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

…2164)
sct · Oct 8, 2021 · 50ce198 · 50ce198
1 parent a20f395
commit 50ce198
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/components/RequestModal/AdvancedRequester/index.tsx b/src/components/RequestModal/AdvancedRequester/index.tsx
@@ -150,56 +150,61 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
       const defaultProfile = serverData.profiles.find(
         (profile) =>
           profile.id ===
-          (isAnime
+          (isAnime && serverData.server.activeAnimeProfileId
             ? serverData.server.activeAnimeProfileId
             : serverData.server.activeProfileId)
       );
       const defaultFolder = serverData.rootFolders.find(
         (folder) =>
           folder.path ===
-          (isAnime
+          (isAnime && serverData.server.activeAnimeDirectory
             ? serverData.server.activeAnimeDirectory
             : serverData.server.activeDirectory)
       );
       const defaultLanguage = serverData.languageProfiles?.find(
         (language) =>
           language.id ===
-          (isAnime
+          (isAnime && serverData.server.activeAnimeLanguageProfileId
             ? serverData.server.activeAnimeLanguageProfileId
             : serverData.server.activeLanguageProfileId)
       );
       const defaultTags = isAnime
         ? serverData.server.activeAnimeTags
         : serverData.server.activeTags;
 
+      const applyOverrides =
+        defaultOverrides &&
+        ((defaultOverrides.server === null && serverData.server.isDefault) ||
+          defaultOverrides.server === serverData.server.id);
+
       if (
         defaultProfile &&
         defaultProfile.id !== selectedProfile &&
-        (!defaultOverrides || defaultOverrides.profile === null)
+        (!applyOverrides || defaultOverrides.profile === null)
       ) {
         setSelectedProfile(defaultProfile.id);
       }
 
       if (
         defaultFolder &&
         defaultFolder.path !== selectedFolder &&
-        (!defaultOverrides || defaultOverrides.folder === null)
+        (!applyOverrides || !defaultOverrides.folder)
       ) {
         setSelectedFolder(defaultFolder.path ?? '');
       }
 
       if (
         defaultLanguage &&
         defaultLanguage.id !== selectedLanguage &&
-        (!defaultOverrides || defaultOverrides.language === null)
+        (!applyOverrides || defaultOverrides.language === null)
       ) {
         setSelectedLanguage(defaultLanguage.id);
       }
 
       if (
         defaultTags &&
         !isEqual(defaultTags, selectedTags) &&
-        (!defaultOverrides || defaultOverrides.tags === null)
+        (!applyOverrides || defaultOverrides.tags === null)
       ) {
         setSelectedTags(defaultTags);
       }
@@ -215,7 +220,7 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
       setSelectedProfile(defaultOverrides.profile);
     }
 
-    if (defaultOverrides && defaultOverrides.folder != null) {
+    if (defaultOverrides && defaultOverrides.folder) {
       setSelectedFolder(defaultOverrides.folder);
     }
 
@@ -241,7 +246,7 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
         profile: selectedProfile !== -1 ? selectedProfile : undefined,
         server: selectedServer ?? undefined,
         user: selectedUser ?? undefined,
-        language: selectedLanguage ?? undefined,
+        language: selectedLanguage !== -1 ? selectedLanguage : undefined,
         tags: selectedTags,
       });
     }