mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-12-07 14:04:10 +03:00
feat: add friendly zone names to tracking details and lifecycle item descriptions
This commit is contained in:
parent
cb8d80f8a2
commit
79f0570511
@ -32,6 +32,7 @@ import { Link, useNavigate } from "react-router-dom";
|
|||||||
import { getLifecycleItemDescription } from "@/utils/lifecycleUtil";
|
import { getLifecycleItemDescription } from "@/utils/lifecycleUtil";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { getTranslatedLabel } from "@/utils/i18n";
|
import { getTranslatedLabel } from "@/utils/i18n";
|
||||||
|
import { resolveZoneName } from "@/hooks/use-zone-friendly-name";
|
||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
import { HiDotsHorizontal } from "react-icons/hi";
|
import { HiDotsHorizontal } from "react-icons/hi";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
@ -73,6 +74,12 @@ export function TrackingDetails({
|
|||||||
|
|
||||||
const { data: config } = useSWR<FrigateConfig>("config");
|
const { data: config } = useSWR<FrigateConfig>("config");
|
||||||
|
|
||||||
|
eventSequence?.map((event) => {
|
||||||
|
event.data.zones_friendly_names = event.data?.zones?.map((zone) => {
|
||||||
|
return resolveZoneName(config, zone);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
const effectiveTime = useMemo(() => {
|
const effectiveTime = useMemo(() => {
|
||||||
return currentTime - annotationOffset / 1000;
|
return currentTime - annotationOffset / 1000;
|
||||||
}, [currentTime, annotationOffset]);
|
}, [currentTime, annotationOffset]);
|
||||||
@ -703,7 +710,8 @@ function LifecycleIconRow({
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<span className="smart-capitalize">
|
<span className="smart-capitalize">
|
||||||
{zone.replaceAll("_", " ")}
|
{item.data?.zones_friendly_names?.[zidx] ??
|
||||||
|
zone.replaceAll("_", " ")}
|
||||||
</span>
|
</span>
|
||||||
</Badge>
|
</Badge>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -31,6 +31,7 @@ import { Link } from "react-router-dom";
|
|||||||
import { Switch } from "@/components/ui/switch";
|
import { Switch } from "@/components/ui/switch";
|
||||||
import { usePersistence } from "@/hooks/use-persistence";
|
import { usePersistence } from "@/hooks/use-persistence";
|
||||||
import { isDesktop } from "react-device-detect";
|
import { isDesktop } from "react-device-detect";
|
||||||
|
import { resolveZoneName } from "@/hooks/use-zone-friendly-name";
|
||||||
|
|
||||||
type DetailStreamProps = {
|
type DetailStreamProps = {
|
||||||
reviewItems?: ReviewSegment[];
|
reviewItems?: ReviewSegment[];
|
||||||
@ -646,6 +647,16 @@ function LifecycleItem({
|
|||||||
const { t } = useTranslation("views/events");
|
const { t } = useTranslation("views/events");
|
||||||
const { data: config } = useSWR<FrigateConfig>("config");
|
const { data: config } = useSWR<FrigateConfig>("config");
|
||||||
|
|
||||||
|
item = {
|
||||||
|
...item,
|
||||||
|
data: {
|
||||||
|
...item.data,
|
||||||
|
zones_friendly_names: item?.data?.zones?.map((zone) => {
|
||||||
|
return resolveZoneName(config, zone);
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
const aspectRatio = useMemo(() => {
|
const aspectRatio = useMemo(() => {
|
||||||
if (!config || !item?.camera) {
|
if (!config || !item?.camera) {
|
||||||
return 16 / 9;
|
return 16 / 9;
|
||||||
|
|||||||
@ -42,7 +42,9 @@ export function getLifecycleItemDescription(
|
|||||||
return t("trackingDetails.lifecycleItemDesc.entered_zone", {
|
return t("trackingDetails.lifecycleItemDesc.entered_zone", {
|
||||||
ns: "views/explore",
|
ns: "views/explore",
|
||||||
label,
|
label,
|
||||||
zones: formatZonesList(lifecycleItem.data.zones),
|
zones: formatZonesList(
|
||||||
|
lifecycleItem.data.zones_friendly_names ?? lifecycleItem.data.zones,
|
||||||
|
),
|
||||||
});
|
});
|
||||||
case "active":
|
case "active":
|
||||||
return t("trackingDetails.lifecycleItemDesc.active", {
|
return t("trackingDetails.lifecycleItemDesc.active", {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user