sort runs

Author: odeimaiz

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

@@ -352,11 +352,11 @@ qx.Class.define("osparc.data.Resources", {
         endpoints: {
           getPageLatest: {
             method: "GET",
-            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D&filter_only_running={runningOnly}&filters={filters}"
+            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by={orderBy}&filter_only_running={runningOnly}&filters={filters}"
           },
           getPageHistory: {
             method: "GET",
-            url: statics.API + "/computations/{studyId}/iterations?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D&include_children={includeChildren}"
+            url: statics.API + "/computations/{studyId}/iterations?offset={offset}&limit={limit}&order_by={orderBy}&include_children={includeChildren}"
           },
         }
       },
@@ -365,7 +365,7 @@ qx.Class.define("osparc.data.Resources", {
         endpoints: {
           getPageLatest: {
             method: "GET",
-            url: statics.API + "/computations/{studyId}/iterations/latest/tasks?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22started_at%22,%22direction%22:%22desc%22%7D&include_children={includeChildren}"
+            url: statics.API + "/computations/{studyId}/iterations/latest/tasks?offset={offset}&limit={limit}&order_by={orderBy}&include_children={includeChildren}"
           },
         }
       },

services/static-webserver/client/source/class/osparc/jobs/RunsTable.js

@@ -87,34 +87,33 @@ qx.Class.define("osparc.jobs.RunsTable", {
         column: 1,
         label: qx.locale.Manager.tr("Project"),
         width: 150,
-        sortable: true
       },
       STATE: {
         id: "state",
         column: 2,
         label: qx.locale.Manager.tr("Status"),
-        width: 150
+        width: 150,
       },
       SUBMIT: {
         id: "submit",
         column: 3,
         label: qx.locale.Manager.tr("Queued"),
         width: 130,
-        sortable: true
+        sortableMap: "submitted_at",
       },
       START: {
         id: "start",
         column: 4,
         label: qx.locale.Manager.tr("Started"),
         width: 130,
-        sortable: true
+        sortableMap: "started_at",
       },
       END: {
         id: "end",
         column: 5,
         label: qx.locale.Manager.tr("Ended"),
         width: 130,
-        sortable: true
+        sortableMap: "ended_at",
       },
       ACTION_CANCEL: {
         id: "action_cancel",

services/static-webserver/client/source/class/osparc/jobs/RunsTableModel.js

@@ -36,7 +36,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
     this.setSortColumnIndexWithoutSortingData(jobsCols.SUBMIT.column);
     this.setSortAscendingWithoutSortingData(false);
     Object.values(jobsCols).forEach(col => {
-      this.setColumnSortable(col.column, Boolean(col.sortable));
+      this.setColumnSortable(col.column, Boolean(col.sortableMap));
     });
   },
 
@@ -66,7 +66,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
     orderBy: {
       check: "Object",
       init: {
-        field: "submitted_at", // ended_at|started_at|state|submitted_at
+        field: "submitted_at", // state|submitted_at|started_at|ended_at
         direction: "desc"
       }
     },
@@ -86,6 +86,17 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
   members: {
     __includeChildren: false,
 
+    // overridden
+    sortByColumn(columnIndex, ascending) {
+      const jobsCols = osparc.jobs.RunsTable.COLS;
+      const colInfo = Object.values(jobsCols).find(col => col.column === columnIndex);
+      this.setOrderBy({
+        field: colInfo.sortableMap,
+        direction: ascending ? "asc" : "desc"
+      })
+      this.base(arguments, columnIndex, ascending)
+    },
+
     // overridden
     _loadRowCount() {
       const offset = 0;