Persist show reviewed locally so it maintains state (#12560)

* Persist show reviewed locally so it maintains state * fix * Theming fixes
blakeblackshear · Jul 22, 2024 · 524f03a · 524f03a
1 parent 68e6ffd
commit 524f03a
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 20 deletions.
diff --git a/web/src/components/filter/ReviewFilterGroup.tsx b/web/src/components/filter/ReviewFilterGroup.tsx
@@ -55,6 +55,8 @@ type ReviewFilterGroupProps = {
   filter?: ReviewFilter;
   motionOnly: boolean;
   filterList?: FilterList;
+  showReviewed: boolean;
+  setShowReviewed: (show: boolean) => void;
   onUpdateFilter: (filter: ReviewFilter) => void;
   setMotionOnly: React.Dispatch<React.SetStateAction<boolean>>;
 };
@@ -66,6 +68,8 @@ export default function ReviewFilterGroup({
   filter,
   motionOnly,
   filterList,
+  showReviewed,
+  setShowReviewed,
   onUpdateFilter,
   setMotionOnly,
 }: ReviewFilterGroupProps) {
@@ -190,10 +194,8 @@ export default function ReviewFilterGroup({
       )}
       {filters.includes("reviewed") && (
         <ShowReviewFilter
-          showReviewed={filter?.showReviewed || 0}
-          setShowReviewed={(reviewed) =>
-            onUpdateFilter({ ...filter, showReviewed: reviewed })
-          }
+          showReviewed={showReviewed}
+          setShowReviewed={setShowReviewed}
         />
       )}
       {isDesktop && filters.includes("date") && (
@@ -418,8 +420,8 @@ export function CamerasFilterButton({
 }
 
 type ShowReviewedFilterProps = {
-  showReviewed?: 0 | 1;
-  setShowReviewed: (reviewed?: 0 | 1) => void;
+  showReviewed: boolean;
+  setShowReviewed: (reviewed: boolean) => void;
 };
 function ShowReviewFilter({
   showReviewed,
@@ -434,9 +436,9 @@ function ShowReviewFilter({
       <div className="hidden h-9 cursor-pointer items-center justify-start rounded-md bg-secondary p-2 text-sm hover:bg-secondary/80 md:flex">
         <Switch
           id="reviewed"
-          checked={showReviewedSwitch == 1}
+          checked={showReviewedSwitch}
           onCheckedChange={() =>
-            setShowReviewedSwitch(showReviewedSwitch == 0 ? 1 : 0)
+            setShowReviewedSwitch(showReviewedSwitch == false ? true : false)
           }
         />
         <Label className="ml-2 cursor-pointer text-primary" htmlFor="reviewed">
@@ -446,12 +448,14 @@ function ShowReviewFilter({
 
       <Button
         className="block duration-0 md:hidden"
-        variant={showReviewedSwitch == 1 ? "select" : "default"}
+        variant={showReviewedSwitch ? "select" : "default"}
         size="sm"
-        onClick={() => setShowReviewedSwitch(showReviewedSwitch == 0 ? 1 : 0)}
+        onClick={() =>
+          setShowReviewedSwitch(showReviewedSwitch == false ? true : false)
+        }
       >
         <FaCheckCircle
-          className={`${showReviewedSwitch == 1 ? "text-selected-foreground" : "text-secondary-foreground"}`}
+          className={`${showReviewedSwitch ? "text-selected-foreground" : "text-secondary-foreground"}`}
         />
       </Button>
     </>

diff --git a/web/src/components/player/PreviewPlayer.tsx b/web/src/components/player/PreviewPlayer.tsx
@@ -328,7 +328,7 @@ function PreviewVideoPlayer({
         )}
       </video>
       {cameraPreviews && !currentPreview && (
-        <div className="absolute inset-0 flex items-center justify-center rounded-lg bg-background_alt text-primary md:rounded-2xl">
+        <div className="absolute inset-0 flex items-center justify-center rounded-lg bg-background_alt text-primary dark:bg-black md:rounded-2xl">
           No Preview Found for {camera.replaceAll("_", " ")}
         </div>
       )}
@@ -547,7 +547,7 @@ function PreviewFramesPlayer({
         onLoad={onImageLoaded}
       />
       {previewFrames?.length === 0 && (
-        <div className="-y-translate-1/2 align-center absolute inset-x-0 top-1/2 rounded-lg bg-background_alt text-center text-primary md:rounded-2xl">
+        <div className="-y-translate-1/2 align-center absolute inset-x-0 top-1/2 rounded-lg bg-background_alt text-center text-primary dark:bg-black md:rounded-2xl">
           No Preview Found for {camera.replaceAll("_", " ")}
         </div>
       )}

diff --git a/web/src/pages/Events.tsx b/web/src/pages/Events.tsx
@@ -3,6 +3,7 @@ import useApiFilter from "@/hooks/use-api-filter";
 import { useCameraPreviews } from "@/hooks/use-camera-previews";
 import { useTimezone } from "@/hooks/use-date-utils";
 import { useOverlayState, useSearchEffect } from "@/hooks/use-overlay-state";
+import { usePersistence } from "@/hooks/use-persistence";
 import { FrigateConfig } from "@/types/frigateConfig";
 import { RecordingStartingPoint } from "@/types/record";
 import {
@@ -32,6 +33,8 @@ export default function Events() {
     "alert",
   );
 
+  const [showReviewed, setShowReviewed] = usePersistence("showReviewed", false);
+
   const [recording, setRecording] =
     useOverlayState<RecordingStartingPoint>("recording");
 
@@ -206,14 +209,14 @@ export default function Events() {
       return [];
     }
 
-    if (reviewFilter?.showReviewed != 1) {
+    if (!showReviewed) {
       return current.filter((seg) => !seg.has_been_reviewed);
     } else {
       return current;
     }
     // only refresh when severity or filter changes
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [severity, reviewFilter, reviewItems?.all.length]);
+  }, [severity, reviewFilter, showReviewed, reviewItems?.all.length]);
 
   // review summary
 
@@ -436,6 +439,8 @@ export default function Events() {
         filter={reviewFilter}
         severity={severity ?? "alert"}
         startTime={startTime}
+        showReviewed={showReviewed ?? false}
+        setShowReviewed={setShowReviewed}
         setSeverity={setSeverity}
         markItemAsReviewed={markItemAsReviewed}
         markAllItemsAsReviewed={markAllItemsAsReviewed}

diff --git a/web/src/types/review.ts b/web/src/types/review.ts
@@ -35,7 +35,6 @@ export type ReviewFilter = {
   zones?: string[];
   before?: number;
   after?: number;
-  showReviewed?: 0 | 1;
   showAll?: boolean;
 };
 

diff --git a/web/src/views/events/EventView.tsx b/web/src/views/events/EventView.tsx
@@ -62,6 +62,8 @@ type EventViewProps = {
   filter?: ReviewFilter;
   severity: ReviewSeverity;
   startTime?: number;
+  showReviewed: boolean;
+  setShowReviewed: (show: boolean) => void;
   setSeverity: (severity: ReviewSeverity) => void;
   markItemAsReviewed: (review: ReviewSegment) => void;
   markAllItemsAsReviewed: (currentItems: ReviewSegment[]) => void;
@@ -78,6 +80,8 @@ export default function EventView({
   filter,
   severity,
   startTime,
+  showReviewed,
+  setShowReviewed,
   setSeverity,
   markItemAsReviewed,
   markAllItemsAsReviewed,
@@ -108,7 +112,7 @@ export default function EventView({
       return { alert: 0, detection: 0, significant_motion: 0 };
     }
 
-    if (filter?.showReviewed == 1) {
+    if (showReviewed) {
       return {
         alert: summary.total_alert ?? 0,
         detection: summary.total_detection ?? 0,
@@ -121,7 +125,7 @@ export default function EventView({
         significant_motion: summary.total_motion - summary.reviewed_motion,
       };
     }
-  }, [filter, reviewSummary]);
+  }, [filter, showReviewed, reviewSummary]);
 
   // review interaction
 
@@ -358,6 +362,8 @@ export default function EventView({
             filter={filter}
             motionOnly={motionOnly}
             filterList={reviewFilterList}
+            showReviewed={showReviewed}
+            setShowReviewed={setShowReviewed}
             onUpdateFilter={updateFilter}
             setMotionOnly={setMotionOnly}
           />

diff --git a/web/src/views/events/RecordingView.tsx b/web/src/views/events/RecordingView.tsx
@@ -418,6 +418,8 @@ export function RecordingView({
               filter={filter}
               motionOnly={false}
               filterList={reviewFilterList}
+              showReviewed
+              setShowReviewed={() => {}}
               onUpdateFilter={updateFilter}
               setMotionOnly={() => {}}
             />
@@ -699,10 +701,10 @@ function Timeline({
           <Skeleton className="size-full" />
         )
       ) : (
-        <div className="h-full overflow-auto bg-secondary">
+        <div className="scrollbar-container h-full overflow-auto bg-secondary">
           <div
             className={cn(
-              "grid h-auto grid-cols-1 gap-4 overflow-auto p-4",
+              "scrollbar-container grid h-auto grid-cols-1 gap-4 overflow-auto p-4",
               isMobile && "sm:grid-cols-2",
             )}
           >