untrash and context binding

Author: odeimaiz

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

@@ -47,6 +47,7 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
     "folderUpdated": "qx.event.type.Data",
     "moveFolderToRequested": "qx.event.type.Data",
     "trashFolderRequested": "qx.event.type.Data",
+    "untrashFolderRequested": "qx.event.type.Data",
     "deleteFolderRequested": "qx.event.type.Data",
   },
 
@@ -85,7 +86,14 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
       check: "Date",
       nullable: true,
       apply: "__applyLastModified"
-    }
+    },
+
+    currentContext: {
+      check: ["studiesAndFolders", "workspaces", "search", "trash"],
+      nullable: false,
+      init: "studiesAndFolders",
+      event: "changeCurrentContext"
+    },
   },
 
   members: {
@@ -187,23 +195,30 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
         position: "bottom-right"
       });
 
-      const editButton = new qx.ui.menu.Button(this.tr("Rename..."), "@FontAwesome5Solid/pencil-alt/12");
-      editButton.addListener("execute", () => this.__editFolder(), this);
-      menu.add(editButton);
+      if (this.getCurrentContext() === "trash") {
+        const trashButton = new qx.ui.menu.Button(this.tr("Restore"), "@MaterialIcons/restore_from_trash/16");
+        trashButton.addListener("execute", () => this.fireDataEvent("untrashFolderRequested", this.getFolderId()), this);
+
+        menu.addSeparator();
 
-      const moveToButton = new qx.ui.menu.Button(this.tr("Move to..."), "@FontAwesome5Solid/folder/12");
-      moveToButton.addListener("execute", () => this.fireDataEvent("moveFolderToRequested", this.getFolderId()), this);
-      menu.add(moveToButton);
+        const deleteButton = new qx.ui.menu.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/12");
+        deleteButton.addListener("execute", () => this.__deleteFolderRequested(), this);
+        menu.add(deleteButton);
+      } else {
+        const editButton = new qx.ui.menu.Button(this.tr("Rename..."), "@FontAwesome5Solid/pencil-alt/12");
+        editButton.addListener("execute", () => this.__editFolder(), this);
+        menu.add(editButton);
 
-      menu.addSeparator();
+        const moveToButton = new qx.ui.menu.Button(this.tr("Move to..."), "@FontAwesome5Solid/folder/12");
+        moveToButton.addListener("execute", () => this.fireDataEvent("moveFolderToRequested", this.getFolderId()), this);
+        menu.add(moveToButton);
 
-      const trashButton = new qx.ui.menu.Button(this.tr("Trash"), "@FontAwesome5Solid/trash/12");
-      trashButton.addListener("execute", () => this.__trashFolderRequested(), this);
-      menu.add(trashButton);
+        menu.addSeparator();
 
-      const deleteButton = new qx.ui.menu.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/12");
-      deleteButton.addListener("execute", () => this.__deleteFolderRequested(), this);
-      menu.add(deleteButton);
+        const trashButton = new qx.ui.menu.Button(this.tr("Trash"), "@FontAwesome5Solid/trash/12");
+        trashButton.addListener("execute", () => this.__trashFolderRequested(), this);
+        menu.add(trashButton);
+      }
 
       menuButton.setMenu(menu);
     },

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

@@ -268,6 +268,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       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("untrashFolderRequested", e => this._untrashFolderRequested(e.getData()));
       resourcesContainer.addListener("deleteFolderRequested", e => this._deleteFolderRequested(e.getData()));
       resourcesContainer.addListener("folderSelected", e => {
         const folderId = e.getData();
@@ -492,6 +493,10 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       throw new Error("Abstract method called!");
     },
 
+    _untrashFolderRequested: 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

@@ -49,6 +49,13 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
   },
 
   properties: {
+    currentContext: {
+      check: ["studiesAndFolders", "workspaces", "search", "trash"],
+      nullable: false,
+      init: "studiesAndFolders",
+      event: "changeCurrentContext"
+    },
+
     mode: {
       check: ["grid", "list"],
       init: "grid",
@@ -76,6 +83,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
     "folderUpdated": "qx.event.type.Data",
     "moveFolderToRequested": "qx.event.type.Data",
     "trashFolderRequested": "qx.event.type.Data",
+    "untrashFolderRequested": "qx.event.type.Data",
     "deleteFolderRequested": "qx.event.type.Data",
     "workspaceSelected": "qx.event.type.Data",
     "workspaceUpdated": "qx.event.type.Data",
@@ -415,11 +423,13 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
 
     __createFolderCard: function(folder) {
       const card = new osparc.dashboard.FolderButtonItem(folder);
+      this.bind("currentContext", card, "currentContext");
       [
         "folderSelected",
         "folderUpdated",
         "moveFolderToRequested",
         "trashFolderRequested",
+        "untrashFolderRequested",
         "deleteFolderRequested",
       ].forEach(eName => card.addListener(eName, e => this.fireDataEvent(eName, e.getData())));
       return card;

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

@@ -548,6 +548,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         .catch(err => console.error(err));
     },
 
+    _untrashFolderRequested: function(folderId) {
+      osparc.store.Folders.getInstance().untrashFolder(folderId)
+        .then(() => this.__reloadFolders())
+        .catch(err => console.error(err));
+    },
+
     _deleteFolderRequested: function(folderId) {
       osparc.store.Folders.getInstance().deleteFolder(folderId, this.getCurrentWorkspaceId())
         .then(() => this.__reloadFolders())
@@ -871,6 +877,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       }
 
       this._createResourcesLayout();
+      this.bind("currentContext", this._resourcesContainer, "currentContext");
 
       const list = this._resourcesContainer.getFlatList();
       if (list) {

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

@@ -139,6 +139,23 @@ qx.Class.define("osparc.store.Folders", {
         .catch(console.error);
     },
 
+    untrashFolder: function(folderId, workspaceId) {
+      const params = {
+        "url": {
+          folderId
+        }
+      };
+      return osparc.data.Resources.getInstance().fetch("folders", "trash", params)
+        .then(() => {
+          console.log("untrashed");
+          /*
+          const folder = this.__addToCache(folderData);
+          this.fireDataEvent("folderAdded", folder);
+          */
+        })
+        .catch(console.error);
+    },
+
     deleteFolder: function(folderId, workspaceId) {
       const params = {
         "url": {