From e59a8c1bd43bab39909dde930938401867e0ea12 Mon Sep 17 00:00:00 2001 From: zipg Date: Tue, 29 Sep 2026 21:01:57 +0800 Subject: [PATCH] fix(sidebar): store full selection as unfiltered visible databases --- .../connection/ConnectionDialog.vue | 18 ++++- .../sidebar/VisibleDatabasesDialog.vue | 22 ++++++- .../visibleDatabasesDialogState.spec.ts | 64 ++++++++++++++++++ .../sidebar/visibleDatabasesDialogState.ts | 66 +++++++++++++++++++ apps/desktop/src/stores/connectionStore.ts | 5 +- 5 files changed, 170 insertions(+), 5 deletions(-) create mode 100644 apps/desktop/src/components/sidebar/__tests__/visibleDatabasesDialogState.spec.ts create mode 100644 apps/desktop/src/components/sidebar/visibleDatabasesDialogState.ts diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vue index bbea1cf93d..5f1c38b8e8 100644 --- a/apps/desktop/src/components/connection/ConnectionDialog.vue +++ b/apps/desktop/src/components/connection/ConnectionDialog.vue @@ -147,7 +147,8 @@ import { Trash2, } from "@lucide/vue"; import { buildDraftVisibleDatabasesConnectionId, connectionCanChooseVisibleDatabases, initialVisibleDatabaseSelection, visibleObjectFiltersNeedReset } from "@/lib/connection/connectionVisibleDatabases"; -import { canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, filterDatabaseNamesForVisiblePicker, filterSchemaNamesForVisiblePicker, normalizeVisibleDatabaseSelection, buildDraftVisibleSchemasConnectionId, normalizeVisibleSchemaSelection } from "@/lib/database/visibleDatabases"; +import { resolveVisibleDatabaseSaveAction } from "@/components/sidebar/visibleDatabasesDialogState"; +import { canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, filterDatabaseNamesForVisiblePicker, filterSchemaNamesForVisiblePicker, buildDraftVisibleSchemasConnectionId, normalizeVisibleSchemaSelection } from "@/lib/database/visibleDatabases"; import { isSchemaAware, isSingleDatabase, supportsDataDictionary } from "@/lib/database/databaseFeatureSupport"; import { normalizeConnectionScope, normalizeConnectionTimeouts } from "@/lib/connection/connectionSubmitNormalization"; import { databaseConnectionFormKind } from "@/lib/database/databaseDriverManifest"; @@ -5787,7 +5788,20 @@ function saveVisibleDatabaseSelection() { [key]: normalizeVisibleSchemaSelection([...visibleDatabaseSelection.value], visibleDatabaseNames.value), }; } else { - form.value.visible_databases = normalizeVisibleDatabaseSelection([...visibleDatabaseSelection.value], visibleDatabaseNames.value); + // "全选"等价于不筛选:存成当时的库名快照会让之后新建的库永远看不到。 + const action = resolveVisibleDatabaseSaveAction({ + selection: visibleDatabaseSelection.value, + allNames: visibleDatabaseNames.value, + defaultVisibleNames: defaultListedVisibleDatabaseNames.value, + configured: form.value.visible_databases, + configuredPatterns: form.value.visible_database_patterns, + patterns: form.value.visible_database_patterns ?? [], + }); + if (action.type === "clear") { + form.value.visible_databases = undefined; + } else if (action.type === "set") { + form.value.visible_databases = action.databaseNames; + } } showVisibleDatabasesDialog.value = false; } diff --git a/apps/desktop/src/components/sidebar/VisibleDatabasesDialog.vue b/apps/desktop/src/components/sidebar/VisibleDatabasesDialog.vue index eb5178bdad..d0094c7767 100644 --- a/apps/desktop/src/components/sidebar/VisibleDatabasesDialog.vue +++ b/apps/desktop/src/components/sidebar/VisibleDatabasesDialog.vue @@ -7,6 +7,7 @@ import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from " import { Input } from "@/components/ui/input"; import { useConnectionStore } from "@/stores/connectionStore"; import { canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, databaseNameMatchesVisiblePatterns, filterDatabaseNamesForVisiblePicker, filterSchemaNamesForVisiblePicker, normalizeVisibleDatabaseSelection, parseVisibleDatabasePatternsInput } from "@/lib/database/visibleDatabases"; +import { resolveVisibleDatabaseSaveAction } from "./visibleDatabasesDialogState"; import * as api from "@/lib/backend/api"; const props = defineProps<{ @@ -159,8 +160,27 @@ async function saveSelection() { if (!canSaveSelection.value) return; if (isSchemaFilterMode.value) { await connectionStore.setVisibleSchemas(props.connectionId, databaseKey.value, normalizeVisibleDatabaseSelection([...selectedNames.value], objectNames.value)); + emit("update:open", false); + return; + } + // 勾选等于"默认可见库"且没有通配符时等价于不筛选:不能存成当时的库名快照, + // 否则之后新建的库永远不会出现在侧边栏(用户视角就是"库丢了")。 + const action = resolveVisibleDatabaseSaveAction({ + selection: selectedNames.value, + allNames: objectNames.value, + defaultVisibleNames: defaultObjectNames.value, + configured: connection.value?.visible_databases, + configuredPatterns: connection.value?.visible_database_patterns, + patterns: parsedPatterns.value, + }); + if (action.type === "none") { + emit("update:open", false); + return; + } + if (action.type === "clear") { + await connectionStore.clearVisibleDatabases(props.connectionId); } else { - await connectionStore.setVisibleDatabaseFilter(props.connectionId, [...selectedNames.value], parsedPatterns.value); + await connectionStore.setVisibleDatabaseFilter(props.connectionId, action.databaseNames, action.patterns); } emit("update:open", false); } diff --git a/apps/desktop/src/components/sidebar/__tests__/visibleDatabasesDialogState.spec.ts b/apps/desktop/src/components/sidebar/__tests__/visibleDatabasesDialogState.spec.ts new file mode 100644 index 0000000000..71484ff3d1 --- /dev/null +++ b/apps/desktop/src/components/sidebar/__tests__/visibleDatabasesDialogState.spec.ts @@ -0,0 +1,64 @@ +import { describe, expect, it } from "vitest"; +import { resolveVisibleDatabaseSaveAction } from "../visibleDatabasesDialogState"; + +const allNames = ["data_upload_mid", "ops", "mysql", "performance_schema", "sys"]; +const defaultVisibleNames = ["data_upload_mid", "ops"]; + +function resolve(selection: string[], overrides: Partial<{ configured: string[] | undefined; configuredPatterns: string[]; patterns: string[] }> = {}) { + return resolveVisibleDatabaseSaveAction({ + selection: new Set(selection), + allNames, + defaultVisibleNames, + configured: "configured" in overrides ? overrides.configured : undefined, + configuredPatterns: overrides.configuredPatterns, + patterns: overrides.patterns ?? [], + }); +} + +describe("visibleDatabasesDialogState", () => { + it("treats a full selection as show-all instead of persisting a snapshot list", () => { + expect(resolve([...defaultVisibleNames])).toEqual({ type: "none" }); + expect(resolve([...defaultVisibleNames], { configured: [...defaultVisibleNames] })).toEqual({ type: "clear" }); + }); + + it("persists a real subset as an explicit list", () => { + expect(resolve(["ops"])).toEqual({ type: "set", databaseNames: ["ops"], patterns: [] }); + expect(resolve(["ops"], { configured: ["ops", "data_upload_mid"] })).toEqual({ type: "set", databaseNames: ["ops"], patterns: [] }); + }); + + it("clears an existing subset once the selection grows back to the full default set", () => { + expect(resolve([...defaultVisibleNames], { configured: ["ops"] })).toEqual({ type: "clear" }); + expect(resolve([...defaultVisibleNames], { configured: ["ops", "mysql"] })).toEqual({ type: "clear" }); + }); + + it("keeps an explicit list when system databases are selected on purpose", () => { + expect(resolve(["data_upload_mid", "ops", "mysql"])).toEqual({ type: "set", databaseNames: ["data_upload_mid", "ops", "mysql"], patterns: [] }); + }); + + it("keeps the list while wildcard patterns are active because the two are unioned", () => { + expect(resolve([...defaultVisibleNames], { patterns: ["log_%"] })).toEqual({ + type: "set", + databaseNames: [...defaultVisibleNames], + patterns: ["log_%"], + }); + }); + + it("skips persistence when nothing changed", () => { + expect(resolve(["ops"], { configured: ["ops"] })).toEqual({ type: "none" }); + expect(resolve(["ops"], { configured: ["ops"], configuredPatterns: ["log_%"], patterns: ["log_%"] })).toEqual({ type: "none" }); + }); + + it("writes a changed wildcard filter back", () => { + expect(resolve(["ops"], { configured: ["ops"], configuredPatterns: ["log_%"], patterns: ["tmp_%"] })).toEqual({ + type: "set", + databaseNames: ["ops"], + patterns: ["tmp_%"], + }); + expect(resolve([...defaultVisibleNames], { configuredPatterns: ["log_%"], patterns: [] })).toEqual({ type: "clear" }); + }); + + it("drops names that no longer exist and ignores blank wildcards", () => { + expect(resolve(["ops", "dropped_db"])).toEqual({ type: "set", databaseNames: ["ops"], patterns: [] }); + expect(resolve([...defaultVisibleNames], { patterns: ["", " "] })).toEqual({ type: "none" }); + }); +}); diff --git a/apps/desktop/src/components/sidebar/visibleDatabasesDialogState.ts b/apps/desktop/src/components/sidebar/visibleDatabasesDialogState.ts new file mode 100644 index 0000000000..b263665321 --- /dev/null +++ b/apps/desktop/src/components/sidebar/visibleDatabasesDialogState.ts @@ -0,0 +1,66 @@ +import { normalizeVisibleDatabaseSelection } from "@/lib/database/visibleDatabases"; + +export type VisibleDatabaseSaveAction = { type: "none" } | { type: "clear" } | { type: "set"; databaseNames: string[]; patterns: string[] }; + +export interface VisibleDatabaseSaveInput { + /** 弹窗里当前勾选的库名。 */ + selection: ReadonlySet; + /** 连接上实际存在的全部库名(含系统库),用于规范化与落库。 */ + allNames: readonly string[]; + /** 未筛选时默认显示的库名(非系统库)。 */ + defaultVisibleNames: readonly string[]; + /** 已保存的 visible_databases。 */ + configured: readonly string[] | undefined; + /** 已保存的 visible_database_patterns。 */ + configuredPatterns: readonly string[] | undefined; + /** 本次要保存的通配符;连接弹窗不改通配符时与 configuredPatterns 相同。 */ + patterns: readonly string[]; +} + +/** + * 显式名单是白名单语义:名单一旦落库,之后新建的库既不在名单内也不会自动出现。 + * 如果用户在弹窗里点的其实就是"全选",把它存成"当时那份库名"的快照会让后来新增的库 + * 永久消失(用户会觉得"我明明没设置过筛选")。因此勾选结果与默认可见集合完全一致、 + * 且没有通配符时,等价于不筛选,直接按"未筛选"保存。 + */ +export function resolveVisibleDatabaseSaveAction(input: VisibleDatabaseSaveInput): VisibleDatabaseSaveAction { + const allNames = [...input.allNames]; + const selectedNames = normalizeVisibleDatabaseSelection([...input.selection], allNames); + const nextPatterns = normalizeVisibleDatabasePatterns(input.patterns); + const configuredNames = input.configured ? normalizeVisibleDatabaseSelection([...input.configured], allNames) : undefined; + const configuredPatterns = normalizeVisibleDatabasePatterns(input.configuredPatterns ?? []); + + const coversDefaultVisible = nextPatterns.length === 0 && sameSelection(selectedNames, input.defaultVisibleNames); + const nextNames = coversDefaultVisible ? undefined : selectedNames; + // 通配符存在时不能丢掉名单:两者取并集,名单缺失会让未命中通配符的库一起消失。 + const nextPatternValues = nextNames === undefined || nextPatterns.length === 0 ? undefined : nextPatterns; + + if (sameOptionalSelection(nextNames, configuredNames) && sameOptionalSelection(nextPatternValues, configuredPatterns.length > 0 ? configuredPatterns : undefined)) { + return { type: "none" }; + } + if (nextNames === undefined) return { type: "clear" }; + return { type: "set", databaseNames: nextNames, patterns: nextPatterns }; +} + +function normalizeVisibleDatabasePatterns(patterns: readonly string[]): string[] { + const seen = new Set(); + const normalized: string[] = []; + for (const pattern of patterns) { + const trimmed = pattern.trim(); + if (!trimmed || seen.has(trimmed)) continue; + seen.add(trimmed); + normalized.push(trimmed); + } + return normalized; +} + +function sameOptionalSelection(left: readonly string[] | undefined, right: readonly string[] | undefined): boolean { + if (left === undefined || right === undefined) return left === right; + return sameSelection(left, right); +} + +function sameSelection(left: readonly string[], right: readonly string[]): boolean { + if (left.length !== right.length) return false; + const rightSet = new Set(right); + return left.every((name) => rightSet.has(name)); +} diff --git a/apps/desktop/src/stores/connectionStore.ts b/apps/desktop/src/stores/connectionStore.ts index 6f3d2a4bb4..b6f1a880b4 100644 --- a/apps/desktop/src/stores/connectionStore.ts +++ b/apps/desktop/src/stores/connectionStore.ts @@ -4278,7 +4278,7 @@ export const useConnectionStore = defineStore("connection", () => { } // 显式勾选 + 通配符模式一并保存(#7164):模式对之后新建的库持续生效 - async function setVisibleDatabaseFilter(connectionId: string, databaseNames: string[], patterns: string[]) { + async function setVisibleDatabaseFilter(connectionId: string, databaseNames: string[] | undefined, patterns: string[]) { const config = getConfig(connectionId); if (!config) return; const normalizedPatterns = patterns.map((pattern) => pattern.trim()).filter((pattern) => pattern !== ""); @@ -4287,7 +4287,8 @@ export const useConnectionStore = defineStore("connection", () => { const nextConnections = [...connections.value]; nextConnections[idx] = { ...nextConnections[idx], - visible_databases: normalizeVisibleDatabaseSelection(databaseNames, databaseNames), + // 空名单等于"一个库都不显示",只可能是误写;弹窗层的"全选"已折算成 undefined。 + visible_databases: databaseNames && databaseNames.length > 0 ? normalizeVisibleDatabaseSelection(databaseNames, databaseNames) : undefined, visible_database_patterns: normalizedPatterns.length > 0 ? normalizedPatterns : undefined, }; await persistConnections(nextConnections);