Don't use tooltip on dashboard toolbar

.github/workflows/codeql-analysis.yml

@@ -36,14 +36,14 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
         with:
           languages: ${{ matrix.language }}
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/autobuild@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -57,4 +57,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0

gallery/src/pages/misc/entity-state.ts

@@ -39,7 +39,6 @@ const SENSOR_DEVICE_CLASSES = [
   "pm1",
   "pm10",
   "pm25",
-  "pm4",
   "power_factor",
   "power",
   "precipitation",

package.json

@@ -81,7 +81,7 @@
     "@material/mwc-top-app-bar": "0.27.0",
     "@material/mwc-top-app-bar-fixed": "0.27.0",
     "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
-    "@material/web": "2.4.1",
+    "@material/web": "2.4.0",
     "@mdi/js": "7.4.47",
     "@mdi/svg": "7.4.47",
     "@replit/codemirror-indentation-markers": "6.5.3",
@@ -89,8 +89,8 @@
     "@thomasloven/round-slider": "0.6.0",
     "@tsparticles/engine": "3.9.1",
     "@tsparticles/preset-links": "3.2.0",
-    "@vaadin/combo-box": "24.9.4",
-    "@vaadin/vaadin-themable-mixin": "24.9.4",
+    "@vaadin/combo-box": "24.9.2",
+    "@vaadin/vaadin-themable-mixin": "24.9.2",
     "@vibrant/color": "4.0.0",
     "@vue/web-component-wrapper": "1.3.0",
     "@webcomponents/scoped-custom-element-registry": "0.0.10",
@@ -111,7 +111,7 @@
     "fuse.js": "7.1.0",
     "google-timezones-json": "1.2.0",
     "gulp-zopfli-green": "6.0.2",
-    "hls.js": "1.6.14",
+    "hls.js": "1.6.13",
     "home-assistant-js-websocket": "9.5.0",
     "idb-keyval": "6.2.2",
     "intl-messageformat": "10.7.18",
@@ -154,11 +154,11 @@
     "@babel/preset-env": "7.28.5",
     "@bundle-stats/plugin-webpack-filter": "4.21.5",
     "@lokalise/node-api": "15.3.1",
-    "@octokit/auth-oauth-device": "8.0.3",
-    "@octokit/plugin-retry": "8.0.3",
-    "@octokit/rest": "22.0.1",
-    "@rsdoctor/rspack-plugin": "1.3.7",
-    "@rspack/core": "1.6.0",
+    "@octokit/auth-oauth-device": "8.0.2",
+    "@octokit/plugin-retry": "8.0.2",
+    "@octokit/rest": "22.0.0",
+    "@rsdoctor/rspack-plugin": "1.3.6",
+    "@rspack/core": "1.5.8",
     "@rspack/dev-server": "1.1.4",
     "@types/babel__plugin-transform-runtime": "7.9.5",
     "@types/chromecast-caf-receiver": "6.0.22",
@@ -178,7 +178,7 @@
     "@types/tar": "6.1.13",
     "@types/ua-parser-js": "0.7.39",
     "@types/webspeechapi": "0.0.29",
-    "@vitest/coverage-v8": "4.0.6",
+    "@vitest/coverage-v8": "4.0.4",
     "babel-loader": "10.0.0",
     "babel-plugin-template-html-minifier": "4.1.0",
     "browserslist-useragent-regexp": "4.1.3",
@@ -201,7 +201,7 @@
     "gulp-rename": "2.1.0",
     "html-minifier-terser": "7.2.0",
     "husky": "9.1.7",
-    "jsdom": "27.1.0",
+    "jsdom": "27.0.1",
     "jszip": "3.10.1",
     "lint-staged": "16.2.6",
     "lit-analyzer": "2.0.3",
@@ -213,13 +213,13 @@
     "rspack-manifest-plugin": "5.1.0",
     "serve": "14.2.5",
     "sinon": "21.0.0",
-    "tar": "7.5.2",
+    "tar": "7.5.1",
     "terser-webpack-plugin": "5.3.14",
     "ts-lit-plugin": "2.0.2",
     "typescript": "5.9.3",
     "typescript-eslint": "8.46.2",
     "vite-tsconfig-paths": "5.1.4",
-    "vitest": "4.0.6",
+    "vitest": "4.0.4",
     "webpack-stats-plugin": "1.1.3",
     "webpackbar": "7.0.0",
     "workbox-build": "patch:workbox-build@npm%3A7.1.1#~/.yarn/patches/workbox-build-npm-7.1.1-a854f3faae.patch"
@@ -231,7 +231,7 @@
     "clean-css": "5.3.3",
     "@lit/reactive-element": "2.1.1",
     "@fullcalendar/daygrid": "6.1.19",
-    "globals": "16.5.0",
+    "globals": "16.4.0",
     "tslib": "2.8.1",
     "@material/mwc-list@^0.27.0": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch"
   },

src/common/entity/entity_filter.ts

@@ -9,9 +9,9 @@ type EntityCategory = "none" | "config" | "diagnostic";
 export interface EntityFilter {
   domain?: string | string[];
   device_class?: string | string[];
-  device?: string | null | (string | null)[];
-  area?: string | null | (string | null)[];
-  floor?: string | null | (string | null)[];
+  device?: string | string[];
+  area?: string | string[];
+  floor?: string | string[];
   label?: string | string[];
   entity_category?: EntityCategory | EntityCategory[];
   hidden_platform?: string | string[];
@@ -19,18 +19,6 @@ export interface EntityFilter {
 
 export type EntityFilterFunc = (entityId: string) => boolean;
 
-const normalizeFilterArray = <T>(
-  value: T | null | T[] | (T | null)[] | undefined
-): Set<T | null> | undefined => {
-  if (value === undefined) {
-    return undefined;
-  }
-  if (value === null) {
-    return new Set([null]);
-  }
-  return new Set(ensureArray(value));
-};
-
 export const generateEntityFilter = (
   hass: HomeAssistant,
   filter: EntityFilter
@@ -41,9 +29,11 @@ export const generateEntityFilter = (
   const deviceClasses = filter.device_class
     ? new Set(ensureArray(filter.device_class))
     : undefined;
-  const floors = normalizeFilterArray(filter.floor);
-  const areas = normalizeFilterArray(filter.area);
-  const devices = normalizeFilterArray(filter.device);
+  const floors = filter.floor ? new Set(ensureArray(filter.floor)) : undefined;
+  const areas = filter.area ? new Set(ensureArray(filter.area)) : undefined;
+  const devices = filter.device
+    ? new Set(ensureArray(filter.device))
+    : undefined;
   const entityCategories = filter.entity_category
     ? new Set(ensureArray(filter.entity_category))
     : undefined;
@@ -83,20 +73,23 @@ export const generateEntityFilter = (
     }
 
     if (floors) {
-      const floorId = floor?.floor_id ?? null;
-      if (!floors.has(floorId)) {
+      if (!floor || !floors.has(floor.floor_id)) {
         return false;
       }
     }
     if (areas) {
-      const areaId = area?.area_id ?? null;
-      if (!areas.has(areaId)) {
+      if (!area) {
+        return false;
+      }
+      if (!areas.has(area.area_id)) {
         return false;
       }
     }
     if (devices) {
-      const deviceId = device?.id ?? null;
-      if (!devices.has(deviceId)) {
+      if (!device) {
+        return false;
+      }
+      if (!devices.has(device.id)) {
         return false;
       }
     }

src/common/entity/get_states.ts

@@ -214,7 +214,6 @@ const FIXED_DOMAIN_ATTRIBUTE_STATES = {
       "pm1",
       "pm10",
       "pm25",
-      "pm4",
       "power_factor",
       "power",
       "pressure",

src/common/keyboard/shortcuts.ts

@@ -1,66 +0,0 @@
-import { tinykeys } from "tinykeys";
-import { canOverrideAlphanumericInput } from "../dom/can-override-input";
-
-/**
- * A function to handle a keyboard shortcut.
- */
-export type ShortcutHandler = (event: KeyboardEvent) => void;
-
-/**
- * Configuration for a keyboard shortcut.
- */
-export interface ShortcutConfig {
-  handler: ShortcutHandler;
-  /**
-   * If true, allows shortcuts even when text is selected.
-   * Default is false to avoid interrupting copy/paste.
-   */
-  allowWhenTextSelected?: boolean;
-}
-
-/**
- * Register keyboard shortcuts using tinykeys.
- * Automatically blocks shortcuts in input fields and during text selection.
- */
-function registerShortcuts(
-  shortcuts: Record<string, ShortcutConfig>
-): () => void {
-  const wrappedShortcuts: Record<string, ShortcutHandler> = {};
-
-  Object.entries(shortcuts).forEach(([key, config]) => {
-    wrappedShortcuts[key] = (event: KeyboardEvent) => {
-      if (!canOverrideAlphanumericInput(event.composedPath())) {
-        return;
-      }
-      if (!config.allowWhenTextSelected && window.getSelection()?.toString()) {
-        return;
-      }
-      config.handler(event);
-    };
-  });
-
-  return tinykeys(window, wrappedShortcuts);
-}
-
-/**
- * Manages keyboard shortcuts registration and cleanup.
- */
-export class ShortcutManager {
-  private _disposer?: () => void;
-
-  /**
-   * Register keyboard shortcuts.
-   * Uses tinykeys syntax: https://github.com/jamiebuilds/tinykeys#usage
-   */
-  public add(shortcuts: Record<string, ShortcutConfig>) {
-    this._disposer = registerShortcuts(shortcuts);
-  }
-
-  /**
-   * Remove all registered shortcuts.
-   */
-  public remove() {
-    this._disposer?.();
-    this._disposer = undefined;
-  }
-}

src/components/chart/ha-chart-base.ts

@@ -652,13 +652,6 @@ export class HaChartBase extends LitElement {
           textBorderWidth: 2,
         },
       },
-      pie: {
-        label: {
-          color: style.getPropertyValue("--primary-text-color"),
-          textBorderColor: style.getPropertyValue("--primary-background-color"),
-          textBorderWidth: 2,
-        },
-      },
       sankey: {
         label: {
           color: style.getPropertyValue("--primary-text-color"),

src/components/chart/state-history-chart-line.ts

@@ -87,8 +87,6 @@ export class StateHistoryChartLine extends LitElement {
 
   private _previousYAxisLabelValue = 0;
 
-  private _yAxisMaximumFractionDigits = 0;
-
   protected render() {
     return html`
       <ha-chart-base
@@ -759,12 +757,8 @@ export class StateHistoryChartLine extends LitElement {
         Math.log10(Math.abs(value - this._previousYAxisLabelValue || 1))
       )
     );
-    this._yAxisMaximumFractionDigits = Math.max(
-      this._yAxisMaximumFractionDigits,
-      maximumFractionDigits
-    );
     const label = formatNumber(value, this.hass.locale, {
-      maximumFractionDigits: this._yAxisMaximumFractionDigits,
+      maximumFractionDigits,
     });
     const width = measureTextWidth(label, 12) + 5;
     if (width > this._yWidth) {

src/components/ha-button.ts

@@ -59,7 +59,6 @@ export class HaButton extends Button {
           line-height: 1;
 
           transition: background-color 0.15s ease-in-out;
-          text-wrap: wrap;
         }
 
         :host([size="small"]) .button {

src/components/ha-tooltip.ts

@@ -9,7 +9,7 @@ export class HaTooltip extends Tooltip {
   @property({ attribute: "show-delay", type: Number }) showDelay = 150;
 
   /** The amount of time to wait before hiding the tooltip when the user mouses out.. */
-  @property({ attribute: "hide-delay", type: Number }) hideDelay = 150;
+  @property({ attribute: "hide-delay", type: Number }) hideDelay = 400;
 
   static get styles(): CSSResultGroup {
     return [

src/data/error_log.ts

@@ -1,5 +1,3 @@
-import { isComponentLoaded } from "../common/config/is_component_loaded";
-import { atLeastVersion } from "../common/config/version";
 import type { HomeAssistant } from "../types";
 
 export interface LogProvider {
@@ -10,8 +8,4 @@ export interface LogProvider {
 export const fetchErrorLog = (hass: HomeAssistant) =>
   hass.callApi<string>("GET", "error_log");
 
-export const getErrorLogDownloadUrl = (hass: HomeAssistant) =>
-  isComponentLoaded(hass, "hassio") &&
-  atLeastVersion(hass.config.version, 2025, 10)
-    ? "/api/hassio/core/logs/latest"
-    : "/api/error_log";
+export const getErrorLogDownloadUrl = "/api/error_log";

src/dialogs/more-info/ha-more-info-history.ts

@@ -152,18 +152,10 @@ export class MoreInfoHistory extends LitElement {
     }
   }
 
-  private _setUpdateTimer() {
+  private _setRedrawTimer() {
+    // redraw the graph every minute to update the time axis
     clearInterval(this._interval);
-    this._interval = window.setInterval(() => {
-      // If using statistics, refresh the data
-      if (this._statistics) {
-        this._fetchStatistics();
-      }
-      // If using history, redraw the graph to update the time axis
-      if (this._stateHistory) {
-        this._redrawGraph();
-      }
-    }, 1000 * 60);
+    this._interval = window.setInterval(() => this._redrawGraph(), 1000 * 60);
   }
 
   private async _getStatisticsMetaData(statisticIds: string[] | undefined) {
@@ -178,30 +170,6 @@ export class MoreInfoHistory extends LitElement {
     return statisticsMetaData;
   }
 
-  private async _fetchStatistics(): Promise<boolean> {
-    // Fire off the metadata and fetch at the same time
-    // to avoid waiting in sequence so the UI responds
-    // faster.
-    const _metadata = this._getStatisticsMetaData([this.entityId]);
-    const _statistics = fetchStatistics(
-      this.hass!,
-      subHours(new Date(), 24),
-      undefined,
-      [this.entityId],
-      "5minute",
-      undefined,
-      statTypes
-    );
-    const [metadata, statistics] = await Promise.all([_metadata, _statistics]);
-    if (metadata && Object.keys(metadata).length) {
-      this._metadata = metadata;
-      this._statistics = statistics;
-      this._statNames = { [this.entityId]: "" };
-      return true;
-    }
-    return false;
-  }
-
   private async _getStateHistory(): Promise<void> {
     if (
       isComponentLoaded(this.hass, "recorder") &&
@@ -212,10 +180,27 @@ export class MoreInfoHistory extends LitElement {
       // has not opted into statistics so there is no need to check as it
       // requires another round-trip to the server.
       if (stateObj && stateObj.attributes.state_class) {
-        const hasStatistics = await this._fetchStatistics();
-        if (hasStatistics) {
-          // Using statistics, set up refresh timer
-          this._setUpdateTimer();
+        // Fire off the metadata and fetch at the same time
+        // to avoid waiting in sequence so the UI responds
+        // faster.
+        const _metadata = this._getStatisticsMetaData([this.entityId]);
+        const _statistics = fetchStatistics(
+          this.hass!,
+          subHours(new Date(), 24),
+          undefined,
+          [this.entityId],
+          "5minute",
+          undefined,
+          statTypes
+        );
+        const [metadata, statistics] = await Promise.all([
+          _metadata,
+          _statistics,
+        ]);
+        if (metadata && Object.keys(metadata).length) {
+          this._metadata = metadata;
+          this._statistics = statistics;
+          this._statNames = { [this.entityId]: "" };
           return;
         }
       }
@@ -253,7 +238,7 @@ export class MoreInfoHistory extends LitElement {
       this._error = err;
       return undefined;
     });
-    this._setUpdateTimer();
+    this._setRedrawTimer();
   }
 
   static styles = [

src/fake_data/entity_component_icons.ts

@@ -97,9 +97,6 @@ export const ENTITY_COMPONENT_ICONS: Record<string, ComponentIcons> = {
     pm25: {
       default: "mdi:molecule",
     },
-    pm4: {
-      default: "mdi:molecule",
-    },
     power: {
       default: "mdi:flash",
     },
@@ -677,9 +674,6 @@ export const ENTITY_COMPONENT_ICONS: Record<string, ComponentIcons> = {
     pm25: {
       default: "mdi:molecule",
     },
-    pm4: {
-      default: "mdi:molecule",
-    },
     power: {
       default: "mdi:flash",
     },

src/panels/calendar/dialog-calendar-event-editor.ts

@@ -332,15 +332,6 @@ class DialogCalendarEventEditor extends LitElement {
 
   private _allDayToggleChanged(ev) {
     this._allDay = ev.target.checked;
-    // When switching to all-day mode, normalize dates to midnight so time portions don't interfere with date comparisons
-    if (this._allDay && this._dtstart && this._dtend) {
-      this._dtstart = new Date(
-        formatDate(this._dtstart, this._timeZone!) + "T00:00:00"
-      );
-      this._dtend = new Date(
-        formatDate(this._dtend, this._timeZone!) + "T00:00:00"
-      );
-    }
   }
 
   private _startDateChanged(ev: CustomEvent) {

src/panels/climate/strategies/climate-view-strategy.ts

@@ -115,24 +115,6 @@ const processAreasForClimate = (
   return cards;
 };
 
-const processUnassignedEntities = (
-  hass: HomeAssistant,
-  entities: string[]
-): LovelaceCardConfig[] => {
-  const unassignedFilter = generateEntityFilter(hass, {
-    area: null,
-  });
-  const unassignedEntities = entities.filter(unassignedFilter);
-  const areaCards: LovelaceCardConfig[] = [];
-  const computeTileCard = computeAreaTileCardConfig(hass, "", true);
-
-  for (const entityId of unassignedEntities) {
-    areaCards.push(computeTileCard(entityId));
-  }
-
-  return areaCards;
-};
-
 @customElement("climate-view-strategy")
 export class ClimateViewStrategy extends ReactiveElement {
   static async generate(
@@ -208,33 +190,10 @@ export class ClimateViewStrategy extends ReactiveElement {
       }
     }
 
-    // Process unassigned entities
-    const unassignedCards = processUnassignedEntities(hass, entities);
-
-    if (unassignedCards.length > 0) {
-      const section: LovelaceSectionRawConfig = {
-        type: "grid",
-        column_span: 2,
-        cards: [
-          {
-            type: "heading",
-            heading:
-              sections.length > 0
-                ? hass.localize(
-                    "ui.panel.lovelace.strategy.climate.other_devices"
-                  )
-                : hass.localize("ui.panel.lovelace.strategy.climate.devices"),
-          },
-          ...unassignedCards,
-        ],
-      };
-      sections.push(section);
-    }
-
     return {
       type: "sections",
       max_columns: 2,
-      sections: sections,
+      sections: sections || [],
     };
   }
 }

src/panels/config/automation/add-automation-element-dialog.ts

@@ -1137,11 +1137,11 @@ class DialogAddAutomationElement
         }
         .groups .selected {
           background-color: var(--ha-color-fill-primary-normal-active);
-          --md-list-item-label-text-color: var(--ha-color-on-primary-normal);
-          --icon-primary-color: var(--ha-color-on-primary-normal);
+          --md-list-item-label-text-color: var(--primary-color);
+          --icon-primary-color: var(--primary-color);
         }
         .groups .selected ha-svg-icon {
-          color: var(--ha-color-on-primary-normal);
+          color: var(--primary-color);
         }
 
         .collection-title {

src/panels/config/backup/ha-config-backup-backups.ts

@@ -125,6 +125,8 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
 
   @query("#overflow-menu") private _overflowMenu?: HaMdMenu;
 
+  private _overflowBackup?: BackupContent;
+
   public connectedCallback() {
     super.connectedCallback();
     window.addEventListener("location-changed", this._locationChanged);
@@ -260,7 +262,7 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
         type: "overflow-menu",
         template: (backup) => html`
           <ha-icon-button
-            .backup=${backup}
+            .selected=${backup}
             .label=${this.hass.localize("ui.common.overflow_menu")}
             .path=${mdiDotsVertical}
             @click=${this._toggleOverflowMenu}
@@ -292,6 +294,7 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
       this._overflowMenu.close();
       return;
     }
+    this._overflowBackup = ev.target.selected;
     this._overflowMenu.anchorElement = ev.target;
     this._overflowMenu.show();
   };
@@ -569,17 +572,15 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
     navigate(`/config/backup/details/${id}`);
   }
 
-  private async _downloadBackup(ev): Promise<void> {
-    const backup = ev.parentElement.anchorElement.backup;
-    if (!backup) {
+  private async _downloadBackup(): Promise<void> {
+    if (!this._overflowBackup) {
       return;
     }
-    downloadBackup(this.hass, this, backup, this.config);
+    downloadBackup(this.hass, this, this._overflowBackup, this.config);
   }
 
-  private async _deleteBackup(ev): Promise<void> {
-    const backup = ev.parentElement.anchorElement.backup;
-    if (!backup) {
+  private async _deleteBackup(): Promise<void> {
+    if (!this._overflowBackup) {
       return;
     }
 
@@ -595,9 +596,11 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
     }
 
     try {
-      await deleteBackup(this.hass, backup.backup_id);
-      if (this._selected.includes(backup.backup_id)) {
-        this._selected = this._selected.filter((id) => id !== backup.backup_id);
+      await deleteBackup(this.hass, this._overflowBackup.backup_id);
+      if (this._selected.includes(this._overflowBackup.backup_id)) {
+        this._selected = this._selected.filter(
+          (id) => id !== this._overflowBackup!.backup_id
+        );
       }
     } catch (err: any) {
       showAlertDialog(this, {

src/panels/config/dashboard/ha-config-updates.ts

@@ -20,7 +20,6 @@ import { subscribeEntityRegistry } from "../../../data/entity_registry";
 import type { UpdateEntity } from "../../../data/update";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import type { HomeAssistant } from "../../../types";
-import "../../../components/ha-progress-ring";
 
 @customElement("ha-config-updates")
 class HaConfigUpdates extends SubscribeMixin(LitElement) {
@@ -57,29 +56,6 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) {
       this._entities?.find((entity) => entity.entity_id === entityId)
   );
 
-  private _renderUpdateProgress(entity: UpdateEntity) {
-    if (entity.attributes.update_percentage != null) {
-      return html`<ha-progress-ring
-        size="small"
-        .value=${entity.attributes.update_percentage}
-        .label=${this.hass.localize(
-          "ui.panel.config.updates.update_in_progress"
-        )}
-      ></ha-progress-ring>`;
-    }
-
-    if (entity.attributes.in_progress) {
-      return html`<ha-spinner
-        size="small"
-        .ariaLabel=${this.hass.localize(
-          "ui.panel.config.updates.update_in_progress"
-        )}
-      ></ha-spinner>`;
-    }
-
-    return html`<ha-icon-next></ha-icon-next>`;
-  }
-
   protected render() {
     if (!this.updateEntities?.length) {
       return nothing;
@@ -130,9 +106,13 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) {
                   )}
                 ></state-badge>
                 ${this.narrow && entity.attributes.in_progress
-                  ? html`<div class="absolute">
-                      ${this._renderUpdateProgress(entity)}
-                    </div>`
+                  ? html`<ha-spinner
+                      class="absolute"
+                      size="small"
+                      .ariaLabel=${this.hass.localize(
+                        "ui.panel.config.updates.update_in_progress"
+                      )}
+                    ></ha-spinner>`
                   : nothing}
               </div>
               <span slot="headline"
@@ -148,9 +128,16 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) {
                   : nothing}
               </span>
               ${!this.narrow
-                ? html`<div slot="end">
-                    ${this._renderUpdateProgress(entity)}
-                  </div>`
+                ? entity.attributes.in_progress
+                  ? html`<div slot="end">
+                      <ha-spinner
+                        size="small"
+                        .ariaLabel=${this.hass.localize(
+                          "ui.panel.config.updates.update_in_progress"
+                        )}
+                      ></ha-spinner>
+                    </div>`
+                  : html`<ha-icon-next slot="end"></ha-icon-next>`
                 : nothing}
             </ha-md-list-item>
           `;
@@ -206,13 +193,13 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) {
         div[slot="start"] {
           position: relative;
         }
-        div.absolute {
+        ha-spinner.absolute {
           position: absolute;
           left: 6px;
           top: 6px;
         }
         state-badge.updating {
-          opacity: 0.2;
+          opacity: 0.5;
         }
       `,
     ];

src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts

@@ -4,7 +4,6 @@ import { customElement, property, query, state } from "lit/decorators";
 import { isComponentLoaded } from "../../../../../common/config/is_component_loaded";
 import { dynamicElement } from "../../../../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import "../../../../../components/ha-button";
 import type { ExtEntityRegistryEntry } from "../../../../../data/entity_registry";
 import { removeEntityRegistryEntry } from "../../../../../data/entity_registry";
 import { HELPERS_CRUD } from "../../../../../data/helpers_crud";
@@ -23,6 +22,7 @@ import "../../../helpers/forms/ha-schedule-form";
 import "../../../helpers/forms/ha-timer-form";
 import "../../../voice-assistants/entity-voice-settings";
 import "../../entity-registry-settings-editor";
+import "../../../../../components/ha-button";
 import type { EntityRegistrySettingsEditor } from "../../entity-registry-settings-editor";
 
 @customElement("entity-settings-helper-tab")
@@ -72,28 +72,22 @@ export class EntitySettingsHelperTab extends LitElement {
         ${this._error
           ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
           : ""}
-        ${this._item === null
-          ? html`<ha-alert alert-type="info"
-              >${this.hass.localize(
-                "ui.dialogs.helper_settings.yaml_not_editable"
-              )}</ha-alert
-            >`
-          : nothing}
         ${!this._componentLoaded
           ? this.hass.localize(
               "ui.dialogs.helper_settings.platform_not_loaded",
               { platform: this.entry.platform }
             )
-          : html`
-              <span @value-changed=${this._valueChanged}>
-                ${dynamicElement(`ha-${this.entry.platform}-form`, {
-                  hass: this.hass,
-                  item: this._item,
-                  entry: this.entry,
-                  disabled: this._item === null,
-                })}
-              </span>
-            `}
+          : this._item === null
+            ? this.hass.localize("ui.dialogs.helper_settings.yaml_not_editable")
+            : html`
+                <span @value-changed=${this._valueChanged}>
+                  ${dynamicElement(`ha-${this.entry.platform}-form`, {
+                    hass: this.hass,
+                    item: this._item,
+                    entry: this.entry,
+                  })}
+                </span>
+              `}
         <entity-registry-settings-editor
           .hass=${this.hass}
           .entry=${this.entry}
@@ -128,9 +122,6 @@ export class EntitySettingsHelperTab extends LitElement {
   }
 
   private _valueChanged(ev: CustomEvent): void {
-    if (this._item === null) {
-      return;
-    }
     this._error = undefined;
     this._item = ev.detail.value;
   }
@@ -204,10 +195,6 @@ export class EntitySettingsHelperTab extends LitElement {
           display: block;
           padding: 0 !important;
         }
-        ha-alert {
-          display: block;
-          margin-bottom: var(--ha-space-4);
-        }
         .form {
           padding: 20px 24px;
         }

src/panels/config/entities/entity-registry-settings-editor.ts

@@ -784,7 +784,7 @@ export class EntityRegistrySettingsEditor extends LitElement {
       <ha-labels-picker
         .hass=${this.hass}
         .value=${this._labels}
-        .disabled=${!!this.disabled}
+        .disabled=${this.disabled}
         @value-changed=${this._labelsChanged}
       ></ha-labels-picker>
       ${this._cameraPrefs

src/panels/config/helpers/forms/ha-counter-form.ts

@@ -17,8 +17,6 @@ class HaCounterForm extends LitElement {
 
   @property({ type: Boolean }) public new = false;
 
-  @property({ type: Boolean }) public disabled = false;
-
   private _item?: Partial<Counter>;
 
   @state() private _name!: string;
@@ -84,7 +82,6 @@ class HaCounterForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}
           dialogInitialFocus
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-icon-picker
           .hass=${this.hass}
@@ -94,7 +91,6 @@ class HaCounterForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.generic.icon"
           )}
-          .disabled=${this.disabled}
         ></ha-icon-picker>
         <ha-textfield
           .value=${this._minimum}
@@ -104,7 +100,6 @@ class HaCounterForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.counter.minimum"
           )}
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-textfield
           .value=${this._maximum}
@@ -114,7 +109,6 @@ class HaCounterForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.counter.maximum"
           )}
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-textfield
           .value=${this._initial}
@@ -124,7 +118,6 @@ class HaCounterForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.counter.initial"
           )}
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-expansion-panel
           header=${this.hass.localize(
@@ -140,14 +133,12 @@ class HaCounterForm extends LitElement {
             .label=${this.hass!.localize(
               "ui.dialogs.helper_settings.counter.step"
             )}
-            .disabled=${this.disabled}
           ></ha-textfield>
           <div class="row">
             <ha-switch
               .checked=${this._restore}
               .configValue=${"restore"}
               @change=${this._valueChanged}
-              .disabled=${this.disabled}
             >
             </ha-switch>
             <div>

src/panels/config/helpers/forms/ha-input_boolean-form.ts

@@ -14,8 +14,6 @@ class HaInputBooleanForm extends LitElement {
 
   @property({ type: Boolean }) public new = false;
 
-  @property({ type: Boolean }) public disabled = false;
-
   private _item?: InputBoolean;
 
   @state() private _name!: string;
@@ -61,7 +59,6 @@ class HaInputBooleanForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}
           dialogInitialFocus
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-icon-picker
           .hass=${this.hass}
@@ -71,7 +68,6 @@ class HaInputBooleanForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.generic.icon"
           )}
-          .disabled=${this.disabled}
         ></ha-icon-picker>
       </div>
     `;

src/panels/config/helpers/forms/ha-input_button-form.ts

@@ -14,8 +14,6 @@ class HaInputButtonForm extends LitElement {
 
   @property({ type: Boolean }) public new = false;
 
-  @property({ type: Boolean }) public disabled = false;
-
   @state() private _name!: string;
 
   @state() private _icon!: string;
@@ -61,7 +59,6 @@ class HaInputButtonForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}
           dialogInitialFocus
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-icon-picker
           .hass=${this.hass}
@@ -71,7 +68,6 @@ class HaInputButtonForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.generic.icon"
           )}
-          .disabled=${this.disabled}
         ></ha-icon-picker>
       </div>
     `;

src/panels/config/helpers/forms/ha-input_datetime-form.ts

@@ -17,8 +17,6 @@ class HaInputDateTimeForm extends LitElement {
 
   @property({ type: Boolean }) public new = false;
 
-  @property({ type: Boolean }) public disabled = false;
-
   private _item?: InputDateTime;
 
   @state() private _name!: string;
@@ -75,7 +73,6 @@ class HaInputDateTimeForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}
           dialogInitialFocus
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-icon-picker
           .hass=${this.hass}
@@ -85,7 +82,6 @@ class HaInputDateTimeForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.generic.icon"
           )}
-          .disabled=${this.disabled}
         ></ha-icon-picker>
         <br />
         ${this.hass.localize("ui.dialogs.helper_settings.input_datetime.mode")}:
@@ -101,7 +97,6 @@ class HaInputDateTimeForm extends LitElement {
             value="date"
             .checked=${this._mode === "date"}
             @change=${this._modeChanged}
-            .disabled=${this.disabled}
           ></ha-radio>
         </ha-formfield>
         <ha-formfield
@@ -114,7 +109,6 @@ class HaInputDateTimeForm extends LitElement {
             value="time"
             .checked=${this._mode === "time"}
             @change=${this._modeChanged}
-            .disabled=${this.disabled}
           ></ha-radio>
         </ha-formfield>
         <ha-formfield
@@ -127,7 +121,6 @@ class HaInputDateTimeForm extends LitElement {
             value="datetime"
             .checked=${this._mode === "datetime"}
             @change=${this._modeChanged}
-            .disabled=${this.disabled}
           ></ha-radio>
         </ha-formfield>
       </div>

src/panels/config/helpers/forms/ha-input_number-form.ts

@@ -18,8 +18,6 @@ class HaInputNumberForm extends LitElement {
 
   @property({ type: Boolean }) public new = false;
 
-  @property({ type: Boolean }) public disabled = false;
-
   private _item?: Partial<InputNumber>;
 
   @state() private _name!: string;
@@ -91,7 +89,6 @@ class HaInputNumberForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}
           dialogInitialFocus
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-icon-picker
           .hass=${this.hass}
@@ -101,7 +98,6 @@ class HaInputNumberForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.generic.icon"
           )}
-          .disabled=${this.disabled}
         ></ha-icon-picker>
         <ha-textfield
           .value=${this._min}
@@ -112,7 +108,6 @@ class HaInputNumberForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.input_number.min"
           )}
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-textfield
           .value=${this._max}
@@ -123,7 +118,6 @@ class HaInputNumberForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.input_number.max"
           )}
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-expansion-panel
           header=${this.hass.localize(
@@ -145,7 +139,6 @@ class HaInputNumberForm extends LitElement {
                 value="slider"
                 .checked=${this._mode === "slider"}
                 @change=${this._modeChanged}
-                .disabled=${this.disabled}
               ></ha-radio>
             </ha-formfield>
             <ha-formfield
@@ -158,7 +151,6 @@ class HaInputNumberForm extends LitElement {
                 value="box"
                 .checked=${this._mode === "box"}
                 @change=${this._modeChanged}
-                .disabled=${this.disabled}
               ></ha-radio>
             </ha-formfield>
           </div>
@@ -171,7 +163,6 @@ class HaInputNumberForm extends LitElement {
             .label=${this.hass!.localize(
               "ui.dialogs.helper_settings.input_number.step"
             )}
-            .disabled=${this.disabled}
           ></ha-textfield>
 
           <ha-textfield
@@ -181,7 +172,6 @@ class HaInputNumberForm extends LitElement {
             .label=${this.hass!.localize(
               "ui.dialogs.helper_settings.input_number.unit_of_measurement"
             )}
-            .disabled=${this.disabled}
           ></ha-textfield>
         </ha-expansion-panel>
       </div>

src/panels/config/helpers/forms/ha-input_select-form.ts

@@ -23,8 +23,6 @@ class HaInputSelectForm extends LitElement {
 
   @property({ type: Boolean }) public new = false;
 
-  @property({ type: Boolean }) public disabled = false;
-
   private _item?: InputSelect;
 
   @state() private _name!: string;
@@ -88,7 +86,6 @@ class HaInputSelectForm extends LitElement {
           )}
           .configValue=${"name"}
           @input=${this._valueChanged}
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-icon-picker
           .hass=${this.hass}
@@ -98,18 +95,13 @@ class HaInputSelectForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.generic.icon"
           )}
-          .disabled=${this.disabled}
         ></ha-icon-picker>
         <div class="header">
           ${this.hass!.localize(
             "ui.dialogs.helper_settings.input_select.options"
           )}:
         </div>
-        <ha-sortable
-          @item-moved=${this._optionMoved}
-          handle-selector=".handle"
-          .disabled=${this.disabled}
-        >
+        <ha-sortable @item-moved=${this._optionMoved} handle-selector=".handle">
           <ha-list class="options">
             ${this._options.length
               ? repeat(
@@ -132,7 +124,6 @@ class HaInputSelectForm extends LitElement {
                           "ui.dialogs.helper_settings.input_select.remove_option"
                         )}
                         @click=${this._removeOption}
-                        .disabled=${this.disabled}
                         .path=${mdiDelete}
                       ></ha-icon-button>
                     </ha-list-item>
@@ -155,13 +146,8 @@ class HaInputSelectForm extends LitElement {
               "ui.dialogs.helper_settings.input_select.add_option"
             )}
             @keydown=${this._handleKeyAdd}
-            .disabled=${this.disabled}
           ></ha-textfield>
-          <ha-button
-            size="small"
-            appearance="plain"
-            @click=${this._addOption}
-            .disabled=${this.disabled}
+          <ha-button size="small" appearance="plain" @click=${this._addOption}
             >${this.hass!.localize(
               "ui.dialogs.helper_settings.input_select.add"
             )}</ha-button

src/panels/config/helpers/forms/ha-input_text-form.ts

@@ -19,8 +19,6 @@ class HaInputTextForm extends LitElement {
 
   @property({ type: Boolean }) public new = false;
 
-  @property({ type: Boolean }) public disabled = false;
-
   private _item?: InputText;
 
   @state() private _name!: string;
@@ -81,7 +79,6 @@ class HaInputTextForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}
           dialogInitialFocus
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-icon-picker
           .hass=${this.hass}
@@ -91,7 +88,6 @@ class HaInputTextForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.generic.icon"
           )}
-          .disabled=${this.disabled}
         ></ha-icon-picker>
         <ha-expansion-panel
           header=${this.hass.localize(
@@ -109,7 +105,6 @@ class HaInputTextForm extends LitElement {
             .label=${this.hass!.localize(
               "ui.dialogs.helper_settings.input_text.min"
             )}
-            .disabled=${this.disabled}
           ></ha-textfield>
           <ha-textfield
             .value=${this._max}
@@ -134,7 +129,6 @@ class HaInputTextForm extends LitElement {
                 value="text"
                 .checked=${this._mode === "text"}
                 @change=${this._modeChanged}
-                .disabled=${this.disabled}
               ></ha-radio>
             </ha-formfield>
             <ha-formfield
@@ -147,7 +141,6 @@ class HaInputTextForm extends LitElement {
                 value="password"
                 .checked=${this._mode === "password"}
                 @change=${this._modeChanged}
-                .disabled=${this.disabled}
               ></ha-radio>
             </ha-formfield>
           </div>
@@ -161,7 +154,6 @@ class HaInputTextForm extends LitElement {
             .helper=${this.hass!.localize(
               "ui.dialogs.helper_settings.input_text.pattern_helper"
             )}
-            .disabled=${this.disabled}
           ></ha-textfield>
         </ha-expansion-panel>
       </div>

src/panels/config/helpers/forms/ha-schedule-form.ts

@@ -17,9 +17,9 @@ import "../../../../components/ha-textfield";
 import type { Schedule, ScheduleDay } from "../../../../data/schedule";
 import { weekdays } from "../../../../data/schedule";
 import { TimeZone } from "../../../../data/translation";
+import { showScheduleBlockInfoDialog } from "./show-dialog-schedule-block-info";
 import { haStyle } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
-import { showScheduleBlockInfoDialog } from "./show-dialog-schedule-block-info";
 
 const defaultFullCalendarConfig: CalendarOptions = {
   plugins: [timeGridPlugin, interactionPlugin],
@@ -43,8 +43,6 @@ class HaScheduleForm extends LitElement {
 
   @property({ type: Boolean }) public new = false;
 
-  @property({ type: Boolean }) public disabled = false;
-
   @state() private _name!: string;
 
   @state() private _icon!: string;
@@ -134,7 +132,6 @@ class HaScheduleForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}
           dialogInitialFocus
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-icon-picker
           .hass=${this.hass}
@@ -144,9 +141,8 @@ class HaScheduleForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.generic.icon"
           )}
-          .disabled=${this.disabled}
         ></ha-icon-picker>
-        ${!this.disabled ? html`<div id="calendar"></div>` : nothing}
+        <div id="calendar"></div>
       </div>
     `;
   }
@@ -179,9 +175,7 @@ class HaScheduleForm extends LitElement {
   }
 
   protected firstUpdated(): void {
-    if (!this.disabled) {
-      this._setupCalendar();
-    }
+    this._setupCalendar();
   }
 
   private _setupCalendar(): void {

src/panels/config/helpers/forms/ha-timer-form.ts

@@ -1,18 +1,18 @@
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { createDurationData } from "../../../../common/datetime/create_duration_data";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-checkbox";
-import "../../../../components/ha-duration-input";
-import type { HaDurationData } from "../../../../components/ha-duration-input";
 import "../../../../components/ha-formfield";
 import "../../../../components/ha-icon-picker";
+import "../../../../components/ha-duration-input";
 import "../../../../components/ha-textfield";
-import type { ForDict } from "../../../../data/automation";
 import type { DurationDict, Timer } from "../../../../data/timer";
 import { haStyle } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
+import { createDurationData } from "../../../../common/datetime/create_duration_data";
+import type { HaDurationData } from "../../../../components/ha-duration-input";
+import type { ForDict } from "../../../../data/automation";
 
 @customElement("ha-timer-form")
 class HaTimerForm extends LitElement {
@@ -20,8 +20,6 @@ class HaTimerForm extends LitElement {
 
   @property({ type: Boolean }) public new = false;
 
-  @property({ type: Boolean }) public disabled = false;
-
   private _item?: Timer;
 
   @state() private _name!: string;
@@ -79,7 +77,6 @@ class HaTimerForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}
           dialogInitialFocus
-          .disabled=${this.disabled}
         ></ha-textfield>
         <ha-icon-picker
           .hass=${this.hass}
@@ -89,13 +86,11 @@ class HaTimerForm extends LitElement {
           .label=${this.hass!.localize(
             "ui.dialogs.helper_settings.generic.icon"
           )}
-          .disabled=${this.disabled}
         ></ha-icon-picker>
         <ha-duration-input
           .configValue=${"duration"}
           .data=${this._duration_data}
           @value-changed=${this._valueChanged}
-          .disabled=${this.disabled}
         ></ha-duration-input>
         <ha-formfield
           .label=${this.hass.localize(
@@ -106,7 +101,6 @@ class HaTimerForm extends LitElement {
             .configValue=${"restore"}
             .checked=${this._restore}
             @click=${this._toggleRestore}
-            .disabled=${this.disabled}
           >
           </ha-checkbox>
         </ha-formfield>
@@ -136,9 +130,6 @@ class HaTimerForm extends LitElement {
   }
 
   private _toggleRestore() {
-    if (this.disabled) {
-      return;
-    }
     this._restore = !this._restore;
     fireEvent(this, "value-changed", {
       value: { ...this._item, restore: this._restore },

src/panels/config/integrations/ha-config-integration-page.ts

@@ -790,10 +790,7 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
     );
     const timeString = new Date().toISOString().replace(/:/g, "-");
     const logFileName = `home-assistant_${integration}_${timeString}.log`;
-    const signedUrl = await getSignedPath(
-      this.hass,
-      getErrorLogDownloadUrl(this.hass)
-    );
+    const signedUrl = await getSignedPath(this.hass, getErrorLogDownloadUrl);
     fileDownload(signedUrl.path, logFileName);
   }
 

src/panels/config/labels/dialog-label-detail.ts

@@ -82,7 +82,7 @@ class DialogLabelDetail
           this.hass,
           this._params.entry
             ? this._params.entry.name || this._params.entry.label_id
-            : this.hass!.localize("ui.dialogs.label-detail.new_label")
+            : this.hass!.localize("ui.panel.config.labels.detail.new_label")
         )}
       >
         <div>
@@ -95,9 +95,11 @@ class DialogLabelDetail
               .value=${this._name}
               .configValue=${"name"}
               @input=${this._input}
-              .label=${this.hass!.localize("ui.dialogs.label-detail.name")}
+              .label=${this.hass!.localize(
+                "ui.panel.config.labels.detail.name"
+              )}
               .validationMessage=${this.hass!.localize(
-                "ui.dialogs.label-detail.required_error_msg"
+                "ui.panel.config.labels.detail.required_error_msg"
               )}
               required
             ></ha-textfield>
@@ -106,21 +108,25 @@ class DialogLabelDetail
               .hass=${this.hass}
               .configValue=${"icon"}
               @value-changed=${this._valueChanged}
-              .label=${this.hass!.localize("ui.dialogs.label-detail.icon")}
+              .label=${this.hass!.localize(
+                "ui.panel.config.labels.detail.icon"
+              )}
             ></ha-icon-picker>
             <ha-color-picker
               .value=${this._color}
               .configValue=${"color"}
               .hass=${this.hass}
               @value-changed=${this._valueChanged}
-              .label=${this.hass!.localize("ui.dialogs.label-detail.color")}
+              .label=${this.hass!.localize(
+                "ui.panel.config.labels.detail.color"
+              )}
             ></ha-color-picker>
             <ha-textarea
               .value=${this._description}
               .configValue=${"description"}
               @input=${this._input}
               .label=${this.hass!.localize(
-                "ui.dialogs.label-detail.description"
+                "ui.panel.config.labels.detail.description"
               )}
             ></ha-textarea>
           </div>
@@ -134,7 +140,7 @@ class DialogLabelDetail
                 @click=${this._deleteEntry}
                 .disabled=${this._submitting}
               >
-                ${this.hass!.localize("ui.common.delete")}
+                ${this.hass!.localize("ui.panel.config.labels.detail.delete")}
               </ha-button>
             `
           : nothing}
@@ -144,8 +150,8 @@ class DialogLabelDetail
           .disabled=${this._submitting || !this._name}
         >
           ${this._params.entry
-            ? this.hass!.localize("ui.common.update")
-            : this.hass!.localize("ui.common.create")}
+            ? this.hass!.localize("ui.panel.config.labels.detail.update")
+            : this.hass!.localize("ui.panel.config.labels.detail.create")}
         </ha-button>
       </ha-dialog>
     `;

src/panels/config/logs/error-log-card.ts

@@ -415,7 +415,7 @@ class ErrorLogCard extends LitElement {
       const downloadUrl =
         this.provider && this.provider !== "core"
           ? getHassioLogDownloadUrl(this.provider)
-          : getErrorLogDownloadUrl(this.hass);
+          : getErrorLogDownloadUrl;
       const logFileName =
         this.provider && this.provider !== "core"
           ? `${this.provider}_${timeString}.log`

src/panels/config/logs/system-log-card.ts

@@ -2,6 +2,8 @@ import { mdiDotsVertical, mdiDownload, mdiRefresh, mdiText } from "@mdi/js";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
+import { atLeastVersion } from "../../../common/config/version";
 import { fireEvent } from "../../../common/dom/fire_event";
 import type { LocalizeFunc } from "../../../common/translations/localize";
 import "../../../components/buttons/ha-call-service-button";
@@ -13,6 +15,7 @@ import "../../../components/ha-list-item";
 import "../../../components/ha-spinner";
 import { getSignedPath } from "../../../data/auth";
 import { getErrorLogDownloadUrl } from "../../../data/error_log";
+import { coreLatestLogsUrl } from "../../../data/hassio/supervisor";
 import { domainToName } from "../../../data/integration";
 import type { LoggedError } from "../../../data/system_log";
 import {
@@ -228,7 +231,11 @@ export class SystemLogCard extends LitElement {
 
   private async _downloadLogs() {
     const timeString = new Date().toISOString().replace(/:/g, "-");
-    const downloadUrl = getErrorLogDownloadUrl(this.hass);
+    const downloadUrl =
+      isComponentLoaded(this.hass, "hassio") &&
+      atLeastVersion(this.hass.config.version, 2025, 10)
+        ? coreLatestLogsUrl
+        : getErrorLogDownloadUrl;
     const logFileName = `home-assistant_${timeString}.log`;
     const signedUrl = await getSignedPath(this.hass, downloadUrl);
     fileDownload(signedUrl.path, logFileName);

src/panels/config/voice-assistants/debug/assist-pipeline-debug.ts

@@ -148,9 +148,7 @@ export class AssistPipelineDebug extends LitElement {
       ).pipeline_runs.reverse();
     } catch (e: any) {
       showAlertDialog(this, {
-        title: this.hass.localize(
-          "ui.panel.config.voice_assistants.debug.error.fetch_runs"
-        ),
+        title: "Failed to fetch pipeline runs",
         text: e.message,
       });
       return;
@@ -178,9 +176,7 @@ export class AssistPipelineDebug extends LitElement {
       ).events;
     } catch (e: any) {
       showAlertDialog(this, {
-        title: this.hass.localize(
-          "ui.panel.config.voice_assistants.debug.error.fetch_events"
-        ),
+        title: "Failed to fetch events",
         text: e.message,
       });
       return;

src/panels/config/voice-assistants/debug/assist-render-pipeline-events.ts

@@ -30,26 +30,16 @@ export class AssistPipelineEvents extends LitElement {
     const run = this._processEvents(this.events);
     if (!run) {
       if (this.events.length) {
-        return html`<ha-alert alert-type="error"
-            >${this.hass.localize(
-              "ui.panel.config.voice_assistants.debug.error.showing_run"
-            )}</ha-alert
-          >
+        return html`<ha-alert alert-type="error">Error showing run</ha-alert>
           <ha-card>
             <ha-expansion-panel>
-              <span slot="header"
-                >${this.hass.localize(
-                  "ui.panel.config.voice_assistants.debug.raw"
-                )}</span
-              >
+              <span slot="header">Raw</span>
               <pre>${JSON.stringify(this.events, null, 2)}</pre>
             </ha-expansion-panel>
           </ha-card>`;
       }
       return html`<ha-alert alert-type="warning"
-        >${this.hass.localize(
-          "ui.panel.config.voice_assistants.debug.no_events"
-        )}</ha-alert
+        >There were no events in this run.</ha-alert
       >`;
     }
     return html`

src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts

@@ -11,16 +11,31 @@ import type { HomeAssistant } from "../../../../types";
 import { formatNumber } from "../../../../common/number/format_number";
 import "../../../../components/ha-yaml-editor";
 import { showAlertDialog } from "../../../../dialogs/generic/show-dialog-box";
-import type { LocalizeKeys } from "../../../../common/translations/localize";
 
-const RUN_DATA = ["pipeline", "language"];
-const WAKE_WORD_DATA = ["engine"];
+const RUN_DATA = {
+  pipeline: "Pipeline",
+  language: "Language",
+};
+const WAKE_WORD_DATA = {
+  engine: "Engine",
+};
 
-const STT_DATA = ["engine"];
+const STT_DATA = {
+  engine: "Engine",
+};
 
-const INTENT_DATA = ["engine", "language", "intent_input"];
+const INTENT_DATA = {
+  engine: "Engine",
+  language: "Language",
+  intent_input: "Input",
+};
 
-const TTS_DATA = ["engine", "language", "voice", "tts_input"];
+const TTS_DATA = {
+  engine: "Engine",
+  language: "Language",
+  voice: "Voice",
+  tts_input: "Input",
+};
 
 const STAGES: Record<PipelineRun["stage"], number> = {
   ready: 0,
@@ -87,32 +102,24 @@ const renderProgress = (
   return html`${durationString}s ✅`;
 };
 
-const renderData = (
-  hass: HomeAssistant,
-  data: Record<string, any>,
-  keys: string[]
-) =>
-  keys.map((key) => {
-    const label = hass.localize(
-      `ui.panel.config.voice_assistants.debug.stages.${key}` as LocalizeKeys
-    );
-    return html`
+const renderData = (data: Record<string, any>, keys: Record<string, string>) =>
+  Object.entries(keys).map(
+    ([key, label]) => html`
       <div class="row">
         <div>${label}</div>
         <div>${data[key]}</div>
       </div>
-    `;
-  });
+    `
+  );
 
 const dataMinusKeysRender = (
-  hass: HomeAssistant,
   data: Record<string, any>,
-  keys: string[]
+  keys: Record<string, string>
 ) => {
   const result = {};
   let render = false;
   for (const key in data) {
-    if (keys.includes(key) || key === "done") {
+    if (key in keys || key === "done") {
       continue;
     }
     render = true;
@@ -120,9 +127,7 @@ const dataMinusKeysRender = (
   }
   return render
     ? html`<ha-expansion-panel>
-        <span slot="header"
-          >${hass.localize("ui.panel.config.voice_assistants.debug.raw")}</span
-        >
+        <span slot="header">Raw</span>
         <ha-yaml-editor readOnly autoUpdate .value=${result}></ha-yaml-editor>
       </ha-expansion-panel>`
     : "";
@@ -178,15 +183,11 @@ export class AssistPipelineDebug extends LitElement {
       <ha-card>
         <div class="card-content">
           <div class="row heading">
-            <div>
-              ${this.hass.localize(
-                "ui.panel.config.voice_assistants.debug.run"
-              )}
-            </div>
+            <div>Run</div>
             <div>${this.pipelineRun.stage}</div>
           </div>
 
-          ${renderData(this.hass, this.pipelineRun.run, RUN_DATA)}
+          ${renderData(this.pipelineRun.run, RUN_DATA)}
           ${messages.length > 0
             ? html`
                 <div class="messages">
@@ -208,39 +209,23 @@ export class AssistPipelineDebug extends LitElement {
             <ha-card>
               <div class="card-content">
                 <div class="row heading">
-                  <span
-                    >${this.hass.localize(
-                      "ui.panel.config.voice_assistants.debug.stages.wake_word"
-                    )}</span
-                  >
+                  <span>Wake word</span>
                   ${renderProgress(this.hass, this.pipelineRun, "wake_word")}
                 </div>
                 ${this.pipelineRun.wake_word
                   ? html`
                       <div class="card-content">
-                        ${renderData(
-                          this.hass,
-                          this.pipelineRun.wake_word,
-                          WAKE_WORD_DATA
-                        )}
+                        ${renderData(this.pipelineRun.wake_word, STT_DATA)}
                         ${this.pipelineRun.wake_word.wake_word_output
                           ? html`<div class="row">
-                                <div>
-                                  ${this.hass.localize(
-                                    "ui.panel.config.voice_assistants.debug.stages.model"
-                                  )}
-                                </div>
+                                <div>Model</div>
                                 <div>
                                   ${this.pipelineRun.wake_word.wake_word_output
                                     .ww_id}
                                 </div>
                               </div>
                               <div class="row">
-                                <div>
-                                  ${this.hass.localize(
-                                    "ui.panel.config.voice_assistants.debug.stages.timestamp"
-                                  )}
-                                </div>
+                                <div>Timestamp</div>
                                 <div>
                                   ${this.pipelineRun.wake_word.wake_word_output
                                     .timestamp}
@@ -248,7 +233,6 @@ export class AssistPipelineDebug extends LitElement {
                               </div>`
                           : ""}
                         ${dataMinusKeysRender(
-                          this.hass,
                           this.pipelineRun.wake_word,
                           WAKE_WORD_DATA
                         )}
@@ -265,11 +249,7 @@ export class AssistPipelineDebug extends LitElement {
             <ha-card>
               <div class="card-content">
                 <div class="row heading">
-                  <span
-                    >${this.hass.localize(
-                      "ui.panel.config.voice_assistants.debug.stages.speech_to_text"
-                    )}</span
-                  >
+                  <span>Speech-to-text</span>
                   ${renderProgress(
                     this.hass,
                     this.pipelineRun,
@@ -280,30 +260,18 @@ export class AssistPipelineDebug extends LitElement {
                 ${this.pipelineRun.stt
                   ? html`
                       <div class="card-content">
-                        ${renderData(this.hass, this.pipelineRun.stt, STT_DATA)}
+                        ${renderData(this.pipelineRun.stt, STT_DATA)}
                         <div class="row">
-                          <div>
-                            ${this.hass.localize(
-                              "ui.panel.config.voice_assistants.debug.stages.language"
-                            )}
-                          </div>
+                          <div>Language</div>
                           <div>${this.pipelineRun.stt.metadata.language}</div>
                         </div>
                         ${this.pipelineRun.stt.stt_output
                           ? html`<div class="row">
-                              <div>
-                                ${this.hass.localize(
-                                  "ui.panel.config.voice_assistants.debug.stages.output"
-                                )}
-                              </div>
+                              <div>Output</div>
                               <div>${this.pipelineRun.stt.stt_output.text}</div>
                             </div>`
                           : ""}
-                        ${dataMinusKeysRender(
-                          this.hass,
-                          this.pipelineRun.stt,
-                          STT_DATA
-                        )}
+                        ${dataMinusKeysRender(this.pipelineRun.stt, STT_DATA)}
                       </div>
                     `
                   : ""}
@@ -317,28 +285,16 @@ export class AssistPipelineDebug extends LitElement {
             <ha-card>
               <div class="card-content">
                 <div class="row heading">
-                  <span
-                    >${this.hass.localize(
-                      "ui.panel.config.voice_assistants.debug.stages.natural_language_processing"
-                    )}</span
-                  >
+                  <span>Natural Language Processing</span>
                   ${renderProgress(this.hass, this.pipelineRun, "intent")}
                 </div>
                 ${this.pipelineRun.intent
                   ? html`
                       <div class="card-content">
-                        ${renderData(
-                          this.hass,
-                          this.pipelineRun.intent,
-                          INTENT_DATA
-                        )}
+                        ${renderData(this.pipelineRun.intent, INTENT_DATA)}
                         ${this.pipelineRun.intent.intent_output
                           ? html`<div class="row">
-                                <div>
-                                  ${this.hass.localize(
-                                    "ui.panel.config.voice_assistants.debug.stages.response_type"
-                                  )}
-                                </div>
+                                <div>Response type</div>
                                 <div>
                                   ${this.pipelineRun.intent.intent_output
                                     .response.response_type}
@@ -347,11 +303,7 @@ export class AssistPipelineDebug extends LitElement {
                               ${this.pipelineRun.intent.intent_output.response
                                 .response_type === "error"
                                 ? html`<div class="row">
-                                    <div>
-                                      ${this.hass.localize(
-                                        "ui.panel.config.voice_assistants.debug.error.code"
-                                      )}
-                                    </div>
+                                    <div>Error code</div>
                                     <div>
                                       ${this.pipelineRun.intent.intent_output
                                         .response.data.code}
@@ -360,27 +312,18 @@ export class AssistPipelineDebug extends LitElement {
                                 : ""}`
                           : ""}
                         <div class="row">
-                          <div>
-                            ${this.hass.localize(
-                              "ui.panel.config.voice_assistants.debug.stages.prefer_local"
-                            )}
-                          </div>
+                          <div>Prefer handling locally</div>
                           <div>
                             ${this.pipelineRun.intent.prefer_local_intents}
                           </div>
                         </div>
                         <div class="row">
-                          <div>
-                            ${this.hass.localize(
-                              "ui.panel.config.voice_assistants.debug.stages.processed_locally"
-                            )}
-                          </div>
+                          <div>Processed locally</div>
                           <div>
                             ${this.pipelineRun.intent.processed_locally}
                           </div>
                         </div>
                         ${dataMinusKeysRender(
-                          this.hass,
                           this.pipelineRun.intent,
                           INTENT_DATA
                         )}
@@ -397,22 +340,14 @@ export class AssistPipelineDebug extends LitElement {
             <ha-card>
               <div class="card-content">
                 <div class="row heading">
-                  <span
-                    >${this.hass.localize(
-                      "ui.panel.config.voice_assistants.debug.stages.text_to_speech"
-                    )}</span
-                  >
+                  <span>Text-to-speech</span>
                   ${renderProgress(this.hass, this.pipelineRun, "tts")}
                 </div>
                 ${this.pipelineRun.tts
                   ? html`
                       <div class="card-content">
-                        ${renderData(this.hass, this.pipelineRun.tts, TTS_DATA)}
-                        ${dataMinusKeysRender(
-                          this.hass,
-                          this.pipelineRun.tts,
-                          TTS_DATA
-                        )}
+                        ${renderData(this.pipelineRun.tts, TTS_DATA)}
+                        ${dataMinusKeysRender(this.pipelineRun.tts, TTS_DATA)}
                       </div>
                     `
                   : ""}
@@ -426,13 +361,7 @@ export class AssistPipelineDebug extends LitElement {
                           ? this._stopTTS
                           : this._playTTS}
                       >
-                        ${this._isPlaying
-                          ? this.hass.localize(
-                              "ui.panel.config.voice_assistants.debug.stop_audio"
-                            )
-                          : this.hass.localize(
-                              "ui.panel.config.voice_assistants.debug.play_audio"
-                            )}
+                        ${this._isPlaying ? "Stop audio" : "Play audio"}
                       </ha-button>
                     </div>
                   `
@@ -443,11 +372,7 @@ export class AssistPipelineDebug extends LitElement {
       ${maybeRenderError(this.pipelineRun, "tts", lastRunStage)}
       <ha-card>
         <ha-expansion-panel>
-          <span slot="header"
-            >${this.hass.localize(
-              "ui.panel.config.voice_assistants.debug.raw"
-            )}</span
-          >
+          <span slot="header">Raw</span>
           <ha-yaml-editor
             read-only
             auto-update
@@ -466,14 +391,7 @@ export class AssistPipelineDebug extends LitElement {
     this._audioElement = new Audio(url);
 
     this._audioElement.addEventListener("error", () => {
-      showAlertDialog(this, {
-        title: this.hass.localize(
-          "ui.panel.config.voice_assistants.debug.error.title"
-        ),
-        text: this.hass.localize(
-          "ui.panel.config.voice_assistants.debug.error.playing_audio"
-        ),
-      });
+      showAlertDialog(this, { title: "Error", text: "Error playing audio" });
     });
 
     this._audioElement.addEventListener("play", () => {

src/panels/light/strategies/light-view-strategy.ts

@@ -61,24 +61,6 @@ const processAreasForLight = (
   return cards;
 };
 
-const processUnassignedLights = (
-  hass: HomeAssistant,
-  entities: string[]
-): LovelaceCardConfig[] => {
-  const unassignedFilter = generateEntityFilter(hass, {
-    area: null,
-  });
-  const unassignedLights = entities.filter(unassignedFilter);
-  const areaCards: LovelaceCardConfig[] = [];
-  const computeTileCard = computeAreaTileCardConfig(hass, "", false);
-
-  for (const entityId of unassignedLights) {
-    areaCards.push(computeTileCard(entityId));
-  }
-
-  return areaCards;
-};
-
 @customElement("light-view-strategy")
 export class LightViewStrategy extends ReactiveElement {
   static async generate(
@@ -154,30 +136,10 @@ export class LightViewStrategy extends ReactiveElement {
       }
     }
 
-    // Process unassigned lights
-    const unassignedCards = processUnassignedLights(hass, entities);
-    if (unassignedCards.length > 0) {
-      const section: LovelaceSectionRawConfig = {
-        type: "grid",
-        column_span: 2,
-        cards: [
-          {
-            type: "heading",
-            heading:
-              sections.length > 0
-                ? hass.localize("ui.panel.lovelace.strategy.light.other_lights")
-                : hass.localize("ui.panel.lovelace.strategy.light.lights"),
-          },
-          ...unassignedCards,
-        ],
-      };
-      sections.push(section);
-    }
-
     return {
       type: "sections",
       max_columns: 2,
-      sections: sections,
+      sections: sections || [],
     };
   }
 }

src/panels/lovelace/cards/energy/hui-energy-compare-card.ts

@@ -80,44 +80,41 @@ export class HuiEnergyCompareCard
 
     return html`
       <ha-alert dismissable @alert-dismissed-clicked=${this._stopCompare}>
-        ${this.hass.localize(
-          "ui.panel.lovelace.cards.energy.energy_compare.info",
-          {
-            start: html`<b
-              >${formatDate(
-                this._start!,
-                this.hass.locale,
-                this.hass.config
-              )}${dayDifference > 0
-                ? ` -
+        ${this.hass.localize("ui.panel.energy.compare.info", {
+          start: html`<b
+            >${formatDate(
+              this._start!,
+              this.hass.locale,
+              this.hass.config
+            )}${dayDifference > 0
+              ? ` -
           ${formatDate(
             this._end || endOfDay(new Date()),
             this.hass.locale,
             this.hass.config
           )}`
-                : ""}</b
-            >`,
-            end: html`<b
-                >${formatDate(
-                  this._startCompare,
-                  this.hass.locale,
-                  this.hass.config
-                )}${dayDifference > 0
-                  ? ` -
+              : ""}</b
+          >`,
+          end: html`<b
+              >${formatDate(
+                this._startCompare,
+                this.hass.locale,
+                this.hass.config
+              )}${dayDifference > 0
+                ? ` -
           ${formatDate(this._endCompare, this.hass.locale, this.hass.config)}`
-                  : ""}</b
-              >
-              <button class="link" @click=${this._changeCompareMode}>
-                (${this._compareMode === CompareMode.PREVIOUS
-                  ? this.hass.localize(
-                      "ui.panel.lovelace.cards.energy.energy_compare.compare_previous_year"
-                    )
-                  : this.hass.localize(
-                      "ui.panel.lovelace.cards.energy.energy_compare.compare_previous_period"
-                    )})
-              </button>`,
-          }
-        )}
+                : ""}</b
+            >
+            <button class="link" @click=${this._changeCompareMode}>
+              (${this._compareMode === CompareMode.PREVIOUS
+                ? this.hass.localize(
+                    "ui.panel.energy.compare.compare_previous_year"
+                  )
+                : this.hass.localize(
+                    "ui.panel.energy.compare.compare_previous_period"
+                  )})
+            </button>`,
+        })}
       </ha-alert>
     `;
   }

src/panels/lovelace/cards/energy/hui-energy-sankey-card.ts

@@ -419,15 +419,13 @@ class HuiEnergySankeyCard
     };
     deviceNodes.forEach((deviceNode) => {
       const entity = this.hass.states[deviceNode.id];
-      const { area, floor } = entity
-        ? getEntityContext(
-            entity,
-            this.hass.entities,
-            this.hass.devices,
-            this.hass.areas,
-            this.hass.floors
-          )
-        : { area: null, floor: null };
+      const { area, floor } = getEntityContext(
+        entity,
+        this.hass.entities,
+        this.hass.devices,
+        this.hass.areas,
+        this.hass.floors
+      );
       if (area) {
         if (area.area_id in areas) {
           areas[area.area_id].value += deviceNode.value;

src/panels/lovelace/cards/hui-calendar-card.ts

@@ -61,6 +61,8 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
 
   @state() private _calendars: Calendar[] = [];
 
+  @state() private _eventDisplay = "list-item";
+
   @state() private _narrow = false;
 
   @state() private _error?: string = undefined;
@@ -142,6 +144,7 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
           .hass=${this.hass}
           .views=${views}
           .initialView=${this._config.initial_view!}
+          .eventDisplay=${this._eventDisplay}
           .error=${this._error}
           @view-changed=${this._handleViewChanged}
         ></ha-full-calendar>
@@ -171,6 +174,8 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
   }
 
   private _handleViewChanged(ev: HASSDomEvent<CalendarViewChanged>): void {
+    this._eventDisplay =
+      ev.detail.view === "dayGridMonth" ? "list-item" : "auto";
     this._startDate = ev.detail.start;
     this._endDate = ev.detail.end;
     this._fetchCalendarEvents();

src/panels/lovelace/cards/hui-home-summary-card.ts

@@ -87,6 +87,11 @@ export class HuiHomeSummaryCard extends LitElement implements LovelaceCard {
     const allEntities = Object.keys(this.hass!.states);
 
     const areas = Object.values(this.hass.areas);
+    const areasFilter = generateEntityFilter(this.hass, {
+      area: areas.map((area) => area.area_id),
+    });
+
+    const entitiesInsideArea = allEntities.filter(areasFilter);
 
     switch (this._config.summary) {
       case "light": {
@@ -95,7 +100,7 @@ export class HuiHomeSummaryCard extends LitElement implements LovelaceCard {
           generateEntityFilter(this.hass!, filter)
         );
 
-        const lightEntities = findEntities(allEntities, lightsFilters);
+        const lightEntities = findEntities(entitiesInsideArea, lightsFilters);
 
         const onLights = lightEntities.filter((entityId) => {
           const s = this.hass!.states[entityId]?.state;
@@ -148,7 +153,7 @@ export class HuiHomeSummaryCard extends LitElement implements LovelaceCard {
           generateEntityFilter(this.hass!, filter)
         );
 
-        const safetyEntities = findEntities(allEntities, safetyFilters);
+        const safetyEntities = findEntities(entitiesInsideArea, safetyFilters);
 
         const locks = safetyEntities.filter((entityId) => {
           const domain = computeDomain(entityId);
@@ -199,7 +204,7 @@ export class HuiHomeSummaryCard extends LitElement implements LovelaceCard {
         );
 
         const mediaPlayerEntities = findEntities(
-          allEntities,
+          entitiesInsideArea,
           mediaPlayerFilters
         );
 

src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts

@@ -17,7 +17,6 @@ import type { HomeAssistant } from "../../../../types";
 import { showSaveSuccessToast } from "../../../../util/toast-saved-success";
 import "../../cards/hui-card";
 import "../../sections/hui-section";
-import { getViewType } from "../../views/get-view-type";
 import { addCards, addSection } from "../config-util";
 import type { LovelaceContainerPath } from "../lovelace-path";
 import { parseLovelaceContainerPath } from "../lovelace-path";
@@ -67,9 +66,7 @@ export class HuiDialogSuggestCard extends LitElement {
     const { viewIndex } = parseLovelaceContainerPath(this._params.path);
     const viewConfig = this._params!.lovelaceConfig.views[viewIndex];
 
-    return (
-      !isStrategyView(viewConfig) && getViewType(viewConfig) === "sections"
-    );
+    return !isStrategyView(viewConfig) && viewConfig.type === "sections";
   }
 
   private _renderPreview() {

src/panels/lovelace/header-footer/hui-graph-header-footer.ts

@@ -218,9 +218,6 @@ export class HuiGraphHeaderFooter
   }
 
   static styles = css`
-    :host {
-      display: block;
-    }
     ha-spinner {
       position: absolute;
       top: calc(50% - 14px);

src/panels/lovelace/hui-root.ts

@@ -322,7 +322,6 @@ class HUIRoot extends LitElement {
                 .path=${item.icon}
                 slot="trigger"
                 .label=${label}
-                hide-title
               ></ha-icon-button>
               ${item.subItems
                 .filter((subItem) => subItem.visible)
@@ -349,10 +348,8 @@ class HUIRoot extends LitElement {
               .id="button-${index}"
               .path=${item.icon}
               @click=${item.buttonAction}
+              .label=${label}
             ></ha-icon-button>
-            <ha-tooltip placement="bottom" .for="button-${index}">
-              ${label}
-            </ha-tooltip>
           `;
       result.push(button);
     });
@@ -391,11 +388,12 @@ class HUIRoot extends LitElement {
             slot="trigger"
             id="dashboardmenu"
             .path=${mdiDotsVertical}
-            .label=${this.hass!.localize("ui.panel.lovelace.editor.menu.open")}
-            hide-title
           ></ha-icon-button>
           ${listItems}
         </ha-button-menu>
+        <ha-tooltip placement="bottom" for="dashboardmenu">
+          ${this.hass!.localize("ui.panel.lovelace.editor.menu.open")}
+        </ha-tooltip>
       `);
     }
     return html`${result}`;

src/panels/lovelace/strategies/home/home-main-view-strategy.ts

@@ -1,11 +1,7 @@
 import { ReactiveElement } from "lit";
 import { customElement } from "lit/decorators";
 import { isComponentLoaded } from "../../../../common/config/is_component_loaded";
-import {
-  findEntities,
-  generateEntityFilter,
-} from "../../../../common/entity/entity_filter";
-import { floorDefaultIcon } from "../../../../components/ha-floor-icon";
+import { generateEntityFilter } from "../../../../common/entity/entity_filter";
 import type { AreaRegistryEntry } from "../../../../data/area_registry";
 import { getEnergyPreferences } from "../../../../data/energy";
 import type { LovelaceCardConfig } from "../../../../data/lovelace/config/card";
@@ -25,7 +21,7 @@ import type {
 import { getAreas, getFloors } from "../areas/helpers/areas-strategy-helper";
 import type { CommonControlSectionStrategyConfig } from "../usage_prediction/common-controls-section-strategy";
 import { getHomeStructure } from "./helpers/home-structure";
-import { HOME_SUMMARIES_FILTERS } from "./helpers/home-summaries";
+import { floorDefaultIcon } from "../../../../components/ha-floor-icon";
 
 export interface HomeMainViewStrategyConfig {
   type: "home-main";
@@ -148,33 +144,15 @@ export class HomeMainViewStrategy extends ReactiveElement {
       column_span: maxColumns,
     } as LovelaceStrategySectionConfig;
 
-    const allEntities = Object.keys(hass.states);
-
-    const mediaPlayerFilter = HOME_SUMMARIES_FILTERS.media_players.map(
-      (filter) => generateEntityFilter(hass, filter)
-    );
-
-    const lightsFilters = HOME_SUMMARIES_FILTERS.light.map((filter) =>
-      generateEntityFilter(hass, filter)
-    );
-
-    const climateFilters = HOME_SUMMARIES_FILTERS.climate.map((filter) =>
-      generateEntityFilter(hass, filter)
-    );
-
-    const safetyFilters = HOME_SUMMARIES_FILTERS.safety.map((filter) =>
-      generateEntityFilter(hass, filter)
-    );
-
-    const hasLights = findEntities(allEntities, lightsFilters).length > 0;
-    const hasMediaPlayers =
-      findEntities(allEntities, mediaPlayerFilter).length > 0;
-    const hasClimate = findEntities(allEntities, climateFilters).length > 0;
-    const hasSafety = findEntities(allEntities, safetyFilters).length > 0;
-
-    const summaryCards: LovelaceCardConfig[] = [
-      hasLights &&
-        ({
+    const summarySection: LovelaceSectionConfig = {
+      type: "grid",
+      column_span: maxColumns,
+      cards: [
+        {
+          type: "heading",
+          heading: hass.localize("ui.panel.lovelace.strategy.home.summaries"),
+        },
+        {
           type: "home-summary",
           summary: "light",
           vertical: true,
@@ -186,9 +164,8 @@ export class HomeMainViewStrategy extends ReactiveElement {
             rows: 2,
             columns: 4,
           },
-        } satisfies HomeSummaryCard),
-      hasClimate &&
-        ({
+        } satisfies HomeSummaryCard,
+        {
           type: "home-summary",
           summary: "climate",
           vertical: true,
@@ -200,9 +177,8 @@ export class HomeMainViewStrategy extends ReactiveElement {
             rows: 2,
             columns: 4,
           },
-        } satisfies HomeSummaryCard),
-      hasSafety &&
-        ({
+        } satisfies HomeSummaryCard,
+        {
           type: "home-summary",
           summary: "safety",
           vertical: true,
@@ -214,9 +190,8 @@ export class HomeMainViewStrategy extends ReactiveElement {
             rows: 2,
             columns: 4,
           },
-        } satisfies HomeSummaryCard),
-      hasMediaPlayers &&
-        ({
+        } satisfies HomeSummaryCard,
+        {
           type: "home-summary",
           summary: "media_players",
           vertical: true,
@@ -228,25 +203,10 @@ export class HomeMainViewStrategy extends ReactiveElement {
             rows: 2,
             columns: 4,
           },
-        } satisfies HomeSummaryCard),
-    ].filter(Boolean) as LovelaceCardConfig[];
-
-    const summarySection: LovelaceSectionConfig = {
-      type: "grid",
-      column_span: maxColumns,
-      cards: [],
+        } satisfies HomeSummaryCard,
+      ],
     };
 
-    if (summaryCards.length) {
-      summarySection.cards!.push(
-        {
-          type: "heading",
-          heading: hass.localize("ui.panel.lovelace.strategy.home.summaries"),
-        },
-        ...summaryCards
-      );
-    }
-
     const weatherFilter = generateEntityFilter(hass, {
       domain: "weather",
       entity_category: "none",
@@ -302,7 +262,7 @@ export class HomeMainViewStrategy extends ReactiveElement {
       [
         favoriteSection.cards && favoriteSection,
         commonControlsSection,
-        summarySection.cards && summarySection,
+        summarySection,
         ...floorsSections,
         widgetSection.cards && widgetSection,
       ] satisfies (LovelaceSectionRawConfig | undefined)[]

src/panels/lovelace/strategies/home/home-media-players-view-strategy.ts

@@ -59,26 +59,6 @@ const processAreasForMediaPlayers = (
   return cards;
 };
 
-const processUnassignedEntities = (
-  hass: HomeAssistant,
-  entities: string[]
-): LovelaceCardConfig[] => {
-  const unassignedFilter = generateEntityFilter(hass, {
-    area: null,
-  });
-  const unassignedEntities = entities.filter(unassignedFilter);
-  const areaCards: LovelaceCardConfig[] = [];
-
-  for (const entityId of unassignedEntities) {
-    areaCards.push({
-      type: "media-control",
-      entity: entityId,
-    } satisfies MediaControlCardConfig);
-  }
-
-  return areaCards;
-};
-
 @customElement("home-media-players-view-strategy")
 export class HomeMMediaPlayersViewStrategy extends ReactiveElement {
   static async generate(
@@ -154,35 +134,10 @@ export class HomeMMediaPlayersViewStrategy extends ReactiveElement {
       }
     }
 
-    // Process unassigned entities
-    const unassignedCards = processUnassignedEntities(hass, entities);
-
-    if (unassignedCards.length > 0) {
-      const section: LovelaceSectionRawConfig = {
-        type: "grid",
-        column_span: 2,
-        cards: [
-          {
-            type: "heading",
-            heading:
-              sections.length > 0
-                ? hass.localize(
-                    "ui.panel.lovelace.strategy.home_media_players.other_media_players"
-                  )
-                : hass.localize(
-                    "ui.panel.lovelace.strategy.home_media_players.media_players"
-                  ),
-          },
-          ...unassignedCards,
-        ],
-      };
-      sections.push(section);
-    }
-
     return {
       type: "sections",
       max_columns: 2,
-      sections: sections,
+      sections: sections || [],
     };
   }
 }

src/panels/safety/strategies/safety-view-strategy.ts

@@ -103,24 +103,6 @@ const processAreasForSafety = (
   return cards;
 };
 
-const processUnassignedEntities = (
-  hass: HomeAssistant,
-  entities: string[]
-): LovelaceCardConfig[] => {
-  const unassignedFilter = generateEntityFilter(hass, {
-    area: null,
-  });
-  const unassignedLights = entities.filter(unassignedFilter);
-  const areaCards: LovelaceCardConfig[] = [];
-  const computeTileCard = computeAreaTileCardConfig(hass, "", false);
-
-  for (const entityId of unassignedLights) {
-    areaCards.push(computeTileCard(entityId));
-  }
-
-  return areaCards;
-};
-
 @customElement("safety-view-strategy")
 export class SafetyViewStrategy extends ReactiveElement {
   static async generate(
@@ -196,33 +178,10 @@ export class SafetyViewStrategy extends ReactiveElement {
       }
     }
 
-    // Process unassigned entities
-    const unassignedCards = processUnassignedEntities(hass, entities);
-
-    if (unassignedCards.length > 0) {
-      const section: LovelaceSectionRawConfig = {
-        type: "grid",
-        column_span: 2,
-        cards: [
-          {
-            type: "heading",
-            heading:
-              sections.length > 0
-                ? hass.localize(
-                    "ui.panel.lovelace.strategy.safety.other_devices"
-                  )
-                : hass.localize("ui.panel.lovelace.strategy.safety.devices"),
-          },
-          ...unassignedCards,
-        ],
-      };
-      sections.push(section);
-    }
-
     return {
       type: "sections",
       max_columns: 2,
-      sections: sections,
+      sections: sections || [],
     };
   }
 }

src/state/quick-bar-mixin.ts

@@ -1,4 +1,5 @@
 import type { PropertyValues } from "lit";
+import { tinykeys } from "tinykeys";
 import memoizeOne from "memoize-one";
 import { isComponentLoaded } from "../common/config/is_component_loaded";
 import { mainWindow } from "../common/dom/get_main_window";
@@ -11,9 +12,9 @@ import type { Constructor, HomeAssistant } from "../types";
 import { storeState } from "../util/ha-pref-storage";
 import { showToast } from "../util/toast";
 import type { HassElement } from "./hass-element";
-import { ShortcutManager } from "../common/keyboard/shortcuts";
 import { extractSearchParamsObject } from "../common/url/search-params";
 import { showVoiceCommandDialog } from "../dialogs/voice-command-dialog/show-ha-voice-command-dialog";
+import { canOverrideAlphanumericInput } from "../common/dom/can-override-input";
 import { showShortcutsDialog } from "../dialogs/shortcuts/show-shortcuts-dialog";
 import type { Redirects } from "../panels/my/ha-panel-my";
 
@@ -61,22 +62,21 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
     }
 
     private _registerShortcut() {
-      const shortcutManager = new ShortcutManager();
-      shortcutManager.add({
+      tinykeys(window, {
         // Those are for latin keyboards that have e, c, m keys
-        e: { handler: (ev) => this._showQuickBar(ev) },
-        c: { handler: (ev) => this._showQuickBar(ev, QuickBarMode.Command) },
-        m: { handler: (ev) => this._createMyLink(ev) },
-        a: { handler: (ev) => this._showVoiceCommandDialog(ev) },
-        d: { handler: (ev) => this._showQuickBar(ev, QuickBarMode.Device) },
+        e: (ev) => this._showQuickBar(ev),
+        c: (ev) => this._showQuickBar(ev, QuickBarMode.Command),
+        m: (ev) => this._createMyLink(ev),
+        a: (ev) => this._showVoiceCommandDialog(ev),
+        d: (ev) => this._showQuickBar(ev, QuickBarMode.Device),
         // Workaround see https://github.com/jamiebuilds/tinykeys/issues/130
-        "Shift+?": { handler: (ev) => this._showShortcutDialog(ev) },
+        "Shift+?": (ev) => this._showShortcutDialog(ev),
         // Those are fallbacks for non-latin keyboards that don't have e, c, m keys (qwerty-based shortcuts)
-        KeyE: { handler: (ev) => this._showQuickBar(ev) },
-        KeyC: { handler: (ev) => this._showQuickBar(ev, QuickBarMode.Command) },
-        KeyM: { handler: (ev) => this._createMyLink(ev) },
-        KeyA: { handler: (ev) => this._showVoiceCommandDialog(ev) },
-        KeyD: { handler: (ev) => this._showQuickBar(ev, QuickBarMode.Device) },
+        KeyE: (ev) => this._showQuickBar(ev),
+        KeyC: (ev) => this._showQuickBar(ev, QuickBarMode.Command),
+        KeyM: (ev) => this._createMyLink(ev),
+        KeyA: (ev) => this._showVoiceCommandDialog(ev),
+        KeyD: (ev) => this._showQuickBar(ev, QuickBarMode.Device),
       });
     }
 
@@ -87,6 +87,7 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
     private _showVoiceCommandDialog(e: KeyboardEvent) {
       if (
         !this.hass?.enableShortcuts ||
+        !canOverrideAlphanumericInput(e.composedPath()) ||
         !this._conversation(this.hass.config.components)
       ) {
         return;
@@ -104,7 +105,7 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
       e: KeyboardEvent,
       mode: QuickBarMode = QuickBarMode.Entity
     ) {
-      if (!this._canShowQuickBar()) {
+      if (!this._canShowQuickBar(e)) {
         return;
       }
 
@@ -117,7 +118,7 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
     }
 
     private _showShortcutDialog(e: KeyboardEvent) {
-      if (!this._canShowQuickBar()) {
+      if (!this._canShowQuickBar(e)) {
         return;
       }
 
@@ -130,7 +131,10 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
     }
 
     private async _createMyLink(e: KeyboardEvent) {
-      if (!this.hass?.enableShortcuts) {
+      if (
+        !this.hass?.enableShortcuts ||
+        !canOverrideAlphanumericInput(e.composedPath())
+      ) {
         return;
       }
 
@@ -189,7 +193,11 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
       });
     }
 
-    private _canShowQuickBar() {
-      return this.hass?.user?.is_admin && this.hass.enableShortcuts;
+    private _canShowQuickBar(e: KeyboardEvent) {
+      return (
+        this.hass?.user?.is_admin &&
+        this.hass.enableShortcuts &&
+        canOverrideAlphanumericInput(e.composedPath())
+      );
     }
   };

src/translations/en.json

@@ -1706,14 +1706,6 @@
         "update": "[%key:ui::panel::config::devices::update%]",
         "unknown_error": "[%key:ui::panel::config::devices::unknown_error%]"
       },
-      "label-detail": {
-        "new_label": "New label",
-        "name": "Name",
-        "icon": "Icon",
-        "color": "Color",
-        "description": "Description",
-        "required_error_msg": "[%key:ui::panel::config::zone::detail::required_error_msg%]"
-      },
       "voice-settings": {
         "expose_header": "Expose",
         "aliases_header": "Aliases",
@@ -2414,7 +2406,18 @@
           "introduction": "Labels can help you organize your areas, devices, and entities. They can be used to filter in the UI, or use them as a target in automations.",
           "introduction2": "Go to the area, device, or entity you want to add a label to, and press the edit button to assign labels to them.",
           "confirm_remove_title": "Remove label?",
-          "confirm_remove": "Are you sure you want to remove label {label}? It will be removed from all areas, devices, and entities."
+          "confirm_remove": "Are you sure you want to remove label {label}? It will be removed from all areas, devices, and entities.",
+          "detail": {
+            "new_label": "New label",
+            "name": "Name",
+            "icon": "Icon",
+            "color": "Color",
+            "description": "Description",
+            "delete": "Delete",
+            "update": "Update",
+            "create": "Create",
+            "required_error_msg": "[%key:ui::panel::config::zone::detail::required_error_msg%]"
+          }
         },
         "areas": {
           "caption": "Areas",
@@ -3626,36 +3629,6 @@
             "older_run": "Older run",
             "newer_run": "Newer run",
             "start_debug_run": "Start debug run",
-            "error": {
-              "code": "Error code",
-              "fetch_events": "Failed to fetch events",
-              "fetch_runs": "Failed to fetch pipeline runs",
-              "playing_audio": "Error playing audio",
-              "showing_run": "Error showing run",
-              "title": "Error"
-            },
-            "no_events": "There were no events in this run.",
-            "play_audio": "Play audio",
-            "raw": "Raw",
-            "run": "Run",
-            "stages": {
-              "engine": "Engine",
-              "input": "Input",
-              "language": "Language",
-              "model": "Model",
-              "natural_language_processing": "Natural language processing",
-              "output": "Output",
-              "pipeline": "Pipeline",
-              "prefer_local": "Prefer handling locally",
-              "processed_locally": "Processed locally",
-              "response_type": "Response type",
-              "speech_to_text": "Speech-to-text",
-              "text_to_speech": "Text-to-speech",
-              "timestamp": "Timestamp",
-              "voice": "Voice",
-              "wake_word": "Wake word"
-            },
-            "stop_audio": "Stop audio",
             "pipeline": {
               "header": "Assist pipeline",
               "run_text_pipeline": "Run text pipeline",
@@ -6975,22 +6948,6 @@
           "common_controls": {
             "not_loaded": "Usage Prediction integration is not loaded.",
             "no_data": "This place will soon fill up with the entities you use most often, based on your activity."
-          },
-          "light": {
-            "lights": "Lights",
-            "other_lights": "Other lights"
-          },
-          "safety": {
-            "devices": "Devices",
-            "other_devices": "Other devices"
-          },
-          "climate": {
-            "devices": "Devices",
-            "other_devices": "Other devices"
-          },
-          "home_media_players": {
-            "media_players": "Media players",
-            "other_media_players": "Other media players"
           }
         },
         "cards": {
@@ -7131,11 +7088,6 @@
               "card_indicates_energy_used": "This card indicates how much of the electricity consumed by your home was generated using non-fossil fuels like solar, wind, and nuclear. The higher, the better!",
               "low_carbon_energy_consumed": "Low-carbon electricity consumed",
               "low_carbon_energy_not_calculated": "Consumed low-carbon electricity couldn't be calculated"
-            },
-            "energy_compare": {
-              "info": "You are comparing the period {start} with the period {end}",
-              "compare_previous_year": "Compare previous year",
-              "compare_previous_period": "Compare previous period"
             }
           },
           "heading": {
@@ -9384,6 +9336,11 @@
       "energy": {
         "download_data": "[%key:ui::panel::history::download_data%]",
         "configure": "[%key:ui::dialogs::quick-bar::commands::navigation::energy%]",
+        "compare": {
+          "info": "You are comparing the period {start} with the period {end}",
+          "compare_previous_year": "Compare previous year",
+          "compare_previous_period": "Compare previous period"
+        },
         "setup": {
           "next": "Next",
           "back": "Back",

test/common/entity/entity_filter.test.ts

@@ -388,70 +388,4 @@ describe("generateEntityFilter", () => {
       expect(filter("light.no_area")).toBe(false);
     });
   });
-
-  describe("null filtering", () => {
-    it("should filter entities with no area when null is used", () => {
-      const filter = generateEntityFilter(mockHass, { area: null });
-
-      expect(filter("light.no_area")).toBe(true);
-      expect(filter("light.living_room")).toBe(false);
-    });
-
-    it("should filter entities with specific area OR no area when null is in array", () => {
-      const filter = generateEntityFilter(mockHass, {
-        area: ["living_room", null],
-      });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("sensor.temperature")).toBe(true);
-      expect(filter("light.no_area")).toBe(true);
-      expect(filter("switch.kitchen")).toBe(false);
-    });
-
-    it("should filter entities with no floor when null is used", () => {
-      const filter = generateEntityFilter(mockHass, { floor: null });
-
-      expect(filter("light.no_area")).toBe(true);
-      expect(filter("light.living_room")).toBe(false);
-    });
-
-    it("should filter entities with specific floor OR no floor", () => {
-      const filter = generateEntityFilter(mockHass, {
-        floor: ["main_floor", null],
-      });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("switch.kitchen")).toBe(true);
-      expect(filter("light.no_area")).toBe(true);
-      expect(filter("light.bedroom")).toBe(false);
-    });
-
-    it("should filter entities with no device when null is used", () => {
-      const filter = generateEntityFilter(mockHass, { device: null });
-
-      expect(filter("light.living_room")).toBe(false);
-      expect(filter("light.no_area")).toBe(false);
-    });
-
-    it("should filter entities with specific device OR no device", () => {
-      const filter = generateEntityFilter(mockHass, {
-        device: ["device1", null],
-      });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("switch.kitchen")).toBe(false);
-    });
-
-    it("should combine null filtering with other criteria", () => {
-      const filter = generateEntityFilter(mockHass, {
-        domain: "light",
-        area: ["living_room", null],
-      });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("light.no_area")).toBe(true);
-      expect(filter("light.bedroom")).toBe(false);
-      expect(filter("sensor.temperature")).toBe(false);
-    });
-  });
 });

test/common/entity/get_states.test.ts

@@ -201,7 +201,6 @@ describe("getStates", () => {
           "pm1",
           "pm10",
           "pm25",
-          "pm4",
           "power_factor",
           "power",
           "pressure",
@@ -216,7 +215,7 @@ describe("getStates", () => {
           "volume_flow_rate",
         ])
       );
-      expect(result.length).toBe(35);
+      expect(result.length).toBe(34);
     });
 
     it("should return empty array for unknown attribute", () => {