Bumped version to 20251029.1

Revert "Fix entities card size and add grid contstraints" (#27725 )
Don't show tooltip for ha button menu in top bar (#27723 )
2025-11-04 16:39:44 +00:00 · 2025-10-30 18:19:31 +01:00 · 2025-10-30 18:18:27 +01:00 · 2025-10-30 18:18:26 +01:00 · 2025-10-30 18:18:25 +01:00 · 2025-10-30 18:18:24 +01:00
44 changed files with 413 additions and 306 deletions
--- a/cast/src/launcher/layout/hc-cast.ts
+++ b/cast/src/launcher/layout/hc-cast.ts
@@ -16,9 +16,9 @@ import {
 } from "../../../../src/common/auth/token_storage";
 import { atLeastVersion } from "../../../../src/common/config/version";
 import { toggleAttribute } from "../../../../src/common/dom/toggle_attribute";
+import "../../../../src/components/ha-button";
 import "../../../../src/components/ha-icon";
 import "../../../../src/components/ha-list";
-import "../../../../src/components/ha-button";
 import "../../../../src/components/ha-list-item";
 import "../../../../src/components/ha-svg-icon";
 import {
@@ -28,7 +28,6 @@ import {
 import { isStrategyDashboard } from "../../../../src/data/lovelace/config/types";
 import type { LovelaceViewConfig } from "../../../../src/data/lovelace/config/view";
 import "../../../../src/layouts/hass-loading-screen";
-import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";
 import "./hc-layout";

@customElement("hc-cast")
@@ -96,7 +95,9 @@ class HcCast extends LitElement {
                <ha-list @action=${this._handlePickView} activatable>
                  ${(
                    this.lovelaceViews ?? [
-                      generateDefaultViewConfig({}, {}, {}, {}, () => ""),
+                      {
+                        title: "Home",
+                      },
                    ]
                  ).map(
                    (view, idx) => html`
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name         = "home-assistant-frontend"
-version      = "20251029.0"
+version      = "20251029.1"
 license      = "Apache-2.0"
 license-files = ["LICENSE*"]
 description  = "The Home Assistant frontend"
--- a/src/components/entity/ha-entities-picker.ts
+++ b/src/components/entity/ha-entities-picker.ts
@@ -147,7 +147,7 @@ class HaEntitiesPicker extends LitElement {
          .createDomains=${this.createDomains}
          .required=${this.required && !currentEntities.length}
          @value-changed=${this._addEntity}
-          add-button
+          .addButton=${currentEntities.length > 0}
        ></ha-entity-picker>
      </div>
    `;
--- a/src/components/ha-form/ha-form.ts
+++ b/src/components/ha-form/ha-form.ts
@@ -148,7 +148,7 @@ export class HaForm extends LitElement implements HaFormElement {
                  .value=${getValue(this.data, item)}
                  .label=${this._computeLabel(item, this.data)}
                  .disabled=${item.disabled || this.disabled || false}
-                  .placeholder=${item.required ? "" : item.default}
+                  .placeholder=${item.required ? undefined : item.default}
                  .helper=${this._computeHelper(item)}
                  .localizeValue=${this.localizeValue}
                  .required=${item.required || false}
--- a/src/components/target-picker/ha-target-picker-value-chip.ts
+++ b/src/components/target-picker/ha-target-picker-value-chip.ts
@@ -16,14 +16,10 @@ import memoizeOne from "memoize-one";
 import { computeCssColor } from "../../common/color/compute-color";
 import { hex2rgb } from "../../common/color/convert-color";
 import { fireEvent } from "../../common/dom/fire_event";
-import { slugify } from "../../common/string/slugify";
-import {
-  computeDeviceName,
-  computeDeviceNameDisplay,
-} from "../../common/entity/compute_device_name";
+import { computeDeviceNameDisplay } from "../../common/entity/compute_device_name";
 import { computeDomain } from "../../common/entity/compute_domain";
-import { computeEntityName } from "../../common/entity/compute_entity_name";
-import { getEntityContext } from "../../common/entity/context/get_entity_context";
+import { computeStateName } from "../../common/entity/compute_state_name";
+import { slugify } from "../../common/string/slugify";
 import { getConfigEntry } from "../../data/config_entries";
 import { labelsContext } from "../../data/context";
 import { domainToName } from "../../data/integration";
@@ -172,23 +168,10 @@ export class HaTargetPickerValueChip extends LitElement {
    if (type === "entity") {
      this._setDomainName(computeDomain(itemId));

-      const stateObject = this.hass.states[itemId];
-      const entityName = computeEntityName(
-        stateObject,
-        this.hass.entities,
-        this.hass.devices
-      );
-      const { device } = getEntityContext(
-        stateObject,
-        this.hass.entities,
-        this.hass.devices,
-        this.hass.areas,
-        this.hass.floors
-      );
-      const deviceName = device ? computeDeviceName(device) : undefined;
+      const stateObj = this.hass.states[itemId];
      return {
-        name: entityName || deviceName || itemId,
-        stateObject,
+        name: computeStateName(stateObj) || itemId,
+        stateObject: stateObj,
      };
    }

--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-trigger.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-trigger.ts
@@ -3,6 +3,7 @@ import {
  mdiContentCopy,
  mdiContentCut,
  mdiDelete,
+  mdiIdentifier,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
  mdiPlusCircleMultipleOutline,
@@ -40,6 +41,8 @@ export default class HaAutomationSidebarTrigger extends LitElement {
  @property({ type: Number, attribute: "sidebar-key" })
  public sidebarKey?: number;

+  @state() private _requestShowId = false;
+
  @state() private _warnings?: string[];

  @query(".sidebar-editor")
@@ -47,6 +50,7 @@ export default class HaAutomationSidebarTrigger extends LitElement {

  protected willUpdate(changedProperties) {
    if (changedProperties.has("config")) {
+      this._requestShowId = false;
      this._warnings = undefined;
      if (this.config) {
        this.yamlMode = this.config.yamlMode;
@@ -101,6 +105,24 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          </div>
        </ha-md-menu-item>

+        ${!this.yamlMode &&
+        !("id" in this.config.config) &&
+        !this._requestShowId
+          ? html`<ha-md-menu-item
+              slot="menu-items"
+              .clickAction=${this._showTriggerId}
+              .disabled=${this.disabled || type === "list"}
+            >
+              <ha-svg-icon slot="start" .path=${mdiIdentifier}></ha-svg-icon>
+              <div class="overflow-label">
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.triggers.edit_id"
+                )}
+                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+              </div>
+            </ha-md-menu-item>`
+          : nothing}
+
        <ha-md-divider
          slot="menu-items"
          role="separator"
@@ -250,6 +272,7 @@ export default class HaAutomationSidebarTrigger extends LitElement {
            @value-changed=${this._valueChangedSidebar}
            @yaml-changed=${this._yamlChangedSidebar}
            .uiSupported=${this.config.uiSupported}
+            .showId=${this._requestShowId}
            .yamlMode=${this.yamlMode}
            .disabled=${this.disabled}
            @ui-mode-not-available=${this._handleUiModeNotAvailable}
@@ -292,6 +315,10 @@ export default class HaAutomationSidebarTrigger extends LitElement {
    fireEvent(this, "toggle-yaml-mode");
  };

+  private _showTriggerId = () => {
+    this._requestShowId = true;
+  };
+
  static styles = [sidebarEditorStyles, overflowStyles];
 }

--- a/src/panels/config/automation/trigger/ha-automation-trigger-editor.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-editor.ts
@@ -29,6 +29,8 @@ export default class HaAutomationTriggerEditor extends LitElement {

  @property({ type: Boolean, attribute: "sidebar" }) public inSidebar = false;

+  @property({ type: Boolean, attribute: "show-id" }) public showId = false;
+
  @query("ha-yaml-editor") public yamlEditor?: HaYamlEditor;

  protected render() {
@@ -36,6 +38,8 @@ export default class HaAutomationTriggerEditor extends LitElement {

    const yamlMode = this.yamlMode || !this.uiSupported;

+    const showId = "id" in this.trigger || this.showId;
+
    return html`
      <div
        class=${classMap({
@@ -70,20 +74,15 @@ export default class HaAutomationTriggerEditor extends LitElement {
              ></ha-yaml-editor>
            `
          : html`
-              ${!isTriggerList(this.trigger)
+              ${showId && !isTriggerList(this.trigger)
                ? html`
                    <ha-textfield
-                      .label=${`${this.hass.localize(
+                      .label=${this.hass.localize(
                        "ui.panel.config.automation.editor.triggers.id"
-                      )} (${this.hass.localize(
-                        "ui.panel.config.automation.editor.triggers.optional"
-                      )})`}
+                      )}
                      .value=${this.trigger.id || ""}
                      .disabled=${this.disabled}
                      @change=${this._idChanged}
-                      .helper=${this.hass.localize(
-                        "ui.panel.config.automation.editor.triggers.id_helper"
-                      )}
                    ></ha-textfield>
                  `
                : nothing}
--- a/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts
+++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts
@@ -245,18 +245,20 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
      newTrigger.to,
      newTrigger.attribute
    );
+    if (Array.isArray(newTrigger.to) && newTrigger.to.length === 0) {
+      delete newTrigger.to;
+    }
    newTrigger.from = this._applyAnyStateExclusive(
      newTrigger.from,
      newTrigger.attribute
    );
+    if (Array.isArray(newTrigger.from) && newTrigger.from.length === 0) {
+      delete newTrigger.from;
+    }

    Object.keys(newTrigger).forEach((key) => {
      const val = newTrigger[key];
-      if (
-        val === undefined ||
-        val === "" ||
-        (Array.isArray(val) && val.length === 0)
-      ) {
+      if (val === undefined || val === "") {
        delete newTrigger[key];
      }
    });
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -228,7 +228,7 @@ export class HaDeviceEntitiesCard extends LitElement {
    addEntitiesToLovelaceView(
      this,
      this.hass,
-      computeCards(this.hass.states, entities, {
+      computeCards(this.hass, entities, {
        title: this.deviceName,
      }),
      computeSection(entities, {
--- a/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
+++ b/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
@@ -5,8 +5,7 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeDeviceNameDisplay } from "../../../../common/entity/compute_device_name";
 import "../../../../components/ha-alert";
 import "../../../../components/ha-area-picker";
-import "../../../../components/ha-wa-dialog";
-import "../../../../components/ha-dialog-footer";
+import "../../../../components/ha-dialog";
 import "../../../../components/ha-button";
 import "../../../../components/ha-labels-picker";
 import type { HaSwitch } from "../../../../components/ha-switch";
@@ -20,8 +19,6 @@ import type { DeviceRegistryDetailDialogParams } from "./show-dialog-device-regi
 class DialogDeviceRegistryDetail extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

-  @state() private _open = false;
-
  @state() private _nameByUser!: string;

  @state() private _error?: string;
@@ -45,15 +42,10 @@ class DialogDeviceRegistryDetail extends LitElement {
    this._areaId = this._params.device.area_id || "";
    this._labels = this._params.device.labels || [];
    this._disabledBy = this._params.device.disabled_by;
-    this._open = true;
    await this.updateComplete;
  }

  public closeDialog(): void {
-    this._open = false;
-  }
-
-  private _dialogClosed(): void {
    this._error = "";
    this._params = undefined;
    fireEvent(this, "dialog-closed", { dialog: this.localName });
@@ -65,12 +57,10 @@ class DialogDeviceRegistryDetail extends LitElement {
    }
    const device = this._params.device;
    return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${computeDeviceNameDisplay(device, this.hass)}
-        prevent-scrim-close
-        @closed=${this._dialogClosed}
+      <ha-dialog
+        open
+        @closed=${this.closeDialog}
+        .heading=${computeDeviceNameDisplay(device, this.hass)}
      >
        <div>
          ${this._error
@@ -78,7 +68,6 @@ class DialogDeviceRegistryDetail extends LitElement {
            : ""}
          <div class="form">
            <ha-textfield
-              autofocus
              .value=${this._nameByUser}
              @input=${this._nameChanged}
              .label=${this.hass.localize(
@@ -86,6 +75,7 @@ class DialogDeviceRegistryDetail extends LitElement {
              )}
              .placeholder=${device.name || ""}
              .disabled=${this._submitting}
+              dialogInitialFocus
            ></ha-textfield>
            <ha-area-picker
              .hass=${this.hass}
@@ -141,25 +131,22 @@ class DialogDeviceRegistryDetail extends LitElement {
            </div>
          </div>
        </div>
-
-        <ha-dialog-footer slot="footer">
-          <ha-button
-            slot="secondaryAction"
-            @click=${this.closeDialog}
-            .disabled=${this._submitting}
-            appearance="plain"
-          >
-            ${this.hass.localize("ui.common.cancel")}
-          </ha-button>
-          <ha-button
-            slot="primaryAction"
-            @click=${this._updateEntry}
-            .disabled=${this._submitting}
-          >
-            ${this.hass.localize("ui.dialogs.device-registry-detail.update")}
-          </ha-button>
-        </ha-dialog-footer>
-      </ha-wa-dialog>
+        <ha-button
+          slot="secondaryAction"
+          @click=${this.closeDialog}
+          .disabled=${this._submitting}
+          appearance="plain"
+        >
+          ${this.hass.localize("ui.common.cancel")}
+        </ha-button>
+        <ha-button
+          slot="primaryAction"
+          @click=${this._updateEntry}
+          .disabled=${this._submitting}
+        >
+          ${this.hass.localize("ui.dialogs.device-registry-detail.update")}
+        </ha-button>
+      </ha-dialog>
    `;
  }

--- a/src/panels/lovelace/card-features/hui-trend-graph-card-feature.ts
+++ b/src/panels/lovelace/card-features/hui-trend-graph-card-feature.ts
@@ -94,7 +94,7 @@ class HuiHistoryChartCardFeature
    }
    if (!this._coordinates) {
      return html`
-        <div class="container">
+        <div class="container loading">
          <ha-spinner size="small"></ha-spinner>
        </div>
      `;
@@ -153,6 +153,14 @@ class HuiHistoryChartCardFeature
      align-items: flex-end;
      pointer-events: none !important;
    }
+
+    .container.loading {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
    hui-graph-base {
      width: 100%;
      --accent-color: var(--feature-color);
--- a/src/panels/lovelace/cards/hui-calendar-card.ts
+++ b/src/panels/lovelace/cards/hui-calendar-card.ts
@@ -137,6 +137,7 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
          class=${classMap({
            "is-grid": this.layout === "grid",
            "is-panel": this.layout === "panel",
+            "has-title": !!this._config.title,
          })}
          .narrow=${this._narrow}
          .events=${this._events}
@@ -229,6 +230,7 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
      padding: 0 8px 8px;
      box-sizing: border-box;
      height: 100%;
+      overflow: hidden;
    }

    .header {
@@ -239,15 +241,25 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
      padding-left: 8px;
      padding-inline-start: 8px;
      direction: var(--direction);
+      white-space: nowrap;
+      text-overflow: ellipsis;
    }

    ha-full-calendar {
      --calendar-height: 400px;
+      height: var(--calendar-height);
    }

    ha-full-calendar.is-grid,
    ha-full-calendar.is-panel {
-      height: calc(100% - 16px);
+      --calendar-height: calc(100% - 16px);
+    }
+
+    ha-full-calendar.is-grid.has-title,
+    ha-full-calendar.is-panel.has-title {
+      --calendar-height: calc(
+        100% - var(--ha-card-header-font-size, var(--ha-font-size-2xl)) - 22px
+      );
    }
  `;
 }
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -1,6 +1,6 @@
 import type { PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, state } from "lit/decorators";
 import { DOMAINS_TOGGLE } from "../../../common/const";
 import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { computeDomain } from "../../../common/entity/compute_domain";
@@ -20,11 +20,9 @@ import type {
 import type {
  LovelaceCard,
  LovelaceCardEditor,
-  LovelaceGridOptions,
  LovelaceHeaderFooter,
 } from "../types";
 import type { EntitiesCardConfig } from "./types";
-import { haStyleScrollbar } from "../../../resources/styles";

 export const computeShowHeaderToggle = <
  T extends EntityConfig | LovelaceRowConfig,
@@ -77,8 +75,6 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {

  private _hass?: HomeAssistant;

-  @property({ attribute: false }) public layout?: string;
-
  private _configEntities?: LovelaceRowConfig[];

  private _showHeaderToggle?: boolean;
@@ -143,14 +139,6 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
    return size;
  }

-  public getGridOptions(): LovelaceGridOptions {
-    return {
-      columns: 12,
-      min_columns: 6,
-      min_rows: this._config?.title || this._showHeaderToggle ? 3 : 2,
-    };
-  }
-
  public setConfig(config: EntitiesCardConfig): void {
    if (!config.entities || !Array.isArray(config.entities)) {
      throw new Error("Entities must be specified");
@@ -245,7 +233,7 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
                    `}
              </h1>
            `}
-        <div id="states" class="card-content ha-scrollbar">
+        <div id="states" class="card-content">
          ${this._configEntities!.map((entityConf) =>
            this._renderEntity(entityConf)
          )}
@@ -258,73 +246,69 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
    `;
  }

-  static styles = [
-    haStyleScrollbar,
-    css`
-      ha-card {
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-      }
-      .card-header {
-        display: flex;
-        justify-content: space-between;
-      }
+  static styles = css`
+    ha-card {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+    .card-header {
+      display: flex;
+      justify-content: space-between;
+    }

-      .card-header .name {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
+    .card-header .name {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }

-      #states {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        gap: var(--entities-card-row-gap, var(--card-row-gap, 8px));
-        overflow-y: auto;
-      }
+    #states {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      gap: var(--entities-card-row-gap, var(--card-row-gap, 8px));
+    }

-      #states > div > * {
-        overflow: clip visible;
-      }
+    #states > div > * {
+      overflow: clip visible;
+    }

-      #states > div {
-        position: relative;
-      }
+    #states > div {
+      position: relative;
+    }

-      .icon {
-        padding: 0px 18px 0px 8px;
-      }
+    .icon {
+      padding: 0px 18px 0px 8px;
+    }

-      .header {
-        border-top-left-radius: var(
-          --ha-card-border-radius,
-          var(--ha-border-radius-lg)
-        );
-        border-top-right-radius: var(
-          --ha-card-border-radius,
-          var(--ha-border-radius-lg)
-        );
-        margin-bottom: 16px;
-        overflow: hidden;
-      }
+    .header {
+      border-top-left-radius: var(
+        --ha-card-border-radius,
+        var(--ha-border-radius-lg)
+      );
+      border-top-right-radius: var(
+        --ha-card-border-radius,
+        var(--ha-border-radius-lg)
+      );
+      margin-bottom: 16px;
+      overflow: hidden;
+    }

-      .footer {
-        border-bottom-left-radius: var(
-          --ha-card-border-radius,
-          var(--ha-border-radius-lg)
-        );
-        border-bottom-right-radius: var(
-          --ha-card-border-radius,
-          var(--ha-border-radius-lg)
-        );
-        margin-top: -16px;
-        overflow: hidden;
-      }
-    `,
-  ];
+    .footer {
+      border-bottom-left-radius: var(
+        --ha-card-border-radius,
+        var(--ha-border-radius-lg)
+      );
+      border-bottom-right-radius: var(
+        --ha-card-border-radius,
+        var(--ha-border-radius-lg)
+      );
+      margin-top: -16px;
+      overflow: hidden;
+    }
+  `;

  private _renderEntity(entityConf: LovelaceRowConfig): TemplateResult {
    const element = createRowElement(
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -5,7 +5,6 @@ import { classMap } from "lit/directives/class-map";
 import { ifDefined } from "lit/directives/if-defined";
 import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { computeDomain } from "../../../common/entity/compute_domain";
-import { computeStateName } from "../../../common/entity/compute_state_name";
 import "../../../components/entity/state-badge";
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
@@ -19,6 +18,7 @@ import type {
 import { SENSOR_DEVICE_CLASS_TIMESTAMP } from "../../../data/sensor";
 import type { HomeAssistant } from "../../../types";
 import { actionHandler } from "../common/directives/action-handler-directive";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";
 import { findEntities } from "../common/find-entities";
 import { handleAction } from "../common/handle-action";
 import { hasAction, hasAnyAction } from "../common/has-action";
@@ -252,7 +252,11 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
      </div>`;
    }

-    const name = entityConf.name ?? computeStateName(stateObj);
+    const name = computeLovelaceEntityName(
+      this.hass!,
+      stateObj,
+      entityConf.name
+    );

    return html`
      <div
--- a/src/panels/lovelace/cards/hui-history-graph-card.ts
+++ b/src/panels/lovelace/cards/hui-history-graph-card.ts
@@ -3,25 +3,27 @@ import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
+import { createSearchParam } from "../../../common/url/search-params";
 import "../../../components/chart/state-history-charts";
 import "../../../components/ha-alert";
 import "../../../components/ha-card";
 import "../../../components/ha-icon-next";
 import {
  computeHistory,
-  subscribeHistoryStatesTimeWindow,
-  type HistoryResult,
  convertStatisticsToHistory,
  mergeHistoryResults,
+  subscribeHistoryStatesTimeWindow,
+  type HistoryResult,
 } from "../../../data/history";
+import { fetchStatistics } from "../../../data/recorder";
 import { getSensorNumericDeviceClasses } from "../../../data/sensor";
 import type { HomeAssistant } from "../../../types";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";
 import { hasConfigOrEntitiesChanged } from "../common/has-changed";
 import { processConfigEntities } from "../common/process-config-entities";
+import type { EntityConfig } from "../entity-rows/types";
 import type { LovelaceCard, LovelaceGridOptions } from "../types";
 import type { HistoryGraphCardConfig } from "./types";
-import { createSearchParam } from "../../../common/url/search-params";
-import { fetchStatistics } from "../../../data/recorder";

 export const DEFAULT_HOURS_TO_SHOW = 24;

@@ -51,6 +53,8 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {

  private _entityIds: string[] = [];

+  private _entities: EntityConfig[] = [];
+
  private _hoursToShow = DEFAULT_HOURS_TO_SHOW;

  private _interval?: number;
@@ -80,21 +84,35 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
      throw new Error("You must include at least one entity");
    }

-    const configEntities = config.entities
+    this._entities = config.entities
      ? processConfigEntities(config.entities)
      : [];
-
-    this._entityIds = [];
-    configEntities.forEach((entity) => {
-      this._entityIds.push(entity.entity);
-      if (entity.name) {
-        this._names[entity.entity] = entity.name;
-      }
-    });
+    this._entityIds = this._entities.map((entity) => entity.entity);

    this._hoursToShow = config.hours_to_show || DEFAULT_HOURS_TO_SHOW;

    this._config = config;
+    this._computeNames();
+  }
+
+  private _computeNames() {
+    if (!this.hass || !this._config) {
+      return;
+    }
+    this._names = {};
+    this._entities.forEach((entity) => {
+      const stateObj = this.hass!.states[entity.entity];
+      this._names[entity.entity] = stateObj
+        ? computeLovelaceEntityName(this.hass!, stateObj, entity.name)
+        : entity.entity;
+    });
+  }
+
+  public willUpdate(changedProps: PropertyValues) {
+    super.willUpdate(changedProps);
+    if (changedProps.has("hass")) {
+      this._computeNames();
+    }
  }

  public connectedCallback() {
--- a/src/panels/lovelace/cards/hui-map-card.ts
+++ b/src/panels/lovelace/cards/hui-map-card.ts
@@ -35,20 +35,12 @@ import {
  hasConfigOrEntitiesChanged,
 } from "../common/has-changed";
 import { processConfigEntities } from "../common/process-config-entities";
-import type { EntityConfig } from "../entity-rows/types";
 import type { LovelaceCard, LovelaceGridOptions } from "../types";
-import type { MapCardConfig } from "./types";
+import type { MapCardConfig, MapEntityConfig } from "./types";

 export const DEFAULT_HOURS_TO_SHOW = 0;
 export const DEFAULT_ZOOM = 14;

-interface MapEntityConfig extends EntityConfig {
-  label_mode?: "state" | "attribute" | "name";
-  attribute?: string;
-  unit?: string;
-  focus?: boolean;
-}
-
 interface GeoEntity {
  entity_id: string;
  label_mode?: "state" | "attribute" | "name" | "icon";
--- a/src/panels/lovelace/cards/hui-statistic-card.ts
+++ b/src/panels/lovelace/cards/hui-statistic-card.ts
@@ -20,14 +20,15 @@ import {
 } from "../../../data/recorder";
 import type { HomeAssistant } from "../../../types";
 import { computeCardSize } from "../common/compute-card-size";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";
 import { findEntities } from "../common/find-entities";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import { createHeaderFooterElement } from "../create-element/create-header-footer-element";
 import type {
  LovelaceCard,
  LovelaceCardEditor,
-  LovelaceHeaderFooter,
  LovelaceGridOptions,
+  LovelaceHeaderFooter,
 } from "../types";
 import type { HuiErrorCard } from "./hui-error-card";
 import type { EntityCardConfig, StatisticCardConfig } from "./types";
@@ -180,7 +181,9 @@ export class HuiStatisticCard extends LitElement implements LovelaceCard {

    const stateObj = this.hass.states[this._config.entity];
    const name =
-      this._config.name ||
+      (this._config.name
+        ? computeLovelaceEntityName(this.hass, stateObj, this._config.name)
+        : "") ||
      getStatisticLabel(this.hass, this._config.entity, this._metadata);

    return html`
--- a/src/panels/lovelace/cards/hui-statistics-graph-card.ts
+++ b/src/panels/lovelace/cards/hui-statistics-graph-card.ts
@@ -1,15 +1,11 @@
+import { differenceInDays, subHours } from "date-fns";
 import type { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
-import { subHours, differenceInDays } from "date-fns";
 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import "../../../components/ha-card";
 import { getEnergyDataCollection } from "../../../data/energy";
-import {
-  getSuggestedMax,
-  getSuggestedPeriod,
-} from "./energy/common/energy-chart-options";
 import type {
  Statistics,
  StatisticsMetaData,
@@ -21,10 +17,16 @@ import {
  getStatisticMetadata,
 } from "../../../data/recorder";
 import type { HomeAssistant } from "../../../types";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";
 import { findEntities } from "../common/find-entities";
 import { hasConfigOrEntitiesChanged } from "../common/has-changed";
 import { processConfigEntities } from "../common/process-config-entities";
+import type { EntityConfig } from "../entity-rows/types";
 import type { LovelaceCard, LovelaceGridOptions } from "../types";
+import {
+  getSuggestedMax,
+  getSuggestedPeriod,
+} from "./energy/common/energy-chart-options";
 import type { StatisticsGraphCardConfig } from "./types";

 export const DEFAULT_DAYS_TO_SHOW = 30;
@@ -67,7 +69,9 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {

  @state() private _unit?: string;

-  private _entities: string[] = [];
+  private _entities: EntityConfig[] = [];
+
+  private _entityIds: string[] = [];

  private _names: Record<string, string> = {};

@@ -148,17 +152,10 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {
      throw new Error("You must include at least one entity");
    }

-    const configEntities = config.entities
+    this._entities = config.entities
      ? processConfigEntities(config.entities, false)
      : [];
-
-    this._entities = [];
-    configEntities.forEach((entity) => {
-      this._entities.push(entity.entity);
-      if (entity.name) {
-        this._names[entity.entity] = entity.name;
-      }
-    });
+    this._entityIds = this._entities.map((ent) => ent.entity);

    if (typeof config.stat_types === "string") {
      this._statTypes = [config.stat_types];
@@ -168,6 +165,20 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {
      this._statTypes = config.stat_types;
    }
    this._config = config;
+    this._computeNames();
+  }
+
+  private _computeNames() {
+    if (!this.hass || !this._config) {
+      return;
+    }
+    this._names = {};
+    this._entities.forEach((config) => {
+      const stateObj = this.hass!.states[config.entity];
+      this._names[config.entity] = stateObj
+        ? computeLovelaceEntityName(this.hass!, stateObj, config.name)
+        : config.entity;
+    });
  }

  protected shouldUpdate(changedProps: PropertyValues): boolean {
@@ -209,6 +220,10 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {
      }
    }

+    if (changedProps.has("hass")) {
+      this._computeNames();
+    }
+
    if (
      changedProps.has("_config") &&
      oldConfig?.entities !== this._config.entities
@@ -232,7 +247,7 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {
    clearInterval(this._interval);
    this._interval = 0; // block concurrent calls
    if (fetchMetadata) {
-      await this._getStatisticsMetaData(this._entities);
+      await this._getStatisticsMetaData(this._entityIds);
    }
    await this._getStatistics();
    // statistics are created every hour
@@ -344,7 +359,7 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {
        }
      }
      if (!unitClass && this._metadata) {
-        const metadata = this._metadata[this._entities[0]];
+        const metadata = this._metadata[this._entityIds[0]];
        unitClass = metadata?.unit_class;
        this._unit = unitClass
          ? getDisplayUnit(this.hass!, metadata.statistic_id, metadata) ||
@@ -356,14 +371,15 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {
        this.hass!,
        startDate,
        endDate,
-        this._entities,
+        this._entityIds,
        this._period,
        unitconfig,
        this._statTypes
      );

      this._statistics = {};
-      this._entities.forEach((id) => {
+      this._entities.forEach((entity) => {
+        const id = entity.entity;
        if (id in statistics) {
          this._statistics![id] = statistics[id];
        }
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -5,6 +5,7 @@ import type { EnergySourceByType } from "../../../data/energy";
 import type { ActionConfig } from "../../../data/lovelace/config/action";
 import type { LovelaceCardConfig } from "../../../data/lovelace/config/card";
 import type { Statistic, StatisticType } from "../../../data/recorder";
+import type { MediaSelectorValue } from "../../../data/selector";
 import type { TimeFormat } from "../../../data/translation";
 import type { ForecastType } from "../../../data/weather";
 import type {
@@ -29,7 +30,6 @@ import type {
 import type { LovelaceHeaderFooterConfig } from "../header-footer/types";
 import type { LovelaceHeadingBadgeConfig } from "../heading-badges/types";
 import type { HomeSummary } from "../strategies/home/helpers/home-summaries";
-import type { MediaSelectorValue } from "../../../data/selector";

 export type AlarmPanelCardConfigState =
  | "arm_away"
@@ -347,7 +347,15 @@ export interface LogbookCardConfig extends LovelaceCardConfig {
  theme?: string;
 }

-interface GeoLocationSourceConfig {
+export interface MapEntityConfig extends EntityConfig {
+  label_mode?: "state" | "attribute" | "name";
+  attribute?: string;
+  unit?: string;
+  focus?: boolean;
+  name?: string;
+}
+
+export interface GeoLocationSourceConfig {
  source: string;
  label_mode?: "name" | "state" | "attribute" | "icon";
  attribute?: string;
@@ -362,7 +370,7 @@ export interface MapCardConfig extends LovelaceCardConfig {
  auto_fit?: boolean;
  fit_zones?: boolean;
  default_zoom?: number;
-  entities?: (EntityConfig | string)[];
+  entities?: (MapEntityConfig | string)[];
  hours_to_show?: number;
  geo_location_sources?: (GeoLocationSourceConfig | string)[];
  dark_mode?: boolean;
@@ -434,7 +442,7 @@ export interface StatisticsGraphCardConfig extends EnergyCardBaseConfig {
 }

 export interface StatisticCardConfig extends LovelaceCardConfig {
-  name?: string;
+  name?: string | EntityNameItem | EntityNameItem[];
  entities: (EntityConfig | string)[];
  period:
    | {
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -1,5 +1,5 @@
 import type { HassEntities, HassEntity } from "home-assistant-js-websocket";
-import { SENSOR_ENTITIES, ASSIST_ENTITIES } from "../../../common/const";
+import { ASSIST_ENTITIES, SENSOR_ENTITIES } from "../../../common/const";
 import { computeDomain } from "../../../common/entity/compute_domain";
 import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 import { computeStateName } from "../../../common/entity/compute_state_name";
@@ -14,12 +14,14 @@ import type {
  GridSourceTypeEnergyPreference,
 } from "../../../data/energy";
 import { domainToName } from "../../../data/integration";
+import type { LovelaceBadgeConfig } from "../../../data/lovelace/config/badge";
 import type { LovelaceCardConfig } from "../../../data/lovelace/config/card";
 import type { LovelaceSectionConfig } from "../../../data/lovelace/config/section";
 import type { LovelaceViewConfig } from "../../../data/lovelace/config/view";
 import { computeUserInitials } from "../../../data/user";
 import type { HomeAssistant } from "../../../types";
 import { HELPER_DOMAINS } from "../../config/helpers/const";
+import type { EntityBadgeConfig } from "../badges/types";
 import type {
  AlarmPanelCardConfig,
  EntitiesCardConfig,
@@ -31,8 +33,7 @@ import type {
 } from "../cards/types";
 import type { EntityConfig } from "../entity-rows/types";
 import type { ButtonsHeaderFooterConfig } from "../header-footer/types";
-import type { LovelaceBadgeConfig } from "../../../data/lovelace/config/badge";
-import type { EntityBadgeConfig } from "../badges/types";
+import { computeLovelaceEntityName } from "./entity/compute-lovelace-entity-name";

 const HIDE_DOMAIN = new Set([
  "ai_task",
@@ -125,13 +126,13 @@ export const computeSection = (
 });

 export const computeCards = (
-  states: HassEntities,
+  hass: HomeAssistant,
  entityIds: string[],
  entityCardOptions: Partial<EntitiesCardConfig>,
  renderFooterEntities = true
 ): LovelaceCardConfig[] => {
  const cards: LovelaceCardConfig[] = [];
-
+  const states = hass.states;
  // For entity card
  const entitiesConf: (string | EntityConfig)[] = [];

@@ -270,19 +271,23 @@ export const computeCards = (
        ? states[a]
          ? computeStateName(states[a])
          : ""
-        : a.name || "",
+        : states[a.entity]
+          ? computeLovelaceEntityName(hass, states[a.entity], a.name)
+          : "",
      typeof b === "string"
        ? states[b]
          ? computeStateName(states[b])
          : ""
-        : b.name || ""
+        : states[b.entity]
+          ? computeLovelaceEntityName(hass, states[b.entity], b.name)
+          : ""
    );
  });

  // If we ended up with footer entities but no normal entities,
  // render the footer entities as normal entities.
  if (entitiesConf.length === 0 && footerEntities.length > 0) {
-    return computeCards(states, entityIds, entityCardOptions, false);
+    return computeCards(hass, entityIds, entityCardOptions, false);
  }

  if (entitiesConf.length > 0 || footerEntities.length > 0) {
@@ -360,14 +365,14 @@ const computeDefaultViewStates = (
 };

 export const generateViewConfig = (
-  localize: LocalizeFunc,
+  hass: HomeAssistant,
  path: string,
  title: string | undefined,
  icon: string | undefined,
  entities: HassEntities
 ): LovelaceViewConfig => {
  const ungroupedEntitites: Record<string, string[]> = {};
-
+  const { localize } = hass;
  // Organize ungrouped entities in ungrouped things
  for (const entityId of Object.keys(entities)) {
    const state = entities[entityId];
@@ -470,7 +475,7 @@ export const generateViewConfig = (
    .forEach((domain) => {
      cards.push(
        ...computeCards(
-          entities,
+          hass,
          ungroupedEntitites[domain].sort((a, b) =>
            stringCompare(
              computeStateName(entities[a]),
@@ -498,16 +503,17 @@ export const generateViewConfig = (
 };

 export const generateDefaultViewConfig = (
-  areaEntries: HomeAssistant["areas"],
-  deviceEntries: HomeAssistant["devices"],
-  entityEntries: HomeAssistant["entities"],
-  entities: HassEntities,
+  hass: HomeAssistant,
  localize: LocalizeFunc,
  energyPrefs?: EnergyPreferences,
  areasPrefs?: AreasDisplayValue,
  hideEntitiesWithoutAreas?: boolean,
  hideEnergy?: boolean
 ): LovelaceViewConfig => {
+  const entities = hass.states;
+  const areaEntries = hass.areas;
+  const deviceEntries = hass.devices;
+  const entityEntries = hass.entities;
  const states = computeDefaultViewStates(entities, entityEntries);
  const path = "default_view";
  const title = "Home";
@@ -549,7 +555,7 @@ export const generateDefaultViewConfig = (

  for (const groupEntity of splittedByGroups.groups) {
    groupCards.push(
-      ...computeCards(entities, groupEntity.attributes.entity_id, {
+      ...computeCards(hass, groupEntity.attributes.entity_id, {
        title: computeStateName(groupEntity),
        show_header_toggle: groupEntity.attributes.control !== "hidden",
      })
@@ -557,7 +563,7 @@ export const generateDefaultViewConfig = (
  }

  const config = generateViewConfig(
-    localize,
+    hass,
    path,
    title,
    icon,
@@ -575,7 +581,7 @@ export const generateDefaultViewConfig = (
    const area = areaEntries[areaId];
    areaCards.push(
      ...computeCards(
-        entities,
+        hass,
        areaEntities.map((entity) => entity.entity_id),
        {
          title: area.name,
@@ -601,7 +607,7 @@ export const generateDefaultViewConfig = (
    const device = deviceEntries[deviceId];
    deviceCards.push(
      ...computeCards(
-        entities,
+        hass,
        deviceEntities.map((entity) => entity.entity_id),
        {
          title:
--- a/src/panels/lovelace/common/process-config-entities.ts
+++ b/src/panels/lovelace/common/process-config-entities.ts
@@ -2,8 +2,12 @@
 import { isValidEntityId } from "../../../common/entity/valid_entity_id";
 import type { EntityConfig, LovelaceRowConfig } from "../entity-rows/types";

+interface BaseEntityConfig {
+  type: string;
+  entity: string;
+}
 export const processConfigEntities = <
-  T extends EntityConfig | LovelaceRowConfig,
+  T extends BaseEntityConfig | LovelaceRowConfig,
 >(
  entities: (T | string)[],
  checkEntityId = true
--- a/src/panels/lovelace/components/hui-entity-editor.ts
+++ b/src/panels/lovelace/components/hui-entity-editor.ts
@@ -45,14 +45,13 @@ export class HuiEntityEditor extends LitElement {
      this.hass.devices
    );

-    const name = this.hass.formatEntityName(
-      stateObj,
-      useDeviceName ? { type: "device" } : { type: "entity" }
-    );
-
    const isRTL = computeRTL(this.hass);

-    const primary = item.name || name || item.entity;
+    const primary =
+      this.hass.formatEntityName(
+        stateObj,
+        useDeviceName ? { type: "device" } : { type: "entity" }
+      ) || item.entity;

    const secondary = this.hass.formatEntityName(
      stateObj,
--- a/src/panels/lovelace/components/hui-generic-entity-row.ts
+++ b/src/panels/lovelace/components/hui-generic-entity-row.ts
@@ -4,19 +4,19 @@ import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { ifDefined } from "lit/directives/if-defined";
 import { DOMAINS_INPUT_ROW } from "../../../common/const";
+import { stopPropagation } from "../../../common/dom/stop_propagation";
 import { toggleAttribute } from "../../../common/dom/toggle_attribute";
 import { computeDomain } from "../../../common/entity/compute_domain";
-import { computeStateName } from "../../../common/entity/compute_state_name";
 import "../../../components/entity/state-badge";
 import "../../../components/ha-relative-time";
 import type { ActionHandlerEvent } from "../../../data/lovelace/action_handler";
 import type { HomeAssistant } from "../../../types";
 import type { EntitiesCardEntityConfig } from "../cards/types";
 import { actionHandler } from "../common/directives/action-handler-directive";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";
 import { handleAction } from "../common/handle-action";
 import { hasAction, hasAnyAction } from "../common/has-action";
 import { createEntityNotFoundWarning } from "./hui-warning";
-import { stopPropagation } from "../../../common/dom/stop_propagation";

@customElement("hui-generic-entity-row")
 export class HuiGenericEntityRow extends LitElement {
@@ -59,7 +59,11 @@ export class HuiGenericEntityRow extends LitElement {
    const pointer = hasAnyAction(this.config);

    const hasSecondary = this.secondaryText || this.config.secondary_info;
-    const name = this.config.name ?? computeStateName(stateObj);
+    const name = computeLovelaceEntityName(
+      this.hass,
+      stateObj,
+      this.config.name
+    );

    return html`
      <div
@@ -87,7 +91,7 @@ export class HuiGenericEntityRow extends LitElement {
              class="info ${classMap({ "text-content": !hasSecondary })}"
              .title=${name}
            >
-              ${this.config.name || computeStateName(stateObj)}
+              ${name}
              ${hasSecondary
                ? html`
                    <div class="secondary">
--- a/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts
@@ -296,11 +296,7 @@ export class HuiCreateDialogCard
  }

  private _suggestCards(): void {
-    const cardConfig = computeCards(
-      this.hass.states,
-      this._selectedEntities,
-      {}
-    );
+    const cardConfig = computeCards(this.hass, this._selectedEntities, {});

    let sectionOptions: Partial<LovelaceSectionConfig> = {};

--- a/src/panels/lovelace/editor/config-elements/hui-generic-entity-row-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-generic-entity-row-editor.ts
@@ -46,20 +46,18 @@ export class HuiGenericEntityRowEditor
    return [
      { name: "entity", required: true, selector: { entity: {} } },
      {
-        type: "grid",
-        name: "",
-        schema: [
-          { name: "name", selector: { text: {} } },
-          {
-            name: "icon",
-            selector: {
-              icon: {},
-            },
-            context: {
-              icon_entity: "entity",
-            },
-          },
-        ],
+        name: "name",
+        selector: { entity_name: {} },
+        context: { entity: "entity" },
+      },
+      {
+        name: "icon",
+        selector: {
+          icon: {},
+        },
+        context: {
+          icon_entity: "entity",
+        },
      },
      {
        name: "secondary_info",
--- a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
@@ -11,20 +11,20 @@ import {
  string,
  union,
 } from "superstruct";
+import type { HASSDomEvent } from "../../../../common/dom/fire_event";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-form/ha-form";
-import "../hui-sub-element-editor";
-import type { EditDetailElementEvent, SubElementEditorConfig } from "../types";
-import type { HASSDomEvent } from "../../../../common/dom/fire_event";
 import type { SchemaUnion } from "../../../../components/ha-form/types";
 import type { HomeAssistant } from "../../../../types";
 import type { ConfigEntity, GlanceCardConfig } from "../../cards/types";
 import "../../components/hui-entity-editor";
+import type { EntityConfig } from "../../entity-rows/types";
 import type { LovelaceCardEditor } from "../../types";
+import "../hui-sub-element-editor";
 import { processEditorEntities } from "../process-editor-entities";
 import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { entitiesConfigStruct } from "../structs/entities-struct";
-import type { EntityConfig } from "../../entity-rows/types";
+import type { EditDetailElementEvent, SubElementEditorConfig } from "../types";

 const cardConfigStruct = assign(
  baseLovelaceCardConfig,
@@ -42,11 +42,17 @@ const cardConfigStruct = assign(

 const SUB_SCHEMA = [
  { name: "entity", selector: { entity: {} }, required: true },
+  {
+    name: "name",
+    selector: { entity_name: {} },
+    context: {
+      entity: "entity",
+    },
+  },
  {
    type: "grid",
    name: "",
    schema: [
-      { name: "name", selector: { text: {} } },
      {
        name: "icon",
        selector: {
--- a/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts
@@ -45,7 +45,13 @@ const cardConfigStruct = assign(

 const SUB_SCHEMA = [
  { name: "entity", selector: { entity: {} }, required: true },
-  { name: "name", selector: { text: {} } },
+  {
+    name: "name",
+    selector: { entity_name: {} },
+    context: {
+      entity: "entity",
+    },
+  },
 ] as const;

@customElement("hui-history-graph-card-editor")
--- a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
@@ -2,6 +2,7 @@ import { mdiPalette } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import memoizeOne from "memoize-one";
 import {
  array,
  assert,
@@ -13,19 +14,19 @@ import {
  string,
  union,
 } from "superstruct";
-import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { hasLocation } from "../../../../common/entity/has_location";
 import { computeDomain } from "../../../../common/entity/compute_domain";
+import { hasLocation } from "../../../../common/entity/has_location";
+import type { LocalizeFunc } from "../../../../common/translations/localize";
 import "../../../../components/ha-form/ha-form";
 import type { SchemaUnion } from "../../../../components/ha-form/types";
-import type { SelectSelector } from "../../../../data/selector";
 import "../../../../components/ha-formfield";
-import "../../../../components/ha-switch";
 import "../../../../components/ha-selector/ha-selector-select";
+import "../../../../components/ha-switch";
+import type { SelectSelector } from "../../../../data/selector";
 import type { HomeAssistant, ValueChangedEvent } from "../../../../types";
 import { DEFAULT_HOURS_TO_SHOW, DEFAULT_ZOOM } from "../../cards/hui-map-card";
-import type { MapCardConfig } from "../../cards/types";
+import type { MapCardConfig, MapEntityConfig } from "../../cards/types";
 import "../../components/hui-entity-editor";
 import type { EntityConfig } from "../../entity-rows/types";
 import type { LovelaceCardEditor } from "../../types";
@@ -33,7 +34,6 @@ import { processEditorEntities } from "../process-editor-entities";
 import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import type { EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
-import type { LocalizeFunc } from "../../../../common/translations/localize";

 export const mapEntitiesConfigStruct = union([
  object({
@@ -223,7 +223,9 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
    })
  );

-  private _entitiesValueChanged(ev: EntitiesEditorEvent): void {
+  private _entitiesValueChanged(
+    ev: EntitiesEditorEvent<MapEntityConfig>
+  ): void {
    if (ev.detail && ev.detail.entities) {
      this._config = { ...this._config!, entities: ev.detail.entities };

--- a/src/panels/lovelace/editor/config-elements/hui-statistic-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-statistic-card-editor.ts
@@ -21,12 +21,13 @@ import type { StatisticCardConfig } from "../../cards/types";
 import { headerFooterConfigStructs } from "../../header-footer/structs";
 import type { LovelaceCardEditor } from "../../types";
 import { baseLovelaceCardConfig } from "../structs/base-card-struct";
+import { entityNameStruct } from "../structs/entity-name-struct";

 const cardConfigStruct = assign(
  baseLovelaceCardConfig,
  object({
    entity: optional(string()),
-    name: optional(string()),
+    name: optional(entityNameStruct),
    icon: optional(string()),
    unit: optional(string()),
    stat_type: optional(string()),
@@ -144,11 +145,15 @@ export class HuiStatisticCardEditor
                }
              : { object: {} },
        },
+        {
+          name: "name",
+          selector: { entity_name: {} },
+          context: { entity: "entity" },
+        },
        {
          type: "grid",
          name: "",
          schema: [
-            { name: "name", selector: { text: {} } },
            {
              name: "icon",
              selector: {
--- a/src/panels/lovelace/editor/structs/entities-struct.ts
+++ b/src/panels/lovelace/editor/structs/entities-struct.ts
@@ -4,11 +4,12 @@ import {
  actionConfigStruct,
  actionConfigStructConfirmation,
 } from "./action-struct";
+import { entityNameStruct } from "./entity-name-struct";

 export const entitiesConfigStruct = union([
  object({
    entity: string(),
-    name: optional(string()),
+    name: optional(entityNameStruct),
    icon: optional(string()),
    image: optional(string()),
    secondary_info: optional(string()),
--- a/src/panels/lovelace/editor/types.ts
+++ b/src/panels/lovelace/editor/types.ts
@@ -43,9 +43,10 @@ export interface ConfigError {
  message: string;
 }

-export interface EntitiesEditorEvent extends CustomEvent {
+export interface EntitiesEditorEvent<T extends EntityConfig = EntityConfig>
+  extends CustomEvent {
  detail: {
-    entities?: EntityConfig[];
+    entities?: T[];
    item?: any;
  };
  target: EventTarget | null;
--- a/src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts
+++ b/src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts
@@ -111,11 +111,7 @@ export class HuiUnusedEntities extends LitElement {
  }

  private _addToLovelaceView(): void {
-    const cardConfig = computeCards(
-      this.hass.states,
-      this._selectedEntities,
-      {}
-    );
+    const cardConfig = computeCards(this.hass, this._selectedEntities, {});
    const sectionConfig = computeSection(this._selectedEntities, {});

    if (this.lovelace.config.views.length === 1) {
--- a/src/panels/lovelace/entity-rows/hui-datetime-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-datetime-entity-row.ts
@@ -1,17 +1,17 @@
+import { format } from "date-fns";
 import type { PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../components/ha-date-input";
-import { format } from "date-fns";
-import { isUnavailableState, UNAVAILABLE } from "../../../data/entity";
+import "../../../components/ha-time-input";
 import { setDateTimeValue } from "../../../data/datetime";
+import { isUnavailableState, UNAVAILABLE } from "../../../data/entity";
 import type { HomeAssistant } from "../../../types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-generic-entity-row";
 import { createEntityNotFoundWarning } from "../components/hui-warning";
 import type { EntityConfig, LovelaceRow } from "./types";
-import "../../../components/ha-time-input";
-import { computeStateName } from "../../../common/entity/compute_state_name";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";

@customElement("hui-datetime-entity-row")
 class HuiInputDatetimeEntityRow extends LitElement implements LovelaceRow {
@@ -53,6 +53,12 @@ class HuiInputDatetimeEntityRow extends LitElement implements LovelaceRow {
    const time = dateObj ? format(dateObj, "HH:mm:ss") : undefined;
    const date = dateObj ? format(dateObj, "yyyy-MM-dd") : undefined;

+    const name = computeLovelaceEntityName(
+      this.hass!,
+      stateObj,
+      this._config.name
+    );
+
    return html`
      <hui-generic-entity-row
        .hass=${this.hass}
@@ -61,7 +67,7 @@ class HuiInputDatetimeEntityRow extends LitElement implements LovelaceRow {
      >
        <div>
          <ha-date-input
-            .label=${this._config.name || computeStateName(stateObj)}
+            .label=${name}
            .locale=${this.hass.locale}
            .value=${date}
            .disabled=${unavailable}
--- a/src/panels/lovelace/entity-rows/hui-input-datetime-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-input-datetime-entity-row.ts
@@ -1,7 +1,6 @@
 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { computeStateName } from "../../../common/entity/compute_state_name";
 import "../../../components/ha-date-input";
 import "../../../components/ha-time-input";
 import { isUnavailableState, UNKNOWN } from "../../../data/entity";
@@ -10,6 +9,7 @@ import {
  stateToIsoDateString,
 } from "../../../data/input_datetime";
 import type { HomeAssistant } from "../../../types";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-generic-entity-row";
 import { createEntityNotFoundWarning } from "../components/hui-warning";
@@ -47,7 +47,11 @@ class HuiInputDatetimeEntityRow extends LitElement implements LovelaceRow {
      `;
    }

-    const name = this._config.name || computeStateName(stateObj);
+    const name = computeLovelaceEntityName(
+      this.hass!,
+      stateObj,
+      this._config.name
+    );

    return html`
      <hui-generic-entity-row
--- a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
@@ -2,7 +2,6 @@ import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { stopPropagation } from "../../../common/dom/stop_propagation";
-import { computeStateName } from "../../../common/entity/compute_state_name";
 import "../../../components/ha-list-item";
 import "../../../components/ha-select";
 import { UNAVAILABLE } from "../../../data/entity";
@@ -11,6 +10,7 @@ import type { InputSelectEntity } from "../../../data/input_select";
 import { setInputSelectOption } from "../../../data/input_select";
 import type { HomeAssistant } from "../../../types";
 import type { EntitiesCardEntityConfig } from "../cards/types";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-generic-entity-row";
 import { createEntityNotFoundWarning } from "../components/hui-warning";
@@ -51,6 +51,12 @@ class HuiInputSelectEntityRow extends LitElement implements LovelaceRow {
      `;
    }

+    const name = computeLovelaceEntityName(
+      this.hass!,
+      stateObj,
+      this._config.name
+    );
+
    return html`
      <hui-generic-entity-row
        .hass=${this.hass}
@@ -58,7 +64,7 @@ class HuiInputSelectEntityRow extends LitElement implements LovelaceRow {
        hide-name
      >
        <ha-select
-          .label=${this._config.name || computeStateName(stateObj)}
+          .label=${name}
          .value=${stateObj.state}
          .options=${stateObj.attributes.options}
          .disabled=${
--- a/src/panels/lovelace/entity-rows/hui-input-text-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-input-text-entity-row.ts
@@ -1,11 +1,11 @@
 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { computeStateName } from "../../../common/entity/compute_state_name";
 import "../../../components/ha-textfield";
 import { isUnavailableState, UNAVAILABLE } from "../../../data/entity";
 import { setValue } from "../../../data/input_text";
 import type { HomeAssistant } from "../../../types";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-generic-entity-row";
 import { createEntityNotFoundWarning } from "../components/hui-warning";
@@ -43,6 +43,12 @@ class HuiInputTextEntityRow extends LitElement implements LovelaceRow {
      `;
    }

+    const name = computeLovelaceEntityName(
+      this.hass!,
+      stateObj,
+      this._config.name
+    );
+
    return html`
      <hui-generic-entity-row
        .hass=${this.hass}
@@ -50,7 +56,7 @@ class HuiInputTextEntityRow extends LitElement implements LovelaceRow {
        hide-name
      >
        <ha-textfield
-          .label=${this._config.name || computeStateName(stateObj)}
+          .label=${name}
          .disabled=${stateObj.state === UNAVAILABLE}
          .value=${stateObj.state}
          .minlength=${stateObj.attributes.min}
--- a/src/panels/lovelace/entity-rows/hui-select-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-select-entity-row.ts
@@ -2,7 +2,6 @@ import type { PropertyValues } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { stopPropagation } from "../../../common/dom/stop_propagation";
-import { computeStateName } from "../../../common/entity/compute_state_name";
 import "../../../components/ha-list-item";
 import "../../../components/ha-select";
 import { UNAVAILABLE } from "../../../data/entity";
@@ -11,6 +10,7 @@ import type { SelectEntity } from "../../../data/select";
 import { setSelectOption } from "../../../data/select";
 import type { HomeAssistant } from "../../../types";
 import type { EntitiesCardEntityConfig } from "../cards/types";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-generic-entity-row";
 import { createEntityNotFoundWarning } from "../components/hui-warning";
@@ -51,6 +51,12 @@ class HuiSelectEntityRow extends LitElement implements LovelaceRow {
      `;
    }

+    const name = computeLovelaceEntityName(
+      this.hass!,
+      stateObj,
+      this._config.name
+    );
+
    return html`
      <hui-generic-entity-row
        .hass=${this.hass}
@@ -58,7 +64,7 @@ class HuiSelectEntityRow extends LitElement implements LovelaceRow {
        hide-name
      >
        <ha-select
-          .label=${this._config.name || computeStateName(stateObj)}
+          .label=${name}
          .value=${stateObj.state}
          .options=${stateObj.attributes.options}
          .disabled=${stateObj.state === UNAVAILABLE}
--- a/src/panels/lovelace/entity-rows/hui-text-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-text-entity-row.ts
@@ -1,7 +1,6 @@
 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { computeStateName } from "../../../common/entity/compute_state_name";
 import "../../../components/ha-textfield";
 import { isUnavailableState, UNAVAILABLE } from "../../../data/entity";
 import type { TextEntity } from "../../../data/text";
@@ -11,6 +10,7 @@ import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-generic-entity-row";
 import { createEntityNotFoundWarning } from "../components/hui-warning";
 import type { EntityConfig, LovelaceRow } from "./types";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";

@customElement("hui-text-entity-row")
 class HuiTextEntityRow extends LitElement implements LovelaceRow {
@@ -46,6 +46,12 @@ class HuiTextEntityRow extends LitElement implements LovelaceRow {
      `;
    }

+    const name = computeLovelaceEntityName(
+      this.hass!,
+      stateObj,
+      this._config.name
+    );
+
    return html`
      <hui-generic-entity-row
        .hass=${this.hass}
@@ -53,7 +59,7 @@ class HuiTextEntityRow extends LitElement implements LovelaceRow {
        hide-name
      >
        <ha-textfield
-          .label=${this._config.name || computeStateName(stateObj)}
+          .label=${name}
          .disabled=${stateObj.state === UNAVAILABLE}
          .value=${stateObj.state}
          .minlength=${stateObj.attributes.min}
--- a/src/panels/lovelace/entity-rows/hui-weather-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-weather-entity-row.ts
@@ -3,7 +3,6 @@ import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { ifDefined } from "lit/directives/if-defined";
-import { computeStateName } from "../../../common/entity/compute_state_name";
 import { isUnavailableState } from "../../../data/entity";
 import type { ActionHandlerEvent } from "../../../data/lovelace/action_handler";
 import type { ForecastEvent, WeatherEntity } from "../../../data/weather";
@@ -24,6 +23,7 @@ import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-generic-entity-row";
 import { createEntityNotFoundWarning } from "../components/hui-warning";
 import type { LovelaceRow } from "./types";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";

@customElement("hui-weather-entity-row")
 class HuiWeatherEntityRow extends LitElement implements LovelaceRow {
@@ -119,6 +119,12 @@ class HuiWeatherEntityRow extends LitElement implements LovelaceRow {
    const forecastData = getForecast(stateObj.attributes, this._forecastEvent);
    const forecast = forecastData?.forecast;

+    const name = computeLovelaceEntityName(
+      this.hass!,
+      stateObj,
+      this._config.name
+    );
+
    return html`
      <div
        class="icon-image ${classMap({
@@ -155,7 +161,7 @@ class HuiWeatherEntityRow extends LitElement implements LovelaceRow {
          hasDoubleClick: hasAction(this._config!.double_tap_action),
        })}
      >
-        ${this._config.name || computeStateName(stateObj)}
+        ${name}
        ${hasSecondary
          ? html`
              <div class="secondary">
--- a/src/panels/lovelace/entity-rows/types.ts
+++ b/src/panels/lovelace/entity-rows/types.ts
@@ -1,3 +1,4 @@
+import type { EntityNameItem } from "../../../common/entity/compute_entity_name_display";
 import type {
  ActionConfig,
  ConfirmationRestrictionConfig,
@@ -10,7 +11,7 @@ import type { TimestampRenderingFormat } from "../components/types";
 export interface EntityConfig {
  entity: string;
  type?: string;
-  name?: string;
+  name?: string | EntityNameItem | EntityNameItem[];
  icon?: string;
  image?: string;
 }
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -321,6 +321,8 @@ class HUIRoot extends LitElement {
                .id="button-${index}"
                .path=${item.icon}
                slot="trigger"
+                .label=${label}
+                hide-title
              ></ha-icon-button>
              ${item.subItems
                .filter((subItem) => subItem.visible)
@@ -340,9 +342,6 @@ class HUIRoot extends LitElement {
                  `
                )}
            </ha-button-menu>
-            <ha-tooltip placement="bottom" .for="button-${index}">
-              ${label}
-            </ha-tooltip>
          `
        : html`
            <ha-icon-button
--- a/src/panels/lovelace/special-rows/hui-button-row.ts
+++ b/src/panels/lovelace/special-rows/hui-button-row.ts
@@ -2,15 +2,15 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, state } from "lit/decorators";
 import { DOMAINS_TOGGLE } from "../../../common/const";
 import { computeDomain } from "../../../common/entity/compute_domain";
-import { computeStateName } from "../../../common/entity/compute_state_name";
-import "../../../components/ha-state-icon";
 import "../../../components/ha-button";
+import "../../../components/ha-state-icon";
+import type { ActionHandlerEvent } from "../../../data/lovelace/action_handler";
 import type { HomeAssistant } from "../../../types";
 import { actionHandler } from "../common/directives/action-handler-directive";
+import { computeLovelaceEntityName } from "../common/entity/compute-lovelace-entity-name";
 import { handleAction } from "../common/handle-action";
 import { hasAction } from "../common/has-action";
 import type { ButtonRowConfig, LovelaceRow } from "../entity-rows/types";
-import type { ActionHandlerEvent } from "../../../data/lovelace/action_handler";

@customElement("hui-button-row")
 export class HuiButtonRow extends LitElement implements LovelaceRow {
@@ -49,8 +49,11 @@ export class HuiButtonRow extends LitElement implements LovelaceRow {
        ? this.hass.states[this._config.entity]
        : undefined;

-    const name =
-      this._config.name ?? (stateObj ? computeStateName(stateObj) : "");
+    const name = computeLovelaceEntityName(
+      this.hass!,
+      stateObj,
+      this._config.name
+    );

    return html`
      <ha-state-icon
--- a/src/panels/lovelace/strategies/original-states/original-states-view-strategy.ts
+++ b/src/panels/lovelace/strategies/original-states/original-states-view-strategy.ts
@@ -44,10 +44,7 @@ export class OriginalStatesViewStrategy extends ReactiveElement {
    // User can override default view. If they didn't, we will add one
    // that contains all entities.
    const view = generateDefaultViewConfig(
-      hass.areas,
-      hass.devices,
-      hass.entities,
-      hass.states,
+      hass,
      localize,
      energyPrefs,
      config.areas,
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -3945,7 +3945,6 @@
              "add": "Add trigger",
              "empty_search": "No triggers found for {term}",
              "id": "Trigger ID",
-              "id_helper": "Helps identify each run based on which trigger fired.",
              "optional": "Optional",
              "edit_id": "Edit ID",
              "duplicate": "[%key:ui::common::duplicate%]",
Author	SHA1	Message	Date
Bram Kragten	0408734ec5	Bumped version to 20251029.1	2025-10-30 18:19:31 +01:00
Paul Bottein	317519fc08	Revert "Fix entities card size and add grid contstraints" (#27725 )	2025-10-30 18:18:27 +01:00
Paul Bottein	843d79eab4	Don't show tooltip for ha button menu in top bar (#27723 )	2025-10-30 18:18:26 +01:00
Paul Bottein	165a757f06	Revert entity naming in target picker chips (#27722 )	2025-10-30 18:18:25 +01:00
Aidan Timson	ea8b730142	Revert "Migrate dialog-device-registry-detail to ha-wa-dialog (#27668 )" (#27716 ) This reverts commit `2a8d935601`.	2025-10-30 18:18:24 +01:00
Paul Bottein	e88c97d625	Use entity naming in more cards (#27714 ) * Use entity naming in more cards * Migrate statistic card * Fix localize	2025-10-30 18:18:23 +01:00
Aidan Timson	7560988b76	Trend feature: make sure content is centered when loading (#27708 ) * Make sure content is centered when loading * Restore from test	2025-10-30 18:18:22 +01:00
Aidan Timson	eecd8077b6	Calendar card height: account for title and stop overflow (#27707 )	2025-10-30 18:18:21 +01:00
Paul Bottein	cbab5c3f7b	Restore trigger id in overflow menu for trigger (#27702 )	2025-10-30 18:18:20 +01:00
Paul Bottein	a5d27c8bb8	Only clear from and to trigger in state trigger (#27700 )	2025-10-30 18:18:19 +01:00
Paul Bottein	a6a340b5db	Only display add button if at least one entity is selected in entities picker (#27699 )	2025-10-30 18:18:18 +01:00