From 72565d68d3df3fdcdb4a5fe8c2456bc150f3ee43 Mon Sep 17 00:00:00 2001 From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com> Date: Wed, 18 Sep 2024 12:19:14 -0500 Subject: [PATCH] fix filters --- web/src/components/filter/SearchFilterGroup.tsx | 7 ++----- web/src/components/input/InputWithTags.tsx | 1 + web/src/views/search/SearchView.tsx | 15 ++++++--------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/web/src/components/filter/SearchFilterGroup.tsx b/web/src/components/filter/SearchFilterGroup.tsx index 0b0b3278e..81090958e 100644 --- a/web/src/components/filter/SearchFilterGroup.tsx +++ b/web/src/components/filter/SearchFilterGroup.tsx @@ -109,11 +109,8 @@ export default function SearchFilterGroup({ return; } const cameraConfig = config.cameras[camera]; - cameraConfig.review.alerts.required_zones.forEach((zone) => { - zones.add(zone); - }); - cameraConfig.review.detections.required_zones.forEach((zone) => { - zones.add(zone); + Object.entries(cameraConfig.zones).map(([name, _]) => { + zones.add(name); }); }); diff --git a/web/src/components/input/InputWithTags.tsx b/web/src/components/input/InputWithTags.tsx index 294d49845..6156d49da 100644 --- a/web/src/components/input/InputWithTags.tsx +++ b/web/src/components/input/InputWithTags.tsx @@ -337,6 +337,7 @@ export default function InputWithTags({ const handleClearInput = useCallback(() => { setInputFocused(false); + setInputValue(""); resetSuggestions(""); setSearch(""); inputRef?.current?.blur(); diff --git a/web/src/views/search/SearchView.tsx b/web/src/views/search/SearchView.tsx index c310ed399..b0ce92bec 100644 --- a/web/src/views/search/SearchView.tsx +++ b/web/src/views/search/SearchView.tsx @@ -62,7 +62,7 @@ export default function SearchView({ } const labels = new Set(); - const cameras = Object.keys(config.cameras); + const cameras = searchFilter?.cameras || Object.keys(config.cameras); cameras.forEach((camera) => { if (camera == "birdseye") { @@ -81,7 +81,7 @@ export default function SearchView({ }); return [...labels].sort(); - }, [config]); + }, [config, searchFilter]); const { data: allSubLabels } = useSWR("sub_labels"); @@ -91,23 +91,20 @@ export default function SearchView({ } const zones = new Set(); - const cameras = Object.keys(config.cameras); + const cameras = searchFilter?.cameras || Object.keys(config.cameras); cameras.forEach((camera) => { if (camera == "birdseye") { return; } const cameraConfig = config.cameras[camera]; - cameraConfig.review.alerts.required_zones.forEach((zone) => { - zones.add(zone); - }); - cameraConfig.review.detections.required_zones.forEach((zone) => { - zones.add(zone); + Object.entries(cameraConfig.zones).map(([name, _]) => { + zones.add(name); }); }); return [...zones].sort(); - }, [config]); + }, [config, searchFilter]); const suggestionsValues = useMemo( () => ({