20240404.0 (#20414)

build-scripts/webpack.cjs

@@ -161,6 +161,7 @@ const createWebpackConfig = ({
     resolve: {
       extensions: [".ts", ".js", ".json"],
       alias: {
+        "lit/static-html$": "lit/static-html.js",
         "lit/decorators$": "lit/decorators.js",
         "lit/directive$": "lit/directive.js",
         "lit/directives/until$": "lit/directives/until.js",

gallery/src/pages/automation/describe-action.ts

@@ -136,7 +136,7 @@ export class DemoAutomationDescribeAction extends LitElement {
         <div class="action">
           <span>
             ${this._action
-              ? describeAction(this.hass, [], this._action)
+              ? describeAction(this.hass, [], [], [], this._action)
               : "<invalid YAML>"}
           </span>
           <ha-yaml-editor
@@ -149,7 +149,7 @@ export class DemoAutomationDescribeAction extends LitElement {
         ${ACTIONS.map(
           (conf) => html`
             <div class="action">
-              <span>${describeAction(this.hass, [], conf as any)}</span>
+              <span>${describeAction(this.hass, [], [], [], conf as any)}</span>
               <pre>${dump(conf)}</pre>
             </div>
           `

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20240403.1"
+version      = "20240404.0"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"

src/components/ha-filter-integrations.ts

@@ -1,4 +1,3 @@
-import { SelectedDetail } from "@material/mwc-list";
 import { mdiFilterVariantRemove } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -56,11 +55,7 @@ export class HaFilterIntegrations extends LitElement {
                 @value-changed=${this._handleSearchChange}
               >
               </search-input-outlined>
-              <mwc-list
+              <mwc-list class="ha-scrollbar" @click=${this._handleItemClick}>
-                @selected=${this._integrationsSelected}
-                multi
-                class="ha-scrollbar"
-              >
                 ${repeat(
                   this._integrations(this._manifests, this._filter, this.value),
                   (i) => i.domain,
@@ -92,7 +87,7 @@ export class HaFilterIntegrations extends LitElement {
       setTimeout(() => {
         if (!this.expanded) return;
         this.renderRoot.querySelector("mwc-list")!.style.height =
-          `${this.clientHeight - 49}px`;
+          `${this.clientHeight - 49 - 32}px`; // 32px is the height of the search input
       }, 300);
     }
   }
@@ -131,34 +126,21 @@ export class HaFilterIntegrations extends LitElement {
         )
   );
 
-  private async _integrationsSelected(
+  private _handleItemClick(ev) {
-    ev: CustomEvent<SelectedDetail<Set<number>>>
+    const listItem = ev.target.closest("ha-check-list-item");
-  ) {
+    const value = listItem?.value;
-    const integrations = this._integrations(
+    if (!value) {
-      this._manifests!,
-      this._filter,
-      this.value
-    );
-
-    if (!ev.detail.index.size) {
-      fireEvent(this, "data-table-filter-changed", {
-        value: [],
-        items: undefined,
-      });
-      this.value = [];
       return;
     }
-
+    if (this.value?.includes(value)) {
-    const value: string[] = [];
+      this.value = this.value?.filter((val) => val !== value);
-
+    } else {
-    for (const index of ev.detail.index) {
+      this.value = [...(this.value || []), value];
-      const domain = integrations[index].domain;
-      value.push(domain);
     }
-    this.value = value;
+    listItem.selected = this.value?.includes(value);
 
     fireEvent(this, "data-table-filter-changed", {
-      value,
+      value: this.value,
       items: undefined,
     });
   }

src/components/ha-outlined-field.ts

@@ -0,0 +1,40 @@
+import { MdOutlinedField } from "@material/web/field/outlined-field";
+import "element-internals-polyfill";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+import { literal } from "lit/static-html";
+
+@customElement("ha-outlined-field")
+export class HaOutlinedField extends MdOutlinedField {
+  protected readonly fieldTag = literal`ha-outlined-field`;
+
+  static override styles = [
+    ...super.styles,
+    css`
+      .container::before {
+        display: block;
+        content: "";
+        position: absolute;
+        inset: 0;
+        background-color: var(--ha-outlined-field-container-color, transparent);
+        opacity: var(--ha-outlined-field-container-opacity, 1);
+        border-start-start-radius: var(--_container-shape-start-start);
+        border-start-end-radius: var(--_container-shape-start-end);
+        border-end-start-radius: var(--_container-shape-end-start);
+        border-end-end-radius: var(--_container-shape-end-end);
+      }
+      .with-start .start {
+        margin-inline-end: var(--ha-outlined-field-start-margin, 4px);
+      }
+      .with-end .end {
+        margin-inline-start: var(--ha-outlined-field-end-margin, 4px);
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-outlined-field": HaOutlinedField;
+  }
+}

src/components/ha-outlined-text-field.ts

@@ -2,9 +2,13 @@ import { MdOutlinedTextField } from "@material/web/textfield/outlined-text-field
 import "element-internals-polyfill";
 import { css } from "lit";
 import { customElement } from "lit/decorators";
+import { literal } from "lit/static-html";
+import "./ha-outlined-field";
 
 @customElement("ha-outlined-text-field")
 export class HaOutlinedTextField extends MdOutlinedTextField {
+  protected readonly fieldTag = literal`ha-outlined-field`;
+
   static override styles = [
     ...super.styles,
     css`
@@ -25,12 +29,10 @@ export class HaOutlinedTextField extends MdOutlinedTextField {
         --md-outlined-field-container-shape-end-end: 10px;
         --md-outlined-field-container-shape-end-start: 10px;
         --md-outlined-field-focus-outline-width: 1px;
+        --ha-outlined-field-start-margin: -4px;
+        --ha-outlined-field-end-margin: -4px;
         --mdc-icon-size: var(--md-input-chip-icon-size, 18px);
       }
-      md-outlined-field {
-        background: var(--ha-outlined-text-field-container-color, transparent);
-        opacity: var(--ha-outlined-text-field-container-opacity, 1);
-      }
       .input {
         font-family: Roboto, sans-serif;
       }

src/components/search-input-outlined.ts

@@ -97,7 +97,7 @@ class SearchInputOutlined extends LitElement {
       ha-outlined-text-field {
         display: block;
         width: 100%;
-        --ha-outlined-text-field-container-color: var(--card-background-color);
+        --ha-outlined-field-container-color: var(--card-background-color);
       }
       ha-svg-icon,
       ha-icon-button {

src/components/trace/hat-trace-timeline.ts

@@ -1,3 +1,4 @@
+import { consume } from "@lit-labs/context";
 import {
   mdiAlertCircle,
   mdiCircle,
@@ -6,14 +7,13 @@ import {
   mdiProgressWrench,
   mdiRecordCircleOutline,
 } from "@mdi/js";
-import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import {
-  css,
   CSSResultGroup,
-  html,
   LitElement,
   PropertyValues,
   TemplateResult,
+  css,
+  html,
   nothing,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -23,27 +23,31 @@ import { relativeTime } from "../../common/datetime/relative_time";
 import { fireEvent } from "../../common/dom/fire_event";
 import { toggleAttribute } from "../../common/dom/toggle_attribute";
 import {
-  EntityRegistryEntry,
+  floorsContext,
-  subscribeEntityRegistry,
+  fullEntitiesContext,
-} from "../../data/entity_registry";
+  labelsContext,
+} from "../../data/context";
+import { EntityRegistryEntry } from "../../data/entity_registry";
+import { FloorRegistryEntry } from "../../data/floor_registry";
+import { LabelRegistryEntry } from "../../data/label_registry";
 import { LogbookEntry } from "../../data/logbook";
 import {
   ChooseAction,
   ChooseActionChoice,
-  getActionType,
   IfAction,
   ParallelAction,
   RepeatAction,
+  getActionType,
 } from "../../data/script";
 import { describeAction } from "../../data/script_i18n";
 import {
   ActionTraceStep,
   AutomationTraceExtended,
   ChooseActionTraceStep,
-  getDataFromPath,
   IfActionTraceStep,
-  isTriggerPath,
   TriggerTraceStep,
+  getDataFromPath,
+  isTriggerPath,
 } from "../../data/trace";
 import { HomeAssistant } from "../../types";
 import "./ha-timeline";
@@ -200,6 +204,8 @@ class ActionRenderer {
   constructor(
     private hass: HomeAssistant,
     private entityReg: EntityRegistryEntry[],
+    private labelReg: LabelRegistryEntry[],
+    private floorReg: FloorRegistryEntry[],
     private entries: TemplateResult[],
     private trace: AutomationTraceExtended,
     private logbookRenderer: LogbookRenderer,
@@ -310,7 +316,14 @@ class ActionRenderer {
 
     this._renderEntry(
       path,
-      describeAction(this.hass, this.entityReg, data, actionType),
+      describeAction(
+        this.hass,
+        this.entityReg,
+        this.labelReg,
+        this.floorReg,
+        data,
+        actionType
+      ),
       undefined,
       data.enabled === false
     );
@@ -475,7 +488,13 @@ class ActionRenderer {
 
     const name =
       repeatConfig.alias ||
-      describeAction(this.hass, this.entityReg, repeatConfig);
+      describeAction(
+        this.hass,
+        this.entityReg,
+        this.labelReg,
+        this.floorReg,
+        repeatConfig
+      );
 
     this._renderEntry(repeatPath, name, undefined, disabled);
 
@@ -631,15 +650,17 @@ export class HaAutomationTracer extends LitElement {
 
   @property({ type: Boolean }) public allowPick = false;
 
-  @state() private _entityReg: EntityRegistryEntry[] = [];
+  @state()
+  @consume({ context: fullEntitiesContext, subscribe: true })
+  _entityReg!: EntityRegistryEntry[];
 
-  public hassSubscribe(): UnsubscribeFunc[] {
+  @state()
-    return [
+  @consume({ context: labelsContext, subscribe: true })
-      subscribeEntityRegistry(this.hass.connection!, (entities) => {
+  _labelReg!: LabelRegistryEntry[];
-        this._entityReg = entities;
+
-      }),
+  @state()
-    ];
+  @consume({ context: floorsContext, subscribe: true })
-  }
+  _floorReg!: FloorRegistryEntry[];
 
   protected render() {
     if (!this.trace) {
@@ -657,6 +678,8 @@ export class HaAutomationTracer extends LitElement {
     const actionRenderer = new ActionRenderer(
       this.hass,
       this._entityReg,
+      this._labelReg,
+      this._floorReg,
       entries,
       this.trace,
       logbookRenderer,

src/data/context.ts

@@ -2,6 +2,8 @@ import { createContext } from "@lit-labs/context";
 import { HassConfig } from "home-assistant-js-websocket";
 import { HomeAssistant } from "../types";
 import { EntityRegistryEntry } from "./entity_registry";
+import { FloorRegistryEntry } from "./floor_registry";
+import { LabelRegistryEntry } from "./label_registry";
 
 export const connectionContext =
   createContext<HomeAssistant["connection"]>("connection");
@@ -25,3 +27,7 @@ export const panelsContext = createContext<HomeAssistant["panels"]>("panels");
 
 export const fullEntitiesContext =
   createContext<EntityRegistryEntry[]>("extendedEntities");
+
+export const floorsContext = createContext<FloorRegistryEntry[]>("floors");
+
+export const labelsContext = createContext<LabelRegistryEntry[]>("labels");

src/data/script_i18n.ts

@@ -14,7 +14,9 @@ import {
   computeEntityRegistryName,
   entityRegistryById,
 } from "./entity_registry";
+import { FloorRegistryEntry } from "./floor_registry";
 import { domainToName } from "./integration";
+import { LabelRegistryEntry } from "./label_registry";
 import {
   ActionType,
   ActionTypes,
@@ -40,6 +42,8 @@ const actionTranslationBaseKey =
 export const describeAction = <T extends ActionType>(
   hass: HomeAssistant,
   entityRegistry: EntityRegistryEntry[],
+  labelRegistry: LabelRegistryEntry[],
+  floorRegistry: FloorRegistryEntry[],
   action: ActionTypes[T],
   actionType?: T,
   ignoreAlias = false
@@ -48,6 +52,8 @@ export const describeAction = <T extends ActionType>(
     return tryDescribeAction(
       hass,
       entityRegistry,
+      labelRegistry,
+      floorRegistry,
       action,
       actionType,
       ignoreAlias
@@ -66,6 +72,8 @@ export const describeAction = <T extends ActionType>(
 const tryDescribeAction = <T extends ActionType>(
   hass: HomeAssistant,
   entityRegistry: EntityRegistryEntry[],
+  labelRegistry: LabelRegistryEntry[],
+  floorRegistry: FloorRegistryEntry[],
   action: ActionTypes[T],
   actionType?: T,
   ignoreAlias = false
@@ -82,10 +90,12 @@ const tryDescribeAction = <T extends ActionType>(
 
     const targets: string[] = [];
     if (config.target) {
-      for (const [key, label] of Object.entries({
+      for (const [key, name] of Object.entries({
         area_id: "areas",
         device_id: "devices",
         entity_id: "entities",
+        floor_id: "floors",
+        label_id: "labels",
       })) {
         if (!(key in config.target)) {
           continue;
@@ -99,7 +109,7 @@ const tryDescribeAction = <T extends ActionType>(
             targets.push(
               hass.localize(
                 `${actionTranslationBaseKey}.service.description.target_template`,
-                { name: label }
+                { name }
               )
             );
             break;
@@ -147,6 +157,32 @@ const tryDescribeAction = <T extends ActionType>(
                 )
               );
             }
+          } else if (key === "floor_id") {
+            const floor = floorRegistry.find(
+              (flr) => flr.floor_id === targetThing
+            );
+            if (floor?.name) {
+              targets.push(floor.name);
+            } else {
+              targets.push(
+                hass.localize(
+                  `${actionTranslationBaseKey}.service.description.target_unknown_floor`
+                )
+              );
+            }
+          } else if (key === "label_id") {
+            const label = labelRegistry.find(
+              (lbl) => lbl.label_id === targetThing
+            );
+            if (label?.name) {
+              targets.push(label.name);
+            } else {
+              targets.push(
+                hass.localize(
+                  `${actionTranslationBaseKey}.service.description.target_unknown_label`
+                )
+              );
+            }
           } else {
             targets.push(targetThing);
           }

src/layouts/hass-tabs-subpage-data-table.ts

@@ -496,8 +496,9 @@ export class HaTabsSubpageDataTable extends LitElement {
       ${this.showFilters && !showPane
         ? html`<ha-dialog
             open
-            hideActions
+            .heading=${localize("ui.components.subpage-data-table.filters", {
-            .heading=${localize("ui.components.subpage-data-table.filters")}
+              number: this.data.length,
+            })}
           >
             <ha-dialog-header slot="heading">
               <ha-icon-button
@@ -509,7 +510,9 @@ export class HaTabsSubpageDataTable extends LitElement {
                 )}
               ></ha-icon-button>
               <span slot="title"
-                >${localize("ui.components.subpage-data-table.filters")}</span
+                >${localize("ui.components.subpage-data-table.filters", {
+                  number: this.data.length,
+                })}</span
               >
               ${this.filters
                 ? html`<ha-icon-button
@@ -523,8 +526,17 @@ export class HaTabsSubpageDataTable extends LitElement {
                 : nothing}
             </ha-dialog-header>
             <div class="filter-dialog-content">
-              <slot name="filter-pane"></slot></div
+              <slot name="filter-pane"></slot>
-          ></ha-dialog>`
+            </div>
+            <div slot="primaryAction">
+              <ha-button @click=${this._toggleFilters}>
+                ${this.hass.localize(
+                  "ui.components.subpage-data-table.show_results",
+                  { number: this.data.length }
+                )}
+              </ha-button>
+            </div>
+          </ha-dialog>`
         : nothing}
     `;
   }
@@ -779,7 +791,6 @@ export class HaTabsSubpageDataTable extends LitElement {
       }
 
       ha-dialog {
-        --dialog-z-index: 100;
         --mdc-dialog-min-width: calc(
           100vw - env(safe-area-inset-right) - env(safe-area-inset-left)
         );
@@ -794,7 +805,7 @@ export class HaTabsSubpageDataTable extends LitElement {
       }
 
       .filter-dialog-content {
-        height: calc(100vh - 1px - var(--header-height));
+        height: calc(100vh - 1px - 61px - var(--header-height));
         display: flex;
         flex-direction: column;
       }

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

@@ -42,8 +42,14 @@ import type { HaYamlEditor } from "../../../../components/ha-yaml-editor";
 import { ACTION_ICONS, YAML_ONLY_ACTION_TYPES } from "../../../../data/action";
 import { AutomationClipboard } from "../../../../data/automation";
 import { validateConfig } from "../../../../data/config";
-import { fullEntitiesContext } from "../../../../data/context";
+import {
+  floorsContext,
+  fullEntitiesContext,
+  labelsContext,
+} from "../../../../data/context";
 import { EntityRegistryEntry } from "../../../../data/entity_registry";
+import { FloorRegistryEntry } from "../../../../data/floor_registry";
+import { LabelRegistryEntry } from "../../../../data/label_registry";
 import {
   Action,
   NonConditionAction,
@@ -146,6 +152,14 @@ export default class HaAutomationActionRow extends LitElement {
   @consume({ context: fullEntitiesContext, subscribe: true })
   _entityReg!: EntityRegistryEntry[];
 
+  @state()
+  @consume({ context: labelsContext, subscribe: true })
+  _labelReg!: LabelRegistryEntry[];
+
+  @state()
+  @consume({ context: floorsContext, subscribe: true })
+  _floorReg!: FloorRegistryEntry[];
+
   @state() private _warnings?: string[];
 
   @state() private _uiModeAvailable = true;
@@ -210,7 +224,13 @@ export default class HaAutomationActionRow extends LitElement {
                   .path=${ACTION_ICONS[type!]}
                 ></ha-svg-icon>`}
             ${capitalizeFirstLetter(
-              describeAction(this.hass, this._entityReg, this.action)
+              describeAction(
+                this.hass,
+                this._entityReg,
+                this._labelReg,
+                this._floorReg,
+                this.action
+              )
             )}
           </h3>
 
@@ -573,7 +593,15 @@ export default class HaAutomationActionRow extends LitElement {
       ),
       inputType: "string",
       placeholder: capitalizeFirstLetter(
-        describeAction(this.hass, this._entityReg, this.action, undefined, true)
+        describeAction(
+          this.hass,
+          this._entityReg,
+          this._labelReg,
+          this._floorReg,
+          this.action,
+          undefined,
+          true
+        )
       ),
       defaultValue: this.action.alias,
       confirmText: this.hass.localize("ui.common.submit"),

src/panels/config/automation/ha-automation-picker.ts

@@ -422,6 +422,14 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
     const labelsInOverflow =
       (this._sizeController.value && this._sizeController.value < 700) ||
       (!this._sizeController.value && this.hass.dockedSidebar === "docked");
+    const automations = this._automations(
+      this.automations,
+      this._entityReg,
+      this.hass.areas,
+      this._categories,
+      this._labels,
+      this._filteredAutomations
+    );
     return html`
       <hass-tabs-subpage-data-table
         .hass=${this.hass}
@@ -432,13 +440,23 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
         id="entity_id"
         .route=${this.route}
         .tabs=${configSections.automations}
+        .searchLabel=${this.hass.localize(
+          "ui.panel.config.automation.picker.search",
+          { number: automations.length }
+        )}
         selectable
         .selected=${this._selected.length}
         @selection-changed=${this._handleSelectionChanged}
         hasFilters
         .filters=${
-          Object.values(this._filters).filter((filter) => filter.value?.length)
+          Object.values(this._filters).filter((filter) =>
-            .length
+            Array.isArray(filter.value)
+              ? filter.value.length
+              : filter.value &&
+                Object.values(filter.value).some((val) =>
+                  Array.isArray(val) ? val.length : val
+                )
+          ).length
         }
         .columns=${this._columns(
           this.narrow,
@@ -446,14 +464,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
           this.hass.locale
         )}
         initialGroupColumn="category"
-        .data=${this._automations(
+        .data=${automations}
-          this.automations,
-          this._entityReg,
-          this.hass.areas,
-          this._categories,
-          this._labels,
-          this._filteredAutomations
-        )}
         .empty=${!this.automations.length}
         @row-click=${this._handleRowClicked}
         .noDataText=${this.hass.localize(

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

@@ -591,7 +591,8 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
         .tabs=${configSections.devices}
         .route=${this.route}
         .searchLabel=${this.hass.localize(
-          "ui.panel.config.devices.picker.search"
+          "ui.panel.config.devices.picker.search",
+          { number: devicesOutput.length }
         )}
         .columns=${this._columns(this.hass.localize, this.narrow)}
         .data=${devicesOutput}
@@ -600,8 +601,13 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
         @selection-changed=${this._handleSelectionChanged}
         .filter=${this._filter}
         hasFilters
-        .filters=${Object.values(this._filters).filter(
+        .filters=${Object.values(this._filters).filter((filter) =>
-          (filter) => filter.value?.length
+          Array.isArray(filter.value)
+            ? filter.value.length
+            : filter.value &&
+              Object.values(filter.value).some((val) =>
+                Array.isArray(val) ? val.length : val
+              )
         ).length}
         @clear-filter=${this._clearFilter}
         @search-changed=${this._handleSearchChange}

src/panels/config/entities/ha-config-entities.ts

@@ -27,7 +27,6 @@ import {
 import { customElement, property, query, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { styleMap } from "lit/directives/style-map";
-import { until } from "lit/directives/until";
 import memoize from "memoize-one";
 import { computeCssColor } from "../../../common/color/compute-color";
 import type { HASSDomEvent } from "../../../common/dom/fire_event";
@@ -67,7 +66,6 @@ import {
   removeEntityRegistryEntry,
   updateEntityRegistryEntry,
 } from "../../../data/entity_registry";
-import { entryIcon } from "../../../data/icons";
 import {
   LabelRegistryEntry,
   createLabelRegistryEntry,
@@ -207,21 +205,19 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
         type: "icon",
         template: (entry) =>
           entry.icon
-            ? html`
+            ? html`<ha-icon .icon=${entry.icon}></ha-icon>`
-                <ha-state-icon
+            : entry.entity
-                  title=${ifDefined(entry.entity?.state)}
+              ? html`
-                  slot="item-icon"
+                  <ha-state-icon
-                  .hass=${this.hass}
+                    title=${ifDefined(entry.entity?.state)}
-                  .stateObj=${entry.entity}
+                    slot="item-icon"
-                ></ha-state-icon>
+                    .hass=${this.hass}
-              `
+                    .stateObj=${entry.entity}
-            : html`
+                  ></ha-state-icon>
-                <ha-icon
+                `
-                  icon=${until(
+              : html`<ha-domain-icon
-                    entryIcon(this.hass, entry as EntityRegistryEntry)
+                  .domain=${computeDomain(entry.entity_id)}
-                  )}
+                ></ha-domain-icon>`,
-                ></ha-icon>
-              `,
       },
       name: {
         main: true,
@@ -577,12 +573,19 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
         )}
         .data=${filteredEntities}
         .searchLabel=${this.hass.localize(
-          "ui.panel.config.entities.picker.search"
+          "ui.panel.config.entities.picker.search",
+          { number: filteredEntities.length }
         )}
         hasFilters
         .filters=${
-          Object.values(this._filters).filter((filter) => filter.value?.length)
+          Object.values(this._filters).filter((filter) =>
-            .length
+            Array.isArray(filter.value)
+              ? filter.value.length
+              : filter.value &&
+                Object.values(filter.value).some((val) =>
+                  Array.isArray(val) ? val.length : val
+                )
+          ).length
         }
         .filter=${this._filter}
         selectable

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

@@ -35,7 +35,11 @@ import { customElement, property, state } from "lit/decorators";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import { listenMediaQuery } from "../../common/dom/media_query";
 import { CloudStatus, fetchCloudStatus } from "../../data/cloud";
-import { fullEntitiesContext } from "../../data/context";
+import {
+  floorsContext,
+  fullEntitiesContext,
+  labelsContext,
+} from "../../data/context";
 import {
   entityRegistryByEntityId,
   entityRegistryById,
@@ -45,6 +49,8 @@ import { HassRouterPage, RouterOptions } from "../../layouts/hass-router-page";
 import { PageNavigation } from "../../layouts/hass-tabs-subpage";
 import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { HomeAssistant, Route } from "../../types";
+import { subscribeLabelRegistry } from "../../data/label_registry";
+import { subscribeFloorRegistry } from "../../data/floor_registry";
 
 declare global {
   // for fire event
@@ -379,11 +385,27 @@ class HaPanelConfig extends SubscribeMixin(HassRouterPage) {
     initialValue: [],
   });
 
+  private _labelsContext = new ContextProvider(this, {
+    context: labelsContext,
+    initialValue: [],
+  });
+
+  private _floorsContext = new ContextProvider(this, {
+    context: floorsContext,
+    initialValue: [],
+  });
+
   public hassSubscribe(): UnsubscribeFunc[] {
     return [
       subscribeEntityRegistry(this.hass.connection!, (entities) => {
         this._entitiesContext.setValue(entities);
       }),
+      subscribeLabelRegistry(this.hass.connection!, (labels) => {
+        this._labelsContext.setValue(labels);
+      }),
+      subscribeFloorRegistry(this.hass.connection!, (floors) => {
+        this._floorsContext.setValue(floors);
+      }),
     ];
   }
 

src/panels/config/helpers/ha-config-helpers.ts

@@ -486,6 +486,16 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) {
     const labelsInOverflow =
       (this._sizeController.value && this._sizeController.value < 700) ||
       (!this._sizeController.value && this.hass.dockedSidebar === "docked");
+    const helpers = this._getItems(
+      this.hass.localize,
+      this._stateItems,
+      this._entityEntries,
+      this._configEntries,
+      this._entityReg,
+      this._categories,
+      this._labels,
+      this._filteredStateItems
+    );
     return html`
       <hass-tabs-subpage-data-table
         .hass=${this.hass}
@@ -493,24 +503,24 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) {
         back-path="/config"
         .route=${this.route}
         .tabs=${configSections.devices}
+        .searchLabel=${this.hass.localize(
+          "ui.panel.config.helpers.picker.search",
+          { number: helpers.length }
+        )}
         selectable
         .selected=${this._selected.length}
         @selection-changed=${this._handleSelectionChanged}
         hasFilters
-        .filters=${Object.values(this._filters).filter(
+        .filters=${Object.values(this._filters).filter((filter) =>
-          (filter) => filter.value?.length
+          Array.isArray(filter.value)
+            ? filter.value.length
+            : filter.value &&
+              Object.values(filter.value).some((val) =>
+                Array.isArray(val) ? val.length : val
+              )
         ).length}
         .columns=${this._columns(this.narrow, this.hass.localize)}
-        .data=${this._getItems(
+        .data=${helpers}
-          this.hass.localize,
-          this._stateItems,
-          this._entityEntries,
-          this._configEntries,
-          this._entityReg,
-          this._categories,
-          this._labels,
-          this._filteredStateItems
-        )}
         initialGroupColumn="category"
         .activeFilters=${this._activeFilters}
         @clear-filter=${this._clearFilter}

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

@@ -425,6 +425,14 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) {
     const labelsInOverflow =
       (this._sizeController.value && this._sizeController.value < 700) ||
       (!this._sizeController.value && this.hass.dockedSidebar === "docked");
+    const scenes = this._scenes(
+      this.scenes,
+      this._entityReg,
+      this.hass.areas,
+      this._categories,
+      this._labels,
+      this._filteredScenes
+    );
     return html`
       <hass-tabs-subpage-data-table
         .hass=${this.hass}
@@ -432,24 +440,26 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) {
         back-path="/config"
         .route=${this.route}
         .tabs=${configSections.automations}
+        .searchLabel=${this.hass.localize(
+          "ui.panel.config.scene.picker.search",
+          { number: scenes.length }
+        )}
         selectable
         .selected=${this._selected.length}
         @selection-changed=${this._handleSelectionChanged}
         hasFilters
-        .filters=${Object.values(this._filters).filter(
+        .filters=${Object.values(this._filters).filter((filter) =>
-          (filter) => filter.value?.length
+          Array.isArray(filter.value)
+            ? filter.value.length
+            : filter.value &&
+              Object.values(filter.value).some((val) =>
+                Array.isArray(val) ? val.length : val
+              )
         ).length}
         .columns=${this._columns(this.narrow, this.hass.localize)}
         id="entity_id"
         initialGroupColumn="category"
-        .data=${this._scenes(
+        .data=${scenes}
-          this.scenes,
-          this._entityReg,
-          this.hass.areas,
-          this._categories,
-          this._labels,
-          this._filteredScenes
-        )}
         .empty=${!this.scenes.length}
         .activeFilters=${this._activeFilters}
         .noDataText=${this.hass.localize(

src/panels/config/script/ha-script-picker.ts

@@ -437,6 +437,14 @@ class HaScriptPicker extends SubscribeMixin(LitElement) {
     const labelsInOverflow =
       (this._sizeController.value && this._sizeController.value < 700) ||
       (!this._sizeController.value && this.hass.dockedSidebar === "docked");
+    const scripts = this._scripts(
+      this.scripts,
+      this._entityReg,
+      this.hass.areas,
+      this._categories,
+      this._labels,
+      this._filteredScripts
+    );
     return html`
       <hass-tabs-subpage-data-table
         .hass=${this.hass}
@@ -444,27 +452,29 @@ class HaScriptPicker extends SubscribeMixin(LitElement) {
         back-path="/config"
         .route=${this.route}
         .tabs=${configSections.automations}
+        .searchLabel=${this.hass.localize(
+          "ui.panel.config.script.picker.search",
+          { number: scripts.length }
+        )}
         hasFilters
         initialGroupColumn="category"
         selectable
         .selected=${this._selected.length}
         @selection-changed=${this._handleSelectionChanged}
-        .filters=${Object.values(this._filters).filter(
+        .filters=${Object.values(this._filters).filter((filter) =>
-          (filter) => filter.value?.length
+          Array.isArray(filter.value)
+            ? filter.value.length
+            : filter.value &&
+              Object.values(filter.value).some((val) =>
+                Array.isArray(val) ? val.length : val
+              )
         ).length}
         .columns=${this._columns(
           this.narrow,
           this.hass.localize,
           this.hass.locale
         )}
-        .data=${this._scripts(
+        .data=${scripts}
-          this.scripts,
-          this._entityReg,
-          this.hass.areas,
-          this._categories,
-          this._labels,
-          this._filteredScripts
-        )}
         .empty=${!this.scripts.length}
         .activeFilters=${this._activeFilters}
         id="entity_id"

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

@@ -9,6 +9,7 @@ import { property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
 import { storage } from "../../common/decorators/storage";
+import { computeDomain } from "../../common/entity/compute_domain";
 import { navigate } from "../../common/navigate";
 import { constructUrlCurrentPath } from "../../common/url/construct-url";
 import {
@@ -27,37 +28,29 @@ import "../../components/ha-menu-button";
 import "../../components/ha-target-picker";
 import "../../components/ha-top-app-bar-fixed";
 import {
-  AreaDeviceLookup,
-  AreaEntityLookup,
-  getAreaDeviceLookup,
-  getAreaEntityLookup,
-} from "../../data/area_registry";
-import {
-  DeviceEntityLookup,
-  getDeviceEntityLookup,
-  subscribeDeviceRegistry,
-} from "../../data/device_registry";
-import { subscribeEntityRegistry } from "../../data/entity_registry";
-import {
-  HistoryResult,
-  computeHistory,
-  subscribeHistory,
-  HistoryStates,
   EntityHistoryState,
+  HistoryResult,
+  HistoryStates,
+  LineChartState,
   LineChartUnit,
   computeGroupKey,
-  LineChartState,
+  computeHistory,
+  subscribeHistory,
 } from "../../data/history";
-import { fetchStatistics, Statistics } from "../../data/recorder";
+import { Statistics, fetchStatistics } from "../../data/recorder";
+import {
+  expandAreaTarget,
+  expandDeviceTarget,
+  expandFloorTarget,
+  expandLabelTarget,
+} from "../../data/selector";
 import { getSensorNumericDeviceClasses } from "../../data/sensor";
-import { SubscribeMixin } from "../../mixins/subscribe-mixin";
+import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
 import { haStyle } from "../../resources/styles";
 import { HomeAssistant } from "../../types";
 import { fileDownload } from "../../util/file_download";
-import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
-import { computeDomain } from "../../common/entity/compute_domain";
 
-class HaPanelHistory extends SubscribeMixin(LitElement) {
+class HaPanelHistory extends LitElement {
   @property({ attribute: false }) hass!: HomeAssistant;
 
   @property({ reflect: true, type: Boolean }) public narrow = false;
@@ -83,12 +76,6 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
 
   @state() private _statisticsHistory?: HistoryResult;
 
-  @state() private _deviceEntityLookup?: DeviceEntityLookup;
-
-  @state() private _areaEntityLookup?: AreaEntityLookup;
-
-  @state() private _areaDeviceLookup?: AreaDeviceLookup;
-
   @state()
   private _showBack?: boolean;
 
@@ -123,18 +110,6 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
     this._unsubscribeHistory();
   }
 
-  public hassSubscribe(): UnsubscribeFunc[] {
-    return [
-      subscribeEntityRegistry(this.hass.connection!, (entities) => {
-        this._deviceEntityLookup = getDeviceEntityLookup(entities);
-        this._areaEntityLookup = getAreaEntityLookup(entities);
-      }),
-      subscribeDeviceRegistry(this.hass.connection!, (devices) => {
-        this._areaDeviceLookup = getAreaDeviceLookup(devices);
-      }),
-    ];
-  }
-
   private _goBack(): void {
     history.back();
   }
@@ -332,7 +307,9 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
     const entityIds = searchParams.entity_id;
     const deviceIds = searchParams.device_id;
     const areaIds = searchParams.area_id;
-    if (entityIds || deviceIds || areaIds) {
+    const floorIds = searchParams.floor_id;
+    const labelsIds = searchParams.label_id;
+    if (entityIds || deviceIds || areaIds || floorIds || labelsIds) {
       this._targetPickerValue = {};
     }
     if (entityIds) {
@@ -347,6 +324,14 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
       const splitIds = areaIds.split(",");
       this._targetPickerValue!.area_id = splitIds;
     }
+    if (floorIds) {
+      const splitIds = floorIds.split(",");
+      this._targetPickerValue!.floor_id = splitIds;
+    }
+    if (labelsIds) {
+      const splitIds = labelsIds.split(",");
+      this._targetPickerValue!.label_id = splitIds;
+    }
 
     const startDate = searchParams.start_date;
     if (startDate) {
@@ -522,95 +507,77 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
   private _getEntityIds(): string[] {
     return this.__getEntityIds(
       this._targetPickerValue,
-      this._deviceEntityLookup,
+      this.hass.entities,
-      this._areaEntityLookup,
+      this.hass.devices,
-      this._areaDeviceLookup
+      this.hass.areas
     );
   }
 
   private __getEntityIds = memoizeOne(
     (
       targetPickerValue: HassServiceTarget,
-      deviceEntityLookup: DeviceEntityLookup | undefined,
+      entities: HomeAssistant["entities"],
-      areaEntityLookup: AreaEntityLookup | undefined,
+      devices: HomeAssistant["devices"],
-      areaDeviceLookup: AreaDeviceLookup | undefined
+      areas: HomeAssistant["areas"]
     ): string[] => {
-      if (
+      if (!targetPickerValue) {
-        !targetPickerValue ||
-        deviceEntityLookup === undefined ||
-        areaEntityLookup === undefined ||
-        areaDeviceLookup === undefined
-      ) {
         return [];
       }
 
-      const entityIds = new Set<string>();
+      const targetSelector = { target: {} };
-      let {
+      const targetEntities = new Set(ensureArray(targetPickerValue.entity_id));
-        area_id: searchingAreaId,
+      const targetDevices = new Set(ensureArray(targetPickerValue.device_id));
-        device_id: searchingDeviceId,
+      const targetAreas = new Set(ensureArray(targetPickerValue.area_id));
-        entity_id: searchingEntityId,
+      const targetFloors = new Set(ensureArray(targetPickerValue.floor_id));
-      } = targetPickerValue;
+      const targetLabels = new Set(ensureArray(targetPickerValue.label_id));
 
-      if (searchingAreaId) {
+      targetLabels.forEach((labelId) => {
-        searchingAreaId = ensureArray(searchingAreaId);
+        const expanded = expandLabelTarget(
-        for (const singleSearchingAreaId of searchingAreaId) {
+          this.hass,
-          const foundEntities = areaEntityLookup[singleSearchingAreaId];
+          labelId,
-          if (foundEntities?.length) {
+          areas,
-            for (const foundEntity of foundEntities) {
+          devices,
-              if (foundEntity.entity_category === null) {
+          entities,
-                entityIds.add(foundEntity.entity_id);
+          targetSelector
-              }
+        );
-            }
+        expanded.devices.forEach((id) => targetDevices.add(id));
-          }
+        expanded.entities.forEach((id) => targetEntities.add(id));
+        expanded.areas.forEach((id) => targetAreas.add(id));
+      });
 
-          const foundDevices = areaDeviceLookup[singleSearchingAreaId];
+      targetFloors.forEach((floorId) => {
-          if (!foundDevices?.length) {
+        const expanded = expandFloorTarget(
-            continue;
+          this.hass,
-          }
+          floorId,
+          areas,
+          targetSelector
+        );
+        expanded.areas.forEach((id) => targetAreas.add(id));
+      });
 
-          for (const foundDevice of foundDevices) {
+      targetAreas.forEach((areaId) => {
-            const foundDeviceEntities = deviceEntityLookup[foundDevice.id];
+        const expanded = expandAreaTarget(
-            if (!foundDeviceEntities?.length) {
+          this.hass,
-              continue;
+          areaId,
-            }
+          devices,
+          entities,
+          targetSelector
+        );
+        expanded.devices.forEach((id) => targetDevices.add(id));
+        expanded.entities.forEach((id) => targetEntities.add(id));
+      });
 
-            for (const foundDeviceEntity of foundDeviceEntities) {
+      targetDevices.forEach((deviceId) => {
-              if (
+        const expanded = expandDeviceTarget(
-                (!foundDeviceEntity.area_id ||
+          this.hass,
-                  foundDeviceEntity.area_id === singleSearchingAreaId) &&
+          deviceId,
-                foundDeviceEntity.entity_category === null
+          entities,
-              ) {
+          targetSelector
-                entityIds.add(foundDeviceEntity.entity_id);
+        );
-              }
+        expanded.entities.forEach((id) => targetEntities.add(id));
-            }
+      });
-          }
-        }
-      }
 
-      if (searchingDeviceId) {
+      return Array.from(targetEntities);
-        searchingDeviceId = ensureArray(searchingDeviceId);
-        for (const singleSearchingDeviceId of searchingDeviceId) {
-          const foundEntities = deviceEntityLookup[singleSearchingDeviceId];
-          if (!foundEntities?.length) {
-            continue;
-          }
-
-          for (const foundEntity of foundEntities) {
-            if (foundEntity.entity_category === null) {
-              entityIds.add(foundEntity.entity_id);
-            }
-          }
-        }
-      }
-
-      if (searchingEntityId) {
-        searchingEntityId = ensureArray(searchingEntityId);
-        for (const singleSearchingEntityId of searchingEntityId) {
-          entityIds.add(singleSearchingEntityId);
-        }
-      }
-
-      return [...entityIds];
     }
   );
 
@@ -639,6 +606,12 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
         ","
       );
     }
+    if (this._targetPickerValue.label_id) {
+      params.label_id = ensureArray(this._targetPickerValue.label_id).join(",");
+    }
+    if (this._targetPickerValue.floor_id) {
+      params.floor_id = ensureArray(this._targetPickerValue.floor_id).join(",");
+    }
     if (this._targetPickerValue.area_id) {
       params.area_id = ensureArray(this._targetPickerValue.area_id).join(",");
     }

src/translations/en.json

@@ -501,6 +501,7 @@
       },
       "subpage-data-table": {
         "filters": "Filters",
+        "show_results": "show {number} results",
         "clear_filter": "Clear filter",
         "close_filter": "Close filters",
         "exit_selection_mode": "Exit selection mode",
@@ -2270,7 +2271,8 @@
               "category": "Category"
             },
             "create_helper": "Create helper",
-            "no_helpers": "Looks like you don't have any helpers yet!"
+            "no_helpers": "Looks like you don't have any helpers yet!",
+            "search": "Search {number} helpers"
           },
           "dialog": {
             "create": "Create",
@@ -2684,6 +2686,7 @@
             "assign_category": "Assign category",
             "no_category_support": "You can't assign an category to this automation",
             "no_category_entity_reg": "To assign an category to an automation it needs to have a unique ID.",
+            "search": "Search {number} automations",
             "headers": {
               "toggle": "Enable/disable",
               "name": "Name",
@@ -3241,7 +3244,9 @@
                     "target_template": "templated {name}",
                     "target_unknown_entity": "unknown entity",
                     "target_unknown_device": "unknown device",
-                    "target_unknown_area": "unknown area"
+                    "target_unknown_area": "unknown area",
+                    "target_unknown_floor": "unknown floor",
+                    "target_unknown_label": "unknown label"
                   }
                 },
                 "play_media": {
@@ -3575,7 +3580,8 @@
             "delete": "[%key:ui::common::delete%]",
             "duplicate": "[%key:ui::common::duplicate%]",
             "empty_header": "Create your first script",
-            "empty_text": "A script is a sequence of actions that can be run from a dashboard, an automation, or be triggered by voice. For example, a ''Wake-up routine''' script that gradually turns on the light in the bedroom and opens the blinds after a delay."
+            "empty_text": "A script is a sequence of actions that can be run from a dashboard, an automation, or be triggered by voice. For example, a ''Wake-up routine''' script that gradually turns on the light in the bedroom and opens the blinds after a delay.",
+            "search": "Search {number} scripts"
           },
           "dialog_new": {
             "header": "Create script",
@@ -3683,7 +3689,8 @@
             "no_category_support": "You can't assign an category to this scene",
             "no_category_entity_reg": "To assign an category to an scene it needs to have a unique ID.",
             "empty_header": "Create your first scene",
-            "empty_text": "Scenes capture entities' states, so you can re-experience the same scene later on. For example, a ''Watching TV'' scene that dims the living room lights, sets a warm white color and turns on the TV."
+            "empty_text": "Scenes capture entities' states, so you can re-experience the same scene later on. For example, a ''Watching TV'' scene that dims the living room lights, sets a warm white color and turns on the TV.",
+            "search": "Search {number} scenes"
           },
           "editor": {
             "default_name": "New scene",
@@ -4008,7 +4015,7 @@
           "confirm_delete": "Are you sure you want to delete this device?",
           "confirm_delete_integration": "Are you sure you want to remove this device from {integration}?",
           "picker": {
-            "search": "Search devices",
+            "search": "Search {number} devices",
             "state": "State"
           }
         },
@@ -4019,7 +4026,7 @@
             "header": "Entities",
             "introduction": "Home Assistant keeps a registry of every entity it has ever seen that can be uniquely identified. Each of these entities will have an entity ID assigned which will be reserved for just this entity.",
             "introduction2": "Use the entity registry to override the name, change the entity ID or remove the entry from Home Assistant.",
-            "search": "Search entities",
+            "search": "Search {number} entities",
             "unnamed_entity": "Unnamed entity",
             "status": {
               "restored": "Restored",