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

Add support for multiple entities for attribute selector

Browse Source
This commit is contained in:
Paul Bottein 2025-07-17 14:23:29 +02:00
parent 77afb9ac1a
commit 81870d0e7d
No known key found for this signature in database
6 changed files with 74 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/components/entity/ha-entity-attribute-picker.ts
View File

@ -6,6 +6,8 @@ import { computeAttributeNameDisplay } from "../../common/entity/compute_attribu
import type { HomeAssistant, ValueChangedEvent } from "../../types";
import "../ha-combo-box";
import type { HaComboBox } from "../ha-combo-box";
import { ensureArray } from "../../common/array/ensure-array";
import { fireEvent } from "../../common/dom/fire_event";
export type HaEntityPickerEntityFilterFunc = (entityId: HassEntity) => boolean;
@ -13,7 +15,7 @@ export type HaEntityPickerEntityFilterFunc = (entityId: HassEntity) => boolean;
class HaEntityAttributePicker extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
@property({ attribute: false }) public entityId?: string;
@property({ attribute: false }) public entityId?: string | string[];
/**
* List of attributes to be hidden.
@ -48,23 +50,37 @@ class HaEntityAttributePicker extends LitElement {
}
protected updated(changedProps: PropertyValues) {
if (changedProps.has("_opened") && this._opened) {
const entityState = this.entityId
? this.hass.states[this.entityId]
: undefined;
(this._comboBox as any).items = entityState
? Object.keys(entityState.attributes)
.filter((key) => !this.hideAttributes?.includes(key))
.map((key) => ({
value: key,
if (
(changedProps.has("_opened") && this._opened) ||
changedProps.has("entityId") ||
changedProps.has("attribute")
) {
const entityIds = this.entityId ? ensureArray(this.entityId) : [];
const options: { value: string; label: string }[] = [];
const attributesSet = new Set<string>();
for (const entityId of entityIds) {
const stateObj = this.hass.states[entityId];
const attributes = Object.keys(stateObj.attributes).filter(
(a) => !this.hideAttributes?.includes(a)
);
for (const a of attributes) {
if (!attributesSet.has(a)) {
attributesSet.add(a);
options.push({
value: a,
label: computeAttributeNameDisplay(
this.hass.localize,
entityState,
stateObj,
this.hass.entities,
key
a
),
}))
: [];
});
}
}
}
(this._comboBox as any).filteredItems = options;
}
}
@ -73,21 +89,10 @@ class HaEntityAttributePicker extends LitElement {
return nothing;
}
const stateObj = this.hass.states[this.entityId!] as HassEntity | undefined;
return html`
<ha-combo-box
.hass=${this.hass}
.value=${this.value
? stateObj
? computeAttributeNameDisplay(
this.hass.localize,
stateObj,
this.hass.entities,
this.value
)
: this.value
: ""}
.value=${this.value}
.autofocus=${this.autofocus}
.label=${this.label ??
this.hass.localize(
@ -97,6 +102,7 @@ class HaEntityAttributePicker extends LitElement {
.required=${this.required}
.helper=${this.helper}
.allowCustomValue=${this.allowCustomValue}
item-id-path="value"
item-value-path="value"
item-label-path="label"
@opened-changed=${this._openedChanged}
@ -106,12 +112,28 @@ class HaEntityAttributePicker extends LitElement {
`;
}
private get _value() {
return this.value || "";
}
private _openedChanged(ev: ValueChangedEvent<boolean>) {
this._opened = ev.detail.value;
}
private _valueChanged(ev: ValueChangedEvent<string>) {
this.value = ev.detail.value;
ev.stopPropagation();
const newValue = ev.detail.value;
if (newValue !== this._value) {
this._setValue(newValue);
}
}
private _setValue(value: string) {
this.value = value;
setTimeout(() => {
fireEvent(this, "value-changed", { value });
fireEvent(this, "change");
}, 0);
}
}

14
src/components/entity/ha-entity-state-picker.ts
View File

@ -32,7 +32,7 @@ class HaEntityStatePicker extends LitElement {
public allowCustomValue;
@property({ attribute: false })
public excludeStates?: string[];
public hideStates?: string[];
@property() public label?: string;
@ -56,19 +56,19 @@ class HaEntityStatePicker extends LitElement {
changedProps.has("extraOptions")
) {
const entityIds = this.entityId ? ensureArray(this.entityId) : [];
const stateOptions: { value: string; label: string }[] = [];
const options: { value: string; label: string }[] = [];
const statesSet = new Set<string>();
for (const entityId of entityIds) {
const stateObj = this.hass.states[entityId];
const states = getStates(this.hass, stateObj, this.attribute).filter(
(s) => !this.excludeStates || !this.excludeStates.includes(s)
(s) => !this.hideStates || !this.hideStates.includes(s)
);
for (const s of states) {
if (!statesSet.has(s)) {
statesSet.add(s);
const options = {
options.push({
value: s,
label: !this.attribute
? this.hass.formatEntityState(stateObj, s)
@ -77,15 +77,14 @@ class HaEntityStatePicker extends LitElement {
this.attribute,
s
),
};
stateOptions.push(options);
});
}
}
}
(this._comboBox as any).filteredItems = [
...(this.extraOptions ?? []),
...stateOptions,
...options,
];
}
}
@ -106,6 +105,7 @@ class HaEntityStatePicker extends LitElement {
.required=${this.required}
.helper=${this.helper}
.allowCustomValue=${this.allowCustomValue}
item-id-path="value"
item-value-path="value"
item-label-path="label"
@opened-changed=${this._openedChanged}

16
src/components/ha-selector/ha-selector-attribute.ts
View File

@ -5,6 +5,7 @@ import { fireEvent } from "../../common/dom/fire_event";
import type { AttributeSelector } from "../../data/selector";
import type { HomeAssistant } from "../../types";
import "../entity/ha-entity-attribute-picker";
import { ensureArray } from "../../common/array/ensure-array";
@customElement("ha-selector-attribute")
export class HaSelectorAttribute extends LitElement {
@ -23,7 +24,7 @@ export class HaSelectorAttribute extends LitElement {
@property({ type: Boolean }) public required = true;
@property({ attribute: false }) public context?: {
filter_entity?: string;
filter_entity?: string | string[];
};
protected render() {
@ -69,11 +70,16 @@ export class HaSelectorAttribute extends LitElement {
// Validate that that the attribute is still valid for this entity, else unselect.
let invalid = false;
if (this.context.filter_entity) {
const stateObj = this.hass.states[this.context.filter_entity];
const entityIds = ensureArray(this.context.filter_entity);
if (!(stateObj && this.value in stateObj.attributes)) {
invalid = true;
}
invalid = !entityIds.some((entityId) => {
const stateObj = this.hass.states[entityId];
return (
stateObj &&
this.value in stateObj.attributes &&
stateObj.attributes[this.value] !== undefined
);
});
} else {
invalid = this.value !== undefined;
}

2
src/components/ha-selector/ha-selector-state.ts
View File

@ -41,7 +41,7 @@ export class HaSelectorState extends SubscribeMixin(LitElement) {
.disabled=${this.disabled}
.required=${this.required}
allow-custom-value
.excludeStates=${this.selector.state?.exclude_states}
.hideStates=${this.selector.state?.hide_states}
></ha-entity-state-picker>
`;
}

2
src/data/selector.ts
View File

@ -395,7 +395,7 @@ export interface StateSelector {
extra_options?: { label: string; value: any }[];
entity_id?: string | string[];
attribute?: string;
exclude_states?: string[];
hide_states?: string[];
} | null;
}

12
src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts
View File

@ -57,7 +57,7 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
}
private _schema = memoizeOne(
(localize: LocalizeFunc, entityId, attribute) =>
(localize: LocalizeFunc, attribute) =>
[
{
name: "entity_id",
@ -66,9 +66,11 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
},
{
name: "attribute",
context: {
filter_entity: "entity_id",
},
selector: {
attribute: {
entity_id: entityId ? entityId[0] : undefined,
hide_attributes: [
"access_token",
"available_modes",
@ -211,11 +213,7 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
if (!data.attribute && data.from === null) {
data.from = ANY_STATE_VALUE;
}
const schema = this._schema(
this.hass.localize,
this.trigger.entity_id,
this.trigger.attribute
);
const schema = this._schema(this.hass.localize, this.trigger.attribute);
return html`
<ha-form