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

Merge branch 'manual-errors' into 'v3'

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

See merge request openflexure/openflexure-microscope-server!269
This commit is contained in:
Joe Knapper 2025-05-20 15:41:19 +00:00
commit 4251360290
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
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,19 @@ 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)); // Test whether the log is empty or the most recent message is not from an error
// If so, return a default message
if (response.data.log.length == 0 | response.data.log.at(-1).levelname != "ERROR") {
var message = "Unexpected error, please check the logs";
}
// As LabThings Actions add the message from any raised exception to the log, the
// last message in the log is the message from the Exception.
//If the Exception was raised with no message, use a default.
else {
message = response.data.log.at(-1).message||"Unexpected error, please check the logs";
}
// Raise an Error with the chosen message
reject(new Error(message));
} }
// If task ends without reporting an error // If task ends without reporting an error
// (NB this includes cancellation) // (NB this includes cancellation)