jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-04-25 13:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Safeguard against non-existant area in device handling (#12475)

Browse Source
This commit is contained in:
Philip Allgaier 2022-04-27 19:25:13 +02:00 committed by GitHub
parent 4b644d8bc5
commit 4cd8b76d7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/device/ha-device-picker.ts
View File

@ -198,7 +198,8 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
this.hass, this.hass,
deviceEntityLookup[device.id] deviceEntityLookup[device.id]
), ),
area: device.area_id area:
device.area_id && areaLookup[device.area_id]
? areaLookup[device.area_id].name ? areaLookup[device.area_id].name
: this.hass.localize("ui.components.device-picker.no_area"), : this.hass.localize("ui.components.device-picker.no_area"),
})); }));

5
src/panels/config/devices/ha-config-devices-dashboard.ts
View File

@ -197,7 +197,10 @@ export class HaConfigDeviceDashboard extends LitElement {
), ),
model: device.model || "<unknown>", model: device.model || "<unknown>",
manufacturer: device.manufacturer || "<unknown>", manufacturer: device.manufacturer || "<unknown>",
area: device.area_id ? areaLookup[device.area_id].name : "—", area:
device.area_id && areaLookup[device.area_id]
? areaLookup[device.area_id].name
: "—",
integration: device.config_entries.length integration: device.config_entries.length
? device.config_entries ? device.config_entries
.filter((entId) => entId in entryLookup) .filter((entId) => entId in entryLookup)