mirror of
https://github.com/supabase/supabase.git
synced 2026-09-06 09:59:03 +08:00
0ed49231b7
Third of a stack. **Stacked on #49070** (which is stacked on #49069) — review those first. Base retargets automatically as each merges. Mechanical throughout; no behavior change. ## The problem Three types described where a query runs, and no two agreed: | | shape | |---|---| | `CellSource` (registry) | `{ id, type, parameters: { … } }` — `id` and `type` always held the same literal | | `QuerySource` (SQL editor) | `{ type: 'database' } \| { type: 'logs', dateRange }` | | notebook cells | flat per-backend fields, neither of the above | Anything crossing between them needed a translation that dropped fields on the way — which is how a notebook cell's replica selection had nowhere to go. ## What changed One `QuerySourceBinding`: a backend `_tag` with that backend's parameters spread flat beside it, borrowed from the wire schema (#49069) so the binding and the persisted cell agree by construction. - **`QuerySource` is deleted.** `useRunSource` returns the shared binding, so `runSource.type`/`dateRange` become `_tag`/`time_range` across the SQL editor — that is most of the file count here. - **`getQuerySourceBinding`** projects a notebook cell onto a binding; **`toQuerySourceBinding`** does the same for any backend-tagged carrier. Both overloaded so an already-narrowed caller gets the matching binding back rather than the union, which keeps the result spreadable without re-narrowing. - **`ExplorerQuerySourceMenu`** drops its inline copy of the custom-range and upgrade-prompt logic in favor of `useLogsCustomRange`, which the SQL editor menu already used. The registry keeps only what is genuinely runtime: endpoints, labels, icons, availability, defaults. What a query *is* stays in the wire schema. ## Verification Typecheck, Prettier, and the lint ratchet clean. 405 tests pass across the notebook schema, query sources, the logs components, the SQL editor, and the Explorer surfaces. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Improvements** * Updated query source handling across Explorer and SQL Editor for a more consistent selection experience. * Database and log sources now preserve identifiers and time ranges more reliably when switching or editing queries. * Source menus, labels, icons, validation, and query execution now reflect the selected source more accurately. * **Bug Fixes** * Invalid or outdated saved source settings now safely fall back to a database source. * Improved log-source detection and time-range handling throughout query editing and execution. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
74 lines
2.5 KiB
TypeScript
74 lines
2.5 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' },
|
|
}: {
|
|
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()
|
|
})
|
|
})
|