administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-05-04 20:47:42 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix useFormattedTimestamp to use new formatUnixTimestampToDateTime date_format

Browse Source
This commit is contained in:
Josh Hawkins 2025-04-22 15:56:09 -05:00
parent 3fa4e3f4ec
commit be46c30daf
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
web/src/hooks/use-date-utils.ts
View File

@ -1,33 +1,42 @@
import { FrigateConfig } from "@/types/frigateConfig"; import { FrigateConfig } from "@/types/frigateConfig";
import { formatUnixTimestampToDateTime } from "@/utils/dateUtil"; import { formatUnixTimestampToDateTime } from "@/utils/dateUtil";
import { useMemo } from "react"; import { useMemo } from "react";
import { useDateLocale } from "@/hooks/use-date-locale";
export function useFormattedTimestamp( export function useFormattedTimestamp(
timestamp: number, timestamp: number,
format: string, format: string,
timezone?: string, timezone?: string,
) { ) {
const locale = useDateLocale();
const formattedTimestamp = useMemo(() => { const formattedTimestamp = useMemo(() => {
return formatUnixTimestampToDateTime(timestamp, { return formatUnixTimestampToDateTime(timestamp, {
timezone, timezone,
strftime_fmt: format, date_format: format,
locale,
}); });
}, [format, timestamp, timezone]); }, [format, timestamp, timezone, locale]);
return formattedTimestamp; return formattedTimestamp;
} }
export function useFormattedRange(start: number, end: number, format: string) { export function useFormattedRange(start: number, end: number, format: string) {
const locale = useDateLocale();
const formattedStart = useMemo(() => { const formattedStart = useMemo(() => {
return formatUnixTimestampToDateTime(start, { return formatUnixTimestampToDateTime(start, {
strftime_fmt: format, date_format: format,
locale,
}); });
}, [format, start]); }, [format, start, locale]);
const formattedEnd = useMemo(() => { const formattedEnd = useMemo(() => {
return formatUnixTimestampToDateTime(end, { return formatUnixTimestampToDateTime(end, {
strftime_fmt: format, date_format: format,
locale,
}); });
}, [format, end]); }, [format, end, locale]);
return `${formattedStart} - ${formattedEnd}`; return `${formattedStart} - ${formattedEnd}`;
} }
@ -44,7 +53,7 @@ export function useTimezone(config: FrigateConfig | undefined) {
}, [config]); }, [config]);
} }
function use24HourTime(config: FrigateConfig | undefined) { export function use24HourTime(config: FrigateConfig | undefined) {
const localeUses24HourTime = useMemo( const localeUses24HourTime = useMemo(
() => () =>
new Intl.DateTimeFormat(undefined, { new Intl.DateTimeFormat(undefined, {
@ -60,8 +69,8 @@ function use24HourTime(config: FrigateConfig | undefined) {
return false; return false;
} }
if (config.ui.time_format != "browser") { if (config.ui.time_format !== "browser") {
return config.ui.time_format == "24hour"; return config.ui.time_format === "24hour";
} }
return localeUses24HourTime; return localeUses24HourTime;