remove trash related code

ITISFoundation · Oct 24, 2024 · 06ad073 · 06ad073
1 parent 139d61e
commit 06ad073
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 45 deletions.
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ContextBreadcrumbs.js b/services/static-webserver/client/source/class/osparc/dashboard/ContextBreadcrumbs.js
@@ -32,7 +32,7 @@ qx.Class.define("osparc.dashboard.ContextBreadcrumbs", {
 
   properties: {
     currentContext: {
-      check: ["studiesAndFolders", "workspaces", "search", "trash"],
+      check: ["studiesAndFolders", "workspaces", "search"],
       nullable: false,
       init: "studiesAndFolders",
       event: "changeCurrentContext",

diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js
@@ -34,7 +34,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
   },
 
   events: {
-    "trashContext": "qx.event.type.Event",
     "changeSharedWith": "qx.event.type.Data",
     "changeSelectedTags": "qx.event.type.Data",
     "changeServiceType": "qx.event.type.Data"
@@ -43,15 +42,13 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
   members: {
     __resourceType: null,
     __workspacesAndFoldersTree: null,
-    __trashButton: null,
     __sharedWithButtons: null,
     __tagButtons: null,
     __serviceTypeButtons: null,
 
     __buildLayout: function() {
       if (this.__resourceType === "study" && osparc.utils.DisabledPlugins.isFoldersEnabled()) {
         this._add(this.__createWorkspacesAndFoldersTree());
-        this._add(this.__createTrashBin());
       } else {
         this._add(this.__createSharedWithFilterLayout());
       }
@@ -87,24 +84,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
     },
     /* /WORKSPACES AND FOLDERS */
 
-    /* TRASH BIN */
-    __createTrashBin: function() {
-      const trashButton = this.__trashButton = new qx.ui.toolbar.RadioButton().set({
-        value: false,
-        appearance: "filter-toggle-button",
-        label: this.tr("Trash"),
-        icon: "@FontAwesome5Solid/trash/18",
-      });
-      trashButton.addListener("changeValue", e => {
-        const trashEnabled = e.getData();
-        if (trashEnabled) {
-          this.fireEvent("trashContext");
-        }
-      });
-      return trashButton;
-    },
-    /* /TRASH BIN */
-
     /* SHARED WITH */
     __createSharedWithFilterLayout: function() {
       const sharedWithLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(5));

diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
@@ -50,7 +50,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
   properties: {
     currentContext: {
-      check: ["studiesAndFolders", "workspaces", "search", "trash"],
+      check: ["studiesAndFolders", "workspaces", "search"],
       nullable: false,
       init: "studiesAndFolders",
       event: "changeCurrentContext"
@@ -932,10 +932,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           }
         }, this);
 
-        this._resourceFilter.addListener("trashContext", () => {
-          this.__changeContext("trash");
-        });
-
         this._searchBarFilter.addListener("filterChanged", e => {
           const filterData = e.getData();
           if (filterData.text) {

diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js
@@ -49,7 +49,7 @@ qx.Class.define("osparc.dashboard.StudyBrowserHeader", {
 
   properties: {
     currentContext: {
-      check: ["studiesAndFolders", "workspaces", "search", "trash"],
+      check: ["studiesAndFolders", "workspaces", "search"],
       nullable: false,
       init: "studiesAndFolders",
       event: "changeCurrentContext",
@@ -200,13 +200,6 @@ qx.Class.define("osparc.dashboard.StudyBrowserHeader", {
           value: this.tr("Search results"),
           cursor: "auto",
         });
-      } else if (currentContext === "trash") {
-        this.__setIcon("@FontAwesome5Solid/trash/20");
-        const trashDays = osparc.store.StaticInfo.getInstance().getTrashRetentionDays();
-        title.set({
-          value: this.tr(`Trash: Items in the bin will be permanently deleted after ${trashDays} days.`),
-          cursor: "auto",
-        });
       } else if (currentContext === "workspaces") {
         this.__setIcon(osparc.store.Workspaces.iconPath(32));
         title.set({

diff --git a/services/static-webserver/client/source/class/osparc/store/StaticInfo.js b/services/static-webserver/client/source/class/osparc/store/StaticInfo.js
@@ -69,16 +69,6 @@ qx.Class.define("osparc.store.StaticInfo", {
       return null;
     },
 
-    getTrashRetentionDays: function() {
-      const staticKey = "webserverProjects";
-      const wsStaticData = this.getValue(staticKey);
-      const key = "PROJECTS_TRASH_RETENTION_DAYS";
-      if (key in wsStaticData) {
-        return wsStaticData[key];
-      }
-      return "unknown";
-    },
-
     getAccountDeletionRetentionDays: function() {
       const staticKey = "webserverLogin";
       const wsStaticData = this.getValue(staticKey);