From 57326324cdf8e1b76da7c2b791a064d3a859522e Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:23:20 -0500
Subject: [PATCH] ensure birdseye is actually enabled in config

---
 .../components/filter/CameraGroupSelector.tsx | 43 ++++++++++---------
 web/src/views/live/LiveDashboardView.tsx      |  2 +-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/web/src/components/filter/CameraGroupSelector.tsx b/web/src/components/filter/CameraGroupSelector.tsx
index c165a938a..47bd81724 100644
--- a/web/src/components/filter/CameraGroupSelector.tsx
+++ b/web/src/components/filter/CameraGroupSelector.tsx
@@ -146,6 +146,8 @@ function NewGroupDialog({ open, setOpen, currentGroups }: NewGroupDialogProps) {
   const { data: config, mutate: updateConfig } =
     useSWR<FrigateConfig>("config");
 
+  const birdseyeConfig = useMemo(() => config?.birdseye, [config]);
+
   // add fields
 
   const [editState, setEditState] = useState<"none" | "add" | "edit">("none");
@@ -298,26 +300,27 @@ function NewGroupDialog({ open, setOpen, currentGroups }: NewGroupDialogProps) {
                 </div>
               </DropdownMenuTrigger>
               <DropdownMenuContent>
-                {[...Object.keys(config?.cameras ?? {}), "birdseye"].map(
-                  (camera) => (
-                    <FilterCheckBox
-                      key={camera}
-                      isChecked={cameras.includes(camera)}
-                      label={camera.replaceAll("_", " ")}
-                      onCheckedChange={(checked) => {
-                        if (checked) {
-                          setCameras([...cameras, camera]);
-                        } else {
-                          const index = cameras.indexOf(camera);
-                          setCameras([
-                            ...cameras.slice(0, index),
-                            ...cameras.slice(index + 1),
-                          ]);
-                        }
-                      }}
-                    />
-                  ),
-                )}
+                {[
+                  ...Object.keys(config?.cameras ?? {}),
+                  ...(birdseyeConfig?.enabled ? ["birdseye"] : []),
+                ].map((camera) => (
+                  <FilterCheckBox
+                    key={camera}
+                    isChecked={cameras.includes(camera)}
+                    label={camera.replaceAll("_", " ")}
+                    onCheckedChange={(checked) => {
+                      if (checked) {
+                        setCameras([...cameras, camera]);
+                      } else {
+                        const index = cameras.indexOf(camera);
+                        setCameras([
+                          ...cameras.slice(0, index),
+                          ...cameras.slice(index + 1),
+                        ]);
+                      }
+                    }}
+                  />
+                ))}
               </DropdownMenuContent>
             </DropdownMenu>
             {error && <div className="text-danger">{error}</div>}
diff --git a/web/src/views/live/LiveDashboardView.tsx b/web/src/views/live/LiveDashboardView.tsx
index 3cbc07a5a..0e50ae871 100644
--- a/web/src/views/live/LiveDashboardView.tsx
+++ b/web/src/views/live/LiveDashboardView.tsx
@@ -130,7 +130,7 @@ export default function LiveDashboardView({
       <div
         className={`my-4 grid ${layout == "grid" ? "grid-cols-2 xl:grid-cols-3 3xl:grid-cols-4" : ""} gap-2 md:gap-4  *:rounded-2xl *:bg-black`}
       >
-        {includeBirdseye && birdseyeConfig && (
+        {includeBirdseye && birdseyeConfig?.enabled && (
           <BirdseyeLivePlayer
             birdseyeConfig={birdseyeConfig}
             liveMode={birdseyeConfig.restream ? "mse" : "jsmpeg"}