untrashStudy

Author: odeimaiz

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

@@ -788,7 +788,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
         if (moveToButton) {
           moveToButton.setEnabled(osparc.study.Utils.canMoveTo(resourceData));
         }
-        const deleteButton = menuButtons.find(menuBtn => "deleteButton" in menuBtn);
+        const deleteButton = menuButtons.find(menuBtn => "trashButton" in menuBtn);
         if (deleteButton) {
           deleteButton.setEnabled(osparc.study.Utils.canBeDeleted(resourceData));
         }

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

@@ -1340,9 +1340,25 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       const menu = card.getMenu();
       const studyData = card.getResourceData();
 
+      const trashed = Boolean(studyData["trashedAt"]);
       const writeAccess = osparc.data.model.Study.canIWrite(studyData["accessRights"]);
       const deleteAccess = osparc.data.model.Study.canIDelete(studyData["accessRights"]);
 
+      if (this.getCurrentContext() === "trash") {
+        if (trashed) {
+          if (writeAccess) {
+            const untrashButton = this.__getUntrashStudyMenuButton(studyData);
+            menu.add(untrashButton);
+          }
+          if (deleteAccess) {
+            const deleteButton = this.__getDeleteStudyMenuButton(studyData, false);
+            menu.addSeparator();
+            menu.add(deleteButton);
+          }
+        }
+        return;
+      }
+
       const openButton = this._getOpenMenuButton(studyData);
       if (openButton) {
         menu.add(openButton);
@@ -1401,9 +1417,9 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       }
 
       if (deleteAccess) {
-        const deleteButton = this.getCurrentContext() === "trash" ? this.__getDeleteStudyMenuButton(studyData, false) : this.__getTrashStudyMenuButton(studyData, false);
+        const trashButton = this.__getTrashStudyMenuButton(studyData, false);
         menu.addSeparator();
-        menu.add(deleteButton);
+        menu.add(trashButton);
       }
 
       card.evaluateMenuButtons();
@@ -1618,7 +1634,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
     __getTrashStudyMenuButton: function(studyData) {
       const trashButton = new qx.ui.menu.Button(this.tr("Trash"), "@FontAwesome5Solid/trash/12");
-      trashButton["deleteButton"] = true;
+      trashButton["trashButton"] = true;
       trashButton.set({
         appearance: "menu-button"
       });
@@ -1627,6 +1643,16 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       return trashButton;
     },
 
+    __getUntrashStudyMenuButton: function(studyData) {
+      const trashButton = new qx.ui.menu.Button(this.tr("Restore"), "@FontAwesome5Solid/trash/12");
+      trashButton["untrashButton"] = true;
+      trashButton.set({
+        appearance: "menu-button"
+      });
+      trashButton.addListener("execute", () => this.__untrashStudy(studyData), this);
+      return trashButton;
+    },
+
     __getDeleteStudyMenuButton: function(studyData) {
       const deleteButton = new qx.ui.menu.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/12");
       deleteButton["deleteButton"] = true;
@@ -1789,6 +1815,16 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       req.send(body);
     },
 
+    __untrashStudy: function(studyData) {
+      osparc.store.Store.getInstance().untrashStudy(studyData.uuid)
+        .then(() => this.__removeFromStudyList(studyData.uuid))
+        .catch(err => {
+          console.error(err);
+          osparc.FlashMessenger.getInstance().logAs(err, "ERROR");
+        })
+        .finally(() => this.resetSelection());
+    },
+
     __trashStudy: function(studyData) {
       const myGid = osparc.auth.Data.getInstance().getGroupId();
       const collabGids = Object.keys(studyData["accessRights"]);