From a24a559160857fe197fd1b11fa6d409c8a400b24 Mon Sep 17 00:00:00 2001 From: lxk955 <164191365+lxk955@users.noreply.github.com> Date: Sun, 4 Oct 2026 22:22:22 +0800 Subject: [PATCH] feat(sql): add new folder button to save to SQL library dialog --- apps/desktop/src/App.vue | 92 ++++++++++++++++++- .../useSaveSqlFolderSelection.spec.ts | 77 ++++++++++++++++ .../composables/useSaveSqlFolderSelection.ts | 56 ++++++++++- 3 files changed, 217 insertions(+), 8 deletions(-) diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue index e9eeffb3ea..cf7a19a927 100644 --- a/apps/desktop/src/App.vue +++ b/apps/desktop/src/App.vue @@ -7,7 +7,7 @@ import { checkStartupAuthentication, logoutWeb, type StartupAuthentication } fro import { markStartupPhase } from "@/lib/startup/startupTiming"; import { clearStartupPreloadRetry } from "@/lib/startup/startupPreloadRecovery"; import { useI18n } from "vue-i18n"; -import { FileText } from "@lucide/vue"; +import { FileText, FolderPlus } from "@lucide/vue"; import { TooltipProvider } from "@/components/ui/tooltip"; import AppToolbar from "@/components/layout/AppToolbar.vue"; import AppTabBar from "@/components/layout/AppTabBar.vue"; @@ -493,7 +493,19 @@ const saveSqlName = ref(""); // never quietly saved under a different one. const autoGeneratedSaveSqlName = ref(null); const ROOT_SAVED_SQL_FOLDER = "__root__"; -const { selection: saveSqlFolderId, pending: saveSqlFolderCreationPending, reset: resetSaveSqlFolderSelection, invalidate: invalidateSaveSqlFolderSelection, select: selectSaveSqlFolder } = useSaveSqlFolderSelection(ROOT_SAVED_SQL_FOLDER); +const { + selection: saveSqlFolderId, + pending: saveSqlFolderCreationPending, + isCreating: isCreatingSaveSqlFolder, + newFolderName: saveSqlNewFolderName, + startCreating: startCreatingSaveSqlFolder, + cancelCreating: cancelCreateSaveSqlFolder, + confirmCreating: confirmCreateSaveSqlFolder, + reset: resetSaveSqlFolderSelection, + invalidate: invalidateSaveSqlFolderSelection, + select: selectSaveSqlFolder, +} = useSaveSqlFolderSelection(ROOT_SAVED_SQL_FOLDER); +const saveSqlNewFolderInputRef = ref | null>(null); const pendingSaveAndCloseTabId = ref(null); const pendingPrevActiveTabId = ref(null); const pendingSaveShouldCloseTab = ref(true); @@ -2481,9 +2493,41 @@ async function handleSaveSqlFolderSelect(value: string) { } const tab = saveSqlDialogTab(); if (!tab) return; + const target = savedSqlTargetForSave(tab); await selectSaveSqlFolder( value, - async () => (await savedSqlStore.createFolder(tab.connectionId, value)).id, + async () => (await savedSqlStore.createFolder(target.connectionId, value)).id, + (error: any) => toast(t("savedSql.createFolderFailed", { message: error?.message || String(error) }), 5000), + ); +} + +async function handleStartCreatingSaveSqlFolder() { + startCreatingSaveSqlFolder(); + await nextTick(); + const raw = saveSqlNewFolderInputRef.value?.$el; + const inputEl = (raw instanceof HTMLInputElement ? raw : raw?.querySelector?.("input")) as HTMLInputElement | undefined; + inputEl?.focus(); +} + +async function handleSaveSqlNewFolderConfirm(): Promise { + const name = saveSqlNewFolderName.value.trim(); + if (!name || saveSqlFolderCreationPending.value) return false; + const tab = saveSqlDialogTab(); + if (!tab) return false; + + const existingFolder = saveSqlFolders.value.find((f) => f.displayName === name || f.name === name); + if (existingFolder) { + await selectSaveSqlFolder(existingFolder.id); + cancelCreateSaveSqlFolder(); + return true; + } + + const target = savedSqlTargetForSave(tab); + return await confirmCreateSaveSqlFolder( + async (folderName) => { + const created = await savedSqlStore.createFolder(target.connectionId, folderName); + return created.id; + }, (error: any) => toast(t("savedSql.createFolderFailed", { message: error?.message || String(error) }), 5000), ); } @@ -2504,6 +2548,14 @@ function autoAdjustedSaveName(error: unknown, attemptedName: string): string | u async function confirmSaveSqlToLibrary() { if (saveSqlFolderCreationPending.value) return; + if (isCreatingSaveSqlFolder.value) { + if (saveSqlNewFolderName.value.trim()) { + const created = await handleSaveSqlNewFolderConfirm(); + if (!created || saveSqlFolderCreationPending.value) return; + } else { + cancelCreateSaveSqlFolder(); + } + } const tab = saveSqlDialogTab(); const name = saveSqlName.value.trim(); if (!tab || !tab.sql.trim() || !name) return; @@ -4991,8 +5043,40 @@ onUnmounted(() => {
- +
+ + +
+
+ + + +
{ expect(folder.pending.value).toBe(false); expect(folder.selection.value).toBe("later-folder"); }); + + it("handles startCreating and cancelCreating lifecycle", () => { + const folder = useSaveSqlFolderSelection("existing-folder"); + expect(folder.isCreating.value).toBe(false); + + folder.startCreating(); + expect(folder.isCreating.value).toBe(true); + expect(folder.newFolderName.value).toBe(""); + + folder.newFolderName.value = "my-new-folder"; + folder.cancelCreating(); + expect(folder.isCreating.value).toBe(false); + expect(folder.newFolderName.value).toBe(""); + }); + + it("successfully creates a folder via confirmCreating", async () => { + const folder = useSaveSqlFolderSelection("existing-folder"); + folder.startCreating(); + folder.newFolderName.value = " Analytics "; + + const createFn = vi.fn().mockResolvedValue("analytics-id"); + const result = await folder.confirmCreating(createFn); + + expect(result).toBe(true); + expect(createFn).toHaveBeenCalledWith("Analytics"); + expect(folder.isCreating.value).toBe(false); + expect(folder.newFolderName.value).toBe(""); + expect(folder.selection.value).toBe("analytics-id"); + expect(folder.pending.value).toBe(false); + }); + + it("handles failure in confirmCreating without resetting typed name", async () => { + const onError = vi.fn(); + const folder = useSaveSqlFolderSelection("existing-folder"); + folder.startCreating(); + folder.newFolderName.value = "Invalid/Folder"; + + const createFn = vi.fn().mockRejectedValue(new Error("Invalid folder name")); + const result = await folder.confirmCreating(createFn, onError); + + expect(result).toBe(false); + expect(onError).toHaveBeenCalledOnce(); + expect(folder.selection.value).toBe("existing-folder"); + expect(folder.pending.value).toBe(false); + expect(folder.isCreating.value).toBe(true); + expect(folder.newFolderName.value).toBe("Invalid/Folder"); + }); + + it("rejects confirmCreating with empty folder name", async () => { + const folder = useSaveSqlFolderSelection("existing-folder"); + folder.startCreating(); + folder.newFolderName.value = " "; + + const createFn = vi.fn(); + const result = await folder.confirmCreating(createFn); + + expect(result).toBe(false); + expect(createFn).not.toHaveBeenCalled(); + expect(folder.isCreating.value).toBe(true); + }); + + it("resets inline folder creation state on reset and invalidate", () => { + const folder = useSaveSqlFolderSelection("existing-folder"); + folder.startCreating(); + folder.newFolderName.value = "test-folder"; + + folder.reset("other-folder"); + expect(folder.isCreating.value).toBe(false); + expect(folder.newFolderName.value).toBe(""); + expect(folder.selection.value).toBe("other-folder"); + + folder.startCreating(); + folder.newFolderName.value = "another-folder"; + folder.invalidate(); + expect(folder.isCreating.value).toBe(false); + expect(folder.newFolderName.value).toBe(""); + }); }); diff --git a/apps/desktop/src/composables/useSaveSqlFolderSelection.ts b/apps/desktop/src/composables/useSaveSqlFolderSelection.ts index fa9b87e2d3..7dd0e86c43 100644 --- a/apps/desktop/src/composables/useSaveSqlFolderSelection.ts +++ b/apps/desktop/src/composables/useSaveSqlFolderSelection.ts @@ -3,24 +3,41 @@ import { readonly, ref } from "vue"; export function useSaveSqlFolderSelection(initialSelection: string) { const selection = ref(initialSelection); const pending = ref(false); + const isCreating = ref(false); + const newFolderName = ref(""); let generation = 0; function reset(value: string) { generation++; pending.value = false; + isCreating.value = false; + newFolderName.value = ""; selection.value = value; } function invalidate() { generation++; pending.value = false; + isCreating.value = false; + newFolderName.value = ""; } - async function select(value: string, create?: () => Promise, onError?: (error: unknown) => void) { + function startCreating() { if (pending.value) return; + isCreating.value = true; + newFolderName.value = ""; + } + + function cancelCreating() { + isCreating.value = false; + newFolderName.value = ""; + } + + async function select(value: string, create?: () => Promise, onError?: (error: unknown) => void): Promise { + if (pending.value) return false; if (!create) { selection.value = value; - return; + return true; } const previousSelection = selection.value; @@ -29,12 +46,38 @@ export function useSaveSqlFolderSelection(initialSelection: string) { try { const createdSelection = await create(); // A closed or reopened dialog owns a newer selection session. - if (requestGeneration !== generation) return; + if (requestGeneration !== generation) return false; selection.value = createdSelection; + return true; } catch (error) { - if (requestGeneration !== generation) return; + if (requestGeneration !== generation) return false; selection.value = previousSelection; onError?.(error); + return false; + } finally { + if (requestGeneration === generation) pending.value = false; + } + } + + async function confirmCreating(create: (name: string) => Promise, onError?: (error: unknown) => void): Promise { + const name = newFolderName.value.trim(); + if (!name || pending.value) return false; + + const previousSelection = selection.value; + const requestGeneration = generation; + pending.value = true; + try { + const createdSelection = await create(name); + if (requestGeneration !== generation) return false; + selection.value = createdSelection; + isCreating.value = false; + newFolderName.value = ""; + return true; + } catch (error) { + if (requestGeneration !== generation) return false; + selection.value = previousSelection; + onError?.(error); + return false; } finally { if (requestGeneration === generation) pending.value = false; } @@ -43,6 +86,11 @@ export function useSaveSqlFolderSelection(initialSelection: string) { return { selection, pending: readonly(pending), + isCreating, + newFolderName, + startCreating, + cancelCreating, + confirmCreating, reset, invalidate, select,