From f7a78543ca75ab209411c05e8db22600ad0d9f95 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 1 Oct 2019 17:13:59 +0200 Subject: [PATCH] Network concept Added --- Dashboard.js | 15 +++-- FloatingSpace/StrategyPart.js | 6 +- FloatingSpace/StrategyPartConstructor.js | 59 +++++++++++++++++-- FloatingSpace/StrategyPartTitle.js | 4 ++ Spaces/StrategySpace.js | 1 + .../FunctionLibraries/AttachDetach.js | 16 ++++- .../FunctionLibraries/NodeChildren.js | 17 ++++++ .../FunctionLibraries/NodeDeleter.js | 30 ++++++++++ .../FunctionLibraries/PartsFromNodes.js | 31 ++++++++-- .../FunctionLibraries/ProtocolNode.js | 29 ++++++--- .../FunctionLibraries/StringifyNode.js | 17 +++++- StrategySpace/Workspace/Workspace.js | 9 +++ 12 files changed, 205 insertions(+), 29 deletions(-) diff --git a/Dashboard.js b/Dashboard.js index 4acf82b8a..b26b3bccb 100644 --- a/Dashboard.js +++ b/Dashboard.js @@ -25,6 +25,7 @@ function newDashboard () { function start () { try { setBrowserEvents() + viewPort = newViewPort() systemEventHandler = newSystemEventHandler() @@ -113,11 +114,15 @@ function newDashboard () { function stopAllRunningTasks () { let definition = canvas.strategySpace.workspace.definition if (definition !== undefined) { - for (let j = 0; k < definition.networkNodes.length; j++) { - let networkNode = definition.networkNodes[j] - for (let i = 0; i < networkNode.taskManagers.length; i++) { - taskManager = networkNode.taskManagers[i] - taskManager.payload.uiObject.menu.internalClick('Stop All Tasks') + if (definition.network !== undefined) { + if (definition.network.networkNodes !== undefined) { + for (let j = 0; j < definition.network.networkNodes.length; j++) { + let networkNode = definition.network.networkNodes[j] + for (let i = 0; i < networkNode.taskManagers.length; i++) { + taskManager = networkNode.taskManagers[i] + taskManager.payload.uiObject.menu.internalClick('Stop All Tasks') + } + } } } } diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 0db572b17..ce02744f1 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -210,10 +210,14 @@ function newStrategyPart () { compatibleType = '->' + 'Definition' + '->' compatibleSubType = undefined break - case 'Network Node': + case 'Network': compatibleType = '->' + 'Definition' + '->' compatibleSubType = undefined break + case 'Network Node': + compatibleType = '->' + 'Network' + '->' + compatibleSubType = undefined + break case 'Exchange Account': compatibleType = '->' + 'Personal Data' + '->' compatibleSubType = undefined diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js index d10fd4745..b006a00cf 100644 --- a/FloatingSpace/StrategyPartConstructor.js +++ b/FloatingSpace/StrategyPartConstructor.js @@ -274,11 +274,11 @@ function newStrategyPartConstructor () { ) menuItemsInitialValues.push( { - action: 'Add Network Node', + action: 'Add Network', actionFunction: payload.onMenuItemClick, - label: 'Add Network Node', + label: 'Add Network', visible: true, - relatedStrategyPart: 'Network Node', + relatedStrategyPart: 'Network', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -317,6 +317,53 @@ function newStrategyPartConstructor () { ) break } + case 'Network': { + addLeftIcons(menuItemsInitialValues, floatingObject) + menuItemsInitialValues.push( + { + action: 'Add Network Node', + actionFunction: payload.onMenuItemClick, + label: 'Add Network Node', + visible: true, + relatedStrategyPart: 'Network Node', + rawRadius: 8, + targetRadius: 0, + currentRadius: 0, + angle: -40 + } + ) + menuItemsInitialValues.push( + { + action: 'Delete Network', + askConfirmation: true, + confirmationLabel: 'Confirm to Delete', + actionFunction: payload.onMenuItemClick, + label: 'Delete Network', + visible: true, + iconPathOn: 'delete', + iconPathOff: 'delete', + rawRadius: 8, + targetRadius: 0, + currentRadius: 0, + angle: 0 + } + ) + menuItemsInitialValues.push( + { + action: 'Share', + actionFunction: payload.onMenuItemClick, + label: 'Share', + visible: true, + iconPathOn: 'menu-share', + iconPathOff: 'menu-share', + rawRadius: 8, + targetRadius: 0, + currentRadius: 0, + angle: 40 + } + ) + break + } case 'Network Node': { addLeftIcons(menuItemsInitialValues, floatingObject) menuItemsInitialValues.push( @@ -2210,6 +2257,10 @@ function newStrategyPartConstructor () { level_0() break } + case 'Network': { + level_1() + break + } case 'Network Node': { level_1() break @@ -2219,7 +2270,7 @@ function newStrategyPartConstructor () { break } case 'Task': { - level_1() + level_3() break } case 'Sensor': { diff --git a/FloatingSpace/StrategyPartTitle.js b/FloatingSpace/StrategyPartTitle.js index da278da30..4eba6488b 100644 --- a/FloatingSpace/StrategyPartTitle.js +++ b/FloatingSpace/StrategyPartTitle.js @@ -52,6 +52,10 @@ function newStrategyPartTitle () { thisObject.allwaysVisible = true break } + case 'Network': { + thisObject.allwaysVisible = true + break + } case 'Network Node': { break } diff --git a/Spaces/StrategySpace.js b/Spaces/StrategySpace.js index 665aaae45..65ea14ec3 100644 --- a/Spaces/StrategySpace.js +++ b/Spaces/StrategySpace.js @@ -40,6 +40,7 @@ function newStrategySpace () { function buildIconByPartTypeMap () { const relationshipArray = [ ['Definition', 'text'], + ['Network', 'headphones'], ['Network Node', 'photo-camera'], ['Task Manager', 'task'], ['Task', 'timeline'], diff --git a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js index ef575dc2f..837f7b3c8 100644 --- a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js +++ b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js @@ -11,11 +11,16 @@ function newAttachDetach () { case 'Definition': { return } + case 'Network': { + node.payload.parentNode.network = undefined + completeDetachment(node, rootNodes) + return + } case 'Network Node': { let payload = node.payload for (let i = 0; i < payload.parentNode.networkNodes.length; i++) { - let netwrokNode = payload.parentNode.networkNodes[i] - if (netwrokNode.id === node.id) { + let networkNode = payload.parentNode.networkNodes[i] + if (networkNode.id === node.id) { payload.parentNode.networkNodes.splice(i, 1) } } @@ -276,6 +281,13 @@ function newAttachDetach () { function attachNode (node, attachToNode, rootNodes) { switch (node.type) { + case 'Network': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.network = node + completeAttachment(node, rootNodes) + } + break case 'Network Node': { node.payload.parentNode = attachToNode node.payload.chainParent = attachToNode diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js index aab531797..40c97abbd 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js @@ -11,6 +11,9 @@ function newNodeChildren () { case 'Definition': { return countChildrenDefinition(parentNode, childNode) } + case 'Network': { + return countChildrenNetwork(parentNode, childNode) + } case 'Network Node': { return countChildrenNetworkNode(parentNode, childNode) } @@ -148,6 +151,20 @@ function newNodeChildren () { response.childIndex = response.childrenCount } } + if (parentNode.network !== undefined) { + response.childrenCount++ + if (parentNode.network.id === childNode.id) { + response.childIndex = response.childrenCount + } + } + return response + } + + function countChildrenNetwork (parentNode, childNode) { + let response = { + childrenCount: 0, + childIndex: undefined + } if (parentNode.networkNodes !== undefined) { for (let i = 0; i < parentNode.networkNodes.length; i++) { let child = parentNode.networkNodes[i] diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js index 262790762..54042a70a 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -1,6 +1,7 @@ function newNodeDeleter () { thisObject = { deleteDefinition: deleteDefinition, + deleteNetwork: deleteNetwork, deleteNetworkNode: deleteNetworkNode, deleteTaskManager: deleteTaskManager, deleteTask: deleteTask, @@ -54,6 +55,10 @@ function newNodeDeleter () { deleteDefinition(rootNode, rootNodes, true) break } + case 'Network': { + deleteNetwork(rootNode, rootNodes) + break + } case 'Network Node': { deleteNetworkNode(rootNode, rootNodes) break @@ -240,6 +245,22 @@ function newNodeDeleter () { if (node.personalData !== undefined) { deletePersonalData(node.personalData, rootNodes) } + if (node.network !== undefined) { + deleteNetwork(node.network, rootNodes) + } + + completeDeletion(node, rootNodes) + destroyPart(node) + cleanNode(node) + } + + function deleteNetwork (node, rootNodes, forced) { + let payload = node.payload + + if (payload.parentNode !== undefined) { + payload.parentNode.network = undefined + } + if (node.networkNodes !== undefined) { while (node.networkNodes.length > 0) { deleteNetworkNode(node.networkNodes[0], rootNodes) @@ -254,6 +275,15 @@ function newNodeDeleter () { function deleteNetworkNode (node, rootNodes, forced) { let payload = node.payload + if (payload.parentNode !== undefined) { + for (let j = 0; j < payload.parentNode.networkNodes.length; j++) { + let networkNode = payload.parentNode.networkNodes[j] + if (networkNode.id === node.id) { + payload.parentNode.networkNodes.splice(j, 1) + } + } + } + if (node.taskManagers !== undefined) { while (node.taskManagers.length > 0) { deleteTaskManager(node.taskManagers[0], rootNodes) diff --git a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js index 1b77a9877..eb1612be0 100644 --- a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js +++ b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js @@ -1,6 +1,7 @@ function newPartsFromNodes () { thisObject = { createPartFromNode: createPartFromNode, + addNetwork: addNetwork, addNetworkNode: addNetworkNode, addTaskManager: addTaskManager, addTask: addTask, @@ -334,10 +335,17 @@ function newPartsFromNodes () { if (node.personalData !== undefined) { createPartFromNode(node.personalData, node, node) } + if (node.network !== undefined) { + createPartFromNode(node.network, node, node) + } + return + } + case 'Network': { + createPart('Network', node.name, node, parentNode, chainParent, 'Network') if (node.networkNodes !== undefined) { for (let m = 0; m < node.networkNodes.length; m++) { - let netwrokNode = node.networkNodes[m] - createPartFromNode(netwrokNode, node, node) + let networkNode = node.networkNodes[m] + createPartFromNode(networkNode, node, node) } } return @@ -398,17 +406,28 @@ function newPartsFromNodes () { } } + function addNetwork (node) { + if (node.network === undefined) { + node.network = { + name: 'Superalgos' + } + createPart('Network', node.network.name, node.network, node, node, 'Network') + } + + return node.network + } + function addNetworkNode (node) { - let netwrokNode = { + let networkNode = { name: 'New Network Node' } if (node.networkNodes === undefined) { node.networkNodes = [] } - node.networkNodes.push(netwrokNode) - createPart('Network Node', netwrokNode.name, netwrokNode, node, node, 'Network Node') + node.networkNodes.push(networkNode) + createPart('Network Node', networkNode.name, networkNode, node, node, 'Network Node') - return netwrokNode + return networkNode } function addTaskManager (node) { diff --git a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js index aa1ce91f1..7e91ac821 100644 --- a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -450,9 +450,26 @@ function newProtocolNode () { name: node.name, taskManagers: [] } - for (let m = 0; m < node.taskManagers.length; m++) { - let taskManager = getProtocolNode(node.taskManagers[m], removePersonalData, parseJSONStrings, includeIds) - object.taskManagers.push(taskManager) + if (node.taskManagers !== undefined) { + for (let m = 0; m < node.taskManagers.length; m++) { + let taskManager = getProtocolNode(node.taskManagers[m], removePersonalData, parseJSONStrings, includeIds) + object.taskManagers.push(taskManager) + } + } + return object + } + case 'Network': { + let object = { + type: node.type, + subType: node.subType, + name: node.name, + networkNodes: [] + } + if (node.networkNodes !== undefined) { + for (let m = 0; m < node.networkNodes.length; m++) { + let networkNode = getProtocolNode(node.networkNodes[m], removePersonalData, parseJSONStrings, includeIds) + object.networkNodes.push(networkNode) + } } return object } @@ -463,11 +480,7 @@ function newProtocolNode () { name: node.name, tradingSystem: getProtocolNode(node.tradingSystem, removePersonalData, parseJSONStrings, includeIds), personalData: getProtocolNode(node.personalData, removePersonalData, parseJSONStrings, includeIds), - networkNodes: [] - } - for (let m = 0; m < node.networkNodes.length; m++) { - let networkNode = getProtocolNode(node.networkNodes[m], removePersonalData, parseJSONStrings, includeIds) - object.networkNodes.push(networkNode) + network: getProtocolNode(node.network, removePersonalData, parseJSONStrings, includeIds) } return object } diff --git a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js index 0d4c65926..84e353257 100644 --- a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js @@ -533,14 +533,12 @@ function newStringifyNode () { } return object } - case 'Definition': { + case 'Network': { let object = { id: node.id, type: node.type, subType: node.subType, name: node.name, - tradingSystem: prepareForStringify(node.tradingSystem, removePersonalData), - personalData: prepareForStringify(node.personalData, removePersonalData), networkNodes: [], savedPayload: getSavedPayload(node) } @@ -552,6 +550,19 @@ function newStringifyNode () { } return object } + case 'Definition': { + let object = { + id: node.id, + type: node.type, + subType: node.subType, + name: node.name, + tradingSystem: prepareForStringify(node.tradingSystem, removePersonalData), + personalData: prepareForStringify(node.personalData, removePersonalData), + network: prepareForStringify(node.network, removePersonalData), + savedPayload: getSavedPayload(node) + } + return object + } } } diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js index c49edf5ef..a23cfe8d9 100644 --- a/StrategySpace/Workspace/Workspace.js +++ b/StrategySpace/Workspace/Workspace.js @@ -246,6 +246,11 @@ function newWorkspace () { functionLibraryTaskFunctions.stopAllTasks(payload.node, functionLibraryProtocolNode) } break + case 'Add Network': + { + functionLibraryPartsFromNodes.addNetwork(payload.node) + } + break case 'Add Network Node': { functionLibraryPartsFromNodes.addNetworkNode(payload.node) @@ -381,6 +386,10 @@ function newWorkspace () { functionLibraryPartsFromNodes.addPersonalData(payload.node) } break + case 'Delete Network': { + functionLibraryNodeDeleter.deleteNetwork(payload.node, workspaceNode.rootNodes) + break + } case 'Delete Network Node': { functionLibraryNodeDeleter.deleteNetworkNode(payload.node, workspaceNode.rootNodes) break