fix: ui crash if copying component with no controls/threats

klarna-incubator · Nov 14, 2023 · 38e80f6 · 38e80f6
1 parent 8d6c988
commit 38e80f6
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/app/src/actions/model/copyNodes.js b/app/src/actions/model/copyNodes.js
@@ -76,7 +76,7 @@ export const copyNodes = (componentIds) => async (dispatch, getState) => {
     //copy threats
     const copyThreats = async () => {
       await Promise.all(
-        threats?.threats[oldComponentId].map(async (oldThreatData) => {
+        (threats?.threats[oldComponentId] || []).map(async (oldThreatData) => {
           const result = await dispatch(
             api.endpoints.createThreat.initiate({
               modelId: oldThreatData.modelId,
@@ -97,29 +97,31 @@ export const copyNodes = (componentIds) => async (dispatch, getState) => {
 
     const copyControls = async () =>
       await Promise.all(
-        controls?.controls[oldComponentId].map(async (oldControlData) => {
-          const result = await dispatch(
-            api.endpoints.createControl.initiate({
-              modelId: oldControlData.modelId,
-              control: {
-                componentId: newComponentId,
-                description: oldControlData.description,
-                title: oldControlData.title,
-                inPlace: oldControlData.inPlace,
-              },
-            })
-          );
-
-          if (result?.data?.control?.id) {
-            idMap.set(oldControlData.id, result.data.control.id);
+        (controls?.controls[oldComponentId] || []).map(
+          async (oldControlData) => {
+            const result = await dispatch(
+              api.endpoints.createControl.initiate({
+                modelId: oldControlData.modelId,
+                control: {
+                  componentId: newComponentId,
+                  description: oldControlData.description,
+                  title: oldControlData.title,
+                  inPlace: oldControlData.inPlace,
+                },
+              })
+            );
+
+            if (result?.data?.control?.id) {
+              idMap.set(oldControlData.id, result.data.control.id);
+            }
           }
-        })
+        )
       );
 
     await Promise.all([copyThreats(), copyControls()]);
 
     const oldThreats = new Set(
-      threats?.threats[oldComponentId].map((t) => t.id)
+      threats?.threats[oldComponentId]?.map((t) => t.id) || []
     );
 
     //link mitigations