refactor: rename any filter to uncategorised

the "any" keyword was a bit confusing
AXeL-dev · Apr 3, 2022 · 822d8c0 · 822d8c0
1 parent 665b3b6
commit 822d8c0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/src/store/reducers/settings.ts b/src/store/reducers/settings.ts
@@ -10,12 +10,12 @@ export const defaultSettings = {
   autoPlayVideos: true,
   recentVideosSeniority: VideosSeniority.OneDay,
   recentViewFilters: {
-    any: true,
+    uncategorised: true,
     viewed: true,
     watchLater: true,
   },
   watchLaterViewFilters: {
-    any: true,
+    uncategorised: true,
     viewed: true,
     archived: true,
   },

diff --git a/src/store/selectors/videos.ts b/src/store/selectors/videos.ts
@@ -48,11 +48,11 @@ export const filterVideoByFlags = (flags: VideoFlags, filters: ViewFilters) => {
   const filterKeys = Object.keys(filters) as ViewFilter[];
   return filterKeys.some((key) => {
     switch (key) {
-      case 'any':
+      case 'uncategorised':
         return (
-          filters.any &&
+          filters.uncategorised &&
           filterKeys
-            .filter((key) => key !== 'any')
+            .filter((key) => key !== 'uncategorised')
             .every((key) => {
               const flag = filter2Flag(key);
               return !flags[flag];

diff --git a/src/types/Settings.ts b/src/types/Settings.ts
@@ -12,13 +12,13 @@ export interface Settings {
 }
 
 export interface RecentViewFilters {
-  any: boolean;
+  uncategorised: boolean;
   viewed: boolean;
   watchLater: boolean;
 }
 
 export interface WatchLaterViewFilters {
-  any: boolean;
+  uncategorised: boolean;
   viewed: boolean;
   archived: boolean;
 }

diff --git a/src/ui/components/pages/Home/ChannelRenderer/RecentViewRenderer.tsx b/src/ui/components/pages/Home/ChannelRenderer/RecentViewRenderer.tsx
@@ -31,13 +31,13 @@ function RecentViewRenderer(props: RecentViewRendererProps) {
   );
   const filterCallback = useCallback(
     (video: Video) => {
-      if (filters.any) {
+      if (filters.uncategorised) {
         return !exclusionList.includes(video.id);
       } else {
         return inclusionList.includes(video.id);
       }
     },
-    [filters.any, exclusionList, inclusionList]
+    [filters.uncategorised, exclusionList, inclusionList]
   );
   const publishedAfter = getDateBefore(
     settings.recentVideosSeniority

diff --git a/src/ui/components/pages/Home/TabActions/RecentViewActions.tsx b/src/ui/components/pages/Home/TabActions/RecentViewActions.tsx
@@ -25,12 +25,12 @@ function RecentViewActions(props: RecentViewActionsProps) {
     setAnchorEl(null);
   };
 
-  const handleAnyFilterToggle = () => {
+  const handleUncategorisedFilterToggle = () => {
     dispatch(
       setViewFilters({
         view: HomeView.Recent,
         filters: {
-          any: !filters.any,
+          uncategorised: !filters.uncategorised,
         },
       })
     );
@@ -83,10 +83,10 @@ function RecentViewActions(props: RecentViewActionsProps) {
         anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
       >
         <CheckableMenuItem
-          checked={filters.any}
-          onClick={handleAnyFilterToggle}
+          checked={filters.uncategorised}
+          onClick={handleUncategorisedFilterToggle}
         >
-          Any
+          Uncategorised
         </CheckableMenuItem>
         <CheckableMenuItem
           checked={filters.viewed}

diff --git a/src/ui/components/pages/Home/TabActions/WatchLaterViewActions/WatchLaterViewFilters.tsx b/src/ui/components/pages/Home/TabActions/WatchLaterViewActions/WatchLaterViewFilters.tsx
@@ -23,12 +23,12 @@ function WatchLaterViewFilters(props: WatchLaterViewFiltersProps) {
     setAnchorEl(null);
   };
 
-  const handleAnyFilterToggle = () => {
+  const handleUncategorisedFilterToggle = () => {
     dispatch(
       setViewFilters({
         view: HomeView.WatchLater,
         filters: {
-          any: !filters.any,
+          uncategorised: !filters.uncategorised,
         },
       })
     );
@@ -81,10 +81,10 @@ function WatchLaterViewFilters(props: WatchLaterViewFiltersProps) {
         anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
       >
         <CheckableMenuItem
-          checked={filters.any}
-          onClick={handleAnyFilterToggle}
+          checked={filters.uncategorised}
+          onClick={handleUncategorisedFilterToggle}
         >
-          Any
+          Uncategorised
         </CheckableMenuItem>
         <CheckableMenuItem
           checked={filters.viewed}