mirror of
https://github.com/supabase/supabase.git
synced 2026-09-06 09:59:03 +08:00
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>
87 lines
3.0 KiB
TypeScript
87 lines
3.0 KiB
TypeScript
import dayjs from 'dayjs'
|
|
import { Check, Lock } from 'lucide-react'
|
|
import {
|
|
DropdownMenuItem,
|
|
DropdownMenuSeparator,
|
|
DropdownMenuSub,
|
|
DropdownMenuSubContent,
|
|
DropdownMenuSubTrigger,
|
|
} from 'ui'
|
|
|
|
import { datePickerValueToLogTimeRange, logTimeRangesEqual } from './LogTimeRange.utils'
|
|
import { EXPLORER_DATEPICKER_HELPERS } from '@/components/interfaces/Settings/Logs/Logs.constants'
|
|
import { maybeShowUpgradePromptIfNotEntitled } from '@/components/interfaces/Settings/Logs/Logs.utils'
|
|
import type { TimeRange } from '@/data/content/notebooks/notebook-schema'
|
|
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
|
|
|
|
export const LogsTimeRangeSubMenu = ({
|
|
range,
|
|
onRangeChange,
|
|
onOpenCustomRange,
|
|
onShowUpgrade,
|
|
}: {
|
|
range: TimeRange
|
|
onRangeChange: (range: TimeRange) => void
|
|
onOpenCustomRange: () => void
|
|
onShowUpgrade: () => void
|
|
}) => {
|
|
const { getEntitlementNumericValue } = useCheckEntitlements('log.retention_days')
|
|
const entitledToLogDays = getEntitlementNumericValue()
|
|
|
|
const isCustomRange = range._tag === 'absolute_time_range'
|
|
const presets = EXPLORER_DATEPICKER_HELPERS.map((helper) => ({
|
|
helper,
|
|
range: datePickerValueToLogTimeRange({
|
|
from: helper.calcFrom(),
|
|
to: helper.calcTo(),
|
|
isHelper: true,
|
|
text: helper.text,
|
|
}),
|
|
}))
|
|
const selectedPreset = presets.find((preset) => logTimeRangesEqual(range, preset.range))
|
|
|
|
return (
|
|
<DropdownMenuSub>
|
|
<DropdownMenuSubTrigger>
|
|
<div className="flex flex-col">
|
|
<span>Time range</span>
|
|
<span className="text-foreground-lighter text-xs">
|
|
{isCustomRange
|
|
? `${dayjs(range.start).format('DD MMM, HH:mm')} - ${dayjs(range.end).format('DD MMM, HH:mm')}`
|
|
: (selectedPreset?.helper.text ?? 'Custom range')}
|
|
</span>
|
|
</div>
|
|
</DropdownMenuSubTrigger>
|
|
<DropdownMenuSubContent className="w-52">
|
|
{presets.map(({ helper, range: presetRange }) => {
|
|
const isSelected = !isCustomRange && logTimeRangesEqual(range, presetRange)
|
|
const isLocked = maybeShowUpgradePromptIfNotEntitled(helper.calcFrom(), entitledToLogDays)
|
|
|
|
return (
|
|
<DropdownMenuItem
|
|
key={helper.text}
|
|
className="justify-between"
|
|
onClick={() => {
|
|
if (isLocked) return onShowUpgrade()
|
|
onRangeChange(presetRange)
|
|
}}
|
|
>
|
|
<span>{helper.text}</span>
|
|
{isLocked ? (
|
|
<Lock size={14} className="text-foreground-lighter" />
|
|
) : (
|
|
isSelected && <Check size={14} />
|
|
)}
|
|
</DropdownMenuItem>
|
|
)
|
|
})}
|
|
<DropdownMenuSeparator />
|
|
<DropdownMenuItem className="justify-between" onClick={onOpenCustomRange}>
|
|
<span>Custom range…</span>
|
|
{isCustomRange && <Check size={14} />}
|
|
</DropdownMenuItem>
|
|
</DropdownMenuSubContent>
|
|
</DropdownMenuSub>
|
|
)
|
|
}
|