From b4d82084a98cc245e73a1be922270994275ce128 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Thu, 12 Dec 2024 08:22:30 -0600
Subject: [PATCH] Fixes (#15465)

* Fix single event return

* Allow customizing if search is preserved for overlay state

* Remove timeout

* Cleanup

* Cleanup naming
---
 frigate/events/cleanup.py           | 5 +++--
 web/src/hooks/use-overlay-state.tsx | 3 ++-
 web/src/pages/Events.tsx            | 7 +++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frigate/events/cleanup.py b/frigate/events/cleanup.py
index b1b485c3d..741f0884c 100644
--- a/frigate/events/cleanup.py
+++ b/frigate/events/cleanup.py
@@ -256,8 +256,9 @@ class EventCleanup(threading.Thread):
 
         events_to_update = []
 
-        for batch in query.iterator():
-            events_to_update.extend([event.id for event in batch])
+        for event in query.iterator():
+            events_to_update.append(event)
+
             if len(events_to_update) >= CHUNK_SIZE:
                 logger.debug(
                     f"Updating {update_params} for {len(events_to_update)} events"
diff --git a/web/src/hooks/use-overlay-state.tsx b/web/src/hooks/use-overlay-state.tsx
index 841585b25..7a43383d4 100644
--- a/web/src/hooks/use-overlay-state.tsx
+++ b/web/src/hooks/use-overlay-state.tsx
@@ -5,6 +5,7 @@ import { usePersistence } from "./use-persistence";
 export function useOverlayState<S>(
   key: string,
   defaultValue: S | undefined = undefined,
+  preserveSearch: boolean = true,
 ): [S | undefined, (value: S, replace?: boolean) => void] {
   const location = useLocation();
   const navigate = useNavigate();
@@ -15,7 +16,7 @@ export function useOverlayState<S>(
     (value: S, replace: boolean = false) => {
       const newLocationState = { ...currentLocationState };
       newLocationState[key] = value;
-      navigate(location.pathname + location.search, {
+      navigate(location.pathname + (preserveSearch ? location.search : ""), {
         state: newLocationState,
         replace,
       });
diff --git a/web/src/pages/Events.tsx b/web/src/pages/Events.tsx
index 8c6f3cd38..28625bbd8 100644
--- a/web/src/pages/Events.tsx
+++ b/web/src/pages/Events.tsx
@@ -39,8 +39,11 @@ export default function Events() {
 
   const [showReviewed, setShowReviewed] = usePersistence("showReviewed", false);
 
-  const [recording, setRecording] =
-    useOverlayState<RecordingStartingPoint>("recording");
+  const [recording, setRecording] = useOverlayState<RecordingStartingPoint>(
+    "recording",
+    undefined,
+    false,
+  );
 
   useSearchEffect("id", (reviewId: string) => {
     axios