jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-08-09 01:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

review: states are string

Browse Source
This commit is contained in:
Quentin POLLET 2024-01-24 16:24:45 +00:00
parent 263efc35a7
commit e20bf741a4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,8 +52,8 @@ export interface NumericStateCondition extends BaseCondition {
export interface StateCondition extends BaseCondition {
condition: "state";
entity?: string;
state?: string | number | string[];
state_not?: string | number | string[];
state?: string | string[];
state_not?: string | string[];
}
export interface ScreenCondition extends BaseCondition {
@ -101,8 +101,9 @@ function checkLegacyFilterCondition(
if (!entity) {
return false;
}
let value = condition.value;
let state = condition.attribute
let state: string | number = condition.attribute
? entity.attributes[condition.attribute]
: entity.state;
@ -113,10 +114,10 @@ function checkLegacyFilterCondition(
if (condition.operator === "==" || condition.operator === "!=") {
const valueIsNumeric =
typeof value === "number" ||
(typeof value === "string" && value.trim() && !isNaN(Number(value)));
(typeof value === "string" && !isNaN(Number(value.trim())));
const stateIsNumeric =
typeof state === "number" ||
(typeof state === "string" && state.trim() && !isNaN(Number(state)));
(typeof state === "string" && !isNaN(Number(state.trim())));
if (valueIsNumeric && stateIsNumeric) {
value = Number(value);
state = Number(state);
@ -249,8 +250,8 @@ export function buildConditionForFilter(
if (typeof condition === "string" || typeof condition === "number") {
newCondition = {
condition: "state",
state: condition,
} as StateCondition;
state: `${condition}`,
};
} else {
newCondition = condition;
}

2
src/panels/lovelace/editor/conditions/types/ha-card-condition-state.ts
View File

@ -21,7 +21,7 @@ type StateConditionData = {
condition: "state";
entity?: string;
invert: "true" | "false";
state?: string | number | string[];
state?: string | string[];
};
@customElement("ha-card-condition-state")