From cb9b0ce904213e447f1379f6f863b83e6e0dabea Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 16 Sep 2020 10:33:33 +0200 Subject: [PATCH] Refactoring --- .../CryptoEcosystemFunctions.js | 54 +++++++++---------- .../FunctionLibraries/DataStorageFunctions.js | 16 +++--- .../FunctionLibraries/TaskFunctions.js | 4 +- DesignSpace/Workspace/Workspace.js | 8 +-- Panels/Layer.js | 4 +- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/DesignSpace/Workspace/FunctionLibraries/CryptoEcosystemFunctions.js b/DesignSpace/Workspace/FunctionLibraries/CryptoEcosystemFunctions.js index f7503e608..c5c2f3743 100644 --- a/DesignSpace/Workspace/FunctionLibraries/CryptoEcosystemFunctions.js +++ b/DesignSpace/Workspace/FunctionLibraries/CryptoEcosystemFunctions.js @@ -290,47 +290,47 @@ function newCryptoEcosystemFunctions() { dashboardsArray.push({ environmentNode: environmentFound, networkNode: networkNode, sessionsArray: allSessionsArray }) } /* - Here we complete the missing stuff at Session Independent Data + Here we complete the missing stuff at Data Mines Data */ - let sessionIndependentData = findInBranch(networkNode, 'Session Independent Data', node, true) - if (sessionIndependentData === undefined) { - node.payload.uiObject.setErrorMessage('Session Independent Data node not found at Network Node ' + networkNode.name) + let dataMinesData = findInBranch(networkNode, 'Data Mines Data', node, true) + if (dataMinesData === undefined) { + node.payload.uiObject.setErrorMessage('Data Mines Data node not found at Network Node ' + networkNode.name) return } - let exchangeDataProducts = findOrCreateChildWithReference(sessionIndependentData, 'Exchange Data Products', cryptoExchange, functionLibraryUiObjectsFromNodes) + let exchangeDataProducts = findOrCreateChildWithReference(dataMinesData, 'Exchange Data Products', cryptoExchange, functionLibraryUiObjectsFromNodes) exchangeDataProducts.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180 - let singleMarketData = findAndRecreateChildWithReference(exchangeDataProducts, 'Single Market Data', market, rootNodes, functionLibraryUiObjectsFromNodes, functionLibraryNodeDeleter) - singleMarketData.payload.floatingObject.collapseToggle() + let marketDataProducts = findAndRecreateChildWithReference(exchangeDataProducts, 'Market Data Products', market, rootNodes, functionLibraryUiObjectsFromNodes, functionLibraryNodeDeleter) + marketDataProducts.payload.floatingObject.collapseToggle() - menuClick(singleMarketData, 'Add All Data Mine Products', true) - menuClickOfNodeArray(singleMarketData.dataMineProducts, 'Add All Data Products', true) + menuClick(marketDataProducts, 'Add All Data Mine Products', true) + menuClickOfNodeArray(marketDataProducts.dataMineProducts, 'Add All Data Products', true) /* - Finally we complete the missing stuff at Session Based Data + Finally we complete the missing stuff at Trading Mines Data */ - let sessionBasedData = findInBranch(networkNode, 'Session Based Data', node, true) - if (sessionBasedData === undefined) { - node.payload.uiObject.setErrorMessage('Session Based Data node not found at Network Node ' + networkNode.name) + let tradingMinesData = findInBranch(networkNode, 'Trading Mines Data', node, true) + if (tradingMinesData === undefined) { + node.payload.uiObject.setErrorMessage('Trading Mines Data node not found at Network Node ' + networkNode.name) return } - let exchangeSessions = findOrCreateChildWithReference(sessionBasedData, 'Exchange Sessions', cryptoExchange, functionLibraryUiObjectsFromNodes) - exchangeSessions.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180 + let exchangeTradingProducts = findOrCreateChildWithReference(tradingMinesData, 'Exchange Trading Products', cryptoExchange, functionLibraryUiObjectsFromNodes) + exchangeTradingProducts.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180 /* We need to delete all the session references related to the market we are installing. We make a copy of the array so that if we need to delete some nodes it does not affect the loop evaluating the nodes. */ let sessionReferencesArray = [] - for (let i = 0; i < exchangeSessions.sessionReferences.length; i++) { - sessionReference = exchangeSessions.sessionReferences[i] + for (let i = 0; i < exchangeTradingProducts.sessionReferences.length; i++) { + sessionReference = exchangeTradingProducts.sessionReferences[i] sessionReferencesArray.push(sessionReference) } for (let i = 0; i < sessionReferencesArray.length; i++) { sessionReference = sessionReferencesArray[i] - if (sessionReference.singleMarketTradingData === undefined) { continue } - if (sessionReference.singleMarketTradingData.payload.referenceParent === undefined) { continue } - if (sessionReference.singleMarketTradingData.payload.referenceParent.id === node.id) { + if (sessionReference.marketTradingProducts === undefined) { continue } + if (sessionReference.marketTradingProducts.payload.referenceParent === undefined) { continue } + if (sessionReference.marketTradingProducts.payload.referenceParent.id === node.id) { functionLibraryNodeDeleter.deleteUIObject(sessionReference, rootNodes) } } @@ -339,18 +339,18 @@ function newCryptoEcosystemFunctions() { */ for (let i = 0; i < sessionsCreatedArray.length; i++) { let session = sessionsCreatedArray[i] - if (isMissingChildren(exchangeSessions, session, true) === true) { - functionLibraryDataStorageFunctions.createSessionReference(exchangeSessions, session, functionLibraryUiObjectsFromNodes) + if (isMissingChildren(exchangeTradingProducts, session, true) === true) { + functionLibraryDataStorageFunctions.createSessionReference(exchangeTradingProducts, session, functionLibraryUiObjectsFromNodes) } } /* Create everything inside the session references. */ - for (let j = 0; j < exchangeSessions.sessionReferences.length; j++) { - sessionReference = exchangeSessions.sessionReferences[j] - menuClick(sessionReference.singleMarketTradingData, 'Add All Trading Mine Products', true) - menuClickOfNodeArray(sessionReference.singleMarketTradingData.tradingMineProducts, 'Add All Data Products', true) - sessionReference.singleMarketTradingData.payload.floatingObject.collapseToggle() + for (let j = 0; j < exchangeTradingProducts.sessionReferences.length; j++) { + sessionReference = exchangeTradingProducts.sessionReferences[j] + menuClick(sessionReference.marketTradingProducts, 'Add All Trading Mine Products', true) + menuClickOfNodeArray(sessionReference.marketTradingProducts.tradingMineProducts, 'Add All Data Products', true) + sessionReference.marketTradingProducts.payload.floatingObject.collapseToggle() } } } diff --git a/DesignSpace/Workspace/FunctionLibraries/DataStorageFunctions.js b/DesignSpace/Workspace/FunctionLibraries/DataStorageFunctions.js index 6b2ca9502..8c511bf62 100644 --- a/DesignSpace/Workspace/FunctionLibraries/DataStorageFunctions.js +++ b/DesignSpace/Workspace/FunctionLibraries/DataStorageFunctions.js @@ -4,8 +4,8 @@ function newDataStorageFunctions() { addAllDataMineProducts: addAllDataMineProducts, addAllTradingMineProducts: addAllTradingMineProducts, addMissingSessionReferences: addMissingSessionReferences, - addMissingSingleMarketData: addMissingSingleMarketData, - addMissingExchangeSessions: addMissingExchangeSessions, + addMissingMarketDataProducts: addMissingMarketDataProducts, + addMissingExchangeTradingProducts: addMissingExchangeTradingProducts, addMissingExchangeDataProducts: addMissingExchangeDataProducts, createSessionReference: createSessionReference } @@ -115,11 +115,11 @@ function newDataStorageFunctions() { where the Session was found. */ let marketTradingTasks = findNodeInNodeMesh(session, 'Market Trading Tasks', undefined, true, false, true, false) - sessionReference.singleMarketTradingData.payload.referenceParent = marketTradingTasks.payload.referenceParent + sessionReference.marketTradingProducts.payload.referenceParent = marketTradingTasks.payload.referenceParent marketTradingTasks.payload.floatingObject.collapseToggle() } - function addMissingSingleMarketData(node, rootNodes, functionLibraryUiObjectsFromNodes) { + function addMissingMarketDataProducts(node, rootNodes, functionLibraryUiObjectsFromNodes) { if (node.payload.referenceParent === undefined) { return } if (node.payload.referenceParent.exchangeMarkets === undefined) { return } let marketsArray = node.payload.referenceParent.exchangeMarkets.markets @@ -127,14 +127,14 @@ function newDataStorageFunctions() { for (let i = 0; i < marketsArray.length; i++) { let market = marketsArray[i] if (isMissingChildren(node, market, true) === true) { - let singleMarketData = functionLibraryUiObjectsFromNodes.addUIObject(node, 'Single Market Data') - singleMarketData.payload.referenceParent = market + let marketDataProducts = functionLibraryUiObjectsFromNodes.addUIObject(node, 'Market Data Products') + marketDataProducts.payload.referenceParent = market } } } - function addMissingExchangeSessions(node, rootNodes, functionLibraryUiObjectsFromNodes) { - addMissingExchange(node, rootNodes, 'Exchange Sessions', functionLibraryUiObjectsFromNodes) + function addMissingExchangeTradingProducts(node, rootNodes, functionLibraryUiObjectsFromNodes) { + addMissingExchange(node, rootNodes, 'Exchange Trading Products', functionLibraryUiObjectsFromNodes) } function addMissingExchangeDataProducts(node, rootNodes, functionLibraryUiObjectsFromNodes) { diff --git a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js index 626082b22..24b0c3687 100644 --- a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js +++ b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js @@ -91,8 +91,8 @@ function newTaskFunctions() { let taskDefinition = functionLibraryProtocolNode.getProtocolNode(node, false, true, true, false, false, taskLightingPath) let networkLightingPath = '->Network->Network Node->' + - 'Data Storage->Session Independent Data->Exchange Data Products->' + - 'Single Market Data->' + + 'Data Storage->Data Mines Data->Exchange Data Products->' + + 'Market Data Products->' + 'Data Mine Products->Bot Products->' + 'Data Product Folder->Data Product Folder->Data Product Folder->Data Product Folder->Data Product Folder->' + 'Data Product->Product Definition->' + diff --git a/DesignSpace/Workspace/Workspace.js b/DesignSpace/Workspace/Workspace.js index 1c8ed2df4..f8e57fec5 100644 --- a/DesignSpace/Workspace/Workspace.js +++ b/DesignSpace/Workspace/Workspace.js @@ -735,14 +735,14 @@ function newWorkspace() { functionLibraryDataStorageFunctions.addMissingSessionReferences(payload.node, thisObject.workspaceNode.rootNodes, functionLibraryUiObjectsFromNodes) } break - case 'Add Missing Single Market Data': + case 'Add Missing Market Data Products': { - functionLibraryDataStorageFunctions.addMissingSingleMarketData(payload.node, thisObject.workspaceNode.rootNodes, functionLibraryUiObjectsFromNodes) + functionLibraryDataStorageFunctions.addMissingMarketDataProducts(payload.node, thisObject.workspaceNode.rootNodes, functionLibraryUiObjectsFromNodes) } break - case 'Add Missing Exchange Sessions': + case 'Add Missing Exchange Trading Products': { - functionLibraryDataStorageFunctions.addMissingExchangeSessions(payload.node, thisObject.workspaceNode.rootNodes, functionLibraryUiObjectsFromNodes) + functionLibraryDataStorageFunctions.addMissingExchangeTradingProducts(payload.node, thisObject.workspaceNode.rootNodes, functionLibraryUiObjectsFromNodes) } break case 'Add Missing Exchange Data Products': diff --git a/Panels/Layer.js b/Panels/Layer.js index fb78668a3..191540e89 100644 --- a/Panels/Layer.js +++ b/Panels/Layer.js @@ -162,8 +162,8 @@ function newLayer() { 'Data Product->' + 'Data Product Folder->Data Product Folder->Data Product Folder->Data Product Folder->Data Product Folder->' + 'Bot Products->Data Mine Products->Trading Mine Products->' + - 'Single Market Data->Single Market Trading Data->Exchange Data Products->' + - 'Session Reference->Session Independent Data->Session Based Data->Exchange Sessions->Session Based Data->Data Storage->Network Node->' + + 'Market Data Products->Single Market Trading Data->Exchange Data Products->' + + 'Session Reference->Data Mines Data->Trading Mines Data->Exchange Trading Products->Trading Mines Data->Data Storage->Network Node->' + 'Data Storage->Network Node->' + 'Backtesting Session->Paper Trading Session->Forward Testing Session->Live Trading Session->' + 'Trading System Reference->Trading Engine Reference->Trading System->Trading Engine->' +