habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web/common: utils: fix infinite value handling in getRelativeTime function (#13564)

Browse Source 
Squash sdko/closes-13562
This commit is contained in:
Dominic R
2025-04-01 09:46:29 -04:00
committed by GitHub
parent 4c9691c932
commit bfa6328172
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
web/src/common/utils.ts
View File

@ -157,23 +157,26 @@ export function adaptCSS(sheet: AdaptableStylesheet | AdaptableStylesheet[]): Ad
return Array.isArray(sheet) ? sheet.map(_adaptCSS) : _adaptCSS(sheet); return Array.isArray(sheet) ? sheet.map(_adaptCSS) : _adaptCSS(sheet);
} }
const _timeUnits = new Map<Intl.RelativeTimeFormatUnit, number>([
["year", 24 * 60 * 60 * 1000 * 365],
["month", (24 * 60 * 60 * 1000 * 365) / 12],
["day", 24 * 60 * 60 * 1000],
["hour", 60 * 60 * 1000],
["minute", 60 * 1000],
["second", 1000],
]);
export function getRelativeTime(d1: Date, d2: Date = new Date()): string { export function getRelativeTime(d1: Date, d2: Date = new Date()): string {
const rtf = new Intl.RelativeTimeFormat("default", { numeric: "auto" });
const elapsed = d1.getTime() - d2.getTime(); const elapsed = d1.getTime() - d2.getTime();
const rtf = new Intl.RelativeTimeFormat("default", { numeric: "auto" });
const _timeUnits: [Intl.RelativeTimeFormatUnit, number][] = [
["year", 1000 * 60 * 60 * 24 * 365],
["month", (24 * 60 * 60 * 1000 * 365) / 12],
["day", 1000 * 60 * 60 * 24],
["hour", 1000 * 60 * 60],
["minute", 1000 * 60],
["second", 1000],
];
// "Math.abs" accounts for both "past" & "future" scenarios
for (const [key, value] of _timeUnits) { for (const [key, value] of _timeUnits) {
if (Math.abs(elapsed) > value || key == "second") { if (Math.abs(elapsed) > value || key === "second") {
return rtf.format(Math.round(elapsed / value), key); let rounded = Math.round(elapsed / value);
if (!isFinite(rounded)) {
rounded = 0;
}
return rtf.format(rounded, key);
} }
} }
return rtf.format(Math.round(elapsed / 1000), "second"); return rtf.format(Math.round(elapsed / 1000), "second");