Skip to content

Commit 077f996

Browse files
committed
cancelRunCollection
1 parent c3fcd6e commit 077f996

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,15 @@ qx.Class.define("osparc.jobs.RunsTable", {
181181
break;
182182
}
183183
case "cancel": {
184-
this.__cancelRun(rowData);
184+
this.__cancelRunCollection(rowData);
185185
break;
186186
}
187187
default:
188188
console.warn(`Unknown action: ${action}`);
189189
}
190190
},
191191

192-
__cancelRun: function(rowData) {
192+
__cancelRunCollection: function(rowData) {
193193
const msg = this.tr("Are you sure you want to cancel") + " <b>" + rowData["name"] + "</b>?";
194194
const confirmationWin = new osparc.ui.window.Confirmation(msg).set({
195195
caption: this.tr("Cancel Run"),
@@ -203,14 +203,17 @@ qx.Class.define("osparc.jobs.RunsTable", {
203203
confirmationWin.open();
204204
confirmationWin.addListener("close", () => {
205205
if (confirmationWin.getConfirmed()) {
206-
const params = {
207-
url: {
208-
"studyId": rowData["projectId"],
209-
},
210-
};
211-
// confirm with @matusdrobuliak66 if this works
212-
osparc.data.Resources.fetch("runPipeline", "stopPipeline", params)
213-
.then(() => osparc.FlashMessenger.logAs(this.tr("Stopping pipeline"), "INFO"))
206+
const promises = [];
207+
rowData["projectIds"].forEach(projectId => {
208+
const params = {
209+
url: {
210+
"studyId": projectId,
211+
},
212+
};
213+
promises.push(osparc.data.Resources.fetch("runPipeline", "stopPipeline", params))
214+
});
215+
Promise.all(promises)
216+
.then(() => osparc.FlashMessenger.logAs(this.tr("Stopping Run"), "INFO"))
214217
.catch(err => osparc.FlashMessenger.logError(err));
215218
}
216219
}, this);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
133133
jobs.forEach(job => {
134134
data.push({
135135
[jobsCols.COLLECTION_RUN_ID.id]: job.getCollectionRunId(),
136-
[jobsCols.PROJECT_IDS.id]: job.getProjectIds().join(", "),
136+
[jobsCols.PROJECT_IDS.id]: job.getProjectIds(),
137137
[jobsCols.NAME.id]: job.getName(),
138138
[jobsCols.STATE.id]: osparc.data.Job.STATUS_LABELS[job.getState()] || job.getState(),
139139
[jobsCols.SUBMIT.id]: job.getSubmittedAt() ? osparc.utils.Utils.formatDateAndTime(job.getSubmittedAt()) : "-",

0 commit comments

Comments
 (0)