resources

Author: odeimaiz

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

@@ -319,6 +319,24 @@ qx.Class.define("osparc.data.Resources", {
           }
         }
       },
+      "jobs": {
+        useCache: false, // handled in osparc.store.Jobs
+        endpoints: {
+          getPage: {
+            method: "GET",
+            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by={orderBy}"
+          },
+        }
+      },
+      "subJobs": {
+        useCache: false, // handled in osparc.store.Jobs
+        endpoints: {
+          getPage: {
+            method: "GET",
+            url: statics.API + "/computations/{studyId}/iterations/latest/tasks?offset={offset}&limit={limit}&order_by={orderBy}"
+          },
+        }
+      },
       "folders": {
         useCache: true,
         idField: "uuid",

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

@@ -25,7 +25,7 @@ qx.Class.define("osparc.jobs.JobInfo", {
     this._setLayout(new qx.ui.layout.VBox());
 
     const jobInfoViewer = this.getChildControl("job-info-viewer");
-    osparc.store.Jobs.getInstance().fetchJobInfo(jobId)
+    osparc.store.Jobs.getInstance().fetchSubJobs(jobId)
       .then(info => {
         jobInfoViewer.setJson(info);
       });

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

@@ -33,8 +33,16 @@ qx.Class.define("osparc.store.Jobs", {
   },
 
   members: {
-    fetchJobs: function() {
-      return osparc.utils.Utils.fetchJSON("/resource/osparc/mock_jobs.json")
+    fetchJobs: function(orderBy = {
+      field: "submitted_at",
+      direction: "desc"
+    }) {
+      const params = {
+        url: {
+          orderBy: JSON.stringify(orderBy),
+        }
+      };
+      return osparc.data.Resources.getInstance().getAllPages("jobs", params)
         .then(jobsData => {
           if ("jobs" in jobsData) {
             jobsData["jobs"].forEach(jobData => {
@@ -46,11 +54,20 @@ qx.Class.define("osparc.store.Jobs", {
         .catch(err => console.error(err));
     },
 
-    fetchJobInfo: function(jobId) {
-      return osparc.utils.Utils.fetchJSON("/resource/osparc/mock_jobs.json")
+    fetchSubJobs: function(studyId, orderBy = {
+      field: "submitted_at",
+      direction: "desc"
+    }) {
+      const params = {
+        url: {
+          studyId,
+          orderBy: JSON.stringify(orderBy),
+        }
+      };
+      return osparc.data.Resources.getInstance().getAllPages("subJobs", params)
         .then(jobsData => {
-          if ("jobs_info" in jobsData && jobId in jobsData["jobs_info"]) {
-            return jobsData["jobs_info"][jobId];
+          if ("jobs_info" in jobsData && studyId in jobsData["jobs_info"]) {
+            return jobsData["jobs_info"][studyId];
           }
           return null;
         })

services/static-webserver/client/source/class/osparc/utils/DisabledPlugins.js

@@ -61,10 +61,7 @@ qx.Class.define("osparc.utils.DisabledPlugins", {
     },
 
     isJobsEnabled: function() {
-      if (osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled() && osparc.product.Utils.isS4LProduct()) {
-        return true;
-      }
-      return false;
+      return osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled();
     },
 
     isHypertoolsEnabled: function() {