fix(mazenet-ui): detect gateway via forwards_l3, drop host-mode
Gateway detection in the editor previously matched archetype === 'host-gateway' (a fictional archetype that never existed in decnet/archetypes.py). Switch to decky_config.forwards_l3 — the real runtime marker the composer already reads — so deletion guards, drag-pinning, context menu locking, and NodeCard DMZ-gateway styling all line up with what actually ships at deploy time. On DMZ palette drop, create the gateway with archetype=deaddeck, services=['ssh'], forwards_l3=true, and mark the edge is_bridge=true, forwards_l3=true. attachEdge now accepts those flags so callers can seed a real bridge attachment.
This commit is contained in:
@@ -1,75 +1,266 @@
|
||||
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import { useSearchParams } from 'react-router-dom';
|
||||
import { PanelRightOpen, PanelRightClose, RotateCcw, UploadCloud } from 'lucide-react';
|
||||
import { useSearchParams, useNavigate } from 'react-router-dom';
|
||||
import {
|
||||
PanelRightOpen, PanelRightClose, RotateCcw, UploadCloud, ArrowLeft,
|
||||
Plus, Trash2, Zap, Copy, Eye, ShieldAlert, GitMerge, Server,
|
||||
} from 'lucide-react';
|
||||
import './MazeNET.css';
|
||||
import axios from '../../utils/api';
|
||||
import Palette from './Palette';
|
||||
import Canvas from './Canvas';
|
||||
import Inspector from './Inspector';
|
||||
import type { Selection } from './Inspector';
|
||||
import ContextMenu, { type MenuItem } from './ContextMenu';
|
||||
import { DEFAULT_SERVICES, DEMO_NETS, DEMO_NODES, DEMO_EDGES } from './data';
|
||||
import type { ServiceDef } from './data';
|
||||
import type { Net, MazeNode, Edge, PendingChange } from './types';
|
||||
import { DEFAULT_SERVICES } from './data';
|
||||
import type { Archetype, ServiceDef } from './data';
|
||||
import type { Net, MazeNode, Edge, DeckyNode } from './types';
|
||||
import { useMazeApi } from './useMazeApi';
|
||||
import { useMazeInteraction } from './useMazeInteraction';
|
||||
import { useMazeInteraction, type PaletteDrag } from './useMazeInteraction';
|
||||
import { ARCHETYPES as DEFAULT_ARCHETYPES } from './data';
|
||||
|
||||
/* Short unique suffix for default names — avoids the DB uniqueness
|
||||
* constraint regardless of delete/re-add sequencing on the client. */
|
||||
const hex4 = (): string => {
|
||||
const r = typeof crypto !== 'undefined' && 'randomUUID' in crypto
|
||||
? crypto.randomUUID().replace(/-/g, '')
|
||||
: Math.random().toString(16).slice(2);
|
||||
return r.slice(0, 4);
|
||||
};
|
||||
|
||||
const MazeNET: React.FC = () => {
|
||||
const api = useMazeApi();
|
||||
const navigate = useNavigate();
|
||||
const [params] = useSearchParams();
|
||||
const topologyId = params.get('topology');
|
||||
const topologyId = params.get('topology') ?? '';
|
||||
|
||||
const [nets, setNets] = useState<Net[]>(DEMO_NETS);
|
||||
const [nodes, setNodes] = useState<MazeNode[]>(DEMO_NODES);
|
||||
const [edges, setEdges] = useState<Edge[]>(DEMO_EDGES);
|
||||
const [pending, setPending] = useState<PendingChange[]>([]);
|
||||
const [nets, setNets] = useState<Net[]>([]);
|
||||
const [nodes, setNodes] = useState<MazeNode[]>([]);
|
||||
const [edges, setEdges] = useState<Edge[]>([]);
|
||||
const [topoStatus, setTopoStatus] = useState<string>('pending');
|
||||
const [topoName, setTopoName] = useState<string>('');
|
||||
const [topoVersion, setTopoVersion] = useState<number>(0);
|
||||
const [selection, setSelection] = useState<Selection>(null);
|
||||
const [inspectorOpen, setInspectorOpen] = useState(true);
|
||||
const [services, setServices] = useState<ServiceDef[]>(DEFAULT_SERVICES);
|
||||
const [archetypes, setArchetypes] = useState<Archetype[]>(DEFAULT_ARCHETYPES);
|
||||
const [loadErr, setLoadErr] = useState<string | null>(null);
|
||||
const [actionErr, setActionErr] = useState<string | null>(null);
|
||||
const [deploying, setDeploying] = useState(false);
|
||||
|
||||
const canvasRef = useRef<HTMLDivElement>(null);
|
||||
const applyChange = useCallback((pc: PendingChange) => {
|
||||
setPending((p) => [...p, pc]);
|
||||
if (pc.op === 'add_edge') {
|
||||
const payload = pc.payload;
|
||||
setEdges((prev) => prev.some((e) => e.id === payload.id)
|
||||
? prev
|
||||
: [...prev, { id: payload.id, from: payload.from, to: payload.to, traffic: 'active' as const }]);
|
||||
}
|
||||
|
||||
const flashErr = useCallback((err: unknown, fallback: string) => {
|
||||
const msg = (err as { response?: { data?: { detail?: string } }; message?: string })
|
||||
?.response?.data?.detail ?? (err as Error)?.message ?? fallback;
|
||||
setActionErr(msg);
|
||||
setTimeout(() => setActionErr(null), 4000);
|
||||
}, []);
|
||||
const interaction = useMazeInteraction({ nets, nodes, setNets, setNodes, applyChange, canvasRef });
|
||||
|
||||
/* ── Palette drop — create LANs / deckies / services via REST ─── */
|
||||
const onPaletteDrop = useCallback(
|
||||
async (drag: PaletteDrag, world: { x: number; y: number }, overNetId: string | null, overNodeId: string | null) => {
|
||||
if (!topologyId) return;
|
||||
|
||||
if (drag.kind === 'network-subnet' || drag.kind === 'network-dmz') {
|
||||
const isDmz = drag.kind === 'network-dmz';
|
||||
if (isDmz && nets.some((n) => n.kind === 'dmz')) {
|
||||
flashErr(null, 'topology already has a DMZ');
|
||||
return;
|
||||
}
|
||||
const w = 320, h = 240;
|
||||
const x = Math.round(world.x - w / 2);
|
||||
const y = Math.round(world.y - h / 2);
|
||||
const name = isDmz ? `dmz-${hex4()}` : `subnet-${hex4()}`;
|
||||
try {
|
||||
const subnet = await api.getNextSubnet().catch(() => undefined);
|
||||
const lan = await api.createLan(topologyId, { name, is_dmz: isDmz, x, y, ...(subnet ? { subnet } : {}) });
|
||||
const net: Net = {
|
||||
id: lan.id, label: lan.name.toUpperCase(), cidr: lan.subnet,
|
||||
kind: isDmz ? 'dmz' : 'subnet', x, y, w, h,
|
||||
};
|
||||
setNets((p) => [...p, net]);
|
||||
|
||||
if (isDmz) {
|
||||
const gwName = `dmz-gateway-${hex4()}`;
|
||||
const gw = await api.createDecky(topologyId, {
|
||||
name: gwName, services: ['ssh'], x: 20, y: 40,
|
||||
decky_config: { archetype: 'deaddeck', forwards_l3: true },
|
||||
});
|
||||
await api.attachEdge(topologyId, {
|
||||
decky_uuid: gw.uuid, lan_id: lan.id,
|
||||
is_bridge: true, forwards_l3: true,
|
||||
});
|
||||
const gwNode: DeckyNode = {
|
||||
kind: 'decky', id: gw.uuid, netId: lan.id, name: gw.name,
|
||||
archetype: 'deaddeck', services: ['ssh'], status: 'idle',
|
||||
x: 20, y: 40, decky_config: { forwards_l3: true },
|
||||
};
|
||||
setNodes((p) => [...p, gwNode]);
|
||||
}
|
||||
} catch (err) {
|
||||
flashErr(err, 'create network failed');
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (drag.kind === 'archetype') {
|
||||
if (!overNetId) return;
|
||||
const net = nets.find((n) => n.id === overNetId);
|
||||
if (!net) return;
|
||||
const arch = archetypes.find((a) => a.slug === drag.slug);
|
||||
const archSlug = drag.slug;
|
||||
const dServices = drag.services ?? arch?.services ?? [];
|
||||
const nx = Math.max(8, Math.round(world.x - net.x - 70));
|
||||
const ny = Math.max(28, Math.round(world.y - net.y - 24));
|
||||
const name = `decky-${hex4()}`;
|
||||
try {
|
||||
const decky = await api.createDecky(topologyId, {
|
||||
name, services: dServices, x: nx, y: ny,
|
||||
decky_config: { archetype: archSlug },
|
||||
});
|
||||
await api.attachEdge(topologyId, { decky_uuid: decky.uuid, lan_id: overNetId });
|
||||
const node: DeckyNode = {
|
||||
kind: 'decky', id: decky.uuid, netId: overNetId, name: decky.name,
|
||||
archetype: archSlug, services: dServices, status: 'idle', x: nx, y: ny,
|
||||
};
|
||||
setNodes((p) => [...p, node]);
|
||||
} catch (err) {
|
||||
flashErr(err, 'create decky failed');
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (drag.kind === 'service') {
|
||||
if (!overNodeId) return;
|
||||
const target = nodes.find((n) => n.id === overNodeId);
|
||||
if (!target || target.kind !== 'decky') return;
|
||||
if (target.services.includes(drag.slug)) return;
|
||||
const nextServices = [...target.services, drag.slug];
|
||||
try {
|
||||
await api.updateDecky(topologyId, overNodeId, { services: nextServices });
|
||||
setNodes((p) => p.map((n) => n.id === overNodeId && n.kind === 'decky'
|
||||
? { ...n, services: nextServices }
|
||||
: n));
|
||||
} catch (err) {
|
||||
flashErr(err, 'update services failed');
|
||||
}
|
||||
}
|
||||
},
|
||||
[api, archetypes, flashErr, nets, nodes, topologyId],
|
||||
);
|
||||
|
||||
/* ── Cross-net reparent via node drag (detach + attach edge) ─── */
|
||||
const onReparent = useCallback(async (nodeId: string, fromNetId: string, toNetId: string) => {
|
||||
if (!topologyId) return;
|
||||
try {
|
||||
const { data: detail } = await axios.get(`/topologies/${topologyId}`);
|
||||
const existingEdge = (detail.edges ?? []).find(
|
||||
(e: { decky_uuid: string; lan_id: string; id: string }) =>
|
||||
e.decky_uuid === nodeId && e.lan_id === fromNetId,
|
||||
);
|
||||
if (existingEdge) await api.detachEdge(topologyId, existingEdge.id);
|
||||
await api.attachEdge(topologyId, { decky_uuid: nodeId, lan_id: toNetId });
|
||||
} catch (err) {
|
||||
flashErr(err, 'reparent failed');
|
||||
}
|
||||
}, [api, flashErr, topologyId]);
|
||||
|
||||
/* Port→port edges stay UI-only (backend edges are decky↔LAN). */
|
||||
const onAddEdge = useCallback((fromId: string, toId: string) => {
|
||||
const id = `viz-${fromId}-${toId}-${Date.now()}`;
|
||||
setEdges((prev) => prev.some((e) => (e.from === fromId && e.to === toId) || (e.from === toId && e.to === fromId))
|
||||
? prev
|
||||
: [...prev, { id, from: fromId, to: toId, traffic: 'active' as const }]);
|
||||
}, []);
|
||||
|
||||
const interaction = useMazeInteraction({
|
||||
nets, nodes, setNets, setNodes, canvasRef,
|
||||
onPaletteDrop, onReparent, onAddEdge,
|
||||
});
|
||||
|
||||
const [ctxMenu, setCtxMenu] = useState<{ x: number; y: number; items: MenuItem[] } | null>(null);
|
||||
|
||||
const removeNet = (id: string) => {
|
||||
const removeNet = async (id: string) => {
|
||||
const net = nets.find((n) => n.id === id);
|
||||
if (!net || net.kind === 'internet') return;
|
||||
setNets((p) => p.filter((n) => n.id !== id));
|
||||
setNodes((p) => p.filter((n) => n.netId !== id));
|
||||
setEdges((p) => p.filter((e) => {
|
||||
const a = nodes.find((x) => x.id === e.from)?.netId;
|
||||
const b = nodes.find((x) => x.id === e.to)?.netId;
|
||||
return a !== id && b !== id;
|
||||
}));
|
||||
applyChange({ op: 'remove_lan', payload: { id } });
|
||||
setSelection(null);
|
||||
/* Cascade delete members first — backend will otherwise 400 on orphan risk. */
|
||||
const members = nodes.filter((n) => n.netId === id && n.kind === 'decky');
|
||||
try {
|
||||
for (const m of members) await api.deleteDecky(topologyId, m.id);
|
||||
await api.deleteLan(topologyId, id);
|
||||
setNets((p) => p.filter((n) => n.id !== id));
|
||||
setNodes((p) => p.filter((n) => n.netId !== id));
|
||||
setEdges((p) => p.filter((e) => {
|
||||
const a = nodes.find((x) => x.id === e.from)?.netId;
|
||||
const b = nodes.find((x) => x.id === e.to)?.netId;
|
||||
return a !== id && b !== id;
|
||||
}));
|
||||
setSelection(null);
|
||||
} catch (err) {
|
||||
flashErr(err, 'delete network failed');
|
||||
}
|
||||
};
|
||||
|
||||
const removeNode = (id: string) => {
|
||||
const removeNode = async (id: string) => {
|
||||
const node = nodes.find((n) => n.id === id);
|
||||
if (!node || node.kind === 'observed') return;
|
||||
setNodes((p) => p.filter((n) => n.id !== id));
|
||||
setEdges((p) => p.filter((e) => e.from !== id && e.to !== id));
|
||||
applyChange({ op: 'remove_decky', payload: { nodeId: id } });
|
||||
setSelection(null);
|
||||
if (node.kind === 'decky' && node.decky_config?.forwards_l3) return;
|
||||
try {
|
||||
await api.deleteDecky(topologyId, id);
|
||||
setNodes((p) => p.filter((n) => n.id !== id));
|
||||
setEdges((p) => p.filter((e) => e.from !== id && e.to !== id));
|
||||
setSelection(null);
|
||||
} catch (err) {
|
||||
flashErr(err, 'delete decky failed');
|
||||
}
|
||||
};
|
||||
|
||||
const removeEdge = (id: string) => {
|
||||
/* Viz-only edges: backend has no edge to delete here. */
|
||||
setEdges((p) => p.filter((e) => e.id !== id));
|
||||
applyChange({ op: 'remove_edge', payload: { id } });
|
||||
setSelection(null);
|
||||
};
|
||||
|
||||
const duplicateNode = async (id: string) => {
|
||||
const n = nodes.find((x) => x.id === id);
|
||||
if (!n || n.kind !== 'decky') return;
|
||||
const name = `${n.name.replace(/-[0-9a-f]{4}$/, '')}-${hex4()}`;
|
||||
try {
|
||||
const decky = await api.createDecky(topologyId, {
|
||||
name, services: [...n.services], x: n.x + 24, y: n.y + 24,
|
||||
decky_config: { archetype: n.archetype },
|
||||
});
|
||||
await api.attachEdge(topologyId, { decky_uuid: decky.uuid, lan_id: n.netId });
|
||||
const copy: DeckyNode = {
|
||||
kind: 'decky', id: decky.uuid, netId: n.netId, name: decky.name,
|
||||
archetype: n.archetype, services: [...n.services], status: 'idle',
|
||||
x: n.x + 24, y: n.y + 24,
|
||||
};
|
||||
setNodes((p) => [...p, copy]);
|
||||
} catch (err) {
|
||||
flashErr(err, 'duplicate failed');
|
||||
}
|
||||
};
|
||||
|
||||
const addServiceToNode = async (id: string, slug: string) => {
|
||||
const n = nodes.find((x) => x.id === id);
|
||||
if (!n || n.kind !== 'decky' || n.services.includes(slug)) return;
|
||||
const nextServices = [...n.services, slug];
|
||||
try {
|
||||
await api.updateDecky(topologyId, id, { services: nextServices });
|
||||
setNodes((p) => p.map((x) => x.id === id && x.kind === 'decky'
|
||||
? { ...x, services: nextServices } : x));
|
||||
} catch (err) {
|
||||
flashErr(err, 'add service failed');
|
||||
}
|
||||
};
|
||||
|
||||
/* Force-mutate is a no-op against a pending topology (no live containers).
|
||||
* Keep the menu item disabled for now; real hook lands with live-editing polish. */
|
||||
const forceMutate = (_id: string) => {
|
||||
flashErr(null, 'force-mutate only applies to deployed topologies');
|
||||
};
|
||||
|
||||
const onNodeContextMenu = (id: string) => (e: React.MouseEvent) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
@@ -77,18 +268,38 @@ const MazeNET: React.FC = () => {
|
||||
if (!node) return;
|
||||
setSelection({ type: 'node', id });
|
||||
const isObs = node.kind === 'observed';
|
||||
const isGateway = node.kind === 'decky' && !!node.decky_config?.forwards_l3;
|
||||
const locked = isObs || isGateway;
|
||||
const lockedTitle = isObs
|
||||
? 'observed entity — not a deployed decky'
|
||||
: isGateway ? 'DMZ gateway — pinned to its DMZ network' : undefined;
|
||||
const usedServices = node.kind === 'decky' ? new Set(node.services) : new Set<string>();
|
||||
const serviceSubmenu: MenuItem[] = services
|
||||
.filter((s) => !usedServices.has(s.slug))
|
||||
.slice(0, 16)
|
||||
.map((s) => ({
|
||||
label: `${s.name} · ${s.proto.toUpperCase()}:${s.port}`,
|
||||
disabled: isObs,
|
||||
onClick: () => addServiceToNode(id, s.slug),
|
||||
}));
|
||||
if (serviceSubmenu.length === 0) {
|
||||
serviceSubmenu.push({ label: '(no free services)', disabled: true });
|
||||
}
|
||||
|
||||
setCtxMenu({
|
||||
x: e.clientX, y: e.clientY,
|
||||
items: [
|
||||
{ label: 'INSPECT', onClick: () => setSelection({ type: 'node', id }) },
|
||||
{ label: 'Add service…', icon: <Plus size={12} />, disabled: isObs,
|
||||
title: isObs ? 'observed entity — services fixed' : undefined,
|
||||
submenu: serviceSubmenu },
|
||||
{ label: 'Force mutate', icon: <Zap size={12} />, disabled: isObs,
|
||||
onClick: () => forceMutate(id) },
|
||||
{ label: 'Duplicate decky', icon: <Copy size={12} />, disabled: locked,
|
||||
title: lockedTitle, onClick: () => duplicateNode(id) },
|
||||
{ separator: true, label: '' },
|
||||
{
|
||||
label: 'DELETE NODE',
|
||||
danger: true,
|
||||
disabled: isObs,
|
||||
title: isObs ? 'observed entity — not a deployed decky' : undefined,
|
||||
onClick: () => removeNode(id),
|
||||
},
|
||||
{ label: 'Delete decky', icon: <Trash2 size={12} />, danger: true,
|
||||
disabled: locked, title: lockedTitle,
|
||||
onClick: () => removeNode(id) },
|
||||
],
|
||||
});
|
||||
};
|
||||
@@ -99,18 +310,39 @@ const MazeNET: React.FC = () => {
|
||||
const net = nets.find((n) => n.id === id);
|
||||
if (!net) return;
|
||||
setSelection({ type: 'net', id });
|
||||
const archetypeSubmenu: MenuItem[] = archetypes.map((a) => ({
|
||||
label: a.name, icon: <Server size={12} />,
|
||||
onClick: async () => {
|
||||
const name = `decky-${hex4()}`;
|
||||
try {
|
||||
const decky = await api.createDecky(topologyId, {
|
||||
name, services: [...a.services], x: 20, y: 40,
|
||||
decky_config: { archetype: a.slug },
|
||||
});
|
||||
await api.attachEdge(topologyId, { decky_uuid: decky.uuid, lan_id: id });
|
||||
const node: DeckyNode = {
|
||||
kind: 'decky', id: decky.uuid, netId: id, name: decky.name,
|
||||
archetype: a.slug, services: [...a.services], status: 'idle',
|
||||
x: 20, y: 40,
|
||||
};
|
||||
setNodes((p) => [...p, node]);
|
||||
} catch (err) {
|
||||
flashErr(err, 'create decky failed');
|
||||
}
|
||||
},
|
||||
}));
|
||||
|
||||
setCtxMenu({
|
||||
x: e.clientX, y: e.clientY,
|
||||
items: [
|
||||
{ label: 'INSPECT', onClick: () => setSelection({ type: 'net', id }) },
|
||||
{ label: 'Add decky…', icon: <Plus size={12} />, submenu: archetypeSubmenu },
|
||||
{ label: 'Inspect', icon: <Eye size={12} />, onClick: () => setSelection({ type: 'net', id }) },
|
||||
{ separator: true, label: '' },
|
||||
{
|
||||
label: 'DELETE NET',
|
||||
danger: true,
|
||||
{ label: net.kind === 'dmz' ? 'Delete DMZ' : 'Delete network',
|
||||
icon: <Trash2 size={12} />, danger: true,
|
||||
disabled: net.kind === 'internet',
|
||||
title: net.kind === 'internet' ? 'internet zone cannot be removed' : undefined,
|
||||
onClick: () => removeNet(id),
|
||||
},
|
||||
onClick: () => removeNet(id) },
|
||||
],
|
||||
});
|
||||
};
|
||||
@@ -122,46 +354,79 @@ const MazeNET: React.FC = () => {
|
||||
setCtxMenu({
|
||||
x: e.clientX, y: e.clientY,
|
||||
items: [
|
||||
{ label: 'REMOVE EDGE', danger: true, onClick: () => removeEdge(id) },
|
||||
{ label: 'Remove edge', icon: <Trash2 size={12} />, danger: true, onClick: () => removeEdge(id) },
|
||||
],
|
||||
});
|
||||
};
|
||||
|
||||
/* Load service catalog from API (fall back to defaults if 401/offline). */
|
||||
const onCanvasContextMenu = (e: React.MouseEvent) => {
|
||||
e.preventDefault();
|
||||
setCtxMenu({
|
||||
x: e.clientX, y: e.clientY,
|
||||
items: [
|
||||
{ label: 'Add subnet here', icon: <GitMerge size={12} />,
|
||||
onClick: () => {
|
||||
const rect = canvasRef.current?.getBoundingClientRect();
|
||||
const wx = e.clientX - (rect?.left ?? 0) - interaction.pan.x;
|
||||
const wy = e.clientY - (rect?.top ?? 0) - interaction.pan.y;
|
||||
onPaletteDrop(
|
||||
{ kind: 'network-subnet', slug: 'subnet', label: 'SUBNET', clientX: e.clientX, clientY: e.clientY },
|
||||
{ x: wx, y: wy }, null, null,
|
||||
);
|
||||
},
|
||||
},
|
||||
{ label: 'Add DMZ here', icon: <ShieldAlert size={12} />,
|
||||
onClick: () => {
|
||||
const rect = canvasRef.current?.getBoundingClientRect();
|
||||
const wx = e.clientX - (rect?.left ?? 0) - interaction.pan.x;
|
||||
const wy = e.clientY - (rect?.top ?? 0) - interaction.pan.y;
|
||||
onPaletteDrop(
|
||||
{ kind: 'network-dmz', slug: 'dmz', label: 'DMZ', clientX: e.clientX, clientY: e.clientY },
|
||||
{ x: wx, y: wy }, null, null,
|
||||
);
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
};
|
||||
|
||||
/* Load catalogs. */
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
api.getServices().then((s) => { if (!cancelled) setServices(s); }).catch(() => {});
|
||||
api.getArchetypes().then((a) => { if (!cancelled) setArchetypes(a); }).catch(() => {});
|
||||
return () => { cancelled = true; };
|
||||
}, [api]);
|
||||
|
||||
/* If ?topology=<id> is present, hydrate from the real backend. */
|
||||
useEffect(() => {
|
||||
/* Hydrate topology. Route guard in App.tsx ensures topologyId is set;
|
||||
* if the id is bogus, surface a friendly error. */
|
||||
const refetch = useCallback(async () => {
|
||||
if (!topologyId) return;
|
||||
let cancelled = false;
|
||||
api.getTopology(topologyId)
|
||||
.then((h) => {
|
||||
if (cancelled) return;
|
||||
setNets(h.nets); setNodes(h.nodes); setEdges(h.edges);
|
||||
setSelection(null);
|
||||
setLoadErr(null);
|
||||
})
|
||||
.catch((err) => {
|
||||
if (!cancelled) setLoadErr(err?.message ?? 'topology load failed');
|
||||
});
|
||||
return () => { cancelled = true; };
|
||||
try {
|
||||
const h = await api.getTopology(topologyId);
|
||||
setNets(h.nets); setNodes(h.nodes); setEdges(h.edges);
|
||||
setTopoStatus(h.topology.status);
|
||||
setTopoName(h.topology.name);
|
||||
setTopoVersion(h.topology.version);
|
||||
setLoadErr(null);
|
||||
} catch (err) {
|
||||
setLoadErr((err as Error)?.message ?? 'topology load failed');
|
||||
}
|
||||
}, [api, topologyId]);
|
||||
|
||||
const onReset = () => {
|
||||
if (topologyId) {
|
||||
api.getTopology(topologyId).then((h) => {
|
||||
setNets(h.nets); setNodes(h.nodes); setEdges(h.edges);
|
||||
}).catch(() => {});
|
||||
} else {
|
||||
setNets(DEMO_NETS); setNodes(DEMO_NODES); setEdges(DEMO_EDGES);
|
||||
useEffect(() => { refetch(); }, [refetch]);
|
||||
|
||||
const onDeploy = async () => {
|
||||
if (!topologyId) return;
|
||||
setDeploying(true);
|
||||
try {
|
||||
await api.deployTopology(topologyId);
|
||||
await refetch();
|
||||
} catch (err) {
|
||||
flashErr(err, 'deploy failed');
|
||||
} finally {
|
||||
setDeploying(false);
|
||||
}
|
||||
setSelection(null);
|
||||
setPending([]);
|
||||
interaction.resetPan();
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
@@ -172,38 +437,38 @@ const MazeNET: React.FC = () => {
|
||||
return () => window.removeEventListener('keydown', onKey);
|
||||
}, []);
|
||||
|
||||
const canDeploy = topoStatus === 'pending' && nets.length > 0;
|
||||
|
||||
return (
|
||||
<div className="maze-page">
|
||||
<div className="maze-page-header">
|
||||
<div>
|
||||
<h1>MAZENET</h1>
|
||||
<h1>MAZENET · {topoName || topologyId}</h1>
|
||||
<div className="maze-page-sub">
|
||||
{topologyId ? `TOPOLOGY ${topologyId} · ` : 'DEMO · '}
|
||||
{nets.length} NETS · {nodes.length} NODES · {edges.length} PATHS ·{' '}
|
||||
{pending.length > 0 ? `${pending.length} UNCOMMITTED` : 'LIVE'}
|
||||
{topoStatus.toUpperCase()} · v{topoVersion} ·{' '}
|
||||
{nets.length} NETS · {nodes.length} NODES · {edges.length} PATHS
|
||||
{loadErr && <span className="alert-text"> · {loadErr}</span>}
|
||||
{actionErr && <span className="alert-text"> · {actionErr}</span>}
|
||||
</div>
|
||||
</div>
|
||||
<div className="maze-page-actions">
|
||||
<button
|
||||
type="button"
|
||||
className="maze-btn ghost"
|
||||
onClick={() => setInspectorOpen((o) => !o)}
|
||||
title={inspectorOpen ? 'Hide inspector' : 'Show inspector'}
|
||||
>
|
||||
{inspectorOpen ? <PanelRightClose size={12} /> : <PanelRightOpen size={12} />}
|
||||
INSPECTOR
|
||||
<button type="button" className="maze-btn ghost" onClick={() => navigate('/topologies')}>
|
||||
<ArrowLeft size={12} /> TOPOLOGIES
|
||||
</button>
|
||||
<button type="button" className="maze-btn ghost" onClick={onReset}>
|
||||
<RotateCcw size={12} /> RESET
|
||||
<button type="button" className="maze-btn ghost" onClick={() => setInspectorOpen((o) => !o)}>
|
||||
{inspectorOpen ? <PanelRightClose size={12} /> : <PanelRightOpen size={12} />} INSPECTOR
|
||||
</button>
|
||||
<button type="button" className="maze-btn ghost" onClick={refetch} title="Revert local state to server">
|
||||
<RotateCcw size={12} /> REFRESH
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className="maze-btn"
|
||||
disabled={pending.length === 0}
|
||||
onClick={() => api.commit(topologyId ?? '', pending)}
|
||||
disabled={!canDeploy || deploying}
|
||||
onClick={onDeploy}
|
||||
title={canDeploy ? 'Deploy topology' : 'Deploy requires pending status + at least one network'}
|
||||
>
|
||||
<UploadCloud size={12} /> COMMIT {pending.length > 0 ? `(${pending.length})` : ''}
|
||||
<UploadCloud size={12} /> {deploying ? 'DEPLOYING…' : 'DEPLOY'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -212,12 +477,13 @@ const MazeNET: React.FC = () => {
|
||||
className="maze-shell"
|
||||
style={{ gridTemplateColumns: inspectorOpen ? '240px 1fr 320px' : '240px 1fr' }}
|
||||
>
|
||||
<Palette services={services} />
|
||||
<Palette services={services} archetypes={archetypes} startPaletteDrag={interaction.startPaletteDrag} />
|
||||
<Canvas
|
||||
ref={canvasRef}
|
||||
nets={nets}
|
||||
nodes={nodes}
|
||||
edges={edges}
|
||||
deployed={topoStatus === 'active' || topoStatus === 'degraded'}
|
||||
selection={selection}
|
||||
setSelection={setSelection}
|
||||
pan={interaction.pan}
|
||||
@@ -232,17 +498,26 @@ const MazeNET: React.FC = () => {
|
||||
onNodeContextMenu={onNodeContextMenu}
|
||||
onNetContextMenu={onNetContextMenu}
|
||||
onEdgeContextMenu={onEdgeContextMenu}
|
||||
onCanvasContextMenu={onCanvasContextMenu}
|
||||
/>
|
||||
{ctxMenu && (
|
||||
<ContextMenu x={ctxMenu.x} y={ctxMenu.y} items={ctxMenu.items} onClose={() => setCtxMenu(null)} />
|
||||
)}
|
||||
{interaction.paletteDrag && (
|
||||
<div
|
||||
className="palette-ghost"
|
||||
style={{ left: interaction.paletteDrag.clientX + 8, top: interaction.paletteDrag.clientY + 8 }}
|
||||
>
|
||||
{interaction.paletteDrag.label}
|
||||
</div>
|
||||
)}
|
||||
{inspectorOpen && (
|
||||
<Inspector
|
||||
selection={selection}
|
||||
nets={nets}
|
||||
nodes={nodes}
|
||||
edges={edges}
|
||||
pending={pending}
|
||||
topologyStatus={topoStatus}
|
||||
onClose={() => setInspectorOpen(false)}
|
||||
onDeleteNet={removeNet}
|
||||
onDeleteNode={removeNode}
|
||||
|
||||
Reference in New Issue
Block a user