From e660e5f84ef21cff4d0e23e10a06fbe42cfc55d8 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 14 Oct 2020 18:18:23 +0200 Subject: [PATCH] Post Loader --- .../FunctionLibraries/NodeCloning.js | 6 ++-- .../FunctionLibraries/ProtocolNode.js | 3 +- .../FunctionLibraries/UiObjectsFromNodes.js | 12 ++----- Globals.js | 11 ++++-- PostLoader.js | 36 +++---------------- 5 files changed, 21 insertions(+), 47 deletions(-) diff --git a/DesignSpace/Workspace/FunctionLibraries/NodeCloning.js b/DesignSpace/Workspace/FunctionLibraries/NodeCloning.js index d0f91677a..78d08b249 100644 --- a/DesignSpace/Workspace/FunctionLibraries/NodeCloning.js +++ b/DesignSpace/Workspace/FunctionLibraries/NodeCloning.js @@ -25,7 +25,8 @@ function newNodeCloning() { type: node.type, name: node.name, code: node.code, - config: node.config + config: node.config, + project: node.project } /* Children Nodes */ @@ -78,7 +79,8 @@ function newNodeCloning() { type: node.type, name: node.name, code: node.code, - config: node.config + config: node.config, + project: node.project } /* Children Nodes */ diff --git a/DesignSpace/Workspace/FunctionLibraries/ProtocolNode.js b/DesignSpace/Workspace/FunctionLibraries/ProtocolNode.js index 04c7bf1cb..a303b79c4 100644 --- a/DesignSpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/DesignSpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -20,7 +20,8 @@ function newProtocolNode() { type: node.type, name: node.name, code: node.code, - config: node.config + config: node.config, + project: node.project } /* Children Nodes */ diff --git a/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js index 69706be31..6ae08e9ae 100644 --- a/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js +++ b/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js @@ -216,15 +216,6 @@ function newUiObjectsFromNodes() { } function createUiObjectFromNode(node, parentNode, chainParent, positionOffset) { - /* Code needed to Migrante from Beta 5 to Beta 6 a Trading System - if (node.type === 'Take Profit') { - node.type = 'Managed Take Profit' - } - if (node.type === 'Stop') { - node.type = 'Managed Stop Loss' - } - */ - /* This function can be called with a positionOffset to change the node saved position and all of its descendants positions as well with an @@ -323,7 +314,8 @@ function newUiObjectsFromNodes() { function addUIObject(parentNode, type) { let object = { name: 'New ' + type, - type: type + type: type, + project: parentNode.project } let parentNodeDefinition = getNodeDefinition(parentNode) diff --git a/Globals.js b/Globals.js index d6f95a94d..38a6d4964 100644 --- a/Globals.js +++ b/Globals.js @@ -1,6 +1,14 @@ +/* Canvas is the root object that will contain all spaces and everything inside. */ +let canvas + +let APP_SCHEMA_MAP = new Map() +let APP_SCHEMA_ARRAY = [] +let DOC_SCHEMA_MAP = new Map() +let DOC_SCHEMA_ARRAY = [] +let CONCEPT_SCHEMA_MAP = new Map() +let CONCEPT_SCHEMA_ARRAY = [] /* User Interface Colors */ - const UI_COLOR = { DARK: "48, 48, 54", LIGHT: "234, 226, 222", @@ -20,7 +28,6 @@ const UI_COLOR = { }; /* User Interface Fonts */ - const UI_FONT = { PRIMARY: "Saira Condensed", SECONDARY: "Source Code Pro" diff --git a/PostLoader.js b/PostLoader.js index 9125e3e9e..fb5fd562e 100644 --- a/PostLoader.js +++ b/PostLoader.js @@ -1,15 +1,7 @@ -let canvas -let markets -let APP_SCHEMA_MAP = new Map() -let APP_SCHEMA_ARRAY = [] -let DOC_SCHEMA_MAP = new Map() -let DOC_SCHEMA_ARRAY = [] -let CONCEPT_SCHEMA_MAP = new Map() -let CONCEPT_SCHEMA_ARRAY = [] -function newDashboard() { - const MODULE_NAME = 'Dashboard' +function newPostLoader() { + const MODULE_NAME = 'Post Loader' const ERROR_LOG = true const logger = newWebDebugLog() logger.fileName = MODULE_NAME @@ -52,34 +44,14 @@ function newDashboard() { if (canvas !== undefined) { canvas.finalize() } - startSuperalgos() + canvas = newCanvas() + canvas.initialize() } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] start -> err = ' + err.stack) } } } - function startSuperalgos() { - try { - /* For now, we are supporting only one market. */ - - let market = { - id: 2, - baseAsset: 'USDT', - quotedAsset: 'BTC' - } - - markets = new Map() - - markets.set(market.id, market) - - canvas = newCanvas() - canvas.initialize() - } catch (err) { - if (ERROR_LOG === true) { logger.write('[ERROR] startSuperalgos -> err = ' + err.stack) } - } - } - function setBrowserEvents() { window.onbeforeunload = saveWorkspace