administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-12-18 02:56:44 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: fix camera setting view zone friendly name display

Browse Source
This commit is contained in:
ZhaiSoul 2025-10-23 06:13:47 +00:00
parent 36b2043518
commit 23aba70819
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
web/src/views/settings/CameraSettingsView.tsx
View File

@ -23,7 +23,6 @@ import { StatusBarMessagesContext } from "@/context/statusbar-provider";
import axios from "axios"; import axios from "axios";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { LuExternalLink } from "react-icons/lu"; import { LuExternalLink } from "react-icons/lu";
import { capitalizeFirstLetter } from "@/utils/stringUtil";
import { MdCircle } from "react-icons/md"; import { MdCircle } from "react-icons/md";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { Trans, useTranslation } from "react-i18next"; import { Trans, useTranslation } from "react-i18next";
@ -88,7 +87,7 @@ export default function CameraSettingsView({
// zones and labels // zones and labels
const getZoneName = useCallback( const getZoneName = useCallback(
(cameraId: string, zoneId: string) => (zoneId: string, cameraId?: string) =>
resolveZoneName(config, zoneId, cameraId), resolveZoneName(config, zoneId, cameraId),
[config], [config],
); );
@ -98,7 +97,7 @@ export default function CameraSettingsView({
return Object.entries(cameraConfig.zones).map(([name, zoneData]) => ({ return Object.entries(cameraConfig.zones).map(([name, zoneData]) => ({
camera: cameraConfig.name, camera: cameraConfig.name,
name, name,
friendly_name: getZoneName(cameraConfig.name, name), friendly_name: getZoneName(name, cameraConfig.name),
objects: zoneData.objects, objects: zoneData.objects,
color: zoneData.color, color: zoneData.color,
})); }));
@ -557,12 +556,7 @@ export default function CameraSettingsView({
{ {
alertsLabels, alertsLabels,
zone: watchedAlertsZones zone: watchedAlertsZones
.map((zone) => .map((zone) => getZoneName(zone))
capitalizeFirstLetter(zone).replaceAll(
"_",
" ",
),
)
.join(", "), .join(", "),
cameraName: selectCameraName, cameraName: selectCameraName,
}, },
@ -676,12 +670,7 @@ export default function CameraSettingsView({
values={{ values={{
detectionsLabels, detectionsLabels,
zone: watchedDetectionsZones zone: watchedDetectionsZones
.map((zone) => .map((zone) => getZoneName(zone))
capitalizeFirstLetter(zone).replaceAll(
"_",
" ",
),
)
.join(", "), .join(", "),
cameraName: selectCameraName, cameraName: selectCameraName,
}} }}
@ -693,12 +682,7 @@ export default function CameraSettingsView({
values={{ values={{
detectionsLabels, detectionsLabels,
zone: watchedDetectionsZones zone: watchedDetectionsZones
.map((zone) => .map((zone) => getZoneName(zone))
capitalizeFirstLetter(zone).replaceAll(
"_",
" ",
),
)
.join(", "), .join(", "),
cameraName: selectCameraName, cameraName: selectCameraName,
}} }}