From c0051aeb688bb329a5994ffdd725d8926e5e3d45 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Tue, 23 Aug 2022 03:25:27 +0200
Subject: [PATCH] Tweak displayed action/condition/trigger names (#13445)

---
 src/data/automation_i18n.ts                               | 8 ++++++--
 .../config/automation/action/ha-automation-action-row.ts  | 5 ++++-
 .../automation/condition/ha-automation-condition-row.ts   | 3 ++-
 .../automation/trigger/ha-automation-trigger-row.ts       | 3 ++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/data/automation_i18n.ts b/src/data/automation_i18n.ts
index d2e1a7b215..a22e803c49 100644
--- a/src/data/automation_i18n.ts
+++ b/src/data/automation_i18n.ts
@@ -1,7 +1,11 @@
 import { Condition, Trigger } from "./automation";
 
-export const describeTrigger = (trigger: Trigger) =>
-  `${trigger.platform || "Unknown"} trigger`;
+export const describeTrigger = (trigger: Trigger) => {
+  if (trigger.alias) {
+    return trigger.alias;
+  }
+  return `${trigger.platform || "Unknown"} trigger`;
+};
 
 export const describeCondition = (condition: Condition) => {
   if (condition.alias) {
diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts
index 8c58ca65ef..8c7daedb86 100644
--- a/src/panels/config/automation/action/ha-automation-action-row.ts
+++ b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -39,6 +39,7 @@ import "./types/ha-automation-action-stop";
 import "./types/ha-automation-action-wait_for_trigger";
 import "./types/ha-automation-action-wait_template";
 import { ACTION_TYPES } from "../../../../data/action";
+import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter";
 
 const getType = (action: Action | undefined) => {
   if (!action) {
@@ -145,7 +146,9 @@ export default class HaAutomationActionRow extends LitElement {
           : ""}
         <ha-expansion-panel
           leftChevron
-          .header=${this.action.alias || describeAction(this.hass, this.action)}
+          .header=${capitalizeFirstLetter(
+            describeAction(this.hass, this.action)
+          )}
         >
           ${this.index !== 0
             ? html`
diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts
index aa2eb92746..df38ecc5a5 100644
--- a/src/panels/config/automation/condition/ha-automation-condition-row.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts
@@ -22,6 +22,7 @@ import { HomeAssistant } from "../../../../types";
 import "./ha-automation-condition-editor";
 import { validateConfig } from "../../../../data/config";
 import { describeCondition } from "../../../../data/automation_i18n";
+import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter";
 
 export interface ConditionElement extends LitElement {
   condition: Condition;
@@ -80,7 +81,7 @@ export default class HaAutomationConditionRow extends LitElement {
 
         <ha-expansion-panel
           leftChevron
-          .header=${this.condition.alias || describeCondition(this.condition)}
+          .header=${capitalizeFirstLetter(describeCondition(this.condition))}
         >
           <ha-progress-button slot="icons" @click=${this._testCondition}>
             ${this.hass.localize(
diff --git a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
index 5525925bd6..24a3d30762 100644
--- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
@@ -40,6 +40,7 @@ import "./types/ha-automation-trigger-time_pattern";
 import "./types/ha-automation-trigger-webhook";
 import "./types/ha-automation-trigger-zone";
 import { describeTrigger } from "../../../../data/automation_i18n";
+import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter";
 
 export interface TriggerElement extends LitElement {
   trigger: Trigger;
@@ -110,7 +111,7 @@ export default class HaAutomationTriggerRow extends LitElement {
 
         <ha-expansion-panel
           leftChevron
-          .header=${this.trigger.alias || describeTrigger(this.trigger)}
+          .header=${capitalizeFirstLetter(describeTrigger(this.trigger))}
         >
           <ha-button-menu
             slot="icons"