refactor

Author: odeimaiz

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

@@ -576,8 +576,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         const destWorkspaceId = data["workspaceId"];
         const destFolderId = data["folderId"];
         const moveFolder = () => {
-          this.__moveFolderToWorkspace(folderId, destWorkspaceId) // first move to workspace
-            .then(() => this.__moveFolderToFolder(folderId, destFolderId)) // then move to folder
+          osparc.store.Folders.getInstance().moveFolderToWorkspace(folderId, destWorkspaceId) // first move to workspace
+            .then(() => osparc.store.Folders.getInstance().moveFolderToFolder(folderId, destFolderId)) // then move to folder
             .then(() => this.__reloadFolders())
             .catch(err => console.error(err));
         }
@@ -595,38 +595,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       moveFolderTo.addListener("cancel", () => win.close());
     },
 
-    __moveFolderToWorkspace: function(folderId, destWorkspaceId) {
-      const folder = osparc.store.Folders.getInstance().getFolder(folderId);
-      if (folder.getWorkspaceId() === destWorkspaceId) {
-        // resolve right away
-        return new Promise(resolve => resolve());
-      }
-      const params = {
-        url: {
-          folderId,
-          workspaceId: destWorkspaceId,
-        }
-      };
-      return osparc.data.Resources.fetch("folders", "moveToWorkspace", params)
-        .then(() => folder.setWorkspaceId(destWorkspaceId))
-        .catch(err => console.error(err));
-    },
-
-    __moveFolderToFolder: function(folderId, destFolderId) {
-      if (folderId === destFolderId) {
-        // resolve right away
-        return new Promise(resolve => resolve());
-      }
-      const folder = osparc.store.Folders.getInstance().getFolder(folderId);
-      const updatedData = {
-        name: folder.getName(),
-        parentFolderId: destFolderId,
-      };
-      return osparc.store.Folders.getInstance().putFolder(folderId, updatedData)
-        .then(() => folder.setParentFolderId(destFolderId))
-        .catch(err => console.error(err));
-    },
-
     _trashFolderRequested: function(folderId) {
       osparc.store.Folders.getInstance().trashFolder(folderId, this.getCurrentWorkspaceId())
         .then(() => {

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

@@ -223,6 +223,47 @@ qx.Class.define("osparc.store.Folders", {
         .catch(console.error);
     },
 
+    moveFolderToFolder: function(folderId, destFolderId) {
+      if (folderId === destFolderId) {
+        // resolve right away
+        return new Promise(resolve => resolve());
+      }
+
+      const folder = this.getFolder(folderId);
+      const updatedData = {
+        name: folder.getName(),
+        parentFolderId: destFolderId,
+      };
+      return this.putFolder(folderId, updatedData)
+        .then(() => folder.setParentFolderId(destFolderId))
+        .catch(err => console.error(err));
+    },
+
+    moveFolderToWorkspace: function(folderId, destWorkspaceId) {
+      const folder = this.getFolder(folderId);
+      if (folder.getWorkspaceId() === destWorkspaceId) {
+        // resolve right away
+        return new Promise(resolve => resolve());
+      }
+
+      const oldParentFolderId = folder.getParentFolderId();
+      const params = {
+        url: {
+          folderId,
+          workspaceId: destWorkspaceId,
+        }
+      };
+      return osparc.data.Resources.fetch("folders", "moveToWorkspace", params)
+        .then(() => {
+          folder.setWorkspaceId(destWorkspaceId);
+          this.fireDataEvent("folderMoved", {
+            folder,
+            oldParentFolderId,
+          });
+        })
+        .catch(err => console.error(err));
+    },
+
     getFolder: function(folderId = null) {
       return this.foldersCached.find(f => f.getFolderId() === folderId);
     },