Self-hosted homelab infrastructure visualizer — interactive network diagram with live status monitoring
TypeScript diagramhomelabhomelab-infrastructure-observabilitynetworkproxmox-veself-hostedzigbeezwavezwave-js
feat: add collapsible/expandable zones for canvas decluttering
pranjal-joshi525dfe5ece1e
diff --git a/frontend/package-lock.json b/frontend/package-lock.jsonindex 3c89582..d20aea1 100644--- a/frontend/package-lock.json+++ b/frontend/package-lock.json@@ -2520,9 +2520,6 @@"arm"],"dev": true,- "libc": [- "glibc"- ],"license": "MIT","optional": true,"os": [@@ -2537,9 +2534,6 @@"arm"],"dev": true,- "libc": [- "musl"- ],"license": "MIT","optional": true,"os": [@@ -2554,9 +2548,6 @@"arm64"],"dev": true,- "libc": [- "glibc"- ],"license": "MIT","optional": true,"os": [@@ -2571,9 +2562,6 @@"arm64"],"dev": true,- "libc": [- "musl"- ],"license": "MIT","optional": true,"os": [@@ -2588,9 +2576,6 @@"loong64"],"dev": true,- "libc": [- "glibc"- ],"license": "MIT","optional": true,"os": [@@ -2605,9 +2590,6 @@"loong64"],"dev": true,- "libc": [- "musl"- ],"license": "MIT","optional": true,"os": [@@ -2622,9 +2604,6 @@"ppc64"],"dev": true,- "libc": [- "glibc"- ],"license": "MIT","optional": true,"os": [@@ -2639,9 +2618,6 @@"ppc64"],"dev": true,- "libc": [- "musl"- ],"license": "MIT","optional": true,"os": [@@ -2656,9 +2632,6 @@"riscv64"],"dev": true,- "libc": [- "glibc"- ],"license": "MIT","optional": true,"os": [@@ -2673,9 +2646,6 @@"riscv64"],"dev": true,- "libc": [- "musl"- ],"license": "MIT","optional": true,"os": [@@ -2690,9 +2660,6 @@"s390x"],"dev": true,- "libc": [- "glibc"- ],"license": "MIT","optional": true,"os": [@@ -2707,9 +2674,6 @@"x64"],"dev": true,- "libc": [- "glibc"- ],"license": "MIT","optional": true,"os": [@@ -2724,9 +2688,6 @@"x64"],"dev": true,- "libc": [- "musl"- ],"license": "MIT","optional": true,"os": [@@ -2975,9 +2936,6 @@"arm64"],"dev": true,- "libc": [- "glibc"- ],"license": "MIT","optional": true,"os": [@@ -2995,9 +2953,6 @@"arm64"],"dev": true,- "libc": [- "musl"- ],"license": "MIT","optional": true,"os": [@@ -3015,9 +2970,6 @@"x64"],"dev": true,- "libc": [- "glibc"- ],"license": "MIT","optional": true,"os": [@@ -3035,9 +2987,6 @@"x64"],"dev": true,- "libc": [- "musl"- ],"license": "MIT","optional": true,"os": [@@ -6935,9 +6884,6 @@"arm64"],"dev": true,- "libc": [- "glibc"- ],"license": "MPL-2.0","optional": true,"os": [@@ -6959,9 +6905,6 @@"arm64"],"dev": true,- "libc": [- "musl"- ],"license": "MPL-2.0","optional": true,"os": [@@ -6983,9 +6926,6 @@"x64"],"dev": true,- "libc": [- "glibc"- ],"license": "MPL-2.0","optional": true,"os": [@@ -7007,9 +6947,6 @@"x64"],"dev": true,- "libc": [- "musl"- ],"license": "MPL-2.0","optional": true,"os": [diff --git a/frontend/src/components/canvas/CanvasContainer.tsx b/frontend/src/components/canvas/CanvasContainer.tsxindex 7433492..c91ecbd 100644--- a/frontend/src/components/canvas/CanvasContainer.tsx+++ b/frontend/src/components/canvas/CanvasContainer.tsx@@ -55,6 +55,25 @@ export function CanvasContainer({ onConnect: onConnectProp, onEdgeDoubleClick, oconst activeTheme = useThemeStore((s) => s.activeTheme)const theme = THEMES[activeTheme]+ // Filter nodes and edges based on collapsed state+ const getVisibleNodeIds = (): Set<string> => {+ const visible = new Set<string>()+ const queue = nodes.filter((n) => !n.parentId).map((n) => n.id)+ while (queue.length > 0) {+ const id = queue.shift()!+ visible.add(id)+ const node = nodes.find((n) => n.id === id)+ if (node && !node.data.custom_colors?.collapsed) {+ const children = nodes.filter((n) => n.parentId === id).map((n) => n.id)+ queue.push(...children)+ }+ }+ return visible+ }+ const visibleNodeIds = getVisibleNodeIds()+ const visibleNodes = nodes.filter((n) => visibleNodeIds.has(n.id))+ const visibleEdges = edges.filter((e) => visibleNodeIds.has(e.source) && visibleNodeIds.has(e.target))+const onNodeClick = useCallback((e: React.MouseEvent, node: Node<NodeData>) => {if (e.ctrlKey || e.metaKey) {setSelectedNode(null)@@ -90,8 +109,8 @@ export function CanvasContainer({ onConnect: onConnectProp, onEdgeDoubleClick, oreturn (<div className="w-full h-full" style={{ background: theme.colors.canvasBackground }}><ReactFlow- nodes={nodes}- edges={edges}+ nodes={visibleNodes}+ edges={visibleEdges}onNodesChange={onNodesChange}onEdgesChange={onEdgesChange}onConnect={onConnectProp}diff --git a/frontend/src/components/canvas/nodes/GroupRectNode.tsx b/frontend/src/components/canvas/nodes/GroupRectNode.tsxindex 574145e..581f391 100644--- a/frontend/src/components/canvas/nodes/GroupRectNode.tsx+++ b/frontend/src/components/canvas/nodes/GroupRectNode.tsx@@ -1,5 +1,6 @@import { useState } from 'react'import { Handle, Position, NodeResizer, type NodeProps, type Node } from '@xyflow/react'+import { ChevronDown } from 'lucide-react'import { useCanvasStore } from '@/stores/canvasStore'import type { NodeData, TextPosition } from '@/types'@@ -36,9 +37,12 @@ const HANDLE_SIDES = [export function GroupRectNode({ id, data, selected }: NodeProps<Node<NodeData>>) {const setEditingGroupRectId = useCanvasStore((s) => s.setEditingGroupRectId)+ const toggleNodeCollapsed = useCanvasStore((s) => s.toggleNodeCollapsed)+ const nodes = useCanvasStore((s) => s.nodes)const [hovered, setHovered] = useState(false)const rc = data.custom_colors ?? {}+ const isCollapsed = rc.collapsed ?? falseconst borderColor = rc.border ?? '#00d4ff'const borderStyle = rc.border_style ?? 'solid'const borderWidth = rc.border_width ?? 2@@ -50,6 +54,9 @@ export function GroupRectNode({ id, data, selected }: NodeProps<Node<NodeData>>)const textPos = (rc.text_position ?? 'top-left') as TextPositionconst posStyle = POSITION_STYLES[textPos]+ // Count children for collapse badge+ const childrenCount = nodes.filter((n) => n.parentId === id).length+const outsideJustify = textPos.includes('right') ? 'flex-end': (textPos.includes('center') || textPos === 'center') ? 'center': 'flex-start'@@ -118,6 +125,8 @@ export function GroupRectNode({ id, data, selected }: NodeProps<Node<NodeData>>)borderRadius: 10,boxSizing: 'border-box',cursor: 'default',+ transition: 'opacity 0.2s ease-out, filter 0.2s ease-out',+ opacity: isCollapsed ? 0.6 : 1,}}onMouseEnter={() => setHovered(true)}onMouseLeave={() => setHovered(false)}@@ -126,6 +135,51 @@ export function GroupRectNode({ id, data, selected }: NodeProps<Node<NodeData>>)setEditingGroupRectId(id)}}>+ {childrenCount > 0 && (+ <button+ className="nodrag"+ onClick={(e) => {+ e.stopPropagation()+ toggleNodeCollapsed(id)+ }}+ style={{+ position: 'absolute',+ top: 6,+ right: 6,+ width: 20,+ height: 20,+ padding: 0,+ background: 'rgba(0, 212, 255, 0.1)',+ border: '1px solid rgba(0, 212, 255, 0.3)',+ borderRadius: 4,+ color: borderColor,+ cursor: 'pointer',+ display: 'flex',+ alignItems: 'center',+ justifyContent: 'center',+ transition: 'all 0.2s ease-out, transform 0.2s ease-out',+ transform: isCollapsed ? 'rotate(-90deg)' : 'rotate(0deg)',+ }}+ title={isCollapsed ? `Show ${childrenCount} hidden items` : `Hide ${childrenCount} items`}+ >+ <ChevronDown size={14} />+ </button>+ )}+ {isCollapsed && childrenCount > 0 && (+ <span+ style={{+ position: 'absolute',+ bottom: 6,+ right: 6,+ fontSize: 10,+ color: borderColor,+ opacity: 0.7,+ userSelect: 'none',+ }}+ >+ +{childrenCount}+ </span>+ )}{labelPosition === 'outside' && data.label && (<spanstyle={{diff --git a/frontend/src/components/canvas/nodes/__tests__/GroupRectNode.collapse.test.tsx b/frontend/src/components/canvas/nodes/__tests__/GroupRectNode.collapse.test.tsxnew file mode 100644index 0000000..08a49f6--- /dev/null+++ b/frontend/src/components/canvas/nodes/__tests__/GroupRectNode.collapse.test.tsx@@ -0,0 +1,142 @@+import { describe, it, expect, vi } from 'vitest'+import { render, screen } from '@testing-library/react'+import userEvent from '@testing-library/user-event'+import { GroupRectNode } from '../GroupRectNode'+import { useCanvasStore } from '@/stores/canvasStore'+import type { Node } from '@xyflow/react'+import type { NodeData } from '@/types'++// Mock useCanvasStore+vi.mock('@/stores/canvasStore', () => ({+ useCanvasStore: vi.fn(),+}))++describe('GroupRectNode - Collapse/Expand', () => {+ const mockToggle = vi.fn()++ beforeEach(() => {+ vi.clearAllMocks()+ ;(useCanvasStore as any).mockImplementation((selector: any) => {+ const state = {+ setEditingGroupRectId: vi.fn(),+ toggleNodeCollapsed: mockToggle,+ nodes: [+ {+ id: 'parent-1',+ data: { label: 'Test Zone', type: 'groupRect' as const, status: 'online' as const, services: [] },+ position: { x: 0, y: 0 },+ },+ {+ id: 'child-1',+ data: { label: 'Child 1', type: 'generic' as const, status: 'online' as const, services: [] },+ position: { x: 100, y: 100 },+ parentId: 'parent-1',+ },+ {+ id: 'child-2',+ data: { label: 'Child 2', type: 'generic' as const, status: 'online' as const, services: [] },+ position: { x: 100, y: 200 },+ parentId: 'parent-1',+ },+ ],+ }+ return selector(state)+ })+ })++ it('shows chevron button when zone has children', () => {+ const node: Node<NodeData> = {+ id: 'zone-1',+ data: { label: 'Test Zone', type: 'groupRect', status: 'online', services: [] },+ position: { x: 0, y: 0 },+ }++ const { container } = render(+ <GroupRectNode id={node.id} data={node.data} selected={false} isConnecting={false} xPos={0} yPos={0} />+ )++ const btn = container.querySelector('button')+ expect(btn).toBeTruthy()+ })++ it('rotates chevron when collapsed', () => {+ const node: Node<NodeData> = {+ id: 'zone-1',+ data: {+ label: 'Test Zone',+ type: 'groupRect',+ status: 'online',+ services: [],+ custom_colors: { collapsed: true },+ },+ position: { x: 0, y: 0 },+ }++ const { container } = render(+ <GroupRectNode id={node.id} data={node.data} selected={false} isConnecting={false} xPos={0} yPos={0} />+ )++ const btn = container.querySelector('button')+ expect(btn?.style.transform).toContain('rotate(-90deg)')+ })++ it('calls toggleNodeCollapsed on chevron click', async () => {+ const user = userEvent.setup()+ const node: Node<NodeData> = {+ id: 'zone-1',+ data: { label: 'Test Zone', type: 'groupRect', status: 'online', services: [] },+ position: { x: 0, y: 0 },+ }++ const { container } = render(+ <GroupRectNode id={node.id} data={node.data} selected={false} isConnecting={false} xPos={0} yPos={0} />+ )++ const btn = container.querySelector('button')+ if (btn) {+ await user.click(btn)+ expect(mockToggle).toHaveBeenCalledWith('zone-1')+ }+ })++ it('shows hidden item count when collapsed', () => {+ const node: Node<NodeData> = {+ id: 'zone-1',+ data: {+ label: 'Test Zone',+ type: 'groupRect',+ status: 'online',+ services: [],+ custom_colors: { collapsed: true },+ },+ position: { x: 0, y: 0 },+ }++ const { container } = render(+ <GroupRectNode id={node.id} data={node.data} selected={false} isConnecting={false} xPos={0} yPos={0} />+ )++ expect(screen.getByText('+2')).toBeTruthy()+ })++ it('reduces zone opacity when collapsed', () => {+ const node: Node<NodeData> = {+ id: 'zone-1',+ data: {+ label: 'Test Zone',+ type: 'groupRect',+ status: 'online',+ services: [],+ custom_colors: { collapsed: true },+ },+ position: { x: 0, y: 0 },+ }++ const { container } = render(+ <GroupRectNode id={node.id} data={node.data} selected={false} isConnecting={false} xPos={0} yPos={0} />+ )++ const div = container.querySelector('div')+ expect(div?.style.opacity).toBe('0.6')+ })+})diff --git a/frontend/src/stores/__tests__/canvasStore.collapse.test.ts b/frontend/src/stores/__tests__/canvasStore.collapse.test.tsnew file mode 100644index 0000000..d5e21c0--- /dev/null+++ b/frontend/src/stores/__tests__/canvasStore.collapse.test.ts@@ -0,0 +1,61 @@+import { describe, it, expect } from 'vitest'+import { renderHook, act } from '@testing-library/react'+import { useCanvasStore } from '../canvasStore'+import type { Node } from '@xyflow/react'+import type { NodeData } from '@/types'++describe('canvasStore - toggleNodeCollapsed', () => {+ it('toggles collapsed state on a zone node', () => {+ const { result } = renderHook(() => useCanvasStore())++ const node: Node<NodeData> = {+ id: 'zone-1',+ data: { label: 'Test Zone', type: 'groupRect', status: 'online', services: [] },+ position: { x: 0, y: 0 },+ }++ act(() => {+ result.current.addNode(node)+ })++ let zone = result.current.nodes.find((n) => n.id === 'zone-1')+ expect(zone?.data.custom_colors?.collapsed).toBeUndefined()++ act(() => {+ result.current.toggleNodeCollapsed('zone-1')+ })++ zone = result.current.nodes.find((n) => n.id === 'zone-1')+ expect(zone?.data.custom_colors?.collapsed).toBe(true)++ act(() => {+ result.current.toggleNodeCollapsed('zone-1')+ })++ zone = result.current.nodes.find((n) => n.id === 'zone-1')+ expect(zone?.data.custom_colors?.collapsed).toBe(false)+ })++ it('marks canvas as unsaved when toggling collapse', () => {+ const { result } = renderHook(() => useCanvasStore())++ const node: Node<NodeData> = {+ id: 'zone-1',+ data: { label: 'Test Zone', type: 'groupRect', status: 'online', services: [] },+ position: { x: 0, y: 0 },+ }++ act(() => {+ result.current.addNode(node)+ result.current.markSaved()+ })++ expect(result.current.hasUnsavedChanges).toBe(false)++ act(() => {+ result.current.toggleNodeCollapsed('zone-1')+ })++ expect(result.current.hasUnsavedChanges).toBe(true)+ })+})diff --git a/frontend/src/stores/canvasStore.ts b/frontend/src/stores/canvasStore.tsindex 8f48d99..b706a47 100644--- a/frontend/src/stores/canvasStore.ts+++ b/frontend/src/stores/canvasStore.ts@@ -52,6 +52,7 @@ interface CanvasState {setEditingGroupRectId: (id: string | null) => voideditingTextId: string | nullsetEditingTextId: (id: string | null) => void+ toggleNodeCollapsed: (id: string) => voidcreateGroup: (nodeIds: string[], name: string) => voidungroup: (groupId: string) => voidmarkSaved: () => void@@ -374,6 +375,25 @@ export const useCanvasStore = create<CanvasState>((set) => ({setEditingTextId: (id) => set({ editingTextId: id }),+ toggleNodeCollapsed: (id) =>+ set((state) => ({+ nodes: state.nodes.map((n) =>+ n.id === id+ ? {+ ...n,+ data: {+ ...n.data,+ custom_colors: {+ ...n.data.custom_colors,+ collapsed: !n.data.custom_colors?.collapsed,+ },+ },+ }+ : n+ ),+ hasUnsavedChanges: true,+ })),+createGroup: (nodeIds, name) =>set((state) => {const PADDING_H = 24diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.tsindex 8e79fa6..d75f1dc 100644--- a/frontend/src/types/index.ts+++ b/frontend/src/types/index.ts@@ -96,6 +96,8 @@ export interface NodeData extends Record<string, unknown> {show_border?: booleanwidth?: numberheight?: number+ // Collapsible zone state (type === 'groupRect')+ collapsed?: boolean}custom_icon?: string/** Number of bottom connection points, 1..48. Default 1 (centered). */