refactor

Author: odeimaiz

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

@@ -19,6 +19,27 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
   type: "static",
 
   statics: {
+    moveStudy: {
+      dragStart: function(event, studyDataOrigin, studyItem) {
+        event.addAction("move");
+        event.addType("osparc-moveStudy");
+        event.addData("osparc-moveStudy", {
+          "studyDataOrigin": studyDataOrigin,
+        });
+
+        // init drag indicator
+        const dragWidget = osparc.dashboard.DragWidget.getInstance();
+        dragWidget.getChildControl("dragged-resource").set({
+          label: studyDataOrigin["name"],
+          icon: "@FontAwesome5Solid/file/16",
+        });
+        dragWidget.start();
+
+        // make it semi transparent while being dragged
+        studyItem.setOpacity(0.2);
+      },
+    },
+
     moveFolder: {
       dragStart: function(event, folderOrigin, folderItem) {
         event.addAction("move");

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

@@ -660,29 +660,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       card.setDraggable(true);
 
       card.addListener("dragstart", e => {
-        e.addAction("move");
-        e.addType("osparc-moveStudy");
-        e.addData("osparc-moveStudy", {
-          "studyDataOrigin": card.getResourceData(),
-        });
-
-        // make it semi transparent while being dragged
-        card.setOpacity(0.2);
-        // init drag indicator
-        const dragWidget = osparc.dashboard.DragWidget.getInstance();
-        dragWidget.getChildControl("dragged-resource").set({
-          label: card.getTitle(),
-          icon: "@FontAwesome5Solid/file/16",
-        });
-        dragWidget.start();
+        const studyDataOrigin = card.getResourceData();
+        osparc.dashboard.DragDropHelpers.moveStudy.dragStart(e, studyDataOrigin, card);
       });
 
       card.addListener("dragend", () => {
-        // bring back opacity after drag
-        card.setOpacity(1);
-        // hide drag indicator
-        const dragWidget = osparc.dashboard.DragWidget.getInstance();
-        dragWidget.end();
+        osparc.dashboard.DragDropHelpers.dragEnd(card);
       });
     },
 

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

@@ -128,10 +128,15 @@ qx.Class.define("osparc.dashboard.WorkspacesAndFoldersTreeItem", {
 
       this.addListener("drop", e => {
         if (e.supportsType("osparc-moveStudy")) {
+          const folderDest = this.__getFolder();
+          if (folderDest == null) {
+            e.preventDefault();
+            return;
+          }
           const studyData = e.getData("osparc-moveStudy")["studyDataOrigin"];
           const studyToFolderData = {
             studyData,
-            destFolderId: this.getFolderId(),
+            destFolderId: folderDest.getFolderId(),
           };
           this.fireDataEvent("studyToFolderRequested", studyToFolderData);
         } else if (e.supportsType("osparc-moveFolder")) {