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

Action buttons raise an Error from the last message in the log for the Action

Browse source
This commit is contained in:
Joe Knapper 2025-05-20 15:16:38 +01:00
parent 0b2aaa9c92
commit 852a003fae
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/components/labThingsComponents/actionButton.vue
View file

@ -251,7 +251,7 @@ export default {
this.modalNotify(`The action '${this.submitLabel}' was cancelled.`); this.modalNotify(`The action '${this.submitLabel}' was cancelled.`);
} }
} catch (error) { } catch (error) {
this.$emit("error", error | Error("Unknown error")); this.$emit("error", error);
} finally { } finally {
// Reset taskRunning and taskId // Reset taskRunning and taskId
this.taskRunning = false; this.taskRunning = false;
@ -297,7 +297,9 @@ export default {
else if (result == "error") { else if (result == "error") {
// Pass the error string back with reject // Pass the error string back with reject
if (!this.progress) this.progress = 1; if (!this.progress) this.progress = 1;
reject(new Error(response.data.output)); // Assume that the most recent message in the log is the error message
// and raise an Error with that message
reject(new Error(response.data.log.at(-1).message));
} }
// If task ends without reporting an error // If task ends without reporting an error
// (NB this includes cancellation) // (NB this includes cancellation)