Add use_uuid

demo/src/stubs/hassio_supervisor.ts

@@ -31,7 +31,7 @@ export const mockHassioSupervisor = (hass: MockHomeAssistant) => {
             version_latest: "3.6.2",
             update_available: false,
             repository: "a0d7b954",
-            icon: false,
+            icon: true,
             logo: true,
           },
           {

gallery/src/components/demo-black-white-row.ts

@@ -53,19 +53,13 @@ class DemoBlackWhiteRow extends LitElement {
 
   firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
-    applyThemesOnElement(
-      this.shadowRoot!.querySelector(".dark"),
-      {
-        default_theme: "default",
-        default_dark_theme: "default",
-        themes: {},
-        darkMode: true,
-        theme: "default",
-      },
-      undefined,
-      undefined,
-      true
-    );
+    applyThemesOnElement(this.shadowRoot!.querySelector(".dark"), {
+      default_theme: "default",
+      default_dark_theme: "default",
+      themes: {},
+      darkMode: true,
+      theme: "default",
+    });
   }
 
   handleSubmit(ev) {

gallery/src/data/text.ts

@@ -1,11 +0,0 @@
-export const LONG_TEXT = `
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc laoreet velit ut elit volutpat, eget ultrices odio lacinia. In imperdiet malesuada est, nec sagittis metus ultricies quis. Sed nisl ex, convallis porttitor ante quis, hendrerit tristique justo. Mauris pharetra venenatis augue, eu maximus sem cursus in. Quisque sed consequat risus. Suspendisse facilisis ligula a odio consectetur condimentum. Curabitur vehicula elit nec augue mollis, et volutpat massa dictum.
-
-Nam pellentesque auctor rutrum. Suspendisse elit est, sodales vel diam nec, porttitor faucibus massa. Ut pretium ac orci eu pharetra. Praesent in nibh at magna viverra rutrum eu vitae tortor. Etiam eget sem ex. Fusce tristique odio nec lacus mattis, vitae tempor nunc malesuada. Maecenas faucibus magna vel libero maximus egestas. Vestibulum luctus semper velit, in lobortis risus tempus non. Curabitur bibendum ornare commodo. Quisque commodo neque sit amet tincidunt lacinia. Proin elementum ante velit, eu congue nulla semper quis. Pellentesque consequat vel nunc at scelerisque. Mauris sit amet venenatis diam, blandit viverra leo. Integer commodo laoreet orci.
-
-Curabitur ipsum tortor, sodales ut augue sed, commodo porttitor libero. Pellentesque molestie vitae mi consectetur tempor. In sed lectus consequat, lobortis neque non, semper ipsum. Etiam eget ex et nibh sagittis pulvinar lacinia ac mauris. Aenean ligula eros, viverra ac nibh at, venenatis semper quam. Sed interdum ligula sit amet massa tincidunt tincidunt. Suspendisse potenti. Aliquam egestas facilisis est, sed faucibus erat scelerisque id. Duis dolor quam, viverra vitae orci euismod, laoreet pellentesque justo. Nunc malesuada non erat at ullamcorper. Mauris eget posuere odio. Vestibulum turpis nunc, pharetra eget ante in, feugiat mollis justo. Proin porttitor, diam nec vulputate pretium, tellus arcu rhoncus turpis, a blandit nisi nulla quis arcu. Nunc ac ullamcorper ligula, nec facilisis leo.
-
-In vitae eros sollicitudin, iaculis ex eget, egestas orci. Etiam sed pretium lorem. Nam nisi enim, consectetur sit amet semper ac, semper pharetra diam. In pulvinar neque sapien, ac ullamcorper est lacinia a. Etiam tincidunt velit sed diam malesuada, eu ornare ex consectetur. Phasellus in imperdiet tellus. Sed bibendum, dui sit amet fringilla aliquet, enim odio sollicitudin lorem, vel semper turpis mauris vel mauris. Aenean congue magna ac massa cursus, in dictum orci commodo. Pellentesque mollis velit in sollicitudin tincidunt. Vestibulum et efficitur nulla.
-
-Quisque posuere, velit sed porttitor dapibus, neque augue fringilla felis, eu luctus nisi nisl nec ipsum. Curabitur pellentesque ac lectus eget ultricies. Vestibulum est dolor, lacinia pharetra vulputate a, facilisis a magna. Nam vitae arcu nibh. Praesent finibus blandit ante, ac gravida ex mollis eget. Donec quam est, pulvinar vitae neque ut, bibendum aliquam erat. Nullam mollis arcu at sem tincidunt, in tristique lectus facilisis. Aenean ut lacus vel nisl finibus iaculis non a turpis. Integer eget ipsum ante. Donec nunc neque, vestibulum ac magna ac, posuere scelerisque dui. Pellentesque massa nibh, rhoncus id dolor quis, placerat posuere turpis. Donec aliquet augue nisi, eu finibus dui auctor et. Vestibulum eu varius lorem. Quisque lectus ante, malesuada pretium risus eget, interdum mattis enim.
-`;

gallery/src/pages/components/ha-faded.ts

@@ -3,7 +3,18 @@ import { customElement } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-faded";
 import "../../../../src/components/ha-markdown";
-import { LONG_TEXT } from "../../data/text";
+
+const LONG_TEXT = `
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc laoreet velit ut elit volutpat, eget ultrices odio lacinia. In imperdiet malesuada est, nec sagittis metus ultricies quis. Sed nisl ex, convallis porttitor ante quis, hendrerit tristique justo. Mauris pharetra venenatis augue, eu maximus sem cursus in. Quisque sed consequat risus. Suspendisse facilisis ligula a odio consectetur condimentum. Curabitur vehicula elit nec augue mollis, et volutpat massa dictum.
+
+Nam pellentesque auctor rutrum. Suspendisse elit est, sodales vel diam nec, porttitor faucibus massa. Ut pretium ac orci eu pharetra. Praesent in nibh at magna viverra rutrum eu vitae tortor. Etiam eget sem ex. Fusce tristique odio nec lacus mattis, vitae tempor nunc malesuada. Maecenas faucibus magna vel libero maximus egestas. Vestibulum luctus semper velit, in lobortis risus tempus non. Curabitur bibendum ornare commodo. Quisque commodo neque sit amet tincidunt lacinia. Proin elementum ante velit, eu congue nulla semper quis. Pellentesque consequat vel nunc at scelerisque. Mauris sit amet venenatis diam, blandit viverra leo. Integer commodo laoreet orci.
+
+Curabitur ipsum tortor, sodales ut augue sed, commodo porttitor libero. Pellentesque molestie vitae mi consectetur tempor. In sed lectus consequat, lobortis neque non, semper ipsum. Etiam eget ex et nibh sagittis pulvinar lacinia ac mauris. Aenean ligula eros, viverra ac nibh at, venenatis semper quam. Sed interdum ligula sit amet massa tincidunt tincidunt. Suspendisse potenti. Aliquam egestas facilisis est, sed faucibus erat scelerisque id. Duis dolor quam, viverra vitae orci euismod, laoreet pellentesque justo. Nunc malesuada non erat at ullamcorper. Mauris eget posuere odio. Vestibulum turpis nunc, pharetra eget ante in, feugiat mollis justo. Proin porttitor, diam nec vulputate pretium, tellus arcu rhoncus turpis, a blandit nisi nulla quis arcu. Nunc ac ullamcorper ligula, nec facilisis leo.
+
+In vitae eros sollicitudin, iaculis ex eget, egestas orci. Etiam sed pretium lorem. Nam nisi enim, consectetur sit amet semper ac, semper pharetra diam. In pulvinar neque sapien, ac ullamcorper est lacinia a. Etiam tincidunt velit sed diam malesuada, eu ornare ex consectetur. Phasellus in imperdiet tellus. Sed bibendum, dui sit amet fringilla aliquet, enim odio sollicitudin lorem, vel semper turpis mauris vel mauris. Aenean congue magna ac massa cursus, in dictum orci commodo. Pellentesque mollis velit in sollicitudin tincidunt. Vestibulum et efficitur nulla.
+
+Quisque posuere, velit sed porttitor dapibus, neque augue fringilla felis, eu luctus nisi nisl nec ipsum. Curabitur pellentesque ac lectus eget ultricies. Vestibulum est dolor, lacinia pharetra vulputate a, facilisis a magna. Nam vitae arcu nibh. Praesent finibus blandit ante, ac gravida ex mollis eget. Donec quam est, pulvinar vitae neque ut, bibendum aliquam erat. Nullam mollis arcu at sem tincidunt, in tristique lectus facilisis. Aenean ut lacus vel nisl finibus iaculis non a turpis. Integer eget ipsum ante. Donec nunc neque, vestibulum ac magna ac, posuere scelerisque dui. Pellentesque massa nibh, rhoncus id dolor quis, placerat posuere turpis. Donec aliquet augue nisi, eu finibus dui auctor et. Vestibulum eu varius lorem. Quisque lectus ante, malesuada pretium risus eget, interdum mattis enim.
+`;
 
 const SMALL_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
 

gallery/src/pages/components/ha-form.ts

@@ -1,18 +1,18 @@
 /* eslint-disable lit/no-template-arrow */
 import "@material/mwc-button";
-import { html, LitElement, TemplateResult } from "lit";
+import { LitElement, TemplateResult, html } from "lit";
 import { customElement, state } from "lit/decorators";
+import { computeInitialHaFormData } from "../../../../src/components/ha-form/compute-initial-ha-form-data";
+import type { HaFormSchema } from "../../../../src/components/ha-form/types";
+import "../../../../src/components/ha-form/ha-form";
+import "../../components/demo-black-white-row";
 import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
 import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
 import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
 import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
-import { computeInitialHaFormData } from "../../../../src/components/ha-form/compute-initial-ha-form-data";
-import "../../../../src/components/ha-form/ha-form";
-import type { HaFormSchema } from "../../../../src/components/ha-form/types";
-import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import { HomeAssistant } from "../../../../src/types";
-import "../../components/demo-black-white-row";
+import { getEntity } from "../../../../src/fake_data/entity";
 
 const ENTITIES = [
   getEntity("alarm_control_panel", "alarm", "disarmed", {
@@ -147,9 +147,7 @@ const SCHEMAS: {
       { name: "target", selector: { target: {} } },
       { name: "number", selector: { number: { min: 0, max: 10 } } },
       { name: "boolean", selector: { boolean: {} } },
-      { name: "time", required: true, selector: { time: {} } },
-      { name: "datetime", required: true, selector: { datetime: {} } },
-      { name: "date", required: true, selector: { date: {} } },
+      { name: "time", selector: { time: {} } },
       { name: "action", selector: { action: {} } },
       { name: "text", selector: { text: { multiline: false } } },
       { name: "text_multiline", selector: { text: { multiline: true } } },

gallery/src/pages/components/ha-selector.ts

@@ -1,20 +1,20 @@
 /* eslint-disable lit/no-template-arrow */
 import "@material/mwc-button";
-import { css, html, LitElement, TemplateResult } from "lit";
+import { LitElement, TemplateResult, css, html } from "lit";
 import { customElement, state } from "lit/decorators";
-import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
-import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
-import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
-import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
 import "../../../../src/components/ha-selector/ha-selector";
 import "../../../../src/components/ha-settings-row";
-import { BlueprintInput } from "../../../../src/data/blueprint";
-import { showDialog } from "../../../../src/dialogs/make-dialog-manager";
-import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
-import { ProvideHassElement } from "../../../../src/mixins/provide-hass-lit-mixin";
 import type { HomeAssistant } from "../../../../src/types";
 import "../../components/demo-black-white-row";
+import { BlueprintInput } from "../../../../src/data/blueprint";
+import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
+import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
+import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
+import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
+import { getEntity } from "../../../../src/fake_data/entity";
+import { ProvideHassElement } from "../../../../src/mixins/provide-hass-lit-mixin";
+import { showDialog } from "../../../../src/dialogs/make-dialog-manager";
 
 const ENTITIES = [
   getEntity("alarm_control_panel", "alarm", "disarmed", {
@@ -109,7 +109,7 @@ const AREAS = [
 
 const SCHEMAS: {
   name: string;
-  input: Record<string, (BlueprintInput & { required?: boolean }) | null>;
+  input: Record<string, BlueprintInput | null>;
 }[] = [
   {
     name: "One of each",
@@ -166,9 +166,7 @@ const SCHEMAS: {
       object: { name: "Object", selector: { object: {} } },
       select_radio: {
         name: "Select (Radio)",
-        selector: {
-          select: { options: ["Option 1", "Option 2"], mode: "list" },
-        },
+        selector: { select: { options: ["Option 1", "Option 2"] } },
       },
       select: {
         name: "Select",
@@ -185,22 +183,6 @@ const SCHEMAS: {
           },
         },
       },
-      select_custom: {
-        name: "Select (Custom)",
-        selector: {
-          select: {
-            custom_value: true,
-            options: [
-              "Option 1",
-              "Option 2",
-              "Option 3",
-              "Option 4",
-              "Option 5",
-              "Option 6",
-            ],
-          },
-        },
-      },
       icon: { name: "Icon", selector: { icon: {} } },
       media: { name: "Media", selector: { media: {} } },
       location: { name: "Location", selector: { location: {} } },
@@ -220,35 +202,6 @@ const SCHEMAS: {
     input: {
       entity: { name: "Entity", selector: { entity: { multiple: true } } },
       device: { name: "Device", selector: { device: { multiple: true } } },
-      area: { name: "Area", selector: { area: { multiple: true } } },
-      select: {
-        name: "Select Multiple",
-        selector: {
-          select: {
-            multiple: true,
-            custom_value: true,
-            options: [
-              "Option 1",
-              "Option 2",
-              "Option 3",
-              "Option 4",
-              "Option 5",
-              "Option 6",
-            ],
-          },
-        },
-      },
-      select_checkbox: {
-        name: "Select Multiple (Checkbox)",
-        required: false,
-        selector: {
-          select: {
-            mode: "list",
-            multiple: true,
-            options: ["Option 1", "Option 2", "Option 3", "Option 4"],
-          },
-        },
-      },
     },
   },
 ];
@@ -257,14 +210,6 @@ const SCHEMAS: {
 class DemoHaSelector extends LitElement implements ProvideHassElement {
   @state() public hass!: HomeAssistant;
 
-  @state() private _disabled = false;
-
-  @state() private _required = false;
-
-  @state() private _helper = false;
-
-  @state() private _label = true;
-
   private data = SCHEMAS.map(() => ({}));
 
   constructor() {
@@ -398,36 +343,6 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
 
   protected render(): TemplateResult {
     return html`
-      <div class="options">
-        <ha-formfield label="Labels">
-          <ha-switch
-            .name=${"label"}
-            .checked=${this._label}
-            @change=${this._handleOptionChange}
-          ></ha-switch>
-        </ha-formfield>
-        <ha-formfield label="Required">
-          <ha-switch
-            .name=${"required"}
-            .checked=${this._required}
-            @change=${this._handleOptionChange}
-          ></ha-switch>
-        </ha-formfield>
-        <ha-formfield label="Disabled">
-          <ha-switch
-            .name=${"disabled"}
-            .checked=${this._disabled}
-            @change=${this._handleOptionChange}
-          ></ha-switch>
-        </ha-formfield>
-        <ha-formfield label="Helper text">
-          <ha-switch
-            .name=${"helper"}
-            .checked=${this._helper}
-            @change=${this._handleOptionChange}
-          ></ha-switch>
-        </ha-formfield>
-      </div>
       ${SCHEMAS.map((info, idx) => {
         const data = this.data[idx];
         const valueChanged = (ev) => {
@@ -450,12 +365,8 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
                         .hass=${this.hass}
                         .selector=${value!.selector}
                         .key=${key}
-                        .label=${this._label ? value!.name : undefined}
                         .value=${data[key] ?? value!.default}
-                        .disabled=${this._disabled}
-                        .required=${this._required}
                         @value-changed=${valueChanged}
-                        .helper=${this._helper ? "Helper text" : undefined}
                       ></ha-selector>
                     </ha-settings-row>
                   `
@@ -467,21 +378,10 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
     `;
   }
 
-  private _handleOptionChange(ev) {
-    this[`_${ev.target.name}`] = ev.target.checked;
-  }
-
   static styles = css`
     ha-selector {
       width: 60;
     }
-    .options {
-      max-width: 800px;
-      margin: 16px auto;
-    }
-    .options ha-formfield {
-      margin-right: 16px;
-    }
   `;
 }
 

gallery/src/pages/lovelace/markdown-card.ts

@@ -9,7 +9,7 @@ const CONFIGS = [
     heading: "markdown-it demo",
     config: `
 - type: markdown
-  content: >-
+  content: >
     # h1 Heading 8-)
 
     ## h2 Heading
@@ -249,17 +249,6 @@ const CONFIGS = [
     ::: warning
     *here be dragons*
     :::
-
-    ### ha-alert
-
-    You can use our [\`ha-alert\`](https://design.home-assistant.io/#components/ha-alert) component in markdown content rendered in the Home Assistant Frontend.
-
-    <ha-alert alert-type="error">This is an error alert — check it out!</ha-alert>
-    <ha-alert alert-type="warning">This is a warning alert — check it out!</ha-alert>
-    <ha-alert alert-type="info">This is an info alert — check it out!</ha-alert>
-    <ha-alert alert-type="success">This is a success alert — check it out!</ha-alert>
-    <ha-alert title="Test alert">This is an alert with a title</ha-alert>
-
     `,
   },
 ];

gallery/src/pages/more-info/update.ts

@@ -5,7 +5,6 @@ import {
   UPDATE_SUPPORT_BACKUP,
   UPDATE_SUPPORT_PROGRESS,
   UPDATE_SUPPORT_INSTALL,
-  UPDATE_SUPPORT_RELEASE_NOTES,
 } from "../../../../src/data/update";
 import "../../../../src/dialogs/more-info/more-info-content";
 import { getEntity } from "../../../../src/fake_data/entity";
@@ -14,11 +13,10 @@ import {
   provideHass,
 } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-more-infos";
-import { LONG_TEXT } from "../../data/text";
 
 const base_attributes = {
   title: "Awesome",
-  installed_version: "1.2.2",
+  current_version: "1.2.2",
   latest_version: "1.2.3",
   release_url: "https://home-assistant.io",
   supported_features: UPDATE_SUPPORT_INSTALL,
@@ -50,7 +48,7 @@ const ENTITIES = [
   }),
   getEntity("update", "update5", "off", {
     ...base_attributes,
-    installed_version: "1.2.3",
+    current_version: "1.2.3",
     friendly_name: "No update",
   }),
   getEntity("update", "update6", "off", {
@@ -102,37 +100,14 @@ const ENTITIES = [
   }),
   getEntity("update", "update14", "off", {
     ...base_attributes,
-    installed_version: null,
-    friendly_name: "Update without installed_version",
+    current_version: null,
+    friendly_name: "Update without current_version",
   }),
   getEntity("update", "update15", "off", {
     ...base_attributes,
     latest_version: null,
     friendly_name: "Update without latest_version",
   }),
-  getEntity("update", "update16", "off", {
-    ...base_attributes,
-    friendly_name: "Update with release notes",
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_RELEASE_NOTES,
-  }),
-  getEntity("update", "update17", "off", {
-    ...base_attributes,
-    friendly_name: "Update with release notes error",
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_RELEASE_NOTES,
-  }),
-  getEntity("update", "update18", "off", {
-    ...base_attributes,
-    friendly_name: "Update with release notes loading",
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_RELEASE_NOTES,
-  }),
-  getEntity("update", "update19", "on", {
-    ...base_attributes,
-    friendly_name: "Update with auto update",
-    auto_update: true,
-  }),
 ];
 
 @customElement("demo-more-info-update")
@@ -155,24 +130,6 @@ class DemoMoreInfoUpdate extends LitElement {
     const hass = provideHass(this._demoRoot);
     hass.updateTranslations(null, "en");
     hass.addEntities(ENTITIES);
-    hass.mockWS(
-      "update/release_notes",
-      (msg: { type: string; entity_id: string }) => {
-        if (msg.entity_id === "update.update16") {
-          return LONG_TEXT;
-        }
-        if (msg.entity_id === "update.update17") {
-          return Promise.reject({
-            code: "error",
-            message: "Could not fetch release notes",
-          });
-        }
-        if (msg.entity_id === "update.update18") {
-          return undefined;
-        }
-        return null;
-      }
-    );
   }
 }
 

hassio/src/addon-view/config/hassio-addon-config.ts

@@ -39,14 +39,7 @@ import type { HomeAssistant } from "../../../../src/types";
 import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
 import { hassioStyle } from "../../resources/hassio-style";
 
-const SUPPORTED_UI_TYPES = [
-  "string",
-  "select",
-  "boolean",
-  "integer",
-  "float",
-  "schema",
-];
+const SUPPORTED_UI_TYPES = ["string", "select", "boolean", "integer", "float"];
 
 const ADDON_YAML_SCHEMA = DEFAULT_SCHEMA.extend([
   new Type("!secret", {
@@ -82,59 +75,19 @@ class HassioAddonConfig extends LitElement {
   public computeLabel = (entry: HaFormSchema): string =>
     this.addon.translations[this.hass.language]?.configuration?.[entry.name]
       ?.name ||
-    this.addon.translations.en?.configuration?.[entry.name]?.name ||
+    this.addon.translations.en?.configuration?.[entry.name].name ||
     entry.name;
 
-  public computeHelper = (entry: HaFormSchema): string =>
-    this.addon.translations[this.hass.language]?.configuration?.[entry.name]
-      ?.description ||
-    this.addon.translations.en?.configuration?.[entry.name]?.description ||
-    "";
-
-  private _convertSchema = memoizeOne(
-    // Convert supervisor schema to selectors
-    (schema: Record<string, any>): HaFormSchema[] =>
-      schema.map((entry) =>
-        entry.type === "select"
-          ? {
-              name: entry.name,
-              required: entry.required,
-              selector: { select: { options: entry.options } },
-            }
-          : entry.type === "string"
-          ? entry.multiple
-            ? {
-                name: entry.name,
-                required: entry.required,
-                selector: {
-                  select: { options: [], multiple: true, custom_value: true },
-                },
-              }
-            : {
-                name: entry.name,
-                required: entry.required,
-                selector: { text: { type: "text" } },
-              }
-          : entry.type === "boolean"
-          ? {
-              name: entry.name,
-              required: entry.required,
-              selector: { boolean: {} },
-            }
-          : entry.type === "schema"
-          ? {
-              name: entry.name,
-              required: entry.required,
-              selector: { object: {} },
-            }
-          : entry.type === "float" || entry.type === "integer"
-          ? {
-              name: entry.name,
-              required: entry.required,
-              selector: { number: { mode: "box" } },
-            }
-          : entry
-      )
+  private _schema = memoizeOne((schema: HaFormSchema[]): HaFormSchema[] =>
+    // @ts-expect-error supervisor does not implement [string, string] for select.options[]
+    schema.map((entry) =>
+      entry.type === "select"
+        ? {
+            ...entry,
+            options: entry.options.map((option) => [option, option]),
+          }
+        : entry
+    )
   );
 
   private _filteredShchema = memoizeOne(
@@ -187,8 +140,7 @@ class HassioAddonConfig extends LitElement {
                 .data=${this._options!}
                 @value-changed=${this._configChanged}
                 .computeLabel=${this.computeLabel}
-                .computeHelper=${this.computeHelper}
-                .schema=${this._convertSchema(
+                .schema=${this._schema(
                   this._showOptional
                     ? this.addon.schema!
                     : this._filteredShchema(
@@ -245,9 +197,8 @@ class HassioAddonConfig extends LitElement {
   protected firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
     this._canShowSchema = !this.addon.schema!.find(
-      (entry) =>
-        // @ts-ignore
-        !SUPPORTED_UI_TYPES.includes(entry.type)
+      // @ts-ignore
+      (entry) => !SUPPORTED_UI_TYPES.includes(entry.type) || entry.multiple
     );
     this._yamlMode = !this._canShowSchema;
   }

hassio/src/addon-view/config/hassio-addon-network.ts

@@ -1,3 +1,4 @@
+import { PaperInputElement } from "@polymer/paper-input/paper-input";
 import {
   css,
   CSSResultGroup,
@@ -7,13 +8,10 @@ import {
   TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-card";
-import "../../../../src/components/ha-form/ha-form";
-import type { HaFormSchema } from "../../../../src/components/ha-form/types";
 import {
   HassioAddonDetails,
   HassioAddonSetOptionParams,
@@ -26,6 +24,16 @@ import { HomeAssistant } from "../../../../src/types";
 import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
 import { hassioStyle } from "../../resources/hassio-style";
 
+interface NetworkItem {
+  description: string;
+  container: string;
+  host: number | null;
+}
+
+interface NetworkItemInput extends PaperInputElement {
+  container: string;
+}
+
 @customElement("hassio-addon-network")
 class HassioAddonNetwork extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -34,13 +42,9 @@ class HassioAddonNetwork extends LitElement {
 
   @property({ attribute: false }) public addon!: HassioAddonDetails;
 
-  @state() private _showOptional = false;
-
-  @state() private _configHasChanged = false;
-
   @state() private _error?: string;
 
-  @state() private _config?: Record<string, any>;
+  @state() private _config?: NetworkItem[];
 
   public connectedCallback(): void {
     super.connectedCallback();
@@ -52,10 +56,6 @@ class HassioAddonNetwork extends LitElement {
       return html``;
     }
 
-    const hasHiddenOptions = Object.keys(this._config).find(
-      (entry) => this._config![entry] === null
-    );
-
     return html`
       <ha-card
         .header=${this.supervisor.localize(
@@ -63,49 +63,52 @@ class HassioAddonNetwork extends LitElement {
         )}
       >
         <div class="card-content">
-          <p>
-            ${this.supervisor.localize(
-              "addon.configuration.network.introduction"
-            )}
-          </p>
           ${this._error
             ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
             : ""}
 
-          <ha-form
-            .data=${this._config}
-            @value-changed=${this._configChanged}
-            .computeLabel=${this._computeLabel}
-            .computeHelper=${this._computeHelper}
-            .schema=${this._createSchema(
-              this._config,
-              this._showOptional,
-              this.hass.userData?.showAdvanced || false
-            )}
-          ></ha-form>
-        </div>
-        ${hasHiddenOptions
-          ? html`<ha-formfield
-              class="show-optional"
-              .label=${this.supervisor.localize(
-                "addon.configuration.network.show_disabled"
+          <table>
+            <tbody>
+              <tr>
+                <th>
+                  ${this.supervisor.localize(
+                    "addon.configuration.network.container"
+                  )}
+                </th>
+                <th>
+                  ${this.supervisor.localize(
+                    "addon.configuration.network.host"
+                  )}
+                </th>
+                <th>${this.supervisor.localize("common.description")}</th>
+              </tr>
+              ${this._config!.map(
+                (item) => html`
+                  <tr>
+                    <td>${item.container}</td>
+                    <td>
+                      <paper-input
+                        @value-changed=${this._configChanged}
+                        placeholder=${this.supervisor.localize(
+                          "addon.configuration.network.disabled"
+                        )}
+                        .value=${item.host ? String(item.host) : ""}
+                        .container=${item.container}
+                        no-label-float
+                      ></paper-input>
+                    </td>
+                    <td>${this._computeDescription(item)}</td>
+                  </tr>
+                `
               )}
-            >
-              <ha-switch
-                @change=${this._toggleOptional}
-                .checked=${this._showOptional}
-              >
-              </ha-switch>
-            </ha-formfield>`
-          : ""}
+            </tbody>
+          </table>
+        </div>
         <div class="card-actions">
           <ha-progress-button class="warning" @click=${this._resetTapped}>
             ${this.supervisor.localize("common.reset_defaults")}
           </ha-progress-button>
-          <ha-progress-button
-            @click=${this._saveTapped}
-            .disabled=${!this._configHasChanged}
-          >
+          <ha-progress-button @click=${this._saveTapped}>
             ${this.supervisor.localize("common.save")}
           </ha-progress-button>
         </div>
@@ -120,60 +123,50 @@ class HassioAddonNetwork extends LitElement {
     }
   }
 
-  private _createSchema = memoizeOne(
-    (
-      config: Record<string, number>,
-      showOptional: boolean,
-      advanced: boolean
-    ): HaFormSchema[] =>
-      (showOptional
-        ? Object.keys(config)
-        : Object.keys(config).filter((entry) => config[entry] !== null)
-      ).map((entry) => ({
-        name: entry,
-        selector: {
-          number: {
-            mode: "box",
-            min: 0,
-            max: 65535,
-            unit_of_measurement: advanced ? entry : undefined,
-          },
-        },
-      }))
-  );
-
-  private _computeLabel = (_: HaFormSchema): string => "";
-
-  private _computeHelper = (item: HaFormSchema): string =>
-    this.addon.translations[this.hass.language]?.network?.[item.name] ||
-    this.addon.translations.en?.network?.[item.name] ||
-    this.addon.network_description?.[item.name] ||
-    item.name;
+  private _computeDescription = (item: NetworkItem): string =>
+    this.addon.translations[this.hass.language]?.network?.[item.container]
+      ?.description ||
+    this.addon.translations.en?.network?.[item.container]?.description ||
+    item.description;
 
   private _setNetworkConfig(): void {
-    this._config = this.addon.network || {};
+    const network = this.addon.network || {};
+    const description = this.addon.network_description || {};
+    const items: NetworkItem[] = Object.keys(network).map((key) => ({
+      container: key,
+      host: network[key],
+      description: description[key],
+    }));
+    this._config = items.sort((a, b) => (a.container > b.container ? 1 : -1));
   }
 
-  private async _configChanged(ev: CustomEvent): Promise<void> {
-    this._configHasChanged = true;
-    this._config! = ev.detail.value;
+  private async _configChanged(ev: Event): Promise<void> {
+    const target = ev.target as NetworkItemInput;
+    this._config!.forEach((item) => {
+      if (
+        item.container === target.container &&
+        item.host !== parseInt(String(target.value), 10)
+      ) {
+        item.host = target.value ? parseInt(String(target.value), 10) : null;
+      }
+    });
   }
 
   private async _resetTapped(ev: CustomEvent): Promise<void> {
     const button = ev.currentTarget as any;
+    button.progress = true;
+
     const data: HassioAddonSetOptionParams = {
       network: null,
     };
 
     try {
       await setHassioAddonOption(this.hass, this.addon.slug, data);
-      this._configHasChanged = false;
       const eventdata = {
         success: true,
         response: undefined,
         path: "option",
       };
-      button.actionSuccess();
       fireEvent(this, "hass-api-called", eventdata);
       if (this.addon?.state === "started") {
         await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
@@ -184,21 +177,19 @@ class HassioAddonNetwork extends LitElement {
         "error",
         extractApiErrorMessage(err)
       );
-      button.actionError();
     }
-  }
 
-  private _toggleOptional() {
-    this._showOptional = !this._showOptional;
+    button.progress = false;
   }
 
   private async _saveTapped(ev: CustomEvent): Promise<void> {
     const button = ev.currentTarget as any;
+    button.progress = true;
 
     this._error = undefined;
     const networkconfiguration = {};
-    Object.entries(this._config!).forEach(([key, value]) => {
-      networkconfiguration[key] = value ?? null;
+    this._config!.forEach((item) => {
+      networkconfiguration[item.container] = parseInt(String(item.host), 10);
     });
 
     const data: HassioAddonSetOptionParams = {
@@ -207,13 +198,11 @@ class HassioAddonNetwork extends LitElement {
 
     try {
       await setHassioAddonOption(this.hass, this.addon.slug, data);
-      this._configHasChanged = false;
       const eventdata = {
         success: true,
         response: undefined,
         path: "option",
       };
-      button.actionSuccess();
       fireEvent(this, "hass-api-called", eventdata);
       if (this.addon?.state === "started") {
         await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
@@ -224,8 +213,8 @@ class HassioAddonNetwork extends LitElement {
         "error",
         extractApiErrorMessage(err)
       );
-      button.actionError();
     }
+    button.progress = false;
   }
 
   static get styles(): CSSResultGroup {
@@ -243,9 +232,6 @@ class HassioAddonNetwork extends LitElement {
           display: flex;
           justify-content: space-between;
         }
-        .show-optional {
-          padding: 16px;
-        }
       `,
     ];
   }

hassio/src/components/supervisor-backup-content.ts

@@ -32,6 +32,13 @@ interface AddonCheckboxItem extends CheckboxItem {
 
 const _computeFolders = (folders): CheckboxItem[] => {
   const list: CheckboxItem[] = [];
+  if (folders.includes("homeassistant")) {
+    list.push({
+      slug: "homeassistant",
+      name: "Home Assistant configuration",
+      checked: false,
+    });
+  }
   if (folders.includes("ssl")) {
     list.push({ slug: "ssl", name: "SSL", checked: false });
   }
@@ -93,7 +100,7 @@ export class SupervisorBackupContent extends LitElement {
       this.folders = _computeFolders(
         this.backup
           ? this.backup.folders
-          : ["ssl", "share", "media", "addons/local"]
+          : ["homeassistant", "ssl", "share", "media", "addons/local"]
       );
       this.addons = _computeAddons(
         this.backup ? this.backup.addons : this.supervisor?.supervisor.addons
@@ -180,7 +187,7 @@ export class SupervisorBackupContent extends LitElement {
             >
               <ha-checkbox
                 .checked=${this.homeAssistant}
-                @change=${this.toggleHomeAssistant}
+                @click=${this.toggleHomeAssistant}
               >
               </ha-checkbox>
             </ha-formfield>

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name         = home-assistant-frontend
-version      = 20220405.0
+version      = 20220322.0
 author       = The Home Assistant Authors
 author_email = hello@home-assistant.io
 license      = Apache-2.0

src/common/entity/domain_icon.ts

@@ -8,25 +8,26 @@ import {
   mdiCalendar,
   mdiCast,
   mdiCastConnected,
-  mdiCheckCircleOutline,
   mdiClock,
-  mdiCloseCircleOutline,
   mdiGestureTapButton,
   mdiLanConnect,
   mdiLanDisconnect,
+  mdiLightSwitch,
   mdiLock,
   mdiLockAlert,
   mdiLockClock,
   mdiLockOpen,
-  mdiPackage,
-  mdiPackageDown,
   mdiPackageUp,
   mdiPowerPlug,
   mdiPowerPlugOff,
   mdiRestart,
-  mdiToggleSwitchVariant,
-  mdiToggleSwitchVariantOff,
+  mdiToggleSwitch,
+  mdiToggleSwitchOff,
+  mdiCheckCircleOutline,
+  mdiCloseCircleOutline,
   mdiWeatherNight,
+  mdiPackage,
+  mdiPackageDown,
 } from "@mdi/js";
 import { HassEntity } from "home-assistant-js-websocket";
 import { updateIsInstalling, UpdateEntity } from "../../data/update";
@@ -108,11 +109,9 @@ export const domainIcon = (
         case "outlet":
           return compareState === "on" ? mdiPowerPlug : mdiPowerPlugOff;
         case "switch":
-          return compareState === "on"
-            ? mdiToggleSwitchVariant
-            : mdiToggleSwitchVariantOff;
+          return compareState === "on" ? mdiToggleSwitch : mdiToggleSwitchOff;
         default:
-          return mdiToggleSwitchVariant;
+          return mdiLightSwitch;
       }
 
     case "sensor": {

src/common/style/icon_color_css.ts

@@ -7,7 +7,6 @@ export const iconColorCSS = css`
   ha-state-icon[data-domain="calendar"][data-state="on"],
   ha-state-icon[data-domain="camera"][data-state="streaming"],
   ha-state-icon[data-domain="cover"][data-state="open"],
-  ha-state-icon[data-domain="device_tracker"][data-state="home"],
   ha-state-icon[data-domain="fan"][data-state="on"],
   ha-state-icon[data-domain="humidifier"][data-state="on"],
   ha-state-icon[data-domain="light"][data-state="on"],

src/common/util/time-cache-entity-promise-func.ts

@@ -1,53 +0,0 @@
-import { HomeAssistant } from "../../types";
-
-interface ResultCache<T> {
-  [entityId: string]: Promise<T> | undefined;
-}
-
-/**
- * Call a function with result caching per entity.
- * @param cacheKey key to store the cache on hass object
- * @param cacheTime time to cache the results
- * @param func function to fetch the data
- * @param hass Home Assistant object
- * @param entityId entity to fetch data for
- * @param args extra arguments to pass to the function to fetch the data
- * @returns
- */
-export const timeCacheEntityPromiseFunc = async <T>(
-  cacheKey: string,
-  cacheTime: number,
-  func: (hass: HomeAssistant, entityId: string, ...args: any[]) => Promise<T>,
-  hass: HomeAssistant,
-  entityId: string,
-  ...args: any[]
-): Promise<T> => {
-  let cache: ResultCache<T> | undefined = (hass as any)[cacheKey];
-
-  if (!cache) {
-    cache = hass[cacheKey] = {};
-  }
-
-  const lastResult = cache[entityId];
-
-  if (lastResult) {
-    return lastResult;
-  }
-
-  const result = func(hass, entityId, ...args);
-  cache[entityId] = result;
-
-  result.then(
-    // When successful, set timer to clear cache
-    () =>
-      setTimeout(() => {
-        cache![entityId] = undefined;
-      }, cacheTime),
-    // On failure, clear cache right away
-    () => {
-      cache![entityId] = undefined;
-    }
-  );
-
-  return result;
-};

src/common/util/time-cache-function-promise.ts

@@ -1,80 +1,43 @@
 import { HomeAssistant } from "../../types";
 
-interface CacheResult<T> {
-  result: T;
-  cacheKey: any;
+interface ResultCache<T> {
+  [entityId: string]: Promise<T> | undefined;
 }
 
-/**
- * Caches a result of a promise for X time. Allows optional extra validation
- * check to invalidate the cache.
- * @param cacheKey the key to store the cache
- * @param cacheTime the time to cache the result
- * @param func the function to fetch the data
- * @param generateCacheKey optional function to generate a cache key based on current hass + cached result. Cache is invalid if generates a different cache key.
- * @param hass Home Assistant object
- * @param args extra arguments to pass to the function to fetch the data
- * @returns
- */
 export const timeCachePromiseFunc = async <T>(
   cacheKey: string,
   cacheTime: number,
-  func: (hass: HomeAssistant, ...args: any[]) => Promise<T>,
-  generateCacheKey:
-    | ((hass: HomeAssistant, lastResult: T) => unknown)
-    | undefined,
+  func: (hass: HomeAssistant, entityId: string, ...args: any[]) => Promise<T>,
   hass: HomeAssistant,
+  entityId: string,
   ...args: any[]
 ): Promise<T> => {
-  const anyHass = hass as any;
-  const lastResult: Promise<CacheResult<T>> | CacheResult<T> | undefined =
-    anyHass[cacheKey];
+  let cache: ResultCache<T> | undefined = (hass as any)[cacheKey];
 
-  const checkCachedResult = (result: CacheResult<T>): T | Promise<T> => {
-    if (
-      !generateCacheKey ||
-      generateCacheKey(hass, result.result) === result.cacheKey
-    ) {
-      return result.result;
-    }
-
-    anyHass[cacheKey] = undefined;
-    return timeCachePromiseFunc(
-      cacheKey,
-      cacheTime,
-      func,
-      generateCacheKey,
-      hass,
-      ...args
-    );
-  };
-
-  // If we have a cached result, return it if it's still valid
-  if (lastResult) {
-    return lastResult instanceof Promise
-      ? lastResult.then(checkCachedResult)
-      : checkCachedResult(lastResult);
+  if (!cache) {
+    cache = hass[cacheKey] = {};
   }
 
-  const resultPromise = func(hass, ...args);
-  anyHass[cacheKey] = resultPromise;
+  const lastResult = cache[entityId];
 
-  resultPromise.then(
+  if (lastResult) {
+    return lastResult;
+  }
+
+  const result = func(hass, entityId, ...args);
+  cache[entityId] = result;
+
+  result.then(
     // When successful, set timer to clear cache
-    (result) => {
-      anyHass[cacheKey] = {
-        result,
-        cacheKey: generateCacheKey?.(hass, result),
-      };
+    () =>
       setTimeout(() => {
-        anyHass[cacheKey] = undefined;
-      }, cacheTime);
-    },
+        cache![entityId] = undefined;
+      }, cacheTime),
     // On failure, clear cache right away
     () => {
-      anyHass[cacheKey] = undefined;
+      cache![entityId] = undefined;
     }
   );
 
-  return resultPromise;
+  return result;
 };

src/components/chart/statistics-chart.ts

@@ -347,8 +347,8 @@ class StatisticsChart extends LitElement {
         statTypes.forEach((type) => {
           let val: number | null;
           if (type === "sum") {
-            if (initVal === null) {
-              initVal = val = stat.state || 0;
+            if (!initVal) {
+              initVal = val = stat.state;
               prevSum = stat.sum;
             } else {
               val = initVal + ((stat.sum || 0) - prevSum!);

src/components/device/ha-device-picker.ts

@@ -52,8 +52,6 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
 
   @property() public value?: string;
 
-  @property() public helper?: string;
-
   @property() public devices?: DeviceRegistryEntry[];
 
   @property() public areas?: AreaRegistryEntry[];
@@ -88,8 +86,6 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
 
   @property({ type: Boolean }) public disabled?: boolean;
 
-  @property({ type: Boolean }) public required?: boolean;
-
   @state() private _opened?: boolean;
 
   @query("ha-combo-box", true) public comboBox!: HaComboBox;
@@ -271,10 +267,8 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
           ? this.hass.localize("ui.components.device-picker.device")
           : this.label}
         .value=${this._value}
-        .helper=${this.helper}
         .renderer=${rowRenderer}
         .disabled=${this.disabled}
-        .required=${this.required}
         item-value-path="id"
         item-label-path="name"
         @opened-changed=${this._openedChanged}

src/components/device/ha-devices-picker.ts

@@ -4,7 +4,6 @@ import { fireEvent } from "../../common/dom/fire_event";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import "./ha-device-picker";
-import type { HaDevicePickerDeviceFilterFunc } from "./ha-device-picker";
 
 @customElement("ha-devices-picker")
 class HaDevicesPicker extends LitElement {
@@ -12,12 +11,6 @@ class HaDevicesPicker extends LitElement {
 
   @property() public value?: string[];
 
-  @property() public helper?: string;
-
-  @property({ type: Boolean }) public disabled?: boolean;
-
-  @property({ type: Boolean }) public required?: boolean;
-
   /**
    * Show entities from specific domains.
    * @type {string}
@@ -42,8 +35,6 @@ class HaDevicesPicker extends LitElement {
 
   @property({ attribute: "pick-device-label" }) public pickDeviceLabel?: string;
 
-  @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc;
-
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
@@ -58,13 +49,11 @@ class HaDevicesPicker extends LitElement {
               allow-custom-entity
               .curValue=${entityId}
               .hass=${this.hass}
-              .deviceFilter=${this.deviceFilter}
               .includeDomains=${this.includeDomains}
               .excludeDomains=${this.excludeDomains}
               .includeDeviceClasses=${this.includeDeviceClasses}
               .value=${entityId}
               .label=${this.pickedDeviceLabel}
-              .disabled=${this.disabled}
               @value-changed=${this._deviceChanged}
             ></ha-device-picker>
           </div>
@@ -72,16 +61,11 @@ class HaDevicesPicker extends LitElement {
       )}
       <div>
         <ha-device-picker
-          allow-custom-entity
           .hass=${this.hass}
-          .helper=${this.helper}
-          .deviceFilter=${this.deviceFilter}
           .includeDomains=${this.includeDomains}
           .excludeDomains=${this.excludeDomains}
           .includeDeviceClasses=${this.includeDeviceClasses}
           .label=${this.pickDeviceLabel}
-          .disabled=${this.disabled}
-          .required=${this.required && !currentDevices.length}
           @value-changed=${this._addDevice}
         ></ha-device-picker>
       </div>

src/components/entity/ha-entities-picker.ts

@@ -14,12 +14,6 @@ class HaEntitiesPickerLight extends LitElement {
 
   @property({ type: Array }) public value?: string[];
 
-  @property({ type: Boolean }) public disabled?: boolean;
-
-  @property({ type: Boolean }) public required?: boolean;
-
-  @property() public helper?: string;
-
   /**
    * Show entities from specific domains.
    * @type {string}
@@ -98,7 +92,6 @@ class HaEntitiesPickerLight extends LitElement {
               .entityFilter=${this._entityFilter}
               .value=${entityId}
               .label=${this.pickedEntityLabel}
-              .disabled=${this.disabled}
               @value-changed=${this._entityChanged}
             ></ha-entity-picker>
           </div>
@@ -106,7 +99,6 @@ class HaEntitiesPickerLight extends LitElement {
       )}
       <div>
         <ha-entity-picker
-          allow-custom-entity
           .hass=${this.hass}
           .includeDomains=${this.includeDomains}
           .excludeDomains=${this.excludeDomains}
@@ -116,9 +108,6 @@ class HaEntitiesPickerLight extends LitElement {
           .includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
           .entityFilter=${this._entityFilter}
           .label=${this.pickEntityLabel}
-          .helper=${this.helper}
-          .disabled=${this.disabled}
-          .required=${this.required && !currentEntities.length}
           @value-changed=${this._addEntity}
         ></ha-entity-picker>
       </div>

src/components/entity/ha-entity-attribute-picker.ts

@@ -19,8 +19,6 @@ class HaEntityAttributePicker extends LitElement {
 
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = false;
-
   @property({ type: Boolean, attribute: "allow-custom-value" })
   public allowCustomValue;
 
@@ -28,8 +26,6 @@ class HaEntityAttributePicker extends LitElement {
 
   @property() public value?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) private _opened = false;
 
   @query("ha-combo-box", true) private _comboBox!: HaComboBox;
@@ -65,8 +61,6 @@ class HaEntityAttributePicker extends LitElement {
           "ui.components.entity.entity-attribute-picker.attribute"
         )}
         .disabled=${this.disabled || !this.entityId}
-        .required=${this.required}
-        .helper=${this.helper}
         .allowCustomValue=${this.allowCustomValue}
         item-value-path="value"
         item-label-path="label"

src/components/entity/ha-entity-picker.ts

@@ -18,6 +18,7 @@ import "./state-badge";
 
 interface HassEntityWithCachedName extends HassEntity {
   friendly_name: string;
+  id: string;
 }
 
 export type HaEntityPickerEntityFilterFunc = (entityId: HassEntity) => boolean;
@@ -39,8 +40,6 @@ export class HaEntityPicker extends LitElement {
 
   @property({ type: Boolean }) public disabled?: boolean;
 
-  @property({ type: Boolean }) public required?: boolean;
-
   @property({ type: Boolean, attribute: "allow-custom-entity" })
   public allowCustomEntity;
 
@@ -48,8 +47,6 @@ export class HaEntityPicker extends LitElement {
 
   @property() public value?: string;
 
-  @property() public helper?: string;
-
   /**
    * Show entities from specific domains.
    * @type {Array}
@@ -100,6 +97,9 @@ export class HaEntityPicker extends LitElement {
 
   @property() public entityFilter?: HaEntityPickerEntityFilterFunc;
 
+  @property({ attribute: "item-value-path" }) public itemValuePath =
+    "entity_id";
+
   @property({ type: Boolean }) public hideClearIcon = false;
 
   @state() private _opened = false;
@@ -148,6 +148,7 @@ export class HaEntityPicker extends LitElement {
             state: "",
             last_changed: "",
             last_updated: "",
+            id: "",
             context: { id: "", user_id: null, parent_id: null },
             friendly_name: this.hass!.localize(
               "ui.components.entity.entity-picker.no_entities"
@@ -168,10 +169,15 @@ export class HaEntityPicker extends LitElement {
         );
 
         return entityIds
-          .map((key) => ({
-            ...hass!.states[key],
-            friendly_name: computeStateName(hass!.states[key]) || key,
-          }))
+          .map((key) => {
+            const stateObj = hass!.states[key];
+
+            return {
+              ...stateObj,
+              friendly_name: computeStateName(stateObj) || key,
+              id: stateObj.context.id,
+            };
+          })
           .sort((entityA, entityB) =>
             caseInsensitiveStringCompare(
               entityA.friendly_name,
@@ -199,10 +205,15 @@ export class HaEntityPicker extends LitElement {
       }
 
       states = entityIds
-        .map((key) => ({
-          ...hass!.states[key],
-          friendly_name: computeStateName(hass!.states[key]) || key,
-        }))
+        .map((key) => {
+          const stateObj = hass!.states[key];
+
+          return {
+            ...stateObj,
+            friendly_name: computeStateName(stateObj) || key,
+            id: stateObj.context?.id,
+          };
+        })
         .sort((entityA, entityB) =>
           caseInsensitiveStringCompare(
             entityA.friendly_name,
@@ -247,6 +258,7 @@ export class HaEntityPicker extends LitElement {
             state: "",
             last_changed: "",
             last_updated: "",
+            id: "",
             context: { id: "", user_id: null, parent_id: null },
             friendly_name: this.hass!.localize(
               "ui.components.entity.entity-picker.no_match"
@@ -299,18 +311,16 @@ export class HaEntityPicker extends LitElement {
   protected render(): TemplateResult {
     return html`
       <ha-combo-box
-        item-value-path="entity_id"
         item-label-path="friendly_name"
+        .itemValuePath=${this.itemValuePath}
         .hass=${this.hass}
         .value=${this._value}
         .label=${this.label === undefined
           ? this.hass.localize("ui.components.entity.entity-picker.entity")
           : this.label}
-        .helper=${this.helper}
         .allowCustomValue=${this.allowCustomEntity}
         .filteredItems=${this._states}
         .renderer=${rowRenderer}
-        .required=${this.required}
         @opened-changed=${this._openedChanged}
         @value-changed=${this._valueChanged}
         @filter-changed=${this._filterChanged}

src/components/ha-addon-picker.ts

@@ -13,12 +13,9 @@ import { HaComboBox } from "./ha-combo-box";
 
 const rowRenderer: ComboBoxLitRenderer<HassioAddonInfo> = (
   item
-) => html`<mwc-list-item twoline graphic="icon">
+) => html`<mwc-list-item twoline>
   <span>${item.name}</span>
   <span slot="secondary">${item.slug}</span>
-  ${item.icon
-    ? html`<img slot="graphic" .src="/api/hassio/addons/${item.slug}/icon" />`
-    : ""}
 </mwc-list-item>`;
 
 @customElement("ha-addon-picker")
@@ -29,14 +26,10 @@ class HaAddonPicker extends LitElement {
 
   @property() public value = "";
 
-  @property() public helper?: string;
-
   @state() private _addons?: HassioAddonInfo[];
 
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = false;
-
   @query("ha-combo-box") private _comboBox!: HaComboBox;
 
   public open() {
@@ -62,9 +55,6 @@ class HaAddonPicker extends LitElement {
           ? this.hass.localize("ui.components.addon-picker.addon")
           : this.label}
         .value=${this._value}
-        .required=${this.required}
-        .disabled=${this.disabled}
-        .helper=${this.helper}
         .renderer=${rowRenderer}
         .items=${this._addons}
         item-value-path="slug"

src/components/ha-area-picker.ts

@@ -28,8 +28,8 @@ import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { PolymerChangedEvent } from "../polymer-types";
 import { HomeAssistant } from "../types";
 import type { HaDevicePickerDeviceFilterFunc } from "./device/ha-device-picker";
-import "./ha-combo-box";
 import type { HaComboBox } from "./ha-combo-box";
+import "./ha-combo-box";
 import "./ha-icon-button";
 import "./ha-svg-icon";
 
@@ -49,8 +49,6 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
 
   @property() public value?: string;
 
-  @property() public helper?: string;
-
   @property() public placeholder?: string;
 
   @property({ type: Boolean, attribute: "no-add" })
@@ -86,8 +84,6 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
 
   @property({ type: Boolean }) public disabled?: boolean;
 
-  @property({ type: Boolean }) public required?: boolean;
-
   @state() private _areas?: AreaRegistryEntry[];
 
   @state() private _devices?: DeviceRegistryEntry[];
@@ -314,13 +310,11 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
     return html`
       <ha-combo-box
         .hass=${this.hass}
-        .helper=${this.helper}
         item-value-path="area_id"
         item-id-path="area_id"
         item-label-path="name"
         .value=${this.value}
         .disabled=${this.disabled}
-        .required=${this.required}
         .label=${this.label === undefined && this.hass
           ? this.hass.localize("ui.components.area-picker.area")
           : this.label}

src/components/ha-areas-picker.ts

@@ -1,166 +0,0 @@
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
-import { fireEvent } from "../common/dom/fire_event";
-import type { EntityRegistryEntry } from "../data/entity_registry";
-import { SubscribeMixin } from "../mixins/subscribe-mixin";
-import type { HomeAssistant } from "../types";
-import type { HaDevicePickerDeviceFilterFunc } from "./device/ha-device-picker";
-import "./ha-area-picker";
-
-@customElement("ha-areas-picker")
-export class HaAreasPicker extends SubscribeMixin(LitElement) {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property() public label?: string;
-
-  @property() public value?: string[];
-
-  @property() public helper?: string;
-
-  @property() public placeholder?: string;
-
-  @property({ type: Boolean, attribute: "no-add" })
-  public noAdd?: boolean;
-
-  /**
-   * Show only areas with entities from specific domains.
-   * @type {Array}
-   * @attr include-domains
-   */
-  @property({ type: Array, attribute: "include-domains" })
-  public includeDomains?: string[];
-
-  /**
-   * Show no areas with entities of these domains.
-   * @type {Array}
-   * @attr exclude-domains
-   */
-  @property({ type: Array, attribute: "exclude-domains" })
-  public excludeDomains?: string[];
-
-  /**
-   * Show only areas with entities of these device classes.
-   * @type {Array}
-   * @attr include-device-classes
-   */
-  @property({ type: Array, attribute: "include-device-classes" })
-  public includeDeviceClasses?: string[];
-
-  @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc;
-
-  @property() public entityFilter?: (entity: EntityRegistryEntry) => boolean;
-
-  @property({ attribute: "picked-area-label" })
-  public pickedAreaLabel?: string;
-
-  @property({ attribute: "pick-area-label" })
-  public pickAreaLabel?: string;
-
-  @property({ type: Boolean }) public disabled?: boolean;
-
-  @property({ type: Boolean }) public required?: boolean;
-
-  protected render(): TemplateResult {
-    if (!this.hass) {
-      return html``;
-    }
-
-    const currentAreas = this._currentAreas;
-    return html`
-      ${currentAreas.map(
-        (area) => html`
-          <div>
-            <ha-area-picker
-              .curValue=${area}
-              .noAdd=${this.noAdd}
-              .hass=${this.hass}
-              .value=${area}
-              .label=${this.pickedAreaLabel}
-              .includeDomains=${this.includeDomains}
-              .excludeDomains=${this.excludeDomains}
-              .includeDeviceClasses=${this.includeDeviceClasses}
-              .deviceFilter=${this.deviceFilter}
-              .entityFilter=${this.entityFilter}
-              .disabled=${this.disabled}
-              @value-changed=${this._areaChanged}
-            ></ha-area-picker>
-          </div>
-        `
-      )}
-      <div>
-        <ha-area-picker
-          .noAdd=${this.noAdd}
-          .hass=${this.hass}
-          .label=${this.pickAreaLabel}
-          .helper=${this.helper}
-          .includeDomains=${this.includeDomains}
-          .excludeDomains=${this.excludeDomains}
-          .includeDeviceClasses=${this.includeDeviceClasses}
-          .deviceFilter=${this.deviceFilter}
-          .entityFilter=${this.entityFilter}
-          .disabled=${this.disabled}
-          .placeholder=${this.placeholder}
-          .required=${this.required && !currentAreas.length}
-          @value-changed=${this._addArea}
-        ></ha-area-picker>
-      </div>
-    `;
-  }
-
-  private get _currentAreas(): string[] {
-    return this.value || [];
-  }
-
-  private async _updateAreas(areas) {
-    this.value = areas;
-
-    fireEvent(this, "value-changed", {
-      value: areas,
-    });
-  }
-
-  private _areaChanged(ev: CustomEvent) {
-    ev.stopPropagation();
-    const curValue = (ev.currentTarget as any).curValue;
-    const newValue = ev.detail.value;
-    if (newValue === curValue) {
-      return;
-    }
-    const currentAreas = this._currentAreas;
-    if (!newValue || currentAreas.includes(newValue)) {
-      this._updateAreas(currentAreas.filter((ent) => ent !== curValue));
-      return;
-    }
-    this._updateAreas(
-      currentAreas.map((ent) => (ent === curValue ? newValue : ent))
-    );
-  }
-
-  private _addArea(ev: CustomEvent) {
-    ev.stopPropagation();
-
-    const toAdd = ev.detail.value;
-    if (!toAdd) {
-      return;
-    }
-    (ev.currentTarget as any).value = "";
-    const currentAreas = this._currentAreas;
-    if (currentAreas.includes(toAdd)) {
-      return;
-    }
-
-    this._updateAreas([...currentAreas, toAdd]);
-  }
-
-  static override styles = css`
-    div {
-      margin-top: 8px;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-areas-picker": HaAreasPicker;
-  }
-}

src/components/ha-base-time-input.ts

@@ -1,14 +1,12 @@
-import "@material/mwc-list/mwc-list-item";
-import { css, html, LitElement, TemplateResult } from "lit";
+import { LitElement, html, TemplateResult, css } from "lit";
 import { customElement, property } from "lit/decorators";
+import "./ha-select";
+import "@material/mwc-list/mwc-list-item";
+import "./ha-textfield";
 import { fireEvent } from "../common/dom/fire_event";
 import { stopPropagation } from "../common/dom/stop_propagation";
-import "./ha-select";
-import "./ha-textfield";
-import "./ha-input-helper-text";
 
 export interface TimeChangedEvent {
-  days?: number;
   hours: number;
   minutes: number;
   seconds: number;
@@ -23,11 +21,6 @@ export class HaBaseTimeInput extends LitElement {
    */
   @property() label?: string;
 
-  /**
-   * Helper for the input
-   */
-  @property() helper?: string;
-
   /**
    * auto validate time inputs
    */
@@ -48,11 +41,6 @@ export class HaBaseTimeInput extends LitElement {
    */
   @property({ type: Boolean }) disabled = false;
 
-  /**
-   * day
-   */
-  @property({ type: Number }) days = 0;
-
   /**
    * hour
    */
@@ -73,11 +61,6 @@ export class HaBaseTimeInput extends LitElement {
    */
   @property({ type: Number }) milliseconds = 0;
 
-  /**
-   * Label for the day input
-   */
-  @property() dayLabel = "";
-
   /**
    * Label for the hour input
    */
@@ -108,11 +91,6 @@ export class HaBaseTimeInput extends LitElement {
    */
   @property({ type: Boolean }) enableMillisecond = false;
 
-  /**
-   * show the day field
-   */
-  @property({ type: Boolean }) enableDay = false;
-
   /**
    * limit hours input
    */
@@ -130,33 +108,8 @@ export class HaBaseTimeInput extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      ${this.label
-        ? html`<label>${this.label}${this.required ? " *" : ""}</label>`
-        : ""}
+      ${this.label ? html`<label>${this.label}</label>` : ""}
       <div class="time-input-wrap">
-        ${this.enableDay
-          ? html`
-              <ha-textfield
-                id="day"
-                type="number"
-                inputmode="numeric"
-                .value=${this.days}
-                .label=${this.dayLabel}
-                name="days"
-                @input=${this._valueChanged}
-                @focus=${this._onFocus}
-                no-spinner
-                .required=${this.required}
-                .autoValidate=${this.autoValidate}
-                min="0"
-                .disabled=${this.disabled}
-                suffix=":"
-                class="hasSuffix"
-              >
-              </ha-textfield>
-            `
-          : ""}
-
         <ha-textfield
           id="hour"
           type="number"
@@ -254,9 +207,6 @@ export class HaBaseTimeInput extends LitElement {
               <mwc-list-item value="PM">PM</mwc-list-item>
             </ha-select>`}
       </div>
-      ${this.helper
-        ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
-        : ""}
     `;
   }
 

src/components/ha-chip-set.ts

@@ -25,7 +25,13 @@ export class HaChipSet extends LitElement {
       ${unsafeCSS(chipStyles)}
 
       slot::slotted(ha-chip) {
-        margin: 4px 4px 4px 0;
+        margin: 4px;
+      }
+      slot::slotted(ha-chip:first-of-type) {
+        margin-left: -4px;
+      }
+      slot::slotted(ha-chip:last-of-type) {
+        margin-right: -4px;
       }
     `;
   }

src/components/ha-chip.ts

@@ -14,8 +14,6 @@ import { customElement, property } from "lit/decorators";
 export class HaChip extends LitElement {
   @property({ type: Boolean }) public hasIcon = false;
 
-  @property({ type: Boolean }) public hasTrailingIcon = false;
-
   @property({ type: Boolean }) public noText = false;
 
   protected render(): TemplateResult {
@@ -32,11 +30,6 @@ export class HaChip extends LitElement {
             <span class="mdc-chip__text"><slot></slot></span>
           </span>
         </span>
-        ${this.hasTrailingIcon
-          ? html`<div class="mdc-chip__icon mdc-chip__icon--trailing">
-              <slot name="trailing-icon"></slot>
-            </div>`
-          : null}
       </div>
     `;
   }
@@ -60,20 +53,14 @@ export class HaChip extends LitElement {
         color: var(--ha-chip-text-color, var(--primary-text-color));
       }
 
-      .mdc-chip__icon--leading,
-      .mdc-chip__icon--trailing {
-        --mdc-icon-size: 18px;
-        line-height: 14px;
+      .mdc-chip__icon--leading {
+        --mdc-icon-size: 20px;
         color: var(--ha-chip-icon-color, var(--ha-chip-text-color));
       }
       .mdc-chip.no-text
         .mdc-chip__icon--leading:not(.mdc-chip__icon--leading-hidden) {
         margin-right: -4px;
       }
-
-      span[role="gridcell"] {
-        line-height: 14px;
-      }
     `;
   }
 }

src/components/ha-combo-box.ts

@@ -64,8 +64,6 @@ export class HaComboBox extends LitElement {
 
   @property() public validationMessage?: string;
 
-  @property() public helper?: string;
-
   @property({ attribute: "error-message" }) public errorMessage?: string;
 
   @property({ type: Boolean }) public invalid?: boolean;
@@ -89,8 +87,6 @@ export class HaComboBox extends LitElement {
 
   @property({ type: Boolean }) public disabled?: boolean;
 
-  @property({ type: Boolean }) public required?: boolean;
-
   @property({ type: Boolean, reflect: true, attribute: "opened" })
   private _opened?: boolean;
 
@@ -112,22 +108,17 @@ export class HaComboBox extends LitElement {
     return this._comboBox.selectedItem;
   }
 
-  public setInputValue(value: string) {
-    this._comboBox.value = value;
-  }
-
   protected render(): TemplateResult {
     return html`
       <vaadin-combo-box-light
         .itemValuePath=${this.itemValuePath}
         .itemIdPath=${this.itemIdPath}
         .itemLabelPath=${this.itemLabelPath}
-        .items=${this.items}
         .value=${this.value || ""}
+        .items=${this.items}
         .filteredItems=${this.filteredItems}
         .allowCustomValue=${this.allowCustomValue}
         .disabled=${this.disabled}
-        .required=${this.required}
         ${comboBoxRenderer(this.renderer || this._defaultRowRenderer)}
         @opened-changed=${this._openedChanged}
         @filter-changed=${this._filterChanged}
@@ -138,7 +129,6 @@ export class HaComboBox extends LitElement {
           .label=${this.label}
           .placeholder=${this.placeholder}
           .disabled=${this.disabled}
-          .required=${this.required}
           .validationMessage=${this.validationMessage}
           .errorMessage=${this.errorMessage}
           class="input"
@@ -149,8 +139,6 @@ export class HaComboBox extends LitElement {
           .suffix=${html`<div style="width: 28px;"></div>`}
           .icon=${this.icon}
           .invalid=${this.invalid}
-          .helper=${this.helper}
-          helperPersistent
         >
           <slot name="icon" slot="leadingIcon"></slot>
         </ha-textfield>

src/components/ha-date-input.ts

@@ -35,24 +35,17 @@ export class HaDateInput extends LitElement {
 
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = false;
-
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   render() {
     return html`<ha-textfield
       .label=${this.label}
-      .helper=${this.helper}
       .disabled=${this.disabled}
       iconTrailing
-      helperPersistent
       @click=${this._openDialog}
       .value=${this.value
         ? formatDateNumeric(new Date(this.value), this.locale)
         : ""}
-      .required=${this.required}
     >
       <ha-svg-icon slot="trailingIcon" .path=${mdiCalendar}></ha-svg-icon>
     </ha-textfield>`;

src/components/ha-duration-input.ts

@@ -5,7 +5,6 @@ import "./ha-base-time-input";
 import type { TimeChangedEvent } from "./ha-base-time-input";
 
 export interface HaDurationData {
-  days?: number;
   hours?: number;
   minutes?: number;
   seconds?: number;
@@ -18,14 +17,10 @@ class HaDurationInput extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public required?: boolean;
 
   @property({ type: Boolean }) public enableMillisecond?: boolean;
 
-  @property({ type: Boolean }) public enableDay?: boolean;
-
   @property({ type: Boolean }) public disabled = false;
 
   @query("paper-time-input", true) private _input?: HTMLElement;
@@ -40,23 +35,19 @@ class HaDurationInput extends LitElement {
     return html`
       <ha-base-time-input
         .label=${this.label}
-        .helper=${this.helper}
         .required=${this.required}
         .autoValidate=${this.required}
         .disabled=${this.disabled}
         errorMessage="Required"
         enableSecond
         .enableMillisecond=${this.enableMillisecond}
-        .enableDay=${this.enableDay}
         format="24"
-        .days=${this._days}
         .hours=${this._hours}
         .minutes=${this._minutes}
         .seconds=${this._seconds}
         .milliseconds=${this._milliseconds}
         @value-changed=${this._durationChanged}
         noHoursLimit
-        dayLabel="dd"
         hourLabel="hh"
         minLabel="mm"
         secLabel="ss"
@@ -65,10 +56,6 @@ class HaDurationInput extends LitElement {
     `;
   }
 
-  private get _days() {
-    return this.data?.days ? Number(this.data.days) : 0;
-  }
-
   private get _hours() {
     return this.data?.hours ? Number(this.data.hours) : 0;
   }
@@ -107,11 +94,6 @@ class HaDurationInput extends LitElement {
       value.minutes %= 60;
     }
 
-    if (this.enableDay && value.hours > 24) {
-      value.days = (value.days ?? 0) + Math.floor(value.hours / 24);
-      value.hours %= 24;
-    }
-
     fireEvent(this, "value-changed", {
       value,
     });

src/components/ha-form/compute-initial-ha-form-data.ts

@@ -34,25 +34,12 @@ export const computeInitialHaFormData = (
       };
     } else if ("selector" in field) {
       const selector: Selector = field.selector;
-
-      if ("device" in selector) {
-        data[field.name] = selector.device.multiple ? [] : "";
-      } else if ("entity" in selector) {
-        data[field.name] = selector.entity.multiple ? [] : "";
-      } else if ("area" in selector) {
-        data[field.name] = selector.area.multiple ? [] : "";
-      } else if ("boolean" in selector) {
+      if ("boolean" in selector) {
         data[field.name] = false;
-      } else if (
-        "text" in selector ||
-        "addon" in selector ||
-        "attribute" in selector ||
-        "icon" in selector ||
-        "theme" in selector
-      ) {
+      } else if ("text" in selector) {
         data[field.name] = "";
       } else if ("number" in selector) {
-        data[field.name] = selector.number.min ?? 0;
+        data[field.name] = "min" in selector.number ? selector.number.min : 0;
       } else if ("select" in selector) {
         if (selector.select.options.length) {
           data[field.name] = selector.select.options[0][0];
@@ -63,23 +50,6 @@ export const computeInitialHaFormData = (
           minutes: 0,
           seconds: 0,
         };
-      } else if ("time" in selector) {
-        data[field.name] = "00:00:00";
-      } else if ("date" in selector || "datetime" in selector) {
-        const now = new Date().toISOString().slice(0, 10);
-        data[field.name] = `${now} 00:00:00`;
-      } else if ("color_rgb" in selector) {
-        data[field.name] = [0, 0, 0];
-      } else if ("color_temp" in selector) {
-        data[field.name] = selector.color_temp.min_mireds ?? 153;
-      } else if (
-        "action" in selector ||
-        "media" in selector ||
-        "target" in selector
-      ) {
-        data[field.name] = {};
-      } else {
-        throw new Error("Selector not supported in initial form data");
       }
     }
   });

src/components/ha-form/ha-form-string.ts

@@ -28,8 +28,6 @@ export class HaFormString extends LitElement implements HaFormElement {
 
   @property() public label!: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public disabled = false;
 
   @state() private _unmaskedPassword = false;
@@ -55,8 +53,6 @@ export class HaFormString extends LitElement implements HaFormElement {
           : "password"}
         .label=${this.label}
         .value=${this.data || ""}
-        .helper=${this.helper}
-        helperPersistent
         .disabled=${this.disabled}
         .required=${this.schema.required}
         .autoValidate=${this.schema.required}

src/components/ha-form/ha-form.ts

@@ -77,7 +77,7 @@ export class HaForm extends LitElement implements HaFormElement {
 
   protected render(): TemplateResult {
     return html`
-      <div class="root" part="root">
+      <div class="root">
         ${this.error && this.error.base
           ? html`
               <ha-alert alert-type="error">
@@ -173,6 +173,7 @@ export class HaForm extends LitElement implements HaFormElement {
   }
 
   static get styles(): CSSResultGroup {
+    // .root has overflow: auto to avoid margin collapse
     return css`
       .root {
         margin-bottom: -24px;

src/components/ha-icon-picker.ts

@@ -31,8 +31,6 @@ export class HaIconPicker extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property() public placeholder?: string;
 
   @property() public fallbackPath?: string;
@@ -41,8 +39,6 @@ export class HaIconPicker extends LitElement {
 
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = false;
-
   @property({ type: Boolean }) public invalid = false;
 
   @state() private _opened = false;
@@ -59,9 +55,7 @@ export class HaIconPicker extends LitElement {
         allow-custom-value
         .filteredItems=${iconItems}
         .label=${this.label}
-        .helper=${this.helper}
         .disabled=${this.disabled}
-        .required=${this.required}
         .placeholder=${this.placeholder}
         .errorMessage=${this.errorMessage}
         .invalid=${this.invalid}

src/components/ha-input-helper-text.ts

@@ -1,25 +0,0 @@
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement } from "lit/decorators";
-
-@customElement("ha-input-helper-text")
-class InputHelperText extends LitElement {
-  protected render(): TemplateResult {
-    return html`<slot></slot>`;
-  }
-
-  static styles = css`
-    :host {
-      display: block;
-      color: var(--mdc-text-field-label-ink-color, rgba(0, 0, 0, 0.6));
-      font-size: 0.75rem;
-      padding-left: 16px;
-      padding-right: 16px;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-input-helper-text": InputHelperText;
-  }
-}

src/components/ha-labeled-slider.js

@@ -33,7 +33,7 @@ class HaLabeledSlider extends PolymerElement {
         }
       </style>
 
-      <div class="title">[[_getTitle()]]</div>
+      <div class="title">[[caption]]</div>
       <div class="extra-container"><slot name="extra"></slot></div>
       <div class="slider-container">
         <ha-icon icon="[[icon]]" hidden$="[[!icon]]"></ha-icon>
@@ -46,26 +46,17 @@ class HaLabeledSlider extends PolymerElement {
           value="{{value}}"
         ></ha-slider>
       </div>
-      <template is="dom-if" if="[[helper]]">
-        <ha-input-helper-text>[[helper]]</ha-input-helper-text>
-      </template>
     `;
   }
 
-  _getTitle() {
-    return `${this.caption}${this.caption && this.required ? " *" : ""}`;
-  }
-
   static get properties() {
     return {
       caption: String,
       disabled: Boolean,
-      required: Boolean,
       min: Number,
       max: Number,
       pin: Boolean,
       step: Number,
-      helper: String,
 
       extra: {
         type: Boolean,

src/components/ha-markdown.ts

@@ -2,11 +2,6 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import "./ha-markdown-element";
 
-// Import components that are allwoed to be defined.
-import "./ha-alert";
-import "./ha-icon";
-import "./ha-svg-icon";
-
 @customElement("ha-markdown")
 export class HaMarkdown extends LitElement {
   @property() public content?;

src/components/ha-menu-button.ts

@@ -3,6 +3,7 @@ import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
+import { computeDomain } from "../common/entity/compute_domain";
 import { subscribeNotifications } from "../data/persistent_notification";
 import { HomeAssistant } from "../types";
 import "./ha-icon-button";
@@ -42,15 +43,18 @@ class HaMenuButton extends LitElement {
 
   protected render(): TemplateResult {
     const hasNotifications =
-      this._hasNotifications &&
-      (this.narrow || this.hass.dockedSidebar === "always_hidden");
+      (this.narrow || this.hass.dockedSidebar === "always_hidden") &&
+      (this._hasNotifications ||
+        Object.keys(this.hass.states).some(
+          (entityId) => computeDomain(entityId) === "configurator"
+        ));
     return html`
       <ha-icon-button
         .label=${this.hass.localize("ui.sidebar.sidebar_toggle")}
         .path=${mdiMenu}
         @click=${this._toggleMenu}
       ></ha-icon-button>
-      ${hasNotifications ? html`<div class="dot"></div>` : ""}
+      ${hasNotifications ? html` <div class="dot"></div> ` : ""}
     `;
   }
 

src/components/ha-selector/ha-selector-addon.ts

@@ -14,20 +14,11 @@ export class HaAddonSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
-  @property({ type: Boolean }) public disabled = false;
-
-  @property({ type: Boolean }) public required = true;
-
   protected render() {
     return html`<ha-addon-picker
       .hass=${this.hass}
       .value=${this.value}
       .label=${this.label}
-      .helper=${this.helper}
-      .disabled=${this.disabled}
-      .required=${this.required}
       allow-custom-entity
     ></ha-addon-picker>`;
   }

src/components/ha-selector/ha-selector-area.ts

@@ -6,7 +6,6 @@ import { EntityRegistryEntry } from "../../data/entity_registry";
 import { AreaSelector } from "../../data/selector";
 import { HomeAssistant } from "../../types";
 import "../ha-area-picker";
-import "../ha-areas-picker";
 
 @customElement("ha-selector-area")
 export class HaAreaSelector extends LitElement {
@@ -18,14 +17,10 @@ export class HaAreaSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @state() public _configEntries?: ConfigEntry[];
 
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   protected updated(changedProperties) {
     if (changedProperties.has("selector")) {
       const oldSelector = changedProperties.get("selector");
@@ -43,47 +38,21 @@ export class HaAreaSelector extends LitElement {
   }
 
   protected render() {
-    if (!this.selector.area.multiple) {
-      return html`
-        <ha-area-picker
-          .hass=${this.hass}
-          .value=${this.value}
-          .label=${this.label}
-          .helper=${this.helper}
-          no-add
-          .deviceFilter=${this._filterDevices}
-          .entityFilter=${this._filterEntities}
-          .includeDeviceClasses=${this.selector.area.entity?.device_class
-            ? [this.selector.area.entity.device_class]
-            : undefined}
-          .includeDomains=${this.selector.area.entity?.domain
-            ? [this.selector.area.entity.domain]
-            : undefined}
-          .disabled=${this.disabled}
-          .required=${this.required}
-        ></ha-area-picker>
-      `;
-    }
-
-    return html`
-      <ha-areas-picker
-        .hass=${this.hass}
-        .value=${this.value}
-        .helper=${this.helper}
-        .pickAreaLabel=${this.label}
-        no-add
-        .deviceFilter=${this._filterDevices}
-        .entityFilter=${this._filterEntities}
-        .includeDeviceClasses=${this.selector.area.entity?.device_class
-          ? [this.selector.area.entity.device_class]
-          : undefined}
-        .includeDomains=${this.selector.area.entity?.domain
-          ? [this.selector.area.entity.domain]
-          : undefined}
-        .disabled=${this.disabled}
-        .required=${this.required}
-      ></ha-areas-picker>
-    `;
+    return html`<ha-area-picker
+      .hass=${this.hass}
+      .value=${this.value}
+      .label=${this.label}
+      no-add
+      .deviceFilter=${this._filterDevices}
+      .entityFilter=${this._filterEntities}
+      .includeDeviceClasses=${this.selector.area.entity?.device_class
+        ? [this.selector.area.entity.device_class]
+        : undefined}
+      .includeDomains=${this.selector.area.entity?.domain
+        ? [this.selector.area.entity.domain]
+        : undefined}
+      .disabled=${this.disabled}
+    ></ha-area-picker>`;
   }
 
   private _filterEntities = (entity: EntityRegistryEntry): boolean => {

src/components/ha-selector/ha-selector-attribute.ts

@@ -1,10 +1,10 @@
+import "../entity/ha-entity-attribute-picker";
 import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
 import { AttributeSelector } from "../../data/selector";
 import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { HomeAssistant } from "../../types";
-import "../entity/ha-entity-attribute-picker";
+import { fireEvent } from "../../common/dom/fire_event";
 
 @customElement("ha-selector-attribute")
 export class HaSelectorAttribute extends SubscribeMixin(LitElement) {
@@ -16,12 +16,8 @@ export class HaSelectorAttribute extends SubscribeMixin(LitElement) {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   @property() public context?: {
     filter_entity?: string;
   };
@@ -34,9 +30,7 @@ export class HaSelectorAttribute extends SubscribeMixin(LitElement) {
         this.context?.filter_entity}
         .value=${this.value}
         .label=${this.label}
-        .helper=${this.helper}
         .disabled=${this.disabled}
-        .required=${this.required}
         allow-custom-value
       ></ha-entity-attribute-picker>
     `;

src/components/ha-selector/ha-selector-boolean.ts

@@ -4,7 +4,6 @@ import { fireEvent } from "../../common/dom/fire_event";
 import { HomeAssistant } from "../../types";
 import "../ha-formfield";
 import "../ha-switch";
-import "../ha-input-helper-text";
 
 @customElement("ha-selector-boolean")
 export class HaBooleanSelector extends LitElement {
@@ -14,23 +13,16 @@ export class HaBooleanSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public disabled = false;
 
   protected render() {
-    return html`
-      <ha-formfield alignEnd spaceBetween .label=${this.label}>
-        <ha-switch
-          .checked=${this.value}
-          @change=${this._handleChange}
-          .disabled=${this.disabled}
-        ></ha-switch>
-      </ha-formfield>
-      ${this.helper
-        ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
-        : ""}
-    `;
+    return html`<ha-formfield alignEnd spaceBetween .label=${this.label}>
+      <ha-switch
+        .checked=${this.value}
+        @change=${this._handleChange}
+        .disabled=${this.disabled}
+      ></ha-switch>
+    </ha-formfield>`;
   }
 
   private _handleChange(ev) {
@@ -43,10 +35,12 @@ export class HaBooleanSelector extends LitElement {
 
   static get styles(): CSSResultGroup {
     return css`
-      ha-formfield {
-        display: flex;
+      :host {
         height: 56px;
-        align-items: center;
+        display: flex;
+      }
+      ha-formfield {
+        width: 100%;
         --mdc-typography-body2-font-size: 1em;
       }
     `;

src/components/ha-selector/ha-selector-color-rgb.ts

@@ -1,9 +1,9 @@
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import { hex2rgb, rgb2hex } from "../../common/color/convert-color";
-import { fireEvent } from "../../common/dom/fire_event";
-import type { ColorRGBSelector } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
+import type { ColorRGBSelector } from "../../data/selector";
+import { fireEvent } from "../../common/dom/fire_event";
+import { hex2rgb, rgb2hex } from "../../common/color/convert-color";
 import "../ha-textfield";
 
 @customElement("ha-selector-color_rgb")
@@ -16,22 +16,14 @@ export class HaColorRGBSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   protected render() {
     return html`
       <ha-textfield
         type="color"
-        helperPersistent
         .value=${this.value ? rgb2hex(this.value as any) : ""}
         .label=${this.label || ""}
-        .required=${this.required}
-        .helper=${this.helper}
-        .disalbled=${this.disabled}
         @change=${this._valueChanged}
       ></ha-textfield>
     `;

src/components/ha-selector/ha-selector-color-temp.ts

@@ -1,8 +1,8 @@
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
-import type { ColorTempSelector } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
+import type { ColorTempSelector } from "../../data/selector";
+import { fireEvent } from "../../common/dom/fire_event";
 import "../ha-labeled-slider";
 
 @customElement("ha-selector-color_temp")
@@ -15,24 +15,17 @@ export class HaColorTempSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   protected render() {
     return html`
       <ha-labeled-slider
         pin
         icon="hass:thermometer"
-        .caption=${this.label || ""}
+        .caption=${this.label}
         .min=${this.selector.color_temp.min_mireds ?? 153}
         .max=${this.selector.color_temp.max_mireds ?? 500}
         .value=${this.value}
-        .disabled=${this.disabled}
-        .helper=${this.helper}
-        .required=${this.required}
         @change=${this._valueChanged}
       ></ha-labeled-slider>
     `;

src/components/ha-selector/ha-selector-date.ts

@@ -1,7 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import type { DateSelector } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
+import type { DateSelector } from "../../data/selector";
 import "../ha-date-input";
 
 @customElement("ha-selector-date")
@@ -14,12 +14,8 @@ export class HaDateSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   protected render() {
     return html`
       <ha-date-input
@@ -27,8 +23,6 @@ export class HaDateSelector extends LitElement {
         .locale=${this.hass.locale}
         .disabled=${this.disabled}
         .value=${this.value}
-        .required=${this.required}
-        .helper=${this.helper}
       >
       </ha-date-input>
     `;

src/components/ha-selector/ha-selector-datetime.ts

@@ -1,13 +1,12 @@
 import { css, html, LitElement } from "lit";
 import { customElement, property, query } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
-import type { DateTimeSelector } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
-import "../ha-date-input";
+import type { DateTimeSelector } from "../../data/selector";
 import type { HaDateInput } from "../ha-date-input";
-import "../ha-time-input";
-import "../ha-input-helper-text";
 import type { HaTimeInput } from "../ha-time-input";
+import { fireEvent } from "../../common/dom/fire_event";
+import "../ha-date-input";
+import "../ha-time-input";
 
 @customElement("ha-selector-datetime")
 export class HaDateTimeSelector extends LitElement {
@@ -19,12 +18,8 @@ export class HaDateTimeSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   @query("ha-date-input") private _dateInput!: HaDateInput;
 
   @query("ha-time-input") private _timeInput!: HaTimeInput;
@@ -33,28 +28,21 @@ export class HaDateTimeSelector extends LitElement {
     const values = this.value?.split(" ");
 
     return html`
-      <div class="input">
-        <ha-date-input
-          .label=${this.label}
-          .locale=${this.hass.locale}
-          .disabled=${this.disabled}
-          .required=${this.required}
-          .value=${values?.[0]}
-          @value-changed=${this._valueChanged}
-        >
-        </ha-date-input>
-        <ha-time-input
-          enable-second
-          .value=${values?.[1] || "0:00:00"}
-          .locale=${this.hass.locale}
-          .disabled=${this.disabled}
-          .required=${this.required}
-          @value-changed=${this._valueChanged}
-        ></ha-time-input>
-      </div>
-      ${this.helper
-        ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
-        : ""}
+      <ha-date-input
+        .label=${this.label}
+        .locale=${this.hass.locale}
+        .disabled=${this.disabled}
+        .value=${values?.[0]}
+        @value-changed=${this._valueChanged}
+      >
+      </ha-date-input>
+      <ha-time-input
+        enable-second
+        .value=${values?.[1] || "0:00:00"}
+        .locale=${this.hass.locale}
+        .disabled=${this.disabled}
+        @value-changed=${this._valueChanged}
+      ></ha-time-input>
     `;
   }
 
@@ -66,7 +54,7 @@ export class HaDateTimeSelector extends LitElement {
   }
 
   static styles = css`
-    .input {
+    :host {
       display: flex;
       align-items: center;
       flex-direction: row;

src/components/ha-selector/ha-selector-device.ts

@@ -17,14 +17,10 @@ export class HaDeviceSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @state() public _configEntries?: ConfigEntry[];
 
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   protected updated(changedProperties) {
     if (changedProperties.has("selector")) {
       const oldSelector = changedProperties.get("selector");
@@ -40,32 +36,10 @@ export class HaDeviceSelector extends LitElement {
 
   protected render() {
     if (!this.selector.device.multiple) {
-      return html`
-        <ha-device-picker
-          .hass=${this.hass}
-          .value=${this.value}
-          .label=${this.label}
-          .helper=${this.helper}
-          .deviceFilter=${this._filterDevices}
-          .includeDeviceClasses=${this.selector.device.entity?.device_class
-            ? [this.selector.device.entity.device_class]
-            : undefined}
-          .includeDomains=${this.selector.device.entity?.domain
-            ? [this.selector.device.entity.domain]
-            : undefined}
-          .disabled=${this.disabled}
-          .required=${this.required}
-          allow-custom-entity
-        ></ha-device-picker>
-      `;
-    }
-
-    return html`
-      ${this.label ? html`<label>${this.label}</label>` : ""}
-      <ha-devices-picker
+      return html`<ha-device-picker
         .hass=${this.hass}
         .value=${this.value}
-        .helper=${this.helper}
+        .label=${this.label}
         .deviceFilter=${this._filterDevices}
         .includeDeviceClasses=${this.selector.device.entity?.device_class
           ? [this.selector.device.entity.device_class]
@@ -74,7 +48,21 @@ export class HaDeviceSelector extends LitElement {
           ? [this.selector.device.entity.domain]
           : undefined}
         .disabled=${this.disabled}
-        .required=${this.required}
+        allow-custom-entity
+      ></ha-device-picker> `;
+    }
+
+    return html`
+      ${this.label ? html`<label>${this.label}</label>` : ""}
+      <ha-devices-picker
+        .hass=${this.hass}
+        .value=${this.value}
+        .includeDeviceClasses=${this.selector.device.entity?.device_class
+          ? [this.selector.device.entity.device_class]
+          : undefined}
+        .includeDomains=${this.selector.device.entity?.domain
+          ? [this.selector.device.entity.domain]
+          : undefined}
       ></ha-devices-picker>
     `;
   }

src/components/ha-selector/ha-selector-duration.ts

@@ -14,8 +14,6 @@ export class HaTimeDuration extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public disabled = false;
 
   @property({ type: Boolean }) public required = true;
@@ -24,11 +22,9 @@ export class HaTimeDuration extends LitElement {
     return html`
       <ha-duration-input
         .label=${this.label}
-        .helper=${this.helper}
         .data=${this.value}
         .disabled=${this.disabled}
         .required=${this.required}
-        .enableDay=${this.selector.duration.enable_day}
       ></ha-duration-input>
     `;
   }

src/components/ha-selector/ha-selector-entity.ts

@@ -1,46 +1,39 @@
-import { HassEntity } from "home-assistant-js-websocket";
-import { html, LitElement, PropertyValues } from "lit";
+import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
+import { html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
-import {
-  EntitySources,
-  fetchEntitySourcesWithCache,
-} from "../../data/entity_sources";
+import { subscribeEntityRegistry } from "../../data/entity_registry";
 import { EntitySelector } from "../../data/selector";
+import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { HomeAssistant } from "../../types";
 import "../entity/ha-entities-picker";
 import "../entity/ha-entity-picker";
 
 @customElement("ha-selector-entity")
-export class HaEntitySelector extends LitElement {
+export class HaEntitySelector extends SubscribeMixin(LitElement) {
   @property() public hass!: HomeAssistant;
 
   @property() public selector!: EntitySelector;
 
-  @state() private _entitySources?: EntitySources;
+  @state() private _entityPlaformLookup?: Record<string, string>;
 
   @property() public value?: any;
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   protected render() {
     if (!this.selector.entity.multiple) {
       return html`<ha-entity-picker
         .hass=${this.hass}
         .value=${this.value}
         .label=${this.label}
-        .helper=${this.helper}
         .includeEntities=${this.selector.entity.include_entities}
         .excludeEntities=${this.selector.entity.exclude_entities}
         .entityFilter=${this._filterEntities}
         .disabled=${this.disabled}
-        .required=${this.required}
+        .itemValuePath=${!this.selector.entity.use_uuid ? "entity_id" : "id"}
         allow-custom-entity
       ></ha-entity-picker>`;
     }
@@ -50,57 +43,56 @@ export class HaEntitySelector extends LitElement {
       <ha-entities-picker
         .hass=${this.hass}
         .value=${this.value}
-        .helper=${this.helper}
+        .entityFilter=${this._filterEntities}
         .includeEntities=${this.selector.entity.include_entities}
         .excludeEntities=${this.selector.entity.exclude_entities}
-        .entityFilter=${this._filterEntities}
-        .disabled=${this.disabled}
-        .required=${this.required}
       ></ha-entities-picker>
     `;
   }
 
-  protected updated(changedProps: PropertyValues): void {
-    super.updated(changedProps);
-    if (
-      changedProps.has("selector") &&
-      this.selector.entity.integration &&
-      !this._entitySources
-    ) {
-      fetchEntitySourcesWithCache(this.hass).then((sources) => {
-        this._entitySources = sources;
-      });
-    }
+  public hassSubscribe(): UnsubscribeFunc[] {
+    return [
+      subscribeEntityRegistry(this.hass.connection!, (entities) => {
+        const entityLookup = {};
+        for (const confEnt of entities) {
+          if (!confEnt.platform) {
+            continue;
+          }
+          entityLookup[confEnt.entity_id] = confEnt.platform;
+        }
+        this._entityPlaformLookup = entityLookup;
+      }),
+    ];
   }
 
   private _filterEntities = (entity: HassEntity): boolean => {
-    const {
-      domain: filterDomain,
-      device_class: filterDeviceClass,
-      integration: filterIntegration,
-    } = this.selector.entity;
-
-    if (filterDomain) {
+    if (this.selector.entity?.domain) {
+      const filterDomain = this.selector.entity.domain;
+      const filterDomainIsArray = Array.isArray(filterDomain);
       const entityDomain = computeStateDomain(entity);
       if (
-        Array.isArray(filterDomain)
-          ? !filterDomain.includes(entityDomain)
-          : entityDomain !== filterDomain
+        (filterDomainIsArray && !filterDomain.includes(entityDomain)) ||
+        (!filterDomainIsArray && entityDomain !== filterDomain)
       ) {
         return false;
       }
     }
-    if (
-      filterDeviceClass &&
-      entity.attributes.device_class !== filterDeviceClass
-    ) {
-      return false;
+    if (this.selector.entity?.device_class) {
+      if (
+        !entity.attributes.device_class ||
+        entity.attributes.device_class !== this.selector.entity.device_class
+      ) {
+        return false;
+      }
     }
-    if (
-      filterIntegration &&
-      this._entitySources?.[entity.entity_id]?.domain !== filterIntegration
-    ) {
-      return false;
+    if (this.selector.entity?.integration) {
+      if (
+        !this._entityPlaformLookup ||
+        this._entityPlaformLookup[entity.entity_id] !==
+          this.selector.entity.integration
+      ) {
+        return false;
+      }
     }
     return true;
   };

src/components/ha-selector/ha-selector-icon.ts

@@ -1,9 +1,9 @@
+import "../ha-icon-picker";
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
-import { IconSelector } from "../../data/selector";
 import { HomeAssistant } from "../../types";
-import "../ha-icon-picker";
+import { IconSelector } from "../../data/selector";
+import { fireEvent } from "../../common/dom/fire_event";
 
 @customElement("ha-selector-icon")
 export class HaIconSelector extends LitElement {
@@ -15,20 +15,13 @@ export class HaIconSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   protected render() {
     return html`
       <ha-icon-picker
         .label=${this.label}
         .value=${this.value}
-        .required=${this.required}
-        .disabled=${this.disabled}
-        .helper=${this.helper}
         .fallbackPath=${this.selector.icon.fallbackPath}
         .placeholder=${this.selector.icon.placeholder}
         @value-changed=${this._valueChanged}

src/components/ha-selector/ha-selector-location.ts

@@ -6,6 +6,7 @@ import type {
   LocationSelector,
   LocationSelectorValue,
 } from "../../data/selector";
+import "../../panels/lovelace/components/hui-theme-select-editor";
 import type { HomeAssistant } from "../../types";
 import type { MarkerLocation } from "../map/ha-locations-editor";
 import "../map/ha-locations-editor";
@@ -20,8 +21,6 @@ export class HaLocationSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
   protected render() {
@@ -29,7 +28,6 @@ export class HaLocationSelector extends LitElement {
       <ha-locations-editor
         class="flex"
         .hass=${this.hass}
-        .helper=${this.helper}
         .locations=${this._location(this.selector, this.value)}
         @location-updated=${this._locationChanged}
         @radius-updated=${this._radiusChanged}
@@ -54,10 +52,7 @@ export class HaLocationSelector extends LitElement {
           longitude: value?.longitude || this.hass.config.longitude,
           radius: selector.location.radius ? value?.radius || 1000 : undefined,
           radius_color: zoneRadiusColor,
-          icon:
-            selector.location.icon || selector.location.radius
-              ? "mdi:map-marker-radius"
-              : "mdi:map-marker",
+          icon: selector.location.icon,
           location_editable: true,
           radius_editable: true,
         },

src/components/ha-selector/ha-selector-media.ts

@@ -33,12 +33,8 @@ export class HaMediaSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  @property({ type: Boolean, reflect: true }) public required = true;
-
   @state() private _thumbnailUrl?: string | null;
 
   willUpdate(changedProps: PropertyValues<this>) {
@@ -88,8 +84,6 @@ export class HaMediaSelector extends LitElement {
         .label=${this.label ||
         this.hass.localize("ui.components.selectors.media.pick_media_player")}
         .disabled=${this.disabled}
-        .helper=${this.helper}
-        .required=${this.required}
         include-domains='["media_player"]'
         allow-custom-entity
         @value-changed=${this._entityChanged}

src/components/ha-selector/ha-selector-number.ts

@@ -6,7 +6,6 @@ import { NumberSelector } from "../../data/selector";
 import { HomeAssistant } from "../../types";
 import "../ha-slider";
 import "../ha-textfield";
-import "../ha-input-helper-text";
 
 @customElement("ha-selector-number")
 export class HaNumberSelector extends LitElement {
@@ -20,20 +19,13 @@ export class HaNumberSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public required = true;
 
   @property({ type: Boolean }) public disabled = false;
 
   protected render() {
-    const isBox = this.selector.number.mode === "box";
-
-    return html`
-      ${this.label ? html`${this.label}${this.required ? " *" : ""}` : ""}
-      <div class="input">
-        ${!isBox
-          ? html`<ha-slider
+    return html`${this.selector.number.mode !== "box"
+        ? html`${this.label}<ha-slider
               .min=${this.selector.number.min}
               .max=${this.selector.number.max}
               .value=${this._value}
@@ -45,33 +37,26 @@ export class HaNumberSelector extends LitElement {
               @change=${this._handleSliderChange}
             >
             </ha-slider>`
-          : ""}
-        <ha-textfield
-          inputMode="numeric"
-          pattern="[0-9]+([\\.][0-9]+)?"
-          .label=${this.selector.number.mode !== "box" ? undefined : this.label}
-          .placeholder=${this.placeholder}
-          class=${classMap({ single: this.selector.number.mode === "box" })}
-          .min=${this.selector.number.min}
-          .max=${this.selector.number.max}
-          .value=${this.value ?? ""}
-          .step=${this.selector.number.step ?? 1}
-          helperPersistent
-          .helper=${isBox ? this.helper : undefined}
-          .disabled=${this.disabled}
-          .required=${this.required}
-          .suffix=${this.selector.number.unit_of_measurement}
-          type="number"
-          autoValidate
-          ?no-spinner=${this.selector.number.mode !== "box"}
-          @input=${this._handleInputChange}
-        >
-        </ha-textfield>
-      </div>
-      ${!isBox && this.helper
-        ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
         : ""}
-    `;
+      <ha-textfield
+        inputMode="numeric"
+        pattern="[0-9]+([\\.][0-9]+)?"
+        .label=${this.selector.number.mode !== "box" ? undefined : this.label}
+        .placeholder=${this.placeholder}
+        class=${classMap({ single: this.selector.number.mode === "box" })}
+        .min=${this.selector.number.min}
+        .max=${this.selector.number.max}
+        .value=${this.value ?? ""}
+        .step=${this.selector.number.step ?? 1}
+        .disabled=${this.disabled}
+        .required=${this.required}
+        .suffix=${this.selector.number.unit_of_measurement}
+        type="number"
+        autoValidate
+        ?no-spinner=${this.selector.number.mode !== "box"}
+        @input=${this._handleInputChange}
+      >
+      </ha-textfield>`;
   }
 
   private get _value() {
@@ -103,7 +88,7 @@ export class HaNumberSelector extends LitElement {
 
   static get styles(): CSSResultGroup {
     return css`
-      .input {
+      :host {
         display: flex;
         justify-content: space-between;
         align-items: center;

src/components/ha-selector/ha-selector-object.ts

@@ -3,7 +3,6 @@ import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { HomeAssistant } from "../../types";
 import "../ha-yaml-editor";
-import "../ha-input-helper-text";
 
 @customElement("ha-selector-object")
 export class HaObjectSelector extends LitElement {
@@ -13,27 +12,18 @@ export class HaObjectSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property() public placeholder?: string;
 
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   protected render() {
     return html`<ha-yaml-editor
-        .hass=${this.hass}
-        .readonly=${this.disabled}
-        .label=${this.label}
-        .required=${this.required}
-        .placeholder=${this.placeholder}
-        .defaultValue=${this.value}
-        @value-changed=${this._handleChange}
-      ></ha-yaml-editor>
-      ${this.helper
-        ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
-        : ""} `;
+      .hass=${this.hass}
+      .disabled=${this.disabled}
+      .placeholder=${this.placeholder}
+      .defaultValue=${this.value}
+      @value-changed=${this._handleChange}
+    ></ha-yaml-editor>`;
   }
 
   private _handleChange(ev) {

src/components/ha-selector/ha-selector-select.ts

@@ -1,19 +1,13 @@
 import "@material/mwc-formfield/mwc-formfield";
 import "@material/mwc-list/mwc-list-item";
-import { mdiClose } from "@mdi/js";
-import { css, html, LitElement } from "lit";
-import { customElement, property, query } from "lit/decorators";
+import { css, CSSResultGroup, html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { stopPropagation } from "../../common/dom/stop_propagation";
 import type { SelectOption, SelectSelector } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
-import "../ha-checkbox";
-import "../ha-chip";
-import "../ha-chip-set";
-import type { HaComboBox } from "../ha-combo-box";
-import "../ha-formfield";
-import "../ha-radio";
 import "../ha-select";
+import "../ha-radio";
 
 @customElement("ha-selector-select")
 export class HaSelectSelector extends LitElement {
@@ -21,7 +15,7 @@ export class HaSelectSelector extends LitElement {
 
   @property({ attribute: false }) public selector!: SelectSelector;
 
-  @property() public value?: string | string[];
+  @property() public value?: string;
 
   @property() public label?: string;
 
@@ -31,117 +25,27 @@ export class HaSelectSelector extends LitElement {
 
   @property({ type: Boolean }) public required = true;
 
-  @query("ha-combo-box", true) private comboBox!: HaComboBox;
-
-  private _filter = "";
-
   protected render() {
-    const options = this.selector.select.options.map((option) =>
-      typeof option === "object" ? option : { value: option, label: option }
-    );
-
-    if (!this.selector.select.custom_value && this._mode === "list") {
-      if (!this.selector.select.multiple || this.required) {
-        return html`
-          <div>
-            ${this.label}
-            ${options.map(
-              (item: SelectOption) => html`
-                <mwc-formfield .label=${item.label}>
-                  <ha-radio
-                    .checked=${item.value === this.value}
-                    .value=${item.value}
-                    .disabled=${this.disabled}
-                    @change=${this._valueChanged}
-                  ></ha-radio>
-                </mwc-formfield>
-              `
-            )}
-          </div>
-          ${this._renderHelper()}
-        `;
-      }
-
+    if (this.required && this.selector.select.options!.length < 6) {
       return html`
         <div>
-          ${this.label}${options.map(
-            (item: SelectOption) => html`
-              <ha-formfield .label=${item.label}>
-                <ha-checkbox
-                  .checked=${this.value?.includes(item.value)}
-                  .value=${item.value}
+          ${this.label}
+          ${this.selector.select.options.map((item: string | SelectOption) => {
+            const value = typeof item === "object" ? item.value : item;
+            const label = typeof item === "object" ? item.label : item;
+
+            return html`
+              <mwc-formfield .label=${label}>
+                <ha-radio
+                  .checked=${value === this.value}
+                  .value=${value}
                   .disabled=${this.disabled}
-                  @change=${this._checkboxChanged}
-                ></ha-checkbox>
-              </ha-formfield>
-            `
-          )}
+                  @change=${this._valueChanged}
+                ></ha-radio>
+              </mwc-formfield>
+            `;
+          })}
         </div>
-        ${this._renderHelper()}
-      `;
-    }
-
-    if (this.selector.select.multiple) {
-      const value =
-        !this.value || this.value === "" ? [] : (this.value as string[]);
-
-      return html`
-        <ha-chip-set>
-          ${value?.map(
-            (item, idx) =>
-              html`
-                <ha-chip hasTrailingIcon>
-                  ${options.find((option) => option.value === item)?.label ||
-                  item}
-                  <ha-svg-icon
-                    slot="trailing-icon"
-                    .path=${mdiClose}
-                    .idx=${idx}
-                    @click=${this._removeItem}
-                  ></ha-svg-icon>
-                </ha-chip>
-              `
-          )}
-        </ha-chip-set>
-
-        <ha-combo-box
-          item-value-path="value"
-          item-label-path="label"
-          .hass=${this.hass}
-          .label=${this.label}
-          .helper=${this.helper}
-          .disabled=${this.disabled}
-          .required=${this.required && !value.length}
-          .value=${this._filter}
-          .items=${options.filter((item) => !this.value?.includes(item.value))}
-          @filter-changed=${this._filterChanged}
-          @value-changed=${this._comboBoxValueChanged}
-        ></ha-combo-box>
-      `;
-    }
-
-    if (this.selector.select.custom_value) {
-      if (
-        this.value !== undefined &&
-        !options.find((option) => option.value === this.value)
-      ) {
-        options.unshift({ value: this.value, label: this.value });
-      }
-
-      return html`
-        <ha-combo-box
-          item-value-path="value"
-          item-label-path="label"
-          .hass=${this.hass}
-          .label=${this.label}
-          .helper=${this.helper}
-          .disabled=${this.disabled}
-          .required=${this.required}
-          .items=${options}
-          .value=${this.value}
-          @filter-changed=${this._filterChanged}
-          @value-changed=${this._comboBoxValueChanged}
-        ></ha-combo-box>
       `;
     }
 
@@ -156,137 +60,36 @@ export class HaSelectSelector extends LitElement {
         @closed=${stopPropagation}
         @selected=${this._valueChanged}
       >
-        ${options.map(
-          (item: SelectOption) => html`
-            <mwc-list-item .value=${item.value}>${item.label}</mwc-list-item>
-          `
-        )}
+        ${this.selector.select.options.map((item: string | SelectOption) => {
+          const value = typeof item === "object" ? item.value : item;
+          const label = typeof item === "object" ? item.label : item;
+
+          return html`<mwc-list-item .value=${value}>${label}</mwc-list-item>`;
+        })}
       </ha-select>
     `;
   }
 
-  private _renderHelper() {
-    return this.helper
-      ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
-      : "";
-  }
-
-  private get _mode(): "list" | "dropdown" {
-    return (
-      this.selector.select.mode ||
-      (this.selector.select.options.length < 6 ? "list" : "dropdown")
-    );
-  }
-
   private _valueChanged(ev) {
     ev.stopPropagation();
-    const value = ev.detail?.value || ev.target.value;
-    if (this.disabled || !value) {
+    if (this.disabled || !ev.target.value) {
       return;
     }
     fireEvent(this, "value-changed", {
-      value: value,
+      value: ev.target.value,
     });
   }
 
-  private _checkboxChanged(ev) {
-    ev.stopPropagation();
-    if (this.disabled) {
-      return;
-    }
-
-    let newValue: string[];
-    const value: string = ev.target.value;
-    const checked = ev.target.checked;
-
-    if (checked) {
-      if (!this.value) {
-        newValue = [value];
-      } else if (this.value.includes(value)) {
-        return;
-      } else {
-        newValue = [...this.value, value];
+  static get styles(): CSSResultGroup {
+    return css`
+      ha-select {
+        width: 100%;
       }
-    } else {
-      if (!this.value?.includes(value)) {
-        return;
+      mwc-formfield {
+        display: block;
       }
-      newValue = (this.value as string[]).filter((v) => v !== value);
-    }
-
-    fireEvent(this, "value-changed", {
-      value: newValue,
-    });
+    `;
   }
-
-  private async _removeItem(ev) {
-    const value: string[] = [...(this.value! as string[])];
-    value.splice(ev.target.idx, 1);
-
-    fireEvent(this, "value-changed", {
-      value,
-    });
-    await this.updateComplete;
-    this._filterChanged();
-  }
-
-  private _comboBoxValueChanged(ev: CustomEvent): void {
-    ev.stopPropagation();
-    const newValue = ev.detail.value;
-
-    if (this.disabled || newValue === "") {
-      return;
-    }
-
-    if (!this.selector.select.multiple) {
-      fireEvent(this, "value-changed", {
-        value: newValue,
-      });
-      return;
-    }
-
-    if (newValue !== undefined && this.value?.includes(newValue)) {
-      return;
-    }
-
-    setTimeout(() => {
-      this._filterChanged();
-      this.comboBox.setInputValue("");
-    }, 0);
-
-    const currentValue =
-      !this.value || this.value === "" ? [] : (this.value as string[]);
-
-    fireEvent(this, "value-changed", {
-      value: [...currentValue, newValue],
-    });
-  }
-
-  private _filterChanged(ev?: CustomEvent): void {
-    this._filter = ev?.detail.value || "";
-
-    const filteredItems = this.comboBox.items?.filter((item) => {
-      if (this.selector.select.multiple && this.value?.includes(item.value)) {
-        return false;
-      }
-      const label = item.label || item.value;
-      return label.toLowerCase().includes(this._filter?.toLowerCase());
-    });
-
-    if (this._filter && this.selector.select.custom_value) {
-      filteredItems?.unshift({ label: this._filter, value: this._filter });
-    }
-
-    this.comboBox.filteredItems = filteredItems;
-  }
-
-  static styles = css`
-    ha-select,
-    mwc-formfield,
-    ha-formfield {
-      display: block;
-    }
-  `;
 }
 
 declare global {

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

@@ -26,8 +26,6 @@ export class HaTargetSelector extends SubscribeMixin(LitElement) {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @state() private _entityPlaformLookup?: Record<string, string>;
 
   @state() private _configEntries?: ConfigEntry[];
@@ -66,7 +64,6 @@ export class HaTargetSelector extends SubscribeMixin(LitElement) {
     return html`<ha-target-picker
       .hass=${this.hass}
       .value=${this.value}
-      .helper=${this.helper}
       .deviceFilter=${this._filterDevices}
       .entityRegFilter=${this._filterRegEntities}
       .entityFilter=${this._filterEntities}

src/components/ha-selector/ha-selector-text.ts

@@ -18,8 +18,6 @@ export class HaTextSelector extends LitElement {
 
   @property() public placeholder?: string;
 
-  @property() public helper?: string;
-
   @property() public selector!: StringSelector;
 
   @property({ type: Boolean }) public disabled = false;
@@ -34,8 +32,6 @@ export class HaTextSelector extends LitElement {
         .label=${this.label}
         .placeholder=${this.placeholder}
         .value=${this.value || ""}
-        .helper=${this.helper}
-        helperPersistent
         .disabled=${this.disabled}
         @input=${this._handleChange}
         autocapitalize="none"
@@ -48,8 +44,6 @@ export class HaTextSelector extends LitElement {
     return html`<ha-textfield
         .value=${this.value || ""}
         .placeholder=${this.placeholder || ""}
-        .helper=${this.helper}
-        helperPersistent
         .disabled=${this.disabled}
         .type=${this._unmaskedPassword ? "text" : this.selector.text?.type}
         @input=${this._handleChange}

src/components/ha-selector/ha-selector-theme.ts

@@ -1,8 +1,8 @@
+import "../../panels/lovelace/components/hui-theme-select-editor";
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import type { ThemeSelector } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
-import "../ha-theme-picker";
+import type { ThemeSelector } from "../../data/selector";
 
 @customElement("ha-selector-theme")
 export class HaThemeSelector extends LitElement {
@@ -16,17 +16,13 @@ export class HaThemeSelector extends LitElement {
 
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  @property({ type: Boolean }) public required = true;
-
   protected render() {
     return html`
-      <ha-theme-picker
+      <hui-theme-select-editor
         .hass=${this.hass}
         .value=${this.value}
         .label=${this.label}
-        .disabled=${this.disabled}
-        .required=${this.required}
-      ></ha-theme-picker>
+      ></hui-theme-select-editor>
     `;
   }
 }

src/components/ha-selector/ha-selector-time.ts

@@ -14,20 +14,14 @@ export class HaTimeSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = false;
-
   protected render() {
     return html`
       <ha-time-input
         .value=${this.value}
         .locale=${this.hass.locale}
         .disabled=${this.disabled}
-        .required=${this.required}
-        .helper=${this.helper}
         .label=${this.label}
         enable-second
       ></ha-time-input>

src/components/ha-service-control.ts

@@ -471,7 +471,6 @@ export class HaServiceControl extends LitElement {
       }
       ha-settings-row {
         --paper-time-input-justify-content: flex-end;
-        --settings-row-content-width: 100%;
         border-top: var(
           --service-control-items-border-top,
           1px solid var(--divider-color)
@@ -490,6 +489,9 @@ export class HaServiceControl extends LitElement {
         margin: var(--service-control-padding, 0 16px);
         padding: 16px 0;
       }
+      :host(:not([narrow])) ha-settings-row ha-selector {
+        width: 60%;
+      }
       .checkbox-spacer {
         width: 32px;
       }

src/components/ha-settings-row.ts

@@ -21,7 +21,7 @@ export class HaSettingsRow extends LitElement {
           <div secondary><slot name="description"></slot></div>
         </paper-item-body>
       </div>
-      <div class="content"><slot></slot></div>
+      <slot></slot>
     `;
   }
 
@@ -43,18 +43,6 @@ export class HaSettingsRow extends LitElement {
         );
         flex: 1;
       }
-      .content {
-        display: contents;
-      }
-      :host(:not([narrow])) .content {
-        display: flex;
-        justify-content: flex-end;
-        flex: 1;
-        padding: 16px 0;
-      }
-      .content ::slotted(*) {
-        width: var(--settings-row-content-width);
-      }
       :host([narrow]) {
         align-items: normal;
         flex-direction: column;

src/components/ha-sidebar.ts

@@ -36,15 +36,14 @@ import memoizeOne from "memoize-one";
 import { LocalStorage } from "../common/decorators/local-storage";
 import { fireEvent } from "../common/dom/fire_event";
 import { toggleAttribute } from "../common/dom/toggle_attribute";
+import { computeDomain } from "../common/entity/compute_domain";
 import { stringCompare } from "../common/string/compare";
 import { computeRTL } from "../common/util/compute_rtl";
-import { throttle } from "../common/util/throttle";
 import { ActionHandlerDetail } from "../data/lovelace";
 import {
   PersistentNotification,
   subscribeNotifications,
 } from "../data/persistent_notification";
-import { updateCanInstall, UpdateEntity } from "../data/update";
 import { actionHandler } from "../panels/lovelace/common/directives/action-handler-directive";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant, PanelInfo, Route } from "../types";
@@ -69,6 +68,7 @@ const SORT_VALUE_URL_PATHS = {
 
 const PANEL_ICONS = {
   calendar: mdiCalendar,
+  config: mdiCog,
   "developer-tools": mdiHammer,
   energy: mdiLightningBolt,
   history: mdiChartBox,
@@ -190,8 +190,6 @@ class HaSidebar extends LitElement {
 
   @state() private _notifications?: PersistentNotification[];
 
-  @state() private _updatesCount = 0;
-
   @state() private _renderEmptySortable = false;
 
   private _mouseLeaveTimeout?: number;
@@ -237,7 +235,6 @@ class HaSidebar extends LitElement {
       changedProps.has("narrow") ||
       changedProps.has("alwaysExpand") ||
       changedProps.has("_externalConfig") ||
-      changedProps.has("_updatesCount") ||
       changedProps.has("_notifications") ||
       changedProps.has("editMode") ||
       changedProps.has("_renderEmptySortable") ||
@@ -293,8 +290,6 @@ class HaSidebar extends LitElement {
       toggleAttribute(this, "rtl", computeRTL(this.hass));
     }
 
-    this._calculateCounts();
-
     if (!SUPPORT_SCROLL_IF_NEEDED) {
       return;
     }
@@ -307,21 +302,6 @@ class HaSidebar extends LitElement {
     }
   }
 
-  private _calculateCounts = throttle(() => {
-    let updateCount = 0;
-
-    for (const entityId of Object.keys(this.hass.states)) {
-      if (
-        entityId.startsWith("update.") &&
-        updateCanInstall(this.hass.states[entityId] as UpdateEntity)
-      ) {
-        updateCount++;
-      }
-    }
-
-    this._updatesCount = updateCount;
-  }, 5000);
-
   private _renderHeader() {
     return html`<div
       class="menu"
@@ -407,37 +387,35 @@ class HaSidebar extends LitElement {
     icon?: string | null,
     iconPath?: string | null
   ) {
-    return urlPath === "config"
-      ? this._renderConfiguration(title)
-      : html`
-          <a
-            role="option"
-            href=${`/${urlPath}`}
-            data-panel=${urlPath}
-            tabindex="-1"
-            @mouseenter=${this._itemMouseEnter}
-            @mouseleave=${this._itemMouseLeave}
-          >
-            <paper-icon-item>
-              ${iconPath
-                ? html`<ha-svg-icon
-                    slot="item-icon"
-                    .path=${iconPath}
-                  ></ha-svg-icon>`
-                : html`<ha-icon slot="item-icon" .icon=${icon}></ha-icon>`}
-              <span class="item-text">${title}</span>
-            </paper-icon-item>
-            ${this.editMode
-              ? html`<ha-icon-button
-                  .label=${this.hass.localize("ui.sidebar.hide_panel")}
-                  .path=${mdiClose}
-                  class="hide-panel"
-                  .panel=${urlPath}
-                  @click=${this._hidePanel}
-                ></ha-icon-button>`
-              : ""}
-          </a>
-        `;
+    return html`
+      <a
+        role="option"
+        href=${`/${urlPath}`}
+        data-panel=${urlPath}
+        tabindex="-1"
+        @mouseenter=${this._itemMouseEnter}
+        @mouseleave=${this._itemMouseLeave}
+      >
+        <paper-icon-item>
+          ${iconPath
+            ? html`<ha-svg-icon
+                slot="item-icon"
+                .path=${iconPath}
+              ></ha-svg-icon>`
+            : html`<ha-icon slot="item-icon" .icon=${icon}></ha-icon>`}
+          <span class="item-text">${title}</span>
+        </paper-icon-item>
+        ${this.editMode
+          ? html`<ha-icon-button
+              .label=${this.hass.localize("ui.sidebar.hide_panel")}
+              .path=${mdiClose}
+              class="hide-panel"
+              .panel=${urlPath}
+              @click=${this._hidePanel}
+            ></ha-icon-button>`
+          : ""}
+      </a>
+    `;
   }
 
   private _renderPanelsEdit(beforeSpacer: PanelInfo[]) {
@@ -499,39 +477,15 @@ class HaSidebar extends LitElement {
     return html`<div class="spacer" disabled></div>`;
   }
 
-  private _renderConfiguration(title: string | null) {
-    return html` <a
-      class="configuration-container"
-      role="option"
-      href="/config"
-      data-panel="config"
-      tabindex="-1"
-      @mouseenter=${this._itemMouseEnter}
-      @mouseleave=${this._itemMouseLeave}
-    >
-      <paper-icon-item class="configuration" role="option">
-        <ha-svg-icon slot="item-icon" .path=${mdiCog}></ha-svg-icon>
-        ${!this.alwaysExpand && this._updatesCount > 0
-          ? html`
-              <span class="configuration-badge" slot="item-icon">
-                ${this._updatesCount}
-              </span>
-            `
-          : ""}
-        <span class="item-text">${title}</span>
-        ${this.alwaysExpand && this._updatesCount > 0
-          ? html`
-              <span class="configuration-badge">${this._updatesCount}</span>
-            `
-          : ""}
-      </paper-icon-item>
-    </a>`;
-  }
-
   private _renderNotifications() {
-    const notificationCount = this._notifications
+    let notificationCount = this._notifications
       ? this._notifications.length
       : 0;
+    for (const entityId in this.hass.states) {
+      if (computeDomain(entityId) === "configurator") {
+        notificationCount++;
+      }
+    }
 
     return html`<div
       class="notifications-container"
@@ -999,21 +953,18 @@ class HaSidebar extends LitElement {
           height: 1px;
           background-color: var(--divider-color);
         }
-        .notifications-container,
-        .configuration-container {
+        .notifications-container {
           display: flex;
           margin-left: env(safe-area-inset-left);
         }
-        :host([rtl]) .notifications-container,
-        :host([rtl]) .configuration-container {
+        :host([rtl]) .notifications-container {
           margin-left: initial;
           margin-right: env(safe-area-inset-right);
         }
         .notifications {
           cursor: pointer;
         }
-        .notifications .item-text,
-        .configuration .item-text {
+        .notifications .item-text {
           flex: 1;
         }
         .profile {
@@ -1037,10 +988,7 @@ class HaSidebar extends LitElement {
           margin-right: 8px;
         }
 
-        .notification-badge,
-        .configuration-badge {
-          left: calc(var(--app-drawer-width) - 42px);
-          position: absolute;
+        .notification-badge {
           min-width: 20px;
           box-sizing: border-box;
           border-radius: 50%;
@@ -1051,11 +999,7 @@ class HaSidebar extends LitElement {
           padding: 0px 6px;
           color: var(--text-accent-color, var(--text-primary-color));
         }
-        .configuration-badge {
-          background-color: var(--primary-color);
-        }
-        ha-svg-icon + .notification-badge,
-        ha-svg-icon + .configuration-badge {
+        ha-svg-icon + .notification-badge {
           position: absolute;
           bottom: 14px;
           left: 26px;

src/components/ha-target-picker.ts

@@ -43,7 +43,6 @@ import type { HaEntityPickerEntityFilterFunc } from "./entity/ha-entity-picker";
 import "./ha-area-picker";
 import "./ha-icon-button";
 import "./ha-svg-icon";
-import "./ha-input-helper-text";
 
 @customElement("ha-target-picker")
 export class HaTargetPicker extends SubscribeMixin(LitElement) {
@@ -53,8 +52,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   /**
    * Show only targets with entities from specific domains.
    * @type {Array}
@@ -216,11 +213,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
             </span>
           </span>
         </div>
-      </div>
-
-      ${this.helper
-        ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
-        : ""} `;
+      </div>`;
   }
 
   private async _showPicker(ev) {

src/components/ha-textarea.ts

@@ -19,11 +19,13 @@ export class HaTextArea extends TextAreaBase {
     textfieldStyles,
     textareaStyles,
     css`
+      :host([autogrow]) {
+        max-height: 200px;
+      }
       :host([autogrow]) .mdc-text-field {
         position: relative;
         min-height: 74px;
         min-width: 178px;
-        max-height: 200px;
       }
       :host([autogrow]) .mdc-text-field:after {
         content: attr(data-value);

src/components/ha-time-input.ts

@@ -2,8 +2,8 @@ import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { useAmPm } from "../common/datetime/use_am_pm";
 import { fireEvent } from "../common/dom/fire_event";
-import { FrontendLocaleData } from "../data/translation";
 import "./ha-base-time-input";
+import { FrontendLocaleData } from "../data/translation";
 import type { TimeChangedEvent } from "./ha-base-time-input";
 
 @customElement("ha-time-input")
@@ -14,12 +14,8 @@ export class HaTimeInput extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = false;
-
   @property({ type: Boolean, attribute: "enable-second" })
   public enableSecond = false;
 
@@ -47,8 +43,6 @@ export class HaTimeInput extends LitElement {
         .disabled=${this.disabled}
         @value-changed=${this._timeChanged}
         .enableSecond=${this.enableSecond}
-        .required=${this.required}
-        .helper=${this.helper}
       ></ha-base-time-input>
     `;
   }

src/components/ha-yaml-editor.ts

@@ -33,8 +33,6 @@ export class HaYamlEditor extends LitElement {
 
   @property({ type: Boolean }) public readOnly = false;
 
-  @property({ type: Boolean }) public required = false;
-
   @state() private _yaml = "";
 
   public setValue(value): void {
@@ -61,9 +59,7 @@ export class HaYamlEditor extends LitElement {
       return html``;
     }
     return html`
-      ${this.label
-        ? html`<p>${this.label}${this.required ? " *" : ""}</p>`
-        : ""}
+      ${this.label ? html`<p>${this.label}</p>` : ""}
       <ha-code-editor
         .hass=${this.hass}
         .value=${this._yaml}

src/components/map/ha-locations-editor.ts

@@ -21,7 +21,6 @@ import type { LeafletModuleType } from "../../common/dom/setup-leaflet-map";
 import type { HomeAssistant } from "../../types";
 import "./ha-map";
 import type { HaMap } from "./ha-map";
-import "../ha-input-helper-text";
 
 declare global {
   // for fire event
@@ -51,8 +50,6 @@ export class HaLocationsEditor extends LitElement {
 
   @property({ attribute: false }) public locations?: MarkerLocation[];
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public autoFit = false;
 
   @property({ type: Number }) public zoom = 16;
@@ -105,18 +102,13 @@ export class HaLocationsEditor extends LitElement {
   }
 
   protected render(): TemplateResult {
-    return html`
-      <ha-map
-        .hass=${this.hass}
-        .layers=${this._getLayers(this._circles, this._locationMarkers)}
-        .zoom=${this.zoom}
-        .autoFit=${this.autoFit}
-        .darkMode=${this.darkMode}
-      ></ha-map>
-      ${this.helper
-        ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
-        : ""}
-    `;
+    return html`<ha-map
+      .hass=${this.hass}
+      .layers=${this._getLayers(this._circles, this._locationMarkers)}
+      .zoom=${this.zoom}
+      .autoFit=${this.autoFit}
+      .darkMode=${this.darkMode}
+    ></ha-map>`;
   }
 
   private _getLayers = memoizeOne(
@@ -295,10 +287,13 @@ export class HaLocationsEditor extends LitElement {
 
   static get styles(): CSSResultGroup {
     return css`
-      ha-map {
+      :host {
         display: block;
         height: 300px;
       }
+      ha-map {
+        height: 100%;
+      }
     `;
   }
 }

src/components/map/ha-map.ts

@@ -488,14 +488,6 @@ export class HaMap extends ReactiveElement {
         text-align: center;
         color: var(--primary-text-color);
       }
-      .leaflet-pane {
-        z-index: 0 !important;
-      }
-      .leaflet-control,
-      .leaflet-top,
-      .leaflet-bottom {
-        z-index: 1 !important;
-      }
     `;
   }
 }

src/data/automation.ts

@@ -62,7 +62,6 @@ export interface ContextConstraint {
 export interface BaseTrigger {
   platform: string;
   id?: string;
-  variables?: Record<string, unknown>;
 }
 
 export interface StateTrigger extends BaseTrigger {

src/data/backup.ts

@@ -1,36 +0,0 @@
-import { HomeAssistant } from "../types";
-
-export interface BackupContent {
-  slug: string;
-  date: string;
-  name: string;
-  size: number;
-  path: string;
-}
-
-export interface BackupData {
-  backing_up: boolean;
-  backups: BackupContent[];
-}
-
-export const getBackupDownloadUrl = (slug: string) =>
-  `/api/backup/download/${slug}`;
-
-export const fetchBackupInfo = (hass: HomeAssistant): Promise<BackupData> =>
-  hass.callWS({
-    type: "backup/info",
-  });
-
-export const removeBackup = (
-  hass: HomeAssistant,
-  slug: string
-): Promise<void> =>
-  hass.callWS({
-    type: "backup/remove",
-    slug,
-  });
-
-export const generateBackup = (hass: HomeAssistant): Promise<BackupContent> =>
-  hass.callWS({
-    type: "backup/generate",
-  });

src/data/camera.ts

@@ -2,7 +2,7 @@ import {
   HassEntityAttributeBase,
   HassEntityBase,
 } from "home-assistant-js-websocket";
-import { timeCacheEntityPromiseFunc } from "../common/util/time-cache-entity-promise-func";
+import { timeCachePromiseFunc } from "../common/util/time-cache-function-promise";
 import { HomeAssistant } from "../types";
 import { getSignedPath } from "./auth";
 
@@ -50,7 +50,7 @@ export const fetchThumbnailUrlWithCache = async (
   width: number,
   height: number
 ) => {
-  const base_url = await timeCacheEntityPromiseFunc(
+  const base_url = await timeCachePromiseFunc(
     "_cameraTmbUrl",
     9000,
     fetchThumbnailUrl,

src/data/entity_registry.ts

@@ -41,10 +41,6 @@ export interface EntityRegistryEntryUpdateParams {
   disabled_by?: string | null;
   hidden_by: string | null;
   new_entity_id?: string;
-  options_domain?: string;
-  options?: {
-    unit_of_measurement?: string | null;
-  };
 }
 
 export const findBatteryEntity = (

src/data/entity_sources.ts

@@ -1,46 +0,0 @@
-import { timeCachePromiseFunc } from "../common/util/time-cache-function-promise";
-import { HomeAssistant } from "../types";
-
-interface EntitySourceConfigEntry {
-  source: "config_entry";
-  domain: string;
-  custom_component: boolean;
-  config_entry: string;
-}
-
-interface EntitySourcePlatformConfig {
-  source: "platform_config";
-  domain: string;
-  custom_component: boolean;
-}
-
-export type EntitySources = Record<
-  string,
-  EntitySourceConfigEntry | EntitySourcePlatformConfig
->;
-
-const fetchEntitySources = (
-  hass: HomeAssistant,
-  entity_id?: string
-): Promise<EntitySources> =>
-  hass.callWS({
-    type: "entity/source",
-    entity_id,
-  });
-
-export const fetchEntitySourcesWithCache = (
-  hass: HomeAssistant,
-  entity_id?: string
-): Promise<EntitySources> =>
-  entity_id
-    ? fetchEntitySources(hass, entity_id)
-    : timeCachePromiseFunc(
-        "_entitySources",
-        // cache for 30 seconds
-        30000,
-        fetchEntitySources,
-        // We base the cache on number of states. If number of states
-        // changes we force a refresh
-        (hass2) => Object.keys(hass2.states).length,
-        hass
-      );

src/data/hassio/addon.ts

@@ -21,8 +21,7 @@ export type AddonState = "started" | "stopped" | null;
 export type AddonRepository = "core" | "local" | string;
 
 interface AddonTranslations {
-  network?: Record<string, string>;
-  configuration?: Record<string, { name?: string; description?: string }>;
+  [key: string]: Record<string, Record<string, Record<string, string>>>;
 }
 
 export interface HassioAddonInfo {
@@ -92,7 +91,7 @@ export interface HassioAddonDetails extends HassioAddonInfo {
   slug: string;
   startup: AddonStartup;
   stdin: boolean;
-  translations: Record<string, AddonTranslations>;
+  translations: AddonTranslations;
   watchdog: null | boolean;
   webui: null | string;
 }

src/data/history.ts

@@ -84,8 +84,6 @@ export interface StatisticsMetaData {
   statistic_id: string;
   source: string;
   name?: string | null;
-  has_sum: boolean;
-  has_mean: boolean;
 }
 
 export type StatisticsValidationResult =

src/data/media-player.ts

@@ -16,11 +16,6 @@ import {
   mdiPlayPause,
   mdiPodcast,
   mdiPower,
-  mdiRepeat,
-  mdiRepeatOff,
-  mdiRepeatOnce,
-  mdiShuffle,
-  mdiShuffleDisabled,
   mdiSkipNext,
   mdiSkipPrevious,
   mdiStop,
@@ -54,8 +49,6 @@ interface MediaPlayerEntityAttributes extends HassEntityAttributeBase {
   entity_picture_local?: string;
   is_volume_muted?: boolean;
   volume_level?: number;
-  repeat?: string;
-  shuffle?: boolean;
   source?: string;
   source_list?: string[];
   sound_mode?: string;
@@ -87,9 +80,7 @@ export const SUPPORT_VOLUME_BUTTONS = 1024;
 export const SUPPORT_SELECT_SOURCE = 2048;
 export const SUPPORT_STOP = 4096;
 export const SUPPORT_PLAY = 16384;
-export const SUPPORT_REPEAT_SET = 262144;
 export const SUPPORT_SELECT_SOUND_MODE = 65536;
-export const SUPPORT_SHUFFLE_SET = 32768;
 export const SUPPORT_BROWSE_MEDIA = 131072;
 
 export type MediaPlayerBrowseAction = "pick" | "play";
@@ -242,8 +233,7 @@ export const computeMediaDescription = (
 };
 
 export const computeMediaControls = (
-  stateObj: MediaPlayerEntity,
-  useExtendedControls = false
+  stateObj: MediaPlayerEntity
 ): ControlButton[] | undefined => {
   if (!stateObj) {
     return undefined;
@@ -276,18 +266,6 @@ export const computeMediaControls = (
   }
 
   const assumedState = stateObj.attributes.assumed_state === true;
-  const stateAttr = stateObj.attributes;
-
-  if (
-    (state === "playing" || state === "paused" || assumedState) &&
-    supportsFeature(stateObj, SUPPORT_SHUFFLE_SET) &&
-    useExtendedControls
-  ) {
-    buttons.push({
-      icon: stateAttr.shuffle === true ? mdiShuffle : mdiShuffleDisabled,
-      action: "shuffle_set",
-    });
-  }
 
   if (
     (state === "playing" || state === "paused" || assumedState) &&
@@ -359,22 +337,6 @@ export const computeMediaControls = (
     });
   }
 
-  if (
-    (state === "playing" || state === "paused" || assumedState) &&
-    supportsFeature(stateObj, SUPPORT_REPEAT_SET) &&
-    useExtendedControls
-  ) {
-    buttons.push({
-      icon:
-        stateAttr.repeat === "all"
-          ? mdiRepeat
-          : stateAttr.repeat === "one"
-          ? mdiRepeatOnce
-          : mdiRepeatOff,
-      action: "repeat_set",
-    });
-  }
-
   return buttons.length > 0 ? buttons : undefined;
 };
 
@@ -413,31 +375,3 @@ export const setMediaPlayerVolume = (
   volume_level: number
 ) =>
   hass.callService("media_player", "volume_set", { entity_id, volume_level });
-
-export const handleMediaControlClick = (
-  hass: HomeAssistant,
-  stateObj: MediaPlayerEntity,
-  action: string
-) =>
-  hass!.callService(
-    "media_player",
-    action,
-    action === "shuffle_set"
-      ? {
-          entity_id: stateObj!.entity_id,
-          shuffle: !stateObj!.attributes.shuffle,
-        }
-      : action === "repeat_set"
-      ? {
-          entity_id: stateObj!.entity_id,
-          repeat:
-            stateObj!.attributes.repeat === "all"
-              ? "one"
-              : stateObj!.attributes.repeat === "off"
-              ? "all"
-              : "off",
-        }
-      : {
-          entity_id: stateObj!.entity_id,
-        }
-  );

src/data/selector.ts

@@ -46,7 +46,6 @@ export interface AreaSelector {
       manufacturer?: DeviceSelector["device"]["manufacturer"];
       model?: DeviceSelector["device"]["model"];
     };
-    multiple?: boolean;
   };
 }
 
@@ -97,9 +96,8 @@ export interface DeviceSelector {
 }
 
 export interface DurationSelector {
-  duration: {
-    enable_day?: boolean;
-  };
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  duration: {};
 }
 
 export interface EntitySelector {
@@ -108,6 +106,7 @@ export interface EntitySelector {
     domain?: string | string[];
     device_class?: string;
     multiple?: boolean;
+    use_uuid?: boolean;
     include_entities?: string[];
     exclude_entities?: string[];
   };
@@ -170,9 +169,6 @@ export interface SelectOption {
 
 export interface SelectSelector {
   select: {
-    multiple?: boolean;
-    custom_value?: boolean;
-    mode?: "list" | "dropdown";
     options: string[] | SelectOption[];
   };
 }
@@ -212,7 +208,6 @@ export interface TargetSelector {
     };
   };
 }
-
 export interface ThemeSelector {
   // eslint-disable-next-line @typescript-eslint/ban-types
   theme: {};

src/data/timer.ts

@@ -12,7 +12,6 @@ export type TimerEntity = HassEntityBase & {
   attributes: HassEntityAttributeBase & {
     duration: string;
     remaining: string;
-    restore: boolean;
   };
 };
 
@@ -27,14 +26,12 @@ export interface Timer {
   name: string;
   icon?: string;
   duration?: string | number | DurationDict;
-  restore?: boolean;
 }
 
 export interface TimerMutableParams {
   name: string;
   icon: string;
   duration: string | number | DurationDict;
-  restore: boolean;
 }
 
 export const fetchTimer = (hass: HomeAssistant) =>

src/data/update.ts

@@ -2,19 +2,15 @@ import type {
   HassEntityAttributeBase,
   HassEntityBase,
 } from "home-assistant-js-websocket";
-import { BINARY_STATE_ON } from "../common/const";
 import { supportsFeature } from "../common/entity/supports-feature";
-import { HomeAssistant } from "../types";
 
 export const UPDATE_SUPPORT_INSTALL = 1;
 export const UPDATE_SUPPORT_SPECIFIC_VERSION = 2;
 export const UPDATE_SUPPORT_PROGRESS = 4;
 export const UPDATE_SUPPORT_BACKUP = 8;
-export const UPDATE_SUPPORT_RELEASE_NOTES = 16;
 
 interface UpdateEntityAttributes extends HassEntityAttributeBase {
-  auto_update: boolean | null;
-  installed_version: string | null;
+  current_version: string | null;
   in_progress: boolean | number;
   latest_version: string | null;
   release_summary: string | null;
@@ -32,14 +28,9 @@ export const updateUsesProgress = (entity: UpdateEntity): boolean =>
   typeof entity.attributes.in_progress === "number";
 
 export const updateCanInstall = (entity: UpdateEntity): boolean =>
-  entity.state === BINARY_STATE_ON &&
-  supportsFeature(entity, UPDATE_SUPPORT_INSTALL);
+  supportsFeature(entity, UPDATE_SUPPORT_INSTALL) &&
+  entity.attributes.latest_version !== entity.attributes.current_version &&
+  entity.attributes.latest_version !== entity.attributes.skipped_version;
 
 export const updateIsInstalling = (entity: UpdateEntity): boolean =>
   updateUsesProgress(entity) || !!entity.attributes.in_progress;
-
-export const updateReleaseNotes = (hass: HomeAssistant, entityId: string) =>
-  hass.callWS<string | null>({
-    type: "update/release_notes",
-    entity_id: entityId,
-  });

src/data/zwave_js.ts

@@ -167,18 +167,12 @@ export interface ZwaveJSNodeMetadata {
   wakeup: string;
   reset: string;
   device_database_url: string;
-  comments: ZWaveJSNodeComment[];
 }
 
 export interface ZWaveJSNodeConfigParams {
   [key: string]: ZWaveJSNodeConfigParam;
 }
 
-export interface ZWaveJSNodeComment {
-  level: "info" | "warning" | "error";
-  text: string;
-}
-
 export interface ZWaveJSNodeConfigParam {
   property: number;
   value: any;

src/dialogs/config-flow/dialog-data-entry-flow.ts

@@ -14,7 +14,9 @@ import { fireEvent, HASSDomEvent } from "../../common/dom/fire_event";
 import { computeRTL } from "../../common/util/compute_rtl";
 import "../../components/ha-circular-progress";
 import "../../components/ha-dialog";
+import "../../components/ha-form/ha-form";
 import "../../components/ha-icon-button";
+import "../../components/ha-markdown";
 import {
   AreaRegistryEntry,
   subscribeAreaRegistry,
@@ -29,14 +31,12 @@ import {
   DeviceRegistryEntry,
   subscribeDeviceRegistry,
 } from "../../data/device_registry";
-import { fetchIntegrationManifest } from "../../data/integration";
 import { haStyleDialog } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
 import { documentationUrl } from "../../util/documentation-url";
 import { showAlertDialog } from "../generic/show-dialog-box";
 import {
   DataEntryFlowDialogParams,
-  FlowHandlers,
   LoadingReason,
 } from "./show-dialog-data-entry-flow";
 import "./step-flow-abort";
@@ -44,10 +44,10 @@ import "./step-flow-create-entry";
 import "./step-flow-external";
 import "./step-flow-form";
 import "./step-flow-loading";
-import "./step-flow-menu";
 import "./step-flow-pick-flow";
 import "./step-flow-pick-handler";
 import "./step-flow-progress";
+import "./step-flow-menu";
 
 let instance = 0;
 
@@ -87,7 +87,7 @@ class DataEntryFlowDialog extends LitElement {
 
   @state() private _areas?: AreaRegistryEntry[];
 
-  @state() private _handlers?: FlowHandlers;
+  @state() private _handlers?: string[];
 
   @state() private _handler?: string;
 
@@ -238,32 +238,22 @@ class DataEntryFlowDialog extends LitElement {
               ""
             : html`
                 <div class="dialog-actions">
-                  ${([
-                    "form",
-                    "menu",
-                    "external",
-                    "progress",
-                    "data_entry_flow_progressed",
-                  ].includes(this._step?.type as any) &&
-                    this._params.manifest?.is_built_in) ||
-                  this._params.manifest?.documentation
+                  ${["form", "menu", "external"].includes(
+                    this._step?.type as any
+                  )
                     ? html`
                         <a
-                          href=${this._params.manifest.is_built_in
-                            ? documentationUrl(
-                                this.hass,
-                                `/integrations/${this._params.manifest.domain}`
-                              )
-                            : this._params?.manifest?.documentation}
+                          href=${documentationUrl(
+                            this.hass,
+                            `/integrations/${this._step!.handler}`
+                          )}
                           target="_blank"
                           rel="noreferrer noopener"
-                        >
-                          <ha-icon-button
+                          ><ha-icon-button
                             .label=${this.hass.localize("ui.common.help")}
                             .path=${mdiHelpCircle}
                             ?rtl=${computeRTL(this.hass)}
-                          >
-                          </ha-icon-button
+                          ></ha-icon-button
                         ></a>
                       `
                     : ""}
@@ -438,17 +428,6 @@ class DataEntryFlowDialog extends LitElement {
         this._handler = undefined;
       }
       this._processStep(step);
-      if (this._params!.manifest === undefined) {
-        try {
-          this._params!.manifest = await fetchIntegrationManifest(
-            this.hass,
-            this._params?.domain || step.handler
-          );
-        } catch (_) {
-          // No manifest
-          this._params!.manifest = null;
-        }
-      }
     } else {
       this._step = null;
       this._flowsInProgress = flowsInProgress;

src/dialogs/config-flow/show-dialog-config-flow.ts

@@ -1,4 +1,5 @@
 import { html } from "lit";
+import { caseInsensitiveStringCompare } from "../../common/string/compare";
 import {
   createConfigFlow,
   deleteConfigFlow,
@@ -22,12 +23,17 @@ export const showConfigFlowDialog = (
   showFlowDialog(element, dialogParams, {
     loadDevicesAndAreas: true,
     getFlowHandlers: async (hass) => {
-      const [integrations, helpers] = await Promise.all([
+      const [handlers] = await Promise.all([
         getConfigFlowHandlers(hass, "integration"),
-        getConfigFlowHandlers(hass, "helper"),
         hass.loadBackendTranslation("title", undefined, true),
       ]);
-      return { integrations, helpers };
+
+      return handlers.sort((handlerA, handlerB) =>
+        caseInsensitiveStringCompare(
+          domainToName(hass.localize, handlerA),
+          domainToName(hass.localize, handlerB)
+        )
+      );
     },
     createFlow: async (hass, handler) => {
       const [step] = await Promise.all([
@@ -85,12 +91,6 @@ export const showConfigFlowDialog = (
       );
     },
 
-    renderShowFormStepFieldHelper(hass, step, field) {
-      return hass.localize(
-        `component.${step.handler}.config.step.${step.step_id}.data_description.${field.name}`
-      );
-    },
-
     renderShowFormStepFieldError(hass, step, error) {
       return hass.localize(
         `component.${step.handler}.config.error.${error}`,

src/dialogs/config-flow/show-dialog-data-entry-flow.ts

@@ -10,17 +10,12 @@ import {
   DataEntryFlowStepMenu,
   DataEntryFlowStepProgress,
 } from "../../data/data_entry_flow";
-import { IntegrationManifest } from "../../data/integration";
 import { HomeAssistant } from "../../types";
 
-export interface FlowHandlers {
-  integrations: string[];
-  helpers: string[];
-}
 export interface FlowConfig {
   loadDevicesAndAreas: boolean;
 
-  getFlowHandlers?: (hass: HomeAssistant) => Promise<FlowHandlers>;
+  getFlowHandlers?: (hass: HomeAssistant) => Promise<string[]>;
 
   createFlow(hass: HomeAssistant, handler: string): Promise<DataEntryFlowStep>;
 
@@ -55,12 +50,6 @@ export interface FlowConfig {
     field: HaFormSchema
   ): string;
 
-  renderShowFormStepFieldHelper(
-    hass: HomeAssistant,
-    step: DataEntryFlowStepForm,
-    field: HaFormSchema
-  ): string;
-
   renderShowFormStepFieldError(
     hass: HomeAssistant,
     step: DataEntryFlowStepForm,
@@ -123,8 +112,6 @@ export interface DataEntryFlowDialogParams {
   startFlowHandler?: string;
   searchQuery?: string;
   continueFlowId?: string;
-  manifest?: IntegrationManifest | null;
-  domain?: string;
   dialogClosedCallback?: (params: {
     flowFinished: boolean;
     entryId?: string;

src/dialogs/config-flow/show-dialog-options-flow.ts

@@ -1,6 +1,6 @@
 import { html } from "lit";
 import { ConfigEntry } from "../../data/config_entries";
-import { domainToName, IntegrationManifest } from "../../data/integration";
+import { domainToName } from "../../data/integration";
 import {
   createOptionsFlow,
   deleteOptionsFlow,
@@ -16,15 +16,12 @@ export const loadOptionsFlowDialog = loadDataEntryFlowDialog;
 
 export const showOptionsFlowDialog = (
   element: HTMLElement,
-  configEntry: ConfigEntry,
-  manifest?: IntegrationManifest | null
+  configEntry: ConfigEntry
 ): void =>
   showFlowDialog(
     element,
     {
       startFlowHandler: configEntry.entry_id,
-      domain: configEntry.domain,
-      manifest,
     },
     {
       loadDevicesAndAreas: false,
@@ -92,12 +89,6 @@ export const showOptionsFlowDialog = (
         );
       },
 
-      renderShowFormStepFieldHelper(hass, step, field) {
-        return hass.localize(
-          `component.${configEntry.domain}.options.step.${step.step_id}.data_description.${field.name}`
-        );
-      },
-
       renderShowFormStepFieldError(hass, step, error) {
         return hass.localize(
           `component.${configEntry.domain}.options.error.${error}`,

src/dialogs/config-flow/step-flow-form.ts

@@ -54,7 +54,6 @@ class StepFlowForm extends LitElement {
           .schema=${step.data_schema}
           .error=${step.errors}
           .computeLabel=${this._labelCallback}
-          .computeHelper=${this._helperCallback}
           .computeError=${this._errorCallback}
         ></ha-form>
       </div>
@@ -167,9 +166,6 @@ class StepFlowForm extends LitElement {
   private _labelCallback = (field: HaFormSchema): string =>
     this.flowConfig.renderShowFormStepFieldLabel(this.hass, this.step, field);
 
-  private _helperCallback = (field: HaFormSchema): string =>
-    this.flowConfig.renderShowFormStepFieldHelper(this.hass, this.step, field);
-
   private _errorCallback = (error: string) =>
     this.flowConfig.renderShowFormStepFieldError(this.hass, this.step, error);
 
@@ -190,10 +186,6 @@ class StepFlowForm extends LitElement {
           margin-top: 24px;
           display: block;
         }
-        h2 {
-          word-break: break-word;
-          padding-right: 72px;
-        }
       `,
     ];
   }

src/dialogs/config-flow/step-flow-pick-handler.ts

@@ -26,13 +26,11 @@ import { HomeAssistant } from "../../types";
 import { brandsUrl } from "../../util/brands-url";
 import { documentationUrl } from "../../util/documentation-url";
 import { configFlowContentStyles } from "./styles";
-import { FlowHandlers } from "./show-dialog-data-entry-flow";
 
 interface HandlerObj {
   name: string;
   slug: string;
   is_add?: boolean;
-  is_helper?: boolean;
 }
 
 declare global {
@@ -48,7 +46,7 @@ declare global {
 class StepFlowPickHandler extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public handlers!: FlowHandlers;
+  @property({ attribute: false }) public handlers!: string[];
 
   @property() public initialFilter?: string;
 
@@ -59,12 +57,8 @@ class StepFlowPickHandler extends LitElement {
   private _height?: number;
 
   private _filterHandlers = memoizeOne(
-    (
-      h: FlowHandlers,
-      filter?: string,
-      _localize?: LocalizeFunc
-    ): [HandlerObj[], HandlerObj[]] => {
-      const integrations: HandlerObj[] = h.integrations.map((handler) => ({
+    (h: string[], filter?: string, _localize?: LocalizeFunc) => {
+      const handlers: HandlerObj[] = h.map((handler) => ({
         name: domainToName(this.hass.localize, handler),
         slug: handler,
       }));
@@ -76,31 +70,17 @@ class StepFlowPickHandler extends LitElement {
           minMatchCharLength: 2,
           threshold: 0.2,
         };
-        const helpers: HandlerObj[] = h.helpers.map((handler) => ({
-          name: domainToName(this.hass.localize, handler),
-          slug: handler,
-          is_helper: true,
-        }));
-        return [
-          new Fuse(integrations, options)
-            .search(filter)
-            .map((result) => result.item),
-          new Fuse(helpers, options)
-            .search(filter)
-            .map((result) => result.item),
-        ];
+        const fuse = new Fuse(handlers, options);
+        return fuse.search(filter).map((result) => result.item);
       }
-      return [
-        integrations.sort((a, b) =>
-          caseInsensitiveStringCompare(a.name, b.name)
-        ),
-        [],
-      ];
+      return handlers.sort((a, b) =>
+        caseInsensitiveStringCompare(a.name, b.name)
+      );
     }
   );
 
   protected render(): TemplateResult {
-    const [integrations, helpers] = this._getHandlers();
+    const handlers = this._getHandlers();
 
     const addDeviceRows: HandlerObj[] = ["zha", "zwave_js"]
       .filter((domain) => isComponentLoaded(this.hass, domain))
@@ -135,8 +115,8 @@ class StepFlowPickHandler extends LitElement {
               <li divider padded class="divider" role="separator"></li>
             `
           : ""}
-        ${integrations.length
-          ? integrations.map((handler) => this._renderRow(handler))
+        ${handlers.length
+          ? handlers.map((handler) => this._renderRow(handler))
           : html`
               <p>
                 ${this.hass.localize(
@@ -159,12 +139,6 @@ class StepFlowPickHandler extends LitElement {
                 >.
               </p>
             `}
-        ${helpers.length
-          ? html`
-              <li divider padded class="divider" role="separator"></li>
-              ${helpers.map((handler) => this._renderRow(handler))}
-            `
-          : ""}
       </mwc-list>
     `;
   }
@@ -188,7 +162,7 @@ class StepFlowPickHandler extends LitElement {
           })}
           referrerpolicy="no-referrer"
         />
-        <span>${handler.name} ${handler.is_helper ? " (helper)" : ""}</span>
+        <span>${handler.name}</span>
         ${handler.is_add ? "" : html`<ha-icon-next slot="meta"></ha-icon-next>`}
       </mwc-list-item>
     `;
@@ -262,13 +236,6 @@ class StepFlowPickHandler extends LitElement {
       return;
     }
 
-    if (handler.is_helper) {
-      navigate(`/config/helpers/add?domain=${handler.slug}`);
-      // This closes dialog.
-      fireEvent(this, "flow-update");
-      return;
-    }
-
     fireEvent(this, "handler-picked", {
       handler: handler.slug,
     });
@@ -283,7 +250,7 @@ class StepFlowPickHandler extends LitElement {
 
     if (handlers.length > 0) {
       fireEvent(this, "handler-picked", {
-        handler: handlers[0][0].slug,
+        handler: handlers[0].slug,
       });
     }
   }

src/dialogs/more-info/controls/more-info-fan.js

@@ -35,7 +35,6 @@ class MoreInfoFan extends LocalizeMixin(EventsMixin(PolymerElement)) {
         .has-direction .container-direction,
         .has-oscillating .container-oscillating {
           display: block;
-          margin-top: 8px;
         }
 
         ha-select {

src/dialogs/more-info/controls/more-info-media_player.ts

@@ -23,7 +23,6 @@ import { showMediaBrowserDialog } from "../../../components/media-player/show-me
 import { UNAVAILABLE, UNKNOWN } from "../../../data/entity";
 import {
   computeMediaControls,
-  handleMediaControlClick,
   MediaPickedEvent,
   MediaPlayerEntity,
   SUPPORT_BROWSE_MEDIA,
@@ -48,7 +47,7 @@ class MoreInfoMediaPlayer extends LitElement {
     }
 
     const stateObj = this.stateObj;
-    const controls = computeMediaControls(stateObj, true);
+    const controls = computeMediaControls(stateObj);
 
     return html`
       <div class="controls">
@@ -96,13 +95,6 @@ class MoreInfoMediaPlayer extends LitElement {
                       .path=${stateObj.attributes.is_volume_muted
                         ? mdiVolumeOff
                         : mdiVolumeHigh}
-                      .label=${this.hass.localize(
-                        `ui.card.media_player.${
-                          stateObj.attributes.is_volume_muted
-                            ? "media_volume_unmute"
-                            : "media_volume_mute"
-                        }`
-                      )}
                       @click=${this._toggleMute}
                     ></ha-icon-button>
                   `
@@ -112,17 +104,11 @@ class MoreInfoMediaPlayer extends LitElement {
                     <ha-icon-button
                       action="volume_down"
                       .path=${mdiVolumeMinus}
-                      .label=${this.hass.localize(
-                        "ui.card.media_player.media_volume_down"
-                      )}
                       @click=${this._handleClick}
                     ></ha-icon-button>
                     <ha-icon-button
                       action="volume_up"
                       .path=${mdiVolumePlus}
-                      .label=${this.hass.localize(
-                        "ui.card.media_player.media_volume_up"
-                      )}
                       @click=${this._handleClick}
                     ></ha-icon-button>
                   `
@@ -216,7 +202,6 @@ class MoreInfoMediaPlayer extends LitElement {
       }
 
       .basic-controls {
-        display: inline-flex;
         flex-grow: 1;
       }
 
@@ -246,10 +231,12 @@ class MoreInfoMediaPlayer extends LitElement {
   }
 
   private _handleClick(e: MouseEvent): void {
-    handleMediaControlClick(
-      this.hass!,
-      this.stateObj!,
-      (e.currentTarget as HTMLElement).getAttribute("action")!
+    this.hass!.callService(
+      "media_player",
+      (e.currentTarget! as HTMLElement).getAttribute("action")!,
+      {
+        entity_id: this.stateObj!.entity_id,
+      }
     );
   }
 

src/dialogs/more-info/controls/more-info-timer.ts

@@ -46,7 +46,7 @@ class MoreInfoTimer extends LitElement {
       <ha-attributes
         .hass=${this.hass}
         .stateObj=${this.stateObj}
-        extra-filters="remaining,restore"
+        extra-filters="remaining"
       ></ha-attributes>
     `;
   }

src/dialogs/more-info/controls/more-info-update.ts

@@ -1,23 +1,18 @@
-import "../../../components/ha-alert";
-import "../../../components/ha-faded";
 import "@material/mwc-button/mwc-button";
 import "@material/mwc-linear-progress/mwc-linear-progress";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { supportsFeature } from "../../../common/entity/supports-feature";
 import "../../../components/ha-checkbox";
-import "../../../components/ha-circular-progress";
 import "../../../components/ha-formfield";
 import "../../../components/ha-markdown";
 import { UNAVAILABLE_STATES } from "../../../data/entity";
 import {
-  UpdateEntity,
   updateIsInstalling,
-  updateReleaseNotes,
+  UpdateEntity,
   UPDATE_SUPPORT_BACKUP,
   UPDATE_SUPPORT_INSTALL,
   UPDATE_SUPPORT_PROGRESS,
-  UPDATE_SUPPORT_RELEASE_NOTES,
   UPDATE_SUPPORT_SPECIFIC_VERSION,
 } from "../../../data/update";
 import type { HomeAssistant } from "../../../types";
@@ -28,10 +23,6 @@ class MoreInfoUpdate extends LitElement {
 
   @property({ attribute: false }) public stateObj?: UpdateEntity;
 
-  @state() private _releaseNotes?: string | null;
-
-  @state() private _error?: string;
-
   protected render(): TemplateResult {
     if (
       !this.hass ||
@@ -59,18 +50,15 @@ class MoreInfoUpdate extends LitElement {
       ${this.stateObj.attributes.title
         ? html`<h3>${this.stateObj.attributes.title}</h3>`
         : ""}
-      ${this._error
-        ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
-        : ""}
 
       <div class="row">
         <div class="key">
           ${this.hass.localize(
-            "ui.dialogs.more_info_control.update.installed_version"
+            "ui.dialogs.more_info_control.update.current_version"
           )}
         </div>
         <div class="value">
-          ${this.stateObj.attributes.installed_version ??
+          ${this.stateObj.attributes.current_version ??
           this.hass.localize("state.default.unavailable")}
         </div>
       </div>
@@ -101,19 +89,11 @@ class MoreInfoUpdate extends LitElement {
             </div>
           </div>`
         : ""}
-      ${supportsFeature(this.stateObj!, UPDATE_SUPPORT_RELEASE_NOTES) &&
-      !this._error
-        ? this._releaseNotes === undefined
-          ? html`<ha-circular-progress active></ha-circular-progress>`
-          : html`<hr />
-              <ha-faded>
-                <ha-markdown .content=${this._releaseNotes}></ha-markdown>
-              </ha-faded> `
-        : this.stateObj.attributes.release_summary
+      ${this.stateObj.attributes.release_summary
         ? html`<hr />
             <ha-markdown
               .content=${this.stateObj.attributes.release_summary}
-            ></ha-markdown>`
+            ></ha-markdown> `
         : ""}
       ${supportsFeature(this.stateObj, UPDATE_SUPPORT_BACKUP)
         ? html`<hr />
@@ -130,20 +110,14 @@ class MoreInfoUpdate extends LitElement {
         : ""}
       <hr />
       <div class="actions">
-        ${this.stateObj.attributes.auto_update
-          ? ""
-          : html`
-              <mwc-button
-                @click=${this._handleSkip}
-                .disabled=${skippedVersion ||
-                this.stateObj.state === "off" ||
-                updateIsInstalling(this.stateObj)}
-              >
-                ${this.hass.localize(
-                  "ui.dialogs.more_info_control.update.skip"
-                )}
-              </mwc-button>
-            `}
+        <mwc-button
+          @click=${this._handleSkip}
+          .disabled=${skippedVersion ||
+          this.stateObj.state === "off" ||
+          updateIsInstalling(this.stateObj)}
+        >
+          ${this.hass.localize("ui.dialogs.more_info_control.update.skip")}
+        </mwc-button>
         ${supportsFeature(this.stateObj, UPDATE_SUPPORT_INSTALL)
           ? html`
               <mwc-button
@@ -162,18 +136,6 @@ class MoreInfoUpdate extends LitElement {
     `;
   }
 
-  protected firstUpdated(): void {
-    if (supportsFeature(this.stateObj!, UPDATE_SUPPORT_RELEASE_NOTES)) {
-      updateReleaseNotes(this.hass, this.stateObj!.entity_id)
-        .then((result) => {
-          this._releaseNotes = result;
-        })
-        .catch((err) => {
-          this._error = err.message;
-        });
-    }
-  }
-
   get _shouldCreateBackup(): boolean | null {
     if (!supportsFeature(this.stateObj!, UPDATE_SUPPORT_BACKUP)) {
       return null;
@@ -239,14 +201,6 @@ class MoreInfoUpdate extends LitElement {
       a {
         color: var(--primary-color);
       }
-      ha-circular-progress {
-        width: 100%;
-        justify-content: center;
-      }
-      mwc-linear-progress {
-        margin-bottom: -10px;
-        margin-top: -10px;
-      }
     `;
   }
 }

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

@@ -132,12 +132,6 @@ export class HaTabsSubpageDataTable extends LitElement {
    */
   @property() public tabs!: PageNavigation[];
 
-  /**
-   * Force hides the filter menu.
-   * @type {Boolean}
-   */
-  @property({ type: Boolean }) public hideFilterMenu = false;
-
   @query("ha-data-table", true) private _dataTable!: HaDataTable;
 
   public clearSelection() {
@@ -201,24 +195,16 @@ export class HaTabsSubpageDataTable extends LitElement {
         .mainPage=${this.mainPage}
         .supervisor=${this.supervisor}
       >
-        ${!this.hideFilterMenu
-          ? html`
-              <div slot="toolbar-icon">
-                ${this.narrow
-                  ? html`
-                      <div class="filter-menu">
-                        ${this.numHidden || this.activeFilters
-                          ? html`<span class="badge"
-                              >${this.numHidden || "!"}</span
-                            >`
-                          : ""}
-                        <slot name="filter-menu"></slot>
-                      </div>
-                    `
-                  : ""}<slot name="toolbar-icon"></slot>
-              </div>
-            `
-          : ""}
+        <div slot="toolbar-icon">
+          ${this.narrow
+            ? html`<div class="filter-menu">
+                ${this.numHidden || this.activeFilters
+                  ? html`<span class="badge">${this.numHidden || "!"}</span>`
+                  : ""}
+                <slot name="filter-menu"></slot>
+              </div>`
+            : ""}<slot name="toolbar-icon"></slot>
+        </div>
         ${this.narrow
           ? html`
               <div slot="header">

src/panels/config/automation/action/types/ha-automation-action-choose.ts

@@ -165,9 +165,6 @@ export class HaChooseAction extends LitElement implements ActionElement {
           right: 0;
           padding: 4px;
         }
-        ha-form::part(root) {
-          overflow: visible;
-        }
       `,
     ];
   }

src/panels/config/automation/blueprint-automation-editor.ts

@@ -326,9 +326,12 @@ export class HaBlueprintAutomationEditor extends LitElement {
         }
         ha-settings-row {
           --paper-time-input-justify-content: flex-end;
-          --settings-row-content-width: 100%;
           border-top: 1px solid var(--divider-color);
         }
+        :host(:not([narrow])) ha-settings-row ha-textfield,
+        :host(:not([narrow])) ha-settings-row ha-selector {
+          width: 60%;
+        }
       `,
     ];
   }

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

@@ -442,9 +442,6 @@ export default class HaAutomationTriggerRow extends LitElement {
           z-index: 3;
           --mdc-theme-text-primary-on-background: var(--primary-text-color);
         }
-        .rtl .card-menu {
-          float: left;
-        }
         .triggered {
           cursor: pointer;
           position: absolute;
@@ -473,6 +470,9 @@ export default class HaAutomationTriggerRow extends LitElement {
           background-color: var(--accent-color);
           color: var(--text-accent-color, var(--text-primary-color));
         }
+        .rtl .card-menu {
+          float: left;
+        }
         mwc-list-item[disabled] {
           --mdc-theme-text-primary-on-background: var(--disabled-text-color);
         }

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

@@ -1,224 +0,0 @@
-import { mdiDelete, mdiDownload, mdiPlus } from "@mdi/js";
-import "@polymer/paper-tooltip/paper-tooltip";
-import {
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  PropertyValues,
-  TemplateResult,
-} from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoize from "memoize-one";
-import { relativeTime } from "../../../common/datetime/relative_time";
-import { DataTableColumnContainer } from "../../../components/data-table/ha-data-table";
-import "../../../components/ha-circular-progress";
-import "../../../components/ha-fab";
-import "../../../components/ha-icon";
-import "../../../components/ha-icon-overflow-menu";
-import "../../../components/ha-svg-icon";
-import { getSignedPath } from "../../../data/auth";
-import {
-  BackupContent,
-  BackupData,
-  fetchBackupInfo,
-  generateBackup,
-  getBackupDownloadUrl,
-  removeBackup,
-} from "../../../data/backup";
-import {
-  showAlertDialog,
-  showConfirmationDialog,
-} from "../../../dialogs/generic/show-dialog-box";
-import "../../../layouts/hass-loading-screen";
-import "../../../layouts/hass-tabs-subpage-data-table";
-import { HomeAssistant, Route } from "../../../types";
-import { fileDownload } from "../../../util/file_download";
-import { configSections } from "../ha-panel-config";
-
-@customElement("ha-config-backup")
-class HaConfigBackup extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ type: Boolean }) public isWide!: boolean;
-
-  @property({ type: Boolean }) public narrow!: boolean;
-
-  @property({ attribute: false }) public route!: Route;
-
-  @state() private _backupData?: BackupData;
-
-  private _columns = memoize(
-    (narrow, _language): DataTableColumnContainer => ({
-      name: {
-        title: this.hass.localize("ui.panel.config.backup.name"),
-        sortable: true,
-        filterable: true,
-        grows: true,
-        template: (entry: string, backup: BackupContent) =>
-          html`${entry}
-            <div class="secondary">${backup.path}</div>`,
-      },
-      size: {
-        title: this.hass.localize("ui.panel.config.backup.size"),
-        width: "15%",
-        hidden: narrow,
-        filterable: true,
-        sortable: true,
-        template: (entry: number) => Math.ceil(entry * 10) / 10 + " MB",
-      },
-      date: {
-        title: this.hass.localize("ui.panel.config.backup.created"),
-        width: "15%",
-        direction: "desc",
-        hidden: narrow,
-        filterable: true,
-        sortable: true,
-        template: (entry: string) =>
-          relativeTime(new Date(entry), this.hass.locale),
-      },
-
-      actions: {
-        title: "",
-        width: "15%",
-        template: (_: string, backup: BackupContent) =>
-          html`<ha-icon-overflow-menu
-            .hass=${this.hass}
-            .narrow=${this.narrow}
-            .items=${[
-              // Download Button
-              {
-                path: mdiDownload,
-                label: this.hass.localize(
-                  "ui.panel.config.backup.download_backup"
-                ),
-                action: () => this._downloadBackup(backup),
-              },
-              // Delete button
-              {
-                path: mdiDelete,
-                label: this.hass.localize(
-                  "ui.panel.config.backup.remove_backup"
-                ),
-                action: () => this._removeBackup(backup),
-              },
-            ]}
-            style="color: var(--secondary-text-color)"
-          >
-          </ha-icon-overflow-menu>`,
-      },
-    })
-  );
-
-  private _getItems = memoize((backupItems: BackupContent[]) =>
-    backupItems.map((backup) => ({
-      name: backup.name,
-      slug: backup.slug,
-      date: backup.date,
-      size: backup.size,
-      path: backup.path,
-    }))
-  );
-
-  protected render(): TemplateResult {
-    if (!this.hass || this._backupData === undefined) {
-      return html`<hass-loading-screen></hass-loading-screen>`;
-    }
-
-    return html`
-      <hass-tabs-subpage-data-table
-        .hass=${this.hass}
-        .narrow=${this.narrow}
-        back-path="/config"
-        .route=${this.route}
-        .tabs=${configSections.backup}
-        .columns=${this._columns(this.narrow, this.hass.language)}
-        .data=${this._getItems(this._backupData.backups)}
-        .noDataText=${this.hass.localize("ui.panel.config.backup.no_bakcups")}
-      >
-        <ha-fab
-          slot="fab"
-          ?disabled=${this._backupData.backing_up}
-          .label=${this._backupData.backing_up
-            ? this.hass.localize("ui.panel.config.backup.creating_backup")
-            : this.hass.localize("ui.panel.config.backup.create_backup")}
-          extended
-          @click=${this._generateBackup}
-        >
-          ${this._backupData.backing_up
-            ? html`<ha-circular-progress
-                slot="icon"
-                active
-              ></ha-circular-progress>`
-            : html`<ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>`}
-        </ha-fab>
-      </hass-tabs-subpage-data-table>
-    `;
-  }
-
-  protected firstUpdated(changedProps: PropertyValues) {
-    super.firstUpdated(changedProps);
-    this._getBackups();
-  }
-
-  private async _getBackups(): Promise<void> {
-    this._backupData = await fetchBackupInfo(this.hass);
-  }
-
-  private async _downloadBackup(backup: BackupContent): Promise<void> {
-    const signedUrl = await getSignedPath(
-      this.hass,
-      getBackupDownloadUrl(backup.slug)
-    );
-    fileDownload(signedUrl.path);
-  }
-
-  private async _generateBackup(): Promise<void> {
-    const confirm = await showConfirmationDialog(this, {
-      title: this.hass.localize("ui.panel.config.backup.create.title"),
-      text: this.hass.localize("ui.panel.config.backup.create.description"),
-      confirmText: this.hass.localize("ui.panel.config.backup.create.confirm"),
-    });
-    if (!confirm) {
-      return;
-    }
-
-    generateBackup(this.hass)
-      .then(() => this._getBackups())
-      .catch((err) => showAlertDialog(this, { text: (err as Error).message }));
-
-    await this._getBackups();
-  }
-
-  private async _removeBackup(backup: BackupContent): Promise<void> {
-    const confirm = await showConfirmationDialog(this, {
-      title: this.hass.localize("ui.panel.config.backup.remove.title"),
-      text: this.hass.localize("ui.panel.config.backup.remove.description", {
-        name: backup.name,
-      }),
-      confirmText: this.hass.localize("ui.panel.config.backup.remove.confirm"),
-    });
-    if (!confirm) {
-      return;
-    }
-
-    await removeBackup(this.hass, backup.slug);
-    await this._getBackups();
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      css`
-        ha-fab[disabled] {
-          --mdc-theme-secondary: var(--disabled-text-color) !important;
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-config-backup": HaConfigBackup;
-  }
-}

src/panels/config/core/ha-config-url-form.ts

@@ -246,8 +246,8 @@ class ConfigUrlForm extends LitElement {
 
     if (isComponentLoaded(this.hass, "cloud")) {
       fetchCloudStatus(this.hass).then((cloudStatus) => {
-        this._cloudStatus = cloudStatus;
         if (cloudStatus.logged_in) {
+          this._cloudStatus = cloudStatus;
           this._showCustomExternalUrl = this._externalUrlValue !== null;
         }
       });

src/panels/config/devices/device-detail/ha-device-entities-card.ts

@@ -75,7 +75,7 @@ export class HaDeviceEntitiesCard extends LitElement {
     this._entityRows = [];
 
     this.entities.forEach((entry) => {
-      if (entry.disabled_by) {
+      if (entry.disabled_by || entry.hidden_by) {
         if (this._extDisabledEntityEntries) {
           hiddenEntities.push(
             this._extDisabledEntityEntries[entry.entity_id] || entry
@@ -167,11 +167,7 @@ export class HaDeviceEntitiesCard extends LitElement {
         computeStateName(stateObj),
         this.deviceName.toLowerCase()
       );
-      if (entry.hidden_by) {
-        config.name = `${
-          name || computeStateName(stateObj)
-        } (${this.hass.localize("ui.panel.config.devices.entities.hidden")})`;
-      } else if (name) {
+      if (name) {
         config.name = name;
       }
     }

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

@@ -1,5 +1,6 @@
-import "@material/mwc-button/mwc-button";
 import "@material/mwc-formfield/mwc-formfield";
+import "../../../components/ha-radio";
+import "@material/mwc-button/mwc-button";
 import "@material/mwc-list/mwc-list-item";
 import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import {
@@ -11,31 +12,17 @@ import {
   TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { stopPropagation } from "../../../common/dom/stop_propagation";
 import { computeDomain } from "../../../common/entity/compute_domain";
 import { domainIcon } from "../../../common/entity/domain_icon";
-import { stringCompare } from "../../../common/string/compare";
-import { LocalizeFunc } from "../../../common/translations/localize";
 import "../../../components/ha-alert";
 import "../../../components/ha-area-picker";
 import "../../../components/ha-expansion-panel";
 import "../../../components/ha-icon-picker";
-import "../../../components/ha-radio";
 import "../../../components/ha-select";
 import "../../../components/ha-switch";
 import "../../../components/ha-textfield";
-import {
-  ConfigEntry,
-  deleteConfigEntry,
-  getConfigEntries,
-} from "../../../data/config_entries";
-import {
-  createConfigFlow,
-  handleConfigFlowStep,
-} from "../../../data/config_flow";
-import { DataEntryFlowStepCreateEntry } from "../../../data/data_entry_flow";
 import {
   DeviceRegistryEntry,
   subscribeDeviceRegistry,
@@ -44,12 +31,9 @@ import {
 import {
   EntityRegistryEntryUpdateParams,
   ExtEntityRegistryEntry,
-  fetchEntityRegistry,
   removeEntityRegistryEntry,
   updateEntityRegistryEntry,
 } from "../../../data/entity_registry";
-import { domainToName } from "../../../data/integration";
-import { showOptionsFlowDialog } from "../../../dialogs/config-flow/show-dialog-options-flow";
 import {
   showAlertDialog,
   showConfirmationDialog,
@@ -58,49 +42,29 @@ import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import { haStyle } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
 import { showDeviceRegistryDetailDialog } from "../devices/device-registry-detail/show-dialog-device-registry-detail";
-import { showEntityEditorDialog } from "./show-dialog-entity-editor";
+import {
+  ConfigEntry,
+  deleteConfigEntry,
+  getConfigEntries,
+} from "../../../data/config_entries";
+import { showOptionsFlowDialog } from "../../../dialogs/config-flow/show-dialog-options-flow";
 
 const OVERRIDE_DEVICE_CLASSES = {
   cover: [
-    [
-      "awning",
-      "blind",
-      "curtain",
-      "damper",
-      "door",
-      "garage",
-      "gate",
-      "shade",
-      "shutter",
-      "window",
-    ],
-  ],
-  binary_sensor: [
-    ["lock"], // Lock
-    ["window", "door", "garage_door", "opening"], // Door
-    ["battery", "battery_charging"], // Battery
-    ["cold", "gas", "heat"], // Climate
-    ["running", "motion", "moving", "occupancy", "presence", "vibration"], // Presence
-    ["power", "plug", "light"], // Power
-    [
-      "smoke",
-      "safety",
-      "sound",
-      "problem",
-      "tamper",
-      "carbon_monoxide",
-      "moisture",
-    ], // Alarm
+    "awning",
+    "blind",
+    "curtain",
+    "damper",
+    "door",
+    "garage",
+    "gate",
+    "shade",
+    "shutter",
+    "window",
   ],
+  binary_sensor: ["window", "door", "garage_door", "opening"],
 };
 
-const OVERRIDE_SENSOR_UNITS = {
-  temperature: ["°C", "°F", "K"],
-  pressure: ["hPa", "Pa", "kPa", "bar", "cbar", "mbar", "mmHg", "inHg", "psi"],
-};
-
-const SWITCH_AS_DOMAINS = ["cover", "fan", "light", "lock", "siren"];
-
 @customElement("entity-registry-settings")
 export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -115,30 +79,24 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
 
   @state() private _deviceClass?: string;
 
-  @state() private _switchAs = "switch";
-
   @state() private _areaId?: string | null;
 
   @state() private _disabledBy!: string | null;
 
   @state() private _hiddenBy!: string | null;
 
+  private _deviceLookup?: Record<string, DeviceRegistryEntry>;
+
   @state() private _device?: DeviceRegistryEntry;
 
   @state() private _helperConfigEntry?: ConfigEntry;
 
-  @state() private _unit_of_measurement?: string | null;
-
   @state() private _error?: string;
 
   @state() private _submitting?: boolean;
 
   private _origEntityId!: string;
 
-  private _deviceLookup?: Record<string, DeviceRegistryEntry>;
-
-  private _deviceClassOptions?: string[][];
-
   public hassSubscribe(): UnsubscribeFunc[] {
     return [
       subscribeDeviceRegistry(this.hass.connection!, (devices) => {
@@ -167,48 +125,23 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
     }
   }
 
-  protected willUpdate(changedProperties: PropertyValues) {
-    super.willUpdate(changedProperties);
-    if (!changedProperties.has("entry")) {
-      return;
-    }
-
-    this._error = undefined;
-    this._name = this.entry.name || "";
-    this._icon = this.entry.icon || "";
-    this._deviceClass =
-      this.entry.device_class || this.entry.original_device_class;
-    this._origEntityId = this.entry.entity_id;
-    this._areaId = this.entry.area_id;
-    this._entityId = this.entry.entity_id;
-    this._disabledBy = this.entry.disabled_by;
-    this._hiddenBy = this.entry.hidden_by;
-    this._device =
-      this.entry.device_id && this._deviceLookup
-        ? this._deviceLookup[this.entry.device_id]
-        : undefined;
-
-    const domain = computeDomain(this.entry.entity_id);
-
-    if (domain === "sensor") {
-      const stateObj: HassEntity | undefined =
-        this.hass.states[this.entry.entity_id];
-      this._unit_of_measurement = stateObj?.attributes?.unit_of_measurement;
-    }
-
-    const deviceClasses: string[][] = OVERRIDE_DEVICE_CLASSES[domain];
-
-    if (!deviceClasses) {
-      return;
-    }
-
-    this._deviceClassOptions = [[], []];
-    for (const deviceClass of deviceClasses) {
-      if (deviceClass.includes(this.entry.original_device_class!)) {
-        this._deviceClassOptions[0] = deviceClass;
-      } else {
-        this._deviceClassOptions[1].push(...deviceClass);
-      }
+  protected updated(changedProperties: PropertyValues) {
+    super.updated(changedProperties);
+    if (changedProperties.has("entry")) {
+      this._error = undefined;
+      this._name = this.entry.name || "";
+      this._icon = this.entry.icon || "";
+      this._deviceClass =
+        this.entry.device_class || this.entry.original_device_class;
+      this._origEntityId = this.entry.entity_id;
+      this._areaId = this.entry.area_id;
+      this._entityId = this.entry.entity_id;
+      this._disabledBy = this.entry.disabled_by;
+      this._hiddenBy = this.entry.hidden_by;
+      this._device =
+        this.entry.device_id && this._deviceLookup
+          ? this._deviceLookup[this.entry.device_id]
+          : undefined;
     }
   }
 
@@ -264,92 +197,24 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
             : undefined}
           .disabled=${this._submitting}
         ></ha-icon-picker>
-        ${this._deviceClassOptions
-          ? html`
-              <ha-select
-                .label=${this.hass.localize(
-                  "ui.dialogs.entity_registry.editor.device_class"
-                )}
-                .value=${this._deviceClass}
-                naturalMenuWidth
-                fixedMenuPosition
-                @selected=${this._deviceClassChanged}
-                @closed=${stopPropagation}
-              >
-                ${this._deviceClassesSorted(
-                  domain,
-                  this._deviceClassOptions[0],
-                  this.hass.localize
-                ).map(
-                  (entry) => html`
-                    <mwc-list-item .value=${entry.deviceClass}>
-                      ${entry.label}
-                    </mwc-list-item>
-                  `
-                )}
-                ${this._deviceClassOptions[0].length &&
-                this._deviceClassOptions[1].length
-                  ? html`<li divider role="separator"></li>`
-                  : ""}
-                ${this._deviceClassesSorted(
-                  domain,
-                  this._deviceClassOptions[1],
-                  this.hass.localize
-                ).map(
-                  (entry) => html`
-                    <mwc-list-item .value=${entry.deviceClass}>
-                      ${entry.label}
-                    </mwc-list-item>
-                  `
-                )}
-              </ha-select>
-            `
-          : ""}
-        ${this._deviceClass &&
-        stateObj?.attributes.unit_of_measurement &&
-        OVERRIDE_SENSOR_UNITS[this._deviceClass]?.includes(
-          stateObj?.attributes.unit_of_measurement
-        )
-          ? html`
-              <ha-select
-                .label=${this.hass.localize(
-                  "ui.dialogs.entity_registry.editor.unit_of_measurement"
-                )}
-                .value=${stateObj.attributes.unit_of_measurement}
-                naturalMenuWidth
-                fixedMenuPosition
-                @selected=${this._unitChanged}
-                @closed=${stopPropagation}
-              >
-                ${OVERRIDE_SENSOR_UNITS[this._deviceClass].map(
-                  (unit: string) => html`
-                    <mwc-list-item .value=${unit}>${unit}</mwc-list-item>
-                  `
-                )}
-              </ha-select>
-            `
-          : ""}
-        ${domain === "switch"
+        ${OVERRIDE_DEVICE_CLASSES[domain]?.includes(this._deviceClass) ||
+        (domain === "cover" && this.entry.original_device_class === null)
           ? html`<ha-select
               .label=${this.hass.localize(
                 "ui.dialogs.entity_registry.editor.device_class"
               )}
+              .value=${this._deviceClass}
               naturalMenuWidth
               fixedMenuPosition
-              @selected=${this._switchAsChanged}
+              @selected=${this._deviceClassChanged}
               @closed=${stopPropagation}
             >
-              <mwc-list-item value="switch" selected>
-                ${domainToName(this.hass.localize, "switch")}</mwc-list-item
-              >
-              <li divider role="separator"></li>
-              ${this._switchAsDomainsSorted(
-                SWITCH_AS_DOMAINS,
-                this.hass.localize
-              ).map(
-                (entry) => html`
-                  <mwc-list-item .value=${entry.domain}>
-                    ${entry.label}
+              ${OVERRIDE_DEVICE_CLASSES[domain].map(
+                (deviceClass: string) => html`
+                  <mwc-list-item .value=${deviceClass}>
+                    ${this.hass.localize(
+                      `ui.dialogs.entity_registry.editor.device_classes.${domain}.${deviceClass}`
+                    )}
                   </mwc-list-item>
                 `
               )}
@@ -399,9 +264,7 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
             )}:
           </div>
           <div class="secondary">
-            ${this._disabledBy &&
-            this._disabledBy !== "user" &&
-            this._disabledBy !== "integration"
+            ${this._disabledBy && this._disabledBy !== "user"
               ? this.hass.localize(
                   "ui.dialogs.entity_registry.editor.enabled_cause",
                   "cause",
@@ -423,9 +286,7 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
                 .checked=${!this._hiddenBy && !this._disabledBy}
                 .disabled=${(this._hiddenBy && this._hiddenBy !== "user") ||
                 this._device?.disabled_by ||
-                (this._disabledBy &&
-                  this._disabledBy !== "user" &&
-                  this._disabledBy !== "integration")}
+                (this._disabledBy && this._disabledBy !== "user")}
                 @change=${this._viewStatusChanged}
               ></ha-radio>
             </mwc-formfield>
@@ -440,9 +301,7 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
                 .checked=${this._hiddenBy !== null}
                 .disabled=${(this._hiddenBy && this._hiddenBy !== "user") ||
                 Boolean(this._device?.disabled_by) ||
-                (this._disabledBy &&
-                  this._disabledBy !== "user" &&
-                  this._disabledBy !== "integration")}
+                (this._disabledBy && this._disabledBy !== "user")}
                 @change=${this._viewStatusChanged}
               ></ha-radio>
             </mwc-formfield>
@@ -457,9 +316,7 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
                 .checked=${this._disabledBy !== null}
                 .disabled=${(this._hiddenBy && this._hiddenBy !== "user") ||
                 Boolean(this._device?.disabled_by) ||
-                (this._disabledBy &&
-                  this._disabledBy !== "user" &&
-                  this._disabledBy !== "integration")}
+                (this._disabledBy && this._disabledBy !== "user")}
                 @change=${this._viewStatusChanged}
               ></ha-radio>
             </mwc-formfield>
@@ -521,7 +378,7 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
           class="warning"
           @click=${this._confirmDeleteEntry}
           .disabled=${this._submitting ||
-          (!this._helperConfigEntry && !stateObj?.attributes.restored)}
+          (!this._helperConfigEntry && !stateObj.attributes.restored)}
         >
           ${this.hass.localize("ui.dialogs.entity_registry.editor.delete")}
         </mwc-button>
@@ -555,18 +412,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
     this._deviceClass = ev.target.value;
   }
 
-  private _unitChanged(ev): void {
-    this._error = undefined;
-    this._unit_of_measurement = ev.target.value;
-  }
-
-  private _switchAsChanged(ev): void {
-    if (ev.target.value === "") {
-      return;
-    }
-    this._switchAs = ev.target.value;
-  }
-
   private _areaPicked(ev: CustomEvent) {
     this._error = undefined;
     this._areaId = ev.detail.value;
@@ -600,9 +445,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
 
   private async _updateEntry(): Promise<void> {
     this._submitting = true;
-
-    const parent = (this.getRootNode() as ShadowRoot).host as HTMLElement;
-
     const params: Partial<EntityRegistryEntryUpdateParams> = {
       name: this._name.trim() || null,
       icon: this._icon.trim() || null,
@@ -610,11 +452,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
       device_class: this._deviceClass || null,
       new_entity_id: this._entityId.trim(),
     };
-
-    const stateObj: HassEntity | undefined =
-      this.hass.states[this.entry.entity_id];
-    const domain = computeDomain(this.entry.entity_id);
-
     if (
       this.entry.disabled_by !== this._disabledBy &&
       (this._disabledBy === null || this._disabledBy === "user")
@@ -627,13 +464,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
     ) {
       params.hidden_by = this._hiddenBy;
     }
-    if (
-      domain === "sensor" &&
-      stateObj?.attributes?.unit_of_measurement !== this._unit_of_measurement
-    ) {
-      params.options_domain = "sensor";
-      params.options = { unit_of_measurement: this._unit_of_measurement };
-    }
     try {
       const result = await updateEntityRegistryEntry(
         this.hass!,
@@ -662,46 +492,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
     } finally {
       this._submitting = false;
     }
-
-    if (this._switchAs !== "switch") {
-      if (
-        !(await showConfirmationDialog(this, {
-          text: this.hass!.localize(
-            "ui.dialogs.entity_registry.editor.switch_as_x_confirm",
-            "domain",
-            this._switchAs
-          ),
-        }))
-      ) {
-        return;
-      }
-      const configFlow = await createConfigFlow(this.hass, "switch_as_x");
-      const result = (await handleConfigFlowStep(
-        this.hass,
-        configFlow.flow_id,
-        {
-          entity_id: this._entityId.trim(),
-          target_domain: this._switchAs,
-        }
-      )) as DataEntryFlowStepCreateEntry;
-      if (!result.result?.entry_id) {
-        return;
-      }
-      const unsub = await this.hass.connection.subscribeEvents(() => {
-        unsub();
-        fetchEntityRegistry(this.hass.connection).then((entityRegistry) => {
-          const entity = entityRegistry.find(
-            (reg) => reg.config_entry_id === result.result!.entry_id
-          );
-          if (!entity) {
-            return;
-          }
-          showEntityEditorDialog(parent, {
-            entity_id: entity.entity_id,
-          });
-        });
-      }, "entity_registry_updated");
-    }
   }
 
   private async _confirmDeleteEntry(): Promise<void> {
@@ -730,31 +520,9 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
   }
 
   private async _showOptionsFlow() {
-    showOptionsFlowDialog(this, this._helperConfigEntry!, null);
+    showOptionsFlowDialog(this, this._helperConfigEntry!);
   }
 
-  private _switchAsDomainsSorted = memoizeOne(
-    (domains: string[], localize: LocalizeFunc) =>
-      domains
-        .map((entry) => ({
-          domain: entry,
-          label: domainToName(localize, entry),
-        }))
-        .sort((a, b) => stringCompare(a.label, b.label))
-  );
-
-  private _deviceClassesSorted = memoizeOne(
-    (domain: string, deviceClasses: string[], localize: LocalizeFunc) =>
-      deviceClasses
-        .map((entry) => ({
-          deviceClass: entry,
-          label: localize(
-            `ui.dialogs.entity_registry.editor.device_classes.${domain}.${entry}`
-          ),
-        }))
-        .sort((a, b) => stringCompare(a.label, b.label))
-  );
-
   static get styles(): CSSResultGroup {
     return [
       haStyle,
@@ -809,9 +577,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
           margin: 8px 0;
           width: 340px;
         }
-        li[divider] {
-          border-bottom-color: var(--divider-color);
-        }
       `,
     ];
   }