cleanup

Author: odeimaiz

services/static-webserver/client/source/class/osparc/dashboard/WorkspacesAndFoldersTree.js

@@ -58,15 +58,6 @@ qx.Class.define("osparc.dashboard.WorkspacesAndFoldersTree", {
       this.__folderRemoved(folder);
     }, this);
 
-    osparc.store.Folders.getInstance().addListener("folderMoved", e => {
-      const {
-        folder,
-        oldParentFolderId,
-      } = e.getData();
-      this.__folderRemoved(folder, oldParentFolderId);
-      this.__folderAdded(folder);
-    }, this);
-
     osparc.store.Workspaces.getInstance().addListener("workspaceAdded", e => {
       const workspace = e.getData();
       this.__addWorkspace(workspace);
@@ -299,26 +290,22 @@ qx.Class.define("osparc.dashboard.WorkspacesAndFoldersTree", {
       }
     },
 
-    __folderRemoved: function(folder, oldParentFolderId) {
+    __folderRemoved: function(folder) {
       // eslint-disable-next-line no-negated-condition
-      const parentModel = this.__getModel(folder.getWorkspaceId(), oldParentFolderId !== undefined ? oldParentFolderId : folder.getParentFolderId());
+      const parentModel = this.__getModel(folder.getWorkspaceId(), folder.getParentFolderId());
       if (parentModel) {
-        console.log("folder removed: children", parentModel.getChildren().toArray());
         const idx = parentModel.getChildren().toArray().findIndex(c => "getWorkspaceId" in c && folder.getWorkspaceId() === c.getWorkspaceId() && folder.getFolderId() === c.getFolderId());
         if (idx > -1) {
           parentModel.getChildren().removeAt(idx);
         }
       }
 
-      if (oldParentFolderId === undefined) {
-        // it was removed, not moved
-        // remove it from the cached models
-        const modelFound = this.__getModel(folder.getWorkspaceId(), folder.getFolderId());
-        if (modelFound) {
-          const index = this.__models.indexOf(modelFound);
-          if (index > -1) { // only splice array when item is found
-            this.__models.splice(index, 1); // 2nd parameter means remove one item only
-          }
+      // remove it from the cached models
+      const modelFound = this.__getModel(folder.getWorkspaceId(), folder.getFolderId());
+      if (modelFound) {
+        const index = this.__models.indexOf(modelFound);
+        if (index > -1) { // only splice array when item is found
+          this.__models.splice(index, 1); // 2nd parameter means remove one item only
         }
       }
     },

services/static-webserver/client/source/class/osparc/store/Folders.js

@@ -28,7 +28,6 @@ qx.Class.define("osparc.store.Folders", {
   events: {
     "folderAdded": "qx.event.type.Data",
     "folderRemoved": "qx.event.type.Data",
-    "folderMoved": "qx.event.type.Data",
   },
 
   statics: {
@@ -220,14 +219,6 @@ qx.Class.define("osparc.store.Folders", {
           if (folderMoved) {
             this.fireDataEvent("folderAdded", folder);
           }
-          /*
-          if (updateData.parentFolderId !== oldParentFolderId) {
-            this.fireDataEvent("folderMoved", {
-              folder,
-              oldParentFolderId,
-            });
-          }
-          */
         })
         .catch(console.error);
     },
@@ -255,7 +246,6 @@ qx.Class.define("osparc.store.Folders", {
         return new Promise(resolve => resolve());
       }
 
-      const oldParentFolderId = folder.getParentFolderId();
       const params = {
         url: {
           folderId,
@@ -267,12 +257,6 @@ qx.Class.define("osparc.store.Folders", {
           this.fireDataEvent("folderRemoved", folder);
           folder.setWorkspaceId(destWorkspaceId);
           this.fireDataEvent("folderAdded", folder);
-          /*
-          this.fireDataEvent("folderMoved", {
-            folder,
-            oldParentFolderId,
-          });
-          */
         })
         .catch(err => console.error(err));
     },