fix(mcp): refresh desktop connection list after MCP mutations
This commit is contained in:
1 parent
914a97326c
commit
0be8a38984
8 files changed
+223
-10
No files matched your search
@@ -150,6 +150,7 @@ function createStore() {
|
||||
moveConnectionToGroup: vi.fn(),
|
||||
createConnectionGroup: vi.fn(() => "group-new"),
|
||||
refreshAllTree: vi.fn().mockResolvedValue(undefined),
|
||||
reloadFromDisk: vi.fn().mockResolvedValue(undefined),
|
||||
removeConnections: vi.fn().mockResolvedValue(undefined),
|
||||
disconnect: vi.fn().mockResolvedValue(undefined),
|
||||
});
|
||||
@@ -196,6 +197,31 @@ describe("AppSidebar connection multi-select moves", () => {
|
||||
}
|
||||
});
|
||||
|
||||
it("waits for persisted connections before refreshing the tree", async () => {
|
||||
let finishReload!: () => void;
|
||||
mocks.store.reloadFromDisk.mockReturnValue(
|
||||
new Promise<void>((resolve) => {
|
||||
finishReload = resolve;
|
||||
}),
|
||||
);
|
||||
const host = await mountSidebar();
|
||||
click(host.querySelector('[data-tooltip="contextMenu.refreshChildren"] button'));
|
||||
expect(mocks.store.reloadFromDisk).toHaveBeenCalledOnce();
|
||||
expect(mocks.store.refreshAllTree).not.toHaveBeenCalled();
|
||||
finishReload();
|
||||
await nextTick();
|
||||
expect(mocks.store.refreshAllTree).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it("reports a failed connection reload without refreshing stale nodes", async () => {
|
||||
mocks.store.reloadFromDisk.mockRejectedValue(new Error("storage unavailable"));
|
||||
const host = await mountSidebar();
|
||||
click(host.querySelector('[data-tooltip="contextMenu.refreshChildren"] button'));
|
||||
await nextTick();
|
||||
expect(mocks.store.refreshAllTree).not.toHaveBeenCalled();
|
||||
expect(mocks.toast).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it("releases an existing-group batch including filtered connections before the next batch", async () => {
|
||||
setSelection(["conn-visible", "conn-hidden"]);
|
||||
const host = await mountSidebar();
|
||||
|
||||
@@ -87,6 +87,7 @@ const moveGroupItems = computed(() => [
|
||||
|
||||
async function refreshTree() {
|
||||
try {
|
||||
await connectionStore.reloadFromDisk();
|
||||
await connectionStore.refreshAllTree();
|
||||
} catch (e: any) {
|
||||
toast(t("connection.connectFailed", { message: translateBackendError(t, e) }), 5000);
|
||||
|
||||
@@ -2,6 +2,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
const listeners = new Map<string, (event: { payload: unknown }) => void>();
|
||||
const unlisten = vi.fn();
|
||||
const reloadFromDisk = vi.fn();
|
||||
let listenerRegistrationBarrier: Promise<void> | null = null;
|
||||
const listen = vi.fn(async (event: string, handler: (event: { payload: unknown }) => void) => {
|
||||
await listenerRegistrationBarrier;
|
||||
@@ -14,7 +15,7 @@ vi.mock("@tauri-apps/api/event", () => ({
|
||||
}));
|
||||
|
||||
vi.mock("@/stores/connectionStore", () => ({
|
||||
useConnectionStore: () => ({ connections: [], initFromDisk: vi.fn(), getConfig: vi.fn(), ensureConnected: vi.fn() }),
|
||||
useConnectionStore: () => ({ connections: [], initFromDisk: vi.fn(), reloadFromDisk, getConfig: vi.fn(), ensureConnected: vi.fn() }),
|
||||
}));
|
||||
|
||||
vi.mock("@/stores/queryStore", () => ({
|
||||
@@ -28,6 +29,7 @@ describe("useTauriEvents", () => {
|
||||
listeners.clear();
|
||||
listen.mockClear();
|
||||
unlisten.mockClear();
|
||||
reloadFromDisk.mockClear();
|
||||
listenerRegistrationBarrier = null;
|
||||
});
|
||||
|
||||
@@ -60,6 +62,8 @@ describe("useTauriEvents", () => {
|
||||
|
||||
expect(setupResolved).toBe(true);
|
||||
expect(listeners.has("dbx-open-connection-links")).toBe(true);
|
||||
await listeners.get("mcp-reload-connections")!({ payload: undefined });
|
||||
expect(reloadFromDisk).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it("routes the native macOS close-tab menu event to the active surface", async () => {
|
||||
|
||||
@@ -102,7 +102,7 @@ export function useTauriEvents(deps: {
|
||||
track(
|
||||
listen("mcp-reload-connections", async () => {
|
||||
try {
|
||||
await connectionStore.initFromDisk();
|
||||
await connectionStore.reloadFromDisk();
|
||||
} catch (e) {
|
||||
console.error("[DBX] mcp-reload-connections error:", e);
|
||||
}
|
||||
|
||||
@@ -117,6 +117,49 @@ describe("connectionStore one_time runtime cleanup", () => {
|
||||
expect(store.connections).toEqual([]);
|
||||
});
|
||||
|
||||
it("reloads externally added, copied and deleted connections while preserving existing tree state", async () => {
|
||||
installApiMocks();
|
||||
const { loadConnections } = await import("@/lib/backend/api");
|
||||
const { useConnectionStore } = await import("@/stores/connectionStore");
|
||||
const store = useConnectionStore();
|
||||
const kept = previewConnection({ id: "kept", one_time: false });
|
||||
const temporary = previewConnection({ id: "temporary" });
|
||||
store.connections = [kept, previewConnection({ id: "removed", one_time: false }), temporary];
|
||||
store.connectedIds.add("kept");
|
||||
store.treeNodes = [{ id: "kept", label: kept.name, type: "connection", connectionId: "kept", isExpanded: true, children: [{ id: "kept:app", label: "app", type: "database", connectionId: "kept", database: "app", isExpanded: true }] }];
|
||||
vi.mocked(loadConnections).mockResolvedValue([kept, previewConnection({ id: "added", one_time: false }), previewConnection({ id: "copied", one_time: false })]);
|
||||
|
||||
await store.reloadFromDisk();
|
||||
|
||||
expect(store.connections.map((connection) => connection.id)).toEqual(["kept", "added", "copied", "temporary"]);
|
||||
expect(store.treeNodes.map((node) => node.id)).toEqual(["kept", "added", "copied", "temporary"]);
|
||||
expect(store.treeNodes[0]).toMatchObject({ isExpanded: true, children: expect.arrayContaining([expect.objectContaining({ id: "kept:app", isExpanded: true })]) });
|
||||
expect(store.connectedIds.has("kept")).toBe(true);
|
||||
});
|
||||
|
||||
it("reads a fresh snapshot when an external change arrives during an in-flight reload", async () => {
|
||||
installApiMocks();
|
||||
const { loadConnections } = await import("@/lib/backend/api");
|
||||
let finishFirstRead!: (connections: ConnectionConfig[]) => void;
|
||||
vi.mocked(loadConnections)
|
||||
.mockReturnValueOnce(
|
||||
new Promise((resolve) => {
|
||||
finishFirstRead = resolve;
|
||||
}),
|
||||
)
|
||||
.mockResolvedValueOnce([previewConnection({ id: "new", one_time: false })]);
|
||||
const { useConnectionStore } = await import("@/stores/connectionStore");
|
||||
const store = useConnectionStore();
|
||||
const initialLoad = store.initFromDisk();
|
||||
await vi.waitFor(() => expect(loadConnections).toHaveBeenCalledOnce());
|
||||
const externalReload = store.reloadFromDisk();
|
||||
finishFirstRead([]);
|
||||
await Promise.all([initialLoad, externalReload]);
|
||||
|
||||
expect(loadConnections).toHaveBeenCalledTimes(2);
|
||||
expect(store.getConfig("new")).toBeDefined();
|
||||
});
|
||||
|
||||
it("removeConnection leaves saved connections to the save_connections sync", async () => {
|
||||
installApiMocks();
|
||||
const { useConnectionStore } = await import("@/stores/connectionStore");
|
||||
|
||||
@@ -9995,6 +9995,13 @@ export const useConnectionStore = defineStore("connection", () => {
|
||||
updateLayoutAndRebuild(reconciledLayout);
|
||||
}
|
||||
|
||||
async function reloadFromDisk() {
|
||||
// An external change may arrive after an in-flight reload read its snapshot.
|
||||
// Wait for it, then read again instead of joining that stale snapshot.
|
||||
await initFromDiskPromise;
|
||||
await initFromDisk();
|
||||
}
|
||||
|
||||
async function initFromDisk() {
|
||||
// Connection normalization and timeout migration depend on persisted global
|
||||
// settings. Startup helpers may initialize connections before App.initApp().
|
||||
@@ -10067,6 +10074,7 @@ export const useConnectionStore = defineStore("connection", () => {
|
||||
replacePinnedTreeNode,
|
||||
removeTreeNode,
|
||||
refreshAllTree,
|
||||
reloadFromDisk,
|
||||
collapseAllTreeNodes,
|
||||
refreshSidebarObjectPagination,
|
||||
refreshTreeNode,
|
||||
|
||||
Reference in new issue
Block a user