From 5206f41fb434bda7609fec642106d80cef71e514 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Tue, 16 Jul 2019 20:06:36 +0200
Subject: [PATCH] Bug Fixing and missing stuff

---
 FloatingSpace/StrategyPartConstructor.js             |  4 ++--
 .../Workspace/FunctionLibraries/NodeChildren.js      | 12 ++++++++++++
 .../Workspace/FunctionLibraries/PartsFromNodes.js    |  7 +++++++
 .../Workspace/FunctionLibraries/ProtocolNode.js      |  6 ++++--
 .../Workspace/FunctionLibraries/StringifyNode.js     |  2 ++
 StrategySpace/Workspace/Workspace.js                 |  8 ++++++++
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js
index 16ee8683c..40269b3d0 100644
--- a/FloatingSpace/StrategyPartConstructor.js
+++ b/FloatingSpace/StrategyPartConstructor.js
@@ -970,7 +970,7 @@ function newStrategyPartConstructor () {
             askConfirmation: true,
             confirmationLabel: 'Confirm to Delete',
             actionFunction: payload.onMenuItemClick,
-            label: 'Delete This Definition',
+            label: 'Delete This',
             visible: false,
             iconPathOn: 'trash',
             iconPathOff: 'trash',
@@ -1004,7 +1004,7 @@ function newStrategyPartConstructor () {
             askConfirmation: true,
             confirmationLabel: 'Confirm to Delete',
             actionFunction: payload.onMenuItemClick,
-            label: 'Delete This Definition',
+            label: 'Delete This',
             visible: false,
             iconPathOn: 'trash',
             iconPathOff: 'trash',
diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js
index 1dadb8006..086b7237e 100644
--- a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js
+++ b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js
@@ -206,6 +206,12 @@ function newNodeChildren () {
         response.childIndex = response.childrenCount
       }
     }
+    if (parentNode.openExecution !== undefined) {
+      response.childrenCount++
+      if (parentNode.openExecution.id === childNode.id) {
+        response.childIndex = response.childrenCount
+      }
+    }
     return response
   }
 
@@ -234,6 +240,12 @@ function newNodeChildren () {
       childrenCount: 0,
       childIndex: undefined
     }
+    if (parentNode.closeExecution !== undefined) {
+      response.childrenCount++
+      if (parentNode.closeExecution.id === childNode.id) {
+        response.childIndex = response.childrenCount
+      }
+    }
     return response
   }
 
diff --git a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js
index 73f429808..6d0d52e2e 100644
--- a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js
+++ b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js
@@ -194,6 +194,9 @@ function newPartsFromNodes () {
         if (node.initialDefinition !== undefined) {
           createPartFromNode(node.initialDefinition, stage, stage)
         }
+        if (node.openExecution !== undefined) {
+          createPartFromNode(node.openExecution, stage, stage)
+        }
         return
       }
       case 'Manage Stage': {
@@ -211,6 +214,10 @@ function newPartsFromNodes () {
       case 'Close Stage': {
         let stage = node
         createPart('Close Stage', stage.name, stage, parentNode, chainParent, 'Close Stage')
+
+        if (node.closeExecution !== undefined) {
+          createPartFromNode(node.closeExecution, stage, stage)
+        }
         return
       }
       case 'Strategy': {
diff --git a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js
index 9eb6d1377..b73b76179 100644
--- a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js
+++ b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js
@@ -207,7 +207,8 @@ function newProtocolNode () {
           type: node.type,
           subType: node.subType,
           name: node.name,
-          initialDefinition: getProtocolNode(node.initialDefinition)
+          initialDefinition: getProtocolNode(node.initialDefinition),
+          openExecution: getProtocolNode(node.openExecution)
         }
         return stage
       }
@@ -225,7 +226,8 @@ function newProtocolNode () {
         let stage = {
           type: node.type,
           subType: node.subType,
-          name: node.name
+          name: node.name,
+          closeExecution: getProtocolNode(node.closeExecution)
         }
         return stage
       }
diff --git a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js
index eb75a7eb7..91cb154c3 100644
--- a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js
+++ b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js
@@ -245,6 +245,7 @@ function newStringifyNode () {
           subType: node.subType,
           name: node.name,
           initialDefinition: prepareForStringify(node.initialDefinition),
+          openExecution: prepareForStringify(node.openExecution),
           savedPayload: getSavedPayload(node)
         }
         return stage
@@ -267,6 +268,7 @@ function newStringifyNode () {
           type: node.type,
           subType: node.subType,
           name: node.name,
+          closeExecution: prepareForStringify(node.closeExecution),
           savedPayload: getSavedPayload(node)
         }
         return stage
diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js
index b10fd119e..c46878fb7 100644
--- a/StrategySpace/Workspace/Workspace.js
+++ b/StrategySpace/Workspace/Workspace.js
@@ -306,6 +306,14 @@ function newWorkspace () {
         functionLibraryNodeDeleter.deleteInitialDefinition(payload.node, workspaceNode.rootNodes)
         break
       }
+      case 'Delete Open Execution': {
+        functionLibraryNodeDeleter.deleteOpenExecution(payload.node, workspaceNode.rootNodes)
+        break
+      }
+      case 'Delete Close Execution': {
+        functionLibraryNodeDeleter.deleteCloseExecution(payload.node, workspaceNode.rootNodes)
+        break
+      }
       case 'Delete Event': {
         functionLibraryNodeDeleter.deleteEvent(payload.node, workspaceNode.rootNodes)
         break