From 72f282409627e0466ba557f4690cf06bf56390de Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 1 Oct 2019 10:00:23 +0200 Subject: [PATCH] Network Node Concept Implemented --- FloatingSpace/StrategyPart.js | 4 +-- FloatingSpace/StrategyPartConstructor.js | 16 ++++++----- FloatingSpace/StrategyPartTitle.js | 3 +++ Spaces/StrategySpace.js | 1 + .../FunctionLibraries/AttachDetach.js | 18 +++++++++++++ .../FunctionLibraries/NodeChildren.js | 20 ++++++++++++++ .../FunctionLibraries/NodeDeleter.js | 19 +++++++++++++ .../FunctionLibraries/PartsFromNodes.js | 24 +++++++++++++++++ .../FunctionLibraries/ProtocolNode.js | 19 ++++++++++--- .../FunctionLibraries/StringifyNode.js | 27 +++++++++++++++---- StrategySpace/Workspace/Workspace.js | 9 +++++++ 11 files changed, 144 insertions(+), 16 deletions(-) diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 7082c74a7..0db572b17 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -210,7 +210,7 @@ function newStrategyPart () { compatibleType = '->' + 'Definition' + '->' compatibleSubType = undefined break - case 'Node': + case 'Network Node': compatibleType = '->' + 'Definition' + '->' compatibleSubType = undefined break @@ -247,7 +247,7 @@ function newStrategyPart () { compatibleSubType = undefined break case 'Task Manager': - compatibleType = '->' + 'Node' + '->' + compatibleType = '->' + 'Network Node' + '->' compatibleSubType = undefined break case 'Task': diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js index 94c16eb1c..d10fd4745 100644 --- a/FloatingSpace/StrategyPartConstructor.js +++ b/FloatingSpace/StrategyPartConstructor.js @@ -274,11 +274,11 @@ function newStrategyPartConstructor () { ) menuItemsInitialValues.push( { - action: 'Add Node', + action: 'Add Network Node', actionFunction: payload.onMenuItemClick, - label: 'Add Node', + label: 'Add Network Node', visible: true, - relatedStrategyPart: 'Node', + relatedStrategyPart: 'Network Node', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -317,7 +317,7 @@ function newStrategyPartConstructor () { ) break } - case 'Node': { + case 'Network Node': { addLeftIcons(menuItemsInitialValues, floatingObject) menuItemsInitialValues.push( { @@ -334,11 +334,11 @@ function newStrategyPartConstructor () { ) menuItemsInitialValues.push( { - action: 'Delete Node', + action: 'Delete Network Node', askConfirmation: true, confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, - label: 'Delete Node', + label: 'Delete Network Node', visible: true, iconPathOn: 'delete', iconPathOff: 'delete', @@ -2210,6 +2210,10 @@ function newStrategyPartConstructor () { level_0() break } + case 'Network Node': { + level_1() + break + } case 'Task Manager': { level_1() break diff --git a/FloatingSpace/StrategyPartTitle.js b/FloatingSpace/StrategyPartTitle.js index 4d859608d..da278da30 100644 --- a/FloatingSpace/StrategyPartTitle.js +++ b/FloatingSpace/StrategyPartTitle.js @@ -52,6 +52,9 @@ function newStrategyPartTitle () { thisObject.allwaysVisible = true break } + case 'Network Node': { + break + } case 'Task Manager': { break } diff --git a/Spaces/StrategySpace.js b/Spaces/StrategySpace.js index 6a69efd76..665aaae45 100644 --- a/Spaces/StrategySpace.js +++ b/Spaces/StrategySpace.js @@ -40,6 +40,7 @@ function newStrategySpace () { function buildIconByPartTypeMap () { const relationshipArray = [ ['Definition', 'text'], + ['Network Node', 'photo-camera'], ['Task Manager', 'task'], ['Task', 'timeline'], ['Sensor', 'pipette'], diff --git a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js index 82fe0caf0..f01bbedba 100644 --- a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js +++ b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js @@ -11,6 +11,17 @@ function newAttachDetach () { case 'Definition': { 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) { + payload.parentNode.nodes.splice(i, 1) + } + } + completeDetachment(node, rootNodes) + return + } case 'Personal Data': { node.payload.parentNode.personalData = undefined completeDetachment(node, rootNodes) @@ -265,6 +276,13 @@ function newAttachDetach () { function attachNode (node, attachToNode, rootNodes) { switch (node.type) { + case 'Network Node': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.networkNodes.push(node) + completeAttachment(node, rootNodes) + } + break case 'Task Manager': { node.payload.parentNode = attachToNode node.payload.chainParent = attachToNode diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js index 5c6c2b311..aab531797 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 Node': { + return countChildrenNetworkNode(parentNode, childNode) + } case 'Task Manager': { return countChildrenTaskManager(parentNode, childNode) } @@ -145,6 +148,23 @@ function newNodeChildren () { response.childIndex = response.childrenCount } } + if (parentNode.networkNodes !== undefined) { + for (let i = 0; i < parentNode.networkNodes.length; i++) { + let child = parentNode.networkNodes[i] + response.childrenCount++ + if (child.id === childNode.id) { + response.childIndex = response.childrenCount + } + } + } + return response + } + + function countChildrenNetworkNode (parentNode, childNode) { + let response = { + childrenCount: 0, + childIndex: undefined + } if (parentNode.taskManagers !== undefined) { for (let i = 0; i < parentNode.taskManagers.length; i++) { let child = parentNode.taskManagers[i] diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js index 46dbd37a7..262790762 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -1,6 +1,7 @@ function newNodeDeleter () { thisObject = { deleteDefinition: deleteDefinition, + deleteNetworkNode: deleteNetworkNode, deleteTaskManager: deleteTaskManager, deleteTask: deleteTask, deleteSensor: deleteBot, @@ -53,6 +54,10 @@ function newNodeDeleter () { deleteDefinition(rootNode, rootNodes, true) break } + case 'Network Node': { + deleteNetworkNode(rootNode, rootNodes) + break + } case 'Task Manager': { deleteTaskManager(rootNode, rootNodes) break @@ -235,6 +240,20 @@ function newNodeDeleter () { if (node.personalData !== undefined) { deletePersonalData(node.personalData, rootNodes) } + if (node.networkNodes !== undefined) { + while (node.networkNodes.length > 0) { + deleteNetworkNode(node.networkNodes[0], rootNodes) + } + } + + completeDeletion(node, rootNodes) + destroyPart(node) + cleanNode(node) + } + + function deleteNetworkNode (node, rootNodes, forced) { + let payload = node.payload + 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 183843041..1b77a9877 100644 --- a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js +++ b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js @@ -1,6 +1,7 @@ function newPartsFromNodes () { thisObject = { createPartFromNode: createPartFromNode, + addNetworkNode: addNetworkNode, addTaskManager: addTaskManager, addTask: addTask, addSensor: addSensor, @@ -333,6 +334,16 @@ function newPartsFromNodes () { if (node.personalData !== undefined) { createPartFromNode(node.personalData, node, node) } + if (node.networkNodes !== undefined) { + for (let m = 0; m < node.networkNodes.length; m++) { + let netwrokNode = node.networkNodes[m] + createPartFromNode(netwrokNode, node, node) + } + } + return + } + case 'Network Node': { + createPart('Network Node', node.name, node, parentNode, chainParent, 'Network Node') if (node.taskManagers !== undefined) { for (let m = 0; m < node.taskManagers.length; m++) { let taskManager = node.taskManagers[m] @@ -387,6 +398,19 @@ function newPartsFromNodes () { } } + function addNetworkNode (node) { + let netwrokNode = { + name: 'New Network Node' + } + if (node.networkNodes === undefined) { + node.networkNodes = [] + } + node.networkNodes.push(netwrokNode) + createPart('Network Node', netwrokNode.name, netwrokNode, node, node, 'Network Node') + + return netwrokNode + } + function addTaskManager (node) { let taskManager = { name: 'New Task Manager' diff --git a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js index 9ee0774ed..aa1ce91f1 100644 --- a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -443,13 +443,11 @@ function newProtocolNode () { } return object } - case 'Definition': { + case 'Network Node': { let object = { type: node.type, subType: node.subType, name: node.name, - tradingSystem: getProtocolNode(node.tradingSystem, removePersonalData, parseJSONStrings, includeIds), - personalData: getProtocolNode(node.personalData, removePersonalData, parseJSONStrings, includeIds), taskManagers: [] } for (let m = 0; m < node.taskManagers.length; m++) { @@ -458,6 +456,21 @@ function newProtocolNode () { } return object } + case 'Definition': { + let object = { + type: node.type, + subType: node.subType, + 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) + } + return object + } } } } diff --git a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js index 6cdf0dbea..0d4c65926 100644 --- a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js @@ -516,6 +516,23 @@ function newStringifyNode () { } return object } + case 'Network Node': { + let object = { + id: node.id, + type: node.type, + subType: node.subType, + name: node.name, + taskManagers: [], + savedPayload: getSavedPayload(node) + } + if (node.taskManagers !== undefined) { + for (let m = 0; m < node.taskManagers.length; m++) { + let taskManager = prepareForStringify(node.taskManagers[m], removePersonalData) + object.taskManagers.push(taskManager) + } + } + return object + } case 'Definition': { let object = { id: node.id, @@ -524,13 +541,13 @@ function newStringifyNode () { name: node.name, tradingSystem: prepareForStringify(node.tradingSystem, removePersonalData), personalData: prepareForStringify(node.personalData, removePersonalData), - taskManagers: [], + networkNodes: [], savedPayload: getSavedPayload(node) } - if (node.taskManagers !== undefined) { - for (let m = 0; m < node.taskManagers.length; m++) { - let taskManager = prepareForStringify(node.taskManagers[m], removePersonalData) - object.taskManagers.push(taskManager) + if (node.networkNodes !== undefined) { + for (let m = 0; m < node.networkNodes.length; m++) { + let networkNode = prepareForStringify(node.networkNodes[m], removePersonalData) + object.networkNodes.push(networkNode) } } return object diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js index 0dd9e4c87..c49edf5ef 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 Node': + { + functionLibraryPartsFromNodes.addNetworkNode(payload.node) + } + break case 'Add Task Manager': { functionLibraryPartsFromNodes.addTaskManager(payload.node) @@ -376,6 +381,10 @@ function newWorkspace () { functionLibraryPartsFromNodes.addPersonalData(payload.node) } break + case 'Delete Network Node': { + functionLibraryNodeDeleter.deleteNetworkNode(payload.node, workspaceNode.rootNodes) + break + } case 'Delete Task Manager': { functionLibraryNodeDeleter.deleteTaskManager(payload.node, workspaceNode.rootNodes) break