sub job

Author: odeimaiz

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

@@ -111,14 +111,14 @@ qx.Class.define("osparc.data.Job", {
   members: {
     __subJobs: null,
 
-    addSubJob: function(subJobData) {
+    addSubJob: function(collectionRunId, subJobData) {
       const subJobFound = this.__subJobs.find(subJb => subJb.getNodeId() === subJobData["nodeId"]);
       if (subJobFound) {
         subJobFound.updateSubJob(subJobData);
         return subJobFound;
       }
 
-      const subJob = new osparc.data.SubJob(subJobData);
+      const subJob = new osparc.data.SubJob(collectionRunId, subJobData);
       this.__subJobs.push(subJob);
       return subJob;
     },

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

@@ -18,10 +18,11 @@
 qx.Class.define("osparc.data.SubJob", {
   extend: qx.core.Object,
 
-  construct: function(subJobData) {
+  construct: function(collectionRunId, subJobData) {
     this.base(arguments);
 
     this.set({
+      collectionRunId,
       projectUuid: subJobData["projectUuid"],
       nodeId: subJobData["nodeId"],
     });
@@ -30,6 +31,12 @@ qx.Class.define("osparc.data.SubJob", {
   },
 
   properties: {
+    collectionRunId: {
+      check: "String",
+      nullable: false,
+      init: null,
+    },
+
     projectUuid: {
       check: "String",
       nullable: false,
@@ -42,7 +49,7 @@ qx.Class.define("osparc.data.SubJob", {
       init: null,
     },
 
-    nodeName: {
+    name: {
       check: "String",
       nullable: false,
       init: null,
@@ -94,7 +101,7 @@ qx.Class.define("osparc.data.SubJob", {
   members: {
     updateSubJob: function(subJobData) {
       this.set({
-        nodeName: subJobData["nodeName"],
+        name: subJobData["name"],
         state: subJobData["state"],
         progress: subJobData["progress"],
         startedAt: subJobData["startedAt"] ? new Date(subJobData["startedAt"]) : null,

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

@@ -62,10 +62,10 @@ qx.Class.define("osparc.jobs.SubRunsTable", {
         label: qx.locale.Manager.tr("Node Id"),
         width: 200
       },
-      NODE_NAME: {
-        id: "nodeName",
+      NAME: {
+        id: "name",
         column: 2,
-        label: qx.locale.Manager.tr("Node"),
+        label: qx.locale.Manager.tr("Name"),
         width: 100
       },
       APP: {
@@ -162,7 +162,7 @@ qx.Class.define("osparc.jobs.SubRunsTable", {
           }
           const jobInfo = new osparc.jobs.Info(subJob.getImage());
           const win = osparc.jobs.Info.popUpInWindow(jobInfo);
-          win.setCaption(rowData["nodeName"]);
+          win.setCaption(rowData["name"]);
           break;
         }
         case "logs": {
@@ -176,7 +176,7 @@ qx.Class.define("osparc.jobs.SubRunsTable", {
           }
           const logDownloadLink = subJob.getLogDownloadLink()
           if (logDownloadLink) {
-            osparc.utils.Utils.downloadLink(logDownloadLink, "GET", rowData["nodeName"] + ".zip");
+            osparc.utils.Utils.downloadLink(logDownloadLink, "GET", rowData["name"] + ".zip");
           } else {
             osparc.FlashMessenger.logAs(this.tr("No logs available"), "WARNING");
           }

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

@@ -113,7 +113,7 @@ qx.Class.define("osparc.jobs.SubRunsTableModel", {
               data.push({
                 [subJobsCols.COLLECTION_RUN_ID.id]: subJob.getCollectionRunId(),
                 [subJobsCols.NODE_ID.id]: subJob.getNodeId(),
-                [subJobsCols.NODE_NAME.id]: subJob.getNodeName(),
+                [subJobsCols.NAME.id]: subJob.getName(),
                 [subJobsCols.APP.id]: appName + ":" + displayVersion,
                 [subJobsCols.STATE.id]: osparc.data.Job.STATUS_LABELS[subJob.getState()] || subJob.getState(),
                 [subJobsCols.PROGRESS.id]: subJob.getProgress() * 100 + "%",

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

@@ -127,7 +127,7 @@ qx.Class.define("osparc.store.Jobs", {
         .then(subJobsData => {
           const subJobs = [];
           subJobsData.forEach(subJobData => {
-            subJobs.push(this.addSubJob(subJobData));
+            subJobs.push(this.addSubJob(collectionRunId, subJobData));
           });
           return subJobs;
         })
@@ -146,16 +146,16 @@ qx.Class.define("osparc.store.Jobs", {
       return job;
     },
 
-    addSubJob: function(subJobData) {
-      let job = this.getJob(subJobData["collectionRunId"]);
+    addSubJob: function(collectionRunId, subJobData) {
+      let job = this.getJob(collectionRunId);
       if (!job) {
         const jobs = this.getJobs();
         job = new osparc.data.Job({
-          "collectionRunId": subJobData["collectionRunId"],
+          collectionRunId,
         });
         jobs.push(job);
       }
-      const subJob = job.addSubJob(subJobData);
+      const subJob = job.addSubJob(collectionRunId, subJobData);
       return subJob;
     },