✨ [Frontend] Update to new collection runs (#8074)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: odeimaiz

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

@@ -22,27 +22,33 @@ qx.Class.define("osparc.data.Job", {
     this.base(arguments);
 
     this.set({
-      projectUuid: jobData["projectUuid"],
-      projectName: jobData["rootProjectName"] || "",
+      collectionRunId: jobData["collectionRunId"],
+      projectIds: jobData["projectIds"],
+      name: jobData["name"] || "",
       state: jobData["state"] || "UNKNOWN",
       submittedAt: jobData["submittedAt"] ? new Date(jobData["submittedAt"]) : null,
       startedAt: jobData["startedAt"] ? new Date(jobData["startedAt"]) : null,
       endedAt: jobData["endedAt"] ? new Date(jobData["endedAt"]) : null,
       info: jobData["info"] || null,
-      customMetadata: jobData["projectCustomMetadata"] || null,
     });
 
     this.__subJobs = [];
   },
 
   properties: {
-    projectUuid: {
+    collectionRunId: {
       check: "String",
       nullable: false,
       init: null,
     },
 
-    projectName: {
+    projectIds: {
+      check: "Array",
+      nullable: false,
+      init: null,
+    },
+
+    name: {
       check: "String",
       nullable: false,
       init: null,
@@ -77,12 +83,6 @@ qx.Class.define("osparc.data.Job", {
       nullable: true,
       init: null,
     },
-
-    customMetadata: {
-      check: "Object",
-      nullable: true,
-      init: null,
-    },
   },
 
   statics: {
@@ -104,14 +104,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/Resources.js

@@ -368,11 +368,13 @@ qx.Class.define("osparc.data.Resources", {
         endpoints: {
           getPageLatest: {
             method: "GET",
-            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by={orderBy}&filter_only_running={runningOnly}&filters={filters}"
+            // uncomment this when the backend supports filtering by runningOnly #8055
+            // url: statics.API + "/computation-collection-runs?offset={offset}&limit={limit}&order_by={orderBy}&filter_only_running={runningOnly}"
+            url: statics.API + "/computation-collection-runs?offset={offset}&limit={limit}&order_by={orderBy}&filter_only_running=false"
           },
           getPageHistory: {
             method: "GET",
-            url: statics.API + "/computations/{studyId}/iterations?offset={offset}&limit={limit}&order_by={orderBy}&include_children={includeChildren}"
+            url: statics.API + "/computation-collection-runs?offset={offset}&limit={limit}&order_by={orderBy}&filter_by_root_project_id={projectId}"
           },
         }
       },
@@ -381,7 +383,7 @@ qx.Class.define("osparc.data.Resources", {
         endpoints: {
           getPageLatest: {
             method: "GET",
-            url: statics.API + "/computations/{studyId}/iterations/latest/tasks?offset={offset}&limit={limit}&order_by={orderBy}&include_children={includeChildren}"
+            url: statics.API + "/computation-collection-runs/{collectionRunId}/tasks?offset={offset}&limit={limit}&order_by={orderBy}"
           },
         }
       },

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/ActivityCenterWindow.js

@@ -59,8 +59,8 @@ qx.Class.define("osparc.jobs.ActivityCenterWindow", {
 
       runsBrowser.addListener("runSelected", e => {
         const data = e.getData();
-        const project = data["rowData"];
-        subRunsBrowser.setProject(project);
+        const collectionRunData = data["rowData"];
+        subRunsBrowser.setCollectionRun(collectionRunData);
         this.getChildControl("title").setValue(this.tr("Tasks"));
         stack.setSelection([subRunsBrowser]);
       });

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

@@ -56,12 +56,12 @@ qx.Class.define("osparc.jobs.ActivityOverview", {
 
       this.__runsTable.addListener("runSelected", e => {
         const data = e.getData();
-        const project = data["rowData"];
-        const projectUuid = project["projectUuid"];
+        const collectionRunData = data["rowData"];
+        const collectionRunId = collectionRunData["collectionRunId"];
         // Hacky-hacky
         for (let i=0; i<this.__runsTable.getTableModel().getRowCount(); i++) {
           const rowData = this.__runsTable.getTableModel().getRowData(i);
-          if (rowData["projectUuid"] === projectUuid && data["rowIdx"] > i) {
+          if (rowData["collectionRunId"] === collectionRunId && data["rowIdx"] > i) {
             const msg = this.tr("Only the latest run's tasks are available");
             osparc.FlashMessenger.logAs(msg, "WARNING");
             return;
@@ -72,7 +72,7 @@ qx.Class.define("osparc.jobs.ActivityOverview", {
           tasksLayout.remove(this.__subRunsTable);
           this.__subRunsTable = null;
         }
-        const subRunsTable = this.__subRunsTable = new osparc.jobs.SubRunsTable(project["projectUuid"]);
+        const subRunsTable = this.__subRunsTable = new osparc.jobs.SubRunsTable(collectionRunData["collectionRunId"]);
         tasksLayout.add(subRunsTable, {
           flex: 1
         });
@@ -106,12 +106,11 @@ qx.Class.define("osparc.jobs.ActivityOverview", {
       runsHistoryLayout.add(introText);
 
       const projectUuid = projectData["uuid"];
-      const includeChildren = true;
       const runningOnly = false;
-      const runsTable = this.__runsTable = new osparc.jobs.RunsTable(projectUuid, includeChildren, runningOnly);
+      const runsTable = this.__runsTable = new osparc.jobs.RunsTable(projectUuid, runningOnly);
       const columnModel = runsTable.getTableColumnModel();
       // Hide project name column
-      columnModel.setColumnVisible(osparc.jobs.RunsTable.COLS.PROJECT_NAME.column, false);
+      columnModel.setColumnVisible(osparc.jobs.RunsTable.COLS.NAME.column, false);
       // Hide cancel column
       columnModel.setColumnVisible(osparc.jobs.RunsTable.COLS.ACTION_CANCEL.column, false);
       runsHistoryLayout.add(runsTable, {

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

@@ -85,9 +85,8 @@ qx.Class.define("osparc.jobs.RunsBrowser", {
           break;
         case "runs-table": {
           const projectUuid = null;
-          const includeChildren = false;
           const runningOnly = true;
-          control = new osparc.jobs.RunsTable(projectUuid, includeChildren, runningOnly);
+          control = new osparc.jobs.RunsTable(projectUuid, runningOnly);
           control.addListener("runSelected", e => this.fireDataEvent("runSelected", e.getData()));
           this._add(control);
           break;