From 9d1fbccf729c29ccc156ad9cfb585f79df28c81a Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Fri, 17 Dec 2021 02:27:01 +0100
Subject: [PATCH] Fixed undo button not readding nodes properly

---
 frontend/src/views/AngularWorkflow.jsx | 33 ++++++++++++++++++++------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index 90fb2466..5aed9339 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -2769,8 +2769,6 @@ const AngularWorkflow = (props) => {
 			//if (nodedata.app_id === undefined) {
 			console.log("Returning because node is not valid: ", nodedata)
       return;
-
-			//}
     }
     
 		//parsedApp.data.finished = true;
@@ -2854,7 +2852,13 @@ const AngularWorkflow = (props) => {
             JSON.stringify(nodedata.parameters[subkey])
           );
           newparam.id = uuidv4();
-          newparam.value = "";
+
+					if (newparam.value === undefined || newparam.value === null) {
+          	newparam.value = "";
+					} else {
+          	newparam.value = newparam.value;
+					}
+
           newparameters.push(newparam);
         }
 
@@ -2997,7 +3001,9 @@ const AngularWorkflow = (props) => {
         type: "node",
         action: "removed",
         data: data,
-      });
+      })
+
+			console.log("REMOVED: ", data)
       setHistory(history);
       setHistoryIndex(history.length);
     }
@@ -3915,13 +3921,16 @@ const AngularWorkflow = (props) => {
   };
 
   const removeNode = () => {
-    setSelectedApp({});
-    setSelectedAction({});
     const selectedNode = cy.$(":selected");
     if (selectedNode.data() === undefined) {
       return;
     }
 
+		if (selectedNode.data("id") === selectedAction.id) {
+			setSelectedApp({});
+			setSelectedAction({});
+		}
+
     if (selectedNode.data().type === "TRIGGER") {
       console.log("Should remove trigger!");
       console.log(selectedNode.data());
@@ -9579,6 +9588,7 @@ const AngularWorkflow = (props) => {
     console.log("HANDLE: ", item);
     if (item.type === "node" && item.action === "removed") {
       // Re-add the node
+			console.log("Item: ", item.data)
 
       cy.add({
         group: "nodes",
@@ -9591,7 +9601,16 @@ const AngularWorkflow = (props) => {
       if (currentitem !== undefined && currentitem !== null) {
         currentitem.remove();
       }
-    }
+
+    } else if (item.type === "edge" && item.action === "removed") {
+      cy.add({
+        group: "edges",
+        data: item.data,
+      });
+
+    } else {
+			console.log("UNHANDLED: ", item)
+		}
 
     if (historyIndex > 0) {
       setHistoryIndex(historyIndex - 1);