Preserve alias at the row level

home-assistant · Oct 4, 2023 · 55e3768 · 55e3768
1 parent e9fe125
commit 55e3768
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -391,7 +391,10 @@ export default class HaAutomationActionRow extends LitElement {
                   ></ha-yaml-editor>
                 `
               : html`
-                  <div @ui-mode-not-available=${this._handleUiModeNotAvailable}>
+                  <div
+                    @ui-mode-not-available=${this._handleUiModeNotAvailable}
+                    @value-changed=${this._onUiChanged}
+                  >
                     ${dynamicElement(`ha-automation-action-${type}`, {
                       hass: this.hass,
                       action: this.action,
@@ -530,6 +533,15 @@ export default class HaAutomationActionRow extends LitElement {
     fireEvent(this, "value-changed", { value: ev.detail.value });
   }
 
+  private _onUiChanged(ev: CustomEvent) {
+    ev.stopPropagation();
+    const value = {
+      alias: this.action.alias,
+      ...ev.detail.value,
+    };
+    fireEvent(this, "value-changed", { value });
+  }
+
   private _switchUiMode() {
     this._warnings = undefined;
     this._yamlMode = false;

diff --git a/src/panels/config/automation/action/types/ha-automation-action-service.ts b/src/panels/config/automation/action/types/ha-automation-action-service.ts
@@ -163,17 +163,10 @@ export class HaServiceAction extends LitElement implements ActionElement {
   }
 
   private _actionChanged(ev) {
-    ev.stopPropagation();
-    const serviceChanged = this._action?.service !== ev.detail.value?.service;
-
-    // Clean old fields except alias if service changed
-    const oldAction = serviceChanged
-      ? {
-          alias: this._action?.alias,
-        }
-      : this.action;
-
-    const value = { ...oldAction, ...ev.detail.value };
+    if (ev.detail.value === this._action) {
+      ev.stopPropagation();
+    }
+    const value = { ...this.action, ...ev.detail.value };
 
     if ("response_variable" in this.action) {
       const [domain, service] = this._action!.service