ott-vis-panel: add text to some nodes to differentiate them easier (#…

…1432)
dyc3 · Mar 1, 2024 · 0791543 · 0791543
1 parent bf8082b
commit 0791543
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/packages/ott-vis-panel/src/components/ForceGraph.tsx b/packages/ott-vis-panel/src/components/ForceGraph.tsx
@@ -21,6 +21,7 @@ export interface Node extends d3.SimulationNodeDatum {
 	group: string;
 	color: string;
 	radius: number;
+	text?: string;
 }
 
 export interface Link extends d3.SimulationLinkDatum<Node> {
@@ -82,12 +83,13 @@ const ForceGraph: React.FC<ForceGraphProps> = ({
 		);
 
 	useEffect(() => {
-		const svg = d3.select(svgRef.current).attr("style", "max-width: 100%; height: auto;");
+		const svg = d3.select(svgRef.current);
 
 		// Add a line for each link, and a circle for each node.
 		const link = svg.select("g.links").selectAll("line").data(links);
 
 		const node = svg.select("g.nodes").selectAll("circle").data(nodes);
+		const nodeText = svg.select("g.nodes").selectAll("text").data(nodes);
 
 		// node.append("title").text(d => d.id);
 
@@ -105,6 +107,7 @@ const ForceGraph: React.FC<ForceGraphProps> = ({
 				.attr("y2", d => (d.target as Node).y ?? 0);
 
 			node.attr("cx", d => d.x).attr("cy", d => d.y);
+			nodeText.attr("x", d => d.x).attr("y", d => d.y + 4);
 		});
 
 		// Reheat the simulation when drag starts, and fix the subject position.
@@ -143,7 +146,7 @@ const ForceGraph: React.FC<ForceGraphProps> = ({
 			width={width}
 			height={height}
 			viewBox={`${-width / 2} ${-height / 2} ${width}, ${height}`}
-			style={{ height: "auto" }}
+			style={{ height: "auto", maxWidth: "100%" }}
 		>
 			<g className="links" stroke="#999" strokeOpacity={0.6}>
 				{links.map((link, i) => (
@@ -152,7 +155,20 @@ const ForceGraph: React.FC<ForceGraphProps> = ({
 			</g>
 			<g className="nodes" stroke="#fff" strokeWidth={1.5}>
 				{nodes.map((node, i) => (
-					<circle key={i} r={radius(node.radius)} fill={color(node.group)} />
+					<>
+						<circle key={i} r={radius(node.radius)} fill={color(node.group)} />
+						<text
+							textAnchor="middle"
+							alignmentBaseline="middle"
+							style={{ userSelect: "none", cursor: "default", pointerEvents: "none" }}
+							fontFamily="Inter, Helvetica, Arial, sans-serif"
+							fontSize={10}
+							strokeWidth={0}
+							fill="#fff"
+						>
+							{node.text}
+						</text>
+					</>
 				))}
 			</g>
 		</svg>

diff --git a/packages/ott-vis-panel/src/components/views/GlobalView.tsx b/packages/ott-vis-panel/src/components/views/GlobalView.tsx
@@ -19,6 +19,7 @@ function buildGraph(state: SystemState): [Node[], Link[]] {
 		y: 0,
 		group: "core",
 		color: "Purple", // TODO: use color from grafana theme/panel options
+		text: "OTT",
 	};
 	nodes.push(core);
 
@@ -34,6 +35,7 @@ function buildGraph(state: SystemState): [Node[], Link[]] {
 			y: 0,
 			group: "monolith",
 			color: "Red", // TODO: use color from grafana theme/panel options
+			text: monolith.substring(0, 6),
 		};
 		nodes.push(monolithNode);
 		monoliths.push(monolithNode);

diff --git a/packages/ott-vis-panel/src/components/views/RegionView.tsx b/packages/ott-vis-panel/src/components/views/RegionView.tsx
@@ -34,6 +34,7 @@ function buildGraph(state: SystemState): [Node[], Link[]] {
 			y: 0,
 			group: "core",
 			color: regionColors[region],
+			text: region,
 		};
 		nodes.push(core);
 
@@ -45,6 +46,7 @@ function buildGraph(state: SystemState): [Node[], Link[]] {
 				y: 0,
 				group: "monolith",
 				color: regionColors[region],
+				text: monolith.substring(0, 6),
 			};
 			nodes.push(monolithNode);
 
@@ -72,13 +74,17 @@ function buildGraph(state: SystemState): [Node[], Link[]] {
 				});
 
 				const clients = roomCounts[room];
+				if (clients === 0) {
+					continue;
+				}
 				const clientsNode: Node = {
 					id: `${room}-clients`,
 					radius: clients,
 					x: 0,
 					y: 0,
 					group: "client",
 					color: regionColors[region],
+					text: `${clients}`,
 				};
 				nodes.push(clientsNode);