mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-08-02 09:02:15 +03:00
Miscellaneous Fixes (#21063)
CI / AMD64 Build (push) Has been cancelled
CI / ARM Build (push) Has been cancelled
CI / Jetson Jetpack 6 (push) Has been cancelled
CI / AMD64 Extra Build (push) Has been cancelled
CI / ARM Extra Build (push) Has been cancelled
CI / Synaptics Build (push) Has been cancelled
CI / Assemble and push default build (push) Has been cancelled
CI / AMD64 Build (push) Has been cancelled
CI / ARM Build (push) Has been cancelled
CI / Jetson Jetpack 6 (push) Has been cancelled
CI / AMD64 Extra Build (push) Has been cancelled
CI / ARM Extra Build (push) Has been cancelled
CI / Synaptics Build (push) Has been cancelled
CI / Assemble and push default build (push) Has been cancelled
* Fix history management failing when updating URL * Handle case where user doesn't have images that represent all states If a user selects all imags and can't proceed we show a warning that they can still proceed but the model won't be trained until they get at least one image for every state. * Still create all classes We stil need to create all classes even if the user didn't assign images to them. * fix camera group access for non admin users changes from previous PR wrongly included users from the standard viewer role (but excluded custom viewer roles) * Adjust threat level interaction to be less strict * use base path when fetching go2rtc data * show config error message when starting in safe mode * fix genai migration * fix genai * Fix genai migration --------- Co-authored-by: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
This commit is contained in:
co-authored by
Josh Hawkins
parent
cd606ad240
commit
1b57fb15a7
@@ -1,3 +1,4 @@
|
||||
import { baseUrl } from "@/api/baseUrl";
|
||||
import { CameraConfig, FrigateConfig } from "@/types/frigateConfig";
|
||||
import { useCallback, useEffect, useState, useMemo } from "react";
|
||||
import useSWR from "swr";
|
||||
@@ -41,9 +42,12 @@ export default function useCameraLiveMode(
|
||||
|
||||
const metadataPromises = streamNames.map(async (streamName) => {
|
||||
try {
|
||||
const response = await fetch(`/api/go2rtc/streams/${streamName}`, {
|
||||
priority: "low",
|
||||
});
|
||||
const response = await fetch(
|
||||
`${baseUrl}api/go2rtc/streams/${streamName}`,
|
||||
{
|
||||
priority: "low",
|
||||
},
|
||||
);
|
||||
|
||||
if (response.ok) {
|
||||
const data = await response.json();
|
||||
|
||||
@@ -17,6 +17,7 @@ export function useHistoryBack({
|
||||
}: UseHistoryBackOptions): void {
|
||||
const historyPushedRef = React.useRef(false);
|
||||
const closedByBackRef = React.useRef(false);
|
||||
const urlWhenOpenedRef = React.useRef<string | null>(null);
|
||||
|
||||
// Keep onClose in a ref to avoid effect re-runs that cause multiple history pushes
|
||||
const onCloseRef = React.useRef(onClose);
|
||||
@@ -30,6 +31,9 @@ export function useHistoryBack({
|
||||
if (open) {
|
||||
// Only push history state if we haven't already (prevents duplicates in strict mode)
|
||||
if (!historyPushedRef.current) {
|
||||
// Store the current URL (pathname + search, without hash) before pushing history state
|
||||
urlWhenOpenedRef.current =
|
||||
window.location.pathname + window.location.search;
|
||||
window.history.pushState({ overlayOpen: true }, "");
|
||||
historyPushedRef.current = true;
|
||||
}
|
||||
@@ -37,6 +41,7 @@ export function useHistoryBack({
|
||||
const handlePopState = () => {
|
||||
closedByBackRef.current = true;
|
||||
historyPushedRef.current = false;
|
||||
urlWhenOpenedRef.current = null;
|
||||
onCloseRef.current();
|
||||
};
|
||||
|
||||
@@ -48,10 +53,22 @@ export function useHistoryBack({
|
||||
} else {
|
||||
// Overlay is closing - clean up history if we pushed and it wasn't via back button
|
||||
if (historyPushedRef.current && !closedByBackRef.current) {
|
||||
window.history.back();
|
||||
const currentUrl = window.location.pathname + window.location.search;
|
||||
const urlWhenOpened = urlWhenOpenedRef.current;
|
||||
|
||||
// If the URL has changed (e.g., filters were applied via search params),
|
||||
// don't go back as it would undo the filter update.
|
||||
// The history entry we pushed will remain, but that's acceptable compared
|
||||
// to losing the user's filter changes.
|
||||
if (!urlWhenOpened || currentUrl === urlWhenOpened) {
|
||||
// URL hasn't changed, safe to go back and remove our history entry
|
||||
window.history.back();
|
||||
}
|
||||
// If URL changed, we skip history.back() to preserve the filter updates
|
||||
}
|
||||
historyPushedRef.current = false;
|
||||
closedByBackRef.current = false;
|
||||
urlWhenOpenedRef.current = null;
|
||||
}
|
||||
}, [enabled, open]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user