diff --git a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js index 372b729e0..c969a8728 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js +++ b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js @@ -1,5 +1,6 @@ function newUiObjectsFromNodes () { thisObject = { + recreateWorkspace: recreateWorkspace, createUiObjectFromNode: createUiObjectFromNode, addDefinition: addDefinition, addNetwork: addNetwork, @@ -41,8 +42,27 @@ function newUiObjectsFromNodes () { addCode: addCode } + let mapOfReferenceParents + let mapOfReferenceChildren + return thisObject + function recreateWorkspace (node) { + mapOfReferenceParents = new Map() + mapOfReferenceChildren = new Map() + let workspace = node + createUiObject('Workspace', workspace.name, workspace, undefined, undefined, 'Workspace') + if (node.rootNodes !== undefined) { + for (let i = 0; i < node.rootNodes.length; i++) { + let rootNode = node.rootNodes[i] + createUiObjectFromNode(rootNode, undefined, undefined) + } + } + mapOfReferenceParents = undefined + mapOfReferenceChildren = undefined + return + } + function createUiObjectFromNode (node, parentNode, chainParent) { switch (node.type) { case 'Code': @@ -349,17 +369,6 @@ function newUiObjectsFromNodes () { } return } - case 'Workspace': { - let workspace = node - createUiObject('Workspace', workspace.name, workspace, parentNode, chainParent, 'Workspace') - if (node.rootNodes !== undefined) { - for (let i = 0; i < node.rootNodes.length; i++) { - let rootNode = node.rootNodes[i] - createUiObjectFromNode(rootNode, undefined, undefined) - } - } - return - } case 'Personal Data': { createUiObject('Personal Data', node.name, node, parentNode, chainParent, 'Personal Data') for (let m = 0; m < node.exchangeAccounts.length; m++) { diff --git a/DesignerSpace/Workspace/Workspace.js b/DesignerSpace/Workspace/Workspace.js index 0784efda2..a76beef28 100644 --- a/DesignerSpace/Workspace/Workspace.js +++ b/DesignerSpace/Workspace/Workspace.js @@ -86,7 +86,7 @@ function newWorkspace () { initializeLoadingFromStrategizer() } else { thisObject.workspaceNode = JSON.parse(savedWorkspace) - functionLibraryUiObjectsFromNodes.createUiObjectFromNode(thisObject.workspaceNode, undefined, undefined) + functionLibraryUiObjectsFromNodes.recreateWorkspace(thisObject.workspaceNode) thisObject.enabled = true } } catch (err) { @@ -223,7 +223,7 @@ function newWorkspace () { stopAllRunningTasks() functionLibraryNodeDeleter.deleteWorkspace(thisObject.workspaceNode, thisObject.workspaceNode.rootNodes) thisObject.workspaceNode = droppedNode - functionLibraryUiObjectsFromNodes.createUiObjectFromNode(thisObject.workspaceNode, undefined, undefined) + functionLibraryUiObjectsFromNodes.recreateWorkspace(thisObject.workspaceNode) } else { let rootNode = functionLibraryProtocolNode.getProtocolNode(droppedNode) thisObject.workspaceNode.rootNodes.push(rootNode)