patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Feature: Show error in webapp if pin_mapping.json contains syntax errors

Browse Source
This commit is contained in:
Thomas Basler 2023-07-22 15:51:16 +02:00
parent 972dea297b
commit eaacce7483
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webapp/src/locales/de.json
View File

@ -527,6 +527,7 @@
},
"deviceadmin": {
"DeviceManager": "Hardware-Einstellungen",
"ParseError": "Syntaxfehler in 'pin_mapping.json': {error}",
"PinAssignment": "Anschlusseinstellungen",
"SelectedProfile": "Ausgewähltes Profil:",
"DefaultProfile": "(Standardeinstellungen)",

1
webapp/src/locales/en.json
View File

@ -527,6 +527,7 @@
},
"deviceadmin": {
"DeviceManager": "Device-Manager",
"ParseError": "Parse error in 'pin_mapping.json': {error}",
"PinAssignment": "Connection settings",
"SelectedProfile": "Selected profile:",
"DefaultProfile": "(Default settings)",

1
webapp/src/locales/fr.json
View File

@ -527,6 +527,7 @@
},
"deviceadmin": {
"DeviceManager": "Gestionnaire de périphériques",
"ParseError": "Erreur d'analyse dans 'pin_mapping.json': {error}",
"PinAssignment": "Paramètres de connexion",
"SelectedProfile": "Profil sélectionné",
"DefaultProfile": "(Réglages par défaut)",

2
webapp/src/utils/authentication.ts
View File

@ -76,7 +76,7 @@ export function handleResponse(response: Response, emitter: Emitter<Record<Event
router.push({ path: "/login", query: { returnUrl: router.currentRoute.value.fullPath } });
}
const error = (data && data.message) || response.statusText;
const error = { message: (data && data.message) || response.statusText, status: response.status || 0 };
return Promise.reject(error);
}

7
webapp/src/views/DeviceAdminView.vue
View File

@ -157,7 +157,12 @@ export default defineComponent({
this.pinMappingList = data;
}
)
.catch(() => {
.catch((error) => {
if (error.status != 404) {
this.alertMessage = this.$t('deviceadmin.ParseError', { error: error.message });
this.alertType = 'danger';
this.showAlert = true;
}
this.pinMappingList = Array<Device>();
})
.finally(() => {