From 50b481c723cfda08f176df092315bfde6fccfa3c Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 30 Mar 2020 08:32:53 +0200 Subject: [PATCH] bug fixes --- .../FunctionLibraries/UiObjectsFromNodes.js | 24 ++++++++++++------- DesignSpace/Workspace/Workspace.js | 6 ++--- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js index c65b37a19..62bf533f6 100644 --- a/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js +++ b/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js @@ -47,9 +47,11 @@ function newUiObjectsFromNodes () { for (let i = 0; i < node.rootNodes.length; i++) { let rootNode = node.rootNodes[i] if (rootNode.type === 'Data Mine') { - let code = JSON.parse(rootNode.code) - if (code.name === name) { - rootNodes.splice(i, 1) + if (rootNode.code !== undefined) { + let code = JSON.parse(rootNode.code) + if (code.name === name) { + rootNodes.splice(i, 1) + } } } } @@ -73,9 +75,11 @@ function newUiObjectsFromNodes () { for (let i = 0; i < node.rootNodes.length; i++) { let rootNode = node.rootNodes[i] if (rootNode.type === 'Trading System') { - let code = JSON.parse(rootNode.code) - if (code.name === name) { - rootNodes.splice(i, 1) + if (rootNode.code !== undefined) { + let code = JSON.parse(rootNode.code) + if (code.name === name) { + rootNodes.splice(i, 1) + } } } } @@ -99,9 +103,11 @@ function newUiObjectsFromNodes () { for (let i = 0; i < node.rootNodes.length; i++) { let rootNode = node.rootNodes[i] if (rootNode.type === 'Super Scripts') { - let code = JSON.parse(rootNode.code) - if (code.name === name) { - rootNodes.splice(i, 1) + if (rootNode.code !== undefined) { + let code = JSON.parse(rootNode.code) + if (code.name === name) { + rootNodes.splice(i, 1) + } } } } diff --git a/DesignSpace/Workspace/Workspace.js b/DesignSpace/Workspace/Workspace.js index 2941cfea0..14321b3f3 100644 --- a/DesignSpace/Workspace/Workspace.js +++ b/DesignSpace/Workspace/Workspace.js @@ -225,15 +225,15 @@ function newWorkspace () { if (rootNode.networkNodes !== undefined) { for (let j = 0; j < rootNode.networkNodes.length; j++) { let networkNode = rootNode.networkNodes[j] - if (networkNode.dataMining !== undefined) { + if (networkNode.dataMining !== undefined && networkNode.dataMining.payload !== undefined) { networkNode.dataMining.payload.uiObject.menu.internalClick('Stop All Exchange Tasks') networkNode.dataMining.payload.uiObject.menu.internalClick('Stop All Exchange Tasks') } - if (networkNode.testingEnvironment !== undefined) { + if (networkNode.testingEnvironment !== undefined && networkNode.testingEnvironment.payload !== undefined) { networkNode.testingEnvironment.payload.uiObject.menu.internalClick('Stop All Exchange Tasks') networkNode.testingEnvironment.payload.uiObject.menu.internalClick('Stop All Exchange Tasks') } - if (networkNode.productionEnvironment !== undefined) { + if (networkNode.productionEnvironment !== undefined && networkNode.productionEnvironment.payload !== undefined) { networkNode.productionEnvironment.payload.uiObject.menu.internalClick('Stop All Exchange Tasks') networkNode.productionEnvironment.payload.uiObject.menu.internalClick('Stop All Exchange Tasks') }