mirrors/jellyseerr
1
0
Fork 0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2026-01-01 04:08:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply request overrides iff override & selected servers match (#2164)

Browse Source
This commit is contained in:
TheCatLady
2021-10-08 09:19:47 -04:00
committed by GitHub
parent a20f395c94
commit 50ce198471
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/RequestModal/AdvancedRequester/index.tsx
View File

@@ -150,21 +150,21 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
const defaultProfile = serverData.profiles.find( const defaultProfile = serverData.profiles.find(
(profile) => (profile) =>
profile.id === profile.id ===
(isAnime (isAnime && serverData.server.activeAnimeProfileId
? serverData.server.activeAnimeProfileId ? serverData.server.activeAnimeProfileId
: serverData.server.activeProfileId) : serverData.server.activeProfileId)
); );
const defaultFolder = serverData.rootFolders.find( const defaultFolder = serverData.rootFolders.find(
(folder) => (folder) =>
folder.path === folder.path ===
(isAnime (isAnime && serverData.server.activeAnimeDirectory
? serverData.server.activeAnimeDirectory ? serverData.server.activeAnimeDirectory
: serverData.server.activeDirectory) : serverData.server.activeDirectory)
); );
const defaultLanguage = serverData.languageProfiles?.find( const defaultLanguage = serverData.languageProfiles?.find(
(language) => (language) =>
language.id === language.id ===
(isAnime (isAnime && serverData.server.activeAnimeLanguageProfileId
? serverData.server.activeAnimeLanguageProfileId ? serverData.server.activeAnimeLanguageProfileId
: serverData.server.activeLanguageProfileId) : serverData.server.activeLanguageProfileId)
); );
@@ -172,10 +172,15 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
? serverData.server.activeAnimeTags ? serverData.server.activeAnimeTags
: serverData.server.activeTags; : serverData.server.activeTags;
const applyOverrides =
defaultOverrides &&
((defaultOverrides.server === null && serverData.server.isDefault) ||
defaultOverrides.server === serverData.server.id);
if ( if (
defaultProfile && defaultProfile &&
defaultProfile.id !== selectedProfile && defaultProfile.id !== selectedProfile &&
(!defaultOverrides || defaultOverrides.profile === null) (!applyOverrides || defaultOverrides.profile === null)
) { ) {
setSelectedProfile(defaultProfile.id); setSelectedProfile(defaultProfile.id);
} }
@@ -183,7 +188,7 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
if ( if (
defaultFolder && defaultFolder &&
defaultFolder.path !== selectedFolder && defaultFolder.path !== selectedFolder &&
(!defaultOverrides || defaultOverrides.folder === null) (!applyOverrides || !defaultOverrides.folder)
) { ) {
setSelectedFolder(defaultFolder.path ?? ''); setSelectedFolder(defaultFolder.path ?? '');
} }
@@ -191,7 +196,7 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
if ( if (
defaultLanguage && defaultLanguage &&
defaultLanguage.id !== selectedLanguage && defaultLanguage.id !== selectedLanguage &&
(!defaultOverrides || defaultOverrides.language === null) (!applyOverrides || defaultOverrides.language === null)
) { ) {
setSelectedLanguage(defaultLanguage.id); setSelectedLanguage(defaultLanguage.id);
} }
@@ -199,7 +204,7 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
if ( if (
defaultTags && defaultTags &&
!isEqual(defaultTags, selectedTags) && !isEqual(defaultTags, selectedTags) &&
(!defaultOverrides || defaultOverrides.tags === null) (!applyOverrides || defaultOverrides.tags === null)
) { ) {
setSelectedTags(defaultTags); setSelectedTags(defaultTags);
} }
@@ -215,7 +220,7 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
setSelectedProfile(defaultOverrides.profile); setSelectedProfile(defaultOverrides.profile);
} }
if (defaultOverrides && defaultOverrides.folder != null) { if (defaultOverrides && defaultOverrides.folder) {
setSelectedFolder(defaultOverrides.folder); setSelectedFolder(defaultOverrides.folder);
} }
@@ -241,7 +246,7 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
profile: selectedProfile !== -1 ? selectedProfile : undefined, profile: selectedProfile !== -1 ? selectedProfile : undefined,
server: selectedServer ?? undefined, server: selectedServer ?? undefined,
user: selectedUser ?? undefined, user: selectedUser ?? undefined,
language: selectedLanguage ?? undefined, language: selectedLanguage !== -1 ? selectedLanguage : undefined,
tags: selectedTags, tags: selectedTags,
}); });
} }