feat(sidebar): allow pinning default database to top

This commit is contained in:
lxk955 authored and GitHub committed 2026-10-03 21:52:11 +08:00
1 parent f991d118cd
commit b498b1e63a
22 files changed
+135 -1

No files matched your search

@@ -335,4 +335,50 @@ describe("connectionStore pinned tree node removal", () => {
expect(store.isTreeNodePinned(users)).toBe(false);
expect(store.isTreeNodePinned(accounts)).toBe(false);
});
it("pins default database to top when sidebarPinDefaultDatabase is true and restores natural order when false", async () => {
vi.doMock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));
const { useConnectionStore } = await import("@/stores/connectionStore");
const { useSettingsStore } = await import("@/stores/settingsStore");
const settingsStore = useSettingsStore();
const store = useConnectionStore();
store.connections = [
{
id: "conn",
name: "Test Connection",
db_type: "mysql",
host: "localhost",
database: "beta",
},
];
const dbAlpha: TreeNode = { id: "conn:alpha", label: "alpha", type: "database", connectionId: "conn", database: "alpha" };
const dbBeta: TreeNode = { id: "conn:beta", label: "beta", type: "database", connectionId: "conn", database: "beta" };
const dbGamma: TreeNode = { id: "conn:gamma", label: "gamma", type: "database", connectionId: "conn", database: "gamma" };
const connNode: TreeNode = {
id: "conn",
label: "Test Connection",
type: "connection",
connectionId: "conn",
children: [dbAlpha, dbBeta, dbGamma],
};
store.treeNodes = [connNode];
expect(settingsStore.editorSettings.sidebarPinDefaultDatabase).toBe(true);
store.syncPinnedTreeState(connNode.children);
expect(connNode.children.map((node) => node.database)).toEqual(["beta", "alpha", "gamma"]);
settingsStore.updateEditorSettings({ sidebarPinDefaultDatabase: false });
await vi.waitFor(() => {
expect(connNode.children.map((node) => node.database)).toEqual(["alpha", "beta", "gamma"]);
});
settingsStore.updateEditorSettings({ sidebarPinDefaultDatabase: true });
await vi.waitFor(() => {
expect(connNode.children.map((node) => node.database)).toEqual(["beta", "alpha", "gamma"]);
});
});
});
+18
View File
@@ -889,6 +889,24 @@ describe("normalizeEditorSettings - tabLayout", () => {
});
});
describe("normalizeEditorSettings - sidebarPinDefaultDatabase", () => {
it("defaults sidebarPinDefaultDatabase to true", () => {
expect(normalizeEditorSettings({}).sidebarPinDefaultDatabase).toBe(true);
});
it("preserves explicit boolean values", () => {
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: false }).sidebarPinDefaultDatabase).toBe(false);
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: true }).sidebarPinDefaultDatabase).toBe(true);
});
it("falls back to default for non-boolean values", () => {
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: "false" } as any).sidebarPinDefaultDatabase).toBe(true);
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: undefined } as any).sidebarPinDefaultDatabase).toBe(true);
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: null } as any).sidebarPinDefaultDatabase).toBe(true);
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: 0 } as any).sidebarPinDefaultDatabase).toBe(true);
});
});
// --- Helpers for Pinia store tests ---
function makeTestConfig(overrides: Partial<AiConfigItem> & { id: string }): AiConfigItem {
@@ -1810,6 +1810,7 @@ export const useConnectionStore = defineStore("connection", () => {
return !!node.connectionId && !!node.schema && isDefaultSchema(node.connectionId, node.schema);
}
if (node.type !== "database" && node.type !== "redis-db" && node.type !== "mongo-db") return false;
if (!settingsStore.editorSettings.sidebarPinDefaultDatabase) return false;
return !!node.connectionId && typeof node.database === "string" && isDefaultDatabase(node.connectionId, node.database);
}
@@ -1821,6 +1822,14 @@ export const useConnectionStore = defineStore("connection", () => {
syncPinnedTreeNodeStateInPlace(nodes, pinnedTreeNodeIds.value, pinnedTreeNodeOrder.value, isFixedPriorityTreeNode);
}
watch(
() => settingsStore.editorSettings.sidebarPinDefaultDatabase,
() => {
syncPinnedTreeState(treeNodes.value);
},
{ flush: "post" },
);
function isConnectionUtilityNode(node: TreeNode): boolean {
// dameng-users / dameng-roles must be here too: they are synthesized admin
// nodes (fixed ids, rebuilt on every re-normalization). If they were treated
@@ -10251,6 +10260,7 @@ export const useConnectionStore = defineStore("connection", () => {
databaseCompatibilityModes,
isTreeNodePinned,
orderByPinnedTreeNodes,
syncPinnedTreeState,
toggleTreeNodePin,
beginPinnedTreeNodeReorder,
endPinnedTreeNodeReorder,
+4
View File
@@ -988,6 +988,7 @@ export interface EditorSettings {
sidebarGlobalSearchLocal: boolean;
sidebarSearchOpenedDatabasesOnly: boolean;
autoSelectActiveSidebarNode: boolean;
sidebarPinDefaultDatabase: boolean;
sidebarBrowseObjectsOnDatabaseActivation: boolean;
sidebarBrowseObjectsOnDatabaseActivationMigrationVersion: number;
openTabsRestoreMode: OpenTabsRestoreMode;
@@ -1283,6 +1284,7 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
sidebarGlobalSearchLocal: false,
sidebarSearchOpenedDatabasesOnly: true,
autoSelectActiveSidebarNode: false,
sidebarPinDefaultDatabase: true,
sidebarBrowseObjectsOnDatabaseActivation: false,
sidebarBrowseObjectsOnDatabaseActivationMigrationVersion: SIDEBAR_BROWSE_OBJECTS_MIGRATION_VERSION,
openTabsRestoreMode: "all",
@@ -1867,6 +1869,7 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
sidebarGlobalSearchLocal: typeof settings.sidebarGlobalSearchLocal === "boolean" ? settings.sidebarGlobalSearchLocal : DEFAULT_EDITOR_SETTINGS.sidebarGlobalSearchLocal,
sidebarSearchOpenedDatabasesOnly: typeof settings.sidebarSearchOpenedDatabasesOnly === "boolean" ? settings.sidebarSearchOpenedDatabasesOnly : DEFAULT_EDITOR_SETTINGS.sidebarSearchOpenedDatabasesOnly,
autoSelectActiveSidebarNode: settings.autoSelectActiveSidebarNode ?? DEFAULT_EDITOR_SETTINGS.autoSelectActiveSidebarNode,
sidebarPinDefaultDatabase: typeof settings.sidebarPinDefaultDatabase === "boolean" ? settings.sidebarPinDefaultDatabase : DEFAULT_EDITOR_SETTINGS.sidebarPinDefaultDatabase,
sidebarBrowseObjectsOnDatabaseActivation:
typeof settings.sidebarBrowseObjectsOnDatabaseActivation === "boolean"
? settings.sidebarBrowseObjectsOnDatabaseActivation
@@ -2720,6 +2723,7 @@ export const useSettingsStore = defineStore("settings", () => {
if (partial.sidebarGlobalSearchLocal !== undefined) editorSettings.value.sidebarGlobalSearchLocal = partial.sidebarGlobalSearchLocal;
if (partial.sidebarSearchOpenedDatabasesOnly !== undefined) editorSettings.value.sidebarSearchOpenedDatabasesOnly = partial.sidebarSearchOpenedDatabasesOnly;
if (partial.autoSelectActiveSidebarNode !== undefined) editorSettings.value.autoSelectActiveSidebarNode = partial.autoSelectActiveSidebarNode;
if (partial.sidebarPinDefaultDatabase !== undefined) editorSettings.value.sidebarPinDefaultDatabase = partial.sidebarPinDefaultDatabase === true;
if (partial.sidebarBrowseObjectsOnDatabaseActivation !== undefined) editorSettings.value.sidebarBrowseObjectsOnDatabaseActivation = partial.sidebarBrowseObjectsOnDatabaseActivation === true;
if (partial.openTabsRestoreMode !== undefined) editorSettings.value.openTabsRestoreMode = normalizeOpenTabsRestoreMode(partial.openTabsRestoreMode);
if (partial.autoReloadRestoredDataTabsOnOpen !== undefined) editorSettings.value.autoReloadRestoredDataTabsOnOpen = partial.autoReloadRestoredDataTabsOnOpen === true;