From b3302a87f58592ad74cb336ca79db318222c7fa4 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 27 May 2019 12:55:32 +0200
Subject: [PATCH] Bug Fixed: Attaching & Detaching

---
 FloatingSpace/StrategyPart.js                 |  6 ++++
 .../FunctionLibraries/AttachDetach.js         | 30 +++++++++----------
 StrategySpace/Workspace/Workspace.js          |  6 ++--
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js
index aa6e7b190..43c576769 100644
--- a/FloatingSpace/StrategyPart.js
+++ b/FloatingSpace/StrategyPart.js
@@ -305,7 +305,12 @@ function newStrategyPart () {
 
     let distanceToChainParent = Math.sqrt(Math.pow(thisObject.payload.position.x - thisObject.payload.targetPosition.x, 2) + Math.pow(thisObject.payload.position.y - thisObject.payload.targetPosition.y, 2))
     let ratio = distanceToChainParent / previousDistance
+    if (previousDistance === 0) {
+      previousDistance = distanceToChainParent
+      return
+    }
     previousDistance = distanceToChainParent
+
     if (thisObject.isOnFocus !== true) { return }
     if (thisObject.payload.chainParent === undefined) { return }
     if (thisObject.payload.parentNode === undefined) { return }
@@ -714,3 +719,4 @@ function newStrategyPart () {
     }
   }
 }
+
diff --git a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js
index 3a5d01aa0..8850d9204 100644
--- a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js
+++ b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js
@@ -6,7 +6,7 @@ function newAttachDetach () {
 
   return thisObject
 
-  function detachNode (node) {
+  function detachNode (node, rootNodes) {
     switch (node.type) {
       case 'Trading System': {
         return
@@ -18,7 +18,7 @@ function newAttachDetach () {
           if (strategy.id === node.id) {
             payload.parentNode.strategies.splice(i, 1)
           }
-          completeDetachment(node)
+          completeDetachment(node, rootNodes)
         }
       }
         break
@@ -65,7 +65,7 @@ function newAttachDetach () {
             payload.parentNode.conditions.splice(i, 1)
           }
         }
-        completeDetachment(node)
+        completeDetachment(node, rootNodes)
       }
         break
       case 'Situation': {
@@ -76,7 +76,7 @@ function newAttachDetach () {
             payload.parentNode.situations.splice(i, 1)
           }
         }
-        completeDetachment(node)
+        completeDetachment(node, rootNodes)
       }
         break
       case 'Phase': {
@@ -94,7 +94,7 @@ function newAttachDetach () {
               }
             }
             payload.parentNode.phases.splice(i, 1)
-            completeDetachment(node)
+            completeDetachment(node, rootNodes)
             return
           }
         }
@@ -102,13 +102,13 @@ function newAttachDetach () {
     }
   }
 
-  function attachNode (node, attachToNode) {
+  function attachNode (node, attachToNode, rootNodes) {
     switch (node.type) {
       case 'Strategy': {
         node.payload.parentNode = attachToNode
         node.payload.chainParent = attachToNode
         node.payload.parentNode.strategies.push(node)
-        completeAttachment(node)
+        completeAttachment(node, rootNodes)
       }
         break
       case 'Phase': {
@@ -122,7 +122,7 @@ function newAttachDetach () {
               node.payload.chainParent = attachToNode
             }
             attachToNode.phases.push(node)
-            completeAttachment(node)
+            completeAttachment(node, rootNodes)
           }
             break
           case 'Take Profit': {
@@ -134,7 +134,7 @@ function newAttachDetach () {
               node.payload.chainParent = attachToNode
             }
             attachToNode.phases.push(node)
-            completeAttachment(node)
+            completeAttachment(node, rootNodes)
           }
             break
           case 'Phase': {
@@ -145,13 +145,13 @@ function newAttachDetach () {
                 if (i === node.payload.parentNode.phases.length - 1) {
                   node.payload.chainParent = attachToNode
                   node.payload.parentNode.phases.push(node)
-                  completeAttachment(node)
+                  completeAttachment(node, rootNodes)
                 } else {
                   node.payload.chainParent = attachToNode
                   let nextPhase = node.payload.parentNode.phases[i + 1]
                   nextPhase.payload.chainParent = node
                   node.payload.parentNode.phases.splice(i + 1, 0, node)
-                  completeAttachment(node)
+                  completeAttachment(node, rootNodes)
                   return
                 }
               }
@@ -164,26 +164,26 @@ function newAttachDetach () {
         node.payload.parentNode = attachToNode
         node.payload.chainParent = attachToNode
         node.payload.parentNode.situations.push(node)
-        completeAttachment(node)
+        completeAttachment(node, rootNodes)
       }
         break
       case 'Condition': {
         node.payload.parentNode = attachToNode
         node.payload.chainParent = attachToNode
         node.payload.parentNode.conditions.push(node)
-        completeAttachment(node)
+        completeAttachment(node, rootNodes)
       }
         break
     }
   }
 
-  function completeDetachment (node) {
+  function completeDetachment (node, rootNodes) {
     node.payload.parentNode = undefined
     node.payload.chainParent = undefined
     rootNodes.push(node)
   }
 
-  function completeAttachment (node) {
+  function completeAttachment (node, rootNodes) {
     for (let i = 0; i < rootNodes.length; i++) {
       let rootNode = rootNodes[i]
       if (rootNode.id === node.id) {
diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js
index d7bb49461..47fa6c650 100644
--- a/StrategySpace/Workspace/Workspace.js
+++ b/StrategySpace/Workspace/Workspace.js
@@ -94,11 +94,11 @@ function newWorkspace () {
   }
 
   function detachNode (node) {
-    functionLibraryAttachDetach.detachNode(node)
+    functionLibraryAttachDetach.detachNode(node, rootNodes)
   }
 
-  function attachNode (node) {
-    functionLibraryAttachDetach.attachNode(node)
+  function attachNode (node, attachToNode) {
+    functionLibraryAttachDetach.attachNode(node, attachToNode, rootNodes)
   }
 
   function physics () {