administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-04-24 07:44:30 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix group url param where a camera group was not always loaded

Browse Source 
Need to use the loading state from the usePersistence hook because values are loaded from indexed db asynchronously
This commit is contained in:
Josh Hawkins 2025-09-30 17:03:20 -05:00
parent 923412ec1c
commit c10229da5d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/filter/CameraGroupSelector.tsx
View File

@ -109,7 +109,7 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
// groups // groups
const [group, setGroup, deleteGroup] = usePersistedOverlayState( const [group, setGroup, , deleteGroup] = usePersistedOverlayState(
"cameraGroup", "cameraGroup",
"default" as string, "default" as string,
); );

4
web/src/hooks/use-overlay-state.tsx
View File

@ -40,6 +40,7 @@ export function usePersistedOverlayState<S extends string>(
): [ ): [
S | undefined, S | undefined,
(value: S | undefined, replace?: boolean) => void, (value: S | undefined, replace?: boolean) => void,
boolean,
() => void, () => void,
] { ] {
const location = useLocation(); const location = useLocation();
@ -55,7 +56,7 @@ export function usePersistedOverlayState<S extends string>(
// saved value from previous session // saved value from previous session
const [persistedValue, setPersistedValue, , deletePersistedValue] = const [persistedValue, setPersistedValue, loaded, deletePersistedValue] =
usePersistence<S>(key, overlayStateValue); usePersistence<S>(key, overlayStateValue);
const setOverlayStateValue = useCallback( const setOverlayStateValue = useCallback(
@ -73,6 +74,7 @@ export function usePersistedOverlayState<S extends string>(
return [ return [
overlayStateValue ?? persistedValue ?? defaultValue, overlayStateValue ?? persistedValue ?? defaultValue,
setOverlayStateValue, setOverlayStateValue,
loaded,
deletePersistedValue, deletePersistedValue,
]; ];
} }

4
web/src/pages/Live.tsx
View File

@ -24,13 +24,13 @@ function Live() {
// selection // selection
const [selectedCameraName, setSelectedCameraName] = useHashState(); const [selectedCameraName, setSelectedCameraName] = useHashState();
const [cameraGroup, setCameraGroup] = usePersistedOverlayState( const [cameraGroup, setCameraGroup, loaded, ,] = usePersistedOverlayState(
"cameraGroup", "cameraGroup",
"default" as string, "default" as string,
); );
useSearchEffect("group", (cameraGroup) => { useSearchEffect("group", (cameraGroup) => {
if (config && cameraGroup) { if (config && cameraGroup && loaded) {
const group = config.camera_groups[cameraGroup]; const group = config.camera_groups[cameraGroup];
if (group) { if (group) {