Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions scripts/toolbar-query-tab.test.mjs
Original file line number Diff line number Diff line change
@@ -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);
});
7 changes: 1 addition & 6 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

Expand Down
21 changes: 21 additions & 0 deletions src/components/SQLEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@ interface QueryEditorSession {
// Only open tabs retain models/undo; closed tabs release their resources.
const queryEditorSessions = new Map<string, QueryEditorSession>();

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;
Expand Down Expand Up @@ -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<MonacoEditor.IStandaloneCodeEditor | null>(null);
const cleanupRef = useRef<(() => void) | null>(null);
Expand All @@ -126,6 +140,12 @@ export const SQLEditor = ({
const activeStatementRef = useRef<string | null>(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;
Expand Down Expand Up @@ -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 = () => {
Expand Down
17 changes: 4 additions & 13 deletions src/components/Toolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const Toolbar = ({
setShowDatabaseSelector,
setShowImportDialog,
setShowExportDialog,
openTab,
openToolbarQueryTab,
openConnectionIds,
selectConnection,
connect
Expand Down Expand Up @@ -146,20 +146,11 @@ export const Toolbar = ({
<span className="toolbar-action-label">Open</span>
</button>
<button
onClick={() => {
if (activeConnectionId) {
openTab({
type: 'query',
title: 'SQL Query',
connectionId: activeConnectionId,
query: ''
});
}
}}
onClick={openToolbarQueryTab}
disabled={!activeConnectionId}
className="flex h-8 items-center gap-1.5 rounded-md bg-accent px-2 text-xs font-semibold text-white transition-colors hover:bg-accent/90 disabled:opacity-40 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-accent"
title="New SQL Query (⌘E)"
aria-label="New SQL Query"
title="Open SQL Query (⌘E)"
aria-label="Open SQL Query"
>
<Terminal size={16} />
<span className="toolbar-action-label">Query</span>
Expand Down
24 changes: 24 additions & 0 deletions src/store/databaseStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { connectionTargetChanged, connectionTargetFingerprint } from '../utils/c
import { parseSavedQueries, upsertSavedQuery, renameSavedQuery, removeSavedQuery, type SavedQuery } from '../utils/savedQueries';
import { tablePageCache } from '../utils/tablePageCache';
import { tableStructureCache } from '../utils/tableStructureCache';
import { findToolbarQueryTab } from '../utils/toolbarQueryTab';

const sidebarRequests = new Map<string, Promise<void>>();
const queuedSidebarRefreshes = new Set<string>();
Expand Down Expand Up @@ -258,6 +259,7 @@ interface DatabaseState {
tabs: Tab[];
activeTabId: string | null;
activeTabIds: Record<string, string | null>; // Connection ID -> Active Tab ID
queryEditorFocusRequest: { tabId: string } | null;

// Query History
queryHistory: HistoryItem[];
Expand Down Expand Up @@ -322,6 +324,7 @@ interface DatabaseState {

// Tab actions
openTab: (tab: Omit<Tab, 'id'>, options?: { forceNew?: boolean }) => void;
openToolbarQueryTab: () => void;
closeTab: (id: string) => void;
reorderTab: (sourceId: string, targetId: string, position: TabDropPosition) => void;
setActiveTabId: (id: string) => void;
Expand Down Expand Up @@ -412,6 +415,7 @@ export const useDatabaseStore = create<DatabaseState>((set, get) => ({
tabs: [],
activeTabId: null,
activeTabIds: {},
queryEditorFocusRequest: null,
queryHistory: loadHistoryFromStorage(),
savedQueries: [],
savedQueryStatus: 'loading',
Expand Down Expand Up @@ -621,6 +625,7 @@ export const useDatabaseStore = create<DatabaseState>((set, get) => ({
activeDatabase: restoredDb,
activeTable: restoredTable,
activeTabId: restoredTabId,
queryEditorFocusRequest: null,
safeMode: conn?.safetyMode || 'Silent',
databases: [],
tabs: state.tabs,
Expand Down Expand Up @@ -702,6 +707,7 @@ export const useDatabaseStore = create<DatabaseState>((set, get) => ({
activeDatabase: restoredDb,
activeTable: restoredTable,
activeTabId: restoredTabId,
queryEditorFocusRequest: null,
safeMode: conn?.safetyMode || 'Silent',
openConnectionIds: newOpenIds,
showConnectionSelector: false // Ensure it's closed
Expand Down Expand Up @@ -931,6 +937,22 @@ export const useDatabaseStore = create<DatabaseState>((set, get) => ({
};
}),

openToolbarQueryTab: () => {
const state = get();
const connectionId = state.activeConnectionId;
if (!connectionId) return;
const database = state.activeDatabase || state.activeDatabases[connectionId]
|| state.savedConnections.find(connection => connection.id === connectionId)?.database || null;
const existing = findToolbarQueryTab(state.tabs, connectionId, database, state.activeTabId);
if (existing) {
state.setActiveTabId(existing.id);
} else {
state.openTab({ type: 'query', title: 'SQL Query', connectionId, database: database || undefined, query: '' });
}
const tabId = get().activeTabId;
if (tabId) set({ queryEditorFocusRequest: { tabId } });
},

closeTab: (id) => set((state) => {
const tabToClose = state.tabs.find(t => t.id === id);
if (!tabToClose) return state;
Expand Down Expand Up @@ -963,6 +985,7 @@ export const useDatabaseStore = create<DatabaseState>((set, get) => ({
tabs: newTabs,
activeTabId: currentConnActiveId,
activeTabIds: newActiveTabIds,
queryEditorFocusRequest: state.queryEditorFocusRequest?.tabId === id ? null : state.queryEditorFocusRequest,
activeTable: activeTab?.tableName || null
};
}),
Expand All @@ -980,6 +1003,7 @@ export const useDatabaseStore = create<DatabaseState>((set, get) => ({
return {
activeTabId: id,
activeTabIds: newActiveTabIds,
queryEditorFocusRequest: state.queryEditorFocusRequest?.tabId === id ? state.queryEditorFocusRequest : null,
activeTable: tab.type === 'table' ? tab.tableName || null : state.activeTable
};
}),
Expand Down
19 changes: 19 additions & 0 deletions src/utils/toolbarQueryTab.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import type { Tab } from '../store/databaseStore';

export const findToolbarQueryTab = (
tabs: Tab[], connectionId: string, database: string | null, activeTabId: string | null
): Tab | undefined => {
const isReusable = (tab: Tab) => tab.type === 'query'
&& tab.title === 'SQL Query'
&& !tab.savedQueryId
&& tab.connectionId === connectionId
&& (tab.database || '') === (database || '');

const active = tabs.find(tab => tab.id === activeTabId && isReusable(tab));
if (active) return active;

for (let index = tabs.length - 1; index >= 0; index--) {
if (isReusable(tabs[index])) return tabs[index];
}
return undefined;
};
Loading