github
/
ha-frontend
mirror of https://github.com/home-assistant/frontend
1
Fork 0
Code Releases Activity

Fix area picker with both entity and device filter (#8438)

This commit is contained in:
Bram Kragten 2021-02-23 15:07:45 +01:00 committed by GitHub
parent 79692ef58a
commit 60e4594abd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/ha-area-picker.ts
View File

@ -140,7 +140,7 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
this._devices = devices; this._devices = devices;
}), }),
subscribeEntityRegistry(this.hass.connection!, (entities) => { subscribeEntityRegistry(this.hass.connection!, (entities) => {
this._entities = entities; this._entities = entities.filter((entity) => entity.area_id);
}), }),
]; ];
} }
@ -193,11 +193,14 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
deviceEntityLookup[entity.device_id].push(entity); deviceEntityLookup[entity.device_id].push(entity);
} }
inputDevices = devices; inputDevices = devices;
inputEntities = entities.filter((entity) => entity.area_id); inputEntities = entities;
} else if (deviceFilter) { } else {
inputDevices = devices; if (deviceFilter) {
} else if (entityFilter) { inputDevices = devices;
inputEntities = entities.filter((entity) => entity.area_id); }
if (entityFilter) {
inputEntities = entities;
}
} }
if (includeDomains) { if (includeDomains) {