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
@@ -49,6 +49,7 @@ function ConfigEditor() {
|
||||
|
||||
const [restartDialogOpen, setRestartDialogOpen] = useState(false);
|
||||
const { send: sendRestart } = useRestart();
|
||||
const initialValidationRef = useRef(false);
|
||||
|
||||
const onHandleSaveConfig = useCallback(
|
||||
async (save_option: SaveOptions): Promise<void> => {
|
||||
@@ -171,6 +172,33 @@ function ConfigEditor() {
|
||||
};
|
||||
}, [rawConfig, apiHost, systemTheme, theme, onHandleSaveConfig]);
|
||||
|
||||
// when in safe mode, attempt to validate the existing (invalid) config immediately
|
||||
// so that the user sees the validation errors without needing to press save
|
||||
useEffect(() => {
|
||||
if (
|
||||
config?.safe_mode &&
|
||||
rawConfig &&
|
||||
!initialValidationRef.current &&
|
||||
!error
|
||||
) {
|
||||
initialValidationRef.current = true;
|
||||
axios
|
||||
.post(`config/save?save_option=saveonly`, rawConfig, {
|
||||
headers: { "Content-Type": "text/plain" },
|
||||
})
|
||||
.then(() => {
|
||||
// if this succeeds while in safe mode, we won't force any UI change
|
||||
})
|
||||
.catch((e: AxiosError<ApiErrorResponse>) => {
|
||||
const errorMessage =
|
||||
e.response?.data?.message ||
|
||||
e.response?.data?.detail ||
|
||||
"Unknown error";
|
||||
setError(errorMessage);
|
||||
});
|
||||
}
|
||||
}, [config?.safe_mode, rawConfig, error]);
|
||||
|
||||
// monitoring state
|
||||
|
||||
const [hasChanges, setHasChanges] = useState(false);
|
||||
|
||||
@@ -14,12 +14,12 @@ import { useTranslation } from "react-i18next";
|
||||
import { useEffect, useMemo, useRef } from "react";
|
||||
import useSWR from "swr";
|
||||
import { useAllowedCameras } from "@/hooks/use-allowed-cameras";
|
||||
import { useIsCustomRole } from "@/hooks/use-is-custom-role";
|
||||
import { useIsAdmin } from "@/hooks/use-is-admin";
|
||||
|
||||
function Live() {
|
||||
const { t } = useTranslation(["views/live"]);
|
||||
const { data: config } = useSWR<FrigateConfig>("config");
|
||||
const isCustomRole = useIsCustomRole();
|
||||
const isAdmin = useIsAdmin();
|
||||
|
||||
// selection
|
||||
|
||||
@@ -94,7 +94,7 @@ function Live() {
|
||||
|
||||
const includesBirdseye = useMemo(() => {
|
||||
// Restricted users should never have access to birdseye
|
||||
if (isCustomRole) {
|
||||
if (!isAdmin) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ function Live() {
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}, [config, cameraGroup, isCustomRole]);
|
||||
}, [config, cameraGroup, isAdmin]);
|
||||
|
||||
const cameras = useMemo(() => {
|
||||
if (!config) {
|
||||
|
||||
Reference in New Issue
Block a user