refactor(network): simplify diagram node visuals
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
import { memo, useState, useRef, useEffect } from 'react'
|
||||
import { Position, NodeResizer, useReactFlow, type NodeProps } from '@xyflow/react'
|
||||
import { HardDrive, Network, ShieldCheck } from 'lucide-react'
|
||||
import { BaseNode, BaseNodeHeader, BaseNodeContent } from '../ui/base-node'
|
||||
import { BaseHandle } from '../ui/base-handle'
|
||||
import { NodeStatusIndicator, type NodeStatus } from '../ui/node-status-indicator'
|
||||
@@ -31,48 +30,9 @@ const NODE_DEFAULT = 120 // default square side in px
|
||||
const NODE_MIN = 80 // minimum square side in px
|
||||
const NODE_MAX = 280 // maximum square side in px
|
||||
|
||||
function DeviceNodeChrome({
|
||||
category,
|
||||
accentClass,
|
||||
glyph,
|
||||
}: {
|
||||
category: string
|
||||
accentClass: string
|
||||
glyph: string
|
||||
}) {
|
||||
const MetaIcon = category === 'network'
|
||||
? Network
|
||||
: category === 'security'
|
||||
? ShieldCheck
|
||||
: HardDrive
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="pointer-events-none absolute inset-x-0 top-0 flex items-center justify-between px-2 py-1">
|
||||
<span className={cn('rounded-full border px-1.5 py-0.5 text-[8px] font-semibold tracking-[0.18em]', accentClass)}>
|
||||
{glyph}
|
||||
</span>
|
||||
<span className="text-[8px] font-medium uppercase tracking-[0.16em] text-muted-foreground/80">
|
||||
{CATEGORY_LABELS[category] ?? category}
|
||||
</span>
|
||||
</div>
|
||||
<div className="pointer-events-none absolute inset-x-3 top-6 h-px bg-gradient-to-r from-transparent via-border-default to-transparent" />
|
||||
<div className="pointer-events-none absolute bottom-2 left-2 flex items-center gap-1 rounded-full border border-default bg-page/80 px-1.5 py-0.5 text-[8px] uppercase tracking-[0.14em] text-muted-foreground">
|
||||
<MetaIcon size={9} />
|
||||
<span>Asset</span>
|
||||
</div>
|
||||
<div className="pointer-events-none absolute bottom-2 right-2 flex gap-1">
|
||||
<span className="h-1.5 w-1.5 rounded-full bg-border-default" />
|
||||
<span className="h-1.5 w-1.5 rounded-full bg-border-default/80" />
|
||||
<span className="h-1.5 w-1.5 rounded-full bg-border-default/60" />
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
function DeviceNodeComponent({ id, data, selected, width, height }: NodeProps) {
|
||||
const nodeData = data as unknown as DeviceNodeData
|
||||
const { icon: Icon, color, accentClass, surfaceClass, category, glyph } = getDeviceRenderConfig(nodeData.deviceType, nodeData.category)
|
||||
const { icon: Icon, color, accentClass, surfaceClass, category } = getDeviceRenderConfig(nodeData.deviceType, nodeData.category)
|
||||
const status = (nodeData.properties?.status || 'unknown') as NodeStatus
|
||||
const ip = nodeData.properties?.ip
|
||||
const props = nodeData.properties || {}
|
||||
@@ -87,8 +47,8 @@ function DeviceNodeComponent({ id, data, selected, width, height }: NodeProps) {
|
||||
const labelPx = Math.max(9, Math.min(20, Math.round(scale * 11)))
|
||||
// IP font: 9px at default, clamped to [8, 16]
|
||||
const ipPx = Math.max(8, Math.min(16, Math.round(scale * 9)))
|
||||
const typePx = Math.max(8, Math.min(13, Math.round(scale * 8.5)))
|
||||
const iconPlateSize = Math.round(Math.max(36, Math.min(92, scale * 56)))
|
||||
const metaPx = Math.max(8, Math.min(11, Math.round(scale * 8)))
|
||||
const iconPlateSize = Math.round(Math.max(34, Math.min(82, scale * 50)))
|
||||
|
||||
const [editing, setEditing] = useState(false)
|
||||
const [labelValue, setLabelValue] = useState(nodeData.label ?? '')
|
||||
@@ -124,19 +84,17 @@ function DeviceNodeComponent({ id, data, selected, width, height }: NodeProps) {
|
||||
<NodeStatusIndicator status={status}>
|
||||
<NodeTooltip>
|
||||
<NodeTooltipTrigger>
|
||||
<BaseNode className="group h-full w-full bg-gradient-to-b from-card via-card to-page/80">
|
||||
<div className={cn('pointer-events-none absolute inset-x-0 top-0 h-14 bg-gradient-to-b', surfaceClass)} />
|
||||
<DeviceNodeChrome category={category} accentClass={accentClass} glyph={glyph} />
|
||||
<BaseNodeHeader className="flex h-full flex-col items-center justify-center gap-2 px-2 pt-8 pb-3">
|
||||
<BaseNode className="group h-full w-full bg-gradient-to-b from-card via-card to-page/70">
|
||||
<div className={cn('pointer-events-none absolute inset-x-0 top-0 h-10 bg-gradient-to-b opacity-80', surfaceClass)} />
|
||||
<BaseNodeHeader className="flex h-full flex-col items-center justify-center gap-2 px-2 py-3">
|
||||
<div
|
||||
className={cn(
|
||||
'relative flex items-center justify-center rounded-2xl border shadow-inner',
|
||||
'relative flex items-center justify-center rounded-xl border transition-colors',
|
||||
accentClass,
|
||||
)}
|
||||
style={{ width: iconPlateSize, height: iconPlateSize }}
|
||||
>
|
||||
<div className="absolute inset-[5px] rounded-[14px] border border-white/8 bg-page/65" />
|
||||
<div className="absolute inset-x-2 top-2 h-px bg-gradient-to-r from-transparent via-white/20 to-transparent" />
|
||||
<div className="absolute inset-[4px] rounded-[10px] border border-white/6 bg-page/55" />
|
||||
<div className="relative z-10">
|
||||
<Icon size={iconPx} style={{ color }} />
|
||||
</div>
|
||||
@@ -176,16 +134,16 @@ function DeviceNodeComponent({ id, data, selected, width, height }: NodeProps) {
|
||||
</span>
|
||||
)}
|
||||
<span
|
||||
style={{ fontSize: typePx }}
|
||||
className="rounded-full border border-default bg-page/70 px-2 py-0.5 text-[9px] uppercase tracking-[0.18em] text-muted-foreground"
|
||||
style={{ fontSize: metaPx }}
|
||||
className="text-[9px] uppercase tracking-[0.16em] text-muted-foreground/80"
|
||||
>
|
||||
{nodeData.deviceType.replace(/-/g, ' ')}
|
||||
{CATEGORY_LABELS[category] ?? nodeData.deviceType.replace(/-/g, ' ')}
|
||||
</span>
|
||||
</BaseNodeHeader>
|
||||
{ip && (
|
||||
<BaseNodeContent className="items-center pt-0 pb-3">
|
||||
<BaseNodeContent className="items-center pt-0 pb-2">
|
||||
<span
|
||||
className="rounded-full border border-default bg-page/80 px-2 py-0.5 font-mono text-muted-foreground"
|
||||
className="rounded-full border border-default bg-page/70 px-2 py-0.5 font-mono text-muted-foreground"
|
||||
style={{ fontSize: ipPx }}
|
||||
>
|
||||
{ip}
|
||||
|
||||
@@ -12,7 +12,6 @@ export interface DeviceRenderConfig {
|
||||
accentClass: string
|
||||
surfaceClass: string
|
||||
category: string
|
||||
glyph: string
|
||||
}
|
||||
|
||||
// Category-semantic color palette — each color carries meaning:
|
||||
@@ -66,13 +65,11 @@ function makeConfig(
|
||||
icon: LucideIcon,
|
||||
color: string,
|
||||
category: string,
|
||||
glyph: string,
|
||||
): DeviceRenderConfig {
|
||||
return {
|
||||
icon,
|
||||
color,
|
||||
category,
|
||||
glyph,
|
||||
accentClass: CATEGORY_STYLES[category]?.accentClass ?? CATEGORY_STYLES.infrastructure.accentClass,
|
||||
surfaceClass: CATEGORY_STYLES[category]?.surfaceClass ?? CATEGORY_STYLES.infrastructure.surfaceClass,
|
||||
}
|
||||
@@ -80,60 +77,60 @@ function makeConfig(
|
||||
|
||||
const SYSTEM_DEVICE_ICONS: Record<string, DeviceRenderConfig> = {
|
||||
// Network layer
|
||||
'router': makeConfig(Router, NETWORK_COLOR, 'network', 'RTR'),
|
||||
'switch': makeConfig(Network, NETWORK_COLOR, 'network', 'SW'),
|
||||
'access-point': makeConfig(Wifi, NETWORK_COLOR, 'network', 'AP'),
|
||||
'load-balancer': makeConfig(Gauge, NETWORK_COLOR, 'network', 'LB'),
|
||||
'router': makeConfig(Router, NETWORK_COLOR, 'network'),
|
||||
'switch': makeConfig(Network, NETWORK_COLOR, 'network'),
|
||||
'access-point': makeConfig(Wifi, NETWORK_COLOR, 'network'),
|
||||
'load-balancer': makeConfig(Gauge, NETWORK_COLOR, 'network'),
|
||||
|
||||
// Security
|
||||
'firewall': makeConfig(BrickWallFire, SECURITY_COLOR, 'security', 'FW'),
|
||||
'badge-reader': makeConfig(KeyRound, SECURITY_COLOR, 'security', 'BR'),
|
||||
'firewall': makeConfig(BrickWallFire, SECURITY_COLOR, 'security'),
|
||||
'badge-reader': makeConfig(KeyRound, SECURITY_COLOR, 'security'),
|
||||
|
||||
// Compute
|
||||
'server': makeConfig(Server, COMPUTE_COLOR, 'compute', 'SRV'),
|
||||
'vm': makeConfig(Boxes, COMPUTE_COLOR, 'compute', 'VM'),
|
||||
'container': makeConfig(Package, COMPUTE_COLOR, 'compute', 'CTR'),
|
||||
'server': makeConfig(Server, COMPUTE_COLOR, 'compute'),
|
||||
'vm': makeConfig(Boxes, COMPUTE_COLOR, 'compute'),
|
||||
'container': makeConfig(Package, COMPUTE_COLOR, 'compute'),
|
||||
|
||||
// Storage
|
||||
'nas': makeConfig(Database, STORAGE_COLOR, 'storage', 'NAS'),
|
||||
'san': makeConfig(HardDrive, STORAGE_COLOR, 'storage', 'SAN'),
|
||||
'cloud-storage': makeConfig(CloudCog, STORAGE_COLOR, 'storage', 'CS'),
|
||||
'nas': makeConfig(Database, STORAGE_COLOR, 'storage'),
|
||||
'san': makeConfig(HardDrive, STORAGE_COLOR, 'storage'),
|
||||
'cloud-storage': makeConfig(CloudCog, STORAGE_COLOR, 'storage'),
|
||||
|
||||
// Cloud / Internet
|
||||
'cloud': makeConfig(Cloud, CLOUD_COLOR, 'cloud', 'CLD'),
|
||||
'aws': makeConfig(Cloud, CLOUD_COLOR, 'cloud', 'AWS'),
|
||||
'azure': makeConfig(Cloud, CLOUD_COLOR, 'cloud', 'AZ'),
|
||||
'gcp': makeConfig(Cloud, CLOUD_COLOR, 'cloud', 'GCP'),
|
||||
'isp': makeConfig(Globe, CLOUD_COLOR, 'cloud', 'WAN'),
|
||||
'cloud': makeConfig(Cloud, CLOUD_COLOR, 'cloud'),
|
||||
'aws': makeConfig(Cloud, CLOUD_COLOR, 'cloud'),
|
||||
'azure': makeConfig(Cloud, CLOUD_COLOR, 'cloud'),
|
||||
'gcp': makeConfig(Cloud, CLOUD_COLOR, 'cloud'),
|
||||
'isp': makeConfig(Globe, CLOUD_COLOR, 'cloud'),
|
||||
|
||||
// Endpoints
|
||||
'workstation': makeConfig(Monitor, ENDPOINT_COLOR, 'endpoint', 'WS'),
|
||||
'laptop': makeConfig(Laptop, ENDPOINT_COLOR, 'endpoint', 'LTP'),
|
||||
'tablet': makeConfig(Tablet, ENDPOINT_COLOR, 'endpoint', 'TAB'),
|
||||
'phone': makeConfig(Smartphone, ENDPOINT_COLOR, 'endpoint', 'PH'),
|
||||
'printer': makeConfig(Printer, ENDPOINT_COLOR, 'endpoint', 'PRN'),
|
||||
'workstation': makeConfig(Monitor, ENDPOINT_COLOR, 'endpoint'),
|
||||
'laptop': makeConfig(Laptop, ENDPOINT_COLOR, 'endpoint'),
|
||||
'tablet': makeConfig(Tablet, ENDPOINT_COLOR, 'endpoint'),
|
||||
'phone': makeConfig(Smartphone, ENDPOINT_COLOR, 'endpoint'),
|
||||
'printer': makeConfig(Printer, ENDPOINT_COLOR, 'endpoint'),
|
||||
|
||||
// Infrastructure / physical
|
||||
'ups': makeConfig(BatteryCharging, INFRA_COLOR, 'infrastructure', 'UPS'),
|
||||
'pdu': makeConfig(PlugZap, INFRA_COLOR, 'infrastructure', 'PDU'),
|
||||
'rack': makeConfig(RectangleVertical, INFRA_COLOR, 'infrastructure', 'RCK'),
|
||||
'patch-panel': makeConfig(Cable, INFRA_COLOR, 'infrastructure', 'PP'),
|
||||
'camera': makeConfig(Camera, INFRA_COLOR, 'infrastructure', 'CAM'),
|
||||
'nvr': makeConfig(Video, INFRA_COLOR, 'infrastructure', 'NVR'),
|
||||
'iot': makeConfig(Radio, INFRA_COLOR, 'infrastructure', 'IOT'),
|
||||
'ups': makeConfig(BatteryCharging, INFRA_COLOR, 'infrastructure'),
|
||||
'pdu': makeConfig(PlugZap, INFRA_COLOR, 'infrastructure'),
|
||||
'rack': makeConfig(RectangleVertical, INFRA_COLOR, 'infrastructure'),
|
||||
'patch-panel': makeConfig(Cable, INFRA_COLOR, 'infrastructure'),
|
||||
'camera': makeConfig(Camera, INFRA_COLOR, 'infrastructure'),
|
||||
'nvr': makeConfig(Video, INFRA_COLOR, 'infrastructure'),
|
||||
'iot': makeConfig(Radio, INFRA_COLOR, 'infrastructure'),
|
||||
}
|
||||
|
||||
const CATEGORY_DEFAULTS: Record<string, DeviceRenderConfig> = {
|
||||
'network': makeConfig(Router, NETWORK_COLOR, 'network', 'NET'),
|
||||
'compute': makeConfig(Server, COMPUTE_COLOR, 'compute', 'CPU'),
|
||||
'storage': makeConfig(Database, STORAGE_COLOR, 'storage', 'DB'),
|
||||
'cloud': makeConfig(Cloud, CLOUD_COLOR, 'cloud', 'CLD'),
|
||||
'endpoint': makeConfig(Monitor, ENDPOINT_COLOR, 'endpoint', 'END'),
|
||||
'infrastructure': makeConfig(PlugZap, INFRA_COLOR, 'infrastructure', 'INF'),
|
||||
'security': makeConfig(BrickWallFire, SECURITY_COLOR, 'security', 'SEC'),
|
||||
'network': makeConfig(Router, NETWORK_COLOR, 'network'),
|
||||
'compute': makeConfig(Server, COMPUTE_COLOR, 'compute'),
|
||||
'storage': makeConfig(Database, STORAGE_COLOR, 'storage'),
|
||||
'cloud': makeConfig(Cloud, CLOUD_COLOR, 'cloud'),
|
||||
'endpoint': makeConfig(Monitor, ENDPOINT_COLOR, 'endpoint'),
|
||||
'infrastructure': makeConfig(PlugZap, INFRA_COLOR, 'infrastructure'),
|
||||
'security': makeConfig(BrickWallFire, SECURITY_COLOR, 'security'),
|
||||
}
|
||||
|
||||
const FALLBACK: DeviceRenderConfig = makeConfig(Cpu, INFRA_COLOR, 'infrastructure', 'DEV')
|
||||
const FALLBACK: DeviceRenderConfig = makeConfig(Cpu, INFRA_COLOR, 'infrastructure')
|
||||
|
||||
export function getDeviceRenderConfig(slug: string, category?: string): DeviceRenderConfig {
|
||||
if (SYSTEM_DEVICE_ICONS[slug]) return SYSTEM_DEVICE_ICONS[slug]
|
||||
|
||||
@@ -6,7 +6,7 @@ export function BaseNode({ className, ...props }: ComponentProps<'div'>) {
|
||||
<div
|
||||
className={cn(
|
||||
'bg-card text-heading relative overflow-hidden rounded-xl border border-default',
|
||||
'transition-colors hover:border-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/50',
|
||||
'transition-colors hover:border-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/40',
|
||||
'in-[.selected]:border-accent',
|
||||
className,
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user