trashed and search workspaces

Author: odeimaiz

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

@@ -99,6 +99,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     __workspacesList: null,
     __foldersList: null,
     __loadingFolders: null,
+    __loadingWorkspaces: null,
 
     // overridden
     initResources: function() {
@@ -163,11 +164,40 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     },
 
     __reloadWorkspaces: function() {
+      if (
+        !osparc.auth.Manager.getInstance().isLoggedIn() ||
+        !osparc.utils.DisabledPlugins.isFoldersEnabled() ||
+        this.getCurrentContext() === "studiesAndFolders" ||
+        this.__loadingWorkspaces
+      ) {
+        return;
+      }
+
+      let request = null;
+      switch (this.getCurrentContext()) {
+        case "search": {
+          const filterData = this._searchBarFilter.getFilterData();
+          const text = filterData.text ? encodeURIComponent(filterData.text) : "";
+          request = osparc.store.Workspaces.getInstance().searchWorkspaces(text);
+          break;
+        }
+        case "workspaces": {
+          request = osparc.store.Workspaces.getInstance().fetchWorkspaces();
+          break;
+        }
+        case "trash":
+          request = osparc.store.Workspaces.getInstance().fetchTrashedWorkspaces();
+          break;
+      }
+
+      this.__loadingWorkspaces = true;
       this.__setWorkspacesToList([]);
-      osparc.store.Workspaces.getInstance().fetchWorkspaces()
+      request
         .then(workspaces => {
           this.__setWorkspacesToList(workspaces);
-        });
+        })
+        .catch(console.error)
+        .finally(() => this.__loadingWorkspaces = null);
     },
 
     __reloadFolders: function() {
@@ -180,7 +210,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         return;
       }
 
-      this.__loadingFolders = true;
       let request = null;
       switch (this.getCurrentContext()) {
         case "search": {
@@ -200,6 +229,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           break;
       }
 
+      this.__loadingFolders = true;
       this.__setFoldersToList([]);
       request
         .then(folders => {
@@ -1032,10 +1062,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
         this._toolbar.show();
         if (context === "search") {
+          this.__reloadWorkspaces();
           this.__reloadFolders();
           this.__reloadStudies();
         } else if (context === "trash") {
-          // for now, studies only
+          this._searchBarFilter.resetFilters();
+          this.__reloadWorkspaces();
           this.__reloadFolders();
           this.__reloadStudies();
         } else if (context === "workspaces") {

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

@@ -68,23 +68,14 @@ qx.Class.define("osparc.store.Workspaces", {
         });
     },
 
-    fetchTrashedWorkspaces: function(orderBy = {
-      field: "modified_at",
-      direction: "desc"
-    }) {
+    fetchTrashedWorkspaces: function() {
       if (osparc.auth.Data.getInstance().isGuest()) {
         return new Promise(resolve => {
           resolve([]);
         });
       }
 
-      const curatedOrderBy = this.self().curateOrderBy(orderBy);
-      const params = {
-        url: {
-          orderBy: JSON.stringify(curatedOrderBy),
-        }
-      };
-      return osparc.data.Resources.getInstance().getAllPages("workspaces", params, "getPageTrashed")
+      return osparc.data.Resources.getInstance().getAllPages("workspaces", {}, "getPageTrashed")
         .then(trashedWorkspacesData => {
           const workspaces = [];
           trashedWorkspacesData.forEach(workspaceData => {
@@ -95,24 +86,16 @@ qx.Class.define("osparc.store.Workspaces", {
         });
     },
 
-    searchWorkspaces: function(
-      text,
-      orderBy = {
-        field: "modified_at",
-        direction: "desc"
-      },
-    ) {
+    searchWorkspaces: function(text) {
       if (osparc.auth.Data.getInstance().isGuest()) {
         return new Promise(resolve => {
           resolve([]);
         });
       }
 
-      const curatedOrderBy = this.self().curateOrderBy(orderBy);
       const params = {
         url: {
           text,
-          orderBy: JSON.stringify(curatedOrderBy),
         }
       };
       return osparc.data.Resources.getInstance().getAllPages("workspaces", params, "getPageSearch")