From eb3e67bd361ea3e01bcf09dcb950910a49a005f5 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Fri, 15 Apr 2022 06:18:03 -0600 Subject: [PATCH] Simplify sorting logic --- docker-compose.yml | 6 +++--- web/src/Sidebar.jsx | 2 +- web/src/routes/Cameras.jsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 34ba0b5c6..9287a4ef9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,9 +12,9 @@ services: 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 b76bb76a2..a74a8c80b 100644 --- a/web/src/Sidebar.jsx +++ b/web/src/Sidebar.jsx @@ -17,7 +17,7 @@ export default function Sidebar() { return Object.entries(config.cameras) .filter(([_, conf]) => conf.ui.dashboard) - .sort(([_, aConf], [__, bConf]) => aConf.ui.order === bConf.ui.order ? 0 : (aConf.ui.order > bConf.ui.order ? 1 : -1)); + .sort(([_, aConf], [__, bConf]) => aConf.ui.order - bConf.ui.order); }, [config]); if (!config) { diff --git a/web/src/routes/Cameras.jsx b/web/src/routes/Cameras.jsx index d3eaf82d5..a61aff91d 100644 --- a/web/src/routes/Cameras.jsx +++ b/web/src/routes/Cameras.jsx @@ -26,7 +26,7 @@ function SortedCameras({ unsortedCameras }) { const sortedCameras = useMemo(() => Object.entries(unsortedCameras) .filter(([_, conf]) => conf.ui.dashboard) - .sort(([_, aConf], [__, bConf]) => aConf.ui.order === bConf.ui.order ? 0 : (aConf.ui.order > bConf.ui.order ? 1 : -1)), + .sort(([_, aConf], [__, bConf]) => aConf.ui.order - bConf.ui.order), [unsortedCameras]); return (