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
feat(ui): 分组右键菜单及自定义一级操作和排序 (#11564)
zipg33adceae7d62
diff --git a/apps/desktop/src/components/editor/QueryEditorContextMenu.vue b/apps/desktop/src/components/editor/QueryEditorContextMenu.vueindex a5fc325d12..060ac530a2 100644--- a/apps/desktop/src/components/editor/QueryEditorContextMenu.vue+++ b/apps/desktop/src/components/editor/QueryEditorContextMenu.vue@@ -42,6 +42,7 @@ import { queryContextObjectActions, type QueryContextObjectAction } from "@/lib/import type { SqlObjectNavigationTarget } from "@/lib/sql/sqlNavigation";import type { SqlSelectionCaseMode } from "@/lib/sql/sqlSelectionCase";import type { QueryEditorProps } from "./queryEditorTypes";+import { useSidebarMenuPresentation } from "@/composables/useSidebarMenuPresentation";export interface QueryEditorContextMenuState {readOnly: QueryEditorProps["readOnly"];@@ -93,12 +94,14 @@ const props = defineProps<{ getState: () => QueryEditorContextMenuState; actionsconst emit = defineEmits<{ close: [] }>();defineSlots<{ default(props: { onContextMenu: (event: MouseEvent) => void; isOpen: boolean }): unknown }>();const { t } = useI18n();+const { presentMenu, SidebarMenuPreferencesDialog, sidebarMenuPreferencesOpen, sidebarMenuPreferences } = useSidebarMenuPresentation();function contextObjectMenuItem(action: QueryContextObjectAction, target: SqlObjectNavigationTarget | null): ContextMenuItem {const disabled = !target;switch (action) {case "view-data":return {+ sidebarActionId: `editor.object.${action}`,label: t("contextMenu.viewData"),action: () => props.actions.emitContextObjectAction(action),disabled,@@ -106,6 +109,7 @@ function contextObjectMenuItem(action: QueryContextObjectAction, target: SqlObje};case "peek-table-structure":return {+ sidebarActionId: `editor.object.${action}`,label: t("contextMenu.peekStructure"),action: () => props.actions.emitContextObjectAction(action),disabled,@@ -113,6 +117,7 @@ function contextObjectMenuItem(action: QueryContextObjectAction, target: SqlObje};case "edit-table-structure":return {+ sidebarActionId: `editor.object.${action}`,label: t("contextMenu.editStructure"),action: () => props.actions.emitContextObjectAction(action),disabled,@@ -120,6 +125,7 @@ function contextObjectMenuItem(action: QueryContextObjectAction, target: SqlObje};case "edit-view":return {+ sidebarActionId: `editor.object.${action}`,label: t("contextMenu.editView"),action: () => props.actions.emitContextObjectAction(action),disabled,@@ -127,6 +133,7 @@ function contextObjectMenuItem(action: QueryContextObjectAction, target: SqlObje};case "view-source":return {+ sidebarActionId: `editor.object.${action}`,label: t("contextMenu.viewSource"),action: () => props.actions.emitContextObjectAction(action),disabled,@@ -134,6 +141,7 @@ function contextObjectMenuItem(action: QueryContextObjectAction, target: SqlObje};case "view-ddl":return {+ sidebarActionId: `editor.object.${action}`,label: t("contextMenu.viewDdl"),action: () => props.actions.emitContextObjectAction(action),disabled,@@ -157,6 +165,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {? []: [{+ sidebarActionId: "editor.execute",label: executeContextMenuLabel,action: actions.executeFromContextMenu,disabled: !canExecuteContextSql,@@ -164,6 +173,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.executeSql,},{+ sidebarActionId: "settings.shortcutExecuteSqlInNewResultTab",label: t("settings.shortcutExecuteSqlInNewResultTab"),action: actions.executeInNewResultTabFromContextMenu,disabled: !canExecuteContextSql,@@ -171,6 +181,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.executeSqlInNewResultTab,},{+ sidebarActionId: "toolbar.explainPlan",label: t("toolbar.explainPlan"),action: actions.explainFromContextMenu,disabled: state.canExplain === false || !canExecuteContextSql,@@ -178,24 +189,27 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.explainSql,},{+ sidebarActionId: "editor.previewChanges",label: t("editor.previewChanges"),action: () => void actions.requestPreviewChanges(props.getState().previewContextSql),disabled: !state.previewContextSql,icon: Eye,},{+ sidebarActionId: "editor.contextMenu.export",label: t("editor.contextMenu.export"),icon: Download,disabled: !canExecuteContextSql,children: [- { label: t("editor.contextMenu.exportQueryResultTo", { format: "CSV" }), action: () => actions.exportQueryFromContextMenu("csv") },- { label: t("editor.contextMenu.exportQueryResultTo", { format: "XLSX" }), action: () => actions.exportQueryFromContextMenu("xlsx") },- { label: t("editor.contextMenu.exportQueryResultTo", { format: "TXT" }), action: () => actions.exportQueryFromContextMenu("txt") },+ { sidebarActionId: "editor.contextMenu.exportQueryResultTo", label: t("editor.contextMenu.exportQueryResultTo", { format: "CSV" }), action: () => actions.exportQueryFromContextMenu("csv") },+ { sidebarActionId: "editor.contextMenu.exportQueryResultTo", label: t("editor.contextMenu.exportQueryResultTo", { format: "XLSX" }), action: () => actions.exportQueryFromContextMenu("xlsx") },+ { sidebarActionId: "editor.contextMenu.exportQueryResultTo", label: t("editor.contextMenu.exportQueryResultTo", { format: "TXT" }), action: () => actions.exportQueryFromContextMenu("txt") },],},]),...queryContextObjectActions(state.contextObjectTarget?.type).map((action) => contextObjectMenuItem(action, state.contextObjectTarget)),{+ sidebarActionId: "editor.contextMenu.expandSelectStar",label: t("editor.contextMenu.expandSelectStar"),action: () => expandSelectStar?.(),disabled: !expandSelectStar,@@ -204,6 +218,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {},{ label: "", separator: true },{+ sidebarActionId: "editor.contextMenu.commentSelection",label: t("editor.contextMenu.commentSelection"),action: actions.toggleCommentFromContextMenu,disabled: state.readOnly || !canCopySelectedSql,@@ -211,6 +226,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.toggleLineComment,},{+ sidebarActionId: "editor.contextMenu.blockCommentSelection",label: t("editor.contextMenu.blockCommentSelection"),action: actions.toggleBlockCommentFromContextMenu,disabled: state.readOnly || !canCopySelectedSql || !supportsQueryEditorBlockComments(state.databaseType),@@ -218,6 +234,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.toggleBlockComment,},{+ sidebarActionId: "editor.format",label: canCopySelectedSql ? t("editor.contextMenu.formatSelectionSql") : t("toolbar.formatSql"),action: () => void actions.formatCurrentSql(),disabled: state.readOnly || (!canCopySelectedSql && !canExecuteContextSql && !state.hasContent) || !canFormatSqlForDatabaseType(state.databaseType),@@ -225,28 +242,33 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.formatSql,},{+ sidebarActionId: "editor.contextMenu.compressSelectionSql",label: t("editor.contextMenu.compressSelectionSql"),action: actions.compressCurrentSql,disabled: state.readOnly || !canCopySelectedSql,icon: Minimize2,},{+ sidebarActionId: "editor.contextMenu.folding",label: t("editor.contextMenu.folding"),icon: ChevronsUpDown,children: [{+ sidebarActionId: "editor.contextMenu.toggleFold",label: t("editor.contextMenu.toggleFold"),action: () => actions.toggleFoldFromContextMenu?.(),icon: ChevronsUpDown,shortcut: shortcuts.toggleFold,},{+ sidebarActionId: "editor.contextMenu.foldAll",label: t("editor.contextMenu.foldAll"),action: () => actions.foldAllFromContextMenu?.(),icon: FoldVertical,shortcut: shortcuts.foldAll,},{+ sidebarActionId: "editor.contextMenu.unfoldAll",label: t("editor.contextMenu.unfoldAll"),action: () => actions.unfoldAllFromContextMenu?.(),icon: UnfoldVertical,@@ -255,6 +277,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {],},{+ sidebarActionId: "editor.contextMenu.copySelection",label: t("editor.contextMenu.copySelection"),action: actions.copySelectedSqlFromContextMenu,disabled: !canCopySelectedSql,@@ -262,18 +285,21 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: "Mod+C",},{+ sidebarActionId: "editor.contextMenu.copySelectionAsRichText",label: t("editor.contextMenu.copySelectionAsRichText"),action: actions.copySelectedSqlAsRichTextFromContextMenu,disabled: !canCopySelectedSql,icon: Highlighter,},{+ sidebarActionId: "editor.contextMenu.screenshotSelection",label: t("editor.contextMenu.screenshotSelection"),action: actions.openCodeSnapshot,disabled: !canCopySelectedSql,icon: Camera,},{+ sidebarActionId: "editor.contextMenu.cutSelection",label: t("editor.contextMenu.cutSelection"),action: actions.cutSelectedSqlFromContextMenu,disabled: !canCopySelectedSql || state.readOnly,@@ -281,6 +307,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: "Mod+X",},{+ sidebarActionId: "editor.contextMenu.pasteFromClipboard",label: t("editor.contextMenu.pasteFromClipboard"),action: actions.pasteClipboardSqlFromContextMenu,disabled: state.readOnly,@@ -289,12 +316,14 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {},{// 显式入口:即使关闭了「粘贴时自动还原源码 SQL」设置也能使用+ sidebarActionId: "editor.contextMenu.pasteRestoringSourceSql",label: t("editor.contextMenu.pasteRestoringSourceSql"),action: actions.pasteClipboardSqlRestoringSource,disabled: state.readOnly,icon: WandSparkles,},{+ sidebarActionId: "editor.contextMenu.sendToAi",label: t("editor.contextMenu.sendToAi"),action: () => {actions.sendSelectionToAi();@@ -304,6 +333,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.sendSelectionToAi,},{+ sidebarActionId: "editor.contextMenu.toggleCaseSelection",label: t("editor.contextMenu.toggleCaseSelection"),action: () => actions.convertSelectedSqlCase("toggle"),disabled: !canCopySelectedSql,@@ -311,6 +341,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.toggleCaseSelection,},{+ sidebarActionId: "editor.contextMenu.uppercaseSelection",label: t("editor.contextMenu.uppercaseSelection"),action: () => actions.convertSelectedSqlCase("upper"),disabled: !canCopySelectedSql,@@ -318,6 +349,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.uppercaseSelection,},{+ sidebarActionId: "editor.contextMenu.lowercaseSelection",label: t("editor.contextMenu.lowercaseSelection"),action: () => actions.convertSelectedSqlCase("lower"),disabled: !canCopySelectedSql,@@ -325,6 +357,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.lowercaseSelection,},{+ sidebarActionId: "editor.contextMenu.convertNamingStyle",label: t("editor.contextMenu.convertNamingStyle"),action: actions.convertSelectedNamingStyle,disabled: !canCopySelectedSql,@@ -332,24 +365,28 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {shortcut: shortcuts.convertNamingStyle,},{+ sidebarActionId: "editor.contextMenu.delimitedList",label: t("editor.contextMenu.delimitedList"),action: actions.openDelimitedListDialog,disabled: state.readOnly || !canCopySelectedSql,icon: List,},{+ sidebarActionId: "editor.contextMenu.addNextSelectionOccurrence",label: t("editor.contextMenu.addNextSelectionOccurrence"),action: actions.addNextSelectionOccurrenceFromContextMenu,icon: TextSelect,shortcut: shortcuts.addNextSelectionOccurrence,},{+ sidebarActionId: "editor.contextMenu.selectAllSelectionOccurrences",label: t("editor.contextMenu.selectAllSelectionOccurrences"),action: actions.selectAllSelectionOccurrencesFromContextMenu,icon: TextSelect,shortcut: shortcuts.selectAllSelectionOccurrences,},{+ sidebarActionId: "editor.contextMenu.selectCurrentStatement",label: t("editor.contextMenu.selectCurrentStatement"),action: actions.selectCurrentStatementFromContextMenu,icon: TextSelect,@@ -357,12 +394,14 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {},{ label: "", separator: true },{+ sidebarActionId: "editor.contextMenu.findReplace",label: t("editor.contextMenu.findReplace"),action: actions.openFindReplaceFromContextMenu,icon: Search,shortcut: shortcuts.find,},{+ sidebarActionId: "editor.contextMenu.deleteEmptyLines",label: t("editor.contextMenu.deleteEmptyLines"),action: actions.deleteEmptyLines,disabled: state.readOnly,@@ -370,6 +409,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {},{ label: "", separator: true },{+ sidebarActionId: "editor.contextMenu.selectAll",label: t("editor.contextMenu.selectAll"),action: actions.selectAllSqlFromContextMenu,icon: TextSelect,@@ -379,7 +419,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {});function currentContextMenuItems(): ContextMenuItem[] {- return contextMenuItems.value;+ return presentMenu(contextMenuItems.value, "sql-editor");}</script>@@ -387,4 +427,5 @@ function currentContextMenuItems(): ContextMenuItem[] {<CustomContextMenu :items="currentContextMenuItems" @close="emit('close')" v-slot="slotProps"><slot v-bind="slotProps" /></CustomContextMenu>+ <SidebarMenuPreferencesDialog v-if="sidebarMenuPreferences" v-model:open="sidebarMenuPreferencesOpen" :scope="sidebarMenuPreferences.scope" :items="sidebarMenuPreferences.items" /></template>diff --git a/apps/desktop/src/components/editor/__tests__/QueryEditorContextMenu.integration.spec.ts b/apps/desktop/src/components/editor/__tests__/QueryEditorContextMenu.integration.spec.tsindex c0f12c5769..7a6c316cc4 100644--- a/apps/desktop/src/components/editor/__tests__/QueryEditorContextMenu.integration.spec.ts+++ b/apps/desktop/src/components/editor/__tests__/QueryEditorContextMenu.integration.spec.ts@@ -5,6 +5,10 @@ import { createI18n } from "vue-i18n";import { afterEach, describe, expect, it, vi } from "vitest";import QueryEditorContextMenu, { type QueryEditorContextMenuActions, type QueryEditorContextMenuState } from "../QueryEditorContextMenu.vue";import { DEFAULT_SHORTCUT_SETTINGS } from "@/lib/editor/shortcutRegistry";+import { createPinia } from "pinia";+import { DEFAULT_EDITOR_SETTINGS, useSettingsStore } from "@/stores/settingsStore";++vi.mock("@/lib/backend/api", async (importOriginal) => ({ ...(await importOriginal<typeof import("@/lib/backend/api")>()), loadEditorSettings: vi.fn(async () => DEFAULT_EDITOR_SETTINGS), saveEditorSettings: vi.fn(async () => undefined) }));const cleanups: Array<() => void> = [];@@ -12,7 +16,7 @@ afterEach(() => {for (const cleanup of cleanups.splice(0).reverse()) cleanup();});-function mountMenu() {+function mountMenu(layout: "full" | "grouped" = "full") {const state = reactive<QueryEditorContextMenuState>({ readOnly: false, hideExecutionControls: false, databaseType: "mysql", selectedSql: "", executableSql: "", previewContextSql: "", contextObjectTarget: null, shortcuts: { ...DEFAULT_SHORTCUT_SETTINGS }, expandSelectStar: undefined });const actions = {executeFromContextMenu: vi.fn(),@@ -64,7 +68,11 @@ function mountMenu() {},),});- app.use(createI18n({ legacy: false, locale: "en", messages: { en: {} }, missingWarn: false, fallbackWarn: false }));+ app.use(createI18n({ legacy: false, locale: "en", messages: { en: { editor: { contextMenu: { exportQueryResultTo: "Export {format}" } } } }, missingWarn: false, fallbackWarn: false }));+ const pinia = createPinia();+ app.use(pinia);+ const settings = useSettingsStore(pinia);+ settings.editorSettings.sidebarMenuLayout = layout;app.mount(host);cleanups.push(() => {app.unmount();@@ -75,7 +83,7 @@ function mountMenu() {host.querySelector("[data-editor-host]")!.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true, cancelable: true, clientX: 20, clientY: 20 }));await nextTick();};- return { state, actions, onClose, open, host };+ return { state, actions, onClose, open, host, settings };}function button(label: string) {@@ -85,6 +93,83 @@ function button(label: string) {}describe("QueryEditor extracted context menu", () => {+ it("keeps primary actions direct and groups clipboard, structure and result operations", async () => {+ const { state, actions, open } = mountMenu("grouped");+ state.selectedSql = "SELECT * FROM orders";+ state.executableSql = state.selectedSql;+ state.contextObjectTarget = { type: "table", name: "orders", database: "demo" };+ await open();+ const labels = [...document.querySelectorAll<HTMLButtonElement>("[data-dbx-context-menu] button")].map((entry) => entry.textContent!);+ expect(labels.indexOf("sidebarMenu.groups.structure")).toBeLessThan(labels.indexOf("sidebarMenu.groups.execution"));+ expect(labels.indexOf("sidebarMenu.groups.copy")).toBeLessThan(labels.indexOf("sidebarMenu.groups.execution"));+ expect(labels.some((label) => label.includes("editor.contextMenu.uppercaseSelection"))).toBe(true);+ button("sidebarMenu.groups.sqlEditor").click();+ await nextTick();+ button("editor.contextMenu.uppercaseSelection").click();+ expect(actions.convertSelectedSqlCase).toHaveBeenCalledExactlyOnceWith("upper");+ await open();+ button("sidebarMenu.groups.structure").click();+ await nextTick();+ button("contextMenu.editStructure").click();+ expect(actions.emitContextObjectAction).toHaveBeenCalledExactlyOnceWith("edit-table-structure");+ });++ it("updates the open menu when switching layouts without clearing the accepted target", async () => {+ const { state, open, onClose } = mountMenu("grouped");+ state.selectedSql = "SELECT * FROM orders";+ state.executableSql = state.selectedSql;+ state.contextObjectTarget = { type: "table", name: "orders", database: "demo" };+ await open();+ state.contextObjectTarget = null;+ button("sidebarMenu.useFull").click();+ await new Promise((resolve) => setTimeout(resolve, 0));+ await nextTick();+ expect(onClose).not.toHaveBeenCalled();+ expect(button("sidebarMenu.useFull").getAttribute("aria-pressed")).toBe("true");+ expect(document.querySelector("[data-dbx-context-menu]")?.textContent).not.toContain("sidebarMenu.customize");+ expect(button("contextMenu.editStructure").disabled).toBe(false);+ button("sidebarMenu.useFull").click();+ await new Promise((resolve) => setTimeout(resolve, 0));+ await nextTick();+ expect(onClose).not.toHaveBeenCalled();+ expect(button("sidebarMenu.useFull").getAttribute("aria-pressed")).toBe("false");+ button("sidebarMenu.groups.structure").click();+ await nextTick();+ expect(button("contextMenu.editStructure").disabled).toBe(false);+ });++ it("recommends explain, uppercase, lowercase and screenshot while permitting opt-out", async () => {+ const { state, open, settings } = mountMenu("grouped");+ state.selectedSql = "SELECT 1";+ state.executableSql = state.selectedSql;+ await open();+ for (const label of ["toolbar.explainPlan", "editor.contextMenu.uppercaseSelection", "editor.contextMenu.lowercaseSelection", "editor.contextMenu.screenshotSelection"]) expect(button(label).disabled).toBe(false);+ settings.editorSettings.sidebarMenuHiddenPrimaryActions["sql-editor"] = ["editor.contextMenu.uppercaseSelection"];+ await open();+ expect([...document.querySelectorAll("[data-dbx-context-menu] button")].some((entry) => entry.textContent === "editor.contextMenu.uppercaseSelection")).toBe(false);+ button("sidebarMenu.groups.sqlEditor").click();+ await nextTick();+ expect(button("editor.contextMenu.uppercaseSelection").disabled).toBe(false);+ });++ it("promotes saved editor actions without changing the preferences of table menus", async () => {+ const { state, open, settings } = mountMenu("grouped");+ settings.editorSettings.sidebarMenuPinnedActions = { "sql-editor": ["editor.contextMenu.export"], table: ["contextMenu.exportData"] };+ state.executableSql = "SELECT 1";+ await open();+ button("editor.contextMenu.export").click();+ await nextTick();+ expect(button("CSV").disabled).toBe(false);+ expect(settings.editorSettings.sidebarMenuPinnedActions.table).toEqual(["contextMenu.exportData"]);+ });++ it("preserves disabled export guards when flattening the result submenu", async () => {+ const { open } = mountMenu("grouped");+ await open();+ button("sidebarMenu.groups.execution").click();+ await nextTick();+ expect(button("CSV").disabled).toBe(true);+ });it("routes the upstream table structure peek action through the extracted menu", async () => {const { state, actions, open } = mountMenu();state.contextObjectTarget = { name: "users", database: "demo", schema: "public", type: "table" };diff --git a/apps/desktop/src/components/objects/DatabaseBrowser.vue b/apps/desktop/src/components/objects/DatabaseBrowser.vueindex 4bcc6d0eba..94c1f0cb2c 100644--- a/apps/desktop/src/components/objects/DatabaseBrowser.vue+++ b/apps/desktop/src/components/objects/DatabaseBrowser.vue@@ -20,6 +20,7 @@ import { useTabUiState } from "@/lib/tabs/tabUiState";import { useQueryStore } from "@/stores/queryStore";import { useConnectionStore } from "@/stores/connectionStore";import { useSettingsStore } from "@/stores/settingsStore";+import { useSidebarMenuPresentation } from "@/composables/useSidebarMenuPresentation";import type { ConnectionConfig, TreeNode } from "@/types/database";import { copyToClipboard } from "@/lib/common/clipboard";@@ -64,6 +65,7 @@ const { t } = useI18n();const queryStore = useQueryStore();const connectionStore = useConnectionStore();const settingsStore = useSettingsStore();+const { presentMenu, SidebarMenuPreferencesDialog, sidebarMenuPreferencesOpen, sidebarMenuPreferences } = useSidebarMenuPresentation();const searchInput = ref<InstanceType<typeof Input>>();const search = ref(restoredUiState.search ?? "");const rows = ref<DatabaseRow[]>([]);@@ -132,30 +134,34 @@ function openDatabase(database: string) {function databaseContextMenuItems(row: DatabaseRow): ContextMenuItem[] {const node: TreeNode = { id: `${props.connection.id}:${row.name}`, label: row.name, type: "database", connectionId: props.connection.id, database: row.name };const runtimeItems = sidebarRuntimeHost.value?.buildContextMenu(node);- if (runtimeItems?.length) return removeUnsupportedDatabaseItems(runtimeItems);+ if (runtimeItems?.length) return presentMenu(removeUnsupportedDatabaseItems(runtimeItems), "database");const isDefault = props.connection.database === row.name;- return [- { label: t("contextMenu.viewData"), action: () => openDatabase(row.name), icon: Database },- {- label: t("contextMenu.viewDdl"),- action: () => {- const dbType = props.connection.db_type;- const sql = dbType === "mysql" ? `SHOW CREATE DATABASE \`${row.name.replaceAll("`", "``")}\`;` : `-- ${row.name}\n-- Database DDL is not available for this driver.`;- queryStore.createTab(props.connection.id, row.name, `${row.name} - ${t("contextMenu.viewDdl")}`, "query", undefined, sql, undefined, { forceNew: true });+ return presentMenu(+ [+ { sidebarActionId: "contextMenu.viewData", label: t("contextMenu.viewData"), action: () => openDatabase(row.name), icon: Database },+ {+ sidebarActionId: "contextMenu.viewDdl",+ label: t("contextMenu.viewDdl"),+ action: () => {+ const dbType = props.connection.db_type;+ const sql = dbType === "mysql" ? `SHOW CREATE DATABASE \`${row.name.replaceAll("`", "``")}\`;` : `-- ${row.name}\n-- Database DDL is not available for this driver.`;+ queryStore.createTab(props.connection.id, row.name, `${row.name} - ${t("contextMenu.viewDdl")}`, "query", undefined, sql, undefined, { forceNew: true });+ },+ icon: Copy,},- icon: Copy,- },- { label: t("contextMenu.newQuery"), action: () => queryStore.createTab(props.connection.id, row.name, `${row.name} - ${t("contextMenu.newQuery")}`, "query", undefined, undefined, undefined, { forceNew: true }), icon: TerminalSquare },- { label: t("contextMenu.copyName"), action: () => copyToClipboard(row.name), icon: Copy },- { label: "", separator: true },- {- label: isDefault ? t("contextMenu.clearDefaultDatabase") : t("contextMenu.setDefaultDatabase"),- action: () => (isDefault ? connectionStore.clearDefaultDatabase(props.connection.id) : connectionStore.setDefaultDatabase(props.connection.id, row.name)),- icon: Database,- },- { label: "", separator: true },- { label: t("contextMenu.refreshTab"), action: () => refresh(), icon: RefreshCw },- ];+ { sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: () => queryStore.createTab(props.connection.id, row.name, `${row.name} - ${t("contextMenu.newQuery")}`, "query", undefined, undefined, undefined, { forceNew: true }), icon: TerminalSquare },+ { sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: () => copyToClipboard(row.name), icon: Copy },+ { label: "", separator: true },+ {+ label: isDefault ? t("contextMenu.clearDefaultDatabase") : t("contextMenu.setDefaultDatabase"),+ action: () => (isDefault ? connectionStore.clearDefaultDatabase(props.connection.id) : connectionStore.setDefaultDatabase(props.connection.id, row.name)),+ icon: Database,+ },+ { label: "", separator: true },+ { sidebarActionId: "contextMenu.refreshTab", label: t("contextMenu.refreshTab"), action: () => refresh(), icon: RefreshCw },+ ],+ "database",+ );}function removeUnsupportedDatabaseItems(items: ContextMenuItem[]): ContextMenuItem[] {@@ -492,6 +498,7 @@ defineExpose({ focusSearch, refresh });</div></div></div>+ <SidebarMenuPreferencesDialog v-if="sidebarMenuPreferences" v-model:open="sidebarMenuPreferencesOpen" :scope="sidebarMenuPreferences.scope" :items="sidebarMenuPreferences.items" /><SidebarTreeRuntimeHost ref="sidebarRuntimeHost" :node="sidebarRuntimeNode" :depth="0" @open-danger-dialog="openSidebarDangerDialog" @open-data="openDatabaseFromSidebar" @open-ddl="openDatabaseFromSidebar" @open-dialog-controller="sidebarDialogController = $event" /><SidebarTreeItemDialogs v-if="sidebarDialogController" :controller="sidebarDialogController" @closed="sidebarDialogController = null" /></section>diff --git a/apps/desktop/src/components/objects/ObjectBrowser.vue b/apps/desktop/src/components/objects/ObjectBrowser.vueindex 1025c2130e..a786f49742 100644--- a/apps/desktop/src/components/objects/ObjectBrowser.vue+++ b/apps/desktop/src/components/objects/ObjectBrowser.vue@@ -127,6 +127,7 @@ import { useConnectionStore } from "@/stores/connectionStore";import { treeNodePinIdentity, type PinnedTreeNodeIdentity } from "@/lib/app/pinnedItems";import { useExportTracker, type ExportTask } from "@/composables/useExportTracker";import { useSettingsStore } from "@/stores/settingsStore";+import { useSidebarMenuPresentation } from "@/composables/useSidebarMenuPresentation";import { formatSidebarTableNamesForCopy, type SidebarTableCopyTarget } from "@/lib/sidebar/sidebarTableNameCopy";import { useQueryStore } from "@/stores/queryStore";import { getTableMutationHistoryStoreOrNull, recordTableMutationHistory } from "@/lib/history/tableMutationHistory";@@ -218,6 +219,7 @@ const { highlight } = useSqlHighlighter();const connectionStore = useConnectionStore();const queryStore = useQueryStore();const settingsStore = useSettingsStore();+const { presentMenu, SidebarMenuPreferencesDialog, sidebarMenuPreferencesOpen, sidebarMenuPreferences } = useSidebarMenuPresentation();const refreshTooltip = computed(() => {const shortcut = formatShortcut(settingsStore.editorSettings.shortcuts.refreshData);return shortcut ? `${t("grid.refresh")} (${shortcut})` : t("grid.refresh");@@ -3578,10 +3580,11 @@ function exportDataSubmenu(item: ObjectBrowserRow): ContextMenuItem {];if (!isVictoriaMetrics.value) {formats.push({ label: "SQL INSERT", action: () => exportData(item, "sql", "source") });- formats.push({ label: t("contextMenu.standardSqlInsert"), action: () => exportData(item, "sql", "standard") });+ formats.push({ sidebarActionId: "contextMenu.standardSqlInsert", label: t("contextMenu.standardSqlInsert"), action: () => exportData(item, "sql", "standard") });}formats.push({ label: "XLSX", action: () => exportDataXlsx(item) });return {+ sidebarActionId: "contextMenu.exportData",label: t("contextMenu.exportData"),icon: Upload,children: formats,@@ -3603,10 +3606,10 @@ function objectBrowserTableClipboardMenuState(item: ObjectBrowserRow) {function tableClipboardMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {if (isVictoriaMetrics.value) return [];- const copyItem: ContextMenuItem = { label: t("contextMenu.copyTable"), action: () => copySingleTableToClipboard(item), icon: Copy };+ const copyItem: ContextMenuItem = { sidebarActionId: "contextMenu.copyTable", label: t("contextMenu.copyTable"), action: () => copySingleTableToClipboard(item), icon: Copy };const state = objectBrowserTableClipboardMenuState(item);if (state === "copy") return [copyItem];- const pasteItem: ContextMenuItem = { label: t("contextMenu.pasteTable"), action: openPasteTableDialog, icon: Clipboard };+ const pasteItem: ContextMenuItem = { sidebarActionId: "contextMenu.pasteTable", label: t("contextMenu.pasteTable"), action: openPasteTableDialog, icon: Clipboard };return state === "paste" ? [pasteItem] : [copyItem, pasteItem];}@@ -3624,6 +3627,7 @@ function addToAiMenuItem(item: ObjectBrowserRow): ContextMenuItem {// and future-proof if multi-schema selection ever appears.const targets = useBatch ? selectedTableRows.value.map((row) => ({ name: row.name, schema: row.schema })) : [{ name: item.name, schema: item.schema }];return {+ sidebarActionId: "contextMenu.addToAi",label: useBatch ? t("contextMenu.addToAiMultiple", { count }) : t("contextMenu.addToAi"),action: () => emit("addToAi", targets),icon: Sparkles,@@ -3637,30 +3641,31 @@ function selectedBatchTableCountLabel(key: "batchDrop" | "batchTruncate" | "batcfunction getTableMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {if (effectiveDatabaseType.value === "nebula") {return [- { label: t("contextMenu.viewData"), action: () => openViewData(item), icon: Table2 },- { label: t("contextMenu.viewDdl"), action: () => openTableInfo(item, "ddl"), icon: FileCode },+ { sidebarActionId: "contextMenu.viewData", label: t("contextMenu.viewData"), action: () => openViewData(item), icon: Table2 },+ { sidebarActionId: "contextMenu.viewDdl", label: t("contextMenu.viewDdl"), action: () => openTableInfo(item, "ddl"), icon: FileCode },{ label: "", separator: true },- { label: t("contextMenu.copyName"), action: () => copyName(item), icon: Copy },+ { sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: () => copyName(item), icon: Copy },];}if (isVictoriaMetrics.value) {return [- { label: t("contextMenu.viewData"), action: () => openViewData(item), icon: Table2 },- { label: t("contextMenu.newQuery"), action: () => openNewQuery(item), icon: TerminalSquare },+ { sidebarActionId: "contextMenu.viewData", label: t("contextMenu.viewData"), action: () => openViewData(item), icon: Table2 },+ { sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: () => openNewQuery(item), icon: TerminalSquare },...(supportsAiAssistantContext(effectiveDatabaseType.value) ? [addToAiMenuItem(item)] : []),{ label: "", separator: true },exportDataSubmenu(item),{ label: "", separator: true },- { label: t("contextMenu.copyName"), action: () => copyName(item), icon: Copy },+ { sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: () => copyName(item), icon: Copy },];}const useBatchActions = isSelectedBatchTableContext(item);const moreActions: ContextMenuItem[] = [];if (supportsVacuumTable.value) {- moreActions.push({ label: t("contextMenu.vacuumTable"), action: () => requestVacuumTable(item), icon: Activity, variant: "destructive" as const });+ moreActions.push({ sidebarActionId: "contextMenu.vacuumTable", label: t("contextMenu.vacuumTable"), action: () => requestVacuumTable(item), icon: Activity, variant: "destructive" as const });}if (supportsTruncateTable.value) {moreActions.push({+ sidebarActionId: "contextMenu.truncateTable",label: useBatchActions ? selectedBatchTableCountLabel("batchTruncate") : t("contextMenu.truncateTable"),action: useBatchActions ? requestBatchTruncateTables : () => requestTruncateTable(item),icon: Scissors,@@ -3669,12 +3674,14 @@ function getTableMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {}moreActions.push({+ sidebarActionId: "contextMenu.emptyTable",label: useBatchActions ? selectedBatchTableCountLabel("batchEmpty") : t("contextMenu.emptyTable"),action: useBatchActions ? requestBatchEmptyTables : () => requestEmptyTable(item),icon: Eraser,variant: "destructive" as const,},{+ sidebarActionId: "contextMenu.dropTable",label: useBatchActions ? selectedBatchTableCountLabel("batchDrop") : t("contextMenu.dropTable"),action: useBatchActions ? requestBatchDropTables : () => requestDrop(item),icon: Trash2,@@ -3682,70 +3689,75 @@ function getTableMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {},);return [- { label: t("contextMenu.viewData"), action: () => openViewData(item), icon: Table2 },+ { sidebarActionId: "contextMenu.viewData", label: t("contextMenu.viewData"), action: () => openViewData(item), icon: Table2 },{+ sidebarActionId: "contextMenu.viewDdl",label: t("contextMenu.viewDdl"),action: () => openTableInfo(item, "ddl"),icon: FileCode,},- ...(canOpenStructureEditor.value ? [{ label: t("contextMenu.editStructure"), action: () => openStructureEditor(item), icon: PencilRuler }] : []),- ...(canRename(item) ? [{ label: t("contextMenu.renameObject"), action: () => requestRename(item), icon: Pencil }] : []),- { label: t("contextMenu.newQuery"), action: () => openNewQuery(item), icon: TerminalSquare },+ ...(canOpenStructureEditor.value ? [{ sidebarActionId: "contextMenu.editStructure", label: t("contextMenu.editStructure"), action: () => openStructureEditor(item), icon: PencilRuler }] : []),+ ...(canRename(item) ? [{ sidebarActionId: "contextMenu.renameObject", label: t("contextMenu.renameObject"), action: () => requestRename(item), icon: Pencil }] : []),+ { sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: () => openNewQuery(item), icon: TerminalSquare },...(supportsAiAssistantContext(effectiveDatabaseType.value) ? [addToAiMenuItem(item)] : []),- ...(canOpenDiagram.value ? [{ label: t("diagram.open"), action: () => openDiagram(item), icon: Network }] : []),- ...(canOpenTableImport.value ? [{ label: t("contextMenu.importData"), action: () => openTableImport(item), icon: Download }] : []),- { label: t("dataCompare.title"), action: () => openDataCompare(item), icon: ArrowRightLeft },+ ...(canOpenDiagram.value ? [{ sidebarActionId: "diagram.open", label: t("diagram.open"), action: () => openDiagram(item), icon: Network }] : []),+ ...(canOpenTableImport.value ? [{ sidebarActionId: "contextMenu.importData", label: t("contextMenu.importData"), action: () => openTableImport(item), icon: Download }] : []),+ { sidebarActionId: "dataCompare.title", label: t("dataCompare.title"), action: () => openDataCompare(item), icon: ArrowRightLeft },{ label: "", separator: true },exportDataSubmenu(item),- { label: t("contextMenu.exportDatabase"), action: () => openDatabaseExport(item), icon: Upload },- { label: t("contextMenu.exportStructure"), action: () => exportStructure(item), icon: FileCode },- ...(canOpenDataDictionary.value ? [{ label: t("dataDictionary.title"), action: () => openDataDictionary(item), icon: FileText }] : []),+ { sidebarActionId: "contextMenu.exportDatabase", label: t("contextMenu.exportDatabase"), action: () => openDatabaseExport(item), icon: Upload },+ { sidebarActionId: "contextMenu.exportStructure", label: t("contextMenu.exportStructure"), action: () => exportStructure(item), icon: FileCode },+ ...(canOpenDataDictionary.value ? [{ sidebarActionId: "dataDictionary.title", label: t("dataDictionary.title"), action: () => openDataDictionary(item), icon: FileText }] : []),{ label: "", separator: true },- { label: t("contextMenu.duplicateStructure"), action: () => requestDuplicateStructure(item), icon: CopyPlus },+ { sidebarActionId: "contextMenu.duplicateStructure", label: t("contextMenu.duplicateStructure"), action: () => requestDuplicateStructure(item), icon: CopyPlus },...tableClipboardMenuItems(item),{ label: "", separator: true },- { label: t("common.more"), icon: ListTree, children: moreActions },+ { sidebarActionId: "common.more", label: t("common.more"), icon: ListTree, children: moreActions },{ label: "", separator: true },- { label: t("contextMenu.copyName"), action: () => copyName(item), icon: Copy },+ { sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: () => copyName(item), icon: Copy },];}function getViewMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {if (effectiveDatabaseType.value === "nebula") {return [- { label: t("contextMenu.viewData"), action: () => openViewData(item), icon: Table2 },- { label: t("contextMenu.viewDdl"), action: () => openTableInfo(item, "ddl"), icon: ScrollText },+ { sidebarActionId: "contextMenu.viewData", label: t("contextMenu.viewData"), action: () => openViewData(item), icon: Table2 },+ { sidebarActionId: "contextMenu.viewDdl", label: t("contextMenu.viewDdl"), action: () => openTableInfo(item, "ddl"), icon: ScrollText },{ label: "", separator: true },- { label: t("contextMenu.copyName"), action: () => copyName(item), icon: Copy },+ { sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: () => copyName(item), icon: Copy },];}return [- { label: t("contextMenu.viewData"), action: () => openViewData(item), icon: Table2 },- { label: t("contextMenu.editView"), action: () => openSource(item), icon: PencilLine },- { label: t("contextMenu.viewSource"), action: () => openSource(item), icon: Code2 },- ...(effectiveDatabaseType.value === "dameng" && item.type === "VIEW" && buildDamengCompileViewSql({ schema: item.schema || selectedSchema.value, name: item.name }) ? [{ label: t("contextMenu.compileObject"), action: () => compileDamengView(item), icon: Wrench }] : []),+ { sidebarActionId: "contextMenu.viewData", label: t("contextMenu.viewData"), action: () => openViewData(item), icon: Table2 },+ { sidebarActionId: "contextMenu.editView", label: t("contextMenu.editView"), action: () => openSource(item), icon: PencilLine },+ { sidebarActionId: "contextMenu.viewSource", label: t("contextMenu.viewSource"), action: () => openSource(item), icon: Code2 },+ ...(effectiveDatabaseType.value === "dameng" && item.type === "VIEW" && buildDamengCompileViewSql({ schema: item.schema || selectedSchema.value, name: item.name })+ ? [{ sidebarActionId: "contextMenu.compileObject", label: t("contextMenu.compileObject"), action: () => compileDamengView(item), icon: Wrench }]+ : []),{+ sidebarActionId: "contextMenu.viewDdl",label: t("contextMenu.viewDdl"),action: () => openTableInfo(item, "ddl"),icon: ScrollText,},- ...(canRename(item) ? [{ label: t("contextMenu.renameObject"), action: () => requestRename(item), icon: Pencil }] : []),- { label: t("contextMenu.newQuery"), action: () => openNewQuery(item), icon: TerminalSquare },- ...(canOpenDiagram.value ? [{ label: t("diagram.open"), action: () => openDiagram(item), icon: Network }] : []),+ ...(canRename(item) ? [{ sidebarActionId: "contextMenu.renameObject", label: t("contextMenu.renameObject"), action: () => requestRename(item), icon: Pencil }] : []),+ { sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: () => openNewQuery(item), icon: TerminalSquare },+ ...(canOpenDiagram.value ? [{ sidebarActionId: "diagram.open", label: t("diagram.open"), action: () => openDiagram(item), icon: Network }] : []),{ label: "", separator: true },exportDataSubmenu(item),- { label: t("contextMenu.exportDatabase"), action: () => openDatabaseExport(item), icon: Upload },- { label: t("contextMenu.exportStructure"), action: () => exportStructure(item), icon: FileCode },- ...(canOpenDataDictionary.value ? [{ label: t("dataDictionary.title"), action: () => openDataDictionary(item), icon: FileText }] : []),+ { sidebarActionId: "contextMenu.exportDatabase", label: t("contextMenu.exportDatabase"), action: () => openDatabaseExport(item), icon: Upload },+ { sidebarActionId: "contextMenu.exportStructure", label: t("contextMenu.exportStructure"), action: () => exportStructure(item), icon: FileCode },+ ...(canOpenDataDictionary.value ? [{ sidebarActionId: "dataDictionary.title", label: t("dataDictionary.title"), action: () => openDataDictionary(item), icon: FileText }] : []),{ label: "", separator: true },{+ sidebarActionId: "contextMenu.dropView",label: t("contextMenu.dropView"),action: () => requestDrop(item),icon: Trash2,variant: "destructive" as const,},{ label: "", separator: true },- { label: t("contextMenu.copyName"), action: () => copyName(item), icon: Copy },+ { sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: () => copyName(item), icon: Copy },];}@@ -3837,13 +3849,14 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {}),);}- return items;+ return item.type === "TABLE" || item.type === "VIEW" || item.type === "MATERIALIZED_VIEW" ? presentMenu(items, item.type === "TABLE" ? "table" : "view") : items;}</script><template><FirebirdObjectManager v-if="effectiveDatabaseType === 'firebird'" v-model:open="firebirdManagerOpen" :connection-id="connection.id" :database="database" /><div ref="rootRef" data-object-browser-root class="flex h-full min-h-0 min-w-0 flex-col bg-background outline-none" tabindex="0" @keydown="onObjectBrowserKeydown">+ <SidebarMenuPreferencesDialog v-if="sidebarMenuPreferences" v-model:open="sidebarMenuPreferencesOpen" :scope="sidebarMenuPreferences.scope" :items="sidebarMenuPreferences.items" /><div v-if="!isEventEditor" ref="toolbarRef" class="flex h-10 shrink-0 items-center gap-2 overflow-hidden border-b px-3"><Button v-if="effectiveDatabaseType === 'firebird'" variant="outline" size="sm" @click="firebirdManagerOpen = true">{{ t("tree.firebirdObjectManager") }}</Button><div class="flex min-w-12 items-center gap-2">diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.tsindex e944b4cff4..7330e98155 100644--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts@@ -14,6 +14,8 @@ const mocks = vi.hoisted(() => ({openTable: vi.fn(),locateTable: vi.fn(),viewMode: "list" as ObjectBrowserViewMode,+ menuLayout: "grouped" as "grouped" | "full",+ pinnedActions: [] as string[],}));vi.mock("@/lib/backend/api", () => ({@@ -37,6 +39,8 @@ vi.mock("@/stores/settingsStore", () => ({objectBrowserViewMode: mocks.viewMode,objectBrowserShowCheckbox: false,sidebarActivation: "double",+ sidebarMenuLayout: mocks.menuLayout,+ sidebarMenuPinnedActions: { table: mocks.pinnedActions },},}),}));@@ -81,6 +85,8 @@ beforeEach(() => {document.head.append(gridStyle);vi.clearAllMocks();mocks.viewMode = "list";+ mocks.menuLayout = "grouped";+ mocks.pinnedActions = [];connection.db_type = "postgres";mocks.listObjects.mockResolvedValue([{ name: "orders", object_type: "TABLE", schema: "row_schema" },@@ -211,7 +217,8 @@ describe.each(["list", "grid"] as const)("ObjectBrowser locate in sidebar (%s)",expect(mocks.openTable).not.toHaveBeenCalled();});- it("locates only the context row while preserving the batch selection", async () => {+ it.each(["grouped", "full"] as const)("locates only the context row while preserving the batch selection in %s menus", async (layout) => {+ mocks.menuLayout = layout;const host = await mountBrowser();for (const name of ["orders", "customers"]) rowFor(host, name).dispatchEvent(new MouseEvent("click", { bubbles: true, ctrlKey: true }));await nextTick();@@ -222,13 +229,25 @@ describe.each(["list", "grid"] as const)("ObjectBrowser locate in sidebar (%s)",expect(mocks.locateTable).toHaveBeenCalledExactlyOnceWith({ tableName: "orders", tableType: "TABLE", schema: "row_schema", catalog: "external_catalog" });for (const name of ["orders", "customers"]) expect(rowFor(host, name).classList.contains("bg-accent")).toBe(true);await openMenu(host, "orders");- menuButton("common.more").dispatchEvent(new MouseEvent("mouseenter"));+ menuButton(layout === "full" ? "common.more" : "sidebarMenu.groups.danger").dispatchEvent(new MouseEvent("mouseenter"));await nextTick();menuButton("contextMenu.batchDrop");menuButton("contextMenu.batchEmpty");expect(mocks.openTable).not.toHaveBeenCalled();});+ it("uses the saved table preferences to show export directly in the browser", async () => {+ mocks.pinnedActions = ["contextMenu.exportData"];+ const host = await mountBrowser();+ await openMenu(host, "orders");+ menuButton("contextMenu.exportData").click();+ await nextTick();+ menuButton("CSV");+ menuButton("JSON");+ menuButton("XLSX");+ expect(mocks.openTable).not.toHaveBeenCalled();+ });+it.each([["orders", "TABLE"],["recent_orders", "VIEW"],diff --git a/apps/desktop/src/components/sidebar/ConnectionTree.vue b/apps/desktop/src/components/sidebar/ConnectionTree.vueindex a874b3f0c2..6117beeeb7 100644--- a/apps/desktop/src/components/sidebar/ConnectionTree.vue+++ b/apps/desktop/src/components/sidebar/ConnectionTree.vue@@ -6,6 +6,7 @@ import { useConnectionStore } from "@/stores/connectionStore";import { useQueryStore } from "@/stores/queryStore";import { useSavedSqlStore } from "@/stores/savedSqlStore";import { useSettingsStore } from "@/stores/settingsStore";+import { useSidebarMenuPresentation } from "@/composables/useSidebarMenuPresentation";import { useToast } from "@/composables/useToast";import type { ColumnInfo, ObjectSourceKind, QueryTab, TableInfo, TableNameFilter, TreeNode, TreeNodeType } from "@/types/database";import type { ElasticsearchIndexMetadataKind } from "@/lib/backend/tauri";@@ -126,6 +127,7 @@ const sidebarScrollbarTrackRef = ref<HTMLElement | null>(null);const sidebarHorizontalScrollbarTrackRef = ref<HTMLElement | null>(null);const sidebarContextMenuRef = ref<{ close: () => void } | null>(null);const sidebarContextMenuItems = ref<ContextMenuItem[]>([]);+const { presentMenu, SidebarMenuPreferencesDialog, sidebarMenuPreferencesOpen, sidebarMenuPreferences } = useSidebarMenuPresentation();const emit = defineEmits<{"open-settings": [initialTab: string];"add-to-ai": [nodes: TreeNode | TreeNode[]];@@ -2079,6 +2081,7 @@ function openSidebarContextMenu(event: MouseEvent, node: TreeNode, openContextMeconst resolved = sidebarTreeRuntime.resolveContextMenu(node, items);const show = (menuItems: ContextMenuItem[]) => {if (request !== contextMenuRequest) return;+ menuItems = presentMenu(menuItems, node.type);sidebarContextMenuTarget.value = createSidebarActionTarget(node);sidebarContextMenuItems.value = menuItems;// Pass the current row's resolved menu atomically, including async plugin items.@@ -2862,6 +2865,8 @@ defineExpose({ focusSearch, createNewGroup, collapseAllTreeNodes, locateTabInSid</div></div></CustomContextMenu>++ <SidebarMenuPreferencesDialog v-if="sidebarMenuPreferences" v-model:open="sidebarMenuPreferencesOpen" :scope="sidebarMenuPreferences.scope" :items="sidebarMenuPreferences.items" /><div v-if="showConnectedConnectionsOnly && store.connectedIds.size > 0" class="shrink-0 border-t border-border bg-background px-2 py-2"><Button type="button" variant="outline" size="sm" class="h-7 w-full justify-center gap-1.5 text-xs" :disabled="isDisconnectingAllActiveConnections" @click="disconnectAllActiveConnections"><Loader2 v-if="isDisconnectingAllActiveConnections" class="h-3.5 w-3.5 animate-spin" />diff --git a/apps/desktop/src/components/sidebar/SidebarMenuPreferencesDialog.vue b/apps/desktop/src/components/sidebar/SidebarMenuPreferencesDialog.vuenew file mode 100644index 0000000000..a8c00af202--- /dev/null+++ b/apps/desktop/src/components/sidebar/SidebarMenuPreferencesDialog.vue@@ -0,0 +1,223 @@+<script setup lang="ts">+import { computed, ref, watch } from "vue";+import { ArrowDown, ArrowUp, GripVertical } from "@lucide/vue";+import { useI18n } from "vue-i18n";+import { useSettingsStore } from "@/stores/settingsStore";+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";+import { Button } from "@/components/ui/button";+import { Label } from "@/components/ui/label";+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";+import type { ContextMenuItem } from "@/components/ui/customContextMenuRegistry";+import { buildSidebarMenuLayout, reorderSidebarMenuEntries, sidebarMenuActionGroup, sidebarMenuActions, sidebarMenuEntryKey, sidebarMenuPrimaryActionIds, sidebarMenuRecommendedPrimaryActionIds, type SidebarMenuScope } from "@/lib/sidebar/sidebarMenuLayout";++const props = defineProps<{ open: boolean; scope: SidebarMenuScope; items: ContextMenuItem[] }>();+const emit = defineEmits<{ "update:open": [open: boolean] }>();+const { t } = useI18n();+const settings = useSettingsStore();+const pinnedIds = ref<string[]>([]);+const hiddenIds = ref<string[]>([]);+const order = ref<string[]>([]);+const activeTab = ref("primary");+const saving = ref(false);+const error = ref("");+type Section = "primary" | "groups";+const dragging = ref<{ section: Section; key: string } | null>(null);+const dropTarget = ref<string | null>(null);+const primaryIds = computed(() => new Set(sidebarMenuPrimaryActionIds(props.scope)));+const recommendedIds = computed(() => new Set(sidebarMenuRecommendedPrimaryActionIds(props.scope)));+const choices = computed(() => {+ const seen = new Set<string>();+ return sidebarMenuActions(props.items).filter((item) => {+ const id = item.sidebarActionId;+ if (!id || seen.has(id) || sidebarMenuActionGroup(item) === "danger") return false;+ seen.add(id);+ return true;+ });+});+const groupedPreview = computed(() => buildSidebarMenuLayout(props.items, props.scope, "grouped", pinnedIds.value, t, { hiddenPrimaryIds: hiddenIds.value, order: order.value }));+const selectedChoices = computed(() => {+ const visible = new Set(choices.value.map((item) => item.sidebarActionId));+ return groupedPreview.value.filter((item) => item.sidebarActionId && visible.has(item.sidebarActionId));+});+const otherChoices = computed(() => choices.value.filter((item) => !isSelected(item.sidebarActionId!)));+const groupChoices = computed(() => groupedPreview.value.filter((item) => item.sidebarActionId?.startsWith("group.") && item.variant !== "destructive"));+const dangerGroup = computed(() => groupedPreview.value.find((item) => item.sidebarActionId === "group.danger"));++watch(+ () => props.open,+ (open) => {+ if (!open) return;+ pinnedIds.value = [...(settings.editorSettings.sidebarMenuPinnedActions?.[props.scope] ?? [])];+ hiddenIds.value = [...(settings.editorSettings.sidebarMenuHiddenPrimaryActions?.[props.scope] ?? [])];+ order.value = [...(settings.editorSettings.sidebarMenuOrder?.[props.scope] ?? [])];+ activeTab.value = "primary";+ error.value = "";+ endDrag();+ },+ { immediate: true },+);++function isSelected(id: string) {+ return primaryIds.value.has(id) || pinnedIds.value.includes(id) || (recommendedIds.value.has(id) && !hiddenIds.value.includes(id));+}++function toggle(id: string, checked: boolean) {+ pinnedIds.value = checked ? [...new Set([...pinnedIds.value, id])] : pinnedIds.value.filter((entry) => entry !== id);+ if (recommendedIds.value.has(id)) hiddenIds.value = checked ? hiddenIds.value.filter((entry) => entry !== id) : [...new Set([...hiddenIds.value, id])];+}++function sectionItems(section: Section) {+ return section === "primary" ? selectedChoices.value : groupChoices.value;+}++function move(section: Section, from: number, to: number) {+ if (saving.value) return;+ const keys = sectionItems(section).map((item) => sidebarMenuEntryKey(item)!);+ order.value = reorderSidebarMenuEntries(order.value, keys, from, to);+}++function startDrag(event: DragEvent, section: Section, item: ContextMenuItem) {+ if (saving.value) {+ event.preventDefault();+ return;+ }+ const key = sidebarMenuEntryKey(item)!;+ dragging.value = { section, key };+ if (event.dataTransfer) {+ event.dataTransfer.effectAllowed = "move";+ event.dataTransfer.setData("text/plain", key);+ }+}++function allowDrop(event: DragEvent, section: Section, item: ContextMenuItem) {+ if (!dragging.value || dragging.value.section !== section || saving.value) return;+ event.preventDefault();+ dropTarget.value = sidebarMenuEntryKey(item)!;+}++function drop(event: DragEvent, section: Section, item: ContextMenuItem) {+ if (!dragging.value || dragging.value.section !== section || saving.value) return;+ event.preventDefault();+ const keys = sectionItems(section).map((entry) => sidebarMenuEntryKey(entry));+ move(section, keys.indexOf(dragging.value.key), keys.indexOf(sidebarMenuEntryKey(item)));+ endDrag();+}++function endDrag() {+ dragging.value = null;+ dropTarget.value = null;+}+function reset() {+ pinnedIds.value = [];+ hiddenIds.value = [];+ order.value = [];+ endDrag();+}++async function save() {+ saving.value = true;+ error.value = "";+ try {+ await settings.updateEditorSettingsAndPersist({+ sidebarMenuPinnedActions: { ...settings.editorSettings.sidebarMenuPinnedActions, [props.scope]: pinnedIds.value },+ sidebarMenuHiddenPrimaryActions: { ...settings.editorSettings.sidebarMenuHiddenPrimaryActions, [props.scope]: hiddenIds.value },+ sidebarMenuOrder: { ...settings.editorSettings.sidebarMenuOrder, [props.scope]: order.value },+ });+ emit("update:open", false);+ } catch (e) {+ error.value = t("sidebarMenu.saveFailed", { message: String(e) });+ } finally {+ saving.value = false;+ }+}+</script>++<template>+ <Dialog :open="open" @update:open="(value) => !saving && emit('update:open', value)">+ <DialogContent class="flex max-h-[90vh] flex-col sm:max-w-xl">+ <DialogHeader class="shrink-0">+ <DialogTitle>{{ t("sidebarMenu.customizeTitle", { scope: t(`sidebarMenu.scopes.${scope}`) }) }}</DialogTitle>+ <DialogDescription>{{ t("sidebarMenu.scopedDescription", { scope: t(`sidebarMenu.scopes.${scope}`) }) }}</DialogDescription>+ </DialogHeader>+ <div class="flex shrink-0 items-center justify-between gap-2">+ <Label>{{ t("sidebarMenu.primaryActions", { scope: t(`sidebarMenu.scopes.${scope}`) }) }}</Label>+ <Button variant="ghost" size="sm" :disabled="saving" @click="reset">{{ t("sidebarMenu.reset") }}</Button>+ </div>+ <Tabs v-model="activeTab" class="flex min-h-0 flex-1 flex-col">+ <TabsList class="shrink-0">+ <TabsTrigger value="primary">{{ t("sidebarMenu.primaryTab") }}</TabsTrigger>+ <TabsTrigger value="groups">{{ t("sidebarMenu.groupOrder") }}</TabsTrigger>+ </TabsList>+ <TabsContent value="primary" class="min-h-0 overflow-y-auto">+ <p class="mb-3 text-sm text-muted-foreground">{{ t("sidebarMenu.primaryHint") }}</p>+ <div class="max-h-[min(45vh,360px)] overflow-y-auto space-y-1 pr-2">+ <div+ v-for="(item, index) in selectedChoices"+ :key="item.sidebarActionId"+ :data-menu-entry="sidebarMenuEntryKey(item)"+ class="flex items-center gap-2 rounded-md px-1 py-1"+ :class="dropTarget === sidebarMenuEntryKey(item) ? 'bg-accent' : ''"+ @dragover="allowDrop($event, 'primary', item)"+ @drop="drop($event, 'primary', item)"+ >+ <Button type="button" variant="ghost" size="icon" class="size-7 shrink-0 cursor-grab" :disabled="saving" draggable="true" :aria-label="t('sidebarMenu.dragAction', { name: item.label })" @dragstart="startDrag($event, 'primary', item)" @dragend="endDrag"+ ><GripVertical class="size-4"+ /></Button>+ <Label class="flex min-w-0 flex-1 items-center gap-3 py-1">+ <input type="checkbox" class="size-4 shrink-0 accent-primary" checked :aria-label="item.label" :disabled="saving || primaryIds.has(item.sidebarActionId!)" @change="toggle(item.sidebarActionId!, ($event.target as HTMLInputElement).checked)" />+ <component :is="item.icon" v-if="item.icon" class="size-4 shrink-0 text-muted-foreground" />+ <span class="min-w-0 flex-1">{{ item.label }}</span>+ </Label>+ <span v-if="primaryIds.has(item.sidebarActionId!)" class="shrink-0 text-xs text-muted-foreground">{{ t("sidebarMenu.builtIn") }}</span>+ <span v-else-if="recommendedIds.has(item.sidebarActionId!)" class="shrink-0 text-xs text-muted-foreground">{{ t("sidebarMenu.recommended") }}</span>+ <div class="flex shrink-0">+ <Button type="button" variant="ghost" size="icon" class="size-7" :disabled="saving || index === 0" :aria-label="t('sidebarMenu.moveUp', { name: item.label })" @click="move('primary', index, index - 1)"><ArrowUp class="size-3.5" /></Button>+ <Button type="button" variant="ghost" size="icon" class="size-7" :disabled="saving || index === selectedChoices.length - 1" :aria-label="t('sidebarMenu.moveDown', { name: item.label })" @click="move('primary', index, index + 1)"><ArrowDown class="size-3.5" /></Button>+ </div>+ </div>+ <template v-if="otherChoices.length">+ <p class="px-2 pt-3 pb-1 text-xs text-muted-foreground">{{ t("sidebarMenu.otherActions") }}</p>+ <Label v-for="item in otherChoices" :key="item.sidebarActionId" class="flex items-center gap-3 rounded-md px-2 py-2 hover:bg-accent">+ <input type="checkbox" class="size-4 shrink-0 accent-primary" :aria-label="item.label" :disabled="saving" @change="toggle(item.sidebarActionId!, ($event.target as HTMLInputElement).checked)" />+ <component :is="item.icon" v-if="item.icon" class="size-4 shrink-0 text-muted-foreground" />+ <span class="flex-1">{{ item.label }}</span>+ <span v-if="recommendedIds.has(item.sidebarActionId!)" class="text-xs text-muted-foreground">{{ t("sidebarMenu.recommended") }}</span>+ </Label>+ </template>+ </div>+ </TabsContent>+ <TabsContent value="groups" class="min-h-0 overflow-y-auto">+ <p class="mb-3 text-sm text-muted-foreground">{{ t("sidebarMenu.orderHint") }}</p>+ <div class="max-h-[min(45vh,360px)] overflow-y-auto space-y-1 pr-2">+ <div+ v-for="(item, index) in groupChoices"+ :key="item.sidebarActionId"+ :data-menu-entry="sidebarMenuEntryKey(item)"+ class="flex items-center gap-2 rounded-md px-1 py-1"+ :class="dropTarget === sidebarMenuEntryKey(item) ? 'bg-accent' : ''"+ @dragover="allowDrop($event, 'groups', item)"+ @drop="drop($event, 'groups', item)"+ >+ <Button type="button" variant="ghost" size="icon" class="size-7 shrink-0 cursor-grab" :disabled="saving" draggable="true" :aria-label="t('sidebarMenu.dragAction', { name: item.label })" @dragstart="startDrag($event, 'groups', item)" @dragend="endDrag"+ ><GripVertical class="size-4"+ /></Button>+ <component :is="item.icon" v-if="item.icon" class="size-4 shrink-0 text-muted-foreground" />+ <span class="min-w-0 flex-1">{{ item.label }}</span>+ <Button type="button" variant="ghost" size="icon" class="size-7" :disabled="saving || index === 0" :aria-label="t('sidebarMenu.moveUp', { name: item.label })" @click="move('groups', index, index - 1)"><ArrowUp class="size-3.5" /></Button>+ <Button type="button" variant="ghost" size="icon" class="size-7" :disabled="saving || index === groupChoices.length - 1" :aria-label="t('sidebarMenu.moveDown', { name: item.label })" @click="move('groups', index, index + 1)"><ArrowDown class="size-3.5" /></Button>+ </div>+ <div v-if="dangerGroup" class="flex items-center gap-2 px-2 py-2 text-destructive">+ <component :is="dangerGroup.icon" class="size-4" /><span class="flex-1">{{ dangerGroup.label }}</span+ ><span class="text-xs">{{ t("sidebarMenu.fixedLast") }}</span>+ </div>+ </div>+ </TabsContent>+ </Tabs>+ <p v-if="error" role="alert" class="shrink-0 text-sm text-destructive">{{ error }}</p>+ <DialogFooter class="shrink-0">+ <Button variant="outline" :disabled="saving" @click="emit('update:open', false)">{{ t("common.cancel") }}</Button>+ <Button :disabled="saving" @click="save">{{ saving ? t("common.processing") : t("common.save") }}</Button>+ </DialogFooter>+ </DialogContent>+ </Dialog>+</template>diff --git a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vueindex 68febbead1..0c0964538f 100644--- a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue+++ b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue@@ -2611,15 +2611,16 @@ function copyNameMenuItem(): ContextMenuItem {const connectionName = node.connectionId ? connectionStore.getConfig(node.connectionId)?.name || "" : "";if (copyDisplayPathForTreeNode(node, connectionName)) {return {+ sidebarActionId: "contextMenu.copyName",label: t("contextMenu.copyName"),icon: Copy,children: [- { label: t("contextMenu.name"), action: copyName, icon: Copy },- { label: t("contextMenu.fullPath"), action: copyDisplayPath, icon: Copy },+ { sidebarActionId: "contextMenu.name", label: t("contextMenu.name"), action: copyName, icon: Copy },+ { sidebarActionId: "contextMenu.fullPath", label: t("contextMenu.fullPath"), action: copyDisplayPath, icon: Copy },],};}- return { label: t("contextMenu.copyName"), action: copyName, icon: Copy, shortcut: shortcutCopyName.value };+ return { sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: copyName, icon: Copy, shortcut: shortcutCopyName.value };}const CONNECTION_URL_COPY_LABEL_KEYS: Record<ConnectionUrlCopyFormat, string> = {@@ -2648,6 +2649,7 @@ function connectionUrlCopyMenuItem(databaseOverride?: string): ContextMenuItem |const formats = connectionUrlCopyFormats(config);if (formats.length === 0) return null;return {+ sidebarActionId: "contextMenu.copyConnectionInfo",label: t("contextMenu.copyConnectionInfo"),icon: Link2,children: formats.map((format) => ({@@ -5800,6 +5802,7 @@ function addToAiMenuItem(node: TreeNode): ContextMenuItem {const tables = node.type === "table" ? selectedAiTableTargets() : [];const count = tables.length;return {+ sidebarActionId: "contextMenu.addToAi",label: count > 1 ? t("contextMenu.addToAiMultiple", { count }) : t("contextMenu.addToAi"),action: () => emit("add-to-ai", count > 1 ? tables : node),icon: Sparkles,@@ -5814,10 +5817,11 @@ function exportDataSubmenu(includeSqlInsert = true): ContextMenuItem {];if (includeSqlInsert) {children.push({ label: "SQL INSERT", action: () => exportData("sql", "source") });- children.push({ label: t("contextMenu.standardSqlInsert"), action: () => exportData("sql", "standard") });+ children.push({ sidebarActionId: "contextMenu.standardSqlInsert", label: t("contextMenu.standardSqlInsert"), action: () => exportData("sql", "standard") });}children.push({ label: "XLSX", action: () => exportDataXlsx() });return {+ sidebarActionId: "contextMenu.exportData",label: count > 1 ? t("contextMenu.exportDataMultiple", { count }) : t("contextMenu.exportData"),icon: Upload,children,@@ -5826,17 +5830,19 @@ function exportDataSubmenu(includeSqlInsert = true): ContextMenuItem {function copyStructureAsSubmenu(): ContextMenuItem {return {+ sidebarActionId: "contextMenu.copyStructureAs",label: t("contextMenu.copyStructureAs"),icon: Clipboard,children: [- { label: t("contextMenu.copyStructureAsTsv"), action: () => copyStructureAs("tsv") },- { label: t("contextMenu.copyStructureAsMarkdown"), action: () => copyStructureAs("markdown") },+ { sidebarActionId: "contextMenu.copyStructureAsTsv", label: t("contextMenu.copyStructureAsTsv"), action: () => copyStructureAs("tsv") },+ { sidebarActionId: "contextMenu.copyStructureAsMarkdown", label: t("contextMenu.copyStructureAsMarkdown"), action: () => copyStructureAs("markdown") },],};}function moreActionsSubmenu(children: ContextMenuItem[]): ContextMenuItem {return {+ sidebarActionId: "common.more",label: t("common.more"),icon: ListTree,variant: "destructive",@@ -5882,6 +5888,7 @@ function savedSqlHistorySubmenu(): ContextMenuItem | null {if (!scope) return null;const files = rankSavedSqlHistory(savedSqlStore.allFiles, { ...scope, limit: 10 });return {+ sidebarActionId: "contextMenu.sqlHistory",label: t("contextMenu.sqlHistory"),icon: ScrollText,children:@@ -5893,6 +5900,7 @@ function savedSqlHistorySubmenu(): ContextMenuItem | null {})): [{+ sidebarActionId: "contextMenu.noSqlHistory",label: t("contextMenu.noSqlHistory"),disabled: true,},@@ -5920,59 +5928,60 @@ function buildConnectionSidebarMenu(context: SidebarMenuFactoryContext): boolean// 2. Connectionif (node.type === "connection") {if (isConnecting.value) {- items.push({ label: t("connection.cancelConnecting"), action: cancelConnectionAttempt, icon: X });+ items.push({ sidebarActionId: "connection.cancelConnecting", label: t("connection.cancelConnecting"), action: cancelConnectionAttempt, icon: X });} else if (canDisconnectConnection()) {- items.push({ label: connectionDisconnectMenuLabel(), action: disconnectConnection, icon: Unplug, shortcut: shortcutDisconnectConnection.value });+ items.push({ sidebarActionId: "contextMenu.disconnectConnection", label: connectionDisconnectMenuLabel(), action: disconnectConnection, icon: Unplug, shortcut: shortcutDisconnectConnection.value });// save_password=false 且本次运行期已输入密码:提供"断开并忘记本次密码",// 清除会话凭据后下次连接需重新输入。if (canForgetSessionCredential()) {items.push({+ sidebarActionId: "connection.disconnectAndForgetPassword",label: t("connection.disconnectAndForgetPassword"),action: disconnectAndForgetConnectionPassword,icon: Unplug,});}} else if (!isConnected.value) {- items.push({ label: t("contextMenu.openConnection"), action: toggle, icon: Plug });+ items.push({ sidebarActionId: "contextMenu.openConnection", label: t("contextMenu.openConnection"), action: toggle, icon: Plug });}items.push({ label: "", separator: true });- items.push({ label: t("contextMenu.copyName"), action: copyName, icon: Copy, shortcut: shortcutCopyName.value });+ items.push({ sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: copyName, icon: Copy, shortcut: shortcutCopyName.value });const connectionUrlCopyMenu = connectionUrlCopyMenuItem();if (connectionUrlCopyMenu) items.push(connectionUrlCopyMenu);items.push({ label: "", separator: true });const supportsQueryActions = supportsConnectionQueryActions(currentDatabaseType());const supportsAiContext = supportsAiAssistantContext(currentDatabaseType());if (supportsQueryActions) {- items.push({ label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });+ items.push({ sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });if (supportsAiContext) {items.push(addToAiMenuItem(node));}}if (canCreateMeilisearchIndex.value) {- items.push({ label: t("meilisearch.createIndex"), action: openCreateMeilisearchIndexDialog, icon: Plus });+ items.push({ sidebarActionId: "meilisearch.createIndex", label: t("meilisearch.createIndex"), action: openCreateMeilisearchIndexDialog, icon: Plus });}const connectionWorkspace = node.connectionId ? driverProfileDatabaseWorkspace(connectionStore.getConfig(node.connectionId)?.driver_profile) : undefined;if (connectionWorkspace?.entryScopes.includes("connection")) {items.push({ label: t(connectionWorkspace.menuLabelKey), action: openProfileConnectionWorkspace, icon: GitBranch });}if (canOpenConnectionDatabaseBrowser.value) {- items.push({ label: t("contextMenu.openDatabaseBrowser"), action: openDatabaseBrowser, icon: TableProperties });+ items.push({ sidebarActionId: "contextMenu.openDatabaseBrowser", label: t("contextMenu.openDatabaseBrowser"), action: openDatabaseBrowser, icon: TableProperties });}if (currentDatabaseType() === "redis") {- items.push({ label: t("contextMenu.instanceInfo"), action: openRedisInstanceInfo, icon: Info });+ items.push({ sidebarActionId: "contextMenu.instanceInfo", label: t("contextMenu.instanceInfo"), action: openRedisInstanceInfo, icon: Info });}if (supportsQueryActions) {const sqlHistoryMenu = savedSqlHistorySubmenu();if (sqlHistoryMenu) items.push(sqlHistoryMenu);}if (node.connectionId && connectionSupportsDatabaseUserAdmin(connectionStore.getConfig(node.connectionId))) {- items.push({ label: t("contextMenu.userAdmin"), action: openUserAdmin, icon: UsersRound });+ items.push({ sidebarActionId: "contextMenu.userAdmin", label: t("contextMenu.userAdmin"), action: openUserAdmin, icon: UsersRound });}if (node.connectionId && connectionSupportsProcessList(connectionStore.getConfig(node.connectionId))) {- items.push({ label: t(currentDatabaseType() === "xugu" ? "processList.transactionTitle" : "contextMenu.processList"), action: openProcessList, icon: Activity });+ items.push({ sidebarActionId: "contextMenu.processList", label: t(currentDatabaseType() === "xugu" ? "processList.transactionTitle" : "contextMenu.processList"), action: openProcessList, icon: Activity });}if (currentDatabaseType() === "sqlserver") {- items.push({ label: t("contextMenu.sqlServerTrace"), action: openSqlServerActivityTrace, icon: Activity });+ items.push({ sidebarActionId: "contextMenu.sqlServerTrace", label: t("contextMenu.sqlServerTrace"), action: openSqlServerActivityTrace, icon: Activity });}if (node.connectionId &&@@ -5982,27 +5991,28 @@ function buildConnectionSidebarMenu(context: SidebarMenuFactoryContext): booleanconnectionSupportsServerDashboard(connectionStore.getConfig(node.connectionId)) ||connectionSupportsPgServerDashboard(connectionStore.getConfig(node.connectionId)))) {- items.push({ label: t("contextMenu.serverDashboard"), action: openServerDashboard, icon: Gauge });+ items.push({ sidebarActionId: "contextMenu.serverDashboard", label: t("contextMenu.serverDashboard"), action: openServerDashboard, icon: Gauge });}if (currentDatabaseType() === "dameng") {- items.push({ label: t("contextMenu.damengUsers"), action: openDamengUsers, icon: UsersRound });- items.push({ label: t("contextMenu.damengRoles"), action: openDamengRoles, icon: ShieldCheck });- items.push({ label: t("contextMenu.damengJobAdmin"), action: openDamengJobAdmin, icon: CalendarClock });+ items.push({ sidebarActionId: "contextMenu.damengUsers", label: t("contextMenu.damengUsers"), action: openDamengUsers, icon: UsersRound });+ items.push({ sidebarActionId: "contextMenu.damengRoles", label: t("contextMenu.damengRoles"), action: openDamengRoles, icon: ShieldCheck });+ items.push({ sidebarActionId: "contextMenu.damengJobAdmin", label: t("contextMenu.damengJobAdmin"), action: openDamengJobAdmin, icon: CalendarClock });}if (canCopyFinalProxyPort.value) {- items.push({ label: t("contextMenu.copyFinalProxyPort"), action: copyFinalProxyPort, icon: Network });+ items.push({ sidebarActionId: "contextMenu.copyFinalProxyPort", label: t("contextMenu.copyFinalProxyPort"), action: copyFinalProxyPort, icon: Network });}if (canOpenSqlFileExecution.value) {- items.push({ label: t("sqlFile.title"), action: openSqlFileExecution, icon: FileCode });+ items.push({ sidebarActionId: "sqlFile.title", label: t("sqlFile.title"), action: openSqlFileExecution, icon: FileCode });}if (canExportAllDatabases.value) {- items.push({ label: t("contextMenu.exportAllDatabases"), action: openAllDatabasesExport, icon: Upload });+ items.push({ sidebarActionId: "contextMenu.exportAllDatabases", label: t("contextMenu.exportAllDatabases"), action: openAllDatabasesExport, icon: Upload });}if (canOpenScheduledBackups.value) {- items.push({ label: t("databaseBackup.title"), action: openScheduledBackups, icon: CalendarClock });+ items.push({ sidebarActionId: "databaseBackup.title", label: t("databaseBackup.title"), action: openScheduledBackups, icon: CalendarClock });}if (canCreateDatabase.value) {items.push({+ sidebarActionId: "contextMenu.createDatabase",label: connectionNamespaceCreationLabel(),action: openConnectionNamespaceCreation,icon: Plus,@@ -6010,6 +6020,7 @@ function buildConnectionSidebarMenu(context: SidebarMenuFactoryContext): boolean}if (canCreateNacosNamespace.value) {items.push({+ sidebarActionId: "nacos.createNamespace",label: t("nacos.createNamespace"),action: openCreateNacosNamespaceDialog,icon: FolderPlus,@@ -6029,15 +6040,16 @@ function buildConnectionSidebarMenu(context: SidebarMenuFactoryContext): boolean}));if (!allMoveTargetsInGroup(null)) {groupChildren.push({ label: "", separator: true });- groupChildren.push({ label: t("connectionGroup.ungrouped"), action: () => moveToGroup(null) });+ groupChildren.push({ sidebarActionId: "connectionGroup.ungrouped", label: t("connectionGroup.ungrouped"), action: () => moveToGroup(null) });}groupChildren.push({ label: "", separator: true });- groupChildren.push({ label: t("connectionGroup.newGroup"), action: moveToNewGroup, icon: FolderPlus });- items.push({ label: t("connectionGroup.moveToGroup"), icon: FolderInput, children: groupChildren });+ groupChildren.push({ sidebarActionId: "connectionGroup.newGroup", label: t("connectionGroup.newGroup"), action: moveToNewGroup, icon: FolderPlus });+ items.push({ sidebarActionId: "connectionGroup.moveToGroup", label: t("connectionGroup.moveToGroup"), icon: FolderInput, children: groupChildren });} else {- items.push({ label: t("connectionGroup.moveToNewGroup"), action: moveToNewGroup, icon: FolderPlus });+ items.push({ sidebarActionId: "connectionGroup.moveToNewGroup", label: t("connectionGroup.moveToNewGroup"), action: moveToNewGroup, icon: FolderPlus });}items.push({+ sidebarActionId: "contextMenu.refreshChildren",label: t("contextMenu.refreshChildren"),action: refresh,icon: RefreshCw,@@ -6050,6 +6062,9 @@ function buildConnectionSidebarMenu(context: SidebarMenuFactoryContext): boolean});for (const entry of visibleFilterMenu) {items.push({+ // Oracle's root namespace filter uses schemas, but shares the primary+ // visible-object filter's preference and ordering with other engines.+ sidebarActionId: entry.target === "visible-databases" ? "contextMenu.configureVisibleObjects" : "visibleSchemas.title",label: t(entry.label === "schemas" ? "visibleSchemas.title" : "contextMenu.configureVisibleObjects"),action: entry.target === "visible-schemas" ? openVisibleSchemasDialog : openVisibleDatabasesDialog,icon: ListFilter,@@ -6057,14 +6072,16 @@ function buildConnectionSidebarMenu(context: SidebarMenuFactoryContext): boolean}if (currentDatabaseType() === "nacos") {items.push({+ sidebarActionId: "nacos.nacosVisibleNamespacesTitle",label: t("nacos.nacosVisibleNamespacesTitle"),action: openVisibleNacosNamespacesDialog,icon: ListFilter,});}- items.push({ label: t("contextMenu.editConnection"), action: editConnection, icon: Pencil, shortcut: shortcutEditConnection.value });+ items.push({ sidebarActionId: "contextMenu.editConnection", label: t("contextMenu.editConnection"), action: editConnection, icon: Pencil, shortcut: shortcutEditConnection.value });if (revealConnectionFilePath.value) {items.push({+ sidebarActionId: "contextMenu.revealDatabaseFile",label: t("contextMenu.revealDatabaseFile"),action: revealDatabaseFile,icon: FolderOpen,@@ -6074,21 +6091,24 @@ function buildConnectionSidebarMenu(context: SidebarMenuFactoryContext): booleanconst config = activeNode.value.connectionId ? connectionStore.getConfig(activeNode.value.connectionId) : undefined;const usesSsh = (config?.transport_layers || []).some((layer) => layer.enabled !== false && layer.type === "ssh");items.push({+ sidebarActionId: "contextMenu.backupSqliteDatabase",label: t("contextMenu.backupSqliteDatabase"),action: backupSqliteDatabase,icon: HardDriveDownload,});if (usesSsh) {items.push({+ sidebarActionId: "contextMenu.restoreSqliteDatabase",label: t("contextMenu.restoreSqliteDatabase"),action: restoreSqliteDatabase,icon: HardDriveDownload,});}}- items.push({ label: connectionDuplicateMenuLabel(), action: duplicateConnection, icon: CopyPlus });+ items.push({ sidebarActionId: "contextMenu.duplicateConnection", label: connectionDuplicateMenuLabel(), action: duplicateConnection, icon: CopyPlus });items.push({ label: "", separator: true });items.push({+ sidebarActionId: "contextMenu.deleteConnection",label: connectionDeleteMenuLabel(),action: deleteConnection,icon: Trash2,@@ -6142,9 +6162,10 @@ function buildDatabaseSidebarMenu(context: SidebarMenuFactoryContext): boolean {// 4. Database / Schemaif (node.type === "database" || node.type === "schema") {if (isXuguSyntheticTreeNode(currentDatabaseType(), node.type, node.schema)) {- items.push({ label: t("contextMenu.copyName"), action: copyName, icon: Copy, shortcut: shortcutCopyName.value });+ items.push({ sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: copyName, icon: Copy, shortcut: shortcutCopyName.value });items.push({ label: "", separator: true });items.push({+ sidebarActionId: "contextMenu.refreshChildren",label: t("contextMenu.refreshChildren"),action: refresh,icon: RefreshCw,@@ -6153,12 +6174,13 @@ function buildDatabaseSidebarMenu(context: SidebarMenuFactoryContext): boolean {return true;}if (currentDatabaseType() === "hbase") {- items.push({ label: t("contextMenu.copyName"), action: copyName, icon: Copy, shortcut: shortcutCopyName.value });+ items.push({ sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: copyName, icon: Copy, shortcut: shortcutCopyName.value });if (canCreateTable.value) {items.push({ label: "", separator: true });- items.push({ label: t("contextMenu.createTable"), action: createTable, icon: Plus });+ items.push({ sidebarActionId: "contextMenu.createTable", label: t("contextMenu.createTable"), action: createTable, icon: Plus });}items.push({+ sidebarActionId: "contextMenu.refreshChildren",label: t("contextMenu.refreshChildren"),action: refresh,icon: RefreshCw,@@ -6167,33 +6189,33 @@ function buildDatabaseSidebarMenu(context: SidebarMenuFactoryContext): boolean {return true;}if (["neo4j", "nebula"].includes(currentDatabaseType() || "") && node.type === "database") {- if (canCloseDatabaseConnection.value) items.push({ label: t("contextMenu.closeDatabaseConnection"), action: closeDatabaseConnection, icon: Unplug });+ if (canCloseDatabaseConnection.value) items.push({ sidebarActionId: "contextMenu.closeDatabaseConnection", label: t("contextMenu.closeDatabaseConnection"), action: closeDatabaseConnection, icon: Unplug });items.push(copyNameMenuItem());items.push({ label: "", separator: true });- if (canOpenObjectBrowser.value) items.push({ label: t("contextMenu.openObjectBrowser"), action: openObjectBrowser, icon: TableProperties });- items.push({ label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });+ if (canOpenObjectBrowser.value) items.push({ sidebarActionId: "contextMenu.openObjectBrowser", label: t("contextMenu.openObjectBrowser"), action: openObjectBrowser, icon: TableProperties });+ items.push({ sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });if (supportsAiAssistantContext(currentDatabaseType())) items.push(addToAiMenuItem(node));const sqlHistoryMenu = savedSqlHistorySubmenu();if (sqlHistoryMenu) items.push(sqlHistoryMenu);items.push({ label: isNodeDefaultDatabase.value ? t("contextMenu.clearDefaultDatabase") : t("contextMenu.setDefaultDatabase"), action: isNodeDefaultDatabase.value ? clearNodeDefaultDatabase : setNodeAsDefaultDatabase, icon: Database });- if (canOpenSqlFileExecution.value) items.push({ label: t("sqlFile.title"), action: openSqlFileExecution, icon: FileCode });+ if (canOpenSqlFileExecution.value) items.push({ sidebarActionId: "sqlFile.title", label: t("sqlFile.title"), action: openSqlFileExecution, icon: FileCode });items.push({ label: "", separator: true });- items.push({ label: t("contextMenu.refreshChildren"), action: refresh, icon: RefreshCw, shortcut: shortcutRefresh });+ items.push({ sidebarActionId: "contextMenu.refreshChildren", label: t("contextMenu.refreshChildren"), action: refresh, icon: RefreshCw, shortcut: shortcutRefresh });return true;}if (canCloseDatabaseConnection.value) {items.unshift({ label: "", separator: true });- items.unshift({ label: t("contextMenu.closeDatabaseConnection"), action: closeDatabaseConnection, icon: Unplug });+ items.unshift({ sidebarActionId: "contextMenu.closeDatabaseConnection", label: t("contextMenu.closeDatabaseConnection"), action: closeDatabaseConnection, icon: Unplug });}items.push(copyNameMenuItem());const databaseUrlCopyMenu = connectionUrlCopyMenuItem(node.database || undefined);if (databaseUrlCopyMenu) items.push(databaseUrlCopyMenu);items.push({ label: "", separator: true });if (canOpenObjectBrowser.value) {- items.push({ label: t("contextMenu.openObjectBrowser"), action: openObjectBrowser, icon: TableProperties });+ items.push({ sidebarActionId: "contextMenu.openObjectBrowser", label: t("contextMenu.openObjectBrowser"), action: openObjectBrowser, icon: TableProperties });}if (supportsConnectionQueryActions(currentDatabaseType())) {- items.push({ label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });+ items.push({ sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });if (node.type === "database" && supportsAiAssistantContext(currentDatabaseType())) {items.push(addToAiMenuItem(node));}@@ -6206,23 +6228,24 @@ function buildDatabaseSidebarMenu(context: SidebarMenuFactoryContext): boolean {}if (node.type === "database" && currentDatabaseType() !== "cloudflare-d1") {if (!isNodeDefaultDatabase.value) {- items.push({ label: t("contextMenu.setDefaultDatabase"), action: setNodeAsDefaultDatabase, icon: Database });+ items.push({ sidebarActionId: "contextMenu.setDefaultDatabase", label: t("contextMenu.setDefaultDatabase"), action: setNodeAsDefaultDatabase, icon: Database });} else {- items.push({ label: t("contextMenu.clearDefaultDatabase"), action: clearNodeDefaultDatabase, icon: Database });+ items.push({ sidebarActionId: "contextMenu.clearDefaultDatabase", label: t("contextMenu.clearDefaultDatabase"), action: clearNodeDefaultDatabase, icon: Database });}}if (node.type === "schema") {if (!isNodeDefaultSchema.value) {- items.push({ label: t("contextMenu.setDefaultSchema"), action: setNodeAsDefaultSchema, icon: Database });+ items.push({ sidebarActionId: "contextMenu.setDefaultSchema", label: t("contextMenu.setDefaultSchema"), action: setNodeAsDefaultSchema, icon: Database });} else {- items.push({ label: t("contextMenu.clearDefaultSchema"), action: clearNodeDefaultSchema, icon: Database });+ items.push({ sidebarActionId: "contextMenu.clearDefaultSchema", label: t("contextMenu.clearDefaultSchema"), action: clearNodeDefaultSchema, icon: Database });}}if (canEditDatabaseProperties.value) {- items.push({ label: t("contextMenu.editDatabaseProperties"), action: openEditDatabasePropertiesDialog, icon: SquarePen });+ items.push({ sidebarActionId: "contextMenu.editDatabaseProperties", label: t("contextMenu.editDatabaseProperties"), action: openEditDatabasePropertiesDialog, icon: SquarePen });}if (canRenameDatabase.value) {items.push({+ sidebarActionId: "contextMenu.renameDatabase",label: t("contextMenu.renameDatabase"),action: openRenameDatabaseDialog,icon: Pencil,@@ -6230,28 +6253,29 @@ function buildDatabaseSidebarMenu(context: SidebarMenuFactoryContext): boolean {});}if (canCreateTable.value) {- items.push({ label: t("contextMenu.createTable"), action: createTable, icon: Plus });+ items.push({ sidebarActionId: "contextMenu.createTable", label: t("contextMenu.createTable"), action: createTable, icon: Plus });}if (canOpenTableImport.value) {- items.push({ label: t("contextMenu.importData"), action: openTableImport, icon: Download });+ items.push({ sidebarActionId: "contextMenu.importData", label: t("contextMenu.importData"), action: openTableImport, icon: Download });}if (canCreateSchema.value) {- items.push({ label: t("contextMenu.createSchema"), action: openCreateSchemaDialog, icon: Plus });+ items.push({ sidebarActionId: "contextMenu.createSchema", label: t("contextMenu.createSchema"), action: openCreateSchemaDialog, icon: Plus });}if (canEditSchemaComment.value) {- items.push({ label: t("contextMenu.editSchemaComment"), action: openEditSchemaCommentDialog, icon: SquarePen });+ items.push({ sidebarActionId: "contextMenu.editSchemaComment", label: t("contextMenu.editSchemaComment"), action: openEditSchemaCommentDialog, icon: SquarePen });}if (canOpenSqlFileExecution.value) {- items.push({ label: t("sqlFile.title"), action: openSqlFileExecution, icon: FileCode });+ items.push({ sidebarActionId: "sqlFile.title", label: t("sqlFile.title"), action: openSqlFileExecution, icon: FileCode });}if (canOpenDiagram.value) {- items.push({ label: t("diagram.open"), action: openDiagram, icon: Network });- items.push({ label: t("docs.title"), action: openDocs, icon: BookOpen });+ items.push({ sidebarActionId: "diagram.open", label: t("diagram.open"), action: openDiagram, icon: Network });+ items.push({ sidebarActionId: "docs.title", label: t("docs.title"), action: openDocs, icon: BookOpen });}if (canOpenDatabaseSearch.value) {- items.push({ label: t("databaseSearch.open"), action: openDatabaseSearch, icon: Search });+ items.push({ sidebarActionId: "databaseSearch.open", label: t("databaseSearch.open"), action: openDatabaseSearch, icon: Search });}items.push({+ sidebarActionId: "contextMenu.refreshChildren",label: t("contextMenu.refreshChildren"),action: refresh,icon: RefreshCw,@@ -6259,28 +6283,30 @@ function buildDatabaseSidebarMenu(context: SidebarMenuFactoryContext): boolean {});if (canConfigureVisibleSchemas.value) {items.push({+ sidebarActionId: "visibleSchemas.title",label: t("visibleSchemas.title"),action: openVisibleSchemasDialog,icon: ListFilter,});}items.push({ label: "", separator: true });- items.push({ label: t("transfer.dataTransfer"), action: openTransfer, icon: ArrowRightLeft });- items.push({ label: t("diff.title"), action: openSchemaDiff, icon: ArrowRightLeft });- items.push({ label: t("dataCompare.title"), action: openDataCompare, icon: ArrowRightLeft });- items.push({ label: t("contextMenu.exportDatabase"), action: openDatabaseExport, icon: Upload });+ items.push({ sidebarActionId: "transfer.dataTransfer", label: t("transfer.dataTransfer"), action: openTransfer, icon: ArrowRightLeft });+ items.push({ sidebarActionId: "diff.title", label: t("diff.title"), action: openSchemaDiff, icon: ArrowRightLeft });+ items.push({ sidebarActionId: "dataCompare.title", label: t("dataCompare.title"), action: openDataCompare, icon: ArrowRightLeft });+ items.push({ sidebarActionId: "contextMenu.exportDatabase", label: t("contextMenu.exportDatabase"), action: openDatabaseExport, icon: Upload });if (canOpenDataDictionary.value) {- items.push({ label: t("dataDictionary.title"), action: openDataDictionary, icon: FileText });+ items.push({ sidebarActionId: "dataDictionary.title", label: t("dataDictionary.title"), action: openDataDictionary, icon: FileText });}const destructiveActions: ContextMenuItem[] = [];if (canEmptyDatabaseTables(node, node.connectionId ? connectionStore.getConfig(node.connectionId) : undefined)) {- destructiveActions.push({ label: t("databaseEmpty.menu"), action: () => void requestEmptyDatabaseTables(node), icon: Eraser, variant: "destructive" as const });+ destructiveActions.push({ sidebarActionId: "databaseEmpty.menu", label: t("databaseEmpty.menu"), action: () => void requestEmptyDatabaseTables(node), icon: Eraser, variant: "destructive" as const });}if (canDropDatabaseTables(node, node.connectionId ? connectionStore.getConfig(node.connectionId) : undefined)) {- destructiveActions.push({ label: t("databaseDrop.menu"), action: () => void requestDropDatabaseTables(node), icon: Trash2, variant: "destructive" as const });+ destructiveActions.push({ sidebarActionId: "databaseDrop.menu", label: t("databaseDrop.menu"), action: () => void requestDropDatabaseTables(node), icon: Trash2, variant: "destructive" as const });}if (canDropDatabase.value) {destructiveActions.push({+ sidebarActionId: "contextMenu.dropDatabase",label: t("contextMenu.dropDatabase"),action: dropDatabase,icon: Trash2,@@ -6297,6 +6323,7 @@ function buildDatabaseSidebarMenu(context: SidebarMenuFactoryContext): boolean {}if (canDropSchema.value) {items.push({+ sidebarActionId: "contextMenu.dropSchema",label: t("contextMenu.dropSchema"),action: dropSchema,icon: Trash2,@@ -6581,50 +6608,51 @@ function buildObjectSidebarMenu(context: SidebarMenuFactoryContext): boolean {// 否则解析不出 scope,菜单只会静默失败。if (isTableVGroupGroupableRowType(node.type) && (node.type === "table" || !!tableVGroupScopeKey(resolveTableVGroupScopeFromNode(connectionStore.treeNodes, node)))) {const vgroupMoveItems = buildTableVGroupMoveMenuItems(node);- if (vgroupMoveItems.length) items.push({ label: t("tableVGroup.moveToGroup"), icon: FolderInput, children: vgroupMoveItems });+ if (vgroupMoveItems.length) items.push({ sidebarActionId: "tableVGroup.moveToGroup", label: t("tableVGroup.moveToGroup"), icon: FolderInput, children: vgroupMoveItems });}// 6. Table / View / Materialized Viewif (node.type === "table" || node.type === "view" || node.type === "materialized_view") {if (currentDatabaseType() === "victoriametrics" && node.type === "table") {- items.push({ label: t("contextMenu.copyName"), action: copyName, icon: Copy, shortcut: shortcutCopyName.value });+ items.push({ sidebarActionId: "contextMenu.copyName", label: t("contextMenu.copyName"), action: copyName, icon: Copy, shortcut: shortcutCopyName.value });items.push({ label: "", separator: true });- items.push({ label: t("contextMenu.viewData"), action: openDataImmediately, icon: TableProperties });- items.push({ label: t("contextMenu.openInNewDataTab"), action: openDataInNewTabImmediately, icon: CopyPlus });- items.push({ label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });+ items.push({ sidebarActionId: "contextMenu.viewData", label: t("contextMenu.viewData"), action: openDataImmediately, icon: TableProperties });+ items.push({ sidebarActionId: "contextMenu.openInNewDataTab", label: t("contextMenu.openInNewDataTab"), action: openDataInNewTabImmediately, icon: CopyPlus });+ items.push({ sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });if (supportsAiAssistantContext(currentDatabaseType())) {items.push(addToAiMenuItem(node));}items.push({ label: "", separator: true });items.push(exportDataSubmenu(false));- items.push({ label: t("contextMenu.refreshChildren"), action: refresh, icon: RefreshCw, shortcut: shortcutRefresh });+ items.push({ sidebarActionId: "contextMenu.refreshChildren", label: t("contextMenu.refreshChildren"), action: refresh, icon: RefreshCw, shortcut: shortcutRefresh });appendPluginTableMenuItems(items, node);return true;}if (["neo4j", "nebula"].includes(currentDatabaseType() || "")) {items.push(copyNameMenuItem());- items.push({ label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });+ items.push({ sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });if (supportsAiAssistantContext(currentDatabaseType())) items.push(addToAiMenuItem(node));items.push({ label: "", separator: true });- items.push({ label: t("contextMenu.viewData"), action: openDataImmediately, icon: TableProperties });- items.push({ label: t("contextMenu.openInNewDataTab"), action: openDataInNewTabImmediately, icon: CopyPlus, shortcut: shortcutOpenDataInNewTab.value });- if (currentDatabaseType() === "nebula") items.push({ label: t("contextMenu.viewDdl"), action: openDdl, icon: FileCode });+ items.push({ sidebarActionId: "contextMenu.viewData", label: t("contextMenu.viewData"), action: openDataImmediately, icon: TableProperties });+ items.push({ sidebarActionId: "contextMenu.openInNewDataTab", label: t("contextMenu.openInNewDataTab"), action: openDataInNewTabImmediately, icon: CopyPlus, shortcut: shortcutOpenDataInNewTab.value });+ if (currentDatabaseType() === "nebula") items.push({ sidebarActionId: "contextMenu.viewDdl", label: t("contextMenu.viewDdl"), action: openDdl, icon: FileCode });if (currentDatabaseType() === "neo4j") items.push(exportDataSubmenu(false));const sqlHistoryMenu = savedSqlHistorySubmenu();if (sqlHistoryMenu) items.push(sqlHistoryMenu);items.push({ label: "", separator: true });- items.push({ label: t("contextMenu.refreshChildren"), action: refresh, icon: RefreshCw, shortcut: shortcutRefresh });+ items.push({ sidebarActionId: "contextMenu.refreshChildren", label: t("contextMenu.refreshChildren"), action: refresh, icon: RefreshCw, shortcut: shortcutRefresh });appendPluginTableMenuItems(items, node);return true;}const destructiveActions: ContextMenuItem[] = [];items.push(copyNameMenuItem());- items.push({ label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });+ items.push({ sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });if (node.type === "table" && supportsAiAssistantContext(currentDatabaseType())) {items.push(addToAiMenuItem(node));}items.push({ label: "", separator: true });- items.push({ label: t("contextMenu.viewData"), action: openDataImmediately, icon: TableProperties });+ items.push({ sidebarActionId: "contextMenu.viewData", label: t("contextMenu.viewData"), action: openDataImmediately, icon: TableProperties });items.push({+ sidebarActionId: "contextMenu.openInNewDataTab",label: t("contextMenu.openInNewDataTab"),action: openDataInNewTabImmediately,icon: CopyPlus,@@ -6632,32 +6660,35 @@ function buildObjectSidebarMenu(context: SidebarMenuFactoryContext): boolean {});if (node.type === "table") {items.push({+ sidebarActionId: "contextMenu.viewDdl",label: t("contextMenu.viewDdl"),action: openDdl,icon: FileCode,});}if (canViewDatabaseObjectDependencies(currentDatabaseType(), node)) {- items.push({ label: t("contextMenu.viewDependencies"), action: openDatabaseObjectDependencies, icon: Network });+ items.push({ sidebarActionId: "contextMenu.viewDependencies", label: t("contextMenu.viewDependencies"), action: openDatabaseObjectDependencies, icon: Network });}if (node.type === "view" || node.type === "materialized_view") {- items.push({ label: t("contextMenu.editView"), action: () => openObjectSourceDialog(true), icon: Pencil });- items.push({ label: t("contextMenu.viewSource"), action: () => openObjectSourceDialog(false), icon: Code2 });+ items.push({ sidebarActionId: "contextMenu.editView", label: t("contextMenu.editView"), action: () => openObjectSourceDialog(true), icon: Pencil });+ items.push({ sidebarActionId: "contextMenu.viewSource", label: t("contextMenu.viewSource"), action: () => openObjectSourceDialog(false), icon: Code2 });if (node.type === "view" && currentDatabaseType() === "dameng" && buildDamengCompileViewSql({ schema: node.schema, name: node.objectName || node.label })) {- items.push({ label: t("contextMenu.compileObject"), action: compileDamengView, icon: Wrench });+ items.push({ sidebarActionId: "contextMenu.compileObject", label: t("contextMenu.compileObject"), action: compileDamengView, icon: Wrench });}items.push({+ sidebarActionId: "contextMenu.viewDdl",label: t("contextMenu.viewDdl"),action: openDdl,icon: FileCode,});- items.push({ label: t("contextMenu.changeOpenMode"), action: () => emit("open-settings", "navigation"), icon: Settings2 });+ items.push({ sidebarActionId: "contextMenu.changeOpenMode", label: t("contextMenu.changeOpenMode"), action: () => emit("open-settings", "navigation"), icon: Settings2 });}if (canOpenStructureEditor.value) {- items.push({ label: t("contextMenu.editStructure"), action: openStructureEditor, icon: PencilRuler });+ items.push({ sidebarActionId: "contextMenu.editStructure", label: t("contextMenu.editStructure"), action: openStructureEditor, icon: PencilRuler });}if (canRenameObject.value) {items.push({+ sidebarActionId: "contextMenu.renameObject",label: t("contextMenu.renameObject"),action: openRenameObjectDialog,icon: Pencil,@@ -6666,6 +6697,7 @@ function buildObjectSidebarMenu(context: SidebarMenuFactoryContext): boolean {}if (node.type === "view" || node.type === "materialized_view") {destructiveActions.push({+ sidebarActionId: "contextMenu.dropView",label: deleteMenuLabel(t("contextMenu.dropView")),action: deleteMenuAction(requestDropObject),icon: Trash2,@@ -6673,8 +6705,9 @@ function buildObjectSidebarMenu(context: SidebarMenuFactoryContext): boolean {variant: "destructive" as const,});}- if (node.type === "table") items.push({ label: t("modelGeneration.title"), action: openModelGeneration, icon: Code2 });+ if (node.type === "table") items.push({ sidebarActionId: "modelGeneration.title", label: t("modelGeneration.title"), action: openModelGeneration, icon: Code2 });items.push({+ sidebarActionId: "contextMenu.generateSql",label: t("contextMenu.generateSql"),icon: FilePlus,children: isTableNotView.value@@ -6694,35 +6727,36 @@ function buildObjectSidebarMenu(context: SidebarMenuFactoryContext): boolean {const sqlHistoryMenu = savedSqlHistorySubmenu();if (sqlHistoryMenu) items.push(sqlHistoryMenu);if (canOpenDiagram.value) {- items.push({ label: t("diagram.open"), action: openDiagram, icon: Network });+ items.push({ sidebarActionId: "diagram.open", label: t("diagram.open"), action: openDiagram, icon: Network });}if (canOpenTableImport.value) {- items.push({ label: t("contextMenu.importData"), action: openTableImport, icon: Download });+ items.push({ sidebarActionId: "contextMenu.importData", label: t("contextMenu.importData"), action: openTableImport, icon: Download });}if (isTableNotView.value) {- items.push({ label: t("dataCompare.title"), action: openDataCompare, icon: ArrowRightLeft });+ items.push({ sidebarActionId: "dataCompare.title", label: t("dataCompare.title"), action: openDataCompare, icon: ArrowRightLeft });}items.push({ label: "", separator: true });items.push(exportDataSubmenu());- items.push({ label: t("contextMenu.exportDatabase"), action: openDatabaseExport, icon: Upload });- items.push({ label: t("contextMenu.exportStructure"), action: exportStructure, icon: FileCode });+ items.push({ sidebarActionId: "contextMenu.exportDatabase", label: t("contextMenu.exportDatabase"), action: openDatabaseExport, icon: Upload });+ items.push({ sidebarActionId: "contextMenu.exportStructure", label: t("contextMenu.exportStructure"), action: exportStructure, icon: FileCode });if (canOpenDataDictionary.value) {- items.push({ label: t("dataDictionary.title"), action: openDataDictionary, icon: FileText });+ items.push({ sidebarActionId: "dataDictionary.title", label: t("dataDictionary.title"), action: openDataDictionary, icon: FileText });}items.push(copyStructureAsSubmenu());if (isTableNotView.value) {items.push({ label: "", separator: true });- items.push({ label: t("contextMenu.duplicateStructure"), action: duplicateStructure, icon: CopyPlus });+ items.push({ sidebarActionId: "contextMenu.duplicateStructure", label: t("contextMenu.duplicateStructure"), action: duplicateStructure, icon: CopyPlus });// Keep menu copy aligned with keyboard copy so frozen multi-selection and single-row fallback stay compatible.items.push(...treeTableClipboardMenuItems(node));if (supportsVacuum.value) {- destructiveActions.push({ label: t("contextMenu.vacuumTable"), action: vacuumTable, icon: Activity, variant: "destructive" as const });+ destructiveActions.push({ sidebarActionId: "contextMenu.vacuumTable", label: t("contextMenu.vacuumTable"), action: vacuumTable, icon: Activity, variant: "destructive" as const });}if (supportsMysqlAutoIncrement.value || batchAutoIncrementCount > 1) {- items.push({ label: autoIncrementMenuLabel(t("contextMenu.mysqlAutoIncrement")), action: autoIncrementMenuAction(mysqlAutoIncrement), icon: Gauge });+ items.push({ sidebarActionId: "contextMenu.mysqlAutoIncrement", label: autoIncrementMenuLabel(t("contextMenu.mysqlAutoIncrement")), action: autoIncrementMenuAction(mysqlAutoIncrement), icon: Gauge });}if (supportsTruncate.value) {destructiveActions.push({+ sidebarActionId: "contextMenu.truncateTable",label: truncateMenuLabel(t("contextMenu.truncateTable")),action: truncateMenuAction(truncateTable),icon: Scissors,@@ -6730,12 +6764,14 @@ function buildObjectSidebarMenu(context: SidebarMenuFactoryContext): boolean {});}destructiveActions.push({+ sidebarActionId: "contextMenu.emptyTable",label: emptyMenuLabel(t("contextMenu.emptyTable")),action: emptyMenuAction(emptyTable),icon: Eraser,variant: "destructive" as const,});destructiveActions.push({+ sidebarActionId: "contextMenu.dropTable",label: deleteMenuLabel(t("contextMenu.dropTable")),action: deleteMenuAction(dropTable),icon: Trash2,@@ -6749,6 +6785,7 @@ function buildObjectSidebarMenu(context: SidebarMenuFactoryContext): boolean {}items.push({ label: "", separator: true });items.push({+ sidebarActionId: "contextMenu.refreshChildren",label: t("contextMenu.refreshChildren"),action: refresh,icon: RefreshCw,@@ -6944,7 +6981,7 @@ function buildObjectSidebarMenu(context: SidebarMenuFactoryContext): boolean {function treeTableClipboardMenuItems(node: TreeNode): ContextMenuItem[] {if (currentDatabaseType() === "victoriametrics") return [];- const copyItem: ContextMenuItem = { label: t("contextMenu.copyTable"), action: copySelectedNames, icon: Copy };+ const copyItem: ContextMenuItem = { sidebarActionId: "contextMenu.copyTable", label: t("contextMenu.copyTable"), action: copySelectedNames, icon: Copy };if (!node.connectionId || !node.database) return [copyItem];const state = tableClipboardMenuState(normalizedTreeClipboardTableEntries(),@@ -6957,7 +6994,7 @@ function treeTableClipboardMenuItems(node: TreeNode): ContextMenuItem[] {canTransferTreeClipboardToCurrentNode(),);if (state === "copy") return [copyItem];- const pasteItem: ContextMenuItem = { label: t("contextMenu.pasteTable"), action: openPasteTableDialog, icon: Clipboard };+ const pasteItem: ContextMenuItem = { sidebarActionId: "contextMenu.pasteTable", label: t("contextMenu.pasteTable"), action: openPasteTableDialog, icon: Clipboard };return state === "paste" ? [pasteItem] : [copyItem, pasteItem];}@@ -7140,6 +7177,7 @@ function treeItemMenuItems(): ContextMenuItem[] {// 1. Pin toggleif (canPin.value) {items.push({+ sidebarActionId: "sidebar.togglePinnedObject",label: isPinned.value ? t("contextMenu.unpin") : t("contextMenu.pin"),action: togglePin,icon: Pin,diff --git a/apps/desktop/src/components/sidebar/__tests__/SidebarMenuPreferencesDialog.spec.ts b/apps/desktop/src/components/sidebar/__tests__/SidebarMenuPreferencesDialog.spec.tsnew file mode 100644index 0000000000..56ac6bfac2--- /dev/null+++ b/apps/desktop/src/components/sidebar/__tests__/SidebarMenuPreferencesDialog.spec.ts@@ -0,0 +1,158 @@+// @vitest-environment happy-dom+import { createApp, h, nextTick, type App } from "vue";+import { createPinia } from "pinia";+import { createI18n } from "vue-i18n";+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";+import SidebarMenuPreferencesDialog from "../SidebarMenuPreferencesDialog.vue";+import { DEFAULT_EDITOR_SETTINGS, useSettingsStore } from "@/stores/settingsStore";+import type { ContextMenuItem } from "@/components/ui/customContextMenuRegistry";++const backend = vi.hoisted(() => ({ loadEditorSettings: vi.fn(), saveEditorSettings: vi.fn() }));+vi.mock("@/lib/backend/api", () => backend);+const apps: App[] = [];+const entry = (id: string, label: string, extras: Partial<ContextMenuItem> = {}): ContextMenuItem => ({ sidebarActionId: id, label, action: vi.fn(), ...extras });+const items = [+ entry("contextMenu.newQuery", "New query"),+ entry("contextMenu.refreshChildren", "Refresh"),+ entry("contextMenu.serverDashboard", "Dashboard"),+ entry("contextMenu.processList", "Processes"),+ entry("contextMenu.sqlServerTrace", "Trace"),+ entry("contextMenu.copyName", "Copy name"),+ entry("contextMenu.exportData", "Export", { children: [{ label: "CSV", action: vi.fn() }] }),+ entry("contextMenu.deleteConnection", "Delete", { variant: "destructive" }),+];++async function flush() {+ await nextTick();+ await new Promise((resolve) => setTimeout(resolve, 0));+ await nextTick();+}+function button(name: string) {+ const result = [...document.querySelectorAll<HTMLButtonElement>("button")].find((el) => el.getAttribute("aria-label") === name || el.textContent?.trim() === name);+ expect(result, name).toBeDefined();+ return result!;+}+function row(id: string) {+ return document.querySelector<HTMLElement>(`[data-menu-entry="${id}"]`)!;+}+function checkbox(name: string) {+ const result = [...document.querySelectorAll("label")].find((el) => el.textContent?.includes(name))?.querySelector<HTMLInputElement>("input");+ expect(result, name).toBeDefined();+ return result!;+}+function visibleOrder() {+ return [...document.querySelectorAll<HTMLElement>("[data-menu-entry]")].map((el) => el.dataset.menuEntry);+}++async function mount() {+ const pinia = createPinia();+ const settings = useSettingsStore(pinia);+ await settings.initEditorSettings();+ const close = vi.fn();+ const app = createApp({ render: () => h(SidebarMenuPreferencesDialog, { open: true, scope: "connection", items, "onUpdate:open": close }) });+ app.use(pinia);+ app.use(+ createI18n({+ legacy: false,+ locale: "en",+ missingWarn: false,+ fallbackWarn: false,+ messages: { en: { sidebarMenu: { moveUp: "Move up {name}", moveDown: "Move down {name}", dragAction: "Reorder {name}", groups: { copy: "Copy", data: "Data", connectionTools: "Database tools", danger: "Danger" } } } },+ }),+ );+ const host = document.createElement("div");+ document.body.append(host);+ app.mount(host);+ apps.push(app);+ await flush();+ return { settings, close };+}++beforeEach(() => {+ vi.resetAllMocks();+ localStorage.clear();+ backend.loadEditorSettings.mockResolvedValue(DEFAULT_EDITOR_SETTINGS);+ backend.saveEditorSettings.mockResolvedValue(undefined);+});+afterEach(async () => {+ for (const app of apps.splice(0)) app.unmount();+ await flush();+ document.body.innerHTML = "";+});++describe("sidebar menu customization", () => {+ it("offers only grouped-menu customization and does not mutate the global layout", async () => {+ backend.loadEditorSettings.mockResolvedValue({ ...DEFAULT_EDITOR_SETTINGS, sidebarMenuLayout: "full" });+ const { settings } = await mount();+ expect(document.querySelector("h2")?.textContent).toBe("sidebarMenu.customizeTitle");+ expect(document.body.textContent).toContain("sidebarMenu.scopedDescription");+ expect(document.body.textContent).not.toContain("sidebarMenu.full");+ expect(document.body.textContent).not.toContain("sidebarMenu.groupedOnly");+ button("common.save").click();+ await flush();+ expect(settings.editorSettings.sidebarMenuLayout).toBe("full");+ expect(backend.saveEditorSettings.mock.calls[0][0].sidebarMenuLayout).toBe("full");+ });+ it("permits cancelling recommended defaults and saves their exclusion", async () => {+ const { settings, close } = await mount();+ expect(checkbox("Dashboard").checked).toBe(true);+ expect(checkbox("Dashboard").disabled).toBe(false);+ expect(checkbox("New query").disabled).toBe(true);+ checkbox("Dashboard").click();+ await flush();+ expect(checkbox("Dashboard").checked).toBe(false);+ button("common.save").click();+ await flush();+ expect(settings.editorSettings.sidebarMenuHiddenPrimaryActions.connection).toEqual(["contextMenu.serverDashboard"]);+ expect(close).toHaveBeenCalledWith(false);+ });++ it("saves a changed primary order from arrow buttons", async () => {+ const { settings } = await mount();+ const original = visibleOrder();+ button("Move up Dashboard").click();+ await flush();+ expect(visibleOrder().indexOf("contextMenu.serverDashboard")).toBe(original.indexOf("contextMenu.serverDashboard") - 1);+ button("common.save").click();+ await flush();+ expect(settings.editorSettings.sidebarMenuOrder.connection?.slice(0, 3)).toEqual(["contextMenu.newQuery", "contextMenu.serverDashboard", "contextMenu.refreshChildren"]);+ });++ it("reorders a dragged entry and keeps group order separate", async () => {+ const { settings } = await mount();+ button("Reorder Trace").dispatchEvent(new Event("dragstart", { bubbles: true, cancelable: true }));+ row("contextMenu.newQuery").dispatchEvent(new Event("dragover", { bubbles: true, cancelable: true }));+ row("contextMenu.newQuery").dispatchEvent(new Event("drop", { bubbles: true, cancelable: true }));+ await flush();+ expect(visibleOrder()[0]).toBe("contextMenu.sqlServerTrace");+ button("sidebarMenu.groupOrder").dispatchEvent(new MouseEvent("mousedown", { bubbles: true, cancelable: true, button: 0 }));+ await flush();+ expect(visibleOrder()).toEqual(["group.copy", "group.manage"]);+ button("Move up Database tools").click();+ await flush();+ expect(visibleOrder()).toEqual(["group.manage", "group.copy"]);+ button("common.save").click();+ await flush();+ expect(settings.editorSettings.sidebarMenuOrder.connection?.[0]).toBe("contextMenu.sqlServerTrace");+ expect(settings.editorSettings.sidebarMenuOrder.connection?.slice(-2)).toEqual(["group.manage", "group.copy"]);+ });++ it("resets recommendations and order without committing a cancelled draft", async () => {+ const { settings, close } = await mount();+ checkbox("Dashboard").click();+ button("Move up Trace").click();+ await flush();+ button("sidebarMenu.reset").click();+ await flush();+ expect(checkbox("Dashboard").checked).toBe(true);+ expect(visibleOrder()[0]).toBe("contextMenu.newQuery");+ checkbox("Dashboard").click();+ await flush();+ button("common.cancel").click();+ await flush();+ expect(settings.editorSettings.sidebarMenuHiddenPrimaryActions).toEqual({});+ expect(settings.editorSettings.sidebarMenuOrder).toEqual({});+ expect(backend.saveEditorSettings).not.toHaveBeenCalled();+ expect(close).toHaveBeenCalledWith(false);+ });+});diff --git a/apps/desktop/src/components/sidebar/__tests__/SidebarTreeRuntimeHost.savedSqlContextMenu.spec.ts b/apps/desktop/src/components/sidebar/__tests__/SidebarTreeRuntimeHost.savedSqlContextMenu.spec.tsindex b7d0083910..dd51022153 100644--- a/apps/desktop/src/components/sidebar/__tests__/SidebarTreeRuntimeHost.savedSqlContextMenu.spec.ts+++ b/apps/desktop/src/components/sidebar/__tests__/SidebarTreeRuntimeHost.savedSqlContextMenu.spec.ts@@ -14,6 +14,7 @@ vi.mock("@/lib/backend/api", async (importOriginal) => {import SidebarTreeRuntimeHost from "@/components/sidebar/SidebarTreeRuntimeHost.vue";import { useConnectionStore } from "@/stores/connectionStore";import { useQueryStore } from "@/stores/queryStore";+import { buildSidebarMenuLayout } from "@/lib/sidebar/sidebarMenuLayout";const mysqlConnection = {id: "conn-mysql",@@ -78,6 +79,54 @@ function menuLabels(items: ContextMenuItem[]): string[] {const tr = (key: string) => i18n.global.t(key);describe("SidebarTreeRuntimeHost saved SQL context menu (#9127)", () => {+ it.each(["mysql", "oracle"])("shares the primary visible-filter preference for %s connections", async (dbType) => {+ const connection = { ...mysqlConnection, db_type: dbType, driver_profile: dbType };+ const host = await mountHost(connection);+ const raw = host.buildContextMenu({ id: connection.id, label: connection.name, type: "connection", connectionId: connection.id });+ const filter = raw.find((entry) => entry.sidebarActionId === "contextMenu.configureVisibleObjects");+ expect(filter?.label).toBe(tr(dbType === "oracle" ? "visibleSchemas.title" : "contextMenu.configureVisibleObjects"));+ const grouped = buildSidebarMenuLayout(raw, "connection", "grouped", [], tr, { order: ["contextMenu.configureVisibleObjects"] });+ expect(grouped[0]).toBe(filter);+ const hidden = buildSidebarMenuLayout(raw, "connection", "grouped", [], tr, { hiddenPrimaryIds: ["contextMenu.configureVisibleObjects"] });+ expect(hidden).not.toContain(filter);+ expect(hidden.find((entry) => entry.sidebarActionId === "group.organize")?.children).toContainEqual(expect.objectContaining({ action: filter!.action }));+ });++ it.each(["mysql", "postgres", "oracle", "sqlserver"])("puts database search in data tools and pinning directly in %s database and table menus", async (dbType) => {+ const host = await mountHost({ ...mysqlConnection, db_type: dbType, driver_profile: dbType });+ for (const type of ["database", "table"] as const) {+ const raw = host.buildContextMenu({ id: `app:${type}`, label: "app", type, connectionId: mysqlConnection.id, database: "app", schema: "public" });+ const grouped = buildSidebarMenuLayout(raw, type, "grouped", [], tr);+ const pin = raw.find((entry) => entry.sidebarActionId === "sidebar.togglePinnedObject");+ expect(pin).toBeDefined();+ expect(grouped).toContain(pin);+ if (type === "database") {+ const search = raw.find((entry) => entry.sidebarActionId === "databaseSearch.open");+ expect(search).toBeDefined();+ expect(grouped.find((entry) => entry.sidebarActionId === "group.data")?.children).toContainEqual(search);+ expect(grouped.some((entry) => entry.sidebarActionId === "group.manage")).toBe(false);+ }+ }+ });++ it("groups real table actions without losing callbacks and binds a promoted query to its original target", async () => {+ const host = await mountHost(mysqlConnection);+ const connectionStore = useConnectionStore();+ const queryStore = useQueryStore();+ vi.spyOn(connectionStore, "ensureConnected").mockResolvedValue(undefined as any);+ const createTabSpy = vi.spyOn(queryStore, "createTab").mockReturnValue("menu-query");+ const node: TreeNode = { id: "orders", label: "orders", type: "table", connectionId: mysqlConnection.id, database: "app", schema: "public" };+ const raw = host.buildContextMenu(node);+ const grouped = buildSidebarMenuLayout(raw, "table", "grouped", ["contextMenu.exportData"], tr);+ expect(grouped.find((item) => item.sidebarActionId === "contextMenu.exportData")?.children?.some((item) => item.label === "CSV")).toBe(true);+ expect(grouped.find((item) => item.label === tr("sidebarMenu.groups.danger"))?.children?.some((item) => item.sidebarActionId === "contextMenu.dropTable")).toBe(true);+ const callbacks = (items: ContextMenuItem[]): Array<ContextMenuItem["action"]> => items.flatMap((item) => (item.children?.length ? callbacks(item.children) : item.action ? [item.action] : []));+ expect(callbacks(grouped)).toHaveLength(callbacks(raw).length);+ expect(callbacks(grouped)).toEqual(expect.arrayContaining(callbacks(raw)));+ node.database = "changed-after-open";+ await grouped.find((item) => item.sidebarActionId === "contextMenu.newQuery")?.action?.();+ expect(createTabSpy.mock.calls[0].slice(0, 7)).toEqual([mysqlConnection.id, "app", undefined, "query", "public", undefined, undefined]);+ });afterEach(() => {for (const app of mountedApps.splice(0)) app.unmount();document.body.innerHTML = "";diff --git a/apps/desktop/src/components/ui/CustomContextMenu.vue b/apps/desktop/src/components/ui/CustomContextMenu.vueindex 939bc95f0a..28c4e00bec 100644--- a/apps/desktop/src/components/ui/CustomContextMenu.vue+++ b/apps/desktop/src/components/ui/CustomContextMenu.vue@@ -35,9 +35,11 @@ const subY = ref(0);let subCloseTimer: ReturnType<typeof setTimeout> | null = null;let subAnchorRect: { left: number; right: number; top: number; bottom: number } | null = null;let contextMenuRegistration: ContextMenuRegistration | null = null;+let menuRevision = 0;function close() {if (!show.value) return;+ menuRevision += 1;activeSubIndex.value = null;subAnchorRect = null;activeItems.value = [];@@ -70,7 +72,10 @@ function isScrollInsideMenu(e: Event): boolean {function onScroll(e: Event) {// Submenus (and tall main menus) are scrollable; ignore their own scroll// so wheel/trackpad scrolling does not dismiss the menu.- if (isScrollInsideMenu(e)) return;+ if (isScrollInsideMenu(e)) {+ if (e.target instanceof Node && menuRef.value?.contains(e.target)) activeSubIndex.value = null;+ return;+ }close();}@@ -102,17 +107,52 @@ onMounted(() => {contextMenuRegistration = registerGlobalContextMenu(close);});-function handleItemClick(item: ContextMenuItem) {+function handleItemClick(item: ContextMenuItem, index: number, event: MouseEvent) {if (itemIsDisabled(item)) return;- if (item.children?.length) return; // submenu trigger — do nothing on click+ if (item.children?.length) {+ onItemMouseEnter(index, event);+ return;+ }if (item.closeOnSelect !== false) close();- item.action?.();+ runItemAction(item);}function handleSubItemClick(item: ContextMenuItem) {if (itemIsDisabled(item)) return;if (item.closeOnSelect !== false) close();- item.action?.();+ runItemAction(item);+}++function adjustMenuPosition() {+ if (!menuRef.value) return;+ const rect = menuRef.value.getBoundingClientRect();+ x.value = Math.max(8, Math.min(x.value, window.innerWidth - rect.width - 8));+ y.value = Math.max(8, Math.min(y.value, window.innerHeight - rect.height - 8));+}++function runItemAction(item: ContextMenuItem) {+ const revision = menuRevision;+ const result = item.action?.() as unknown;+ if (item.closeOnSelect !== false || !item.refreshItems) return;+ const refresh = () => {+ if (!show.value || revision !== menuRevision) return;+ activeSubIndex.value = null;+ subAnchorRect = null;+ if (subCloseTimer) {+ clearTimeout(subCloseTimer);+ subCloseTimer = null;+ }+ activeItems.value = item.refreshItems!();+ nextTick(() => {+ if (!show.value || revision !== menuRevision) return;+ adjustMenuPosition();+ const button = [...(menuRef.value?.querySelectorAll<HTMLButtonElement>("button") ?? [])].find((entry) => entry.dataset.menuAction === item.sidebarActionId);+ button?.focus({ preventScroll: true });+ button?.scrollIntoView?.({ block: "nearest" });+ });+ };+ if (result && typeof (result as PromiseLike<unknown>).then === "function") void Promise.resolve(result).then(refresh, refresh);+ else refresh();}function onContextMenu(event: MouseEvent, itemsOverride?: ContextMenuItem[]) {@@ -122,6 +162,8 @@ function onContextMenu(event: MouseEvent, itemsOverride?: ContextMenuItem[]) {// value before Vue has flushed the parent-to-child update.const items = itemsOverride ?? (typeof props.items === "function" ? props.items() : props.items);if (items.length === 0) return;+ menuRevision += 1;+ activeSubIndex.value = null;activeItems.value = items;event.preventDefault();event.stopPropagation();@@ -130,14 +172,7 @@ function onContextMenu(event: MouseEvent, itemsOverride?: ContextMenuItem[]) {contextMenuRegistration?.activate();show.value = true;emit("open");- nextTick(() => {- if (!menuRef.value) return;- const rect = menuRef.value.getBoundingClientRect();- const vw = window.innerWidth;- const vh = window.innerHeight;- if (rect.right > vw) x.value = Math.max(0, vw - rect.width - 8);- if (rect.bottom > vh) y.value = Math.max(0, vh - rect.height - 8);- });+ nextTick(adjustMenuPosition);}// ---- submenu ----@@ -274,10 +309,10 @@ onBeforeUnmount(() => {v-if="show"ref="menuRef"data-dbx-context-menu- :style="{ position: 'fixed', left: x + 'px', top: y + 'px', zIndex: 9999 }"- class="pointer-events-auto bg-popover text-popover-foreground min-w-40 w-max max-w-[calc(100vw-16px)] rounded-md p-1 overflow-y-auto ring-1 ring-foreground/10 shadow-lg"+ :style="{ position: 'fixed', left: x + 'px', top: y + 'px', zIndex: 9999, maxHeight: 'calc(100vh - 16px)' }"+ class="pointer-events-auto bg-popover text-popover-foreground min-w-40 w-max max-w-[calc(100vw-16px)] rounded-md p-1 overflow-y-auto overscroll-contain ring-1 ring-foreground/10 shadow-lg">- <template v-for="(item, index) in activeItems" :key="index">+ <template v-for="(item, index) in activeItems" :key="item.sidebarActionId ?? index"><template v-if="item.visible !== false"><div v-if="item.separator" class="-mx-1 my-1 flex items-center px-1"><div class="h-px flex-1 bg-border/70" />@@ -287,8 +322,9 @@ onBeforeUnmount(() => {:disabled="itemIsDisabled(item)":aria-pressed="item.checkedStyle === 'switch' ? !!item.checked : undefined":title="item.title"+ :data-menu-action="item.sidebarActionId":class="[...itemButtonClass(item.variant), activeSubmenuTriggerClass(item, index)]"- @click="handleItemClick(item)"+ @click="(event) => handleItemClick(item, index, event)"@mouseenter="(e) => onItemMouseEnter(index, e)"@mouseleave="onItemMouseLeave">diff --git a/apps/desktop/src/components/ui/__tests__/CustomContextMenu.spec.ts b/apps/desktop/src/components/ui/__tests__/CustomContextMenu.spec.tsindex cc8cfedc69..5fd3b06985 100644--- a/apps/desktop/src/components/ui/__tests__/CustomContextMenu.spec.ts+++ b/apps/desktop/src/components/ui/__tests__/CustomContextMenu.spec.ts@@ -20,6 +20,91 @@ afterEach(() => {});describe("CustomContextMenu lifecycle", () => {+ it("ignores a pending refresh after the menu has been closed", async () => {+ let complete!: () => void;+ const refresh = vi.fn(() => [{ label: "Updated" }]);+ const close = vi.fn();+ const root = defineComponent({+ setup: () => () =>+ h(+ CustomContextMenu,+ {+ onClose: close,+ items: [+ {+ label: "Switch",+ sidebarActionId: "menu.layout",+ closeOnSelect: false,+ refreshItems: refresh,+ action: () =>+ new Promise<void>((resolve) => {+ complete = resolve;+ }),+ },+ ],+ },+ { default: ({ onContextMenu }: { onContextMenu: (event: MouseEvent) => void }) => h("div", { id: "pending-refresh", onContextmenu: onContextMenu }) },+ ),+ });+ const host = document.createElement("div");+ document.body.append(host);+ mountedContainers.push(host);+ const app = createApp(root);+ app.mount(host);+ host.querySelector("#pending-refresh")?.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true }));+ await nextTick();+ document.querySelector<HTMLButtonElement>('[data-menu-action="menu.layout"]')?.click();+ document.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape" }));+ await nextTick();+ complete();+ await Promise.resolve();+ await nextTick();+ expect(close).toHaveBeenCalledOnce();+ expect(refresh).not.toHaveBeenCalled();+ expect(document.querySelector("[data-dbx-context-menu]")).toBeNull();+ app.unmount();+ });++ it("keeps a height-constrained main menu open on its own scroll events", async () => {+ const close = vi.fn();+ const items = Array.from({ length: 50 }, (_, i) => ({ label: `Action ${i}` }));+ const root = defineComponent({ setup: () => () => h(CustomContextMenu, { items, onClose: close }, { default: ({ onContextMenu }: { onContextMenu: (event: MouseEvent) => void }) => h("div", { id: "tall-menu", onContextmenu: onContextMenu }) }) });+ const host = document.createElement("div");+ document.body.append(host);+ mountedContainers.push(host);+ const app = createApp(root);+ app.mount(host);+ host.querySelector("#tall-menu")?.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true }));+ await nextTick();+ const menu = document.querySelector<HTMLElement>("[data-dbx-context-menu]")!;+ expect(menu.style.maxHeight).toBe("calc(100vh - 16px)");+ menu.dispatchEvent(new Event("scroll", { bubbles: true }));+ await nextTick();+ expect(close).not.toHaveBeenCalled();+ expect(menu.querySelectorAll("button")).toHaveLength(50);+ app.unmount();+ });+ it("opens submenus on click without requiring a hover", async () => {+ const action = vi.fn();+ const root = defineComponent({+ setup: () => () => h(CustomContextMenu, { items: [{ label: "Data tools", children: [{ label: "Export", action }] }] }, { default: ({ onContextMenu }: { onContextMenu: (event: MouseEvent) => void }) => h("div", { id: "click-submenu", onContextmenu: onContextMenu }) }),+ });+ const container = document.createElement("div");+ mountedContainers.push(container);+ document.body.append(container);+ const app = createApp(root);+ app.mount(container);+ container.querySelector("#click-submenu")?.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true }));+ await nextTick();+ const trigger = Array.from(document.body.querySelectorAll("button")).find((button) => button.textContent === "Data tools");+ trigger?.click();+ await nextTick();+ const child = Array.from(document.body.querySelectorAll("button")).find((button) => button.textContent === "Export");+ expect(child).toBeTruthy();+ child?.click();+ expect(action).toHaveBeenCalledOnce();+ app.unmount();+ });it("exposes the open state and closes only the active target", async () => {const firstOpen = vi.fn();const firstClose = vi.fn();diff --git a/apps/desktop/src/components/ui/customContextMenuRegistry.ts b/apps/desktop/src/components/ui/customContextMenuRegistry.tsindex acb5518167..12c33742b8 100644--- a/apps/desktop/src/components/ui/customContextMenuRegistry.ts+++ b/apps/desktop/src/components/ui/customContextMenuRegistry.ts@@ -1,6 +1,8 @@import type { Component } from "vue";export interface ContextMenuItem {+ /** Stable built-in action key used by the sidebar's saved menu preferences. */+ sidebarActionId?: string;label: string;action?: () => void;disabled?: boolean | (() => boolean);@@ -11,6 +13,8 @@ export interface ContextMenuItem {indentLevel?: number;checked?: boolean;closeOnSelect?: boolean;+ /** Refresh an open menu after a non-closing action, using the accepted target. */+ refreshItems?: () => ContextMenuItem[];checkedStyle?: "check" | "switch";// Raw shortcut syntax such as `Mod+C` or `Shift+Alt+U`; display formatting stays in this component.shortcut?: string;diff --git a/apps/desktop/src/composables/useSidebarMenuPresentation.ts b/apps/desktop/src/composables/useSidebarMenuPresentation.tsnew file mode 100644index 0000000000..fa3e7ce5e4--- /dev/null+++ b/apps/desktop/src/composables/useSidebarMenuPresentation.ts@@ -0,0 +1,62 @@+import { defineAsyncComponent, ref, shallowRef } from "vue";+import { useI18n } from "vue-i18n";+import { Blocks, ListTree } from "@lucide/vue";+import { useSettingsStore } from "@/stores/settingsStore";+import { useToast } from "@/composables/useToast";+import type { ContextMenuItem } from "@/components/ui/customContextMenuRegistry";+import { buildSidebarMenuLayout, sidebarMenuScope, type SidebarMenuScope, type SidebarMenuTargetType } from "@/lib/sidebar/sidebarMenuLayout";++const SidebarMenuPreferencesDialog = defineAsyncComponent(() => import("@/components/sidebar/SidebarMenuPreferencesDialog.vue"));++/** Shared by the tree and database/object browsers; execution stays with each owner. */+export function useSidebarMenuPresentation() {+ const { t } = useI18n();+ const settings = useSettingsStore();+ const { toast } = useToast();+ const sidebarMenuPreferencesOpen = ref(false);+ const menuLayoutSaving = ref(false);+ const sidebarMenuPreferences = shallowRef<{ scope: SidebarMenuScope; items: ContextMenuItem[] } | null>(null);++ function presentMenu(originalItems: ContextMenuItem[], type: SidebarMenuTargetType): ContextMenuItem[] {+ const scope = sidebarMenuScope(type);+ if (!scope) return originalItems;+ const full = settings.editorSettings.sidebarMenuLayout === "full";+ const items = buildSidebarMenuLayout(originalItems, scope, settings.editorSettings.sidebarMenuLayout, settings.editorSettings.sidebarMenuPinnedActions?.[scope] ?? [], t, {+ hiddenPrimaryIds: settings.editorSettings.sidebarMenuHiddenPrimaryActions?.[scope],+ order: settings.editorSettings.sidebarMenuOrder?.[scope],+ });+ items.push({ label: "", separator: true });+ if (!full)+ items.push({+ label: t("sidebarMenu.customize"),+ icon: Blocks,+ action: () => {+ sidebarMenuPreferences.value = { scope, items: originalItems };+ sidebarMenuPreferencesOpen.value = true;+ },+ });+ items.push({+ sidebarActionId: "menu.layout",+ label: t("sidebarMenu.useFull"),+ icon: ListTree,+ checked: full,+ checkedStyle: "switch",+ disabled: () => menuLayoutSaving.value,+ closeOnSelect: false,+ refreshItems: () => presentMenu(originalItems, type),+ action: () => {+ if (menuLayoutSaving.value) return;+ menuLayoutSaving.value = true;+ return settings+ .updateEditorSettingsAndPersist({ sidebarMenuLayout: full ? "grouped" : "full" })+ .catch((error) => toast(t("sidebarMenu.saveFailed", { message: String(error) }), 5000))+ .finally(() => {+ menuLayoutSaving.value = false;+ });+ },+ });+ return items;+ }++ return { presentMenu, SidebarMenuPreferencesDialog, sidebarMenuPreferencesOpen, sidebarMenuPreferences };+}diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.tsindex bcc4e731d4..aab9ca6c1b 100644--- a/apps/desktop/src/i18n/locales/az.ts+++ b/apps/desktop/src/i18n/locales/az.ts@@ -1,3 +1,4 @@+import { sidebarMenuAz as sidebarMenu } from "./sidebarMenuMessages";import { withEnglishFallback } from "./fallback";import docs from "./docs/az";import { dataDictionaryAz as dataDictionary } from "./dataDictionaryMessages";@@ -60,6 +61,7 @@ const consul = {};export default withEnglishFallback({+ sidebarMenu,pluginPlatform: {dataAccessConsent: '"{name}" "{connection}" bağlantısındakı məlumatları oxumaq istəyir. Bu bağlantı açıq olduqca plagin, Plagin Mərkəzində girişi ləğv edənə qədər orada yalnız oxuma sorğuları icra edə bilər. İcazə verilsin?',dataAccessConsentTitle: "Məlumat girişi sorğusu",diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex 6b04fbd921..c234268f28 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -1,3 +1,4 @@+import { sidebarMenuEn as sidebarMenu } from "./sidebarMenuMessages";import { redisGroupingEn as redisGrouping } from "./redisGrouping";import docs from "./docs/en";import { dataDictionaryEn as dataDictionary } from "./dataDictionaryMessages";@@ -61,6 +62,7 @@ const consul = {};export default {+ sidebarMenu,modelGeneration: {title: "Generate model",editTemplate: "Edit template",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex da6b0db3e3..d00d9adaca 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -1,3 +1,4 @@+import { sidebarMenuEs as sidebarMenu } from "./sidebarMenuMessages";import { withEnglishFallback } from "./fallback";import { mongodbDatabaseDumpEs as mongoDump } from "./mongodbDatabaseDump";import { meilisearchManagementEs } from "./meilisearchManagement";@@ -63,6 +64,7 @@ const consul = {};export default withEnglishFallback({+ sidebarMenu,modelGeneration: {title: "Generar modelo",editTemplate: "Editar plantilla",diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.tsindex 060450506c..ecd411a40e 100644--- a/apps/desktop/src/i18n/locales/id.ts+++ b/apps/desktop/src/i18n/locales/id.ts@@ -1,3 +1,4 @@+import { sidebarMenuId as sidebarMenu } from "./sidebarMenuMessages";import { withEnglishFallback } from "./fallback";import docs from "./docs/id";import { dataDictionaryId as dataDictionary } from "./dataDictionaryMessages";@@ -6,6 +7,7 @@ import { sqlServerTraceMessages as sqlServerTrace } from "./sqlServerTraceMessagimport { meilisearchManagementId } from "./meilisearchManagement";export default withEnglishFallback({+ sidebarMenu,cellTransform: {title: "Pratinjau konversi",description: "Konversi nilai saat ini untuk dilihat atau disalin. Nilai sumber dan draf editor tidak berubah.",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex defed04ac9..5b500d674b 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -1,3 +1,4 @@+import { sidebarMenuIt as sidebarMenu } from "./sidebarMenuMessages";import { withEnglishFallback } from "./fallback";import { mongodbDatabaseDumpIt as mongoDump } from "./mongodbDatabaseDump";import { meilisearchManagementIt } from "./meilisearchManagement";@@ -61,6 +62,7 @@ const consul = {};export default withEnglishFallback({+ sidebarMenu,modelGeneration: {title: "Genera modello",editTemplate: "Modifica modello",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex 84d6151c5b..6c007c4e0f 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -1,3 +1,4 @@+import { sidebarMenuJa as sidebarMenu } from "./sidebarMenuMessages";import { withEnglishFallback } from "./fallback";import { mongodbDatabaseDumpJa as mongoDump } from "./mongodbDatabaseDump";import docs from "./docs/ja";@@ -62,6 +63,7 @@ const consul = {};export default withEnglishFallback({+ sidebarMenu,modelGeneration: {title: "モデルを生成",editTemplate: "テンプレートを編集",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex dc572822a9..891e18796a 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -1,3 +1,4 @@+import { sidebarMenuKo as sidebarMenu } from "./sidebarMenuMessages";import { withEnglishFallback } from "./fallback";import { mongodbDatabaseDumpKo as mongoDump } from "./mongodbDatabaseDump";import { meilisearchManagementKo } from "./meilisearchManagement";@@ -61,6 +62,7 @@ const consul = {};export default withEnglishFallback({+ sidebarMenu,modelGeneration: {title: "모델 생성",editTemplate: "템플릿 편집",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex 4f044d1d58..2d2508e157 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -1,3 +1,4 @@+import { sidebarMenuPtBR as sidebarMenu } from "./sidebarMenuMessages";import { withEnglishFallback } from "./fallback";import { mongodbDatabaseDumpPtBR as mongoDump } from "./mongodbDatabaseDump";import { meilisearchManagementPtBR } from "./meilisearchManagement";@@ -62,6 +63,7 @@ const consul = {};export default withEnglishFallback({+ sidebarMenu,modelGeneration: {title: "Gerar modelo",editTemplate: "Editar modelo",diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.tsindex cd64449731..f37fd55182 100644--- a/apps/desktop/src/i18n/locales/ru.ts+++ b/apps/desktop/src/i18n/locales/ru.ts@@ -1,3 +1,4 @@+import { sidebarMenuRu as sidebarMenu } from "./sidebarMenuMessages";import { withEnglishFallback } from "./fallback";import docs from "./docs/ru";import { dataDictionaryRu as dataDictionary } from "./dataDictionaryMessages";@@ -5,6 +6,7 @@ import { meilisearchManagementRu } from "./meilisearchManagement";// Russian locale. Entries omitted here fall back to English at runtime.export default withEnglishFallback({+ sidebarMenu,modelGeneration: {title: "Создать модель",editTemplate: "Изменить шаблон",diff --git a/apps/desktop/src/i18n/locales/sidebarMenuMessages.ts b/apps/desktop/src/i18n/locales/sidebarMenuMessages.tsnew file mode 100644index 0000000000..c7427bf2e2--- /dev/null+++ b/apps/desktop/src/i18n/locales/sidebarMenuMessages.ts@@ -0,0 +1,515 @@+export const sidebarMenuEn = {+ customize: "Customize grouped menu…",+ customizeTitle: "Customize {scope} menu",+ scopedDescription: "Choose primary actions and arrange groups in the {scope} grouped menu. Changes apply only to {scope} menus.",+ recommended: "Recommended",+ primaryTab: "Primary actions",+ groupOrder: "Group order",+ orderHint: "Drag the handle or use the arrows to reorder grouped menus. Actions and groups are ordered separately; dangerous operations stay last. Full menus keep their original layout.",+ dragAction: "Drag to reorder {name}",+ moveUp: "Move {name} up",+ moveDown: "Move {name} down",+ otherActions: "More actions",+ fixedLast: "Always last",+ grouped: "Grouped menu",+ full: "Full menu",+ useFull: "Use full menu",+ primaryActions: "Primary actions · {scope}",+ primaryHint: "Core actions stay visible. Recommended actions can be unchecked. Drag or use the arrows to reorder primary actions.",+ builtIn: "Core",+ reset: "Reset actions and order",+ saveFailed: "Could not save menu preferences: {message}",+ groups: {+ connectionSettings: "Connection management",+ databaseSettings: "Database settings",+ schemaSettings: "Schema settings",+ tableSettings: "Table management",+ viewSettings: "View management",+ execution: "Execution and results",+ sqlEditor: "SQL processing",+ selection: "Selection and folding",+ connectionTools: "Database tools",+ data: "Data tools",+ sql: "SQL and code",+ structure: "Structure tools",+ copy: "Copy",+ organize: "Organize and settings",+ manage: "Management",+ other: "Other actions",+ danger: "Dangerous operations",+ },+ scopes: { "sql-editor": "SQL editor", connection: "Connection", database: "Database", schema: "Schema", table: "Table", view: "View" },+};++export const sidebarMenuZhCN = {+ customize: "自定义分组菜单…",+ customizeTitle: "自定义{scope}菜单",+ scopedDescription: "选择{scope}分组菜单的一级操作,并调整操作和分组顺序。仅影响{scope}菜单。",+ recommended: "默认推荐",+ primaryTab: "一级操作",+ groupOrder: "分组顺序",+ orderHint: "拖动手柄或点击箭头调整分组菜单顺序。操作与分组分别排序;危险操作固定在底部。完整菜单保留原布局。",+ dragAction: "拖动排序:{name}",+ moveUp: "上移:{name}",+ moveDown: "下移:{name}",+ otherActions: "更多可选操作",+ fixedLast: "固定在底部",+ grouped: "分组菜单",+ full: "完整菜单",+ useFull: "使用完整菜单",+ primaryActions: "一级操作 · {scope}",+ primaryHint: "基础操作固定显示,默认推荐项可取消。拖动或点击箭头调整一级操作顺序。",+ builtIn: "基础操作",+ reset: "恢复默认操作与排序",+ saveFailed: "无法保存菜单偏好:{message}",+ groups: {+ connectionSettings: "连接管理",+ databaseSettings: "数据库设置",+ schemaSettings: "Schema 设置",+ tableSettings: "表管理",+ viewSettings: "视图管理",+ execution: "执行与结果",+ sqlEditor: "SQL 处理",+ selection: "选择与折叠",+ connectionTools: "数据库工具",+ data: "数据工具",+ sql: "SQL 与代码",+ structure: "结构工具",+ copy: "复制",+ organize: "组织与设置",+ manage: "管理工具",+ other: "其他操作",+ danger: "危险操作",+ },+ scopes: { "sql-editor": "SQL 编辑器", connection: "连接", database: "数据库", schema: "Schema", table: "表", view: "视图" },+};++export const sidebarMenuZhTW = {+ customize: "自訂分組選單…",+ customizeTitle: "自訂{scope}選單",+ scopedDescription: "選擇{scope}分組選單的一級操作,並調整操作和分組順序。僅影響{scope}選單。",+ recommended: "預設推薦",+ primaryTab: "一級操作",+ groupOrder: "分組順序",+ orderHint: "拖曳手柄或點擊箭頭調整分組選單順序。操作與分組分別排序;危險操作固定在底部。完整選單保留原配置。",+ dragAction: "拖曳排序:{name}",+ moveUp: "上移:{name}",+ moveDown: "下移:{name}",+ otherActions: "更多可選操作",+ fixedLast: "固定在底部",+ grouped: "分組選單",+ full: "完整選單",+ useFull: "使用完整選單",+ primaryActions: "一級操作 · {scope}",+ primaryHint: "基本操作固定顯示,預設推薦項可取消。拖曳或點擊箭頭調整一級操作順序。",+ builtIn: "基本操作",+ reset: "還原預設操作與排序",+ saveFailed: "無法儲存選單偏好:{message}",+ groups: {+ connectionSettings: "連線管理",+ databaseSettings: "資料庫設定",+ schemaSettings: "Schema 設定",+ tableSettings: "資料表管理",+ viewSettings: "檢視表管理",+ execution: "執行與結果",+ sqlEditor: "SQL 處理",+ selection: "選取與摺疊",+ connectionTools: "資料庫工具",+ data: "資料工具",+ sql: "SQL 與程式碼",+ structure: "結構工具",+ copy: "複製",+ organize: "組織與設定",+ manage: "管理工具",+ other: "其他操作",+ danger: "危險操作",+ },+ scopes: { "sql-editor": "SQL 編輯器", connection: "連線", database: "資料庫", schema: "Schema", table: "資料表", view: "檢視表" },+};++export const sidebarMenuJa = {+ customize: "グループメニューをカスタマイズ…",+ customizeTitle: "{scope}メニューをカスタマイズ",+ scopedDescription: "{scope}のグループメニューの主要な操作と順序を設定します。変更は{scope}メニューにのみ適用されます。",+ recommended: "おすすめ",+ primaryTab: "主要な操作",+ groupOrder: "グループの順序",+ orderHint: "ハンドルをドラッグするか矢印でグループメニューを並べ替えます。操作とグループは別々に並べ替えられ、危険な操作は最後に固定されます。完全なメニューは元の配置を保持します。",+ dragAction: "{name}をドラッグして並べ替え",+ moveUp: "{name}を上へ",+ moveDown: "{name}を下へ",+ otherActions: "その他の操作",+ fixedLast: "最後に固定",+ grouped: "グループ表示",+ full: "すべて表示",+ useFull: "完全なメニューを使用",+ primaryActions: "主要な操作 · {scope}",+ primaryHint: "基本操作は常に表示されます。おすすめの操作は解除できます。ドラッグまたは矢印で主要な操作を並べ替えます。",+ builtIn: "基本操作",+ reset: "操作と順序をリセット",+ saveFailed: "メニュー設定を保存できませんでした:{message}",+ groups: {+ connectionSettings: "接続の管理",+ databaseSettings: "データベース設定",+ schemaSettings: "スキーマ設定",+ tableSettings: "テーブルの管理",+ viewSettings: "ビューの管理",+ execution: "実行と結果",+ sqlEditor: "SQL の処理",+ selection: "選択と折りたたみ",+ connectionTools: "データベースツール",+ data: "データツール",+ sql: "SQL とコード",+ structure: "構造ツール",+ copy: "コピー",+ organize: "整理と設定",+ manage: "管理ツール",+ other: "その他の操作",+ danger: "危険な操作",+ },+ scopes: { "sql-editor": "SQL エディター", connection: "接続", database: "データベース", schema: "スキーマ", table: "テーブル", view: "ビュー" },+};++export const sidebarMenuKo = {+ customize: "그룹 메뉴 사용자 지정…",+ customizeTitle: "{scope} 메뉴 사용자 지정",+ scopedDescription: "{scope} 그룹 메뉴의 주요 작업과 그룹 순서를 설정하세요. 변경 사항은 {scope} 메뉴에만 적용됩니다.",+ recommended: "기본 추천",+ primaryTab: "주요 작업",+ groupOrder: "그룹 순서",+ orderHint: "핸들을 드래그하거나 화살표로 그룹 메뉴 순서를 변경하세요. 작업과 그룹은 따로 정렬되며 위험한 작업은 마지막에 유지됩니다. 전체 메뉴는 원래 레이아웃을 유지합니다.",+ dragAction: "{name} 드래그하여 정렬",+ moveUp: "{name} 위로 이동",+ moveDown: "{name} 아래로 이동",+ otherActions: "추가 작업",+ fixedLast: "마지막에 고정",+ grouped: "그룹 메뉴",+ full: "전체 메뉴",+ useFull: "전체 메뉴 사용",+ primaryActions: "주요 작업 · {scope}",+ primaryHint: "기본 작업은 항상 표시됩니다. 추천 작업은 해제할 수 있습니다. 드래그하거나 화살표로 주요 작업의 순서를 변경하세요.",+ builtIn: "기본",+ reset: "작업 및 순서 초기화",+ saveFailed: "메뉴 설정을 저장할 수 없습니다: {message}",+ groups: {+ connectionSettings: "연결 관리",+ databaseSettings: "데이터베이스 설정",+ schemaSettings: "스키마 설정",+ tableSettings: "테이블 관리",+ viewSettings: "뷰 관리",+ execution: "실행 및 결과",+ sqlEditor: "SQL 처리",+ selection: "선택 및 접기",+ connectionTools: "데이터베이스 도구",+ data: "데이터 도구",+ sql: "SQL 및 코드",+ structure: "구조 도구",+ copy: "복사",+ organize: "정리 및 설정",+ manage: "관리 도구",+ other: "기타 작업",+ danger: "위험한 작업",+ },+ scopes: { "sql-editor": "SQL 편집기", connection: "연결", database: "데이터베이스", schema: "스키마", table: "테이블", view: "뷰" },+};++export const sidebarMenuEs = {+ customize: "Personalizar menú agrupado…",+ customizeTitle: "Personalizar menú de {scope}",+ scopedDescription: "Elige acciones principales y ordena los grupos del menú agrupado de {scope}. Los cambios se aplican solo a los menús de {scope}.",+ recommended: "Recomendada",+ primaryTab: "Acciones principales",+ groupOrder: "Orden de grupos",+ orderHint: "Arrastra el control o usa las flechas para ordenar los menús agrupados. Las acciones y los grupos se ordenan por separado; las operaciones peligrosas quedan al final. El menú completo conserva su diseño original.",+ dragAction: "Arrastrar para ordenar {name}",+ moveUp: "Subir {name}",+ moveDown: "Bajar {name}",+ otherActions: "Más acciones",+ fixedLast: "Siempre al final",+ grouped: "Menú agrupado",+ full: "Menú completo",+ useFull: "Usar menú completo",+ primaryActions: "Acciones principales · {scope}",+ primaryHint: "Las acciones básicas siempre son visibles. Puedes desmarcar las recomendadas. Arrastra o usa las flechas para ordenar las acciones principales.",+ builtIn: "Básica",+ reset: "Restablecer acciones y orden",+ saveFailed: "No se pudieron guardar las preferencias del menú: {message}",+ groups: {+ connectionSettings: "Gestión de conexiones",+ databaseSettings: "Ajustes de base de datos",+ schemaSettings: "Ajustes de esquema",+ tableSettings: "Gestión de tablas",+ viewSettings: "Gestión de vistas",+ execution: "Ejecución y resultados",+ sqlEditor: "Procesamiento SQL",+ selection: "Selección y plegado",+ connectionTools: "Herramientas de base de datos",+ data: "Herramientas de datos",+ sql: "SQL y código",+ structure: "Herramientas de estructura",+ copy: "Copiar",+ organize: "Organización y ajustes",+ manage: "Administración",+ other: "Otras acciones",+ danger: "Operaciones peligrosas",+ },+ scopes: { "sql-editor": "Editor SQL", connection: "Conexión", database: "Base de datos", schema: "Esquema", table: "Tabla", view: "Vista" },+};++export const sidebarMenuIt = {+ customize: "Personalizza menu raggruppato…",+ customizeTitle: "Personalizza menu {scope}",+ scopedDescription: "Scegli le azioni principali e ordina i gruppi nel menu raggruppato {scope}. Le modifiche si applicano solo ai menu {scope}.",+ recommended: "Consigliata",+ primaryTab: "Azioni principali",+ groupOrder: "Ordine dei gruppi",+ orderHint: "Trascina la maniglia o usa le frecce per ordinare i menu raggruppati. Azioni e gruppi sono ordinati separatamente; le operazioni pericolose restano ultime. Il menu completo mantiene il layout originale.",+ dragAction: "Trascina per ordinare {name}",+ moveUp: "Sposta {name} in alto",+ moveDown: "Sposta {name} in basso",+ otherActions: "Altre azioni",+ fixedLast: "Sempre ultimo",+ grouped: "Menu raggruppato",+ full: "Menu completo",+ useFull: "Usa menu completo",+ primaryActions: "Azioni principali · {scope}",+ primaryHint: "Le azioni di base restano visibili. Puoi deselezionare quelle consigliate. Trascina o usa le frecce per ordinare le azioni principali.",+ builtIn: "Di base",+ reset: "Ripristina azioni e ordine",+ saveFailed: "Impossibile salvare le preferenze del menu: {message}",+ groups: {+ connectionSettings: "Gestione connessioni",+ databaseSettings: "Impostazioni database",+ schemaSettings: "Impostazioni schema",+ tableSettings: "Gestione tabelle",+ viewSettings: "Gestione viste",+ execution: "Esecuzione e risultati",+ sqlEditor: "Elaborazione SQL",+ selection: "Selezione e compressione",+ connectionTools: "Strumenti database",+ data: "Strumenti dati",+ sql: "SQL e codice",+ structure: "Strumenti struttura",+ copy: "Copia",+ organize: "Organizzazione e impostazioni",+ manage: "Gestione",+ other: "Altre azioni",+ danger: "Operazioni pericolose",+ },+ scopes: { "sql-editor": "Editor SQL", connection: "Connessione", database: "Database", schema: "Schema", table: "Tabella", view: "Vista" },+};++export const sidebarMenuPtBR = {+ customize: "Personalizar menu agrupado…",+ customizeTitle: "Personalizar menu de {scope}",+ scopedDescription: "Escolha as ações principais e organize os grupos do menu agrupado de {scope}. As alterações se aplicam apenas aos menus de {scope}.",+ recommended: "Recomendada",+ primaryTab: "Ações principais",+ groupOrder: "Ordem dos grupos",+ orderHint: "Arraste a alça ou use as setas para ordenar os menus agrupados. Ações e grupos são ordenados separadamente; operações perigosas ficam por último. O menu completo mantém o layout original.",+ dragAction: "Arrastar para ordenar {name}",+ moveUp: "Mover {name} para cima",+ moveDown: "Mover {name} para baixo",+ otherActions: "Mais ações",+ fixedLast: "Sempre por último",+ grouped: "Menu agrupado",+ full: "Menu completo",+ useFull: "Usar menu completo",+ primaryActions: "Ações principais · {scope}",+ primaryHint: "As ações básicas permanecem visíveis. As recomendadas podem ser desmarcadas. Arraste ou use as setas para ordenar as ações principais.",+ builtIn: "Básica",+ reset: "Restaurar ações e ordem",+ saveFailed: "Não foi possível salvar as preferências do menu: {message}",+ groups: {+ connectionSettings: "Gerenciamento de conexões",+ databaseSettings: "Configurações do banco de dados",+ schemaSettings: "Configurações do esquema",+ tableSettings: "Gerenciamento de tabelas",+ viewSettings: "Gerenciamento de visões",+ execution: "Execução e resultados",+ sqlEditor: "Processamento SQL",+ selection: "Seleção e recolhimento",+ connectionTools: "Ferramentas de banco de dados",+ data: "Ferramentas de dados",+ sql: "SQL e código",+ structure: "Ferramentas de estrutura",+ copy: "Copiar",+ organize: "Organização e configurações",+ manage: "Administração",+ other: "Outras ações",+ danger: "Operações perigosas",+ },+ scopes: { "sql-editor": "Editor SQL", connection: "Conexão", database: "Banco de dados", schema: "Esquema", table: "Tabela", view: "Visão" },+};++export const sidebarMenuRu = {+ customize: "Настроить группированное меню…",+ customizeTitle: "Настроить меню: {scope}",+ scopedDescription: "Выберите основные действия и порядок групп в группированном меню {scope}. Изменения применяются только к меню {scope}.",+ recommended: "Рекомендуется",+ primaryTab: "Основные действия",+ groupOrder: "Порядок групп",+ orderHint: "Перетащите маркер или используйте стрелки для сортировки группированного меню. Действия и группы сортируются отдельно; опасные операции остаются в конце. Полное меню сохраняет исходный вид.",+ dragAction: "Перетащить для сортировки: {name}",+ moveUp: "Переместить вверх: {name}",+ moveDown: "Переместить вниз: {name}",+ otherActions: "Другие действия",+ fixedLast: "Всегда в конце",+ grouped: "Группированное меню",+ full: "Полное меню",+ useFull: "Использовать полное меню",+ primaryActions: "Основные действия · {scope}",+ primaryHint: "Базовые действия всегда видны. Рекомендуемые действия можно отключить. Перетащите маркер или используйте стрелки для сортировки основных действий.",+ builtIn: "Базовое",+ reset: "Сбросить действия и порядок",+ saveFailed: "Не удалось сохранить настройки меню: {message}",+ groups: {+ connectionSettings: "Управление подключениями",+ databaseSettings: "Настройки базы данных",+ schemaSettings: "Настройки схемы",+ tableSettings: "Управление таблицами",+ viewSettings: "Управление представлениями",+ execution: "Выполнение и результаты",+ sqlEditor: "Обработка SQL",+ selection: "Выделение и сворачивание",+ connectionTools: "Инструменты базы данных",+ data: "Инструменты данных",+ sql: "SQL и код",+ structure: "Инструменты структуры",+ copy: "Копирование",+ organize: "Организация и настройки",+ manage: "Управление",+ other: "Другие действия",+ danger: "Опасные операции",+ },+ scopes: { "sql-editor": "Редактор SQL", connection: "Подключение", database: "База данных", schema: "Схема", table: "Таблица", view: "Представление" },+};++export const sidebarMenuTr = {+ customize: "Gruplu menüyü özelleştir…",+ customizeTitle: "{scope} menüsünü özelleştir",+ scopedDescription: "{scope} gruplu menüsündeki birincil işlemleri ve grup sırasını seçin. Değişiklikler yalnızca {scope} menülerine uygulanır.",+ recommended: "Önerilen",+ primaryTab: "Birincil işlemler",+ groupOrder: "Grup sırası",+ orderHint: "Tutamacı sürükleyin veya oklarla gruplu menüleri sıralayın. İşlemler ve gruplar ayrı sıralanır; tehlikeli işlemler sonda kalır. Tam menü özgün düzenini korur.",+ dragAction: "{name} sıralamak için sürükle",+ moveUp: "{name} yukarı taşı",+ moveDown: "{name} aşağı taşı",+ otherActions: "Diğer işlemler",+ fixedLast: "Her zaman sonda",+ grouped: "Gruplu menü",+ full: "Tam menü",+ useFull: "Tam menüyü kullan",+ primaryActions: "Birincil işlemler · {scope}",+ primaryHint: "Temel işlemler görünür kalır. Önerilen işlemler kaldırılabilir. Birincil işlemleri sürükleyerek veya oklarla sıralayın.",+ builtIn: "Temel",+ reset: "İşlemleri ve sırayı sıfırla",+ saveFailed: "Menü tercihleri kaydedilemedi: {message}",+ groups: {+ connectionSettings: "Bağlantı yönetimi",+ databaseSettings: "Veritabanı ayarları",+ schemaSettings: "Şema ayarları",+ tableSettings: "Tablo yönetimi",+ viewSettings: "Görünüm yönetimi",+ execution: "Çalıştırma ve sonuçlar",+ sqlEditor: "SQL işleme",+ selection: "Seçim ve daraltma",+ connectionTools: "Veritabanı araçları",+ data: "Veri araçları",+ sql: "SQL ve kod",+ structure: "Yapı araçları",+ copy: "Kopyala",+ organize: "Düzenleme ve ayarlar",+ manage: "Yönetim",+ other: "Diğer işlemler",+ danger: "Tehlikeli işlemler",+ },+ scopes: { "sql-editor": "SQL düzenleyici", connection: "Bağlantı", database: "Veritabanı", schema: "Şema", table: "Tablo", view: "Görünüm" },+};++export const sidebarMenuId = {+ customize: "Sesuaikan menu berkelompok…",+ customizeTitle: "Sesuaikan menu {scope}",+ scopedDescription: "Pilih tindakan utama dan urutan kelompok pada menu berkelompok {scope}. Perubahan hanya berlaku untuk menu {scope}.",+ recommended: "Disarankan",+ primaryTab: "Tindakan utama",+ groupOrder: "Urutan kelompok",+ orderHint: "Seret pegangan atau gunakan panah untuk mengurutkan menu berkelompok. Tindakan dan kelompok diurutkan terpisah; operasi berbahaya tetap paling akhir. Menu lengkap mempertahankan tata letak aslinya.",+ dragAction: "Seret untuk mengurutkan {name}",+ moveUp: "Pindahkan {name} ke atas",+ moveDown: "Pindahkan {name} ke bawah",+ otherActions: "Tindakan lain",+ fixedLast: "Selalu terakhir",+ grouped: "Menu berkelompok",+ full: "Menu lengkap",+ useFull: "Gunakan menu lengkap",+ primaryActions: "Tindakan utama · {scope}",+ primaryHint: "Tindakan dasar selalu terlihat. Tindakan yang disarankan dapat dibatalkan. Seret atau gunakan panah untuk mengurutkan tindakan utama.",+ builtIn: "Dasar",+ reset: "Atur ulang tindakan dan urutan",+ saveFailed: "Preferensi menu tidak dapat disimpan: {message}",+ groups: {+ connectionSettings: "Pengelolaan koneksi",+ databaseSettings: "Pengaturan basis data",+ schemaSettings: "Pengaturan skema",+ tableSettings: "Pengelolaan tabel",+ viewSettings: "Pengelolaan tampilan",+ execution: "Eksekusi dan hasil",+ sqlEditor: "Pemrosesan SQL",+ selection: "Pemilihan dan pelipatan",+ connectionTools: "Alat basis data",+ data: "Alat data",+ sql: "SQL dan kode",+ structure: "Alat struktur",+ copy: "Salin",+ organize: "Pengaturan dan organisasi",+ manage: "Pengelolaan",+ other: "Tindakan lain",+ danger: "Operasi berbahaya",+ },+ scopes: { "sql-editor": "Editor SQL", connection: "Koneksi", database: "Basis data", schema: "Skema", table: "Tabel", view: "Tampilan" },+};++export const sidebarMenuAz = {+ customize: "Qruplaşdırılmış menyunu fərdiləşdir…",+ customizeTitle: "{scope} menyusunu fərdiləşdir",+ scopedDescription: "{scope} qruplaşdırılmış menyusunda əsas əməliyyatları və qrup sırasını seçin. Dəyişikliklər yalnız {scope} menyularına tətbiq edilir.",+ recommended: "Tövsiyə olunur",+ primaryTab: "Əsas əməliyyatlar",+ groupOrder: "Qrup sırası",+ orderHint: "Qruplaşdırılmış menyunu sıralamaq üçün tutacağı sürükləyin və ya oxlardan istifadə edin. Əməliyyatlar və qruplar ayrıca sıralanır; təhlükəli əməliyyatlar sonda qalır. Tam menyu ilkin düzəni saxlayır.",+ dragAction: "{name} sıralamaq üçün sürüklə",+ moveUp: "{name} yuxarı köçür",+ moveDown: "{name} aşağı köçür",+ otherActions: "Digər əməliyyatlar",+ fixedLast: "Həmişə sonda",+ grouped: "Qruplaşdırılmış menyu",+ full: "Tam menyu",+ useFull: "Tam menyudan istifadə et",+ primaryActions: "Əsas əməliyyatlar · {scope}",+ primaryHint: "Əsas əməliyyatlar görünən qalır. Tövsiyə olunan əməliyyatların seçimi ləğv edilə bilər. Əsas əməliyyatları sürükləyərək və ya oxlarla sıralayın.",+ builtIn: "Əsas",+ reset: "Əməliyyatları və sıranı sıfırla",+ saveFailed: "Menyu seçimlərini saxlamaq mümkün olmadı: {message}",+ groups: {+ connectionSettings: "Bağlantı idarəetməsi",+ databaseSettings: "Verilənlər bazası parametrləri",+ schemaSettings: "Sxem parametrləri",+ tableSettings: "Cədvəl idarəetməsi",+ viewSettings: "Görünüş idarəetməsi",+ execution: "İcra və nəticələr",+ sqlEditor: "SQL emalı",+ selection: "Seçim və yığma",+ connectionTools: "Verilənlər bazası alətləri",+ data: "Məlumat alətləri",+ sql: "SQL və kod",+ structure: "Struktur alətləri",+ copy: "Kopyala",+ organize: "Təşkil və parametrlər",+ manage: "İdarəetmə",+ other: "Digər əməliyyatlar",+ danger: "Təhlükəli əməliyyatlar",+ },+ scopes: { "sql-editor": "SQL redaktoru", connection: "Bağlantı", database: "Verilənlər bazası", schema: "Sxem", table: "Cədvəl", view: "Görünüş" },+};diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.tsindex a8cae2f98c..1968871184 100644--- a/apps/desktop/src/i18n/locales/tr.ts+++ b/apps/desktop/src/i18n/locales/tr.ts@@ -1,3 +1,4 @@+import { sidebarMenuTr as sidebarMenu } from "./sidebarMenuMessages";import { withEnglishFallback } from "./fallback";import docs from "./docs/tr";import { dataDictionaryTr as dataDictionary } from "./dataDictionaryMessages";@@ -60,6 +61,7 @@ const consul = {};export default withEnglishFallback({+ sidebarMenu,pluginPlatform: {dataAccessConsent: '"{name}", "{connection}" bağlantısındaki verileri okumak istiyor. Bu bağlantı açık olduğu sürece eklenti, Eklenti Merkezi\'nden erişimi iptal edene kadar bağlantıda salt okunur sorgular çalıştırabilir. İzin verilsin mi?',dataAccessConsentTitle: "Veri Erişim İsteği",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex c060952f37..336804e08d 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -1,3 +1,4 @@+import { sidebarMenuZhCN as sidebarMenu } from "./sidebarMenuMessages";import { redisGroupingZhCN as redisGrouping } from "./redisGrouping";import { withEnglishFallback } from "./fallback";import docs from "./docs/zh-CN";@@ -7,6 +8,7 @@ import { meilisearchManagementZhCN } from "./meilisearchManagement";import { mongodbDatabaseDumpZhCN as mongoDump } from "./mongodbDatabaseDump";export default withEnglishFallback({+ sidebarMenu,modelGeneration: {title: "生成模型",editTemplate: "编辑模板",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex ea40d62968..63e788ef8f 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -1,3 +1,4 @@+import { sidebarMenuZhTW as sidebarMenu } from "./sidebarMenuMessages";import { redisGroupingZhTW as redisGrouping } from "./redisGrouping";import { withEnglishFallback } from "./fallback";import { mongodbDatabaseDumpZhTW as mongoDump } from "./mongodbDatabaseDump";@@ -63,6 +64,7 @@ const consul = {};export default withEnglishFallback({+ sidebarMenu,modelGeneration: {title: "產生模型",editTemplate: "編輯範本",diff --git a/apps/desktop/src/lib/__tests__/sidebar/sidebarMenuLayout.spec.ts b/apps/desktop/src/lib/__tests__/sidebar/sidebarMenuLayout.spec.tsnew file mode 100644index 0000000000..334465bc74--- /dev/null+++ b/apps/desktop/src/lib/__tests__/sidebar/sidebarMenuLayout.spec.ts@@ -0,0 +1,155 @@+import { describe, expect, it, vi } from "vitest";+import type { ContextMenuItem } from "@/components/ui/customContextMenuRegistry";+import { buildSidebarMenuLayout, normalizeSidebarMenuPinnedActions, reorderSidebarMenuEntries, sidebarMenuActions } from "@/lib/sidebar/sidebarMenuLayout";++const t = (key: string) => key;+const item = (id: string, extras: Partial<ContextMenuItem> = {}): ContextMenuItem => ({ sidebarActionId: id, label: id, action: vi.fn(), ...extras });+const leaves = (items: readonly ContextMenuItem[]): ContextMenuItem[] => items.flatMap((entry) => (entry.children?.length ? leaves(entry.children) : entry.separator ? [] : [entry]));++describe("sidebar menu layout", () => {+ it.each([+ ["connection", "connectionSettings"],+ ["database", "databaseSettings"],+ ["schema", "schemaSettings"],+ ["table", "tableSettings"],+ ["view", "viewSettings"],+ ] as const)("names settings for the current %s scope", (scope, key) => {+ const menu = buildSidebarMenuLayout([item("contextMenu.configureVisibleObjects")], scope, "grouped", [], t, { hiddenPrimaryIds: ["contextMenu.configureVisibleObjects"] });+ expect(menu[0].label).toBe(`sidebarMenu.groups.${key}`);+ expect(menu[0].sidebarActionId).toBe("group.organize");+ });+ it.each(["database", "schema", "table", "view"] as const)("shows pinning by default in %s menus and allows hiding and ordering it", (scope) => {+ const pin = item("sidebar.togglePinnedObject");+ const query = item("contextMenu.newQuery");+ const raw = [query, pin];+ expect(buildSidebarMenuLayout(raw, scope, "grouped", [], t, { order: [pin.sidebarActionId!, query.sidebarActionId!] }).filter((entry) => !entry.separator)).toEqual([pin, query]);+ const hidden = buildSidebarMenuLayout(raw, scope, "grouped", [], t, { hiddenPrimaryIds: [pin.sidebarActionId!] });+ expect(hidden).not.toContain(pin);+ expect(hidden.find((entry) => entry.sidebarActionId === "group.organize")?.children).toContainEqual(pin);+ expect(buildSidebarMenuLayout(raw, scope, "full", [], t, { hiddenPrimaryIds: [pin.sidebarActionId!] })).toEqual(raw);+ });++ it("uses the same optional placement and ordering for visible-object and schema filters", () => {+ const filters = [item("contextMenu.configureVisibleObjects"), item("visibleSchemas.title")];+ const defaults = buildSidebarMenuLayout(filters, "connection", "grouped", [], t, { order: ["visibleSchemas.title", "contextMenu.configureVisibleObjects"] });+ expect(defaults).toEqual([filters[1], filters[0]]);+ const hidden = buildSidebarMenuLayout(filters, "connection", "grouped", [], t, { hiddenPrimaryIds: filters.map((entry) => entry.sidebarActionId!) });+ expect(hidden[0].sidebarActionId).toBe("group.organize");+ expect(hidden[0].children).toEqual(filters);+ });++ it("groups database-wide search with data tools without an extra management submenu", () => {+ const search = item("databaseSearch.open");+ const menu = buildSidebarMenuLayout([search, item("contextMenu.exportDatabase")], "database", "grouped", [], t);+ expect(menu.map((entry) => entry.sidebarActionId)).toEqual(["group.data"]);+ expect(menu[0].children).toContainEqual(search);+ });+ it("shows database-specific management actions directly by default and allows opting out", () => {+ const dashboard = item("contextMenu.serverDashboard");+ const processes = item("contextMenu.processList");+ const trace = item("contextMenu.sqlServerTrace");+ const input = [dashboard, processes, trace, item("contextMenu.newQuery")];+ const defaults = buildSidebarMenuLayout(input, "connection", "grouped", [], t);+ for (const action of [dashboard, processes, trace]) expect(defaults).toContain(action);+ const customized = buildSidebarMenuLayout(input, "connection", "grouped", [], t, { hiddenPrimaryIds: ["contextMenu.serverDashboard", "contextMenu.sqlServerTrace"] });+ expect(customized).not.toContain(dashboard);+ expect(customized).not.toContain(trace);+ expect(customized).toContain(processes);+ expect(customized.find((entry) => entry.sidebarActionId === "group.manage")?.children).toEqual(expect.arrayContaining([dashboard, trace]));+ expect(leaves(customized)).toHaveLength(input.length);+ expect(buildSidebarMenuLayout(input, "connection", "full", [], t, { hiddenPrimaryIds: [dashboard.sidebarActionId!], order: [processes.sidebarActionId!] })).toEqual(input);+ });++ it("sorts primary actions and groups independently while leaving dangerous actions last", () => {+ const input = [item("contextMenu.refreshChildren"), item("contextMenu.viewData"), item("contextMenu.copyName"), item("contextMenu.importData"), item("contextMenu.viewDdl"), item("contextMenu.dropTable", { variant: "destructive" })];+ const grouped = buildSidebarMenuLayout(input, "table", "grouped", [], t, { order: ["group.danger", "group.data", "group.copy", "contextMenu.refreshChildren", "contextMenu.viewData", "group.structure"] });+ expect(grouped.filter((entry) => !entry.separator).map((entry) => entry.sidebarActionId)).toEqual(["contextMenu.refreshChildren", "contextMenu.viewData", "group.data", "group.copy", "group.structure", "group.danger"]);+ expect(leaves(grouped).map((entry) => entry.action)).toEqual(expect.arrayContaining(input.map((entry) => entry.action)));+ });++ it("keeps the connection lifecycle entry in its saved position when its status changes", () => {+ for (const id of ["contextMenu.openConnection", "connection.cancelConnecting", "contextMenu.disconnectConnection"]) {+ const input = [item("contextMenu.newQuery"), item(id), item("contextMenu.refreshChildren")];+ const menu = buildSidebarMenuLayout(input, "connection", "grouped", [], t, { order: ["contextMenu.refreshChildren", "action.connectionState", "contextMenu.newQuery"] });+ expect(menu.filter((entry) => !entry.separator).map((entry) => entry.sidebarActionId)).toEqual(["contextMenu.refreshChildren", id, "contextMenu.newQuery"]);+ }+ });++ it("retains temporarily unavailable preferences while moving visible entries", () => {+ expect(reorderSidebarMenuEntries(["a", "temporarily.unavailable", "b", "group.copy"], ["a", "b", "c"], 2, 0)).toEqual(["c", "temporarily.unavailable", "a", "group.copy", "b"]);+ expect(reorderSidebarMenuEntries(["a"], ["a"], 0, -1)).toEqual(["a"]);+ });+ it("places structure and copy groups before data tools regardless of source order", () => {+ const input = [item("contextMenu.importData"), item("contextMenu.copyName"), item("contextMenu.viewDdl")];+ const grouped = buildSidebarMenuLayout(input, "table", "grouped", [], t);+ expect(grouped.map((entry) => entry.label)).toEqual(["sidebarMenu.groups.structure", "sidebarMenu.groups.copy", "sidebarMenu.groups.data"]);+ expect(buildSidebarMenuLayout(input, "table", "full", [], t)).toEqual(input);+ });+ it("retains every action callback and guard in grouped and full menus", () => {+ const input = [+ item("contextMenu.viewData"),+ item("contextMenu.exportData", {+ children: [+ { label: "CSV", action: vi.fn() },+ { label: "JSON", action: vi.fn() },+ ],+ }),+ item("common.more", { variant: "destructive", children: [item("contextMenu.vacuumTable", { variant: "destructive" }), item("contextMenu.dropTable", { variant: "destructive" })] }),+ item("contextMenu.refreshChildren", { shortcut: "F5" }),+ ];+ expect(buildSidebarMenuLayout(input, "table", "full", [], t)).toEqual(input);+ const grouped = buildSidebarMenuLayout(input, "table", "grouped", [], t);+ expect(leaves(grouped).map((entry) => entry.action)).toEqual(expect.arrayContaining(leaves(input).map((entry) => entry.action)));+ expect(leaves(grouped)).toHaveLength(leaves(input).length);+ expect(grouped.find((entry) => entry.label === "sidebarMenu.groups.structure")?.children?.[0].sidebarActionId).toBe("contextMenu.vacuumTable");+ expect(grouped.find((entry) => entry.label === "sidebarMenu.groups.danger")?.children?.[0].sidebarActionId).toBe("contextMenu.dropTable");+ expect(grouped.find((entry) => entry.sidebarActionId === "contextMenu.refreshChildren")?.shortcut).toBe("F5");+ });++ it("promotes an entire export submenu by its stable ID without duplication or a third level", () => {+ const exportItem = item("contextMenu.exportData", { label: "导出数据(3 张表)", children: [{ label: "CSV", action: vi.fn() }] });+ const input = [exportItem, item("contextMenu.viewData")];+ const grouped = buildSidebarMenuLayout(input, "table", "grouped", ["contextMenu.exportData"], t);+ expect(grouped[0].sidebarActionId).toBe("contextMenu.viewData");+ expect(grouped[1]).toBe(exportItem);+ expect(leaves(grouped)).toHaveLength(2);+ expect(buildSidebarMenuLayout([{ ...exportItem, label: "Export" }], "table", "grouped", ["contextMenu.exportData"], t)[0].sidebarActionId).toBe("contextMenu.exportData");+ });++ it("flattens grouped export choices but retains disabled parents and invisible children", () => {+ let disabled = true;+ const exportItem = item("contextMenu.exportData", {+ label: "Export",+ disabled: () => disabled,+ children: [+ { label: "CSV", action: vi.fn() },+ { label: "Secret", visible: false, action: vi.fn() },+ ],+ });+ const grouped = buildSidebarMenuLayout([exportItem], "table", "grouped", [], t);+ const child = grouped[0].children![0];+ expect(child.label).toBe("Export · CSV");+ expect(grouped[0].children).toHaveLength(1);+ expect((child.disabled as () => boolean)()).toBe(true);+ disabled = false;+ expect((child.disabled as () => boolean)()).toBe(false);+ expect(grouped[0].children!.every((entry) => !entry.children)).toBe(true);+ });++ it("keeps plugin menus intact and never promotes dangerous actions", () => {+ const plugin = { label: "Plugin", children: [{ label: "Run", action: vi.fn() }] };+ const drop = item("contextMenu.dropTable", { variant: "destructive" });+ const input = [plugin, drop];+ const grouped = buildSidebarMenuLayout(input, "table", "grouped", ["contextMenu.dropTable"], t);+ expect(grouped).toContain(plugin);+ expect(grouped).not.toContain(drop);+ expect(grouped.find((entry) => entry.variant === "destructive")?.children).toEqual([drop]);+ expect(input).toEqual([plugin, drop]);+ });++ it("accepts persisted IDs only for known object scopes, including temporarily unavailable actions", () => {+ expect(normalizeSidebarMenuPinnedActions({ table: ["contextMenu.exportData", "contextMenu.exportData", "future.action", "", 42], database: ["diff.title"], unknown: ["contextMenu.viewData"] })).toEqual({ table: ["contextMenu.exportData", "future.action"], database: ["diff.title"] });+ expect(normalizeSidebarMenuPinnedActions(null)).toEqual({});+ expect(sidebarMenuActions([item("common.more", { children: [item("contextMenu.dropTable")] })])).toHaveLength(1);+ });+});diff --git a/apps/desktop/src/lib/sidebar/sidebarMenuLayout.ts b/apps/desktop/src/lib/sidebar/sidebarMenuLayout.tsnew file mode 100644index 0000000000..9cbad96636--- /dev/null+++ b/apps/desktop/src/lib/sidebar/sidebarMenuLayout.ts@@ -0,0 +1,230 @@+import { ArrowRightLeft, Clipboard, Code2, FolderTree, ListTree, Settings2, TriangleAlert, Wrench } from "@lucide/vue";+import type { ContextMenuItem } from "@/components/ui/customContextMenuRegistry";+import type { TreeNodeType } from "@/types/database";+import { SIDEBAR_MENU_SCOPES, type SidebarMenuLayout, type SidebarMenuScope } from "./sidebarMenuPreferences";++export { normalizeSidebarMenuPinnedActions, normalizeSidebarMenuOrder } from "./sidebarMenuPreferences";+export type { SidebarMenuLayout, SidebarMenuScope, SidebarMenuPinnedActions, SidebarMenuOrder } from "./sidebarMenuPreferences";+export type SidebarMenuTargetType = TreeNodeType | "sql-editor";+export interface SidebarMenuLayoutOptions {+ hiddenPrimaryIds?: readonly string[];+ order?: readonly string[];+}+type MenuGroup = "data" | "sql" | "structure" | "copy" | "selection" | "organize" | "manage" | "other" | "danger";+type Translate = (key: string) => string;++const scopes = new Set<SidebarMenuScope>(SIDEBAR_MENU_SCOPES);++export function sidebarMenuScope(type: SidebarMenuTargetType): SidebarMenuScope | null {+ if (type === "materialized_view") return "view";+ return scopes.has(type as SidebarMenuScope) ? (type as SidebarMenuScope) : null;+}++const primaryActions: Record<SidebarMenuScope, readonly string[]> = {+ connection: ["connection.cancelConnecting", "contextMenu.openConnection", "contextMenu.disconnectConnection", "contextMenu.newQuery", "contextMenu.openDatabaseBrowser", "contextMenu.editConnection", "contextMenu.refreshChildren"],+ database: ["contextMenu.openObjectBrowser", "contextMenu.newQuery", "contextMenu.createTable", "contextMenu.refreshChildren"],+ schema: ["contextMenu.openObjectBrowser", "contextMenu.newQuery", "contextMenu.createTable", "contextMenu.refreshChildren"],+ table: ["contextMenu.viewData", "contextMenu.openInNewDataTab", "contextMenu.editStructure", "contextMenu.newQuery", "contextMenu.refreshChildren"],+ view: ["contextMenu.viewData", "contextMenu.openInNewDataTab", "contextMenu.editView", "contextMenu.newQuery", "contextMenu.refreshChildren"],+ "sql-editor": ["editor.execute", "editor.format", "editor.contextMenu.copySelection", "editor.contextMenu.cutSelection", "editor.contextMenu.pasteFromClipboard", "editor.contextMenu.findReplace"],+};++const recommendedPrimaryActions: Partial<Record<SidebarMenuScope, readonly string[]>> = {+ connection: ["contextMenu.serverDashboard", "contextMenu.processList", "contextMenu.sqlServerTrace", "contextMenu.instanceInfo", "contextMenu.damengJobAdmin", "contextMenu.configureVisibleObjects", "visibleSchemas.title"],+ database: ["sidebar.togglePinnedObject", "visibleSchemas.title"],+ schema: ["sidebar.togglePinnedObject"],+ table: ["sidebar.togglePinnedObject"],+ view: ["sidebar.togglePinnedObject"],+ "sql-editor": ["toolbar.explainPlan", "editor.contextMenu.uppercaseSelection", "editor.contextMenu.lowercaseSelection", "editor.contextMenu.screenshotSelection"],+};++export function sidebarMenuRecommendedPrimaryActionIds(scope: SidebarMenuScope): readonly string[] {+ return recommendedPrimaryActions[scope] ?? [];+}++/** Connection status changes should not move the user's connect/disconnect entry. */+export function sidebarMenuEntryKey(item: ContextMenuItem): string | undefined {+ if (item.sidebarActionId && primaryActions.connection.slice(0, 3).includes(item.sidebarActionId)) return "action.connectionState";+ return item.sidebarActionId;+}++export function sortSidebarMenuEntries(items: readonly ContextMenuItem[], order: readonly string[]): ContextMenuItem[] {+ const rank = new Map(order.map((id, index) => [id, index]));+ return items+ .map((item, index) => ({ item, index }))+ .sort((a, b) => (rank.get(sidebarMenuEntryKey(a.item) ?? "") ?? order.length) - (rank.get(sidebarMenuEntryKey(b.item) ?? "") ?? order.length) || a.index - b.index)+ .map(({ item }) => item);+}++/** Replace only the visible subsequence, retaining positions of unavailable entries. */+export function reorderSidebarMenuEntries(savedOrder: readonly string[], visibleIds: readonly string[], from: number, to: number): string[] {+ if (from < 0 || to < 0 || from >= visibleIds.length || to >= visibleIds.length || from === to) return [...savedOrder];+ const reordered = [...visibleIds];+ const [moved] = reordered.splice(from, 1);+ reordered.splice(to, 0, moved!);+ const visible = new Set(visibleIds);+ let index = 0;+ const result = savedOrder.map((id) => (visible.has(id) ? reordered[index++]! : id));+ result.push(...reordered.slice(index));+ return result;+}++const groupActions: Partial<Record<MenuGroup, readonly string[]>> = {+ data: ["contextMenu.importData", "contextMenu.exportData", "contextMenu.exportDatabase", "contextMenu.exportAllDatabases", "transfer.dataTransfer", "dataCompare.title", "contextMenu.backupSqliteDatabase", "contextMenu.restoreSqliteDatabase", "databaseBackup.title", "databaseSearch.open"],+ sql: ["contextMenu.generateSql", "contextMenu.sqlHistory", "contextMenu.addToAi", "modelGeneration.title", "sqlFile.title"],+ structure: ["contextMenu.viewDdl", "contextMenu.viewSource", "contextMenu.viewDependencies", "contextMenu.exportStructure", "contextMenu.duplicateStructure", "contextMenu.renameObject", "contextMenu.compileObject", "diagram.open", "docs.title", "diff.title", "dataDictionary.title"],+ copy: ["contextMenu.copyName", "contextMenu.copyConnectionInfo", "contextMenu.copyStructureAs", "contextMenu.copyFinalProxyPort", "contextMenu.copyTable", "contextMenu.pasteTable"],+ organize: [+ "contextMenu.setDefaultDatabase",+ "contextMenu.clearDefaultDatabase",+ "contextMenu.setDefaultSchema",+ "contextMenu.clearDefaultSchema",+ "contextMenu.editDatabaseProperties",+ "contextMenu.renameDatabase",+ "contextMenu.createSchema",+ "contextMenu.editSchemaComment",+ "contextMenu.configureVisibleObjects",+ "visibleSchemas.title",+ "connectionGroup.moveToGroup",+ "connectionGroup.moveToNewGroup",+ "contextMenu.duplicateConnection",+ "connection.disconnectAndForgetPassword",+ "contextMenu.closeDatabaseConnection",+ "contextMenu.revealDatabaseFile",+ "contextMenu.changeOpenMode",+ "tableVGroup.moveToGroup",+ "tableVGroup.removeFromGroup",+ "tableVGroup.moveToNewGroup",+ "sidebar.togglePinnedObject",+ ],+ manage: [+ "contextMenu.createDatabase",+ "contextMenu.userAdmin",+ "contextMenu.processList",+ "contextMenu.sqlServerTrace",+ "contextMenu.serverDashboard",+ "contextMenu.instanceInfo",+ "contextMenu.damengUsers",+ "contextMenu.damengRoles",+ "contextMenu.damengJobAdmin",+ "contextMenu.vacuumTable",+ "contextMenu.mysqlAutoIncrement",+ ],+};++const groupIcons = { data: ArrowRightLeft, sql: Code2, structure: FolderTree, copy: Clipboard, selection: ListTree, organize: Settings2, manage: Wrench, other: ListTree, danger: TriangleAlert };+const groupOrder: MenuGroup[] = ["structure", "copy", "data", "sql", "selection", "organize", "manage", "other", "danger"];++export function sidebarMenuActionGroup(item: ContextMenuItem): MenuGroup {+ const id = item.sidebarActionId;+ if (id?.startsWith("editor.object.") || id === "editor.contextMenu.expandSelectStar") return "structure";+ if (id === "settings.shortcutExecuteSqlInNewResultTab" || id === "toolbar.explainPlan" || id === "editor.previewChanges" || id === "editor.contextMenu.export") return "data";+ if (id === "editor.contextMenu.copySelectionAsRichText" || id === "editor.contextMenu.screenshotSelection" || id === "editor.contextMenu.pasteRestoringSourceSql") return "copy";+ if (id === "editor.contextMenu.folding" || id === "editor.contextMenu.addNextSelectionOccurrence" || id === "editor.contextMenu.selectAllSelectionOccurrences" || id === "editor.contextMenu.selectCurrentStatement" || id === "editor.contextMenu.selectAll") return "selection";+ if (id?.startsWith("editor.contextMenu.")) return "sql";+ for (const [group, ids] of Object.entries(groupActions)) if (id && ids.includes(id)) return group as MenuGroup;+ return item.variant === "destructive" ? "danger" : "other";+}++/** The old More wrapper contains independent actions, including maintenance. */+export function sidebarMenuActions(items: readonly ContextMenuItem[]): ContextMenuItem[] {+ return items.flatMap((item) => {+ if (item.separator || item.visible === false) return [];+ return item.sidebarActionId === "common.more" && item.children ? sidebarMenuActions(item.children) : [item];+ });+}++export function sidebarMenuPrimaryActionIds(scope: SidebarMenuScope): readonly string[] {+ return primaryActions[scope];+}++/** Keep existing callbacks, state and guards, while avoiding a third menu level. */+function flattenMenuItem(item: ContextMenuItem, prefix = ""): ContextMenuItem[] {+ if (item.separator || item.visible === false) return [];+ const label = prefix ? `${prefix} · ${item.label}` : item.label;+ if (!item.children?.length) return [{ ...item, label }];+ return item.children.flatMap((child) =>+ flattenMenuItem(+ {+ ...child,+ variant: child.variant ?? item.variant,+ disabled: () => (typeof item.disabled === "function" ? item.disabled() : !!item.disabled) || (typeof child.disabled === "function" ? child.disabled() : !!child.disabled),+ },+ label,+ ),+ );+}++export function buildSidebarMenuLayout(items: readonly ContextMenuItem[], scope: SidebarMenuScope, layout: SidebarMenuLayout, pinnedIds: readonly string[], t: Translate, options: SidebarMenuLayoutOptions = {}): ContextMenuItem[] {+ if (layout === "full") return [...items];+ const actions = sidebarMenuActions(items);+ const primary: ContextMenuItem[] = [];+ const groups = new Map<MenuGroup, ContextMenuItem[]>();+ const builtInIds = new Set(primaryActions[scope]);+ const recommendedIds = new Set(sidebarMenuRecommendedPrimaryActionIds(scope));+ const hiddenIds = new Set(options.hiddenPrimaryIds ?? []);+ const pinned = new Set(pinnedIds);+ const extensions: ContextMenuItem[] = [];+ for (const item of actions) {+ // Untagged engine/plugin menus retain their existing structure and callbacks.+ if (!item.sidebarActionId) {+ extensions.push(item);+ continue;+ }+ const actionGroup = sidebarMenuActionGroup(item);+ const group: MenuGroup = scope === "connection" && ["data", "sql", "structure"].includes(actionGroup) ? "manage" : (scope === "table" || scope === "view") && actionGroup === "manage" ? "structure" : actionGroup;+ if (group !== "danger" && (builtInIds.has(item.sidebarActionId) || pinned.has(item.sidebarActionId) || (recommendedIds.has(item.sidebarActionId) && !hiddenIds.has(item.sidebarActionId)))) {+ primary.push(item);+ continue;+ }+ const children = groups.get(group) ?? [];+ children.push(...flattenMenuItem(item));+ groups.set(group, children);+ }+ primary.sort((a, b) => {+ const rank = (item: ContextMenuItem) => {+ const base = primaryActions[scope].indexOf(item.sidebarActionId!);+ const recommended = sidebarMenuRecommendedPrimaryActionIds(scope).indexOf(item.sidebarActionId!);+ return base >= 0 ? base : primaryActions[scope].length + (recommended >= 0 ? recommended : recommendedIds.size + pinnedIds.indexOf(item.sidebarActionId!));+ };+ return rank(a) - rank(b);+ });+ const result = sortSidebarMenuEntries(primary, options.order ?? []);+ if (primary.length && (groups.size || extensions.length)) result.push({ label: "", separator: true });+ const groupItems: ContextMenuItem[] = [];+ let dangerItem: ContextMenuItem | undefined;+ for (const group of groupOrder) {+ const children = groups.get(group);+ if (!children?.length) continue;+ const labelKey =+ group === "organize"+ ? scope === "connection"+ ? "connectionSettings"+ : scope === "database"+ ? "databaseSettings"+ : scope === "schema"+ ? "schemaSettings"+ : scope === "table"+ ? "tableSettings"+ : scope === "view"+ ? "viewSettings"+ : "organize"+ : scope === "connection" && group === "manage"+ ? "connectionTools"+ : scope === "sql-editor" && group === "data"+ ? "execution"+ : scope === "sql-editor" && group === "sql"+ ? "sqlEditor"+ : group;+ const item: ContextMenuItem = { sidebarActionId: `group.${group}`, label: t(`sidebarMenu.groups.${labelKey}`), icon: groupIcons[group], children, variant: group === "danger" ? "destructive" : "default" };+ if (group === "danger") dangerItem = item;+ else groupItems.push(item);+ }+ result.push(...sortSidebarMenuEntries(groupItems, options.order ?? []));+ if (extensions.length) result.push({ label: "", separator: true }, ...extensions);+ if (dangerItem) {+ if (result.length && !result[result.length - 1]?.separator) result.push({ label: "", separator: true });+ result.push(dangerItem);+ }+ return result;+}diff --git a/apps/desktop/src/lib/sidebar/sidebarMenuPreferences.ts b/apps/desktop/src/lib/sidebar/sidebarMenuPreferences.tsnew file mode 100644index 0000000000..f216f3b1a6--- /dev/null+++ b/apps/desktop/src/lib/sidebar/sidebarMenuPreferences.ts@@ -0,0 +1,20 @@+export const SIDEBAR_MENU_SCOPES = ["connection", "database", "schema", "table", "view", "sql-editor"] as const;+export type SidebarMenuScope = (typeof SIDEBAR_MENU_SCOPES)[number];+export type SidebarMenuLayout = "grouped" | "full";+export type SidebarMenuPinnedActions = Partial<Record<SidebarMenuScope, string[]>>;+export type SidebarMenuOrder = Partial<Record<SidebarMenuScope, string[]>>;++/** Normalize persisted preferences without importing menu rendering or icons. */+export function normalizeSidebarMenuPinnedActions(value: unknown): SidebarMenuPinnedActions {+ if (!value || typeof value !== "object" || Array.isArray(value)) return {};+ const result: SidebarMenuPinnedActions = {};+ for (const scope of SIDEBAR_MENU_SCOPES) {+ const ids = (value as Record<string, unknown>)[scope];+ if (Array.isArray(ids)) result[scope] = [...new Set(ids.filter((id): id is string => typeof id === "string" && /^[a-zA-Z][\w.-]{0,159}$/.test(id)))];+ }+ return result;+}++export function normalizeSidebarMenuOrder(value: unknown): SidebarMenuOrder {+ return normalizeSidebarMenuPinnedActions(value);+}diff --git a/apps/desktop/src/stores/__tests__/settingsStore.sidebarMenu.spec.ts b/apps/desktop/src/stores/__tests__/settingsStore.sidebarMenu.spec.tsnew file mode 100644index 0000000000..daf46ae4a5--- /dev/null+++ b/apps/desktop/src/stores/__tests__/settingsStore.sidebarMenu.spec.ts@@ -0,0 +1,80 @@+// @vitest-environment happy-dom+import { createPinia, setActivePinia } from "pinia";+import { beforeEach, describe, expect, it, vi } from "vitest";+import { DEFAULT_EDITOR_SETTINGS, STORAGE_KEY, useSettingsStore } from "../settingsStore";++const backend = vi.hoisted(() => ({ loadEditorSettings: vi.fn(), saveEditorSettings: vi.fn() }));+vi.mock("@/lib/backend/api", () => backend);++beforeEach(() => {+ vi.resetAllMocks();+ localStorage.clear();+ setActivePinia(createPinia());+ backend.saveEditorSettings.mockResolvedValue(undefined);+});++describe("sidebar menu preference migration and persistence", () => {+ it("defaults both new and existing installations without a menu choice to grouped menus", async () => {+ backend.loadEditorSettings.mockResolvedValue(null);+ const fresh = useSettingsStore();+ await fresh.initEditorSettings();+ expect(fresh.editorSettings.sidebarMenuLayout).toBe("grouped");+ setActivePinia(createPinia());+ const { sidebarMenuLayout: _layout, ...legacy } = DEFAULT_EDITOR_SETTINGS;+ backend.loadEditorSettings.mockResolvedValue(legacy);+ const existing = useSettingsStore();+ await existing.initEditorSettings();+ expect(existing.editorSettings.sidebarMenuLayout).toBe("grouped");+ });++ it.each([+ [STORAGE_KEY, JSON.stringify({ fontSize: 18 })],+ ["dbx-query-editor-font-size", "18"],+ ])("defaults legacy local preferences from %s to grouped menus", async (key, value) => {+ backend.loadEditorSettings.mockResolvedValue(null);+ localStorage.setItem(key, value);+ const store = useSettingsStore();+ await store.initEditorSettings();+ expect(store.editorSettings.fontSize).toBe(18);+ expect(store.editorSettings.sidebarMenuLayout).toBe("grouped");+ expect(backend.saveEditorSettings.mock.calls.at(-1)![0].sidebarMenuLayout).toBe("grouped");+ });++ it("persists the chosen layout and separate action IDs, and restores them after reload", async () => {+ backend.loadEditorSettings.mockResolvedValue(DEFAULT_EDITOR_SETTINGS);+ const store = useSettingsStore();+ await store.initEditorSettings();+ await store.updateEditorSettingsAndPersist({+ sidebarMenuLayout: "full",+ sidebarMenuPinnedActions: { table: ["contextMenu.exportData"], database: ["diff.title"], "sql-editor": ["editor.contextMenu.export"] },+ sidebarMenuHiddenPrimaryActions: { connection: ["contextMenu.serverDashboard", "contextMenu.configureVisibleObjects"], table: ["sidebar.togglePinnedObject"] },+ sidebarMenuOrder: { table: ["contextMenu.exportData", "group.copy", "group.structure"] },+ });+ const snapshot = backend.saveEditorSettings.mock.calls.at(-1)![0];+ expect(snapshot.sidebarMenuPinnedActions).toEqual({ table: ["contextMenu.exportData"], database: ["diff.title"], "sql-editor": ["editor.contextMenu.export"] });+ setActivePinia(createPinia());+ backend.loadEditorSettings.mockResolvedValue(snapshot);+ const restored = useSettingsStore();+ await restored.initEditorSettings();+ expect(restored.editorSettings.sidebarMenuLayout).toBe("full");+ expect(restored.editorSettings.sidebarMenuPinnedActions.table).toEqual(["contextMenu.exportData"]);+ expect(restored.editorSettings.sidebarMenuPinnedActions["sql-editor"]).toEqual(["editor.contextMenu.export"]);+ expect(restored.editorSettings.sidebarMenuHiddenPrimaryActions.connection).toEqual(["contextMenu.serverDashboard", "contextMenu.configureVisibleObjects"]);+ expect(restored.editorSettings.sidebarMenuHiddenPrimaryActions.table).toEqual(["sidebar.togglePinnedObject"]);+ expect(restored.editorSettings.sidebarMenuOrder.table).toEqual(["contextMenu.exportData", "group.copy", "group.structure"]);+ });++ it("rolls back both preferences when saving fails", async () => {+ backend.loadEditorSettings.mockResolvedValue(DEFAULT_EDITOR_SETTINGS);+ const store = useSettingsStore();+ await store.initEditorSettings();+ backend.saveEditorSettings.mockRejectedValue(new Error("read-only storage"));+ await expect(store.updateEditorSettingsAndPersist({ sidebarMenuLayout: "full", sidebarMenuPinnedActions: { table: ["contextMenu.exportData"] }, sidebarMenuHiddenPrimaryActions: { connection: ["contextMenu.serverDashboard"] }, sidebarMenuOrder: { table: ["group.copy"] } })).rejects.toThrow(+ "read-only storage",+ );+ expect(store.editorSettings.sidebarMenuLayout).toBe("grouped");+ expect(store.editorSettings.sidebarMenuPinnedActions).toEqual({});+ expect(store.editorSettings.sidebarMenuHiddenPrimaryActions).toEqual({});+ expect(store.editorSettings.sidebarMenuOrder).toEqual({});+ });+});diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.tsindex 08f257255f..ef2bbdd326 100644--- a/apps/desktop/src/stores/settingsStore.ts+++ b/apps/desktop/src/stores/settingsStore.ts@@ -28,6 +28,7 @@ import { REDIS_DATABASE_DISPLAY_LIMIT_DEFAULT, REDIS_DATABASE_DISPLAY_LIMIT_MIN,import { normalizeSidebarHiddenTablePrefixes } from "@/lib/sidebar/sidebarTableNameDisplay";import { normalizeSidebarCopyTableNameSeparator } from "@/lib/sidebar/sidebarTableNameCopy";import type { SidebarActivation } from "@/lib/sidebar/treeNodeClick";+import { normalizeSidebarMenuPinnedActions, normalizeSidebarMenuOrder, type SidebarMenuLayout, type SidebarMenuPinnedActions, type SidebarMenuOrder } from "@/lib/sidebar/sidebarMenuPreferences";import { DEFAULT_SQL_SNIPPETS } from "@/lib/sql/sqlSnippetTemplates";import { DEFAULT_SQL_FORMATTER_SETTINGS, normalizeSqlFormatterSettings, type SqlFormatterSettings } from "@/lib/sql/sqlFormatterConfig";import { canonicalSqlShortcutSql, DEFAULT_SQL_SHORTCUTS, deriveSqlShortcutDatabaseTypes, mergeDefaultSqlShortcuts, normalizeSqlShortcutDatabaseTypes, normalizeSqlShortcutKind, normalizeSqlShortcutLimit, normalizeSqlShortcutSqlByDatabaseType } from "@/lib/sql/sqlShortcutActions";@@ -1070,6 +1071,10 @@ export interface EditorSettings {shortcuts: ShortcutSettings;sqlFormatter: SqlFormatterSettings;sidebarActivation: SidebarActivation;+ sidebarMenuLayout: SidebarMenuLayout;+ sidebarMenuPinnedActions: SidebarMenuPinnedActions;+ sidebarMenuHiddenPrimaryActions: SidebarMenuPinnedActions;+ sidebarMenuOrder: SidebarMenuOrder;sidebarConnectionSortMode: ConnectionListSortMode;sidebarObjectDisplay: "grouped" | "simple";routineSourceOpenMode: "query-tab" | "dialog";@@ -1392,6 +1397,10 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {shortcuts: normalizeShortcutSettings(),sqlFormatter: normalizeSqlFormatterSettings(DEFAULT_SQL_FORMATTER_SETTINGS),sidebarActivation: "single",+ sidebarMenuLayout: "grouped",+ sidebarMenuPinnedActions: {},+ sidebarMenuHiddenPrimaryActions: {},+ sidebarMenuOrder: {},sidebarConnectionSortMode: "manual",sidebarObjectDisplay: "grouped",routineSourceOpenMode: "query-tab",@@ -2033,6 +2042,10 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, existshortcuts: normalizeShortcutSettings(settings.shortcuts),sqlFormatter: normalizeSqlFormatterSettings(settings.sqlFormatter),sidebarActivation: settings.sidebarActivation === "single" || settings.sidebarActivation === "double" ? settings.sidebarActivation : DEFAULT_EDITOR_SETTINGS.sidebarActivation,+ sidebarMenuLayout: settings.sidebarMenuLayout === "full" ? "full" : "grouped",+ sidebarMenuPinnedActions: normalizeSidebarMenuPinnedActions(settings.sidebarMenuPinnedActions),+ sidebarMenuHiddenPrimaryActions: normalizeSidebarMenuPinnedActions(settings.sidebarMenuHiddenPrimaryActions),+ sidebarMenuOrder: normalizeSidebarMenuOrder(settings.sidebarMenuOrder),sidebarConnectionSortMode: normalizeConnectionListSortMode(settings.sidebarConnectionSortMode),sidebarObjectDisplay: settings.sidebarObjectDisplay === "simple" || settings.sidebarObjectDisplay === "grouped" ? settings.sidebarObjectDisplay : DEFAULT_EDITOR_SETTINGS.sidebarObjectDisplay,routineSourceOpenMode: settings.routineSourceOpenMode === "query-tab" || settings.routineSourceOpenMode === "dialog" ? settings.routineSourceOpenMode : DEFAULT_EDITOR_SETTINGS.routineSourceOpenMode,@@ -2914,6 +2927,10 @@ export const useSettingsStore = defineStore("settings", () => {if (partial.shortcuts !== undefined) editorSettings.value.shortcuts = normalizeShortcutSettings(partial.shortcuts);if (partial.sqlFormatter !== undefined) editorSettings.value.sqlFormatter = normalizeSqlFormatterSettings(partial.sqlFormatter);if (partial.sidebarActivation !== undefined) editorSettings.value.sidebarActivation = partial.sidebarActivation;+ if (partial.sidebarMenuLayout !== undefined) editorSettings.value.sidebarMenuLayout = partial.sidebarMenuLayout === "full" ? "full" : "grouped";+ if (partial.sidebarMenuPinnedActions !== undefined) editorSettings.value.sidebarMenuPinnedActions = normalizeSidebarMenuPinnedActions(partial.sidebarMenuPinnedActions);+ if (partial.sidebarMenuHiddenPrimaryActions !== undefined) editorSettings.value.sidebarMenuHiddenPrimaryActions = normalizeSidebarMenuPinnedActions(partial.sidebarMenuHiddenPrimaryActions);+ if (partial.sidebarMenuOrder !== undefined) editorSettings.value.sidebarMenuOrder = normalizeSidebarMenuOrder(partial.sidebarMenuOrder);if (partial.sidebarConnectionSortMode !== undefined) editorSettings.value.sidebarConnectionSortMode = normalizeConnectionListSortMode(partial.sidebarConnectionSortMode);if (partial.sidebarObjectDisplay !== undefined) editorSettings.value.sidebarObjectDisplay = partial.sidebarObjectDisplay;if (partial.routineSourceOpenMode !== undefined) editorSettings.value.routineSourceOpenMode = partial.routineSourceOpenMode;diff --git a/docs/assets/grouped-context-menu/connection-menu.jpg b/docs/assets/grouped-context-menu/connection-menu.jpgnew file mode 100644index 0000000000..d3309d2476Binary files /dev/null and b/docs/assets/grouped-context-menu/connection-menu.jpg differdiff --git a/docs/assets/grouped-context-menu/customize-actions.jpg b/docs/assets/grouped-context-menu/customize-actions.jpgnew file mode 100644index 0000000000..9c73e01dc9Binary files /dev/null and b/docs/assets/grouped-context-menu/customize-actions.jpg differdiff --git a/docs/assets/grouped-context-menu/customize-groups.jpg b/docs/assets/grouped-context-menu/customize-groups.jpgnew file mode 100644index 0000000000..a05bdb207cBinary files /dev/null and b/docs/assets/grouped-context-menu/customize-groups.jpg differdiff --git a/docs/assets/grouped-context-menu/full-menu-scroll.jpg b/docs/assets/grouped-context-menu/full-menu-scroll.jpgnew file mode 100644index 0000000000..340d056a8bBinary files /dev/null and b/docs/assets/grouped-context-menu/full-menu-scroll.jpg differdiff --git a/docs/assets/grouped-context-menu/sql-editor-menu.jpg b/docs/assets/grouped-context-menu/sql-editor-menu.jpgnew file mode 100644index 0000000000..1abbcf2b2dBinary files /dev/null and b/docs/assets/grouped-context-menu/sql-editor-menu.jpg differdiff --git a/docs/assets/grouped-context-menu/table-menu.jpg b/docs/assets/grouped-context-menu/table-menu.jpgnew file mode 100644index 0000000000..7e2a8daaf8Binary files /dev/null and b/docs/assets/grouped-context-menu/table-menu.jpg differ