folders order_by

Author: odeimaiz

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

@@ -177,7 +177,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           return;
         }
         this.__setFoldersToList([]);
-        osparc.store.Folders.getInstance().fetchFolders(folderId, workspaceId)
+        osparc.store.Folders.getInstance().fetchFolders(folderId, workspaceId, this.getOrderBy())
           .then(folders => {
             this.__setFoldersToList(folders);
           })
@@ -317,24 +317,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     __setFoldersToList: function(folders) {
       this.__foldersList = folders;
       folders.forEach(folder => folder["resourceType"] = "folder");
-
-      const sortByValueBE = this.getOrderBy().field;
-      let sortByValue = null;
-      switch (sortByValueBE) {
-        case "name":
-          sortByValue = "name";
-          break;
-        case "prj_owner":
-          sortByValue = "owner";
-          break;
-        case "creation_date":
-          sortByValue = "createdAt";
-          break;
-        case "last_change_date":
-          sortByValue = "lastModified";
-          break;
-      }
-      this.self().sortFoldersList(this.__foldersList, sortByValue);
       this.__reloadFolderCards();
     },
 

services/static-webserver/client/source/class/osparc/data/Resources.js

@@ -299,7 +299,7 @@ qx.Class.define("osparc.data.Resources", {
         endpoints: {
           getPage: {
             method: "GET",
-            url: statics.API + "/folders?workspace_id={workspaceId}&folder_id={folderId}&offset={offset}&limit={limit}"
+            url: statics.API + "/folders?workspace_id={workspaceId}&folder_id={folderId}&offset={offset}&limit={limit}&order_by={orderBy}"
           },
           getOne: {
             method: "GET",

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

@@ -34,17 +34,30 @@ qx.Class.define("osparc.store.Folders", {
   members: {
     foldersCached: null,
 
-    fetchFolders: function(folderId = null, workspaceId = null) {
+    fetchFolders: function(
+      folderId = null,
+      workspaceId = null,
+      orderBy = {
+        field: "modified_at",
+        direction: "desc"
+      }
+    ) {
       if (osparc.auth.Data.getInstance().isGuest()) {
         return new Promise(resolve => {
           resolve([]);
         });
       }
 
+      const curatedOrderBy = osparc.utils.Utils.deepCloneObject(orderBy);
+      if (curatedOrderBy.field !== "name") {
+        curatedOrderBy.field = "modified_at";
+      }
+
       const params = {
-        "url": {
+        url: {
           workspaceId,
           folderId,
+          orderBy: JSON.stringify(curatedOrderBy),
         }
       };
       return osparc.data.Resources.getInstance().getAllPages("folders", params)