20221003.0 (#13979)

* Add icon to device class duration

* Change to mdiProgressClock

.github/workflows/demo.yaml

@@ -27,9 +27,7 @@ jobs:
       - name: Build Demo
         run: ./node_modules/.bin/gulp build-demo
       - name: Deploy to Netlify
-        uses: netlify/actions/cli@master
+        run: npx netlify-cli deploy --dir=demo/dist --prod
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEMO_DEV_SITE_ID }}
-        with:
-          args: deploy --dir=demo/dist --prod

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 90 days stale policy
-        uses: actions/stale@v5.1.1
+        uses: actions/stale@v6.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 90

demo/src/ha-demo.ts

@@ -61,12 +61,14 @@ class HaDemo extends HomeAssistantAppEl {
         area_id: null,
         disabled_by: null,
         entity_id: "sensor.co2_intensity",
+        id: "sensor.co2_intensity",
         name: null,
         icon: null,
         platform: "co2signal",
         hidden_by: null,
         entity_category: null,
         has_entity_name: false,
+        unique_id: "co2_intensity",
       },
       {
         config_entry_id: "co2signal",
@@ -74,12 +76,14 @@ class HaDemo extends HomeAssistantAppEl {
         area_id: null,
         disabled_by: null,
         entity_id: "sensor.grid_fossil_fuel_percentage",
+        id: "sensor.co2_intensity",
         name: null,
         icon: null,
         platform: "co2signal",
         hidden_by: null,
         entity_category: null,
         has_entity_name: false,
+        unique_id: "grid_fossil_fuel_percentage",
       },
     ]);
 

demo/src/stubs/energy.ts

@@ -11,14 +11,12 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
           {
             stat_energy_from: "sensor.energy_consumption_tarif_1",
             stat_cost: "sensor.energy_consumption_tarif_1_cost",
-            entity_energy_from: "sensor.energy_consumption_tarif_1",
             entity_energy_price: null,
             number_energy_price: null,
           },
           {
             stat_energy_from: "sensor.energy_consumption_tarif_2",
             stat_cost: "sensor.energy_consumption_tarif_2_cost",
-            entity_energy_from: "sensor.energy_consumption_tarif_2",
             entity_energy_price: null,
             number_energy_price: null,
           },
@@ -27,14 +25,12 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
           {
             stat_energy_to: "sensor.energy_production_tarif_1",
             stat_compensation: "sensor.energy_production_tarif_1_compensation",
-            entity_energy_to: "sensor.energy_production_tarif_1",
             entity_energy_price: null,
             number_energy_price: null,
           },
           {
             stat_energy_to: "sensor.energy_production_tarif_2",
             stat_compensation: "sensor.energy_production_tarif_2_compensation",
-            entity_energy_to: "sensor.energy_production_tarif_2",
             entity_energy_price: null,
             number_energy_price: null,
           },
@@ -55,7 +51,6 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
         type: "gas",
         stat_energy_from: "sensor.energy_gas",
         stat_cost: "sensor.energy_gas_cost",
-        entity_energy_from: "sensor.energy_gas",
         entity_energy_price: null,
         number_energy_price: null,
       },

demo/src/stubs/history.ts

@@ -6,7 +6,7 @@ import {
   endOfDay,
 } from "date-fns/esm";
 import { HassEntity } from "home-assistant-js-websocket";
-import { StatisticValue } from "../../../src/data/history";
+import { StatisticValue } from "../../../src/data/recorder";
 import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 interface HistoryQueryParams {

gallery/src/pages/Text/remove-delete-add-create.markdown

@@ -0,0 +1,56 @@
+---
+title: When to use remove, delete, add and create
+subtitle: The difference between remove/delete and add/create.
+---
+
+# Remove vs Delete
+Remove and Delete are quite similar, but can be frustrating if used inconsistently.
+
+## Remove
+Take away and set aside, but kept in existence.
+
+For example:
+* Removing a user's permission
+* Removing a user from a group
+* Removing links between items
+* Removing a widget
+* Removing a link
+* Removing an item from a cart
+
+## Delete
+Erase, rendered nonexistent or nonrecoverable.
+
+For example:
+* Deleting a field
+* Deleting a value in a field
+* Deleting a task
+* Deleting a group
+* Deleting a permission
+* Deleting a calendar event
+
+# Add vs Create
+In most cases, Create can be paired with Delete, and Add can be paired with Remove.
+
+## Add
+An already-exisiting item.
+
+For example:
+* Adding a permission to a user
+* Adding a user to a group
+* Adding links between items
+* Adding a widget
+* Adding a link
+* Adding an item to a cart
+
+## Create
+Something made from scratch.
+
+For example:
+* Creating a new field
+* Creating a new value in a field
+* Creating a new task
+* Creating a new group
+* Creating a new permission
+* Creating a new calendar event
+
+Based on this is [UX magazine article](https://uxmag.com/articles/ui-copy-remove-vs-delete2-banner).

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

@@ -36,6 +36,7 @@ const conditions = [
   { condition: "sun", after: "sunset" },
   { condition: "sun", after: "sunrise", offset: "-01:00" },
   { condition: "zone", entity_id: "device_tracker.person", zone: "zone.home" },
+  { condition: "trigger", id: "motion" },
   { condition: "time" },
   { condition: "template" },
 ];

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

@@ -1,5 +1,5 @@
 /* eslint-disable lit/no-template-arrow */
-import { LitElement, TemplateResult, html } from "lit";
+import { LitElement, TemplateResult, html, css } from "lit";
 import { customElement, state } from "lit/decorators";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import type { HomeAssistant } from "../../../../src/types";
@@ -47,6 +47,8 @@ const SCHEMAS: { name: string; actions: Action[] }[] = [
 class DemoHaAutomationEditorAction extends LitElement {
   @state() private hass!: HomeAssistant;
 
+  @state() private _disabled = false;
+
   private data: any = SCHEMAS.map((info) => info.actions);
 
   constructor() {
@@ -67,6 +69,15 @@ class DemoHaAutomationEditorAction extends LitElement {
       this.requestUpdate();
     };
     return html`
+      <div class="options">
+        <ha-formfield label="Disabled">
+          <ha-switch
+            .name=${"disabled"}
+            .checked=${this._disabled}
+            @change=${this._handleOptionChange}
+          ></ha-switch>
+        </ha-formfield>
+      </div>
       ${SCHEMAS.map(
         (info, sampleIdx) => html`
           <demo-black-white-row
@@ -81,6 +92,7 @@ class DemoHaAutomationEditorAction extends LitElement {
                     .hass=${this.hass}
                     .actions=${this.data[sampleIdx]}
                     .sampleIdx=${sampleIdx}
+                    .disabled=${this._disabled}
                     @value-changed=${valueChanged}
                   ></ha-automation-action>
                 `
@@ -90,6 +102,20 @@ class DemoHaAutomationEditorAction extends LitElement {
       )}
     `;
   }
+
+  private _handleOptionChange(ev) {
+    this[`_${ev.target.name}`] = ev.target.checked;
+  }
+
+  static styles = css`
+    .options {
+      max-width: 800px;
+      margin: 16px auto;
+    }
+    .options ha-formfield {
+      margin-right: 16px;
+    }
+  `;
 }
 
 declare global {

gallery/src/pages/automation/editor-condition.ts

@@ -1,5 +1,5 @@
 /* eslint-disable lit/no-template-arrow */
-import { LitElement, TemplateResult, html } from "lit";
+import { LitElement, TemplateResult, html, css } from "lit";
 import { customElement, state } from "lit/decorators";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import type { HomeAssistant } from "../../../../src/types";
@@ -83,6 +83,8 @@ const SCHEMAS: { name: string; conditions: ConditionWithShorthand[] }[] = [
 class DemoHaAutomationEditorCondition extends LitElement {
   @state() private hass!: HomeAssistant;
 
+  @state() private _disabled = false;
+
   private data: any = SCHEMAS.map((info) => info.conditions);
 
   constructor() {
@@ -103,6 +105,15 @@ class DemoHaAutomationEditorCondition extends LitElement {
       this.requestUpdate();
     };
     return html`
+      <div class="options">
+        <ha-formfield label="Disabled">
+          <ha-switch
+            .name=${"disabled"}
+            .checked=${this._disabled}
+            @change=${this._handleOptionChange}
+          ></ha-switch>
+        </ha-formfield>
+      </div>
       ${SCHEMAS.map(
         (info, sampleIdx) => html`
           <demo-black-white-row
@@ -117,6 +128,7 @@ class DemoHaAutomationEditorCondition extends LitElement {
                     .hass=${this.hass}
                     .conditions=${this.data[sampleIdx]}
                     .sampleIdx=${sampleIdx}
+                    .disabled=${this._disabled}
                     @value-changed=${valueChanged}
                   ></ha-automation-condition>
                 `
@@ -126,6 +138,20 @@ class DemoHaAutomationEditorCondition extends LitElement {
       )}
     `;
   }
+
+  private _handleOptionChange(ev) {
+    this[`_${ev.target.name}`] = ev.target.checked;
+  }
+
+  static styles = css`
+    .options {
+      max-width: 800px;
+      margin: 16px auto;
+    }
+    .options ha-formfield {
+      margin-right: 16px;
+    }
+  `;
 }
 
 declare global {

gallery/src/pages/automation/editor-trigger.ts

@@ -1,5 +1,5 @@
 /* eslint-disable lit/no-template-arrow */
-import { LitElement, TemplateResult, html } from "lit";
+import { LitElement, TemplateResult, html, css } from "lit";
 import { customElement, state } from "lit/decorators";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import type { HomeAssistant } from "../../../../src/types";
@@ -107,6 +107,8 @@ const SCHEMAS: { name: string; triggers: Trigger[] }[] = [
 class DemoHaAutomationEditorTrigger extends LitElement {
   @state() private hass!: HomeAssistant;
 
+  @state() private _disabled = false;
+
   private data: any = SCHEMAS.map((info) => info.triggers);
 
   constructor() {
@@ -127,6 +129,15 @@ class DemoHaAutomationEditorTrigger extends LitElement {
       this.requestUpdate();
     };
     return html`
+      <div class="options">
+        <ha-formfield label="Disabled">
+          <ha-switch
+            .name=${"disabled"}
+            .checked=${this._disabled}
+            @change=${this._handleOptionChange}
+          ></ha-switch>
+        </ha-formfield>
+      </div>
       ${SCHEMAS.map(
         (info, sampleIdx) => html`
           <demo-black-white-row
@@ -141,6 +152,7 @@ class DemoHaAutomationEditorTrigger extends LitElement {
                     .hass=${this.hass}
                     .triggers=${this.data[sampleIdx]}
                     .sampleIdx=${sampleIdx}
+                    .disabled=${this._disabled}
                     @value-changed=${valueChanged}
                   ></ha-automation-trigger>
                 `
@@ -150,6 +162,20 @@ class DemoHaAutomationEditorTrigger extends LitElement {
       )}
     `;
   }
+
+  private _handleOptionChange(ev) {
+    this[`_${ev.target.name}`] = ev.target.checked;
+  }
+
+  static styles = css`
+    .options {
+      max-width: 800px;
+      margin: 16px auto;
+    }
+    .options ha-formfield {
+      margin-right: 16px;
+    }
+  `;
 }
 
 declare global {

gallery/src/pages/components/dialogs.markdown

@@ -1,9 +1,9 @@
 ---
-title: Dialgos
+title: Dialogs
 subtitle: Dialogs provide important prompts in a user flow.
 ---
 
-# Material Desing 3
+# Material Design 3
 
 Our dialogs are based on the latest version of Material Design. Specs and guidelines can be found on it's [website](https://m3.material.io/components/dialogs/overview). 
 

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

@@ -195,6 +195,48 @@ const SCHEMAS: {
           },
         },
       },
+      select_disabled_list: {
+        name: "Select disabled option",
+        selector: {
+          select: {
+            options: [
+              { label: "Option 1", value: "Option 1" },
+              { label: "Option 2", value: "Option 2" },
+              { label: "Option 3", value: "Option 3", disabled: true },
+            ],
+            mode: "list",
+          },
+        },
+      },
+      select_disabled_multiple: {
+        name: "Select disabled option",
+        selector: {
+          select: {
+            multiple: true,
+            options: [
+              { label: "Option 1", value: "Option 1" },
+              { label: "Option 2", value: "Option 2" },
+              { label: "Option 3", value: "Option 3", disabled: true },
+            ],
+            mode: "list",
+          },
+        },
+      },
+      select_disabled: {
+        name: "Select disabled option",
+        selector: {
+          select: {
+            options: [
+              { label: "Option 1", value: "Option 1" },
+              { label: "Option 2", value: "Option 2" },
+              { label: "Option 3", value: "Option 3", disabled: true },
+              { label: "Option 4", value: "Option 4", disabled: true },
+              { label: "Option 5", value: "Option 5", disabled: true },
+              { label: "Option 6", value: "Option 6" },
+            ],
+          },
+        },
+      },
       select_custom: {
         name: "Select (Custom)",
         selector: {

gallery/src/pages/misc/integration-card.ts

@@ -191,10 +191,12 @@ const createEntityRegistryEntries = (
     hidden_by: null,
     entity_category: null,
     entity_id: "binary_sensor.updater",
+    id: "binary_sensor.updater",
     name: null,
     icon: null,
     platform: "updater",
     has_entity_name: false,
+    unique_id: "updater",
   },
 ];
 

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

@@ -1,16 +1,7 @@
 import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import "../../../../src/components/ha-card";
-import {
-  SUPPORT_OPEN,
-  SUPPORT_STOP,
-  SUPPORT_CLOSE,
-  SUPPORT_SET_POSITION,
-  SUPPORT_OPEN_TILT,
-  SUPPORT_STOP_TILT,
-  SUPPORT_CLOSE_TILT,
-  SUPPORT_SET_TILT_POSITION,
-} from "../../../../src/data/cover";
+import { CoverEntityFeature } from "../../../../src/data/cover";
 import "../../../../src/dialogs/more-info/more-info-content";
 import { getEntity } from "../../../../src/fake_data/entity";
 import {
@@ -22,113 +13,127 @@ import "../../components/demo-more-infos";
 const ENTITIES = [
   getEntity("cover", "position_buttons", "on", {
     friendly_name: "Position Buttons",
-    supported_features: SUPPORT_OPEN + SUPPORT_STOP + SUPPORT_CLOSE,
+    supported_features:
+      CoverEntityFeature.OPEN +
+      CoverEntityFeature.STOP +
+      CoverEntityFeature.CLOSE,
   }),
   getEntity("cover", "position_slider_half", "on", {
     friendly_name: "Position Half-Open",
     supported_features:
-      SUPPORT_OPEN + SUPPORT_STOP + SUPPORT_CLOSE + SUPPORT_SET_POSITION,
+      CoverEntityFeature.OPEN +
+      CoverEntityFeature.STOP +
+      CoverEntityFeature.CLOSE +
+      CoverEntityFeature.SET_POSITION,
     current_position: 50,
   }),
   getEntity("cover", "position_slider_open", "on", {
     friendly_name: "Position Open",
     supported_features:
-      SUPPORT_OPEN + SUPPORT_STOP + SUPPORT_CLOSE + SUPPORT_SET_POSITION,
+      CoverEntityFeature.OPEN +
+      CoverEntityFeature.STOP +
+      CoverEntityFeature.CLOSE +
+      CoverEntityFeature.SET_POSITION,
     current_position: 100,
   }),
   getEntity("cover", "position_slider_closed", "on", {
     friendly_name: "Position Closed",
     supported_features:
-      SUPPORT_OPEN + SUPPORT_STOP + SUPPORT_CLOSE + SUPPORT_SET_POSITION,
+      CoverEntityFeature.OPEN +
+      CoverEntityFeature.STOP +
+      CoverEntityFeature.CLOSE +
+      CoverEntityFeature.SET_POSITION,
     current_position: 0,
   }),
   getEntity("cover", "tilt_buttons", "on", {
     friendly_name: "Tilt Buttons",
     supported_features:
-      SUPPORT_OPEN_TILT + SUPPORT_STOP_TILT + SUPPORT_CLOSE_TILT,
+      CoverEntityFeature.OPEN_TILT +
+      CoverEntityFeature.STOP_TILT +
+      CoverEntityFeature.CLOSE_TILT,
   }),
   getEntity("cover", "tilt_slider_half", "on", {
     friendly_name: "Tilt Half-Open",
     supported_features:
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
+      CoverEntityFeature.OPEN_TILT +
+      CoverEntityFeature.STOP_TILT +
+      CoverEntityFeature.CLOSE_TILT +
+      CoverEntityFeature.SET_TILT_POSITION,
     current_tilt_position: 50,
   }),
   getEntity("cover", "tilt_slider_open", "on", {
     friendly_name: "Tilt Open",
     supported_features:
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
+      CoverEntityFeature.OPEN_TILT +
+      CoverEntityFeature.STOP_TILT +
+      CoverEntityFeature.CLOSE_TILT +
+      CoverEntityFeature.SET_TILT_POSITION,
     current_tilt_position: 100,
   }),
   getEntity("cover", "tilt_slider_closed", "on", {
     friendly_name: "Tilt Closed",
     supported_features:
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
+      CoverEntityFeature.OPEN_TILT +
+      CoverEntityFeature.STOP_TILT +
+      CoverEntityFeature.CLOSE_TILT +
+      CoverEntityFeature.SET_TILT_POSITION,
     current_tilt_position: 0,
   }),
   getEntity("cover", "position_slider_tilt_slider", "on", {
     friendly_name: "Both Sliders",
     supported_features:
-      SUPPORT_OPEN +
-      SUPPORT_STOP +
-      SUPPORT_CLOSE +
-      SUPPORT_SET_POSITION +
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
+      CoverEntityFeature.OPEN +
+      CoverEntityFeature.STOP +
+      CoverEntityFeature.CLOSE +
+      CoverEntityFeature.SET_POSITION +
+      CoverEntityFeature.OPEN_TILT +
+      CoverEntityFeature.STOP_TILT +
+      CoverEntityFeature.CLOSE_TILT +
+      CoverEntityFeature.SET_TILT_POSITION,
     current_position: 30,
     current_tilt_position: 70,
   }),
   getEntity("cover", "position_tilt_slider", "on", {
     friendly_name: "Position & Tilt Slider",
     supported_features:
-      SUPPORT_OPEN +
-      SUPPORT_STOP +
-      SUPPORT_CLOSE +
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
+      CoverEntityFeature.OPEN +
+      CoverEntityFeature.STOP +
+      CoverEntityFeature.CLOSE +
+      CoverEntityFeature.OPEN_TILT +
+      CoverEntityFeature.STOP_TILT +
+      CoverEntityFeature.CLOSE_TILT +
+      CoverEntityFeature.SET_TILT_POSITION,
     current_tilt_position: 70,
   }),
   getEntity("cover", "position_slider_tilt", "on", {
     friendly_name: "Position Slider & Tilt",
     supported_features:
-      SUPPORT_OPEN +
-      SUPPORT_STOP +
-      SUPPORT_CLOSE +
-      SUPPORT_SET_POSITION +
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT,
+      CoverEntityFeature.OPEN +
+      CoverEntityFeature.STOP +
+      CoverEntityFeature.CLOSE +
+      CoverEntityFeature.SET_POSITION +
+      CoverEntityFeature.OPEN_TILT +
+      CoverEntityFeature.STOP_TILT +
+      CoverEntityFeature.CLOSE_TILT,
     current_position: 30,
   }),
   getEntity("cover", "position_slider_only_tilt_slider", "on", {
     friendly_name: "Position Slider Only & Tilt Buttons",
     supported_features:
-      SUPPORT_SET_POSITION +
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT,
+      CoverEntityFeature.SET_POSITION +
+      CoverEntityFeature.OPEN_TILT +
+      CoverEntityFeature.STOP_TILT +
+      CoverEntityFeature.CLOSE_TILT,
     current_position: 30,
   }),
   getEntity("cover", "position_slider_only_tilt", "on", {
     friendly_name: "Position Slider Only & Tilt",
     supported_features:
-      SUPPORT_SET_POSITION +
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
+      CoverEntityFeature.SET_POSITION +
+      CoverEntityFeature.OPEN_TILT +
+      CoverEntityFeature.STOP_TILT +
+      CoverEntityFeature.CLOSE_TILT +
+      CoverEntityFeature.SET_TILT_POSITION,
     current_position: 30,
     current_tilt_position: 70,
   }),

gallery/src/pages/more-info/input-number.markdown

@@ -0,0 +1,3 @@
+---
+title: Input Number
+---

gallery/src/pages/more-info/input-number.ts

@@ -0,0 +1,60 @@
+import { html, LitElement, PropertyValues, TemplateResult } from "lit";
+import { customElement, property, query } from "lit/decorators";
+import "../../../../src/components/ha-card";
+import "../../../../src/dialogs/more-info/more-info-content";
+import { getEntity } from "../../../../src/fake_data/entity";
+import {
+  MockHomeAssistant,
+  provideHass,
+} from "../../../../src/fake_data/provide_hass";
+import "../../components/demo-more-infos";
+
+const ENTITIES = [
+  getEntity("input_number", "box1", 0, {
+    friendly_name: "Box1",
+    min: 0,
+    max: 100,
+    step: 1,
+    initial: 0,
+    mode: "box",
+    unit_of_measurement: "items",
+  }),
+  getEntity("input_number", "slider1", 0, {
+    friendly_name: "Slider1",
+    min: 0,
+    max: 100,
+    step: 1,
+    initial: 0,
+    mode: "slider",
+    unit_of_measurement: "items",
+  }),
+];
+
+@customElement("demo-more-info-input-number")
+class DemoMoreInfoInputNumber extends LitElement {
+  @property() public hass!: MockHomeAssistant;
+
+  @query("demo-more-infos") private _demoRoot!: HTMLElement;
+
+  protected render(): TemplateResult {
+    return html`
+      <demo-more-infos
+        .hass=${this.hass}
+        .entities=${ENTITIES.map((ent) => ent.entityId)}
+      ></demo-more-infos>
+    `;
+  }
+
+  protected firstUpdated(changedProperties: PropertyValues) {
+    super.firstUpdated(changedProperties);
+    const hass = provideHass(this._demoRoot);
+    hass.updateTranslations(null, "en");
+    hass.addEntities(ENTITIES);
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "demo-more-info-input-number": DemoMoreInfoInputNumber;
+  }
+}

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

@@ -1,12 +1,7 @@
 import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import "../../../../src/components/ha-card";
-import {
-  LightColorModes,
-  SUPPORT_EFFECT,
-  SUPPORT_FLASH,
-  SUPPORT_TRANSITION,
-} from "../../../../src/data/light";
+import { LightColorMode, LightEntityFeature } from "../../../../src/data/light";
 import "../../../../src/dialogs/more-info/more-info-content";
 import { getEntity } from "../../../../src/fake_data/entity";
 import {
@@ -22,8 +17,8 @@ const ENTITIES = [
   getEntity("light", "kitchen_light", "on", {
     friendly_name: "Brightness Light",
     brightness: 200,
-    supported_color_modes: [LightColorModes.BRIGHTNESS],
-    color_mode: LightColorModes.BRIGHTNESS,
+    supported_color_modes: [LightColorMode.BRIGHTNESS],
+    color_mode: LightColorMode.BRIGHTNESS,
   }),
   getEntity("light", "color_temperature_light", "on", {
     friendly_name: "White Color Temperature Light",
@@ -32,10 +27,10 @@ const ENTITIES = [
     min_mireds: 30,
     max_mireds: 150,
     supported_color_modes: [
-      LightColorModes.BRIGHTNESS,
-      LightColorModes.COLOR_TEMP,
+      LightColorMode.BRIGHTNESS,
+      LightColorMode.COLOR_TEMP,
     ],
-    color_mode: LightColorModes.COLOR_TEMP,
+    color_mode: LightColorMode.COLOR_TEMP,
   }),
   getEntity("light", "color_hs_light", "on", {
     friendly_name: "Color HS Light",
@@ -44,13 +39,16 @@ const ENTITIES = [
     rgb_color: [30, 100, 255],
     min_mireds: 30,
     max_mireds: 150,
-    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_features:
+      LightEntityFeature.EFFECT +
+      LightEntityFeature.FLASH +
+      LightEntityFeature.TRANSITION,
     supported_color_modes: [
-      LightColorModes.BRIGHTNESS,
-      LightColorModes.COLOR_TEMP,
-      LightColorModes.HS,
+      LightColorMode.BRIGHTNESS,
+      LightColorMode.COLOR_TEMP,
+      LightColorMode.HS,
     ],
-    color_mode: LightColorModes.HS,
+    color_mode: LightColorMode.HS,
     effect_list: ["random", "colorloop"],
   }),
   getEntity("light", "color_rgb_ct_light", "on", {
@@ -59,22 +57,28 @@ const ENTITIES = [
     color_temp: 75,
     min_mireds: 30,
     max_mireds: 150,
-    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_features:
+      LightEntityFeature.EFFECT +
+      LightEntityFeature.FLASH +
+      LightEntityFeature.TRANSITION,
     supported_color_modes: [
-      LightColorModes.BRIGHTNESS,
-      LightColorModes.COLOR_TEMP,
-      LightColorModes.RGB,
+      LightColorMode.BRIGHTNESS,
+      LightColorMode.COLOR_TEMP,
+      LightColorMode.RGB,
     ],
-    color_mode: LightColorModes.COLOR_TEMP,
+    color_mode: LightColorMode.COLOR_TEMP,
     effect_list: ["random", "colorloop"],
   }),
   getEntity("light", "color_RGB_light", "on", {
     friendly_name: "Color Effects Light",
     brightness: 255,
     rgb_color: [30, 100, 255],
-    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
-    supported_color_modes: [LightColorModes.BRIGHTNESS, LightColorModes.RGB],
-    color_mode: LightColorModes.RGB,
+    supported_features:
+      LightEntityFeature.EFFECT +
+      LightEntityFeature.FLASH +
+      LightEntityFeature.TRANSITION,
+    supported_color_modes: [LightColorMode.BRIGHTNESS, LightColorMode.RGB],
+    color_mode: LightColorMode.RGB,
     effect_list: ["random", "colorloop"],
   }),
   getEntity("light", "color_rgbw_light", "on", {
@@ -83,13 +87,16 @@ const ENTITIES = [
     rgbw_color: [30, 100, 255, 125],
     min_mireds: 30,
     max_mireds: 150,
-    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_features:
+      LightEntityFeature.EFFECT +
+      LightEntityFeature.FLASH +
+      LightEntityFeature.TRANSITION,
     supported_color_modes: [
-      LightColorModes.BRIGHTNESS,
-      LightColorModes.COLOR_TEMP,
-      LightColorModes.RGBW,
+      LightColorMode.BRIGHTNESS,
+      LightColorMode.COLOR_TEMP,
+      LightColorMode.RGBW,
     ],
-    color_mode: LightColorModes.RGBW,
+    color_mode: LightColorMode.RGBW,
     effect_list: ["random", "colorloop"],
   }),
   getEntity("light", "color_rgbww_light", "on", {
@@ -98,13 +105,16 @@ const ENTITIES = [
     rgbww_color: [30, 100, 255, 125, 10],
     min_mireds: 30,
     max_mireds: 150,
-    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_features:
+      LightEntityFeature.EFFECT +
+      LightEntityFeature.FLASH +
+      LightEntityFeature.TRANSITION,
     supported_color_modes: [
-      LightColorModes.BRIGHTNESS,
-      LightColorModes.COLOR_TEMP,
-      LightColorModes.RGBWW,
+      LightColorMode.BRIGHTNESS,
+      LightColorMode.COLOR_TEMP,
+      LightColorMode.RGBWW,
     ],
-    color_mode: LightColorModes.RGBWW,
+    color_mode: LightColorMode.RGBWW,
     effect_list: ["random", "colorloop"],
   }),
   getEntity("light", "color_xy_light", "on", {
@@ -114,13 +124,16 @@ const ENTITIES = [
     rgb_color: [30, 100, 255],
     min_mireds: 30,
     max_mireds: 150,
-    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_features:
+      LightEntityFeature.EFFECT +
+      LightEntityFeature.FLASH +
+      LightEntityFeature.TRANSITION,
     supported_color_modes: [
-      LightColorModes.BRIGHTNESS,
-      LightColorModes.COLOR_TEMP,
-      LightColorModes.XY,
+      LightColorMode.BRIGHTNESS,
+      LightColorMode.COLOR_TEMP,
+      LightColorMode.XY,
     ],
-    color_mode: LightColorModes.XY,
+    color_mode: LightColorMode.XY,
     effect_list: ["random", "colorloop"],
   }),
 ];

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

@@ -1024,10 +1024,13 @@ class HassioAddonInfo extends LitElement {
     button.progress = true;
 
     const confirmed = await showConfirmationDialog(this, {
-      title: this.addon.name,
-      text: "Are you sure you want to uninstall this add-on?",
-      confirmText: "uninstall add-on",
-      dismissText: "no",
+      title: this.supervisor.localize("dialog.uninstall_addon.title", {
+        name: this.addon.name,
+      }),
+      text: this.supervisor.localize("dialog.uninstall_addon.text"),
+      confirmText: this.supervisor.localize("dialog.uninstall_addon.uninstall"),
+      dismissText: this.supervisor.localize("common.cancel"),
+      destructive: true,
     });
 
     if (!confirmed) {

hassio/src/backups/hassio-backups.ts

@@ -119,6 +119,7 @@ export class HassioBackups extends LitElement {
     (narrow: boolean): DataTableColumnContainer => ({
       name: {
         title: this.supervisor.localize("backup.name"),
+        main: true,
         sortable: true,
         filterable: true,
         grows: true,

hassio/src/dialogs/suggestAddonRestart.ts

@@ -18,9 +18,11 @@ export const suggestAddonRestart = async (
   addon: HassioAddonDetails
 ): Promise<void> => {
   const confirmed = await showConfirmationDialog(element, {
-    title: supervisor.localize("common.restart_name", "name", addon.name),
+    title: supervisor.localize("dialog.restart_addon.title", {
+      name: addon.name,
+    }),
     text: supervisor.localize("dialog.restart_addon.text"),
-    confirmText: supervisor.localize("dialog.restart_addon.confirm_text"),
+    confirmText: supervisor.localize("dialog.restart_addon.restart"),
     dismissText: supervisor.localize("common.cancel"),
   });
   if (confirmed) {
@@ -28,11 +30,9 @@ export const suggestAddonRestart = async (
       await restartHassioAddon(hass, addon.slug);
     } catch (err: any) {
       showAlertDialog(element, {
-        title: supervisor.localize(
-          "common.failed_to_restart_name",
-          "name",
-          addon.name
-        ),
+        title: supervisor.localize("common.failed_to_restart_name", {
+          name: addon.name,
+        }),
         text: extractApiErrorMessage(err),
       });
     }

hassio/src/system/hassio-supervisor-info.ts

@@ -23,6 +23,7 @@ import {
   showAlertDialog,
   showConfirmationDialog,
 } from "../../../src/dialogs/generic/show-dialog-box";
+import { showJoinBetaDialog } from "../../../src/panels/config/core/updates/show-dialog-join-beta";
 import {
   UNHEALTHY_REASON_URL,
   UNSUPPORTED_REASON_URL,
@@ -230,36 +231,27 @@ class HassioSupervisorInfo extends LitElement {
     button.progress = true;
 
     if (this.supervisor.supervisor.channel === "stable") {
-      const confirmed = await showConfirmationDialog(this, {
-        title: this.supervisor.localize("system.supervisor.warning"),
-        text: html`${this.supervisor.localize("system.supervisor.beta_warning")}
-          <br />
-          <b> ${this.supervisor.localize("system.supervisor.beta_backup")} </b>
-          <br /><br />
-          ${this.supervisor.localize("system.supervisor.beta_release_items")}
-          <ul>
-            <li>Home Assistant Core</li>
-            <li>Home Assistant Supervisor</li>
-            <li>Home Assistant Operating System</li>
-          </ul>
-          <br />
-          ${this.supervisor.localize("system.supervisor.beta_join_confirm")}`,
-        confirmText: this.supervisor.localize(
-          "system.supervisor.join_beta_action"
-        ),
-        dismissText: this.supervisor.localize("common.cancel"),
+      showJoinBetaDialog(this, {
+        join: async () => {
+          await this._setChannel("beta");
+          button.progress = false;
+        },
+        cancel: () => {
+          button.progress = false;
+        },
       });
-
-      if (!confirmed) {
-        button.progress = false;
-        return;
-      }
+    } else {
+      await this._setChannel("stable");
+      button.progress = false;
     }
+  }
 
+  private async _setChannel(
+    channel: SupervisorOptions["channel"]
+  ): Promise<void> {
     try {
       const data: Partial<SupervisorOptions> = {
-        channel:
-          this.supervisor.supervisor.channel === "stable" ? "beta" : "stable",
+        channel,
       };
       await setSupervisorOption(this.hass, data);
       await this._reloadSupervisor();
@@ -270,8 +262,6 @@ class HassioSupervisorInfo extends LitElement {
         ),
         text: extractApiErrorMessage(err),
       });
-    } finally {
-      button.progress = false;
     }
   }
 

package.json

@@ -93,8 +93,8 @@
     "@polymer/paper-tooltip": "^3.0.1",
     "@polymer/polymer": "3.4.1",
     "@thomasloven/round-slider": "0.5.4",
-    "@vaadin/combo-box": "^23.1.5",
-    "@vaadin/vaadin-themable-mixin": "^23.1.5",
+    "@vaadin/combo-box": "^23.2.0",
+    "@vaadin/vaadin-themable-mixin": "^23.2.0",
     "@vibrant/color": "^3.2.1-alpha.1",
     "@vibrant/core": "^3.2.1-alpha.1",
     "@vibrant/quantizer-mmcq": "^3.2.1-alpha.1",
@@ -111,7 +111,7 @@
     "deep-freeze": "^0.0.1",
     "fuse.js": "^6.0.0",
     "google-timezones-json": "^1.0.2",
-    "hls.js": "^1.2.1",
+    "hls.js": "^1.2.3",
     "home-assistant-js-websocket": "^8.0.0",
     "idb-keyval": "^5.1.3",
     "intl-messageformat": "^9.9.1",

pyproject.toml

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

script/core

@@ -46,6 +46,14 @@ frontend:
 #   development_repo: ${WD}" >> "${WD}/config/configuration.yaml"
   fi
 
+  if [ ! -z "${CODESPACES}" ]; then
+  echo "
+http:
+  use_x_forwarded_for: true
+  trusted_proxies:
+    - 127.0.0.1
+" >> "${WD}/config/configuration.yaml"
+  fi
 fi
 
 hass -c "${WD}/config"

src/common/const.ts

@@ -6,6 +6,7 @@ import {
   mdiAlert,
   mdiAngleAcute,
   mdiAppleSafari,
+  mdiArrowLeftRight,
   mdiBell,
   mdiBookmark,
   mdiBrightness5,
@@ -25,7 +26,6 @@ import {
   mdiFlower,
   mdiFormatListBulleted,
   mdiFormTextbox,
-  mdiGasCylinder,
   mdiGauge,
   mdiGestureTapButton,
   mdiGoogleAssistant,
@@ -37,23 +37,27 @@ import {
   mdiLightningBolt,
   mdiMailbox,
   mdiMapMarkerRadius,
+  mdiMeterGas,
+  mdiMicrophoneMessage,
   mdiMolecule,
   mdiMoleculeCo,
   mdiMoleculeCo2,
   mdiPalette,
+  mdiProgressClock,
   mdiRayVertex,
   mdiRemote,
   mdiRobot,
   mdiRobotVacuum,
   mdiScriptText,
   mdiSineWave,
-  mdiMicrophoneMessage,
+  mdiSpeedometer,
   mdiThermometer,
   mdiThermostat,
   mdiTimerOutline,
   mdiVideo,
   mdiWaterPercent,
   mdiWeatherCloudy,
+  mdiWeight,
   mdiWhiteBalanceSunny,
   mdiWifi,
 } from "@mdi/js";
@@ -121,11 +125,14 @@ export const FIXED_DEVICE_CLASS_ICONS = {
   carbon_monoxide: mdiMoleculeCo,
   current: mdiCurrentAc,
   date: mdiCalendar,
+  distance: mdiArrowLeftRight,
+  duration: mdiProgressClock,
   energy: mdiLightningBolt,
   frequency: mdiSineWave,
-  gas: mdiGasCylinder,
+  gas: mdiMeterGas,
   humidity: mdiWaterPercent,
   illuminance: mdiBrightness5,
+  moisture: mdiWaterPercent,
   monetary: mdiCash,
   nitrogen_dioxide: mdiMolecule,
   nitrogen_monoxide: mdiMolecule,
@@ -139,11 +146,14 @@ export const FIXED_DEVICE_CLASS_ICONS = {
   pressure: mdiGauge,
   reactive_power: mdiFlash,
   signal_strength: mdiWifi,
+  speed: mdiSpeedometer,
   sulphur_dioxide: mdiMolecule,
   temperature: mdiThermometer,
   timestamp: mdiClock,
   volatile_organic_compounds: mdiMolecule,
   voltage: mdiSineWave,
+  // volume: TBD, => no well matching icon found
+  weight: mdiWeight,
 };
 
 /** Domains that have a state card. */

src/common/datetime/format_duration.ts

@@ -0,0 +1,28 @@
+import { HaDurationData } from "../../components/ha-duration-input";
+
+const leftPad = (num: number) => (num < 10 ? `0${num}` : num);
+
+export const formatDuration = (duration: HaDurationData) => {
+  const d = duration.days || 0;
+  const h = duration.hours || 0;
+  const m = duration.minutes || 0;
+  const s = duration.seconds || 0;
+  const ms = duration.milliseconds || 0;
+
+  if (d > 0) {
+    return `${d} days ${h}:${leftPad(m)}:${leftPad(s)}`;
+  }
+  if (h > 0) {
+    return `${h}:${leftPad(m)}:${leftPad(s)}`;
+  }
+  if (m > 0) {
+    return `${m}:${leftPad(s)}`;
+  }
+  if (s > 0) {
+    return `${s} seconds`;
+  }
+  if (ms > 0) {
+    return `${ms} milliseconds`;
+  }
+  return null;
+};

src/common/entity/compute_state_display.ts

@@ -2,17 +2,18 @@ import { HassEntity } from "home-assistant-js-websocket";
 import { UNAVAILABLE, UNKNOWN } from "../../data/entity";
 import { FrontendLocaleData } from "../../data/translation";
 import {
-  UPDATE_SUPPORT_PROGRESS,
   updateIsInstallingFromAttributes,
+  UPDATE_SUPPORT_PROGRESS,
 } from "../../data/update";
+import { formatDuration, UNIT_TO_SECOND_CONVERT } from "../datetime/duration";
 import { formatDate } from "../datetime/format_date";
 import { formatDateTime } from "../datetime/format_date_time";
 import { formatTime } from "../datetime/format_time";
 import { formatNumber, isNumericFromAttributes } from "../number/format_number";
+import { blankBeforePercent } from "../translations/blank_before_percent";
 import { LocalizeFunc } from "../translations/localize";
-import { supportsFeatureFromAttributes } from "./supports-feature";
-import { formatDuration, UNIT_TO_SECOND_CONVERT } from "../datetime/duration";
 import { computeDomain } from "./compute_domain";
+import { supportsFeatureFromAttributes } from "./supports-feature";
 
 export const computeStateDisplay = (
   localize: LocalizeFunc,
@@ -67,7 +68,7 @@ export const computeStateDisplayFromEntityAttributes = (
     const unit = !attributes.unit_of_measurement
       ? ""
       : attributes.unit_of_measurement === "%"
-      ? "%"
+      ? blankBeforePercent(locale) + "%"
       : ` ${attributes.unit_of_measurement}`;
     return `${formatNumber(state, locale)}${unit}`;
   }

src/common/entity/feature_class_names.ts

@@ -1,10 +1,14 @@
 import { HassEntity } from "home-assistant-js-websocket";
 import { supportsFeature } from "./supports-feature";
 
+export type FeatureClassNames<T extends number = number> = Partial<
+  Record<T, string>
+>;
+
 // Expects classNames to be an object mapping feature-bit -> className
 export const featureClassNames = (
   stateObj: HassEntity,
-  classNames: { [feature: number]: string }
+  classNames: FeatureClassNames
 ) => {
   if (!stateObj || !stateObj.attributes.supported_features) {
     return "";

src/common/entity/get_states.ts

@@ -37,6 +37,7 @@ const FIXED_DOMAIN_STATES = {
   siren: ["on", "off"],
   sun: ["above_horizon", "below_horizon"],
   switch: ["on", "off"],
+  timer: ["active", "idle", "paused"],
   update: ["on", "off"],
   vacuum: ["cleaning", "docked", "error", "idle", "paused", "returning"],
   weather: [
@@ -239,10 +240,13 @@ export const getStates = (
       }
       break;
     case "light":
-      if (attribute === "effect") {
+      if (attribute === "effect" && state.attributes.effect_list) {
         result.push(...state.attributes.effect_list);
-      } else if (attribute === "color_mode") {
-        result.push(...state.attributes.color_modes);
+      } else if (
+        attribute === "color_mode" &&
+        state.attributes.supported_color_modes
+      ) {
+        result.push(...state.attributes.supported_color_modes);
       }
       break;
     case "media_player":

src/common/integrations/protocolIntegrationPicked.ts

@@ -1,11 +1,11 @@
 import { html } from "lit";
 import { getConfigEntries } from "../../data/config_entries";
+import { showConfigFlowDialog } from "../../dialogs/config-flow/show-dialog-config-flow";
 import { showConfirmationDialog } from "../../dialogs/generic/show-dialog-box";
 import { showZWaveJSAddNodeDialog } from "../../panels/config/integrations/integration-panels/zwave_js/show-dialog-zwave_js-add-node";
 import type { HomeAssistant } from "../../types";
 import { documentationUrl } from "../../util/documentation-url";
 import { isComponentLoaded } from "../config/is_component_loaded";
-import { fireEvent } from "../dom/fire_event";
 import { navigate } from "../navigate";
 
 export const protocolIntegrationPicked = async (
@@ -18,7 +18,7 @@ export const protocolIntegrationPicked = async (
       domain: "zwave_js",
     });
 
-    if (!entries.length) {
+    if (!isComponentLoaded(hass, "zwave_js") || !entries.length) {
       // If the component isn't loaded, ask them to load the integration first
       showConfirmationDialog(element, {
         text: hass.localize(
@@ -39,8 +39,8 @@ export const protocolIntegrationPicked = async (
           "ui.panel.config.integrations.config_flow.proceed"
         ),
         confirm: () => {
-          fireEvent(element, "handler-picked", {
-            handler: "zwave_js",
+          showConfigFlowDialog(element, {
+            startFlowHandler: "zwave_js",
           });
         },
       });
@@ -75,8 +75,8 @@ export const protocolIntegrationPicked = async (
           "ui.panel.config.integrations.config_flow.proceed"
         ),
         confirm: () => {
-          fireEvent(element, "handler-picked", {
-            handler: "zha",
+          showConfigFlowDialog(element, {
+            startFlowHandler: "zha",
           });
         },
       });

src/common/string/title-case.ts

@@ -0,0 +1,4 @@
+export const titleCase = (s) =>
+  s.replace(/^_*(.)|_+(.)/g, (_s, c, d) =>
+    c ? c.toUpperCase() : " " + d.toUpperCase()
+  );

src/common/translations/blank_before_percent.ts

@@ -0,0 +1,18 @@
+import { FrontendLocaleData } from "../../data/translation";
+
+// Logic based on https://en.wikipedia.org/wiki/Percent_sign#Form_and_spacing
+export const blankBeforePercent = (
+  localeOptions: FrontendLocaleData
+): string => {
+  switch (localeOptions.language) {
+    case "cz":
+    case "de":
+    case "fi":
+    case "fr":
+    case "sk":
+    case "sv":
+      return " ";
+    default:
+      return "";
+  }
+};

src/components/chart/statistics-chart.ts

@@ -13,6 +13,7 @@ import {
   TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import memoizeOne from "memoize-one";
 import { getGraphColorByIndex } from "../../common/color/colors";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import {
@@ -20,31 +21,38 @@ import {
   numberFormatToLocale,
 } from "../../common/number/format_number";
 import {
-  getStatisticIds,
+  getDisplayUnit,
   getStatisticLabel,
+  getStatisticMetadata,
   Statistics,
   statisticsHaveType,
-  StatisticsMetaData,
   StatisticType,
-} from "../../data/history";
+} from "../../data/recorder";
 import type { HomeAssistant } from "../../types";
 import "./ha-chart-base";
 
+export type ExtendedStatisticType = StatisticType | "state";
+
+export const statTypeMap: Record<ExtendedStatisticType, StatisticType> = {
+  mean: "mean",
+  min: "min",
+  max: "max",
+  sum: "sum",
+  state: "sum",
+};
 @customElement("statistics-chart")
 class StatisticsChart extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ attribute: false }) public statisticsData!: Statistics;
 
-  @property({ type: Array }) public statisticIds?: StatisticsMetaData[];
-
   @property() public names: boolean | Record<string, string> = false;
 
   @property() public unit?: string;
 
   @property({ attribute: false }) public endTime?: Date;
 
-  @property({ type: Array }) public statTypes: Array<StatisticType> = [
+  @property({ type: Array }) public statTypes: Array<ExtendedStatisticType> = [
     "sum",
     "min",
     "mean",
@@ -191,18 +199,28 @@ class StatisticsChart extends LitElement {
     };
   }
 
-  private async _getStatisticIds() {
-    this.statisticIds = await getStatisticIds(this.hass);
-  }
+  private _getStatisticsMetaData = memoizeOne(
+    async (statisticIds: string[] | undefined) => {
+      const statsMetadataArray = await getStatisticMetadata(
+        this.hass,
+        statisticIds
+      );
+      const statisticsMetaData = {};
+      statsMetadataArray.forEach((x) => {
+        statisticsMetaData[x.statistic_id] = x;
+      });
+      return statisticsMetaData;
+    }
+  );
 
   private async _generateData() {
     if (!this.statisticsData) {
       return;
     }
 
-    if (!this.statisticIds) {
-      await this._getStatisticIds();
-    }
+    const statisticsMetaData = await this._getStatisticsMetaData(
+      Object.keys(this.statisticsData)
+    );
 
     let colorIndex = 0;
     const statisticsData = Object.values(this.statisticsData);
@@ -233,9 +251,7 @@ class StatisticsChart extends LitElement {
     const names = this.names || {};
     statisticsData.forEach((stats) => {
       const firstStat = stats[0];
-      const meta = this.statisticIds!.find(
-        (stat) => stat.statistic_id === firstStat.statistic_id
-      );
+      const meta = statisticsMetaData?.[firstStat.statistic_id];
       let name = names[firstStat.statistic_id];
       if (!name) {
         name = getStatisticLabel(this.hass, firstStat.statistic_id, meta);
@@ -243,8 +259,11 @@ class StatisticsChart extends LitElement {
 
       if (!this.unit) {
         if (unit === undefined) {
-          unit = meta?.display_unit_of_measurement;
-        } else if (unit !== meta?.display_unit_of_measurement) {
+          unit = getDisplayUnit(this.hass, firstStat.statistic_id, meta);
+        } else if (
+          unit !== getDisplayUnit(this.hass, firstStat.statistic_id, meta)
+        ) {
+          // Clear unit if not all statistics have same unit
           unit = null;
         }
       }
@@ -301,7 +320,7 @@ class StatisticsChart extends LitElement {
         : this.statTypes;
 
       sortedTypes.forEach((type) => {
-        if (statisticsHaveType(stats, type)) {
+        if (statisticsHaveType(stats, statTypeMap[type])) {
           const band = drawBands && (type === "min" || type === "max");
           statTypes.push(type);
           statDataSets.push({
@@ -329,7 +348,6 @@ class StatisticsChart extends LitElement {
 
       let prevDate: Date | null = null;
       // Process chart data.
-      let initVal: number | null = null;
       let prevSum: number | null = null;
       stats.forEach((stat) => {
         const date = new Date(stat.start);
@@ -341,11 +359,11 @@ class StatisticsChart extends LitElement {
         statTypes.forEach((type) => {
           let val: number | null;
           if (type === "sum") {
-            if (initVal === null) {
-              initVal = val = stat.state || 0;
+            if (prevSum === null) {
+              val = 0;
               prevSum = stat.sum;
             } else {
-              val = initVal + ((stat.sum || 0) - prevSum!);
+              val = (stat.sum || 0) - prevSum;
             }
           } else {
             val = stat[type];

src/components/data-table/ha-data-table.ts

@@ -69,6 +69,7 @@ export interface DataTableSortColumnData {
 }
 
 export interface DataTableColumnData<T = any> extends DataTableSortColumnData {
+  main?: boolean;
   title: TemplateResult | string;
   label?: TemplateResult | string;
   type?: "numeric" | "icon" | "icon-button" | "overflow-menu";
@@ -406,7 +407,7 @@ export class HaDataTable extends LitElement {
           }
           return html`
             <div
-              role="cell"
+              role=${column.main ? "rowheader" : "cell"}
               class="mdc-data-table__cell ${classMap({
                 "mdc-data-table__cell--numeric": column.type === "numeric",
                 "mdc-data-table__cell--icon": column.type === "icon",

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

@@ -312,6 +312,7 @@ export class HaEntityPicker extends LitElement {
         .filteredItems=${this._states}
         .renderer=${rowRenderer}
         .required=${this.required}
+        .disabled=${this.disabled}
         @opened-changed=${this._openedChanged}
         @value-changed=${this._valueChanged}
         @filter-changed=${this._filterChanged}

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

@@ -7,6 +7,8 @@ import { getStates } from "../../common/entity/get_states";
 import { HomeAssistant } from "../../types";
 import "../ha-combo-box";
 import type { HaComboBox } from "../ha-combo-box";
+import { formatAttributeValue } from "../../data/entity_attributes";
+import { fireEvent } from "../../common/dom/fire_event";
 
 export type HaEntityPickerEntityFilterFunc = (entityId: HassEntity) => boolean;
 
@@ -55,7 +57,7 @@ class HaEntityStatePicker extends LitElement {
                     this.hass.locale,
                     key
                   )
-                : key,
+                : formatAttributeValue(this.hass, key),
             }))
           : [];
     }
@@ -69,16 +71,7 @@ class HaEntityStatePicker extends LitElement {
     return html`
       <ha-combo-box
         .hass=${this.hass}
-        .value=${this.value
-          ? this.entityId && this.hass.states[this.entityId]
-            ? computeStateDisplay(
-                this.hass.localize,
-                this.hass.states[this.entityId],
-                this.hass.locale,
-                this.value
-              )
-            : this.value
-          : ""}
+        .value=${this._value}
         .autofocus=${this.autofocus}
         .label=${this.label ??
         this.hass.localize("ui.components.entity.entity-state-picker.state")}
@@ -95,12 +88,28 @@ class HaEntityStatePicker extends LitElement {
     `;
   }
 
+  private get _value() {
+    return this.value || "";
+  }
+
   private _openedChanged(ev: PolymerChangedEvent<boolean>) {
     this._opened = ev.detail.value;
   }
 
   private _valueChanged(ev: PolymerChangedEvent<string>) {
-    this.value = ev.detail.value;
+    ev.stopPropagation();
+    const newValue = ev.detail.value;
+    if (newValue !== this._value) {
+      this._setValue(newValue);
+    }
+  }
+
+  private _setValue(value: string) {
+    this.value = value;
+    setTimeout(() => {
+      fireEvent(this, "value-changed", { value });
+      fireEvent(this, "change");
+    }, 0);
   }
 }
 

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

@@ -3,10 +3,14 @@ import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
+import { ensureArray } from "../../common/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
-import { computeStateName } from "../../common/entity/compute_state_name";
 import { stringCompare } from "../../common/string/compare";
-import { getStatisticIds, StatisticsMetaData } from "../../data/history";
+import {
+  getStatisticIds,
+  getStatisticLabel,
+  StatisticsMetaData,
+} from "../../data/recorder";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import { documentationUrl } from "../../util/documentation-url";
@@ -39,23 +43,14 @@ export class HaStatisticPicker extends LitElement {
     type: Array,
     attribute: "include-statistics-unit-of-measurement",
   })
-  public includeStatisticsUnitOfMeasurement?: string[];
+  public includeStatisticsUnitOfMeasurement?: string | string[];
 
   /**
-   * Show only statistics displayed with these units of measurements.
-   * @type {Array}
-   * @attr include-display-unit-of-measurement
+   * Show only statistics with these unit classes.
+   * @attr include-unit-class
    */
-  @property({ type: Array, attribute: "include-display-unit-of-measurement" })
-  public includeDisplayUnitOfMeasurement?: string[];
-
-  /**
-   * Show only statistics with these device classes.
-   * @type {Array}
-   * @attr include-device-classes
-   */
-  @property({ type: Array, attribute: "include-device-classes" })
-  public includeDeviceClasses?: string[];
+  @property({ attribute: "include-unit-class" })
+  public includeUnitClass?: string | string[];
 
   /**
    * Show only statistics on entities.
@@ -97,9 +92,8 @@ export class HaStatisticPicker extends LitElement {
   private _getStatistics = memoizeOne(
     (
       statisticIds: StatisticsMetaData[],
-      includeStatisticsUnitOfMeasurement?: string[],
-      includeDisplayUnitOfMeasurement?: string[],
-      includeDeviceClasses?: string[],
+      includeStatisticsUnitOfMeasurement?: string | string[],
+      includeUnitClass?: string | string[],
       entitiesOnly?: boolean
     ): Array<{ id: string; name: string; state?: HassEntity }> => {
       if (!statisticIds.length) {
@@ -114,17 +108,18 @@ export class HaStatisticPicker extends LitElement {
       }
 
       if (includeStatisticsUnitOfMeasurement) {
+        const includeUnits: (string | null)[] = ensureArray(
+          includeStatisticsUnitOfMeasurement
+        );
         statisticIds = statisticIds.filter((meta) =>
-          includeStatisticsUnitOfMeasurement.includes(
-            meta.statistics_unit_of_measurement
-          )
+          includeUnits.includes(meta.statistics_unit_of_measurement)
         );
       }
-      if (includeDisplayUnitOfMeasurement) {
+      if (includeUnitClass) {
+        const includeUnitClasses: (string | null)[] =
+          ensureArray(includeUnitClass);
         statisticIds = statisticIds.filter((meta) =>
-          includeDisplayUnitOfMeasurement.includes(
-            meta.display_unit_of_measurement
-          )
+          includeUnitClasses.includes(meta.unit_class)
         );
       }
 
@@ -139,23 +134,16 @@ export class HaStatisticPicker extends LitElement {
           if (!entitiesOnly) {
             output.push({
               id: meta.statistic_id,
-              name: meta.name || meta.statistic_id,
+              name: getStatisticLabel(this.hass, meta.statistic_id, meta),
             });
           }
           return;
         }
-        if (
-          !includeDeviceClasses ||
-          includeDeviceClasses.includes(
-            entityState!.attributes.device_class || ""
-          )
-        ) {
-          output.push({
-            id: meta.statistic_id,
-            name: computeStateName(entityState),
-            state: entityState,
-          });
-        }
+        output.push({
+          id: meta.statistic_id,
+          name: getStatisticLabel(this.hass, meta.statistic_id, meta),
+          state: entityState,
+        });
       });
 
       if (!output.length) {
@@ -206,8 +194,7 @@ export class HaStatisticPicker extends LitElement {
         (this.comboBox as any).items = this._getStatistics(
           this.statisticIds!,
           this.includeStatisticsUnitOfMeasurement,
-          this.includeDisplayUnitOfMeasurement,
-          this.includeDeviceClasses,
+          this.includeUnitClass,
           this.entitiesOnly
         );
       } else {
@@ -215,8 +202,7 @@ export class HaStatisticPicker extends LitElement {
           (this.comboBox as any).items = this._getStatistics(
             this.statisticIds!,
             this.includeStatisticsUnitOfMeasurement,
-            this.includeDisplayUnitOfMeasurement,
-            this.includeDeviceClasses,
+            this.includeUnitClass,
             this.entitiesOnly
           );
         });

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

@@ -22,11 +22,52 @@ class HaStatisticsPicker extends LitElement {
   @property({ attribute: "pick-statistic-label" })
   public pickStatisticLabel?: string;
 
+  /**
+   * Show only statistics natively stored with these units of measurements.
+   * @attr include-statistics-unit-of-measurement
+   */
+  @property({
+    attribute: "include-statistics-unit-of-measurement",
+  })
+  public includeStatisticsUnitOfMeasurement?: string[] | string;
+
+  /**
+   * Show only statistics with these unit classes.
+   * @attr include-unit-class
+   */
+  @property({ attribute: "include-unit-class" })
+  public includeUnitClass?: string | string[];
+
+  /**
+   * Ignore filtering of statistics type and units when only a single statistic is selected.
+   * @type {boolean}
+   * @attr ignore-restrictions-on-first-statistic
+   */
+  @property({
+    type: Boolean,
+    attribute: "ignore-restrictions-on-first-statistic",
+  })
+  public ignoreRestrictionsOnFirstStatistic = false;
+
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
     }
 
+    const ignoreRestriction =
+      this.ignoreRestrictionsOnFirstStatistic &&
+      this._currentStatistics.length <= 1;
+
+    const includeStatisticsUnitCurrent = ignoreRestriction
+      ? undefined
+      : this.includeStatisticsUnitOfMeasurement;
+    const includeUnitClassCurrent = ignoreRestriction
+      ? undefined
+      : this.includeUnitClass;
+    const includeStatisticTypesCurrent = ignoreRestriction
+      ? undefined
+      : this.statisticTypes;
+
     return html`
       ${this._currentStatistics.map(
         (statisticId) => html`
@@ -34,8 +75,10 @@ class HaStatisticsPicker extends LitElement {
             <ha-statistic-picker
               .curValue=${statisticId}
               .hass=${this.hass}
+              .includeStatisticsUnitOfMeasurement=${includeStatisticsUnitCurrent}
+              .includeUnitClass=${includeUnitClassCurrent}
               .value=${statisticId}
-              .statisticTypes=${this.statisticTypes}
+              .statisticTypes=${includeStatisticTypesCurrent}
               .statisticIds=${this.statisticIds}
               .label=${this.pickedStatisticLabel}
               @value-changed=${this._statisticChanged}
@@ -46,6 +89,9 @@ class HaStatisticsPicker extends LitElement {
       <div>
         <ha-statistic-picker
           .hass=${this.hass}
+          .includeStatisticsUnitOfMeasurement=${this
+            .includeStatisticsUnitOfMeasurement}
+          .includeUnitClass=${this.includeUnitClass}
           .statisticTypes=${this.statisticTypes}
           .statisticIds=${this.statisticIds}
           .label=${this.pickStatisticLabel}

src/components/ha-camera-stream.ts

@@ -15,6 +15,7 @@ import {
   CAMERA_SUPPORT_STREAM,
   computeMJPEGStreamUrl,
   fetchStreamUrl,
+  fetchThumbnailUrlWithCache,
   STREAM_TYPE_HLS,
   STREAM_TYPE_WEB_RTC,
 } from "../data/camera";
@@ -37,6 +38,9 @@ class HaCameraStream extends LitElement {
   @property({ type: Boolean, attribute: "allow-exoplayer" })
   public allowExoPlayer = false;
 
+  // Video background image before its loaded
+  @state() private _posterUrl?: string;
+
   // We keep track if we should force MJPEG if there was a failure
   // to get the HLS stream url. This is reset if we change entities.
   @state() private _forceMJPEG?: string;
@@ -51,12 +55,14 @@ class HaCameraStream extends LitElement {
       !this._shouldRenderMJPEG &&
       this.stateObj &&
       (changedProps.get("stateObj") as CameraEntity | undefined)?.entity_id !==
-        this.stateObj.entity_id &&
-      this.stateObj!.attributes.frontend_stream_type === STREAM_TYPE_HLS
+        this.stateObj.entity_id
     ) {
-      this._forceMJPEG = undefined;
-      this._url = undefined;
-      this._getStreamUrl();
+      this._getPosterUrl();
+      if (this.stateObj!.attributes.frontend_stream_type === STREAM_TYPE_HLS) {
+        this._forceMJPEG = undefined;
+        this._url = undefined;
+        this._getStreamUrl();
+      }
     }
   }
 
@@ -94,6 +100,7 @@ class HaCameraStream extends LitElement {
             .controls=${this.controls}
             .hass=${this.hass}
             .url=${this._url}
+            .posterUrl=${this._posterUrl}
           ></ha-hls-player>`
         : html``;
     }
@@ -105,6 +112,7 @@ class HaCameraStream extends LitElement {
         .controls=${this.controls}
         .hass=${this.hass}
         .entityid=${this.stateObj.entity_id}
+        .posterUrl=${this._posterUrl}
       ></ha-web-rtc-player>`;
     }
     return html``;
@@ -129,6 +137,20 @@ class HaCameraStream extends LitElement {
     return !isComponentLoaded(this.hass!, "stream");
   }
 
+  private async _getPosterUrl(): Promise<void> {
+    try {
+      this._posterUrl = await fetchThumbnailUrlWithCache(
+        this.hass!,
+        this.stateObj!.entity_id,
+        this.clientWidth,
+        this.clientHeight
+      );
+    } catch (err: any) {
+      // poster url is optional
+      this._posterUrl = undefined;
+    }
+  }
+
   private async _getStreamUrl(): Promise<void> {
     try {
       const { url } = await fetchStreamUrl(

src/components/ha-combo-box.ts

@@ -8,7 +8,14 @@ import type {
   ComboBoxLightValueChangedEvent,
 } from "@vaadin/combo-box/vaadin-combo-box-light";
 import { registerStyles } from "@vaadin/vaadin-themable-mixin/register-styles";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  PropertyValues,
+  TemplateResult,
+} from "lit";
 import { ComboBoxLitRenderer, comboBoxRenderer } from "@vaadin/combo-box/lit";
 import { customElement, property, query } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
@@ -225,11 +232,13 @@ export class HaComboBox extends LitElement {
     // @ts-ignore
     fireEvent(this, ev.type, ev.detail);
 
-    if (
-      opened &&
-      "MutationObserver" in window &&
-      !this._overlayMutationObserver
-    ) {
+    if (opened) {
+      this.removeInertOnOverlay();
+    }
+  }
+
+  private removeInertOnOverlay() {
+    if ("MutationObserver" in window && !this._overlayMutationObserver) {
       const overlay = document.querySelector<HTMLElement>(
         "vaadin-combo-box-overlay"
       );
@@ -268,6 +277,16 @@ export class HaComboBox extends LitElement {
     }
   }
 
+  updated(changedProps: PropertyValues) {
+    super.updated(changedProps);
+    if (
+      changedProps.has("filteredItems") ||
+      (changedProps.has("items") && this.opened)
+    ) {
+      this.removeInertOnOverlay();
+    }
+  }
+
   private _filterChanged(ev: ComboBoxLightFilterChangedEvent) {
     // @ts-ignore
     fireEvent(this, ev.type, ev.detail, { composed: false });
@@ -278,7 +297,7 @@ export class HaComboBox extends LitElement {
     const newValue = ev.detail.value;
 
     if (newValue !== this.value) {
-      fireEvent(this, "value-changed", { value: newValue });
+      fireEvent(this, "value-changed", { value: newValue || undefined });
     }
   }
 
@@ -290,6 +309,7 @@ export class HaComboBox extends LitElement {
       }
       vaadin-combo-box-light {
         position: relative;
+        --vaadin-combo-box-overlay-max-height: calc(45vh);
       }
       ha-textfield {
         width: 100%;

src/components/ha-cover-controls.ts

@@ -3,15 +3,14 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { computeCloseIcon, computeOpenIcon } from "../common/entity/cover_icon";
+import { supportsFeature } from "../common/entity/supports-feature";
 import {
   CoverEntity,
+  CoverEntityFeature,
   isClosing,
   isFullyClosed,
   isFullyOpen,
   isOpening,
-  supportsClose,
-  supportsOpen,
-  supportsStop,
 } from "../data/cover";
 import { UNAVAILABLE } from "../data/entity";
 import type { HomeAssistant } from "../types";
@@ -32,7 +31,7 @@ class HaCoverControls extends LitElement {
       <div class="state">
         <ha-icon-button
           class=${classMap({
-            hidden: !supportsOpen(this.stateObj),
+            hidden: !supportsFeature(this.stateObj, CoverEntityFeature.OPEN),
           })}
           .label=${this.hass.localize(
             "ui.dialogs.more_info_control.cover.open_cover"
@@ -44,7 +43,7 @@ class HaCoverControls extends LitElement {
         </ha-icon-button>
         <ha-icon-button
           class=${classMap({
-            hidden: !supportsStop(this.stateObj),
+            hidden: !supportsFeature(this.stateObj, CoverEntityFeature.STOP),
           })}
           .label=${this.hass.localize(
             "ui.dialogs.more_info_control.cover.stop_cover"
@@ -55,7 +54,7 @@ class HaCoverControls extends LitElement {
         ></ha-icon-button>
         <ha-icon-button
           class=${classMap({
-            hidden: !supportsClose(this.stateObj),
+            hidden: !supportsFeature(this.stateObj, CoverEntityFeature.CLOSE),
           })}
           .label=${this.hass.localize(
             "ui.dialogs.more_info_control.cover.close_cover"

src/components/ha-cover-tilt-controls.ts

@@ -2,13 +2,12 @@ import { mdiArrowBottomLeft, mdiArrowTopRight, mdiStop } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
+import { supportsFeature } from "../common/entity/supports-feature";
 import {
   CoverEntity,
+  CoverEntityFeature,
   isFullyClosedTilt,
   isFullyOpenTilt,
-  supportsCloseTilt,
-  supportsOpenTilt,
-  supportsStopTilt,
 } from "../data/cover";
 import { UNAVAILABLE } from "../data/entity";
 import { HomeAssistant } from "../types";
@@ -27,7 +26,10 @@ class HaCoverTiltControls extends LitElement {
 
     return html` <ha-icon-button
         class=${classMap({
-          invisible: !supportsOpenTilt(this.stateObj),
+          invisible: !supportsFeature(
+            this.stateObj,
+            CoverEntityFeature.OPEN_TILT
+          ),
         })}
         .label=${this.hass.localize(
           "ui.dialogs.more_info_control.cover.open_tilt_cover"
@@ -38,7 +40,10 @@ class HaCoverTiltControls extends LitElement {
       ></ha-icon-button>
       <ha-icon-button
         class=${classMap({
-          invisible: !supportsStopTilt(this.stateObj),
+          invisible: !supportsFeature(
+            this.stateObj,
+            CoverEntityFeature.STOP_TILT
+          ),
         })}
         .label=${this.hass.localize(
           "ui.dialogs.more_info_control.cover.stop_cover"
@@ -49,7 +54,10 @@ class HaCoverTiltControls extends LitElement {
       ></ha-icon-button>
       <ha-icon-button
         class=${classMap({
-          invisible: !supportsCloseTilt(this.stateObj),
+          invisible: !supportsFeature(
+            this.stateObj,
+            CoverEntityFeature.CLOSE_TILT
+          ),
         })}
         .label=${this.hass.localize(
           "ui.dialogs.more_info_control.cover.close_tilt_cover"

src/components/ha-dialog.ts

@@ -91,7 +91,7 @@ export class HaDialog extends DialogBase {
       .header_button {
         position: absolute;
         right: 16px;
-        top: 10px;
+        top: 14px;
         text-decoration: none;
         color: inherit;
       }

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

@@ -26,6 +26,7 @@ export class HaFormFloat extends LitElement implements HaFormElement {
   protected render(): TemplateResult {
     return html`
       <ha-textfield
+        type="numeric"
         inputMode="decimal"
         .label=${this.label}
         .value=${this.data !== undefined ? this.data : ""}
@@ -55,6 +56,11 @@ export class HaFormFloat extends LitElement implements HaFormElement {
       return;
     }
 
+    // Allow user to start typing a negative value
+    if (rawValue === "-") {
+      return;
+    }
+
     if (rawValue !== "") {
       value = parseFloat(rawValue);
       if (isNaN(value)) {

src/components/ha-formfield.ts

@@ -13,6 +13,9 @@ export class HaFormfield extends FormfieldBase {
       switch (input.tagName) {
         case "HA-CHECKBOX":
         case "HA-RADIO":
+          if ((input as any).disabled) {
+            break;
+          }
           (input as any).checked = !(input as any).checked;
           fireEvent(input, "change");
           break;

src/components/ha-gauge.ts

@@ -2,6 +2,7 @@ import { css, LitElement, PropertyValues, svg, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { styleMap } from "lit/directives/style-map";
 import { formatNumber } from "../common/number/format_number";
+import { blankBeforePercent } from "../common/translations/blank_before_percent";
 import { afterNextRender } from "../common/util/render-status";
 import { FrontendLocaleData } from "../data/translation";
 import { getValueInPercentage, normalize } from "../util/calculate";
@@ -133,7 +134,11 @@ export class Gauge extends LitElement {
               ? this._segment_label
               : this.valueText || formatNumber(this.value, this.locale)
           }${
-      this._segment_label ? "" : this.label === "%" ? "%" : ` ${this.label}`
+      this._segment_label
+        ? ""
+        : this.label === "%"
+        ? blankBeforePercent(this.locale) + "%"
+        : ` ${this.label}`
     }
         </text>
       </svg>`;

src/components/ha-hls-player.ts

@@ -23,6 +23,8 @@ class HaHLSPlayer extends LitElement {
 
   @property() public url!: string;
 
+  @property() public posterUrl!: string;
+
   @property({ type: Boolean, attribute: "controls" })
   public controls = false;
 
@@ -78,6 +80,7 @@ class HaHLSPlayer extends LitElement {
         : ""}
       ${!this._errorIsFatal
         ? html`<video
+            .poster=${this.posterUrl}
             ?autoplay=${this.autoPlay}
             .muted=${this.muted}
             ?playsinline=${this.playsInline}
@@ -165,7 +168,7 @@ class HaHLSPlayer extends LitElement {
     window.addEventListener("resize", this._resizeExoPlayer);
     this.updateComplete.then(() => nextRender()).then(this._resizeExoPlayer);
     this._videoEl.style.visibility = "hidden";
-    await this.hass!.auth.external!.sendMessage({
+    await this.hass!.auth.external!.fireMessage({
       type: "exoplayer/play_hls",
       payload: {
         url: new URL(url, window.location.href).toString(),

src/components/ha-icon-overflow-menu.ts

@@ -3,6 +3,8 @@ import { mdiDotsVertical } from "@mdi/js";
 import "@polymer/paper-tooltip/paper-tooltip";
 import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
+import { haStyle } from "../resources/styles";
 import { HomeAssistant } from "../types";
 import "./ha-button-menu";
 import "./ha-icon-button";
@@ -15,7 +17,9 @@ export interface IconOverflowMenuItem {
   narrowOnly?: boolean;
   disabled?: boolean;
   tooltip?: string;
-  onClick: CallableFunction;
+  action: () => any;
+  warning?: boolean;
+  divider?: boolean;
 }
 
 @customElement("ha-icon-overflow-menu")
@@ -43,19 +47,23 @@ export class HaIconOverflowMenu extends LitElement {
                 slot="trigger"
               ></ha-icon-button>
 
-              ${this.items.map(
-                (item) => html`
-                  <mwc-list-item
-                    graphic="icon"
-                    .disabled=${item.disabled}
-                    @click=${item.action}
-                  >
-                    <div slot="graphic">
-                      <ha-svg-icon .path=${item.path}></ha-svg-icon>
-                    </div>
-                    ${item.label}
-                  </mwc-list-item>
-                `
+              ${this.items.map((item) =>
+                item.divider
+                  ? html`<li divider role="separator"></li>`
+                  : html`<mwc-list-item
+                      graphic="icon"
+                      ?disabled=${item.disabled}
+                      @click=${item.action}
+                      class=${classMap({ warning: Boolean(item.warning) })}
+                    >
+                      <div slot="graphic">
+                        <ha-svg-icon
+                          class=${classMap({ warning: Boolean(item.warning) })}
+                          .path=${item.path}
+                        ></ha-svg-icon>
+                      </div>
+                      ${item.label}
+                    </mwc-list-item> `
               )}
             </ha-button-menu>`
         : html`
@@ -63,6 +71,8 @@ export class HaIconOverflowMenu extends LitElement {
             ${this.items.map((item) =>
               item.narrowOnly
                 ? ""
+                : item.divider
+                ? html`<div role="separator"></div>`
                 : html`<div>
                     ${item.tooltip
                       ? html`<paper-tooltip animation-delay="0" position="left">
@@ -73,7 +83,7 @@ export class HaIconOverflowMenu extends LitElement {
                       @click=${item.action}
                       .label=${item.label}
                       .path=${item.path}
-                      .disabled=${item.disabled}
+                      ?disabled=${item.disabled}
                     ></ha-icon-button>
                   </div> `
             )}
@@ -81,7 +91,8 @@ export class HaIconOverflowMenu extends LitElement {
     `;
   }
 
-  protected _handleIconOverflowMenuOpened() {
+  protected _handleIconOverflowMenuOpened(e) {
+    e.stopPropagation();
     // If this component is used inside a data table, the z-index of the row
     // needs to be increased. Otherwise the ha-button-menu would be displayed
     // underneath the next row in the table.
@@ -99,12 +110,22 @@ export class HaIconOverflowMenu extends LitElement {
   }
 
   static get styles() {
-    return css`
-      :host {
-        display: flex;
-        justify-content: flex-end;
-      }
-    `;
+    return [
+      haStyle,
+      css`
+        :host {
+          display: flex;
+          justify-content: flex-end;
+        }
+        li[role="separator"] {
+          border-bottom-color: var(--divider-color);
+        }
+        div[role="separator"] {
+          border-right: 1px solid var(--divider-color);
+          width: 1px;
+        }
+      `,
+    ];
   }
 }
 

src/components/ha-icon-picker.ts

@@ -1,4 +1,4 @@
-import { css, html, LitElement, TemplateResult } from "lit";
+import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
@@ -14,6 +14,7 @@ type IconItem = {
   keywords: string[];
 };
 let iconItems: IconItem[] = [];
+let iconLoaded = false;
 
 // eslint-disable-next-line lit/prefer-static-styles
 const rowRenderer: ComboBoxLitRenderer<IconItem> = (item) => html`<mwc-list-item
@@ -88,15 +89,16 @@ export class HaIconPicker extends LitElement {
 
   private async _openedChanged(ev: PolymerChangedEvent<boolean>) {
     this._opened = ev.detail.value;
-    if (this._opened && !iconItems.length) {
+    if (this._opened && !iconLoaded) {
       const iconList = await import("../../build/mdi/iconList.json");
 
       iconItems = iconList.default.map((icon) => ({
         icon: `mdi:${icon.name}`,
         keywords: icon.keywords,
       }));
+      iconLoaded = true;
 
-      (this.comboBox as any).filteredItems = iconItems;
+      this.comboBox.filteredItems = iconItems;
 
       Object.keys(customIcons).forEach((iconSet) => {
         this._loadCustomIconItems(iconSet);
@@ -116,13 +118,17 @@ export class HaIconPicker extends LitElement {
         keywords: icon.keywords ?? [],
       }));
       iconItems.push(...customIconItems);
-      (this.comboBox as any).filteredItems = iconItems;
+      this.comboBox.filteredItems = iconItems;
     } catch (e) {
       // eslint-disable-next-line
       console.warn(`Unable to load icon list for ${iconsetPrefix} iconset`);
     }
   }
 
+  protected shouldUpdate(changedProps: PropertyValues) {
+    return !this._opened || changedProps.has("_opened");
+  }
+
   private _valueChanged(ev: PolymerChangedEvent<string>) {
     ev.stopPropagation();
     this._setValue(ev.detail.value);
@@ -161,14 +167,12 @@ export class HaIconPicker extends LitElement {
       filteredItems.push(...filteredItemsByKeywords);
 
       if (filteredItems.length > 0) {
-        (this.comboBox as any).filteredItems = filteredItems;
+        this.comboBox.filteredItems = filteredItems;
       } else {
-        (this.comboBox as any).filteredItems = [
-          { icon: filterString, keywords: [] },
-        ];
+        this.comboBox.filteredItems = [{ icon: filterString, keywords: [] }];
       }
     } else {
-      (this.comboBox as any).filteredItems = iconItems;
+      this.comboBox.filteredItems = iconItems;
     }
   }
 

src/components/ha-navigation-picker.ts

@@ -0,0 +1,221 @@
+import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
+import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
+import { customElement, property, query, state } from "lit/decorators";
+import { fireEvent } from "../common/dom/fire_event";
+import { titleCase } from "../common/string/title-case";
+import {
+  fetchConfig,
+  LovelaceConfig,
+  LovelaceViewConfig,
+} from "../data/lovelace";
+import { PolymerChangedEvent } from "../polymer-types";
+import { HomeAssistant, PanelInfo } from "../types";
+import "./ha-combo-box";
+import type { HaComboBox } from "./ha-combo-box";
+import "./ha-icon";
+
+type NavigationItem = {
+  path: string;
+  icon: string;
+  title: string;
+};
+
+const DEFAULT_ITEMS: NavigationItem[] = [];
+
+// eslint-disable-next-line lit/prefer-static-styles
+const rowRenderer: ComboBoxLitRenderer<NavigationItem> = (item) => html`
+  <mwc-list-item graphic="icon" .twoline=${!!item.title}>
+    <ha-icon .icon=${item.icon} slot="graphic"></ha-icon>
+    <span>${item.title || item.path}</span>
+    <span slot="secondary">${item.path}</span>
+  </mwc-list-item>
+`;
+
+const createViewNavigationItem = (
+  prefix: string,
+  view: LovelaceViewConfig,
+  index: number
+) => ({
+  path: `/${prefix}/${view.path ?? index}`,
+  icon: view.icon ?? "mdi:view-compact",
+  title: view.title ?? (view.path ? titleCase(view.path) : `${index}`),
+});
+
+const createPanelNavigationItem = (hass: HomeAssistant, panel: PanelInfo) => ({
+  path: `/${panel.url_path}`,
+  icon: panel.icon ?? "mdi:view-dashboard",
+  title:
+    panel.url_path === hass.defaultPanel
+      ? hass.localize("panel.states")
+      : hass.localize(`panel.${panel.title}`) ||
+        panel.title ||
+        (panel.url_path ? titleCase(panel.url_path) : ""),
+});
+
+@customElement("ha-navigation-picker")
+export class HaNavigationPicker extends LitElement {
+  @property() public hass?: HomeAssistant;
+
+  @property() public label?: string;
+
+  @property() public value?: string;
+
+  @property() public helper?: string;
+
+  @property({ type: Boolean }) public disabled = false;
+
+  @property({ type: Boolean }) public required = false;
+
+  @state() private _opened = false;
+
+  private navigationItemsLoaded = false;
+
+  private navigationItems: NavigationItem[] = DEFAULT_ITEMS;
+
+  @query("ha-combo-box", true) private comboBox!: HaComboBox;
+
+  protected render(): TemplateResult {
+    return html`
+      <ha-combo-box
+        .hass=${this.hass}
+        item-value-path="path"
+        item-label-path="path"
+        .value=${this._value}
+        allow-custom-value
+        .filteredItems=${this.navigationItems}
+        .label=${this.label}
+        .helper=${this.helper}
+        .disabled=${this.disabled}
+        .required=${this.required}
+        .renderer=${rowRenderer}
+        @opened-changed=${this._openedChanged}
+        @value-changed=${this._valueChanged}
+        @filter-changed=${this._filterChanged}
+      >
+      </ha-combo-box>
+    `;
+  }
+
+  private async _openedChanged(ev: PolymerChangedEvent<boolean>) {
+    this._opened = ev.detail.value;
+    if (this._opened && !this.navigationItemsLoaded) {
+      this._loadNavigationItems();
+    }
+  }
+
+  private async _loadNavigationItems() {
+    this.navigationItemsLoaded = true;
+
+    const panels = Object.entries(this.hass!.panels).map(([id, panel]) => ({
+      id,
+      ...panel,
+    }));
+    const lovelacePanels = panels.filter(
+      (panel) => panel.component_name === "lovelace"
+    );
+
+    const viewConfigs = await Promise.all(
+      lovelacePanels.map((panel) =>
+        fetchConfig(
+          this.hass!.connection,
+          // path should be null to fetch default lovelace panel
+          panel.url_path === "lovelace" ? null : panel.url_path,
+          true
+        )
+          .then((config) => [panel.id, config] as [string, LovelaceConfig])
+          .catch((_) => [panel.id, undefined] as [string, undefined])
+      )
+    );
+
+    const panelViewConfig = new Map(viewConfigs);
+
+    this.navigationItems = [];
+
+    for (const panel of panels) {
+      this.navigationItems.push(createPanelNavigationItem(this.hass!, panel));
+
+      const config = panelViewConfig.get(panel.id);
+
+      if (!config) continue;
+
+      config.views.forEach((view, index) =>
+        this.navigationItems.push(
+          createViewNavigationItem(panel.url_path, view, index)
+        )
+      );
+    }
+
+    this.comboBox.filteredItems = this.navigationItems;
+  }
+
+  protected shouldUpdate(changedProps: PropertyValues) {
+    return !this._opened || changedProps.has("_opened");
+  }
+
+  private _valueChanged(ev: PolymerChangedEvent<string>) {
+    ev.stopPropagation();
+    this._setValue(ev.detail.value);
+  }
+
+  private _setValue(value: string) {
+    this.value = value;
+    fireEvent(
+      this,
+      "value-changed",
+      { value: this._value },
+      {
+        bubbles: false,
+        composed: false,
+      }
+    );
+  }
+
+  private _filterChanged(ev: CustomEvent): void {
+    const filterString = ev.detail.value.toLowerCase();
+    const characterCount = filterString.length;
+    if (characterCount >= 2) {
+      const filteredItems: NavigationItem[] = [];
+
+      this.navigationItems.forEach((item) => {
+        if (
+          item.path.toLowerCase().includes(filterString) ||
+          item.title.toLowerCase().includes(filterString)
+        ) {
+          filteredItems.push(item);
+        }
+      });
+
+      if (filteredItems.length > 0) {
+        this.comboBox.filteredItems = filteredItems;
+      } else {
+        this.comboBox.filteredItems = [];
+      }
+    } else {
+      this.comboBox.filteredItems = this.navigationItems;
+    }
+  }
+
+  private get _value() {
+    return this.value || "";
+  }
+
+  static get styles() {
+    return css`
+      ha-icon,
+      ha-svg-icon {
+        color: var(--primary-text-color);
+        position: relative;
+        bottom: 0px;
+      }
+      *[slot="prefix"] {
+        margin-right: 8px;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-navigation-picker": HaNavigationPicker;
+  }
+}

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

@@ -0,0 +1,47 @@
+import { html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators";
+import { fireEvent } from "../../common/dom/fire_event";
+import { NavigationSelector } from "../../data/selector";
+import { HomeAssistant } from "../../types";
+import "../ha-navigation-picker";
+
+@customElement("ha-selector-navigation")
+export class HaNavigationSelector extends LitElement {
+  @property() public hass!: HomeAssistant;
+
+  @property() public selector!: NavigationSelector;
+
+  @property() public value?: string;
+
+  @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-navigation-picker
+        .hass=${this.hass}
+        .label=${this.label}
+        .value=${this.value}
+        .required=${this.required}
+        .disabled=${this.disabled}
+        .helper=${this.helper}
+        @value-changed=${this._valueChanged}
+      ></ha-navigation-picker>
+    `;
+  }
+
+  private _valueChanged(ev: CustomEvent) {
+    fireEvent(this, "value-changed", { value: ev.detail.value });
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-selector-navigation": HaNavigationSelector;
+  }
+}

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

@@ -51,8 +51,9 @@ export class HaNumberSelector extends LitElement {
             `
           : ""}
         <ha-textfield
-          inputMode="numeric"
-          pattern="[0-9]+([\\.][0-9]+)?"
+          .inputMode=${(this.selector.number.step || 1) % 1 !== 0
+            ? "decimal"
+            : "numeric"}
           .label=${this.selector.number.mode !== "box" ? undefined : this.label}
           .placeholder=${this.placeholder}
           class=${classMap({ single: this.selector.number.mode === "box" })}

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

@@ -13,6 +13,7 @@ import type { HaComboBox } from "../ha-combo-box";
 import "../ha-formfield";
 import "../ha-radio";
 import "../ha-select";
+import "../ha-input-helper-text";
 
 @customElement("ha-selector-select")
 export class HaSelectSelector extends LitElement {
@@ -40,7 +41,7 @@ export class HaSelectSelector extends LitElement {
     );
 
     if (!this.selector.select.custom_value && this._mode === "list") {
-      if (!this.selector.select.multiple || this.required) {
+      if (!this.selector.select.multiple) {
         return html`
           <div>
             ${this.label}
@@ -50,7 +51,7 @@ export class HaSelectSelector extends LitElement {
                   <ha-radio
                     .checked=${item.value === this.value}
                     .value=${item.value}
-                    .disabled=${this.disabled}
+                    .disabled=${item.disabled || this.disabled}
                     @change=${this._valueChanged}
                   ></ha-radio>
                 </ha-formfield>
@@ -63,13 +64,14 @@ export class HaSelectSelector extends LitElement {
 
       return html`
         <div>
-          ${this.label}${options.map(
+          ${this.label}
+          ${options.map(
             (item: SelectOption) => html`
               <ha-formfield .label=${item.label}>
                 <ha-checkbox
                   .checked=${this.value?.includes(item.value)}
                   .value=${item.value}
-                  .disabled=${this.disabled}
+                  .disabled=${item.disabled || this.disabled}
                   @change=${this._checkboxChanged}
                 ></ha-checkbox>
               </ha-formfield>
@@ -112,7 +114,9 @@ export class HaSelectSelector extends LitElement {
           .disabled=${this.disabled}
           .required=${this.required && !value.length}
           .value=${this._filter}
-          .items=${options.filter((item) => !this.value?.includes(item.value))}
+          .items=${options.filter(
+            (option) => !option.disabled && !value?.includes(option.value)
+          )}
           @filter-changed=${this._filterChanged}
           @value-changed=${this._comboBoxValueChanged}
         ></ha-combo-box>
@@ -136,7 +140,7 @@ export class HaSelectSelector extends LitElement {
           .helper=${this.helper}
           .disabled=${this.disabled}
           .required=${this.required}
-          .items=${options}
+          .items=${options.filter((item) => !item.disabled)}
           .value=${this.value}
           @filter-changed=${this._filterChanged}
           @value-changed=${this._comboBoxValueChanged}
@@ -157,7 +161,9 @@ export class HaSelectSelector extends LitElement {
       >
         ${options.map(
           (item: SelectOption) => html`
-            <mwc-list-item .value=${item.value}>${item.label}</mwc-list-item>
+            <mwc-list-item .value=${item.value} .disabled=${item.disabled}
+              >${item.label}</mwc-list-item
+            >
           `
         )}
       </ha-select>
@@ -285,6 +291,9 @@ export class HaSelectSelector extends LitElement {
     ha-formfield {
       display: block;
     }
+    mwc-list-item[disabled] {
+      --mdc-theme-text-primary-on-background: var(--disabled-text-color);
+    }
   `;
 }
 

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

@@ -16,6 +16,7 @@ import "./ha-selector-device";
 import "./ha-selector-duration";
 import "./ha-selector-entity";
 import "./ha-selector-file";
+import "./ha-selector-navigation";
 import "./ha-selector-number";
 import "./ha-selector-object";
 import "./ha-selector-select";

src/components/ha-service-control.ts

@@ -55,12 +55,14 @@ export class HaServiceControl extends LitElement {
     data?: Record<string, any>;
   };
 
-  @state() private _value!: this["value"];
+  @property({ type: Boolean }) public disabled = false;
 
   @property({ reflect: true, type: Boolean }) public narrow!: boolean;
 
   @property({ type: Boolean }) public showAdvanced?: boolean;
 
+  @state() private _value!: this["value"];
+
   @state() private _checkedKeys = new Set();
 
   @state() private _manifest?: IntegrationManifest;
@@ -227,6 +229,7 @@ export class HaServiceControl extends LitElement {
     return html`<ha-service-picker
         .hass=${this.hass}
         .value=${this._value?.service}
+        .disabled=${this.disabled}
         @value-changed=${this._serviceChanged}
       ></ha-service-picker>
       <div class="description">
@@ -273,6 +276,7 @@ export class HaServiceControl extends LitElement {
               .selector=${serviceData.target
                 ? { target: serviceData.target }
                 : { target: {} }}
+              .disabled=${this.disabled}
               @value-changed=${this._targetChanged}
               .value=${this._value?.target}
             ></ha-selector
@@ -280,6 +284,7 @@ export class HaServiceControl extends LitElement {
         : entityId
         ? html`<ha-entity-picker
             .hass=${this.hass}
+            .disabled=${this.disabled}
             .value=${this._value?.data?.entity_id}
             .label=${entityId.description}
             @value-changed=${this._entityPicked}
@@ -291,6 +296,7 @@ export class HaServiceControl extends LitElement {
             .hass=${this.hass}
             .label=${this.hass.localize("ui.components.service-control.data")}
             .name=${"data"}
+            .readOnly=${this.disabled}
             .defaultValue=${this._value?.data}
             @value-changed=${this._dataChanged}
           ></ha-yaml-editor>`
@@ -311,16 +317,18 @@ export class HaServiceControl extends LitElement {
                         .checked=${this._checkedKeys.has(dataField.key) ||
                         (this._value?.data &&
                           this._value.data[dataField.key] !== undefined)}
+                        .disabled=${this.disabled}
                         @change=${this._checkboxChanged}
                         slot="prefix"
                       ></ha-checkbox>`}
                   <span slot="heading">${dataField.name || dataField.key}</span>
                   <span slot="description">${dataField?.description}</span>
                   <ha-selector
-                    .disabled=${showOptional &&
-                    !this._checkedKeys.has(dataField.key) &&
-                    (!this._value?.data ||
-                      this._value.data[dataField.key] === undefined)}
+                    .disabled=${this.disabled ||
+                    (showOptional &&
+                      !this._checkedKeys.has(dataField.key) &&
+                      (!this._value?.data ||
+                        this._value.data[dataField.key] === undefined))}
                     .hass=${this.hass}
                     .selector=${dataField.selector}
                     .key=${dataField.key}

src/components/ha-service-picker.ts

@@ -20,6 +20,8 @@ const rowRenderer: ComboBoxLitRenderer<{ service: string; name: string }> = (
 class HaServicePicker extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
+  @property({ type: Boolean }) public disabled = false;
+
   @property() public value?: string;
 
   @state() private _filter?: string;
@@ -35,6 +37,7 @@ class HaServicePicker extends LitElement {
           this._filter
         )}
         .value=${this.value}
+        .disabled=${this.disabled}
         .renderer=${rowRenderer}
         item-value-path="service"
         item-label-path="name"

src/components/ha-sidebar.ts

@@ -221,13 +221,15 @@ class HaSidebar extends SubscribeMixin(LitElement) {
   private _sortable?: SortableInstance;
 
   public hassSubscribe(): UnsubscribeFunc[] {
-    return [
-      subscribeRepairsIssueRegistry(this.hass.connection!, (repairs) => {
-        this._issuesCount = repairs.issues.filter(
-          (issue) => !issue.ignored
-        ).length;
-      }),
-    ];
+    return this.hass.user?.is_admin
+      ? [
+          subscribeRepairsIssueRegistry(this.hass.connection!, (repairs) => {
+            this._issuesCount = repairs.issues.filter(
+              (issue) => !issue.ignored
+            ).length;
+          }),
+        ]
+      : [];
   }
 
   protected render() {

src/components/ha-textfield.ts

@@ -82,6 +82,16 @@ export class HaTextField extends TextFieldBase {
         direction: var(--direction);
       }
 
+      .mdc-floating-label:not(.mdc-floating-label--float-above) {
+        text-overflow: ellipsis;
+        width: inherit;
+        padding-right: 30px;
+        padding-inline-end: 30px;
+        padding-inline-start: initial;
+        box-sizing: border-box;
+        direction: var(--direction);
+      }
+
       input {
         text-align: var(--text-field-text-align, start);
       }
@@ -111,7 +121,7 @@ export class HaTextField extends TextFieldBase {
         inset-inline-end: initial !important;
         transform-origin: var(--float-start);
         direction: var(--direction);
-        transform-origin: var(--float-start);
+        text-align: var(--float-start);
       }
 
       .mdc-text-field--with-leading-icon.mdc-text-field--filled

src/components/ha-web-rtc-player.ts

@@ -34,6 +34,8 @@ class HaWebRtcPlayer extends LitElement {
   @property({ type: Boolean, attribute: "playsinline" })
   public playsInline = false;
 
+  @property() public posterUrl!: string;
+
   @state() private _error?: string;
 
   // don't cache this, as we remove it on disconnects
@@ -54,6 +56,7 @@ class HaWebRtcPlayer extends LitElement {
         .muted=${this.muted}
         ?playsinline=${this.playsInline}
         ?controls=${this.controls}
+        .poster=${this.posterUrl}
       ></video>
     `;
   }

src/components/trace/trace-tab-styles.ts

@@ -28,7 +28,7 @@ export const traceTabStyles = css`
   }
 
   .tabs > *.active {
-    border-bottom-color: var(--accent-color);
+    border-bottom-color: var(--primary-color);
   }
 
   .tabs > *:focus,

src/data/application_credential.ts

@@ -8,6 +8,10 @@ export interface ApplicationCredentialsConfig {
   integrations: Record<string, ApplicationCredentialsDomainConfig>;
 }
 
+export interface ApplicationCredentialsConfigEntry {
+  application_credentials_id?: string;
+}
+
 export interface ApplicationCredential {
   id: string;
   domain: string;
@@ -21,6 +25,15 @@ export const fetchApplicationCredentialsConfig = async (hass: HomeAssistant) =>
     type: "application_credentials/config",
   });
 
+export const fetchApplicationCredentialsConfigEntry = async (
+  hass: HomeAssistant,
+  configEntryId: string
+) =>
+  hass.callWS<ApplicationCredentialsConfigEntry>({
+    type: "application_credentials/config_entry",
+    config_entry_id: configEntryId,
+  });
+
 export const fetchApplicationCredentials = async (hass: HomeAssistant) =>
   hass.callWS<ApplicationCredential[]>({
     type: "application_credentials/list",

src/data/automation.ts

@@ -9,6 +9,7 @@ import { DeviceCondition, DeviceTrigger } from "./device_automation";
 import { Action, MODES } from "./script";
 
 export const AUTOMATION_DEFAULT_MODE: typeof MODES[number] = "single";
+export const AUTOMATION_DEFAULT_MAX = 10;
 
 export interface AutomationEntity extends HassEntityBase {
   attributes: HassEntityAttributeBase & {
@@ -310,14 +311,37 @@ export const deleteAutomation = (hass: HomeAssistant, id: string) =>
 
 let inititialAutomationEditorData: Partial<AutomationConfig> | undefined;
 
-export const getAutomationConfig = (hass: HomeAssistant, id: string) =>
+export const fetchAutomationFileConfig = (hass: HomeAssistant, id: string) =>
   hass.callApi<AutomationConfig>("GET", `config/automation/config/${id}`);
 
+export const getAutomationStateConfig = (
+  hass: HomeAssistant,
+  entity_id: string
+) =>
+  hass.callWS<{ config: AutomationConfig }>({
+    type: "automation/config",
+    entity_id,
+  });
+
+export const saveAutomationConfig = (
+  hass: HomeAssistant,
+  id: string,
+  config: AutomationConfig
+) => hass.callApi<void>("POST", `config/automation/config/${id}`, config);
+
 export const showAutomationEditor = (data?: Partial<AutomationConfig>) => {
   inititialAutomationEditorData = data;
   navigate("/config/automation/edit/new");
 };
 
+export const duplicateAutomation = (config: AutomationConfig) => {
+  showAutomationEditor({
+    ...config,
+    id: undefined,
+    alias: undefined,
+  });
+};
+
 export const getAutomationEditorInitData = () => {
   const data = inititialAutomationEditorData;
   inititialAutomationEditorData = undefined;

src/data/automation_i18n.ts

@@ -1,7 +1,15 @@
+import { formatDuration } from "../common/datetime/format_duration";
 import secondsToDuration from "../common/datetime/seconds_to_duration";
+import { ensureArray } from "../common/ensure-array";
 import { computeStateName } from "../common/entity/compute_state_name";
 import type { HomeAssistant } from "../types";
 import { Condition, Trigger } from "./automation";
+import {
+  DeviceCondition,
+  DeviceTrigger,
+  localizeDeviceAutomationCondition,
+  localizeDeviceAutomationTrigger,
+} from "./device_automation";
 import { formatAttributeName } from "./entity_attributes";
 
 export const describeTrigger = (
@@ -68,7 +76,7 @@ export const describeTrigger = (
   }
 
   // State Trigger
-  if (trigger.platform === "state" && trigger.entity_id) {
+  if (trigger.platform === "state") {
     let base = "When";
     let entities = "";
 
@@ -89,12 +97,17 @@ export const describeTrigger = (
           } ${computeStateName(states[entity]) || entity}`;
         }
       }
-    } else {
+    } else if (trigger.entity_id) {
       entities = states[trigger.entity_id]
         ? computeStateName(states[trigger.entity_id])
         : trigger.entity_id;
     }
 
+    if (!entities) {
+      // no entity_id or empty array
+      entities = "something";
+    }
+
     base += ` ${entities} changes`;
 
     if (trigger.from) {
@@ -128,17 +141,19 @@ export const describeTrigger = (
       base += ` to ${to}`;
     }
 
-    if ("for" in trigger) {
-      let duration: string;
+    if (trigger.for) {
+      let duration: string | null;
       if (typeof trigger.for === "number") {
-        duration = `for ${secondsToDuration(trigger.for)!}`;
+        duration = secondsToDuration(trigger.for);
       } else if (typeof trigger.for === "string") {
-        duration = `for ${trigger.for}`;
+        duration = trigger.for;
       } else {
-        duration = `for ${JSON.stringify(trigger.for)}`;
+        duration = formatDuration(trigger.for);
       }
 
-      base += ` for ${duration}`;
+      if (duration) {
+        base += ` for ${duration}`;
+      }
     }
 
     return base;
@@ -174,7 +189,11 @@ export const describeTrigger = (
   // Time Trigger
   if (trigger.platform === "time" && trigger.at) {
     const at = trigger.at.includes(".")
-      ? hass.states[trigger.at] || trigger.at
+      ? `entity ${
+          hass.states[trigger.at]
+            ? computeStateName(hass.states[trigger.at])
+            : trigger.at
+        }`
       : trigger.at;
 
     return `When the time is equal to ${at}`;
@@ -280,7 +299,7 @@ export const describeTrigger = (
   }
   // MQTT Trigger
   if (trigger.platform === "mqtt") {
-    return "When a MQTT payload has been received";
+    return "When an MQTT message has been received";
   }
 
   // Template Trigger
@@ -292,7 +311,25 @@ export const describeTrigger = (
   if (trigger.platform === "webhook") {
     return "When a Webhook payload has been received";
   }
-  return `${trigger.platform || "Unknown"} trigger`;
+
+  if (trigger.platform === "device") {
+    if (!trigger.device_id) {
+      return "Device trigger";
+    }
+    const config = trigger as DeviceTrigger;
+    const localized = localizeDeviceAutomationTrigger(hass, config);
+    if (localized) {
+      return localized;
+    }
+    const stateObj = hass.states[config.entity_id as string];
+    return `${stateObj ? computeStateName(stateObj) : config.entity_id} ${
+      config.type
+    }`;
+  }
+
+  return `${
+    trigger.platform ? trigger.platform.replace(/_/g, " ") : "Unknown"
+  } trigger`;
 };
 
 export const describeCondition = (
@@ -304,15 +341,64 @@ export const describeCondition = (
     return condition.alias;
   }
 
-  if (["or", "and", "not"].includes(condition.condition)) {
-    return `multiple conditions using "${condition.condition}"`;
+  if (!condition.condition) {
+    const shorthands: Array<"and" | "or" | "not"> = ["and", "or", "not"];
+    for (const key of shorthands) {
+      if (!(key in condition)) {
+        continue;
+      }
+      if (ensureArray(condition[key])) {
+        condition = {
+          condition: key,
+          conditions: condition[key],
+        };
+      }
+    }
+  }
+
+  if (condition.condition === "or") {
+    const conditions = ensureArray(condition.conditions);
+
+    let count = "condition";
+
+    if (conditions && conditions.length > 0) {
+      count = `of ${conditions.length} conditions`;
+    }
+
+    return `Test if any ${count} matches`;
+  }
+
+  if (condition.condition === "and") {
+    const conditions = ensureArray(condition.conditions);
+
+    const count =
+      conditions && conditions.length > 0
+        ? `${conditions.length} `
+        : "multiple";
+
+    return `Test if ${count} conditions match`;
+  }
+
+  if (condition.condition === "not") {
+    const conditions = ensureArray(condition.conditions);
+
+    const what =
+      conditions && conditions.length > 0
+        ? `none of ${conditions.length} conditions match`
+        : "no condition matches";
+
+    return `Test if ${what}`;
   }
 
   // State Condition
-  if (condition.condition === "state" && condition.entity_id) {
+  if (condition.condition === "state") {
     let base = "Confirm";
     const stateObj = hass.states[condition.entity_id];
-    const entity = stateObj ? computeStateName(stateObj) : condition.entity_id;
+    const entity = stateObj
+      ? computeStateName(stateObj)
+      : condition.entity_id
+      ? condition.entity_id
+      : "an entity";
 
     if ("attribute" in condition) {
       base += ` ${condition.attribute} from`;
@@ -328,10 +414,14 @@ export const describeCondition = (
             : ""
         } ${state}`;
       }
-    } else {
+    } else if (condition.state) {
       states = condition.state.toString();
     }
 
+    if (!states) {
+      states = "a state";
+    }
+
     base += ` ${entity} is ${states}`;
 
     if ("for" in condition) {
@@ -467,5 +557,29 @@ export const describeCondition = (
     }`;
   }
 
-  return `${condition.condition} condition`;
+  if (condition.condition === "device") {
+    if (!condition.device_id) {
+      return "Device condition";
+    }
+    const config = condition as DeviceCondition;
+    const localized = localizeDeviceAutomationCondition(hass, config);
+    if (localized) {
+      return localized;
+    }
+    const stateObj = hass.states[config.entity_id as string];
+    return `${stateObj ? computeStateName(stateObj) : config.entity_id} ${
+      config.type
+    }`;
+  }
+
+  if (condition.condition === "trigger") {
+    if (!condition.id) {
+      return "Trigger condition";
+    }
+    return `When triggered by ${condition.id}`;
+  }
+
+  return `${
+    condition.condition ? condition.condition.replace(/_/g, " ") : "Unknown"
+  } condition`;
 };

src/data/camera.ts

@@ -6,6 +6,7 @@ import { timeCacheEntityPromiseFunc } from "../common/util/time-cache-entity-pro
 import { HomeAssistant } from "../types";
 import { getSignedPath } from "./auth";
 
+export const CAMERA_ORIENTATIONS = [1, 2, 3, 4, 6, 8];
 export const CAMERA_SUPPORT_ON_OFF = 1;
 export const CAMERA_SUPPORT_STREAM = 2;
 
@@ -26,6 +27,7 @@ export interface CameraEntity extends HassEntityBase {
 
 export interface CameraPreferences {
   preload_stream: boolean;
+  orientation: number;
 }
 
 export interface CameraThumbnail {
@@ -109,11 +111,13 @@ export const fetchCameraPrefs = (hass: HomeAssistant, entityId: string) =>
     entity_id: entityId,
   });
 
+type ValueOf<T extends any[]> = T[number];
 export const updateCameraPrefs = (
   hass: HomeAssistant,
   entityId: string,
   prefs: {
     preload_stream?: boolean;
+    orientation?: ValueOf<typeof CAMERA_ORIENTATIONS>;
   }
 ) =>
   hass.callWS<CameraPreferences>({

src/data/config_entries.ts

@@ -1,3 +1,4 @@
+import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { HomeAssistant } from "../types";
 
 export interface ConfigEntry {
@@ -44,6 +45,29 @@ export const RECOVERABLE_STATES: ConfigEntry["state"][] = [
   "setup_retry",
 ];
 
+export interface ConfigEntryUpdate {
+  // null means no update as is the current state
+  type: null | "added" | "removed" | "updated";
+  entry: ConfigEntry;
+}
+
+export const subscribeConfigEntries = (
+  hass: HomeAssistant,
+  callbackFunction: (message: ConfigEntryUpdate[]) => void,
+  filters?: { type?: "helper" | "integration"; domain?: string }
+): Promise<UnsubscribeFunc> => {
+  const params: any = {
+    type: "config_entries/subscribe",
+  };
+  if (filters && filters.type) {
+    params.type_filter = filters.type;
+  }
+  return hass.connection.subscribeMessage<ConfigEntryUpdate[]>(
+    (message) => callbackFunction(message),
+    params
+  );
+};
+
 export const getConfigEntries = (
   hass: HomeAssistant,
   filters?: { type?: "helper" | "integration"; domain?: string }

src/data/cover.ts

@@ -4,46 +4,16 @@ import {
 } from "home-assistant-js-websocket";
 import { supportsFeature } from "../common/entity/supports-feature";
 
-export const SUPPORT_OPEN = 1;
-export const SUPPORT_CLOSE = 2;
-export const SUPPORT_SET_POSITION = 4;
-export const SUPPORT_STOP = 8;
-export const SUPPORT_OPEN_TILT = 16;
-export const SUPPORT_CLOSE_TILT = 32;
-export const SUPPORT_STOP_TILT = 64;
-export const SUPPORT_SET_TILT_POSITION = 128;
-
-export const FEATURE_CLASS_NAMES = {
-  4: "has-set_position",
-  16: "has-open_tilt",
-  32: "has-close_tilt",
-  64: "has-stop_tilt",
-  128: "has-set_tilt_position",
-};
-
-export const supportsOpen = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_OPEN);
-
-export const supportsClose = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_CLOSE);
-
-export const supportsSetPosition = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_SET_POSITION);
-
-export const supportsStop = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_STOP);
-
-export const supportsOpenTilt = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_OPEN_TILT);
-
-export const supportsCloseTilt = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_CLOSE_TILT);
-
-export const supportsStopTilt = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_STOP_TILT);
-
-export const supportsSetTiltPosition = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_SET_TILT_POSITION);
+export const enum CoverEntityFeature {
+  OPEN = 1,
+  CLOSE = 2,
+  SET_POSITION = 4,
+  STOP = 8,
+  OPEN_TILT = 16,
+  CLOSE_TILT = 32,
+  STOP_TILT = 64,
+  SET_TILT_POSITION = 128,
+}
 
 export function isFullyOpen(stateObj: CoverEntity) {
   if (stateObj.attributes.current_position !== undefined) {
@@ -77,17 +47,19 @@ export function isClosing(stateObj: CoverEntity) {
 
 export function isTiltOnly(stateObj: CoverEntity) {
   const supportsCover =
-    supportsOpen(stateObj) || supportsClose(stateObj) || supportsStop(stateObj);
+    supportsFeature(stateObj, CoverEntityFeature.OPEN) ||
+    supportsFeature(stateObj, CoverEntityFeature.CLOSE) ||
+    supportsFeature(stateObj, CoverEntityFeature.STOP);
   const supportsTilt =
-    supportsOpenTilt(stateObj) ||
-    supportsCloseTilt(stateObj) ||
-    supportsStopTilt(stateObj);
+    supportsFeature(stateObj, CoverEntityFeature.OPEN_TILT) ||
+    supportsFeature(stateObj, CoverEntityFeature.CLOSE_TILT) ||
+    supportsFeature(stateObj, CoverEntityFeature.STOP_TILT);
   return supportsTilt && !supportsCover;
 }
 
 interface CoverEntityAttributes extends HassEntityAttributeBase {
-  current_position: number;
-  current_tilt_position: number;
+  current_position?: number;
+  current_tilt_position?: number;
 }
 
 export interface CoverEntity extends HassEntityBase {

src/data/energy.ts

@@ -20,7 +20,8 @@ import {
   getStatisticMetadata,
   Statistics,
   StatisticsMetaData,
-} from "./history";
+  StatisticsUnitConfiguration,
+} from "./recorder";
 
 const energyCollectionKeys: (string | undefined)[] = [];
 
@@ -28,7 +29,6 @@ export const emptyFlowFromGridSourceEnergyPreference =
   (): FlowFromGridSourceEnergyPreference => ({
     stat_energy_from: "",
     stat_cost: null,
-    entity_energy_from: null,
     entity_energy_price: null,
     number_energy_price: null,
   });
@@ -37,7 +37,6 @@ export const emptyFlowToGridSourceEnergyPreference =
   (): FlowToGridSourceEnergyPreference => ({
     stat_energy_to: "",
     stat_compensation: null,
-    entity_energy_to: null,
     entity_energy_price: null,
     number_energy_price: null,
   });
@@ -67,7 +66,6 @@ export const emptyGasEnergyPreference = (): GasSourceTypeEnergyPreference => ({
   type: "gas",
   stat_energy_from: "",
   stat_cost: null,
-  entity_energy_from: null,
   entity_energy_price: null,
   number_energy_price: null,
 });
@@ -92,7 +90,6 @@ export interface FlowFromGridSourceEnergyPreference {
   stat_cost: string | null;
 
   // Can be used to generate costs if stat_cost omitted
-  entity_energy_from: string | null;
   entity_energy_price: string | null;
   number_energy_price: number | null;
 }
@@ -104,8 +101,7 @@ export interface FlowToGridSourceEnergyPreference {
   // $ meter
   stat_compensation: string | null;
 
-  // Can be used to generate costs if stat_cost omitted
-  entity_energy_to: string | null;
+  // Can be used to generate costs if stat_compensation omitted
   entity_energy_price: string | null;
   number_energy_price: number | null;
 }
@@ -141,7 +137,6 @@ export interface GasSourceTypeEnergyPreference {
   stat_cost: string | null;
 
   // Can be used to generate costs if stat_cost omitted
-  entity_energy_from: string | null;
   entity_energy_price: string | null;
   number_energy_price: number | null;
   unit_of_measurement?: string | null;
@@ -358,12 +353,19 @@ const getEnergyData = async (
   // Subtract 1 hour from start to get starting point data
   const startMinHour = addHours(start, -1);
 
+  const lengthUnit = hass.config.unit_system.length || "";
+  const units: StatisticsUnitConfiguration = {
+    energy: "kWh",
+    volume: lengthUnit === "km" ? "m³" : "ft³",
+  };
+
   const stats = await fetchStatistics(
     hass!,
     startMinHour,
     end,
     statIDs,
-    period
+    period,
+    units
   );
 
   let statsCompare;
@@ -385,7 +387,8 @@ const getEnergyData = async (
       compareStartMinHour,
       endCompare,
       statIDs,
-      period
+      period,
+      units
     );
   }
 
@@ -597,20 +600,14 @@ export const getEnergySolarForecasts = (hass: HomeAssistant) =>
     type: "energy/solar_forecast",
   });
 
-export const ENERGY_GAS_VOLUME_UNITS = ["m³"];
-export const ENERGY_GAS_ENERGY_UNITS = ["kWh"];
-export const ENERGY_GAS_UNITS = [
-  ...ENERGY_GAS_VOLUME_UNITS,
-  ...ENERGY_GAS_ENERGY_UNITS,
-];
+const energyGasUnitClass = ["volume", "energy"] as const;
+export type EnergyGasUnitClass = typeof energyGasUnitClass[number];
 
-export type EnergyGasUnit = "volume" | "energy";
-
-export const getEnergyGasUnitCategory = (
+export const getEnergyGasUnitClass = (
   prefs: EnergyPreferences,
   statisticsMetaData: Record<string, StatisticsMetaData> = {},
   excludeSource?: string
-): EnergyGasUnit | undefined => {
+): EnergyGasUnitClass | undefined => {
   for (const source of prefs.energy_sources) {
     if (source.type !== "gas") {
       continue;
@@ -619,29 +616,29 @@ export const getEnergyGasUnitCategory = (
       continue;
     }
     const statisticIdWithMeta = statisticsMetaData[source.stat_energy_from];
-    if (statisticIdWithMeta) {
-      return ENERGY_GAS_VOLUME_UNITS.includes(
-        statisticIdWithMeta.display_unit_of_measurement
+    if (
+      energyGasUnitClass.includes(
+        statisticIdWithMeta.unit_class as EnergyGasUnitClass
       )
-        ? "volume"
-        : "energy";
+    ) {
+      return statisticIdWithMeta.unit_class as EnergyGasUnitClass;
     }
   }
   return undefined;
 };
 
 export const getEnergyGasUnit = (
+  hass: HomeAssistant,
   prefs: EnergyPreferences,
   statisticsMetaData: Record<string, StatisticsMetaData> = {}
 ): string | undefined => {
-  for (const source of prefs.energy_sources) {
-    if (source.type !== "gas") {
-      continue;
-    }
-    const statisticIdWithMeta = statisticsMetaData[source.stat_energy_from];
-    if (statisticIdWithMeta?.display_unit_of_measurement) {
-      return statisticIdWithMeta.display_unit_of_measurement;
-    }
+  const unitClass = getEnergyGasUnitClass(prefs, statisticsMetaData);
+  if (unitClass === undefined) {
+    return undefined;
   }
-  return undefined;
+  return unitClass === "energy"
+    ? "kWh"
+    : hass.config.unit_system.length === "km"
+    ? "m³"
+    : "ft³";
 };

src/data/entity_registry.ts

@@ -1,11 +1,13 @@
 import { Connection, createCollection } from "home-assistant-js-websocket";
 import { Store } from "home-assistant-js-websocket/dist/store";
+import memoizeOne from "memoize-one";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { caseInsensitiveStringCompare } from "../common/string/compare";
 import { debounce } from "../common/util/debounce";
 import { HomeAssistant } from "../types";
 
 export interface EntityRegistryEntry {
+  id: string;
   entity_id: string;
   name: string | null;
   icon: string | null;
@@ -18,10 +20,10 @@ export interface EntityRegistryEntry {
   entity_category: "config" | "diagnostic" | null;
   has_entity_name: boolean;
   original_name?: string;
+  unique_id: string;
 }
 
 export interface ExtEntityRegistryEntry extends EntityRegistryEntry {
-  unique_id: string;
   capabilities: Record<string, unknown>;
   original_icon?: string;
   device_class?: string;
@@ -59,7 +61,7 @@ export interface EntityRegistryEntryUpdateParams {
   hidden_by: string | null;
   new_entity_id?: string;
   options_domain?: string;
-  options?: SensorEntityOptions | WeatherEntityOptions;
+  options?: SensorEntityOptions | NumberEntityOptions | WeatherEntityOptions;
 }
 
 export const findBatteryEntity = (
@@ -91,7 +93,10 @@ export const computeEntityRegistryName = (
     return entry.name;
   }
   const state = hass.states[entry.entity_id];
-  return state ? computeStateName(state) : entry.entity_id;
+  if (state) {
+    return computeStateName(state);
+  }
+  return entry.original_name ? entry.original_name : entry.entity_id;
 };
 
 export const getExtendedEntityRegistryEntry = (
@@ -161,6 +166,16 @@ export const sortEntityRegistryByName = (entries: EntityRegistryEntry[]) =>
     caseInsensitiveStringCompare(entry1.name || "", entry2.name || "")
   );
 
+export const entityRegistryById = memoizeOne(
+  (entries: HomeAssistant["entities"]) => {
+    const entities: HomeAssistant["entities"] = {};
+    for (const entity of Object.values(entries)) {
+      entities[entity.id] = entity;
+    }
+    return entities;
+  }
+);
+
 export const getEntityPlatformLookup = (
   entities: EntityRegistryEntry[]
 ): Record<string, string> => {

src/data/history.ts

@@ -1,10 +1,7 @@
 import { HassEntities, HassEntity } from "home-assistant-js-websocket";
 import { computeDomain } from "../common/entity/compute_domain";
 import { computeStateDisplayFromEntityAttributes } from "../common/entity/compute_state_display";
-import {
-  computeStateName,
-  computeStateNameFromEntityAttributes,
-} from "../common/entity/compute_state_name";
+import { computeStateNameFromEntityAttributes } from "../common/entity/compute_state_name";
 import { LocalizeFunc } from "../common/translations/localize";
 import { HomeAssistant } from "../types";
 import { FrontendLocaleData } from "./translation";
@@ -63,87 +60,6 @@ export interface HistoryResult {
   timeline: TimelineEntity[];
 }
 
-export type StatisticType = "sum" | "min" | "max" | "mean";
-
-export interface Statistics {
-  [statisticId: string]: StatisticValue[];
-}
-
-export interface StatisticValue {
-  statistic_id: string;
-  start: string;
-  end: string;
-  last_reset: string | null;
-  max: number | null;
-  mean: number | null;
-  min: number | null;
-  sum: number | null;
-  state: number | null;
-}
-
-export interface StatisticsMetaData {
-  display_unit_of_measurement: string;
-  statistics_unit_of_measurement: string;
-  statistic_id: string;
-  source: string;
-  name?: string | null;
-  has_sum: boolean;
-  has_mean: boolean;
-}
-
-export type StatisticsValidationResult =
-  | StatisticsValidationResultNoState
-  | StatisticsValidationResultEntityNotRecorded
-  | StatisticsValidationResultEntityNoLongerRecorded
-  | StatisticsValidationResultUnsupportedStateClass
-  | StatisticsValidationResultUnitsChanged
-  | StatisticsValidationResultUnsupportedUnitMetadata
-  | StatisticsValidationResultUnsupportedUnitState;
-
-export interface StatisticsValidationResultNoState {
-  type: "no_state";
-  data: { statistic_id: string };
-}
-
-export interface StatisticsValidationResultEntityNoLongerRecorded {
-  type: "entity_no_longer_recorded";
-  data: { statistic_id: string };
-}
-
-export interface StatisticsValidationResultEntityNotRecorded {
-  type: "entity_not_recorded";
-  data: { statistic_id: string };
-}
-
-export interface StatisticsValidationResultUnsupportedStateClass {
-  type: "unsupported_state_class";
-  data: { statistic_id: string; state_class: string };
-}
-
-export interface StatisticsValidationResultUnitsChanged {
-  type: "units_changed";
-  data: { statistic_id: string; state_unit: string; metadata_unit: string };
-}
-
-export interface StatisticsValidationResultUnsupportedUnitMetadata {
-  type: "unsupported_unit_metadata";
-  data: {
-    statistic_id: string;
-    device_class: string;
-    metadata_unit: string;
-    supported_unit: string;
-  };
-}
-
-export interface StatisticsValidationResultUnsupportedUnitState {
-  type: "unsupported_unit_state";
-  data: { statistic_id: string; device_class: string; metadata_unit: string };
-}
-
-export interface StatisticsValidationResults {
-  [statisticId: string]: StatisticsValidationResult[];
-}
-
 export interface HistoryStates {
   [entityId: string]: EntityHistoryState[];
 }
@@ -449,132 +365,3 @@ export const computeHistory = (
 
   return { line: unitStates, timeline: timelineDevices };
 };
-
-// Statistics
-
-export const getStatisticIds = (
-  hass: HomeAssistant,
-  statistic_type?: "mean" | "sum"
-) =>
-  hass.callWS<StatisticsMetaData[]>({
-    type: "history/list_statistic_ids",
-    statistic_type,
-  });
-
-export const getStatisticMetadata = (
-  hass: HomeAssistant,
-  statistic_ids?: string[]
-) =>
-  hass.callWS<StatisticsMetaData[]>({
-    type: "recorder/get_statistics_metadata",
-    statistic_ids,
-  });
-
-export const fetchStatistics = (
-  hass: HomeAssistant,
-  startTime: Date,
-  endTime?: Date,
-  statistic_ids?: string[],
-  period: "5minute" | "hour" | "day" | "month" = "hour"
-) =>
-  hass.callWS<Statistics>({
-    type: "history/statistics_during_period",
-    start_time: startTime.toISOString(),
-    end_time: endTime?.toISOString(),
-    statistic_ids,
-    period,
-  });
-
-export const validateStatistics = (hass: HomeAssistant) =>
-  hass.callWS<StatisticsValidationResults>({
-    type: "recorder/validate_statistics",
-  });
-
-export const updateStatisticsMetadata = (
-  hass: HomeAssistant,
-  statistic_id: string,
-  unit_of_measurement: string | null
-) =>
-  hass.callWS<void>({
-    type: "recorder/update_statistics_metadata",
-    statistic_id,
-    unit_of_measurement,
-  });
-
-export const clearStatistics = (hass: HomeAssistant, statistic_ids: string[]) =>
-  hass.callWS<void>({
-    type: "recorder/clear_statistics",
-    statistic_ids,
-  });
-
-export const calculateStatisticSumGrowth = (
-  values: StatisticValue[]
-): number | null => {
-  if (!values || values.length < 2) {
-    return null;
-  }
-  const endSum = values[values.length - 1].sum;
-  if (endSum === null) {
-    return null;
-  }
-  const startSum = values[0].sum;
-  if (startSum === null) {
-    return endSum;
-  }
-  return endSum - startSum;
-};
-
-export const calculateStatisticsSumGrowth = (
-  data: Statistics,
-  stats: string[]
-): number | null => {
-  let totalGrowth: number | null = null;
-
-  for (const stat of stats) {
-    if (!(stat in data)) {
-      continue;
-    }
-    const statGrowth = calculateStatisticSumGrowth(data[stat]);
-
-    if (statGrowth === null) {
-      continue;
-    }
-    if (totalGrowth === null) {
-      totalGrowth = statGrowth;
-    } else {
-      totalGrowth += statGrowth;
-    }
-  }
-
-  return totalGrowth;
-};
-
-export const statisticsHaveType = (
-  stats: StatisticValue[],
-  type: StatisticType
-) => stats.some((stat) => stat[type] !== null);
-
-export const adjustStatisticsSum = (
-  hass: HomeAssistant,
-  statistic_id: string,
-  start_time: string,
-  adjustment: number
-): Promise<void> =>
-  hass.callWS({
-    type: "recorder/adjust_sum_statistics",
-    statistic_id,
-    start_time,
-    adjustment,
-  });
-
-export const getStatisticLabel = (
-  hass: HomeAssistant,
-  statisticsId: string,
-  statisticsMetaData: StatisticsMetaData | undefined
-): string => {
-  const entity = hass.states[statisticsId];
-  if (entity) {
-    return computeStateName(entity);
-  }
-  return statisticsMetaData?.name || statisticsId;
-};

src/data/integrations.ts

@@ -0,0 +1,37 @@
+import { HomeAssistant } from "../types";
+
+export type IotStandards = "zwave" | "zigbee" | "homekit" | "matter";
+
+export interface Integration {
+  name?: string;
+  config_flow?: boolean;
+  integrations?: Integrations;
+  iot_standards?: IotStandards[];
+  is_built_in?: boolean;
+  iot_class?: string;
+}
+
+export interface Integrations {
+  [domain: string]: Integration;
+}
+
+export interface IntegrationDescriptions {
+  core: {
+    integration: Integrations;
+    hardware: Integrations;
+    helper: Integrations;
+    translated_name: string[];
+  };
+  custom: {
+    integration: Integrations;
+    hardware: Integrations;
+    helper: Integrations;
+  };
+}
+
+export const getIntegrationDescriptions = (
+  hass: HomeAssistant
+): Promise<IntegrationDescriptions> =>
+  hass.callWS<IntegrationDescriptions>({
+    type: "integration/descriptions",
+  });

src/data/light.ts

@@ -3,76 +3,83 @@ import {
   HassEntityBase,
 } from "home-assistant-js-websocket";
 
-export const enum LightColorModes {
+export const enum LightEntityFeature {
+  EFFECT = 4,
+  FLASH = 8,
+  TRANSITION = 32,
+}
+
+export const enum LightColorMode {
   UNKNOWN = "unknown",
   ONOFF = "onoff",
   BRIGHTNESS = "brightness",
   COLOR_TEMP = "color_temp",
-  WHITE = "white",
   HS = "hs",
   XY = "xy",
   RGB = "rgb",
   RGBW = "rgbw",
   RGBWW = "rgbww",
+  WHITE = "white",
 }
 
 const modesSupportingColor = [
-  LightColorModes.HS,
-  LightColorModes.XY,
-  LightColorModes.RGB,
-  LightColorModes.RGBW,
-  LightColorModes.RGBWW,
+  LightColorMode.HS,
+  LightColorMode.XY,
+  LightColorMode.RGB,
+  LightColorMode.RGBW,
+  LightColorMode.RGBWW,
 ];
 
-const modesSupportingDimming = [
+const modesSupportingBrightness = [
   ...modesSupportingColor,
-  LightColorModes.COLOR_TEMP,
-  LightColorModes.BRIGHTNESS,
+  LightColorMode.COLOR_TEMP,
+  LightColorMode.BRIGHTNESS,
+  LightColorMode.WHITE,
 ];
 
-export const SUPPORT_EFFECT = 4;
-export const SUPPORT_FLASH = 8;
-export const SUPPORT_TRANSITION = 32;
-
 export const lightSupportsColorMode = (
   entity: LightEntity,
-  mode: LightColorModes
-) => entity.attributes.supported_color_modes?.includes(mode);
+  mode: LightColorMode
+) => entity.attributes.supported_color_modes?.includes(mode) || false;
 
 export const lightIsInColorMode = (entity: LightEntity) =>
-  modesSupportingColor.includes(entity.attributes.color_mode);
+  (entity.attributes.color_mode &&
+    modesSupportingColor.includes(entity.attributes.color_mode)) ||
+  false;
 
 export const lightSupportsColor = (entity: LightEntity) =>
   entity.attributes.supported_color_modes?.some((mode) =>
     modesSupportingColor.includes(mode)
   );
 
-export const lightSupportsDimming = (entity: LightEntity) =>
+export const lightSupportsBrightness = (entity: LightEntity) =>
   entity.attributes.supported_color_modes?.some((mode) =>
-    modesSupportingDimming.includes(mode)
-  );
+    modesSupportingBrightness.includes(mode)
+  ) || false;
 
-export const getLightCurrentModeRgbColor = (entity: LightEntity): number[] =>
-  entity.attributes.color_mode === LightColorModes.RGBWW
+export const getLightCurrentModeRgbColor = (
+  entity: LightEntity
+): number[] | undefined =>
+  entity.attributes.color_mode === LightColorMode.RGBWW
     ? entity.attributes.rgbww_color
-    : entity.attributes.color_mode === LightColorModes.RGBW
+    : entity.attributes.color_mode === LightColorMode.RGBW
     ? entity.attributes.rgbw_color
     : entity.attributes.rgb_color;
 
 interface LightEntityAttributes extends HassEntityAttributeBase {
-  min_mireds: number;
-  max_mireds: number;
-  friendly_name: string;
-  brightness: number;
-  hs_color: [number, number];
-  rgb_color: [number, number, number];
-  rgbw_color: [number, number, number, number];
-  rgbww_color: [number, number, number, number, number];
-  color_temp: number;
+  min_mireds?: number;
+  max_mireds?: number;
+  brightness?: number;
+  xy_color?: [number, number];
+  hs_color?: [number, number];
+  color_temp?: number;
+  rgb_color?: [number, number, number];
+  rgbw_color?: [number, number, number, number];
+  rgbww_color?: [number, number, number, number, number];
   effect?: string;
-  effect_list: string[] | null;
-  supported_color_modes: LightColorModes[];
-  color_mode: LightColorModes;
+  effect_list?: string[] | null;
+  supported_color_modes?: LightColorMode[];
+  color_mode?: LightColorMode;
 }
 
 export interface LightEntity extends HassEntityBase {

src/data/lovelace.ts

@@ -93,6 +93,8 @@ export interface LovelaceViewConfig {
   panel?: boolean;
   background?: string;
   visible?: boolean | ShowViewConfig[];
+  subview?: boolean;
+  back_path?: string;
 }
 
 export interface LovelaceViewElement extends HTMLElement {

src/data/media-player.ts

@@ -51,6 +51,7 @@ interface MediaPlayerEntityAttributes extends HassEntityAttributeBase {
   media_duration?: number;
   media_position?: number;
   media_title?: string;
+  media_channel?: string;
   icon?: string;
   entity_picture_local?: string;
   is_volume_muted?: boolean;
@@ -235,6 +236,9 @@ export const computeMediaDescription = (
         }
       }
       break;
+    case "channel":
+      secondaryTitle = stateObj.attributes.media_channel!;
+      break;
     default:
       secondaryTitle = stateObj.attributes.app_name || "";
   }

src/data/recorder.ts

@@ -0,0 +1,294 @@
+import { computeStateName } from "../common/entity/compute_state_name";
+import { HomeAssistant } from "../types";
+
+export type StatisticType = "state" | "sum" | "min" | "max" | "mean";
+
+export interface Statistics {
+  [statisticId: string]: StatisticValue[];
+}
+
+export interface StatisticValue {
+  statistic_id: string;
+  start: string;
+  end: string;
+  last_reset: string | null;
+  max: number | null;
+  mean: number | null;
+  min: number | null;
+  sum: number | null;
+  state: number | null;
+}
+
+export interface StatisticsMetaData {
+  statistics_unit_of_measurement: string | null;
+  statistic_id: string;
+  source: string;
+  name?: string | null;
+  has_sum: boolean;
+  has_mean: boolean;
+  unit_class: string | null;
+}
+
+export type StatisticsValidationResult =
+  | StatisticsValidationResultNoState
+  | StatisticsValidationResultEntityNotRecorded
+  | StatisticsValidationResultEntityNoLongerRecorded
+  | StatisticsValidationResultUnsupportedStateClass
+  | StatisticsValidationResultUnitsChanged
+  | StatisticsValidationResultUnitsChangedCanConvert
+  | StatisticsValidationResultUnsupportedUnitMetadata
+  | StatisticsValidationResultUnsupportedUnitMetadataCanConvert
+  | StatisticsValidationResultUnsupportedUnitState;
+
+export interface StatisticsValidationResultNoState {
+  type: "no_state";
+  data: { statistic_id: string };
+}
+
+export interface StatisticsValidationResultEntityNoLongerRecorded {
+  type: "entity_no_longer_recorded";
+  data: { statistic_id: string };
+}
+
+export interface StatisticsValidationResultEntityNotRecorded {
+  type: "entity_not_recorded";
+  data: { statistic_id: string };
+}
+
+export interface StatisticsValidationResultUnsupportedStateClass {
+  type: "unsupported_state_class";
+  data: { statistic_id: string; state_class: string };
+}
+
+export interface StatisticsValidationResultUnitsChanged {
+  type: "units_changed";
+  data: { statistic_id: string; state_unit: string; metadata_unit: string };
+}
+
+export interface StatisticsValidationResultUnitsChangedCanConvert {
+  type: "units_changed_can_convert";
+  data: { statistic_id: string; state_unit: string; metadata_unit: string };
+}
+
+export interface StatisticsValidationResultUnsupportedUnitMetadata {
+  type: "unsupported_unit_metadata";
+  data: {
+    statistic_id: string;
+    device_class: string;
+    metadata_unit: string;
+    supported_unit: string;
+  };
+}
+
+export interface StatisticsValidationResultUnsupportedUnitMetadataCanConvert {
+  type: "unsupported_unit_metadata_can_convert";
+  data: {
+    statistic_id: string;
+    device_class: string;
+    metadata_unit: string;
+    supported_unit: string;
+  };
+}
+
+export interface StatisticsUnitConfiguration {
+  energy?: "Wh" | "kWh" | "MWh";
+  power?: "W" | "kW";
+  pressure?:
+    | "Pa"
+    | "hPa"
+    | "kPa"
+    | "bar"
+    | "cbar"
+    | "mbar"
+    | "inHg"
+    | "psi"
+    | "mmHg";
+  temperature?: "°C" | "°F" | "K";
+  volume?: "ft³" | "m³";
+}
+
+export interface StatisticsValidationResultUnsupportedUnitState {
+  type: "unsupported_unit_state";
+  data: { statistic_id: string; device_class: string; metadata_unit: string };
+}
+
+export interface StatisticsValidationResults {
+  [statisticId: string]: StatisticsValidationResult[];
+}
+
+export const getStatisticIds = (
+  hass: HomeAssistant,
+  statistic_type?: "mean" | "sum"
+) =>
+  hass.callWS<StatisticsMetaData[]>({
+    type: "recorder/list_statistic_ids",
+    statistic_type,
+  });
+
+export const getStatisticMetadata = (
+  hass: HomeAssistant,
+  statistic_ids?: string[]
+) =>
+  hass.callWS<StatisticsMetaData[]>({
+    type: "recorder/get_statistics_metadata",
+    statistic_ids,
+  });
+
+export const fetchStatistics = (
+  hass: HomeAssistant,
+  startTime: Date,
+  endTime?: Date,
+  statistic_ids?: string[],
+  period: "5minute" | "hour" | "day" | "month" = "hour",
+  units?: StatisticsUnitConfiguration
+) =>
+  hass.callWS<Statistics>({
+    type: "recorder/statistics_during_period",
+    start_time: startTime.toISOString(),
+    end_time: endTime?.toISOString(),
+    statistic_ids,
+    period,
+    units,
+  });
+
+export const validateStatistics = (hass: HomeAssistant) =>
+  hass.callWS<StatisticsValidationResults>({
+    type: "recorder/validate_statistics",
+  });
+
+export const updateStatisticsMetadata = (
+  hass: HomeAssistant,
+  statistic_id: string,
+  unit_of_measurement: string | null
+) =>
+  hass.callWS<void>({
+    type: "recorder/update_statistics_metadata",
+    statistic_id,
+    unit_of_measurement,
+  });
+
+export const changeStatisticUnit = (
+  hass: HomeAssistant,
+  statistic_id: string,
+  old_unit_of_measurement: string | null,
+  new_unit_of_measurement: string | null
+) =>
+  hass.callWS<void>({
+    type: "recorder/change_statistics_unit",
+    statistic_id,
+    old_unit_of_measurement,
+    new_unit_of_measurement,
+  });
+
+export const clearStatistics = (hass: HomeAssistant, statistic_ids: string[]) =>
+  hass.callWS<void>({
+    type: "recorder/clear_statistics",
+    statistic_ids,
+  });
+
+export const calculateStatisticSumGrowth = (
+  values: StatisticValue[]
+): number | null => {
+  if (!values || values.length < 2) {
+    return null;
+  }
+  const endSum = values[values.length - 1].sum;
+  if (endSum === null) {
+    return null;
+  }
+  const startSum = values[0].sum;
+  if (startSum === null) {
+    return endSum;
+  }
+  return endSum - startSum;
+};
+
+export const calculateStatisticsSumGrowth = (
+  data: Statistics,
+  stats: string[]
+): number | null => {
+  let totalGrowth: number | null = null;
+
+  for (const stat of stats) {
+    if (!(stat in data)) {
+      continue;
+    }
+    const statGrowth = calculateStatisticSumGrowth(data[stat]);
+
+    if (statGrowth === null) {
+      continue;
+    }
+    if (totalGrowth === null) {
+      totalGrowth = statGrowth;
+    } else {
+      totalGrowth += statGrowth;
+    }
+  }
+
+  return totalGrowth;
+};
+
+export const statisticsHaveType = (
+  stats: StatisticValue[],
+  type: StatisticType
+) => stats.some((stat) => stat[type] !== null);
+
+const mean_stat_types: readonly StatisticType[] = ["mean", "min", "max"];
+const sum_stat_types: readonly StatisticType[] = ["sum"];
+
+export const statisticsMetaHasType = (
+  metadata: StatisticsMetaData,
+  type: StatisticType
+) => {
+  if (mean_stat_types.includes(type) && metadata.has_mean) {
+    return true;
+  }
+  if (sum_stat_types.includes(type) && metadata.has_sum) {
+    return true;
+  }
+  return false;
+};
+
+export const adjustStatisticsSum = (
+  hass: HomeAssistant,
+  statistic_id: string,
+  start_time: string,
+  adjustment: number,
+  adjustment_unit_of_measurement: string | null
+): Promise<void> =>
+  hass.callWS({
+    type: "recorder/adjust_sum_statistics",
+    statistic_id,
+    start_time,
+    adjustment,
+    adjustment_unit_of_measurement,
+  });
+
+export const getStatisticLabel = (
+  hass: HomeAssistant,
+  statisticsId: string,
+  statisticsMetaData: StatisticsMetaData | undefined
+): string => {
+  const entity = hass.states[statisticsId];
+  if (entity) {
+    return computeStateName(entity);
+  }
+  return statisticsMetaData?.name || statisticsId;
+};
+
+export const getDisplayUnit = (
+  hass: HomeAssistant,
+  statisticsId: string | undefined,
+  statisticsMetaData: StatisticsMetaData | undefined
+): string | null | undefined => {
+  let unit: string | undefined;
+  if (statisticsId) {
+    unit = hass.states[statisticsId]?.attributes.unit_of_measurement;
+  }
+  return unit === undefined
+    ? statisticsMetaData?.statistics_unit_of_measurement
+    : unit;
+};
+
+export const isExternalStatistic = (statisticsId: string): boolean =>
+  statisticsId.includes(":");

src/data/scene.ts

@@ -14,8 +14,11 @@ export const SCENE_IGNORED_DOMAINS = [
   "input_button",
   "persistent_notification",
   "person",
+  "scene",
+  "schedule",
   "sensor",
   "sun",
+  "update",
   "weather",
   "zone",
 ];

src/data/script.ts

@@ -15,7 +15,6 @@ import {
   Describe,
   boolean,
 } from "superstruct";
-import { computeObjectId } from "../common/entity/compute_object_id";
 import { navigate } from "../common/navigate";
 import { HomeAssistant } from "../types";
 import {
@@ -278,9 +277,9 @@ export type ActionType = keyof ActionTypes;
 
 export const triggerScript = (
   hass: HomeAssistant,
-  entityId: string,
+  scriptId: string,
   variables?: Record<string, unknown>
-) => hass.callService("script", computeObjectId(entityId), variables);
+) => hass.callService("script", scriptId, variables);
 
 export const canRun = (state: ScriptEntity) => {
   if (state.state === "off") {
@@ -301,6 +300,15 @@ export const deleteScript = (hass: HomeAssistant, objectId: string) =>
 
 let inititialScriptEditorData: Partial<ScriptConfig> | undefined;
 
+export const fetchScriptFileConfig = (hass: HomeAssistant, objectId: string) =>
+  hass.callApi<ScriptConfig>("GET", `config/script/config/${objectId}`);
+
+export const getScriptStateConfig = (hass: HomeAssistant, entity_id: string) =>
+  hass.callWS<{ config: ScriptConfig }>({
+    type: "script/config",
+    entity_id,
+  });
+
 export const showScriptEditor = (data?: Partial<ScriptConfig>) => {
   inititialScriptEditorData = data;
   navigate("/config/script/edit/new");

src/data/script_i18n.ts

@@ -1,3 +1,4 @@
+import { formatDuration } from "../common/datetime/format_duration";
 import secondsToDuration from "../common/datetime/seconds_to_duration";
 import { ensureArray } from "../common/ensure-array";
 import { computeStateName } from "../common/entity/compute_state_name";
@@ -5,6 +6,13 @@ import { isTemplate } from "../common/string/has-template";
 import { HomeAssistant } from "../types";
 import { Condition } from "./automation";
 import { describeCondition, describeTrigger } from "./automation_i18n";
+import { localizeDeviceAutomationAction } from "./device_automation";
+import { computeDeviceName } from "./device_registry";
+import {
+  computeEntityRegistryName,
+  entityRegistryById,
+} from "./entity_registry";
+import { domainToName } from "./integration";
 import {
   ActionType,
   ActionTypes,
@@ -47,9 +55,13 @@ export const describeAction = <T extends ActionType>(
     ) {
       base = "Call a service based on a template";
     } else if (config.service) {
-      base = `Call service ${config.service}`;
+      const [domain, serviceName] = config.service.split(".", 2);
+      const service = hass.services[domain][serviceName];
+      base = service
+        ? `${domainToName(hass.localize, domain)}: ${service.name}`
+        : `Call service: ${config.service}`;
     } else {
-      return actionType;
+      return "Call a service";
     }
     if (config.target) {
       const targets: string[] = [];
@@ -66,26 +78,49 @@ export const describeAction = <T extends ActionType>(
           ? config.target[key]
           : [config.target[key]];
 
-        const values: string[] = [];
-
-        let renderValues = true;
-
         for (const targetThing of keyConf) {
           if (isTemplate(targetThing)) {
             targets.push(`templated ${label}`);
-            renderValues = false;
             break;
+          } else if (key === "entity_id") {
+            if (targetThing.includes(".")) {
+              const state = hass.states[targetThing];
+              if (state) {
+                targets.push(computeStateName(state));
+              } else {
+                targets.push(targetThing);
+              }
+            } else {
+              const entityReg = entityRegistryById(hass.entities)[targetThing];
+              if (entityReg) {
+                targets.push(
+                  computeEntityRegistryName(hass, entityReg) || targetThing
+                );
+              } else {
+                targets.push("unknown entity");
+              }
+            }
+          } else if (key === "device_id") {
+            const device = hass.devices[targetThing];
+            if (device) {
+              targets.push(computeDeviceName(device, hass));
+            } else {
+              targets.push("unknown device");
+            }
+          } else if (key === "area_id") {
+            const area = hass.areas[targetThing];
+            if (area?.name) {
+              targets.push(area.name);
+            } else {
+              targets.push("unknown area");
+            }
           } else {
-            values.push(targetThing);
+            targets.push(targetThing);
           }
         }
-
-        if (renderValues) {
-          targets.push(`${label} ${values.join(", ")}`);
-        }
       }
       if (targets.length > 0) {
-        base += ` on ${targets.join(", ")}`;
+        base += ` ${targets.join(", ")}`;
       }
     }
 
@@ -102,9 +137,11 @@ export const describeAction = <T extends ActionType>(
     } else if (typeof config.delay === "string") {
       duration = isTemplate(config.delay)
         ? "based on a template"
-        : `for ${config.delay}`;
+        : `for ${config.delay || "a duration"}`;
+    } else if (config.delay) {
+      duration = `for ${formatDuration(config.delay)}`;
     } else {
-      duration = `for ${JSON.stringify(config.delay)}`;
+      duration = "for a duration";
     }
 
     return `Delay ${duration}`;
@@ -118,13 +155,12 @@ export const describeAction = <T extends ActionType>(
     } else {
       entityId = config.target?.entity_id || config.entity_id;
     }
+    if (!entityId) {
+      return "Activate a scene";
+    }
     const sceneStateObj = entityId ? hass.states[entityId] : undefined;
-    return `Scene ${
-      sceneStateObj
-        ? computeStateName(sceneStateObj)
-        : "scene" in config
-        ? config.scene
-        : config.target?.entity_id || config.entity_id || ""
+    return `Active scene ${
+      sceneStateObj ? computeStateName(sceneStateObj) : entityId
     }`;
   }
 
@@ -132,16 +168,22 @@ export const describeAction = <T extends ActionType>(
     const config = action as PlayMediaAction;
     const entityId = config.target?.entity_id || config.entity_id;
     const mediaStateObj = entityId ? hass.states[entityId] : undefined;
-    return `Play ${config.metadata.title || config.data.media_content_id} on ${
+    return `Play ${
+      config.metadata.title || config.data.media_content_id || "media"
+    } on ${
       mediaStateObj
         ? computeStateName(mediaStateObj)
-        : config.target?.entity_id || config.entity_id
+        : entityId || "a media player"
     }`;
   }
 
   if (actionType === "wait_for_trigger") {
     const config = action as WaitForTriggerAction;
-    return `Wait for ${ensureArray(config.wait_for_trigger)
+    const triggers = ensureArray(config.wait_for_trigger);
+    if (!triggers || triggers.length === 0) {
+      return "Wait for a trigger";
+    }
+    return `Wait for ${triggers
       .map((trigger) => describeTrigger(trigger, hass))
       .join(", ")}`;
   }
@@ -164,22 +206,26 @@ export const describeAction = <T extends ActionType>(
   }
 
   if (actionType === "check_condition") {
-    return `Test ${describeCondition(action as Condition, hass)}`;
+    return describeCondition(action as Condition, hass);
   }
 
   if (actionType === "stop") {
     const config = action as StopAction;
-    return `Stopped${config.stop ? ` because: ${config.stop}` : ""}`;
+    return `Stop${config.stop ? ` because: ${config.stop}` : ""}`;
   }
 
   if (actionType === "if") {
     const config = action as IfAction;
     return `Perform an action if: ${
-      typeof config.if === "string"
+      !config.if
+        ? ""
+        : typeof config.if === "string"
         ? config.if
         : ensureArray(config.if).length > 1
         ? `${ensureArray(config.if).length} conditions`
-        : describeCondition(ensureArray(config.if)[0], hass)
+        : ensureArray(config.if).length
+        ? describeCondition(ensureArray(config.if)[0], hass)
+        : ""
     }${config.else ? " (or else!)" : ""}`;
   }
 
@@ -219,6 +265,13 @@ export const describeAction = <T extends ActionType>(
 
   if (actionType === "device_action") {
     const config = action as DeviceAction;
+    if (!config.device_id) {
+      return "Device action";
+    }
+    const localized = localizeDeviceAutomationAction(hass, config);
+    if (localized) {
+      return localized;
+    }
     const stateObj = hass.states[config.entity_id as string];
     return `${config.type || "Perform action with"} ${
       stateObj ? computeStateName(stateObj) : config.entity_id

src/data/selector.ts

@@ -21,6 +21,7 @@ export type Selector =
   | IconSelector
   | LocationSelector
   | MediaSelector
+  | NavigationSelector
   | NumberSelector
   | ObjectSelector
   | SelectSelector
@@ -171,6 +172,11 @@ export interface MediaSelectorValue {
   };
 }
 
+export interface NavigationSelector {
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  navigation: {};
+}
+
 export interface NumberSelector {
   number: {
     min?: number;
@@ -189,6 +195,7 @@ export interface ObjectSelector {
 export interface SelectOption {
   value: string;
   label: string;
+  disabled?: boolean;
 }
 
 export interface SelectSelector {

src/data/supported_brands.ts

@@ -1,6 +1,13 @@
-import { SupportedBrandObj } from "../dialogs/config-flow/step-flow-pick-handler";
 import type { HomeAssistant } from "../types";
 
+export interface SupportedBrandObj {
+  name: string;
+  slug: string;
+  is_add?: boolean;
+  is_helper?: boolean;
+  supported_flows: string[];
+}
+
 export type SupportedBrandHandler = Record<string, string>;
 
 export const getSupportedBrands = (hass: HomeAssistant) =>

src/data/zha.ts

@@ -309,7 +309,7 @@ export const fetchCommandsForCluster = (
     cluster_type: clusterType,
   });
 
-export const fetchClustersForZhaNode = (
+export const fetchClustersForZhaDevice = (
   hass: HomeAssistant,
   ieeeAddress: string
 ): Promise<Cluster[]> =>

src/data/zwave_js.ts

@@ -85,6 +85,13 @@ enum Protocols {
   ZWaveLongRange = 1,
 }
 
+enum NodeType {
+  Controller,
+  /** @deprecated Use `NodeType["End Node"]` instead */
+  "Routing End Node",
+  "End Node" = 1,
+}
+
 export enum FirmwareUpdateStatus {
   Error_Timeout = -1,
   Error_Checksum = 0,
@@ -142,12 +149,12 @@ export interface ZWaveJSController {
   sdk_version: string;
   type: number;
   own_node_id: number;
-  is_secondary: boolean;
+  is_primary: boolean;
   is_using_home_id_from_other_network: boolean;
   is_sis_present: boolean;
   was_real_primary: boolean;
-  is_static_update_controller: boolean;
-  is_slave: boolean;
+  is_suc: boolean;
+  node_type: NodeType;
   firmware_version: string;
   manufacturer_id: number;
   product_id: number;

src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts

@@ -170,7 +170,6 @@ class DialogConfigEntrySystemOptions extends LitElement {
           ),
         });
       }
-      this._params!.entryUpdated(result.config_entry);
       this.closeDialog();
     } catch (err: any) {
       this._error = err.message || "Unknown error";

src/dialogs/config-entry-system-options/show-dialog-config-entry-system-options.ts

@@ -5,7 +5,6 @@ import { IntegrationManifest } from "../../data/integration";
 export interface ConfigEntrySystemOptionsDialogParams {
   entry: ConfigEntry;
   manifest?: IntegrationManifest;
-  entryUpdated(entry: ConfigEntry): void;
 }
 
 export const loadConfigEntrySystemOptionsDialog = () =>

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

@@ -18,9 +18,7 @@ import {
   AreaRegistryEntry,
   subscribeAreaRegistry,
 } from "../../data/area_registry";
-import { fetchConfigFlowInProgress } from "../../data/config_flow";
 import {
-  DataEntryFlowProgress,
   DataEntryFlowStep,
   subscribeDataEntryFlowProgressed,
 } from "../../data/data_entry_flow";
@@ -28,14 +26,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,8 +40,6 @@ 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";
 
 let instance = 0;
@@ -86,12 +80,8 @@ class DataEntryFlowDialog extends LitElement {
 
   @state() private _areas?: AreaRegistryEntry[];
 
-  @state() private _handlers?: FlowHandlers;
-
   @state() private _handler?: string;
 
-  @state() private _flowsInProgress?: DataEntryFlowProgress[];
-
   private _unsubAreas?: UnsubscribeFunc;
 
   private _unsubDevices?: UnsubscribeFunc;
@@ -102,15 +92,39 @@ class DataEntryFlowDialog extends LitElement {
     this._params = params;
     this._instance = instance++;
 
-    if (params.startFlowHandler) {
-      this._checkFlowsInProgress(params.startFlowHandler);
-      return;
-    }
+    const curInstance = this._instance;
+    let step: DataEntryFlowStep;
 
-    if (params.continueFlowId) {
+    if (params.startFlowHandler) {
+      this._loading = "loading_flow";
+      this._handler = params.startFlowHandler;
+      try {
+        step = await this._params!.flowConfig.createFlow(
+          this.hass,
+          params.startFlowHandler
+        );
+      } catch (err: any) {
+        this.closeDialog();
+        let message = err.message || err.body || "Unknown error";
+        if (typeof message !== "string") {
+          message = JSON.stringify(message);
+        }
+        showAlertDialog(this, {
+          title: this.hass.localize(
+            "ui.panel.config.integrations.config_flow.error"
+          ),
+          text: `${this.hass.localize(
+            "ui.panel.config.integrations.config_flow.could_not_load"
+          )}: ${message}`,
+        });
+        return;
+      }
+      // Happens if second showDialog called
+      if (curInstance !== this._instance) {
+        return;
+      }
+    } else if (params.continueFlowId) {
       this._loading = "loading_flow";
-      const curInstance = this._instance;
-      let step: DataEntryFlowStep;
       try {
         step = await params.flowConfig.fetchFlow(
           this.hass,
@@ -132,32 +146,17 @@ class DataEntryFlowDialog extends LitElement {
         });
         return;
       }
-
-      // Happens if second showDialog called
-      if (curInstance !== this._instance) {
-        return;
-      }
-
-      this._processStep(step);
-      this._loading = undefined;
+    } else {
       return;
     }
 
-    // Create a new config flow. Show picker
-    if (!params.flowConfig.getFlowHandlers) {
-      throw new Error("No getFlowHandlers defined in flow config");
+    // Happens if second showDialog called
+    if (curInstance !== this._instance) {
+      return;
     }
-    this._step = null;
 
-    // We only load the handlers once
-    if (this._handlers === undefined) {
-      this._loading = "loading_handlers";
-      try {
-        this._handlers = await params.flowConfig.getFlowHandlers(this.hass);
-      } finally {
-        this._loading = undefined;
-      }
-    }
+    this._processStep(step);
+    this._loading = undefined;
   }
 
   public closeDialog() {
@@ -185,7 +184,6 @@ class DataEntryFlowDialog extends LitElement {
     this._step = undefined;
     this._params = undefined;
     this._devices = undefined;
-    this._flowsInProgress = undefined;
     this._handler = undefined;
     if (this._unsubAreas) {
       this._unsubAreas();
@@ -218,15 +216,12 @@ class DataEntryFlowDialog extends LitElement {
         hideActions
       >
         <div>
-          ${this._loading ||
-          (this._step === null &&
-            this._handlers === undefined &&
-            this._handler === undefined)
+          ${this._loading || this._step === null
             ? html`
                 <step-flow-loading
                   .flowConfig=${this._params.flowConfig}
                   .hass=${this.hass}
-                  .loadingReason=${this._loading || "loading_handlers"}
+                  .loadingReason=${this._loading}
                   .handler=${this._handler}
                   .step=${this._step}
                 ></step-flow-loading>
@@ -273,24 +268,7 @@ class DataEntryFlowDialog extends LitElement {
                     dialogAction="close"
                   ></ha-icon-button>
                 </div>
-                ${this._step === null
-                  ? this._handler
-                    ? html`<step-flow-pick-flow
-                        .flowConfig=${this._params.flowConfig}
-                        .hass=${this.hass}
-                        .handler=${this._handler}
-                        .flowsInProgress=${this._flowsInProgress}
-                      ></step-flow-pick-flow>`
-                    : // Show handler picker
-                      html`
-                        <step-flow-pick-handler
-                          .hass=${this.hass}
-                          .handlers=${this._handlers}
-                          .initialFilter=${this._params.searchQuery}
-                          @handler-picked=${this._handlerPicked}
-                        ></step-flow-pick-handler>
-                      `
-                  : this._step.type === "form"
+                ${this._step.type === "form"
                   ? html`
                       <step-flow-form
                         .flowConfig=${this._params.flowConfig}
@@ -400,64 +378,6 @@ class DataEntryFlowDialog extends LitElement {
     });
   }
 
-  private async _checkFlowsInProgress(handler: string) {
-    this._loading = "loading_handlers";
-    this._handler = handler;
-
-    const flowsInProgress = (
-      await fetchConfigFlowInProgress(this.hass.connection)
-    ).filter((flow) => flow.handler === handler);
-
-    if (!flowsInProgress.length) {
-      // No flows in progress, create a new flow
-      this._loading = "loading_flow";
-      let step: DataEntryFlowStep;
-      try {
-        step = await this._params!.flowConfig.createFlow(this.hass, handler);
-      } catch (err: any) {
-        this.closeDialog();
-        const message =
-          err?.status_code === 404
-            ? this.hass.localize(
-                "ui.panel.config.integrations.config_flow.no_config_flow"
-              )
-            : `${this.hass.localize(
-                "ui.panel.config.integrations.config_flow.could_not_load"
-              )}: ${err?.body?.message || err?.message}`;
-
-        showAlertDialog(this, {
-          title: this.hass.localize(
-            "ui.panel.config.integrations.config_flow.error"
-          ),
-          text: message,
-        });
-        return;
-      } finally {
-        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;
-    }
-    this._loading = undefined;
-  }
-
-  private _handlerPicked(ev) {
-    this._checkFlowsInProgress(ev.detail.handler);
-  }
-
   private async _processStep(
     step: DataEntryFlowStep | undefined | Promise<DataEntryFlowStep>
   ): Promise<void> {

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

@@ -3,11 +3,9 @@ import {
   createConfigFlow,
   deleteConfigFlow,
   fetchConfigFlow,
-  getConfigFlowHandlers,
   handleConfigFlowStep,
 } from "../../data/config_flow";
 import { domainToName } from "../../data/integration";
-import { getSupportedBrands } from "../../data/supported_brands";
 import {
   DataEntryFlowDialogParams,
   loadDataEntryFlowDialog,
@@ -22,16 +20,6 @@ export const showConfigFlowDialog = (
 ): void =>
   showFlowDialog(element, dialogParams, {
     loadDevicesAndAreas: true,
-    getFlowHandlers: async (hass) => {
-      const [integrations, helpers, supportedBrands] = await Promise.all([
-        getConfigFlowHandlers(hass, "integration"),
-        getConfigFlowHandlers(hass, "helper"),
-        getSupportedBrands(hass),
-        hass.loadBackendTranslation("title", undefined, true),
-      ]);
-
-      return { integrations, helpers, supportedBrands };
-    },
     createFlow: async (hass, handler) => {
       const [step] = await Promise.all([
         createConfigFlow(hass, handler),

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

@@ -22,8 +22,6 @@ export interface FlowHandlers {
 export interface FlowConfig {
   loadDevicesAndAreas: boolean;
 
-  getFlowHandlers?: (hass: HomeAssistant) => Promise<FlowHandlers>;
-
   createFlow(hass: HomeAssistant, handler: string): Promise<DataEntryFlowStep>;
 
   fetchFlow(hass: HomeAssistant, flowId: string): Promise<DataEntryFlowStep>;

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

@@ -12,8 +12,6 @@ import { DataEntryFlowStepAbort } from "../../data/data_entry_flow";
 import { HomeAssistant } from "../../types";
 import { showAddApplicationCredentialDialog } from "../../panels/config/application_credentials/show-dialog-add-application-credential";
 import { configFlowContentStyles } from "./styles";
-import { showConfirmationDialog } from "../generic/show-dialog-box";
-import { domainToName } from "../../data/integration";
 import { DataEntryFlowDialogParams } from "./show-dialog-data-entry-flow";
 import { showConfigFlowDialog } from "./show-dialog-config-flow";
 
@@ -54,21 +52,11 @@ class StepFlowAbort extends LitElement {
   }
 
   private async _handleMissingCreds() {
-    const confirm = await showConfirmationDialog(this, {
-      title: this.hass.localize(
-        "ui.panel.config.integrations.config_flow.missing_credentials",
-        {
-          integration: domainToName(this.hass.localize, this.domain),
-        }
-      ),
-    });
     this._flowDone();
-    if (!confirm) {
-      return;
-    }
     // Prompt to enter credentials and restart integration setup
     showAddApplicationCredentialDialog(this.params.dialogParentElement!, {
       selectedDomain: this.domain,
+      manifest: this.params.manifest,
       applicationCredentialAddedCallback: () => {
         showConfigFlowDialog(this.params.dialogParentElement!, {
           dialogClosedCallback: this.params.dialogClosedCallback,

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

@@ -1,130 +0,0 @@
-import "@polymer/paper-item";
-import "@polymer/paper-item/paper-icon-item";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-item/paper-item-body";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
-import "../../components/ha-icon-next";
-import { localizeConfigFlowTitle } from "../../data/config_flow";
-import { DataEntryFlowProgress } from "../../data/data_entry_flow";
-import { domainToName } from "../../data/integration";
-import { HomeAssistant } from "../../types";
-import { brandsUrl } from "../../util/brands-url";
-import { FlowConfig } from "./show-dialog-data-entry-flow";
-import { configFlowContentStyles } from "./styles";
-
-@customElement("step-flow-pick-flow")
-class StepFlowPickFlow extends LitElement {
-  public flowConfig!: FlowConfig;
-
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false })
-  public flowsInProgress!: DataEntryFlowProgress[];
-
-  @property() public handler!: string;
-
-  protected render(): TemplateResult {
-    return html`
-      <h2>
-        ${this.hass.localize(
-          "ui.panel.config.integrations.config_flow.pick_flow_step.title"
-        )}
-      </h2>
-
-      <div>
-        ${this.flowsInProgress.map(
-          (flow) => html` <paper-icon-item
-            @click=${this._flowInProgressPicked}
-            .flow=${flow}
-          >
-            <img
-              slot="item-icon"
-              loading="lazy"
-              src=${brandsUrl({
-                domain: flow.handler,
-                type: "icon",
-                useFallback: true,
-                darkOptimized: this.hass.themes?.darkMode,
-              })}
-              referrerpolicy="no-referrer"
-            />
-
-            <paper-item-body>
-              ${localizeConfigFlowTitle(this.hass.localize, flow)}
-            </paper-item-body>
-            <ha-icon-next></ha-icon-next>
-          </paper-icon-item>`
-        )}
-        <paper-item @click=${this._startNewFlowPicked} .handler=${this.handler}>
-          <paper-item-body>
-            ${this.hass.localize(
-              "ui.panel.config.integrations.config_flow.pick_flow_step.new_flow",
-              "integration",
-              domainToName(this.hass.localize, this.handler)
-            )}
-          </paper-item-body>
-          <ha-icon-next></ha-icon-next>
-        </paper-item>
-      </div>
-    `;
-  }
-
-  private _startNewFlowPicked(ev) {
-    this._startFlow(ev.currentTarget.handler);
-  }
-
-  private _startFlow(handler: string) {
-    fireEvent(this, "flow-update", {
-      stepPromise: this.flowConfig.createFlow(this.hass, handler),
-    });
-  }
-
-  private _flowInProgressPicked(ev) {
-    const flow: DataEntryFlowProgress = ev.currentTarget.flow;
-    fireEvent(this, "flow-update", {
-      stepPromise: this.flowConfig.fetchFlow(this.hass, flow.flow_id),
-    });
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      configFlowContentStyles,
-      css`
-        img {
-          width: 40px;
-          height: 40px;
-        }
-        ha-icon-next {
-          margin-right: 8px;
-        }
-        div {
-          overflow: auto;
-          max-height: 600px;
-          margin: 16px 0;
-        }
-        h2 {
-          padding-inline-end: 66px;
-          direction: var(--direction);
-        }
-        @media all and (max-height: 900px) {
-          div {
-            max-height: calc(100vh - 134px);
-          }
-        }
-        paper-icon-item,
-        paper-item {
-          cursor: pointer;
-          margin-bottom: 4px;
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "step-flow-pick-flow": StepFlowPickFlow;
-  }
-}

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

@@ -1,372 +0,0 @@
-import "@material/mwc-list/mwc-list";
-import "@material/mwc-list/mwc-list-item";
-import Fuse from "fuse.js";
-import {
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  PropertyValues,
-  TemplateResult,
-} from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { styleMap } from "lit/directives/style-map";
-import memoizeOne from "memoize-one";
-import { isComponentLoaded } from "../../common/config/is_component_loaded";
-import { fireEvent } from "../../common/dom/fire_event";
-import { protocolIntegrationPicked } from "../../common/integrations/protocolIntegrationPicked";
-import { navigate } from "../../common/navigate";
-import { caseInsensitiveStringCompare } from "../../common/string/compare";
-import { LocalizeFunc } from "../../common/translations/localize";
-import "../../components/ha-icon-next";
-import "../../components/search-input";
-import { domainToName } from "../../data/integration";
-import { haStyleScrollbar } from "../../resources/styles";
-import { HomeAssistant } from "../../types";
-import { brandsUrl } from "../../util/brands-url";
-import { documentationUrl } from "../../util/documentation-url";
-import { showConfirmationDialog } from "../generic/show-dialog-box";
-import { FlowHandlers } from "./show-dialog-data-entry-flow";
-import { configFlowContentStyles } from "./styles";
-
-interface HandlerObj {
-  name: string;
-  slug: string;
-  is_add?: boolean;
-  is_helper?: boolean;
-}
-
-export interface SupportedBrandObj extends HandlerObj {
-  supported_flows: string[];
-}
-
-declare global {
-  // for fire event
-  interface HASSDomEvents {
-    "handler-picked": {
-      handler: string;
-    };
-  }
-}
-
-@customElement("step-flow-pick-handler")
-class StepFlowPickHandler extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public handlers!: FlowHandlers;
-
-  @property() public initialFilter?: string;
-
-  @state() private _filter?: string;
-
-  private _width?: number;
-
-  private _height?: number;
-
-  private _filterHandlers = memoizeOne(
-    (
-      h: FlowHandlers,
-      filter?: string,
-      _localize?: LocalizeFunc
-    ): [(HandlerObj | SupportedBrandObj)[], HandlerObj[]] => {
-      const integrations: (HandlerObj | SupportedBrandObj)[] =
-        h.integrations.map((handler) => ({
-          name: domainToName(this.hass.localize, handler),
-          slug: handler,
-        }));
-
-      for (const [domain, domainBrands] of Object.entries(h.supportedBrands)) {
-        for (const [slug, name] of Object.entries(domainBrands)) {
-          integrations.push({
-            slug,
-            name,
-            supported_flows: [domain],
-          });
-        }
-      }
-
-      if (filter) {
-        const options: Fuse.IFuseOptions<HandlerObj> = {
-          keys: ["name", "slug"],
-          isCaseSensitive: false,
-          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),
-        ];
-      }
-      return [
-        integrations.sort((a, b) =>
-          caseInsensitiveStringCompare(a.name, b.name)
-        ),
-        [],
-      ];
-    }
-  );
-
-  protected render(): TemplateResult {
-    const [integrations, helpers] = this._getHandlers();
-
-    const addDeviceRows: HandlerObj[] = ["zha", "zwave_js"]
-      .filter((domain) => isComponentLoaded(this.hass, domain))
-      .map((domain) => ({
-        name: this.hass.localize(
-          `ui.panel.config.integrations.add_${domain}_device`
-        ),
-        slug: domain,
-        is_add: true,
-      }))
-      .sort((a, b) => caseInsensitiveStringCompare(a.name, b.name));
-
-    return html`
-      <h2>${this.hass.localize("ui.panel.config.integrations.new")}</h2>
-      <search-input
-        .hass=${this.hass}
-        autofocus
-        .filter=${this._filter}
-        @value-changed=${this._filterChanged}
-        .label=${this.hass.localize("ui.panel.config.integrations.search")}
-        @keypress=${this._maybeSubmit}
-      ></search-input>
-      <mwc-list
-        style=${styleMap({
-          width: `${this._width}px`,
-          height: `${this._height}px`,
-        })}
-        class="ha-scrollbar"
-      >
-        ${addDeviceRows.length
-          ? html`
-              ${addDeviceRows.map((handler) => this._renderRow(handler))}
-              <li divider padded class="divider" role="separator"></li>
-            `
-          : ""}
-        ${integrations.length
-          ? integrations.map((handler) => this._renderRow(handler))
-          : html`
-              <p>
-                ${this.hass.localize(
-                  "ui.panel.config.integrations.note_about_integrations"
-                )}<br />
-                ${this.hass.localize(
-                  "ui.panel.config.integrations.note_about_website_reference"
-                )}<a
-                  href=${documentationUrl(
-                    this.hass,
-                    `/integrations/${
-                      this._filter ? `#search/${this._filter}` : ""
-                    }`
-                  )}
-                  target="_blank"
-                  rel="noreferrer"
-                  >${this.hass.localize(
-                    "ui.panel.config.integrations.home_assistant_website"
-                  )}</a
-                >.
-              </p>
-            `}
-        ${helpers.length
-          ? html`
-              <li divider padded class="divider" role="separator"></li>
-              ${helpers.map((handler) => this._renderRow(handler))}
-            `
-          : ""}
-      </mwc-list>
-    `;
-  }
-
-  private _renderRow(handler: HandlerObj) {
-    return html`
-      <mwc-list-item
-        graphic="medium"
-        .hasMeta=${!handler.is_add}
-        .handler=${handler}
-        @click=${this._handlerPicked}
-      >
-        <img
-          slot="graphic"
-          loading="lazy"
-          src=${brandsUrl({
-            domain: handler.slug,
-            type: "icon",
-            useFallback: true,
-            darkOptimized: this.hass.themes?.darkMode,
-          })}
-          referrerpolicy="no-referrer"
-        />
-        <span>${handler.name} ${handler.is_helper ? " (helper)" : ""}</span>
-        ${handler.is_add ? "" : html`<ha-icon-next slot="meta"></ha-icon-next>`}
-      </mwc-list-item>
-    `;
-  }
-
-  public willUpdate(changedProps: PropertyValues): void {
-    super.willUpdate(changedProps);
-    if (this._filter === undefined && this.initialFilter !== undefined) {
-      this._filter = this.initialFilter;
-    }
-    if (this.initialFilter !== undefined && this._filter === "") {
-      this.initialFilter = undefined;
-      this._filter = "";
-      this._width = undefined;
-      this._height = undefined;
-    } else if (
-      this.hasUpdated &&
-      changedProps.has("_filter") &&
-      (!this._width || !this._height)
-    ) {
-      // Store the width and height so that when we search, box doesn't jump
-      const boundingRect =
-        this.shadowRoot!.querySelector("mwc-list")!.getBoundingClientRect();
-      this._width = boundingRect.width;
-      this._height = boundingRect.height;
-    }
-  }
-
-  protected firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-    setTimeout(
-      () => this.shadowRoot!.querySelector("search-input")!.focus(),
-      0
-    );
-  }
-
-  private _getHandlers() {
-    return this._filterHandlers(
-      this.handlers,
-      this._filter,
-      this.hass.localize
-    );
-  }
-
-  private async _filterChanged(e) {
-    this._filter = e.detail.value;
-  }
-
-  private async _handlerPicked(ev) {
-    const handler: HandlerObj | SupportedBrandObj = ev.currentTarget.handler;
-
-    if (handler.is_add) {
-      this._handleAddPicked(handler.slug);
-      return;
-    }
-
-    if (handler.is_helper) {
-      navigate(`/config/helpers/add?domain=${handler.slug}`);
-      // This closes dialog.
-      fireEvent(this, "flow-update");
-      return;
-    }
-
-    if ("supported_flows" in handler) {
-      const slug = handler.supported_flows[0];
-
-      showConfirmationDialog(this, {
-        text: this.hass.localize(
-          "ui.panel.config.integrations.config_flow.supported_brand_flow",
-          {
-            supported_brand: handler.name,
-            flow_domain_name: domainToName(this.hass.localize, slug),
-          }
-        ),
-        confirm: () => {
-          if (["zha", "zwave_js"].includes(slug)) {
-            this._handleAddPicked(slug);
-            return;
-          }
-
-          fireEvent(this, "handler-picked", {
-            handler: slug,
-          });
-        },
-      });
-
-      return;
-    }
-
-    fireEvent(this, "handler-picked", {
-      handler: handler.slug,
-    });
-  }
-
-  private async _handleAddPicked(slug: string): Promise<void> {
-    await protocolIntegrationPicked(this, this.hass, slug);
-    // This closes dialog.
-    fireEvent(this, "flow-update");
-  }
-
-  private _maybeSubmit(ev: KeyboardEvent) {
-    if (ev.key !== "Enter") {
-      return;
-    }
-
-    const handlers = this._getHandlers();
-
-    if (handlers.length > 0) {
-      fireEvent(this, "handler-picked", {
-        handler: handlers[0][0].slug,
-      });
-    }
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      configFlowContentStyles,
-      haStyleScrollbar,
-      css`
-        img {
-          width: 40px;
-          height: 40px;
-        }
-        search-input {
-          display: block;
-          margin: 16px 16px 0;
-        }
-        ha-icon-next {
-          margin-right: 8px;
-        }
-        mwc-list {
-          overflow: auto;
-          max-height: 600px;
-        }
-        .divider {
-          border-bottom-color: var(--divider-color);
-        }
-        h2 {
-          padding-inline-end: 66px;
-          direction: var(--direction);
-        }
-        @media all and (max-height: 900px) {
-          mwc-list {
-            max-height: calc(100vh - 134px);
-          }
-        }
-        p {
-          text-align: center;
-          padding: 16px;
-          margin: 0;
-        }
-        p > a {
-          color: var(--primary-color);
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "step-flow-pick-handler": StepFlowPickHandler;
-  }
-}

src/dialogs/generic/dialog-box.ts

@@ -2,6 +2,7 @@ import "@material/mwc-button/mwc-button";
 import { mdiAlertOutline } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
 import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../../components/ha-dialog";
@@ -96,6 +97,9 @@ class DialogBox extends LitElement {
           @click=${this._confirm}
           ?dialogInitialFocus=${!this._params.prompt}
           slot="primaryAction"
+          class=${classMap({
+            destructive: this._params.destructive || false,
+          })}
         >
           ${this._params.confirmText
             ? this._params.confirmText
@@ -153,6 +157,9 @@ class DialogBox extends LitElement {
       .secondary {
         color: var(--secondary-text-color);
       }
+      .destructive {
+        --mdc-theme-primary: var(--error-color);
+      }
       ha-dialog {
         --mdc-dialog-heading-ink-color: var(--primary-text-color);
         --mdc-dialog-content-ink-color: var(--primary-text-color);

src/dialogs/generic/show-dialog-box.ts

@@ -16,6 +16,7 @@ export interface ConfirmationDialogParams extends BaseDialogBoxParams {
   dismissText?: string;
   confirm?: () => void;
   cancel?: () => void;
+  destructive?: boolean;
 }
 
 export interface PromptDialogParams extends BaseDialogBoxParams {

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

@@ -377,12 +377,14 @@ class MoreInfoClimate extends LitElement {
 
   private _handlePresetmodeChanged(ev) {
     const newVal = ev.target.value || null;
-    this._callServiceHelper(
-      this.stateObj!.attributes.preset_mode,
-      newVal,
-      "set_preset_mode",
-      { preset_mode: newVal }
-    );
+    if (newVal) {
+      this._callServiceHelper(
+        this.stateObj!.attributes.preset_mode,
+        newVal,
+        "set_preset_mode",
+        { preset_mode: newVal }
+      );
+    }
   }
 
   private async _callServiceHelper(

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

@@ -1,19 +1,29 @@
 import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { attributeClassNames } from "../../../common/entity/attribute_class_names";
-import { featureClassNames } from "../../../common/entity/feature_class_names";
+import {
+  FeatureClassNames,
+  featureClassNames,
+} from "../../../common/entity/feature_class_names";
+import { supportsFeature } from "../../../common/entity/supports-feature";
 import "../../../components/ha-attributes";
 import "../../../components/ha-cover-tilt-controls";
 import "../../../components/ha-labeled-slider";
 import {
   CoverEntity,
-  FEATURE_CLASS_NAMES,
+  CoverEntityFeature,
   isTiltOnly,
-  supportsSetPosition,
-  supportsSetTiltPosition,
 } from "../../../data/cover";
 import { HomeAssistant } from "../../../types";
 
+export const FEATURE_CLASS_NAMES: FeatureClassNames<CoverEntityFeature> = {
+  [CoverEntityFeature.SET_POSITION]: "has-set_position",
+  [CoverEntityFeature.OPEN_TILT]: "has-open_tilt",
+  [CoverEntityFeature.CLOSE_TILT]: "has-close_tilt",
+  [CoverEntityFeature.STOP_TILT]: "has-stop_tilt",
+  [CoverEntityFeature.SET_TILT_POSITION]: "has-set_tilt_position",
+};
+
 @customElement("more-info-cover")
 class MoreInfoCover extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -34,13 +44,16 @@ class MoreInfoCover extends LitElement {
             .caption=${this.hass.localize("ui.card.cover.position")}
             pin=""
             .value=${this.stateObj.attributes.current_position}
-            .disabled=${!supportsSetPosition(this.stateObj)}
+            .disabled=${!supportsFeature(
+              this.stateObj,
+              CoverEntityFeature.SET_POSITION
+            )}
             @change=${this._coverPositionSliderChanged}
           ></ha-labeled-slider>
         </div>
 
         <div class="tilt">
-          ${supportsSetTiltPosition(this.stateObj)
+          ${supportsFeature(this.stateObj, CoverEntityFeature.SET_TILT_POSITION)
             ? // Either render the labeled slider and put the tilt buttons into its slot
               // or (if tilt position is not supported and therefore no slider is shown)
               // render a title <div> (same style as for a labeled slider) and directly put

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

@@ -20,13 +20,13 @@ import "../../../components/ha-labeled-slider";
 import "../../../components/ha-select";
 import {
   getLightCurrentModeRgbColor,
-  LightColorModes,
+  LightColorMode,
   LightEntity,
+  LightEntityFeature,
   lightIsInColorMode,
   lightSupportsColor,
   lightSupportsColorMode,
-  lightSupportsDimming,
-  SUPPORT_EFFECT,
+  lightSupportsBrightness,
 } from "../../../data/light";
 import type { HomeAssistant } from "../../../types";
 
@@ -56,7 +56,7 @@ class MoreInfoLight extends LitElement {
 
   @state() private _colorPickerColor?: [number, number, number];
 
-  @state() private _mode?: "color" | LightColorModes;
+  @state() private _mode?: "color" | LightColorMode;
 
   protected render(): TemplateResult {
     if (!this.hass || !this.stateObj) {
@@ -65,29 +65,29 @@ class MoreInfoLight extends LitElement {
 
     const supportsTemp = lightSupportsColorMode(
       this.stateObj,
-      LightColorModes.COLOR_TEMP
+      LightColorMode.COLOR_TEMP
     );
 
     const supportsWhite = lightSupportsColorMode(
       this.stateObj,
-      LightColorModes.WHITE
+      LightColorMode.WHITE
     );
 
     const supportsRgbww = lightSupportsColorMode(
       this.stateObj,
-      LightColorModes.RGBWW
+      LightColorMode.RGBWW
     );
 
     const supportsRgbw =
       !supportsRgbww &&
-      lightSupportsColorMode(this.stateObj, LightColorModes.RGBW);
+      lightSupportsColorMode(this.stateObj, LightColorMode.RGBW);
 
     const supportsColor =
       supportsRgbww || supportsRgbw || lightSupportsColor(this.stateObj);
 
     return html`
       <div class="content">
-        ${lightSupportsDimming(this.stateObj)
+        ${lightSupportsBrightness(this.stateObj)
           ? html`
               <ha-labeled-slider
                 caption=${this.hass.localize("ui.card.light.brightness")}
@@ -113,7 +113,7 @@ class MoreInfoLight extends LitElement {
                 : ""}
               ${supportsTemp &&
               ((!supportsColor && !supportsWhite) ||
-                this._mode === LightColorModes.COLOR_TEMP)
+                this._mode === LightColorMode.COLOR_TEMP)
                 ? html`
                     <ha-labeled-slider
                       class="color_temp"
@@ -204,7 +204,7 @@ class MoreInfoLight extends LitElement {
                       : ""}
                   `
                 : ""}
-              ${supportsFeature(this.stateObj, SUPPORT_EFFECT) &&
+              ${supportsFeature(this.stateObj, LightEntityFeature.EFFECT) &&
               this.stateObj!.attributes.effect_list?.length
                 ? html`
                     <hr />
@@ -260,31 +260,31 @@ class MoreInfoLight extends LitElement {
       let brightnessAdjust = 100;
       this._brightnessAdjusted = undefined;
       if (
-        stateObj.attributes.color_mode === LightColorModes.RGB &&
-        !lightSupportsColorMode(stateObj, LightColorModes.RGBWW) &&
-        !lightSupportsColorMode(stateObj, LightColorModes.RGBW)
+        stateObj.attributes.color_mode === LightColorMode.RGB &&
+        !lightSupportsColorMode(stateObj, LightColorMode.RGBWW) &&
+        !lightSupportsColorMode(stateObj, LightColorMode.RGBW)
       ) {
-        const maxVal = Math.max(...stateObj.attributes.rgb_color);
+        const maxVal = Math.max(...stateObj.attributes.rgb_color!);
         if (maxVal < 255) {
           this._brightnessAdjusted = maxVal;
           brightnessAdjust = (this._brightnessAdjusted / 255) * 100;
         }
       }
       this._brightnessSliderValue = Math.round(
-        (stateObj.attributes.brightness * brightnessAdjust) / 255
+        ((stateObj.attributes.brightness || 0) * brightnessAdjust) / 255
       );
       this._ctSliderValue = stateObj.attributes.color_temp;
       this._wvSliderValue =
-        stateObj.attributes.color_mode === LightColorModes.RGBW
-          ? Math.round((stateObj.attributes.rgbw_color[3] * 100) / 255)
+        stateObj.attributes.color_mode === LightColorMode.RGBW
+          ? Math.round((stateObj.attributes.rgbw_color![3] * 100) / 255)
           : undefined;
       this._cwSliderValue =
-        stateObj.attributes.color_mode === LightColorModes.RGBWW
-          ? Math.round((stateObj.attributes.rgbww_color[3] * 100) / 255)
+        stateObj.attributes.color_mode === LightColorMode.RGBWW
+          ? Math.round((stateObj.attributes.rgbww_color![3] * 100) / 255)
           : undefined;
       this._wwSliderValue =
-        stateObj.attributes.color_mode === LightColorModes.RGBWW
-          ? Math.round((stateObj.attributes.rgbww_color[4] * 100) / 255)
+        stateObj.attributes.color_mode === LightColorMode.RGBWW
+          ? Math.round((stateObj.attributes.rgbww_color![4] * 100) / 255)
           : undefined;
 
       const currentRgbColor = getLightCurrentModeRgbColor(stateObj);
@@ -307,10 +307,10 @@ class MoreInfoLight extends LitElement {
     (supportsTemp: boolean, supportsWhite: boolean) => {
       const modes = [{ label: "Color", value: "color" }];
       if (supportsTemp) {
-        modes.push({ label: "Temperature", value: LightColorModes.COLOR_TEMP });
+        modes.push({ label: "Temperature", value: LightColorMode.COLOR_TEMP });
       }
       if (supportsWhite) {
-        modes.push({ label: "White", value: LightColorModes.WHITE });
+        modes.push({ label: "White", value: LightColorMode.WHITE });
       }
       return modes;
     }
@@ -342,7 +342,7 @@ class MoreInfoLight extends LitElement {
 
     this._brightnessSliderValue = bri;
 
-    if (this._mode === LightColorModes.WHITE) {
+    if (this._mode === LightColorMode.WHITE) {
       this.hass.callService("light", "turn_on", {
         entity_id: this.stateObj!.entity_id,
         white: Math.min(255, Math.round((bri * 255) / 100)),
@@ -486,7 +486,7 @@ class MoreInfoLight extends LitElement {
   }
 
   private _setRgbWColor(rgbColor: [number, number, number]) {
-    if (lightSupportsColorMode(this.stateObj!, LightColorModes.RGBWW)) {
+    if (lightSupportsColorMode(this.stateObj!, LightColorMode.RGBWW)) {
       const rgbww_color: [number, number, number, number, number] = this
         .stateObj!.attributes.rgbww_color
         ? [...this.stateObj!.attributes.rgbww_color]
@@ -495,7 +495,7 @@ class MoreInfoLight extends LitElement {
         entity_id: this.stateObj!.entity_id,
         rgbww_color: rgbColor.concat(rgbww_color.slice(3)),
       });
-    } else if (lightSupportsColorMode(this.stateObj!, LightColorModes.RGBW)) {
+    } else if (lightSupportsColorMode(this.stateObj!, LightColorMode.RGBW)) {
       const rgbw_color: [number, number, number, number] = this.stateObj!
         .attributes.rgbw_color
         ? [...this.stateObj!.attributes.rgbw_color]
@@ -524,8 +524,8 @@ class MoreInfoLight extends LitElement {
     ];
 
     if (
-      lightSupportsColorMode(this.stateObj!, LightColorModes.RGBWW) ||
-      lightSupportsColorMode(this.stateObj!, LightColorModes.RGBW)
+      lightSupportsColorMode(this.stateObj!, LightColorMode.RGBWW) ||
+      lightSupportsColorMode(this.stateObj!, LightColorMode.RGBW)
     ) {
       this._setRgbWColor(
         this._colorBrightnessSliderValue
@@ -535,7 +535,7 @@ class MoreInfoLight extends LitElement {
             )
           : [ev.detail.rgb.r, ev.detail.rgb.g, ev.detail.rgb.b]
       );
-    } else if (lightSupportsColorMode(this.stateObj!, LightColorModes.RGB)) {
+    } else if (lightSupportsColorMode(this.stateObj!, LightColorMode.RGB)) {
       const rgb_color: [number, number, number] = [
         ev.detail.rgb.r,
         ev.detail.rgb.g,

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

@@ -167,7 +167,8 @@ class MoreInfoMediaPlayer extends LitElement {
             </div>
           `
         : ""}
-      ${supportsFeature(stateObj, SUPPORT_SELECT_SOUND_MODE) &&
+      ${![UNAVAILABLE, UNKNOWN, "off"].includes(stateObj.state) &&
+      supportsFeature(stateObj, SUPPORT_SELECT_SOUND_MODE) &&
       stateObj.attributes.sound_mode_list?.length
         ? html`
             <div class="sound-input">

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

@@ -90,7 +90,7 @@ export class MoreInfoDialog extends LitElement {
     const stateObj = this.hass.states[entityId];
 
     const domain = computeDomain(entityId);
-    const name = stateObj ? computeStateName(stateObj) : entityId;
+    const name = (stateObj && computeStateName(stateObj)) || entityId;
     const tabs = this._getTabs(entityId, this.hass.user!.is_admin);
 
     return html`

src/external_app/external_app_entrypoint.ts

@@ -7,7 +7,7 @@ This is the entry point for providing external app stuff from app entrypoint.
 
 import { fireEvent } from "../common/dom/fire_event";
 import { HomeAssistantMain } from "../layouts/home-assistant-main";
-import type { EMExternalMessageCommands } from "./external_messaging";
+import type { EMIncomingMessageCommands } from "./external_messaging";
 
 export const attachExternalToApp = (hassMainEl: HomeAssistantMain) => {
   window.addEventListener("haptic", (ev) =>
@@ -24,7 +24,7 @@ export const attachExternalToApp = (hassMainEl: HomeAssistantMain) => {
 
 const handleExternalMessage = (
   hassMainEl: HomeAssistantMain,
-  msg: EMExternalMessageCommands
+  msg: EMIncomingMessageCommands
 ): boolean => {
   const bus = hassMainEl.hass.auth.external!;
 

src/external_app/external_messaging.ts

@@ -8,7 +8,6 @@ interface CommandInFlight {
 export interface EMMessage {
   id?: number;
   type: string;
-  payload?: unknown;
 }
 
 interface EMError {
@@ -30,34 +29,120 @@ interface EMMessageResultError {
   error: EMError;
 }
 
-interface EMExternalMessageRestart {
+interface EMOutgoingMessageConfigGet extends EMMessage {
+  type: "config/get";
+}
+
+interface EMOutgoingMessageMatterCommission extends EMMessage {
+  type: "matter/commission";
+}
+
+type EMOutgoingMessageWithAnswer = {
+  "config/get": {
+    request: EMOutgoingMessageConfigGet;
+    response: ExternalConfig;
+  };
+  "matter/commission": {
+    request: EMOutgoingMessageMatterCommission;
+    response: {
+      code: string;
+    };
+  };
+};
+
+interface EMOutgoingMessageExoplayerPlayHLS extends EMMessage {
+  type: "exoplayer/play_hls";
+  payload: {
+    url: string;
+    muted: boolean;
+  };
+}
+interface EMOutgoingMessageExoplayerResize extends EMMessage {
+  type: "exoplayer/resize";
+  payload: {
+    left: number;
+    top: number;
+    right: number;
+    bottom: number;
+  };
+}
+
+interface EMOutgoingMessageExoplayerStop extends EMMessage {
+  type: "exoplayer/stop";
+}
+
+interface EMOutgoingMessageThemeUpdate extends EMMessage {
+  type: "theme-update";
+}
+
+interface EMOutgoingMessageHaptic extends EMMessage {
+  type: "haptic";
+  payload: { hapticType: string };
+}
+
+interface EMOutgoingMessageConnectionStatus extends EMMessage {
+  type: "connection-status";
+  payload: { event: string };
+}
+
+interface EMOutgoingMessageAppConfiguration extends EMMessage {
+  type: "config_screen/show";
+}
+
+interface EMOutgoingMessageTagWrite extends EMMessage {
+  type: "tag/write";
+  payload: {
+    name: string | null;
+    tag: string;
+  };
+}
+
+interface EMOutgoingMessageSidebarShow extends EMMessage {
+  type: "sidebar/show";
+}
+
+type EMOutgoingMessageWithoutAnswer =
+  | EMOutgoingMessageHaptic
+  | EMOutgoingMessageConnectionStatus
+  | EMOutgoingMessageAppConfiguration
+  | EMOutgoingMessageTagWrite
+  | EMOutgoingMessageSidebarShow
+  | EMOutgoingMessageExoplayerPlayHLS
+  | EMOutgoingMessageExoplayerResize
+  | EMOutgoingMessageExoplayerStop
+  | EMOutgoingMessageThemeUpdate
+  | EMMessageResultSuccess
+  | EMMessageResultError;
+
+interface EMIncomingMessageRestart {
   id: number;
   type: "command";
   command: "restart";
 }
 
-interface EMExternMessageShowNotifications {
+interface EMIncomingMessageShowNotifications {
   id: number;
   type: "command";
   command: "notifications/show";
 }
 
-export type EMExternalMessageCommands =
-  | EMExternalMessageRestart
-  | EMExternMessageShowNotifications;
+export type EMIncomingMessageCommands =
+  | EMIncomingMessageRestart
+  | EMIncomingMessageShowNotifications;
 
-type ExternalMessage =
+type EMIncomingMessage =
   | EMMessageResultSuccess
   | EMMessageResultError
-  | EMExternalMessageCommands;
+  | EMIncomingMessageCommands;
 
-type ExternalMessageHandler = (msg: EMExternalMessageCommands) => boolean;
+type EMIncomingMessageHandler = (msg: EMIncomingMessageCommands) => boolean;
 
 export interface ExternalConfig {
   hasSettingsScreen: boolean;
   hasSidebar: boolean;
   canWriteTag: boolean;
   hasExoPlayer: boolean;
+  canCommissionMatter: boolean;
 }
 
 export class ExternalMessaging {
@@ -67,7 +152,7 @@ export class ExternalMessaging {
 
   public msgId = 0;
 
-  private _commandHandler?: ExternalMessageHandler;
+  private _commandHandler?: EMIncomingMessageHandler;
 
   public async attach() {
     window[CALLBACK_EXTERNAL_BUS] = (msg) => this.receiveMessage(msg);
@@ -77,12 +162,12 @@ export class ExternalMessaging {
         payload: { event: ev.detail },
       })
     );
-    this.config = await this.sendMessage<ExternalConfig>({
+    this.config = await this.sendMessage<"config/get">({
       type: "config/get",
     });
   }
 
-  public addCommandHandler(handler: ExternalMessageHandler) {
+  public addCommandHandler(handler: EMIncomingMessageHandler) {
     this._commandHandler = handler;
   }
 
@@ -90,31 +175,33 @@ export class ExternalMessaging {
    * Send message to external app that expects a response.
    * @param msg message to send
    */
-  public sendMessage<T>(msg: EMMessage): Promise<T> {
+  public sendMessage<T extends keyof EMOutgoingMessageWithAnswer>(
+    msg: EMOutgoingMessageWithAnswer[T]["request"]
+  ): Promise<EMOutgoingMessageWithAnswer[T]["response"]> {
     const msgId = ++this.msgId;
     msg.id = msgId;
 
-    this.fireMessage(msg);
+    this._sendExternal(msg);
 
-    return new Promise<T>((resolve, reject) => {
-      this.commands[msgId] = { resolve, reject };
-    });
+    return new Promise<EMOutgoingMessageWithAnswer[T]["response"]>(
+      (resolve, reject) => {
+        this.commands[msgId] = { resolve, reject };
+      }
+    );
   }
 
   /**
    * Send message to external app without expecting a response.
    * @param msg message to send
    */
-  public fireMessage(
-    msg: EMMessage | EMMessageResultSuccess | EMMessageResultError
-  ) {
+  public fireMessage(msg: EMOutgoingMessageWithoutAnswer) {
     if (!msg.id) {
       msg.id = ++this.msgId;
     }
     this._sendExternal(msg);
   }
 
-  public receiveMessage(msg: ExternalMessage) {
+  public receiveMessage(msg: EMIncomingMessage) {
     if (__DEV__) {
       // eslint-disable-next-line no-console
       console.log("Receiving message from external app", msg);

src/layouts/hass-subpage.ts

@@ -1,6 +1,15 @@
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  PropertyValues,
+  TemplateResult,
+} from "lit";
 import { customElement, eventOptions, property } from "lit/decorators";
 import { restoreScroll } from "../common/decorators/restore-scroll";
+import { toggleAttribute } from "../common/dom/toggle_attribute";
+import { computeRTL } from "../common/util/compute_rtl";
 import "../components/ha-icon-button-arrow-prev";
 import "../components/ha-menu-button";
 import { HomeAssistant } from "../types";
@@ -15,6 +24,8 @@ class HassSubpage extends LitElement {
 
   @property({ type: String, attribute: "back-path" }) public backPath?: string;
 
+  @property() public backCallback?: () => void;
+
   @property({ type: Boolean, reflect: true }) public narrow = false;
 
   @property({ type: Boolean }) public supervisor = false;
@@ -22,6 +33,17 @@ class HassSubpage extends LitElement {
   // @ts-ignore
   @restoreScroll(".content") private _savedScrollPos?: number;
 
+  protected willUpdate(changedProps: PropertyValues): void {
+    super.willUpdate(changedProps);
+    if (!changedProps.has("hass")) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    if (!oldHass || oldHass.locale !== this.hass.locale) {
+      toggleAttribute(this, "rtl", computeRTL(this.hass));
+    }
+  }
+
   protected render(): TemplateResult {
     return html`
       <div class="toolbar">
@@ -52,6 +74,9 @@ class HassSubpage extends LitElement {
         <slot name="toolbar-icon"></slot>
       </div>
       <div class="content" @scroll=${this._saveScrollPos}><slot></slot></div>
+      <div id="fab">
+        <slot name="fab"></slot>
+      </div>
     `;
   }
 
@@ -61,6 +86,10 @@ class HassSubpage extends LitElement {
   }
 
   private _backTapped(): void {
+    if (this.backCallback) {
+      this.backCallback();
+      return;
+    }
     history.back();
   }
 
@@ -116,6 +145,29 @@ class HassSubpage extends LitElement {
         overflow: auto;
         -webkit-overflow-scrolling: touch;
       }
+
+      #fab {
+        position: fixed;
+        right: calc(16px + env(safe-area-inset-right));
+        bottom: calc(16px + env(safe-area-inset-bottom));
+        z-index: 1;
+      }
+      :host([narrow]) #fab.tabs {
+        bottom: calc(84px + env(safe-area-inset-bottom));
+      }
+      #fab[is-wide] {
+        bottom: 24px;
+        right: 24px;
+      }
+      :host([rtl]) #fab {
+        right: auto;
+        left: calc(16px + env(safe-area-inset-left));
+      }
+      :host([rtl][is-wide]) #fab {
+        bottom: 24px;
+        left: 24px;
+        right: auto;
+      }
     `;
   }
 }

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

@@ -375,3 +375,9 @@ export class HaTabsSubpageDataTable extends LitElement {
     `;
   }
 }
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hass-tabs-subpage-data-table": HaTabsSubpageDataTable;
+  }
+}