rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle cancellation gracefully

Browse source 
Cancellation is now confirmed with a modal notification, and
won't result in an error in the console.
This commit is contained in:
Richard Bowman 2024-01-04 16:35:13 +00:00
parent 7d497fcf73
commit bea9bdee02
1 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

46
webapp/src/components/genericComponents/taskSubmitter.vue
View file

@ -35,15 +35,21 @@
</button> </button>
</div> </div>
<div id="modal-center" ref="statusModal" class="" uk-modal="bg-close: false; esc-close: false; stack: true;"> <div
id="modal-center"
ref="statusModal"
class=""
uk-modal="bg-close: false; esc-close: false; stack: true;"
>
<div class="uk-modal-dialog uk-modal-body uk-margin-auto-vertical"> <div class="uk-modal-dialog uk-modal-body uk-margin-auto-vertical">
<h2>{{ submitLabel }}</h2> <h2>{{ submitLabel }}</h2>
<div id="log-container" ref="logContainer"> <div id="log-container" ref="logContainer">
<div v-for="(item, index) in log" :key="`log_entry_${index}`"> <div v-for="(item, index) in log" :key="`log_entry_${index}`">
{{ item.message }} {{ item.message }}
</div> </div>
<div v-if="taskStatus=='error'" class="uk-alert-danger"> <div v-if="taskStatus == 'error'" class="uk-alert-danger">
The task failed due to an error - use the button below to close this dialog. The task failed due to an error - use the button below to close this
dialog.
</div> </div>
</div> </div>
<div id="progress-and-cancel-row"> <div id="progress-and-cancel-row">
@ -241,7 +247,12 @@ export default {
response.data.id, response.data.id,
response.data.href response.data.href
); );
this.$emit("response", response); if (response.status == "completed") {
this.$emit("response", response);
} else if (response.status == "cancelled") {
this.$emit("cancelled", response);
this.modalNotify(`The action '${this.submitLabel}' was cancelled.`);
}
this.$emit("finished"); this.$emit("finished");
} catch (error) { } catch (error) {
this.$emit("error", error | Error("Unknown error")); this.$emit("error", error | Error("Unknown error"));
@ -284,9 +295,13 @@ export default {
.then(response => { .then(response => {
var result = response.data.status; var result = response.data.status;
this.taskStatus = result; this.taskStatus = result;
// If the task ends with success if ((result == "running") | (result == "pending")) {
if (result == "completed") { // If the task is still running, we update progress/log,
resolve(response.data); // and schedule another poll
this.progress = response.data.progress;
this.log = response.data.log;
// Check again after timeout
setTimeout(checkCondition, interval, resolve, reject);
} }
// If task ends with an error // If task ends with an error
else if (result == "error") { else if (result == "error") {
@ -294,17 +309,10 @@ export default {
if (!this.progress) this.progress = 1; if (!this.progress) this.progress = 1;
reject(new Error(response.data.output)); reject(new Error(response.data.output));
} }
// If task ends with termination // If task ends without reporting an error
else if (result == "cancelled") { // (NB this includes cancellation)
// Pass a generic termination error back with reject else {
if (!this.progress) this.progress = 100; resolve(response.data);
reject(new Error("Task cancelled"));
} else {
// Since the task is still running, we can update the progress bar
this.progress = response.data.progress;
this.log = response.data.log;
// Check again after timeout
setTimeout(checkCondition, interval, resolve, reject);
} }
}); });
}; };
@ -319,7 +327,7 @@ export default {
}, },
hideModal() { hideModal() {
UIkit.modal(this.$refs.statusModal).hide() UIkit.modal(this.$refs.statusModal).hide();
}, },
terminateTask: function() { terminateTask: function() {