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
fix(desktop): keep SQL library hierarchy when sorting by date (#11800)
onenewcodef0efcc728637
diff --git a/apps/desktop/src/components/layout/SqlLibraryPanel.vue b/apps/desktop/src/components/layout/SqlLibraryPanel.vueindex a59208eae0..6a26e83d9a 100644--- a/apps/desktop/src/components/layout/SqlLibraryPanel.vue+++ b/apps/desktop/src/components/layout/SqlLibraryPanel.vue@@ -58,6 +58,7 @@ import { savedSqlBatchErrorMessage, savedSqlErrorMessage } from "@/lib/savedSql/import { savedSqlDatabaseScopeKey } from "@/lib/savedSql/savedSqlDatabaseTree";import { ensureSqlExtension, extractCandidateDatabaseFromName, nextAvailableSqlName } from "@/lib/savedSql/savedSqlFileName";import { savedSqlImportTarget } from "@/lib/savedSql/savedSqlImportTarget";+import { buildSavedSqlTreeRows, savedSqlFolderBranchMatches, type SavedSqlTreeRow } from "@/lib/savedSql/savedSqlTreeRows";import { savedSqlExecutionTargetFromTab, type SavedSqlOpenTargetMode } from "@/lib/savedSql/savedSqlExecutionTarget";import { uniqueSavedSqlExportFileName, exportSavedSqlFileContent } from "@/lib/savedSql/savedSqlExport";import { orderedListRangeAnchorIndex, orderedListSelectionIntent } from "@/lib/selection/orderedListSelection";@@ -95,7 +96,7 @@ watch(searchText, (text) => {}});-// Sort mode: "folder" (default tree structure) or "date" (flat list by update date)+// Sort mode: "folder" (manual sibling order) or "date" (updated date among siblings)const sortMode = ref<"folder" | "date">("folder");function getConnectionLabel(connectionId: string) {@@ -360,8 +361,7 @@ function fileMatchesQuery(file: SavedSqlFile) {function folderMatchesQuery(folder: SavedSqlFolder) {const q = searchQuery.value;if (!q) return true;- if (folder.name.toLowerCase().includes(q)) return true;- return savedSqlStore.filesInFolder(folder.id).some((file) => fileMatchesQuery(file));+ return folder.name.toLowerCase().includes(q);}function childFolders(parentFolderId?: string) {@@ -374,8 +374,8 @@ function descendantFolders(parentFolderId: string): SavedSqlFolder[] {}function folderBranchMatchesQuery(folder: SavedSqlFolder) {- if (folderMatchesQuery(folder)) return true;- return descendantFolders(folder.id).some((child) => folderMatchesQuery(child));+ if (!searchQuery.value) return true;+ return savedSqlFolderBranchMatches(folder, savedSqlStore.allFolders, savedSqlStore.allFiles, folderMatchesQuery, fileMatchesQuery);}function filesInFolder(folderId: string) {@@ -393,40 +393,16 @@ function allFilesInFolderBranch(folderId: string): SavedSqlFile[] {return savedSqlStore.allFiles.filter((file) => file.folderId && branchFolderIds.includes(file.folderId));}-type SqlLibraryRow = { type: "folder"; folder: SavedSqlFolder; depth: number; folderIndex: number } | { type: "file"; file: SavedSqlFile; depth: number };--const visibleFolderRows = computed<SqlLibraryRow[]>(() => {- const rows: SqlLibraryRow[] = [];- let folderIndex = 0;- const appendFolder = (folder: SavedSqlFolder, depth: number) => {- if (!folderBranchMatchesQuery(folder)) return;- rows.push({ type: "folder", folder, depth, folderIndex: folderIndex++ });- if (!isFolderExpanded(folder)) return;- for (const child of childFolders(folder.id)) {- appendFolder(child, depth + 1);- }- for (const file of filesInFolder(folder.id)) {- rows.push({ type: "file", file, depth: depth + 1 });- }- };- for (const folder of childFolders()) {- appendFolder(folder, 0);- }- return rows;-});--const visibleFiles = computed(() => savedSqlStore.filesWithoutFolder().filter((file) => fileMatchesQuery(file)));--// Flat list sorted by updatedAt (descending) - combines all folders and files-const itemsByDate = computed(() => {- const allFolders = savedSqlStore.allFolders.filter((folder) => folderBranchMatchesQuery(folder)).map((folder) => ({ type: "folder" as const, item: folder, updatedAt: folder.updatedAt }));-- const allFiles = [...savedSqlStore.allFolders.flatMap((folder) => filesInFolder(folder.id)), ...visibleFiles.value].map((file) => ({ type: "file" as const, item: file, updatedAt: file.updatedAt }));-- return [...allFolders, ...allFiles].sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));-});+const treeRows = computed<SavedSqlTreeRow[]>(() =>+ buildSavedSqlTreeRows(savedSqlStore.allFolders, savedSqlStore.allFiles, {+ mode: sortMode.value,+ isFolderExpanded,+ folderMatches: searchQuery.value ? folderMatchesQuery : undefined,+ fileMatches: searchQuery.value ? fileMatchesQuery : undefined,+ }),+);-const hasAnyVisibleItem = computed(() => visibleFolderRows.value.length > 0 || visibleFiles.value.length > 0);+const hasAnyVisibleItem = computed(() => treeRows.value.length > 0);const collapsedFolders = ref<Set<string>>(new Set());@@ -562,16 +538,10 @@ watch(// Unified item list for selection, matching the currently rendered order.const allSelectableItems = computed(() => {- if (sortMode.value === "date") {- return itemsByDate.value.map((item) => ({- type: item.type,- id: item.item.id,- }));- }-- const treeItems = visibleFolderRows.value.map((row) => (row.type === "folder" ? { type: "folder" as const, id: row.folder.id } : { type: "file" as const, id: row.file.id }));- const rootFiles = visibleFiles.value.map((file) => ({ type: "file" as const, id: file.id }));- return [...treeItems, ...rootFiles];+ return treeRows.value.map((row) => ({+ type: row.type,+ id: row.type === "folder" ? row.folder.id : row.file.id,+ }));});const hasSelection = computed(() => selectedFileIds.value.size > 0 || selectedFolderIds.value.size > 0);@@ -1605,7 +1575,7 @@ function showDropInside(targetId: string) {<span v-if="hasSelection" class="text-[12px] text-muted-foreground ml-1">({{ selectedCount }})</span><span class="flex-1" /><LightTooltip :text="t('sqlLibrary.collapseAll')" side="bottom" :delay="0" :close-delay="0" nowrap :disabled="!hasAnyFolder()">- <Button variant="ghost" size="icon" class="h-5 w-5" :disabled="!hasAnyFolder() || sortMode === 'date'" @click="collapseAllFolders">+ <Button variant="ghost" size="icon" class="h-5 w-5" :disabled="!hasAnyFolder()" @click="collapseAllFolders"><ChevronsDownUp class="h-3 w-3" /></Button></LightTooltip>@@ -1667,114 +1637,88 @@ function showDropInside(targetId: string) {onContextMenu($event);">- <!-- Flat list sorted by date -->- <div v-if="sortMode === 'date'" class="space-y-0">- <div v-for="item in itemsByDate" :key="item.type + '-' + item.item.id">- <div- v-if="item.type === 'folder'"- class="relative flex cursor-default items-center gap-1 px-2 py-1.5 text-[13px] group"- :class="[folderRowClass(item.item.id), isDraggingItem(item.item.id) ? 'opacity-50' : '']"- @mousedown="handleDragMouseDown($event, item.item.id, 'folder')"- @click="handleFolderClick(item.item, $event)"- @contextmenu.capture="contextTarget = item.item"- @contextmenu.prevent="- contextTarget = item.item;- onContextMenu($event);- "- >- <FolderClosed class="h-4 w-4 text-amber-500 shrink-0" />- <template v-if="isRenamingFolder(item.item.id)">- <input- :ref="setRenameInputRef"- v-model="renameValue"- data-preserve-editor-focus- data-no-drag="true"- class="min-w-0 flex-1 rounded border border-primary/50 bg-transparent px-1 text-[13px] outline-none"- @keydown.enter.prevent="confirmRename"- @keydown.escape.prevent="cancelRename"- @focus="handleRenameInputFocus"- @blur="handleRenameInputBlur"- @mousedown.stop- @click.stop- />- </template>- <span v-else class="dbx-sql-library-drag-label min-w-0 flex-1 truncate">- {{ item.item.name }}- <span class="ml-1 text-muted-foreground">({{ folderFileCount(item.item.id) }})</span>- </span>- <LightTooltip v-if="!isRenamingFolder(item.item.id)" :text="t('savedSql.newSubfolder')" side="left" :delay="0" :close-delay="0" nowrap>- <button- type="button"- data-no-drag="true"- class="flex h-5 w-5 shrink-0 items-center justify-center rounded text-muted-foreground/70 hover:bg-accent hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"- :aria-label="t('savedSql.newSubfolder')"- @mousedown.stop- @click.stop="openNewFolderInput(item.item.id)"- >- <FolderPlus class="h-3.5 w-3.5" />- </button>- </LightTooltip>- </div>+ <div+ v-if="dragState.draggedType === 'file'"+ class="relative px-2 py-1 text-[10px] font-medium uppercase text-muted-foreground"+ :class="showDropInside(UNFILED_DROP_TARGET_ID) ? 'ring-1 ring-primary/50 bg-primary/5' : ''"+ @mousemove="updateDropTarget($event, UNFILED_DROP_TARGET_ID, 'unfiled')"+ @mouseleave="clearDropTarget(UNFILED_DROP_TARGET_ID)"+ >+ {{ t("sqlLibrary.unfiled") }}+ </div>- <template v-else>- <div- class="relative flex cursor-default items-center gap-1 px-2 py-1.5 text-[13px] group"- :class="[fileRowClass(item.item.id), isDraggingItem(item.item.id) ? 'opacity-50' : '']"- @mousedown="handleDragMouseDown($event, item.item.id, 'file')"- @click="handleFileClick(item.item, $event)"- @contextmenu.capture="contextTarget = item.item"- @contextmenu.prevent="- contextTarget = item.item;- onContextMenu($event);- "- >- <FileText class="h-3.5 w-3.5 text-blue-400 shrink-0" />- <span v-if="isFileDirty(item.item)" aria-hidden="true" class="dirty-sql-library-marker">*</span>- <template v-if="isRenamingFile(item.item.id)">- <input- :ref="setRenameInputRef"- v-model="renameValue"- data-preserve-editor-focus- data-no-drag="true"- class="min-w-0 flex-1 rounded border border-primary/50 bg-transparent px-1 text-[13px] outline-none"- @keydown.enter.prevent="confirmRename"- @keydown.escape.prevent="cancelRename"- @focus="handleRenameInputFocus"- @blur="handleRenameInputBlur"- @mousedown.stop- @click.stop- />- </template>- <span v-else class="dbx-sql-library-drag-label min-w-0 flex-1 truncate" :title="fileTitleLabel(item.item)" :style="fileTitleStyle(item.item)">{{ item.item.name }}</span>- <span class="min-w-0 max-w-[45%] shrink truncate text-[13px]" :class="fileMetaClass(item.item.id)" :title="getConnectionLabel(item.item.connectionId)">[{{ getConnectionLabel(item.item.connectionId) }}]</span>- </div>- <SqlLibrarySearchSnippet v-if="searchQuery" :file="item.item" :query="searchQuery" @select-match="(match) => handleMatchClick(item.item, match)" />+ <div v-for="row in treeRows" :key="row.type + '-' + (row.type === 'folder' ? row.folder.id : row.file.id)">+ <div+ v-if="row.type === 'folder'"+ class="relative flex cursor-default items-center gap-1 py-1.5 pr-2 text-[13px] group"+ :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')"+ @mousemove="updateDropTarget($event, row.folder.id, 'folder')"+ @mouseleave="clearDropTarget(row.folder.id)"+ @click="handleFolderClick(row.folder, $event)"+ @contextmenu.capture="contextTarget = row.folder"+ @contextmenu.prevent="+ contextTarget = row.folder;+ onContextMenu($event);+ "+ >+ <div v-if="showDropBefore(row.folder.id)" class="absolute left-2 right-2 top-0 border-t-2 border-primary" />+ <div v-if="showDropAfter(row.folder.id)" class="absolute left-2 right-2 bottom-0 border-b-2 border-primary" />+ <component :is="isFolderExpanded(row.folder) ? FolderOpen : FolderClosed" class="h-4 w-4 text-amber-500 shrink-0" />+ <template v-if="isRenamingFolder(row.folder.id)">+ <input+ :ref="setRenameInputRef"+ v-model="renameValue"+ data-preserve-editor-focus+ data-no-drag="true"+ class="min-w-0 flex-1 rounded border border-primary/50 bg-transparent px-1 text-[13px] outline-none"+ @keydown.enter.prevent="confirmRename"+ @keydown.escape.prevent="cancelRename"+ @focus="handleRenameInputFocus"+ @blur="handleRenameInputBlur"+ @mousedown.stop+ @click.stop+ /></template>+ <span v-else class="dbx-sql-library-drag-label min-w-0 flex-1 truncate">+ {{ row.folder.name }}+ <span class="ml-1 text-muted-foreground">({{ folderFileCount(row.folder.id) }})</span>+ </span>+ <LightTooltip v-if="!isRenamingFolder(row.folder.id)" :text="t('savedSql.newSubfolder')" side="left" :delay="0" :close-delay="0" nowrap>+ <button+ type="button"+ data-no-drag="true"+ class="flex h-5 w-5 shrink-0 items-center justify-center rounded text-muted-foreground/70 hover:bg-accent hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"+ :aria-label="t('savedSql.newSubfolder')"+ @mousedown.stop+ @click.stop="openNewFolderInput(row.folder.id)"+ >+ <FolderPlus class="h-3.5 w-3.5" />+ </button>+ </LightTooltip></div>- </div>- <!-- Tree structure sorted by folder -->- <div v-else>- <div v-for="row in visibleFolderRows" :key="row.type === 'folder' ? row.folder.id : row.file.id">+ <template v-else><div- v-if="row.type === 'folder'"class="relative flex cursor-default items-center gap-1 py-1.5 pr-2 text-[13px] group":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')"- @mousemove="updateDropTarget($event, row.folder.id, 'folder')"- @mouseleave="clearDropTarget(row.folder.id)"- @click="handleFolderClick(row.folder, $event)"- @contextmenu.capture="contextTarget = row.folder"+ :class="[fileRowClass(row.file.id), isDraggingItem(row.file.id) ? 'opacity-50' : '']"+ @mousedown="handleDragMouseDown($event, row.file.id, 'file')"+ @mousemove="updateDropTarget($event, row.file.id, 'file')"+ @mouseleave="clearDropTarget(row.file.id)"+ @click="handleFileClick(row.file, $event)"+ @contextmenu.capture="contextTarget = row.file"@contextmenu.prevent="- contextTarget = row.folder;+ contextTarget = row.file;onContextMenu($event);">- <div v-if="showDropBefore(row.folder.id)" class="absolute left-2 right-2 top-0 border-t-2 border-primary" />- <div v-if="showDropAfter(row.folder.id)" class="absolute left-2 right-2 bottom-0 border-b-2 border-primary" />- <component :is="isFolderExpanded(row.folder) ? FolderOpen : FolderClosed" class="h-4 w-4 text-amber-500 shrink-0" />- <template v-if="isRenamingFolder(row.folder.id)">+ <div v-if="showDropBefore(row.file.id)" class="absolute left-2 right-2 top-0 border-t-2 border-primary" />+ <div v-if="showDropAfter(row.file.id)" class="absolute left-2 right-2 bottom-0 border-b-2 border-primary" />+ <FileText class="h-3.5 w-3.5 text-blue-400 shrink-0" />+ <span v-if="isFileDirty(row.file)" aria-hidden="true" class="dirty-sql-library-marker">*</span>+ <template v-if="isRenamingFile(row.file.id)"><input:ref="setRenameInputRef"v-model="renameValue"@@ -1789,116 +1733,12 @@ function showDropInside(targetId: string) {@click.stop/></template>- <span v-else class="dbx-sql-library-drag-label min-w-0 flex-1 truncate">- {{ row.folder.name }}- <span class="ml-1 text-muted-foreground">({{ folderFileCount(row.folder.id) }})</span>- </span>- <LightTooltip v-if="!isRenamingFolder(row.folder.id)" :text="t('savedSql.newSubfolder')" side="left" :delay="0" :close-delay="0" nowrap>- <button- type="button"- data-no-drag="true"- class="flex h-5 w-5 shrink-0 items-center justify-center rounded text-muted-foreground/70 hover:bg-accent hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"- :aria-label="t('savedSql.newSubfolder')"- @mousedown.stop- @click.stop="openNewFolderInput(row.folder.id)"- >- <FolderPlus class="h-3.5 w-3.5" />- </button>- </LightTooltip>- </div>-- <template v-else>- <div- class="relative flex cursor-default items-center gap-1 py-1.5 pr-2 text-[13px] group"- :style="{ paddingLeft: `${8 + row.depth * 16}px` }"- :class="[fileRowClass(row.file.id), isDraggingItem(row.file.id) ? 'opacity-50' : '']"- @mousedown="handleDragMouseDown($event, row.file.id, 'file')"- @mousemove="updateDropTarget($event, row.file.id, 'file')"- @mouseleave="clearDropTarget(row.file.id)"- @click="handleFileClick(row.file, $event)"- @contextmenu.capture="contextTarget = row.file"- @contextmenu.prevent="- contextTarget = row.file;- onContextMenu($event);- "- >- <div v-if="showDropBefore(row.file.id)" class="absolute left-2 right-2 top-0 border-t-2 border-primary" />- <div v-if="showDropAfter(row.file.id)" class="absolute left-2 right-2 bottom-0 border-b-2 border-primary" />- <FileText class="h-3.5 w-3.5 text-blue-400 shrink-0" />- <span v-if="isFileDirty(row.file)" aria-hidden="true" class="dirty-sql-library-marker">*</span>- <template v-if="isRenamingFile(row.file.id)">- <input- :ref="setRenameInputRef"- v-model="renameValue"- data-preserve-editor-focus- data-no-drag="true"- class="min-w-0 flex-1 rounded border border-primary/50 bg-transparent px-1 text-[13px] outline-none"- @keydown.enter.prevent="confirmRename"- @keydown.escape.prevent="cancelRename"- @focus="handleRenameInputFocus"- @blur="handleRenameInputBlur"- @mousedown.stop- @click.stop- />- </template>- <span v-else class="dbx-sql-library-drag-label min-w-0 flex-1 truncate" :title="fileTitleLabel(row.file)" :style="fileTitleStyle(row.file)">{{ row.file.name }}</span>- <span class="min-w-0 max-w-[45%] shrink truncate text-[13px]" :class="fileMetaClass(row.file.id)" :title="getConnectionLabel(row.file.connectionId)">[{{ getConnectionLabel(row.file.connectionId) }}]</span>- </div>- <SqlLibrarySearchSnippet v-if="searchQuery" :file="row.file" :query="searchQuery" :depth="row.depth" @select-match="(match) => handleMatchClick(row.file, match)" />- </template>- </div>-- <div v-if="visibleFiles.length > 0 || dragState.draggedType === 'file'">- <div- v-if="dragState.draggedType === 'file'"- class="relative px-2 py-1 text-[10px] font-medium uppercase text-muted-foreground"- :class="showDropInside(UNFILED_DROP_TARGET_ID) ? 'ring-1 ring-primary/50 bg-primary/5' : ''"- @mousemove="updateDropTarget($event, UNFILED_DROP_TARGET_ID, 'unfiled')"- @mouseleave="clearDropTarget(UNFILED_DROP_TARGET_ID)"- >- {{ t("sqlLibrary.unfiled") }}+ <span v-else class="dbx-sql-library-drag-label min-w-0 flex-1 truncate" :title="fileTitleLabel(row.file)" :style="fileTitleStyle(row.file)">{{ row.file.name }}</span>+ <span class="min-w-0 max-w-[45%] shrink truncate text-[13px]" :class="fileMetaClass(row.file.id)" :title="getConnectionLabel(row.file.connectionId)">[{{ getConnectionLabel(row.file.connectionId) }}]</span></div>- <template v-for="file in visibleFiles" :key="file.id">- <div- class="relative flex cursor-default items-center gap-1 px-2 py-1.5 text-[13px] group"- :class="[fileRowClass(file.id), isDraggingItem(file.id) ? 'opacity-50' : '']"- @mousedown="handleDragMouseDown($event, file.id, 'file')"- @mousemove="updateDropTarget($event, file.id, 'file')"- @mouseleave="clearDropTarget(file.id)"- @click="handleFileClick(file, $event)"- @contextmenu.capture="contextTarget = file"- @contextmenu.prevent="- contextTarget = file;- onContextMenu($event);- "- >- <div v-if="showDropBefore(file.id)" class="absolute left-2 right-2 top-0 border-t-2 border-primary" />- <div v-if="showDropAfter(file.id)" class="absolute left-2 right-2 bottom-0 border-b-2 border-primary" />- <FileText class="h-3.5 w-3.5 text-blue-400 shrink-0" />- <span v-if="isFileDirty(file)" aria-hidden="true" class="dirty-sql-library-marker">*</span>- <template v-if="isRenamingFile(file.id)">- <input- :ref="setRenameInputRef"- v-model="renameValue"- data-preserve-editor-focus- data-no-drag="true"- class="min-w-0 flex-1 rounded border border-primary/50 bg-transparent px-1 text-[13px] outline-none"- @keydown.enter.prevent="confirmRename"- @keydown.escape.prevent="cancelRename"- @focus="handleRenameInputFocus"- @blur="handleRenameInputBlur"- @mousedown.stop- @click.stop- />- </template>- <span v-else class="dbx-sql-library-drag-label min-w-0 flex-1 truncate" :title="fileTitleLabel(file)" :style="fileTitleStyle(file)">{{ file.name }}</span>- <span class="min-w-0 max-w-[45%] shrink truncate text-[13px]" :class="fileMetaClass(file.id)" :title="getConnectionLabel(file.connectionId)">[{{ getConnectionLabel(file.connectionId) }}]</span>- </div>- <SqlLibrarySearchSnippet v-if="searchQuery" :file="file" :query="searchQuery" @select-match="(match) => handleMatchClick(file, match)" />- </template>- </div>+ <SqlLibrarySearchSnippet v-if="searchQuery" :file="row.file" :query="searchQuery" :depth="row.depth" @select-match="(match) => handleMatchClick(row.file, match)" />+ </template></div>- <!-- End tree structure --><div v-if="savedSqlStore.loadState === 'idle' || savedSqlStore.loadState === 'loading'" class="flex h-full flex-col items-center justify-center gap-2 text-muted-foreground" role="status" aria-live="polite"><Loader2 class="h-6 w-6 animate-spin motion-reduce:animate-none" aria-hidden="true" />diff --git a/apps/desktop/src/lib/__tests__/savedSql/savedSqlTreeRows.spec.ts b/apps/desktop/src/lib/__tests__/savedSql/savedSqlTreeRows.spec.tsnew file mode 100644index 0000000000..d5c2954e5b--- /dev/null+++ b/apps/desktop/src/lib/__tests__/savedSql/savedSqlTreeRows.spec.ts@@ -0,0 +1,118 @@+import { describe, expect, it } from "vitest";+import { buildSavedSqlTreeRows } from "@/lib/savedSql/savedSqlTreeRows";+import type { SavedSqlFile, SavedSqlFolder } from "@/types/database";++function folder(overrides: Partial<SavedSqlFolder> & Pick<SavedSqlFolder, "id" | "name">): SavedSqlFolder {+ return {+ connectionId: "connection",+ createdAt: "2024-01-01T00:00:00.000Z",+ updatedAt: "2024-01-01T00:00:00.000Z",+ ...overrides,+ };+}++function file(overrides: Partial<SavedSqlFile> & Pick<SavedSqlFile, "id" | "name">): SavedSqlFile {+ return {+ connectionId: "connection",+ database: "database",+ sql: "select 1",+ createdAt: "2024-01-01T00:00:00.000Z",+ updatedAt: "2024-01-01T00:00:00.000Z",+ ...overrides,+ };+}++describe("buildSavedSqlTreeRows", () => {+ it("keeps queries under their folder with the correct depth", () => {+ const rows = buildSavedSqlTreeRows([folder({ id: "reports", name: "Reports" })], [file({ id: "monthly", name: "monthly.sql", folderId: "reports" })], { mode: "folder" });++ expect(rows).toEqual([+ { type: "folder", folder: expect.objectContaining({ id: "reports" }), depth: 0 },+ { type: "file", file: expect.objectContaining({ id: "monthly" }), depth: 1 },+ ]);+ });++ it("keeps nested folders under their parent instead of promoting them", () => {+ const rows = buildSavedSqlTreeRows([folder({ id: "root", name: "Root" }), folder({ id: "child", name: "Child", parentFolderId: "root" }), folder({ id: "grandchild", name: "Grandchild", parentFolderId: "child" })], [file({ id: "nested", name: "nested.sql", folderId: "grandchild" })], {+ mode: "folder",+ });++ expect(rows.map((row) => [row.type, row.depth])).toEqual([+ ["folder", 0],+ ["folder", 1],+ ["folder", 2],+ ["file", 3],+ ]);+ expect(rows[2]).toMatchObject({ folder: { parentFolderId: "child" } });+ });++ it("sorts folders and files by updatedAt only among siblings in date mode", () => {+ const rootFolder = folder({ id: "root", name: "Root", updatedAt: "2024-01-01T00:00:00.000Z" });+ const childFolder = folder({ id: "child", name: "Child", parentFolderId: "root", updatedAt: "2024-01-03T00:00:00.000Z" });+ const childFile = file({ id: "child-file", name: "child.sql", folderId: "root", updatedAt: "2024-01-04T00:00:00.000Z" });+ const nestedFile = file({ id: "nested", name: "nested.sql", folderId: "child", updatedAt: "2024-01-02T00:00:00.000Z" });++ const rows = buildSavedSqlTreeRows([rootFolder, childFolder], [childFile, nestedFile], { mode: "date" });++ expect(rows.map((row) => (row.type === "folder" ? row.folder.id : row.file.id))).toEqual(["root", "child-file", "child", "nested"]);+ });++ it("uses names as a stable date tie-breaker", () => {+ const updatedAt = "2024-02-01T00:00:00.000Z";+ const rows = buildSavedSqlTreeRows([], [file({ id: "ten", name: "report10.sql", updatedAt }), file({ id: "two", name: "report2.sql", updatedAt })], { mode: "date" });++ expect(rows.map((row) => (row.type === "file" ? row.file.name : ""))).toEqual(["report2.sql", "report10.sql"]);+ });++ it("keeps folder-first orderIndex ordering in folder mode", () => {+ const rows = buildSavedSqlTreeRows(+ [folder({ id: "second", name: "Second", orderIndex: 2 }), folder({ id: "first", name: "First", orderIndex: 1 })],+ [file({ id: "newer", name: "newer.sql", orderIndex: 1, updatedAt: "2025-01-01T00:00:00.000Z" }), file({ id: "older", name: "older.sql", orderIndex: 2, updatedAt: "2020-01-01T00:00:00.000Z" })],+ { mode: "folder" },+ );++ expect(rows.map((row) => (row.type === "folder" ? row.folder.id : row.file.id))).toEqual(["first", "second", "newer", "older"]);+ });++ it("keeps root files and mixes them with root folders by date", () => {+ const rows = buildSavedSqlTreeRows(+ [folder({ id: "folder", name: "Folder", updatedAt: "2024-03-01T00:00:00.000Z" })],+ [file({ id: "root-file", name: "root.sql", updatedAt: "2024-03-02T00:00:00.000Z" }), file({ id: "nested-file", name: "nested.sql", folderId: "folder", updatedAt: "2024-03-03T00:00:00.000Z" })],+ { mode: "date" },+ );++ expect(+ rows.map((row) => ({+ id: row.type === "folder" ? row.folder.id : row.file.id,+ depth: row.depth,+ })),+ ).toEqual([+ { id: "root-file", depth: 0 },+ { id: "folder", depth: 0 },+ { id: "nested-file", depth: 1 },+ ]);+ });++ it("applies search and collapse only to visible rows without changing depths", () => {+ const folders = [folder({ id: "root", name: "Root" }), folder({ id: "child", name: "Child", parentFolderId: "root" }), folder({ id: "grandchild", name: "Grandchild", parentFolderId: "child" })];+ const files = [file({ id: "match", name: "monthly.sql", folderId: "grandchild" }), file({ id: "unmatched-root", name: "unrelated.sql" })];++ const searched = buildSavedSqlTreeRows(folders, files, {+ mode: "date",+ fileMatches: (candidate) => candidate.name.includes("monthly"),+ });+ expect(searched.map((row) => [row.type, row.depth])).toEqual([+ ["folder", 0],+ ["folder", 1],+ ["folder", 2],+ ["file", 3],+ ]);++ const collapsed = buildSavedSqlTreeRows(folders, files, {+ mode: "date",+ isFolderExpanded: (candidate) => candidate.id !== "child",+ });+ expect(collapsed.map((row) => (row.type === "folder" ? row.folder.id : row.file.id))).toEqual(["root", "child", "unmatched-root"]);+ expect(collapsed.map((row) => row.depth)).toEqual([0, 1, 0]);+ });+});diff --git a/apps/desktop/src/lib/savedSql/savedSqlTreeRows.ts b/apps/desktop/src/lib/savedSql/savedSqlTreeRows.tsnew file mode 100644index 0000000000..8527fa1b6c--- /dev/null+++ b/apps/desktop/src/lib/savedSql/savedSqlTreeRows.ts@@ -0,0 +1,145 @@+import type { SavedSqlFile, SavedSqlFolder } from "@/types/database";++export type SavedSqlTreeSortMode = "folder" | "date";++export type SavedSqlTreeFolderRow = {+ type: "folder";+ folder: SavedSqlFolder;+ depth: number;+};++export type SavedSqlTreeFileRow = {+ type: "file";+ file: SavedSqlFile;+ depth: number;+};++export type SavedSqlTreeRow = SavedSqlTreeFolderRow | SavedSqlTreeFileRow;++export interface SavedSqlTreeRowsOptions {+ mode: SavedSqlTreeSortMode;+ isFolderExpanded?: (folder: SavedSqlFolder) => boolean;+ folderMatches?: (folder: SavedSqlFolder) => boolean;+ fileMatches?: (file: SavedSqlFile) => boolean;+}++type SavedSqlTreeItem = { type: "folder"; folder: SavedSqlFolder } | { type: "file"; file: SavedSqlFile };++function compareNames(a: string, b: string) {+ return a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" });+}++function compareSiblingItems(a: SavedSqlTreeItem, b: SavedSqlTreeItem, mode: SavedSqlTreeSortMode) {+ if (mode === "date") {+ const aUpdatedAt = a.type === "folder" ? a.folder.updatedAt : a.file.updatedAt;+ const bUpdatedAt = b.type === "folder" ? b.folder.updatedAt : b.file.updatedAt;+ const dateComparison = bUpdatedAt.localeCompare(aUpdatedAt);+ if (dateComparison !== 0) return dateComparison;+ } else if (a.type !== b.type) {+ return a.type === "folder" ? -1 : 1;+ }++ const aOrderIndex = a.type === "folder" ? (a.folder.orderIndex ?? 0) : (a.file.orderIndex ?? 0);+ const bOrderIndex = b.type === "folder" ? (b.folder.orderIndex ?? 0) : (b.file.orderIndex ?? 0);+ const orderComparison = mode === "date" ? 0 : aOrderIndex - bOrderIndex;+ if (orderComparison !== 0) return orderComparison;++ const aName = a.type === "folder" ? a.folder.name : a.file.name;+ const bName = b.type === "folder" ? b.folder.name : b.file.name;+ const nameComparison = compareNames(aName, bName);+ if (nameComparison !== 0) return nameComparison;++ const typeComparison = a.type.localeCompare(b.type);+ if (typeComparison !== 0) return typeComparison;++ const aId = a.type === "folder" ? a.folder.id : a.file.id;+ const bId = b.type === "folder" ? b.folder.id : b.file.id;+ return aId.localeCompare(bId);+}++export function savedSqlFolderBranchMatches(folder: SavedSqlFolder, folders: readonly SavedSqlFolder[], files: readonly SavedSqlFile[], folderMatches: (candidate: SavedSqlFolder) => boolean, fileMatches: (candidate: SavedSqlFile) => boolean): boolean {+ const childrenByParent = new Map<string, SavedSqlFolder[]>();+ for (const candidate of folders) {+ const parentFolderId = candidate.parentFolderId || "";+ const siblings = childrenByParent.get(parentFolderId) ?? [];+ siblings.push(candidate);+ childrenByParent.set(parentFolderId, siblings);+ }++ const filesByFolder = new Map<string, SavedSqlFile[]>();+ for (const candidate of files) {+ const folderId = candidate.folderId || "";+ const siblings = filesByFolder.get(folderId) ?? [];+ siblings.push(candidate);+ filesByFolder.set(folderId, siblings);+ }++ const visited = new Set<string>();+ const matchesBranch = (candidate: SavedSqlFolder): boolean => {+ if (visited.has(candidate.id)) return false;+ visited.add(candidate.id);++ if (folderMatches(candidate)) return true;+ if ((filesByFolder.get(candidate.id) ?? []).some(fileMatches)) return true;+ return (childrenByParent.get(candidate.id) ?? []).some(matchesBranch);+ };++ return matchesBranch(folder);+}++export function buildSavedSqlTreeRows(folders: readonly SavedSqlFolder[], files: readonly SavedSqlFile[], options: SavedSqlTreeRowsOptions): SavedSqlTreeRow[] {+ const folderMatches = options.folderMatches ?? (() => true);+ const fileMatches = options.fileMatches ?? (() => true);+ const isFolderExpanded = options.isFolderExpanded ?? (() => true);++ const childrenByParent = new Map<string, SavedSqlFolder[]>();+ for (const folder of folders) {+ const parentFolderId = folder.parentFolderId || "";+ const siblings = childrenByParent.get(parentFolderId) ?? [];+ siblings.push(folder);+ childrenByParent.set(parentFolderId, siblings);+ }++ const filesByFolder = new Map<string, SavedSqlFile[]>();+ for (const file of files) {+ const folderId = file.folderId || "";+ const siblings = filesByFolder.get(folderId) ?? [];+ siblings.push(file);+ filesByFolder.set(folderId, siblings);+ }++ const matchedFolderIds = new Set(folders.filter(folderMatches).map((folder) => folder.id));++ const branchMatchCache = new Map<string, boolean>();+ const folderBranchMatches = (folder: SavedSqlFolder): boolean => {+ const cached = branchMatchCache.get(folder.id);+ if (cached !== undefined) return cached;++ const matches = folderMatches(folder) || (filesByFolder.get(folder.id) ?? []).some(fileMatches) || (childrenByParent.get(folder.id) ?? []).some(folderBranchMatches);+ branchMatchCache.set(folder.id, matches);+ return matches;+ };++ const rows: SavedSqlTreeRow[] = [];+ const appendItems = (parentFolderId: string, depth: number) => {+ const items: SavedSqlTreeItem[] = [+ ...(childrenByParent.get(parentFolderId) ?? []).filter(folderBranchMatches).map((folder) => ({ type: "folder" as const, folder })),+ ...(filesByFolder.get(parentFolderId) ?? []).filter((file) => matchedFolderIds.has(parentFolderId) || fileMatches(file)).map((file) => ({ type: "file" as const, file })),+ ];++ items.sort((a, b) => compareSiblingItems(a, b, options.mode));+ for (const item of items) {+ if (item.type === "folder") {+ rows.push({ type: "folder", folder: item.folder, depth });+ if (isFolderExpanded(item.folder)) {+ appendItems(item.folder.id, depth + 1);+ }+ } else {+ rows.push({ type: "file", file: item.file, depth });+ }+ }+ };++ appendItems("", 0);+ return rows;+}