feat(sql): add folder search and creation to save dialog

This commit is contained in:
lexmin0412 authored and GitHub committed 2026-07-17 17:12:32 +08:00
1 parent bb613b1712
commit 7165ec8911
10 files changed
+200 -18

No files matched your search

+61 -18
View File
@@ -32,6 +32,7 @@ import { useVisibilityChange } from "@/composables/useVisibilityChange";
import { useWebDavAutoUpload } from "@/composables/useWebDavAutoUpload"; import { useWebDavAutoUpload } from "@/composables/useWebDavAutoUpload";
import { useScheduledDatabaseBackups } from "@/composables/useScheduledDatabaseBackups"; import { useScheduledDatabaseBackups } from "@/composables/useScheduledDatabaseBackups";
import { shouldDrawDesktopWindowFrame } from "@/composables/useWindowControls"; import { shouldDrawDesktopWindowFrame } from "@/composables/useWindowControls";
import { useSaveSqlFolderSelection } from "@/composables/useSaveSqlFolderSelection";
import "@/i18n"; import "@/i18n";
import { translateBackendError } from "@/i18n/backend-errors"; import { translateBackendError } from "@/i18n/backend-errors";
import * as api from "@/lib/backend/api"; 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 { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input"; 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 { HistoryEntry } from "@/lib/backend/tauri";
import type { AiAction } from "@/lib/ai/ai"; 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 queryEditorObjectSourceTarget = ref<{ connectionId: string; database: string; schema?: string; name: string; objectType: ObjectSourceKind; initialEditing: boolean } | null>(null);
const showSaveSqlDialog = ref(false); const showSaveSqlDialog = ref(false);
const saveSqlName = ref(""); 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<string | null>(null); const pendingSaveAndCloseTabId = ref<string | null>(null);
const pendingPrevActiveTabId = ref<string | null>(null); const pendingPrevActiveTabId = ref<string | null>(null);
const pendingSaveShouldCloseTab = ref(true); const pendingSaveShouldCloseTab = ref(true);
const pendingAppCloseAction = ref<AppCloseAction | null>(null); const pendingAppCloseAction = ref<AppCloseAction | null>(null);
const pendingCloseActionChoice = ref(false); const pendingCloseActionChoice = ref(false);
const ROOT_SAVED_SQL_FOLDER = "__root__";
const activeTab = computed(() => queryStore.tabs.find((t) => t.id === queryStore.activeTabId)); const activeTab = computed(() => queryStore.tabs.find((t) => t.id === queryStore.activeTabId));
@@ -637,6 +638,7 @@ function closePendingSavedTab() {
} }
function cancelPendingSaveAndClose() { function cancelPendingSaveAndClose() {
invalidateSaveSqlFolderSelection();
showSaveSqlDialog.value = false; showSaveSqlDialog.value = false;
pendingSaveAndCloseTabId.value = null; pendingSaveAndCloseTabId.value = null;
pendingPrevActiveTabId.value = null; pendingPrevActiveTabId.value = null;
@@ -825,7 +827,7 @@ async function handleSaveTab(tabId: string) {
const prevActive = queryStore.activeTabId; const prevActive = queryStore.activeTabId;
queryStore.activeTabId = tabId; queryStore.activeTabId = tabId;
saveSqlName.value = defaultSavedSqlName(tab.title); saveSqlName.value = defaultSavedSqlName(tab.title);
saveSqlFolderId.value = ROOT_SAVED_SQL_FOLDER; resetSaveSqlFolderSelection(ROOT_SAVED_SQL_FOLDER);
pendingSaveAndCloseTabId.value = tabId; pendingSaveAndCloseTabId.value = tabId;
pendingPrevActiveTabId.value = prevActive; pendingPrevActiveTabId.value = prevActive;
showSaveSqlDialog.value = true; showSaveSqlDialog.value = true;
@@ -857,7 +859,7 @@ async function openSaveSqlDialog() {
} }
saveSqlName.value = defaultSavedSqlName(tab.title); saveSqlName.value = defaultSavedSqlName(tab.title);
saveSqlFolderId.value = ROOT_SAVED_SQL_FOLDER; resetSaveSqlFolderSelection(ROOT_SAVED_SQL_FOLDER);
showSaveSqlDialog.value = true; showSaveSqlDialog.value = true;
} }
@@ -900,7 +902,36 @@ async function saveActiveObjectSource(tab: QueryTab): Promise<boolean> {
} }
} }
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() { async function confirmSaveSqlToLibrary() {
if (saveSqlFolderCreationPending.value) return;
const tab = activeTab.value; const tab = activeTab.value;
const name = saveSqlName.value.trim(); const name = saveSqlName.value.trim();
if (!tab || !tab.sql.trim() || !name) return; if (!tab || !tab.sql.trim() || !name) return;
@@ -931,6 +962,7 @@ async function saveActiveSqlAsLocalFile() {
const path = await api.saveExternalSqlFile(defaultSavedSqlName(tab.title), tab.sql); const path = await api.saveExternalSqlFile(defaultSavedSqlName(tab.title), tab.sql);
if (!path) return; if (!path) return;
queryStore.linkExternalSqlPath(tab.id, path, sqlFileTitleFromPath(path)); queryStore.linkExternalSqlPath(tab.id, path, sqlFileTitleFromPath(path));
invalidateSaveSqlFolderSelection();
showSaveSqlDialog.value = false; showSaveSqlDialog.value = false;
closePendingSavedTab(); closePendingSavedTab();
toast(t("savedSql.saved"), 2000); toast(t("savedSql.saved"), 2000);
@@ -2256,7 +2288,10 @@ onUnmounted(() => {
@update:open=" @update:open="
(open: boolean) => { (open: boolean) => {
showSaveSqlDialog = open; showSaveSqlDialog = open;
if (!open && pendingSaveAndCloseTabId) cancelPendingSaveAndClose(); if (!open) {
invalidateSaveSqlFolderSelection();
if (pendingSaveAndCloseTabId) cancelPendingSaveAndClose();
}
} }
" "
> >
@@ -2271,23 +2306,31 @@ onUnmounted(() => {
</div> </div>
<div class="space-y-1.5"> <div class="space-y-1.5">
<label class="text-xs font-medium text-muted-foreground">{{ t("savedSql.folder") }}</label> <label class="text-xs font-medium text-muted-foreground">{{ t("savedSql.folder") }}</label>
<Select v-model="saveSqlFolderId"> <SearchableSelect
<SelectTrigger class="h-8 w-full"> :model-value="saveSqlFolderId"
<SelectValue /> :options="[ROOT_SAVED_SQL_FOLDER, ...saveSqlFolders.map((f) => f.id)]"
</SelectTrigger> :display-name="saveSqlFolderDisplayName"
<SelectContent position="popper"> :normalize-custom="saveSqlFolderNormalizeCustom"
<SelectItem :value="ROOT_SAVED_SQL_FOLDER">{{ t("savedSql.rootFolder") }}</SelectItem> :placeholder="t('savedSql.folderPlaceholder')"
<SelectItem v-for="folder in saveSqlFolders" :key="folder.id" :value="folder.id"> :search-placeholder="t('savedSql.searchPlaceholder')"
{{ folder.displayName }} :empty-text="t('common.noResults')"
</SelectItem> :disabled="saveSqlFolderCreationPending"
</SelectContent> allow-custom
</Select> trigger-variant="outline"
trigger-class="h-8 w-full max-w-none text-sm"
content-class="w-[var(--reka-popover-trigger-width)]"
@update:model-value="handleSaveSqlFolderSelect"
>
<template #custom-option-label="{ value }">
<span class="truncate">{{ t("savedSql.createFolderOption", { name: value }) }}</span>
</template>
</SearchableSelect>
</div> </div>
</div> </div>
<DialogFooter> <DialogFooter>
<Button v-if="isDesktop" variant="secondary" @click="saveActiveSqlAsLocalFile">{{ t("savedSql.saveToFile") }}</Button> <Button v-if="isDesktop" variant="secondary" @click="saveActiveSqlAsLocalFile">{{ t("savedSql.saveToFile") }}</Button>
<Button variant="outline" @click="cancelPendingSaveAndClose()">{{ t("dangerDialog.cancel") }}</Button> <Button variant="outline" @click="cancelPendingSaveAndClose()">{{ t("dangerDialog.cancel") }}</Button>
<Button :disabled="!saveSqlName.trim()" @click="confirmSaveSqlToLibrary">{{ t("savedSql.save") }}</Button> <Button :disabled="saveSqlFolderCreationPending || !saveSqlName.trim()" @click="confirmSaveSqlToLibrary">{{ t("savedSql.save") }}</Button>
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
@@ -0,0 +1,61 @@
import { readFileSync } from "node:fs";
import { describe, expect, it, vi } from "vitest";
import { useSaveSqlFolderSelection } from "@/composables/useSaveSqlFolderSelection";
function deferred<T>() {
let resolve!: (value: T) => void;
let reject!: (reason?: unknown) => void;
const promise = new Promise<T>((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<string>();
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<string>();
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");
});
});
@@ -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<string>, 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,
};
}
+4
View File
@@ -120,6 +120,10 @@ export default {
renameFile: "Rename SQL", renameFile: "Rename SQL",
deleteFile: "Delete SQL", deleteFile: "Delete SQL",
deleteFileConfirm: "Delete “{name}”?", deleteFileConfirm: "Delete “{name}”?",
createFolderOption: "Create folder “{name}”",
folderPlaceholder: "Select a folder",
searchPlaceholder: "Search folders...",
createFolderFailed: "Failed to create folder: {message}",
}, },
sqlLibrary: { sqlLibrary: {
title: "SQL Library", title: "SQL Library",
+4
View File
@@ -122,6 +122,10 @@ export default withEnglishFallback({
renameFile: "Renombrar SQL", renameFile: "Renombrar SQL",
deleteFile: "Eliminar SQL", deleteFile: "Eliminar SQL",
deleteFileConfirm: "¿Eliminar “{name}”?", deleteFileConfirm: "¿Eliminar “{name}”?",
createFolderOption: "Crear carpeta “{name}”",
folderPlaceholder: "Seleccionar carpeta",
searchPlaceholder: "Buscar carpetas...",
createFolderFailed: "Error al crear carpeta: {message}",
}, },
sqlLibrary: { sqlLibrary: {
title: "Biblioteca SQL", title: "Biblioteca SQL",
+4
View File
@@ -121,6 +121,10 @@ export default withEnglishFallback({
renameFile: "Rinomina SQL", renameFile: "Rinomina SQL",
deleteFile: "Elimina SQL", deleteFile: "Elimina SQL",
deleteFileConfirm: "Eliminare “{name}”?", deleteFileConfirm: "Eliminare “{name}”?",
createFolderOption: "Crea cartella “{name}”",
folderPlaceholder: "Seleziona cartella",
searchPlaceholder: "Cerca cartelle...",
createFolderFailed: "Impossibile creare la cartella: {message}",
}, },
sqlLibrary: { sqlLibrary: {
title: "Libreria SQL", title: "Libreria SQL",
+4
View File
@@ -122,6 +122,10 @@ export default withEnglishFallback({
renameFile: "SQLの名前を変更", renameFile: "SQLの名前を変更",
deleteFile: "SQLを削除", deleteFile: "SQLを削除",
deleteFileConfirm: "「{name}」を削除しますか?", deleteFileConfirm: "「{name}」を削除しますか?",
createFolderOption: "フォルダ「{name}」を作成",
folderPlaceholder: "フォルダを選択",
searchPlaceholder: "フォルダを検索...",
createFolderFailed: "フォルダの作成に失敗しました: {message}",
}, },
sqlLibrary: { sqlLibrary: {
title: "SQLライブラリ", title: "SQLライブラリ",
+4
View File
@@ -122,6 +122,10 @@ export default withEnglishFallback({
renameFile: "Renomear SQL", renameFile: "Renomear SQL",
deleteFile: "Excluir SQL", deleteFile: "Excluir SQL",
deleteFileConfirm: "Excluir “{name}”?", deleteFileConfirm: "Excluir “{name}”?",
createFolderOption: "Criar pasta “{name}”",
folderPlaceholder: "Selecionar pasta",
searchPlaceholder: "Pesquisar pastas...",
createFolderFailed: "Falha ao criar pasta: {message}",
}, },
sqlLibrary: { sqlLibrary: {
title: "Biblioteca SQL", title: "Biblioteca SQL",
+4
View File
@@ -122,6 +122,10 @@ export default withEnglishFallback({
renameFile: "重命名 SQL", renameFile: "重命名 SQL",
deleteFile: "删除 SQL", deleteFile: "删除 SQL",
deleteFileConfirm: "确定删除“{name}”吗?", deleteFileConfirm: "确定删除“{name}”吗?",
createFolderOption: "创建文件夹“{name}”",
folderPlaceholder: "选择文件夹",
searchPlaceholder: "搜索文件夹...",
createFolderFailed: "创建文件夹失败:{message}",
}, },
sqlLibrary: { sqlLibrary: {
title: "SQL 库", title: "SQL 库",
+4
View File
@@ -122,6 +122,10 @@ export default withEnglishFallback({
renameFile: "重新命名 SQL", renameFile: "重新命名 SQL",
deleteFile: "刪除 SQL", deleteFile: "刪除 SQL",
deleteFileConfirm: "確定刪除「{name}」嗎?", deleteFileConfirm: "確定刪除「{name}」嗎?",
createFolderOption: "建立資料夾「{name}」",
folderPlaceholder: "選擇資料夾",
searchPlaceholder: "搜尋資料夾...",
createFolderFailed: "建立資料夾失敗:{message}",
}, },
sqlLibrary: { sqlLibrary: {
title: "SQL 庫", title: "SQL 庫",