Fix filter refresh in collection page (#704)

ShokoAnime · Nov 29, 2023 · cb32c3d · cb32c3d
1 parent fd9383d
commit cb32c3d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/components/Collection/CollectionView.tsx b/src/components/Collection/CollectionView.tsx
@@ -43,6 +43,8 @@ export const listItemSize = {
 const CollectionView = ({ isSidebarOpen, mode, setGroupTotal, setTimelineSeries }: Props) => {
   const { filterId, groupId } = useParams();
 
+  const [currentFilterId, setCurrentFilterId] = useState(filterId);
+
   const settingsQuery = useGetSettingsQuery();
   const settings = useMemo(() => settingsQuery?.data ?? initialSettings, [settingsQuery]);
   const { showRandomPoster: showRandomPosterGrid } = settings.WebUI_Settings.collection.poster;
@@ -124,14 +126,22 @@ const CollectionView = ({ isSidebarOpen, mode, setGroupTotal, setTimelineSeries
     fetchPage.cancel();
     setFetchingPage(false);
 
-    const shouldFetch = groupId ? true : groupsData.isUninitialized;
+    let shouldFetch: boolean;
+    if (groupId) {
+      shouldFetch = true;
+    } else if (filterId !== currentFilterId) {
+      setCurrentFilterId(filterId);
+      shouldFetch = true;
+    } else {
+      shouldFetch = groupsData.isUninitialized;
+    }
 
     if (shouldFetch) {
       fetchPage(1);
     }
 
     return () => fetchPage.cancel();
-  }, [filterId, groupId, groupsData.isUninitialized, fetchPage]);
+  }, [currentFilterId, filterId, groupId, groupsData.isUninitialized, fetchPage]);
 
   useEffect(() => {
     if (!groupId) setSeriesData({ pages: [], total: -1 });

diff --git a/src/pages/collection/Collection.tsx b/src/pages/collection/Collection.tsx
@@ -71,7 +71,7 @@ function Collection() {
 
   const filterData = useGetFilterQuery({ filterId }, { skip: !filterId });
   const groupData = useGetGroupQuery({ groupId: groupId! }, { skip: !groupId });
-  const subsectionName = groupId ? groupData?.data?.Name : filterData?.data?.Name;
+  const subsectionName = groupId ? groupData?.data?.Name : filterId && filterData?.data?.Name;
 
   const settingsQuery = useGetSettingsQuery();
   const settings = useMemo(() => settingsQuery?.data ?? initialSettings, [settingsQuery]);