25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
feat(layout): persist directory expanded state for sql library and sql files (#13593) (#13740)
lxk955cb6b033b4cae
diff --git a/apps/desktop/src/components/layout/SqlFilePanel.vue b/apps/desktop/src/components/layout/SqlFilePanel.vueindex 02bd1dda53..9f91e85c23 100644--- a/apps/desktop/src/components/layout/SqlFilePanel.vue+++ b/apps/desktop/src/components/layout/SqlFilePanel.vue@@ -28,6 +28,7 @@ import { externalSqlFileOpenErrorMessage, externalSqlEditorMaxBytes, formatSqlFiimport * as api from "@/lib/backend/api";import type { SqlFileEntry } from "@/lib/backend/api";import { getSqlFileFilter, getSqlFileFolderPaths, saveSqlFileFilter, saveSqlFileFolderPaths, notifySqlFileFoldersChanged } from "@/lib/sqlFile/sqlFileFolders";+import { getSqlFileFoldersUiState, saveSqlFileFoldersUiState, type SqlFileFolderUiState } from "@/lib/sqlFile/sqlFileUiState";import { filterAndSortSqlFileEntries, getSqlFileSortOrder, saveSqlFileSortOrder, type SqlFileSortOrder } from "@/lib/sql/sqlFileTreeFilter";import { orderedListSelectionIntent, type OrderedListSelectionItem } from "@/lib/selection/orderedListSelection";import { getSqlFileOpenMode, saveSqlFileOpenMode, type SqlFileOpenMode } from "@/lib/sqlFile/sqlFileInteraction";@@ -57,6 +58,19 @@ interface FolderState {}const folders = ref<FolderState[]>([]);+let uiStateInitialized = false;++function persistFoldersUiState() {+ if (!uiStateInitialized) return;+ const state: Record<string, SqlFileFolderUiState> = {};+ for (const f of folders.value) {+ state[f.path] = {+ collapsed: f.collapsed,+ expanded: [...f.expanded],+ };+ }+ saveSqlFileFoldersUiState(state);+}const fileTree = ref<HTMLElement | null>(null);const locatingFile = ref(false);const currentFilePath = computed(() => {@@ -206,6 +220,7 @@ async function locateFileTarget(path: string) {}target.folder.collapsed = false;target.folder.expanded = new Set([...target.folder.expanded, ...target.ancestors]);+ persistFoldersUiState();const itemIndex = visibleItems.value.findIndex((item) => item.folder === target.folder && item.type === "file" && normalizeExternalSqlPath(item.path) === target.path);const item = visibleItems.value[itemIndex];if (!item) return;@@ -254,6 +269,7 @@ function loadSavedFolders(): string[] {function saveFolders() {const paths = folders.value.map((f) => f.path);saveSqlFileFolderPaths(paths);+ persistFoldersUiState();}async function pickFolder() {@@ -362,6 +378,7 @@ async function loadFolderEntries(folderPath: string): Promise<string | null> {if (displayPath && stillPresent.has(displayPath)) nextExpanded.add(displayPath);}folders.value[target].expanded = nextExpanded;+ persistFoldersUiState();// Selection keys already normalize both root and entry paths.}} catch (e: any) {@@ -529,6 +546,7 @@ function toggleExpand(folder: FolderState, path: string) {next.add(path);folder.expanded = next;}+ persistFoldersUiState();}function toggleFolderCollapse(folder: FolderState) {@@ -543,6 +561,7 @@ function toggleFolderCollapse(folder: FolderState) {} else {folder.collapsed = !folder.collapsed;}+ persistFoldersUiState();}// Expand/collapse every directory beneath the given top-level folder.@@ -554,6 +573,7 @@ function setAllExpanded(folder: FolderState, expanded: boolean) {} else {folder.expanded = new Set();}+ persistFoldersUiState();}function collectDirPaths(entries: SqlFileEntry[], into: Set<string>) {@@ -629,13 +649,26 @@ watch([foldersInitialized, () => props.locateRequest], async ([initialized, requonBeforeUnmount(() => {disposed = true;+ persistFoldersUiState();});onMounted(async () => {// Restoring folders must not persist a partially loaded list. Register all// roots before scanning so closing the panel cannot discard saved roots.const saved = loadSavedFolders();- folders.value = saved.map((path) => ({ path, entries: [], expanded: new Set<string>(), loading: true, refreshing: false, collapsed: false }));+ const uiStates = getSqlFileFoldersUiState();+ folders.value = saved.map((path) => {+ const ui = uiStates[path];+ return {+ path,+ entries: [],+ expanded: new Set<string>(ui?.expanded ?? []),+ loading: true,+ refreshing: false,+ collapsed: ui?.collapsed === true,+ };+ });+ uiStateInitialized = true;for (const path of saved) {if (disposed) return;await loadFolderEntries(path);@@ -941,6 +974,7 @@ async function createSqlFolder() {if (folder) {folder.collapsed = false;folder.expanded = new Set([...folder.expanded, target.directoryPath, path]);+ persistFoldersUiState();}activeKey.value = nodeKey(target.rootPath, "dir", path);selectedKeys.value = new Set();@@ -1191,6 +1225,7 @@ function expandSubtree(target: Extract<ContextTarget, { kind: "dir" }>) {next.add(target.entry.path);collectDirPaths(target.entry.children, next);folder.expanded = next;+ persistFoldersUiState();}function collapseSubtree(target: Extract<ContextTarget, { kind: "dir" }>) {@@ -1204,6 +1239,7 @@ function collapseSubtree(target: Extract<ContextTarget, { kind: "dir" }>) {if (!subtree.has(p)) next.add(p);}folder.expanded = next;+ persistFoldersUiState();}function clearContextTarget() {diff --git a/apps/desktop/src/components/layout/SqlLibraryPanel.vue b/apps/desktop/src/components/layout/SqlLibraryPanel.vueindex 172a148bd6..d9cf37dadd 100644--- a/apps/desktop/src/components/layout/SqlLibraryPanel.vue+++ b/apps/desktop/src/components/layout/SqlLibraryPanel.vue@@ -58,6 +58,7 @@ import { savedSqlFolderBranchFileCount } from "@/lib/savedSql/savedSqlFolderCounimport { collectSavedSqlDirectoryImportFiles } from "@/lib/savedSql/savedSqlDirectoryImport";import { savedSqlBatchErrorMessage, savedSqlErrorMessage } from "@/lib/savedSql/savedSqlErrors";import { savedSqlDatabaseScopeKey } from "@/lib/savedSql/savedSqlDatabaseTree";+import { getSavedSqlExpandedFolderIds, saveSavedSqlExpandedFolderIds } from "@/lib/savedSql/savedSqlUiState";import { ensureSqlExtension, extractCandidateDatabaseFromName, nextAvailableSqlName } from "@/lib/savedSql/savedSqlFileName";import { savedSqlImportTarget } from "@/lib/savedSql/savedSqlImportTarget";import { buildSavedSqlTreeRows, savedSqlFolderBranchMatches, type SavedSqlTreeRow } from "@/lib/savedSql/savedSqlTreeRows";@@ -430,29 +431,30 @@ const treeRows = computed<SavedSqlTreeRow[]>(() =>const hasAnyVisibleItem = computed(() => treeRows.value.length > 0);-const collapsedFolders = ref<Set<string>>(new Set());+const expandedFolders = ref<Set<string>>(getSavedSqlExpandedFolderIds());-// Seed a default-collapsed state when the library first becomes non-empty so-// opening the panel shows every directory collapsed instead of fully expanded.-// Guarded so a later in-session folder add/delete does not re-collapse folders-// the user has already expanded.-const collapseDefaultsSeeded = ref(false);+function saveExpandedFoldersState() {+ saveSavedSqlExpandedFolderIds(expandedFolders.value);+}++// Prune deleted folder IDs when folder list is loaded or modified.watch(() => savedSqlStore.allFolders.map((folder) => folder.id),(folderIds) => {- if (collapseDefaultsSeeded.value || folderIds.length === 0) return;- collapseDefaultsSeeded.value = true;- collapsedFolders.value = new Set(folderIds);+ if (folderIds.length === 0 || expandedFolders.value.size === 0) return;+ const validIds = new Set(folderIds);+ const pruned = new Set([...expandedFolders.value].filter((id) => validIds.has(id)));+ if (pruned.size !== expandedFolders.value.size) {+ expandedFolders.value = pruned;+ saveExpandedFoldersState();+ }},- { immediate: true },);function collapseAllFolders() {- // Collapse the whole tree: every folder currently known, including nested- // children, is marked collapsed in one shot.- const folderIds = savedSqlStore.allFoldersTreeOrder.map((folder) => folder.id);- if (folderIds.length === 0) return;- collapsedFolders.value = new Set(folderIds);+ if (expandedFolders.value.size === 0) return;+ expandedFolders.value = new Set();+ saveExpandedFoldersState();}function hasAnyFolder(): boolean {@@ -468,16 +470,17 @@ function toggleFolder(folderId: string) {const folder = savedSqlStore.allFolders.find((candidate) => candidate.id === folderId);if (folder && folderBranchMatchesQuery(folder)) return;}- const next = new Set(collapsedFolders.value);+ const next = new Set(expandedFolders.value);if (next.has(folderId)) next.delete(folderId);else next.add(folderId);- collapsedFolders.value = next;+ expandedFolders.value = next;+ saveExpandedFoldersState();}function isFolderExpanded(folder: SavedSqlFolder) {// 搜索激活时,命中的分支自动展开以便直接看到匹配文件;否则遵循折叠状态。if (searchQuery.value && folderBranchMatchesQuery(folder)) return true;- return !collapsedFolders.value.has(folder.id);+ return expandedFolders.value.has(folder.id);}async function openNewFolderInput(parentFolderId?: string) {@@ -486,7 +489,8 @@ async function openNewFolderInput(parentFolderId?: string) {const connectionId = parent?.connectionId || connectionStore.connections[0]?.id;if (!connectionId) return;if (parent?.id) {- collapsedFolders.value = new Set([...collapsedFolders.value].filter((id) => id !== parent.id));+ expandedFolders.value = new Set([...expandedFolders.value, parent.id]);+ saveExpandedFoldersState();}try {const folder = await savedSqlStore.createFolder(connectionId, t("savedSql.newFolderDefault"), parent?.id);@@ -501,7 +505,8 @@ async function openNewQueryInFolder(folder?: SavedSqlFolder) {const connectionId = folder?.connectionId || connectionStore.activeConnectionId || connectionStore.connections[0]?.id;if (!connectionId) return;if (folder?.id) {- collapsedFolders.value = new Set([...collapsedFolders.value].filter((id) => id !== folder.id));+ expandedFolders.value = new Set([...expandedFolders.value, folder.id]);+ saveExpandedFoldersState();}const folderFiles = folder ? savedSqlStore.filesInFolder(folder.id) : [];@@ -552,15 +557,16 @@ async function locateFile(fileId: string) {if (searchInputPending.value || !treeRows.value.some((row) => row.type === "file" && row.file.id === file.id)) {searchInput.value?.clear();}- const expanded = new Set(collapsedFolders.value);+ const expanded = new Set(expandedFolders.value);const visited = new Set<string>();let folderId = file.folderId;while (folderId && !visited.has(folderId)) {visited.add(folderId);- expanded.delete(folderId);+ expanded.add(folderId);folderId = savedSqlStore.allFolders.find((folder) => folder.id === folderId)?.parentFolderId;}- collapsedFolders.value = expanded;+ expandedFolders.value = expanded;+ saveExpandedFoldersState();clearSelection();activeItemId.value = file.id;activeItemType.value = "file";@@ -1722,6 +1728,7 @@ defineExpose({<divv-if="row.type === 'folder'"class="relative flex cursor-default items-center gap-1 py-1.5 pr-2 text-[13px] group"+ :data-sql-library-folder="row.folder.id":style="{ paddingLeft: `${8 + row.depth * 16}px` }":class="[showDropInside(row.folder.id) ? 'ring-1 ring-primary/50 bg-primary/5' : folderRowClass(row.folder.id), isDraggingItem(row.folder.id) ? 'opacity-50' : '']"@mousedown="handleDragMouseDown($event, row.folder.id, 'folder')"diff --git a/apps/desktop/src/components/layout/__tests__/SqlFilePanel.expandedPersistence.spec.ts b/apps/desktop/src/components/layout/__tests__/SqlFilePanel.expandedPersistence.spec.tsnew file mode 100644index 0000000000..67efce8a9d--- /dev/null+++ b/apps/desktop/src/components/layout/__tests__/SqlFilePanel.expandedPersistence.spec.ts@@ -0,0 +1,131 @@+// @vitest-environment happy-dom++import { createApp, nextTick, type App } from "vue";+import { createPinia, setActivePinia } from "pinia";+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";+import i18n from "@/i18n";+import type { SqlFileEntry } from "@/lib/backend/api";++const entries: SqlFileEntry[] = [+ {+ name: "dir1",+ path: "/sql/dir1",+ is_dir: true,+ children: [+ {+ name: "sub1.sql",+ path: "/sql/dir1/sub1.sql",+ is_dir: false,+ children: [],+ },+ ],+ },+ {+ name: "dir2",+ path: "/sql/dir2",+ is_dir: true,+ children: [+ {+ name: "sub2.sql",+ path: "/sql/dir2/sub2.sql",+ is_dir: false,+ children: [],+ },+ ],+ },+];++vi.mock("@/lib/sqlFile/sqlFileFolders", () => ({+ getSqlFileFilter: () => "*.sql",+ getSqlFileFolderPaths: () => ["/sql"],+ saveSqlFileFilter: vi.fn(),+ saveSqlFileFolderPaths: vi.fn(),+ notifySqlFileFoldersChanged: vi.fn(),+}));++vi.mock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));++vi.mock("@/lib/backend/api", async (importOriginal) => ({+ ...(await importOriginal<typeof import("@/lib/backend/api")>()),+ listSqlFilesInFolder: vi.fn(async () => entries),+}));++import SqlFilePanel from "../SqlFilePanel.vue";++const mounted: Array<{ app: App; host: HTMLElement }> = [];++async function mountSqlFilePanel() {+ const pinia = createPinia();+ setActivePinia(pinia);+ const host = document.createElement("div");+ document.body.appendChild(host);+ const app = createApp(SqlFilePanel);+ app.use(pinia);+ app.use(i18n);+ app.mount(host);+ mounted.push({ app, host });++ // Wait for initial folder load+ await vi.waitFor(() => expect(host.querySelector('[data-sql-file-path="/sql/dir1"]')).not.toBeNull());+ return { host, app };+}++beforeEach(() => {+ localStorage.clear();+});++afterEach(() => {+ for (const { app, host } of mounted.splice(0)) {+ app.unmount();+ host.remove();+ }+ vi.restoreAllMocks();+});++describe("SqlFilePanel expanded directory state persistence (issue #13593)", () => {+ it("preserves expanded subdirectories across panel remounts", async () => {+ // 1st mount: opening panel+ const first = await mountSqlFilePanel();++ // Initially, sub1.sql is not rendered because dir1 is collapsed+ expect(first.host.querySelector('[data-sql-file-path="/sql/dir1/sub1.sql"]')).toBeNull();++ // Click on dir1 row to expand it+ const dir1Row = first.host.querySelector<HTMLElement>('[data-sql-file-path="/sql/dir1"]')!;+ dir1Row.click();+ await nextTick();++ // sub1.sql is now visible+ expect(first.host.querySelector('[data-sql-file-path="/sql/dir1/sub1.sql"]')).not.toBeNull();+ // dir2 remains collapsed+ expect(first.host.querySelector('[data-sql-file-path="/sql/dir2/sub2.sql"]')).toBeNull();++ // Unmount (simulating closing the panel)+ first.app.unmount();+ first.host.remove();+ mounted.length = 0;++ // 2nd mount (simulating reopening the panel)+ const second = await mountSqlFilePanel();++ // dir1 should STILL be expanded, so sub1.sql is immediately visible!+ expect(second.host.querySelector('[data-sql-file-path="/sql/dir1/sub1.sql"]')).not.toBeNull();+ // dir2 is still collapsed+ expect(second.host.querySelector('[data-sql-file-path="/sql/dir2/sub2.sql"]')).toBeNull();++ // Expand dir2 as well+ const dir2Row = second.host.querySelector<HTMLElement>('[data-sql-file-path="/sql/dir2"]')!;+ dir2Row.click();+ await nextTick();+ expect(second.host.querySelector('[data-sql-file-path="/sql/dir2/sub2.sql"]')).not.toBeNull();++ // Remount a 3rd time+ second.app.unmount();+ second.host.remove();+ mounted.length = 0;++ const third = await mountSqlFilePanel();+ expect(third.host.querySelector('[data-sql-file-path="/sql/dir1/sub1.sql"]')).not.toBeNull();+ expect(third.host.querySelector('[data-sql-file-path="/sql/dir2/sub2.sql"]')).not.toBeNull();+ });+});diff --git a/apps/desktop/src/components/layout/__tests__/SqlLibraryPanel.expandedPersistence.spec.ts b/apps/desktop/src/components/layout/__tests__/SqlLibraryPanel.expandedPersistence.spec.tsnew file mode 100644index 0000000000..0041e5ed2e--- /dev/null+++ b/apps/desktop/src/components/layout/__tests__/SqlLibraryPanel.expandedPersistence.spec.ts@@ -0,0 +1,126 @@+// @vitest-environment happy-dom+import { createApp, nextTick, type App } from "vue";+import { createPinia, setActivePinia } from "pinia";+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";+import i18n from "@/i18n";+import { useSavedSqlStore } from "@/stores/savedSqlStore";+import type { SavedSqlFile, SavedSqlFolder } from "@/types/database";+import SqlLibraryPanel from "../SqlLibraryPanel.vue";++const mounted: Array<{ app: App; host: HTMLElement }> = [];+const timestamp = "2026-10-01T00:00:00Z";++function makeFolder(id: string, name: string, parentFolderId?: string): SavedSqlFolder {+ return { id, name, connectionId: "c1", parentFolderId, createdAt: timestamp, updatedAt: timestamp };+}++function makeFile(id: string, name: string, folderId?: string): SavedSqlFile {+ return { id, name, sql: "SELECT 1;", sqlLoaded: true, connectionId: "c1", database: "app", folderId, createdAt: timestamp, updatedAt: timestamp };+}++async function mountLibrary(folders: SavedSqlFolder[], files: SavedSqlFile[]) {+ const pinia = createPinia();+ setActivePinia(pinia);+ const store = useSavedSqlStore();+ store.loadState = "loaded";+ store.folders = [...folders];+ store.files = [...files];+ vi.spyOn(store, "ensureAllFilesLoaded").mockResolvedValue(undefined);++ const host = document.createElement("div");+ document.body.appendChild(host);+ const app = createApp(SqlLibraryPanel);+ app.use(pinia);+ app.use(i18n);+ app.mount(host);+ mounted.push({ app, host });+ await nextTick();+ return { host, store, app };+}++function visibleFileIds(host: HTMLElement): string[] {+ return [...host.querySelectorAll("[data-sql-library-file]")].map((row) => row.getAttribute("data-sql-library-file")!);+}++function folderElement(host: HTMLElement, folderId: string): HTMLElement | null {+ return host.querySelector<HTMLElement>(`[data-sql-library-folder="${folderId}"]`);+}++beforeEach(() => {+ localStorage.clear();+});++afterEach(() => {+ for (const { app, host } of mounted.splice(0)) {+ app.unmount();+ host.remove();+ }+ vi.restoreAllMocks();+});++describe("SqlLibraryPanel expanded state persistence (issue #13593)", () => {+ it("defaults to collapsed and preserves expanded state across panel remounts", async () => {+ const folders = [makeFolder("f1", "Queries"), makeFolder("f2", "Reports")];+ const files = [makeFile("q1", "query1.sql", "f1"), makeFile("r1", "report1.sql", "f2")];++ // 1st mount: opening panel for the first time+ const first = await mountLibrary(folders, files);+ expect(visibleFileIds(first.host)).toEqual([]); // both folders collapsed++ // Expand folder f1 by clicking it+ folderElement(first.host, "f1")!.click();+ await nextTick();++ // Now f1 is expanded, showing q1, while f2 remains collapsed+ expect(visibleFileIds(first.host)).toEqual(["q1"]);++ // Unmount (simulating closing the panel)+ first.app.unmount();+ first.host.remove();+ mounted.length = 0;++ // 2nd mount (simulating reopening the panel)+ const second = await mountLibrary(folders, files);+ // f1 should STILL be expanded, f2 should STILL be collapsed!+ expect(visibleFileIds(second.host)).toEqual(["q1"]);++ // Expand f2 as well+ folderElement(second.host, "f2")!.click();+ await nextTick();+ expect(visibleFileIds(second.host)).toEqual(["q1", "r1"]);++ // Unmount and remount again+ second.app.unmount();+ second.host.remove();+ mounted.length = 0;++ const third = await mountLibrary(folders, files);+ expect(visibleFileIds(third.host)).toEqual(["q1", "r1"]);+ });++ it("persists collapsed-all state", async () => {+ const folders = [makeFolder("f1", "Queries")];+ const files = [makeFile("q1", "query1.sql", "f1")];++ const first = await mountLibrary(folders, files);+ // Expand folder f1+ folderElement(first.host, "f1")!.click();+ await nextTick();+ expect(visibleFileIds(first.host)).toEqual(["q1"]);++ // Click collapse all button+ const collapseAllBtn = first.host.querySelector<HTMLButtonElement>("button:has(.lucide-chevrons-down-up)");+ expect(collapseAllBtn).not.toBeNull();+ collapseAllBtn!.click();+ await nextTick();+ expect(visibleFileIds(first.host)).toEqual([]);++ // Remount+ first.app.unmount();+ first.host.remove();+ mounted.length = 0;++ const second = await mountLibrary(folders, files);+ expect(visibleFileIds(second.host)).toEqual([]);+ });+});diff --git a/apps/desktop/src/lib/savedSql/__tests__/savedSqlUiState.spec.ts b/apps/desktop/src/lib/savedSql/__tests__/savedSqlUiState.spec.tsnew file mode 100644index 0000000000..0b77d2854d--- /dev/null+++ b/apps/desktop/src/lib/savedSql/__tests__/savedSqlUiState.spec.ts@@ -0,0 +1,29 @@+// @vitest-environment happy-dom+import { beforeEach, describe, expect, it } from "vitest";+import { getSavedSqlExpandedFolderIds, saveSavedSqlExpandedFolderIds, SQL_LIBRARY_EXPANDED_FOLDERS_STORAGE_KEY } from "../savedSqlUiState";++describe("savedSqlUiState", () => {+ beforeEach(() => {+ localStorage.clear();+ });++ it("returns an empty set when no expanded folder IDs have been persisted", () => {+ expect(getSavedSqlExpandedFolderIds()).toEqual(new Set());+ });++ it("persists and restores expanded folder IDs", () => {+ saveSavedSqlExpandedFolderIds(new Set(["folder-1", "folder-2"]));+ expect(getSavedSqlExpandedFolderIds()).toEqual(new Set(["folder-1", "folder-2"]));+ });++ it("handles corrupted or invalid storage values safely", () => {+ localStorage.setItem(SQL_LIBRARY_EXPANDED_FOLDERS_STORAGE_KEY, "not-json");+ expect(getSavedSqlExpandedFolderIds()).toEqual(new Set());++ localStorage.setItem(SQL_LIBRARY_EXPANDED_FOLDERS_STORAGE_KEY, JSON.stringify({ not: "an array" }));+ expect(getSavedSqlExpandedFolderIds()).toEqual(new Set());++ localStorage.setItem(SQL_LIBRARY_EXPANDED_FOLDERS_STORAGE_KEY, JSON.stringify(["valid", 123, null]));+ expect(getSavedSqlExpandedFolderIds()).toEqual(new Set(["valid"]));+ });+});diff --git a/apps/desktop/src/lib/savedSql/savedSqlUiState.ts b/apps/desktop/src/lib/savedSql/savedSqlUiState.tsnew file mode 100644index 0000000000..607abb22b5--- /dev/null+++ b/apps/desktop/src/lib/savedSql/savedSqlUiState.ts@@ -0,0 +1,25 @@+import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage";++export const SQL_LIBRARY_EXPANDED_FOLDERS_STORAGE_KEY = "dbx-sql-library-expanded-folders";++/**+ * Load the persisted set of expanded folder IDs in the SQL Library panel.+ * Defaults to an empty set so that all folders start collapsed until explicitly expanded.+ */+export function getSavedSqlExpandedFolderIds(): Set<string> {+ try {+ const raw = safeLocalStorageGet(SQL_LIBRARY_EXPANDED_FOLDERS_STORAGE_KEY);+ if (!raw) return new Set();+ const parsed = JSON.parse(raw);+ return Array.isArray(parsed) ? new Set(parsed.filter((id): id is string => typeof id === "string")) : new Set();+ } catch {+ return new Set();+ }+}++/**+ * Persist the current set of expanded folder IDs in the SQL Library panel.+ */+export function saveSavedSqlExpandedFolderIds(expandedIds: ReadonlySet<string>): void {+ safeLocalStorageSet(SQL_LIBRARY_EXPANDED_FOLDERS_STORAGE_KEY, JSON.stringify([...expandedIds]));+}diff --git a/apps/desktop/src/lib/sqlFile/__tests__/sqlFileUiState.spec.ts b/apps/desktop/src/lib/sqlFile/__tests__/sqlFileUiState.spec.tsnew file mode 100644index 0000000000..ee8c3fa0da--- /dev/null+++ b/apps/desktop/src/lib/sqlFile/__tests__/sqlFileUiState.spec.ts@@ -0,0 +1,60 @@+// @vitest-environment happy-dom+import { beforeEach, describe, expect, it } from "vitest";+import { getSqlFileFoldersUiState, saveSqlFileFoldersUiState, SQL_FILE_FOLDERS_UI_STATE_STORAGE_KEY } from "../sqlFileUiState";++describe("sqlFileUiState", () => {+ beforeEach(() => {+ localStorage.clear();+ });++ it("returns empty object when no state has been saved", () => {+ expect(getSqlFileFoldersUiState()).toEqual({});+ });++ it("persists and restores folder UI state including collapsed roots and expanded subdirectories", () => {+ saveSqlFileFoldersUiState({+ "/project/sql": {+ collapsed: false,+ expanded: ["/project/sql/migrations", "/project/sql/seeds"],+ },+ "/other/scripts": {+ collapsed: true,+ expanded: [],+ },+ });++ const restored = getSqlFileFoldersUiState();+ expect(restored).toEqual({+ "/project/sql": {+ collapsed: false,+ expanded: ["/project/sql/migrations", "/project/sql/seeds"],+ },+ "/other/scripts": {+ collapsed: true,+ expanded: [],+ },+ });+ });++ it("sanitizes corrupted localStorage values gracefully", () => {+ localStorage.setItem(SQL_FILE_FOLDERS_UI_STATE_STORAGE_KEY, "{ broken json");+ expect(getSqlFileFoldersUiState()).toEqual({});++ localStorage.setItem(SQL_FILE_FOLDERS_UI_STATE_STORAGE_KEY, "[]");+ expect(getSqlFileFoldersUiState()).toEqual({});++ localStorage.setItem(+ SQL_FILE_FOLDERS_UI_STATE_STORAGE_KEY,+ JSON.stringify({+ "/path": { collapsed: "invalid", expanded: [123, "/path/valid"] },+ invalidEntry: "not an object",+ }),+ );+ expect(getSqlFileFoldersUiState()).toEqual({+ "/path": {+ collapsed: false,+ expanded: ["/path/valid"],+ },+ });+ });+});diff --git a/apps/desktop/src/lib/sqlFile/sqlFileUiState.ts b/apps/desktop/src/lib/sqlFile/sqlFileUiState.tsnew file mode 100644index 0000000000..fef8b92d2c--- /dev/null+++ b/apps/desktop/src/lib/sqlFile/sqlFileUiState.ts@@ -0,0 +1,40 @@+import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage";++export const SQL_FILE_FOLDERS_UI_STATE_STORAGE_KEY = "dbx-sql-file-folders-ui-state";++export interface SqlFileFolderUiState {+ collapsed?: boolean;+ expanded?: string[];+}++/**+ * Load the persisted UI state (collapsed root flag and expanded subdirectory paths)+ * for each external SQL file folder.+ */+export function getSqlFileFoldersUiState(): Record<string, SqlFileFolderUiState> {+ try {+ const raw = safeLocalStorageGet(SQL_FILE_FOLDERS_UI_STATE_STORAGE_KEY);+ if (!raw) return {};+ const parsed = JSON.parse(raw);+ if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};+ const result: Record<string, SqlFileFolderUiState> = {};+ for (const [key, value] of Object.entries(parsed)) {+ if (!value || typeof value !== "object") continue;+ const v = value as { collapsed?: unknown; expanded?: unknown };+ result[key] = {+ collapsed: typeof v.collapsed === "boolean" ? v.collapsed : false,+ expanded: Array.isArray(v.expanded) ? v.expanded.filter((p): p is string => typeof p === "string") : [],+ };+ }+ return result;+ } catch {+ return {};+ }+}++/**+ * Persist the UI state for all external SQL file folders.+ */+export function saveSqlFileFoldersUiState(state: Record<string, SqlFileFolderUiState>): void {+ safeLocalStorageSet(SQL_FILE_FOLDERS_UI_STATE_STORAGE_KEY, JSON.stringify(state));+}