From c69fb77b62f3650517c99cb5a341b15b85577254 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Tue, 26 Sep 2023 12:54:40 -0700 Subject: [PATCH] Fix choose description when a non-list form of conditions is used (#18023) --- .../action/types/ha-automation-action-choose.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/panels/config/automation/action/types/ha-automation-action-choose.ts b/src/panels/config/automation/action/types/ha-automation-action-choose.ts index a34bb036e2..f77328bf4b 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-choose.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-choose.ts @@ -82,26 +82,23 @@ export class HaChooseAction extends LitElement implements ActionElement { if (this.isExpanded(idx)) { return ""; } - if (!option.conditions || option.conditions.length === 0) { + const conditions = ensureArray(option.conditions); + if (!conditions || conditions.length === 0) { return this.hass.localize( "ui.panel.config.automation.editor.actions.type.choose.no_conditions" ); } let str = ""; - if (typeof option.conditions[0] === "string") { - str += option.conditions[0]; + if (typeof conditions[0] === "string") { + str += conditions[0]; } else { - str += describeCondition( - option.conditions[0], - this.hass, - this._entityReg - ); + str += describeCondition(conditions[0], this.hass, this._entityReg); } - if (option.conditions.length > 1) { + if (conditions.length > 1) { str += this.hass.localize( "ui.panel.config.automation.editor.actions.type.choose.option_description_additional", "numberOfAdditionalConditions", - option.conditions.length - 1 + conditions.length - 1 ); } return str;