## What Decompose step **5 of 6** for `SQLEditor.tsx`. Extracts the Assistant / diff cluster and the keyboard-shortcut wiring out of the `SQLEditorContent` monolith into two focused, individually-testable hooks: - **`useSqlEditorAi`** — SQL completion (`complete`), the ask-AI prompt flow (`handlePrompt`), accept/discard diff handlers, `onDebug` / `buildDebugPrompt` helpers, `handleDiffEditorMount`, and the fragile diff lifecycle effects (one-shot diff-request drain, diff-editor value sync, ask-AI widget visibility). - **`useSqlEditorShortcuts`** — the registered shortcuts (focus editor, new snippet, format, explain) plus the accept/discard/escape keydown handling. `SQLEditorContent` now composes these hooks alongside the execution/explain hooks landed in decompose 4. ## Behavior-preserving This is a pure extraction. The moved function bodies, effect logic, dependency arrays, and JSX are unchanged from the previous monolith (verified via `git diff` against the pre-decomposition source). In particular: - `useEffectEvent` is preserved for `drainDiffRequest` / `resetDiff`. - `editorMountCount` remains single-owner (passed into the AI hook to drive the one-shot drain). - The untrusted→safe SQL promotion (`acceptUntrustedSql`) continues to happen in the run/explain gesture and warning-modal handlers in `SQLEditorContent`, as close to the explicit user action as possible. The Phase-1 characterization suite (`SQLEditor.test.tsx`, 11 tests) remains green. ## Stack Part of the SQLEditor decomposition stack (1/6 … 6/6). Builds on decompose 4 (execution + explain hooks, #47923). Next: PR6 splits the JSX into panes + final cleanup. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Improved SQL editor AI assistance, including completion prompts, debugging support, and diff review controls. * Added keyboard shortcuts for accepting or discarding AI-generated SQL changes. * Added shortcuts for focusing the editor, creating snippets, formatting queries, and explaining SQL. * **Bug Fixes** * Prevented SQL execution while reviewing AI-generated differences. * Improved handling of AI diff state during editor loading and interaction. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
SQL Editor Overview
Quick run-through of the different building blocks that make up the SQL Editor, to help navigating the codebase a little easier 🙂🙏
UI structure
-
Folders and snippets (in the product menu) are rendered via
SQLEditorMenuandSQLEditorNav, in which the data are all loaded from the API via React Query directly. (Refer to point 3 under "Data Structure" below)SQLEditorMenu: Wraps aroundSQLEditorNav+ renders search input + View running queries buttonSQLEditorNav: Renders the 3 collapsible snippet sections
-
The Tabs interface is powered by a separate state
tabs.ts. (Also used by the Table Editor) -
Route validation to check for snippet validity + last visited snippet lies in the page level on
[id].tsx -
When searching for snippets, we're deliberately opting to render the results as a flat list in
SearchListfor ease of finding (rather than keeping the 3 separate sections / having folders)
Data structure
-
SQL Editor is mainly powered by a Valtio store in
sql-editor-v2.ts, in which most of the data is being managed on the client side for optimistic rendering to keep the editor feeling snappy. (unlike other parts of the dashboard where the data is always invalidated whenever a mutation happens). -
The Valtio store here stores snippets across multiple projects as we aren't using a context provider, though this was a legacy decision (refer to
ProjectContextfor more context on using providers with stores) -
While
SQLEditorNavrenders the folders + snippets directly from the API endpoints via React Query, we still store them in the Valtio store to store some properties used on the client side likesplitSizesandprojectReffor snippets, andstatusfor folders (although it's possible that we can simplify the Valtio store).
Data fetching
-
The endpoint to fetch snippets and folders are via
useSQLSnippetFoldersQueryanduseSqlSnippetsQuery, both of which are paginated (limit set at 100)useSQLSnippetFoldersQuery: Specifically for fetching private snippets and foldersuseSqlSnippetsQuery: For fetching shared and favorite snippets
-
Page fetching is done on demand for the snippets via a "Load more" button due to the complexity of a tree view (we've deliberate avoided an infinite loading UX which we commonly do across other parts of the dashboard)
Data flow
Landing on the SQL Editor
-
Snippets and folders are all initially loaded via React Query in
SQLEditorNav, which are then initialized into the Valtio store viasnapV2.addSnippetcalls in theuseEffects -
On
/editor/sql- We'll redirect users to the last visited snippet if there's one (
/editor/sql/[id]), otherwise will redirect to/editor/sql/new(within[id].tsx)
- We'll redirect users to the last visited snippet if there's one (
-
On
/editor/sql/[id]- We'll load the content of the snippet via
useContentQueryand update the Valtio store viasnapV2.setSnippet
- We'll load the content of the snippet via
Writing a snippet
-
On
/editor/sql/new:- The first character input will update the Valtio store with a snippet skeleton via
snapV2.addSnippetand user will be redirected to/editor/sql/[id], using theidfrom the skeleton - Note that
snapV2.addSnippetonly handles adding snippets to the store and does not queue the snippet for saving - Subsequent character inputs will follow below as per
/editor/sql/[id]
- The first character input will update the Valtio store with a snippet skeleton via
-
On
/editor/sql/[id]:snapV2.setSqlwill be called based on the debounced value of the code editor, in which we'll then queue the snippet for saving viaupsertSnippet.- Note that we do invalidate some React Queries (snippet count, snippets, and folders) after saving via
upsertSnippet, but the invalidation is only triggered if it's a new snippet that's not saved in the DB yet
Running a snippet
-
There's several safeguards in place before we run the query
- Check for destructive operations: Will open a confirmation modal before running the query
- Check for update statements without where clause: Will open a confirmation modal before running the query
- Append a preset limit to the query if it's a select: To prevent accidentally running an expensive query on the database. Users can explicitly opt out of this to set "No limit"
-
If the snippet's name is "Untitled query", we'll also trigger a non-blocking request to rename the snippet via AI. Snippet name will be updated whenever the request completes.
Renaming, Moving, Deleting, Sharing snippets
- These functionalities all call
upsertContentvia React Query directly without going through the Valtio store - We thereafter update the Valtio stores for the SQL Editor and Tabs as required if the upsert is successful
Possible areas to simplify, refactor, or improve
-
updateSnippetandsetSqlcould be consolidated insql-editor-v2.ts -
Refactor renaming a query to have optimistic rendering for consistency on how we update snippets in the
sql-editor-v2.ts -
Implement drag and drop functionality for snippets into folders
-
RenameQueryModalandMoveQueryModal, could callupdateSnippetinstead ofremoveSnippet+addSnippet?