moving folders

Author: odeimaiz

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

@@ -70,10 +70,7 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
           compatible = workspaceOrigin.getMyAccessRights()["delete"] && workspaceDest.getMyAccessRights()["write"];
         }
 
-        if (compatible) {
-          folderItem.getChildControl("icon").setTextColor("strong-main");
-        } else {
-          folderItem.getChildControl("icon").setTextColor("danger-red");
+        if (!compatible) {
           // do not allow
           event.preventDefault();
         }
@@ -82,11 +79,12 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
         dragWidget.setDropAllowed(compatible);
       },
 
-      drop: function(event, folderDest) {
+      drop: function(event, destWorkspaceId, destFolderId) {
         const studyData = event.getData("osparc-moveStudy")["studyDataOrigin"];
         const studyToFolderData = {
           studyData,
-          destFolderId: folderDest.getFolderId(),
+          destWorkspaceId,
+          destFolderId,
         };
         return studyToFolderData;
       },
@@ -143,10 +141,7 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
           compatible = workspaceOrigin.getMyAccessRights()["delete"] && workspaceDest.getMyAccessRights()["write"];
         }
 
-        if (compatible) {
-          folderItem.getChildControl("icon").setTextColor("strong-main");
-        } else {
-          folderItem.getChildControl("icon").setTextColor("danger-red");
+        if (!compatible) {
           // do not allow
           event.preventDefault();
         }
@@ -155,12 +150,12 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
         dragWidget.setDropAllowed(compatible);
       },
 
-      drop: function(event, folderDest) {
+      drop: function(event, destWorkspaceId, destFolderId) {
         const folderOrigin = event.getData("osparc-moveFolder")["folderOrigin"];
         const folderToFolderData = {
           folderId: folderOrigin.getFolderId(),
-          destWorkspaceId: folderDest.getWorkspaceId(),
-          destFolderId: folderDest.getFolderId(),
+          destWorkspaceId,
+          destFolderId,
         };
         return folderToFolderData;
       },

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

@@ -195,10 +195,10 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
       this.addListener("drop", e => {
         const folderDest = this.getFolder();
         if (e.supportsType("osparc-moveStudy")) {
-          const studyToFolderData = osparc.dashboard.DragDropHelpers.moveStudy.drop(e, folderDest);
+          const studyToFolderData = osparc.dashboard.DragDropHelpers.moveStudy.drop(e, folderDest.getWorkspaceId(), folderDest.getFolderId());
           this.fireDataEvent("studyToFolderRequested", studyToFolderData);
         } else if (e.supportsType("osparc-moveFolder")) {
-          const folderToFolderData = osparc.dashboard.DragDropHelpers.moveFolder.drop(e, folderDest);
+          const folderToFolderData = osparc.dashboard.DragDropHelpers.moveFolder.drop(e, folderDest.getWorkspaceId(), folderDest.getFolderId());
           this.fireDataEvent("folderToFolderRequested", folderToFolderData);
         }
       });

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

@@ -104,16 +104,13 @@ qx.Class.define("osparc.dashboard.WorkspacesAndFoldersTreeItem", {
       });
 
       this.addListener("drop", e => {
-        const folderDest = this.__getFolder();
-        if (folderDest == null) {
-          e.preventDefault();
-          return;
-        }
+        const workspaceDestId = this.getModel().getWorkspaceId();
+        const folderDestId = this.getModel().getFolderId();
         if (e.supportsType("osparc-moveStudy")) {
-          const studyToFolderData = osparc.dashboard.DragDropHelpers.moveStudy.drop(e, folderDest);
+          const studyToFolderData = osparc.dashboard.DragDropHelpers.moveStudy.drop(e, workspaceDestId, folderDestId);
           this.fireDataEvent("studyToFolderRequested", studyToFolderData);
         } else if (e.supportsType("osparc-moveFolder")) {
-          const folderToFolderData = osparc.dashboard.DragDropHelpers.moveFolder.drop(e, folderDest);
+          const folderToFolderData = osparc.dashboard.DragDropHelpers.moveFolder.drop(e, workspaceDestId, folderDestId);
           this.fireDataEvent("folderToFolderRequested", folderToFolderData);
         }
       });