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
fix(sidebar): expand connection tree on first click (#13536) (#13557)
onenewcode12a9973f18a0
diff --git a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vueindex 34c11fbd66..932e99a6c5 100644--- a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue+++ b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue@@ -99,7 +99,7 @@ import type { ElasticsearchIndexMetadataKind } from "@/lib/backend/tauri";import { queryTimeoutSecsForConnection } from "@/lib/sql/queryTimeout";import { resolveDefaultDatabase } from "@/lib/database/defaultDatabase";import { connectionUsesVisibleSchemaFilter } from "@/lib/database/visibleDatabases";-import { canTreeNodePin, canTreeNodeShowExpander } from "@/lib/sidebar/sidebarTreeItemLayout";+import { canTreeNodeExpand, canTreeNodePin, canTreeNodeShowExpander } from "@/lib/sidebar/sidebarTreeItemLayout";import { sidebarConnectionVisibleFilterMenu } from "@/lib/sidebar/sidebarVisibleFilterMenu";import { supportsSidebarObjectNameFilter } from "@/lib/sidebar/sidebarObjectNameFilter";import { connectionGroupDestinationRows } from "@/lib/sidebar/sidebarLayout";@@ -1149,6 +1149,9 @@ async function toggle(requestId = beginNavigationRequest()) {} else {await connectionStore.loadDatabases(node.connectionId, treeLoadSearchOptions);}+ node.isExpanded = true;+ const liveNode = findSidebarActionTarget(connectionStore.treeNodes, createSidebarActionTarget(node));+ if (liveNode) liveNode.isExpanded = true;} else if (node.type === "redis-db" && node.connectionId && node.database) {await connectionStore.ensureConnected(node.connectionId);const alias = connectionStore.getRedisDatabaseAlias(node.connectionId, node.database);@@ -8867,6 +8870,10 @@ function emitNodeToggled(node: TreeNode, wasExpanded: boolean, expandedOverride?const liveNode = findSidebarActionTarget(connectionStore.treeNodes, createSidebarActionTarget(node)) ?? node;activeNode.value = liveNode;const isExpanded = expandedOverride ?? !wasExpanded;+ if (canTreeNodeExpand(node.type)) {+ node.isExpanded = isExpanded;+ liveNode.isExpanded = isExpanded;+ }if (!isExpanded) {collapseSubtreeDescendants(node);if (liveNode !== node) {diff --git a/apps/desktop/src/components/sidebar/__tests__/SidebarTreeRuntimeHost.expansion.spec.ts b/apps/desktop/src/components/sidebar/__tests__/SidebarTreeRuntimeHost.expansion.spec.tsindex 46b9ad2ecc..0600659803 100644--- a/apps/desktop/src/components/sidebar/__tests__/SidebarTreeRuntimeHost.expansion.spec.ts+++ b/apps/desktop/src/components/sidebar/__tests__/SidebarTreeRuntimeHost.expansion.spec.ts@@ -29,6 +29,7 @@ const connectionStore = {node.isExpanded = true;}),loadTables: vi.fn(async () => undefined),+ loadDatabases: vi.fn(async () => undefined),loadCustomTypeChildren: vi.fn(async (node: TreeNode) => {node.hasMembers = true;node.children = [{ id: `${node.id}:attribute`, label: "STREET", type: "type-member", connectionId: node.connectionId, database: node.database }];@@ -1344,4 +1345,120 @@ describe("SidebarTreeRuntimeHost expansion", () => {expect(connectionNode.isExpanded).toBe(false);expect(databaseNode.isExpanded).toBe(false);});++ it("expands a connection on first click even when loader does not pre-set isExpanded (issue #13536)", async () => {+ const databaseNode: TreeNode = {+ id: "mysql:db1",+ label: "db1",+ type: "database",+ connectionId: "mysql",+ database: "db1",+ isExpanded: false,+ children: [],+ };+ const connectionNode = reactive<TreeNode>({+ id: "mysql",+ label: "MySQL Prod",+ type: "connection",+ connectionId: "mysql",+ isExpanded: false,+ children: [],+ });++ connectionStore.treeNodes = [connectionNode];+ connectionStore.loadDatabases = vi.fn(async () => {+ // Loader attaches children but does not set isExpanded (e.g. sidebarExpandTreeOnConnect is false)+ connectionNode.children = [databaseNode];+ });++ const host = ref<InstanceType<typeof SidebarTreeRuntimeHost> | null>(null);+ const toggled = vi.fn((node: TreeNode, expanded: boolean) => {+ syncSidebarTreeNodeExpansion(connectionStore.treeNodes, node, expanded);+ });+ const app = createApp(+ defineComponent({+ setup: () => () => h(SidebarTreeRuntimeHost, { ref: host, node: connectionNode, depth: 0, onNodeToggled: toggled }),+ }),+ );+ mountedApps.push(app);+ const container = document.createElement("div");+ document.body.append(container);+ app.use(i18n);+ app.mount(container);++ host.value?.toggleNode(connectionNode);+ await vi.waitFor(() => expect(connectionNode.isExpanded).toBe(true));++ expect(connectionStore.loadDatabases).toHaveBeenCalledWith("mysql", undefined);+ expect(connectionStore.treeNodes[0].isExpanded).toBe(true);+ expect(toggled).toHaveBeenCalledWith(connectionNode, true);+ });++ it("expands a connection during search on first click (issue #13536)", async () => {+ const databaseNode: TreeNode = {+ id: "mysql:db1",+ label: "db1",+ type: "database",+ connectionId: "mysql",+ database: "db1",+ isExpanded: false,+ children: [],+ };+ const connectionNode = reactive<TreeNode>({+ id: "mysql",+ label: "MySQL Prod",+ type: "connection",+ connectionId: "mysql",+ isExpanded: false,+ children: [],+ });++ connectionStore.treeNodes = [connectionNode];+ connectionStore.loadDatabases = vi.fn(async () => {+ connectionNode.children = [databaseNode];+ });++ const collapsedIds = ref(new Set<string>());+ const projection = computed(() => filterSidebarTree(connectionStore.treeNodes, "MySQL", collapsedIds.value));+ const handlers = searchHandlers(collapsedIds);++ const host = ref<InstanceType<typeof SidebarTreeRuntimeHost> | null>(null);+ const app = createApp(+ defineComponent({+ setup() {+ provide(sidebarTreeContextKey, {+ getVisibleNodes: () => projection.value,+ getVisibleNodeIndex: () => 0,+ isSearchProjectionActive: () => true,+ getTreeLoadSearchOptions: () => ({ searchFilter: "", allowGlobalSearchMismatch: true, expectedSidebarSearchQuery: "" }),+ });+ return () =>+ h(SidebarTreeRuntimeHost, {+ ref: host,+ node: projection.value[0],+ depth: 0,+ onSearchToggle: handlers.onSearchToggle,+ onNodeToggled: handlers.onNodeToggled,+ });+ },+ }),+ );+ mountedApps.push(app);+ const container = document.createElement("div");+ document.body.append(container);+ app.use(i18n);+ app.mount(container);++ host.value?.toggleNode(projection.value[0]);+ await vi.waitFor(() => expect(projection.value[0].isExpanded).toBe(true));++ expect(connectionStore.loadDatabases).toHaveBeenCalledWith("mysql", {+ searchFilter: "",+ allowGlobalSearchMismatch: true,+ expectedSidebarSearchQuery: "",+ });+ expect(connectionStore.treeNodes[0].isExpanded).toBe(true);+ expect(projection.value[0].isExpanded).toBe(true);+ expect(projection.value[0].children?.map((c) => c.label)).toEqual(["db1"]);+ });});