refactor: rename uncategorised filter to others

AXeL-dev · Aug 22, 2022 · f228a80 · f228a80
1 parent f8c9254
commit f228a80
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/src/store/reducers/settings.ts b/src/store/reducers/settings.ts
@@ -16,14 +16,14 @@ export const defaultSettings = {
   autoPlayVideos: true,
   recentVideosSeniority: VideosSeniority.OneDay,
   recentViewFilters: {
-    uncategorised: true,
     viewed: true,
     watchLater: true,
+    others: true,
   },
   watchLaterViewFilters: {
-    uncategorised: true,
     viewed: true,
     archived: true,
+    others: true,
   },
   homeDisplayOptions: {
     hiddenViews: [],

diff --git a/src/store/selectors/videos.ts b/src/store/selectors/videos.ts
@@ -73,11 +73,11 @@ const filterVideoByFlags = (video: VideoCache, filters: ViewFilters) => {
   };
   return filterKeys.some((key) => {
     switch (key) {
-      case 'uncategorised':
+      case 'others':
         return (
-          filters.uncategorised &&
+          filters.others &&
           filterKeys
-            .filter((key) => !['uncategorised'].includes(key))
+            .filter((key) => !['others'].includes(key))
             .every((key) => !hasFlag(key))
         );
       default:

diff --git a/src/types/Settings.ts b/src/types/Settings.ts
@@ -18,15 +18,15 @@ export interface HomeDisplayOptions {
 }
 
 export interface RecentViewFilters {
-  uncategorised: boolean;
   viewed: boolean;
   watchLater: boolean;
+  others: boolean;
 }
 
 export interface WatchLaterViewFilters {
-  uncategorised: boolean;
   viewed: boolean;
   archived: boolean;
+  others: boolean;
 }
 
 export type ViewFilters = Either<RecentViewFilters, WatchLaterViewFilters>;

diff --git a/src/ui/components/pages/Home/ChannelRenderer/RecentViewRenderer.tsx b/src/ui/components/pages/Home/ChannelRenderer/RecentViewRenderer.tsx
@@ -16,13 +16,13 @@ function RecentViewRenderer(props: RecentViewRendererProps) {
   const videos = useAppSelector(selectRecentChannelVideos(channel));
   const filterCallback = useCallback(
     (video: Video) => {
-      if (settings.recentViewFilters.uncategorised) {
+      if (settings.recentViewFilters.others) {
         return !videos.excluded.includes(video.id);
       } else {
         return videos.included.includes(video.id);
       }
     },
-    [settings.recentViewFilters.uncategorised, videos],
+    [settings.recentViewFilters.others, videos],
   );
   const publishedAfter = useMemo(
     () => getDateBefore(settings.recentVideosSeniority).toISOString(),

diff --git a/src/ui/components/pages/Home/TabActions/RecentViewActions/RecentViewFilters.tsx b/src/ui/components/pages/Home/TabActions/RecentViewActions/RecentViewFilters.tsx
@@ -58,12 +58,6 @@ function RecentViewFilters(props: RecentViewFiltersProps) {
         transformOrigin={{ horizontal: 'right', vertical: 'top' }}
         anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
       >
-        <CheckableMenuItem
-          checked={filters.uncategorised}
-          onClick={() => handleFilterToggle('uncategorised')}
-        >
-          Uncategorised
-        </CheckableMenuItem>
         <CheckableMenuItem
           checked={filters.viewed}
           onClick={() => handleFilterToggle('viewed')}
@@ -76,6 +70,12 @@ function RecentViewFilters(props: RecentViewFiltersProps) {
         >
           Watch later
         </CheckableMenuItem>
+        <CheckableMenuItem
+          checked={filters.others}
+          onClick={() => handleFilterToggle('others')}
+        >
+          Others
+        </CheckableMenuItem>
       </StyledMenu>
     </>
   );

diff --git a/src/ui/components/pages/Home/TabActions/WatchLaterViewActions/WatchLaterViewFilters.tsx b/src/ui/components/pages/Home/TabActions/WatchLaterViewActions/WatchLaterViewFilters.tsx
@@ -58,12 +58,6 @@ function WatchLaterViewFilters(props: WatchLaterViewFiltersProps) {
         transformOrigin={{ horizontal: 'right', vertical: 'top' }}
         anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
       >
-        <CheckableMenuItem
-          checked={filters.uncategorised}
-          onClick={() => handleFilterToggle('uncategorised')}
-        >
-          Uncategorised
-        </CheckableMenuItem>
         <CheckableMenuItem
           checked={filters.viewed}
           onClick={() => handleFilterToggle('viewed')}
@@ -76,6 +70,12 @@ function WatchLaterViewFilters(props: WatchLaterViewFiltersProps) {
         >
           Archived
         </CheckableMenuItem>
+        <CheckableMenuItem
+          checked={filters.others}
+          onClick={() => handleFilterToggle('others')}
+        >
+          Others
+        </CheckableMenuItem>
       </StyledMenu>
     </>
   );