From e30f64dc0e6939e422fd7b35c719bff676327165 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 26 Dec 2019 10:45:50 +0100 Subject: [PATCH] Data Mine Refactoring --- ChartsSpace/PlottersManager.js | 10 +- Dashboard.js | 6 +- .../FunctionLibraries/ChainAttachDetach.js | 2 +- .../FunctionLibraries/TaskFunctions.js | 2 +- FloatingSpace/UiObject.js | 2 +- FloatingSpace/UiObjectTitle.js | 2 +- Panels/ProductCard.js | 112 +++++++++--------- Panels/ProductsPanel.js | 68 +++++------ ProductStorage.js | 10 +- Project.njsproj | 2 +- Spaces/DesignerSpace.js | 2 +- Spaces/FloatingSpace.js | 2 +- Spaces/PanelsSpace.js | 2 +- 13 files changed, 111 insertions(+), 111 deletions(-) diff --git a/ChartsSpace/PlottersManager.js b/ChartsSpace/PlottersManager.js index 8196289a4..64f7a288a 100644 --- a/ChartsSpace/PlottersManager.js +++ b/ChartsSpace/PlottersManager.js @@ -127,7 +127,7 @@ function newPlottersManager () { function initializeProductPlotter (pProductCard, callBack) { try { /* Before Initializing a Plotter, we need the Storage it will use, loaded with the files it will initially need. */ - let objName = pProductCard.devTeam.codeName + '-' + pProductCard.bot.codeName + '-' + pProductCard.product.codeName + let objName = pProductCard.dataMine.codeName + '-' + pProductCard.bot.codeName + '-' + pProductCard.product.codeName let storage = newProductStorage(objName) /* @@ -158,7 +158,7 @@ function newPlottersManager () { } } - storage.initialize(pProductCard.devTeam, pProductCard.bot, pProductCard.session, pProductCard.product, exchange, market, datetime, timePeriod, onProductStorageInitialized) + storage.initialize(pProductCard.dataMine, pProductCard.bot, pProductCard.session, pProductCard.product, exchange, market, datetime, timePeriod, onProductStorageInitialized) function onProductStorageInitialized (err) { try { @@ -196,7 +196,7 @@ function newPlottersManager () { 'Plotter Panel->Javascript Code->Panel Data->Data Formula->' productDefinition = functionLibraryProtocolNode.getProtocolNode(pProductCard.product.node, false, true, true, false, false, lightingPath) } else { - plotter = getNewPlotter(pProductCard.product.plotter.devTeam, pProductCard.product.plotter.codeName, pProductCard.product.plotter.moduleName) + plotter = getNewPlotter(pProductCard.product.plotter.dataMine, pProductCard.product.plotter.codeName, pProductCard.product.plotter.moduleName) } plotter.container.connectToParent(thisObject.container, true, true, false, true, true, true) @@ -224,7 +224,7 @@ function newPlottersManager () { let panelConfig = pProductCard.product.plotter.module.panels[i] let parameters = { - devTeam: pProductCard.product.plotter.devTeam, + dataMine: pProductCard.product.plotter.dataMine, plotterCodeName: pProductCard.product.plotter.codeName, moduleCodeName: pProductCard.product.plotter.moduleName, panelCodeName: panelConfig.codeName @@ -245,7 +245,7 @@ function newPlottersManager () { let panel = productDefinition.referenceParent.panels[i] let parameters = { - devTeam: pProductCard.product.plotter.devTeam, + dataMine: pProductCard.product.plotter.dataMine, plotterCodeName: pProductCard.product.plotter.codeName, moduleCodeName: pProductCard.product.plotter.moduleName, panelCodeName: panel.id diff --git a/Dashboard.js b/Dashboard.js index 230c680bb..de8915fb5 100644 --- a/Dashboard.js +++ b/Dashboard.js @@ -54,7 +54,7 @@ function newDashboard () { if (canvas !== undefined) { canvas.finalize() } - /* Here we check where we are executing. In case we are Local we need to create a Local Dummy User and Team. */ + /* Here we check where we are executing. In case we are Local we need to create a Local Dummy User and Data Mine. */ if (window.canvasApp.executingAt === 'Local') { window.localStorage.setItem(LOGGED_IN_ACCESS_TOKEN_LOCAL_STORAGE_KEY, 'Local Access Token') // Dummy Access Token @@ -67,9 +67,9 @@ function newDashboard () { userProfileChangedEventSubscriptionId = window.canvasApp.eventHandler.listenToEvent('User Profile Changed', userProfileChanged) browserResizedEventSubscriptionId = window.canvasApp.eventHandler.listenToEvent('Browser Resized', browserResized) - /* Here we used to have a call to the Teams Module to get the profile pictures. That was removed but to keep things working, we do this: */ + /* Here we used to have a call to the DataMines Module to get the profile pictures. That was removed but to keep things working, we do this: */ - window.canvasApp.context.teamProfileImages = new Map() + window.canvasApp.context.dataMineProfileImages = new Map() window.canvasApp.context.fbProfileImages = new Map() setTimeout(delayedStart, DEBUG_START_UP_DELAY) diff --git a/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js b/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js index df3519f05..10d5d09b2 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js +++ b/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js @@ -14,7 +14,7 @@ function newChainAttachDetach () { case 'Network': { return } - case 'Team': { + case 'Data Mine': { return } case 'Phase': { diff --git a/DesignerSpace/Workspace/FunctionLibraries/TaskFunctions.js b/DesignerSpace/Workspace/FunctionLibraries/TaskFunctions.js index 8b153578c..d9dcafed8 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/TaskFunctions.js +++ b/DesignerSpace/Workspace/FunctionLibraries/TaskFunctions.js @@ -48,7 +48,7 @@ function newTaskFunctions () { 'Sensor Bot->' + 'Indicator Bot->' + 'Trading Bot->' + - 'Team->' + 'Data Mine->' let definition = functionLibraryProtocolNode.getProtocolNode(node, false, true, true, false, false, lightingPath) diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 893272e0b..d7b47cabf 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -1145,7 +1145,7 @@ function newUiObject () { browserCanvasContext.fill() - if (thisObject.payload.node.type === 'Definition' || thisObject.payload.node.type === 'Network' || thisObject.payload.node.type === 'Team') { + if (thisObject.payload.node.type === 'Definition' || thisObject.payload.node.type === 'Network' || thisObject.payload.node.type === 'Data Mine') { VISIBLE_RADIUS = thisObject.container.frame.radius * 2 let OPACITY = 1 diff --git a/FloatingSpace/UiObjectTitle.js b/FloatingSpace/UiObjectTitle.js index ace5efac0..834d79ed4 100644 --- a/FloatingSpace/UiObjectTitle.js +++ b/FloatingSpace/UiObjectTitle.js @@ -53,7 +53,7 @@ function newUiObjectTitle () { thisObject.allwaysVisible = true break } - case 'Team': { + case 'Data Mine': { thisObject.allwaysVisible = true break } diff --git a/Panels/ProductCard.js b/Panels/ProductCard.js index 0c51f0565..c4777ed5b 100644 --- a/Panels/ProductCard.js +++ b/Panels/ProductCard.js @@ -7,7 +7,7 @@ function newProductCard () { let thisObject = { container: undefined, status: PRODUCT_CARD_STATUS.OFF, - devTeam: undefined, + dataMine: undefined, bot: undefined, product: undefined, code: undefined, @@ -69,14 +69,14 @@ function newProductCard () { let timePeriod = INITIAL_TIME_PERIOD let datetime = NEW_SESSION_INITIAL_DATE - /* TODO We are in a transition period in which bots and teams images might be located at different places. + /* TODO We are in a transition period in which bots and dataMines images might be located at different places. What we are going to do then is to try to load them from both places and use the variable that finally gets an image. */ /* This is the legacy image storage. */ - let legacyTeamAvatar - let legacyTeamAvatarLoaded = false + let legacyDataMineAvatar + let legacyDataMineAvatarLoaded = false /* TODO Temporary code */ let legacyBotAvatar @@ -89,11 +89,11 @@ function newProductCard () { /* We are transitioning towards this */ - let teamAvatar // stores the avatar image of the team the bot portrayed at this card belongs to. - let teamAvatarLoaded = false + let dataMineAvatar // stores the avatar image of the dataMine the bot portrayed at this card belongs to. + let dataMineAvatarLoaded = false /* TODO Temporary code */ - let botAvatar // stores the avatar image of the team the bot portrayed at this card belongs to. + let botAvatar // stores the avatar image of the dataMine the bot portrayed at this card belongs to. let botAvatarLoaded = false /* Add an Event Handler */ @@ -111,14 +111,14 @@ function newProductCard () { thisObject.container = undefined thisObject.eventHandler = undefined thisObject.status = undefined - thisObject.devTeam = undefined + thisObject.dataMine = undefined thisObject.bot = undefined thisObject.product = undefined thisObject.code = undefined thisObject.fitFunction = undefined - legacyTeamAvatar = undefined - legacyTeamAvatarLoaded = undefined + legacyDataMineAvatar = undefined + legacyDataMineAvatarLoaded = undefined legacyBotAvatar = undefined legacyBotAvatarLoaded = undefined legacyPlotterBanner = undefined @@ -150,10 +150,10 @@ function newProductCard () { /* Add information that will later be needed. */ - let team = ecosystem.getTeam(thisObject.product.plotter.devTeam) + let dataMine = ecosystem.getDataMine(thisObject.product.plotter.dataMine) let plotter - if (team !== undefined) { - plotter = ecosystem.getPlotter(team, thisObject.product.plotter.codeName) + if (dataMine !== undefined) { + plotter = ecosystem.getPlotter(dataMine, thisObject.product.plotter.codeName) } if (plotter !== undefined) { @@ -212,13 +212,13 @@ function newProductCard () { /* WARNING THIS IS TEMPORARY CODE */ - const LEGACY_TEAM = thisObject.devTeam.codeName + const LEGACY_DATA_MINE = thisObject.dataMine.codeName const REPO = thisObject.bot.repo const PROFILE_PIC = thisObject.bot.profilePicture - /* The plotter banner, comes from the Legacy Location so far, no matter if the Team is at the Teams Modules or not. */ + /* The plotter banner, comes from the Legacy Location so far, no matter if the Data Mine is at the DataMines Modules or not. */ - const PLOTTER_TEAM = thisObject.product.plotter.devTeam + const PLOTTER_DATA_MINE = thisObject.product.plotter.dataMine const PLOTTER_REPO = thisObject.product.plotter.codeName const PLOTTER_PROFILE_PIC = thisObject.product.plotter.profilePicture @@ -230,7 +230,7 @@ function newProductCard () { } if (PLOTTER_PROFILE_PIC !== undefined) { - legacyPlotterBanner.src = window.canvasApp.urlPrefix + 'Images/' + PLOTTER_TEAM + '/' + PLOTTER_REPO + '/' + PLOTTER_PROFILE_PIC + legacyPlotterBanner.src = window.canvasApp.urlPrefix + 'Images/' + PLOTTER_DATA_MINE + '/' + PLOTTER_REPO + '/' + PLOTTER_PROFILE_PIC } else { if (thisObject.product.plotter.banner !== undefined) { legacyPlotterBanner.src = window.canvasApp.urlPrefix + 'Images/' + thisObject.product.plotter.banner + '-Banner.PNG' @@ -239,25 +239,25 @@ function newProductCard () { } } - const TEAM = thisObject.devTeam.codeName.toLowerCase() + const DATA_MINE = thisObject.dataMine.codeName.toLowerCase() const BOT = thisObject.bot.codeName.toLowerCase() - if (window.canvasApp.context.teamProfileImages.get(TEAM) === undefined) { - // This means this Team is a Lecay Team, still not at any Module. + if (window.canvasApp.context.dataMineProfileImages.get(DATA_MINE) === undefined) { + // This means this Data Mine is a Lecay Data Mine, still not at any Module. /* Here we will download the images still at the legacy storage. */ - legacyTeamAvatar = new Image() + legacyDataMineAvatar = new Image() - legacyTeamAvatar.onload = onLegacyImageLoad + legacyDataMineAvatar.onload = onLegacyImageLoad function onLegacyImageLoad () { - legacyTeamAvatarLoaded = true + legacyDataMineAvatarLoaded = true } - legacyTeamAvatar.src = window.canvasApp.urlPrefix + 'Images/' + LEGACY_TEAM + '/' + LEGACY_TEAM + '.png' + legacyDataMineAvatar.src = window.canvasApp.urlPrefix + 'Images/' + LEGACY_DATA_MINE + '/' + LEGACY_DATA_MINE + '.png' legacyBotAvatar = new Image() legacyBotAvatar.onload = onLegacyImageLoadBot @@ -267,23 +267,23 @@ function newProductCard () { thisObject.bot.avatar = legacyBotAvatar } - legacyBotAvatar.src = window.canvasApp.urlPrefix + 'Images/' + LEGACY_TEAM + '/' + REPO + '/' + PROFILE_PIC + legacyBotAvatar.src = window.canvasApp.urlPrefix + 'Images/' + LEGACY_DATA_MINE + '/' + REPO + '/' + PROFILE_PIC } else { /* - Here we will download the images of teams shareed at the Teams Module. - There might be Product Cards of bots beloging to teams not present currently at the Teams Module, in those cases + Here we will download the images of dataMines shareed at the DataMines Module. + There might be Product Cards of bots beloging to dataMines not present currently at the DataMines Module, in those cases nothing should happen. */ - teamAvatar = new Image() + dataMineAvatar = new Image() - teamAvatar.onload = onImageLoad + dataMineAvatar.onload = onImageLoad function onImageLoad () { - teamAvatarLoaded = true + dataMineAvatarLoaded = true } - teamAvatar.src = window.canvasApp.context.teamProfileImages.get(TEAM) + dataMineAvatar.src = window.canvasApp.context.dataMineProfileImages.get(DATA_MINE) botAvatar = new Image() botAvatar.onload = onImageLoadBot @@ -293,7 +293,7 @@ function newProductCard () { thisObject.bot.avatar = botAvatar } - botAvatar.src = window.canvasApp.context.fbProfileImages.get(TEAM + '-' + BOT) + botAvatar.src = window.canvasApp.context.fbProfileImages.get(DATA_MINE + '-' + BOT) } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = ' + err.stack) } @@ -460,7 +460,7 @@ function newProductCard () { y: 0 } - const devTeamImageSize = 20 + const dataMineImageSize = 20 const botImageSize = 20 const plotterImageSize = { width: 180, @@ -470,32 +470,32 @@ function newProductCard () { lastMouseOver-- // Animating the mouse onMouseOver if (lastMouseOver > 0) { - /* First the Dev Team Profile Picture. */ - let teamImagePoint = { + /* First the Dev Data Mine Profile Picture. */ + let dataMineImagePoint = { x: 2, - y: thisObject.container.frame.height / 2 - devTeamImageSize / 2 + y: thisObject.container.frame.height / 2 - dataMineImageSize / 2 } - teamImagePoint = thisObject.container.frame.frameThisPoint(teamImagePoint) - fitImagePoint = thisObject.fitFunction(teamImagePoint) - let teamImage - if (legacyTeamAvatarLoaded === true) { - teamImage = legacyTeamAvatar + dataMineImagePoint = thisObject.container.frame.frameThisPoint(dataMineImagePoint) + fitImagePoint = thisObject.fitFunction(dataMineImagePoint) + let dataMineImage + if (legacyDataMineAvatarLoaded === true) { + dataMineImage = legacyDataMineAvatar } - if (teamAvatarLoaded === true) { - teamImage = teamAvatar + if (dataMineAvatarLoaded === true) { + dataMineImage = dataMineAvatar } - if (teamImage !== undefined && teamImagePoint.y === fitImagePoint.y) { - if (teamImage.naturalHeight !== 0) { + if (dataMineImage !== undefined && dataMineImagePoint.y === fitImagePoint.y) { + if (dataMineImage.naturalHeight !== 0) { /* The image is rounded before being displayed. */ browserCanvasContext.save() browserCanvasContext.beginPath() - browserCanvasContext.arc(teamImagePoint.x + devTeamImageSize / 2, teamImagePoint.y + devTeamImageSize / 2, devTeamImageSize / 2, 0, Math.PI * 2, true) + browserCanvasContext.arc(dataMineImagePoint.x + dataMineImageSize / 2, dataMineImagePoint.y + dataMineImageSize / 2, dataMineImageSize / 2, 0, Math.PI * 2, true) browserCanvasContext.closePath() browserCanvasContext.clip() - browserCanvasContext.drawImage(teamImage, teamImagePoint.x, teamImagePoint.y, devTeamImageSize, devTeamImageSize) + browserCanvasContext.drawImage(dataMineImage, dataMineImagePoint.x, dataMineImagePoint.y, dataMineImageSize, dataMineImageSize) browserCanvasContext.beginPath() - browserCanvasContext.arc(teamImagePoint.x, teamImagePoint.y, devTeamImageSize / 2, 0, Math.PI * 2, true) + browserCanvasContext.arc(dataMineImagePoint.x, dataMineImagePoint.y, dataMineImageSize / 2, 0, Math.PI * 2, true) browserCanvasContext.clip() browserCanvasContext.closePath() browserCanvasContext.restore() @@ -511,7 +511,7 @@ function newProductCard () { botImagePoint = thisObject.container.frame.frameThisPoint(botImagePoint) fitImagePoint = thisObject.fitFunction(botImagePoint) - let imageId = thisObject.bot.devTeam + '.' + thisObject.bot.profilePicture + let imageId = thisObject.bot.dataMine + '.' + thisObject.bot.profilePicture /* TODO Temporary code */ let botImage botImage = thisObject.bot.avatar @@ -545,7 +545,7 @@ function newProductCard () { y: plotterImagePoint.y + plotterImageSize.height } fitImagePoint = thisObject.fitFunction(fitImagePoint) - let imageId = thisObject.product.plotter.devTeam + '.' + thisObject.product.plotter.codeName + '.' + thisObject.product.plotter.moduleName + '.' + thisObject.product.plotter.profilePicture + let imageId = thisObject.product.plotter.dataMine + '.' + thisObject.product.plotter.codeName + '.' + thisObject.product.plotter.moduleName + '.' + thisObject.product.plotter.profilePicture let plotterImage = legacyPlotterBanner if (plotterImage !== undefined && plotterImagePoint.y + plotterImageSize.height === fitImagePoint.y) { if (plotterImage.naturalHeight !== 0) { @@ -627,13 +627,13 @@ function newProductCard () { browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY let label if (lastMouseOver > 0) { - /* devTeam */ - label = thisObject.devTeam.displayName + /* dataMine */ + label = thisObject.dataMine.displayName if (label.length > 10) { label = label.substring(1, 8) + '...' } labelPoint = { - x: 2 + devTeamImageSize / 2 - label.length / 2 * fontSize * FONT_ASPECT_RATIO, - y: thisObject.container.frame.height / 2 + devTeamImageSize / 2 + fontSize * FONT_ASPECT_RATIO + 5 + x: 2 + dataMineImageSize / 2 - label.length / 2 * fontSize * FONT_ASPECT_RATIO, + y: thisObject.container.frame.height / 2 + dataMineImageSize / 2 + fontSize * FONT_ASPECT_RATIO + 5 } labelPoint = thisObject.container.frame.frameThisPoint(labelPoint) @@ -647,7 +647,7 @@ function newProductCard () { labelPoint = { x: thisObject.container.frame.width - 8 - label.length / 2 * fontSize * FONT_ASPECT_RATIO, - y: thisObject.container.frame.height / 2 + devTeamImageSize / 2 + fontSize * FONT_ASPECT_RATIO + 5 + y: thisObject.container.frame.height / 2 + dataMineImageSize / 2 + fontSize * FONT_ASPECT_RATIO + 5 } labelPoint = thisObject.container.frame.frameThisPoint(labelPoint) @@ -675,7 +675,7 @@ function newProductCard () { } labelPoint = { x: thisObject.container.frame.width / 2 - label.length / 2 * fontSize * FONT_ASPECT_RATIO, - y: thisObject.container.frame.height / 2 - devTeamImageSize / 2 - fontSize * FONT_ASPECT_RATIO - 20 + y: thisObject.container.frame.height / 2 - dataMineImageSize / 2 - fontSize * FONT_ASPECT_RATIO - 20 } labelPoint = thisObject.container.frame.frameThisPoint(labelPoint) labelPoint = thisObject.fitFunction(labelPoint) diff --git a/Panels/ProductsPanel.js b/Panels/ProductsPanel.js index a28de7171..d52590b12 100644 --- a/Panels/ProductsPanel.js +++ b/Panels/ProductsPanel.js @@ -67,18 +67,18 @@ function newProductsPanel () { } /* For legacy plotters, we will add product cards based on the old ecosystem file */ - for (let i = 0; i < ecosystem.devTeams.length; i++) { - let devTeam = ecosystem.devTeams[i] + for (let i = 0; i < ecosystem.dataMines.length; i++) { + let dataMine = ecosystem.dataMines[i] - for (let j = 0; j < devTeam.bots.length; j++) { - let bot = devTeam.bots[j] + for (let j = 0; j < dataMine.bots.length; j++) { + let bot = dataMine.bots[j] if (bot.type !== 'Indicator Bot Instance') { continue } if (bot.products !== undefined) { for (let k = 0; k < bot.products.length; k++) { let product = bot.products[k] - addProductCard(devTeam, bot, product) + addProductCard(dataMine, bot, product) } } } @@ -88,19 +88,19 @@ function newProductsPanel () { let workspaceNode = canvas.designerSpace.workspace.workspaceNode for (let i = 0; i < workspaceNode.rootNodes.length; i++) { let rootNode = workspaceNode.rootNodes[i] - if (rootNode.type === 'Team') { - let teamNode = rootNode + if (rootNode.type === 'Data Mine') { + let dataMineNode = rootNode - let team = {} - if (teamNode.code === undefined) { continue } + let dataMine = {} + if (dataMineNode.code === undefined) { continue } try { - let code = JSON.parse(teamNode.code) - team.codeName = code.codeName + let code = JSON.parse(dataMineNode.code) + dataMine.codeName = code.codeName } catch (err) { continue } - for (let j = 0; j < teamNode.indicatorBots.length; j++) { - let botNode = teamNode.indicatorBots[j] + for (let j = 0; j < dataMineNode.indicatorBots.length; j++) { + let botNode = dataMineNode.indicatorBots[j] let bot = {} if (botNode.code === undefined) { continue } @@ -149,20 +149,20 @@ function newProductsPanel () { } if (plotterNode.payload.parentNode === undefined) { continue } - let plotterTeamNode = plotterNode.payload.parentNode + let plotterDataMineNode = plotterNode.payload.parentNode - let plotterTeam = {} - if (plotterTeamNode.code === undefined) { continue } + let plotterDataMine = {} + if (plotterDataMineNode.code === undefined) { continue } try { - let code = JSON.parse(plotterTeamNode.code) - plotterTeam.codeName = code.codeName + let code = JSON.parse(plotterDataMineNode.code) + plotterDataMine.codeName = code.codeName } catch (err) { continue } /* Conversion to fit old format */ product.plotter = plotter - product.plotter.devTeam = plotterTeam.codeName + product.plotter.dataMine = plotterDataMine.codeName product.plotter.moduleName = plotterModule.codeName product.plotter.banner = plotterModule.banner product.plotter.legacy = false @@ -171,8 +171,8 @@ function newProductsPanel () { product.dataSets = [] product.exchangeList = [{'name': 'Poloniex'}] product.node = productNode - team.displayName = teamNode.name - team.host = {'url': 'localhost'} + dataMine.displayName = dataMineNode.name + dataMine.host = {'url': 'localhost'} bot.displayName = botNode.name for (let m = 0; m < productNode.datasets.length; m++) { @@ -187,7 +187,7 @@ function newProductsPanel () { } } - addProductCard(team, bot, product) + addProductCard(dataMine, bot, product) } } } @@ -204,15 +204,15 @@ function newProductsPanel () { productCard.finalize() } - function addProductCard (devTeam, bot, product, session) { + function addProductCard (dataMine, bot, product, session) { /* Now we create Product objects */ let productCard = newProductCard() - productCard.devTeam = devTeam + productCard.dataMine = dataMine productCard.bot = bot productCard.product = product productCard.fitFunction = thisObject.fitFunction - productCard.code = exchange + '-' + market.assetB + '/' + market.assetA + '-' + devTeam.codeName + '-' + bot.codeName + '-' + product.codeName + productCard.code = exchange + '-' + market.assetB + '/' + market.assetA + '-' + dataMine.codeName + '-' + bot.codeName + '-' + product.codeName if (session !== undefined) { productCard.code = productCard.code + '-' + session.id @@ -397,7 +397,7 @@ function newProductsPanel () { let tradingBotInstance = tradingBotInstances[n] let code let instanceBot - let instanceTeam + let instanceDataMine for (let m = 0; m < tradingBotInstance.processes.length; m++) { let process = tradingBotInstance.processes[m] @@ -405,18 +405,18 @@ function newProductsPanel () { code = JSON.parse(process.payload.referenceParent.payload.parentNode.code) instanceBot = code.codeName code = JSON.parse(process.payload.referenceParent.payload.parentNode.payload.parentNode.code) - instanceTeam = code.codeName + instanceDataMine = code.codeName } catch (err) { continue } - for (let i = 0; i < ecosystem.devTeams.length; i++) { - let devTeam = ecosystem.devTeams[i] + for (let i = 0; i < ecosystem.dataMines.length; i++) { + let dataMine = ecosystem.dataMines[i] - for (let j = 0; j < devTeam.bots.length; j++) { - let bot = devTeam.bots[j] + for (let j = 0; j < dataMine.bots.length; j++) { + let bot = dataMine.bots[j] if (bot.type !== 'Trading Bot Instance') { continue } - if (devTeam.codeName === instanceTeam && bot.codeName === instanceBot) { + if (dataMine.codeName === instanceDataMine && bot.codeName === instanceBot) { /* We found an instance of the same Trading we are currently looking at. Next thing to do is to see its layers to see if we can match it with the current product. */ @@ -439,10 +439,10 @@ function newProductsPanel () { if (product.codeName === layerCode.product) { /* We have a layer that is matching the current product */ - let cardCode = exchange + '-' + market.assetB + '/' + market.assetA + '-' + devTeam.codeName + '-' + bot.codeName + '-' + product.codeName + '-' + process.session.id + let cardCode = exchange + '-' + market.assetB + '/' + market.assetA + '-' + dataMine.codeName + '-' + bot.codeName + '-' + product.codeName + '-' + process.session.id let cardFound = removeFromLocalProductCards(cardCode) if (cardFound !== true) { - productCard = addProductCard(devTeam, bot, product, process.session) + productCard = addProductCard(dataMine, bot, product, process.session) onProductCardStatusChanged(productCard) } } diff --git a/ProductStorage.js b/ProductStorage.js index bdb862032..3ad5d77f6 100644 --- a/ProductStorage.js +++ b/ProductStorage.js @@ -74,7 +74,7 @@ function newProductStorage (pName) { } } - function initialize (pDevTeam, pBot, pSession, pProduct, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { + function initialize (pdataMine, pBot, pSession, pProduct, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { try { datetime = pDatetime timePeriod = pTimePeriod @@ -90,7 +90,7 @@ function newProductStorage (pName) { dataSetsToLoad++ let marketFiles = newMarketFiles() - marketFiles.initialize(pDevTeam, pBot, pSession, pProduct, thisSet, pExchange, pMarket, onMarketFileReady) + marketFiles.initialize(pdataMine, pBot, pSession, pProduct, thisSet, pExchange, pMarket, onMarketFileReady) thisObject.marketFiles.push(marketFiles) } break @@ -99,7 +99,7 @@ function newProductStorage (pName) { dataSetsToLoad++ let dailyFiles = newDailyFiles() - dailyFiles.initialize(pDevTeam, pBot, pSession, pProduct, thisSet, pExchange, pMarket, pDatetime, pTimePeriod, onDailyFileReady) + dailyFiles.initialize(pdataMine, pBot, pSession, pProduct, thisSet, pExchange, pMarket, pDatetime, pTimePeriod, onDailyFileReady) thisObject.dailyFiles.push(dailyFiles) } break @@ -108,7 +108,7 @@ function newProductStorage (pName) { dataSetsToLoad++ let singleFile = newSingleFile() - singleFile.initialize(pDevTeam, pBot, pSession, pProduct, thisSet, pExchange, pMarket, onSingleFileReady) + singleFile.initialize(pdataMine, pBot, pSession, pProduct, thisSet, pExchange, pMarket, onSingleFileReady) thisObject.singleFile.push(singleFile) } break @@ -117,7 +117,7 @@ function newProductStorage (pName) { dataSetsToLoad++ let fileSequences = newFileSequence() - fileSequences.initialize(pDevTeam, pBot, pSession, pProduct, thisSet, pExchange, pMarket, onFileSequenceReady) + fileSequences.initialize(pdataMine, pBot, pSession, pProduct, thisSet, pExchange, pMarket, onFileSequenceReady) thisObject.fileSequences.push(fileSequences) } break diff --git a/Project.njsproj b/Project.njsproj index 7cc00eb05..b45882cef 100644 --- a/Project.njsproj +++ b/Project.njsproj @@ -106,7 +106,7 @@ Code - + Code diff --git a/Spaces/DesignerSpace.js b/Spaces/DesignerSpace.js index 3dff9ae53..eca3b7c49 100644 --- a/Spaces/DesignerSpace.js +++ b/Spaces/DesignerSpace.js @@ -139,7 +139,7 @@ function newDesignerSpace () { 'bot-indicator', 'bot-sensor', 'time-period', - 'team', + 'data-mine', 'procedure-loop', 'calculations-procedure', 'data-building-procedure', diff --git a/Spaces/FloatingSpace.js b/Spaces/FloatingSpace.js index f86b91b12..2c4ddef30 100644 --- a/Spaces/FloatingSpace.js +++ b/Spaces/FloatingSpace.js @@ -107,7 +107,7 @@ function newFloatingSpace () { if ( payload.node.type === 'Definition' || payload.node.type === 'Network' || - payload.node.type === 'Team' + payload.node.type === 'Data Mine' ) { return false } diff --git a/Spaces/PanelsSpace.js b/Spaces/PanelsSpace.js index b67add293..641758d0b 100644 --- a/Spaces/PanelsSpace.js +++ b/Spaces/PanelsSpace.js @@ -63,7 +63,7 @@ function newPanelsSpace () { panel.session = pSession panel.initialize(pPanelCode) } else { - panel = getNewPlotterPanel(pParameters.devTeam, pParameters.plotterCodeName, pParameters.moduleCodeName, pParameters.panelCodeName) + panel = getNewPlotterPanel(pParameters.dataMine, pParameters.plotterCodeName, pParameters.moduleCodeName, pParameters.panelCodeName) panel.fitFunction = canvas.chartSpace.fitIntoVisibleArea panel.container.isVisibleFunction = canvas.chartSpace.isThisPointVisible panel.session = pSession