Skip to content

fix(gui): guard quota reset date formatting #2405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
luvs01 wants to merge 1 commit into
base: dev
Choose a base branch
from
+15 −5
Draft

fix(gui): guard quota reset date formatting #2405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions gui/src/components/QuotaBars.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,19 @@ function StackedQuotaRow({ row, threshold, t, locale, incomplete }: {
);
}

function formatResetAt(resetAt: number | undefined, t: TFn, locale: Locale): { day: string; time: string } {
if (typeof resetAt !== "number" || !Number.isFinite(resetAt)) return { day: "", time: "" };
/** Normalize seconds-or-milliseconds epochs and reject values outside JavaScript Date's range. */
function resetDate(resetAt: number | undefined): { date: Date; ms: number } | null {
if (typeof resetAt !== "number" || !Number.isFinite(resetAt)) return null;
const ms = resetAt < 10_000_000_000 ? resetAt * 1000 : resetAt;
const date = new Date(ms);
if (!Number.isFinite(date.getTime())) return null;
return { date, ms };
}

function formatResetAt(resetAt: number | undefined, t: TFn, locale: Locale): { day: string; time: string } {
const normalized = resetDate(resetAt);
if (!normalized) return { day: "", time: "" };
const { date } = normalized;
const now = new Date();
const tag = bcp47(locale);
const time = new Intl.DateTimeFormat(tag, { hour: "2-digit", minute: "2-digit", hour12: false }).format(date);
Expand All @@ -371,9 +380,9 @@ export function formatResetFuture(
locale: Locale = "en",
now = Date.now(),
): string {
if (typeof resetAt !== "number" || !Number.isFinite(resetAt)) return "";
const ms = resetAt < 10_000_000_000 ? resetAt * 1000 : resetAt;
const date = new Date(ms);
const normalized = resetDate(resetAt);
if (!normalized) return "";
const { date, ms } = normalized;
const tag = bcp47(locale);
const time = new Intl.DateTimeFormat(tag, { hour: "2-digit", minute: "2-digit", hour12: false }).format(date);
const nowDate = new Date(now);
Expand Down
1 change: 1 addition & 0 deletions tests/quota-bars-rows.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ describe("formatResetFuture", () => {
expect(formatResetFuture(NOW - 86_400_000, t, "en", NOW)).toContain("quota.resetsAt");
expect(formatResetFuture(undefined, t, "en", NOW)).toBe("");
expect(formatResetFuture(Number.NaN, t, "en", NOW)).toBe("");
expect(formatResetFuture(Number.MAX_VALUE, t, "en", NOW)).toBe("");
});

test("seconds-epoch inputs are normalized to milliseconds", () => {
Expand Down
Loading