fix(home): ignore legacy filter keys when counting the active view fi…

…lters
AXeL-dev · Oct 2, 2022 · c2bbc0a · c2bbc0a
1 parent c34e163
commit c2bbc0a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/store/selectors/settings.ts b/src/store/selectors/settings.ts
@@ -32,10 +32,17 @@ export const selectViewFilters = (view: HomeView) =>
     }
   });
 
+const legacyViewFilterKeys = ['uncategorised', 'viewed'];
+
+export const getActiveViewFilters = (filters: ViewFilters) =>
+  Object.entries(filters).filter(
+    ([key, value]) => !legacyViewFilterKeys.includes(key) && value,
+  );
+
 export const selectActiveViewFiltersCount = (view: HomeView) =>
   createSelector(
     selectViewFilters(view),
-    (filters) => Object.values(filters).filter(Boolean).length,
+    (filters) => getActiveViewFilters(filters).length,
   );
 
 export const selectViewSorting = (view: HomeView) =>

diff --git a/src/ui/components/pages/Home/TabActions/CommonMenus/ViewFilters.tsx b/src/ui/components/pages/Home/TabActions/CommonMenus/ViewFilters.tsx
@@ -6,7 +6,10 @@ import {
   NestedMenuItemProps,
 } from 'ui/components/shared';
 import { useAppDispatch, useAppSelector } from 'store';
-import { selectViewFilters } from 'store/selectors/settings';
+import {
+  selectViewFilters,
+  getActiveViewFilters,
+} from 'store/selectors/settings';
 import { setViewFilters } from 'store/reducers/settings';
 import { HomeView, ViewFilters as Filters } from 'types';
 import FilterAltIcon from '@mui/icons-material/FilterAlt';
@@ -26,7 +29,7 @@ function ViewFilters(props: ViewFiltersProps) {
   const filters = useAppSelector(selectViewFilters(view));
   const dispatch = useAppDispatch();
   const activeFiltersCount = useMemo(
-    () => Object.values(filters).filter(Boolean).length,
+    () => getActiveViewFilters(filters).length,
     [filters],
   );