Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(studio): reject custom log time ranges outside the Date range (#50539)

Ali Waseemd72a29852c75
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx b/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
index f5b2ab65bfe..90183fca92e 100644
--- a/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
@@ -343,6 +343,11 @@ export const LogsDatePicker = ({
) : null}
</Label>
))}
+ {displayedHelpers.length === 0 && (
+ <p className="px-2 py-1.5 text-xs text-foreground-light w-full">
+ Invalid format. Try 2h, 30m, or 7d.
+ </p>
+ )}
</RadioGroup>
</div>
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.datePickerHelpers.ts b/apps/studio/components/interfaces/Settings/Logs/Logs.datePickerHelpers.ts
index 422a2f04033..76271b2eb50 100644
--- a/apps/studio/components/interfaces/Settings/Logs/Logs.datePickerHelpers.ts
+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.datePickerHelpers.ts
@@ -29,9 +29,8 @@ export const parseCustomInput = (input: string): ParsedCustomInput => {
const [, numStr, unitStr] = match
const value = Number.parseInt(numStr, 10)
- // Only finite positive values may reach generateDynamicHelper(): Number.isFinite
- // rejects NaN and Infinity outright, and the <= 0 guard keeps out non-positive.
- if (!Number.isFinite(value) || value <= 0) return { type: 'invalid' }
+ const exceedsDateRange = !dayjs().subtract(value, 'day').isValid()
+ if (!Number.isFinite(value) || value <= 0 || exceedsDateRange) return { type: 'invalid' }
if (!unitStr) {
return { type: 'number', value }
diff --git a/apps/studio/tests/features/logs/Logs.Datepickers.test.tsx b/apps/studio/tests/features/logs/Logs.Datepickers.test.tsx
index c9bff95574f..639961eb08e 100644
--- a/apps/studio/tests/features/logs/Logs.Datepickers.test.tsx
+++ b/apps/studio/tests/features/logs/Logs.Datepickers.test.tsx
@@ -67,6 +67,12 @@ describe('parseCustomInput', () => {
expect(parseCustomInput('0')).toEqual({ type: 'invalid' })
expect(parseCustomInput('-5')).toEqual({ type: 'invalid' })
})
+
+ test('returns invalid for amounts that fall outside the representable date range', () => {
+ expect(parseCustomInput('999999999')).toEqual({ type: 'invalid' })
+ expect(parseCustomInput('999999999d')).toEqual({ type: 'invalid' })
+ expect(parseCustomInput('99999999')).toEqual({ type: 'number', value: 99999999 })
+ })
})
describe('generateDynamicHelper', () => {
@@ -125,6 +131,16 @@ describe('generateHelpersFromInput', () => {
expect(helpers).toHaveLength(1)
expect(helpers![0].text).toBe('Last 2 hours')
})
+
+ test('never returns a helper whose calcFrom throws', () => {
+ expect(generateHelpersFromInput('999999999')).toBeNull()
+
+ const helpers = generateHelpersFromInput('99999999')
+ expect(helpers).not.toBeNull()
+ for (const helper of helpers!) {
+ expect(() => helper.calcFrom()).not.toThrow()
+ }
+ })
})
const mockFn = vi.fn()