From c005c59186d0e44b4315a6de37e1fa2ec5d3f022 Mon Sep 17 00:00:00 2001 From: Isaac Sanchez-Hawkins <266845420+isanchez404@users.noreply.github.com> Date: Wed, 13 May 2026 03:30:42 -0400 Subject: [PATCH] fix(quota): accept epoch reset timestamps (#1241) * fix(quota): accept epoch reset timestamps * fix(quota): format epoch reset windows --------- Co-authored-by: Isaac Sanchez --- .../web/server/lib/quota/utils/formatters.js | 6 ++++-- .../server/lib/quota/utils/formatters.test.js | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/packages/web/server/lib/quota/utils/formatters.js b/packages/web/server/lib/quota/utils/formatters.js index a5326394..7cf85c2a 100644 --- a/packages/web/server/lib/quota/utils/formatters.js +++ b/packages/web/server/lib/quota/utils/formatters.js @@ -27,8 +27,10 @@ export const formatResetTime = (timestamp) => { } }; +const hasResetTimestamp = (resetAt) => resetAt !== null && resetAt !== undefined && resetAt !== ''; + export const calculateResetAfterSeconds = (resetAt) => { - if (!resetAt) return null; + if (!hasResetTimestamp(resetAt)) return null; const resetAtTime = new Date(resetAt).getTime(); if (!Number.isFinite(resetAtTime)) return null; const delta = Math.floor((resetAtTime - Date.now()) / 1000); @@ -37,7 +39,7 @@ export const calculateResetAfterSeconds = (resetAt) => { export const toUsageWindow = ({ usedPercent, windowSeconds, resetAt, valueLabel }) => { const resetAfterSeconds = calculateResetAfterSeconds(resetAt); - const resetFormatted = resetAt ? formatResetTime(resetAt) : null; + const resetFormatted = hasResetTimestamp(resetAt) ? formatResetTime(resetAt) : null; return { usedPercent, remainingPercent: usedPercent !== null ? Math.max(0, 100 - usedPercent) : null, diff --git a/packages/web/server/lib/quota/utils/formatters.test.js b/packages/web/server/lib/quota/utils/formatters.test.js index 9965d383..38a7700e 100644 --- a/packages/web/server/lib/quota/utils/formatters.test.js +++ b/packages/web/server/lib/quota/utils/formatters.test.js @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { calculateResetAfterSeconds, formatResetTime } from './formatters.js'; +import { calculateResetAfterSeconds, formatResetTime, toUsageWindow } from './formatters.js'; describe('formatResetTime', () => { it('returns null for invalid timestamps', () => { @@ -12,6 +12,10 @@ describe('formatResetTime', () => { }); describe('calculateResetAfterSeconds', () => { + it('accepts an epoch reset timestamp', () => { + expect(calculateResetAfterSeconds(0)).toBe(0); + }); + it('returns null for invalid timestamps', () => { expect(calculateResetAfterSeconds('not-a-date')).toBeNull(); expect(calculateResetAfterSeconds(NaN)).toBeNull(); @@ -19,3 +23,13 @@ describe('calculateResetAfterSeconds', () => { expect(calculateResetAfterSeconds(-Infinity)).toBeNull(); }); }); + +describe('toUsageWindow', () => { + it('formats epoch reset timestamps', () => { + const usageWindow = toUsageWindow({ resetAt: 0 }); + + expect(usageWindow.resetAfterSeconds).toBe(0); + expect(usageWindow.resetAtFormatted).toBe(formatResetTime(0)); + expect(usageWindow.resetAfterFormatted).toBe(formatResetTime(0)); + }); +});