From 4f5fc17b201db37ca1ef8c44068042ae2f860c7c Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Tue, 8 Oct 2019 12:02:01 +0200
Subject: [PATCH] Bug Detaching Sensors, Indicators and Trading Engines

---
 FloatingSpace/StrategyPartConstructor.js      | 78 ++++++++++++++++---
 .../FunctionLibraries/AttachDetach.js         |  6 +-
 .../FunctionLibraries/PartsFromNodes.js       |  9 ++-
 3 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js
index b3ffccea3..cfb1a735f 100644
--- a/FloatingSpace/StrategyPartConstructor.js
+++ b/FloatingSpace/StrategyPartConstructor.js
@@ -707,6 +707,11 @@ function newStrategyPartConstructor () {
         break
       }
       case 'Sensor': {
+        strategyPart.codeEditor = newCodeEditor()
+        strategyPart.codeEditor.isVisibleFunction = strategyPart.isVisibleFunction
+        strategyPart.codeEditor.initialize()
+        strategyPart.codeEditor.container.connectToParent(strategyPart.container, false, false, true, true, false, false, false, false)
+
         addLeftIcons(menuItemsInitialValues, floatingObject)
         menuItemsInitialValues.push(
           {
@@ -718,9 +723,24 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: -40
+            angle: -45
           }
           )
+        menuItemsInitialValues.push(
+          {
+            action: 'Edit Sensor',
+            actionFunction: strategyPart.codeEditor.activate,
+            label: 'Edit Sensor',
+            visible: true,
+            iconPathOn: 'html',
+            iconPathOff: 'html',
+            rawRadius: 8,
+            targetRadius: 0,
+            currentRadius: 0,
+            angle: -15,
+            dontShowAtFullscreen: true
+          }
+            )
         menuItemsInitialValues.push(
           {
             action: 'Delete Sensor',
@@ -734,7 +754,7 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: 0
+            angle: 15
           }
             )
         menuItemsInitialValues.push(
@@ -748,12 +768,17 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: 40
+            angle: 45
           }
                     )
         break
       }
       case 'Indicator': {
+        strategyPart.codeEditor = newCodeEditor()
+        strategyPart.codeEditor.isVisibleFunction = strategyPart.isVisibleFunction
+        strategyPart.codeEditor.initialize()
+        strategyPart.codeEditor.container.connectToParent(strategyPart.container, false, false, true, true, false, false, false, false)
+
         addLeftIcons(menuItemsInitialValues, floatingObject)
         menuItemsInitialValues.push(
           {
@@ -765,9 +790,24 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: -40
+            angle: -45
           }
           )
+        menuItemsInitialValues.push(
+          {
+            action: 'Edit Indicator',
+            actionFunction: strategyPart.codeEditor.activate,
+            label: 'Edit Indicator',
+            visible: true,
+            iconPathOn: 'html',
+            iconPathOff: 'html',
+            rawRadius: 8,
+            targetRadius: 0,
+            currentRadius: 0,
+            angle: -15,
+            dontShowAtFullscreen: true
+          }
+            )
         menuItemsInitialValues.push(
           {
             action: 'Delete Indicator',
@@ -781,7 +821,7 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: 0
+            angle: 15
           }
             )
         menuItemsInitialValues.push(
@@ -795,12 +835,17 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: 40
+            angle: 45
           }
             )
         break
       }
       case 'Trading Engine': {
+        strategyPart.codeEditor = newCodeEditor()
+        strategyPart.codeEditor.isVisibleFunction = strategyPart.isVisibleFunction
+        strategyPart.codeEditor.initialize()
+        strategyPart.codeEditor.container.connectToParent(strategyPart.container, false, false, true, true, false, false, false, false)
+
         addLeftIcons(menuItemsInitialValues, floatingObject)
         menuItemsInitialValues.push(
           {
@@ -812,7 +857,22 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: -40
+            angle: -45
+          }
+          )
+        menuItemsInitialValues.push(
+          {
+            action: 'Edit Trading Engine',
+            actionFunction: strategyPart.codeEditor.activate,
+            label: 'Edit Trading Engine',
+            visible: true,
+            iconPathOn: 'html',
+            iconPathOff: 'html',
+            rawRadius: 8,
+            targetRadius: 0,
+            currentRadius: 0,
+            angle: -15,
+            dontShowAtFullscreen: true
           }
           )
         menuItemsInitialValues.push(
@@ -828,7 +888,7 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: 0
+            angle: 15
           }
             )
         menuItemsInitialValues.push(
@@ -842,7 +902,7 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: 40
+            angle: 45
           }
           )
         break
diff --git a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js
index 7d86667b3..4ae7812ea 100644
--- a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js
+++ b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js
@@ -104,17 +104,17 @@ function newAttachDetach () {
         return
       }
       case 'Sensor': {
-        node.payload.parentNode.sensor = undefined
+        node.payload.parentNode.bot = undefined
         completeDetachment(node, rootNodes)
         return
       }
       case 'Indicator': {
-        node.payload.parentNode.indicator = undefined
+        node.payload.parentNode.bot = undefined
         completeDetachment(node, rootNodes)
         return
       }
       case 'Trading Engine': {
-        node.payload.parentNode.tradingEngine = undefined
+        node.payload.parentNode.bot = undefined
         completeDetachment(node, rootNodes)
         return
       }
diff --git a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js
index 472551122..e4a946d14 100644
--- a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js
+++ b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js
@@ -565,7 +565,8 @@ function newPartsFromNodes () {
   function addSensor (node) {
     if (node.bot === undefined) {
       node.bot = {
-        processes: []
+        processes: [],
+        code: '{}'
       }
       createPart('Sensor', '', node.bot, node, node)
     }
@@ -575,7 +576,8 @@ function newPartsFromNodes () {
   function addIndicator (node) {
     if (node.bot === undefined) {
       node.bot = {
-        processes: []
+        processes: [],
+        code: '{}'
       }
       createPart('Indicator', '', node.bot, node, node)
     }
@@ -585,7 +587,8 @@ function newPartsFromNodes () {
   function addTradingEngine (node) {
     if (node.bot === undefined) {
       node.bot = {
-        processes: []
+        processes: [],
+        code: '{}'
       }
       createPart('Trading Engine', '', node.bot, node, node)
     }