mirror of
https://github.com/supabase/supabase.git
synced 2026-09-09 19:42:46 +08:00
c0e109f662
Second of a stack. **Stacked on #49069** — review that one first; this PR's diff only makes sense on top of it. Base will retarget to `master` automatically when #49069 merges. Net `-72` lines. No behavior change beyond the one noted at the bottom. ## The problem The query-source registry carried its own `LogTimeRange` type and `logTimeRangeSchema`, which had drifted from the notebook wire schema's copy in four ways: | | wire schema | registry | |---|---|---| | discriminant | `_tag: 'relative_time_range'` | `type: 'relative'` | | absolute bounds | `start` / `end` | `from` / `to` | | relative units | minute…year | minute, hour, day | | validation | none | positive int, end-after-start | Two definitions of one concept, neither convertible to the other without a lossy mapping — and the notebook query cell was papering over it by discarding a log cell's persisted range and substituting a default. ## What changed #49069 moved the validations onto the wire schema's `timeRangeSchema` and exported it. This PR deletes the registry's copy and points every consumer at `TimeRange`. The registry keeps what is genuinely runtime: endpoints, labels, availability, defaults. The field renames ripple mechanically through the logs date-picker helpers, the time-range submenu, `useLogsCustomRange`, the SQL editor's session state, and their tests. Coverage for the absolute-range and unit rules moved to `notebook-schema.test.ts` in #49069, alongside the schema that now owns them. `ExplorerQuerySourceMenu` also drops its hand-rolled custom-range construction in favor of `customDateRangeToLogTimeRange`, which already existed and does the same clamping. ## One behavior change `logTimeRangeToDatePickerValue` now renders a range whose unit has no picker preset (week, month, year — allowed by the wire schema, not offered in the UI) as a resolved absolute range, instead of trying and failing to build a helper for it. Previously unreachable, since the registry's narrower unit set made those ranges unrepresentable. ## Verification Typecheck, Prettier, and the lint ratchet clean. 401 tests pass across the notebook schema, query sources, the logs source components, the SQL editor, and the Explorer surfaces. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Improved log time-range handling across Explorer and SQL Editor. * Custom date ranges now display and resolve correctly, including clamping invalid ranges. * Unsupported relative time units are converted to compatible absolute date-picker values. * **Refactor** * Standardized log queries on a shared time-range format for more consistent validation and behavior. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
74 lines
2.6 KiB
TypeScript
74 lines
2.6 KiB
TypeScript
import { screen, waitFor } from '@testing-library/react'
|
|
import userEvent from '@testing-library/user-event'
|
|
import { mockAnimationsApi } from 'jsdom-testing-mocks'
|
|
import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from 'ui'
|
|
import { describe, expect, it, vi, type Mock } from 'vitest'
|
|
|
|
import { LogsTimeRangeSubMenu } from './LogsTimeRangeSubMenu'
|
|
import { type TimeRange } from '@/data/content/notebooks/notebook-schema'
|
|
import { customRender } from '@/tests/lib/custom-render'
|
|
|
|
mockAnimationsApi()
|
|
|
|
vi.mock('@/hooks/misc/useCheckEntitlements', () => ({
|
|
useCheckEntitlements: () => ({ getEntitlementNumericValue: () => 1 }),
|
|
}))
|
|
|
|
const renderSubMenu = ({
|
|
onRangeChange = vi.fn<(range: TimeRange) => void>(),
|
|
onOpenCustomRange = vi.fn<() => void>(),
|
|
onShowUpgrade = vi.fn<() => void>(),
|
|
range = { _tag: 'relative_time_range', amount: 1, unit: 'hour' } as TimeRange,
|
|
}: {
|
|
onRangeChange?: Mock<(range: TimeRange) => void>
|
|
onOpenCustomRange?: Mock<() => void>
|
|
onShowUpgrade?: Mock<() => void>
|
|
range?: TimeRange
|
|
} = {}) => {
|
|
customRender(
|
|
<DropdownMenu defaultOpen>
|
|
<DropdownMenuTrigger>Open</DropdownMenuTrigger>
|
|
<DropdownMenuContent>
|
|
<LogsTimeRangeSubMenu
|
|
range={range}
|
|
onRangeChange={onRangeChange}
|
|
onOpenCustomRange={onOpenCustomRange}
|
|
onShowUpgrade={onShowUpgrade}
|
|
/>
|
|
</DropdownMenuContent>
|
|
</DropdownMenu>
|
|
)
|
|
|
|
return { onRangeChange, onOpenCustomRange, onShowUpgrade }
|
|
}
|
|
|
|
describe('LogsTimeRangeSubMenu', () => {
|
|
it('opens the upgrade prompt instead of applying a range beyond retention', async () => {
|
|
const { onRangeChange, onShowUpgrade } = renderSubMenu()
|
|
|
|
await userEvent.hover(await screen.findByText('Time range'))
|
|
await userEvent.click(await screen.findByText('Last 7 days'))
|
|
|
|
expect(onShowUpgrade).toHaveBeenCalledOnce()
|
|
expect(onRangeChange).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('exposes the custom-range action', async () => {
|
|
const { onOpenCustomRange } = renderSubMenu()
|
|
|
|
await userEvent.hover(await screen.findByText('Time range'))
|
|
await userEvent.click(await screen.findByText('Custom range…'))
|
|
|
|
expect(onOpenCustomRange).toHaveBeenCalledOnce()
|
|
})
|
|
|
|
it('marks the structurally matching preset as selected', async () => {
|
|
renderSubMenu({ range: { _tag: 'relative_time_range', amount: 3, unit: 'hour' } })
|
|
|
|
await userEvent.hover(await screen.findByText('Time range'))
|
|
|
|
await waitFor(() => expect(screen.getAllByText('Last 3 hours')).toHaveLength(2))
|
|
expect(document.querySelector('.lucide-check')).toBeInTheDocument()
|
|
})
|
|
})
|