Skip to content

Fix wec connectors #2266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
btwshivam merged 6 commits into from
Dec 7, 2025
Merged

Fix wec connectors #2266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1421139
Fix Wec connectors layout
kunal-511 Dec 6, 2025
c5bf8c9
fix formatting
kunal-511 Dec 6, 2025
0f6c239
Fix edge style change
kunal-511 Dec 6, 2025
ed4f151
fix formatting
kunal-511 Dec 6, 2025
beeb49e
update perfomance and timming issues
kunal-511 Dec 6, 2025
288b27c
Improve node spacing
kunal-511 Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
228 changes: 119 additions & 109 deletions frontend/src/components/WecsTopology.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import { useTranslation } from 'react-i18next';
import { useWebSocket } from '../context/webSocketExports';
import useTheme from '../stores/themeStore';
import useZoomStore from '../stores/zoomStore';
import WecsDetailsPanel from './wecs_details/WecsDetailsPanel';
import { FlowCanvas } from './wds_topology/FlowCanvas';
import ListViewComponent from '../components/ListViewComponent';
Expand Down Expand Up @@ -258,15 +257,18 @@
nodes: CustomNode[],
edges: CustomEdge[],
direction = 'LR',
prevNodes: React.MutableRefObject<CustomNode[]>,
currentZoom: number
prevNodes: React.MutableRefObject<CustomNode[]>
) => {
const scaleFactor = Math.max(0.5, Math.min(2.0, currentZoom));
const NODE_WIDTH = 146 * scaleFactor;
const NODE_HEIGHT = 30 * scaleFactor;
const NODE_SEP = 40 * scaleFactor;
const RANK_SEP = 100 * scaleFactor;
const CHILD_SPACING = NODE_HEIGHT + 30 * scaleFactor;
// Use fixed layout values - let ReactFlow handle zoom visually
const NODE_WIDTH = 146;
const NODE_HEIGHT = 30;
const NODE_SEP = 60;
const RANK_SEP = 150;
const CHILD_SPACING = NODE_HEIGHT + 30;

if (nodes.length === 0) {
return { nodes: [], edges: [] };
}

// Step 1: Initial Dagre layout
const dagreGraph = new dagre.graphlib.Graph();
Expand All @@ -276,8 +278,11 @@
const nodeMap = new Map<string, CustomNode>();
const newNodes: CustomNode[] = [];

const shouldRecalculate = true;
if (!shouldRecalculate && Math.abs(nodes.length - prevNodes.current.length) <= 5) {
// recalculate only if node count changes significantly or if this is first render
const shouldRecalculate =
prevNodes.current.length === 0 || Math.abs(nodes.length - prevNodes.current.length) > 5;

if (!shouldRecalculate) {
prevNodes.current.forEach(node => nodeMap.set(node.id, node));
}

Expand All @@ -291,20 +296,24 @@
}
});

edges.forEach(edge => {
dagreGraph.setEdge(edge.source, edge.target);
});
if (shouldRecalculate) {
edges.forEach(edge => {
dagreGraph.setEdge(edge.source, edge.target);
});

dagre.layout(dagreGraph);
dagre.layout(dagreGraph);
} else {
return { nodes: prevNodes.current, edges };
}

const layoutedNodes = newNodes.map(node => {
const dagreNode = dagreGraph.node(node.id);
return dagreNode
? {
...node,
position: {
x: dagreNode.x - NODE_WIDTH / 2 + 50 * scaleFactor,
y: dagreNode.y - NODE_HEIGHT / 2 + 50 * scaleFactor,
x: dagreNode.x - NODE_WIDTH / 2 + 50,
y: dagreNode.y - NODE_HEIGHT / 2 + 50,
},
}
: node;
Expand Down Expand Up @@ -525,7 +534,6 @@
const WecsTreeview = () => {
const { t } = useTranslation();
const theme = useTheme(state => state.theme);
const { currentZoom, getScaledNodeStyle } = useZoomStore();
const { edgeType } = useEdgeTypeStore();
const [nodes, setNodes] = useState<CustomNode[]>([]);
const [edges, setEdges] = useState<CustomEdge[]>([]);
Expand All @@ -540,7 +548,6 @@
const [isExpanded, setIsExpanded] = useState<boolean>(true);
const [isFullscreen, setIsFullscreen] = useState<boolean>(false);
const nodeCache = useRef<Map<string, CustomNode>>(new Map());
const edgeCache = useRef<Map<string, CustomEdge>>(new Map());
const edgeIdCounter = useRef<number>(0);
const prevNodes = useRef<CustomNode[]>([]);
const renderStartTime = useRef<number>(0);
Expand All @@ -556,44 +563,44 @@
renderStartTime.current = performance.now();
}, []);

// Add effect to update node styles when theme or zoom changes
const updateNodeStyles = useCallback(() => {
if (nodes.length > 0) {
setNodes(currentNodes => {
return currentNodes.map(node => {
return {
...node,
style: {
...getScaledNodeStyle(currentZoom),
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
backgroundColor: theme === 'dark' ? 'rgba(51, 51, 51, 0)' : 'rgba(255, 255, 255, 0)',
color: theme === 'dark' ? 'rgba(255, 255, 255, 0)' : 'rgba(0, 0, 0, 0)',
border: '1px solid rgba(0, 0, 0, 0)',
transition: 'all 0.2s ease-in-out',
},
};
});
});
setNodes(currentNodes => {
if (currentNodes.length === 0) return currentNodes;

// Update edge styles for the current theme
setEdges(currentEdges => {
return currentEdges.map(edge => ({
...edge,
return currentNodes.map(node => {
return {
...node,
style: {
...edge.style,
stroke: theme === 'dark' ? 'rgba(255, 255, 255, 0)' : 'rgba(0, 0, 0, 0)',
...node.style,
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
backgroundColor: theme === 'dark' ? 'rgba(51, 51, 51, 0)' : 'rgba(255, 255, 255, 0)',
color: theme === 'dark' ? 'rgba(255, 255, 255, 0)' : 'rgba(0, 0, 0, 0)',
border: '1px solid rgba(0, 0, 0, 0)',
transition: 'all 0.2s ease-in-out',
},
}));
};
});
}
}, [nodes.length, currentZoom, theme, getScaledNodeStyle]);
});
}, [theme]);

useEffect(() => {
updateNodeStyles();
}, [updateNodeStyles]);

// Update edge types when edgeType changes
useEffect(() => {
if (edges.length > 0) {
setEdges(currentEdges =>
currentEdges.map(edge => ({
...edge,
type: edgeType,
}))
);
}
}, [edgeType]);

Check warning on line 602 in frontend/src/components/WecsTopology.tsx

View workflow job for this annotation

GitHub Actions / Frontend Checks 

React Hook useEffect has a missing dependency: 'edges.length'. Either include it or remove the dependency array

useEffect(() => {
const timer = setTimeout(() => {
setMinimumLoadingTimeElapsed(true);
Expand Down Expand Up @@ -744,6 +751,21 @@
].includes(parentType);
}

// Fixed node styles
const nodeStyle = {
padding: '2px 12px',
fontSize: '6px',
width: '146px',
height: '30px',
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
backgroundColor: theme === 'dark' ? 'rgba(51, 51, 51, 0)' : 'rgba(255, 255, 255, 0)',
color: theme === 'dark' ? 'rgba(255, 255, 255, 0)' : 'rgba(0, 0, 0, 0)',
border: '1px solid rgba(0, 0, 0, 0)',
transition: 'all 0.2s ease-in-out',
};

const node =
cachedNode ||
({
Expand Down Expand Up @@ -791,31 +813,13 @@
isDeploymentOrJobPod,
},
position: { x: 0, y: 0 },
style: {
...getScaledNodeStyle(currentZoom),
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
backgroundColor: theme === 'dark' ? 'rgba(51, 51, 51, 0)' : 'rgba(255, 255, 255, 0)',
color: theme === 'dark' ? 'rgba(255, 255, 255, 0)' : 'rgba(0, 0, 0, 0)',
border: '1px solid rgba(0, 0, 0, 0)',
transition: 'all 0.2s ease-in-out',
},
style: nodeStyle,
sourcePosition: Position.Right,
targetPosition: Position.Left,
} as CustomNode);

if (cachedNode) {
node.style = {
...getScaledNodeStyle(currentZoom),
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
backgroundColor: theme === 'dark' ? 'rgba(51, 51, 51, 0)' : 'rgba(255, 255, 255, 0)',
color: theme === 'dark' ? 'rgba(255, 255, 255, 0)' : 'rgba(0, 0, 0, 0)',
border: '1px solid rgba(0, 0, 0, 0)',
transition: 'all 0.2s ease-in-out',
};
node.style = nodeStyle;
}

if (!cachedNode) nodeCache.current.set(id, node);
Expand All @@ -824,40 +828,39 @@
if (parent && stateRef.current.isExpanded) {
const uniqueSuffix = resourceData?.metadata?.uid || edgeIdCounter.current++;
const edgeId = `edge-${parent}-${id}-${uniqueSuffix}`;
const cachedEdge = edgeCache.current.get(edgeId);
if (!cachedEdge) {
const edge = {
id: edgeId,
source: parent,
target: id,
type: edgeType,
const edge = {
id: edgeId,
source: parent,
target: id,
type: edgeType,
animated: true,
style: {
stroke: theme === 'dark' ? 'url(#edge-gradient-dark)' : 'url(#edge-gradient-light)',
strokeWidth: 2,
opacity: 0.8,
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
filter:
theme === 'dark'
? 'drop-shadow(0 2px 4px rgba(0,0,0,0.3))'
: 'drop-shadow(0 1px 2px rgba(0,0,0,0.1))',
strokeLinecap: 'round' as const,
strokeLinejoin: 'round' as const,
},
markerEnd: {
type: MarkerType.ArrowClosed,
width: 12,
height: 12,
color: theme === 'dark' ? '#64748b' : '#94a3b8',
},
data: {
status: 'default' as 'default' | 'active' | 'success' | 'warning' | 'error',
animated: true,
style: { stroke: theme === 'dark' ? '#ccc' : '#a3a3a3', strokeDasharray: '2,2' },
markerEnd: {
type: MarkerType.ArrowClosed,
color: theme === 'dark' ? '#ccc' : '#a3a3a3',
},
};
newEdges.push(edge);
edgeCache.current.set(edgeId, edge);
} else {
// Update cached edge styles for the current theme
const markerEnd: { type: MarkerType; color?: string; width?: number; height?: number } = {
type: cachedEdge.markerEnd?.type || MarkerType.ArrowClosed,
color: theme === 'dark' ? '#ccc' : '#a3a3a3',
};

const updatedEdge = {
...cachedEdge,
style: { stroke: theme === 'dark' ? '#ccc' : '#a3a3a3', strokeDasharray: '2,2' },
markerEnd,
type: edgeType,
};
newEdges.push(updatedEdge);
}
},
};
newEdges.push(edge);
}
},
[getTimeAgo, handleClosePanel, handleMenuOpen, theme, currentZoom, getScaledNodeStyle, edgeType]
[getTimeAgo, handleClosePanel, handleMenuOpen, theme, edgeType]
);

const transformDataToTree = useCallback(
Expand All @@ -868,11 +871,11 @@
setIsTransforming(false);
return;
}

const clusterTimestampMap = await fetchAllClusterTimestamps(data);

// Clear caches when theme changes to ensure proper styling
// Clear node cache to ensure fresh nodes with updated styles
nodeCache.current.clear();
edgeCache.current.clear();
edgeIdCounter.current = 0;

const newNodes: CustomNode[] = [];
Expand Down Expand Up @@ -1270,23 +1273,30 @@
newNodes,
newEdges,
'LR',
prevNodes,
currentZoom
prevNodes
);
if (!isEqual(nodes, layoutedNodes)) setNodes(layoutedNodes);
if (!isEqual(edges, layoutedEdges)) setEdges(layoutedEdges);

if (!isEqual(nodes, layoutedNodes)) {
setNodes(layoutedNodes);
setEdges(layoutedEdges);
} else if (!isEqual(edges, layoutedEdges)) {
setEdges(layoutedEdges);
}

prevNodes.current = layoutedNodes;
setIsTransforming(false);
},
[createNode, nodes, edges, fetchAllClusterTimestamps, currentZoom, edgeType]
[createNode, fetchAllClusterTimestamps]

Check warning on line 1289 in frontend/src/components/WecsTopology.tsx

View workflow job for this annotation

GitHub Actions / Frontend Checks 

React Hook useCallback has missing dependencies: 'edges' and 'nodes'. Either include them or remove the dependency array
);

// Memoize the data processing to avoid unnecessary re-renders
const memoizedWecsData = useMemo(() => wecsData, [wecsData]);

// Memoize node and edge rendering to prevent unnecessary re-renders
const memoizedNodes = useMemo(() => nodes, [nodes]);
const memoizedEdges = useMemo(() => edges, [edges]);
// Memoize node rendering to prevent unnecessary re-renders
const memoizedNodes = useMemo(() => {
if (nodes.length === 0) return [];
return nodes;
}, [nodes]);
Comment on lines +1296 to +1299
Copy link

Copilot AI Dec 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ineffective memoization pattern. The useMemo checks for empty arrays and returns a new empty array reference each time, or returns the same nodes reference. This provides no actual memoization benefit since the dependency is [nodes], which already triggers re-computation when nodes change.

The pattern useMemo(() => condition ? [] : value, [value]) is redundant. Consider either removing this useMemo entirely or implementing meaningful memoization logic if there's a specific use case.

Copilot uses AI. Check for mistakes.

useEffect(() => {
if (memoizedWecsData !== null && !isEqual(memoizedWecsData, prevWecsData.current)) {
Expand Down Expand Up @@ -1621,7 +1631,7 @@
<ReactFlowProvider>
<FlowCanvas
nodes={memoizedNodes}
edges={memoizedEdges}
edges={edges}
renderStartTime={renderStartTime}
theme={theme}
/>
Expand Down
11 changes: 11 additions & 0 deletions frontend/src/components/wds_topology/FlowCanvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,17 @@ export const FlowCanvas = memo<FlowCanvasProps>(({ nodes, edges, theme }) => {
.react-flow__edge-path {
stroke-width: 2;
stroke-dasharray: none;
will-change: auto;
}

.react-flow__edges {
will-change: transform;
transform: translateZ(0);
}

.react-flow__nodes {
will-change: transform;
transform: translateZ(0);
}

/* Ensure menu buttons are always clickable */
Expand Down
Loading