all info exposed

Author: odeimaiz

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

@@ -99,8 +99,8 @@ qx.Class.define("osparc.data.Job", {
       return this.__subJobs;
     },
 
-    clearSubJobs: function() {
-      this.__subJobs = [];
+    getSubJob: function(nodeId) {
+      return this.__subJobs.find(subJb => subJb.getNodeId() === nodeId);
     },
   }
 });

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

@@ -19,16 +19,13 @@
 qx.Class.define("osparc.jobs.JobInfo", {
   extend: qx.ui.core.Widget,
 
-  construct(jobId) {
+  construct(info) {
     this.base(arguments);
 
     this._setLayout(new qx.ui.layout.VBox());
 
     const jobInfoViewer = this.getChildControl("job-info-viewer");
-    osparc.store.Jobs.getInstance().fetchSubJobs(jobId)
-      .then(info => {
-        jobInfoViewer.setJson(info);
-      });
+    jobInfoViewer.setJson(info);
   },
 
   statics: {

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

@@ -121,9 +121,17 @@ qx.Class.define("osparc.jobs.SubJobsTable", {
       const rowData = this.getTableModel().getRowData(row);
       switch (action) {
         case "info": {
-          const jobInfo = new osparc.jobs.JobInfo(rowData["image"]);
+          const job = osparc.store.Jobs.getInstance().getJob(rowData["projectUuid"]);
+          if (!job) {
+            return;
+          }
+          const subJob = job.getSubJob(rowData["nodeId"]);
+          if (!subJob) {
+            return;
+          }
+          const jobInfo = new osparc.jobs.JobInfo(subJob.getImage());
           const win = osparc.jobs.JobInfo.popUpInWindow(jobInfo);
-          win.setCaption(win.getCaption() + " - " + rowData["projectName"]);
+          win.setCaption(win.getCaption() + " - " + rowData["nodeName"]);
           break;
         }
         default:

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

@@ -79,9 +79,10 @@ qx.Class.define("osparc.jobs.SubJobsTableModel", {
                 [subJobsCols.NODE_NAME.id]: subJob.getNodeName(),
                 [subJobsCols.SOLVER.id]: subJob.getImage()["name"] + ":" + subJob.getImage()["tag"],
                 [subJobsCols.STATE.id]: subJob.getState(),
-                [subJobsCols.PROGRESS.id]: subJob.getProgress(),
+                [subJobsCols.PROGRESS.id]: subJob.getProgress() * 100 + "%",
                 [subJobsCols.START.id]: subJob.getStartedAt() ? osparc.utils.Utils.formatDateAndTime(subJob.getStartedAt()) : "-",
                 [subJobsCols.END.id]: subJob.getEndedAt() ? osparc.utils.Utils.formatDateAndTime(subJob.getEndedAt()) : "-",
+                [subJobsCols.IMAGE.id]: subJob.getImage() ? osparc.utils.Utils.formatDateAndTime(subJob.getEndedAt()) : "-",
               });
             });
             return data;

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

@@ -15,10 +15,6 @@
 
 ************************************************************************ */
 
-/**
- * @asset(osparc/mock_jobs.json")
- */
-
 qx.Class.define("osparc.store.Jobs", {
   extend: qx.core.Object,
   type: "singleton",
@@ -110,5 +106,10 @@ qx.Class.define("osparc.store.Jobs", {
       }
       return null;
     },
+
+    getJob: function(projectUuid) {
+      const jobs = this.getJobs();
+      return jobs.find(job => job.getProjectUuid() === projectUuid);
+    },
   }
 });