From 3a2bf6498dc7fe0d62e37c5db56f23c1219bf7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=A4=A7=E7=8C=AB?= <16399091+binaricat@users.noreply.github.com> Date: Thu, 15 Oct 2026 14:52:16 +0800 Subject: [PATCH] feat(vault): move selected hosts to a group (#3675) Add a Move to group action for the selected hosts, reusing existing group moves and saving the selection once. Omit the hidden synthetic General destination. Related to #3194; marquee selection and dragging a selection are outside this change. 65 focused checks, lint, build and real grid/list mouse/keyboard/cancel/reload/single-host drag checks pass. Current-head remote review and both CI jobs pass. --- application/i18n/locales/en/core.ts | 3 + application/i18n/locales/es/core.ts | 3 + application/i18n/locales/ru/vault.ts | 3 + application/i18n/locales/zh-CN/core.ts | 3 + application/i18n/locales/zh-TW/core.ts | 3 + components/VaultView.tsx | 2 + components/vault/VaultViewLayout.tsx | 54 ++++++++++++ .../vault/useVaultGroupDragHandlers.test.tsx | 85 +++++++++++++++++++ components/vault/useVaultGroupDragHandlers.ts | 68 ++++++--------- 9 files changed, 184 insertions(+), 40 deletions(-) create mode 100644 components/vault/useVaultGroupDragHandlers.test.tsx diff --git a/application/i18n/locales/en/core.ts b/application/i18n/locales/en/core.ts index 042e04fab..dc4ca5f92 100644 --- a/application/i18n/locales/en/core.ts +++ b/application/i18n/locales/en/core.ts @@ -1149,6 +1149,9 @@ Highlight the focused split pane: 'vault.hosts.deleteMultiple.success': 'Deleted {count} hosts', 'vault.hosts.connectSelected': 'Connect ({count})', 'vault.hosts.connectMultiple.success': 'Connecting {count} hosts', + 'vault.hosts.moveSelected': 'Move to group ({count})', + 'vault.hosts.moveSelected.description': 'Move the selected hosts to an existing group, or leave them ungrouped. Selected groups are not moved.', + 'vault.hosts.moveMultiple.success': 'Moved {count} hosts to {group}', 'vault.hosts.moveToGroup.success': 'Moved {host} to {group}', 'vault.hosts.errors.nameRequired': 'Host name is required.', 'vault.hosts.empty.title': 'Set up your hosts', diff --git a/application/i18n/locales/es/core.ts b/application/i18n/locales/es/core.ts index bed448376..a3bb8cbbc 100644 --- a/application/i18n/locales/es/core.ts +++ b/application/i18n/locales/es/core.ts @@ -1107,6 +1107,9 @@ Resalta el panel dividido enfocado: 'vault.hosts.deleteMultiple.success': 'Se eliminaron {count} hosts', 'vault.hosts.connectSelected': 'Conectar ({count})', 'vault.hosts.connectMultiple.success': 'Conectando {count} hosts', + 'vault.hosts.moveSelected': 'Mover al grupo ({count})', + 'vault.hosts.moveSelected.description': 'Mueve los hosts seleccionados a un grupo existente o los deja sin grupo. Los grupos seleccionados no se mueven.', + 'vault.hosts.moveMultiple.success': 'Se movieron {count} hosts a {group}', 'vault.hosts.moveToGroup.success': 'Se movió {host} a {group}', 'vault.hosts.errors.nameRequired': 'Se requiere el nombre del host.', 'vault.hosts.empty.title': 'Configura tus hosts', diff --git a/application/i18n/locales/ru/vault.ts b/application/i18n/locales/ru/vault.ts index 68287fc84..f68b65cb5 100644 --- a/application/i18n/locales/ru/vault.ts +++ b/application/i18n/locales/ru/vault.ts @@ -128,6 +128,9 @@ export const ruVaultMessages: Messages = { 'vault.hosts.deleteMultiple.success': 'Удалено хостов: {count}', 'vault.hosts.connectSelected': 'Подключить ({count})', 'vault.hosts.connectMultiple.success': 'Подключение хостов: {count}', + 'vault.hosts.moveSelected': 'Переместить в группу ({count})', + 'vault.hosts.moveSelected.description': 'Переместить выбранные хосты в существующую группу или оставить без группы. Выбранные группы не перемещаются.', + 'vault.hosts.moveMultiple.success': 'Перемещено {count} хостов в {group}', 'vault.hosts.moveToGroup.success': 'Хост {host} перемещён в {group}', 'vault.hosts.empty.title': 'Настройте свои хосты', 'vault.hosts.empty.desc': 'Сохраняйте хосты, чтобы быстро подключаться к серверам, виртуальным машинам и контейнерам.', diff --git a/application/i18n/locales/zh-CN/core.ts b/application/i18n/locales/zh-CN/core.ts index fbc8e85c1..a30b3e4e2 100644 --- a/application/i18n/locales/zh-CN/core.ts +++ b/application/i18n/locales/zh-CN/core.ts @@ -766,6 +766,9 @@ export const zhCNCoreMessages: Messages = { 'vault.hosts.deleteMultiple.success': '已删除 {count} 个主机', 'vault.hosts.connectSelected': '连接 ({count})', 'vault.hosts.connectMultiple.success': '正在连接 {count} 个主机', + 'vault.hosts.moveSelected': '移动到分组 ({count})', + 'vault.hosts.moveSelected.description': '将选中的主机移动到现有分组,也可移出分组。选中的分组本身不会移动。', + 'vault.hosts.moveMultiple.success': '已将 {count} 个主机移动到 {group}', 'vault.hosts.moveToGroup.success': '已将 {host} 移动到 {group}', 'vault.hosts.errors.nameRequired': '主机名称不能为空。', 'vault.hosts.empty.title': '设置你的主机', diff --git a/application/i18n/locales/zh-TW/core.ts b/application/i18n/locales/zh-TW/core.ts index 7d8261fcb..d3cd8f5e6 100644 --- a/application/i18n/locales/zh-TW/core.ts +++ b/application/i18n/locales/zh-TW/core.ts @@ -768,6 +768,9 @@ export const zhTWCoreMessages: Messages = { 'vault.hosts.deleteMultiple.success': '已刪除 {count} 個主機', 'vault.hosts.connectSelected': '連線 ({count})', 'vault.hosts.connectMultiple.success': '正在連線 {count} 個主機', + 'vault.hosts.moveSelected': '移動到群組 ({count})', + 'vault.hosts.moveSelected.description': '將選取的主機移動到現有群組,也可移出群組。選取的群組本身不會移動。', + 'vault.hosts.moveMultiple.success': '已將 {count} 個主機移動到 {group}', 'vault.hosts.moveToGroup.success': '已將 {host} 移動到 {group}', 'vault.hosts.errors.nameRequired': '主機名稱不能為空。', 'vault.hosts.empty.title': '設定你的主機', diff --git a/components/VaultView.tsx b/components/VaultView.tsx index 75f886a21..82e3ada28 100644 --- a/components/VaultView.tsx +++ b/components/VaultView.tsx @@ -1358,6 +1358,7 @@ const VaultViewInner: React.FC = ({ handleUnmanageGroup, managedGroupPaths, moveHostToGroup, + moveHostsToGroup, setDragOverDropTarget, setGroupDragOverDropTarget, } = useVaultGroupDragHandlers({ @@ -1602,6 +1603,7 @@ const VaultViewInner: React.FC = ({ managedSources, moveGroup, moveHostToGroup, + moveHostsToGroup, Network, newFolderName, newHostGroupPath, diff --git a/components/vault/VaultViewLayout.tsx b/components/vault/VaultViewLayout.tsx index 6bcd5d0a1..20df4ff2c 100644 --- a/components/vault/VaultViewLayout.tsx +++ b/components/vault/VaultViewLayout.tsx @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ +import { Combobox } from "../ui/combobox"; import React, { useCallback } from "react"; import { deleteVaultKey } from "../../application/defaultKeyPassphrases"; import { VaultGroupDeletionConfirmationChangedError } from "../../application/state/useVaultGroupDeletion"; @@ -243,6 +244,7 @@ export function VaultViewLayout({ ctx }: { ctx: VaultViewLayoutContext }) { managedSources, moveGroup, moveHostToGroup, + moveHostsToGroup, Network, newFolderName, newHostGroupPath, @@ -445,6 +447,8 @@ export function VaultViewLayout({ ctx }: { ctx: VaultViewLayoutContext }) { persistWidthStorageKey: STORAGE_KEY_VAULT_HOST_PANEL_WIDTH, resizeAriaLabel: t("vault.panel.resizeWidth"), }; + const [isMoveHostsOpen, setIsMoveHostsOpen] = React.useState(false); + const [moveTargetGroup, setMoveTargetGroup] = React.useState(""); const [isSidebarResizing, setIsSidebarResizing] = React.useState(false); const keyListRef = React.useRef(keys); keyListRef.current = keys; @@ -1130,6 +1134,19 @@ export function VaultViewLayout({ ctx }: { ctx: VaultViewLayoutContext }) { count: selectedHostIds.size, })} + + + + + + = {}): Host => ({ + id, label: `Host ${id}`, hostname: `${id}.example`, username: 'user', port: 22, + tags: ['keep'], group: 'Old', ...extra, +}); + +test('bulk group move publishes all selected hosts together and preserves unselected hosts', async () => { + const original = [host('a'), host('b', { protocol: 'telnet' }), host('c')]; + const writes: Host[][] = []; + await withActions(original, [], actions => { + act(() => actions.moveHostsToGroup(new Set(['a', 'b']), 'New/Nested')); + assert.equal(writes.length, 1); + assert.deepEqual(writes[0].map(h => h.group), ['New/Nested', 'New/Nested', 'Old']); + assert.equal(writes[0][2], original[2]); + assert.deepEqual(writes[0][0].tags, ['keep']); + assert.equal(writes[0][0].hostname, original[0].hostname); + }, writes); +}); + +test('mixed protocols entering and leaving managed groups retain single-host move rules', async () => { + const original = [host('ssh'), host('telnet', { protocol: 'telnet' }), host('local', { protocol: 'local' })]; + const sources = [{ id: 'parent', groupName: 'Managed' }, { id: 'child', groupName: 'Managed/Nested' }] as ManagedSource[]; + const writes: Host[][] = []; + await withActions(original, sources, actions => { + act(() => actions.moveHostsToGroup(new Set(original.map(h => h.id)), 'Managed/Nested')); + assert.equal(writes.length, 1); + assert.equal(writes[0][0].managedSourceId, 'child'); + assert.equal(writes[0][0].label, 'Hostssh'); + assert.equal(writes[0][1].managedSourceId, undefined); + assert.equal(writes[0][1].label, 'Host telnet'); + assert.equal(writes[0][2].managedSourceId, undefined); + assert.equal(writes[0][2].label, 'Host local'); + }, writes); + await withActions(writes[0], sources, actions => { + act(() => actions.moveHostsToGroup(new Set(original.map(h => h.id)), null)); + assert.deepEqual(writes[1].map(h => h.group), ['', '', '']); + assert.ok(writes[1].every(h => h.managedSourceId === undefined)); + }, writes); +}); + +test('same-group, missing and empty selections do not publish changes', async () => { + const writes: Host[][] = []; + await withActions([host('a')], [], actions => { + act(() => actions.moveHostsToGroup(new Set(['a']), 'Old')); + act(() => actions.moveHostsToGroup(new Set(['missing']), 'New')); + act(() => actions.moveHostsToGroup(new Set(), 'New')); + assert.equal(writes.length, 0); + act(() => actions.moveHostToGroup('a', 'New')); + assert.equal(writes.length, 1); + assert.equal(writes[0][0].group, 'New'); + }, writes); +}); + +async function withActions( + hosts: Host[], managedSources: ManagedSource[], + run: (actions: ReturnType) => void, + writes: Host[][], +) { + const previousWindow = globalThis.window; + const actEnvironment = globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }; + const previousAct = actEnvironment.IS_REACT_ACT_ENVIRONMENT; + actEnvironment.IS_REACT_ACT_ENVIRONMENT = true; + globalThis.window = { setTimeout: () => 1, clearTimeout: () => {} } as unknown as Window & typeof globalThis; + let renderer: ReactTestRenderer | undefined; + let actions: ReturnType; + function Probe() { + actions = useVaultGroupDragHandlers({ hosts, managedSources, + onUpdateHosts: next => writes.push(next), onUpdateManagedSources: () => {}, t: key => key }); + return null; + } + try { + await act(async () => { renderer = create(); }); + run(actions!); + } finally { + await act(async () => renderer?.unmount()); + globalThis.window = previousWindow; + actEnvironment.IS_REACT_ACT_ENVIRONMENT = previousAct; + } +} diff --git a/components/vault/useVaultGroupDragHandlers.ts b/components/vault/useVaultGroupDragHandlers.ts index bcc6e3701..4e071997c 100644 --- a/components/vault/useVaultGroupDragHandlers.ts +++ b/components/vault/useVaultGroupDragHandlers.ts @@ -66,53 +66,40 @@ export function useVaultGroupDragHandlers({ setDragOverDropTarget(path ? { kind: "group", path } : null); }, []); - const moveHostToGroup = useCallback((hostId: string, groupPath: string | null) => { + const moveHostsToGroup = useCallback((hostIds: ReadonlySet, groupPath: string | null) => { const targetGroup = groupPath || ""; - const hostToMove = hosts.find((h) => h.id === hostId); - if (!hostToMove || (hostToMove.group || "") === targetGroup) { - setDragOverDropTarget(null); - return; - } - - // Find the most specific (deepest) managed source that matches the target group const targetManagedSource = managedSources .filter(s => targetGroup === s.groupName || targetGroup.startsWith(s.groupName + "/")) .sort((a, b) => b.groupName.length - a.groupName.length)[0]; - - const movedHost = { - ...hostToMove, - group: targetGroup, - }; - const updatedHost = (() => { - const h = movedHost; - - // Only SSH hosts can be managed (SSH config only supports SSH) - const canBeManaged = !h.protocol || h.protocol === "ssh"; - - // Sanitize label if moving to a managed group (SSH config requires no spaces in Host alias) - let label = h.label; - if (targetManagedSource && canBeManaged && label) { - label = label.replace(/\s/g, ''); - } - - return { - ...h, - label, - group: targetGroup, - managedSourceId: (targetManagedSource && canBeManaged) ? targetManagedSource.id : undefined, - }; - })(); - onUpdateHosts(hosts.map((host) => (host.id === hostId ? updatedHost : host))); + let movedCount = 0; + const updatedHosts = hosts.map(host => { + if (!hostIds.has(host.id) || (host.group || "") === targetGroup) return host; + movedCount += 1; + const canBeManaged = !host.protocol || host.protocol === "ssh"; + return { + ...host, + group: targetGroup, + label: targetManagedSource && canBeManaged + ? host.label.replace(/\s/g, '') : host.label, + managedSourceId: targetManagedSource && canBeManaged ? targetManagedSource.id : undefined, + }; + }); setDragOverDropTarget(null); + if (movedCount === 0) return; + // Publish the entire selection once; repeated single-host updates would + // each start from the same render snapshot and overwrite earlier moves. + onUpdateHosts(updatedHosts); pulseDropTarget(groupPath ? { kind: "group", path: groupPath } : { kind: "root" }); - toast.success( - t("vault.hosts.moveToGroup.success", { - host: hostToMove.label, - group: groupPath || t("vault.hosts.allHosts"), - }), - ); + toast.success(t("vault.hosts.moveMultiple.success", { + count: movedCount, + group: groupPath || t("vault.hosts.allHosts"), + })); }, [hosts, managedSources, onUpdateHosts, pulseDropTarget, t]); - + + const moveHostToGroup = useCallback((hostId: string, groupPath: string | null) => { + moveHostsToGroup(new Set([hostId]), groupPath); + }, [moveHostsToGroup]); + const getDropTargetClasses = (target: DropTarget) => cn( isSameDropTarget(dragOverDropTarget, target) && @@ -151,6 +138,7 @@ export function useVaultGroupDragHandlers({ handleUnmanageGroup, managedGroupPaths, moveHostToGroup, + moveHostsToGroup, setDragOverDropTarget, setGroupDragOverDropTarget, };