Cleanup else/default block when deleting all actions (#19298)

This commit is contained in:
karwosts 2024-01-08 05:10:23 -08:00 committed by GitHub
parent f5fc66f47e
commit ec2ae15e3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 15 deletions

View File

@ -468,13 +468,16 @@ export class HaChooseAction extends LitElement implements ActionElement {
private _defaultChanged(ev: CustomEvent) { private _defaultChanged(ev: CustomEvent) {
ev.stopPropagation(); ev.stopPropagation();
const value = ev.detail.value as Action[]; this._showDefault = true;
fireEvent(this, "value-changed", { const defaultAction = ev.detail.value as Action[];
value: { const newValue: ChooseAction = {
...this.action, ...this.action,
default: value, default: defaultAction,
}, };
}); if (defaultAction.length === 0) {
delete newValue.default;
}
fireEvent(this, "value-changed", { value: newValue });
} }
static get styles(): CSSResultGroup { static get styles(): CSSResultGroup {

View File

@ -117,14 +117,16 @@ export class HaIfAction extends LitElement implements ActionElement {
private _elseChanged(ev: CustomEvent) { private _elseChanged(ev: CustomEvent) {
ev.stopPropagation(); ev.stopPropagation();
const value = ev.detail.value as Action[]; this._showElse = true;
const elseAction = ev.detail.value as Action[];
fireEvent(this, "value-changed", { const newValue: IfAction = {
value: { ...this.action,
...this.action, else: elseAction,
else: value, };
}, if (elseAction.length === 0) {
}); delete newValue.else;
}
fireEvent(this, "value-changed", { value: newValue });
} }
static get styles(): CSSResultGroup { static get styles(): CSSResultGroup {