mirror of
https://github.com/supabase/supabase.git
synced 2026-10-18 15:49:09 +03:00
## Summary - define application-owned database and logs source contracts, defaults, validation, labels, and execution endpoints - extract controlled database and logs parameter controls for reuse outside SQL snippets - adapt the SQL editor to the shared source model without changing snippet behavior - standardize source icons at 16px with a 2px stroke - keep relative logs ranges aligned with the existing date picker units ## To test 1. Open an existing query in the SQL Editor and run it against the database. 2. Switch the query source to Logs, change the time range, and confirm the query still runs as expected. ## Why Explorer queries and notebook query cells need to select an execution source without coupling that source to SQL snippets. This provides the shared registry and controlled UI foundation for those consumers. ## Impact Existing SQL snippets retain their current database/logs routing and session behavior. The registry documents the SQL editor legacy database-selector adapter while new consumers own their identifier inline. The shared Logs date picker remains unchanged; query ranges support its existing minute, hour, and day units. This PR does not add the Explorer query tab itself. ## Validation - pnpm --filter studio typecheck - focused Vitest coverage for the registry, canonical log-range utilities, SQL execution adapters, source filtering, retention locking, custom ranges, and preset selection - pnpm --filter studio run lint:ratchet Component and state tests cover this change per the Studio testing guidance; no E2E test is added. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added a unified query-source menu for database queries and logs. * Added custom log time-range selection with calendar support and retention-aware upgrade prompts. * Added consistent source icons and improved database selection handling. * Added support for relative and absolute log time ranges. * **Bug Fixes** * Improved log-range validation, defaults, and current-time handling. * Updated query execution to use the correct source-specific endpoints. * **Tests** * Expanded coverage for query sources, log ranges, menus, and retention behavior. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
153 lines
4.0 KiB
TypeScript
153 lines
4.0 KiB
TypeScript
import dayjs from 'dayjs'
|
|
import * as z from 'zod'
|
|
|
|
import { logsAllEndpointUrl } from '@/data/logs/logs-endpoint'
|
|
import { isoDateTimeString } from '@/lib/iso-datetime'
|
|
|
|
export type LogTimeRange =
|
|
| {
|
|
type: 'relative'
|
|
amount: number
|
|
unit: 'minute' | 'hour' | 'day'
|
|
}
|
|
| {
|
|
type: 'absolute'
|
|
from: string
|
|
to: string
|
|
}
|
|
|
|
export type DatabaseSource = {
|
|
id: 'database'
|
|
type: 'database'
|
|
endpoint: '/platform/pg-meta/{ref}/query'
|
|
parameters: {
|
|
/**
|
|
* Query-owned database selection. The SQL editor still adapts its legacy
|
|
* global/local-storage selector into this shape; new consumers persist the
|
|
* identifier directly with their query.
|
|
*/
|
|
identifier?: string
|
|
}
|
|
}
|
|
|
|
export type LogsSource = {
|
|
id: 'logs'
|
|
type: 'logs'
|
|
endpoint: ReturnType<typeof logsAllEndpointUrl>
|
|
parameters: {
|
|
time_range: LogTimeRange
|
|
}
|
|
}
|
|
|
|
/** Sources are registered by Studio; query surfaces only store a source binding. */
|
|
export type Source = DatabaseSource | LogsSource
|
|
|
|
export type CellSourceOf<S extends Source> = Pick<S, 'type' | 'id' | 'parameters'>
|
|
|
|
export type CellSource = CellSourceOf<DatabaseSource> | CellSourceOf<LogsSource>
|
|
|
|
export const DEFAULT_LOG_TIME_RANGE: LogTimeRange = {
|
|
type: 'relative',
|
|
amount: 1,
|
|
unit: 'hour',
|
|
}
|
|
|
|
export const QUERY_SOURCE_REGISTRY = {
|
|
database: {
|
|
id: 'database',
|
|
type: 'database',
|
|
endpoint: '/platform/pg-meta/{ref}/query',
|
|
parameters: {},
|
|
},
|
|
logs: {
|
|
id: 'logs',
|
|
type: 'logs',
|
|
endpoint: logsAllEndpointUrl(true),
|
|
parameters: { time_range: DEFAULT_LOG_TIME_RANGE },
|
|
},
|
|
} as const satisfies Record<Source['id'], Source>
|
|
|
|
export type QuerySourceId = keyof typeof QUERY_SOURCE_REGISTRY
|
|
|
|
export const QUERY_SOURCES = Object.values(QUERY_SOURCE_REGISTRY) satisfies Source[]
|
|
|
|
export const QUERY_SOURCE_LABELS: Record<QuerySourceId, string> = {
|
|
database: 'Database',
|
|
logs: 'Logs',
|
|
}
|
|
|
|
const isoDateTimeSchema = z.string().refine((value) => isoDateTimeString(value) !== null, {
|
|
message: 'must be a valid ISO-8601 datetime',
|
|
})
|
|
|
|
export const logTimeRangeSchema = z
|
|
.discriminatedUnion('type', [
|
|
z
|
|
.object({
|
|
type: z.literal('relative'),
|
|
amount: z.number().int().positive(),
|
|
unit: z.enum(['minute', 'hour', 'day']),
|
|
})
|
|
.strict(),
|
|
z
|
|
.object({
|
|
type: z.literal('absolute'),
|
|
from: isoDateTimeSchema,
|
|
to: isoDateTimeSchema,
|
|
})
|
|
.strict(),
|
|
])
|
|
.refine(
|
|
(range) => {
|
|
if (range.type !== 'absolute') return true
|
|
|
|
const from = dayjs(range.from)
|
|
const to = dayjs(range.to)
|
|
// An unparseable endpoint is already reported against its own field; the
|
|
// ordering rule stays quiet so it doesn't add a second, misleading issue.
|
|
if (!from.isValid() || !to.isValid()) return true
|
|
|
|
return to.isAfter(from)
|
|
},
|
|
{
|
|
message: 'must be later than the start of the range',
|
|
path: ['to'],
|
|
}
|
|
)
|
|
|
|
export const cellSourceSchema = z.discriminatedUnion('type', [
|
|
z
|
|
.object({
|
|
id: z.literal('database'),
|
|
type: z.literal('database'),
|
|
parameters: z.object({ identifier: z.string().optional() }).strict(),
|
|
})
|
|
.strict(),
|
|
z
|
|
.object({
|
|
id: z.literal('logs'),
|
|
type: z.literal('logs'),
|
|
parameters: z.object({ time_range: logTimeRangeSchema }).strict(),
|
|
})
|
|
.strict(),
|
|
])
|
|
|
|
export function createDefaultCellSource(id: 'database'): CellSourceOf<DatabaseSource>
|
|
export function createDefaultCellSource(id: 'logs'): CellSourceOf<LogsSource>
|
|
export function createDefaultCellSource(id: QuerySourceId): CellSource
|
|
export function createDefaultCellSource(id: QuerySourceId): CellSource {
|
|
const source = QUERY_SOURCE_REGISTRY[id]
|
|
|
|
if (source.type === 'logs') {
|
|
return {
|
|
id: source.id,
|
|
type: source.type,
|
|
parameters: { time_range: { ...source.parameters.time_range } },
|
|
}
|
|
}
|
|
|
|
return { id: source.id, type: source.type, parameters: { ...source.parameters } }
|
|
}
|
|
|
|
export const getQuerySource = (id: QuerySourceId): Source => QUERY_SOURCE_REGISTRY[id]
|