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

ui_migration refactor(store) update mixins

Browse source
This commit is contained in:
Antonio Anaya 2026-04-21 18:04:54 -06:00
parent 3ecb5b32e4
commit ed158a0b60
2 changed files with 41 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

32
webapp/src/mixins/modalMixins.js
View file

@ -8,6 +8,7 @@
import UIkit from "uikit";
import { eventBus } from "@/eventBus";
import { useSettingsStore } from "@/stores/settings.js";
export default {
methods: {
@ -55,9 +56,10 @@ export default {
);
},
modalError: function (error) {
var errormsg = this.getErrorMessage(error);
this.$store.commit("setErrorMessage", errormsg);
modalError(set_error) {
const store = useSettingsStore();
var errormsg = this.getErrorMessage(set_error);
store.error = errormsg;
UIkit.notification({
message: `${errormsg}`,
status: "danger",
@ -78,30 +80,30 @@ export default {
return String(data);
}
},
getErrorData: function (error) {
getErrorData: function (data_error) {
// If a response was obtained, extract the most specific message
if (error.response) {
if (data_error.response) {
// If the response is a nicely formatted JSON response from the server
if (error.response.data.message) {
return error.response.data.message;
if (data_error.response.data.message) {
return data_error.response.data.message;
}
if (error.response.data.detail) {
if (data_error.response.data.detail) {
try {
return error.response.data.detail[0].msg;
return data_error.response.data.detail[0].msg;
} catch {
return error.response.data.detail;
return data_error.response.data.detail;
}
}
// If the response is just some generic error response
if (error.response.data) {
return error.response.data;
if (data_error.response.data) {
return data_error.response.data;
}
return error.response;
return data_error.response;
}
// If we have an error object with a message, use that
if (error.message) return error.message;
if (data_error.message) return data_error.message;
// At this point just formatting the whole error object is the best we can do.
return error;
return data_error;
},
showModalElement: function (element) {