mirror of
https://github.com/supabase/supabase.git
synced 2026-09-06 18:11:51 +08:00
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>
279 lines
9.5 KiB
TypeScript
279 lines
9.5 KiB
TypeScript
import { type UntrustedSqlFragment } from '@supabase/pg-meta'
|
|
import { useParams } from 'common'
|
|
import {
|
|
createContext,
|
|
use,
|
|
useCallback,
|
|
useEffect,
|
|
useEffectEvent,
|
|
useMemo,
|
|
useState,
|
|
type Context,
|
|
type Dispatch,
|
|
type PropsWithChildren,
|
|
type SetStateAction,
|
|
} from 'react'
|
|
|
|
import { useSqlEditorDiff, useSqlEditorPrompt } from './hooks'
|
|
import type { UtilityTab } from './SQLEditor.types'
|
|
import { useSQLEditorContext } from './SQLEditorContext'
|
|
import { useAddDefinitions } from './useAddDefinitions'
|
|
import { useEditorMount } from './useEditorMount'
|
|
import { useLogsSqlExecution } from './useLogsSqlExecution'
|
|
import { usePrettifyQuery } from './usePrettifyQuery'
|
|
import { useRunSource } from './useRunSource'
|
|
import { useSnippetIdentity } from './useSnippetIdentity'
|
|
import { useSnippetTitleGenerator } from './useSnippetTitleGenerator'
|
|
import { useSqlEditorAi } from './useSqlEditorAi'
|
|
import { useSqlEditorExecution } from './useSqlEditorExecution'
|
|
import { useSqlEditorShortcuts } from './useSqlEditorShortcuts'
|
|
import { isValidConnString } from '@/data/fetchers'
|
|
import {
|
|
untrustedLogSql,
|
|
type SafeLogSqlFragment,
|
|
type UntrustedLogSqlFragment,
|
|
} from '@/data/logs/safe-analytics-sql'
|
|
import { type QuerySourceBinding } from '@/data/query-sources/query-source-registry'
|
|
import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'
|
|
import {
|
|
getSqlEditorV2StateSnapshot,
|
|
useSqlEditorV2StateSnapshot,
|
|
} from '@/state/sql-editor/sql-editor-state'
|
|
import { createTabId, useTabsStateSnapshot } from '@/state/tabs'
|
|
|
|
/**
|
|
* Reactive SQL-editor controllers, distributed via a handful of focused
|
|
* contexts so the visual tree consumes exactly the slice it needs instead of
|
|
* prop-drilling whole hook bundles. The stable Monaco refs + imperative helpers
|
|
* live in `SQLEditorContext`; this provider owns everything that changes with
|
|
* state.
|
|
*
|
|
* SQL that a user runs is NOT promoted to safety here — the provider only
|
|
* exposes the already-safe `executeQuery` pipeline plus
|
|
* `readEditorSql` (which returns an `UntrustedSqlFragment`). Each user-action
|
|
* site (the toolbar/editor/results components and the shortcut handlers)
|
|
* promotes with `acceptUntrustedSql` right where the user acts, so the promotion
|
|
* is auditable.
|
|
*/
|
|
|
|
type SnippetContextValue = {
|
|
id: string
|
|
snippetName: string
|
|
isLoading: boolean
|
|
}
|
|
|
|
type AssistantContextValue = {
|
|
diff: ReturnType<typeof useSqlEditorDiff>
|
|
prompt: ReturnType<typeof useSqlEditorPrompt>
|
|
ai: ReturnType<typeof useSqlEditorAi>
|
|
}
|
|
|
|
type SqlEditorExecution = ReturnType<typeof useSqlEditorExecution>
|
|
type SqlEditorMount = ReturnType<typeof useEditorMount>
|
|
|
|
/** Running SQL: the safe execute pipeline, its status, and formatting. */
|
|
type RunContextValue = {
|
|
executeQuery: SqlEditorExecution['executeQuery']
|
|
readEditorSql: () => UntrustedSqlFragment | undefined
|
|
isExecuting: boolean
|
|
potentialIssues: SqlEditorExecution['potentialIssues']
|
|
resetPotentialIssues: () => void
|
|
prettifyQuery: () => void
|
|
runSource: QuerySourceBinding
|
|
executeLogsQuery: (sql: SafeLogSqlFragment) => void
|
|
readEditorLogsSql: () => UntrustedLogSqlFragment | undefined
|
|
}
|
|
|
|
/** Editor-surface UI state: selection, the active results tab, and mount. */
|
|
type UiContextValue = {
|
|
hasSelection: boolean
|
|
setHasSelection: Dispatch<SetStateAction<boolean>>
|
|
activeUtilityTab: UtilityTab
|
|
setActiveUtilityTab: Dispatch<SetStateAction<UtilityTab>>
|
|
onMount: SqlEditorMount['onMount']
|
|
}
|
|
|
|
const SnippetContext = createContext<SnippetContextValue | null>(null)
|
|
const AssistantContext = createContext<AssistantContextValue | null>(null)
|
|
const RunContext = createContext<RunContextValue | null>(null)
|
|
const UiContext = createContext<UiContextValue | null>(null)
|
|
|
|
function useGuardedContext<T>(context: Context<T | null>, hookName: string): T {
|
|
const value = use(context)
|
|
if (!value) {
|
|
throw new Error(`${hookName} must be used within a SQLEditorControllersProvider`)
|
|
}
|
|
return value
|
|
}
|
|
|
|
/** Snippet identity + display name for the current tab. */
|
|
export const useSqlEditorSnippet = () => useGuardedContext(SnippetContext, 'useSqlEditorSnippet')
|
|
|
|
/** The Assistant / diff cluster controllers (diff, prompt, ai). */
|
|
export const useSqlEditorAssistant = () =>
|
|
useGuardedContext(AssistantContext, 'useSqlEditorAssistant')
|
|
|
|
/** Run execution, warnings, and query formatting. */
|
|
export const useSqlEditorRun = () => useGuardedContext(RunContext, 'useSqlEditorRun')
|
|
|
|
/** Editor-surface UI state (selection, active results tab, editor mount). */
|
|
export const useSqlEditorUi = () => useGuardedContext(UiContext, 'useSqlEditorUi')
|
|
|
|
export const SQLEditorControllersProvider = ({ children }: PropsWithChildren) => {
|
|
const { monacoRef, scrollTopRef, editor } = useSQLEditorContext()
|
|
|
|
const { ref } = useParams()
|
|
const { data: project } = useSelectedProjectQuery()
|
|
|
|
const tabs = useTabsStateSnapshot()
|
|
const snapV2 = useSqlEditorV2StateSnapshot()
|
|
const { setSelectedDatabaseId } = useDatabaseSelectorStateSnapshot()
|
|
|
|
const diff = useSqlEditorDiff()
|
|
const { isDiffOpen } = diff
|
|
const prompt = useSqlEditorPrompt()
|
|
const { promptState, resetPrompt } = prompt
|
|
|
|
const [hasSelection, setHasSelection] = useState<boolean>(false)
|
|
const [activeUtilityTab, setActiveUtilityTab] = useState<UtilityTab>('results')
|
|
|
|
const { id, urlId, generatedNewSnippetName, isLoading } = useSnippetIdentity()
|
|
const { onMount, editorMountCount } = useEditorMount({ id })
|
|
|
|
const runSource = useRunSource(id)
|
|
|
|
useAddDefinitions(id, monacoRef.current, { enabled: runSource._tag !== 'logs' })
|
|
|
|
const { data: databases, isSuccess: isSuccessReadReplicas } = useReadReplicasQuery(
|
|
{
|
|
projectRef: ref,
|
|
},
|
|
{ enabled: isValidConnString(project?.connectionString) }
|
|
)
|
|
|
|
const { setAiTitle } = useSnippetTitleGenerator()
|
|
|
|
const prettifyQuery = usePrettifyQuery({ id, isDiffOpen })
|
|
|
|
// Reads the SQL to run from the editor as an UntrustedSqlFragment. Promotion
|
|
// to safety (acceptUntrustedSql) happens at each user-action site, never here.
|
|
const readEditorSql = useCallback((): UntrustedSqlFragment | undefined => {
|
|
const snippet = getSqlEditorV2StateSnapshot().snippets[id]?.snippet
|
|
const fallback = snippet?.type === 'log_sql' ? undefined : snippet?.content?.unchecked_sql
|
|
return editor.getSql(fallback)
|
|
}, [editor, id])
|
|
|
|
// Reads the SQL to run from the editor as an UntrustedLogSqlFragment — the logs
|
|
// sibling of readEditorSql. Promotion (acceptUntrustedLogsSql) happens at each
|
|
// user-action site, never here.
|
|
const readEditorLogsSql = useCallback((): UntrustedLogSqlFragment | undefined => {
|
|
const snippet = getSqlEditorV2StateSnapshot().snippets[id]?.snippet
|
|
const fallback = snippet?.type === 'log_sql' ? snippet.content?.unchecked_sql : undefined
|
|
const sql = editor.getSql(fallback)
|
|
return sql === undefined ? undefined : untrustedLogSql(sql)
|
|
}, [editor, id])
|
|
|
|
const {
|
|
executeQuery,
|
|
isExecuting: isExecutingDb,
|
|
potentialIssues,
|
|
resetPotentialIssues,
|
|
} = useSqlEditorExecution({
|
|
id,
|
|
isDiffOpen,
|
|
hasSelection,
|
|
setAiTitle,
|
|
})
|
|
|
|
const { executeLogsQuery, isExecuting: isExecutingLogs } = useLogsSqlExecution({ id })
|
|
|
|
const isExecuting = isExecutingDb || isExecutingLogs
|
|
|
|
const ai = useSqlEditorAi({ id, editorMountCount, diff, prompt, sqlSource: runSource._tag })
|
|
const { acceptAiHandler, discardAiHandler } = ai
|
|
|
|
useSqlEditorShortcuts({
|
|
isDiffOpen,
|
|
isPromptOpen: promptState.isOpen,
|
|
prettifyQuery,
|
|
acceptAiHandler,
|
|
discardAiHandler,
|
|
resetPrompt,
|
|
})
|
|
|
|
const saveScrollPosition = useEffectEvent((snippetId: string) => {
|
|
if (ref) {
|
|
const tabId = createTabId('sql', { id: snippetId })
|
|
tabs.updateTab(tabId, { scrollTop: scrollTopRef.current })
|
|
}
|
|
})
|
|
useEffect(() => {
|
|
// Save the departing snippet's scroll position on unmount / snippet switch.
|
|
return () => saveScrollPosition(id)
|
|
}, [id])
|
|
|
|
useEffect(() => {
|
|
if (isSuccessReadReplicas) {
|
|
const primaryDatabase = databases.find((db) => db.identifier === ref)
|
|
setSelectedDatabaseId(primaryDatabase?.identifier)
|
|
}
|
|
}, [isSuccessReadReplicas, databases, ref, setSelectedDatabaseId])
|
|
|
|
const snippetName =
|
|
urlId === 'new'
|
|
? generatedNewSnippetName
|
|
: (snapV2.snippets[id]?.snippet.name ?? generatedNewSnippetName)
|
|
|
|
const snippetValue = useMemo<SnippetContextValue>(
|
|
() => ({ id, snippetName, isLoading }),
|
|
[id, snippetName, isLoading]
|
|
)
|
|
|
|
const assistantValue = useMemo<AssistantContextValue>(
|
|
() => ({ diff, prompt, ai }),
|
|
[diff, prompt, ai]
|
|
)
|
|
|
|
const runValue = useMemo<RunContextValue>(
|
|
() => ({
|
|
executeQuery,
|
|
readEditorSql,
|
|
isExecuting,
|
|
potentialIssues,
|
|
resetPotentialIssues,
|
|
prettifyQuery,
|
|
runSource,
|
|
executeLogsQuery,
|
|
readEditorLogsSql,
|
|
}),
|
|
[
|
|
executeQuery,
|
|
readEditorSql,
|
|
isExecuting,
|
|
potentialIssues,
|
|
resetPotentialIssues,
|
|
prettifyQuery,
|
|
runSource,
|
|
executeLogsQuery,
|
|
readEditorLogsSql,
|
|
]
|
|
)
|
|
|
|
const uiValue = useMemo<UiContextValue>(
|
|
() => ({ hasSelection, setHasSelection, activeUtilityTab, setActiveUtilityTab, onMount }),
|
|
[hasSelection, activeUtilityTab, onMount]
|
|
)
|
|
|
|
return (
|
|
<SnippetContext.Provider value={snippetValue}>
|
|
<AssistantContext.Provider value={assistantValue}>
|
|
<RunContext.Provider value={runValue}>
|
|
<UiContext.Provider value={uiValue}>{children}</UiContext.Provider>
|
|
</RunContext.Provider>
|
|
</AssistantContext.Provider>
|
|
</SnippetContext.Provider>
|
|
)
|
|
}
|