From 1d45f3acbcaba4f7b63b227a3e86a05838b7f891 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 9 Sep 2019 10:20:52 +0200
Subject: [PATCH] Bug Fixed while deleting Task Manager

---
 .../FunctionLibraries/NodeDeleter.js          |  2 +-
 StrategySpace/Workspace/Workspace.js          | 83 +++++++++++--------
 2 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js
index e5de24395..517f705bb 100644
--- a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js
+++ b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js
@@ -222,7 +222,7 @@ function newNodeDeleter () {
       deletePersonalData(node.personalData, rootNodes)
     }
     if (node.taskManager !== undefined) {
-      deleteTaskManager(node.personalData, rootNodes)
+      deleteTaskManager(node.taskManager, rootNodes)
     }
     completeDeletion(node, rootNodes)
     destroyPart(node)
diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js
index b3ac2f5e7..bae8d1635 100644
--- a/StrategySpace/Workspace/Workspace.js
+++ b/StrategySpace/Workspace/Workspace.js
@@ -1,6 +1,9 @@
 
 function newWorkspace () {
   const MODULE_NAME = 'Workspace'
+  const ERROR_LOG = true
+  const logger = newWebDebugLog()
+  logger.fileName = MODULE_NAME
 
   let thisObject = {
     tradingSystem: undefined,
@@ -53,29 +56,33 @@ function newWorkspace () {
   }
 
   async function initialize () {
-    let user = window.localStorage.getItem(LOGGED_IN_USER_LOCAL_STORAGE_KEY)
-    if (user === null) {
-      return
-    }
-    user = JSON.parse(user)
-
-    let idAtStrategizer = window.localStorage.getItem(CANVAS_APP_NAME + '.' + 'Strategizer Gateway' + '.' + user.alias)
-    let savedWorkspace = window.localStorage.getItem(CANVAS_APP_NAME + '.' + 'Workspace' + '.' + user.alias)
-
-    if (savedWorkspace === null || idAtStrategizer === null) {
-      workspaceNode.type = 'Workspace'
-      workspaceNode.name = 'My Workspace'
-      functionLibraryPartsFromNodes.createPartFromNode(workspaceNode, undefined, undefined)
-      spawnPosition.y = spawnPosition.y + 250
-      initializeLoadingFromStrategizer()
-    } else {
-      workspaceNode = JSON.parse(savedWorkspace)
-      functionLibraryPartsFromNodes.createPartFromNode(workspaceNode, undefined, undefined)
-      for (let i = 0; i < workspaceNode.rootNodes.length; i++) {
-        let rootNode = workspaceNode.rootNodes[i]
-        functionLibraryPartsFromNodes.createPartFromNode(rootNode, undefined, undefined)
+    try {
+      let user = window.localStorage.getItem(LOGGED_IN_USER_LOCAL_STORAGE_KEY)
+      if (user === null) {
+        return
       }
-      thisObject.enabled = true
+      user = JSON.parse(user)
+
+      let idAtStrategizer = window.localStorage.getItem(CANVAS_APP_NAME + '.' + 'Strategizer Gateway' + '.' + user.alias)
+      let savedWorkspace = window.localStorage.getItem(CANVAS_APP_NAME + '.' + 'Workspace' + '.' + user.alias)
+
+      if (savedWorkspace === null || idAtStrategizer === null) {
+        workspaceNode.type = 'Workspace'
+        workspaceNode.name = 'My Workspace'
+        functionLibraryPartsFromNodes.createPartFromNode(workspaceNode, undefined, undefined)
+        spawnPosition.y = spawnPosition.y + 250
+        initializeLoadingFromStrategizer()
+      } else {
+        workspaceNode = JSON.parse(savedWorkspace)
+        functionLibraryPartsFromNodes.createPartFromNode(workspaceNode, undefined, undefined)
+        for (let i = 0; i < workspaceNode.rootNodes.length; i++) {
+          let rootNode = workspaceNode.rootNodes[i]
+          functionLibraryPartsFromNodes.createPartFromNode(rootNode, undefined, undefined)
+        }
+        thisObject.enabled = true
+      }
+    } catch (err) {
+      if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = ' + err.stack) }
     }
   }
 
@@ -134,24 +141,28 @@ function newWorkspace () {
   }
 
   function spawn (nodeText, point) {
-    point = canvas.floatingSpace.container.frame.unframeThisPoint(point)
-    spawnPosition.x = point.x
-    spawnPosition.y = point.y
+    try {
+      point = canvas.floatingSpace.container.frame.unframeThisPoint(point)
+      spawnPosition.x = point.x
+      spawnPosition.y = point.y
 
-    let droppedNode = JSON.parse(nodeText)
+      let droppedNode = JSON.parse(nodeText)
 
-    if (droppedNode.type === 'Workspace') {
-      functionLibraryNodeDeleter.deleteWorkspace(workspaceNode, workspaceNode.rootNodes)
-      workspaceNode = droppedNode
-      functionLibraryPartsFromNodes.createPartFromNode(workspaceNode, undefined, undefined)
-      for (let i = 0; i < workspaceNode.rootNodes.length; i++) {
-        let rootNode = workspaceNode.rootNodes[i]
+      if (droppedNode.type === 'Workspace') {
+        functionLibraryNodeDeleter.deleteWorkspace(workspaceNode, workspaceNode.rootNodes)
+        workspaceNode = droppedNode
+        functionLibraryPartsFromNodes.createPartFromNode(workspaceNode, undefined, undefined)
+        for (let i = 0; i < workspaceNode.rootNodes.length; i++) {
+          let rootNode = workspaceNode.rootNodes[i]
+          functionLibraryPartsFromNodes.createPartFromNode(rootNode, undefined, undefined)
+        }
+      } else {
+        let rootNode = functionLibraryProtocolNode.getProtocolNode(droppedNode)
+        workspaceNode.rootNodes.push(rootNode)
         functionLibraryPartsFromNodes.createPartFromNode(rootNode, undefined, undefined)
       }
-    } else {
-      let rootNode = functionLibraryProtocolNode.getProtocolNode(droppedNode)
-      workspaceNode.rootNodes.push(rootNode)
-      functionLibraryPartsFromNodes.createPartFromNode(rootNode, undefined, undefined)
+    } catch (err) {
+      if (ERROR_LOG === true) { logger.write('[ERROR] spawn -> err = ' + err.stack) }
     }
   }