Add aliases description in voice dialog (#16233)

* Add aliases description in voice dialog

* Update style

* Remove duplicate margin

src/panels/config/voice-assistants/entity-voice-settings.ts

@@ -1,4 +1,11 @@
-import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  nothing,
+  PropertyValues,
+} from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
@@ -148,12 +155,11 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
 
     const anyExposed = uiExposed || manExposedAlexa || manExposedGoogle;
 
-    return html`<ha-settings-row>
+    return html`
-        <span slot="heading"
+      <ha-settings-row>
-          >${this.hass.localize(
+        <h3 slot="heading">
-            "ui.dialogs.voice-settings.expose_header"
+          ${this.hass.localize("ui.dialogs.voice-settings.expose_header")}
-          )}</span
+        </h3>
-        >
         <ha-switch
           @change=${this._toggleAll}
           .checked=${anyExposed}
@@ -161,65 +167,76 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
       </ha-settings-row>
       ${anyExposed
         ? showAssistants.map(
-            (key) => html`<ha-settings-row>
+            (key) => html`
-              <img
+              <ha-settings-row>
-                alt=""
+                <img
-                src=${brandsUrl({
+                  alt=""
-                  domain: voiceAssistants[key].domain,
+                  src=${brandsUrl({
-                  type: "icon",
+                    domain: voiceAssistants[key].domain,
-                  darkOptimized: this.hass.themes?.darkMode,
+                    type: "icon",
-                })}
+                    darkOptimized: this.hass.themes?.darkMode,
-                referrerpolicy="no-referrer"
+                  })}
-                slot="prefix"
+                  referrerpolicy="no-referrer"
-              />
+                  slot="prefix"
-              <span slot="heading">${voiceAssistants[key].name}</span>
+                />
-              ${key === "cloud.google_assistant" &&
+                <span slot="heading">${voiceAssistants[key].name}</span>
-              !googleManual &&
+                ${key === "cloud.google_assistant" &&
-              this._googleEntity?.might_2fa
+                !googleManual &&
-                ? html`<ha-formfield
+                this._googleEntity?.might_2fa
-                    slot="description"
+                  ? html`
-                    .label=${this.hass.localize(
+                      <ha-formfield
-                      "ui.dialogs.voice-settings.ask_pin"
+                        slot="description"
-                    )}
+                        .label=${this.hass.localize(
-                  >
+                          "ui.dialogs.voice-settings.ask_pin"
-                    <ha-checkbox
+                        )}
-                      .checked=${!this.entry.options?.[key]?.disable_2fa}
+                      >
-                      @change=${this._2faChanged}
+                        <ha-checkbox
-                    ></ha-checkbox>
+                          .checked=${!this.entry.options?.[key]?.disable_2fa}
-                  </ha-formfield>`
+                          @change=${this._2faChanged}
-                : (alexaManual && key === "cloud.alexa") ||
+                        ></ha-checkbox>
-                  (googleManual && key === "cloud.google_assistant")
+                      </ha-formfield>
-                ? html`<span slot="description"
+                    `
-                    >${this.hass.localize(
+                  : (alexaManual && key === "cloud.alexa") ||
-                      "ui.dialogs.voice-settings.manual_config"
+                    (googleManual && key === "cloud.google_assistant")
-                    )}</span
+                  ? html`
-                  >`
+                      <span slot="description">
-                : ""}
+                        ${this.hass.localize(
-              <ha-switch
+                          "ui.dialogs.voice-settings.manual_config"
-                .assistant=${key}
+                        )}
-                @change=${this._toggleAssistant}
+                      </span>
-                .disabled=${(alexaManual && key === "cloud.alexa") ||
+                    `
-                (googleManual && key === "cloud.google_assistant")}
+                  : nothing}
-                .checked=${alexaManual && key === "cloud.alexa"
+                <ha-switch
-                  ? manExposedAlexa
+                  .assistant=${key}
-                  : googleManual && key === "cloud.google_assistant"
+                  @change=${this._toggleAssistant}
-                  ? manExposedGoogle
+                  .disabled=${(alexaManual && key === "cloud.alexa") ||
-                  : this.entry.options?.[key]?.should_expose}
+                  (googleManual && key === "cloud.google_assistant")}
-              ></ha-switch>
+                  .checked=${alexaManual && key === "cloud.alexa"
-            </ha-settings-row>`
+                    ? manExposedAlexa
+                    : googleManual && key === "cloud.google_assistant"
+                    ? manExposedGoogle
+                    : this.entry.options?.[key]?.should_expose}
+                ></ha-switch>
+              </ha-settings-row>
+            `
           )
-        : ""}
+        : nothing}
 
-      <h3>
+      <h3 class="header">
-        ${this.hass.localize("ui.dialogs.voice-settings.aliasses_header")}
+        ${this.hass.localize("ui.dialogs.voice-settings.aliases_header")}
       </h3>
 
+      <p class="description">
+        ${this.hass.localize("ui.dialogs.voice-settings.aliases_description")}
+      </p>
+
       <ha-aliases-editor
         .hass=${this.hass}
         .aliases=${this._aliases ?? this.entry.aliases}
         @value-changed=${this._aliasesChanged}
         @blur=${this._saveAliases}
-      ></ha-aliases-editor>`;
+      ></ha-aliases-editor>
+    `;
   }
 
   private _aliasesChanged(ev) {
@@ -297,6 +314,7 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
         }
         img {
           height: 32px;
+          width: 32px;
           margin-right: 16px;
         }
         ha-aliases-editor {
@@ -312,6 +330,17 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
         ha-checkbox {
           --mdc-checkbox-state-layer-size: 40px;
         }
+        .header {
+          margin-top: 8px;
+          margin-bottom: 4px;
+        }
+        .description {
+          color: var(--secondary-text-color);
+          font-size: 14px;
+          line-height: 20px;
+          margin-top: 0;
+          margin-bottom: 16px;
+        }
       `,
     ];
   }
@@ -325,3 +354,9 @@ declare global {
     "entity-entry-updated": ExtEntityRegistryEntry;
   }
 }
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "entity-voice-settings": EntityVoiceSettings;
+  }
+}

src/translations/en.json

@@ -1071,7 +1071,8 @@
       },
       "voice-settings": {
         "expose_header": "Expose",
-        "aliasses_header": "Aliasses",
+        "aliases_header": "Aliases",
+        "aliases_description": "Aliases are supported by Assist and Google Assistant.",
         "ask_pin": "Ask for PIN",
         "manual_config": "Managed with filters in configuration.yaml"
       },