to trash working

Author: odeimaiz

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

@@ -176,12 +176,12 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
         const workspaceIdOrigin = studyDataOrigin["workspaceId"];
         const workspaceOrigin = osparc.store.Workspaces.getInstance().getWorkspace(workspaceIdOrigin);
         // Compatibility checks:
-        // - My Workspace -> Trash (1)
+        // - My Workspace -> Trash (0)
         //   - Delete on Study
-        // - Shared Workspace -> Trash (2)
+        // - Shared Workspace -> Trash (1)
         //   - Delete on Shared Workspace
         if (workspaceIdOrigin === null) { // (0)
-          compatible = osparc.data.model.Study.canIDelete(studyDataOrigin["accessRights"])
+          compatible = osparc.data.model.Study.canIDelete(studyDataOrigin["accessRights"]);
         } else if (workspaceIdOrigin !== null) { // (1)
           compatible = workspaceOrigin.getMyAccessRights()["delete"];
         }
@@ -195,20 +195,41 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
         dragWidget.setDropAllowed(compatible);
       },
 
-      drop: function(event, folderItem, destWorkspaceId, destFolderId) {
-        const studyData = event.getData("osparc-moveStudy")["studyDataOrigin"];
-        const studyToFolderData = {
-          studyData,
-          destWorkspaceId,
-          destFolderId,
-        };
-        folderItem.getChildControl("icon").resetTextColor();
-        return studyToFolderData;
+      drop: function(event) {
+        return event.getData("osparc-moveStudy")["studyDataOrigin"];
       },
     },
 
     trashFolder: {
+      dragOver: function(event) {
+        let compatible = false;
+        const folderOrigin = event.getData("osparc-moveFolder")["folderOrigin"];
+        const workspaceIdOrigin = folderOrigin.getWorkspaceId();
+        const workspaceOrigin = osparc.store.Workspaces.getInstance().getWorkspace(workspaceIdOrigin);
+        // Compatibility checks:
+        // - My Workspace -> Trash (0)
+        //   - Yes
+        // - Shared Workspace -> Trash (1)
+        //   - Delete on Shared Workspace
+        if (workspaceIdOrigin === null) { // (0)
+          compatible = true;
+        } else if (workspaceIdOrigin !== null) { // (1)
+          compatible = workspaceOrigin.getMyAccessRights()["delete"];
+        }
+
+        if (!compatible) {
+          // do not allow
+          event.preventDefault();
+        }
+
+        const dragWidget = osparc.dashboard.DragWidget.getInstance();
+        dragWidget.setDropAllowed(compatible);
+      },
 
+      drop: function(event) {
+        const folderOrigin = event.getData("osparc-moveFolder")["folderOrigin"];
+        return folderOrigin.getFolderId();
+      },
     },
 
     dragLeave: function(item) {

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

@@ -35,6 +35,8 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
 
   events: {
     "trashContext": "qx.event.type.Event",
+    "trashStudyRequested": "qx.event.type.Data",
+    "trashFolderRequested": "qx.event.type.Data",
     "changeSharedWith": "qx.event.type.Data",
     "changeSelectedTags": "qx.event.type.Data",
     "changeServiceType": "qx.event.type.Data"
@@ -132,6 +134,16 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
       trashButton.addListener("dragleave", () => {
         osparc.dashboard.DragDropHelpers.dragLeave();
       });
+
+      trashButton.addListener("drop", e => {
+        if (e.supportsType("osparc-moveStudy")) {
+          const studyData = osparc.dashboard.DragDropHelpers.trashStudy.drop(e);
+          this.fireDataEvent("trashStudyRequested", studyData);
+        } else if (e.supportsType("osparc-moveFolder")) {
+          const folderId = osparc.dashboard.DragDropHelpers.trashFolder.drop(e);
+          this.fireDataEvent("trashFolderRequested", folderId);
+        }
+      });
     },
 
     evaluateTrashEmpty: function() {

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

@@ -1167,6 +1167,13 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       workspacesAndFoldersTree.addListener("folderToFolderRequested", e => {
         this._folderToFolderRequested(e.getData());
       });
+
+      this._resourceFilter.addListener("trashStudyRequested", e => {
+        this.__trashStudyRequested(e.getData());
+      });
+      this._resourceFilter.addListener("trashFolderRequested", e => {
+        this._trashFolderRequested(e.getData());
+      });
     },
 
     __addSortByButton: function() {