From 7165ec8911f644369bf6b0771d73dc3c55c9c48a Mon Sep 17 00:00:00 2001 From: lexmin0412 Date: Fri, 17 Jul 2026 17:12:32 +0800 Subject: [PATCH] feat(sql): add folder search and creation to save dialog --- apps/desktop/src/App.vue | 79 ++++++++++++++----- .../useSaveSqlFolderSelection.spec.ts | 61 ++++++++++++++ .../composables/useSaveSqlFolderSelection.ts | 50 ++++++++++++ apps/desktop/src/i18n/locales/en.ts | 4 + apps/desktop/src/i18n/locales/es.ts | 4 + apps/desktop/src/i18n/locales/it.ts | 4 + apps/desktop/src/i18n/locales/ja.ts | 4 + apps/desktop/src/i18n/locales/pt-BR.ts | 4 + apps/desktop/src/i18n/locales/zh-CN.ts | 4 + apps/desktop/src/i18n/locales/zh-TW.ts | 4 + 10 files changed, 200 insertions(+), 18 deletions(-) create mode 100644 apps/desktop/src/composables/__tests__/useSaveSqlFolderSelection.spec.ts create mode 100644 apps/desktop/src/composables/useSaveSqlFolderSelection.ts diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue index 0315b4050d..2c541a5df7 100644 --- a/apps/desktop/src/App.vue +++ b/apps/desktop/src/App.vue @@ -32,6 +32,7 @@ import { useVisibilityChange } from "@/composables/useVisibilityChange"; import { useWebDavAutoUpload } from "@/composables/useWebDavAutoUpload"; import { useScheduledDatabaseBackups } from "@/composables/useScheduledDatabaseBackups"; import { shouldDrawDesktopWindowFrame } from "@/composables/useWindowControls"; +import { useSaveSqlFolderSelection } from "@/composables/useSaveSqlFolderSelection"; import "@/i18n"; import { translateBackendError } from "@/i18n/backend-errors"; import * as api from "@/lib/backend/api"; @@ -92,7 +93,7 @@ import { ensureJdbcxRuntimeDrivers } from "@/lib/database/jdbcxBuiltinDriver"; import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; -import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; +import { SearchableSelect } from "@/components/ui/searchable-select"; import type { HistoryEntry } from "@/lib/backend/tauri"; import type { AiAction } from "@/lib/ai/ai"; @@ -169,13 +170,13 @@ const queryEditorDdlTarget = ref<{ connectionId: string; database: string; catal const queryEditorObjectSourceTarget = ref<{ connectionId: string; database: string; schema?: string; name: string; objectType: ObjectSourceKind; initialEditing: boolean } | null>(null); const showSaveSqlDialog = ref(false); const saveSqlName = ref(""); -const saveSqlFolderId = ref(""); +const ROOT_SAVED_SQL_FOLDER = "__root__"; +const { selection: saveSqlFolderId, pending: saveSqlFolderCreationPending, reset: resetSaveSqlFolderSelection, invalidate: invalidateSaveSqlFolderSelection, select: selectSaveSqlFolder } = useSaveSqlFolderSelection(ROOT_SAVED_SQL_FOLDER); const pendingSaveAndCloseTabId = ref(null); const pendingPrevActiveTabId = ref(null); const pendingSaveShouldCloseTab = ref(true); const pendingAppCloseAction = ref(null); const pendingCloseActionChoice = ref(false); -const ROOT_SAVED_SQL_FOLDER = "__root__"; const activeTab = computed(() => queryStore.tabs.find((t) => t.id === queryStore.activeTabId)); @@ -637,6 +638,7 @@ function closePendingSavedTab() { } function cancelPendingSaveAndClose() { + invalidateSaveSqlFolderSelection(); showSaveSqlDialog.value = false; pendingSaveAndCloseTabId.value = null; pendingPrevActiveTabId.value = null; @@ -825,7 +827,7 @@ async function handleSaveTab(tabId: string) { const prevActive = queryStore.activeTabId; queryStore.activeTabId = tabId; saveSqlName.value = defaultSavedSqlName(tab.title); - saveSqlFolderId.value = ROOT_SAVED_SQL_FOLDER; + resetSaveSqlFolderSelection(ROOT_SAVED_SQL_FOLDER); pendingSaveAndCloseTabId.value = tabId; pendingPrevActiveTabId.value = prevActive; showSaveSqlDialog.value = true; @@ -857,7 +859,7 @@ async function openSaveSqlDialog() { } saveSqlName.value = defaultSavedSqlName(tab.title); - saveSqlFolderId.value = ROOT_SAVED_SQL_FOLDER; + resetSaveSqlFolderSelection(ROOT_SAVED_SQL_FOLDER); showSaveSqlDialog.value = true; } @@ -900,7 +902,36 @@ async function saveActiveObjectSource(tab: QueryTab): Promise { } } +function saveSqlFolderDisplayName(id: string) { + if (id === ROOT_SAVED_SQL_FOLDER) return t("savedSql.rootFolder"); + const folder = saveSqlFolders.value.find((f) => f.id === id); + return folder?.displayName ?? id; +} + +function saveSqlFolderNormalizeCustom(value: string) { + const trimmed = value.trim(); + if (!trimmed) return trimmed; + const folder = saveSqlFolders.value.find((f) => f.displayName === trimmed); + return folder ? folder.id : trimmed; +} + +async function handleSaveSqlFolderSelect(value: string) { + const isExisting = value === ROOT_SAVED_SQL_FOLDER || saveSqlFolders.value.some((f) => f.id === value); + if (isExisting) { + await selectSaveSqlFolder(value); + return; + } + const tab = activeTab.value; + if (!tab) return; + await selectSaveSqlFolder( + value, + async () => (await savedSqlStore.createFolder(tab.connectionId, value)).id, + (error: any) => toast(t("savedSql.createFolderFailed", { message: error?.message || String(error) }), 5000), + ); +} + async function confirmSaveSqlToLibrary() { + if (saveSqlFolderCreationPending.value) return; const tab = activeTab.value; const name = saveSqlName.value.trim(); if (!tab || !tab.sql.trim() || !name) return; @@ -931,6 +962,7 @@ async function saveActiveSqlAsLocalFile() { const path = await api.saveExternalSqlFile(defaultSavedSqlName(tab.title), tab.sql); if (!path) return; queryStore.linkExternalSqlPath(tab.id, path, sqlFileTitleFromPath(path)); + invalidateSaveSqlFolderSelection(); showSaveSqlDialog.value = false; closePendingSavedTab(); toast(t("savedSql.saved"), 2000); @@ -2256,7 +2288,10 @@ onUnmounted(() => { @update:open=" (open: boolean) => { showSaveSqlDialog = open; - if (!open && pendingSaveAndCloseTabId) cancelPendingSaveAndClose(); + if (!open) { + invalidateSaveSqlFolderSelection(); + if (pendingSaveAndCloseTabId) cancelPendingSaveAndClose(); + } } " > @@ -2271,23 +2306,31 @@ onUnmounted(() => {
- + + +
- + diff --git a/apps/desktop/src/composables/__tests__/useSaveSqlFolderSelection.spec.ts b/apps/desktop/src/composables/__tests__/useSaveSqlFolderSelection.spec.ts new file mode 100644 index 0000000000..1807065cc6 --- /dev/null +++ b/apps/desktop/src/composables/__tests__/useSaveSqlFolderSelection.spec.ts @@ -0,0 +1,61 @@ +import { readFileSync } from "node:fs"; +import { describe, expect, it, vi } from "vitest"; +import { useSaveSqlFolderSelection } from "@/composables/useSaveSqlFolderSelection"; + +function deferred() { + let resolve!: (value: T) => void; + let reject!: (reason?: unknown) => void; + const promise = new Promise((resolvePromise, rejectPromise) => { + resolve = resolvePromise; + reject = rejectPromise; + }); + return { promise, resolve, reject }; +} + +const appSource = readFileSync(new URL("../../App.vue", import.meta.url), "utf8"); + +describe("save SQL folder selection", () => { + it("keeps save and reselection blocked until folder creation completes", async () => { + const creation = deferred(); + const folder = useSaveSqlFolderSelection("existing-folder"); + + const pendingSelection = folder.select("new-folder", () => creation.promise); + await folder.select("other-folder"); + + expect(folder.pending.value).toBe(true); + expect(folder.selection.value).toBe("existing-folder"); + expect(appSource).toContain("if (saveSqlFolderCreationPending.value) return;"); + expect(appSource).toContain(':disabled="saveSqlFolderCreationPending"'); + expect(appSource).toContain(':disabled="saveSqlFolderCreationPending || !saveSqlName.trim()"'); + + creation.resolve("created-folder"); + await pendingSelection; + + expect(folder.pending.value).toBe(false); + expect(folder.selection.value).toBe("created-folder"); + }); + + it("preserves the previous valid selection when folder creation fails", async () => { + const onError = vi.fn(); + const folder = useSaveSqlFolderSelection("existing-folder"); + + await folder.select("new-folder", () => Promise.reject(new Error("create failed")), onError); + + expect(folder.pending.value).toBe(false); + expect(folder.selection.value).toBe("existing-folder"); + expect(onError).toHaveBeenCalledOnce(); + }); + + it("ignores stale folder creation after the dialog selection session resets", async () => { + const creation = deferred(); + const folder = useSaveSqlFolderSelection("first-folder"); + const pendingSelection = folder.select("new-folder", () => creation.promise); + + folder.reset("later-folder"); + creation.resolve("stale-created-folder"); + await pendingSelection; + + expect(folder.pending.value).toBe(false); + expect(folder.selection.value).toBe("later-folder"); + }); +}); diff --git a/apps/desktop/src/composables/useSaveSqlFolderSelection.ts b/apps/desktop/src/composables/useSaveSqlFolderSelection.ts new file mode 100644 index 0000000000..fa9b87e2d3 --- /dev/null +++ b/apps/desktop/src/composables/useSaveSqlFolderSelection.ts @@ -0,0 +1,50 @@ +import { readonly, ref } from "vue"; + +export function useSaveSqlFolderSelection(initialSelection: string) { + const selection = ref(initialSelection); + const pending = ref(false); + let generation = 0; + + function reset(value: string) { + generation++; + pending.value = false; + selection.value = value; + } + + function invalidate() { + generation++; + pending.value = false; + } + + async function select(value: string, create?: () => Promise, onError?: (error: unknown) => void) { + if (pending.value) return; + if (!create) { + selection.value = value; + return; + } + + const previousSelection = selection.value; + const requestGeneration = generation; + pending.value = true; + try { + const createdSelection = await create(); + // A closed or reopened dialog owns a newer selection session. + if (requestGeneration !== generation) return; + selection.value = createdSelection; + } catch (error) { + if (requestGeneration !== generation) return; + selection.value = previousSelection; + onError?.(error); + } finally { + if (requestGeneration === generation) pending.value = false; + } + } + + return { + selection, + pending: readonly(pending), + reset, + invalidate, + select, + }; +} diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts index 42ddd2f8fc..8b473ba541 100644 --- a/apps/desktop/src/i18n/locales/en.ts +++ b/apps/desktop/src/i18n/locales/en.ts @@ -120,6 +120,10 @@ export default { renameFile: "Rename SQL", deleteFile: "Delete SQL", deleteFileConfirm: "Delete “{name}”?", + createFolderOption: "Create folder “{name}”", + folderPlaceholder: "Select a folder", + searchPlaceholder: "Search folders...", + createFolderFailed: "Failed to create folder: {message}", }, sqlLibrary: { title: "SQL Library", diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts index 080f254c4e..13cb9bcf5b 100644 --- a/apps/desktop/src/i18n/locales/es.ts +++ b/apps/desktop/src/i18n/locales/es.ts @@ -122,6 +122,10 @@ export default withEnglishFallback({ renameFile: "Renombrar SQL", deleteFile: "Eliminar SQL", deleteFileConfirm: "¿Eliminar “{name}”?", + createFolderOption: "Crear carpeta “{name}”", + folderPlaceholder: "Seleccionar carpeta", + searchPlaceholder: "Buscar carpetas...", + createFolderFailed: "Error al crear carpeta: {message}", }, sqlLibrary: { title: "Biblioteca SQL", diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts index 5724285fe0..2f59f3b6fc 100644 --- a/apps/desktop/src/i18n/locales/it.ts +++ b/apps/desktop/src/i18n/locales/it.ts @@ -121,6 +121,10 @@ export default withEnglishFallback({ renameFile: "Rinomina SQL", deleteFile: "Elimina SQL", deleteFileConfirm: "Eliminare “{name}”?", + createFolderOption: "Crea cartella “{name}”", + folderPlaceholder: "Seleziona cartella", + searchPlaceholder: "Cerca cartelle...", + createFolderFailed: "Impossibile creare la cartella: {message}", }, sqlLibrary: { title: "Libreria SQL", diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts index 1eefcb7254..98da1d2455 100644 --- a/apps/desktop/src/i18n/locales/ja.ts +++ b/apps/desktop/src/i18n/locales/ja.ts @@ -122,6 +122,10 @@ export default withEnglishFallback({ renameFile: "SQLの名前を変更", deleteFile: "SQLを削除", deleteFileConfirm: "「{name}」を削除しますか?", + createFolderOption: "フォルダ「{name}」を作成", + folderPlaceholder: "フォルダを選択", + searchPlaceholder: "フォルダを検索...", + createFolderFailed: "フォルダの作成に失敗しました: {message}", }, sqlLibrary: { title: "SQLライブラリ", diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts index ffe69479f0..7011807f68 100644 --- a/apps/desktop/src/i18n/locales/pt-BR.ts +++ b/apps/desktop/src/i18n/locales/pt-BR.ts @@ -122,6 +122,10 @@ export default withEnglishFallback({ renameFile: "Renomear SQL", deleteFile: "Excluir SQL", deleteFileConfirm: "Excluir “{name}”?", + createFolderOption: "Criar pasta “{name}”", + folderPlaceholder: "Selecionar pasta", + searchPlaceholder: "Pesquisar pastas...", + createFolderFailed: "Falha ao criar pasta: {message}", }, sqlLibrary: { title: "Biblioteca SQL", diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts index d50b474a91..b7c3c6adce 100644 --- a/apps/desktop/src/i18n/locales/zh-CN.ts +++ b/apps/desktop/src/i18n/locales/zh-CN.ts @@ -122,6 +122,10 @@ export default withEnglishFallback({ renameFile: "重命名 SQL", deleteFile: "删除 SQL", deleteFileConfirm: "确定删除“{name}”吗?", + createFolderOption: "创建文件夹“{name}”", + folderPlaceholder: "选择文件夹", + searchPlaceholder: "搜索文件夹...", + createFolderFailed: "创建文件夹失败:{message}", }, sqlLibrary: { title: "SQL 库", diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts index 598dd59acb..fbea2c09b0 100644 --- a/apps/desktop/src/i18n/locales/zh-TW.ts +++ b/apps/desktop/src/i18n/locales/zh-TW.ts @@ -122,6 +122,10 @@ export default withEnglishFallback({ renameFile: "重新命名 SQL", deleteFile: "刪除 SQL", deleteFileConfirm: "確定刪除「{name}」嗎?", + createFolderOption: "建立資料夾「{name}」", + folderPlaceholder: "選擇資料夾", + searchPlaceholder: "搜尋資料夾...", + createFolderFailed: "建立資料夾失敗:{message}", }, sqlLibrary: { title: "SQL 庫",