From 1e3b82ed22a96d72a12fa55cf6965d4c447abc30 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Tue, 21 Jan 2020 11:54:31 +0100
Subject: [PATCH] Simulation working again

---
 ChartsSpace/PlottersManager.js                            | 8 ++++++++
 .../Workspace/FunctionLibraries/TaskFunctions.js          | 2 +-
 Panels/Layer.js                                           | 2 +-
 Panels/LayersPanel.js                                     | 7 ++++---
 Spaces/ChartSpace.js                                      | 1 +
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ChartsSpace/PlottersManager.js b/ChartsSpace/PlottersManager.js
index 593248445..169e10ca7 100644
--- a/ChartsSpace/PlottersManager.js
+++ b/ChartsSpace/PlottersManager.js
@@ -150,6 +150,14 @@ function newPlottersManager () {
       let plotterModule = layer.definition.referenceParent.referenceParent.referenceParent
       let session
 
+      if (layer.definition.referenceParent.parentNode.parentNode !== undefined) {
+        if (layer.definition.referenceParent.parentNode.parentNode.type === 'Session Reference') {
+          if (layer.definition.referenceParent.parentNode.parentNode.referenceParent !== undefined) {
+            session = layer.definition.referenceParent.parentNode.parentNode.referenceParent
+          }
+        }
+      }
+
       storage.initialize(
         dataMine,
         bot,
diff --git a/DesignerSpace/Workspace/FunctionLibraries/TaskFunctions.js b/DesignerSpace/Workspace/FunctionLibraries/TaskFunctions.js
index 9073bf7ff..3a1d3ca57 100644
--- a/DesignerSpace/Workspace/FunctionLibraries/TaskFunctions.js
+++ b/DesignerSpace/Workspace/FunctionLibraries/TaskFunctions.js
@@ -29,7 +29,7 @@ function newTaskFunctions () {
     'Indicator Bot Instance->' +
     'Trading Bot Instance->' +
     'Process Instance->' +
-    'Market Instance->Market->Exchange Markets->Crypto Exchange->' +
+    'Market Reference->Market->Exchange Markets->Crypto Exchange->' +
     'Market Base Asset->Market Quoted Asset->Asset->' +
     'Backtesting Session->Live Trading Session->Paper Trading Session->Fordward Testing Session->' +
     'Process Definition->' +
diff --git a/Panels/Layer.js b/Panels/Layer.js
index 032e52b97..41eac1827 100644
--- a/Panels/Layer.js
+++ b/Panels/Layer.js
@@ -129,7 +129,7 @@ function newLayer () {
                         '->Layer->' +
                         'Data Product->Single Market Data->' +
                         'Session Independent Data->Session Based Data->' +
-                        'Session Instance->Backtesting Session->Paper Trading Session->Fordward Testing Session->Live Trading Session->' +
+                        'Session Reference->Backtesting Session->Paper Trading Session->Fordward Testing Session->Live Trading Session->' +
                         'Market->Market Base Asset->Asset->' +
                         'Market Quoted Asset->Asset->' +
                         'Exchange Markets->Crypto Exchange->' +
diff --git a/Panels/LayersPanel.js b/Panels/LayersPanel.js
index f4c257052..2144c28f7 100644
--- a/Panels/LayersPanel.js
+++ b/Panels/LayersPanel.js
@@ -90,6 +90,7 @@ function newProductsPanel () {
     /* Now we create Product objects */
     let layer = newLayer()
     layer.payload = layerNode.payload
+    layer.nodeId = layerNode.payload.node.id
     layer.fitFunction = thisObject.fitFunction
 
     /* Initialize it */
@@ -315,7 +316,7 @@ function newProductsPanel () {
     function turnOffUnusedLayers () {
       for (let i = 0; i < localLayers.length; i++) {
         let layer = localLayers[i]
-        removeLayer(layer.payload.node.id)
+        removeLayer(layer.nodeId)
       }
     }
   }
@@ -334,8 +335,8 @@ function newProductsPanel () {
   }
 
   function drawHeader () {
-    let label1 = thisObject.payload.node.payload.parentNode.payload.parentNode.name.substring(0, 15)
-    let label2 = thisObject.payload.node.payload.parentNode.name.substring(0, 15)
+    let label1 = thisObject.payload.node.payload.parentNode.payload.parentNode.name.substring(0, 18)
+    let label2 = thisObject.payload.node.payload.parentNode.name.substring(0, 18)
     let label3 = ''
 
     let icon1 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.payload.parentNode.type)
diff --git a/Spaces/ChartSpace.js b/Spaces/ChartSpace.js
index 25d105712..67b21038c 100644
--- a/Spaces/ChartSpace.js
+++ b/Spaces/ChartSpace.js
@@ -248,6 +248,7 @@ function newChartSpace () {
   }
 
   function syncWithDesigner () {
+    if (thisObject.payload.node === undefined) { return }
     syncWithDesignerLoop = syncWithDesignerLoop + 0.00000000001
 
     if (thisObject.payload.node.timeMachines !== undefined) {