Self-hosted homelab infrastructure visualizer — interactive network diagram with live status monitoring
TypeScript diagramhomelabhomelab-infrastructure-observabilitynetworkproxmox-veself-hostedzigbeezwavezwave-js
fix(canvas): detach a selection from a zone in one undo step
Pouzor6c55cbfe5804
diff --git a/frontend/src/components/canvas/CanvasContainer.tsx b/frontend/src/components/canvas/CanvasContainer.tsxindex bc71076..e2aec4e 100644--- a/frontend/src/components/canvas/CanvasContainer.tsx+++ b/frontend/src/components/canvas/CanvasContainer.tsx@@ -46,7 +46,7 @@ export function CanvasContainer({ onConnect: onConnectProp, onEdgeDoubleClick, osetSelectedNode, snapshotHistory,fitViewPending, clearFitViewPending,copySelectedNodes, pasteNodes,- removeFromGroup,+ removeNodesFromGroup,} = useCanvasStore()const { fitView, screenToFlowPosition, getIntersectingNodes } = useReactFlow<Node<NodeData>>()@@ -166,9 +166,10 @@ export function CanvasContainer({ onConnect: onConnectProp, onEdgeDoubleClick, o// how the user takes a node back out of it. The whole selection leaves// with it, not only the node under the cursor.if (!intersecting.some((n) => n.id === zoneParent.id)) {- for (const n of movable) {- if (n.parentId === zoneParent.id) removeFromGroup(zoneParent.id, n.id)- }+ const leaving = movable.filter((n) => n.parentId === zoneParent.id).map((n) => n.id)+ // One history entry, so a single undo puts the whole selection back —+ // symmetric with the batched add.+ removeNodesFromGroup(zoneParent.id, leaving)}} else if (!dragNode.parentId) {// Only free nodes join a new parent; one already nested elsewhere in the@@ -198,7 +199,7 @@ export function CanvasContainer({ onConnect: onConnectProp, onEdgeDoubleClick, o}}onNodeDragStop(event, dragNode, dragNodes)- }, [onRequestAddToGroup, onRequestAddToContainer, onRequestAddToZone, removeFromGroup, nodes, getIntersectingNodes, onNodeDragStop])+ }, [onRequestAddToGroup, onRequestAddToContainer, onRequestAddToZone, removeNodesFromGroup, nodes, getIntersectingNodes, onNodeDragStop])return (<div ref={wrapperRef} className="w-full h-full" style={{ background: theme.colors.canvasBackground }} onMouseMove={onMouseMove}>diff --git a/frontend/src/components/canvas/__tests__/CanvasContainer.test.tsx b/frontend/src/components/canvas/__tests__/CanvasContainer.test.tsxindex 0480da0..4c2bd33 100644--- a/frontend/src/components/canvas/__tests__/CanvasContainer.test.tsx+++ b/frontend/src/components/canvas/__tests__/CanvasContainer.test.tsx@@ -359,6 +359,11 @@ describe('CanvasContainer', () => {expect(after.find((n) => n.id === 'n1')!.parentId).toBeUndefined()expect(after.find((n) => n.id === 'n2')!.parentId).toBeUndefined()expect(after.find((n) => n.id === 'n2')!.position).toEqual({ x: 140, y: 140 })+ // One history entry for the whole selection: a single undo puts both back.+ useCanvasStore.getState().undo()+ const restored = useCanvasStore.getState().nodes+ expect(restored.find((n) => n.id === 'n1')!.parentId).toBe('z1')+ expect(restored.find((n) => n.id === 'n2')!.parentId).toBe('z1')})// ── Canvas settings ───────────────────────────────────────────────────────diff --git a/frontend/src/stores/__tests__/canvasStore/zones.test.ts b/frontend/src/stores/__tests__/canvasStore/zones.test.tsindex 49f0ee4..c0b03df 100644--- a/frontend/src/stores/__tests__/canvasStore/zones.test.ts+++ b/frontend/src/stores/__tests__/canvasStore/zones.test.ts@@ -238,6 +238,50 @@ describe('canvasStore — batch parenting (#365)', () => {expect(nodes.find((n) => n.id === 'n2')!.position).toEqual({ x: 8, y: 8 })})+ it('removeNodesFromGroup detaches the whole selection in one undo step', () => {+ const z = zone('z1')+ useCanvasStore.setState({+ nodes: [+ z,+ { ...makeNode('n1'), parentId: 'z1', position: { x: 20, y: 20 }, data: { ...makeNode('n1').data, parent_id: 'z1' } },+ { ...makeNode('n2'), parentId: 'z1', position: { x: 40, y: 40 }, data: { ...makeNode('n2').data, parent_id: 'z1' } },+ ],+ })+ useCanvasStore.getState().removeNodesFromGroup('z1', ['n1', 'n2'])++ let nodes = useCanvasStore.getState().nodes+ expect(nodes.find((n) => n.id === 'n1')!.parentId).toBeUndefined()+ expect(nodes.find((n) => n.id === 'n1')!.position).toEqual({ x: 120, y: 120 })+ expect(nodes.find((n) => n.id === 'n2')!.position).toEqual({ x: 140, y: 140 })++ useCanvasStore.getState().undo()+ nodes = useCanvasStore.getState().nodes+ expect(nodes.find((n) => n.id === 'n1')!.parentId).toBe('z1')+ expect(nodes.find((n) => n.id === 'n2')!.parentId).toBe('z1')+ })++ it('removeNodesFromGroup ignores nodes that are not in that group', () => {+ useCanvasStore.setState({+ nodes: [+ zone('z1'),+ { ...makeNode('n1'), parentId: 'z1', position: { x: 20, y: 20 }, data: { ...makeNode('n1').data, parent_id: 'z1' } },+ makeNode('free'),+ ],+ })+ useCanvasStore.getState().removeNodesFromGroup('z1', ['n1', 'free', 'ghost'])++ const nodes = useCanvasStore.getState().nodes+ expect(nodes.find((n) => n.id === 'n1')!.parentId).toBeUndefined()+ expect(nodes.find((n) => n.id === 'free')!.position).toEqual(makeNode('free').position)+ })++ it('removeNodesFromGroup is a no-op when nothing in the batch is attached', () => {+ useCanvasStore.setState({ nodes: [zone('z1'), makeNode('n1')] })+ const before = useCanvasStore.getState().nodes+ useCanvasStore.getState().removeNodesFromGroup('z1', ['n1'])+ expect(useCanvasStore.getState().nodes).toBe(before)+ })+it('addNodesToContainer parents every child of a container-mode node', () => {useCanvasStore.setState({nodes: [diff --git a/frontend/src/stores/canvasStore.ts b/frontend/src/stores/canvasStore.tsindex c6adb3c..29055ff 100644--- a/frontend/src/stores/canvasStore.ts+++ b/frontend/src/stores/canvasStore.ts@@ -330,6 +330,8 @@ interface CanvasState {* count moved; 0 for an invalid CIDR or no match. */importZoneSubnet: (zoneId: string, cidr: string) => numberremoveFromGroup: (groupId: string, childId: string) => void+ /** Batch form of removeFromGroup — one history entry for the whole selection. */+ removeNodesFromGroup: (groupId: string, childIds: string[]) => voidmarkSaved: () => voidmarkUnsaved: () => voidloadCanvas: (nodes: Node<NodeData>[], edges: Edge<EdgeData>[]) => void@@ -1115,14 +1117,22 @@ export const useCanvasStore = create<CanvasState>((rawSet, get) => {},// Release a single child from a group back to the canvas. Group stays.- removeFromGroup: (groupId, childId) =>+ removeFromGroup: (groupId, childId) => get().removeNodesFromGroup(groupId, [childId]),++ // Detach children from their parent, restoring absolute positions. Batched+ // for the same reason as addNodesToGroup & co: a multi-selection dragged out+ // of a zone must undo in one step, not one per node.+ removeNodesFromGroup: (groupId, childIds) =>set((state) => {const group = state.nodes.find((n) => n.id === groupId)- const child = state.nodes.find((n) => n.id === childId)- if (!group || !child || child.parentId !== groupId) return state+ if (!group) return state+ const detaching = new Set(+ childIds.filter((id) => state.nodes.some((n) => n.id === id && n.parentId === groupId)),+ )+ if (detaching.size === 0) return stateconst nodes = state.nodes.map((n) => {- if (n.id !== childId) return n+ if (!detaching.has(n.id)) return nreturn {...n,parentId: undefined,