diff --git a/members/nullnet-server/ui/src/components/topology/EdgePanel.tsx b/members/nullnet-server/ui/src/components/topology/EdgePanel.tsx index e5caf4d..fe3f5de 100644 --- a/members/nullnet-server/ui/src/components/topology/EdgePanel.tsx +++ b/members/nullnet-server/ui/src/components/topology/EdgePanel.tsx @@ -142,6 +142,9 @@ export default function EdgePanel({ edges }: Props) { {edges.map((e, i) => { const session = sessionByNetId.get(e.net_id); + const netIdsLabel = e.via_proxy && chainByProxyNetId.has(e.net_id) + ? `nets ${chainByProxyNetId.get(e.net_id)!.join(', ')}` + : `net ${e.net_id}`; return (
-
- - {e.via_proxy && chainByProxyNetId.has(e.net_id) - ? `nets ${chainByProxyNetId.get(e.net_id)!.join(', ')}` - : `net ${e.net_id}`} +
+ + {netIdsLabel} {e.setup_ms > 0 && ( - {e.setup_ms}ms setup + {e.setup_ms}ms setup )}
{e.egress && ( diff --git a/members/nullnet-server/ui/src/components/topology/InternetPanel.tsx b/members/nullnet-server/ui/src/components/topology/InternetPanel.tsx index 4b6b2fe..cc723d8 100644 --- a/members/nullnet-server/ui/src/components/topology/InternetPanel.tsx +++ b/members/nullnet-server/ui/src/components/topology/InternetPanel.tsx @@ -44,6 +44,8 @@ export default function InternetPanel() { {sessionList.map(s => { const isFocused = focusedClientIp === s.client_ip; + const netIds = chainByProxyNetId.get(s.network_id); + const netIdsLabel = netIds ? `nets ${netIds.join(', ')}` : `net ${s.network_id}`; return (
-
-
- {chainByProxyNetId.has(s.network_id) - ? `nets ${chainByProxyNetId.get(s.network_id)!.join(', ')}` - : `net ${s.network_id}`} +
+
+ {netIdsLabel}
{formatTime(s.created_at)}
diff --git a/members/nullnet-server/ui/src/pages/Dashboard.tsx b/members/nullnet-server/ui/src/pages/Dashboard.tsx index dd02c65..aa740e1 100644 --- a/members/nullnet-server/ui/src/pages/Dashboard.tsx +++ b/members/nullnet-server/ui/src/pages/Dashboard.tsx @@ -119,6 +119,9 @@ function DashboardView() { {graph!.edges.map((e, i) => { const session = sessionByNetId.get(e.net_id); + const netIdsLabel = e.via_proxy && chainByProxyNetId.has(e.net_id) + ? chainByProxyNetId.get(e.net_id)!.join(', ') + : String(e.net_id); return ( {e.to} - {e.via_proxy && chainByProxyNetId.has(e.net_id) - ? chainByProxyNetId.get(e.net_id)!.join(', ') - : e.net_id} +
+ {netIdsLabel} +
{session?.client_net ?? }