mirror of
https://github.com/t8y2/dbx.git
synced 2026-10-23 02:40:11 +00:00
fix: add etcd to driver manifest, fix SQL library rename focus and remove dblclick rename
This commit is contained in:
t8y2
@@ -0,0 +1,986 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, nextTick, onBeforeUnmount, reactive, ref } from "vue";
|
||||
import { useI18n } from "vue-i18n";
|
||||
import {
|
||||
Download,
|
||||
FileInput,
|
||||
FileText,
|
||||
FolderCog,
|
||||
FolderClosed,
|
||||
FolderOpen,
|
||||
FolderPlus,
|
||||
Library,
|
||||
LocateFixed,
|
||||
Pencil,
|
||||
Search,
|
||||
Trash2,
|
||||
Upload,
|
||||
X,
|
||||
} from "@lucide/vue";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from "@/components/ui/dialog";
|
||||
import CustomContextMenu, { type ContextMenuItem as CtxMenuItem } from "@/components/ui/CustomContextMenu.vue";
|
||||
import { useToast } from "@/composables/useToast";
|
||||
import { isTauriRuntime } from "@/lib/tauriRuntime";
|
||||
import * as api from "@/lib/api";
|
||||
import { useSavedSqlStore } from "@/stores/savedSqlStore";
|
||||
import { useConnectionStore } from "@/stores/connectionStore";
|
||||
import { useQueryStore } from "@/stores/queryStore";
|
||||
import { useSettingsStore } from "@/stores/settingsStore";
|
||||
import { focusSidebarRenameInput } from "@/lib/sidebarRenameFocus";
|
||||
import type { SavedSqlFile, SavedSqlFolder } from "@/types/database";
|
||||
|
||||
const { t } = useI18n();
|
||||
const { toast } = useToast();
|
||||
const savedSqlStore = useSavedSqlStore();
|
||||
const connectionStore = useConnectionStore();
|
||||
const queryStore = useQueryStore();
|
||||
const settingsStore = useSettingsStore();
|
||||
|
||||
const emit = defineEmits<{
|
||||
close: [];
|
||||
}>();
|
||||
|
||||
const UNFILED_DROP_TARGET_ID = "__sql-library-unfiled__";
|
||||
const DRAG_THRESHOLD = 5;
|
||||
|
||||
type DragItemType = "folder" | "file" | "unfiled";
|
||||
type DropPosition = "before" | "after" | "inside";
|
||||
|
||||
const activeConnectionIds = computed(() => new Set(connectionStore.connections.map((c) => c.id)));
|
||||
const searchText = ref("");
|
||||
const searchQuery = computed(() => searchText.value.trim().toLowerCase());
|
||||
const orphanedIds = computed(() => savedSqlStore.orphanedFileIds(activeConnectionIds.value));
|
||||
|
||||
function isConnectionVisible(connectionId: string) {
|
||||
return activeConnectionIds.value.has(connectionId);
|
||||
}
|
||||
|
||||
function getConnectionLabel(connectionId: string) {
|
||||
const conn = connectionStore.connections.find((c) => c.id === connectionId);
|
||||
return conn?.name || connectionId;
|
||||
}
|
||||
|
||||
function activeImportConnectionId() {
|
||||
return connectionStore.activeConnectionId || connectionStore.connections[0]?.id || "";
|
||||
}
|
||||
|
||||
function importConnectionIdForFolder(folder?: SavedSqlFolder) {
|
||||
return folder?.connectionId || activeImportConnectionId();
|
||||
}
|
||||
|
||||
function ensureSqlExtension(name: string) {
|
||||
return /\.sql$/i.test(name) ? name : `${name}.sql`;
|
||||
}
|
||||
|
||||
function sanitizeFileSystemSegment(name: string) {
|
||||
return name.replace(/[<>:"/\\|?*\u0000-\u001F]/g, "_").trim() || "untitled";
|
||||
}
|
||||
|
||||
function stripSqlExtension(name: string) {
|
||||
return name.replace(/\.sql$/i, "");
|
||||
}
|
||||
|
||||
function relativeImportName(baseDir: string, filePath: string) {
|
||||
const normalizedBase = baseDir.replace(/\\/g, "/").replace(/\/+$/, "");
|
||||
const normalizedFile = filePath.replace(/\\/g, "/");
|
||||
const relative = normalizedFile.startsWith(`${normalizedBase}/`)
|
||||
? normalizedFile.slice(normalizedBase.length + 1)
|
||||
: normalizedFile.split("/").pop() || "import.sql";
|
||||
const pretty = relative.replace(/\//g, " - ");
|
||||
return ensureSqlExtension(pretty);
|
||||
}
|
||||
|
||||
function uniqueImportedName(name: string, takenNames: Set<string>) {
|
||||
const normalized = ensureSqlExtension(name);
|
||||
if (!takenNames.has(normalized)) {
|
||||
takenNames.add(normalized);
|
||||
return normalized;
|
||||
}
|
||||
|
||||
const base = stripSqlExtension(normalized);
|
||||
let counter = 2;
|
||||
while (true) {
|
||||
const candidate = `${base} (${counter}).sql`;
|
||||
if (!takenNames.has(candidate)) {
|
||||
takenNames.add(candidate);
|
||||
return candidate;
|
||||
}
|
||||
counter++;
|
||||
}
|
||||
}
|
||||
|
||||
async function downloadText(content: string, fileName: string) {
|
||||
const blob = new Blob([content], { type: "text/plain;charset=utf-8" });
|
||||
const url = URL.createObjectURL(blob);
|
||||
const anchor = document.createElement("a");
|
||||
anchor.href = url;
|
||||
anchor.download = fileName;
|
||||
anchor.click();
|
||||
URL.revokeObjectURL(url);
|
||||
}
|
||||
|
||||
async function exportSingleFile(file: SavedSqlFile) {
|
||||
try {
|
||||
const defaultFileName = sanitizeFileSystemSegment(ensureSqlExtension(file.name));
|
||||
if (isTauriRuntime()) {
|
||||
const { save } = await import("@tauri-apps/plugin-dialog");
|
||||
const { writeTextFile } = await import("@tauri-apps/plugin-fs");
|
||||
const path = await save({
|
||||
defaultPath: defaultFileName,
|
||||
filters: [{ name: "SQL", extensions: ["sql"] }],
|
||||
});
|
||||
if (!path) return;
|
||||
await writeTextFile(path, file.sql);
|
||||
} else {
|
||||
await downloadText(file.sql, defaultFileName);
|
||||
}
|
||||
toast(t("sqlLibrary.exported"), 2000);
|
||||
} catch (e: any) {
|
||||
toast(t("sqlLibrary.exportFailed", { message: e?.message || String(e) }), 5000);
|
||||
}
|
||||
}
|
||||
|
||||
async function exportFolderContents(folder?: SavedSqlFolder) {
|
||||
if (!isTauriRuntime()) {
|
||||
toast(t("sqlLibrary.desktopOnly"), 4000);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const { open } = await import("@tauri-apps/plugin-dialog");
|
||||
const { mkdir, writeTextFile } = await import("@tauri-apps/plugin-fs");
|
||||
const { join } = await import("@tauri-apps/api/path");
|
||||
|
||||
const targetDir = await open({
|
||||
directory: true,
|
||||
multiple: false,
|
||||
recursive: true,
|
||||
title: folder ? t("sqlLibrary.exportFolder") : t("sqlLibrary.exportLibrary"),
|
||||
});
|
||||
if (!targetDir || Array.isArray(targetDir)) return;
|
||||
|
||||
const rootDirName = sanitizeFileSystemSegment(folder?.name || t("savedSql.rootFolder"));
|
||||
const rootDir = await join(targetDir, rootDirName);
|
||||
await mkdir(rootDir, { recursive: true });
|
||||
|
||||
if (folder) {
|
||||
for (const file of savedSqlStore.filesInFolder(folder.id)) {
|
||||
const filePath = await join(rootDir, sanitizeFileSystemSegment(ensureSqlExtension(file.name)));
|
||||
await writeTextFile(filePath, file.sql);
|
||||
}
|
||||
} else {
|
||||
for (const libraryFolder of savedSqlStore.allFolders.filter((item) => isConnectionVisible(item.connectionId))) {
|
||||
const folderDir = await join(rootDir, sanitizeFileSystemSegment(libraryFolder.name));
|
||||
await mkdir(folderDir, { recursive: true });
|
||||
for (const file of savedSqlStore.filesInFolder(libraryFolder.id)) {
|
||||
const filePath = await join(folderDir, sanitizeFileSystemSegment(ensureSqlExtension(file.name)));
|
||||
await writeTextFile(filePath, file.sql);
|
||||
}
|
||||
}
|
||||
|
||||
const unfiled = savedSqlStore.filesWithoutFolder().filter((file) => !orphanedIds.value.has(file.id));
|
||||
if (unfiled.length > 0) {
|
||||
const unfiledDir = await join(rootDir, sanitizeFileSystemSegment(t("sqlLibrary.unfiled")));
|
||||
await mkdir(unfiledDir, { recursive: true });
|
||||
for (const file of unfiled) {
|
||||
const filePath = await join(unfiledDir, sanitizeFileSystemSegment(ensureSqlExtension(file.name)));
|
||||
await writeTextFile(filePath, file.sql);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
toast(t("sqlLibrary.exported"), 2000);
|
||||
} catch (e: any) {
|
||||
toast(t("sqlLibrary.exportFailed", { message: e?.message || String(e) }), 5000);
|
||||
}
|
||||
}
|
||||
|
||||
async function collectSqlFilesRecursively(dir: string): Promise<string[]> {
|
||||
const { readDir } = await import("@tauri-apps/plugin-fs");
|
||||
const { join, extname } = await import("@tauri-apps/api/path");
|
||||
|
||||
const results: string[] = [];
|
||||
for (const entry of await readDir(dir)) {
|
||||
const fullPath = await join(dir, entry.name);
|
||||
if (entry.isDirectory) {
|
||||
results.push(...(await collectSqlFilesRecursively(fullPath)));
|
||||
continue;
|
||||
}
|
||||
if (!entry.isFile) continue;
|
||||
if ((await extname(fullPath)).toLowerCase() !== ".sql") continue;
|
||||
results.push(fullPath);
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
||||
async function importDirectoryIntoLibrary(targetFolder?: SavedSqlFolder) {
|
||||
if (!isTauriRuntime()) {
|
||||
toast(t("sqlLibrary.desktopOnly"), 4000);
|
||||
return;
|
||||
}
|
||||
|
||||
const connectionId = importConnectionIdForFolder(targetFolder);
|
||||
if (!connectionId) {
|
||||
toast(t("sqlLibrary.noConnection"), 4000);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const { open } = await import("@tauri-apps/plugin-dialog");
|
||||
const { readTextFile } = await import("@tauri-apps/plugin-fs");
|
||||
const selected = await open({
|
||||
directory: true,
|
||||
multiple: false,
|
||||
recursive: true,
|
||||
title: t("sqlLibrary.importDirectory"),
|
||||
});
|
||||
if (!selected || Array.isArray(selected)) return;
|
||||
|
||||
const sqlPaths = await collectSqlFilesRecursively(selected);
|
||||
if (sqlPaths.length === 0) {
|
||||
toast(t("sqlLibrary.importNone"), 3000);
|
||||
return;
|
||||
}
|
||||
|
||||
const takenNames = new Set(
|
||||
(targetFolder ? savedSqlStore.filesInFolder(targetFolder.id) : savedSqlStore.filesWithoutFolder())
|
||||
.filter((file) => !orphanedIds.value.has(file.id))
|
||||
.map((file) => file.name),
|
||||
);
|
||||
|
||||
for (const path of sqlPaths) {
|
||||
const content = await readTextFile(path);
|
||||
const displayName = uniqueImportedName(relativeImportName(selected, path), takenNames);
|
||||
await savedSqlStore.saveFile({
|
||||
connectionId,
|
||||
folderId: targetFolder?.id,
|
||||
name: displayName,
|
||||
database: "",
|
||||
sql: content,
|
||||
});
|
||||
}
|
||||
|
||||
toast(t("sqlLibrary.imported", { count: sqlPaths.length }), 2500);
|
||||
} catch (e: any) {
|
||||
toast(t("sqlLibrary.importFailed", { message: e?.message || String(e) }), 5000);
|
||||
}
|
||||
}
|
||||
|
||||
async function chooseSyncDirectory() {
|
||||
if (!isTauriRuntime()) {
|
||||
toast(t("sqlLibrary.desktopOnly"), 4000);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const { open } = await import("@tauri-apps/plugin-dialog");
|
||||
const selected = await open({
|
||||
directory: true,
|
||||
multiple: false,
|
||||
recursive: true,
|
||||
title: t("sqlLibrary.chooseSyncDirectory"),
|
||||
});
|
||||
if (!selected || Array.isArray(selected)) return;
|
||||
|
||||
await settingsStore.updateDesktopSettings({ saved_sql_sync_dir: selected });
|
||||
await savedSqlStore.syncToLocalDirectory();
|
||||
toast(t("sqlLibrary.syncDirectorySaved"), 2500);
|
||||
} catch (e: any) {
|
||||
toast(t("sqlLibrary.syncDirectoryFailed", { message: e?.message || String(e) }), 5000);
|
||||
}
|
||||
}
|
||||
|
||||
async function disableSyncDirectory() {
|
||||
try {
|
||||
await settingsStore.updateDesktopSettings({ saved_sql_sync_dir: null });
|
||||
toast(t("sqlLibrary.syncDirectoryDisabled"), 2500);
|
||||
} catch (e: any) {
|
||||
toast(t("sqlLibrary.syncDirectoryFailed", { message: e?.message || String(e) }), 5000);
|
||||
}
|
||||
}
|
||||
|
||||
async function openSqlStorageDirectory() {
|
||||
if (!isTauriRuntime()) {
|
||||
toast(t("sqlLibrary.desktopOnly"), 4000);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await api.openSavedSqlStorageDir(settingsStore.desktopSettings.saved_sql_sync_dir || undefined);
|
||||
} catch (e: any) {
|
||||
toast(t("sqlLibrary.openDirectoryFailed", { message: e?.message || String(e) }), 5000);
|
||||
}
|
||||
}
|
||||
|
||||
function fileMatchesQuery(file: SavedSqlFile) {
|
||||
const q = searchQuery.value;
|
||||
if (!q) return true;
|
||||
return [file.name, file.database, file.schema, file.sql, getConnectionLabel(file.connectionId)]
|
||||
.filter(Boolean)
|
||||
.some((value) => String(value).toLowerCase().includes(q));
|
||||
}
|
||||
|
||||
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) => !orphanedIds.value.has(file.id) && fileMatchesQuery(file));
|
||||
}
|
||||
|
||||
function filesInFolder(folderId: string) {
|
||||
const folder = savedSqlStore.allFolders.find((item) => item.id === folderId);
|
||||
const includeAllFilesForMatchedFolder =
|
||||
!!folder && !!searchQuery.value && folder.name.toLowerCase().includes(searchQuery.value);
|
||||
return savedSqlStore
|
||||
.filesInFolder(folderId)
|
||||
.filter((file) => !orphanedIds.value.has(file.id))
|
||||
.filter((file) => includeAllFilesForMatchedFolder || fileMatchesQuery(file));
|
||||
}
|
||||
|
||||
const visibleFolders = computed(() =>
|
||||
savedSqlStore.allFolders.filter((folder) => isConnectionVisible(folder.connectionId) && folderMatchesQuery(folder)),
|
||||
);
|
||||
|
||||
const visibleFiles = computed(() =>
|
||||
savedSqlStore
|
||||
.filesWithoutFolder()
|
||||
.filter((file) => !orphanedIds.value.has(file.id))
|
||||
.filter((file) => fileMatchesQuery(file)),
|
||||
);
|
||||
|
||||
const hasAnyVisibleItem = computed(() => visibleFolders.value.length > 0 || visibleFiles.value.length > 0);
|
||||
|
||||
const collapsedFolders = ref<Set<string>>(new Set());
|
||||
|
||||
function toggleFolder(folderId: string) {
|
||||
if (suppressNextRowClick.value) return;
|
||||
const next = new Set(collapsedFolders.value);
|
||||
if (next.has(folderId)) next.delete(folderId);
|
||||
else next.add(folderId);
|
||||
collapsedFolders.value = next;
|
||||
}
|
||||
|
||||
function isFolderExpanded(folderId: string) {
|
||||
return !collapsedFolders.value.has(folderId);
|
||||
}
|
||||
|
||||
const showNewFolderInput = ref(false);
|
||||
const newFolderName = ref("");
|
||||
const newFolderInputRef = ref<HTMLInputElement | null>(null);
|
||||
|
||||
function openNewFolderInput() {
|
||||
newFolderName.value = "";
|
||||
showNewFolderInput.value = true;
|
||||
nextTick(() => newFolderInputRef.value?.focus());
|
||||
}
|
||||
|
||||
async function confirmNewFolder() {
|
||||
const name = newFolderName.value.trim();
|
||||
if (!name) {
|
||||
cancelNewFolder();
|
||||
return;
|
||||
}
|
||||
showNewFolderInput.value = false;
|
||||
const connectionId = connectionStore.connections[0]?.id;
|
||||
if (!connectionId) return;
|
||||
await savedSqlStore.createFolder(connectionId, name);
|
||||
}
|
||||
|
||||
function cancelNewFolder() {
|
||||
showNewFolderInput.value = false;
|
||||
newFolderName.value = "";
|
||||
}
|
||||
|
||||
const renamingTarget = ref<{ type: "folder" | "file"; id: string } | null>(null);
|
||||
const renameValue = ref("");
|
||||
const renameInputRef = ref<HTMLInputElement | null>(null);
|
||||
function setRenameInputRef(el: unknown) {
|
||||
renameInputRef.value = (el as HTMLInputElement) ?? null;
|
||||
}
|
||||
|
||||
function startRenameFolder(folder: SavedSqlFolder) {
|
||||
renamingTarget.value = { type: "folder", id: folder.id };
|
||||
renameValue.value = folder.name;
|
||||
nextTick(() => {
|
||||
focusSidebarRenameInput(() => renameInputRef.value ?? undefined);
|
||||
});
|
||||
}
|
||||
|
||||
function startRenameFile(file: SavedSqlFile) {
|
||||
renamingTarget.value = { type: "file", id: file.id };
|
||||
renameValue.value = file.name.replace(/\.sql$/i, "");
|
||||
nextTick(() => {
|
||||
focusSidebarRenameInput(() => renameInputRef.value ?? undefined);
|
||||
});
|
||||
}
|
||||
|
||||
async function confirmRename() {
|
||||
if (!renamingTarget.value) return;
|
||||
const { type, id } = renamingTarget.value;
|
||||
const name = renameValue.value.trim();
|
||||
renamingTarget.value = null;
|
||||
renameValue.value = "";
|
||||
if (!name) return;
|
||||
if (type === "folder") {
|
||||
await savedSqlStore.renameFolder(id, name);
|
||||
} else {
|
||||
await savedSqlStore.renameFile(id, name.endsWith(".sql") ? name : `${name}.sql`);
|
||||
}
|
||||
}
|
||||
|
||||
function cancelRename() {
|
||||
renamingTarget.value = null;
|
||||
renameValue.value = "";
|
||||
}
|
||||
|
||||
const deleteTarget = ref<{ type: "folder" | "file"; id: string; name: string } | null>(null);
|
||||
const showDeleteConfirm = ref(false);
|
||||
|
||||
function confirmDeleteFolder(folder: SavedSqlFolder) {
|
||||
deleteTarget.value = { type: "folder", id: folder.id, name: folder.name };
|
||||
showDeleteConfirm.value = true;
|
||||
}
|
||||
|
||||
function confirmDeleteFile(file: SavedSqlFile) {
|
||||
deleteTarget.value = { type: "file", id: file.id, name: file.name };
|
||||
showDeleteConfirm.value = true;
|
||||
}
|
||||
|
||||
async function executeDelete() {
|
||||
if (!deleteTarget.value) return;
|
||||
const { type, id } = deleteTarget.value;
|
||||
if (type === "folder") await savedSqlStore.deleteFolder(id);
|
||||
else await savedSqlStore.deleteFile(id);
|
||||
showDeleteConfirm.value = false;
|
||||
deleteTarget.value = null;
|
||||
}
|
||||
|
||||
function openFile(file: SavedSqlFile) {
|
||||
if (suppressNextRowClick.value) return;
|
||||
queryStore.openSavedSql(file);
|
||||
connectionStore.activeConnectionId = file.connectionId;
|
||||
}
|
||||
|
||||
const contextTarget = ref<SavedSqlFolder | SavedSqlFile | "panel" | null>(null);
|
||||
|
||||
const contextMenuItems = computed<CtxMenuItem[]>(() => {
|
||||
const target = contextTarget.value;
|
||||
if (!target) return [];
|
||||
if (target === "panel") {
|
||||
return [
|
||||
{ label: t("savedSql.newFolder"), action: openNewFolderInput, icon: FolderPlus },
|
||||
{ label: t("sqlLibrary.importDirectory"), action: () => importDirectoryIntoLibrary(), icon: Upload },
|
||||
{ label: t("sqlLibrary.exportLibrary"), action: () => exportFolderContents(), icon: Download },
|
||||
{ label: "", separator: true },
|
||||
{ label: t("sqlLibrary.openStorageDirectory"), action: openSqlStorageDirectory, icon: LocateFixed },
|
||||
{ label: t("sqlLibrary.chooseSyncDirectory"), action: chooseSyncDirectory, icon: FolderCog },
|
||||
{
|
||||
label: t("sqlLibrary.disableSyncDirectory"),
|
||||
action: disableSyncDirectory,
|
||||
icon: X,
|
||||
visible: !!settingsStore.desktopSettings.saved_sql_sync_dir,
|
||||
},
|
||||
];
|
||||
}
|
||||
if ("sql" in target) {
|
||||
return [
|
||||
{ label: t("savedSql.open"), action: () => openFile(target), icon: FileText },
|
||||
{ label: t("sqlLibrary.exportFile"), action: () => exportSingleFile(target), icon: FileInput },
|
||||
{ label: "", separator: true },
|
||||
{ label: t("savedSql.renameFile"), action: () => startRenameFile(target), icon: Pencil },
|
||||
{ label: "", separator: true },
|
||||
{
|
||||
label: t("savedSql.deleteFile"),
|
||||
action: () => confirmDeleteFile(target),
|
||||
icon: Trash2,
|
||||
variant: "destructive",
|
||||
},
|
||||
];
|
||||
}
|
||||
return [
|
||||
{ label: t("sqlLibrary.importIntoFolder"), action: () => importDirectoryIntoLibrary(target), icon: Upload },
|
||||
{ label: t("sqlLibrary.exportFolder"), action: () => exportFolderContents(target), icon: Download },
|
||||
{ label: "", separator: true },
|
||||
{ label: t("savedSql.renameFolder"), action: () => startRenameFolder(target), icon: Pencil },
|
||||
{ label: "", separator: true },
|
||||
{
|
||||
label: t("savedSql.deleteFolder"),
|
||||
action: () => confirmDeleteFolder(target),
|
||||
icon: Trash2,
|
||||
variant: "destructive",
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
function clearContextTarget() {
|
||||
contextTarget.value = null;
|
||||
}
|
||||
|
||||
const dragState = reactive<{
|
||||
active: boolean;
|
||||
draggedId: string | null;
|
||||
draggedType: DragItemType | null;
|
||||
targetId: string | null;
|
||||
targetType: DragItemType | null;
|
||||
dropPosition: DropPosition | null;
|
||||
}>({
|
||||
active: false,
|
||||
draggedId: null,
|
||||
draggedType: null,
|
||||
targetId: null,
|
||||
targetType: null,
|
||||
dropPosition: null,
|
||||
});
|
||||
|
||||
let pendingDrag: {
|
||||
id: string;
|
||||
type: DragItemType;
|
||||
startX: number;
|
||||
startY: number;
|
||||
sourceEl: HTMLElement | null;
|
||||
} | null = null;
|
||||
let dragGhostEl: HTMLElement | null = null;
|
||||
let clearSuppressTimer: number | undefined;
|
||||
const suppressNextRowClick = ref(false);
|
||||
|
||||
function markSuppressedClick() {
|
||||
suppressNextRowClick.value = true;
|
||||
window.clearTimeout(clearSuppressTimer);
|
||||
clearSuppressTimer = window.setTimeout(() => {
|
||||
suppressNextRowClick.value = false;
|
||||
}, 0);
|
||||
}
|
||||
|
||||
function resetDragState() {
|
||||
dragState.active = false;
|
||||
dragState.draggedId = null;
|
||||
dragState.draggedType = null;
|
||||
dragState.targetId = null;
|
||||
dragState.targetType = null;
|
||||
dragState.dropPosition = null;
|
||||
pendingDrag = null;
|
||||
if (dragGhostEl) {
|
||||
dragGhostEl.remove();
|
||||
dragGhostEl = null;
|
||||
}
|
||||
document.body.style.cursor = "";
|
||||
document.body.style.userSelect = "";
|
||||
}
|
||||
|
||||
function createDragGhost(sourceEl: HTMLElement, x: number, y: number) {
|
||||
const ghost = document.createElement("div");
|
||||
const textNode = sourceEl.querySelector(".dbx-sql-library-drag-label");
|
||||
ghost.textContent = textNode?.textContent || "";
|
||||
ghost.style.cssText = `
|
||||
position: fixed;
|
||||
pointer-events: none;
|
||||
z-index: 9999;
|
||||
opacity: 0.9;
|
||||
box-shadow: 0 2px 8px rgba(0,0,0,0.12);
|
||||
border-radius: 4px;
|
||||
background: var(--background, #fff);
|
||||
border: 1px solid var(--border, #e5e7eb);
|
||||
max-width: 220px;
|
||||
height: 24px;
|
||||
padding: 0 8px;
|
||||
font-size: 12px;
|
||||
line-height: 24px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
left: ${x + 8}px;
|
||||
top: ${y - 12}px;
|
||||
`;
|
||||
document.body.appendChild(ghost);
|
||||
return ghost;
|
||||
}
|
||||
|
||||
function moveDragGhost(x: number, y: number) {
|
||||
if (!dragGhostEl) return;
|
||||
dragGhostEl.style.left = `${x + 8}px`;
|
||||
dragGhostEl.style.top = `${y - 12}px`;
|
||||
}
|
||||
|
||||
function onDocumentMouseMove(event: MouseEvent) {
|
||||
if (!pendingDrag && !dragState.active) return;
|
||||
|
||||
if (pendingDrag && !dragState.active) {
|
||||
const dx = event.clientX - pendingDrag.startX;
|
||||
const dy = event.clientY - pendingDrag.startY;
|
||||
if (Math.abs(dx) < DRAG_THRESHOLD && Math.abs(dy) < DRAG_THRESHOLD) return;
|
||||
|
||||
dragState.active = true;
|
||||
dragState.draggedId = pendingDrag.id;
|
||||
dragState.draggedType = pendingDrag.type;
|
||||
document.body.style.cursor = "grabbing";
|
||||
document.body.style.userSelect = "none";
|
||||
if (pendingDrag.sourceEl) {
|
||||
dragGhostEl = createDragGhost(pendingDrag.sourceEl, event.clientX, event.clientY);
|
||||
}
|
||||
pendingDrag = null;
|
||||
}
|
||||
|
||||
if (dragState.active) {
|
||||
moveDragGhost(event.clientX, event.clientY);
|
||||
}
|
||||
}
|
||||
|
||||
async function performDrop() {
|
||||
const draggedId = dragState.draggedId;
|
||||
const draggedType = dragState.draggedType;
|
||||
const targetId = dragState.targetId;
|
||||
const targetType = dragState.targetType;
|
||||
const dropPosition = dragState.dropPosition;
|
||||
if (!draggedId || !draggedType || !targetId || !targetType || !dropPosition) return;
|
||||
|
||||
if (draggedType === "folder" && targetType === "folder" && dropPosition !== "inside") {
|
||||
await savedSqlStore.reorderFolders(draggedId, targetId, dropPosition);
|
||||
return;
|
||||
}
|
||||
|
||||
if (draggedType !== "file") return;
|
||||
|
||||
if (targetType === "folder") {
|
||||
await savedSqlStore.moveFileToFolder(draggedId, targetId);
|
||||
return;
|
||||
}
|
||||
|
||||
if (targetType === "unfiled") {
|
||||
await savedSqlStore.moveFileToFolder(draggedId, undefined);
|
||||
return;
|
||||
}
|
||||
|
||||
if (targetType === "file" && dropPosition !== "inside") {
|
||||
await savedSqlStore.reorderFiles(draggedId, targetId, dropPosition);
|
||||
}
|
||||
}
|
||||
|
||||
function onDocumentMouseUp() {
|
||||
const hadActiveDrag = dragState.active;
|
||||
const dropPromise = hadActiveDrag ? performDrop() : Promise.resolve();
|
||||
if (hadActiveDrag) markSuppressedClick();
|
||||
resetDragState();
|
||||
void dropPromise;
|
||||
}
|
||||
|
||||
document.addEventListener("mousemove", onDocumentMouseMove, true);
|
||||
document.addEventListener("mouseup", onDocumentMouseUp, true);
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
document.removeEventListener("mousemove", onDocumentMouseMove, true);
|
||||
document.removeEventListener("mouseup", onDocumentMouseUp, true);
|
||||
window.clearTimeout(clearSuppressTimer);
|
||||
resetDragState();
|
||||
});
|
||||
|
||||
function handleDragMouseDown(event: MouseEvent, id: string, type: Extract<DragItemType, "folder" | "file">) {
|
||||
if (event.button !== 0) return;
|
||||
const target = event.target as HTMLElement | null;
|
||||
if (target?.closest("[data-no-drag='true']")) return;
|
||||
pendingDrag = {
|
||||
id,
|
||||
type,
|
||||
startX: event.clientX,
|
||||
startY: event.clientY,
|
||||
sourceEl: event.currentTarget as HTMLElement,
|
||||
};
|
||||
}
|
||||
|
||||
function updateDropTarget(event: MouseEvent, targetId: string, targetType: DragItemType) {
|
||||
if (!dragState.active || !dragState.draggedId || !dragState.draggedType) return;
|
||||
if (dragState.draggedId === targetId) {
|
||||
clearDropTarget(targetId);
|
||||
return;
|
||||
}
|
||||
|
||||
let nextPosition: DropPosition | null = null;
|
||||
if (dragState.draggedType === "folder" && targetType === "folder") {
|
||||
const rect = (event.currentTarget as HTMLElement).getBoundingClientRect();
|
||||
nextPosition = event.clientY - rect.top < rect.height / 2 ? "before" : "after";
|
||||
} else if (dragState.draggedType === "file" && targetType === "file") {
|
||||
const rect = (event.currentTarget as HTMLElement).getBoundingClientRect();
|
||||
nextPosition = event.clientY - rect.top < rect.height / 2 ? "before" : "after";
|
||||
} else if (dragState.draggedType === "file" && (targetType === "folder" || targetType === "unfiled")) {
|
||||
nextPosition = "inside";
|
||||
}
|
||||
|
||||
dragState.targetId = nextPosition ? targetId : null;
|
||||
dragState.targetType = nextPosition ? targetType : null;
|
||||
dragState.dropPosition = nextPosition;
|
||||
}
|
||||
|
||||
function clearDropTarget(targetId: string) {
|
||||
if (dragState.targetId !== targetId) return;
|
||||
dragState.targetId = null;
|
||||
dragState.targetType = null;
|
||||
dragState.dropPosition = null;
|
||||
}
|
||||
|
||||
function isDraggingItem(id: string) {
|
||||
return dragState.active && dragState.draggedId === id;
|
||||
}
|
||||
|
||||
function showDropBefore(targetId: string) {
|
||||
return dragState.active && dragState.targetId === targetId && dragState.dropPosition === "before";
|
||||
}
|
||||
|
||||
function showDropAfter(targetId: string) {
|
||||
return dragState.active && dragState.targetId === targetId && dragState.dropPosition === "after";
|
||||
}
|
||||
|
||||
function showDropInside(targetId: string) {
|
||||
return dragState.active && dragState.targetId === targetId && dragState.dropPosition === "inside";
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="h-full flex flex-col overflow-hidden border-l bg-background select-none">
|
||||
<div class="h-9 flex items-center gap-1 px-2 border-b shrink-0 bg-muted/20">
|
||||
<span class="text-xs font-medium">{{ t("sqlLibrary.title") }}</span>
|
||||
<span class="flex-1" />
|
||||
<Button variant="ghost" size="icon" class="h-5 w-5" :title="t('savedSql.newFolder')" @click="openNewFolderInput">
|
||||
<FolderPlus class="h-3 w-3" />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="h-5 w-5"
|
||||
:title="t('sqlLibrary.importDirectory')"
|
||||
@click="importDirectoryIntoLibrary()"
|
||||
>
|
||||
<Upload class="h-3 w-3" />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="h-5 w-5"
|
||||
:title="t('sqlLibrary.exportLibrary')"
|
||||
@click="exportFolderContents()"
|
||||
>
|
||||
<Download class="h-3 w-3" />
|
||||
</Button>
|
||||
<Button variant="ghost" size="icon" class="h-5 w-5" @click="emit('close')">
|
||||
<X class="h-3 w-3" />
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div class="border-b shrink-0 px-2 py-1">
|
||||
<div class="relative">
|
||||
<Search class="absolute left-2 top-1/2 -translate-y-1/2 h-3 w-3 text-muted-foreground" />
|
||||
<input
|
||||
v-model="searchText"
|
||||
autocapitalize="off"
|
||||
autocorrect="off"
|
||||
spellcheck="false"
|
||||
class="w-full h-6 pl-7 pr-6 text-xs rounded border border-border bg-background focus:outline-none focus:ring-1 focus:ring-ring"
|
||||
:placeholder="t('grid.search')"
|
||||
/>
|
||||
<button
|
||||
v-if="searchText"
|
||||
type="button"
|
||||
class="absolute right-1.5 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
|
||||
@click="searchText = ''"
|
||||
>
|
||||
<X class="h-3 w-3" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="min-h-0 flex-1 overflow-y-auto p-1">
|
||||
<div v-if="showNewFolderInput" class="flex items-center gap-1 px-2 py-1.5">
|
||||
<FolderOpen class="h-4 w-4 text-blue-400 shrink-0" />
|
||||
<input
|
||||
ref="newFolderInputRef"
|
||||
v-model="newFolderName"
|
||||
class="h-6 min-w-0 flex-1 rounded border border-border bg-background px-2 text-xs outline-none focus:ring-1 focus:ring-ring"
|
||||
:placeholder="t('savedSql.newFolderDefault')"
|
||||
@keydown.enter.prevent="confirmNewFolder"
|
||||
@keydown.escape.prevent="cancelNewFolder"
|
||||
@blur="confirmNewFolder"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<CustomContextMenu :items="contextMenuItems" @close="clearContextTarget">
|
||||
<template #default="{ onContextMenu }">
|
||||
<div
|
||||
class="h-full"
|
||||
@contextmenu.prevent="
|
||||
contextTarget = 'panel';
|
||||
onContextMenu($event);
|
||||
"
|
||||
>
|
||||
<div v-for="folder in visibleFolders" :key="folder.id" class="mb-0.5">
|
||||
<div
|
||||
class="relative flex items-center gap-1 rounded px-2 py-1.5 text-xs cursor-pointer transition-colors group"
|
||||
:class="[
|
||||
showDropInside(folder.id) ? 'ring-1 ring-primary/50 bg-primary/5' : 'hover:bg-accent',
|
||||
isDraggingItem(folder.id) ? 'opacity-50' : '',
|
||||
]"
|
||||
@mousedown="handleDragMouseDown($event, folder.id, 'folder')"
|
||||
@mousemove="updateDropTarget($event, folder.id, 'folder')"
|
||||
@mouseleave="clearDropTarget(folder.id)"
|
||||
@click="toggleFolder(folder.id)"
|
||||
@contextmenu.prevent="
|
||||
contextTarget = folder;
|
||||
onContextMenu($event);
|
||||
"
|
||||
>
|
||||
<div v-if="showDropBefore(folder.id)" class="absolute left-2 right-2 top-0 border-t-2 border-primary" />
|
||||
<div
|
||||
v-if="showDropAfter(folder.id)"
|
||||
class="absolute left-2 right-2 bottom-0 border-b-2 border-primary"
|
||||
/>
|
||||
<component
|
||||
:is="isFolderExpanded(folder.id) ? FolderOpen : FolderClosed"
|
||||
class="h-4 w-4 text-blue-400 shrink-0"
|
||||
/>
|
||||
<template v-if="renamingTarget?.type === 'folder' && renamingTarget.id === folder.id">
|
||||
<input
|
||||
:ref="setRenameInputRef"
|
||||
v-model="renameValue"
|
||||
data-no-drag="true"
|
||||
class="min-w-0 flex-1 rounded border border-primary/50 bg-transparent px-1 text-xs outline-none"
|
||||
@keydown.enter.prevent="confirmRename"
|
||||
@keydown.escape.prevent="cancelRename"
|
||||
@blur="confirmRename"
|
||||
@click.stop
|
||||
/>
|
||||
</template>
|
||||
<span v-else class="dbx-sql-library-drag-label min-w-0 flex-1 truncate">
|
||||
{{ folder.name }}
|
||||
<span class="ml-1 text-muted-foreground">({{ filesInFolder(folder.id).length }})</span>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div v-if="isFolderExpanded(folder.id)" class="ml-4">
|
||||
<div
|
||||
v-for="file in filesInFolder(folder.id)"
|
||||
:key="file.id"
|
||||
class="relative flex items-center gap-1 rounded px-2 py-1.5 text-xs cursor-pointer transition-colors group"
|
||||
:class="[isDraggingItem(file.id) ? 'opacity-50' : 'hover:bg-accent']"
|
||||
@mousedown="handleDragMouseDown($event, file.id, 'file')"
|
||||
@mousemove="updateDropTarget($event, file.id, 'file')"
|
||||
@mouseleave="clearDropTarget(file.id)"
|
||||
@click="openFile(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" />
|
||||
<template v-if="renamingTarget?.type === 'file' && renamingTarget.id === file.id">
|
||||
<input
|
||||
:ref="setRenameInputRef"
|
||||
v-model="renameValue"
|
||||
data-no-drag="true"
|
||||
class="min-w-0 flex-1 rounded border border-primary/50 bg-transparent px-1 text-xs outline-none"
|
||||
@keydown.enter.prevent="confirmRename"
|
||||
@keydown.escape.prevent="cancelRename"
|
||||
@blur="confirmRename"
|
||||
@click.stop
|
||||
/>
|
||||
</template>
|
||||
<span v-else class="dbx-sql-library-drag-label min-w-0 flex-1 truncate">{{ file.name }}</span>
|
||||
<span class="shrink-0 text-xs text-muted-foreground">
|
||||
[{{ getConnectionLabel(file.connectionId) }}]
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div v-if="filesInFolder(folder.id).length === 0" class="px-2 py-1 text-xs text-muted-foreground">
|
||||
{{ t("sqlLibrary.emptyFolder") }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="visibleFiles.length > 0 || dragState.draggedType === 'file'" class="mt-2">
|
||||
<div
|
||||
class="relative rounded 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>
|
||||
<div
|
||||
v-for="file in visibleFiles"
|
||||
:key="file.id"
|
||||
class="relative flex items-center gap-1 rounded px-2 py-1.5 text-xs cursor-pointer transition-colors group"
|
||||
:class="[isDraggingItem(file.id) ? 'opacity-50' : 'hover:bg-accent']"
|
||||
@mousedown="handleDragMouseDown($event, file.id, 'file')"
|
||||
@mousemove="updateDropTarget($event, file.id, 'file')"
|
||||
@mouseleave="clearDropTarget(file.id)"
|
||||
@click="openFile(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" />
|
||||
<template v-if="renamingTarget?.type === 'file' && renamingTarget.id === file.id">
|
||||
<input
|
||||
:ref="setRenameInputRef"
|
||||
v-model="renameValue"
|
||||
data-no-drag="true"
|
||||
class="min-w-0 flex-1 rounded border border-primary/50 bg-transparent px-1 text-xs outline-none"
|
||||
@keydown.enter.prevent="confirmRename"
|
||||
@keydown.escape.prevent="cancelRename"
|
||||
@blur="confirmRename"
|
||||
@click.stop
|
||||
/>
|
||||
</template>
|
||||
<span v-else class="dbx-sql-library-drag-label min-w-0 flex-1 truncate">{{ file.name }}</span>
|
||||
<span class="shrink-0 text-xs text-muted-foreground">
|
||||
[{{ getConnectionLabel(file.connectionId) }}]
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="!hasAnyVisibleItem && !showNewFolderInput"
|
||||
class="flex h-full flex-col items-center justify-center gap-2 text-muted-foreground"
|
||||
>
|
||||
<Library class="h-8 w-8 opacity-30" />
|
||||
<p class="text-xs">{{ t("sqlLibrary.empty") }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</CustomContextMenu>
|
||||
</div>
|
||||
|
||||
<Dialog v-model:open="showDeleteConfirm">
|
||||
<DialogContent class="sm:max-w-[380px]">
|
||||
<DialogHeader>
|
||||
<DialogTitle v-if="deleteTarget?.type === 'folder'">{{ t("savedSql.deleteFolder") }}</DialogTitle>
|
||||
<DialogTitle v-else>{{ t("savedSql.deleteFile") }}</DialogTitle>
|
||||
<DialogDescription v-if="deleteTarget?.type === 'folder'">
|
||||
{{ t("savedSql.deleteFolderConfirm", { name: deleteTarget?.name || "" }) }}
|
||||
</DialogDescription>
|
||||
<DialogDescription v-else>
|
||||
{{ t("savedSql.deleteFileConfirm", { name: deleteTarget?.name || "" }) }}
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<DialogFooter>
|
||||
<Button variant="outline" size="sm" @click="showDeleteConfirm = false">{{ t("dangerDialog.cancel") }}</Button>
|
||||
<Button variant="destructive" size="sm" @click="executeDelete">{{ t("dangerDialog.confirm") }}</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</div>
|
||||
</template>
|
||||
@@ -495,6 +495,17 @@
|
||||
"skipTcpProbe": true,
|
||||
"defaultPort": 5138
|
||||
},
|
||||
{
|
||||
"dbType": "etcd",
|
||||
"label": "etcd",
|
||||
"runtimeMode": "agent",
|
||||
"mcpMode": "bridge",
|
||||
"agentKey": "etcd",
|
||||
"singleConnectionPool": false,
|
||||
"metadataConnectionScoped": false,
|
||||
"skipTcpProbe": true,
|
||||
"defaultPort": 2379
|
||||
},
|
||||
{
|
||||
"dbType": "iotdb",
|
||||
"label": "Apache IoTDB",
|
||||
|
||||
@@ -34,11 +34,18 @@ pub struct DesktopSettings {
|
||||
pub icon_theme: DesktopIconTheme,
|
||||
#[serde(default)]
|
||||
pub debug_logging_enabled: bool,
|
||||
#[serde(default)]
|
||||
pub saved_sql_sync_dir: Option<String>,
|
||||
}
|
||||
|
||||
impl Default for DesktopSettings {
|
||||
fn default() -> Self {
|
||||
Self { show_tray_icon: true, icon_theme: DesktopIconTheme::Default, debug_logging_enabled: false }
|
||||
Self {
|
||||
show_tray_icon: true,
|
||||
icon_theme: DesktopIconTheme::Default,
|
||||
debug_logging_enabled: false,
|
||||
saved_sql_sync_dir: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -124,6 +131,7 @@ const SCHEMA_STATEMENTS: &[&str] = &[
|
||||
id TEXT PRIMARY KEY,
|
||||
connection_id TEXT NOT NULL,
|
||||
name TEXT NOT NULL DEFAULT '',
|
||||
order_index INTEGER NOT NULL DEFAULT 0,
|
||||
created_at TEXT NOT NULL DEFAULT '',
|
||||
updated_at TEXT NOT NULL DEFAULT ''
|
||||
)",
|
||||
@@ -135,6 +143,7 @@ const SCHEMA_STATEMENTS: &[&str] = &[
|
||||
database_name TEXT NOT NULL DEFAULT '',
|
||||
schema_name TEXT,
|
||||
sql_text TEXT NOT NULL DEFAULT '',
|
||||
order_index INTEGER NOT NULL DEFAULT 0,
|
||||
created_at TEXT NOT NULL DEFAULT '',
|
||||
updated_at TEXT NOT NULL DEFAULT ''
|
||||
)",
|
||||
@@ -155,6 +164,7 @@ impl Storage {
|
||||
conn.execute(statement, []).map_err(|e| e.to_string())?;
|
||||
}
|
||||
ensure_history_columns_sync(conn)?;
|
||||
ensure_saved_sql_columns_sync(conn)?;
|
||||
Ok(())
|
||||
})
|
||||
}
|
||||
@@ -196,6 +206,34 @@ fn ensure_history_columns_sync(conn: &Connection) -> Result<(), String> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn ensure_saved_sql_columns_sync(conn: &Connection) -> Result<(), String> {
|
||||
const FOLDER_COLUMNS: &[(&str, &str)] = &[("order_index", "INTEGER NOT NULL DEFAULT 0")];
|
||||
const FILE_COLUMNS: &[(&str, &str)] = &[("order_index", "INTEGER NOT NULL DEFAULT 0")];
|
||||
|
||||
ensure_table_columns(conn, "saved_sql_folders", FOLDER_COLUMNS)?;
|
||||
ensure_table_columns(conn, "saved_sql_files", FILE_COLUMNS)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn ensure_table_columns(conn: &Connection, table_name: &str, columns: &[(&str, &str)]) -> Result<(), String> {
|
||||
let mut stmt =
|
||||
conn.prepare(&format!("SELECT name FROM pragma_table_info('{table_name}')")).map_err(|e| e.to_string())?;
|
||||
let existing = stmt
|
||||
.query_map([], |row| row.get::<_, String>(0))
|
||||
.map_err(|e| e.to_string())?
|
||||
.collect::<Result<HashSet<_>, _>>()
|
||||
.map_err(|e| e.to_string())?;
|
||||
|
||||
for (name, definition) in columns {
|
||||
if existing.contains(*name) {
|
||||
continue;
|
||||
}
|
||||
conn.execute(&format!("ALTER TABLE {table_name} ADD COLUMN {name} {definition}"), [])
|
||||
.map_err(|e| e.to_string())?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn ssh_tunnel_secret_segment(index: usize, hop: &crate::models::connection::SshTunnelConfig) -> String {
|
||||
if hop.id.trim().is_empty() {
|
||||
index.to_string()
|
||||
@@ -436,6 +474,14 @@ impl Storage {
|
||||
"debug_logging_enabled".to_string(),
|
||||
serde_json::Value::Bool(desktop_settings.debug_logging_enabled),
|
||||
);
|
||||
match desktop_settings.saved_sql_sync_dir.as_ref().filter(|path| !path.trim().is_empty()) {
|
||||
Some(path) => {
|
||||
settings.insert("saved_sql_sync_dir".to_string(), serde_json::Value::String(path.clone()));
|
||||
}
|
||||
None => {
|
||||
settings.remove("saved_sql_sync_dir");
|
||||
}
|
||||
}
|
||||
self.save_app_settings_json(&settings).await
|
||||
}
|
||||
|
||||
@@ -452,6 +498,12 @@ impl Storage {
|
||||
.get("debug_logging_enabled")
|
||||
.and_then(|value| value.as_bool())
|
||||
.unwrap_or_else(|| DesktopSettings::default().debug_logging_enabled),
|
||||
saved_sql_sync_dir: settings
|
||||
.get("saved_sql_sync_dir")
|
||||
.and_then(|value| value.as_str())
|
||||
.map(str::trim)
|
||||
.filter(|value| !value.is_empty())
|
||||
.map(ToString::to_string),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -785,9 +837,16 @@ impl Storage {
|
||||
|
||||
for folder in &library.folders {
|
||||
tx.execute(
|
||||
"INSERT INTO saved_sql_folders (id, connection_id, name, created_at, updated_at) \
|
||||
VALUES (?, ?, ?, ?, ?)",
|
||||
params![folder.id, folder.connection_id, folder.name, folder.created_at, folder.updated_at],
|
||||
"INSERT INTO saved_sql_folders (id, connection_id, name, order_index, created_at, updated_at) \
|
||||
VALUES (?, ?, ?, ?, ?, ?)",
|
||||
params![
|
||||
folder.id,
|
||||
folder.connection_id,
|
||||
folder.name,
|
||||
folder.order_index,
|
||||
folder.created_at,
|
||||
folder.updated_at
|
||||
],
|
||||
)
|
||||
.map_err(|e| e.to_string())?;
|
||||
}
|
||||
@@ -795,8 +854,8 @@ impl Storage {
|
||||
for file in &library.files {
|
||||
tx.execute(
|
||||
"INSERT INTO saved_sql_files \
|
||||
(id, connection_id, folder_id, name, database_name, schema_name, sql_text, created_at, updated_at) \
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
(id, connection_id, folder_id, name, database_name, schema_name, sql_text, order_index, created_at, updated_at) \
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
params![
|
||||
file.id,
|
||||
file.connection_id,
|
||||
@@ -805,6 +864,7 @@ impl Storage {
|
||||
file.database,
|
||||
file.schema,
|
||||
file.sql,
|
||||
file.order_index,
|
||||
file.created_at,
|
||||
file.updated_at
|
||||
],
|
||||
@@ -821,8 +881,8 @@ impl Storage {
|
||||
self.with_conn(|conn| {
|
||||
let mut folder_stmt = conn
|
||||
.prepare(
|
||||
"SELECT id, connection_id, name, created_at, updated_at \
|
||||
FROM saved_sql_folders ORDER BY connection_id, name COLLATE NOCASE",
|
||||
"SELECT id, connection_id, name, order_index, created_at, updated_at \
|
||||
FROM saved_sql_folders ORDER BY order_index, connection_id, name COLLATE NOCASE",
|
||||
)
|
||||
.map_err(|e| e.to_string())?;
|
||||
let folders = folder_stmt
|
||||
@@ -831,8 +891,9 @@ impl Storage {
|
||||
id: row.get(0)?,
|
||||
connection_id: row.get(1)?,
|
||||
name: row.get(2)?,
|
||||
created_at: row.get(3)?,
|
||||
updated_at: row.get(4)?,
|
||||
order_index: row.get(3)?,
|
||||
created_at: row.get(4)?,
|
||||
updated_at: row.get(5)?,
|
||||
})
|
||||
})
|
||||
.map_err(|e| e.to_string())?
|
||||
@@ -841,8 +902,8 @@ impl Storage {
|
||||
|
||||
let mut file_stmt = conn
|
||||
.prepare(
|
||||
"SELECT id, connection_id, folder_id, name, database_name, schema_name, sql_text, created_at, updated_at \
|
||||
FROM saved_sql_files ORDER BY connection_id, folder_id, name COLLATE NOCASE",
|
||||
"SELECT id, connection_id, folder_id, name, database_name, schema_name, sql_text, order_index, created_at, updated_at \
|
||||
FROM saved_sql_files ORDER BY COALESCE(folder_id, ''), order_index, connection_id, name COLLATE NOCASE",
|
||||
)
|
||||
.map_err(|e| e.to_string())?;
|
||||
let files = file_stmt
|
||||
@@ -855,8 +916,9 @@ impl Storage {
|
||||
database: row.get(4)?,
|
||||
schema: row.get(5)?,
|
||||
sql: row.get(6)?,
|
||||
created_at: row.get(7)?,
|
||||
updated_at: row.get(8)?,
|
||||
order_index: row.get(7)?,
|
||||
created_at: row.get(8)?,
|
||||
updated_at: row.get(9)?,
|
||||
})
|
||||
})
|
||||
.map_err(|e| e.to_string())?
|
||||
@@ -872,13 +934,21 @@ impl Storage {
|
||||
let folder = folder.clone();
|
||||
self.with_conn(move |conn| {
|
||||
conn.execute(
|
||||
"INSERT INTO saved_sql_folders (id, connection_id, name, created_at, updated_at) \
|
||||
VALUES (?, ?, ?, ?, ?) \
|
||||
"INSERT INTO saved_sql_folders (id, connection_id, name, order_index, created_at, updated_at) \
|
||||
VALUES (?, ?, ?, ?, ?, ?) \
|
||||
ON CONFLICT(id) DO UPDATE SET \
|
||||
connection_id = excluded.connection_id, \
|
||||
name = excluded.name, \
|
||||
order_index = excluded.order_index, \
|
||||
updated_at = excluded.updated_at",
|
||||
params![folder.id, folder.connection_id, folder.name, folder.created_at, folder.updated_at],
|
||||
params![
|
||||
folder.id,
|
||||
folder.connection_id,
|
||||
folder.name,
|
||||
folder.order_index,
|
||||
folder.created_at,
|
||||
folder.updated_at
|
||||
],
|
||||
)
|
||||
.map(|_| ())
|
||||
.map_err(|e| e.to_string())
|
||||
@@ -902,8 +972,8 @@ impl Storage {
|
||||
self.with_conn(move |conn| {
|
||||
conn.execute(
|
||||
"INSERT INTO saved_sql_files \
|
||||
(id, connection_id, folder_id, name, database_name, schema_name, sql_text, created_at, updated_at) \
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) \
|
||||
(id, connection_id, folder_id, name, database_name, schema_name, sql_text, order_index, created_at, updated_at) \
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) \
|
||||
ON CONFLICT(id) DO UPDATE SET \
|
||||
connection_id = excluded.connection_id, \
|
||||
folder_id = excluded.folder_id, \
|
||||
@@ -911,6 +981,7 @@ impl Storage {
|
||||
database_name = excluded.database_name, \
|
||||
schema_name = excluded.schema_name, \
|
||||
sql_text = excluded.sql_text, \
|
||||
order_index = excluded.order_index, \
|
||||
updated_at = excluded.updated_at",
|
||||
params![
|
||||
file.id,
|
||||
@@ -920,6 +991,7 @@ impl Storage {
|
||||
file.database,
|
||||
file.schema,
|
||||
file.sql,
|
||||
file.order_index,
|
||||
file.created_at,
|
||||
file.updated_at
|
||||
],
|
||||
@@ -1348,6 +1420,7 @@ mod tests {
|
||||
show_tray_icon: false,
|
||||
icon_theme: DesktopIconTheme::Black,
|
||||
debug_logging_enabled: true,
|
||||
saved_sql_sync_dir: None,
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
@@ -1355,7 +1428,12 @@ mod tests {
|
||||
assert_eq!(storage.load_password_hash().await.unwrap(), Some("hash-1".to_string()));
|
||||
assert_eq!(
|
||||
storage.load_desktop_settings().await.unwrap(),
|
||||
DesktopSettings { show_tray_icon: false, icon_theme: DesktopIconTheme::Black, debug_logging_enabled: true }
|
||||
DesktopSettings {
|
||||
show_tray_icon: false,
|
||||
icon_theme: DesktopIconTheme::Black,
|
||||
debug_logging_enabled: true,
|
||||
saved_sql_sync_dir: None
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user