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

Improve/extend description of conditions (#15943)

Browse Source
This commit is contained in:
Franck Nijhof 2023-03-28 16:43:00 +02:00 committed by GitHub
parent 48c74c8660
commit a6f9482bf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 86 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/data/automation.ts
View File

@ -197,6 +197,7 @@ export interface StateCondition extends BaseCondition {
attribute?: string;
state: string | number | string[];
for?: string | number | ForDict;
match?: "all" | "any";
}
export interface NumericStateCondition extends BaseCondition {

98
src/data/automation_i18n.ts
View File

@ -513,36 +513,108 @@ export const describeCondition = (
// State Condition
if (condition.condition === "state") {
let base = "Confirm";
const stateObj = hass.states[condition.entity_id];
const entity = stateObj
? computeStateName(stateObj)
: condition.entity_id
? condition.entity_id
: "an entity";
if (!condition.entity_id) {
return `${base} state`;
}
if ("attribute" in condition) {
base += ` ${condition.attribute} from`;
if (condition.attribute) {
const stateObj = Array.isArray(condition.entity_id)
? hass.states[condition.entity_id[0]]
: hass.states[condition.entity_id];
base += ` ${computeAttributeNameDisplay(
hass.localize,
stateObj,
hass.entities,
condition.attribute
)} of`;
}
if (Array.isArray(condition.entity_id)) {
let entities = "";
for (const [index, entity] of condition.entity_id.entries()) {
if (hass.states[entity]) {
entities += `${index > 0 ? "," : ""} ${
condition.entity_id.length > 1 &&
index === condition.entity_id.length - 1
? condition.match === "any"
? "or"
: "and"
: ""
} ${computeStateName(hass.states[entity]) || entity}`;
}
}
if (entities) {
base += ` ${entities} ${condition.entity_id.length > 1 ? "are" : "is"}`;
} else {
// no entity_id or empty array
base += " an entity";
}
} else if (condition.entity_id) {
base += ` ${
hass.states[condition.entity_id]
? computeStateName(hass.states[condition.entity_id])
: condition.entity_id
} is`;
}
let states = "";
const stateObj =
hass.states[
Array.isArray(condition.entity_id)
? condition.entity_id[0]
: condition.entity_id
];
if (Array.isArray(condition.state)) {
for (const [index, state] of condition.state.entries()) {
states += `${index > 0 ? "," : ""} ${
condition.state.length > 1 && index === condition.state.length - 1
? "or"
: ""
} ${state}`;
} '${
condition.attribute
? computeAttributeValueDisplay(
hass.localize,
stateObj,
hass.locale,
hass.entities,
condition.attribute,
state
)
: computeStateDisplay(
hass.localize,
stateObj,
hass.locale,
hass.entities,
state
)
}'`;
}
} else if (condition.state) {
states = condition.state.toString();
} else if (condition.state !== "") {
states = `'${
condition.attribute
? computeAttributeValueDisplay(
hass.localize,
stateObj,
hass.locale,
hass.entities,
condition.attribute,
condition.state
).toString()
: computeStateDisplay(
hass.localize,
stateObj,
hass.locale,
hass.entities,
condition.state.toString()
).toString()
}'`;
}
if (!states) {
states = "a state";
}
base += ` ${entity} is ${states}`;
base += ` ${states}`;
if (condition.for) {
const duration = describeDuration(condition.for);