Don't check for entity id in state condition
This commit is contained in:
parent
efdabfc8a4
commit
f5e6a65a37
|
@ -25,8 +25,8 @@ interface BaseCondition {
|
||||||
export interface NumericStateCondition extends BaseCondition {
|
export interface NumericStateCondition extends BaseCondition {
|
||||||
condition: "numeric_state";
|
condition: "numeric_state";
|
||||||
entity?: string;
|
entity?: string;
|
||||||
below?: string | number;
|
below?: string | number; // string for entity_id
|
||||||
above?: string | number;
|
above?: string | number; // string for entity_id
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface StateCondition extends BaseCondition {
|
export interface StateCondition extends BaseCondition {
|
||||||
|
@ -80,16 +80,10 @@ function checkStateCondition(
|
||||||
condition.entity && hass.states[condition.entity]
|
condition.entity && hass.states[condition.entity]
|
||||||
? hass.states[condition.entity].state
|
? hass.states[condition.entity].state
|
||||||
: UNAVAILABLE;
|
: 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
|
return condition.state != null
|
||||||
? ensureArray(value).includes(state)
|
? ensureArray(condition.state).includes(state)
|
||||||
: !ensureArray(value).includes(state);
|
: !ensureArray(condition.state_not).includes(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
function checkStateNumericCondition(
|
function checkStateNumericCondition(
|
||||||
|
|
Loading…
Reference in New Issue