🐛 fix(connectionStore): 修复分组连接时树节点的更新逻辑
确保连接到分组中的连接时,原地更新现有节点属性,避免添加重复的根节点。 使用 findNode 递归搜索替代 findIndex 只搜索根级别。原地修改节点属性而非替换整个对象,保留父子引用关系。
This commit is contained in:
2 files changed
+112
-12
No files matched your search
@@ -759,19 +759,21 @@ export const useConnectionStore = defineStore("connection", () => {
|
|||||||
clearConnectionError(config.id);
|
clearConnectionError(config.id);
|
||||||
if (id !== config.id) clearConnectionError(id);
|
if (id !== config.id) clearConnectionError(id);
|
||||||
|
|
||||||
const node: TreeNode = {
|
const existing = findNode(treeNodes.value, id);
|
||||||
id,
|
if (existing) {
|
||||||
label: config.name,
|
existing.label = config.name;
|
||||||
type: "connection",
|
existing.type = "connection";
|
||||||
connectionId: id,
|
existing.connectionId = id;
|
||||||
isExpanded: false,
|
existing.children = existing.children || [];
|
||||||
children: [],
|
|
||||||
};
|
|
||||||
const existing = treeNodes.value.findIndex((n) => n.id === id);
|
|
||||||
if (existing >= 0) {
|
|
||||||
treeNodes.value[existing] = node;
|
|
||||||
} else {
|
} else {
|
||||||
treeNodes.value.push(node);
|
treeNodes.value.push({
|
||||||
|
id,
|
||||||
|
label: config.name,
|
||||||
|
type: "connection",
|
||||||
|
connectionId: id,
|
||||||
|
isExpanded: false,
|
||||||
|
children: [],
|
||||||
|
});
|
||||||
}
|
}
|
||||||
return id;
|
return id;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -0,0 +1,98 @@
|
|||||||
|
import { test } from "vitest";
|
||||||
|
import assert from "node:assert/strict";
|
||||||
|
import { createPinia, setActivePinia } from "pinia";
|
||||||
|
import { useConnectionStore } from "../../apps/desktop/src/stores/connectionStore.ts";
|
||||||
|
import type { ConnectionConfig, SidebarLayout, TreeNode } from "../../apps/desktop/src/types/database.ts";
|
||||||
|
|
||||||
|
function installMemoryStorage() {
|
||||||
|
const values = new Map<string, string>();
|
||||||
|
const original = Object.getOwnPropertyDescriptor(globalThis, "localStorage");
|
||||||
|
Object.defineProperty(globalThis, "localStorage", {
|
||||||
|
configurable: true,
|
||||||
|
value: {
|
||||||
|
getItem: (key: string) => values.get(key) ?? null,
|
||||||
|
setItem: (key: string, value: string) => values.set(key, value),
|
||||||
|
removeItem: (key: string) => values.delete(key),
|
||||||
|
clear: () => values.clear(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
restore() {
|
||||||
|
if (original) Object.defineProperty(globalThis, "localStorage", original);
|
||||||
|
else Reflect.deleteProperty(globalThis, "localStorage");
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function conn(id: string, name: string): ConnectionConfig {
|
||||||
|
return {
|
||||||
|
id,
|
||||||
|
name,
|
||||||
|
db_type: "mysql",
|
||||||
|
host: "127.0.0.1",
|
||||||
|
port: 3306,
|
||||||
|
username: "root",
|
||||||
|
password: "secret",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function countConnectionNodes(nodes: TreeNode[], connectionId: string): number {
|
||||||
|
let count = 0;
|
||||||
|
for (const node of nodes) {
|
||||||
|
if (node.type === "connection" && node.connectionId === connectionId) count++;
|
||||||
|
if (node.children) count += countConnectionNodes(node.children, connectionId);
|
||||||
|
}
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
test("connecting a grouped connection updates it in place instead of adding a root node", async () => {
|
||||||
|
const originalFetch = globalThis.fetch;
|
||||||
|
const storage = installMemoryStorage();
|
||||||
|
const layout: SidebarLayout = {
|
||||||
|
groups: [{ id: "group-1", name: "Group", collapsed: false }],
|
||||||
|
order: [{ type: "group", id: "group-1", connectionIds: [] }],
|
||||||
|
};
|
||||||
|
|
||||||
|
globalThis.fetch = (async (input, init) => {
|
||||||
|
const url = String(input);
|
||||||
|
if (url === "/api/connection/list") {
|
||||||
|
return new Response("[]", { status: 200, headers: { "Content-Type": "application/json" } });
|
||||||
|
}
|
||||||
|
if (url === "/api/layout/sidebar") {
|
||||||
|
if (init?.method === "POST") {
|
||||||
|
return new Response("null", { status: 200, headers: { "Content-Type": "application/json" } });
|
||||||
|
}
|
||||||
|
return new Response(JSON.stringify(layout), { status: 200, headers: { "Content-Type": "application/json" } });
|
||||||
|
}
|
||||||
|
if (url === "/api/connection/save") {
|
||||||
|
return new Response("null", { status: 200, headers: { "Content-Type": "application/json" } });
|
||||||
|
}
|
||||||
|
if (url === "/api/connection/connect") {
|
||||||
|
const body = JSON.parse(String(init?.body ?? "{}"));
|
||||||
|
return new Response(JSON.stringify(body.config.id), {
|
||||||
|
status: 200,
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return new Response("null", { status: 200, headers: { "Content-Type": "application/json" } });
|
||||||
|
}) as typeof fetch;
|
||||||
|
|
||||||
|
try {
|
||||||
|
setActivePinia(createPinia());
|
||||||
|
const store = useConnectionStore();
|
||||||
|
await store.initFromDisk();
|
||||||
|
store.startCreatingConnectionInGroup("group-1");
|
||||||
|
|
||||||
|
const config = conn("conn-1", "Grouped MySQL");
|
||||||
|
await store.addConnection(config);
|
||||||
|
await store.connect(config);
|
||||||
|
|
||||||
|
assert.equal(store.treeNodes.length, 1);
|
||||||
|
assert.equal(store.treeNodes[0].type, "connection-group");
|
||||||
|
assert.deepEqual(store.treeNodes[0].children?.map((node) => node.id), ["conn-1"]);
|
||||||
|
assert.equal(countConnectionNodes(store.treeNodes, "conn-1"), 1);
|
||||||
|
} finally {
|
||||||
|
globalThis.fetch = originalFetch;
|
||||||
|
storage.restore();
|
||||||
|
}
|
||||||
|
});
|
||||||
Reference in new issue
Block a user