add it as url parameter

Author: odeimaiz

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

@@ -347,7 +347,7 @@ qx.Class.define("osparc.data.Resources", {
           },
         }
       },
-      "jobs": {
+      "runs": {
         useCache: false, // handled in osparc.store.Jobs
         endpoints: {
           getPageLatestActive: {
@@ -356,24 +356,16 @@ qx.Class.define("osparc.data.Resources", {
           },
           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"
-          },
-          getPageHistoryIncludeChildren: {
-            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=true"
+            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}"
           },
         }
       },
-      "subJobs": {
+      "subRuns": {
         useCache: false, // handled in osparc.store.Jobs
         endpoints: {
           getPageLatest: {
             method: "GET",
-            url: statics.API + "/computations/{studyId}/iterations/latest/tasks?offset={offset}&limit={limit}"
-          },
-          getPageLatestIncludeChildren: {
-            method: "GET",
-            url: statics.API + "/computations/{studyId}/iterations/latest/tasks?offset={offset}&limit={limit}&include_children=true"
+            url: statics.API + "/computations/{studyId}/iterations/latest/tasks?offset={offset}&limit={limit}&include_children={includeChildren}"
           },
         }
       },

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

@@ -56,7 +56,7 @@ qx.Class.define("osparc.store.Jobs", {
       const options = {
         resolveWResponse: true
       };
-      return osparc.data.Resources.fetch("jobs", "getPageLatestActive", params, options)
+      return osparc.data.Resources.fetch("runs", "getPageLatestActive", params, options)
         .then(jobsResp => {
           this.fireDataEvent("changeJobsActive", jobsResp["_meta"]["total"]);
           const jobsActive = [];
@@ -75,6 +75,7 @@ qx.Class.define("osparc.store.Jobs", {
 
     fetchJobsHistory: function(
       studyId,
+      includeChildren = false,
       offset = 0,
       limit = this.self().SERVER_MAX_LIMIT,
       orderBy = {
@@ -86,6 +87,7 @@ qx.Class.define("osparc.store.Jobs", {
       const params = {
         url: {
           studyId,
+          includeChildren,
           offset,
           limit,
           orderBy: JSON.stringify(orderBy),
@@ -94,7 +96,7 @@ qx.Class.define("osparc.store.Jobs", {
       const options = {
         resolveWResponse: true
       };
-      return osparc.data.Resources.fetch("jobs", "getPageHistory", params, options)
+      return osparc.data.Resources.fetch("runs", "getPageHistory", params, options)
         .then(jobsResp => {
           if (resolveWResponse) {
             return jobsResp;
@@ -111,13 +113,14 @@ qx.Class.define("osparc.store.Jobs", {
         .catch(err => console.error(err));
     },
 
-    fetchSubJobs: function(projectUuid) {
+    fetchSubJobs: function(projectUuid, includeChildren = false) {
       const params = {
         url: {
           studyId: projectUuid,
+          includeChildren,
         }
       };
-      return osparc.data.Resources.getInstance().getAllPages("subJobs", params, "getPageLatest")
+      return osparc.data.Resources.getInstance().getAllPages("subRuns", params, "getPageLatest")
         .then(subJobsData => {
           const subJobs = [];
           subJobsData.forEach(subJobData => {