Display label inside field for entity picker and area picker

.github/workflows/relative-ci.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Send bundle stats and build information to RelativeCI
-        uses: relative-ci/agent-action@feb19ddc698445db27401f1490f6ac182da0816f # v3.2.0
+        uses: relative-ci/agent-action@8504826a02078b05756e4c07e380023cc2c4274a # v3.1.0
         with:
           key: ${{ secrets[format('RELATIVE_CI_KEY_{0}_{1}', matrix.bundle, matrix.build)] }}
           token: ${{ github.token }}

.github/workflows/release.yaml

@@ -55,7 +55,7 @@ jobs:
           script/release
 
       - name: Upload release assets
-        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
         with:
           files: |
             dist/*.whl
@@ -108,7 +108,7 @@ jobs:
       - name: Tar folder
         run: tar -czf landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz -C landing-page/dist .
       - name: Upload release asset
-        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
         with:
           files: landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz
 
@@ -137,6 +137,6 @@ jobs:
       - name: Tar folder
         run: tar -czf hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz -C hassio/build .
       - name: Upload release asset
-        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
         with:
           files: hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz

build-scripts/bundle.cjs

@@ -18,16 +18,16 @@ module.exports.sourceMapURL = () => {
 module.exports.ignorePackages = () => [];
 
 // Files from NPM packages that we should replace with empty file
-module.exports.emptyPackages = ({ isHassioBuild, isLandingPageBuild }) =>
+module.exports.emptyPackages = ({ isHassioBuild }) =>
   [
     require.resolve("@vaadin/vaadin-material-styles/typography.js"),
     require.resolve("@vaadin/vaadin-material-styles/font-icons.js"),
     // Icons in supervisor conflict with icons in HA so we don't load.
-    (isHassioBuild || isLandingPageBuild) &&
+    isHassioBuild &&
       require.resolve(
         path.resolve(paths.root_dir, "src/components/ha-icon.ts")
       ),
-    (isHassioBuild || isLandingPageBuild) &&
+    isHassioBuild &&
       require.resolve(
         path.resolve(paths.root_dir, "src/components/ha-icon-picker.ts")
       ),
@@ -337,7 +337,6 @@ module.exports.config = {
       publicPath: publicPath(latestBuild),
       isProdBuild,
       latestBuild,
-      isLandingPageBuild: true,
     };
   },
 };

build-scripts/rspack.cjs

@@ -41,7 +41,6 @@ const createRspackConfig = ({
   isStatsBuild,
   isTestBuild,
   isHassioBuild,
-  isLandingPageBuild,
   dontHash,
 }) => {
   if (!dontHash) {
@@ -169,9 +168,7 @@ const createRspackConfig = ({
         },
       }),
       new rspack.NormalModuleReplacementPlugin(
-        new RegExp(
+        new RegExp(bundle.emptyPackages({ isHassioBuild }).join("|")),
-          bundle.emptyPackages({ isHassioBuild, isLandingPageBuild }).join("|")
-        ),
         path.resolve(paths.root_dir, "src/util/empty.js")
       ),
       !isProdBuild && new LogStartCompilePlugin(),

landing-page/src/ha-landing-page.ts

@@ -1,25 +1,22 @@
 import "@material/mwc-linear-progress";
-import { mdiOpenInNew } from "@mdi/js";
+import { type PropertyValues, css, html, nothing } from "lit";
-import { css, html, nothing, type PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { extractSearchParam } from "../../src/common/url/search-params";
 import "../../src/components/ha-alert";
-import "../../src/components/ha-button";
 import "../../src/components/ha-fade-in";
 import "../../src/components/ha-spinner";
-import "../../src/components/ha-svg-icon";
-import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
-import "../../src/onboarding/onboarding-welcome-links";
-import { onBoardingStyles } from "../../src/onboarding/styles";
 import { haStyle } from "../../src/resources/styles";
-import "./components/landing-page-logs";
+import "../../src/onboarding/onboarding-welcome-links";
 import "./components/landing-page-network";
+import "./components/landing-page-logs";
+import { extractSearchParam } from "../../src/common/url/search-params";
+import { onBoardingStyles } from "../../src/onboarding/styles";
+import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
+import { LandingPageBaseElement } from "./landing-page-base-element";
 import {
   getSupervisorNetworkInfo,
   pingSupervisor,
   type NetworkInfo,
 } from "./data/supervisor";
-import { LandingPageBaseElement } from "./landing-page-base-element";
 
 export const ASSUME_CORE_START_SECONDS = 60;
 const SCHEDULE_CORE_CHECK_SECONDS = 1;
@@ -97,21 +94,16 @@ class HaLandingPage extends LandingPageBaseElement {
         <ha-language-picker
           .value=${this.language}
           .label=${""}
-          button-style
           native-name
           @value-changed=${this._languageChanged}
           inline-arrow
         ></ha-language-picker>
-        <ha-button
+        <a
-          appearance="plain"
-          variant="neutral"
           href="https://www.home-assistant.io/getting-started/onboarding/"
           target="_blank"
           rel="noreferrer noopener"
+          >${this.localize("ui.panel.page-onboarding.help")}</a
         >
-          ${this.localize("ui.panel.page-onboarding.help")}
-          <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
-        </ha-button>
       </div>
     `;
   }
@@ -226,8 +218,26 @@ class HaLandingPage extends LandingPageBaseElement {
       ha-alert p {
         text-align: unset;
       }
-      .footer ha-svg-icon {
+      ha-language-picker {
-        --mdc-icon-size: var(--ha-space-5);
+        display: block;
+        width: 200px;
+        border-radius: var(--ha-border-radius-sm);
+        overflow: hidden;
+        --ha-select-height: 40px;
+        --mdc-select-fill-color: none;
+        --mdc-select-label-ink-color: var(--primary-text-color, #212121);
+        --mdc-select-ink-color: var(--primary-text-color, #212121);
+        --mdc-select-idle-line-color: transparent;
+        --mdc-select-hover-line-color: transparent;
+        --mdc-select-dropdown-icon-color: var(--primary-text-color, #212121);
+        --mdc-shape-small: 0;
+      }
+      a {
+        text-decoration: none;
+        color: var(--primary-text-color);
+        margin-right: 16px;
+        margin-inline-end: 16px;
+        margin-inline-start: initial;
       }
       ha-fade-in {
         min-height: calc(100vh - 64px - 88px);

package.json

@@ -52,7 +52,7 @@
     "@fullcalendar/list": "6.1.19",
     "@fullcalendar/luxon3": "6.1.19",
     "@fullcalendar/timegrid": "6.1.19",
-    "@home-assistant/webawesome": "3.0.0-beta.6.ha.7",
+    "@home-assistant/webawesome": "3.0.0-beta.6.ha.6",
     "@lezer/highlight": "1.2.3",
     "@lit-labs/motion": "1.0.9",
     "@lit-labs/observers": "2.0.6",
@@ -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",
@@ -122,7 +122,7 @@
     "lit": "3.3.1",
     "lit-html": "3.3.1",
     "luxon": "3.7.2",
-    "marked": "16.4.2",
+    "marked": "16.4.1",
     "memoize-one": "6.0.0",
     "node-vibrant": "4.0.3",
     "object-hash": "3.0.0",
@@ -152,13 +152,13 @@
     "@babel/helper-define-polyfill-provider": "0.6.5",
     "@babel/plugin-transform-runtime": "7.28.5",
     "@babel/preset-env": "7.28.5",
-    "@bundle-stats/plugin-webpack-filter": "4.21.6",
+    "@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",
+    "@octokit/rest": "22.0.0",
-    "@rsdoctor/rspack-plugin": "1.3.8",
+    "@rsdoctor/rspack-plugin": "1.3.7",
-    "@rspack/core": "1.6.1",
+    "@rspack/core": "1.6.0",
     "@rspack/dev-server": "1.1.4",
     "@types/babel__plugin-transform-runtime": "7.9.5",
     "@types/chromecast-caf-receiver": "6.0.22",
@@ -178,12 +178,12 @@
     "@types/tar": "6.1.13",
     "@types/ua-parser-js": "0.7.39",
     "@types/webspeechapi": "0.0.29",
-    "@vitest/coverage-v8": "4.0.7",
+    "@vitest/coverage-v8": "4.0.5",
     "babel-loader": "10.0.0",
     "babel-plugin-template-html-minifier": "4.1.0",
     "browserslist-useragent-regexp": "4.1.3",
     "del": "8.0.1",
-    "eslint": "9.39.1",
+    "eslint": "9.38.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-import-resolver-webpack": "0.13.10",
@@ -217,9 +217,9 @@
     "terser-webpack-plugin": "5.3.14",
     "ts-lit-plugin": "2.0.2",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.46.3",
+    "typescript-eslint": "8.46.2",
     "vite-tsconfig-paths": "5.1.4",
-    "vitest": "4.0.7",
+    "vitest": "4.0.5",
     "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/auth/ha-authorize.ts

@@ -1,5 +1,4 @@
 /* eslint-disable lit/prefer-static-styles */
-import { mdiOpenInNew } from "@mdi/js";
 import type { PropertyValues } from "lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -7,8 +6,6 @@ import punycode from "punycode";
 import { applyThemesOnElement } from "../common/dom/apply_themes_on_element";
 import { extractSearchParamsObject } from "../common/url/search-params";
 import "../components/ha-alert";
-import "../components/ha-button";
-import "../components/ha-svg-icon";
 import type { AuthProvider, AuthUrlSearchParams } from "../data/auth";
 import { fetchAuthProviders } from "../data/auth";
 import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
@@ -136,8 +133,25 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
           justify-content: space-between;
           align-items: center;
         }
-        .footer ha-svg-icon {
+        ha-language-picker {
-          --mdc-icon-size: var(--ha-space-5);
+          width: 200px;
+          border-radius: var(--ha-border-radius-sm);
+          overflow: hidden;
+          --ha-select-height: 40px;
+          --mdc-select-fill-color: none;
+          --mdc-select-label-ink-color: var(--primary-text-color, #212121);
+          --mdc-select-ink-color: var(--primary-text-color, #212121);
+          --mdc-select-idle-line-color: transparent;
+          --mdc-select-hover-line-color: transparent;
+          --mdc-select-dropdown-icon-color: var(--primary-text-color, #212121);
+          --mdc-shape-small: 0;
+        }
+        .footer a {
+          text-decoration: none;
+          color: var(--primary-text-color);
+          margin-right: 16px;
+          margin-inline-end: 16px;
+          margin-inline-start: initial;
         }
         h1 {
           font-size: var(--ha-font-size-3xl);
@@ -191,21 +205,16 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
         <ha-language-picker
           .value=${this.language}
           .label=${""}
-          button-style
           native-name
           @value-changed=${this._languageChanged}
           inline-arrow
         ></ha-language-picker>
-        <ha-button
+        <a
-          appearance="plain"
-          variant="neutral"
           href="https://www.home-assistant.io/docs/authentication/"
           target="_blank"
           rel="noreferrer noopener"
+          >${this.localize("ui.panel.page-authorize.help")}</a
         >
-          ${this.localize("ui.panel.page-authorize.help")}
-          <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
-        </ha-button>
       </div>
     `;
   }

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)[];
+  device?: string | string[];
-  area?: string | null | (string | null)[];
+  area?: string | string[];
-  floor?: string | null | (string | null)[];
+  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 floors = filter.floor ? new Set(ensureArray(filter.floor)) : undefined;
-  const areas = normalizeFilterArray(filter.area);
+  const areas = filter.area ? new Set(ensureArray(filter.area)) : undefined;
-  const devices = normalizeFilterArray(filter.device);
+  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 (!floor || !floors.has(floor.floor_id)) {
-      if (!floors.has(floorId)) {
         return false;
       }
     }
     if (areas) {
-      const areaId = area?.area_id ?? null;
+      if (!area) {
-      if (!areas.has(areaId)) {
+        return false;
+      }
+      if (!areas.has(area.area_id)) {
         return false;
       }
     }
     if (devices) {
-      const deviceId = device?.id ?? null;
+      if (!device) {
-      if (!devices.has(deviceId)) {
+        return false;
+      }
+      if (!devices.has(device.id)) {
         return false;
       }
     }

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

@@ -35,6 +35,7 @@ export const MIN_TIME_BETWEEN_UPDATES = 60 * 5 * 1000;
 const LEGEND_OVERFLOW_LIMIT = 10;
 const LEGEND_OVERFLOW_LIMIT_MOBILE = 6;
 const DOUBLE_TAP_TIME = 300;
+const RESIZE_ANIMATION_DURATION = 250;
 
 export type CustomLegendOption = ECOption["legend"] & {
   type: "custom";
@@ -90,8 +91,6 @@ export class HaChartBase extends LitElement {
 
   private _shouldResizeChart = false;
 
-  private _resizeAnimationDuration?: number;
-
   // @ts-ignore
   private _resizeController = new ResizeController(this, {
     callback: () => {
@@ -215,7 +214,6 @@ export class HaChartBase extends LitElement {
       ) {
         // custom legend changes may require a resize to layout properly
         this._shouldResizeChart = true;
-        this._resizeAnimationDuration = 250;
       }
     } else if (this._isTouchDevice && changedProps.has("_isZoomed")) {
       chartOptions.dataZoom = this._getDataZoomConfig();
@@ -627,10 +625,6 @@ export class HaChartBase extends LitElement {
   }
 
   private _createTheme(style: CSSStyleDeclaration) {
-    const textBorderColor =
-      style.getPropertyValue("--ha-card-background") ||
-      style.getPropertyValue("--card-background-color");
-    const textBorderWidth = 2;
     return {
       color: getAllGraphColors(style),
       backgroundColor: "transparent",
@@ -654,22 +648,15 @@ export class HaChartBase extends LitElement {
       graph: {
         label: {
           color: style.getPropertyValue("--primary-text-color"),
-          textBorderColor,
+          textBorderColor: style.getPropertyValue("--primary-background-color"),
-          textBorderWidth,
+          textBorderWidth: 2,
-        },
-      },
-      pie: {
-        label: {
-          color: style.getPropertyValue("--primary-text-color"),
-          textBorderColor,
-          textBorderWidth,
         },
       },
       sankey: {
         label: {
           color: style.getPropertyValue("--primary-text-color"),
-          textBorderColor,
+          textBorderColor: style.getPropertyValue("--primary-background-color"),
-          textBorderWidth,
+          textBorderWidth: 2,
         },
       },
       categoryAxis: {
@@ -983,14 +970,11 @@ export class HaChartBase extends LitElement {
   private _handleChartRenderFinished = () => {
     if (this._shouldResizeChart) {
       this.chart?.resize({
-        animation:
+        animation: this._reducedMotion
-          this._reducedMotion ||
+          ? undefined
-          typeof this._resizeAnimationDuration !== "number"
+          : { duration: RESIZE_ANIMATION_DURATION },
-            ? undefined
-            : { duration: this._resizeAnimationDuration },
       });
       this._shouldResizeChart = false;
-      this._resizeAnimationDuration = undefined;
     }
   };
 

src/components/chart/ha-network-graph.ts

@@ -2,10 +2,7 @@ import type { EChartsType } from "echarts/core";
 import type { GraphSeriesOption } from "echarts/charts";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state, query } from "lit/decorators";
-import type {
+import type { TopLevelFormatterParams } from "echarts/types/dist/shared";
-  CallbackDataParams,
-  TopLevelFormatterParams,
-} from "echarts/types/dist/shared";
 import { mdiFormatTextVariant, mdiGoogleCirclesGroup } from "@mdi/js";
 import memoizeOne from "memoize-one";
 import { listenMediaQuery } from "../../common/dom/media_query";
@@ -19,7 +16,6 @@ import { deepEqual } from "../../common/util/deep-equal";
 export interface NetworkNode {
   id: string;
   name?: string;
-  context?: string;
   category?: number;
   value?: number;
   symbolSize?: number;
@@ -192,25 +188,6 @@ export class HaNetworkGraph extends SubscribeMixin(LitElement) {
       label: {
         show: showLabels,
         position: "right",
-        formatter: (params: CallbackDataParams) => {
-          const node = params.data as NetworkNode;
-          if (node.context) {
-            return `{primary|${node.name ?? ""}}\n{secondary|${node.context}}`;
-          }
-          return node.name ?? "";
-        },
-        rich: {
-          primary: {
-            fontSize: 12,
-          },
-          secondary: {
-            fontSize: 12,
-            color: getComputedStyle(document.body).getPropertyValue(
-              "--secondary-text-color"
-            ),
-            lineHeight: 16,
-          },
-        },
       },
       emphasis: {
         focus: isMobile ? "none" : "adjacency",
@@ -248,7 +225,6 @@ export class HaNetworkGraph extends SubscribeMixin(LitElement) {
           ({
             id: node.id,
             name: node.name,
-            context: node.context,
             category: node.category,
             value: node.value,
             symbolSize: node.symbolSize || 30,

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-area-picker.ts

@@ -87,8 +87,6 @@ export class HaAreaPicker extends LitElement {
 
   @property({ type: Boolean }) public required = false;
 
-  @property({ attribute: "add-button-label" }) public addButtonLabel?: string;
-
   @query("ha-generic-picker") private _picker?: HaGenericPicker;
 
   public async open() {
@@ -359,7 +357,11 @@ export class HaAreaPicker extends LitElement {
 
   protected render(): TemplateResult {
     const placeholder =
-      this.placeholder ?? this.hass.localize("ui.components.area-picker.area");
+      this.placeholder ??
+      this.hass.localize("ui.components.area-picker.placeholder");
+    const notFoundLabel = this.hass.localize(
+      "ui.components.area-picker.no_match"
+    );
 
     const valueRenderer = this._computeValueRenderer(this.hass.areas);
 
@@ -369,15 +371,12 @@ export class HaAreaPicker extends LitElement {
         .autofocus=${this.autofocus}
         .label=${this.label}
         .helper=${this.helper}
-        .notFoundLabel=${this.hass.localize(
+        .notFoundLabel=${notFoundLabel}
-          "ui.components.area-picker.no_match"
-        )}
         .placeholder=${placeholder}
         .value=${this.value}
         .getItems=${this._getItems}
         .getAdditionalItems=${this._getAdditionalItems}
         .valueRenderer=${valueRenderer}
-        .addButtonLabel=${this.addButtonLabel}
         @value-changed=${this._valueChanged}
       >
       </ha-generic-picker>

src/components/ha-generic-picker.ts

@@ -3,13 +3,13 @@ import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
 import { mdiPlaylistPlus } from "@mdi/js";
 import { css, html, LitElement, nothing, type CSSResultGroup } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
 import { tinykeys } from "tinykeys";
 import { fireEvent } from "../common/dom/fire_event";
 import type { HomeAssistant } from "../types";
 import "./ha-bottom-sheet";
 import "./ha-button";
 import "./ha-combo-box-item";
+import "./ha-icon-button";
 import "./ha-input-helper-text";
 import "./ha-picker-combo-box";
 import type {
@@ -106,9 +106,6 @@ export class HaGenericPicker extends LitElement {
 
   protected render() {
     return html`
-      ${this.label
-        ? html`<label ?disabled=${this.disabled}>${this.label}</label>`
-        : nothing}
       <div class="container">
         <div id="picker">
           <slot name="field">
@@ -129,7 +126,7 @@ export class HaGenericPicker extends LitElement {
                   type="button"
                   class=${this._opened ? "opened" : ""}
                   compact
-                  aria-label=${ifDefined(this.label)}
+                  .label=${this.label}
                   @click=${this.open}
                   @clear=${this._clear}
                   .placeholder=${this.placeholder}

src/components/ha-language-picker.ts

@@ -1,7 +1,6 @@
-import { mdiMenuDown } from "@mdi/js";
 import type { PropertyValues } from "lit";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import { formatLanguageCode } from "../common/language/format_language";
@@ -9,10 +8,10 @@ import { caseInsensitiveStringCompare } from "../common/string/compare";
 import type { FrontendLocaleData } from "../data/translation";
 import { translationMetadata } from "../resources/translations-metadata";
 import type { HomeAssistant, ValueChangedEvent } from "../types";
-import "./ha-button";
 import "./ha-generic-picker";
-import type { HaGenericPicker } from "./ha-generic-picker";
+import "./ha-list-item";
 import type { PickerComboBoxItem } from "./ha-picker-combo-box";
+import "./ha-select";
 
 export const getLanguageOptions = (
   languages: string[],
@@ -76,9 +75,6 @@ export class HaLanguagePicker extends LitElement {
   @property({ attribute: "native-name", type: Boolean })
   public nativeName = false;
 
-  @property({ type: Boolean, attribute: "button-style" })
-  public buttonStyle = false;
-
   @property({ attribute: "no-sort", type: Boolean }) public noSort = false;
 
   @property({ attribute: "inline-arrow", type: Boolean })
@@ -86,8 +82,6 @@ export class HaLanguagePicker extends LitElement {
 
   @state() _defaultLanguages: string[] = [];
 
-  @query("ha-generic-picker", true) public genericPicker!: HaGenericPicker;
-
   protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
     this._computeDefaultLanguageOptions();
@@ -107,13 +101,12 @@ export class HaLanguagePicker extends LitElement {
       this.hass?.locale
     );
 
-  private _getLanguageName = (lang?: string) =>
+  private _valueRenderer = (value) => {
-    this._getItems().find((language) => language.id === lang)?.primary;
+    const language = this._getItems().find(
-
+      (lang) => lang.id === value
-  private _valueRenderer = (value) =>
+    )?.primary;
-    html`<span slot="headline"
+    return html`<span slot="headline">${language ?? value}</span> `;
-      >${this._getLanguageName(value) ?? value}</span
+  };
-    > `;
 
   protected render() {
     const value =
@@ -137,28 +130,10 @@ export class HaLanguagePicker extends LitElement {
         .getItems=${this._getItems}
         @value-changed=${this._changed}
         hide-clear-icon
-      >
+      ></ha-generic-picker>
-        ${this.buttonStyle
-          ? html`<ha-button
-              slot="field"
-              .disabled=${this.disabled}
-              @click=${this._openPicker}
-              appearance="plain"
-              variant="neutral"
-            >
-              ${this._getLanguageName(value)}
-              <ha-svg-icon slot="end" .path=${mdiMenuDown}></ha-svg-icon>
-            </ha-button>`
-          : nothing}
-      </ha-generic-picker>
     `;
   }
 
-  private _openPicker(ev: Event) {
-    ev.stopPropagation();
-    this.genericPicker.open();
-  }
-
   static styles = css`
     ha-generic-picker {
       width: 100%;

src/components/ha-picker-field.ts

@@ -8,6 +8,7 @@ import {
   type TemplateResult,
 } from "lit";
 import { customElement, property, query } from "lit/decorators";
+import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../common/dom/fire_event";
 import "./ha-combo-box-item";
 import type { HaComboBoxItem } from "./ha-combo-box-item";
@@ -33,6 +34,8 @@ export class HaPickerField extends LitElement {
 
   @property() public placeholder?: string;
 
+  @property() public label?: string;
+
   @property({ attribute: "hide-clear-icon", type: Boolean })
   public hideClearIcon = false;
 
@@ -51,15 +54,35 @@ export class HaPickerField extends LitElement {
       !!this.value && !this.required && !this.disabled && !this.hideClearIcon;
 
     return html`
-      <ha-combo-box-item .disabled=${this.disabled} type="button" compact>
+      <ha-combo-box-item
+        .disabled=${this.disabled}
+        type="button"
+        compact
+        aria-label=${ifDefined(this.label)}
+      >
         ${this.value
           ? this.valueRenderer
             ? this.valueRenderer(this.value)
-            : html`<slot name="headline">${this.value}</slot>`
+            : html`<span slot="headline">${this.value}</span>`
           : html`
-              <span slot="headline" class="placeholder">
+              ${this.label
-                ${this.placeholder}
+                ? html`
-              </span>
+                    <span
+                      slot="headline"
+                      class="label ${this.placeholder
+                        ? "with-placeholder"
+                        : ""}"
+                      >${this.label}</span
+                    >
+                  `
+                : nothing}
+              ${this.placeholder
+                ? html`
+                    <span slot="headline" class="placeholder">
+                      ${this.placeholder}
+                    </span>
+                  `
+                : nothing}
             `}
         ${showClearIcon
           ? html`
@@ -152,9 +175,24 @@ export class HaPickerField extends LitElement {
           width: 32px;
         }
 
+        .label {
+          padding: 0 8px;
+          color: var(--secondary-text-color);
+          line-height: var(--ha-line-height-normal);
+          font-size: var(--ha-font-size-m);
+          white-space: nowrap;
+        }
+
+        .label.with-placeholder {
+          line-height: var(--ha-line-height-condensed);
+          font-size: var(--ha-font-size-xs);
+        }
+
         .placeholder {
           color: var(--secondary-text-color);
           padding: 0 8px;
+          line-height: var(--ha-line-height-normal);
+          font-size: var(--ha-font-size-m);
         }
       `,
     ];

src/components/ha-sidebar.ts

@@ -157,8 +157,7 @@ export const computePanels = memoizeOne(
     Object.values(panels).forEach((panel) => {
       if (
         hiddenPanels.includes(panel.url_path) ||
-        (!panel.title && panel.url_path !== defaultPanel) ||
+        (!panel.title && panel.url_path !== defaultPanel)
-        (!panel.default_visible && !panelsOrder.includes(panel.url_path))
       ) {
         return;
       }

src/components/ha-target-picker.ts

@@ -87,208 +87,166 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
 
   protected render() {
     if (this.addOnTop) {
-      return html` ${this._renderPicker()} ${this._renderItems()} `;
+      return html` ${this._renderChips()} ${this._renderItems()} `;
     }
-    return html` ${this._renderItems()} ${this._renderPicker()} `;
+    return html` ${this._renderItems()} ${this._renderChips()} `;
   }
 
   private _renderValueChips() {
-    const entityIds = this.value?.entity_id
+    return html`<div class="mdc-chip-set items">
-      ? ensureArray(this.value.entity_id)
+      ${this.value?.floor_id
-      : [];
+        ? ensureArray(this.value.floor_id).map(
-    const deviceIds = this.value?.device_id
+            (floor_id) => html`
-      ? ensureArray(this.value.device_id)
+              <ha-target-picker-value-chip
-      : [];
+                .hass=${this.hass}
-    const areaIds = this.value?.area_id ? ensureArray(this.value.area_id) : [];
+                type="floor"
-    const floorIds = this.value?.floor_id
+                .itemId=${floor_id}
-      ? ensureArray(this.value.floor_id)
+                @remove-target-item=${this._handleRemove}
-      : [];
+                @expand-target-item=${this._handleExpand}
-    const labelIds = this.value?.label_id
+              ></ha-target-picker-value-chip>
-      ? ensureArray(this.value.label_id)
+            `
-      : [];
+          )
-
+        : nothing}
-    if (
+      ${this.value?.area_id
-      !entityIds.length &&
+        ? ensureArray(this.value.area_id).map(
-      !deviceIds.length &&
+            (area_id) => html`
-      !areaIds.length &&
+              <ha-target-picker-value-chip
-      !floorIds.length &&
+                .hass=${this.hass}
-      !labelIds.length
+                type="area"
-    ) {
+                .itemId=${area_id}
-      return nothing;
+                @remove-target-item=${this._handleRemove}
-    }
+                @expand-target-item=${this._handleExpand}
-
+              ></ha-target-picker-value-chip>
-    return html`
+            `
-      <div class="mdc-chip-set items">
+          )
-        ${floorIds.length
+        : nothing}
-          ? floorIds.map(
+      ${this.value?.device_id
-              (floor_id) => html`
+        ? ensureArray(this.value.device_id).map(
-                <ha-target-picker-value-chip
+            (device_id) => html`
-                  .hass=${this.hass}
+              <ha-target-picker-value-chip
-                  type="floor"
+                .hass=${this.hass}
-                  .itemId=${floor_id}
+                type="device"
-                  @remove-target-item=${this._handleRemove}
+                .itemId=${device_id}
-                  @expand-target-item=${this._handleExpand}
+                @remove-target-item=${this._handleRemove}
-                ></ha-target-picker-value-chip>
+                @expand-target-item=${this._handleExpand}
-              `
+              ></ha-target-picker-value-chip>
-            )
+            `
-          : nothing}
+          )
-        ${areaIds.length
+        : nothing}
-          ? areaIds.map(
+      ${this.value?.entity_id
-              (area_id) => html`
+        ? ensureArray(this.value.entity_id).map(
-                <ha-target-picker-value-chip
+            (entity_id) => html`
-                  .hass=${this.hass}
+              <ha-target-picker-value-chip
-                  type="area"
+                .hass=${this.hass}
-                  .itemId=${area_id}
+                type="entity"
-                  @remove-target-item=${this._handleRemove}
+                .itemId=${entity_id}
-                  @expand-target-item=${this._handleExpand}
+                @remove-target-item=${this._handleRemove}
-                ></ha-target-picker-value-chip>
+                @expand-target-item=${this._handleExpand}
-              `
+              ></ha-target-picker-value-chip>
-            )
+            `
-          : nothing}
+          )
-        ${deviceIds.length
+        : nothing}
-          ? deviceIds.map(
+      ${this.value?.label_id
-              (device_id) => html`
+        ? ensureArray(this.value.label_id).map(
-                <ha-target-picker-value-chip
+            (label_id) => html`
-                  .hass=${this.hass}
+              <ha-target-picker-value-chip
-                  type="device"
+                .hass=${this.hass}
-                  .itemId=${device_id}
+                type="label"
-                  @remove-target-item=${this._handleRemove}
+                .itemId=${label_id}
-                  @expand-target-item=${this._handleExpand}
+                @remove-target-item=${this._handleRemove}
-                ></ha-target-picker-value-chip>
+                @expand-target-item=${this._handleExpand}
-              `
+              ></ha-target-picker-value-chip>
-            )
+            `
-          : nothing}
+          )
-        ${entityIds.length
+        : nothing}
-          ? entityIds.map(
+    </div>`;
-              (entity_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="entity"
-                  .itemId=${entity_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-        ${labelIds.length
-          ? labelIds.map(
-              (label_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="label"
-                  .itemId=${label_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-      </div>
-    `;
   }
 
   private _renderValueGroups() {
-    const entityIds = this.value?.entity_id
+    return html`<div class="item-groups">
-      ? ensureArray(this.value.entity_id)
+      ${this.value?.entity_id
-      : [];
+        ? html`
-    const deviceIds = this.value?.device_id
+            <ha-target-picker-item-group
-      ? ensureArray(this.value.device_id)
+              @remove-target-item=${this._handleRemove}
-      : [];
+              type="entity"
-    const areaIds = this.value?.area_id ? ensureArray(this.value.area_id) : [];
+              .hass=${this.hass}
-    const floorIds = this.value?.floor_id
+              .items=${{ entity: ensureArray(this.value?.entity_id) }}
-      ? ensureArray(this.value.floor_id)
+              .deviceFilter=${this.deviceFilter}
-      : [];
+              .entityFilter=${this.entityFilter}
-    const labelIds = this.value?.label_id
+              .includeDomains=${this.includeDomains}
-      ? ensureArray(this.value?.label_id)
+              .includeDeviceClasses=${this.includeDeviceClasses}
-      : [];
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+      ${this.value?.device_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="device"
+              .hass=${this.hass}
+              .items=${{ device: ensureArray(this.value?.device_id) }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+      ${this.value?.floor_id || this.value?.area_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="area"
+              .hass=${this.hass}
+              .items=${{
+                floor: ensureArray(this.value?.floor_id),
+                area: ensureArray(this.value?.area_id),
+              }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+      ${this.value?.label_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="label"
+              .hass=${this.hass}
+              .items=${{ label: ensureArray(this.value?.label_id) }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+    </div>`;
+  }
 
+  private _renderItems() {
     if (
-      !entityIds.length &&
+      !this.value?.floor_id &&
-      !deviceIds.length &&
+      !this.value?.area_id &&
-      !areaIds.length &&
+      !this.value?.device_id &&
-      !floorIds.length &&
+      !this.value?.entity_id &&
-      !labelIds.length
+      !this.value?.label_id
     ) {
       return nothing;
     }
 
-    return html`
-      <div class="item-groups">
-        ${entityIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="entity"
-                .hass=${this.hass}
-                .items=${{ entity: entityIds }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-        ${deviceIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="device"
-                .hass=${this.hass}
-                .items=${{ device: deviceIds }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-        ${floorIds.length || areaIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="area"
-                .hass=${this.hass}
-                .items=${{
-                  floor: floorIds,
-                  area: areaIds,
-                }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-        ${labelIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="label"
-                .hass=${this.hass}
-                .items=${{ label: labelIds }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-      </div>
-    `;
-  }
-
-  private _renderItems() {
     return html`
       ${this.compact ? this._renderValueChips() : this._renderValueGroups()}
     `;
   }
 
-  private _renderPicker() {
+  private _renderChips() {
     return html`
       <div class="add-target-wrapper">
         <ha-button
@@ -389,8 +347,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
     this._pickerFilter = filter;
   };
 
-  private _hidePicker(ev) {
+  private _hidePicker() {
-    ev.stopPropagation();
     this._open = false;
     this._pickerWrapperOpen = false;
 

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/components/ha-wa-dialog.ts

@@ -1,4 +1,6 @@
-import { css, html, LitElement } from "lit";
+import "@home-assistant/webawesome/dist/components/dialog/dialog";
+import { mdiClose } from "@mdi/js";
+import { css, html, LitElement, nothing } from "lit";
 import {
   customElement,
   eventOptions,
@@ -6,9 +8,6 @@ import {
   query,
   state,
 } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
-import { mdiClose } from "@mdi/js";
-import "@home-assistant/webawesome/dist/components/dialog/dialog";
 import { fireEvent } from "../common/dom/fire_event";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
@@ -32,8 +31,6 @@ export type DialogWidth = "small" | "medium" | "large" | "full";
  *
  * @slot header - Replace the entire header area.
  * @slot headerNavigationIcon - Leading header action (e.g. close/back button).
- * @slot headerTitle - Custom title content (used when header-title is not set).
- * @slot headerSubtitle - Custom subtitle content (used when header-subtitle is not set).
  * @slot headerActionItems - Trailing header actions (e.g. buttons, menus).
  * @slot - Dialog content body.
  * @slot footer - Dialog footer content.
@@ -55,8 +52,8 @@ export type DialogWidth = "small" | "medium" | "large" | "full";
  * @attr {boolean} open - Controls the dialog open state.
  * @attr {("small"|"medium"|"large"|"full")} width - Preferred dialog width preset. Defaults to "medium".
  * @attr {boolean} prevent-scrim-close - Prevents closing the dialog by clicking the scrim/overlay. Defaults to false.
- * @attr {string} header-title - Header title text. If not set, the headerTitle slot is used.
+ * @attr {string} header-title - Header title text when no custom title slot is provided.
- * @attr {string} header-subtitle - Header subtitle text. If not set, the headerSubtitle slot is used.
+ * @attr {string} header-subtitle - Header subtitle text when no custom subtitle slot is provided.
  * @attr {("above"|"below")} header-subtitle-position - Position of the subtitle relative to the title. Defaults to "below".
  * @attr {boolean} flexcontent - Makes the dialog body a flex container for flexible layouts.
  *
@@ -75,12 +72,6 @@ export type DialogWidth = "small" | "medium" | "large" | "full";
 export class HaWaDialog extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: "aria-labelledby" })
-  public ariaLabelledBy?: string;
-
-  @property({ attribute: "aria-describedby" })
-  public ariaDescribedBy?: string;
-
   @property({ type: Boolean, reflect: true })
   public open = false;
 
@@ -90,11 +81,11 @@ export class HaWaDialog extends LitElement {
   @property({ type: Boolean, reflect: true, attribute: "prevent-scrim-close" })
   public preventScrimClose = false;
 
-  @property({ attribute: "header-title" })
+  @property({ type: String, attribute: "header-title" })
-  public headerTitle?: string;
+  public headerTitle = "";
 
-  @property({ attribute: "header-subtitle" })
+  @property({ type: String, attribute: "header-subtitle" })
-  public headerSubtitle?: string;
+  public headerSubtitle = "";
 
   @property({ type: String, attribute: "header-subtitle-position" })
   public headerSubtitlePosition: "above" | "below" = "below";
@@ -126,11 +117,6 @@ export class HaWaDialog extends LitElement {
         .open=${this._open}
         .lightDismiss=${!this.preventScrimClose}
         without-header
-        aria-labelledby=${ifDefined(
-          this.ariaLabelledBy ||
-            (this.headerTitle !== undefined ? "ha-wa-dialog-title" : undefined)
-        )}
-        aria-describedby=${ifDefined(this.ariaDescribedBy)}
         @wa-show=${this._handleShow}
         @wa-after-show=${this._handleAfterShow}
         @wa-after-hide=${this._handleAfterHide}
@@ -147,14 +133,14 @@ export class HaWaDialog extends LitElement {
                 .path=${mdiClose}
               ></ha-icon-button>
             </slot>
-            ${this.headerTitle !== undefined
+            ${this.headerTitle
-              ? html`<span slot="title" class="title" id="ha-wa-dialog-title">
+              ? html`<span slot="title" class="title">
                   ${this.headerTitle}
                 </span>`
-              : html`<slot name="headerTitle" slot="title"></slot>`}
+              : nothing}
-            ${this.headerSubtitle !== undefined
+            ${this.headerSubtitle
               ? html`<span slot="subtitle">${this.headerSubtitle}</span>`
-              : html`<slot name="headerSubtitle" slot="subtitle"></slot>`}
+              : nothing}
             <slot name="headerActionItems" slot="actionItems"></slot>
           </ha-dialog-header>
         </slot>

src/components/target-picker/ha-target-picker-item-row.ts

@@ -6,7 +6,6 @@ import {
   mdiLabel,
   mdiTextureBox,
 } from "@mdi/js";
-import type { HassEntity } from "home-assistant-js-websocket";
 import { css, html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -20,12 +19,9 @@ import { computeDomain } from "../../common/entity/compute_domain";
 import { computeEntityName } from "../../common/entity/compute_entity_name";
 import { getEntityContext } from "../../common/entity/context/get_entity_context";
 import { computeRTL } from "../../common/util/compute_rtl";
-import type { AreaRegistryEntry } from "../../data/area_registry";
 import { getConfigEntry } from "../../data/config_entries";
 import { labelsContext } from "../../data/context";
-import type { DeviceRegistryEntry } from "../../data/device_registry";
 import type { HaEntityPickerEntityFilterFunc } from "../../data/entity";
-import type { FloorRegistryEntry } from "../../data/floor_registry";
 import { domainToName } from "../../data/integration";
 import type { LabelRegistryEntry } from "../../data/label_registry";
 import {
@@ -115,10 +111,10 @@ export class HaTargetPickerItemRow extends LitElement {
   }
 
   protected render() {
-    const { name, context, iconPath, fallbackIconPath, stateObject, notFound } =
+    const { name, context, iconPath, fallbackIconPath, stateObject } =
       this._itemData(this.type, this.itemId);
 
-    const showEntities = this.type !== "entity" && !notFound;
+    const showEntities = this.type !== "entity";
 
     const entries = this.parentEntries || this._entries;
 
@@ -132,7 +128,7 @@ export class HaTargetPickerItemRow extends LitElement {
     }
 
     return html`
-      <ha-md-list-item type="text" class=${notFound ? "error" : ""}>
+      <ha-md-list-item type="text">
         <div class="icon" slot="start">
           ${this.subEntry
             ? html`
@@ -152,15 +148,11 @@ export class HaTargetPickerItemRow extends LitElement {
                 />`
               : fallbackIconPath
                 ? html`<ha-svg-icon .path=${fallbackIconPath}></ha-svg-icon>`
-                : this.type === "entity"
+                : stateObject
                   ? html`
                       <ha-state-icon
                         .hass=${this.hass}
-                        .stateObj=${stateObject ||
+                        .stateObj=${stateObject}
-                        ({
-                          entity_id: this.itemId,
-                          attributes: {},
-                        } as HassEntity)}
                       >
                       </ha-state-icon>
                     `
@@ -168,14 +160,8 @@ export class HaTargetPickerItemRow extends LitElement {
         </div>
 
         <div slot="headline">${name}</div>
-        ${notFound || (context && !this.hideContext)
+        ${context && !this.hideContext
-          ? html`<span slot="supporting-text"
+          ? html`<span slot="supporting-text">${context}</span>`
-              >${notFound
-                ? this.hass.localize(
-                    `ui.components.target-picker.${this.type}_not_found`
-                  )
-                : context}</span
-            >`
           : nothing}
         ${this._domainName && this.subEntry
           ? html`<span slot="supporting-text" class="domain"
@@ -488,28 +474,26 @@ export class HaTargetPickerItemRow extends LitElement {
 
   private _itemData = memoizeOne((type: TargetType, item: string) => {
     if (type === "floor") {
-      const floor: FloorRegistryEntry | undefined = this.hass.floors?.[item];
+      const floor = this.hass.floors?.[item];
       return {
         name: floor?.name || item,
         iconPath: floor?.icon,
         fallbackIconPath: floor ? floorDefaultIconPath(floor) : mdiHome,
-        notFound: !floor,
       };
     }
     if (type === "area") {
-      const area: AreaRegistryEntry | undefined = this.hass.areas?.[item];
+      const area = this.hass.areas?.[item];
       return {
         name: area?.name || item,
-        context: area?.floor_id && this.hass.floors?.[area.floor_id]?.name,
+        context: area.floor_id && this.hass.floors?.[area.floor_id]?.name,
         iconPath: area?.icon,
         fallbackIconPath: mdiTextureBox,
-        notFound: !area,
       };
     }
     if (type === "device") {
-      const device: DeviceRegistryEntry | undefined = this.hass.devices?.[item];
+      const device = this.hass.devices?.[item];
 
-      if (device?.primary_config_entry) {
+      if (device.primary_config_entry) {
         this._getDeviceDomain(device.primary_config_entry);
       }
 
@@ -517,25 +501,24 @@ export class HaTargetPickerItemRow extends LitElement {
         name: device ? computeDeviceNameDisplay(device, this.hass) : item,
         context: device?.area_id && this.hass.areas?.[device.area_id]?.name,
         fallbackIconPath: mdiDevices,
-        notFound: !device,
       };
     }
     if (type === "entity") {
       this._setDomainName(computeDomain(item));
 
-      const stateObject: HassEntity | undefined = this.hass.states[item];
+      const stateObject = this.hass.states[item];
-      const entityName = stateObject
+      const entityName = computeEntityName(
-        ? computeEntityName(stateObject, this.hass.entities, this.hass.devices)
+        stateObject,
-        : item;
+        this.hass.entities,
-      const { area, device } = stateObject
+        this.hass.devices
-        ? getEntityContext(
+      );
-            stateObject,
+      const { area, device } = getEntityContext(
-            this.hass.entities,
+        stateObject,
-            this.hass.devices,
+        this.hass.entities,
-            this.hass.areas,
+        this.hass.devices,
-            this.hass.floors
+        this.hass.areas,
-          )
+        this.hass.floors
-        : { area: undefined, device: undefined };
+      );
       const deviceName = device ? computeDeviceName(device) : undefined;
       const areaName = area ? computeAreaName(area) : undefined;
       const context = [areaName, entityName ? deviceName : undefined]
@@ -545,19 +528,15 @@ export class HaTargetPickerItemRow extends LitElement {
         name: entityName || deviceName || item,
         context,
         stateObject,
-        notFound: !stateObject && item !== "all",
       };
     }
 
     // type label
-    const label: LabelRegistryEntry | undefined = this._labelRegistry.find(
+    const label = this._labelRegistry.find((lab) => lab.label_id === item);
-      (lab) => lab.label_id === item
-    );
     return {
       name: label?.name || item,
       iconPath: label?.icon,
       fallbackIconPath: mdiLabel,
-      notFound: !label,
     };
   });
 
@@ -618,27 +597,17 @@ export class HaTargetPickerItemRow extends LitElement {
         border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
       }
 
-      .error {
-        background: var(--ha-color-fill-warning-quiet-resting);
-      }
-
-      .error [slot="supporting-text"] {
-        color: var(--ha-color-on-warning-normal);
-      }
-
       state-badge {
         color: var(--ha-color-on-neutral-quiet);
       }
 
       .icon {
-        width: 24px;
         display: flex;
       }
 
       img {
         width: 24px;
         height: 24px;
-        z-index: 1;
       }
       ha-icon-button {
         --mdc-icon-button-size: 32px;

src/components/target-picker/ha-target-picker-selector.ts

@@ -705,7 +705,7 @@ export class HaTargetPickerSelector extends LitElement {
           ) as EntityComboBoxItem[];
         }
 
-        if (!filterType && entities.length) {
+        if (!filterType) {
           // show group title
           items.push(
             this.hass.localize("ui.components.target-picker.type.entities")
@@ -733,7 +733,7 @@ export class HaTargetPickerSelector extends LitElement {
           devices = this._filterGroup("device", devices);
         }
 
-        if (!filterType && devices.length) {
+        if (!filterType) {
           // show group title
           items.push(
             this.hass.localize("ui.components.target-picker.type.devices")
@@ -769,7 +769,7 @@ export class HaTargetPickerSelector extends LitElement {
           ) as FloorComboBoxItem[];
         }
 
-        if (!filterType && areasAndFloors.length) {
+        if (!filterType) {
           // show group title
           items.push(
             this.hass.localize("ui.components.target-picker.type.areas")
@@ -811,7 +811,7 @@ export class HaTargetPickerSelector extends LitElement {
           labels = this._filterGroup("label", labels);
         }
 
-        if (!filterType && labels.length) {
+        if (!filterType) {
           // show group title
           items.push(
             this.hass.localize("ui.components.target-picker.type.labels")

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) =>
+export const getErrorLogDownloadUrl = "/api/error_log";
-  isComponentLoaded(hass, "hassio") &&
-  atLeastVersion(hass.config.version, 2025, 10)
-    ? "/api/hassio/core/logs/latest"
-    : "/api/error_log";

src/data/icons.ts

@@ -12,7 +12,6 @@ import {
   mdiChatSleep,
   mdiClipboardList,
   mdiClock,
-  mdiCodeBraces,
   mdiCog,
   mdiCommentAlert,
   mdiCounter,
@@ -114,7 +113,6 @@ export const FALLBACK_DOMAIN_ICONS = {
   text: mdiFormTextbox,
   time: mdiClock,
   timer: mdiTimerOutline,
-  template: mdiCodeBraces,
   todo: mdiClipboardList,
   tts: mdiSpeakerMessage,
   vacuum: mdiRobotVacuum,

src/data/script.ts

@@ -222,7 +222,6 @@ export interface StopAction extends BaseAction {
 
 export interface SequenceAction extends BaseAction {
   sequence: (ManualScriptConfig | Action)[];
-  metadata?: {};
 }
 
 export interface ParallelAction extends BaseAction {
@@ -480,7 +479,6 @@ export const migrateAutomationAction = (
   }
 
   if (typeof action === "object" && action !== null && "sequence" in action) {
-    delete (action as SequenceAction).metadata;
     for (const sequenceAction of (action as SequenceAction).sequence) {
       migrateAutomationAction(sequenceAction);
     }

src/dialogs/more-info/ha-more-info-add-to.ts

@@ -1,152 +0,0 @@
-import { LitElement, css, html, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import "../../components/ha-alert";
-import "../../components/ha-icon";
-import "../../components/ha-list-item";
-import "../../components/ha-spinner";
-import type {
-  ExternalEntityAddToActions,
-  ExternalEntityAddToAction,
-} from "../../external_app/external_messaging";
-import { showToast } from "../../util/toast";
-
-import type { HomeAssistant } from "../../types";
-
-@customElement("ha-more-info-add-to")
-export class HaMoreInfoAddTo extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public entityId!: string;
-
-  @state() private _externalActions?: ExternalEntityAddToActions = {
-    actions: [],
-  };
-
-  @state() private _loading = true;
-
-  private async _loadExternalActions() {
-    if (this.hass.auth.external?.config.hasEntityAddTo) {
-      this._externalActions =
-        await this.hass.auth.external?.sendMessage<"entity/add_to/get_actions">(
-          {
-            type: "entity/add_to/get_actions",
-            payload: { entity_id: this.entityId },
-          }
-        );
-    }
-  }
-
-  private async _actionSelected(ev: CustomEvent) {
-    const action = (ev.currentTarget as any)
-      .action as ExternalEntityAddToAction;
-    if (!action.enabled) {
-      return;
-    }
-
-    try {
-      await this.hass.auth.external!.fireMessage({
-        type: "entity/add_to",
-        payload: {
-          entity_id: this.entityId,
-          app_payload: action.app_payload,
-        },
-      });
-    } catch (err: any) {
-      showToast(this, {
-        message: this.hass.localize(
-          "ui.dialogs.more_info_control.add_to.action_failed",
-          {
-            error: err.message || err,
-          }
-        ),
-      });
-    }
-  }
-
-  protected async firstUpdated() {
-    await this._loadExternalActions();
-    this._loading = false;
-  }
-
-  protected render() {
-    if (this._loading) {
-      return html`
-        <div class="loading">
-          <ha-spinner></ha-spinner>
-        </div>
-      `;
-    }
-
-    if (!this._externalActions?.actions.length) {
-      return html`
-        <ha-alert alert-type="info">
-          ${this.hass.localize(
-            "ui.dialogs.more_info_control.add_to.no_actions"
-          )}
-        </ha-alert>
-      `;
-    }
-
-    return html`
-      <div class="actions-list">
-        ${this._externalActions.actions.map(
-          (action) => html`
-            <ha-list-item
-              graphic="icon"
-              .disabled=${!action.enabled}
-              .action=${action}
-              .twoline=${!!action.details}
-              @click=${this._actionSelected}
-            >
-              <span>${action.name}</span>
-              ${action.details
-                ? html`<span slot="secondary">${action.details}</span>`
-                : nothing}
-              <ha-icon slot="graphic" .icon=${action.mdi_icon}></ha-icon>
-            </ha-list-item>
-          `
-        )}
-      </div>
-    `;
-  }
-
-  static styles = css`
-    :host {
-      display: block;
-      padding: var(--ha-space-2) var(--ha-space-6) var(--ha-space-6)
-        var(--ha-space-6);
-    }
-
-    .loading {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      padding: var(--ha-space-8);
-    }
-
-    .actions-list {
-      display: flex;
-      flex-direction: column;
-    }
-
-    ha-list-item {
-      cursor: pointer;
-    }
-
-    ha-list-item[disabled] {
-      cursor: not-allowed;
-      opacity: 0.5;
-    }
-
-    ha-icon {
-      display: flex;
-      align-items: center;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-more-info-add-to": HaMoreInfoAddTo;
-  }
-}

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

@@ -8,7 +8,6 @@ import {
   mdiPencil,
   mdiPencilOff,
   mdiPencilOutline,
-  mdiPlusBoxMultipleOutline,
   mdiTransitConnectionVariant,
 } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
@@ -61,7 +60,6 @@ import {
   computeShowLogBookComponent,
 } from "./const";
 import "./controls/more-info-default";
-import "./ha-more-info-add-to";
 import "./ha-more-info-history-and-logbook";
 import "./ha-more-info-info";
 import "./ha-more-info-settings";
@@ -75,7 +73,7 @@ export interface MoreInfoDialogParams {
   data?: Record<string, any>;
 }
 
-type View = "info" | "history" | "settings" | "related" | "add_to";
+type View = "info" | "history" | "settings" | "related";
 
 interface ChildView {
   viewTag: string;
@@ -196,10 +194,6 @@ export class MoreInfoDialog extends LitElement {
     );
   }
 
-  private _shouldShowAddEntityTo(): boolean {
-    return !!this.hass.auth.external?.config.hasEntityAddTo;
-  }
-
   private _getDeviceId(): string | null {
     const entity = this.hass.entities[this._entityId!] as
       | EntityRegistryEntry
@@ -301,11 +295,6 @@ export class MoreInfoDialog extends LitElement {
     this._setView("related");
   }
 
-  private _goToAddEntityTo(ev) {
-    if (!shouldHandleRequestSelectedEvent(ev)) return;
-    this._setView("add_to");
-  }
-
   private _breadcrumbClick(ev: Event) {
     ev.stopPropagation();
     this._setView("related");
@@ -532,22 +521,6 @@ export class MoreInfoDialog extends LitElement {
                             .path=${mdiInformationOutline}
                           ></ha-svg-icon>
                         </ha-list-item>
-                        ${this._shouldShowAddEntityTo()
-                          ? html`
-                              <ha-list-item
-                                graphic="icon"
-                                @request-selected=${this._goToAddEntityTo}
-                              >
-                                ${this.hass.localize(
-                                  "ui.dialogs.more_info_control.add_entity_to"
-                                )}
-                                <ha-svg-icon
-                                  slot="graphic"
-                                  .path=${mdiPlusBoxMultipleOutline}
-                                ></ha-svg-icon>
-                              </ha-list-item>
-                            `
-                          : nothing}
                       </ha-button-menu>
                     `
                   : nothing}
@@ -640,14 +613,7 @@ export class MoreInfoDialog extends LitElement {
                                   : "entity"}
                               ></ha-related-items>
                             `
-                          : this._currView === "add_to"
+                          : nothing
-                            ? html`
-                                <ha-more-info-add-to
-                                  .hass=${this.hass}
-                                  .entityId=${entityId}
-                                ></ha-more-info-add-to>
-                              `
-                            : nothing
               )}
             </div>
           `

src/dialogs/sidebar/dialog-edit-sidebar.ts

@@ -102,17 +102,6 @@ class DialogEditSidebar extends LitElement {
       this.hass.locale
     );
 
-    // Add default hidden panels that are missing in hidden
-    for (const panel of panels) {
-      if (
-        !panel.default_visible &&
-        !this._order.includes(panel.url_path) &&
-        !this._hidden.includes(panel.url_path)
-      ) {
-        this._hidden.push(panel.url_path);
-      }
-    }
-
     const items = [
       ...beforeSpacer,
       ...panels.filter((panel) => this._hidden!.includes(panel.url_path)),

src/external_app/external_messaging.ts

@@ -36,13 +36,6 @@ interface EMOutgoingMessageConfigGet extends EMMessage {
   type: "config/get";
 }
 
-interface EMOutgoingMessageEntityAddToGetActions extends EMMessage {
-  type: "entity/add_to/get_actions";
-  payload: {
-    entity_id: string;
-  };
-}
-
 interface EMOutgoingMessageBarCodeScan extends EMMessage {
   type: "bar_code/scan";
   payload: {
@@ -82,10 +75,6 @@ interface EMOutgoingMessageWithAnswer {
     request: EMOutgoingMessageConfigGet;
     response: ExternalConfig;
   };
-  "entity/add_to/get_actions": {
-    request: EMOutgoingMessageEntityAddToGetActions;
-    response: ExternalEntityAddToActions;
-  };
 }
 
 interface EMOutgoingMessageExoplayerPlayHLS extends EMMessage {
@@ -168,14 +157,6 @@ interface EMOutgoingMessageThreadStoreInPlatformKeychain extends EMMessage {
   };
 }
 
-interface EMOutgoingMessageAddEntityTo extends EMMessage {
-  type: "entity/add_to";
-  payload: {
-    entity_id: string;
-    app_payload: string; // Opaque string received from get_actions
-  };
-}
-
 type EMOutgoingMessageWithoutAnswer =
   | EMMessageResultError
   | EMMessageResultSuccess
@@ -196,8 +177,7 @@ type EMOutgoingMessageWithoutAnswer =
   | EMOutgoingMessageThemeUpdate
   | EMOutgoingMessageThreadStoreInPlatformKeychain
   | EMOutgoingMessageImprovScan
-  | EMOutgoingMessageImprovConfigureDevice
+  | EMOutgoingMessageImprovConfigureDevice;
-  | EMOutgoingMessageAddEntityTo;
 
 export interface EMIncomingMessageRestart {
   id: number;
@@ -313,31 +293,18 @@ type EMIncomingMessage =
 type EMIncomingMessageHandler = (msg: EMIncomingMessageCommands) => boolean;
 
 export interface ExternalConfig {
-  hasSettingsScreen?: boolean;
+  hasSettingsScreen: boolean;
-  hasSidebar?: boolean;
+  hasSidebar: boolean;
-  canWriteTag?: boolean;
+  canWriteTag: boolean;
-  hasExoPlayer?: boolean;
+  hasExoPlayer: boolean;
-  canCommissionMatter?: boolean;
+  canCommissionMatter: boolean;
-  canImportThreadCredentials?: boolean;
+  canImportThreadCredentials: boolean;
-  canTransferThreadCredentialsToKeychain?: boolean;
+  canTransferThreadCredentialsToKeychain: boolean;
-  hasAssist?: boolean;
+  hasAssist: boolean;
-  hasBarCodeScanner?: number;
+  hasBarCodeScanner: number;
-  canSetupImprov?: boolean;
+  canSetupImprov: boolean;
-  downloadFileSupported?: boolean;
+  downloadFileSupported: boolean;
-  appVersion?: string;
+  appVersion: string;
-  hasEntityAddTo?: boolean; // Supports "Add to" from more-info dialog, with action coming from external app
-}
-
-export interface ExternalEntityAddToAction {
-  enabled: boolean;
-  name: string; // Translated name of the action to be displayed in the UI
-  details?: string; // Optional translated details of the action to be displayed in the UI
-  mdi_icon: string; // MDI icon name to be displayed in the UI (e.g., "mdi:car")
-  app_payload: string; // Opaque string to be sent back when the action is selected
-}
-
-export interface ExternalEntityAddToActions {
-  actions: ExternalEntityAddToAction[];
 }
 
 export class ExternalMessaging {

src/layouts/partial-panel-resolver.ts

@@ -33,7 +33,7 @@ const COMPONENTS = {
   "media-browser": () =>
     import("../panels/media-browser/ha-panel-media-browser"),
   light: () => import("../panels/light/ha-panel-light"),
-  security: () => import("../panels/security/ha-panel-security"),
+  safety: () => import("../panels/safety/ha-panel-safety"),
   climate: () => import("../panels/climate/ha-panel-climate"),
 };
 

src/mixins/conditional-listener-mixin.ts

@@ -1,104 +0,0 @@
-import type { ReactiveElement } from "lit";
-import { listenMediaQuery } from "../common/dom/media_query";
-import type { HomeAssistant } from "../types";
-import type { Condition } from "../panels/lovelace/common/validate-condition";
-import { checkConditionsMet } from "../panels/lovelace/common/validate-condition";
-
-type Constructor<T> = abstract new (...args: any[]) => T;
-
-/**
- * Extract media queries from conditions recursively
- */
-export function extractMediaQueries(conditions: Condition[]): string[] {
-  return conditions.reduce<string[]>((array, c) => {
-    if ("conditions" in c && c.conditions) {
-      array.push(...extractMediaQueries(c.conditions));
-    }
-    if (c.condition === "screen" && c.media_query) {
-      array.push(c.media_query);
-    }
-    return array;
-  }, []);
-}
-
-/**
- * Helper to setup media query listeners for conditional visibility
- */
-export function setupMediaQueryListeners(
-  conditions: Condition[],
-  hass: HomeAssistant,
-  addListener: (unsub: () => void) => void,
-  onUpdate: (conditionsMet: boolean) => void
-): void {
-  const mediaQueries = extractMediaQueries(conditions);
-
-  if (mediaQueries.length === 0) return;
-
-  // Optimization for single media query
-  const hasOnlyMediaQuery =
-    conditions.length === 1 &&
-    conditions[0].condition === "screen" &&
-    !!conditions[0].media_query;
-
-  mediaQueries.forEach((mediaQuery) => {
-    const unsub = listenMediaQuery(mediaQuery, (matches) => {
-      if (hasOnlyMediaQuery) {
-        onUpdate(matches);
-      } else {
-        const conditionsMet = checkConditionsMet(conditions, hass);
-        onUpdate(conditionsMet);
-      }
-    });
-    addListener(unsub);
-  });
-}
-
-/**
- * Mixin to handle conditional listeners for visibility control
- *
- * Provides lifecycle management for listeners (media queries, time-based, state changes, etc.)
- * that control conditional visibility of components.
- *
- * Usage:
- * 1. Extend your component with ConditionalListenerMixin(ReactiveElement)
- * 2. Override setupConditionalListeners() to setup your listeners
- * 3. Use addConditionalListener() to register unsubscribe functions
- * 4. Call clearConditionalListeners() and setupConditionalListeners() when config changes
- *
- * The mixin automatically:
- * - Sets up listeners when component connects to DOM
- * - Cleans up listeners when component disconnects from DOM
- */
-export const ConditionalListenerMixin = <
-  T extends Constructor<ReactiveElement>,
->(
-  superClass: T
-) => {
-  abstract class ConditionalListenerClass extends superClass {
-    private __listeners: (() => void)[] = [];
-
-    public connectedCallback() {
-      super.connectedCallback();
-      this.setupConditionalListeners();
-    }
-
-    public disconnectedCallback() {
-      super.disconnectedCallback();
-      this.clearConditionalListeners();
-    }
-
-    protected clearConditionalListeners(): void {
-      this.__listeners.forEach((unsub) => unsub());
-      this.__listeners = [];
-    }
-
-    protected addConditionalListener(unsubscribe: () => void): void {
-      this.__listeners.push(unsubscribe);
-    }
-
-    protected setupConditionalListeners(): void {
-      // Override in subclass
-    }
-  }
-  return ConditionalListenerClass;
-};

src/panels/climate/ha-panel-climate.ts

@@ -1,23 +1,24 @@
-import type { CSSResultGroup, PropertyValues } from "lit";
+import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
-import { LitElement, css, html, nothing } from "lit";
+import { LitElement, css, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { goBack } from "../../common/navigate";
-import { debounce } from "../../common/util/debounce";
-import { deepEqual } from "../../common/util/deep-equal";
 import "../../components/ha-icon-button-arrow-prev";
 import "../../components/ha-menu-button";
-import type { LovelaceStrategyViewConfig } from "../../data/lovelace/config/view";
+import type { LovelaceConfig } from "../../data/lovelace/config/types";
 import { haStyle } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
-import { generateLovelaceViewStrategy } from "../lovelace/strategies/get-strategy";
 import type { Lovelace } from "../lovelace/types";
 import "../lovelace/views/hui-view";
 import "../lovelace/views/hui-view-container";
 
-const CLIMATE_LOVELACE_VIEW_CONFIG: LovelaceStrategyViewConfig = {
+const CLIMATE_LOVELACE_CONFIG: LovelaceConfig = {
-  strategy: {
+  views: [
-    type: "climate",
+    {
-  },
+      strategy: {
+        type: "climate",
+      },
+    },
+  ],
 };
 
 @customElement("ha-panel-climate")
@@ -32,119 +33,65 @@ class PanelClimate extends LitElement {
 
   @state() private _searchParms = new URLSearchParams(window.location.search);
 
+  public firstUpdated(_changedProperties: PropertyValues): void {
+    super.firstUpdated(_changedProperties);
+  }
+
   public willUpdate(changedProps: PropertyValues) {
-    super.willUpdate(changedProps);
-    // Initial setup
     if (!this.hasUpdated) {
       this.hass.loadFragmentTranslation("lovelace");
-      this._setLovelace();
-      return;
     }
-
     if (!changedProps.has("hass")) {
       return;
     }
-
     const oldHass = changedProps.get("hass") as this["hass"];
-    if (oldHass && oldHass.localize !== this.hass.localize) {
+    if (oldHass?.locale !== this.hass.locale) {
       this._setLovelace();
-      return;
-    }
-
-    if (oldHass && this.hass) {
-      // If the entity registry changed, ask the user if they want to refresh the config
-      if (
-        oldHass.entities !== this.hass.entities ||
-        oldHass.devices !== this.hass.devices ||
-        oldHass.areas !== this.hass.areas ||
-        oldHass.floors !== this.hass.floors
-      ) {
-        if (this.hass.config.state === "RUNNING") {
-          this._debounceRegistriesChanged();
-          return;
-        }
-      }
-      // If ha started, refresh the config
-      if (
-        this.hass.config.state === "RUNNING" &&
-        oldHass.config.state !== "RUNNING"
-      ) {
-        this._setLovelace();
-      }
     }
   }
 
-  private _debounceRegistriesChanged = debounce(
-    () => this._registriesChanged(),
-    200
-  );
-
-  private _registriesChanged = async () => {
-    this._setLovelace();
-  };
-
   private _back(ev) {
     ev.stopPropagation();
     goBack();
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     return html`
       <div class="header">
         <div class="toolbar">
-          ${
+          ${this._searchParms.has("historyBack")
-            this._searchParms.has("historyBack")
+            ? html`
-              ? html`
+                <ha-icon-button-arrow-prev
-                  <ha-icon-button-arrow-prev
+                  @click=${this._back}
-                    @click=${this._back}
+                  slot="navigationIcon"
-                    slot="navigationIcon"
+                ></ha-icon-button-arrow-prev>
-                  ></ha-icon-button-arrow-prev>
+              `
-                `
+            : html`
-              : html`
+                <ha-menu-button
-                  <ha-menu-button
+                  slot="navigationIcon"
-                    slot="navigationIcon"
+                  .hass=${this.hass}
-                    .hass=${this.hass}
+                  .narrow=${this.narrow}
-                    .narrow=${this.narrow}
+                ></ha-menu-button>
-                  ></ha-menu-button>
+              `}
-                `
-          }
           <div class="main-title">${this.hass.localize("panel.climate")}</div>
         </div>
       </div>
-      ${
+
-        this._lovelace
+      <hui-view-container .hass=${this.hass}>
-          ? html`
+        <hui-view
-              <hui-view-container .hass=${this.hass}>
+          .hass=${this.hass}
-                <hui-view
+          .narrow=${this.narrow}
-                  .hass=${this.hass}
+          .lovelace=${this._lovelace}
-                  .narrow=${this.narrow}
+          .index=${this._viewIndex}
-                  .lovelace=${this._lovelace}
+        ></hui-view>
-                  .index=${this._viewIndex}
-                ></hui-view
-              ></hui-view-container>
-            `
-          : nothing
-      }
       </hui-view-container>
     `;
   }
 
-  private async _setLovelace() {
+  private _setLovelace() {
-    const viewConfig = await generateLovelaceViewStrategy(
-      CLIMATE_LOVELACE_VIEW_CONFIG,
-      this.hass
-    );
-
-    const config = { views: [viewConfig] };
-    const rawConfig = { views: [CLIMATE_LOVELACE_VIEW_CONFIG] };
-
-    if (deepEqual(config, this._lovelace?.config)) {
-      return;
-    }
-
     this._lovelace = {
-      config: config,
+      config: CLIMATE_LOVELACE_CONFIG,
-      rawConfig: rawConfig,
+      rawConfig: CLIMATE_LOVELACE_CONFIG,
       editMode: false,
       urlPath: "climate",
       mode: "generated",

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/areas/dialog-floor-registry-detail.ts

@@ -8,24 +8,24 @@ import { fireEvent } from "../../../common/dom/fire_event";
 import "../../../components/chips/ha-chip-set";
 import "../../../components/chips/ha-input-chip";
 import "../../../components/ha-alert";
-import "../../../components/ha-aliases-editor";
-import "../../../components/ha-area-picker";
 import "../../../components/ha-button";
+import "../../../components/ha-aliases-editor";
 import { createCloseHeading } from "../../../components/ha-dialog";
 import "../../../components/ha-icon-picker";
 import "../../../components/ha-picture-upload";
 import "../../../components/ha-settings-row";
 import "../../../components/ha-svg-icon";
 import "../../../components/ha-textfield";
-import { updateAreaRegistryEntry } from "../../../data/area_registry";
+import "../../../components/ha-area-picker";
 import type {
   FloorRegistryEntry,
   FloorRegistryEntryMutableParams,
 } from "../../../data/floor_registry";
 import { haStyle, haStyleDialog } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
-import { showAreaRegistryDetailDialog } from "./show-dialog-area-registry-detail";
 import type { FloorRegistryDetailDialogParams } from "./show-dialog-floor-registry-detail";
+import { showAreaRegistryDetailDialog } from "./show-dialog-area-registry-detail";
+import { updateAreaRegistryEntry } from "../../../data/area_registry";
 
 class DialogFloorDetail extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -168,6 +168,11 @@ class DialogFloorDetail extends LitElement {
               )}
             </h3>
 
+            <p class="description">
+              ${this.hass.localize(
+                "ui.panel.config.floors.editor.areas_description"
+              )}
+            </p>
             ${areas.length
               ? html`<ha-chip-set>
                   ${repeat(
@@ -192,17 +197,13 @@ class DialogFloorDetail extends LitElement {
                       </ha-input-chip>`
                   )}
                 </ha-chip-set>`
-              : html`<p class="description">
+              : nothing}
-                  ${this.hass.localize(
-                    "ui.panel.config.floors.editor.areas_description"
-                  )}
-                </p>`}
             <ha-area-picker
               no-add
               .hass=${this.hass}
               @value-changed=${this._addArea}
               .excludeAreas=${areas.map((a) => a.area_id)}
-              .addButtonLabel=${this.hass.localize(
+              .label=${this.hass.localize(
                 "ui.panel.config.floors.editor.add_area"
               )}
             ></ha-area-picker>

src/panels/config/automation/action/ha-automation-action-row.ts

@@ -588,11 +588,7 @@ export default class HaAutomationActionRow extends LitElement {
       ...this._clipboard,
       action: deepClone(this.action),
     };
-    let action = this.action;
+    copyToClipboard(dump(this.action));
-    if ("sequence" in action) {
-      action = { ...this.action, metadata: {} };
-    }
-    copyToClipboard(dump(action));
   }
 
   private _onDisable = () => {

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

@@ -257,7 +257,7 @@ class DialogAddAutomationElement
 
       const results = fuse.multiTermsSearch(filter);
       if (results) {
-        return results.map((result) => result.item).filter((item) => item.name);
+        return results.map((result) => result.item);
       }
       return items;
     }
@@ -294,7 +294,7 @@ class DialogAddAutomationElement
 
       const results = fuse.multiTermsSearch(filter);
       if (results) {
-        return results.map((result) => result.item).filter((item) => item.name);
+        return results.map((result) => result.item);
       }
       return items;
     }
@@ -383,16 +383,9 @@ class DialogAddAutomationElement
 
         generatedCollections.push({
           titleKey: collection.titleKey,
-          groups: groups.sort((a, b) => {
+          groups: groups.sort((a, b) =>
-            // make sure device is always on top
+            stringCompare(a.name, b.name, this.hass.locale.language)
-            if (a.key === "device" || a.key === "device_id") {
+          ),
-              return -1;
-            }
-            if (b.key === "device" || b.key === "device_id") {
-              return 1;
-            }
-            return stringCompare(a.name, b.name, this.hass.locale.language);
-          }),
         });
       });
       return generatedCollections;
@@ -685,7 +678,7 @@ class DialogAddAutomationElement
         );
 
     const typeTitle = this.hass.localize(
-      `ui.panel.config.automation.editor.${automationElementType}s.add`
+      `ui.panel.config.automation.editor.${automationElementType}s.header`
     );
 
     const tabButtons = [
@@ -902,9 +895,7 @@ class DialogAddAutomationElement
 
     return html`
       <div class="items-title ${this._itemsScrolled ? "scrolled" : ""}">
-        ${this._tab === "blocks" && !this._filter
+        ${title}
-          ? this.hass.localize("ui.panel.config.automation.editor.blocks")
-          : title}
       </div>
       <ha-md-list
         dialogInitialFocus=${ifDefined(this._fullScreen ? "" : undefined)}
@@ -1054,7 +1045,6 @@ class DialogAddAutomationElement
   private _onSearchFocus(ev) {
     this._removeKeyboardShortcuts = tinykeys(ev.target, {
       ArrowDown: this._focusSearchList,
-      Enter: this._pickSingleItem,
     });
   }
 
@@ -1071,39 +1061,6 @@ class DialogAddAutomationElement
     this._itemsListFirstElement.focus();
   };
 
-  private _pickSingleItem = (ev: KeyboardEvent) => {
-    if (!this._filter) {
-      return;
-    }
-
-    ev.preventDefault();
-    const automationElementType = this._params!.type;
-
-    const items = [
-      ...this._getFilteredItems(
-        automationElementType,
-        this._filter,
-        this.hass.localize,
-        this.hass.services,
-        this._manifests
-      ),
-      ...(automationElementType !== "trigger"
-        ? this._getFilteredBuildingBlocks(
-            automationElementType,
-            this._filter,
-            this.hass.localize
-          )
-        : []),
-    ];
-
-    if (items.length !== 1) {
-      return;
-    }
-
-    this._params!.add(items[0].key);
-    this.closeDialog();
-  };
-
   static get styles(): CSSResultGroup {
     return [
       css`
@@ -1180,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);
+          --md-list-item-label-text-color: var(--primary-color);
-          --icon-primary-color: var(--ha-color-on-primary-normal);
+          --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/automation/sidebar/ha-automation-sidebar-action.ts

@@ -1,3 +1,4 @@
+import { consume } from "@lit/context";
 import {
   mdiAppleKeyboardCommand,
   mdiContentCopy,
@@ -13,6 +14,7 @@ import {
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
+import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { handleStructError } from "../../../../common/structs/handle-errors";
 import type { LocalizeKeys } from "../../../../common/translations/localize";
@@ -20,8 +22,16 @@ import "../../../../components/ha-md-divider";
 import "../../../../components/ha-md-menu-item";
 import { ACTION_BUILDING_BLOCKS } from "../../../../data/action";
 import type { ActionSidebarConfig } from "../../../../data/automation";
-import { domainToName } from "../../../../data/integration";
+import {
-import type { RepeatAction, ServiceAction } from "../../../../data/script";
+  floorsContext,
+  fullEntitiesContext,
+  labelsContext,
+} from "../../../../data/context";
+import type { EntityRegistryEntry } from "../../../../data/entity_registry";
+import type { FloorRegistryEntry } from "../../../../data/floor_registry";
+import type { LabelRegistryEntry } from "../../../../data/label_registry";
+import type { RepeatAction } from "../../../../data/script";
+import { describeAction } from "../../../../data/script_i18n";
 import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
@@ -50,6 +60,18 @@ export default class HaAutomationSidebarAction extends LitElement {
 
   @state() private _warnings?: string[];
 
+  @state()
+  @consume({ context: fullEntitiesContext, subscribe: true })
+  _entityReg!: EntityRegistryEntry[];
+
+  @state()
+  @consume({ context: labelsContext, subscribe: true })
+  _labelReg!: LabelRegistryEntry[];
+
+  @state()
+  @consume({ context: floorsContext, subscribe: true })
+  _floorReg!: Record<string, FloorRegistryEntry>;
+
   @query(".sidebar-editor")
   public editor?: HaAutomationConditionEditor;
 
@@ -80,27 +102,20 @@ export default class HaAutomationSidebarAction extends LitElement {
 
     const isBuildingBlock = ACTION_BUILDING_BLOCKS.includes(type || "");
 
+    const title = capitalizeFirstLetter(
+      describeAction(
+        this.hass,
+        this._entityReg,
+        this._labelReg,
+        this._floorReg,
+        actionConfig
+      )
+    );
+
     const subtitle = this.hass.localize(
       "ui.panel.config.automation.editor.actions.action"
     );
 
-    let title =
-      this.hass.localize(
-        `ui.panel.config.automation.editor.actions.type.${type}.label` as LocalizeKeys
-      ) || type;
-
-    if (type === "service" && (actionConfig as ServiceAction).action) {
-      const [domain, service] = (actionConfig as ServiceAction).action!.split(
-        ".",
-        2
-      );
-      title = `${domainToName(this.hass.localize, domain)}: ${
-        this.hass.localize(`component.${domain}.services.${service}.name`) ||
-        this.hass.services[domain][service]?.name ||
-        title
-      }`;
-    }
-
     const description = isBuildingBlock
       ? this.hass.localize(
           `ui.panel.config.automation.editor.actions.type.${type}.description.picker` as LocalizeKeys

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();
   };
@@ -372,14 +375,16 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
         clickable
         id="backup_id"
         has-filters
-        .filters=${Object.values(this._filters).filter((filter) =>
+        .filters=${
-          Array.isArray(filter)
+          Object.values(this._filters).filter((filter) =>
-            ? filter.length
+            Array.isArray(filter)
-            : filter &&
+              ? filter.length
-              Object.values(filter).some((val) =>
+              : filter &&
-                Array.isArray(val) ? val.length : val
+                Object.values(filter).some((val) =>
-              )
+                  Array.isArray(val) ? val.length : val
-        ).length}
+                )
+          ).length
+        }
         selectable
         .selected=${this._selected.length}
         .initialGroupColumn=${this._activeGrouping}
@@ -421,28 +426,30 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
         </div>
 
         <div slot="selection-bar">
-          ${!this.narrow
+          ${
-            ? html`
+            !this.narrow
-                <ha-button
+              ? html`
-                  appearance="plain"
+                  <ha-button
-                  @click=${this._deleteSelected}
+                    appearance="plain"
-                  variant="danger"
+                    @click=${this._deleteSelected}
-                >
+                    variant="danger"
-                  ${this.hass.localize(
+                  >
-                    "ui.panel.config.backup.backups.delete_selected"
+                    ${this.hass.localize(
-                  )}
+                      "ui.panel.config.backup.backups.delete_selected"
-                </ha-button>
+                    )}
-              `
+                  </ha-button>
-            : html`
+                `
-                <ha-icon-button
+              : html`
-                  .label=${this.hass.localize(
+                  <ha-icon-button
-                    "ui.panel.config.backup.backups.delete_selected"
+                    .label=${this.hass.localize(
-                  )}
+                      "ui.panel.config.backup.backups.delete_selected"
-                  .path=${mdiDelete}
+                    )}
-                  class="warning"
+                    .path=${mdiDelete}
-                  @click=${this._deleteSelected}
+                    class="warning"
-                ></ha-icon-button>
+                    @click=${this._deleteSelected}
-              `}
+                  ></ha-icon-button>
+                `
+          }
         </div>
 
         <ha-filter-states
@@ -455,39 +462,43 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
           expanded
           .narrow=${this.narrow}
         ></ha-filter-states>
-        ${!this._needsOnboarding
+        ${
-          ? html`
+          !this._needsOnboarding
-              <ha-fab
+            ? html`
-                slot="fab"
+                <ha-fab
-                ?disabled=${backupInProgress}
+                  slot="fab"
-                .label=${this.hass.localize(
+                  ?disabled=${backupInProgress}
-                  "ui.panel.config.backup.backups.new_backup"
+                  .label=${this.hass.localize(
-                )}
+                    "ui.panel.config.backup.backups.new_backup"
-                extended
+                  )}
-                @click=${this._newBackup}
+                  extended
-              >
+                  @click=${this._newBackup}
-                ${backupInProgress
+                >
-                  ? html`<div slot="icon" class="loading">
+                  ${backupInProgress
-                      <ha-spinner .size=${"small"}></ha-spinner>
+                    ? html`<div slot="icon" class="loading">
-                    </div>`
+                        <ha-spinner .size=${"small"}></ha-spinner>
-                  : html`<ha-svg-icon
+                      </div>`
-                      slot="icon"
+                    : html`<ha-svg-icon
-                      .path=${mdiPlus}
+                        slot="icon"
-                    ></ha-svg-icon>`}
+                        .path=${mdiPlus}
-              </ha-fab>
+                      ></ha-svg-icon>`}
-            `
+                </ha-fab>
-          : nothing}
+              `
+            : nothing
+        }
       </hass-tabs-subpage-data-table>
       <ha-md-menu id="overflow-menu" positioning="fixed">
-        <ha-md-menu-item .clickAction=${this._downloadBackup}>
+          <ha-md-menu-item .clickAction=${this._downloadBackup}>
-          <ha-svg-icon slot="start" .path=${mdiDownload}></ha-svg-icon>
+              <ha-svg-icon slot="start" .path=${mdiDownload}></ha-svg-icon>
-          ${this.hass.localize("ui.common.download")}
+            ${this.hass.localize("ui.common.download")}
-        </ha-md-menu-item>
+          </ha-md-menu-item>
-        <ha-md-menu-item class="warning" .clickAction=${this._deleteBackup}>
+            <ha-md-menu-item class="warning" .clickAction=${this._deleteBackup}>
-          <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
+              <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
-          ${this.hass.localize("ui.common.delete")}
+            ${this.hass.localize("ui.common.delete")}
-        </ha-md-menu-item>
+            </ha-md-menu-item>
-      </ha-md-menu>
+        </ha-md-menu>
+      >
+      </ha-icon-overflow-menu>
     `;
   }
 
@@ -561,17 +572,15 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
     navigate(`/config/backup/details/${id}`);
   }
 
-  private _downloadBackup = async (ev): Promise<void> => {
+  private async _downloadBackup(): Promise<void> {
-    const backup = ev.parentElement.anchorElement.backup;
+    if (!this._overflowBackup) {
-    if (!backup) {
       return;
     }
-    downloadBackup(this.hass, this, backup, this.config);
+    downloadBackup(this.hass, this, this._overflowBackup, this.config);
-  };
+  }
 
-  private _deleteBackup = async (ev): Promise<void> => {
+  private async _deleteBackup(): Promise<void> {
-    const backup = ev.parentElement.anchorElement.backup;
+    if (!this._overflowBackup) {
-    if (!backup) {
       return;
     }
 
@@ -587,9 +596,11 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
     }
 
     try {
-      await deleteBackup(this.hass, backup.backup_id);
+      await deleteBackup(this.hass, this._overflowBackup.backup_id);
-      if (this._selected.includes(backup.backup_id)) {
+      if (this._selected.includes(this._overflowBackup.backup_id)) {
-        this._selected = this._selected.filter((id) => id !== backup.backup_id);
+        this._selected = this._selected.filter(
+          (id) => id !== this._overflowBackup!.backup_id
+        );
       }
     } catch (err: any) {
       showAlertDialog(this, {
@@ -601,7 +612,7 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
       return;
     }
     fireEvent(this, "ha-refresh-backup-info");
-  };
+  }
 
   private async _deleteSelected() {
     const confirm = await showConfirmationDialog(this, {

src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts

@@ -9,7 +9,6 @@ import "../../../../components/ha-dialog";
 import "../../../../components/ha-button";
 import "../../../../components/ha-formfield";
 import "../../../../components/ha-radio";
-import "../../../../components/ha-markdown";
 import type { HaRadio } from "../../../../components/ha-radio";
 import type {
   FlowFromGridSourceEnergyPreference,
@@ -20,7 +19,11 @@ import {
   emptyFlowToGridSourceEnergyPreference,
   energyStatisticHelpUrl,
 } from "../../../../data/energy";
-import { isExternalStatistic } from "../../../../data/recorder";
+import {
+  getDisplayUnit,
+  getStatisticMetadata,
+  isExternalStatistic,
+} from "../../../../data/recorder";
 import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor";
 import type { HassDialog } from "../../../../dialogs/make-dialog-manager";
 import { haStyleDialog } from "../../../../resources/styles";
@@ -44,6 +47,8 @@ export class DialogEnergyGridFlowSettings
 
   @state() private _costs?: "no-costs" | "number" | "entity" | "statistic";
 
+  @state() private _pickedDisplayUnit?: string | null;
+
   @state() private _energy_units?: string[];
 
   @state() private _error?: string;
@@ -76,6 +81,11 @@ export class DialogEnergyGridFlowSettings
           : "stat_energy_to"
       ];
 
+    this._pickedDisplayUnit = getDisplayUnit(
+      this.hass,
+      initialSourceId,
+      params.metadata
+    );
     this._energy_units = (
       await getSensorDeviceClassConvertibleUnits(this.hass, "energy")
     ).units;
@@ -93,6 +103,7 @@ export class DialogEnergyGridFlowSettings
   public closeDialog() {
     this._params = undefined;
     this._source = undefined;
+    this._pickedDisplayUnit = undefined;
     this._error = undefined;
     this._excludeList = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
@@ -106,6 +117,10 @@ export class DialogEnergyGridFlowSettings
 
     const pickableUnit = this._energy_units?.join(", ") || "";
 
+    const unitPriceSensor = this._pickedDisplayUnit
+      ? `${this.hass.config.currency}/${this._pickedDisplayUnit}`
+      : undefined;
+
     const unitPriceFixed = `${this.hass.config.currency}/kWh`;
 
     const externalSource =
@@ -231,15 +246,9 @@ export class DialogEnergyGridFlowSettings
               .hass=${this.hass}
               include-domains='["sensor", "input_number"]'
               .value=${this._source.entity_energy_price}
-              .label=${this.hass.localize(
+              .label=${`${this.hass.localize(
                 `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.cost_entity_input`
-              )}
+              )} ${unitPriceSensor ? ` (${unitPriceSensor})` : ""}`}
-              .helper=${html`<ha-markdown
-                .content=${this.hass.localize(
-                  "ui.panel.config.energy.grid.flow_dialog.cost_entity_helper",
-                  { currency: this.hass.config.currency }
-                )}
-              ></ha-markdown>`}
               @value-changed=${this._priceEntityChanged}
             ></ha-entity-picker>`
           : ""}
@@ -332,6 +341,16 @@ export class DialogEnergyGridFlowSettings
   }
 
   private async _statisticChanged(ev: CustomEvent<{ value: string }>) {
+    if (ev.detail.value) {
+      const metadata = await getStatisticMetadata(this.hass, [ev.detail.value]);
+      this._pickedDisplayUnit = getDisplayUnit(
+        this.hass,
+        ev.detail.value,
+        metadata[0]
+      );
+    } else {
+      this._pickedDisplayUnit = undefined;
+    }
     this._source = {
       ...this._source!,
       [this._params!.direction === "from"

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`
+          : this._item === null
-              <span @value-changed=${this._valueChanged}>
+            ? this.hass.localize("ui.dialogs.helper_settings.yaml_not_editable")
-                ${dynamicElement(`ha-${this.entry.platform}-form`, {
+            : html`
-                  hass: this.hass,
+                <span @value-changed=${this._valueChanged}>
-                  item: this._item,
+                  ${dynamicElement(`ha-${this.entry.platform}-form`, {
-                  entry: this.entry,
+                    hass: this.hass,
-                  disabled: this._item === null,
+                    item: this._item,
-                })}
+                    entry: this.entry,
-              </span>
+                  })}
-            `}
+                </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
+        <ha-sortable @item-moved=${this._optionMoved} handle-selector=".handle">
-          @item-moved=${this._optionMoved}
-          handle-selector=".handle"
-          .disabled=${this.disabled}
-        >
           <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
+          <ha-button size="small" appearance="plain" @click=${this._addOption}
-            size="small"
-            appearance="plain"
-            @click=${this._addOption}
-            .disabled=${this.disabled}
             >${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/info/ha-config-info.ts

@@ -107,8 +107,6 @@ class HaConfigInfo extends LitElement {
     const customUiList: { name: string; url: string; version: string }[] =
       (window as any).CUSTOM_UI_LIST || [];
 
-    const isDark = this.hass.themes?.darkMode || false;
-
     return html`
       <hass-subpage
         .hass=${this.hass}
@@ -188,7 +186,7 @@ class HaConfigInfo extends LitElement {
                 : nothing}
             </ul>
           </ha-card>
-          <ha-card outlined class="ohf ${isDark ? "dark" : ""}">
+          <ha-card outlined class="ohf">
             <div>
               ${this.hass.localize("ui.panel.config.info.proud_part_of")}
             </div>
@@ -348,10 +346,6 @@ class HaConfigInfo extends LitElement {
           max-width: 250px;
         }
 
-        .ohf.dark img {
-          color-scheme: dark;
-        }
-
         .versions {
           display: flex;
           flex-direction: column;

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(
+    const signedUrl = await getSignedPath(this.hass, getErrorLogDownloadUrl);
-      this.hass,
-      getErrorLogDownloadUrl(this.hass)
-    );
     fileDownload(signedUrl.path, logFileName);
   }
 

src/panels/config/integrations/integration-panels/bluetooth/bluetooth-network-visualization.ts

@@ -8,7 +8,6 @@ import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { relativeTime } from "../../../../../common/datetime/relative_time";
-import { getDeviceContext } from "../../../../../common/entity/context/get_device_context";
 import { navigate } from "../../../../../common/navigate";
 import { throttle } from "../../../../../common/util/throttle";
 import "../../../../../components/chart/ha-network-graph";
@@ -195,17 +194,11 @@ export class BluetoothNetworkVisualization extends LitElement {
       ];
       const links: NetworkLink[] = [];
       Object.values(scanners).forEach((scanner) => {
-        const scannerDevice = this._sourceDevices[scanner.source] as
+        const scannerDevice = this._sourceDevices[scanner.source];
-          | DeviceRegistryEntry
-          | undefined;
-        const area = scannerDevice
-          ? getDeviceContext(scannerDevice, this.hass).area
-          : undefined;
         nodes.push({
           id: scanner.source,
           name:
             scannerDevice?.name_by_user || scannerDevice?.name || scanner.name,
-          context: area?.name,
           category: 1,
           value: 5,
           symbol: "circle",
@@ -238,16 +231,10 @@ export class BluetoothNetworkVisualization extends LitElement {
           });
           return;
         }
-        const device = this._sourceDevices[node.address] as
+        const device = this._sourceDevices[node.address];
-          | DeviceRegistryEntry
-          | undefined;
-        const area = device
-          ? getDeviceContext(device, this.hass).area
-          : undefined;
         nodes.push({
           id: node.address,
           name: this._getBluetoothDeviceName(node.address),
-          context: area?.name,
           value: device ? 1 : 0,
           category: device ? 2 : 3,
           symbolSize: 20,
@@ -307,20 +294,15 @@ export class BluetoothNetworkVisualization extends LitElement {
       const btDevice = this._data.find((d) => d.address === address);
       if (btDevice) {
         tooltipText = `<b>${name}</b><br><b>${this.hass.localize("ui.panel.config.bluetooth.address")}:</b> ${address}<br><b>${this.hass.localize("ui.panel.config.bluetooth.rssi")}:</b> ${btDevice.rssi}<br><b>${this.hass.localize("ui.panel.config.bluetooth.source")}:</b> ${btDevice.source}<br><b>${this.hass.localize("ui.panel.config.bluetooth.updated")}:</b> ${relativeTime(new Date(btDevice.time * 1000), this.hass.locale)}`;
-        const device = this._sourceDevices[address];
-        if (device) {
-          const area = getDeviceContext(device, this.hass).area;
-          if (area) {
-            tooltipText += `<br><b>${this.hass.localize("ui.panel.config.bluetooth.area")}: </b>${area.name}`;
-          }
-        }
       } else {
         const device = this._sourceDevices[address];
         if (device) {
           tooltipText = `<b>${name}</b><br><b>${this.hass.localize("ui.panel.config.bluetooth.address")}:</b> ${address}`;
-          const area = getDeviceContext(device, this.hass).area;
+          if (device.area_id) {
-          if (area) {
+            const area = this.hass.areas[device.area_id];
-            tooltipText += `<br><b>${this.hass.localize("ui.panel.config.bluetooth.area")}: </b>${area.name}`;
+            if (area) {
+              tooltipText += `<br><b>${this.hass.localize("ui.panel.config.bluetooth.area")}: </b>${area.name}`;
+            }
           }
         }
       }

src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts

@@ -19,8 +19,6 @@ import "../../../../../layouts/hass-tabs-subpage";
 import type { HomeAssistant, Route } from "../../../../../types";
 import { formatAsPaddedHex } from "./functions";
 import { zhaTabs } from "./zha-config-dashboard";
-import type { DeviceRegistryEntry } from "../../../../../data/device_registry";
-import { getDeviceContext } from "../../../../../common/entity/context/get_device_context";
 
 @customElement("zha-network-visualization-page")
 export class ZHANetworkVisualizationPage extends LitElement {
@@ -119,11 +117,8 @@ export class ZHANetworkVisualizationPage extends LitElement {
     } else {
       label += `<br><b>${this.hass.localize("ui.panel.config.zha.visualization.device_not_in_db")}</b>`;
     }
-    const haDevice = this.hass.devices[device.device_reg_id] as
+    if (device.area_id) {
-      | DeviceRegistryEntry
+      const area = this.hass.areas[device.area_id];
-      | undefined;
-    if (haDevice) {
-      const area = getDeviceContext(haDevice, this.hass).area;
       if (area) {
         label += `<br><b>${this.hass.localize("ui.panel.config.zha.visualization.area")}: </b>${area.name}`;
       }
@@ -209,17 +204,10 @@ export class ZHANetworkVisualizationPage extends LitElement {
         category = 2; // End Device
       }
 
-      const haDevice = this.hass.devices[device.device_reg_id] as
-        | DeviceRegistryEntry
-        | undefined;
-      const area = haDevice
-        ? getDeviceContext(haDevice, this.hass).area
-        : undefined;
       // Create node
       nodes.push({
         id: device.ieee,
         name: device.user_given_name || device.name || device.ieee,
-        context: area?.name,
         category,
         value: isCoordinator ? 3 : device.device_type === "Router" ? 2 : 1,
         symbolSize: isCoordinator

src/panels/config/integrations/integration-panels/zwave_js/zwave_js-network-visualization.ts

@@ -5,7 +5,6 @@ import type {
 import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { getDeviceContext } from "../../../../../common/entity/context/get_device_context";
 import { navigate } from "../../../../../common/navigate";
 import { debounce } from "../../../../../common/util/debounce";
 import "../../../../../components/chart/ha-network-graph";
@@ -125,7 +124,7 @@ export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) {
       return tip;
     }
     const { id, name } = data as any;
-    const device = this._devices[id] as DeviceRegistryEntry | undefined;
+    const device = this._devices[id];
     const nodeStatus = this._nodeStatuses[id];
     let tip = `${(params as any).marker} ${name}`;
     tip += `<br><b>${this.hass.localize("ui.panel.config.zwave_js.visualization.node_id")}:</b> ${id}`;
@@ -139,12 +138,6 @@ export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) {
         tip += `<br><b>Z-Wave Plus:</b> ${this.hass.localize("ui.panel.config.zwave_js.visualization.version")} ${nodeStatus.zwave_plus_version}`;
       }
     }
-    if (device) {
-      const area = getDeviceContext(device, this.hass).area;
-      if (area) {
-        tip += `<br><b>${this.hass.localize("ui.panel.config.zwave_js.visualization.area")}:</b> ${area.name}`;
-      }
-    }
     return tip;
   };
 
@@ -204,16 +197,10 @@ export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) {
         if (node.is_controller_node) {
           controllerNode = node.node_id;
         }
-        const device = this._devices[node.node_id] as
+        const device = this._devices[node.node_id];
-          | DeviceRegistryEntry
-          | undefined;
-        const area = device
-          ? getDeviceContext(device, this.hass).area
-          : undefined;
         nodes.push({
           id: String(node.node_id),
           name: device?.name_by_user ?? device?.name ?? String(node.node_id),
-          context: area?.name,
           value: node.is_controller_node ? 3 : node.is_routing ? 2 : 1,
           category:
             node.status === NodeStatus.Dead

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/lovelace/dashboards/ha-config-lovelace-dashboards.ts

@@ -320,9 +320,9 @@ export class HaConfigLovelaceDashboards extends LitElement {
 
       if (this.hass.panels.light) {
         result.push({
-          icon: this.hass.panels.light.icon || "mdi:lamps",
+          icon: "mdi:lamps",
           title: this.hass.localize("panel.light"),
-          show_in_sidebar: true,
+          show_in_sidebar: false,
           mode: "storage",
           url_path: "light",
           filename: "",
@@ -332,13 +332,13 @@ export class HaConfigLovelaceDashboards extends LitElement {
         });
       }
 
-      if (this.hass.panels.security) {
+      if (this.hass.panels.safety) {
         result.push({
-          icon: this.hass.panels.security.icon || "mdi:security",
+          icon: "mdi:security",
-          title: this.hass.localize("panel.security"),
+          title: this.hass.localize("panel.safety"),
-          show_in_sidebar: true,
+          show_in_sidebar: false,
           mode: "storage",
-          url_path: "security",
+          url_path: "safety",
           filename: "",
           default: false,
           require_admin: false,
@@ -348,9 +348,9 @@ export class HaConfigLovelaceDashboards extends LitElement {
 
       if (this.hass.panels.climate) {
         result.push({
-          icon: this.hass.panels.climate.icon || "mdi:home-thermometer",
+          icon: "mdi:home-thermometer",
           title: this.hass.localize("panel.climate"),
-          show_in_sidebar: true,
+          show_in_sidebar: false,
           mode: "storage",
           url_path: "climate",
           filename: "",
@@ -470,13 +470,13 @@ export class HaConfigLovelaceDashboards extends LitElement {
   }
 
   private _canDelete(urlPath: string) {
-    return !["lovelace", "energy", "light", "security", "climate"].includes(
+    return !["lovelace", "energy", "light", "safety", "climate"].includes(
       urlPath
     );
   }
 
   private _canEdit(urlPath: string) {
-    return !["light", "security", "climate"].includes(urlPath);
+    return !["light", "safety", "climate"].includes(urlPath);
   }
 
   private _handleDelete = async (item: DataTableItem) => {

src/panels/config/repairs/dialog-repairs-issue-subtitle.ts

@@ -41,6 +41,7 @@ class DialogRepairsIssueSubtitle extends LitElement {
     :host {
       display: block;
       font-size: var(--ha-font-size-m);
+      margin-bottom: 8px;
       color: var(--secondary-text-color);
       text-overflow: ellipsis;
       overflow: hidden;

src/panels/config/repairs/dialog-repairs-issue.ts

@@ -1,14 +1,15 @@
-import { mdiOpenInNew } from "@mdi/js";
+import { mdiClose, mdiOpenInNew } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property, state, query } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { isNavigationClick } from "../../../common/dom/is-navigation-click";
 import "../../../components/ha-alert";
-import "../../../components/ha-wa-dialog";
+import "../../../components/ha-md-dialog";
+import type { HaMdDialog } from "../../../components/ha-md-dialog";
 import "../../../components/ha-button";
 import "../../../components/ha-svg-icon";
-import "../../../components/ha-dialog-footer";
+import "../../../components/ha-dialog-header";
 import "./dialog-repairs-issue-subtitle";
 import "../../../components/ha-markdown";
 import type { RepairsIssue } from "../../../data/repairs";
@@ -25,12 +26,11 @@ class DialogRepairsIssue extends LitElement {
 
   @state() private _params?: RepairsIssueDialogParams;
 
-  @state() private _open = false;
+  @query("ha-md-dialog") private _dialog?: HaMdDialog;
 
   public showDialog(params: RepairsIssueDialogParams): void {
     this._params = params;
     this._issue = this._params.issue;
-    this._open = true;
   }
 
   private _dialogClosed() {
@@ -44,7 +44,7 @@ class DialogRepairsIssue extends LitElement {
   }
 
   public closeDialog() {
-    this._open = false;
+    this._dialog?.close();
   }
 
   protected render() {
@@ -62,19 +62,32 @@ class DialogRepairsIssue extends LitElement {
       ) || this.hass!.localize("ui.panel.config.repairs.dialog.title");
 
     return html`
-      <ha-wa-dialog
+      <ha-md-dialog
-        .hass=${this.hass}
+        open
-        .open=${this._open}
-        header-title=${dialogTitle}
-        aria-describedby="dialog-repairs-issue-description"
         @closed=${this._dialogClosed}
+        aria-labelledby="dialog-repairs-issue-title"
+        aria-describedby="dialog-repairs-issue-description"
       >
-        <dialog-repairs-issue-subtitle
+        <ha-dialog-header slot="headline">
-          slot="headerSubtitle"
+          <ha-icon-button
-          .hass=${this.hass}
+            slot="navigationIcon"
-          .issue=${this._issue}
+            .label=${this.hass.localize("ui.common.close") ?? "Close"}
-        ></dialog-repairs-issue-subtitle>
+            .path=${mdiClose}
-        <div class="dialog-content">
+            @click=${this.closeDialog}
+          ></ha-icon-button>
+          <span
+            slot="title"
+            id="dialog-repairs-issue-title"
+            .title=${dialogTitle}
+            >${dialogTitle}</span
+          >
+          <dialog-repairs-issue-subtitle
+            slot="subtitle"
+            .hass=${this.hass}
+            .issue=${this._issue}
+          ></dialog-repairs-issue-subtitle>
+        </ha-dialog-header>
+        <div slot="content" class="dialog-content">
           ${this._issue.breaks_in_ha_version
             ? html`
                 <ha-alert alert-type="warning">
@@ -109,12 +122,8 @@ class DialogRepairsIssue extends LitElement {
               `
             : ""}
         </div>
-        <ha-dialog-footer slot="footer">
+        <div slot="actions">
-          <ha-button
+          <ha-button appearance="plain" @click=${this._ignoreIssue}>
-            slot="secondaryAction"
-            appearance="plain"
-            @click=${this._ignoreIssue}
-          >
             ${this._issue!.ignored
               ? this.hass!.localize("ui.panel.config.repairs.dialog.unignore")
               : this.hass!.localize("ui.panel.config.repairs.dialog.ignore")}
@@ -122,7 +131,6 @@ class DialogRepairsIssue extends LitElement {
           ${this._issue.learn_more_url
             ? html`
                 <ha-button
-                  slot="primaryAction"
                   appearance="filled"
                   rel="noopener noreferrer"
                   href=${learnMoreUrlIsHomeAssistant
@@ -141,8 +149,8 @@ class DialogRepairsIssue extends LitElement {
                 </ha-button>
               `
             : ""}
-        </ha-dialog-footer>
+        </div>
-      </ha-wa-dialog>
+      </ha-md-dialog>
     `;
   }
 
@@ -164,7 +172,7 @@ class DialogRepairsIssue extends LitElement {
         padding-top: 0;
       }
       ha-alert {
-        margin-bottom: var(--ha-space-4);
+        margin-bottom: 16px;
         display: block;
       }
       .dismissed {

src/panels/config/script/manual-script-editor.ts

@@ -371,11 +371,7 @@ export class HaManualScriptEditor extends LitElement {
       }
     }
 
-    const actionType = getActionType(config);
+    if (!["sequence", "unknown"].includes(getActionType(config))) {
-    if (
-      !["sequence", "unknown"].includes(actionType) ||
-      (actionType === "sequence" && "metadata" in config)
-    ) {
       config = { sequence: [config] };
     }
 

src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts

@@ -109,26 +109,15 @@ export class AssistPipelineDetailConversation extends LitElement {
   }
 
   private _supportedLanguagesChanged(ev) {
-    this._supportedLanguages = ev.detail.value;
+    if (ev.detail.value === "*") {
-
-    if (
-      this._supportedLanguages === "*" ||
-      !this._supportedLanguages?.includes(
-        this.data?.conversation_language || ""
-      ) ||
-      !this.data?.conversation_language
-    ) {
       // wait for update of conversation_engine
       setTimeout(() => {
         const value = { ...this.data };
-        if (this._supportedLanguages === "*") {
+        value.conversation_language = "*";
-          value.conversation_language = "*";
-        } else {
-          value.conversation_language = this._supportedLanguages?.[0] ?? null;
-        }
         fireEvent(this, "value-changed", { value });
       }, 0);
     }
+    this._supportedLanguages = ev.detail.value;
   }
 
   static styles = css`

src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts

@@ -214,7 +214,7 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
         <ha-button
           slot="primaryAction"
           @click=${this._updatePipeline}
-          .loading=${this._submitting}
+          .disabled=${this._submitting}
           dialogInitialFocus
         >
           ${this._params.pipeline?.id

src/panels/light/ha-panel-light.ts

@@ -1,23 +1,24 @@
-import type { CSSResultGroup, PropertyValues } from "lit";
+import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
-import { LitElement, css, html, nothing } from "lit";
+import { LitElement, css, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { goBack } from "../../common/navigate";
-import { debounce } from "../../common/util/debounce";
-import { deepEqual } from "../../common/util/deep-equal";
 import "../../components/ha-icon-button-arrow-prev";
 import "../../components/ha-menu-button";
-import type { LovelaceStrategyViewConfig } from "../../data/lovelace/config/view";
+import type { LovelaceConfig } from "../../data/lovelace/config/types";
 import { haStyle } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
-import { generateLovelaceViewStrategy } from "../lovelace/strategies/get-strategy";
 import type { Lovelace } from "../lovelace/types";
 import "../lovelace/views/hui-view";
 import "../lovelace/views/hui-view-container";
 
-const LIGHT_LOVELACE_VIEW_CONFIG: LovelaceStrategyViewConfig = {
+const LIGHT_LOVELACE_CONFIG: LovelaceConfig = {
-  strategy: {
+  views: [
-    type: "light",
+    {
-  },
+      strategy: {
+        type: "light",
+      },
+    },
+  ],
 };
 
 @customElement("ha-panel-light")
@@ -33,118 +34,60 @@ class PanelLight extends LitElement {
   @state() private _searchParms = new URLSearchParams(window.location.search);
 
   public willUpdate(changedProps: PropertyValues) {
-    super.willUpdate(changedProps);
-    // Initial setup
     if (!this.hasUpdated) {
       this.hass.loadFragmentTranslation("lovelace");
-      this._setLovelace();
-      return;
     }
-
     if (!changedProps.has("hass")) {
       return;
     }
-
     const oldHass = changedProps.get("hass") as this["hass"];
-    if (oldHass && oldHass.localize !== this.hass.localize) {
+    if (oldHass?.locale !== this.hass.locale) {
       this._setLovelace();
-      return;
-    }
-
-    if (oldHass && this.hass) {
-      // If the entity registry changed, ask the user if they want to refresh the config
-      if (
-        oldHass.entities !== this.hass.entities ||
-        oldHass.devices !== this.hass.devices ||
-        oldHass.areas !== this.hass.areas ||
-        oldHass.floors !== this.hass.floors
-      ) {
-        if (this.hass.config.state === "RUNNING") {
-          this._debounceRegistriesChanged();
-          return;
-        }
-      }
-      // If ha started, refresh the config
-      if (
-        this.hass.config.state === "RUNNING" &&
-        oldHass.config.state !== "RUNNING"
-      ) {
-        this._setLovelace();
-      }
     }
   }
 
-  private _debounceRegistriesChanged = debounce(
-    () => this._registriesChanged(),
-    200
-  );
-
-  private _registriesChanged = async () => {
-    this._setLovelace();
-  };
-
   private _back(ev) {
     ev.stopPropagation();
     goBack();
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     return html`
       <div class="header">
         <div class="toolbar">
-          ${
+          ${this._searchParms.has("historyBack")
-            this._searchParms.has("historyBack")
+            ? html`
-              ? html`
+                <ha-icon-button-arrow-prev
-                  <ha-icon-button-arrow-prev
+                  @click=${this._back}
-                    @click=${this._back}
+                  slot="navigationIcon"
-                    slot="navigationIcon"
+                ></ha-icon-button-arrow-prev>
-                  ></ha-icon-button-arrow-prev>
+              `
-                `
+            : html`
-              : html`
+                <ha-menu-button
-                  <ha-menu-button
+                  slot="navigationIcon"
-                    slot="navigationIcon"
+                  .hass=${this.hass}
-                    .hass=${this.hass}
+                  .narrow=${this.narrow}
-                    .narrow=${this.narrow}
+                ></ha-menu-button>
-                  ></ha-menu-button>
+              `}
-                `
-          }
           <div class="main-title">${this.hass.localize("panel.light")}</div>
         </div>
       </div>
-      ${
+
-        this._lovelace
+      <hui-view-container .hass=${this.hass}>
-          ? html`
+        <hui-view
-              <hui-view-container .hass=${this.hass}>
+          .hass=${this.hass}
-                <hui-view
+          .narrow=${this.narrow}
-                  .hass=${this.hass}
+          .lovelace=${this._lovelace}
-                  .narrow=${this.narrow}
+          .index=${this._viewIndex}
-                  .lovelace=${this._lovelace}
+        ></hui-view>
-                  .index=${this._viewIndex}
-                ></hui-view
-              ></hui-view-container>
-            `
-          : nothing
-      }
       </hui-view-container>
     `;
   }
 
-  private async _setLovelace() {
+  private _setLovelace() {
-    const viewConfig = await generateLovelaceViewStrategy(
-      LIGHT_LOVELACE_VIEW_CONFIG,
-      this.hass
-    );
-
-    const config = { views: [viewConfig] };
-    const rawConfig = { views: [LIGHT_LOVELACE_VIEW_CONFIG] };
-
-    if (deepEqual(config, this._lovelace?.config)) {
-      return;
-    }
-
     this._lovelace = {
-      config: config,
+      config: LIGHT_LOVELACE_CONFIG,
-      rawConfig: rawConfig,
+      rawConfig: LIGHT_LOVELACE_CONFIG,
       editMode: false,
       urlPath: "light",
       mode: "generated",

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/badges/hui-badge.ts

@@ -2,14 +2,14 @@ import type { PropertyValues } from "lit";
 import { ReactiveElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
+import type { MediaQueriesListener } from "../../../common/dom/media_query";
 import "../../../components/ha-svg-icon";
 import type { LovelaceBadgeConfig } from "../../../data/lovelace/config/badge";
 import type { HomeAssistant } from "../../../types";
 import {
-  ConditionalListenerMixin,
+  attachConditionMediaQueriesListeners,
-  setupMediaQueryListeners,
+  checkConditionsMet,
-} from "../../../mixins/conditional-listener-mixin";
+} from "../common/validate-condition";
-import { checkConditionsMet } from "../common/validate-condition";
 import { createBadgeElement } from "../create-element/create-badge-element";
 import { createErrorBadgeConfig } from "../create-element/create-element-base";
 import type { LovelaceBadge } from "../types";
@@ -22,7 +22,7 @@ declare global {
 }
 
 @customElement("hui-badge")
-export class HuiBadge extends ConditionalListenerMixin(ReactiveElement) {
+export class HuiBadge extends ReactiveElement {
   @property({ type: Boolean }) public preview = false;
 
   @property({ attribute: false }) public config?: LovelaceBadgeConfig;
@@ -40,16 +40,20 @@ export class HuiBadge extends ConditionalListenerMixin(ReactiveElement) {
 
   private _element?: LovelaceBadge;
 
+  private _listeners: MediaQueriesListener[] = [];
+
   protected createRenderRoot() {
     return this;
   }
 
   public disconnectedCallback() {
     super.disconnectedCallback();
+    this._clearMediaQueries();
   }
 
   public connectedCallback() {
     super.connectedCallback();
+    this._listenMediaQueries();
     this._updateVisibility();
   }
 
@@ -133,17 +137,26 @@ export class HuiBadge extends ConditionalListenerMixin(ReactiveElement) {
     }
   }
 
-  protected setupConditionalListeners() {
+  private _clearMediaQueries() {
-    if (!this.config?.visibility || !this.hass) {
+    this._listeners.forEach((unsub) => unsub());
+    this._listeners = [];
+  }
+
+  private _listenMediaQueries() {
+    this._clearMediaQueries();
+    if (!this.config?.visibility) {
       return;
     }
+    const conditions = this.config.visibility;
+    const hasOnlyMediaQuery =
+      conditions.length === 1 &&
+      conditions[0].condition === "screen" &&
+      !!conditions[0].media_query;
 
-    setupMediaQueryListeners(
+    this._listeners = attachConditionMediaQueriesListeners(
       this.config.visibility,
-      this.hass,
+      (matches) => {
-      (unsub) => this.addConditionalListener(unsub),
+        this._updateVisibility(hasOnlyMediaQuery && matches);
-      (conditionsMet) => {
-        this._updateVisibility(conditionsMet);
       }
     );
   }

src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts

@@ -8,7 +8,6 @@ import memoizeOne from "memoize-one";
 import type { BarSeriesOption, PieSeriesOption } from "echarts/charts";
 import { PieChart } from "echarts/charts";
 import type { ECElementEvent } from "echarts/types/dist/shared";
-import type { PieDataItemOption } from "echarts/types/src/chart/pie/PieSeries";
 import { filterXSS } from "../../../../common/util/xss";
 import { getGraphColorByIndex } from "../../../../common/color/colors";
 import { formatNumber } from "../../../../common/number/format_number";
@@ -388,7 +387,6 @@ export class HuiEnergyDevicesGraphCard
     });
 
     if (this._chartType === "pie") {
-      const pieChartData = chartData as NonNullable<PieSeriesOption["data"]>;
       const { summedData, compareSummedData } = getSummedData(energyData);
       const { consumption, compareConsumption } = computeConsumptionData(
         summedData,
@@ -401,10 +399,7 @@ export class HuiEnergyDevicesGraphCard
         "from_battery" in summedData;
       const untracked = showUntracked
         ? totalUsed -
-          pieChartData.reduce(
+          chartData.reduce((acc: number, d: any) => acc + d.value[0], 0)
-            (acc: number, d) => acc + (d as PieDataItemOption).value![0],
-            0
-          )
         : 0;
       if (untracked > 0) {
         const color = getEnergyColor(
@@ -414,7 +409,7 @@ export class HuiEnergyDevicesGraphCard
           false,
           "--history-unknown-color"
         );
-        pieChartData.push({
+        chartData.push({
           id: "untracked",
           value: [untracked, "untracked"] as any,
           name: this.hass.localize(
@@ -447,20 +442,13 @@ export class HuiEnergyDevicesGraphCard
           }
         }
       }
-      const totalChart = pieChartData.reduce(
-        (acc: number, d) =>
-          this._hiddenStats.includes((d as PieDataItemOption).id as string)
-            ? acc
-            : acc + (d as PieDataItemOption).value![0],
-        0
-      );
       datasets.push({
         type: "pie",
         radius: ["0%", compareData ? "30%" : "40%"],
         name: this.hass.localize(
           "ui.panel.lovelace.cards.energy.energy_devices_graph.total_energy_usage"
         ),
-        data: [totalChart],
+        data: [totalUsed],
         label: {
           show: true,
           position: "center",
@@ -468,7 +456,7 @@ export class HuiEnergyDevicesGraphCard
           fontSize: computedStyle.getPropertyValue("--ha-font-size-l"),
           lineHeight: 24,
           fontWeight: "bold",
-          formatter: `{a}\n${formatNumber(totalChart, this.hass.locale)} kWh`,
+          formatter: `{a}\n${formatNumber(totalUsed, this.hass.locale)} kWh`,
         },
         cursor: "default",
         itemStyle: {

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
+      const { area, floor } = getEntityContext(
-        ? getEntityContext(
+        entity,
-            entity,
+        this.hass.entities,
-            this.hass.entities,
+        this.hass.devices,
-            this.hass.devices,
+        this.hass.areas,
-            this.hass.areas,
+        this.hass.floors
-            this.hass.floors
+      );
-          )
-        : { area: null, floor: null };
       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-card.ts

@@ -2,16 +2,16 @@ import type { PropertyValues } from "lit";
 import { ReactiveElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
+import type { MediaQueriesListener } from "../../../common/dom/media_query";
 import "../../../components/ha-svg-icon";
 import type { LovelaceCardConfig } from "../../../data/lovelace/config/card";
 import type { HomeAssistant } from "../../../types";
-import {
-  ConditionalListenerMixin,
-  setupMediaQueryListeners,
-} from "../../../mixins/conditional-listener-mixin";
 import { migrateLayoutToGridOptions } from "../common/compute-card-grid-size";
 import { computeCardSize } from "../common/compute-card-size";
-import { checkConditionsMet } from "../common/validate-condition";
+import {
+  attachConditionMediaQueriesListeners,
+  checkConditionsMet,
+} from "../common/validate-condition";
 import { tryCreateCardElement } from "../create-element/create-card-element";
 import { createErrorCardElement } from "../create-element/create-element-base";
 import type { LovelaceCard, LovelaceGridOptions } from "../types";
@@ -24,7 +24,7 @@ declare global {
 }
 
 @customElement("hui-card")
-export class HuiCard extends ConditionalListenerMixin(ReactiveElement) {
+export class HuiCard extends ReactiveElement {
   @property({ type: Boolean }) public preview = false;
 
   @property({ attribute: false }) public config?: LovelaceCardConfig;
@@ -44,16 +44,20 @@ export class HuiCard extends ConditionalListenerMixin(ReactiveElement) {
 
   private _element?: LovelaceCard;
 
+  private _listeners: MediaQueriesListener[] = [];
+
   protected createRenderRoot() {
     return this;
   }
 
   public disconnectedCallback() {
     super.disconnectedCallback();
+    this._clearMediaQueries();
   }
 
   public connectedCallback() {
     super.connectedCallback();
+    this._listenMediaQueries();
     this._updateVisibility();
   }
 
@@ -247,17 +251,26 @@ export class HuiCard extends ConditionalListenerMixin(ReactiveElement) {
     }
   }
 
-  protected setupConditionalListeners() {
+  private _clearMediaQueries() {
-    if (!this.config?.visibility || !this.hass) {
+    this._listeners.forEach((unsub) => unsub());
+    this._listeners = [];
+  }
+
+  private _listenMediaQueries() {
+    this._clearMediaQueries();
+    if (!this.config?.visibility) {
       return;
     }
+    const conditions = this.config.visibility;
+    const hasOnlyMediaQuery =
+      conditions.length === 1 &&
+      conditions[0].condition === "screen" &&
+      !!conditions[0].media_query;
 
-    setupMediaQueryListeners(
+    this._listeners = attachConditionMediaQueriesListeners(
       this.config.visibility,
-      this.hass,
+      (matches) => {
-      (unsub) => this.addConditionalListener(unsub),
+        this._updateVisibility(hasOnlyMediaQuery && matches);
-      (conditionsMet) => {
-        this._updateVisibility(conditionsMet);
       }
     );
   }

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

@@ -33,7 +33,7 @@ import type { HomeSummaryCard } from "./types";
 const COLORS: Record<HomeSummary, string> = {
   light: "amber",
   climate: "deep-orange",
-  security: "blue-grey",
+  safety: "blue-grey",
   media_players: "blue",
 };
 
@@ -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;
@@ -142,20 +147,20 @@ export class HuiHomeSummaryCard extends LitElement implements LovelaceCard {
           ? `${formattedMinTemp}°`
           : `${formattedMinTemp} - ${formattedMaxTemp}°`;
       }
-      case "security": {
+      case "safety": {
         // Alarm and lock status
-        const securityFilters = HOME_SUMMARIES_FILTERS.security.map((filter) =>
+        const safetyFilters = HOME_SUMMARIES_FILTERS.safety.map((filter) =>
           generateEntityFilter(this.hass!, filter)
         );
 
-        const securityEntities = findEntities(allEntities, securityFilters);
+        const safetyEntities = findEntities(entitiesInsideArea, safetyFilters);
 
-        const locks = securityEntities.filter((entityId) => {
+        const locks = safetyEntities.filter((entityId) => {
           const domain = computeDomain(entityId);
           return domain === "lock";
         });
 
-        const alarms = securityEntities.filter((entityId) => {
+        const alarms = safetyEntities.filter((entityId) => {
           const domain = computeDomain(entityId);
           return domain === "alarm_control_panel";
         });
@@ -199,7 +204,7 @@ export class HuiHomeSummaryCard extends LitElement implements LovelaceCard {
         );
 
         const mediaPlayerEntities = findEntities(
-          allEntities,
+          entitiesInsideArea,
           mediaPlayerFilters
         );
 

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

@@ -1,6 +1,5 @@
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
 import { ifDefined } from "lit/directives/if-defined";
 import { styleMap } from "lit/directives/style-map";
 import parseAspectRatio from "../../../common/util/parse-aspect-ratio";
@@ -98,10 +97,7 @@ export class HuiIframeCard extends LitElement implements LovelaceCard {
       : `${sandbox_user_params} ${IFRAME_SANDBOX}`;
 
     return html`
-      <ha-card
+      <ha-card .header=${this._config.title}>
-        class=${classMap({ "hide-background": this._config.hide_background })}
-        .header=${this._config.title}
-      >
         <div
           id="root"
           style=${styleMap({
@@ -137,12 +133,6 @@ export class HuiIframeCard extends LitElement implements LovelaceCard {
       flex-direction: column;
     }
 
-    ha-card.hide-background {
-      background: transparent;
-      box-shadow: none;
-      border: none;
-    }
-
     #root {
       width: 100%;
       height: 100%;

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

@@ -79,11 +79,6 @@ export abstract class HuiStackCard<T extends StackCardConfig = StackCardConfig>
           this._errorCard.preview = this.preview;
         }
       }
-      if (changedProperties.has("layout")) {
-        this._cards.forEach((card) => {
-          card.layout = this.layout;
-        });
-      }
     }
 
     if (changedProperties.has("layout")) {
@@ -95,7 +90,6 @@ export abstract class HuiStackCard<T extends StackCardConfig = StackCardConfig>
     const element = document.createElement("hui-card");
     element.hass = this.hass;
     element.preview = this.preview;
-    element.layout = this.layout;
     element.config = cardConfig;
     element.load();
     return element;

src/panels/lovelace/cards/types.ts

@@ -323,7 +323,6 @@ export interface IframeCardConfig extends LovelaceCardConfig {
   title?: string;
   allow?: string;
   url: string;
-  hide_background?: boolean;
 }
 
 export interface LightCardConfig extends LovelaceCardConfig {

src/panels/lovelace/common/graph/coordinates.ts

@@ -20,11 +20,10 @@ const calcPoints = (
     }
   });
   const rangeY = maxY - minY || minY * 0.1;
-  // add top and bottom margins to prevent cropping
-  maxY += rangeY * 0.1;
-  minY -= rangeY * 0.1;
   if (maxY < 0) {
     // all values are negative
+    // add margin
+    maxY += rangeY * 0.1;
     maxY = Math.min(0, maxY);
     yAxisOrigin = 0;
   } else if (minY < 0) {
@@ -32,6 +31,8 @@ const calcPoints = (
     yAxisOrigin = (maxY / (maxY - minY || 1)) * height;
   } else {
     // all values are positive
+    // add margin
+    minY -= rangeY * 0.1;
     minY = Math.max(0, minY);
   }
   const yDenom = maxY - minY || 1;

src/panels/lovelace/common/handle-action.ts

@@ -67,7 +67,7 @@ export const handleAction = async (
         await hass.loadBackendTranslation("title");
         const localize = await hass.loadBackendTranslation("services");
         serviceName = `${domainToName(localize, domain)}: ${
-          localize(`component.${domain}.services.${service}.name`) ||
+          localize(`component.${domain}.services.${serviceName}.name`) ||
           serviceDomains[domain][service].name ||
           service
         }`;

src/panels/lovelace/common/validate-condition.ts

@@ -1,4 +1,6 @@
 import { ensureArray } from "../../../common/array/ensure-array";
+import type { MediaQueriesListener } from "../../../common/dom/media_query";
+import { listenMediaQuery } from "../../../common/dom/media_query";
 
 import { isValidEntityId } from "../../../common/entity/valid_entity_id";
 import { UNKNOWN } from "../../../data/entity";
@@ -360,3 +362,31 @@ export function addEntityToCondition(
   }
   return condition;
 }
+
+export function extractMediaQueries(conditions: Condition[]): string[] {
+  return conditions.reduce<string[]>((array, c) => {
+    if ("conditions" in c && c.conditions) {
+      array.push(...extractMediaQueries(c.conditions));
+    }
+    if (c.condition === "screen" && c.media_query) {
+      array.push(c.media_query);
+    }
+    return array;
+  }, []);
+}
+
+export function attachConditionMediaQueriesListeners(
+  conditions: Condition[],
+  onChange: (visibility: boolean) => void
+): MediaQueriesListener[] {
+  const mediaQueries = extractMediaQueries(conditions);
+
+  const listeners = mediaQueries.map((query) => {
+    const listener = listenMediaQuery(query, (matches) => {
+      onChange(matches);
+    });
+    return listener;
+  });
+
+  return listeners;
+}

src/panels/lovelace/components/hui-conditional-base.ts

@@ -1,16 +1,16 @@
 import type { PropertyValues } from "lit";
 import { ReactiveElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import type { MediaQueriesListener } from "../../../common/dom/media_query";
+import { deepEqual } from "../../../common/util/deep-equal";
 import type { HomeAssistant } from "../../../types";
-import {
-  ConditionalListenerMixin,
-  setupMediaQueryListeners,
-} from "../../../mixins/conditional-listener-mixin";
 import type { HuiCard } from "../cards/hui-card";
 import type { ConditionalCardConfig } from "../cards/types";
 import type { Condition } from "../common/validate-condition";
 import {
+  attachConditionMediaQueriesListeners,
   checkConditionsMet,
+  extractMediaQueries,
   validateConditionalConfig,
 } from "../common/validate-condition";
 import type { ConditionalRowConfig, LovelaceRow } from "../entity-rows/types";
@@ -22,9 +22,7 @@ declare global {
 }
 
 @customElement("hui-conditional-base")
-export class HuiConditionalBase extends ConditionalListenerMixin(
+export class HuiConditionalBase extends ReactiveElement {
-  ReactiveElement
-) {
   @property({ attribute: false }) public hass?: HomeAssistant;
 
   @property({ type: Boolean }) public preview = false;
@@ -33,6 +31,10 @@ export class HuiConditionalBase extends ConditionalListenerMixin(
 
   protected _element?: HuiCard | LovelaceRow;
 
+  private _listeners: MediaQueriesListener[] = [];
+
+  private _mediaQueries: string[] = [];
+
   protected createRenderRoot() {
     return this;
   }
@@ -61,14 +63,21 @@ export class HuiConditionalBase extends ConditionalListenerMixin(
 
   public disconnectedCallback() {
     super.disconnectedCallback();
+    this._clearMediaQueries();
   }
 
   public connectedCallback() {
     super.connectedCallback();
+    this._listenMediaQueries();
     this._updateVisibility();
   }
 
-  protected setupConditionalListeners() {
+  private _clearMediaQueries() {
+    this._listeners.forEach((unsub) => unsub());
+    this._listeners = [];
+  }
+
+  private _listenMediaQueries() {
     if (!this._config || !this.hass) {
       return;
     }
@@ -76,13 +85,27 @@ export class HuiConditionalBase extends ConditionalListenerMixin(
     const supportedConditions = this._config.conditions.filter(
       (c) => "condition" in c
     ) as Condition[];
+    const mediaQueries = extractMediaQueries(supportedConditions);
 
-    setupMediaQueryListeners(
+    if (deepEqual(mediaQueries, this._mediaQueries)) return;
+
+    this._clearMediaQueries();
+
+    const conditions = this._config.conditions;
+    const hasOnlyMediaQuery =
+      conditions.length === 1 &&
+      "condition" in conditions[0] &&
+      conditions[0].condition === "screen" &&
+      !!conditions[0].media_query;
+
+    this._listeners = attachConditionMediaQueriesListeners(
       supportedConditions,
-      this.hass,
+      (matches) => {
-      (unsub) => this.addConditionalListener(unsub),
+        if (hasOnlyMediaQuery) {
-      (conditionsMet) => {
+          this.setVisibility(matches);
-        this.setVisibility(conditionsMet);
+          return;
+        }
+        this._updateVisibility();
       }
     );
   }
@@ -96,8 +119,7 @@ export class HuiConditionalBase extends ConditionalListenerMixin(
       changed.has("hass") ||
       changed.has("preview")
     ) {
-      this.clearConditionalListeners();
+      this._listenMediaQueries();
-      this.setupConditionalListeners();
       this._updateVisibility();
     }
   }

src/panels/lovelace/editor/config-elements/hui-iframe-card-editor.ts

@@ -16,7 +16,6 @@ const cardConfigStruct = assign(
     url: optional(string()),
     aspect_ratio: optional(string()),
     allow_open_top_navigation: optional(boolean()),
-    hide_background: optional(boolean()),
   })
 );
 
@@ -30,7 +29,6 @@ const SCHEMA = [
       { name: "aspect_ratio", selector: { text: {} } },
     ],
   },
-  { name: "hide_background", selector: { boolean: {} } },
 ] as const;
 
 @customElement("hui-iframe-card-editor")
@@ -58,7 +56,6 @@ export class HuiIframeCardEditor
         .data=${this._config}
         .schema=${SCHEMA}
         .computeLabel=${this._computeLabelCallback}
-        .computeHelper=${this._computeHelperCallback}
         @value-changed=${this._valueChanged}
       ></ha-form>
     `;
@@ -68,29 +65,8 @@ export class HuiIframeCardEditor
     fireEvent(this, "config-changed", { config: ev.detail.value });
   }
 
-  private _computeLabelCallback = (schema: SchemaUnion<typeof SCHEMA>) => {
+  private _computeLabelCallback = (schema: SchemaUnion<typeof SCHEMA>) =>
-    switch (schema.name) {
+    this.hass!.localize(`ui.panel.lovelace.editor.card.generic.${schema.name}`);
-      case "hide_background":
-        return this.hass!.localize(
-          "ui.panel.lovelace.editor.card.iframe.hide_background"
-        );
-      default:
-        return this.hass!.localize(
-          `ui.panel.lovelace.editor.card.generic.${schema.name}`
-        );
-    }
-  };
-
-  private _computeHelperCallback = (schema: SchemaUnion<typeof SCHEMA>) => {
-    switch (schema.name) {
-      case "hide_background":
-        return this.hass!.localize(
-          "ui.panel.lovelace.editor.card.iframe.hide_background_helper"
-        );
-      default:
-        return "";
-    }
-  };
 }
 
 declare global {

src/panels/lovelace/editor/config-elements/hui-logbook-card-editor.ts

@@ -1,7 +1,5 @@
-import type { HassServiceTarget } from "home-assistant-js-websocket";
+import { html, LitElement, nothing } from "lit";
-import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import {
   array,
   assert,
@@ -11,21 +9,23 @@ import {
   optional,
   string,
 } from "superstruct";
+import type { HassServiceTarget } from "home-assistant-js-websocket";
+import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entities-picker";
+import "../../../../components/ha-target-picker";
 import "../../../../components/ha-form/ha-form";
 import type { SchemaUnion } from "../../../../components/ha-form/types";
-import "../../../../components/ha-target-picker";
-import type { HaEntityPickerEntityFilterFunc } from "../../../../data/entity";
 import { filterLogbookCompatibleEntities } from "../../../../data/logbook";
-import { targetStruct } from "../../../../data/script";
-import { resolveEntityIDs } from "../../../../data/selector";
-import { getSensorNumericDeviceClasses } from "../../../../data/sensor";
 import type { HomeAssistant } from "../../../../types";
-import { DEFAULT_HOURS_TO_SHOW } from "../../cards/hui-logbook-card";
 import type { LogbookCardConfig } from "../../cards/types";
 import type { LovelaceCardEditor } from "../../types";
 import { baseLovelaceCardConfig } from "../structs/base-card-struct";
+import { DEFAULT_HOURS_TO_SHOW } from "../../cards/hui-logbook-card";
+import { targetStruct } from "../../../../data/script";
+import { getSensorNumericDeviceClasses } from "../../../../data/sensor";
+import type { HaEntityPickerEntityFilterFunc } from "../../../../data/entity";
+import { resolveEntityIDs } from "../../../../data/selector";
 
 const cardConfigStruct = assign(
   baseLovelaceCardConfig,
@@ -132,6 +132,7 @@ export class HuiLogbookCardEditor
         .hass=${this.hass}
         .entityFilter=${this._filterFunc}
         .value=${this._targetPicker}
+        add-on-top
         @value-changed=${this._entitiesChanged}
       ></ha-target-picker>
     `;
@@ -188,13 +189,6 @@ export class HuiLogbookCardEditor
         );
     }
   };
-
-  static styles = css`
-    ha-target-picker {
-      display: block;
-      margin-top: var(--ha-space-4);
-    }
-  `;
 }
 
 declare global {

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/heading-badges/hui-heading-badge.ts

@@ -2,13 +2,13 @@ import type { PropertyValues } from "lit";
 import { ReactiveElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
+import type { MediaQueriesListener } from "../../../common/dom/media_query";
 import "../../../components/ha-svg-icon";
 import type { HomeAssistant } from "../../../types";
 import {
-  ConditionalListenerMixin,
+  attachConditionMediaQueriesListeners,
-  setupMediaQueryListeners,
+  checkConditionsMet,
-} from "../../../mixins/conditional-listener-mixin";
+} from "../common/validate-condition";
-import { checkConditionsMet } from "../common/validate-condition";
 import { createHeadingBadgeElement } from "../create-element/create-heading-badge-element";
 import type { LovelaceHeadingBadge } from "../types";
 import type { LovelaceHeadingBadgeConfig } from "./types";
@@ -21,7 +21,7 @@ declare global {
 }
 
 @customElement("hui-heading-badge")
-export class HuiHeadingBadge extends ConditionalListenerMixin(ReactiveElement) {
+export class HuiHeadingBadge extends ReactiveElement {
   @property({ type: Boolean }) public preview = false;
 
   @property({ attribute: false }) public config?: LovelaceHeadingBadgeConfig;
@@ -39,16 +39,20 @@ export class HuiHeadingBadge extends ConditionalListenerMixin(ReactiveElement) {
 
   private _element?: LovelaceHeadingBadge;
 
+  private _listeners: MediaQueriesListener[] = [];
+
   protected createRenderRoot() {
     return this;
   }
 
   public disconnectedCallback() {
     super.disconnectedCallback();
+    this._clearMediaQueries();
   }
 
   public connectedCallback() {
     super.connectedCallback();
+    this._listenMediaQueries();
     this._updateVisibility();
   }
 
@@ -133,17 +137,26 @@ export class HuiHeadingBadge extends ConditionalListenerMixin(ReactiveElement) {
     }
   }
 
-  protected setupConditionalListeners() {
+  private _clearMediaQueries() {
-    if (!this.config?.visibility || !this.hass) {
+    this._listeners.forEach((unsub) => unsub());
+    this._listeners = [];
+  }
+
+  private _listenMediaQueries() {
+    this._clearMediaQueries();
+    if (!this.config?.visibility) {
       return;
     }
+    const conditions = this.config.visibility;
+    const hasOnlyMediaQuery =
+      conditions.length === 1 &&
+      conditions[0].condition === "screen" &&
+      !!conditions[0].media_query;
 
-    setupMediaQueryListeners(
+    this._listeners = attachConditionMediaQueriesListeners(
       this.config.visibility,
-      this.hass,
+      (matches) => {
-      (unsub) => this.addConditionalListener(unsub),
+        this._updateVisibility(hasOnlyMediaQuery && matches);
-      (conditionsMet) => {
-        this._updateVisibility(conditionsMet);
       }
     );
   }

src/panels/lovelace/hui-root.ts

@@ -391,11 +391,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/sections/hui-section.ts

@@ -4,6 +4,7 @@ import { ReactiveElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { storage } from "../../../common/decorators/storage";
 import { fireEvent } from "../../../common/dom/fire_event";
+import type { MediaQueriesListener } from "../../../common/dom/media_query";
 import "../../../components/ha-svg-icon";
 import type { LovelaceSectionElement } from "../../../data/lovelace";
 import type { LovelaceCardConfig } from "../../../data/lovelace/config/card";
@@ -13,13 +14,12 @@ import type {
 } from "../../../data/lovelace/config/section";
 import { isStrategySection } from "../../../data/lovelace/config/section";
 import type { HomeAssistant } from "../../../types";
-import {
-  ConditionalListenerMixin,
-  setupMediaQueryListeners,
-} from "../../../mixins/conditional-listener-mixin";
 import "../cards/hui-card";
 import type { HuiCard } from "../cards/hui-card";
-import { checkConditionsMet } from "../common/validate-condition";
+import {
+  attachConditionMediaQueriesListeners,
+  checkConditionsMet,
+} from "../common/validate-condition";
 import { createSectionElement } from "../create-element/create-section-element";
 import { showCreateCardDialog } from "../editor/card-editor/show-create-card-dialog";
 import { showEditCardDialog } from "../editor/card-editor/show-edit-card-dialog";
@@ -37,7 +37,7 @@ declare global {
 }
 
 @customElement("hui-section")
-export class HuiSection extends ConditionalListenerMixin(ReactiveElement) {
+export class HuiSection extends ReactiveElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ attribute: false }) public config!: LovelaceSectionRawConfig;
@@ -59,6 +59,8 @@ export class HuiSection extends ConditionalListenerMixin(ReactiveElement) {
 
   private _layoutElement?: LovelaceSectionElement;
 
+  private _listeners: MediaQueriesListener[] = [];
+
   private _config: LovelaceSectionConfig | undefined;
 
   @storage({
@@ -112,10 +114,14 @@ export class HuiSection extends ConditionalListenerMixin(ReactiveElement) {
 
   public disconnectedCallback() {
     super.disconnectedCallback();
+    this._clearMediaQueries();
   }
 
   public connectedCallback() {
     super.connectedCallback();
+    if (this.hasUpdated) {
+      this._listenMediaQueries();
+    }
     this._updateElement();
   }
 
@@ -152,17 +158,26 @@ export class HuiSection extends ConditionalListenerMixin(ReactiveElement) {
     }
   }
 
-  protected setupConditionalListeners() {
+  private _clearMediaQueries() {
-    if (!this._config?.visibility || !this.hass) {
+    this._listeners.forEach((unsub) => unsub());
+    this._listeners = [];
+  }
+
+  private _listenMediaQueries() {
+    this._clearMediaQueries();
+    if (!this._config?.visibility) {
       return;
     }
+    const conditions = this._config.visibility;
+    const hasOnlyMediaQuery =
+      conditions.length === 1 &&
+      conditions[0].condition === "screen" &&
+      conditions[0].media_query != null;
 
-    setupMediaQueryListeners(
+    this._listeners = attachConditionMediaQueriesListeners(
       this._config.visibility,
-      this.hass,
+      (matches) => {
-      (unsub) => this.addConditionalListener(unsub),
+        this._updateElement(hasOnlyMediaQuery && matches);
-      (conditionsMet) => {
-        this._updateElement(conditionsMet);
       }
     );
   }
@@ -184,6 +199,9 @@ export class HuiSection extends ConditionalListenerMixin(ReactiveElement) {
       type: sectionConfig.type || DEFAULT_SECTION_LAYOUT,
     };
     this._config = sectionConfig;
+    if (this.isConnected) {
+      this._listenMediaQueries();
+    }
 
     // Create a new layout element if necessary.
     let addLayoutElement = false;

src/panels/lovelace/strategies/get-strategy.ts

@@ -48,7 +48,7 @@ const STRATEGIES: Record<LovelaceStrategyConfigType, Record<string, any>> = {
       import("./home/home-media-players-view-strategy"),
     "home-area": () => import("./home/home-area-view-strategy"),
     light: () => import("../../light/strategies/light-view-strategy"),
-    security: () => import("../../security/strategies/security-view-strategy"),
+    safety: () => import("../../safety/strategies/safety-view-strategy"),
     climate: () => import("../../climate/strategies/climate-view-strategy"),
   },
   section: {

src/panels/lovelace/strategies/home/helpers/home-summaries.ts

@@ -2,12 +2,12 @@ import type { EntityFilter } from "../../../../../common/entity/entity_filter";
 import type { LocalizeFunc } from "../../../../../common/translations/localize";
 import { climateEntityFilters } from "../../../../climate/strategies/climate-view-strategy";
 import { lightEntityFilters } from "../../../../light/strategies/light-view-strategy";
-import { securityEntityFilters } from "../../../../security/strategies/security-view-strategy";
+import { safetyEntityFilters } from "../../../../safety/strategies/safety-view-strategy";
 
 export const HOME_SUMMARIES = [
   "light",
   "climate",
-  "security",
+  "safety",
   "media_players",
 ] as const;
 
@@ -16,14 +16,14 @@ export type HomeSummary = (typeof HOME_SUMMARIES)[number];
 export const HOME_SUMMARIES_ICONS: Record<HomeSummary, string> = {
   light: "mdi:lamps",
   climate: "mdi:home-thermometer",
-  security: "mdi:security",
+  safety: "mdi:security",
   media_players: "mdi:multimedia",
 };
 
 export const HOME_SUMMARIES_FILTERS: Record<HomeSummary, EntityFilter[]> = {
   light: lightEntityFilters,
   climate: climateEntityFilters,
-  security: securityEntityFilters,
+  safety: safetyEntityFilters,
   media_players: [{ domain: "media_player", entity_category: "none" }],
 };
 
@@ -31,7 +31,7 @@ export const getSummaryLabel = (
   localize: LocalizeFunc,
   summary: HomeSummary
 ) => {
-  if (summary === "light" || summary === "climate" || summary === "security") {
+  if (summary === "light" || summary === "climate" || summary === "safety") {
     return localize(`panel.${summary}`);
   }
   return localize(`ui.panel.lovelace.strategy.home.summary_list.${summary}`);

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

@@ -104,7 +104,7 @@ export class HomeAreaViewStrategy extends ReactiveElement {
     const {
       light,
       climate,
-      security,
+      safety,
       media_players: mediaPlayers,
     } = entitiesBySummary;
 
@@ -136,16 +136,16 @@ export class HomeAreaViewStrategy extends ReactiveElement {
       });
     }
 
-    if (security.length > 0) {
+    if (safety.length > 0) {
       sections.push({
         type: "grid",
         cards: [
           computeHeadingCard(
-            getSummaryLabel(hass.localize, "security"),
+            getSummaryLabel(hass.localize, "safety"),
-            HOME_SUMMARIES_ICONS.security,
+            HOME_SUMMARIES_ICONS.safety,
-            "/security?historyBack=1"
+            "/safety?historyBack=1"
           ),
-          ...security.map(computeTileCard),
+          ...safety.map(computeTileCard),
         ],
       });
     }

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 {
+import { generateEntityFilter } from "../../../../common/entity/entity_filter";
-  findEntities,
-  generateEntityFilter,
-} from "../../../../common/entity/entity_filter";
-import { floorDefaultIcon } from "../../../../components/ha-floor-icon";
 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 summarySection: LovelaceSectionConfig = {
-
+      type: "grid",
-    const mediaPlayerFilter = HOME_SUMMARIES_FILTERS.media_players.map(
+      column_span: maxColumns,
-      (filter) => generateEntityFilter(hass, filter)
+      cards: [
-    );
+        {
-
+          type: "heading",
-    const lightsFilters = HOME_SUMMARIES_FILTERS.light.map((filter) =>
+          heading: hass.localize("ui.panel.lovelace.strategy.home.summaries"),
-      generateEntityFilter(hass, filter)
+        },
-    );
+        {
-
-    const climateFilters = HOME_SUMMARIES_FILTERS.climate.map((filter) =>
-      generateEntityFilter(hass, filter)
-    );
-
-    const securityFilters = HOME_SUMMARIES_FILTERS.security.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 hasSecurity = findEntities(allEntities, securityFilters).length > 0;
-
-    const summaryCards: LovelaceCardConfig[] = [
-      hasLights &&
-        ({
           type: "home-summary",
           summary: "light",
           vertical: true,
@@ -186,9 +164,8 @@ export class HomeMainViewStrategy extends ReactiveElement {
             rows: 2,
             columns: 4,
           },
-        } satisfies HomeSummaryCard),
+        } satisfies HomeSummaryCard,
-      hasClimate &&
+        {
-        ({
           type: "home-summary",
           summary: "climate",
           vertical: true,
@@ -200,23 +177,21 @@ export class HomeMainViewStrategy extends ReactiveElement {
             rows: 2,
             columns: 4,
           },
-        } satisfies HomeSummaryCard),
+        } satisfies HomeSummaryCard,
-      hasSecurity &&
+        {
-        ({
           type: "home-summary",
-          summary: "security",
+          summary: "safety",
           vertical: true,
           tap_action: {
             action: "navigate",
-            navigation_path: "/security?historyBack=1",
+            navigation_path: "/safety?historyBack=1",
           },
           grid_options: {
             rows: 2,
             columns: 4,
           },
-        } satisfies HomeSummaryCard),
+        } satisfies HomeSummaryCard,
-      hasMediaPlayers &&
+        {
-        ({
           type: "home-summary",
           summary: "media_players",
           vertical: true,
@@ -228,25 +203,10 @@ export class HomeMainViewStrategy extends ReactiveElement {
             rows: 2,
             columns: 4,
           },
-        } satisfies HomeSummaryCard),
+        } satisfies HomeSummaryCard,
-    ].filter(Boolean) as LovelaceCardConfig[];
+      ],
-
-    const summarySection: LovelaceSectionConfig = {
-      type: "grid",
-      column_span: maxColumns,
-      cards: [],
     };
 
-    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/ha-panel-safety.ts

@@ -1,27 +1,28 @@
-import type { CSSResultGroup, PropertyValues } from "lit";
+import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
-import { LitElement, css, html, nothing } from "lit";
+import { LitElement, css, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { goBack } from "../../common/navigate";
-import { debounce } from "../../common/util/debounce";
-import { deepEqual } from "../../common/util/deep-equal";
 import "../../components/ha-icon-button-arrow-prev";
 import "../../components/ha-menu-button";
-import type { LovelaceStrategyViewConfig } from "../../data/lovelace/config/view";
+import type { LovelaceConfig } from "../../data/lovelace/config/types";
 import { haStyle } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
-import { generateLovelaceViewStrategy } from "../lovelace/strategies/get-strategy";
 import type { Lovelace } from "../lovelace/types";
 import "../lovelace/views/hui-view";
 import "../lovelace/views/hui-view-container";
 
-const SECURITY_LOVELACE_VIEW_CONFIG: LovelaceStrategyViewConfig = {
+const SAFETY_LOVELACE_CONFIG: LovelaceConfig = {
-  strategy: {
+  views: [
-    type: "security",
+    {
-  },
+      strategy: {
+        type: "safety",
+      },
+    },
+  ],
 };
 
-@customElement("ha-panel-security")
+@customElement("ha-panel-safety")
-class PanelSecurity extends LitElement {
+class PanelSafety extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ type: Boolean, reflect: true }) public narrow = false;
@@ -33,120 +34,62 @@ class PanelSecurity extends LitElement {
   @state() private _searchParms = new URLSearchParams(window.location.search);
 
   public willUpdate(changedProps: PropertyValues) {
-    super.willUpdate(changedProps);
-    // Initial setup
     if (!this.hasUpdated) {
       this.hass.loadFragmentTranslation("lovelace");
-      this._setLovelace();
-      return;
     }
-
     if (!changedProps.has("hass")) {
       return;
     }
-
     const oldHass = changedProps.get("hass") as this["hass"];
-    if (oldHass && oldHass.localize !== this.hass.localize) {
+    if (oldHass?.locale !== this.hass.locale) {
       this._setLovelace();
-      return;
-    }
-
-    if (oldHass && this.hass) {
-      // If the entity registry changed, ask the user if they want to refresh the config
-      if (
-        oldHass.entities !== this.hass.entities ||
-        oldHass.devices !== this.hass.devices ||
-        oldHass.areas !== this.hass.areas ||
-        oldHass.floors !== this.hass.floors
-      ) {
-        if (this.hass.config.state === "RUNNING") {
-          this._debounceRegistriesChanged();
-          return;
-        }
-      }
-      // If ha started, refresh the config
-      if (
-        this.hass.config.state === "RUNNING" &&
-        oldHass.config.state !== "RUNNING"
-      ) {
-        this._setLovelace();
-      }
     }
   }
 
-  private _debounceRegistriesChanged = debounce(
-    () => this._registriesChanged(),
-    200
-  );
-
-  private _registriesChanged = async () => {
-    this._setLovelace();
-  };
-
   private _back(ev) {
     ev.stopPropagation();
     goBack();
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     return html`
       <div class="header">
         <div class="toolbar">
-          ${
+          ${this._searchParms.has("historyBack")
-            this._searchParms.has("historyBack")
+            ? html`
-              ? html`
+                <ha-icon-button-arrow-prev
-                  <ha-icon-button-arrow-prev
+                  @click=${this._back}
-                    @click=${this._back}
+                  slot="navigationIcon"
-                    slot="navigationIcon"
+                ></ha-icon-button-arrow-prev>
-                  ></ha-icon-button-arrow-prev>
+              `
-                `
+            : html`
-              : html`
+                <ha-menu-button
-                  <ha-menu-button
+                  slot="navigationIcon"
-                    slot="navigationIcon"
-                    .hass=${this.hass}
-                    .narrow=${this.narrow}
-                  ></ha-menu-button>
-                `
-          }
-          <div class="main-title">${this.hass.localize("panel.security")}</div>
-        </div>
-      </div>
-      ${
-        this._lovelace
-          ? html`
-              <hui-view-container .hass=${this.hass}>
-                <hui-view
                   .hass=${this.hass}
                   .narrow=${this.narrow}
-                  .lovelace=${this._lovelace}
+                ></ha-menu-button>
-                  .index=${this._viewIndex}
+              `}
-                ></hui-view
+          <div class="main-title">${this.hass.localize("panel.safety")}</div>
-              ></hui-view-container>
+        </div>
-            `
+      </div>
-          : nothing
+
-      }
+      <hui-view-container .hass=${this.hass}>
+        <hui-view
+          .hass=${this.hass}
+          .narrow=${this.narrow}
+          .lovelace=${this._lovelace}
+          .index=${this._viewIndex}
+        ></hui-view>
       </hui-view-container>
     `;
   }
 
-  private async _setLovelace() {
+  private _setLovelace() {
-    const viewConfig = await generateLovelaceViewStrategy(
-      SECURITY_LOVELACE_VIEW_CONFIG,
-      this.hass
-    );
-
-    const config = { views: [viewConfig] };
-    const rawConfig = { views: [SECURITY_LOVELACE_VIEW_CONFIG] };
-
-    if (deepEqual(config, this._lovelace?.config)) {
-      return;
-    }
-
     this._lovelace = {
-      config: config,
+      config: SAFETY_LOVELACE_CONFIG,
-      rawConfig: rawConfig,
+      rawConfig: SAFETY_LOVELACE_CONFIG,
       editMode: false,
-      urlPath: "security",
+      urlPath: "safety",
       mode: "generated",
       locale: this.hass.locale,
       enableFullEditMode: () => undefined,
@@ -248,6 +191,6 @@ class PanelSecurity extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "ha-panel-security": PanelSecurity;
+    "ha-panel-safety": PanelSafety;
   }
 }

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

@@ -17,11 +17,11 @@ import {
 } from "../../lovelace/strategies/areas/helpers/areas-strategy-helper";
 import { getHomeStructure } from "../../lovelace/strategies/home/helpers/home-structure";
 
-export interface SecurityViewStrategyConfig {
+export interface SafetyViewStrategyConfig {
-  type: "security";
+  type: "safety";
 }
 
-export const securityEntityFilters: EntityFilter[] = [
+export const safetyEntityFilters: EntityFilter[] = [
   {
     domain: "camera",
     entity_category: "none",
@@ -67,7 +67,7 @@ export const securityEntityFilters: EntityFilter[] = [
   },
 ];
 
-const processAreasForSecurity = (
+const processAreasForSafety = (
   areaIds: string[],
   hass: HomeAssistant,
   entities: string[]
@@ -81,12 +81,12 @@ const processAreasForSecurity = (
     const areaFilter = generateEntityFilter(hass, {
       area: area.area_id,
     });
-    const areaSecurityEntities = entities.filter(areaFilter);
+    const areaSafetyEntities = entities.filter(areaFilter);
     const areaCards: LovelaceCardConfig[] = [];
 
     const computeTileCard = computeAreaTileCardConfig(hass, "", false);
 
-    for (const entityId of areaSecurityEntities) {
+    for (const entityId of areaSafetyEntities) {
       areaCards.push(computeTileCard(entityId));
     }
 
@@ -103,28 +103,10 @@ const processAreasForSecurity = (
   return cards;
 };
 
-const processUnassignedEntities = (
+@customElement("safety-view-strategy")
-  hass: HomeAssistant,
+export class SafetyViewStrategy extends ReactiveElement {
-  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("security-view-strategy")
-export class SecurityViewStrategy extends ReactiveElement {
   static async generate(
-    _config: SecurityViewStrategyConfig,
+    _config: SafetyViewStrategyConfig,
     hass: HomeAssistant
   ): Promise<LovelaceViewConfig> {
     const areas = getAreas(hass.areas);
@@ -135,11 +117,11 @@ export class SecurityViewStrategy extends ReactiveElement {
 
     const allEntities = Object.keys(hass.states);
 
-    const securityFilters = securityEntityFilters.map((filter) =>
+    const safetyFilters = safetyEntityFilters.map((filter) =>
       generateEntityFilter(hass, filter)
     );
 
-    const entities = findEntities(allEntities, securityFilters);
+    const entities = findEntities(allEntities, safetyFilters);
 
     const floorCount = home.floors.length + (home.areas.length ? 1 : 0);
 
@@ -164,7 +146,7 @@ export class SecurityViewStrategy extends ReactiveElement {
         ],
       };
 
-      const areaCards = processAreasForSecurity(areaIds, hass, entities);
+      const areaCards = processAreasForSafety(areaIds, hass, entities);
 
       if (areaCards.length > 0) {
         section.cards!.push(...areaCards);
@@ -188,7 +170,7 @@ export class SecurityViewStrategy extends ReactiveElement {
         ],
       };
 
-      const areaCards = processAreasForSecurity(home.areas, hass, entities);
+      const areaCards = processAreasForSafety(home.areas, hass, entities);
 
       if (areaCards.length > 0) {
         section.cards!.push(...areaCards);
@@ -196,39 +178,16 @@ export class SecurityViewStrategy 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.security.other_devices"
-                  )
-                : hass.localize("ui.panel.lovelace.strategy.security.devices"),
-          },
-          ...unassignedCards,
-        ],
-      };
-      sections.push(section);
-    }
-
     return {
       type: "sections",
       max_columns: 2,
-      sections: sections,
+      sections: sections || [],
     };
   }
 }
 
 declare global {
   interface HTMLElementTagNameMap {
-    "security-view-strategy": SecurityViewStrategy;
+    "safety-view-strategy": SafetyViewStrategy;
   }
 }

src/translations/en.json

@@ -12,7 +12,7 @@
     "media_browser": "Media",
     "profile": "Profile",
     "light": "Lights",
-    "security": "Security",
+    "safety": "Safety",
     "climate": "Climate"
   },
   "state": {
@@ -684,10 +684,10 @@
       },
       "target-picker": {
         "expand": "Expand",
-        "expand_floor_id": "Split this floor into separate areas",
+        "expand_floor_id": "Split this floor into separate areas.",
-        "expand_area_id": "Split this area into separate devices and entities",
+        "expand_area_id": "Split this area into separate devices and entities.",
-        "expand_device_id": "Split this device into separate entities",
+        "expand_device_id": "Split this device into separate entities.",
-        "expand_label_id": "Split this label into separate areas, devices and entities",
+        "expand_label_id": "Split this label into separate areas, devices and entities.",
         "add_target": "Add target",
         "remove": "Remove",
         "remove_floor_id": "Remove floor",
@@ -695,11 +695,6 @@
         "remove_device_id": "Remove device",
         "remove_entity_id": "Remove entity",
         "remove_label_id": "Remove label",
-        "floor_not_found": "Floor not found",
-        "area_not_found": "Area not found",
-        "device_not_found": "Device not found",
-        "entity_not_found": "Entity not found",
-        "label_not_found": "Label not found",
         "devices_count": "{count} {count, plural,\n one {device}\n other {devices}\n}",
         "entities_count": "{count} {count, plural,\n one {entity}\n other {entities}\n}",
         "target_details": "Target details",
@@ -829,6 +824,7 @@
         "add_new": "Add new area…",
         "no_areas": "You don't have any areas",
         "no_match": "No matching areas found",
+        "placeholder": "Select an area",
         "unassigned_areas": "Unassigned areas",
         "failed_create_area": "Failed to create area."
       },
@@ -1434,7 +1430,6 @@
         "back_to_info": "Back to info",
         "info": "Information",
         "related": "Related",
-        "add_entity_to": "Add to",
         "history": "History",
         "aggregate": "5-minute aggregated",
         "logbook": "Activity",
@@ -1451,10 +1446,6 @@
           "last_action": "Last action",
           "last_triggered": "Last triggered"
         },
-        "add_to": {
-          "no_actions": "No actions available",
-          "action_failed": "Failed to perform the action {error}"
-        },
         "sun": {
           "azimuth": "Azimuth",
           "elevation": "Elevation",
@@ -3076,7 +3067,6 @@
             "remove_co2_signal": "Remove Electricity Maps integration",
             "add_co2_signal": "Add Electricity Maps integration",
             "flow_dialog": {
-              "cost_entity_helper": "Any sensor with a unit of `{currency}/(valid energy unit)` (e.g. `{currency}/Wh` or `{currency}/kWh`) may be used and will be automatically converted.",
               "from": {
                 "header": "Configure grid consumption",
                 "paragraph": "Grid consumption is the energy that flows from the energy grid to your home.",
@@ -6562,8 +6552,7 @@
             "model": "Model",
             "status": "Status",
             "version": "Version",
-            "data_rate": "Data rate",
+            "data_rate": "Data rate"
-            "area": "Area"
           },
           "node_status": {
             "0": "Unknown",
@@ -6987,22 +6976,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"
-          },
-          "security": {
-            "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": {
@@ -7790,9 +7763,7 @@
             },
             "iframe": {
               "name": "Webpage",
-              "description": "The Webpage card allows you to embed your favorite webpage right into Home Assistant.",
+              "description": "The Webpage card allows you to embed your favorite webpage right into Home Assistant."
-              "hide_background": "Hide background",
-              "hide_background_helper": "Useful for pages which allow a transparent background."
             },
             "light": {
               "name": "Light",

src/types.ts

@@ -138,7 +138,6 @@ export interface PanelInfo<T = Record<string, any> | null> {
   title: string | null;
   url_path: string;
   config_panel_domain?: string;
-  default_visible?: boolean;
 }
 
 export type Panels = Record<string, PanelInfo>;

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);
-    });
-  });
 });