feat(sidebar): support bulk connection group deletion

This commit is contained in:
二丫讲梵 authored and GitHub committed 2026-08-17 14:58:48 +08:00
1 parent 23102934ad
commit ce5b96189f
29 files changed
+864 -79

No files matched your search

@@ -1,6 +1,6 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
import { shallowRef } from "vue";
import { sidebarFormTarget } from "@/components/sidebar/sidebarTreeDialogState";
import { connectionGroupDeleteTargetSnapshot, deleteConnectionsWithGroup, showDeleteGroupConfirm, sidebarFormTarget } from "@/components/sidebar/sidebarTreeDialogState";
import type { TreeNode } from "@/types/database";
const mocks = vi.hoisted(() => ({
@@ -30,6 +30,16 @@ function connectionNode(connectionId: string): TreeNode {
};
}
function connectionGroupNode(groupId: string): TreeNode {
return {
id: groupId,
label: groupId,
type: "connection-group",
isExpanded: true,
children: [],
};
}
function connectionStore(selectedTreeNodeIds: string[]) {
const lastSelectedTreeNodeId = selectedTreeNodeIds[selectedTreeNodeIds.length - 1] ?? null;
return {
@@ -39,6 +49,9 @@ function connectionStore(selectedTreeNodeIds: string[]) {
connectionMultiSelectActive: selectedTreeNodeIds.length > 0,
moveConnectionToGroup: vi.fn(),
createConnectionGroup: vi.fn(() => "group-new"),
connectionIdsInGroups: vi.fn((): string[] => []),
deleteConnectionGroups: vi.fn().mockResolvedValue([]),
removeConnections: vi.fn().mockResolvedValue(undefined),
connectedIds: new Set<string>(),
connectingIds: new Set<string>(),
disconnect: vi.fn().mockResolvedValue(undefined),
@@ -47,15 +60,14 @@ function connectionStore(selectedTreeNodeIds: string[]) {
};
}
function runtime(activeNode: TreeNode, store: ReturnType<typeof connectionStore>, selectedNodes: TreeNode[] = []) {
function runtime(activeNode: TreeNode, store: ReturnType<typeof connectionStore>, selectedNodes: TreeNode[] = [], requestGroupRename = vi.fn()) {
return useSidebarConnectionMutationRuntime({
activeNode: shallowRef(activeNode),
releaseActiveNodeReference: vi.fn(),
selectedTreeNodesInVisibleOrder: () => selectedNodes,
connectionStore: store as any,
queryStore: { openDatabaseKeys: new Set<string>() } as any,
requestGroupRename: vi.fn(),
groupCreated: vi.fn(),
requestGroupRename,
openVisibleDatabases: vi.fn(),
openVisibleSchemas: vi.fn(),
});
@@ -131,6 +143,78 @@ describe("sidebar connection move selection", () => {
});
});
describe("sidebar connection group deletion selection", () => {
beforeEach(() => {
vi.clearAllMocks();
sidebarFormTarget.value = null;
connectionGroupDeleteTargetSnapshot.value = [];
deleteConnectionsWithGroup.value = false;
showDeleteGroupConfirm.value = false;
});
it("snapshots every selected group for the confirmation dialog", () => {
const groups = [connectionGroupNode("group-1"), connectionGroupNode("group-2")];
const store = connectionStore(groups.map((group) => group.id));
const { connectionGroupDeleteConfirmMessage, connectionGroupDeleteMenuLabel, deleteConnectionGroup } = runtime(groups[1], store, groups);
expect(connectionGroupDeleteMenuLabel()).toBe('connectionGroup.deleteSelectedGroups:{"count":2}');
deleteConnectionGroup();
groups.splice(0);
expect(showDeleteGroupConfirm.value).toBe(true);
expect(connectionGroupDeleteTargetSnapshot.value.map((group) => group.id)).toEqual(["group-1", "group-2"]);
expect(connectionGroupDeleteConfirmMessage()).toBe('connectionGroup.deleteSelectedGroupsConfirmMessage:{"count":2}');
});
it("starts inline rename after creating a subgroup", () => {
const parent = connectionGroupNode("group-parent");
const store = connectionStore([parent.id]);
const requestGroupRename = vi.fn();
const { newSubgroup } = runtime(parent, store, [parent], requestGroupRename);
newSubgroup();
expect(store.createConnectionGroup).toHaveBeenCalledWith("connectionGroup.newGroupDefault", "group-parent");
expect(requestGroupRename).toHaveBeenCalledWith("group-new");
});
it("deletes nested connections and groups as one confirmed operation", async () => {
const groups = [connectionGroupNode("group-1"), connectionGroupNode("group-2")];
const store = connectionStore(groups.map((group) => group.id));
store.deleteConnectionGroups.mockResolvedValue(["conn-1", "conn-2"]);
const { confirmDeleteGroup, deleteConnectionGroup } = runtime(groups[0], store, groups);
deleteConnectionGroup();
deleteConnectionsWithGroup.value = true;
await confirmDeleteGroup();
expect(store.removeConnections).not.toHaveBeenCalled();
expect(store.deleteConnectionGroups).toHaveBeenCalledWith(["group-1", "group-2"], true);
expect(store.disconnect.mock.calls).toEqual([["conn-1"], ["conn-2"]]);
expect(showDeleteGroupConfirm.value).toBe(false);
expect(connectionGroupDeleteTargetSnapshot.value).toEqual([]);
expect(deleteConnectionsWithGroup.value).toBe(false);
expect(mocks.toast).toHaveBeenCalledWith('connection.groupsDeleted:{"count":2}', 2000);
});
it("keeps the groups and dialog open when connection persistence fails", async () => {
const group = connectionGroupNode("group-1");
const store = connectionStore([group.id]);
store.deleteConnectionGroups.mockRejectedValue(new Error("persist failed"));
const { confirmDeleteGroup, deleteConnectionGroup } = runtime(group, store, [group]);
deleteConnectionGroup();
deleteConnectionsWithGroup.value = true;
await confirmDeleteGroup();
expect(store.deleteConnectionGroups).toHaveBeenCalledWith(["group-1"], true);
expect(store.disconnect).not.toHaveBeenCalled();
expect(showDeleteGroupConfirm.value).toBe(true);
expect(connectionGroupDeleteTargetSnapshot.value.map((target) => target.id)).toEqual(["group-1"]);
expect(mocks.toast).toHaveBeenCalledWith('connection.saveFailed:{"message":"persist failed"}', 5000);
});
});
describe("sidebar connection disconnect selection", () => {
beforeEach(() => {
vi.clearAllMocks();
@@ -1,4 +1,4 @@
import { computed, type ShallowRef } from "vue";
import { computed, ref, type ShallowRef } from "vue";
import { useI18n } from "vue-i18n";
import { useToast } from "@/composables/useToast";
import { useConnectionStore } from "@/stores/connectionStore";
@@ -14,9 +14,9 @@ import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
import { revealPathInFileManager } from "@/lib/backend/tauri";
import { canConfigureVisibleSchemasForTreeNode } from "@/lib/database/databaseFeatureSupport";
import { canCloseSidebarDatabaseConnection } from "@/lib/sidebar/sidebarDatabaseOpenState";
import { selectedConnectionDeleteTargets, selectedConnectionDisconnectTargets, selectedConnectionDuplicateTargets } from "@/lib/sidebar/sidebarConnectionSelection";
import { selectedConnectionDeleteTargets, selectedConnectionDisconnectTargets, selectedConnectionDuplicateTargets, selectedConnectionGroupDeleteTargets } from "@/lib/sidebar/sidebarConnectionSelection";
import { releaseConnectionFromMultiSelection } from "@/lib/sidebar/sidebarConnectionMultiSelect";
import { connectionDeleteTargetSnapshot, showDeleteConfirm, showDeleteGroupConfirm, sidebarFormTarget } from "@/components/sidebar/sidebarTreeDialogState";
import { connectionDeleteTargetSnapshot, connectionGroupDeleteTargetSnapshot, deleteConnectionsWithGroup, showDeleteConfirm, showDeleteGroupConfirm, sidebarFormTarget } from "@/components/sidebar/sidebarTreeDialogState";
import { connectionCanConfigureSidebarVisibleDatabases } from "@/lib/sidebar/sidebarVisibleFilterMenu";
import { disconnectSidebarConnections } from "@/lib/sidebar/sidebarConnectionDisconnect";
@@ -27,7 +27,6 @@ interface SidebarConnectionMutationRuntimeOptions {
connectionStore: ReturnType<typeof useConnectionStore>;
queryStore: ReturnType<typeof useQueryStore>;
requestGroupRename: (groupId: string) => void;
groupCreated: (groupId: string) => void;
openVisibleDatabases: (node: TreeNode) => void;
openVisibleSchemas: (node: TreeNode) => void;
}
@@ -36,6 +35,7 @@ export function useSidebarConnectionMutationRuntime(options: SidebarConnectionMu
const { t } = useI18n();
const { toast } = useToast();
const { activeNode, selectedTreeNodesInVisibleOrder, connectionStore, queryStore } = options;
const deletingConnectionGroups = ref(false);
async function setNodeAsDefaultDatabase() {
const node = activeNode.value;
@@ -324,7 +324,26 @@ export function useSidebarConnectionMutationRuntime(options: SidebarConnectionMu
if (activeNode.value.type === "connection-group") options.requestGroupRename(activeNode.value.id);
}
function connectionGroupDeleteTargets() {
if (showDeleteGroupConfirm.value && connectionGroupDeleteTargetSnapshot.value.length) return connectionGroupDeleteTargetSnapshot.value;
return selectedConnectionGroupDeleteTargets(activeNode.value, selectedTreeNodesInVisibleOrder());
}
function connectionGroupDeleteMenuLabel(): string {
const count = connectionGroupDeleteTargets().length;
return count > 1 ? t("connectionGroup.deleteSelectedGroups", { count }) : t("connectionGroup.deleteGroup");
}
function connectionGroupDeleteConfirmMessage(): string {
const targets = connectionGroupDeleteTargets();
return targets.length > 1 ? t("connectionGroup.deleteSelectedGroupsConfirmMessage", { count: targets.length }) : t("connectionGroup.deleteGroupConfirmMessage", { name: targets[0]?.label || sidebarFormTarget.value?.label || activeNode.value.label });
}
function deleteConnectionGroup() {
const targets = selectedConnectionGroupDeleteTargets(activeNode.value, selectedTreeNodesInVisibleOrder());
if (!targets.length) return;
connectionGroupDeleteTargetSnapshot.value = targets.slice();
deleteConnectionsWithGroup.value = false;
showDeleteGroupConfirm.value = true;
}
@@ -334,16 +353,32 @@ export function useSidebarConnectionMutationRuntime(options: SidebarConnectionMu
function newSubgroup() {
const groupId = connectionStore.createConnectionGroup(t("connectionGroup.newGroupDefault"), activeNode.value.id);
connectionStore.selectedTreeNodeId = groupId;
options.groupCreated(groupId);
options.requestGroupRename(groupId);
}
function confirmDeleteGroup() {
const node = sidebarFormTarget.value ?? activeNode.value;
connectionStore.deleteConnectionGroup(node.id);
options.releaseActiveNodeReference([node.id]);
showDeleteGroupConfirm.value = false;
toast(t("connection.groupDeleted"), 2000);
async function confirmDeleteGroup() {
const targets = connectionGroupDeleteTargets();
if (!targets.length || deletingConnectionGroups.value) return;
const groupIds = targets.map((target) => target.id);
deletingConnectionGroups.value = true;
try {
const connectionIds = await connectionStore.deleteConnectionGroups(groupIds, deleteConnectionsWithGroup.value);
options.releaseActiveNodeReference(groupIds);
for (const connectionId of connectionIds) {
connectionStore.disconnect(connectionId).catch((error) => {
console.warn("[DBX][connection-group:delete:disconnect-failed]", { connectionId, error });
});
}
showDeleteGroupConfirm.value = false;
connectionGroupDeleteTargetSnapshot.value = [];
deleteConnectionsWithGroup.value = false;
toast(targets.length > 1 ? t("connection.groupsDeleted", { count: targets.length }) : t("connection.groupDeleted"), 2000);
} catch (error: any) {
toast(t("connection.saveFailed", { message: error?.message || String(error) }), 5000);
} finally {
deletingConnectionGroups.value = false;
}
}
function moveToGroup(groupId: string | null) {
@@ -403,10 +438,14 @@ export function useSidebarConnectionMutationRuntime(options: SidebarConnectionMu
openVisibleDatabasesDialog,
openVisibleSchemasDialog,
startRenameGroup,
connectionGroupDeleteTargets,
connectionGroupDeleteMenuLabel,
connectionGroupDeleteConfirmMessage,
deleteConnectionGroup,
newConnectionInGroup,
newSubgroup,
confirmDeleteGroup,
deletingConnectionGroups,
moveToGroup,
createGroupAndMoveConnection,
};