🐛 [Frontend] Fix: allow moving to root folder (#6615)

ITISFoundation · Oct 28, 2024 · f870beb · f870beb
1 parent 59f0725
commit f870beb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
@@ -471,7 +471,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
     _moveFolderToRequested: function(folderId) {
       const currentWorkspaceId = this.getCurrentWorkspaceId();
-      const currentFolderId = this.getCurrentWorkspaceId();
+      const currentFolderId = this.getCurrentFolderId();
       const moveFolderTo = new osparc.dashboard.MoveResourceTo(currentWorkspaceId, currentFolderId);
       const title = this.tr("Move to...");
       const win = osparc.ui.window.Window.popUpInWindow(moveFolderTo, title, 400, 400);
@@ -481,7 +481,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         const destWorkspaceId = data["workspaceId"];
         const destFolderId = data["folderId"];
         if (destWorkspaceId !== currentWorkspaceId) {
-          const msg = this.tr("Coming soon");
+          const msg = this.tr("Moving folders to Shared Workspaces are coming soon");
           osparc.FlashMessenger.getInstance().logAs(msg, "WARNING");
           return;
         }
@@ -504,6 +504,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           }, this);
         }
       });
+      moveFolderTo.addListener("cancel", () => win.close());
     },
 
     __moveFolderToWorkspace: function(folderId, destWorkspaceId) {
@@ -1415,7 +1416,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       moveToButton["moveToButton"] = true;
       moveToButton.addListener("tap", () => {
         const currentWorkspaceId = this.getCurrentWorkspaceId();
-        const currentFolderId = this.getCurrentWorkspaceId();
+        const currentFolderId = this.getCurrentFolderId();
         const moveStudyTo = new osparc.dashboard.MoveResourceTo(currentWorkspaceId, currentFolderId);
         const title = this.tr("Move to...");
         const win = osparc.ui.window.Window.popUpInWindow(moveStudyTo, title, 400, 400);