DB viewer + query editor enhancements (home-screen-ux-query-editor) (#4)

* feat: add query_history table migration (v5) (Task 1)

* feat: add isDestructiveQuery utility (Task 2)

* feat: add tabType discriminator and openQueryTab to dbViewerStore (Task 3)

* feat: add execute_query command with pagination and query history (Task 4)

* feat: add typed wrappers for executeQuery, getQueryHistory, clearQueryHistory (Task 5)

* fix: global search bypasses folder scope when filters active (Task 6)

* feat: add TagFilterDropdown with checkboxes and empty state (Task 7)

* feat: add DbTypeFilterDropdown with checkboxes and clear all (Task 8)

* feat: wire TagFilterDropdown/DbTypeFilterDropdown into ActionRow, add inline tag creation (Task 9)

* feat: add Name input to GeneralTab for connection editing (Task 10)

* feat: add QueryEditor Monaco wrapper with SQL mode and Cmd+Enter (Task 11)

* feat: add DestructiveQueryDialog with SQL preview and confirmation (Task 12)

* feat: integrate query tabs, Monaco editor, destructive guard into DbViewerScreen (Task 13)

* fix: harden moveConnection against race conditions on rapid drags (Task 14)

* docs: update AGENTS.md implementation status for Home Screen UX + Query Editor (Task 15)

* feat: switch tag filter to OR semantics, add environment filter (F-T16)

* feat: add activeEnvironment filter state to uiStore and useFilteredConnections (F-T17)

* feat: add environment filter select to Filters dropdown (F-T18)

* feat: filter folder cards by tag match or contained connections (F-T19)

* fix: keep grid header width to content, border last column

* fix: hide select-all checkbox and empty-state when no table open

* fix: filter folder cards by any active filter, show global search results (F-T20)

* feat: show 'Showing Search Results' breadcrumb with clear button (F-T21)

* docs: update README + AGENTS.md for Query Editor, filters, and planned AI integration (BYOK)

* feat: refresh indicator with spinning icon and pulse, defer auto-refresh on tab switch

* feat: smart default schema selection, refresh schemas on database switch

* fix: auto-refresh waits for in-flight refresh to complete before next tick

* style: shrink db viewer sidebar nav icons from 20px to 16px

* style: shrink db viewer sidebar nav buttons to 32px (8px padding)

* style: make Tables panel title xs, regular weight, muted

* style: bump Tables panel title back to sm, keep regular weight and muted

* feat: export schema diagram as PNG/JPEG/SVG (entire schema or viewport)

* chore: lockfile for html-to-image

* fix: raise schema visualizer toolbar above legend so export menu isn't hidden

* feat: schema export via save dialog, transparent background option, save notification

* fix: render nothing in tab bar when no tabs are open

* style: reduce tab bar height from 40px to 36px

* style: reduce tab bar height to 32px

* style: revert tab bar height to 36px

* feat: split tab bar with fixed +Query and Changes actions on the right

* style: blue play-icon Query button in tab bar

* refactor: remove sidebar New Query button (now in tab bar)

* style: conditional bottom padding in sidebar toolbar when nothing is below

* feat: distinguish table and query tabs with icons

* style: tab icons follow active/inactive state, muted colors

* feat: query tab toolbar (run/format/dialect badge) + bare transparent editor

* style: blue rounded Run Query button in query toolbar

* feat: smart platform-aware shortcut tooltip on Run Query (⌘+⏎ / Ctrl+Enter)

* style: show only the shortcut in the Run Query tooltip

* fix: Cmd+Enter keybinding stale closure; add run pulse to query toolbar; bundle monaco locally (offline)

* feat: show placeholder text in empty query editor

* feat: SQL autocomplete — keywords + table names from active schema

* feat: per-table column autocomplete on 'table.' + docs update

* feat: query-variant result toolbar — export/refresh/columns left, smart-unit execution time right

* fix: populate execution_time_ms on query results so the toolbar can show time taken

* fix: re-measure monaco fonts after async font load to stop cursor drift

* feat: resizable + collapsible query results panel

* refactor: move results caret onto the resize handle (centered), bottom caret when collapsed

* style: thin drag strip with caret on its own centered pill

* refactor: remove Queue button from table toolbar (Changes lives in tab bar)

* style: changes button becomes bordered rounded icon with count badge

* docs: mark tab-bar Changes queue button in AGENTS.md and README
This commit is contained in:
2026-08-01 05:56:47 +08:00
committed by GitHub
parent 4f18993e70
commit 80962d7d11
66 changed files with 5681 additions and 509 deletions
+442 -67
View File
@@ -1,7 +1,17 @@
import { useCallback, useEffect, useRef, useState } from "react";
import { useCallback, useEffect, useRef, useState, Suspense, lazy } from "react";
import { ChevronDown, ChevronUp } from "lucide-react";
import { format as formatSql } from "sql-formatter";
import { TooltipProvider } from "../ui/Tooltip";
import { DbViewerSidebar } from "./DbViewerSidebar";
import { DbViewerToolbar } from "./DbViewerToolbar";
import { isDestructiveQuery } from "../../lib/utils";
import { executeQuery } from "../../lib/commands";
const QueryEditor = lazy(() => import("../editor/QueryEditor").then((m) => ({ default: m.QueryEditor })));
import { QueryToolbar } from "../editor/QueryToolbar";
const DestructiveQueryDialog = lazy(() =>
import("../editor/DestructiveQueryDialog").then((m) => ({ default: m.DestructiveQueryDialog })),
);
import { TableTree } from "./TableTree";
import { ObjectExplorerPage } from "./ObjectExplorerPage";
import { TabBar } from "./TabBar";
@@ -39,6 +49,7 @@ export function DbViewerScreen({
const [searchQuery, setSearchQuery] = useState("");
const [selectedRows, setSelectedRows] = useState<Set<number>>(new Set());
const [editModalOpen, setEditModalOpen] = useState(false);
const [destructiveQuery, setDestructiveQuery] = useState<string | null>(null);
const connections = useConnectionStore((s) => s.connections);
const currentConnection =
connections.find((c) => c.id === connectionId) ?? null;
@@ -72,6 +83,7 @@ export function DbViewerScreen({
const setTabData = useDbViewerStore((s) => s.setTabData);
const setTabError = useDbViewerStore((s) => s.setTabError);
const setTabLoading = useDbViewerStore((s) => s.setTabLoading);
const databases = useDbViewerStore((s) => s.databases);
const currentDatabase = useDbViewerStore((s) => s.currentDatabase);
const setCurrentDatabase = useDbViewerStore((s) => s.setCurrentDatabase);
@@ -105,6 +117,57 @@ export function DbViewerScreen({
[connectionId, setTabData, setTabError],
);
async function executeQueryForTab(tabId: string, sql: string) {
const tab = useDbViewerStore.getState().tabs.find((t) => t.id === tabId);
if (!tab) return;
setTabLoading(tabId, true);
try {
const result = await executeQuery(connectionId, sql, tab.page, tab.pageSize);
setTabData(tabId, result);
} catch (e) {
setTabError(tabId, e instanceof Error ? e.message : String(e));
}
}
// Read the active tab from the store directly so the Monaco keybinding action
// (which keeps the first onRun closure) always sees the latest query text.
const handleRunQuery = useCallback(() => {
const state = useDbViewerStore.getState();
const tab = state.tabs.find((t) => t.id === state.activeTabId);
if (!tab || tab.tabType !== "query") return;
const sql = tab.query?.trim() ?? "";
if (!sql) return;
if (isDestructiveQuery(sql)) {
setDestructiveQuery(sql);
} else {
executeQueryForTab(tab.id, sql);
}
}, []);
// Auto-format the active query tab's SQL
const handleFormatQuery = useCallback(() => {
const state = useDbViewerStore.getState();
const tab = state.tabs.find((t) => t.id === state.activeTabId);
if (!tab || tab.tabType !== "query") return;
const dbType = currentConnection?.db_type ?? "postgresql";
const language =
dbType === "mysql"
? "mysql"
: dbType === "sqlite"
? "sqlite"
: "postgresql";
try {
const formatted = formatSql(tab.query ?? "", { language });
useDbViewerStore.setState((s) => ({
tabs: s.tabs.map((t) =>
t.id === tab.id ? { ...t, query: formatted } : t,
),
}));
} catch {
// leave the query untouched if formatting fails
}
}, [currentConnection?.db_type]);
// Cmd+W / Ctrl+W: close current tab, or navigate home if no tabs (configurable in Settings → Shortcuts)
useShortcut("close_tab", () => {
const state = useDbViewerStore.getState();
@@ -116,6 +179,7 @@ export function DbViewerScreen({
});
useEffect(() => {
if (!activeTab) return;
if (activeTab.tabType !== "table") return;
if (!activeTab.loading) return;
if (activeTab.error) return;
fetchData(activeTab);
@@ -124,6 +188,7 @@ export function DbViewerScreen({
// Smart default sort: apply once when data first loads for a tab
useEffect(() => {
if (!activeTab) return;
if (activeTab.tabType !== "table") return;
if (activeTab.loading) return;
if (!activeTab.data) return;
if (activeTab.smartSortApplied) return;
@@ -370,10 +435,17 @@ export function DbViewerScreen({
}
}, [filterRules, activeTab, clearColumnFilter]);
// Refresh: clear data so auto-fetch effect re-fetches
// Refresh: clear data so auto-fetch effect re-fetches; for query tabs, re-run the stored query
const handleRefresh = useCallback(() => {
const tabId = useDbViewerStore.getState().activeTabId;
if (!tabId) return;
const tab = useDbViewerStore.getState().tabs.find((t) => t.id === tabId);
if (!tab) return;
if (tab.tabType === "query") {
const sql = tab.query?.trim() ?? "";
if (sql) executeQueryForTab(tabId, sql);
return;
}
useDbViewerStore.setState((s) => ({
tabs: s.tabs.map((t) =>
t.id === tabId ? { ...t, loading: true, error: null } : t,
@@ -416,6 +488,47 @@ export function DbViewerScreen({
[tablePanelWidth],
);
// Query results panel: collapsible + resizable (min 120px, max 80% of column)
const queryColumnRef = useRef<HTMLDivElement>(null);
const resultsResizeRef = useRef<{ startY: number; startH: number } | null>(
null,
);
const [resultsHeight, setResultsHeight] = useState(() =>
Math.round(
(typeof window !== "undefined" ? window.innerHeight : 800) * 0.4,
),
);
const [resultsCollapsed, setResultsCollapsed] = useState(false);
const onResultsResizeStart = useCallback(
(e: React.MouseEvent) => {
e.preventDefault();
resultsResizeRef.current = {
startY: e.clientY,
startH: resultsHeight,
};
const columnH =
queryColumnRef.current?.clientHeight ||
(typeof window !== "undefined" ? window.innerHeight : 800);
const maxH = Math.max(120, Math.round(columnH * 0.8));
const onMove = (ev: MouseEvent) => {
if (!resultsResizeRef.current) return;
const h =
resultsResizeRef.current.startH +
(resultsResizeRef.current.startY - ev.clientY);
setResultsHeight(Math.max(120, Math.min(maxH, h)));
};
const onUp = () => {
resultsResizeRef.current = null;
document.removeEventListener("mousemove", onMove);
document.removeEventListener("mouseup", onUp);
};
document.addEventListener("mousemove", onMove);
document.addEventListener("mouseup", onUp);
},
[resultsHeight],
);
const handleNavigate = useCallback(
(view: string) => {
if (view === "home") onHome();
@@ -479,73 +592,335 @@ export function DbViewerScreen({
/>
<div className="flex-1 w-0 flex flex-col min-w-0 overflow-hidden">
<TabBar />
{activeTab?.data && (
<TableControls
connectionId={connectionId}
schema={activeSchema}
table={activeTable}
columns={columns}
rows={rawRows}
hiddenColumns={hiddenColumns}
onToggleColumn={(col) =>
toggleHiddenColumn(activeTab!.id, col)
{activeTab?.tabType === "query" ? (
<Suspense
fallback={
<div className="p-4 text-text-muted">
Loading editor...
</div>
}
onRefresh={handleRefresh}
filterRules={filterRules}
onFilterChange={(rules) =>
setFilterRules(activeTab!.id, rules)
}
sortRules={sortRules}
onSortChange={(rules) =>
setSortRules(activeTab!.id, rules)
}
defaultRefreshRate={
settings?.table_refresh_rate ?? 0
}
selectedCount={selectedRows.size}
selectedRows={processedRows.filter(
(_, i) => selectedRows.has(i),
)}
onClearSelection={() =>
setSelectedRows(new Set())
}
/>
)}
<div className="flex-1 flex flex-col min-h-0 overflow-hidden">
<VirtualDataGrid
connectionId={connectionId}
schema={activeSchema}
rows={processedRows}
columns={columns}
hiddenColumns={hiddenColumns}
selectedRows={selectedRows}
onToggleRow={(rowIndex) => {
setSelectedRows((prev) => {
const next = new Set(prev);
if (next.has(rowIndex))
next.delete(rowIndex);
else next.add(rowIndex);
return next;
});
}}
onToggleAll={() => {
setSelectedRows((prev) => {
if (
prev.size ===
processedRows.length &&
processedRows.length > 0
) {
return new Set();
>
<div ref={queryColumnRef} className="flex flex-col flex-1 min-h-0 overflow-hidden">
<QueryToolbar
onRun={handleRunQuery}
onFormat={handleFormatQuery}
dbType={currentConnection?.db_type}
/>
<div className="flex-1 min-h-0 overflow-hidden">
<QueryEditor
value={activeTab.query ?? ""}
onChange={(value) =>
useDbViewerStore.setState(
(s) => ({
tabs: s.tabs.map(
(t) =>
t.id ===
activeTab.id
? {
...t,
query: value,
}
: t,
),
}),
)
}
onRun={handleRunQuery}
/>
</div>
{!resultsCollapsed ? (
<>
<div className="relative shrink-0">
<div
data-testid="query-results-resize"
aria-label="Resize results"
onMouseDown={
onResultsResizeStart
}
onDoubleClick={() =>
setResultsHeight(
Math.round(
(typeof window !==
"undefined"
? window
.innerHeight
: 800) *
0.4,
),
)
}
className="h-1 cursor-row-resize bg-border/20 hover:bg-accent/30 active:bg-accent/50"
/>
{/* caret pill, centered on the drag strip */}
<button
type="button"
onClick={() =>
setResultsCollapsed(
true,
)
}
aria-label="Hide results"
onMouseDown={(e) =>
e.stopPropagation()
}
className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 flex items-center justify-center rounded-full border border-border bg-surface px-2 py-0.5 text-text-muted hover:text-text hover:bg-surface-raised shadow-sm transition-colors cursor-pointer"
>
<ChevronDown size={12} />
</button>
</div>
<div
data-testid="query-results"
style={{
height: resultsHeight,
}}
className="flex flex-col min-h-0 shrink-0"
>
{activeTab?.data && (
<TableControls
connectionId={connectionId}
schema={activeSchema}
table={activeTable}
columns={columns}
rows={rawRows}
hiddenColumns={
hiddenColumns
}
onToggleColumn={(
col,
) =>
toggleHiddenColumn(
activeTab!.id,
col,
)
}
onRefresh={
handleRefresh
}
filterRules={
filterRules
}
onFilterChange={(
rules,
) =>
setFilterRules(
activeTab!.id,
rules,
)
}
sortRules={
sortRules
}
onSortChange={(
rules,
) =>
setSortRules(
activeTab!.id,
rules,
)
}
defaultRefreshRate={
settings?.table_refresh_rate ??
0
}
selectedCount={
selectedRows.size
}
selectedRows={processedRows.filter(
(_, i) =>
selectedRows.has(
i,
),
)}
onClearSelection={() =>
setSelectedRows(
new Set(),
)
}
variant="query"
/>
)}
<div className="flex-1 flex flex-col min-h-0 overflow-hidden">
<VirtualDataGrid
connectionId={connectionId}
schema={activeSchema}
rows={processedRows}
columns={columns}
hiddenColumns={hiddenColumns}
selectedRows={selectedRows}
onToggleRow={(rowIndex) => {
setSelectedRows(
(prev) => {
const next =
new Set(
prev,
);
if (
next.has(
rowIndex,
)
)
next.delete(
rowIndex,
);
else
next.add(
rowIndex,
);
return next;
},
);
}}
onToggleAll={() => {
setSelectedRows(
(prev) => {
if (
prev.size ===
processedRows.length &&
processedRows.length >
0
) {
return new Set();
}
return new Set(
processedRows.map(
(_, i) =>
i,
),
);
},
);
}}
/>
</div>
</div>
</>
) : (
<>
{/* collapsed caret pill, pinned to the bottom of the editor */}
<div className="flex shrink-0 justify-center py-1">
<button
type="button"
onClick={() =>
setResultsCollapsed(
false,
)
}
aria-label="Show results"
className="flex items-center justify-center rounded-full border border-border bg-surface px-2 py-0.5 text-text-muted hover:text-text hover:bg-surface-raised shadow-sm transition-colors cursor-pointer"
>
<ChevronUp size={12} />
</button>
</div>
</>
)}
<DestructiveQueryDialog
open={destructiveQuery !== null}
query={destructiveQuery ?? ""}
onConfirm={() => {
if (
destructiveQuery &&
activeTab
) {
executeQueryForTab(
activeTab.id,
destructiveQuery,
);
}
setDestructiveQuery(null);
}}
onCancel={() =>
setDestructiveQuery(null)
}
return new Set(
processedRows.map(
(_, i) => i,
),
);
});
}}
/>
</div>
/>
</div>
</Suspense>
) : (
<>
{activeTab?.data && (
<TableControls
connectionId={connectionId}
schema={activeSchema}
table={activeTable}
columns={columns}
rows={rawRows}
hiddenColumns={hiddenColumns}
onToggleColumn={(col) =>
toggleHiddenColumn(
activeTab!.id,
col,
)
}
onRefresh={handleRefresh}
filterRules={filterRules}
onFilterChange={(rules) =>
setFilterRules(
activeTab!.id,
rules,
)
}
sortRules={sortRules}
onSortChange={(rules) =>
setSortRules(
activeTab!.id,
rules,
)
}
defaultRefreshRate={
settings?.table_refresh_rate ??
0
}
selectedCount={selectedRows.size}
selectedRows={processedRows.filter(
(_, i) =>
selectedRows.has(i),
)}
onClearSelection={() =>
setSelectedRows(new Set())
}
/>
)}
<div className="flex-1 flex flex-col min-h-0 overflow-hidden">
<VirtualDataGrid
connectionId={connectionId}
schema={activeSchema}
rows={processedRows}
columns={columns}
hiddenColumns={hiddenColumns}
selectedRows={selectedRows}
onToggleRow={(rowIndex) => {
setSelectedRows((prev) => {
const next = new Set(
prev,
);
if (next.has(rowIndex))
next.delete(
rowIndex,
);
else next.add(rowIndex);
return next;
});
}}
onToggleAll={() => {
setSelectedRows((prev) => {
if (
prev.size ===
processedRows.length &&
processedRows.length >
0
) {
return new Set();
}
return new Set(
processedRows.map(
(_, i) => i,
),
);
});
}}
/>
</div>
</>
)}
</div>
</div>
) : currentView === "functions" ? (