diff --git a/scripts/toolbar-query-tab.test.mjs b/scripts/toolbar-query-tab.test.mjs new file mode 100644 index 0000000..8139008 --- /dev/null +++ b/scripts/toolbar-query-tab.test.mjs @@ -0,0 +1,37 @@ +import assert from 'node:assert/strict'; +import { test } from 'node:test'; +import { build } from 'esbuild'; + +const { outputFiles } = await build({ + entryPoints: ['src/utils/toolbarQueryTab.ts'], + bundle: true, + platform: 'node', + format: 'esm', + write: false, +}); +const { findToolbarQueryTab } = await import( + `data:text/javascript;base64,${Buffer.from(outputFiles[0].contents).toString('base64')}` +); + +const tabs = [ + { id: 'first', type: 'query', title: 'SQL Query', connectionId: 'local', database: 'app', query: 'select 1' }, + { id: 'remote', type: 'query', title: 'SQL Query', connectionId: 'remote', database: 'app', query: 'select 2' }, + { id: 'saved', type: 'query', title: 'SQL Query', savedQueryId: 'saved-1', connectionId: 'local', database: 'app' }, + { id: 'table', type: 'table', title: 'SQL Query', connectionId: 'local', database: 'app' }, + { id: 'last', type: 'query', title: 'SQL Query', connectionId: 'local', database: 'app', query: 'select 3' }, + { id: 'other-database', type: 'query', title: 'SQL Query', connectionId: 'local', database: 'audit', query: 'select 4' }, +]; + +test('reuses the active ordinary SQL Query tab without changing its SQL', () => { + assert.equal(findToolbarQueryTab(tabs, 'local', 'app', 'first'), tabs[0]); +}); + +test('otherwise chooses the latest ordinary SQL Query tab for this connection', () => { + assert.equal(findToolbarQueryTab(tabs, 'local', 'app', 'table'), tabs[4]); + assert.equal(findToolbarQueryTab(tabs, 'remote', 'app', 'first'), tabs[1]); + assert.equal(findToolbarQueryTab(tabs, 'local', 'audit', 'first'), tabs[5]); +}); + +test('does not reuse saved, table, or other-connection tabs', () => { + assert.equal(findToolbarQueryTab(tabs.slice(1, 4), 'local', 'app', 'saved'), undefined); +}); diff --git a/src/App.tsx b/src/App.tsx index a031ece..e1386ad 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -70,12 +70,7 @@ function App() { if ((e.metaKey || e.ctrlKey) && e.key === 'e') { e.preventDefault(); if (activeConnectionId) { - useDatabaseStore.getState().openTab({ - type: 'query', - title: 'SQL Query', - connectionId: activeConnectionId, - query: '' - }); + useDatabaseStore.getState().openToolbarQueryTab(); } } diff --git a/src/components/SQLEditor.tsx b/src/components/SQLEditor.tsx index 6d6d3e7..8bb64b7 100644 --- a/src/components/SQLEditor.tsx +++ b/src/components/SQLEditor.tsx @@ -40,6 +40,19 @@ interface QueryEditorSession { // Only open tabs retain models/undo; closed tabs release their resources. const queryEditorSessions = new Map(); +const focusRequestedEditor = (tabId: string, editor: MonacoEditor.IStandaloneCodeEditor) => { + const request = useDatabaseStore.getState().queryEditorFocusRequest; + if (!request || request.tabId !== tabId) return; + const model = editor.getModel(); + if (!model || model.isDisposed()) return; + const end = model.getPositionAt(model.getValueLength()); + editor.setPosition(end); + editor.revealPositionInCenterIfOutsideViewport(end); + editor.focus(); + useDatabaseStore.setState(state => state.queryEditorFocusRequest === request + ? { queryEditorFocusRequest: null } : state); +}; + interface CompletionSchemaEntry { loadedAt: number; refreshTrigger: number; @@ -118,6 +131,7 @@ export const SQLEditor = ({ onActiveStatementChange, }: SQLEditorProps) => { const resolvedTheme = useDatabaseStore((state) => state.resolvedTheme); + const focusRequest = useDatabaseStore((state) => state.queryEditorFocusRequest); const sqlEditorAppearance = useDatabaseStore((state) => state.appearanceSettings.sqlEditor); const editorRef = useRef(null); const cleanupRef = useRef<(() => void) | null>(null); @@ -126,6 +140,12 @@ export const SQLEditor = ({ const activeStatementRef = useRef(null); const modelPath = `sqlmate-query:///${encodeURIComponent(tabId)}.sql`; + useEffect(() => { + if (focusRequest?.tabId === tabId && editorRef.current) { + focusRequestedEditor(tabId, editorRef.current); + } + }, [focusRequest, tabId]); + useEffect(() => { if (completionContextMatches(connectionId, database)) { void getCompletionSchema(connectionId, database, refreshTrigger).tables; @@ -242,6 +262,7 @@ export const SQLEditor = ({ const savedSession = queryEditorSessions.get(tabId); if (savedSession?.viewState) editor.restoreViewState(savedSession.viewState); queryEditorSessions.set(tabId, { model, viewState: savedSession?.viewState || null }); + focusRequestedEditor(tabId, editor); callbacksRef.current.onChange(model.getValue()); const decorations = editor.createDecorationsCollection(); const updateActiveStatement = () => { diff --git a/src/components/Toolbar.tsx b/src/components/Toolbar.tsx index f95f294..16d3fab 100644 --- a/src/components/Toolbar.tsx +++ b/src/components/Toolbar.tsx @@ -46,7 +46,7 @@ export const Toolbar = ({ setShowDatabaseSelector, setShowImportDialog, setShowExportDialog, - openTab, + openToolbarQueryTab, openConnectionIds, selectConnection, connect @@ -146,20 +146,11 @@ export const Toolbar = ({ Open