Feature: Show error in webapp if pin_mapping.json contains syntax errors
This commit is contained in:
parent
972dea297b
commit
eaacce7483
@ -527,6 +527,7 @@
|
|||||||
},
|
},
|
||||||
"deviceadmin": {
|
"deviceadmin": {
|
||||||
"DeviceManager": "Hardware-Einstellungen",
|
"DeviceManager": "Hardware-Einstellungen",
|
||||||
|
"ParseError": "Syntaxfehler in 'pin_mapping.json': {error}",
|
||||||
"PinAssignment": "Anschlusseinstellungen",
|
"PinAssignment": "Anschlusseinstellungen",
|
||||||
"SelectedProfile": "Ausgewähltes Profil:",
|
"SelectedProfile": "Ausgewähltes Profil:",
|
||||||
"DefaultProfile": "(Standardeinstellungen)",
|
"DefaultProfile": "(Standardeinstellungen)",
|
||||||
|
|||||||
@ -527,6 +527,7 @@
|
|||||||
},
|
},
|
||||||
"deviceadmin": {
|
"deviceadmin": {
|
||||||
"DeviceManager": "Device-Manager",
|
"DeviceManager": "Device-Manager",
|
||||||
|
"ParseError": "Parse error in 'pin_mapping.json': {error}",
|
||||||
"PinAssignment": "Connection settings",
|
"PinAssignment": "Connection settings",
|
||||||
"SelectedProfile": "Selected profile:",
|
"SelectedProfile": "Selected profile:",
|
||||||
"DefaultProfile": "(Default settings)",
|
"DefaultProfile": "(Default settings)",
|
||||||
|
|||||||
@ -527,6 +527,7 @@
|
|||||||
},
|
},
|
||||||
"deviceadmin": {
|
"deviceadmin": {
|
||||||
"DeviceManager": "Gestionnaire de périphériques",
|
"DeviceManager": "Gestionnaire de périphériques",
|
||||||
|
"ParseError": "Erreur d'analyse dans 'pin_mapping.json': {error}",
|
||||||
"PinAssignment": "Paramètres de connexion",
|
"PinAssignment": "Paramètres de connexion",
|
||||||
"SelectedProfile": "Profil sélectionné",
|
"SelectedProfile": "Profil sélectionné",
|
||||||
"DefaultProfile": "(Réglages par défaut)",
|
"DefaultProfile": "(Réglages par défaut)",
|
||||||
|
|||||||
@ -73,10 +73,10 @@ export function handleResponse(response: Response, emitter: Emitter<Record<Event
|
|||||||
// auto logout if 401 response returned from api
|
// auto logout if 401 response returned from api
|
||||||
logout();
|
logout();
|
||||||
emitter.emit("logged-out");
|
emitter.emit("logged-out");
|
||||||
router.push({path: "/login", query: { returnUrl: router.currentRoute.value.fullPath }});
|
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);
|
return Promise.reject(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -85,8 +85,8 @@
|
|||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
<label for="inputDisplayContrast" class="col-sm-2 col-form-label">{{
|
<label for="inputDisplayContrast" class="col-sm-2 col-form-label">{{
|
||||||
$t('deviceadmin.Contrast', { contrast: $n(deviceConfigList.display.contrast / 100,
|
$t('deviceadmin.Contrast', { contrast: $n(deviceConfigList.display.contrast / 100,
|
||||||
'percent')
|
'percent')
|
||||||
}) }}</label>
|
}) }}</label>
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<input type="range" class="form-range" min="0" max="100" id="inputDisplayContrast"
|
<input type="range" class="form-range" min="0" max="100" id="inputDisplayContrast"
|
||||||
v-model="deviceConfigList.display.contrast" />
|
v-model="deviceConfigList.display.contrast" />
|
||||||
@ -120,7 +120,7 @@ export default defineComponent({
|
|||||||
BootstrapAlert,
|
BootstrapAlert,
|
||||||
InputElement,
|
InputElement,
|
||||||
PinInfo,
|
PinInfo,
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
dataLoading: true,
|
dataLoading: true,
|
||||||
@ -157,7 +157,12 @@ export default defineComponent({
|
|||||||
this.pinMappingList = data;
|
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>();
|
this.pinMappingList = Array<Device>();
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user