From b5ed52131a716cbb71c2ccd5090c53187292a297 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Wed, 15 Jan 2020 09:11:54 +0100
Subject: [PATCH] Bugs Fixed

---
 Panels/Layer.js   | 3 ++-
 ProductStorage.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Panels/Layer.js b/Panels/Layer.js
index 2ac627e97..5f0987417 100644
--- a/Panels/Layer.js
+++ b/Panels/Layer.js
@@ -137,7 +137,8 @@ function newLayer () {
                         'Record Definition->Record Property->Formula->' +
                         'Data Building Procedure->Procedure Loop->Javascript Code->Procedure Initialization->Javascript Code->' +
                         'Calculations Procedure->Procedure Loop->Javascript Code->Procedure Initialization->Javascript Code->' +
-                        'Plotter Module->Shapes->' +
+                        'Plotter Module->Plotter->' +
+                        'Shapes->' +
                         'Chart Points->Point->Point Formula->' +
                         'Polygon->Polygon Body->Style->Style Condition->Style->' +
                         'Polygon Border->Style->Style Condition->Style->' +
diff --git a/ProductStorage.js b/ProductStorage.js
index 3feff668b..4e0c4142a 100644
--- a/ProductStorage.js
+++ b/ProductStorage.js
@@ -85,7 +85,7 @@ function newProductStorage (name) {
       for (let i = 0; i < product.datasets.length; i++) {
         let dataset = product.datasets[i]
 
-        switch (dataset.type) {
+        switch (dataset.code.type) {
           case 'Market Files': {
             dataSetsToLoad++
 
@@ -122,7 +122,7 @@ function newProductStorage (name) {
           }
             break
           default:
-            if (ERROR_LOG === true) { logger.write('[WARN] initialize -> initialize -> dataset with no type defined. Data can not be retrieved. -> codeName = ' + dataset.codeName) }
+            if (ERROR_LOG === true) { logger.write('[WARN] initialize -> dataset with no type defined or type not supported -> dataset.code.type = ' + dataset.code.type) }
         }
 
         function onMarketFileReady (err, pCaller) {