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

Fix: Prevent runtime errors in webapp when invalid pin_mapping.json is provided

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

12
webapp/src/components/PinInfo.vue
View File

@ -17,11 +17,11 @@
{{ capitalizeFirstLetter(category) }}</td> {{ capitalizeFirstLetter(category) }}</td>
<td :class="{ 'table-danger': !isEqual(category, prop) }">{{ prop }}</td> <td :class="{ 'table-danger': !isEqual(category, prop) }">{{ prop }}</td>
<td> <td>
<template v-if="((selectedPinAssignment as Device)[category as keyof Device])"> <template v-if="selectedPinAssignment && category in selectedPinAssignment">
{{ (selectedPinAssignment as any)[category][prop] }}</template> {{ (selectedPinAssignment as any)[category][prop] }}</template>
</td> </td>
<td> <td>
<template v-if="((currentPinAssignment as Device)[category as keyof Device])"> <template v-if="currentPinAssignment && category in currentPinAssignment">
{{ (currentPinAssignment as any)[category][prop] }}</template> {{ (currentPinAssignment as any)[category][prop] }}</template>
</td> </td>
</tr> </tr>
@ -65,12 +65,12 @@ export default defineComponent({
methods: { methods: {
properties(category: string): string[] { properties(category: string): string[] {
let curArray: Array<string> = []; let curArray: Array<string> = [];
if ((this.currentPinAssignment as Device)[category as keyof Device]) { if (this.currentPinAssignment && category in this.currentPinAssignment) {
curArray = Object.keys((this.currentPinAssignment as Device)[category as keyof Device]); curArray = Object.keys((this.currentPinAssignment as Device)[category as keyof Device]);
} }
let selArray: Array<string> = []; let selArray: Array<string> = [];
if ((this.selectedPinAssignment as Device)[category as keyof Device]) { if (this.selectedPinAssignment && category in this.selectedPinAssignment) {
selArray = Object.keys((this.selectedPinAssignment as Device)[category as keyof Device]); selArray = Object.keys((this.selectedPinAssignment as Device)[category as keyof Device]);
} }
@ -83,10 +83,10 @@ export default defineComponent({
let comSel = 999999; let comSel = 999999;
let comCur = 999999; let comCur = 999999;
if ((this.selectedPinAssignment as Device)[category as keyof Device]) { if (this.selectedPinAssignment && category in this.selectedPinAssignment) {
comSel = (this.selectedPinAssignment as any)[category][prop]; comSel = (this.selectedPinAssignment as any)[category][prop];
} }
if ((this.currentPinAssignment as Device)[category as keyof Device]) { if (this.currentPinAssignment && category in this.currentPinAssignment) {
comCur = (this.currentPinAssignment as any)[category][prop]; comCur = (this.currentPinAssignment as any)[category][prop];
} }