jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 09:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check if area exists during default dashboard generation (#14767)

Browse Source
This commit is contained in:
Bram Kragten 2022-12-15 11:09:49 +01:00 committed by GitHub
parent 139cbb363c
commit 5b17c59a56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/panels/lovelace/common/generate-lovelace-config.ts
View File

@ -47,6 +47,7 @@ interface SplittedByAreaDevice {
}
const splitByAreaDevice = (
areaEntries: HomeAssistant["areas"],
deviceEntries: HomeAssistant["devices"],
entityEntries: HomeAssistant["entities"],
entities: HassEntities
@ -55,25 +56,21 @@ const splitByAreaDevice = (
const areasWithEntities: SplittedByAreaDevice["areasWithEntities"] = {};
const devicesWithEntities: SplittedByAreaDevice["devicesWithEntities"] = {};
const areaDevices = new Set(
Object.values(deviceEntries)
.filter((device) => device.area_id)
.map((device) => device.id)
);
for (const entity of Object.values(entityEntries)) {
if (
(entity.area_id ||
(entity.device_id && areaDevices.has(entity.device_id))) &&
entity.entity_id in allEntities
) {
const areaId =
entity.area_id || deviceEntries[entity.device_id!].area_id!;
const areaId =
entity.area_id ||
(entity.device_id && deviceEntries[entity.device_id].area_id);
if (areaId && areaId in areaEntries && entity.entity_id in allEntities) {
if (!(areaId in areasWithEntities)) {
areasWithEntities[areaId] = [];
}
areasWithEntities[areaId].push(allEntities[entity.entity_id]);
delete allEntities[entity.entity_id];
} else if (entity.device_id && entity.entity_id in allEntities) {
} else if (
entity.device_id &&
entity.device_id in deviceEntries &&
entity.entity_id in allEntities
) {
if (!(entity.device_id in devicesWithEntities)) {
devicesWithEntities[entity.device_id] = [];
}
@ -460,6 +457,7 @@ export const generateDefaultViewConfig = (
}
const splittedByAreaDevice = splitByAreaDevice(
areaEntries,
deviceEntries,
entityEntries,
states