fetchJobsActive

Author: odeimaiz

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

@@ -343,13 +343,12 @@ qx.Class.define("osparc.data.Resources", {
           },
         }
       },
-      "jobs": {
+      "jobsActive": {
         useCache: false, // handled in osparc.store.Jobs
         endpoints: {
           getPage: {
             method: "GET",
-            // url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by={orderBy}"
-            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D"
+            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=true"
           },
         }
       },

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().fetchJobs());
+    preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsActive());
     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", {
     this.addListener("tap", () => osparc.jobs.ActivityCenterWindow.openWindow(), this);
 
     const jobsStore = osparc.store.Jobs.getInstance();
-    jobsStore.addListener("changeJobs", e => this.__updateJobsButton(), this);
+    jobsStore.addListener("changeJobs", () => this.__updateJobsButton(), this);
   },
 
   members: {

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

@@ -60,7 +60,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
       const offset = 0;
       const limit = 1;
       const resolveWResponse = true;
-      osparc.store.Jobs.getInstance().fetchJobs(offset, limit, JSON.stringify(this.getOrderBy()), resolveWResponse)
+      osparc.store.Jobs.getInstance().fetchJobsActive(offset, limit, JSON.stringify(this.getOrderBy()), resolveWResponse)
         .then(resp => {
           this._onRowCountLoaded(resp["_meta"].total)
         })
@@ -76,7 +76,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
       const lastRow = Math.min(qxLastRow, this._rowCount - 1);
       // Returns a request promise with given offset and limit
       const getFetchPromise = (offset, limit) => {
-        return osparc.store.Jobs.getInstance().fetchJobs(offset, limit, JSON.stringify(this.getOrderBy()))
+        return osparc.store.Jobs.getInstance().fetchJobsActive(offset, limit, JSON.stringify(this.getOrderBy()))
           .then(jobs => {
             const data = [];
             const jobsCols = osparc.jobs.RunsTable.COLS;

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

@@ -25,6 +25,13 @@ qx.Class.define("osparc.store.Jobs", {
       init: [],
       nullable: true,
       event: "changeJobs"
+    },
+
+    jobsActive: {
+      check: "Array",
+      init: [],
+      nullable: true,
+      event: "changeJobsActive"
     }
   },
 
@@ -33,7 +40,7 @@ qx.Class.define("osparc.store.Jobs", {
   },
 
   members: {
-    fetchJobs: function(
+    fetchJobsActive: function(
       offset = 0,
       limit = this.self().SERVER_MAX_LIMIT,
       orderBy = {
@@ -52,7 +59,7 @@ qx.Class.define("osparc.store.Jobs", {
       const options = {
         resolveWResponse: true
       };
-      return osparc.data.Resources.fetch("jobs", "getPage", params, options)
+      return osparc.data.Resources.fetch("jobsActive", "getPage", params, options)
         .then(jobsResp => {
           const jobs = [];
           if ("data" in jobsResp) {