Skip to content

✨ [Frontend] Update to new collection runs #8074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jul 8, 2025
Merged

✨ [Frontend] Update to new collection runs #8074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4e6892b
rename to old
odeimaiz Jul 8, 2025
1eaa1fe
runs adapted
odeimaiz Jul 8, 2025
b7f6f5d
minor
odeimaiz Jul 8, 2025
3ca8858
filter_by_root_project_id
odeimaiz Jul 8, 2025
5a093d8
sub runs
odeimaiz Jul 8, 2025
9fc7c4d
sub job
odeimaiz Jul 8, 2025
c3fcd6e
no customMetadata
odeimaiz Jul 8, 2025
077f996
cancelRunCollection
odeimaiz Jul 8, 2025
a37af36
shouldShowFn
odeimaiz Jul 8, 2025
bea4b70
conditional cancel button
odeimaiz Jul 8, 2025
3117a2c
hidden by default
odeimaiz Jul 8, 2025
2125f51
comment
odeimaiz Jul 8, 2025
6899842
Merge branch 'master' into feature/grouped-jobs
mergify[bot] Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions services/static-webserver/client/source/class/osparc/data/Job.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -77,12 +83,6 @@ qx.Class.define("osparc.data.Job", {
nullable: true,
init: null,
},

customMetadata: {
check: "Object",
nullable: true,
init: null,
},
},

statics: {
Expand All @@ -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;
},
Expand Down
8 changes: 5 additions & 3 deletions services/static-webserver/client/source/class/osparc/data/Resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
},
}
},
Expand All @@ -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}"
},
}
},
Expand Down
13 changes: 10 additions & 3 deletions services/static-webserver/client/source/class/osparc/data/SubJob.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
});
Expand All @@ -30,6 +31,12 @@ qx.Class.define("osparc.data.SubJob", {
},

properties: {
collectionRunId: {
check: "String",
nullable: false,
init: null,
},

projectUuid: {
check: "String",
nullable: false,
Expand All @@ -42,7 +49,7 @@ qx.Class.define("osparc.data.SubJob", {
init: null,
},

nodeName: {
name: {
check: "String",
nullable: false,
init: null,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions services/static-webserver/client/source/class/osparc/jobs/ActivityCenterWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
});
Expand Down
13 changes: 6 additions & 7 deletions services/static-webserver/client/source/class/osparc/jobs/ActivityOverview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
});
Expand Down Expand Up @@ -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, {
Expand Down
3 changes: 1 addition & 2 deletions services/static-webserver/client/source/class/osparc/jobs/RunsBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading