Skip to content

Fix target picker secondary entities support #51729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MindFreeze merged 1 commit into from
Apr 28, 2026
Merged

Fix target picker secondary entities support #51729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/components/target-picker/ha-target-picker-item-row.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,8 @@ export class HaTargetPickerItemRow extends LitElement {
this.includeDomains,
this.includeDeviceClasses,
this.hass.states,
this.entityFilter
this.entityFilter,
!this.primaryEntitiesOnly
)
) {
return true;
Expand Down Expand Up @@ -458,7 +459,8 @@ export class HaTargetPickerItemRow extends LitElement {
this.includeDomains,
this.includeDeviceClasses,
this.hass.states,
this.entityFilter
this.entityFilter,
!this.primaryEntitiesOnly
)
) {
return true;
Expand Down
13 changes: 8 additions & 5 deletions src/data/target.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ export const areaMeetsFilter = (
includeDomains?: string[],
includeDeviceClasses?: string[],
states?: HomeAssistant["states"],
entityFilter?: HaEntityPickerEntityFilterFunc
entityFilter?: HaEntityPickerEntityFilterFunc,
includeSecondary = false
): boolean => {
const areaDevices = Object.values(devices).filter(
(device) => device.area_id === area.area_id
Expand All @@ -133,7 +134,8 @@ export const areaMeetsFilter = (
includeDomains,
includeDeviceClasses,
states,
entityFilter
entityFilter,
includeSecondary
)
)
) {
Expand All @@ -148,7 +150,7 @@ export const areaMeetsFilter = (
areaEntities.some((entity) =>
entityRegMeetsFilter(
entity,
false,
includeSecondary,
includeDomains,
includeDeviceClasses,
states,
Expand All @@ -169,7 +171,8 @@ export const deviceMeetsFilter = (
includeDomains?: string[],
includeDeviceClasses?: string[],
states?: HomeAssistant["states"],
entityFilter?: HaEntityPickerEntityFilterFunc
entityFilter?: HaEntityPickerEntityFilterFunc,
includeSecondary = false
): boolean => {
const devEntities = Object.values(entities).filter(
(entity) => entity.device_id === device.id
Expand All @@ -179,7 +182,7 @@ export const deviceMeetsFilter = (
!devEntities.some((entity) =>
entityRegMeetsFilter(
entity,
false,
includeSecondary,
includeDomains,
includeDeviceClasses,
states,
Expand Down
Loading