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

Don't check for entity id in state condition

This commit is contained in:
Paul Bottein 2024-03-12 17:58:36 +01:00
parent efdabfc8a4
commit f5e6a65a37
No known key found for this signature in database
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/panels/lovelace/common/validate-condition.ts
View File

@ -25,8 +25,8 @@ interface BaseCondition {
export interface NumericStateCondition extends BaseCondition {
condition: "numeric_state";
entity?: string;
below?: string | number;
above?: string | number;
below?: string | number; // string for entity_id
above?: string | number; // string for entity_id
}
export interface StateCondition extends BaseCondition {
@ -80,16 +80,10 @@ function checkStateCondition(
condition.entity && hass.states[condition.entity]
? hass.states[condition.entity].state
: UNAVAILABLE;
let value = condition.state ?? condition.state_not;
// Handle entity_id, UI should be updated for conditionnal card (filters does not have UI for now)
if (Array.isArray(value) || typeof value === "string") {
value = getValueFromEntityId(hass, value);
}
return condition.state != null
? ensureArray(value).includes(state)
: !ensureArray(value).includes(state);
? ensureArray(condition.state).includes(state)
: !ensureArray(condition.state_not).includes(state);
}
function checkStateNumericCondition(