From a72ff7600540099e0ebd5c93cc8e38d85be6e7f4 Mon Sep 17 00:00:00 2001
From: Aviv Turgeman <aturgema@redhat.com>
Date: Wed, 29 Jan 2025 13:44:20 +0200
Subject: [PATCH] Manual backport for #116

Signed-off-by: Aviv Turgeman <aturgema@redhat.com>
---
 src/views/states/topology/utils/utils.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/states/topology/utils/utils.ts b/src/views/states/topology/utils/utils.ts
index 020ad72..a06b16f 100644
--- a/src/views/states/topology/utils/utils.ts
+++ b/src/views/states/topology/utils/utils.ts
@@ -62,10 +62,10 @@ const createNodes = (
 const createEdges = (childNodes: NodeModel[]): EdgeModel[] => {
   const edges: EdgeModel[] = [];
 
-  childNodes.forEach((sourceNode) => {
+  childNodes?.forEach((sourceNode) => {
     // Find bridge connections
     if (!isEmpty(sourceNode.data?.bridgePorts)) {
-      sourceNode.data?.bridgePorts.forEach((port) => {
+      sourceNode.data?.bridgePorts?.forEach((port) => {
         const targetNode = childNodes.find(
           (target) => target.label === port.name && target.id !== sourceNode.id,
         );
@@ -82,8 +82,8 @@ const createEdges = (childNodes: NodeModel[]): EdgeModel[] => {
     }
 
     // Find bond connections
-    if (!isEmpty(sourceNode.data?.vlanBaseInterface)) {
-      sourceNode.data?.bondPorts.forEach((port) => {
+    if (!isEmpty(sourceNode.data?.bondPorts)) {
+      sourceNode.data?.bondPorts?.forEach((port) => {
         const targetNode = childNodes.find(
           (target) => target.label === port && target.id !== sourceNode.id,
         );
@@ -100,7 +100,7 @@ const createEdges = (childNodes: NodeModel[]): EdgeModel[] => {
     }
 
     // Find vlan connections
-    if (!isEmpty(sourceNode.data?.bondPorts)) {
+    if (!isEmpty(sourceNode.data?.vlanBaseInterface)) {
       const baseInterface = sourceNode.data?.vlanBaseInterface;
 
       const targetNode = childNodes.find(
@@ -145,7 +145,7 @@ export const transformDataToTopologyModel = (
   const nodes: NodeModel[] = [];
   const edges: EdgeModel[] = [];
 
-  data.forEach((nodeState) => {
+  data?.forEach((nodeState) => {
     const nnsName = nodeState.metadata.name;
 
     const childNodes = createNodes(nnsName, nodeState.status.currentState.interfaces);