Include non-primary entities targeted directly by label (#26952)

This commit is contained in:
Paul Bottein
2025-09-11 15:12:20 +02:00
committed by GitHub
parent dcea227f4a
commit 5ba5c00c70

View File

@@ -592,7 +592,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
if (
entity.labels.includes(target.id) &&
!this.value!.entity_id?.includes(entity.entity_id) &&
this._entityRegMeetsFilter(entity)
this._entityRegMeetsFilter(entity, true)
) {
newEntities.push(entity.entity_id);
}
@@ -717,8 +717,11 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
return true;
}
private _entityRegMeetsFilter(entity: EntityRegistryDisplayEntry): boolean {
if (entity.hidden || entity.entity_category) {
private _entityRegMeetsFilter(
entity: EntityRegistryDisplayEntry,
includeSecondary = false
): boolean {
if (entity.hidden || (entity.entity_category && !includeSecondary)) {
return false;
}