pass filter

Author: odeimaiz

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

@@ -351,10 +351,6 @@ qx.Class.define("osparc.data.Resources", {
         useCache: false, // handled in osparc.store.Jobs
         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}"
-          },
-          getPageLatestFiltered: {
             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}"
           },

services/static-webserver/client/source/class/osparc/desktop/MainPage.js

@@ -69,7 +69,7 @@ qx.Class.define("osparc.desktop.MainPage", {
     preloadPromises.push(osparc.store.Tags.getInstance().fetchTags());
     preloadPromises.push(osparc.store.Products.getInstance().fetchUiConfig());
     preloadPromises.push(osparc.store.PollTasks.getInstance().fetchTasks());
-    preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsActive());
+    preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsLatest());
     Promise.all(preloadPromises)
       .then(() => {
         const mainStack = this.__createMainStack();

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

@@ -34,7 +34,7 @@ qx.Class.define("osparc.jobs.JobsButton", {
 
     const jobsStore = osparc.store.Jobs.getInstance();
     jobsStore.addListener("changeJobsActive", e => this.__updateJobsButton(e.getData()), this);
-    jobsStore.fetchJobsActive();
+    jobsStore.fetchJobsLatest();
   },
 
   members: {

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

@@ -60,7 +60,7 @@ qx.Class.define("osparc.jobs.RunsBrowser", {
           control.getChildControl("textfield").set({
             placeholder: qx.locale.Manager.tr("Filter by name or ID"),
           });
-          control.hide(); // @matusdrobuliak66: remove this when the backend is ready
+          // control.hide(); // @matusdrobuliak66: remove this when the backend is ready
           this.getChildControl("header-filter").add(control, {
             flex: 1
           });

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

@@ -96,7 +96,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
         promise = osparc.store.Jobs.getInstance().fetchJobsHistory(this.getProjectUuid(), this.__includeChildren, offset, limit, orderBy, resolveWResponse);
       } else {
         const filters = this.getFilterString() ? { text: this.getFilterString() } : null;
-        promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy, filters, resolveWResponse);
+        promise = osparc.store.Jobs.getInstance().fetchJobsLatest(this.getRunningOnly(), offset, limit, orderBy, filters, resolveWResponse);
       }
       promise
         .then(resp => {
@@ -120,7 +120,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
           promise = osparc.store.Jobs.getInstance().fetchJobsHistory(this.getProjectUuid(), this.__includeChildren, offset, limit, orderBy);
         } else {
           const filters = this.getFilterString() ? { text: this.getFilterString() } : null;
-          promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy, filters);
+          promise = osparc.store.Jobs.getInstance().fetchJobsLatest(this.getRunningOnly(), offset, limit, orderBy, filters);
         }
         return promise
           .then(jobs => {

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

@@ -37,7 +37,7 @@ qx.Class.define("osparc.store.Jobs", {
   },
 
   members: {
-    fetchJobsActive: function(
+    fetchJobsLatest: function(
       runningOnly = true,
       offset = 0,
       limit = this.self().SERVER_MAX_LIMIT,
@@ -54,18 +54,13 @@ qx.Class.define("osparc.store.Jobs", {
           offset,
           limit,
           orderBy: JSON.stringify(orderBy),
+          filters: filters ? JSON.stringify(filters) : {}
         }
       };
       const options = {
         resolveWResponse: true
       };
-      if (filters) {
-        params["url"]["filters"] = JSON.stringify(filters);
-        promise = osparc.data.Resources.fetch("runs", "getPageLatestFiltered", params, options);
-      } else {
-        promise = osparc.data.Resources.fetch("runs", "getPageLatest", params, options);
-      }
-      return promise
+      return osparc.data.Resources.fetch("runs", "getPageLatest", params, options)
         .then(jobsResp => {
           if (runningOnly) {
             this.fireDataEvent("changeJobsActive", jobsResp["_meta"]["total"]);