trash folder workflow

Author: odeimaiz

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

@@ -46,7 +46,8 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
     "folderSelected": "qx.event.type.Data",
     "folderUpdated": "qx.event.type.Data",
     "moveFolderToRequested": "qx.event.type.Data",
-    "deleteFolderRequested": "qx.event.type.Data"
+    "trashFolderRequested": "qx.event.type.Data",
+    "deleteFolderRequested": "qx.event.type.Data",
   },
 
   properties: {
@@ -196,6 +197,10 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
 
       menu.addSeparator();
 
+      const trashButton = new qx.ui.menu.Button(this.tr("Trash"), "@FontAwesome5Solid/trash/12");
+      trashButton.addListener("execute", () => this.__trashFolderRequested(), this);
+      menu.add(trashButton);
+
       const deleteButton = new qx.ui.menu.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/12");
       deleteButton.addListener("execute", () => this.__deleteFolderRequested(), this);
       menu.add(deleteButton);
@@ -237,6 +242,24 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
       folderEditor.addListener("cancel", () => win.close());
     },
 
+    __trashFolderRequested: function() {
+      const trashDays = osparc.store.StaticInfo.getInstance().getTrashRetentionDays();
+      let msg = this.tr("Are you sure you want to move the Folder and all its content to the trash?");
+      msg += "<br><br>" + this.tr("It will be permanently deleted after ") + trashDays + " days.";
+      const confirmationWin = new osparc.ui.window.Confirmation(msg).set({
+        caption: this.tr("Move to Trash"),
+        confirmText: this.tr("Move to Trash"),
+        confirmAction: "delete"
+      });
+      confirmationWin.center();
+      confirmationWin.open();
+      confirmationWin.addListener("close", () => {
+        if (confirmationWin.getConfirmed()) {
+          this.fireDataEvent("trashFolderRequested", this.getFolderId());
+        }
+      }, this);
+    },
+
     __deleteFolderRequested: function() {
       const msg = this.tr("Are you sure you want to delete") + " <b>" + this.getTitle() + "</b>?";
       const confirmationWin = new osparc.ui.window.Confirmation(msg).set({

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

@@ -267,6 +267,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       resourcesContainer.addListener("emptyStudyClicked", e => this._deleteResourceRequested(e.getData()));
       resourcesContainer.addListener("folderUpdated", e => this._folderUpdated(e.getData()));
       resourcesContainer.addListener("moveFolderToRequested", e => this._moveFolderToRequested(e.getData()));
+      resourcesContainer.addListener("trashFolderRequested", e => this._trashFolderRequested(e.getData()));
       resourcesContainer.addListener("deleteFolderRequested", e => this._deleteFolderRequested(e.getData()));
       resourcesContainer.addListener("folderSelected", e => {
         const folderId = e.getData();
@@ -487,6 +488,10 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       throw new Error("Abstract method called!");
     },
 
+    _trashFolderRequested: function(folderId) {
+      throw new Error("Abstract method called!");
+    },
+
     _deleteFolderRequested: function(folderId) {
       throw new Error("Abstract method called!");
     },

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

@@ -75,6 +75,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
     "folderSelected": "qx.event.type.Data",
     "folderUpdated": "qx.event.type.Data",
     "moveFolderToRequested": "qx.event.type.Data",
+    "trashFolderRequested": "qx.event.type.Data",
     "deleteFolderRequested": "qx.event.type.Data",
     "workspaceSelected": "qx.event.type.Data",
     "workspaceUpdated": "qx.event.type.Data",
@@ -418,6 +419,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
         "folderSelected",
         "folderUpdated",
         "moveFolderToRequested",
+        "trashFolderRequested",
         "deleteFolderRequested",
       ].forEach(eName => card.addListener(eName, e => this.fireDataEvent(eName, e.getData())));
       return card;

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

@@ -542,6 +542,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         .catch(err => console.error(err));
     },
 
+    _trashFolderRequested: function(folderId) {
+      osparc.store.Folders.getInstance().trashFolder(folderId, this.getCurrentWorkspaceId())
+        .then(() => this.__reloadFolders())
+        .catch(err => console.error(err));
+    },
+
     _deleteFolderRequested: function(folderId) {
       osparc.store.Folders.getInstance().deleteFolder(folderId, this.getCurrentWorkspaceId())
         .then(() => this.__reloadFolders())

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

@@ -122,6 +122,23 @@ qx.Class.define("osparc.store.Folders", {
         });
     },
 
+    trashFolder: function(folderId, workspaceId) {
+      const params = {
+        "url": {
+          folderId
+        }
+      };
+      return osparc.data.Resources.getInstance().fetch("folders", "trash", params)
+        .then(() => {
+          const folder = this.getFolder(folderId);
+          if (folder) {
+            this.__deleteFromCache(folderId, workspaceId);
+            this.fireDataEvent("folderRemoved", folder);
+          }
+        })
+        .catch(console.error);
+    },
+
     deleteFolder: function(folderId, workspaceId) {
       const params = {
         "url": {