From 20633975c62636ae2e2250ab75398676d4ea7d5f Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Sat, 12 Mar 2022 10:10:09 -0700 Subject: [PATCH] Fix undefined return in Sidebar --- docker-compose.yml | 12 ++++++------ web/src/Sidebar.jsx | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9431e00bd..34ba0b5c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,16 +5,16 @@ services: user: vscode # add groups from host for render, plugdev, video group_add: - - 109 # render - - 44 # video - - 46 # plugdev + - "109" # render + - "44" # video + - "46" # plugdev shm_size: "256mb" build: context: . dockerfile: docker/Dockerfile.dev - devices: - - /dev/bus/usb:/dev/bus/usb - - /dev/dri:/dev/dri # for intel hwaccel, needs to be updated for your hardware + #devices: + # - /dev/bus/usb:/dev/bus/usb + # - /dev/dri:/dev/dri # for intel hwaccel, needs to be updated for your hardware volumes: - /etc/localtime:/etc/localtime:ro - .:/lab/frigate:cached diff --git a/web/src/Sidebar.jsx b/web/src/Sidebar.jsx index 40306ef2a..a4d31933c 100644 --- a/web/src/Sidebar.jsx +++ b/web/src/Sidebar.jsx @@ -50,17 +50,17 @@ export default function Sidebar() { function SortedCameras({ unsortedCameras }) { - const sortedCameras = useMemo(() => { + const sortedCameras = useMemo(() => Object.entries(unsortedCameras) .filter(([_, conf]) => conf.ui.show) .sort(([_, aConf], [__, bConf]) => aConf.ui.order === bConf.ui.order ? 0 : (aConf.ui.order > bConf.ui.order ? 1 : -1)) - }, [unsortedCameras]); + , [unsortedCameras]); return ( {sortedCameras.map(([camera]) => ( - + ))} @@ -69,11 +69,11 @@ function SortedCameras({ unsortedCameras }) { function SortedRecordingCameras({ unsortedCameras }) { - const sortedCameras = useMemo(() => { + const sortedCameras = useMemo(() => Object.entries(unsortedCameras) .filter(([_, conf]) => conf.ui.show) .sort(([_, aConf], [__, bConf]) => aConf.ui.order === bConf.ui.order ? 0 : (aConf.ui.order > bConf.ui.order ? 1 : -1)) - }, [unsortedCameras]); + , [unsortedCameras]); return (