RTL fix for log buttons (#12474)

* Move Restart to Overflow and yaml config advanced

* Move around YAML Config page

* Move to developer tools

* Make card actions

* Update Translations

build-scripts/webpack.js

@@ -3,10 +3,10 @@ const webpack = require("webpack");
 const path = require("path");
 const TerserPlugin = require("terser-webpack-plugin");
 const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
-const paths = require("./paths.js");
-const bundle = require("./bundle.js");
 const log = require("fancy-log");
 const WebpackBar = require("webpackbar");
+const paths = require("./paths.js");
+const bundle = require("./bundle.js");
 
 class LogStartCompilePlugin {
   ignoredFirst = false;
@@ -138,6 +138,8 @@ const createWebpackConfig = ({
         "lit/directives/cache$": "lit/directives/cache.js",
         "lit/directives/repeat$": "lit/directives/repeat.js",
         "lit/polyfill-support$": "lit/polyfill-support.js",
+        "@lit-labs/virtualizer/layouts/grid":
+          "@lit-labs/virtualizer/layouts/grid.js",
       },
     },
     output: {

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

@@ -8,7 +8,7 @@ import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
 import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
 import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
 import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
-import type { Condition } from "../../../../src/data/automation";
+import type { ConditionWithShorthand } from "../../../../src/data/automation";
 import "../../../../src/panels/config/automation/condition/ha-automation-condition";
 import { HaDeviceCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-device";
 import { HaLogicalCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-logical";
@@ -20,7 +20,7 @@ import { HaTimeCondition } from "../../../../src/panels/config/automation/condit
 import { HaTriggerCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-trigger";
 import { HaZoneCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-zone";
 
-const SCHEMAS: { name: string; conditions: Condition[] }[] = [
+const SCHEMAS: { name: string; conditions: ConditionWithShorthand[] }[] = [
   {
     name: "State",
     conditions: [{ condition: "state", ...HaStateCondition.defaultConfig }],
@@ -69,6 +69,14 @@ const SCHEMAS: { name: string; conditions: Condition[] }[] = [
     name: "Trigger",
     conditions: [{ condition: "trigger", ...HaTriggerCondition.defaultConfig }],
   },
+  {
+    name: "Shorthand",
+    conditions: [
+      { and: HaLogicalCondition.defaultConfig.conditions },
+      { or: HaLogicalCondition.defaultConfig.conditions },
+      { not: HaLogicalCondition.defaultConfig.conditions },
+    ],
+  },
 ];
 
 @customElement("demo-automation-editor-condition")

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

@@ -159,13 +159,19 @@ export class DemoHaAlert extends LitElement {
 
   firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
-    applyThemesOnElement(this.shadowRoot!.querySelector(".dark"), {
-      default_theme: "default",
-      default_dark_theme: "default",
-      themes: {},
-      darkMode: true,
-      theme: "default",
-    });
+    applyThemesOnElement(
+      this.shadowRoot!.querySelector(".dark"),
+      {
+        default_theme: "default",
+        default_dark_theme: "default",
+        themes: {},
+        darkMode: true,
+        theme: "default",
+      },
+      undefined,
+      undefined,
+      true
+    );
   }
 
   static get styles() {

gallery/src/pages/components/ha-tip.markdown

@@ -0,0 +1,3 @@
+---
+title: Tips
+---

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

@@ -0,0 +1,73 @@
+import { html, css, LitElement, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
+import "../../../../src/components/ha-tip";
+import "../../../../src/components/ha-card";
+import { applyThemesOnElement } from "../../../../src/common/dom/apply_themes_on_element";
+
+const tips: (string | TemplateResult)[] = [
+  "Test tip",
+  "Bigger test tip, with some random text just to fill up as much space as possible without it looking like I'm really trying to to that",
+  html`<i>Tip</i> <b>with</b> <sub>HTML</sub>`,
+];
+
+@customElement("demo-components-ha-tip")
+export class DemoHaTip extends LitElement {
+  protected render(): TemplateResult {
+    return html` ${["light", "dark"].map(
+      (mode) => html`
+        <div class=${mode}>
+          <ha-card header="ha-tip ${mode} demo">
+            <div class="card-content">
+              ${tips.map((tip) => html`<ha-tip>${tip}</ha-tip>`)}
+            </div>
+          </ha-card>
+        </div>
+      `
+    )}`;
+  }
+
+  firstUpdated(changedProps) {
+    super.firstUpdated(changedProps);
+    applyThemesOnElement(
+      this.shadowRoot!.querySelector(".dark"),
+      {
+        default_theme: "default",
+        default_dark_theme: "default",
+        themes: {},
+        darkMode: true,
+        theme: "default",
+      },
+      undefined,
+      undefined,
+      true
+    );
+  }
+
+  static get styles() {
+    return css`
+      :host {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+      }
+      .dark,
+      .light {
+        display: block;
+        background-color: var(--primary-background-color);
+        padding: 0 50px;
+      }
+      ha-tip {
+        margin-bottom: 14px;
+      }
+      ha-card {
+        margin: 24px auto;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "demo-components-ha-tip": DemoHaTip;
+  }
+}

hassio/src/addon-view/log/hassio-addon-logs.ts

@@ -2,6 +2,7 @@ import "@material/mwc-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../../src/components/ha-alert";
+import "../../../../src/components/ha-ansi-to-html";
 import "../../../../src/components/ha-card";
 import {
   fetchHassioAddonLogs,
@@ -11,7 +12,6 @@ import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import { haStyle } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
-import "../../components/hassio-ansi-to-html";
 import { hassioStyle } from "../../resources/hassio-style";
 
 @customElement("hassio-addon-logs")
@@ -40,9 +40,9 @@ class HassioAddonLogs extends LitElement {
           : ""}
         <div class="card-content">
           ${this._content
-            ? html`<hassio-ansi-to-html
+            ? html`<ha-ansi-to-html
                 .content=${this._content}
-              ></hassio-ansi-to-html>`
+              ></ha-ansi-to-html>`
             : ""}
         </div>
         <div class="card-actions">

hassio/src/backups/hassio-backups.ts

@@ -1,7 +1,7 @@
 import "@material/mwc-button";
 import { ActionDetail } from "@material/mwc-list";
 import "@material/mwc-list/mwc-list-item";
-import { mdiDelete, mdiDotsVertical, mdiPlus } from "@mdi/js";
+import { mdiBackupRestore, mdiDelete, mdiDotsVertical, mdiPlus } from "@mdi/js";
 import {
   css,
   CSSResultGroup,
@@ -166,7 +166,15 @@ export class HassioBackups extends LitElement {
     }
     return html`
       <hass-tabs-subpage-data-table
-        .tabs=${supervisorTabs(this.hass)}
+        .tabs=${atLeastVersion(this.hass.config.version, 2022, 5)
+          ? [
+              {
+                translationKey: "panel.backups",
+                path: `/hassio/backups`,
+                iconPath: mdiBackupRestore,
+              },
+            ]
+          : supervisorTabs(this.hass)}
         .hass=${this.hass}
         .localizeFunc=${this.supervisor.localize}
         .searchLabel=${this.supervisor.localize("search")}
@@ -182,7 +190,9 @@ export class HassioBackups extends LitElement {
         selectable
         hasFab
         .mainPage=${!atLeastVersion(this.hass.config.version, 2021, 12)}
-        back-path="/config"
+        back-path=${atLeastVersion(this.hass.config.version, 2022, 5)
+          ? "/config/system"
+          : "/config"}
         supervisor
       >
         <ha-button-menu

hassio/src/dashboard/hassio-dashboard.ts

@@ -10,6 +10,7 @@ import { HomeAssistant, Route } from "../../../src/types";
 import { supervisorTabs } from "../hassio-tabs";
 import "./hassio-addons";
 import "./hassio-update";
+import "../../../src/layouts/hass-subpage";
 
 @customElement("hassio-dashboard")
 class HassioDashboard extends LitElement {
@@ -22,6 +23,31 @@ class HassioDashboard extends LitElement {
   @property({ attribute: false }) public route!: Route;
 
   protected render(): TemplateResult {
+    if (atLeastVersion(this.hass.config.version, 2022, 5)) {
+      return html`<hass-subpage
+        .hass=${this.hass}
+        .narrow=${this.narrow}
+        .route=${this.route}
+        .header=${this.supervisor.localize("panel.addons")}
+      >
+        <hassio-addons
+          .hass=${this.hass}
+          .supervisor=${this.supervisor}
+        ></hassio-addons>
+        <a href="/hassio/store">
+          <ha-fab
+            .label=${this.supervisor.localize("panel.store")}
+            extended
+            class="non-tabs"
+          >
+            <ha-svg-icon
+              slot="icon"
+              .path=${mdiStorePlus}
+            ></ha-svg-icon> </ha-fab
+        ></a>
+      </hass-subpage>`;
+    }
+
     return html`
       <hass-tabs-subpage
         .hass=${this.hass}
@@ -74,6 +100,12 @@ class HassioDashboard extends LitElement {
         .content {
           margin: 0 auto;
         }
+        ha-fab.non-tabs {
+          position: fixed;
+          right: calc(16px + env(safe-area-inset-right));
+          bottom: calc(16px + env(safe-area-inset-bottom));
+          z-index: 1;
+        }
       `,
     ];
   }

hassio/src/hassio-main.ts

@@ -3,8 +3,8 @@ import { customElement, property } from "lit/decorators";
 import { atLeastVersion } from "../../src/common/config/version";
 import { applyThemesOnElement } from "../../src/common/dom/apply_themes_on_element";
 import { fireEvent } from "../../src/common/dom/fire_event";
-import { isNavigationClick } from "../../src/common/dom/is-navigation-click";
 import { mainWindow } from "../../src/common/dom/get_main_window";
+import { isNavigationClick } from "../../src/common/dom/is-navigation-click";
 import { navigate } from "../../src/common/navigate";
 import { HassioPanelInfo } from "../../src/data/hassio/supervisor";
 import { Supervisor } from "../../src/data/supervisor/supervisor";
@@ -73,6 +73,14 @@ export class HassioMain extends SupervisorBaseElement {
       });
     });
 
+    // Forward keydown events to the main window for quickbar access
+    document.body.addEventListener("keydown", (ev) => {
+      // @ts-ignore
+      fireEvent(mainWindow, "hass-quick-bar-trigger", ev, {
+        bubbles: false,
+      });
+    });
+
     makeDialogManager(this, this.shadowRoot!);
   }
 

hassio/src/hassio-my-redirect.ts

@@ -15,7 +15,7 @@ import {
 } from "../../src/panels/my/ha-panel-my";
 import { HomeAssistant, Route } from "../../src/types";
 
-const REDIRECTS: Redirects = {
+export const REDIRECTS: Redirects = {
   supervisor: {
     redirect: "/hassio/dashboard",
   },

hassio/src/hassio-tabs.ts

@@ -8,24 +8,27 @@ import { atLeastVersion } from "../../src/common/config/version";
 import type { PageNavigation } from "../../src/layouts/hass-tabs-subpage";
 import { HomeAssistant } from "../../src/types";
 
-export const supervisorTabs = (hass: HomeAssistant): PageNavigation[] => [
-  {
-    translationKey: atLeastVersion(hass.config.version, 2021, 12)
-      ? "panel.addons"
-      : "panel.dashboard",
-    path: `/hassio/dashboard`,
-    iconPath: atLeastVersion(hass.config.version, 2021, 12)
-      ? mdiPuzzle
-      : mdiViewDashboard,
-  },
-  {
-    translationKey: "panel.backups",
-    path: `/hassio/backups`,
-    iconPath: mdiBackupRestore,
-  },
-  {
-    translationKey: "panel.system",
-    path: `/hassio/system`,
-    iconPath: mdiCogs,
-  },
-];
+export const supervisorTabs = (hass: HomeAssistant): PageNavigation[] =>
+  atLeastVersion(hass.config.version, 2022, 5)
+    ? []
+    : [
+        {
+          translationKey: atLeastVersion(hass.config.version, 2021, 12)
+            ? "panel.addons"
+            : "panel.dashboard",
+          path: `/hassio/dashboard`,
+          iconPath: atLeastVersion(hass.config.version, 2021, 12)
+            ? mdiPuzzle
+            : mdiViewDashboard,
+        },
+        {
+          translationKey: "panel.backups",
+          path: `/hassio/backups`,
+          iconPath: mdiBackupRestore,
+        },
+        {
+          translationKey: "panel.system",
+          path: `/hassio/system`,
+          iconPath: mdiCogs,
+        },
+      ];

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

@@ -23,6 +23,10 @@ import {
   showAlertDialog,
   showConfirmationDialog,
 } from "../../../src/dialogs/generic/show-dialog-box";
+import {
+  UNHEALTHY_REASON_URL,
+  UNSUPPORTED_REASON_URL,
+} from "../../../src/panels/config/system-health/ha-config-system-health";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
 import { bytesToString } from "../../../src/util/bytes-to-string";
@@ -30,11 +34,6 @@ import { documentationUrl } from "../../../src/util/documentation-url";
 import "../components/supervisor-metric";
 import { hassioStyle } from "../resources/hassio-style";
 
-const UNSUPPORTED_REASON_URL = {};
-const UNHEALTHY_REASON_URL = {
-  privileged: "/more-info/unsupported/privileged",
-};
-
 @customElement("hassio-supervisor-info")
 class HassioSupervisorInfo extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;

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

@@ -1,3 +1,4 @@
+import "../../../src/components/ha-ansi-to-html";
 import "@material/mwc-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -11,7 +12,6 @@ import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import "../../../src/layouts/hass-loading-screen";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
-import "../components/hassio-ansi-to-html";
 import { hassioStyle } from "../resources/hassio-style";
 
 interface LogProvider {
@@ -89,8 +89,8 @@ class HassioSupervisorLog extends LitElement {
 
         <div class="card-content" id="content">
           ${this._content
-            ? html`<hassio-ansi-to-html .content=${this._content}>
-              </hassio-ansi-to-html>`
+            ? html`<ha-ansi-to-html .content=${this._content}>
+              </ha-ansi-to-html>`
             : html`<hass-loading-screen no-toolbar></hass-loading-screen>`}
         </div>
         <div class="card-actions">

package.json

@@ -106,6 +106,7 @@
     "deep-clone-simple": "^1.1.1",
     "deep-freeze": "^0.0.1",
     "fuse.js": "^6.0.0",
+    "fuzzysort": "^1.2.1",
     "google-timezones-json": "^1.0.2",
     "hls.js": "^1.1.5",
     "home-assistant-js-websocket": "^7.0.3",

setup.cfg

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

src/common/datetime/duration.ts

@@ -0,0 +1,16 @@
+import secondsToDuration from "./seconds_to_duration";
+
+const DAY_IN_SECONDS = 86400;
+const HOUR_IN_SECONDS = 3600;
+const MINUTE_IN_SECONDS = 60;
+
+export const UNIT_TO_SECOND_CONVERT = {
+  s: 1,
+  min: MINUTE_IN_SECONDS,
+  h: HOUR_IN_SECONDS,
+  d: DAY_IN_SECONDS,
+};
+
+export const formatDuration = (duration: string, units: string): string =>
+  secondsToDuration(parseFloat(duration) * UNIT_TO_SECOND_CONVERT[units]) ||
+  "0";

src/common/entity/compute_state_display.ts

@@ -13,6 +13,7 @@ import { formatNumber, isNumericState } from "../number/format_number";
 import { LocalizeFunc } from "../translations/localize";
 import { computeStateDomain } from "./compute_state_domain";
 import { supportsFeature } from "./supports-feature";
+import { formatDuration, UNIT_TO_SECOND_CONVERT } from "../datetime/duration";
 
 export const computeStateDisplay = (
   localize: LocalizeFunc,
@@ -28,11 +29,27 @@ export const computeStateDisplay = (
 
   // Entities with a `unit_of_measurement` or `state_class` are numeric values and should use `formatNumber`
   if (isNumericState(stateObj)) {
+    // state is duration
+    if (
+      stateObj.attributes.device_class === "duration" &&
+      stateObj.attributes.unit_of_measurement &&
+      UNIT_TO_SECOND_CONVERT[stateObj.attributes.unit_of_measurement]
+    ) {
+      try {
+        return formatDuration(
+          compareState,
+          stateObj.attributes.unit_of_measurement
+        );
+      } catch (_err) {
+        // fallback to default
+      }
+    }
     if (stateObj.attributes.device_class === "monetary") {
       try {
         return formatNumber(compareState, locale, {
           style: "currency",
           currency: stateObj.attributes.unit_of_measurement,
+          minimumFractionDigits: 2,
         });
       } catch (_err) {
         // fallback to default

src/common/string/filter/char-code.ts

@@ -1,244 +0,0 @@
-// MIT License
-
-// Copyright (c) 2015 - present Microsoft Corporation
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-// Names from https://blog.codinghorror.com/ascii-pronunciation-rules-for-programmers/
-
-/**
- * An inlined enum containing useful character codes (to be used with String.charCodeAt).
- * Please leave the const keyword such that it gets inlined when compiled to JavaScript!
- */
-export enum CharCode {
-  Null = 0,
-  /**
-   * The `\b` character.
-   */
-  Backspace = 8,
-  /**
-   * The `\t` character.
-   */
-  Tab = 9,
-  /**
-   * The `\n` character.
-   */
-  LineFeed = 10,
-  /**
-   * The `\r` character.
-   */
-  CarriageReturn = 13,
-  Space = 32,
-  /**
-   * The `!` character.
-   */
-  ExclamationMark = 33,
-  /**
-   * The `"` character.
-   */
-  DoubleQuote = 34,
-  /**
-   * The `#` character.
-   */
-  Hash = 35,
-  /**
-   * The `$` character.
-   */
-  DollarSign = 36,
-  /**
-   * The `%` character.
-   */
-  PercentSign = 37,
-  /**
-   * The `&` character.
-   */
-  Ampersand = 38,
-  /**
-   * The `'` character.
-   */
-  SingleQuote = 39,
-  /**
-   * The `(` character.
-   */
-  OpenParen = 40,
-  /**
-   * The `)` character.
-   */
-  CloseParen = 41,
-  /**
-   * The `*` character.
-   */
-  Asterisk = 42,
-  /**
-   * The `+` character.
-   */
-  Plus = 43,
-  /**
-   * The `,` character.
-   */
-  Comma = 44,
-  /**
-   * The `-` character.
-   */
-  Dash = 45,
-  /**
-   * The `.` character.
-   */
-  Period = 46,
-  /**
-   * The `/` character.
-   */
-  Slash = 47,
-
-  Digit0 = 48,
-  Digit1 = 49,
-  Digit2 = 50,
-  Digit3 = 51,
-  Digit4 = 52,
-  Digit5 = 53,
-  Digit6 = 54,
-  Digit7 = 55,
-  Digit8 = 56,
-  Digit9 = 57,
-
-  /**
-   * The `:` character.
-   */
-  Colon = 58,
-  /**
-   * The `;` character.
-   */
-  Semicolon = 59,
-  /**
-   * The `<` character.
-   */
-  LessThan = 60,
-  /**
-   * The `=` character.
-   */
-  Equals = 61,
-  /**
-   * The `>` character.
-   */
-  GreaterThan = 62,
-  /**
-   * The `?` character.
-   */
-  QuestionMark = 63,
-  /**
-   * The `@` character.
-   */
-  AtSign = 64,
-
-  A = 65,
-  B = 66,
-  C = 67,
-  D = 68,
-  E = 69,
-  F = 70,
-  G = 71,
-  H = 72,
-  I = 73,
-  J = 74,
-  K = 75,
-  L = 76,
-  M = 77,
-  N = 78,
-  O = 79,
-  P = 80,
-  Q = 81,
-  R = 82,
-  S = 83,
-  T = 84,
-  U = 85,
-  V = 86,
-  W = 87,
-  X = 88,
-  Y = 89,
-  Z = 90,
-
-  /**
-   * The `[` character.
-   */
-  OpenSquareBracket = 91,
-  /**
-   * The `\` character.
-   */
-  Backslash = 92,
-  /**
-   * The `]` character.
-   */
-  CloseSquareBracket = 93,
-  /**
-   * The `^` character.
-   */
-  Caret = 94,
-  /**
-   * The `_` character.
-   */
-  Underline = 95,
-  /**
-   * The ``(`)`` character.
-   */
-  BackTick = 96,
-
-  a = 97,
-  b = 98,
-  c = 99,
-  d = 100,
-  e = 101,
-  f = 102,
-  g = 103,
-  h = 104,
-  i = 105,
-  j = 106,
-  k = 107,
-  l = 108,
-  m = 109,
-  n = 110,
-  o = 111,
-  p = 112,
-  q = 113,
-  r = 114,
-  s = 115,
-  t = 116,
-  u = 117,
-  v = 118,
-  w = 119,
-  x = 120,
-  y = 121,
-  z = 122,
-
-  /**
-   * The `{` character.
-   */
-  OpenCurlyBrace = 123,
-  /**
-   * The `|` character.
-   */
-  Pipe = 124,
-  /**
-   * The `}` character.
-   */
-  CloseCurlyBrace = 125,
-  /**
-   * The `~` character.
-   */
-  Tilde = 126,
-}

src/common/string/filter/filter.ts

@@ -1,551 +0,0 @@
-/* eslint-disable no-console */
-// MIT License
-
-// Copyright (c) 2015 - present Microsoft Corporation
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-import { CharCode } from "./char-code";
-
-const _debug = false;
-
-export interface Match {
-  start: number;
-  end: number;
-}
-
-const _maxLen = 128;
-
-function initTable() {
-  const table: number[][] = [];
-  const row: number[] = [];
-  for (let i = 0; i <= _maxLen; i++) {
-    row[i] = 0;
-  }
-  for (let i = 0; i <= _maxLen; i++) {
-    table.push(row.slice(0));
-  }
-  return table;
-}
-
-function isSeparatorAtPos(value: string, index: number): boolean {
-  if (index < 0 || index >= value.length) {
-    return false;
-  }
-  const code = value.codePointAt(index);
-  switch (code) {
-    case CharCode.Underline:
-    case CharCode.Dash:
-    case CharCode.Period:
-    case CharCode.Space:
-    case CharCode.Slash:
-    case CharCode.Backslash:
-    case CharCode.SingleQuote:
-    case CharCode.DoubleQuote:
-    case CharCode.Colon:
-    case CharCode.DollarSign:
-    case CharCode.LessThan:
-    case CharCode.OpenParen:
-    case CharCode.OpenSquareBracket:
-      return true;
-    case undefined:
-      return false;
-    default:
-      if (isEmojiImprecise(code)) {
-        return true;
-      }
-      return false;
-  }
-}
-
-function isWhitespaceAtPos(value: string, index: number): boolean {
-  if (index < 0 || index >= value.length) {
-    return false;
-  }
-  const code = value.charCodeAt(index);
-  switch (code) {
-    case CharCode.Space:
-    case CharCode.Tab:
-      return true;
-    default:
-      return false;
-  }
-}
-
-function isUpperCaseAtPos(pos: number, word: string, wordLow: string): boolean {
-  return word[pos] !== wordLow[pos];
-}
-
-export function isPatternInWord(
-  patternLow: string,
-  patternPos: number,
-  patternLen: number,
-  wordLow: string,
-  wordPos: number,
-  wordLen: number,
-  fillMinWordPosArr = false
-): boolean {
-  while (patternPos < patternLen && wordPos < wordLen) {
-    if (patternLow[patternPos] === wordLow[wordPos]) {
-      if (fillMinWordPosArr) {
-        // Remember the min word position for each pattern position
-        _minWordMatchPos[patternPos] = wordPos;
-      }
-      patternPos += 1;
-    }
-    wordPos += 1;
-  }
-  return patternPos === patternLen; // pattern must be exhausted
-}
-
-enum Arrow {
-  Diag = 1,
-  Left = 2,
-  LeftLeft = 3,
-}
-
-/**
- * An array representing a fuzzy match.
- *
- * 0. the score
- * 1. the offset at which matching started
- * 2. `<match_pos_N>`
- * 3. `<match_pos_1>`
- * 4. `<match_pos_0>` etc
- */
-// export type FuzzyScore = [score: number, wordStart: number, ...matches: number[]];// [number, number, number];
-export type FuzzyScore = Array<number>;
-
-export function fuzzyScore(
-  pattern: string,
-  patternLow: string,
-  patternStart: number,
-  word: string,
-  wordLow: string,
-  wordStart: number,
-  firstMatchCanBeWeak: boolean
-): FuzzyScore | undefined {
-  const patternLen = pattern.length > _maxLen ? _maxLen : pattern.length;
-  const wordLen = word.length > _maxLen ? _maxLen : word.length;
-
-  if (
-    patternStart >= patternLen ||
-    wordStart >= wordLen ||
-    patternLen - patternStart > wordLen - wordStart
-  ) {
-    return undefined;
-  }
-
-  // Run a simple check if the characters of pattern occur
-  // (in order) at all in word. If that isn't the case we
-  // stop because no match will be possible
-  if (
-    !isPatternInWord(
-      patternLow,
-      patternStart,
-      patternLen,
-      wordLow,
-      wordStart,
-      wordLen,
-      true
-    )
-  ) {
-    return undefined;
-  }
-
-  // Find the max matching word position for each pattern position
-  // NOTE: the min matching word position was filled in above, in the `isPatternInWord` call
-  _fillInMaxWordMatchPos(
-    patternLen,
-    wordLen,
-    patternStart,
-    wordStart,
-    patternLow,
-    wordLow
-  );
-
-  let row: number;
-  let column = 1;
-  let patternPos: number;
-  let wordPos: number;
-
-  const hasStrongFirstMatch = [false];
-
-  // There will be a match, fill in tables
-  for (
-    row = 1, patternPos = patternStart;
-    patternPos < patternLen;
-    row++, patternPos++
-  ) {
-    // Reduce search space to possible matching word positions and to possible access from next row
-    const minWordMatchPos = _minWordMatchPos[patternPos];
-    const maxWordMatchPos = _maxWordMatchPos[patternPos];
-    const nextMaxWordMatchPos =
-      patternPos + 1 < patternLen ? _maxWordMatchPos[patternPos + 1] : wordLen;
-
-    for (
-      column = minWordMatchPos - wordStart + 1, wordPos = minWordMatchPos;
-      wordPos < nextMaxWordMatchPos;
-      column++, wordPos++
-    ) {
-      let score = Number.MIN_SAFE_INTEGER;
-      let canComeDiag = false;
-
-      if (wordPos <= maxWordMatchPos) {
-        score = _doScore(
-          pattern,
-          patternLow,
-          patternPos,
-          patternStart,
-          word,
-          wordLow,
-          wordPos,
-          wordLen,
-          wordStart,
-          _diag[row - 1][column - 1] === 0,
-          hasStrongFirstMatch
-        );
-      }
-
-      let diagScore = 0;
-      if (score !== Number.MAX_SAFE_INTEGER) {
-        canComeDiag = true;
-        diagScore = score + _table[row - 1][column - 1];
-      }
-
-      const canComeLeft = wordPos > minWordMatchPos;
-      const leftScore = canComeLeft
-        ? _table[row][column - 1] + (_diag[row][column - 1] > 0 ? -5 : 0)
-        : 0; // penalty for a gap start
-
-      const canComeLeftLeft =
-        wordPos > minWordMatchPos + 1 && _diag[row][column - 1] > 0;
-      const leftLeftScore = canComeLeftLeft
-        ? _table[row][column - 2] + (_diag[row][column - 2] > 0 ? -5 : 0)
-        : 0; // penalty for a gap start
-
-      if (
-        canComeLeftLeft &&
-        (!canComeLeft || leftLeftScore >= leftScore) &&
-        (!canComeDiag || leftLeftScore >= diagScore)
-      ) {
-        // always prefer choosing left left to jump over a diagonal because that means a match is earlier in the word
-        _table[row][column] = leftLeftScore;
-        _arrows[row][column] = Arrow.LeftLeft;
-        _diag[row][column] = 0;
-      } else if (canComeLeft && (!canComeDiag || leftScore >= diagScore)) {
-        // always prefer choosing left since that means a match is earlier in the word
-        _table[row][column] = leftScore;
-        _arrows[row][column] = Arrow.Left;
-        _diag[row][column] = 0;
-      } else if (canComeDiag) {
-        _table[row][column] = diagScore;
-        _arrows[row][column] = Arrow.Diag;
-        _diag[row][column] = _diag[row - 1][column - 1] + 1;
-      } else {
-        throw new Error(`not possible`);
-      }
-    }
-  }
-
-  if (_debug) {
-    printTables(pattern, patternStart, word, wordStart);
-  }
-
-  if (!hasStrongFirstMatch[0] && !firstMatchCanBeWeak) {
-    return undefined;
-  }
-
-  row--;
-  column--;
-
-  const result: FuzzyScore = [_table[row][column], wordStart];
-
-  let backwardsDiagLength = 0;
-  let maxMatchColumn = 0;
-
-  while (row >= 1) {
-    // Find the column where we go diagonally up
-    let diagColumn = column;
-    do {
-      const arrow = _arrows[row][diagColumn];
-      if (arrow === Arrow.LeftLeft) {
-        diagColumn -= 2;
-      } else if (arrow === Arrow.Left) {
-        diagColumn -= 1;
-      } else {
-        // found the diagonal
-        break;
-      }
-    } while (diagColumn >= 1);
-
-    // Overturn the "forwards" decision if keeping the "backwards" diagonal would give a better match
-    if (
-      backwardsDiagLength > 1 && // only if we would have a contiguous match of 3 characters
-      patternLow[patternStart + row - 1] === wordLow[wordStart + column - 1] && // only if we can do a contiguous match diagonally
-      !isUpperCaseAtPos(diagColumn + wordStart - 1, word, wordLow) && // only if the forwards chose diagonal is not an uppercase
-      backwardsDiagLength + 1 > _diag[row][diagColumn] // only if our contiguous match would be longer than the "forwards" contiguous match
-    ) {
-      diagColumn = column;
-    }
-
-    if (diagColumn === column) {
-      // this is a contiguous match
-      backwardsDiagLength++;
-    } else {
-      backwardsDiagLength = 1;
-    }
-
-    if (!maxMatchColumn) {
-      // remember the last matched column
-      maxMatchColumn = diagColumn;
-    }
-
-    row--;
-    column = diagColumn - 1;
-    result.push(column);
-  }
-
-  if (wordLen === patternLen) {
-    // the word matches the pattern with all characters!
-    // giving the score a total match boost (to come up ahead other words)
-    result[0] += 2;
-  }
-
-  // Add 1 penalty for each skipped character in the word
-  const skippedCharsCount = maxMatchColumn - patternLen;
-  result[0] -= skippedCharsCount;
-
-  return result;
-}
-
-function _doScore(
-  pattern: string,
-  patternLow: string,
-  patternPos: number,
-  patternStart: number,
-  word: string,
-  wordLow: string,
-  wordPos: number,
-  wordLen: number,
-  wordStart: number,
-  newMatchStart: boolean,
-  outFirstMatchStrong: boolean[]
-): number {
-  if (patternLow[patternPos] !== wordLow[wordPos]) {
-    return Number.MIN_SAFE_INTEGER;
-  }
-
-  let score = 1;
-  let isGapLocation = false;
-  if (wordPos === patternPos - patternStart) {
-    // common prefix: `foobar <-> foobaz`
-    //                            ^^^^^
-    score = pattern[patternPos] === word[wordPos] ? 7 : 5;
-  } else if (
-    isUpperCaseAtPos(wordPos, word, wordLow) &&
-    (wordPos === 0 || !isUpperCaseAtPos(wordPos - 1, word, wordLow))
-  ) {
-    // hitting upper-case: `foo <-> forOthers`
-    //                              ^^ ^
-    score = pattern[patternPos] === word[wordPos] ? 7 : 5;
-    isGapLocation = true;
-  } else if (
-    isSeparatorAtPos(wordLow, wordPos) &&
-    (wordPos === 0 || !isSeparatorAtPos(wordLow, wordPos - 1))
-  ) {
-    // hitting a separator: `. <-> foo.bar`
-    //                                ^
-    score = 5;
-  } else if (
-    isSeparatorAtPos(wordLow, wordPos - 1) ||
-    isWhitespaceAtPos(wordLow, wordPos - 1)
-  ) {
-    // post separator: `foo <-> bar_foo`
-    //                              ^^^
-    score = 5;
-    isGapLocation = true;
-  }
-
-  if (score > 1 && patternPos === patternStart) {
-    outFirstMatchStrong[0] = true;
-  }
-
-  if (!isGapLocation) {
-    isGapLocation =
-      isUpperCaseAtPos(wordPos, word, wordLow) ||
-      isSeparatorAtPos(wordLow, wordPos - 1) ||
-      isWhitespaceAtPos(wordLow, wordPos - 1);
-  }
-
-  //
-  if (patternPos === patternStart) {
-    // first character in pattern
-    if (wordPos > wordStart) {
-      // the first pattern character would match a word character that is not at the word start
-      // so introduce a penalty to account for the gap preceding this match
-      score -= isGapLocation ? 3 : 5;
-    }
-  } else if (newMatchStart) {
-    // this would be the beginning of a new match (i.e. there would be a gap before this location)
-    score += isGapLocation ? 2 : 0;
-  } else {
-    // this is part of a contiguous match, so give it a slight bonus, but do so only if it would not be a prefered gap location
-    score += isGapLocation ? 0 : 1;
-  }
-
-  if (wordPos + 1 === wordLen) {
-    // we always penalize gaps, but this gives unfair advantages to a match that would match the last character in the word
-    // so pretend there is a gap after the last character in the word to normalize things
-    score -= isGapLocation ? 3 : 5;
-  }
-
-  return score;
-}
-
-function printTable(
-  table: number[][],
-  pattern: string,
-  patternLen: number,
-  word: string,
-  wordLen: number
-): string {
-  function pad(s: string, n: number, _pad = " ") {
-    while (s.length < n) {
-      s = _pad + s;
-    }
-    return s;
-  }
-  let ret = ` |   |${word
-    .split("")
-    .map((c) => pad(c, 3))
-    .join("|")}\n`;
-
-  for (let i = 0; i <= patternLen; i++) {
-    if (i === 0) {
-      ret += " |";
-    } else {
-      ret += `${pattern[i - 1]}|`;
-    }
-    ret +=
-      table[i]
-        .slice(0, wordLen + 1)
-        .map((n) => pad(n.toString(), 3))
-        .join("|") + "\n";
-  }
-  return ret;
-}
-
-function printTables(
-  pattern: string,
-  patternStart: number,
-  word: string,
-  wordStart: number
-): void {
-  pattern = pattern.substr(patternStart);
-  word = word.substr(wordStart);
-  console.log(printTable(_table, pattern, pattern.length, word, word.length));
-  console.log(printTable(_arrows, pattern, pattern.length, word, word.length));
-  console.log(printTable(_diag, pattern, pattern.length, word, word.length));
-}
-
-const _minWordMatchPos = initArr(2 * _maxLen); // min word position for a certain pattern position
-const _maxWordMatchPos = initArr(2 * _maxLen); // max word position for a certain pattern position
-const _diag = initTable(); // the length of a contiguous diagonal match
-const _table = initTable();
-const _arrows = <Arrow[][]>initTable();
-
-function initArr(maxLen: number) {
-  const row: number[] = [];
-  for (let i = 0; i <= maxLen; i++) {
-    row[i] = 0;
-  }
-  return row;
-}
-
-function _fillInMaxWordMatchPos(
-  patternLen: number,
-  wordLen: number,
-  patternStart: number,
-  wordStart: number,
-  patternLow: string,
-  wordLow: string
-) {
-  let patternPos = patternLen - 1;
-  let wordPos = wordLen - 1;
-  while (patternPos >= patternStart && wordPos >= wordStart) {
-    if (patternLow[patternPos] === wordLow[wordPos]) {
-      _maxWordMatchPos[patternPos] = wordPos;
-      patternPos--;
-    }
-    wordPos--;
-  }
-}
-
-export interface FuzzyScorer {
-  (
-    pattern: string,
-    lowPattern: string,
-    patternPos: number,
-    word: string,
-    lowWord: string,
-    wordPos: number,
-    firstMatchCanBeWeak: boolean
-  ): FuzzyScore | undefined;
-}
-
-export function createMatches(score: undefined | FuzzyScore): Match[] {
-  if (typeof score === "undefined") {
-    return [];
-  }
-  const res: Match[] = [];
-  const wordPos = score[1];
-  for (let i = score.length - 1; i > 1; i--) {
-    const pos = score[i] + wordPos;
-    const last = res[res.length - 1];
-    if (last && last.end === pos) {
-      last.end = pos + 1;
-    } else {
-      res.push({ start: pos, end: pos + 1 });
-    }
-  }
-  return res;
-}
-
-/**
- * A fast function (therefore imprecise) to check if code points are emojis.
- * Generated using https://github.com/alexdima/unicode-utils/blob/master/generate-emoji-test.js
- */
-export function isEmojiImprecise(x: number): boolean {
-  return (
-    (x >= 0x1f1e6 && x <= 0x1f1ff) ||
-    x === 8986 ||
-    x === 8987 ||
-    x === 9200 ||
-    x === 9203 ||
-    (x >= 9728 && x <= 10175) ||
-    x === 11088 ||
-    x === 11093 ||
-    (x >= 127744 && x <= 128591) ||
-    (x >= 128640 && x <= 128764) ||
-    (x >= 128992 && x <= 129003) ||
-    (x >= 129280 && x <= 129535) ||
-    (x >= 129648 && x <= 129750)
-  );
-}

src/common/string/filter/sequence-matching.ts

@@ -1,52 +1,4 @@
-import { fuzzyScore } from "./filter";
-
-/**
- * Determine whether a sequence of letters exists in another string,
- *   in that order, allowing for skipping. Ex: "chdr" exists in "chandelier")
- *
- * @param {string} filter - Sequence of letters to check for
- * @param {ScorableTextItem} item - Item against whose strings will be checked
- *
- * @return {number} Score representing how well the word matches the filter. Return of 0 means no match.
- */
-
-export const fuzzySequentialMatch = (
-  filter: string,
-  item: ScorableTextItem
-) => {
-  let topScore = Number.NEGATIVE_INFINITY;
-
-  for (const word of item.strings) {
-    const scores = fuzzyScore(
-      filter,
-      filter.toLowerCase(),
-      0,
-      word,
-      word.toLowerCase(),
-      0,
-      true
-    );
-
-    if (!scores) {
-      continue;
-    }
-
-    // The VS Code implementation of filter returns a 0 for a weak match.
-    // But if .filter() sees a "0", it considers that a failed match and will remove it.
-    // So, we set score to 1 in these cases so the match will be included, and mostly respect correct ordering.
-    const score = scores[0] === 0 ? 1 : scores[0];
-
-    if (score > topScore) {
-      topScore = score;
-    }
-  }
-
-  if (topScore === Number.NEGATIVE_INFINITY) {
-    return undefined;
-  }
-
-  return topScore;
-};
+import fuzzysort from "fuzzysort";
 
 /**
  * An interface that objects must extend in order to use the fuzzy sequence matcher
@@ -66,18 +18,48 @@ export interface ScorableTextItem {
   strings: string[];
 }
 
-type FuzzyFilterSort = <T extends ScorableTextItem>(
+export type FuzzyFilterSort = <T extends ScorableTextItem>(
   filter: string,
   items: T[]
 ) => T[];
 
-export const fuzzyFilterSort: FuzzyFilterSort = (filter, items) =>
-  items
+export function fuzzyMatcher(search: string | null): (string) => boolean {
+  const scorer = fuzzyScorer(search);
+  return (value: string) => scorer([value]) !== Number.NEGATIVE_INFINITY;
+}
+
+export function fuzzyScorer(
+  search: string | null
+): (values: string[]) => number {
+  const searchTerms = (search || "").match(/("[^"]+"|[^"\s]+)/g);
+  if (!searchTerms) {
+    return () => 0;
+  }
+  return (values) =>
+    searchTerms
+      .map((term) => {
+        const resultsForTerm = fuzzysort.go(term, values, {
+          allowTypo: true,
+        });
+        if (resultsForTerm.length > 0) {
+          return Math.max(...resultsForTerm.map((result) => result.score));
+        }
+        return Number.NEGATIVE_INFINITY;
+      })
+      .reduce((partial, current) => partial + current, 0);
+}
+
+export const fuzzySortFilterSort: FuzzyFilterSort = (filter, items) => {
+  const scorer = fuzzyScorer(filter);
+  return items
     .map((item) => {
-      item.score = fuzzySequentialMatch(filter, item);
+      item.score = scorer(item.strings);
       return item;
     })
-    .filter((item) => item.score !== undefined)
+    .filter((item) => item.score !== undefined && item.score > -100000)
     .sort(({ score: scoreA = 0 }, { score: scoreB = 0 }) =>
       scoreA > scoreB ? -1 : scoreA < scoreB ? 1 : 0
     );
+};
+
+export const defaultFuzzyFilterSort = fuzzySortFilterSort;

src/common/util/promise-timeout.ts

@@ -1,4 +1,4 @@
-export const promiseTimeout = (ms: number, promise: Promise<any>) => {
+export const promiseTimeout = (ms: number, promise: Promise<any> | any) => {
   const timeout = new Promise((_resolve, reject) => {
     setTimeout(() => {
       reject(`Timed out in ${ms} ms.`);

src/common/util/subscribe-polling.ts

@@ -0,0 +1,18 @@
+import { HomeAssistant } from "../../types";
+
+export const subscribePollingCollection = (
+  hass: HomeAssistant,
+  updateData: (hass: HomeAssistant) => void,
+  interval: number
+) => {
+  let timeout;
+  const fetchData = async () => {
+    try {
+      await updateData(hass);
+    } finally {
+      timeout = setTimeout(() => fetchData(), interval);
+    }
+  };
+  fetchData();
+  return () => clearTimeout(timeout);
+};

src/components/currency-datalist.ts

@@ -1,165 +1,167 @@
+export const currencies = [
+  "AED",
+  "AFN",
+  "ALL",
+  "AMD",
+  "ANG",
+  "AOA",
+  "ARS",
+  "AUD",
+  "AWG",
+  "AZN",
+  "BAM",
+  "BBD",
+  "BDT",
+  "BGN",
+  "BHD",
+  "BIF",
+  "BMD",
+  "BND",
+  "BOB",
+  "BRL",
+  "BSD",
+  "BTN",
+  "BWP",
+  "BYN",
+  "BYR",
+  "BZD",
+  "CAD",
+  "CDF",
+  "CHF",
+  "CLP",
+  "CNY",
+  "COP",
+  "CRC",
+  "CUP",
+  "CVE",
+  "CZK",
+  "DJF",
+  "DKK",
+  "DOP",
+  "DZD",
+  "EGP",
+  "ERN",
+  "ETB",
+  "EUR",
+  "FJD",
+  "FKP",
+  "GBP",
+  "GEL",
+  "GHS",
+  "GIP",
+  "GMD",
+  "GNF",
+  "GTQ",
+  "GYD",
+  "HKD",
+  "HNL",
+  "HRK",
+  "HTG",
+  "HUF",
+  "IDR",
+  "ILS",
+  "INR",
+  "IQD",
+  "IRR",
+  "ISK",
+  "JMD",
+  "JOD",
+  "JPY",
+  "KES",
+  "KGS",
+  "KHR",
+  "KMF",
+  "KPW",
+  "KRW",
+  "KWD",
+  "KYD",
+  "KZT",
+  "LAK",
+  "LBP",
+  "LKR",
+  "LRD",
+  "LSL",
+  "LTL",
+  "LYD",
+  "MAD",
+  "MDL",
+  "MGA",
+  "MKD",
+  "MMK",
+  "MNT",
+  "MOP",
+  "MRO",
+  "MUR",
+  "MVR",
+  "MWK",
+  "MXN",
+  "MYR",
+  "MZN",
+  "NAD",
+  "NGN",
+  "NIO",
+  "NOK",
+  "NPR",
+  "NZD",
+  "OMR",
+  "PAB",
+  "PEN",
+  "PGK",
+  "PHP",
+  "PKR",
+  "PLN",
+  "PYG",
+  "QAR",
+  "RON",
+  "RSD",
+  "RUB",
+  "RWF",
+  "SAR",
+  "SBD",
+  "SCR",
+  "SDG",
+  "SEK",
+  "SGD",
+  "SHP",
+  "SLL",
+  "SOS",
+  "SRD",
+  "SSP",
+  "STD",
+  "SYP",
+  "SZL",
+  "THB",
+  "TJS",
+  "TMT",
+  "TND",
+  "TOP",
+  "TRY",
+  "TTD",
+  "TWD",
+  "TZS",
+  "UAH",
+  "UGX",
+  "USD",
+  "UYU",
+  "UZS",
+  "VEF",
+  "VND",
+  "VUV",
+  "WST",
+  "XAF",
+  "XCD",
+  "XOF",
+  "XPF",
+  "YER",
+  "ZAR",
+  "ZMK",
+  "ZWL",
+];
+
 export const createCurrencyListEl = () => {
   const list = document.createElement("datalist");
   list.id = "currencies";
-  for (const currency of [
-    "AED",
-    "AFN",
-    "ALL",
-    "AMD",
-    "ANG",
-    "AOA",
-    "ARS",
-    "AUD",
-    "AWG",
-    "AZN",
-    "BAM",
-    "BBD",
-    "BDT",
-    "BGN",
-    "BHD",
-    "BIF",
-    "BMD",
-    "BND",
-    "BOB",
-    "BRL",
-    "BSD",
-    "BTN",
-    "BWP",
-    "BYN",
-    "BYR",
-    "BZD",
-    "CAD",
-    "CDF",
-    "CHF",
-    "CLP",
-    "CNY",
-    "COP",
-    "CRC",
-    "CUP",
-    "CVE",
-    "CZK",
-    "DJF",
-    "DKK",
-    "DOP",
-    "DZD",
-    "EGP",
-    "ERN",
-    "ETB",
-    "EUR",
-    "FJD",
-    "FKP",
-    "GBP",
-    "GEL",
-    "GHS",
-    "GIP",
-    "GMD",
-    "GNF",
-    "GTQ",
-    "GYD",
-    "HKD",
-    "HNL",
-    "HRK",
-    "HTG",
-    "HUF",
-    "IDR",
-    "ILS",
-    "INR",
-    "IQD",
-    "IRR",
-    "ISK",
-    "JMD",
-    "JOD",
-    "JPY",
-    "KES",
-    "KGS",
-    "KHR",
-    "KMF",
-    "KPW",
-    "KRW",
-    "KWD",
-    "KYD",
-    "KZT",
-    "LAK",
-    "LBP",
-    "LKR",
-    "LRD",
-    "LSL",
-    "LTL",
-    "LYD",
-    "MAD",
-    "MDL",
-    "MGA",
-    "MKD",
-    "MMK",
-    "MNT",
-    "MOP",
-    "MRO",
-    "MUR",
-    "MVR",
-    "MWK",
-    "MXN",
-    "MYR",
-    "MZN",
-    "NAD",
-    "NGN",
-    "NIO",
-    "NOK",
-    "NPR",
-    "NZD",
-    "OMR",
-    "PAB",
-    "PEN",
-    "PGK",
-    "PHP",
-    "PKR",
-    "PLN",
-    "PYG",
-    "QAR",
-    "RON",
-    "RSD",
-    "RUB",
-    "RWF",
-    "SAR",
-    "SBD",
-    "SCR",
-    "SDG",
-    "SEK",
-    "SGD",
-    "SHP",
-    "SLL",
-    "SOS",
-    "SRD",
-    "SSP",
-    "STD",
-    "SYP",
-    "SZL",
-    "THB",
-    "TJS",
-    "TMT",
-    "TND",
-    "TOP",
-    "TRY",
-    "TTD",
-    "TWD",
-    "TZS",
-    "UAH",
-    "UGX",
-    "USD",
-    "UYU",
-    "UZS",
-    "VEF",
-    "VND",
-    "VUV",
-    "WST",
-    "XAF",
-    "XCD",
-    "XOF",
-    "XPF",
-    "YER",
-    "ZAR",
-    "ZMK",
-    "ZWL",
-  ]) {
+  for (const currency of currencies) {
     const option = document.createElement("option");
     option.value = currency;
     option.innerHTML = currency;

src/components/data-table/sort_filter_worker.ts

@@ -7,25 +7,26 @@ import type {
   SortableColumnContainer,
   SortingDirection,
 } from "./ha-data-table";
+import { fuzzyMatcher } from "../../common/string/filter/sequence-matching";
 
 const filterData = (
   data: DataTableRowData[],
   columns: SortableColumnContainer,
   filter: string
 ) => {
-  filter = filter.toUpperCase();
+  const matcher = fuzzyMatcher(filter);
   return data.filter((row) =>
     Object.entries(columns).some((columnEntry) => {
       const [key, column] = columnEntry;
       if (column.filterable) {
         if (
-          String(
-            column.filterKey
-              ? row[column.valueColumn || key][column.filterKey]
-              : row[column.valueColumn || key]
+          matcher(
+            String(
+              column.filterKey
+                ? row[column.valueColumn || key][column.filterKey]
+                : row[column.valueColumn || key]
+            )
           )
-            .toUpperCase()
-            .includes(filter)
         ) {
           return true;
         }

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

@@ -198,9 +198,10 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
           this.hass,
           deviceEntityLookup[device.id]
         ),
-        area: device.area_id
-          ? areaLookup[device.area_id].name
-          : this.hass.localize("ui.components.device-picker.no_area"),
+        area:
+          device.area_id && areaLookup[device.area_id]
+            ? areaLookup[device.area_id].name
+            : this.hass.localize("ui.components.device-picker.no_area"),
       }));
       if (!outputDevices.length) {
         return [

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

@@ -15,6 +15,7 @@ import type { HaComboBox } from "../ha-combo-box";
 import "../ha-icon-button";
 import "../ha-svg-icon";
 import "./state-badge";
+import { defaultFuzzyFilterSort } from "../../common/string/filter/sequence-matching";
 
 interface HassEntityWithCachedName extends HassEntity {
   friendly_name: string;
@@ -336,11 +337,18 @@ export class HaEntityPicker extends LitElement {
   }
 
   private _filterChanged(ev: CustomEvent): void {
-    const filterString = ev.detail.value.toLowerCase();
-    (this.comboBox as any).filteredItems = this._states.filter(
-      (entityState) =>
-        entityState.entity_id.toLowerCase().includes(filterString) ||
-        computeStateName(entityState).toLowerCase().includes(filterString)
+    const filterString = ev.detail.value;
+
+    const sortableEntityStates = this._states.map((entityState) => ({
+      strings: [entityState.entity_id, computeStateName(entityState)],
+      entityState: entityState,
+    }));
+    const sortedEntityStates = defaultFuzzyFilterSort(
+      filterString,
+      sortableEntityStates
+    );
+    (this.comboBox as any).filteredItems = sortedEntityStates.map(
+      (sortableItem) => sortableItem.entityState
     );
   }
 

src/components/ha-ansi-to-html.ts

@@ -10,8 +10,8 @@ interface State {
   backgroundColor: null | string;
 }
 
-@customElement("hassio-ansi-to-html")
-class HassioAnsiToHtml extends LitElement {
+@customElement("ha-ansi-to-html")
+class HaAnsiToHtml extends LitElement {
   @property() public content!: string;
 
   protected render(): TemplateResult | void {
@@ -241,6 +241,6 @@ class HassioAnsiToHtml extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "hassio-ansi-to-html": HassioAnsiToHtml;
+    "ha-ansi-to-html": HaAnsiToHtml;
   }
 }

src/components/ha-area-picker.ts

@@ -409,7 +409,7 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
             name,
           });
           this._areas = [...this._areas!, area];
-          (this.comboBox as any).items = this._getAreas(
+          (this.comboBox as any).filteredItems = this._getAreas(
             this._areas!,
             this._devices!,
             this._entities!,

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

@@ -310,6 +310,7 @@ export class HaBaseTimeInput extends LitElement {
       border-radius: var(--mdc-shape-small, 4px) var(--mdc-shape-small, 4px) 0 0;
       overflow: hidden;
       position: relative;
+      direction: ltr;
     }
     ha-textfield {
       width: 40px;

src/components/ha-combo-box.ts

@@ -250,6 +250,18 @@ export class HaComboBox extends LitElement {
         top: -7px;
         right: 36px;
       }
+
+      :host-context([style*="direction: rtl;"]) .toggle-button {
+        left: 12px;
+        right: auto;
+        top: -10px;
+      }
+      :host-context([style*="direction: rtl;"]) .clear-button {
+        --mdc-icon-size: 20px;
+        top: -7px;
+        left: 36px;
+        right: auto;
+      }
     `;
   }
 }

src/components/ha-dialog.ts

@@ -98,6 +98,10 @@ export class HaDialog extends DialogBase {
         margin-left: 40px;
         margin-right: 0px;
       }
+      :host-context([style*="direction: rtl;"]) .dialog-actions {
+        left: 0px !important;
+        right: auto !important;
+      }
     `,
   ];
 }

src/components/ha-fab.ts

@@ -1,5 +1,6 @@
 import { Fab } from "@material/mwc-fab";
 import { customElement } from "lit/decorators";
+import { css } from "lit";
 
 @customElement("ha-fab")
 export class HaFab extends Fab {
@@ -7,6 +8,17 @@ export class HaFab extends Fab {
     super.firstUpdated(changedProperties);
     this.style.setProperty("--mdc-theme-secondary", "var(--primary-color)");
   }
+
+  static override styles = Fab.styles.concat([
+    css`
+      :host-context([style*="direction: rtl;"])
+        .mdc-fab--extended
+        .mdc-fab__icon {
+        margin-left: 12px !important;
+        margin-right: calc(12px - 20px) !important;
+      }
+    `,
+  ]);
 }
 
 declare global {

src/components/ha-file-upload.ts

@@ -176,10 +176,24 @@ export class HaFileUpload extends LitElement {
         .mdc-text-field__icon--leading {
           margin-bottom: 12px;
         }
+        :host-context([style*="direction: rtl;"])
+          .mdc-text-field__icon--leading {
+          margin-right: 0px;
+        }
         .mdc-text-field--filled .mdc-floating-label--float-above {
           transform: scale(0.75);
           top: 8px;
         }
+        :host-context([style*="direction: rtl;"]) .mdc-floating-label {
+          left: initial;
+          right: 16px;
+        }
+        :host-context([style*="direction: rtl;"])
+          .mdc-text-field--filled
+          .mdc-floating-label {
+          left: initial;
+          right: 48px;
+        }
         .dragged:before {
           position: var(--layout-fit_-_position);
           top: var(--layout-fit_-_top);

src/components/ha-metric.ts

@@ -0,0 +1,79 @@
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
+import { roundWithOneDecimal } from "../util/calculate";
+import "./ha-bar";
+import "./ha-settings-row";
+
+@customElement("ha-metric")
+class HaMetric extends LitElement {
+  @property({ type: Number }) public value!: number;
+
+  @property({ type: String }) public heading!: string;
+
+  @property({ type: String }) public tooltip?: string;
+
+  protected render(): TemplateResult {
+    const roundedValue = roundWithOneDecimal(this.value);
+    return html`
+      <ha-settings-row>
+        <span slot="heading"> ${this.heading} </span>
+        <div slot="description" .title=${this.tooltip ?? ""}>
+          <span class="value"> ${roundedValue} % </span>
+          <ha-bar
+            class=${classMap({
+              "target-warning": roundedValue > 50,
+              "target-critical": roundedValue > 85,
+            })}
+            .value=${this.value}
+          ></ha-bar>
+        </div>
+      </ha-settings-row>
+    `;
+  }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      ha-settings-row {
+        padding: 0;
+        height: 54px;
+        width: 100%;
+      }
+      ha-settings-row > div[slot="description"] {
+        white-space: normal;
+        color: var(--secondary-text-color);
+        display: flex;
+        justify-content: space-between;
+      }
+      ha-bar {
+        --ha-bar-primary-color: var(
+          --metric-bar-ok-color,
+          var(--success-color)
+        );
+      }
+      .target-warning {
+        --ha-bar-primary-color: var(
+          --metric-bar-warning-color,
+          var(--warning-color)
+        );
+      }
+      .target-critical {
+        --ha-bar-primary-color: var(
+          --metric-bar-critical-color,
+          var(--error-color)
+        );
+      }
+      .value {
+        width: 48px;
+        padding-right: 4px;
+        flex-shrink: 0;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-metric": HaMetric;
+  }
+}

src/components/ha-navigation-list.ts

@@ -4,9 +4,9 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { PageNavigation } from "../layouts/hass-tabs-subpage";
 import type { HomeAssistant } from "../types";
+import "./ha-clickable-list-item";
 import "./ha-icon-next";
 import "./ha-svg-icon";
-import "./ha-clickable-list-item";
 
 @customElement("ha-navigation-list")
 class HaNavigationList extends LitElement {
@@ -56,6 +56,9 @@ class HaNavigationList extends LitElement {
   }
 
   static styles: CSSResultGroup = css`
+    :host {
+      --mdc-list-vertical-padding: 0;
+    }
     a {
       text-decoration: none;
       color: var(--primary-text-color);
@@ -68,6 +71,7 @@ class HaNavigationList extends LitElement {
       color: var(--secondary-text-color);
       height: 24px;
       width: 24px;
+      display: block;
     }
     ha-svg-icon {
       padding: 8px;
@@ -78,9 +82,10 @@ class HaNavigationList extends LitElement {
     .icon-background ha-svg-icon {
       color: #fff;
     }
-    mwc-list-item {
+    ha-clickable-list-item {
       cursor: pointer;
       font-size: var(--navigation-list-item-title-font-size);
+      padding: var(--navigation-list-item-padding) 0;
     }
   `;
 }

src/components/ha-network.ts

@@ -163,6 +163,9 @@ export class HaNetwork extends LitElement {
 
         ha-settings-row {
           padding: 0;
+          --paper-time-input-justify-content: flex-end;
+          --settings-row-content-display: contents;
+          --settings-row-prefix-display: contents;
         }
 
         span[slot="heading"],

src/components/ha-select.ts

@@ -47,6 +47,10 @@ export class HaSelect extends SelectBase {
       .mdc-select__anchor {
         width: var(--ha-select-min-width, 200px);
       }
+      :host-context([style*="direction: rtl;"]) .mdc-floating-label {
+        right: 16px !important;
+        left: initial !important;
+      }
     `,
   ];
 }

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

@@ -1,4 +1,4 @@
-import { html, LitElement } from "lit";
+import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
@@ -76,6 +76,13 @@ export class HaLocationSelector extends LitElement {
     const radius = ev.detail.radius;
     fireEvent(this, "value-changed", { value: { ...this.value, radius } });
   }
+
+  static styles = css`
+    :host {
+      display: block;
+      height: 400px;
+    }
+  `;
 }
 
 declare global {

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

@@ -107,6 +107,7 @@ export class HaNumberSelector extends LitElement {
         display: flex;
         justify-content: space-between;
         align-items: center;
+        direction: ltr;
       }
       ha-slider {
         flex: 1;

src/components/ha-service-control.ts

@@ -472,6 +472,7 @@ export class HaServiceControl extends LitElement {
       ha-settings-row {
         --paper-time-input-justify-content: flex-end;
         --settings-row-content-width: 100%;
+        --settings-row-prefix-display: contents;
         border-top: var(
           --service-control-items-border-top,
           1px solid var(--divider-color)

src/components/ha-settings-row.ts

@@ -47,7 +47,7 @@ export class HaSettingsRow extends LitElement {
         display: contents;
       }
       :host(:not([narrow])) .content {
-        display: flex;
+        display: var(--settings-row-content-display, flex);
         justify-content: flex-end;
         flex: 1;
         padding: 16px 0;
@@ -68,7 +68,7 @@ export class HaSettingsRow extends LitElement {
         white-space: normal;
       }
       .prefix-wrap {
-        display: contents;
+        display: var(--settings-row-prefix-display);
       }
       :host([narrow]) .prefix-wrap {
         display: flex;

src/components/ha-sidebar.ts

@@ -1051,9 +1051,6 @@ class HaSidebar extends LitElement {
           padding: 0px 6px;
           color: var(--text-accent-color, var(--text-primary-color));
         }
-        .configuration-badge {
-          background-color: var(--primary-color);
-        }
         ha-svg-icon + .notification-badge,
         ha-svg-icon + .configuration-badge {
           position: absolute;

src/components/ha-target-picker.ts

@@ -616,6 +616,10 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
         opacity: var(--light-disabled-opacity);
         pointer-events: none;
       }
+      :host-context([style*="direction: rtl;"]) .mdc-chip__icon {
+        margin-right: -14px !important;
+        margin-left: 4px !important;
+      }
     `;
   }
 }

src/components/ha-textfield.ts

@@ -91,6 +91,19 @@ export class HaTextField extends TextFieldBase {
       .mdc-text-field {
         overflow: var(--text-field-overflow);
       }
+
+      :host-context([style*="direction: rtl;"]) .mdc-floating-label {
+        right: 10px !important;
+        left: initial !important;
+      }
+
+      :host-context([style*="direction: rtl;"])
+        .mdc-text-field--with-leading-icon.mdc-text-field--filled
+        .mdc-floating-label {
+        max-width: calc(100% - 48px);
+        right: 48px !important;
+        left: initial !important;
+      }
     `,
   ];
 }

src/components/ha-tip.ts

@@ -0,0 +1,38 @@
+import { mdiLightbulbOutline } from "@mdi/js";
+import { css, html, LitElement } from "lit";
+import { customElement } from "lit/decorators";
+
+import "./ha-svg-icon";
+
+@customElement("ha-tip")
+class HaTip extends LitElement {
+  public render() {
+    return html`
+      <ha-svg-icon .path=${mdiLightbulbOutline}></ha-svg-icon>
+      <span class="prefix">Tip!</span>
+      <span class="text"><slot></slot></span>
+    `;
+  }
+
+  static styles = css`
+    :host {
+      display: block;
+      text-align: center;
+    }
+
+    .text {
+      margin-left: 2px;
+      color: var(--secondary-text-color);
+    }
+
+    .prefix {
+      font-weight: 500;
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-tip": HaTip;
+  }
+}

src/components/media-player/dialog-media-player-browse.ts

@@ -151,6 +151,7 @@ class DialogMediaPlayerBrowse extends LitElement {
 
         ha-media-player-browse {
           --media-browser-max-height: calc(100vh - 65px);
+          height: calc(100vh - 65px);
         }
 
         @media (min-width: 800px) {
@@ -163,6 +164,7 @@ class DialogMediaPlayerBrowse extends LitElement {
           ha-media-player-browse {
             position: initial;
             --media-browser-max-height: 100vh - 137px;
+            height: 100vh - 137px;
             width: 700px;
           }
         }

src/components/media-player/ha-media-player-browse.ts

@@ -3,6 +3,8 @@ import "@material/mwc-list/mwc-list";
 import "@material/mwc-list/mwc-list-item";
 import { mdiArrowUpRight, mdiPlay, mdiPlus } from "@mdi/js";
 import "@polymer/paper-tooltip/paper-tooltip";
+import { grid } from "@lit-labs/virtualizer/layouts/grid";
+import "@lit-labs/virtualizer";
 import {
   css,
   CSSResultGroup,
@@ -16,16 +18,13 @@ import {
   eventOptions,
   property,
   query,
-  queryAll,
   state,
 } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-import { ifDefined } from "lit/directives/if-defined";
-import { styleMap } from "lit/directives/style-map";
+import { until } from "lit/directives/until";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeRTLDirection } from "../../common/util/compute_rtl";
 import { debounce } from "../../common/util/debounce";
-import { getSignedPath } from "../../data/auth";
 import type { MediaPlayerItem } from "../../data/media-player";
 import {
   browseMediaPlayer,
@@ -40,18 +39,18 @@ import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
 import { installResizeObserver } from "../../panels/lovelace/common/install-resize-observer";
 import { haStyle } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
-import { brandsUrl, extractDomainFromBrandUrl } from "../../util/brands-url";
 import { documentationUrl } from "../../util/documentation-url";
 import "../entity/ha-entity-picker";
 import "../ha-button-menu";
 import "../ha-card";
-import type { HaCard } from "../ha-card";
 import "../ha-circular-progress";
 import "../ha-fab";
 import "../ha-icon-button";
 import "../ha-svg-icon";
 import "./ha-browse-media-tts";
 import type { TtsMediaPickedEvent } from "./ha-browse-media-tts";
+import { getSignedPath } from "../../data/auth";
+import { brandsUrl, extractDomainFromBrandUrl } from "../../util/brands-url";
 
 declare global {
   interface HASSDomEvents {
@@ -101,8 +100,6 @@ export class HaMediaPlayerBrowse extends LitElement {
 
   @query(".content") private _content?: HTMLDivElement;
 
-  @queryAll(".lazythumbnail") private _thumbnails?: HaCard[];
-
   private _headerOffsetHeight = 0;
 
   private _resizeObserver?: ResizeObserver;
@@ -148,326 +145,6 @@ export class HaMediaPlayerBrowse extends LitElement {
     }
   }
 
-  protected render(): TemplateResult {
-    if (this._error) {
-      return html`
-        <div class="container">${this._renderError(this._error)}</div>
-      `;
-    }
-
-    if (!this._currentItem) {
-      return html`<ha-circular-progress active></ha-circular-progress>`;
-    }
-
-    const currentItem = this._currentItem;
-
-    const subtitle = this.hass.localize(
-      `ui.components.media-browser.class.${currentItem.media_class}`
-    );
-    const children = currentItem.children || [];
-    const mediaClass = MediaClassBrowserSettings[currentItem.media_class];
-    const childrenMediaClass = currentItem.children_media_class
-      ? MediaClassBrowserSettings[currentItem.children_media_class]
-      : MediaClassBrowserSettings.directory;
-
-    return html`
-              ${
-                currentItem.can_play
-                  ? html` <div
-                      class="header ${classMap({
-                        "no-img": !currentItem.thumbnail,
-                        "no-dialog": !this.dialog,
-                      })}"
-                      @transitionend=${this._setHeaderHeight}
-                    >
-                      <div class="header-content">
-                        ${currentItem.thumbnail
-                          ? html`
-                              <div
-                                class="img"
-                                style=${styleMap({
-                                  backgroundImage: currentItem.thumbnail
-                                    ? `url(${currentItem.thumbnail})`
-                                    : "none",
-                                })}
-                              >
-                                ${this._narrow && currentItem?.can_play
-                                  ? html`
-                                      <ha-fab
-                                        mini
-                                        .item=${currentItem}
-                                        @click=${this._actionClicked}
-                                      >
-                                        <ha-svg-icon
-                                          slot="icon"
-                                          .label=${this.hass.localize(
-                                            `ui.components.media-browser.${this.action}-media`
-                                          )}
-                                          .path=${this.action === "play"
-                                            ? mdiPlay
-                                            : mdiPlus}
-                                        ></ha-svg-icon>
-                                        ${this.hass.localize(
-                                          `ui.components.media-browser.${this.action}`
-                                        )}
-                                      </ha-fab>
-                                    `
-                                  : ""}
-                              </div>
-                            `
-                          : html``}
-                        <div class="header-info">
-                          <div class="breadcrumb">
-                            <h1 class="title">${currentItem.title}</h1>
-                            ${subtitle
-                              ? html` <h2 class="subtitle">${subtitle}</h2> `
-                              : ""}
-                          </div>
-                          ${currentItem.can_play &&
-                          (!currentItem.thumbnail || !this._narrow)
-                            ? html`
-                                <mwc-button
-                                  raised
-                                  .item=${currentItem}
-                                  @click=${this._actionClicked}
-                                >
-                                  <ha-svg-icon
-                                    .label=${this.hass.localize(
-                                      `ui.components.media-browser.${this.action}-media`
-                                    )}
-                                    .path=${this.action === "play"
-                                      ? mdiPlay
-                                      : mdiPlus}
-                                  ></ha-svg-icon>
-                                  ${this.hass.localize(
-                                    `ui.components.media-browser.${this.action}`
-                                  )}
-                                </mwc-button>
-                              `
-                            : ""}
-                        </div>
-                      </div>
-                    </div>`
-                  : ""
-              }
-          <div
-            class="content"
-            @scroll=${this._scroll}
-            @touchmove=${this._scroll}
-          >
-            ${
-              this._error
-                ? html`
-                    <div class="container">
-                      ${this._renderError(this._error)}
-                    </div>
-                  `
-                : isTTSMediaSource(currentItem.media_content_id)
-                ? html`
-                    <ha-browse-media-tts
-                      .item=${currentItem}
-                      .hass=${this.hass}
-                      .action=${this.action}
-                      @tts-picked=${this._ttsPicked}
-                    ></ha-browse-media-tts>
-                  `
-                : !children.length && !currentItem.not_shown
-                ? html`
-                    <div class="container no-items">
-                      ${currentItem.media_content_id ===
-                      "media-source://media_source/local/."
-                        ? html`
-                            <div class="highlight-add-button">
-                              <span>
-                                <ha-svg-icon
-                                  .path=${mdiArrowUpRight}
-                                ></ha-svg-icon>
-                              </span>
-                              <span>
-                                ${this.hass.localize(
-                                  "ui.components.media-browser.file_management.highlight_button"
-                                )}
-                              </span>
-                            </div>
-                          `
-                        : this.hass.localize(
-                            "ui.components.media-browser.no_items"
-                          )}
-                    </div>
-                  `
-                : childrenMediaClass.layout === "grid"
-                ? html`
-                    <div
-                      class="children ${classMap({
-                        portrait:
-                          childrenMediaClass.thumbnail_ratio === "portrait",
-                      })}"
-                    >
-                      ${children.map(
-                        (child) => html`
-                          <div
-                            class="child"
-                            .item=${child}
-                            @click=${this._childClicked}
-                          >
-                            <ha-card outlined>
-                              <div class="thumbnail">
-                                ${child.thumbnail
-                                  ? html`
-                                      <div
-                                        class="${["app", "directory"].includes(
-                                          child.media_class
-                                        )
-                                          ? "centered-image"
-                                          : ""} image lazythumbnail"
-                                        data-src=${child.thumbnail}
-                                      ></div>
-                                    `
-                                  : html`
-                                      <div class="icon-holder image">
-                                        <ha-svg-icon
-                                          class="folder"
-                                          .path=${MediaClassBrowserSettings[
-                                            child.media_class === "directory"
-                                              ? child.children_media_class ||
-                                                child.media_class
-                                              : child.media_class
-                                          ].icon}
-                                        ></ha-svg-icon>
-                                      </div>
-                                    `}
-                                ${child.can_play
-                                  ? html`
-                                      <ha-icon-button
-                                        class="play ${classMap({
-                                          can_expand: child.can_expand,
-                                        })}"
-                                        .item=${child}
-                                        .label=${this.hass.localize(
-                                          `ui.components.media-browser.${this.action}-media`
-                                        )}
-                                        .path=${this.action === "play"
-                                          ? mdiPlay
-                                          : mdiPlus}
-                                        @click=${this._actionClicked}
-                                      ></ha-icon-button>
-                                    `
-                                  : ""}
-                              </div>
-                              <div class="title">
-                                ${child.title}
-                                <paper-tooltip
-                                  fitToVisibleBounds
-                                  position="top"
-                                  offset="4"
-                                  >${child.title}</paper-tooltip
-                                >
-                              </div>
-                            </ha-card>
-                          </div>
-                        `
-                      )}
-                      ${currentItem.not_shown
-                        ? html`
-                            <div class="grid not-shown">
-                              <div class="title">
-                                ${this.hass.localize(
-                                  "ui.components.media-browser.not_shown",
-                                  { count: currentItem.not_shown }
-                                )}
-                              </div>
-                            </div>
-                          `
-                        : ""}
-                    </div>
-                  `
-                : html`
-                    <mwc-list>
-                      ${children.map(
-                        (child) => html`
-                          <mwc-list-item
-                            @click=${this._childClicked}
-                            .item=${child}
-                            .graphic=${mediaClass.show_list_images
-                              ? "medium"
-                              : "avatar"}
-                            dir=${computeRTLDirection(this.hass)}
-                          >
-                            <div
-                              class=${classMap({
-                                graphic: true,
-                                lazythumbnail:
-                                  mediaClass.show_list_images === true,
-                              })}
-                              data-src=${ifDefined(
-                                mediaClass.show_list_images && child.thumbnail
-                                  ? child.thumbnail
-                                  : undefined
-                              )}
-                              slot="graphic"
-                            >
-                              <ha-icon-button
-                                class="play ${classMap({
-                                  show:
-                                    !mediaClass.show_list_images ||
-                                    !child.thumbnail,
-                                })}"
-                                .item=${child}
-                                .label=${this.hass.localize(
-                                  `ui.components.media-browser.${this.action}-media`
-                                )}
-                                .path=${this.action === "play"
-                                  ? mdiPlay
-                                  : mdiPlus}
-                                @click=${this._actionClicked}
-                              ></ha-icon-button>
-                            </div>
-                            <span class="title">${child.title}</span>
-                          </mwc-list-item>
-                          <li divider role="separator"></li>
-                        `
-                      )}
-                      ${currentItem.not_shown
-                        ? html`
-                            <mwc-list-item
-                              noninteractive
-                              class="not-shown"
-                              .graphic=${mediaClass.show_list_images
-                                ? "medium"
-                                : "avatar"}
-                              dir=${computeRTLDirection(this.hass)}
-                            >
-                              <span class="title">
-                                ${this.hass.localize(
-                                  "ui.components.media-browser.not_shown",
-                                  { count: currentItem.not_shown }
-                                )}
-                              </span>
-                            </mwc-list-item>
-                          `
-                        : ""}
-                    </mwc-list>
-                  `
-            }
-          </div>
-        </div>
-      </div>
-    `;
-  }
-
-  protected firstUpdated(): void {
-    this._measureCard();
-    this._attachResizeObserver();
-  }
-
-  protected shouldUpdate(changedProps: PropertyValues): boolean {
-    if (changedProps.size > 1 || !changedProps.has("hass")) {
-      return true;
-    }
-    const oldHass = changedProps.get("hass") as this["hass"];
-    return oldHass === undefined || oldHass.localize !== this.hass.localize;
-  }
-
   public willUpdate(changedProps: PropertyValues<this>): void {
     super.willUpdate(changedProps);
 
@@ -583,6 +260,19 @@ export class HaMediaPlayerBrowse extends LitElement {
     }
   }
 
+  protected shouldUpdate(changedProps: PropertyValues): boolean {
+    if (changedProps.size > 1 || !changedProps.has("hass")) {
+      return true;
+    }
+    const oldHass = changedProps.get("hass") as this["hass"];
+    return oldHass === undefined || oldHass.localize !== this.hass.localize;
+  }
+
+  protected firstUpdated(): void {
+    this._measureCard();
+    this._attachResizeObserver();
+  }
+
   protected updated(changedProps: PropertyValues): void {
     super.updated(changedProps);
 
@@ -590,16 +280,368 @@ export class HaMediaPlayerBrowse extends LitElement {
       this._animateHeaderHeight();
     } else if (changedProps.has("_currentItem")) {
       this._setHeaderHeight();
-      this._attachIntersectionObserver();
     }
   }
 
-  private _actionClicked(ev: MouseEvent): void {
+  protected render(): TemplateResult {
+    if (this._error) {
+      return html`
+        <div class="container">${this._renderError(this._error)}</div>
+      `;
+    }
+
+    if (!this._currentItem) {
+      return html`<ha-circular-progress active></ha-circular-progress>`;
+    }
+
+    const currentItem = this._currentItem;
+
+    const subtitle = this.hass.localize(
+      `ui.components.media-browser.class.${currentItem.media_class}`
+    );
+    const children = currentItem.children || [];
+    const mediaClass = MediaClassBrowserSettings[currentItem.media_class];
+    const childrenMediaClass = currentItem.children_media_class
+      ? MediaClassBrowserSettings[currentItem.children_media_class]
+      : MediaClassBrowserSettings.directory;
+
+    const backgroundImage = currentItem.thumbnail
+      ? this._getSignedThumbnail(currentItem.thumbnail).then(
+          (value) => `url(${value})`
+        )
+      : "none";
+
+    return html`
+              ${
+                currentItem.can_play
+                  ? html`
+                      <div
+                        class="header ${classMap({
+                          "no-img": !currentItem.thumbnail,
+                          "no-dialog": !this.dialog,
+                        })}"
+                        @transitionend=${this._setHeaderHeight}
+                      >
+                        <div class="header-content">
+                          ${currentItem.thumbnail
+                            ? html`
+                                <div
+                                  class="img"
+                                  style="background-image: ${until(
+                                    backgroundImage,
+                                    ""
+                                  )}"
+                                >
+                                  ${this._narrow && currentItem?.can_play
+                                    ? html`
+                                        <ha-fab
+                                          mini
+                                          .item=${currentItem}
+                                          @click=${this._actionClicked}
+                                        >
+                                          <ha-svg-icon
+                                            slot="icon"
+                                            .label=${this.hass.localize(
+                                              `ui.components.media-browser.${this.action}-media`
+                                            )}
+                                            .path=${this.action === "play"
+                                              ? mdiPlay
+                                              : mdiPlus}
+                                          ></ha-svg-icon>
+                                          ${this.hass.localize(
+                                            `ui.components.media-browser.${this.action}`
+                                          )}
+                                        </ha-fab>
+                                      `
+                                    : ""}
+                                </div>
+                              `
+                            : html``}
+                          <div class="header-info">
+                            <div class="breadcrumb">
+                              <h1 class="title">${currentItem.title}</h1>
+                              ${subtitle
+                                ? html` <h2 class="subtitle">${subtitle}</h2> `
+                                : ""}
+                            </div>
+                            ${currentItem.can_play &&
+                            (!currentItem.thumbnail || !this._narrow)
+                              ? html`
+                                  <mwc-button
+                                    raised
+                                    .item=${currentItem}
+                                    @click=${this._actionClicked}
+                                  >
+                                    <ha-svg-icon
+                                      .label=${this.hass.localize(
+                                        `ui.components.media-browser.${this.action}-media`
+                                      )}
+                                      .path=${this.action === "play"
+                                        ? mdiPlay
+                                        : mdiPlus}
+                                    ></ha-svg-icon>
+                                    ${this.hass.localize(
+                                      `ui.components.media-browser.${this.action}`
+                                    )}
+                                  </mwc-button>
+                                `
+                              : ""}
+                          </div>
+                        </div>
+                      </div>
+                    `
+                  : ""
+              }
+          <div
+            class="content"
+            @scroll=${this._scroll}
+            @touchmove=${this._scroll}
+          >
+            ${
+              this._error
+                ? html`
+                    <div class="container">
+                      ${this._renderError(this._error)}
+                    </div>
+                  `
+                : isTTSMediaSource(currentItem.media_content_id)
+                ? html`
+                    <ha-browse-media-tts
+                      .item=${currentItem}
+                      .hass=${this.hass}
+                      .action=${this.action}
+                      @tts-picked=${this._ttsPicked}
+                    ></ha-browse-media-tts>
+                  `
+                : !children.length && !currentItem.not_shown
+                ? html`
+                    <div class="container no-items">
+                      ${currentItem.media_content_id ===
+                      "media-source://media_source/local/."
+                        ? html`
+                            <div class="highlight-add-button">
+                              <span>
+                                <ha-svg-icon
+                                  .path=${mdiArrowUpRight}
+                                ></ha-svg-icon>
+                              </span>
+                              <span>
+                                ${this.hass.localize(
+                                  "ui.components.media-browser.file_management.highlight_button"
+                                )}
+                              </span>
+                            </div>
+                          `
+                        : this.hass.localize(
+                            "ui.components.media-browser.no_items"
+                          )}
+                    </div>
+                  `
+                : childrenMediaClass.layout === "grid"
+                ? html`
+                    <lit-virtualizer
+                      scroller
+                      .layout=${grid({
+                        itemSize: {
+                          width: "175px",
+                          height: "225px",
+                        },
+                        gap: "16px",
+                        flex: { preserve: "aspect-ratio" },
+                        justify: "space-evenly",
+                        direction: "vertical",
+                      })}
+                      .items=${children}
+                      .renderItem=${this._renderGridItem}
+                      class="children ${classMap({
+                        portrait:
+                          childrenMediaClass.thumbnail_ratio === "portrait",
+                        not_shown: !!currentItem.not_shown,
+                      })}"
+                    ></lit-virtualizer>
+                    ${currentItem.not_shown
+                      ? html`
+                          <div class="grid not-shown">
+                            <div class="title">
+                              ${this.hass.localize(
+                                "ui.components.media-browser.not_shown",
+                                { count: currentItem.not_shown }
+                              )}
+                            </div>
+                          </div>
+                        `
+                      : ""}
+                  `
+                : html`
+                    <mwc-list>
+                      <lit-virtualizer
+                        scroller
+                        .items=${children}
+                        .renderItem=${this._renderListItem}
+                      ></lit-virtualizer>
+                      ${currentItem.not_shown
+                        ? html`
+                            <mwc-list-item
+                              noninteractive
+                              class="not-shown"
+                              .graphic=${mediaClass.show_list_images
+                                ? "medium"
+                                : "avatar"}
+                              dir=${computeRTLDirection(this.hass)}
+                            >
+                              <span class="title">
+                                ${this.hass.localize(
+                                  "ui.components.media-browser.not_shown",
+                                  { count: currentItem.not_shown }
+                                )}
+                              </span>
+                            </mwc-list-item>
+                          `
+                        : ""}
+                    </mwc-list>
+                  `
+            }
+          </div>
+        </div>
+      </div>
+    `;
+  }
+
+  private _renderGridItem = (child: MediaPlayerItem): TemplateResult => {
+    const backgroundImage = child.thumbnail
+      ? this._getSignedThumbnail(child.thumbnail).then(
+          (value) => `url(${value})`
+        )
+      : "none";
+
+    return html`
+      <div class="child" .item=${child} @click=${this._childClicked}>
+        <ha-card outlined>
+          <div class="thumbnail">
+            ${child.thumbnail
+              ? html`
+                  <div
+                    class="${["app", "directory"].includes(child.media_class)
+                      ? "centered-image"
+                      : ""} image"
+                    style="background-image: ${until(backgroundImage, "")}"
+                  ></div>
+                `
+              : html`
+                  <div class="icon-holder image">
+                    <ha-svg-icon
+                      class="folder"
+                      .path=${MediaClassBrowserSettings[
+                        child.media_class === "directory"
+                          ? child.children_media_class || child.media_class
+                          : child.media_class
+                      ].icon}
+                    ></ha-svg-icon>
+                  </div>
+                `}
+            ${child.can_play
+              ? html`
+                  <ha-icon-button
+                    class="play ${classMap({
+                      can_expand: child.can_expand,
+                    })}"
+                    .item=${child}
+                    .label=${this.hass.localize(
+                      `ui.components.media-browser.${this.action}-media`
+                    )}
+                    .path=${this.action === "play" ? mdiPlay : mdiPlus}
+                    @click=${this._actionClicked}
+                  ></ha-icon-button>
+                `
+              : ""}
+          </div>
+          <div class="title">
+            ${child.title}
+            <paper-tooltip fitToVisibleBounds position="top" offset="4"
+              >${child.title}</paper-tooltip
+            >
+          </div>
+        </ha-card>
+      </div>
+    `;
+  };
+
+  private _renderListItem = (child: MediaPlayerItem): TemplateResult => {
+    const currentItem = this._currentItem;
+    const mediaClass = MediaClassBrowserSettings[currentItem!.media_class];
+
+    const backgroundImage =
+      mediaClass.show_list_images && child.thumbnail
+        ? this._getSignedThumbnail(child.thumbnail).then(
+            (value) => `url(${value})`
+          )
+        : "none";
+
+    return html`
+      <mwc-list-item
+        @click=${this._childClicked}
+        .item=${child}
+        .graphic=${mediaClass.show_list_images ? "medium" : "avatar"}
+        dir=${computeRTLDirection(this.hass)}
+      >
+        <div
+          class=${classMap({
+            graphic: true,
+            thumbnail: mediaClass.show_list_images === true,
+          })}
+          style="background-image: ${until(backgroundImage, "")}"
+          slot="graphic"
+        >
+          <ha-icon-button
+            class="play ${classMap({
+              show: !mediaClass.show_list_images || !child.thumbnail,
+            })}"
+            .item=${child}
+            .label=${this.hass.localize(
+              `ui.components.media-browser.${this.action}-media`
+            )}
+            .path=${this.action === "play" ? mdiPlay : mdiPlus}
+            @click=${this._actionClicked}
+          ></ha-icon-button>
+        </div>
+        <span class="title">${child.title}</span>
+      </mwc-list-item>
+      <li divider role="separator"></li>
+    `;
+  };
+
+  private async _getSignedThumbnail(
+    thumbnailUrl: string | undefined
+  ): Promise<string> {
+    if (!thumbnailUrl) {
+      return "";
+    }
+
+    if (thumbnailUrl.startsWith("/")) {
+      // Thumbnails served by local API require authentication
+      return (await getSignedPath(this.hass, thumbnailUrl)).path;
+    }
+
+    if (thumbnailUrl.startsWith("https://brands.home-assistant.io")) {
+      // The backend is not aware of the theme used by the users,
+      // so we rewrite the URL to show a proper icon
+      thumbnailUrl = brandsUrl({
+        domain: extractDomainFromBrandUrl(thumbnailUrl),
+        type: "icon",
+        useFallback: true,
+        darkOptimized: this.hass.themes?.darkMode,
+      });
+    }
+
+    return thumbnailUrl;
+  }
+
+  private _actionClicked = (ev: MouseEvent): void => {
     ev.stopPropagation();
     const item = (ev.currentTarget as any).item;
 
     this._runAction(item);
-  }
+  };
 
   private _runAction(item: MediaPlayerItem): void {
     fireEvent(this, "media-picked", { item, navigateIds: this.navigateIds });
@@ -615,7 +657,7 @@ export class HaMediaPlayerBrowse extends LitElement {
     });
   }
 
-  private async _childClicked(ev: MouseEvent): Promise<void> {
+  private _childClicked = async (ev: MouseEvent): Promise<void> => {
     const target = ev.currentTarget as any;
     const item: MediaPlayerItem = target.item;
 
@@ -631,7 +673,7 @@ export class HaMediaPlayerBrowse extends LitElement {
     fireEvent(this, "media-browsed", {
       ids: [...this.navigateIds, item],
     });
-  }
+  };
 
   private async _fetchData(
     entityId: string,
@@ -658,55 +700,6 @@ export class HaMediaPlayerBrowse extends LitElement {
     this._resizeObserver.observe(this);
   }
 
-  /**
-   * Load thumbnails for images on demand as they become visible.
-   */
-  private async _attachIntersectionObserver(): Promise<void> {
-    if (!("IntersectionObserver" in window) || !this._thumbnails) {
-      return;
-    }
-    if (!this._intersectionObserver) {
-      this._intersectionObserver = new IntersectionObserver(
-        async (entries, observer) => {
-          await Promise.all(
-            entries.map(async (entry) => {
-              if (!entry.isIntersecting) {
-                return;
-              }
-              const thumbnailCard = entry.target as HTMLElement;
-              let thumbnailUrl = thumbnailCard.dataset.src;
-              if (!thumbnailUrl) {
-                return;
-              }
-              if (thumbnailUrl.startsWith("/")) {
-                // Thumbnails served by local API require authentication
-                const signedPath = await getSignedPath(this.hass, thumbnailUrl);
-                thumbnailUrl = signedPath.path;
-              } else if (
-                thumbnailUrl.startsWith("https://brands.home-assistant.io")
-              ) {
-                // The backend is not aware of the theme used by the users,
-                // so we rewrite the URL to show a proper icon
-                thumbnailUrl = brandsUrl({
-                  domain: extractDomainFromBrandUrl(thumbnailUrl),
-                  type: "icon",
-                  useFallback: true,
-                  darkOptimized: this.hass.themes?.darkMode,
-                });
-              }
-              thumbnailCard.style.backgroundImage = `url(${thumbnailUrl})`;
-              observer.unobserve(thumbnailCard); // loaded, so no need to observe anymore
-            })
-          );
-        }
-      );
-    }
-    const observer = this._intersectionObserver!;
-    for (const thumbnailCard of this._thumbnails) {
-      observer.observe(thumbnailCard);
-    }
-  }
-
   private _closeDialogAction(): void {
     fireEvent(this, "close-dialog");
   }
@@ -841,6 +834,7 @@ export class HaMediaPlayerBrowse extends LitElement {
         .content {
           overflow-y: auto;
           box-sizing: border-box;
+          height: 100%;
         }
 
         /* HEADER */
@@ -926,6 +920,7 @@ export class HaMediaPlayerBrowse extends LitElement {
         .not-shown {
           font-style: italic;
           color: var(--secondary-text-color);
+          padding: 8px 16px 8px;
         }
 
         .grid.not-shown {
@@ -951,7 +946,11 @@ export class HaMediaPlayerBrowse extends LitElement {
           border-bottom-color: var(--divider-color);
         }
 
-        .children {
+        mwc-list-item {
+          width: 100%;
+        }
+
+        div.children {
           display: grid;
           grid-template-columns: repeat(
             auto-fit,
@@ -988,7 +987,7 @@ export class HaMediaPlayerBrowse extends LitElement {
           padding-bottom: 100%;
         }
 
-        .portrait.children ha-card .thumbnail {
+        .portrait ha-card .thumbnail {
           padding-bottom: 150%;
         }
 
@@ -1062,10 +1061,6 @@ export class HaMediaPlayerBrowse extends LitElement {
           color: var(--primary-color);
         }
 
-        ha-card:hover .lazythumbnail {
-          opacity: 0.5;
-        }
-
         .child .title {
           font-size: 16px;
           padding-top: 16px;
@@ -1127,7 +1122,7 @@ export class HaMediaPlayerBrowse extends LitElement {
           padding: 0 24px;
         }
 
-        :host([narrow]) .children {
+        :host([narrow]) div.children {
           grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) !important;
         }
 
@@ -1232,6 +1227,16 @@ export class HaMediaPlayerBrowse extends LitElement {
           --mdc-fab-box-shadow: none;
           --mdc-theme-secondary: rgba(var(--rgb-primary-color), 0.5);
         }
+
+        lit-virtualizer {
+          height: 100%;
+          overflow: overlay !important;
+          contain: size layout !important;
+        }
+
+        lit-virtualizer.not_shown {
+          height: calc(100% - 36px);
+        }
       `,
     ];
   }

src/data/automation.ts

@@ -152,6 +152,12 @@ export interface EventTrigger extends BaseTrigger {
   context?: ContextConstraint;
 }
 
+export interface CalendarTrigger extends BaseTrigger {
+  platform: "calendar";
+  event: "start" | "end";
+  entity_id: string;
+}
+
 export type Trigger =
   | StateTrigger
   | MqttTrigger
@@ -166,7 +172,8 @@ export type Trigger =
   | TimeTrigger
   | TemplateTrigger
   | EventTrigger
-  | DeviceTrigger;
+  | DeviceTrigger
+  | CalendarTrigger;
 
 interface BaseCondition {
   condition: string;
@@ -226,6 +233,20 @@ export interface TriggerCondition extends BaseCondition {
   id: string;
 }
 
+type ShorthandBaseCondition = Omit<BaseCondition, "condition">;
+
+export interface ShorthandAndCondition extends ShorthandBaseCondition {
+  and: Condition[];
+}
+
+export interface ShorthandOrCondition extends ShorthandBaseCondition {
+  or: Condition[];
+}
+
+export interface ShorthandNotCondition extends ShorthandBaseCondition {
+  not: Condition[];
+}
+
 export type Condition =
   | StateCondition
   | NumericStateCondition
@@ -237,6 +258,12 @@ export type Condition =
   | LogicalCondition
   | TriggerCondition;
 
+export type ConditionWithShorthand =
+  | Condition
+  | ShorthandAndCondition
+  | ShorthandOrCondition
+  | ShorthandNotCondition;
+
 export const triggerAutomationActions = (
   hass: HomeAssistant,
   entityId: string

src/data/error_log.ts

@@ -1,4 +1,9 @@
 import { HomeAssistant } from "../types";
 
+export interface LogProvider {
+  key: string;
+  name: string;
+}
+
 export const fetchErrorLog = (hass: HomeAssistant) =>
   hass.callApi<string>("GET", "error_log");

src/data/update.ts

@@ -1,10 +1,15 @@
 import type {
+  HassEntities,
   HassEntityAttributeBase,
   HassEntityBase,
 } from "home-assistant-js-websocket";
 import { BINARY_STATE_ON } from "../common/const";
+import { computeStateDomain } from "../common/entity/compute_state_domain";
 import { supportsFeature } from "../common/entity/supports-feature";
+import { caseInsensitiveStringCompare } from "../common/string/compare";
+import { showAlertDialog } from "../dialogs/generic/show-dialog-box";
 import { HomeAssistant } from "../types";
+import { showToast } from "../util/toast";
 
 export const UPDATE_SUPPORT_INSTALL = 1;
 export const UPDATE_SUPPORT_SPECIFIC_VERSION = 2;
@@ -31,8 +36,12 @@ export const updateUsesProgress = (entity: UpdateEntity): boolean =>
   supportsFeature(entity, UPDATE_SUPPORT_PROGRESS) &&
   typeof entity.attributes.in_progress === "number";
 
-export const updateCanInstall = (entity: UpdateEntity): boolean =>
-  entity.state === BINARY_STATE_ON &&
+export const updateCanInstall = (
+  entity: UpdateEntity,
+  showSkipped = false
+): boolean =>
+  (entity.state === BINARY_STATE_ON ||
+    (showSkipped && Boolean(entity.attributes.skipped_version))) &&
   supportsFeature(entity, UPDATE_SUPPORT_INSTALL);
 
 export const updateIsInstalling = (entity: UpdateEntity): boolean =>
@@ -43,3 +52,75 @@ export const updateReleaseNotes = (hass: HomeAssistant, entityId: string) =>
     type: "update/release_notes",
     entity_id: entityId,
   });
+
+export const filterUpdateEntities = (entities: HassEntities) =>
+  (
+    Object.values(entities).filter(
+      (entity) => computeStateDomain(entity) === "update"
+    ) as UpdateEntity[]
+  ).sort((a, b) => {
+    if (a.attributes.title === "Home Assistant Core") {
+      return -3;
+    }
+    if (b.attributes.title === "Home Assistant Core") {
+      return 3;
+    }
+    if (a.attributes.title === "Home Assistant Operating System") {
+      return -2;
+    }
+    if (b.attributes.title === "Home Assistant Operating System") {
+      return 2;
+    }
+    if (a.attributes.title === "Home Assistant Supervisor") {
+      return -1;
+    }
+    if (b.attributes.title === "Home Assistant Supervisor") {
+      return 1;
+    }
+    return caseInsensitiveStringCompare(
+      a.attributes.title || a.attributes.friendly_name || "",
+      b.attributes.title || b.attributes.friendly_name || ""
+    );
+  });
+
+export const filterUpdateEntitiesWithInstall = (
+  entities: HassEntities,
+  showSkipped = false
+) =>
+  filterUpdateEntities(entities).filter((entity) =>
+    updateCanInstall(entity, showSkipped)
+  );
+
+export const checkForEntityUpdates = async (
+  element: HTMLElement,
+  hass: HomeAssistant
+) => {
+  const entities = filterUpdateEntities(hass.states).map(
+    (entity) => entity.entity_id
+  );
+
+  if (!entities.length) {
+    showAlertDialog(element, {
+      title: hass.localize("ui.panel.config.updates.no_update_entities.title"),
+      text: hass.localize(
+        "ui.panel.config.updates.no_update_entities.description"
+      ),
+      warning: true,
+    });
+    return;
+  }
+
+  await hass.callService("homeassistant", "update_entity", {
+    entity_id: entities,
+  });
+
+  if (filterUpdateEntitiesWithInstall(hass.states).length) {
+    showToast(element, {
+      message: hass.localize("ui.panel.config.updates.updates_refreshed"),
+    });
+  } else {
+    showToast(element, {
+      message: hass.localize("ui.panel.config.updates.no_new_updates"),
+    });
+  }
+};

src/data/zwave_js.ts

@@ -127,7 +127,7 @@ export interface ZWaveJSClient {
 
 export interface ZWaveJSController {
   home_id: number;
-  library_version: string;
+  sdk_version: string;
   type: number;
   own_node_id: number;
   is_secondary: boolean;
@@ -136,7 +136,7 @@ export interface ZWaveJSController {
   was_real_primary: boolean;
   is_static_update_controller: boolean;
   is_slave: boolean;
-  serial_api_version: string;
+  firmware_version: string;
   manufacturer_id: number;
   product_id: number;
   product_type: number;

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

@@ -11,7 +11,6 @@ import {
 } from "lit";
 import { customElement, state } from "lit/decorators";
 import { fireEvent, HASSDomEvent } from "../../common/dom/fire_event";
-import { computeRTL } from "../../common/util/compute_rtl";
 import "../../components/ha-circular-progress";
 import "../../components/ha-dialog";
 import "../../components/ha-icon-button";
@@ -261,7 +260,6 @@ class DataEntryFlowDialog extends LitElement {
                           <ha-icon-button
                             .label=${this.hass.localize("ui.common.help")}
                             .path=${mdiHelpCircle}
-                            ?rtl=${computeRTL(this.hass)}
                           >
                           </ha-icon-button
                         ></a>
@@ -273,7 +271,6 @@ class DataEntryFlowDialog extends LitElement {
                     )}
                     .path=${mdiClose}
                     dialogAction="close"
-                    ?rtl=${computeRTL(this.hass)}
                   ></ha-icon-button>
                 </div>
                 ${this._step === null
@@ -521,7 +518,7 @@ class DataEntryFlowDialog extends LitElement {
           top: 0;
           right: 0;
         }
-        .dialog-actions[rtl] {
+        :host-context([style*="direction: rtl;"]) .dialog-actions {
           right: auto;
           left: 0;
         }

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

@@ -146,14 +146,14 @@ export const showOptionsFlowDialog = (
       renderMenuHeader(hass, step) {
         return (
           hass.localize(
-            `component.${step.handler}.option.step.${step.step_id}.title`
-          ) || hass.localize(`component.${step.handler}.title`)
+            `component.${configEntry.domain}.options.step.${step.step_id}.title`
+          ) || hass.localize(`component.${configEntry.domain}.title`)
         );
       },
 
       renderMenuDescription(hass, step) {
         const description = hass.localize(
-          `component.${step.handler}.option.step.${step.step_id}.description`,
+          `component.${configEntry.domain}.options.step.${step.step_id}.description`,
           step.description_placeholders
         );
         return description
@@ -169,7 +169,7 @@ export const showOptionsFlowDialog = (
 
       renderMenuOption(hass, step, option) {
         return hass.localize(
-          `component.${step.handler}.options.step.${step.step_id}.menu_options.${option}`,
+          `component.${configEntry.domain}.options.step.${step.step_id}.menu_options.${option}`,
           step.description_placeholders
         );
       },

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

@@ -194,6 +194,10 @@ class StepFlowForm extends LitElement {
           word-break: break-word;
           padding-right: 72px;
         }
+        :host-context([style*="direction: rtl;"]) h2 {
+          padding-right: auto !important;
+          padding-left: 72px !important;
+        }
       `,
     ];
   }

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

@@ -106,6 +106,10 @@ class StepFlowPickFlow extends LitElement {
         h2 {
           padding-right: 66px;
         }
+        :host-context([style*="direction: rtl;"]) h2 {
+          padding-right: auto !important;
+          padding-left: 66px !important;
+        }
         @media all and (max-height: 900px) {
           div {
             max-height: calc(100vh - 134px);

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

@@ -313,6 +313,10 @@ class StepFlowPickHandler extends LitElement {
         h2 {
           padding-right: 66px;
         }
+        :host-context([style*="direction: rtl;"]) h2 {
+          padding-right: auto !important;
+          padding-left: 66px !important;
+        }
         @media all and (max-height: 900px) {
           mwc-list {
             max-height: calc(100vh - 134px);

src/dialogs/generic/dialog-box.ts

@@ -77,7 +77,7 @@ class DialogBox extends LitElement {
                   dialogInitialFocus
                   .value=${this._value || ""}
                   @keyup=${this._handleKeyUp}
-                  @change=${this._valueChanged}
+                  @input=${this._valueChanged}
                   .label=${this._params.inputLabel
                     ? this._params.inputLabel
                     : ""}

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

@@ -119,7 +119,15 @@ class MoreInfoVacuum extends LitElement {
                         "ui.dialogs.more_info_control.vacuum.status"
                       )}:
                     </span>
-                    <span><strong>${stateObj.attributes.status}</strong></span>
+                    <span>
+                      <strong>
+                        ${stateObj.attributes.status ||
+                        this.hass.localize(
+                          `component.vacuum.state._.${stateObj.state}`
+                        ) ||
+                        stateObj.state}
+                      </strong>
+                    </span>
                   </div>
                 `
               : ""}

src/dialogs/quick-bar/ha-quick-bar.ts

@@ -24,7 +24,7 @@ import { domainIcon } from "../../common/entity/domain_icon";
 import { navigate } from "../../common/navigate";
 import { caseInsensitiveStringCompare } from "../../common/string/compare";
 import {
-  fuzzyFilterSort,
+  defaultFuzzyFilterSort,
   ScorableTextItem,
 } from "../../common/string/filter/sequence-matching";
 import { debounce } from "../../common/util/debounce";
@@ -240,7 +240,7 @@ export class QuickBar extends LitElement {
                   : ""}
               </mwc-list>
             `}
-        ${this._hint ? html`<div class="hint">${this._hint}</div>` : ""}
+        ${this._hint ? html`<ha-tip>${this._hint}</ha-tip>` : ""}
       </ha-dialog>
     `;
   }
@@ -694,7 +694,7 @@ export class QuickBar extends LitElement {
 
   private _filterItems = memoizeOne(
     (items: QuickBarItem[], filter: string): QuickBarItem[] =>
-      fuzzyFilterSort<QuickBarItem>(filter.trimLeft(), items)
+      defaultFuzzyFilterSort<QuickBarItem>(filter.trimLeft(), items)
   );
 
   static get styles() {
@@ -782,10 +782,8 @@ export class QuickBar extends LitElement {
           text-transform: capitalize;
         }
 
-        .hint {
+        ha-tip {
           padding: 20px;
-          font-style: italic;
-          text-align: center;
         }
 
         .nothing-found {

src/layouts/ha-init-page.ts

@@ -5,15 +5,22 @@ import { property, state } from "lit/decorators";
 class HaInitPage extends LitElement {
   @property({ type: Boolean }) public error = false;
 
-  @state() showProgressIndicator = false;
+  @state() private _showProgressIndicator = false;
 
-  private _showProgressIndicatorTimeout;
+  @state() private _retryInSeconds = 60;
+
+  private _showProgressIndicatorTimeout?: NodeJS.Timeout;
+
+  private _retryInterval?: NodeJS.Timeout;
 
   protected render() {
     return this.error
       ? html`
           <p>Unable to connect to Home Assistant.</p>
-          <mwc-button @click=${this._retry}>Retry</mwc-button>
+          <p class="retry-text">
+            Retrying in ${this._retryInSeconds} seconds...
+          </p>
+          <mwc-button @click=${this._retry}>Retry now</mwc-button>
           ${location.host.includes("ui.nabu.casa")
             ? html`
                 <p>
@@ -29,7 +36,7 @@ class HaInitPage extends LitElement {
         `
       : html`
           <div id="progress-indicator-wrapper">
-            ${this.showProgressIndicator
+            ${this._showProgressIndicator
               ? html`<ha-circular-progress active></ha-circular-progress>`
               : ""}
           </div>
@@ -39,14 +46,26 @@ class HaInitPage extends LitElement {
 
   disconnectedCallback() {
     super.disconnectedCallback();
-    clearTimeout(this._showProgressIndicatorTimeout);
+    if (this._showProgressIndicatorTimeout) {
+      clearTimeout(this._showProgressIndicatorTimeout);
+    }
+    if (this._retryInterval) {
+      clearInterval(this._retryInterval);
+    }
   }
 
   protected firstUpdated() {
     this._showProgressIndicatorTimeout = setTimeout(async () => {
       await import("../components/ha-circular-progress");
-      this.showProgressIndicator = true;
+      this._showProgressIndicator = true;
     }, 5000);
+
+    this._retryInterval = setInterval(() => {
+      const remainingSeconds = this._retryInSeconds--;
+      if (remainingSeconds <= 0) {
+        this._retry();
+      }
+    }, 1000);
   }
 
   private _retry() {
@@ -70,6 +89,9 @@ class HaInitPage extends LitElement {
       a {
         color: var(--primary-color);
       }
+      .retry-text {
+        margin-top: 0;
+      }
       p,
       #loading-text {
         max-width: 350px;

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

@@ -130,7 +130,7 @@ export class HaTabsSubpageDataTable extends LitElement {
    * Array of tabs to show on the page.
    * @type {Array}
    */
-  @property() public tabs!: PageNavigation[];
+  @property() public tabs: PageNavigation[] = [];
 
   /**
    * Force hides the filter menu.
@@ -283,6 +283,9 @@ export class HaTabsSubpageDataTable extends LitElement {
         height: calc(100vh - 1px - var(--header-height));
         display: block;
       }
+      :host([narrow]) hass-tabs-subpage {
+        --main-title-margin: 0;
+      }
       .table-header {
         display: flex;
         align-items: center;

src/layouts/hass-tabs-subpage.ts

@@ -82,6 +82,16 @@ class HassTabsSubpage extends LitElement {
           (!page.advancedOnly || showAdvanced)
       );
 
+      if (shownTabs.length < 2) {
+        if (shownTabs.length === 1) {
+          const page = shownTabs[0];
+          return [
+            page.translationKey ? localizeFunc(page.translationKey) : page.name,
+          ];
+        }
+        return [""];
+      }
+
       return shownTabs.map(
         (page) =>
           html`
@@ -134,7 +144,7 @@ class HassTabsSubpage extends LitElement {
       this.narrow,
       this.localizeFunc || this.hass.localize
     );
-    const showTabs = tabs.length > 1 || !this.narrow;
+    const showTabs = tabs.length > 1;
     return html`
       <div class="toolbar">
         ${this.mainPage || (!this.backPath && history.state?.root)
@@ -159,8 +169,10 @@ class HassTabsSubpage extends LitElement {
                 @click=${this._backTapped}
               ></ha-icon-button-arrow-prev>
             `}
-        ${this.narrow
-          ? html`<div class="main-title"><slot name="header"></slot></div>`
+        ${this.narrow || !showTabs
+          ? html`<div class="main-title">
+              <slot name="header">${!showTabs ? tabs[0] : ""}</slot>
+            </div>`
           : ""}
         ${showTabs
           ? html`
@@ -283,6 +295,7 @@ class HassTabsSubpage extends LitElement {
         max-height: var(--header-height);
         line-height: 20px;
         color: var(--sidebar-text-color);
+        margin: var(--main-title-margin, 0 0 0 24px);
       }
 
       .content {

src/onboarding/onboarding-restore-backup.ts

@@ -1,11 +1,11 @@
 import "@material/mwc-button/mwc-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
-import "../../hassio/src/components/hassio-ansi-to-html";
 import { showBackupUploadDialog } from "../../hassio/src/dialogs/backup/show-dialog-backup-upload";
 import { showHassioBackupDialog } from "../../hassio/src/dialogs/backup/show-dialog-hassio-backup";
 import type { LocalizeFunc } from "../common/translations/localize";
 import "../components/ha-card";
+import "../components/ha-ansi-to-html";
 import { fetchInstallationType } from "../data/onboarding";
 import { makeDialogManager } from "../dialogs/make-dialog-manager";
 import { ProvideHassLitMixin } from "../mixins/provide-hass-lit-mixin";
@@ -86,7 +86,7 @@ class OnboardingRestoreBackup extends ProvideHassLitMixin(LitElement) {
           padding: 4px;
           margin-top: 8px;
         }
-        hassio-ansi-to-html {
+        ha-ansi-to-html {
           display: block;
           line-height: 22px;
           padding: 0 8px;

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

@@ -414,7 +414,7 @@ export default class HaAutomationActionRow extends LitElement {
           z-index: 3;
           --mdc-theme-text-primary-on-background: var(--primary-text-color);
         }
-        .rtl .card-menu {
+        :host-context([style*="direction: rtl;"]) .card-menu {
           right: initial;
           left: 16px;
         }

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

@@ -10,9 +10,7 @@ const SCHEMA: HaFormSchema[] = [
   {
     name: "wait_template",
     selector: {
-      text: {
-        multiline: true,
-      },
+      template: {},
     },
   },
   {

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

@@ -332,6 +332,7 @@ export class HaBlueprintAutomationEditor extends LitElement {
         ha-settings-row {
           --paper-time-input-justify-content: flex-end;
           --settings-row-content-width: 100%;
+          --settings-row-prefix-display: contents;
           border-top: 1px solid var(--divider-color);
         }
       `,

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

@@ -245,7 +245,7 @@ export default class HaAutomationConditionRow extends LitElement {
           display: flex;
           align-items: center;
         }
-        .rtl .card-menu {
+        :host-context([style*="direction: rtl;"]) .card-menu {
           float: left;
         }
         mwc-list-item[disabled] {

src/panels/config/automation/condition/types/ha-automation-condition-template.ts

@@ -1,6 +1,6 @@
-import "../../../../../components/ha-textarea";
-import { css, html, LitElement } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
+import "../../../../../components/ha-textarea";
 import type { TemplateCondition } from "../../../../../data/automation";
 import type { HomeAssistant } from "../../../../../types";
 import { handleChangeEvent } from "../ha-automation-condition-row";
@@ -18,28 +18,27 @@ export class HaTemplateCondition extends LitElement {
   protected render() {
     const { value_template } = this.condition;
     return html`
-      <ha-textarea
-        name="value_template"
-        .label=${this.hass.localize(
+      <p>
+        ${this.hass.localize(
           "ui.panel.config.automation.editor.conditions.type.template.value_template"
         )}
+        *
+      </p>
+      <ha-code-editor
+        .name=${"value_template"}
+        mode="jinja2"
+        .hass=${this.hass}
         .value=${value_template}
-        @input=${this._valueChanged}
+        autocomplete-entities
+        @value-changed=${this._valueChanged}
         dir="ltr"
-        autogrow
-      ></ha-textarea>
+      ></ha-code-editor>
     `;
   }
 
   private _valueChanged(ev: CustomEvent): void {
     handleChangeEvent(this, ev);
   }
-
-  static styles = css`
-    ha-textarea {
-      display: block;
-    }
-  `;
 }
 
 declare global {

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

@@ -28,6 +28,7 @@ import {
 } from "../../../../dialogs/generic/show-dialog-box";
 import { haStyle } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
+import "./types/ha-automation-trigger-calendar";
 import "./types/ha-automation-trigger-device";
 import "./types/ha-automation-trigger-event";
 import "./types/ha-automation-trigger-geo_location";
@@ -44,6 +45,7 @@ import "./types/ha-automation-trigger-webhook";
 import "./types/ha-automation-trigger-zone";
 
 const OPTIONS = [
+  "calendar",
   "device",
   "event",
   "state",
@@ -442,7 +444,7 @@ export default class HaAutomationTriggerRow extends LitElement {
           z-index: 3;
           --mdc-theme-text-primary-on-background: var(--primary-text-color);
         }
-        .rtl .card-menu {
+        :host-context([style*="direction: rtl;"]) .card-menu {
           float: left;
         }
         .triggered {

src/panels/config/automation/trigger/types/ha-automation-trigger-calendar.ts

@@ -0,0 +1,79 @@
+import { html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators";
+import memoizeOne from "memoize-one";
+import { fireEvent } from "../../../../../common/dom/fire_event";
+import type { CalendarTrigger } from "../../../../../data/automation";
+import type { HomeAssistant } from "../../../../../types";
+import type { TriggerElement } from "../ha-automation-trigger-row";
+import type { HaFormSchema } from "../../../../../components/ha-form/types";
+import type { LocalizeFunc } from "../../../../../common/translations/localize";
+
+@customElement("ha-automation-trigger-calendar")
+export class HaCalendarTrigger extends LitElement implements TriggerElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ attribute: false }) public trigger!: CalendarTrigger;
+
+  private _schema = memoizeOne((localize: LocalizeFunc) => [
+    {
+      name: "entity_id",
+      required: true,
+      selector: { entity: { domain: "calendar" } },
+    },
+    {
+      name: "event",
+      type: "select",
+      required: true,
+      options: [
+        [
+          "start",
+          localize(
+            "ui.panel.config.automation.editor.triggers.type.calendar.start"
+          ),
+        ],
+        [
+          "end",
+          localize(
+            "ui.panel.config.automation.editor.triggers.type.calendar.end"
+          ),
+        ],
+      ],
+    },
+  ]);
+
+  public static get defaultConfig() {
+    return {
+      event: "start" as CalendarTrigger["event"],
+    };
+  }
+
+  protected render() {
+    const schema = this._schema(this.hass.localize);
+    return html`
+      <ha-form
+        .schema=${schema}
+        .data=${this.trigger}
+        .hass=${this.hass}
+        .computeLabel=${this._computeLabelCallback}
+        @value-changed=${this._valueChanged}
+      ></ha-form>
+    `;
+  }
+
+  private _valueChanged(ev: CustomEvent): void {
+    ev.stopPropagation();
+    const newTrigger = ev.detail.value;
+    fireEvent(this, "value-changed", { value: newTrigger });
+  }
+
+  private _computeLabelCallback = (schema: HaFormSchema): string =>
+    this.hass.localize(
+      `ui.panel.config.automation.editor.triggers.type.calendar.${schema.name}`
+    );
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-automation-trigger-calendar": HaCalendarTrigger;
+  }
+}

src/panels/config/automation/trigger/types/ha-automation-trigger-template.ts

@@ -1,5 +1,5 @@
 import "../../../../../components/ha-textarea";
-import { css, html, LitElement } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { TemplateTrigger } from "../../../../../data/automation";
 import type { HomeAssistant } from "../../../../../types";
@@ -18,28 +18,27 @@ export class HaTemplateTrigger extends LitElement {
   protected render() {
     const { value_template } = this.trigger;
     return html`
-      <ha-textarea
-        name="value_template"
-        .label=${this.hass.localize(
+      <p>
+        ${this.hass.localize(
           "ui.panel.config.automation.editor.triggers.type.template.value_template"
         )}
+        *
+      </p>
+      <ha-code-editor
+        .name=${"value_template"}
+        mode="jinja2"
+        .hass=${this.hass}
         .value=${value_template}
-        @input=${this._valueChanged}
+        autocomplete-entities
+        @value-changed=${this._valueChanged}
         dir="ltr"
-        autogrow
-      ></ha-textarea>
+      ></ha-code-editor>
     `;
   }
 
   private _valueChanged(ev: CustomEvent): void {
     handleChangeEvent(this, ev);
   }
-
-  static styles = css`
-    ha-textarea {
-      display: block;
-    }
-  `;
 }
 
 declare global {

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

@@ -80,6 +80,7 @@ class HaConfigBackup extends LitElement {
       actions: {
         title: "",
         width: "15%",
+        type: "overflow-menu",
         template: (_: string, backup: BackupContent) =>
           html`<ha-icon-overflow-menu
             .hass=${this.hass}
@@ -126,17 +127,23 @@ class HaConfigBackup extends LitElement {
 
     return html`
       <hass-tabs-subpage-data-table
+        .tabs=${[
+          {
+            translationKey: "ui.panel.config.backup.caption",
+            path: `/config/backup`,
+          },
+        ]}
         .hass=${this.hass}
         .narrow=${this.narrow}
         back-path="/config/system"
         .route=${this.route}
         .columns=${this._columns(this.narrow, this.hass.language)}
         .data=${this._getItems(this._backupData.backups)}
-        .noDataText=${this.hass.localize("ui.panel.config.backup.no_bakcups")}
+        .noDataText=${this.hass.localize("ui.panel.config.backup.no_backups")}
+        .searchLabel=${this.hass.localize(
+          "ui.panel.config.backup.picker.search"
+        )}
       >
-        <span slot="header"
-          >${this.hass.localize("ui.panel.config.backup.caption")}</span
-        >
         <ha-fab
           slot="fab"
           ?disabled=${this._backupData.backing_up}

src/panels/config/blueprint/ha-blueprint-overview.ts

@@ -224,7 +224,7 @@ class HaBlueprintOverview extends LitElement {
         .narrow=${this.narrow}
         back-path="/config"
         .route=${this.route}
-        .tabs=${configSections.blueprints}
+        .tabs=${configSections.automations}
         .columns=${this._columns(this.narrow, this.hass.language)}
         .data=${this._processedBlueprints(this.blueprints)}
         id="entity_id"

src/panels/config/core/ha-config-analytics.ts

@@ -58,9 +58,9 @@ class ConfigAnalytics extends LitElement {
               "ui.panel.config.core.section.core.core_config.save_button"
             )}
           </mwc-button>
-          ${analyticsLearnMore(this.hass)}
         </div>
       </ha-card>
+      <div class="footer">${analyticsLearnMore(this.hass)}</div>
     `;
   }
 
@@ -117,6 +117,10 @@ class ConfigAnalytics extends LitElement {
           justify-content: space-between;
           align-items: center;
         }
+        .footer {
+          padding: 32px 0 16px;
+          text-align: center;
+        }
       `, // row-reverse so we tab first to "save"
     ];
   }

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

@@ -1,342 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import "@polymer/paper-input/paper-input";
-import type { PaperInputElement } from "@polymer/paper-input/paper-input";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { UNIT_C } from "../../../common/const";
-import { createCurrencyListEl } from "../../../components/currency-datalist";
-import "../../../components/ha-card";
-import "../../../components/map/ha-locations-editor";
-import type { MarkerLocation } from "../../../components/map/ha-locations-editor";
-import { createTimezoneListEl } from "../../../components/timezone-datalist";
-import { ConfigUpdateValues, saveCoreConfig } from "../../../data/core";
-import { SYMBOL_TO_ISO } from "../../../data/currency";
-import type { PolymerChangedEvent } from "../../../polymer-types";
-import type { HomeAssistant } from "../../../types";
-import "../../../components/ha-formfield";
-import "../../../components/ha-radio";
-import type { HaRadio } from "../../../components/ha-radio";
-
-@customElement("ha-config-core-form")
-class ConfigCoreForm extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @state() private _working = false;
-
-  @state() private _location?: [number, number];
-
-  @state() private _currency?: string;
-
-  @state() private _elevation?: string;
-
-  @state() private _unitSystem?: ConfigUpdateValues["unit_system"];
-
-  @state() private _timeZone?: string;
-
-  protected render(): TemplateResult {
-    const canEdit = ["storage", "default"].includes(
-      this.hass.config.config_source
-    );
-    const disabled = this._working || !canEdit;
-
-    return html`
-      <ha-card
-        .header=${this.hass.localize(
-          "ui.panel.config.core.section.core.form.heading"
-        )}
-      >
-        <div class="card-content">
-          ${!canEdit
-            ? html`
-                <p>
-                  ${this.hass.localize(
-                    "ui.panel.config.core.section.core.core_config.edit_requires_storage"
-                  )}
-                </p>
-              `
-            : ""}
-
-          <div class="row">
-            <ha-locations-editor
-              class="flex"
-              .hass=${this.hass}
-              .locations=${this._markerLocation(
-                this.hass.config.latitude,
-                this.hass.config.longitude,
-                this._location
-              )}
-              @location-updated=${this._locationChanged}
-            ></ha-locations-editor>
-          </div>
-
-          <div class="row">
-            <div class="flex">
-              ${this.hass.localize(
-                "ui.panel.config.core.section.core.core_config.time_zone"
-              )}
-            </div>
-
-            <paper-input
-              class="flex"
-              .label=${this.hass.localize(
-                "ui.panel.config.core.section.core.core_config.time_zone"
-              )}
-              name="timeZone"
-              list="timezones"
-              .disabled=${disabled}
-              .value=${this._timeZoneValue}
-              @value-changed=${this._handleChange}
-            ></paper-input>
-          </div>
-          <div class="row">
-            <div class="flex">
-              ${this.hass.localize(
-                "ui.panel.config.core.section.core.core_config.elevation"
-              )}
-            </div>
-
-            <paper-input
-              class="flex"
-              .label=${this.hass.localize(
-                "ui.panel.config.core.section.core.core_config.elevation"
-              )}
-              name="elevation"
-              type="number"
-              .disabled=${disabled}
-              .value=${this._elevationValue}
-              @value-changed=${this._handleChange}
-            >
-              <span slot="suffix">
-                ${this.hass.localize(
-                  "ui.panel.config.core.section.core.core_config.elevation_meters"
-                )}
-              </span>
-            </paper-input>
-          </div>
-
-          <div class="row">
-            <div class="flex">
-              ${this.hass.localize(
-                "ui.panel.config.core.section.core.core_config.unit_system"
-              )}
-            </div>
-            <div class="radio-group">
-              <ha-formfield
-                .label=${html`${this.hass.localize(
-                    "ui.panel.config.core.section.core.core_config.unit_system_metric"
-                  )}
-                  <div class="secondary">
-                    ${this.hass.localize(
-                      "ui.panel.config.core.section.core.core_config.metric_example"
-                    )}
-                  </div>`}
-              >
-                <ha-radio
-                  name="unit_system"
-                  value="metric"
-                  .checked=${this._unitSystemValue === "metric"}
-                  @change=${this._unitSystemChanged}
-                  .disabled=${this._working}
-                ></ha-radio>
-              </ha-formfield>
-              <ha-formfield
-                .label=${html`${this.hass.localize(
-                    "ui.panel.config.core.section.core.core_config.unit_system_imperial"
-                  )}
-                  <div class="secondary">
-                    ${this.hass.localize(
-                      "ui.panel.config.core.section.core.core_config.imperial_example"
-                    )}
-                  </div>`}
-              >
-                <ha-radio
-                  name="unit_system"
-                  value="imperial"
-                  .checked=${this._unitSystemValue === "imperial"}
-                  @change=${this._unitSystemChanged}
-                  .disabled=${this._working}
-                ></ha-radio>
-              </ha-formfield>
-            </div>
-          </div>
-          <div class="row">
-            <div class="flex">
-              ${this.hass.localize(
-                "ui.panel.config.core.section.core.core_config.currency"
-              )}<br />
-              <a
-                href="https://en.wikipedia.org/wiki/ISO_4217#Active_codes"
-                target="_blank"
-                rel="noopener noreferrer"
-                >${this.hass.localize(
-                  "ui.panel.config.core.section.core.core_config.find_currency_value"
-                )}</a
-              >
-            </div>
-
-            <paper-input
-              class="flex"
-              .label=${this.hass.localize(
-                "ui.panel.config.core.section.core.core_config.currency"
-              )}
-              name="currency"
-              list="currencies"
-              .disabled=${disabled}
-              .value=${this._currencyValue}
-              @value-changed=${this._handleChange}
-            ></paper-input>
-          </div>
-        </div>
-        <div class="card-actions">
-          <mwc-button @click=${this._save} .disabled=${disabled}>
-            ${this.hass.localize(
-              "ui.panel.config.core.section.core.core_config.save_button"
-            )}
-          </mwc-button>
-        </div>
-      </ha-card>
-    `;
-  }
-
-  protected firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-
-    const tzInput = this.shadowRoot!.querySelector(
-      "[name=timeZone]"
-    ) as PaperInputElement;
-    tzInput.inputElement.appendChild(createTimezoneListEl());
-
-    const cInput = this.shadowRoot!.querySelector(
-      "[name=currency]"
-    ) as PaperInputElement;
-    cInput.inputElement.appendChild(createCurrencyListEl());
-  }
-
-  private _markerLocation = memoizeOne(
-    (
-      lat: number,
-      lng: number,
-      location?: [number, number]
-    ): MarkerLocation[] => [
-      {
-        id: "location",
-        latitude: location ? location[0] : lat,
-        longitude: location ? location[1] : lng,
-        location_editable: true,
-      },
-    ]
-  );
-
-  private get _currencyValue() {
-    return this._currency !== undefined
-      ? this._currency
-      : this.hass.config.currency;
-  }
-
-  private get _elevationValue() {
-    return this._elevation !== undefined
-      ? this._elevation
-      : this.hass.config.elevation;
-  }
-
-  private get _timeZoneValue() {
-    return this._timeZone !== undefined
-      ? this._timeZone
-      : this.hass.config.time_zone;
-  }
-
-  private get _unitSystemValue() {
-    return this._unitSystem !== undefined
-      ? this._unitSystem
-      : this.hass.config.unit_system.temperature === UNIT_C
-      ? "metric"
-      : "imperial";
-  }
-
-  private _handleChange(ev: PolymerChangedEvent<string>) {
-    const target = ev.currentTarget as PaperInputElement;
-    let value = target.value;
-
-    if (target.name === "currency" && value) {
-      if (value in SYMBOL_TO_ISO) {
-        value = SYMBOL_TO_ISO[value];
-      }
-    }
-
-    this[`_${target.name}`] = value;
-  }
-
-  private _locationChanged(ev) {
-    this._location = ev.detail.location;
-  }
-
-  private _unitSystemChanged(ev: CustomEvent) {
-    this._unitSystem = (ev.target as HaRadio).value as "metric" | "imperial";
-  }
-
-  private async _save() {
-    this._working = true;
-    try {
-      const location = this._location || [
-        this.hass.config.latitude,
-        this.hass.config.longitude,
-      ];
-      await saveCoreConfig(this.hass, {
-        latitude: location[0],
-        longitude: location[1],
-        currency: this._currencyValue,
-        elevation: Number(this._elevationValue),
-        unit_system: this._unitSystemValue,
-        time_zone: this._timeZoneValue,
-      });
-    } catch (err: any) {
-      alert(`Error saving config: ${err.message}`);
-    } finally {
-      this._working = false;
-    }
-  }
-
-  static get styles(): CSSResultGroup {
-    return css`
-      .row {
-        display: flex;
-        flex-direction: row;
-        margin: 0 -8px;
-        align-items: center;
-      }
-
-      .secondary {
-        color: var(--secondary-text-color);
-      }
-
-      .flex {
-        flex: 1;
-      }
-
-      .row > * {
-        margin: 0 8px;
-      }
-
-      .radio-group {
-        display: flex;
-        flex-direction: column;
-        flex: 1;
-      }
-
-      .card-actions {
-        text-align: right;
-      }
-
-      a {
-        color: var(--primary-color);
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-config-core-form": ConfigCoreForm;
-  }
-}

src/panels/config/core/ha-config-core.js

@@ -1,57 +0,0 @@
-import "@polymer/app-layout/app-header/app-header";
-import "@polymer/app-layout/app-toolbar/app-toolbar";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-/* eslint-plugin-disable lit */
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-import "../../../layouts/hass-subpage";
-import LocalizeMixin from "../../../mixins/localize-mixin";
-import "../../../styles/polymer-ha-style";
-import "./ha-config-core-form";
-import "./ha-config-name-form";
-
-/*
- * @appliesMixin LocalizeMixin
- */
-class HaConfigCore extends LocalizeMixin(PolymerElement) {
-  static get template() {
-    return html`
-      <style include="iron-flex ha-style">
-        .content {
-          padding: 28px 20px 0;
-          max-width: 1040px;
-          margin: 0 auto;
-        }
-
-        ha-config-name-form,
-        ha-config-core-form {
-          display: block;
-          margin-top: 24px;
-        }
-      </style>
-
-      <hass-subpage
-        hass="[[hass]]"
-        narrow="[[narrow]]"
-        header="[[localize('ui.panel.config.core.caption')]]"
-        back-path="/config/system"
-      >
-        <div class="content">
-          <ha-config-name-form hass="[[hass]]"></ha-config-name-form>
-          <ha-config-core-form hass="[[hass]]"></ha-config-core-form>
-        </div>
-      </hass-subpage>
-    `;
-  }
-
-  static get properties() {
-    return {
-      hass: Object,
-      isWide: Boolean,
-      narrow: Boolean,
-      showAdvanced: Boolean,
-      route: Object,
-    };
-  }
-}
-
-customElements.define("ha-config-core", HaConfigCore);

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

@@ -1,97 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import "../../../components/ha-card";
-import { ConfigUpdateValues, saveCoreConfig } from "../../../data/core";
-import type { HomeAssistant } from "../../../types";
-import "../../../components/ha-textfield";
-import type { HaTextField } from "../../../components/ha-textfield";
-
-@customElement("ha-config-name-form")
-class ConfigNameForm extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @state() private _working = false;
-
-  @state() private _name!: ConfigUpdateValues["location_name"];
-
-  protected render(): TemplateResult {
-    const canEdit = ["storage", "default"].includes(
-      this.hass.config.config_source
-    );
-    const disabled = this._working || !canEdit;
-
-    return html`
-      <ha-card>
-        <div class="card-content">
-          ${!canEdit
-            ? html`
-                <p>
-                  ${this.hass.localize(
-                    "ui.panel.config.core.section.core.core_config.edit_requires_storage"
-                  )}
-                </p>
-              `
-            : ""}
-          <ha-textfield
-            class="flex"
-            .label=${this.hass.localize(
-              "ui.panel.config.core.section.core.core_config.location_name"
-            )}
-            .disabled=${disabled}
-            .value=${this._nameValue}
-            @change=${this._handleChange}
-          ></ha-textfield>
-        </div>
-        <div class="card-actions">
-          <mwc-button @click=${this._save} .disabled=${disabled}>
-            ${this.hass.localize(
-              "ui.panel.config.core.section.core.core_config.save_button"
-            )}
-          </mwc-button>
-        </div>
-      </ha-card>
-    `;
-  }
-
-  private get _nameValue() {
-    return this._name !== undefined
-      ? this._name
-      : this.hass.config.location_name;
-  }
-
-  private _handleChange(ev) {
-    const target = ev.currentTarget as HaTextField;
-    this._name = target.value;
-  }
-
-  private async _save() {
-    this._working = true;
-    try {
-      await saveCoreConfig(this.hass, {
-        location_name: this._nameValue,
-      });
-    } catch (err: any) {
-      alert("FAIL");
-    } finally {
-      this._working = false;
-    }
-  }
-
-  static get styles() {
-    return css`
-      .card-actions {
-        text-align: right;
-      }
-      ha-textfield {
-        display: block;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-config-name-form": ConfigNameForm;
-  }
-}

src/panels/config/core/ha-config-section-analytics.ts

@@ -33,6 +33,11 @@ class HaConfigSectionAnalytics extends LitElement {
       max-width: 1040px;
       margin: 0 auto;
     }
+    ha-config-analytics {
+      display: block;
+      max-width: 600px;
+      margin: 0 auto;
+    }
   `;
 }
 

src/panels/config/core/ha-config-section-general.ts

@@ -0,0 +1,313 @@
+import timezones from "google-timezones-json";
+import { css, html, LitElement, TemplateResult } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { UNIT_C } from "../../../common/const";
+import { stopPropagation } from "../../../common/dom/stop_propagation";
+import { navigate } from "../../../common/navigate";
+import { HaProgressButton } from "../../../components/buttons/ha-progress-button";
+import { currencies } from "../../../components/currency-datalist";
+import "../../../components/ha-formfield";
+import "../../../components/ha-radio";
+import type { HaRadio } from "../../../components/ha-radio";
+import "../../../components/ha-settings-row";
+import { ConfigUpdateValues, saveCoreConfig } from "../../../data/core";
+import { SYMBOL_TO_ISO } from "../../../data/currency";
+import "../../../layouts/hass-subpage";
+import { haStyle } from "../../../resources/styles";
+import type { HomeAssistant } from "../../../types";
+
+@customElement("ha-config-section-general")
+class HaConfigSectionGeneral extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ type: Boolean }) public narrow!: boolean;
+
+  @state() private _submitting = false;
+
+  @state() private _unitSystem?: ConfigUpdateValues["unit_system"];
+
+  @state() private _currency?: string;
+
+  @state() private _name?: string;
+
+  @state() private _elevation?: number;
+
+  @state() private _timeZone?: string;
+
+  protected render(): TemplateResult {
+    const canEdit = ["storage", "default"].includes(
+      this.hass.config.config_source
+    );
+    const disabled = this._submitting || !canEdit;
+    return html`
+      <hass-subpage
+        back-path="/config/system"
+        .hass=${this.hass}
+        .narrow=${this.narrow}
+        .header=${this.hass.localize("ui.panel.config.core.caption")}
+      >
+        <div class="content">
+          <ha-card>
+            <div class="card-content">
+              ${!canEdit
+                ? html`
+                    <p>
+                      ${this.hass.localize(
+                        "ui.panel.config.core.section.core.core_config.edit_requires_storage"
+                      )}
+                    </p>
+                  `
+                : ""}
+              <ha-textfield
+                name="name"
+                .label=${this.hass.localize(
+                  "ui.panel.config.core.section.core.core_config.location_name"
+                )}
+                .disabled=${disabled}
+                .value=${this._name}
+                @change=${this._handleChange}
+              ></ha-textfield>
+              <ha-select
+                .label=${this.hass.localize(
+                  "ui.panel.config.core.section.core.core_config.time_zone"
+                )}
+                name="timeZone"
+                fixedMenuPosition
+                naturalMenuWidth
+                .disabled=${disabled}
+                .value=${this._timeZone}
+                @closed=${stopPropagation}
+                @change=${this._handleChange}
+              >
+                ${Object.keys(timezones).map(
+                  (tz) =>
+                    html`<mwc-list-item value=${tz}
+                      >${timezones[tz]}</mwc-list-item
+                    >`
+                )}
+              </ha-select>
+              <ha-textfield
+                .label=${this.hass.localize(
+                  "ui.panel.config.core.section.core.core_config.elevation"
+                )}
+                name="elevation"
+                type="number"
+                .disabled=${disabled}
+                .value=${this._elevation}
+                @change=${this._handleChange}
+              >
+                <span slot="suffix">
+                  ${this.hass.localize(
+                    "ui.panel.config.core.section.core.core_config.elevation_meters"
+                  )}
+                </span>
+              </ha-textfield>
+              <div>
+                <div>
+                  ${this.hass.localize(
+                    "ui.panel.config.core.section.core.core_config.unit_system"
+                  )}
+                </div>
+                <ha-formfield
+                  .label=${html`
+                    <span style="font-size: 14px">
+                      ${this.hass.localize(
+                        "ui.panel.config.core.section.core.core_config.metric_example"
+                      )}
+                    </span>
+                    <div style="color: var(--secondary-text-color)">
+                      ${this.hass.localize(
+                        "ui.panel.config.core.section.core.core_config.unit_system_metric"
+                      )}
+                    </div>
+                  `}
+                >
+                  <ha-radio
+                    name="unit_system"
+                    value="metric"
+                    .checked=${this._unitSystem === "metric"}
+                    @change=${this._unitSystemChanged}
+                    .disabled=${this._submitting}
+                  ></ha-radio>
+                </ha-formfield>
+                <ha-formfield
+                  .label=${html`
+                    <span style="font-size: 14px">
+                      ${this.hass.localize(
+                        "ui.panel.config.core.section.core.core_config.imperial_example"
+                      )}
+                    </span>
+                    <div style="color: var(--secondary-text-color)">
+                      ${this.hass.localize(
+                        "ui.panel.config.core.section.core.core_config.unit_system_imperial"
+                      )}
+                    </div>
+                  `}
+                >
+                  <ha-radio
+                    name="unit_system"
+                    value="imperial"
+                    .checked=${this._unitSystem === "imperial"}
+                    @change=${this._unitSystemChanged}
+                    .disabled=${this._submitting}
+                  ></ha-radio>
+                </ha-formfield>
+              </div>
+              <div>
+                <ha-select
+                  .label=${this.hass.localize(
+                    "ui.panel.config.core.section.core.core_config.currency"
+                  )}
+                  name="currency"
+                  fixedMenuPosition
+                  naturalMenuWidth
+                  .disabled=${disabled}
+                  .value=${this._currency}
+                  @closed=${stopPropagation}
+                  @change=${this._handleChange}
+                >
+                  ${currencies.map(
+                    (currency) =>
+                      html`<mwc-list-item .value=${currency}
+                        >${currency}</mwc-list-item
+                      >`
+                  )}</ha-select
+                >
+                <a
+                  href="https://en.wikipedia.org/wiki/ISO_4217#Active_codes"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  >${this.hass.localize(
+                    "ui.panel.config.core.section.core.core_config.find_currency_value"
+                  )}</a
+                >
+              </div>
+            </div>
+            <ha-settings-row>
+              <div slot="heading">
+                ${this.hass.localize(
+                  "ui.panel.config.core.section.core.core_config.edit_location"
+                )}
+              </div>
+              <div slot="description" class="secondary">
+                ${this.hass.localize(
+                  "ui.panel.config.core.section.core.core_config.edit_location_description"
+                )}
+              </div>
+              <mwc-button @click=${this._editLocation}
+                >${this.hass.localize("ui.common.edit")}</mwc-button
+              >
+            </ha-settings-row>
+            <div class="card-actions">
+              <ha-progress-button @click=${this._updateEntry}>
+                ${this.hass!.localize("ui.panel.config.zone.detail.update")}
+              </ha-progress-button>
+            </div>
+          </ha-card>
+        </div>
+      </hass-subpage>
+    `;
+  }
+
+  protected firstUpdated(): void {
+    this._unitSystem =
+      this.hass.config.unit_system.temperature === UNIT_C
+        ? "metric"
+        : "imperial";
+    this._currency = this.hass.config.currency;
+    this._elevation = this.hass.config.elevation;
+    this._timeZone = this.hass.config.time_zone;
+    this._name = this.hass.config.location_name;
+  }
+
+  private _handleChange(ev) {
+    const target = ev.currentTarget;
+    let value = target.value;
+
+    if (target.name === "currency" && value) {
+      if (value in SYMBOL_TO_ISO) {
+        value = SYMBOL_TO_ISO[value];
+      }
+    }
+
+    this[`_${target.name}`] = value;
+  }
+
+  private _unitSystemChanged(ev: CustomEvent) {
+    this._unitSystem = (ev.target as HaRadio).value as "metric" | "imperial";
+  }
+
+  private async _updateEntry(ev) {
+    const button = ev.target as HaProgressButton;
+    if (button.progress) {
+      return;
+    }
+    button.progress = true;
+
+    try {
+      await saveCoreConfig(this.hass, {
+        currency: this._currency,
+        elevation: Number(this._elevation),
+        unit_system: this._unitSystem,
+        time_zone: this._timeZone,
+        location_name: this._name,
+      });
+      button.actionSuccess();
+    } catch (err: any) {
+      button.actionError();
+      alert(`Error saving config: ${err.message}`);
+    } finally {
+      button.progress = false;
+    }
+  }
+
+  private _editLocation() {
+    navigate("/config/zone");
+  }
+
+  static styles = [
+    haStyle,
+    css`
+      .content {
+        padding: 28px 20px 0;
+        max-width: 1040px;
+        margin: 0 auto;
+      }
+      ha-card {
+        max-width: 500px;
+        margin: 0 auto;
+        height: 100%;
+        justify-content: space-between;
+        flex-direction: column;
+        display: flex;
+      }
+      .card-content {
+        display: flex;
+        justify-content: space-between;
+        flex-direction: column;
+        padding: 16px 16px 0 16px;
+      }
+      .card-actions {
+        text-align: right;
+        height: 48px;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+        margin-top: 16px;
+      }
+      .card-content > * {
+        display: block;
+        margin-top: 16px;
+      }
+      ha-select {
+        display: block;
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-config-section-general": HaConfigSectionGeneral;
+  }
+}

src/panels/config/core/ha-config-section-storage.ts

@@ -1,40 +0,0 @@
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
-import "../../../layouts/hass-subpage";
-import type { HomeAssistant, Route } from "../../../types";
-import "./ha-config-analytics";
-
-@customElement("ha-config-section-storage")
-class HaConfigSectionStorage extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public route!: Route;
-
-  @property({ type: Boolean }) public narrow!: boolean;
-
-  protected render(): TemplateResult {
-    return html`
-      <hass-subpage
-        back-path="/config/system"
-        .hass=${this.hass}
-        .narrow=${this.narrow}
-      >
-        <div class="content"></div>
-      </hass-subpage>
-    `;
-  }
-
-  static styles = css`
-    .content {
-      padding: 28px 20px 0;
-      max-width: 1040px;
-      margin: 0 auto;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-config-section-storage": HaConfigSectionStorage;
-  }
-}

src/panels/config/core/ha-config-section-updates.ts

@@ -0,0 +1,208 @@
+import type { ActionDetail } from "@material/mwc-list";
+import "@material/mwc-list/mwc-list-item";
+import { mdiDotsVertical, mdiRefresh } from "@mdi/js";
+import { HassEntities } from "home-assistant-js-websocket";
+import { css, html, LitElement, TemplateResult } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import memoizeOne from "memoize-one";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
+import "../../../components/ha-alert";
+import "../../../components/ha-bar";
+import "../../../components/ha-button-menu";
+import "../../../components/ha-card";
+import "../../../components/ha-metric";
+import { extractApiErrorMessage } from "../../../data/hassio/common";
+import {
+  fetchHassioSupervisorInfo,
+  HassioSupervisorInfo,
+  reloadSupervisor,
+  setSupervisorOption,
+  SupervisorOptions,
+} from "../../../data/hassio/supervisor";
+import {
+  checkForEntityUpdates,
+  filterUpdateEntitiesWithInstall,
+} from "../../../data/update";
+import {
+  showAlertDialog,
+  showConfirmationDialog,
+} from "../../../dialogs/generic/show-dialog-box";
+import "../../../layouts/hass-subpage";
+import type { HomeAssistant } from "../../../types";
+import "../dashboard/ha-config-updates";
+
+@customElement("ha-config-section-updates")
+class HaConfigSectionUpdates extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ type: Boolean }) public narrow!: boolean;
+
+  @state() private _showSkipped = false;
+
+  @state() private _supervisorInfo?: HassioSupervisorInfo;
+
+  protected firstUpdated(changedProps) {
+    super.firstUpdated(changedProps);
+
+    if (isComponentLoaded(this.hass, "hassio")) {
+      fetchHassioSupervisorInfo(this.hass).then((data) => {
+        this._supervisorInfo = data;
+      });
+    }
+  }
+
+  protected render(): TemplateResult {
+    const canInstallUpdates = this._filterUpdateEntitiesWithInstall(
+      this.hass.states,
+      this._showSkipped
+    );
+
+    return html`
+      <hass-subpage
+        back-path="/config/system"
+        .hass=${this.hass}
+        .narrow=${this.narrow}
+        .header=${this.hass.localize("ui.panel.config.updates.caption")}
+      >
+        <div slot="toolbar-icon">
+          <ha-icon-button
+            .label=${this.hass.localize(
+              "ui.panel.config.updates.check_updates"
+            )}
+            .path=${mdiRefresh}
+            @click=${this._checkUpdates}
+          ></ha-icon-button>
+          <ha-button-menu corner="BOTTOM_START" @action=${this._handleAction}>
+            <ha-icon-button
+              slot="trigger"
+              .label=${this.hass.localize("ui.common.menu")}
+              .path=${mdiDotsVertical}
+            ></ha-icon-button>
+            <mwc-list-item id="skipped">
+              ${this._showSkipped
+                ? this.hass.localize("ui.panel.config.updates.hide_skipped")
+                : this.hass.localize("ui.panel.config.updates.show_skipped")}
+            </mwc-list-item>
+            ${this._supervisorInfo?.channel !== "dev"
+              ? html`
+                  <mwc-list-item id="beta">
+                    ${this._supervisorInfo?.channel === "stable"
+                      ? this.hass.localize("ui.panel.config.updates.join_beta")
+                      : this.hass.localize(
+                          "ui.panel.config.updates.leave_beta"
+                        )}
+                  </mwc-list-item>
+                `
+              : ""}
+          </ha-button-menu>
+        </div>
+        <div class="content">
+          <ha-card outlined>
+            <div class="card-content">
+              ${canInstallUpdates.length
+                ? html`
+                    <ha-config-updates
+                      .hass=${this.hass}
+                      .narrow=${this.narrow}
+                      .updateEntities=${canInstallUpdates}
+                      showAll
+                    ></ha-config-updates>
+                  `
+                : html`
+                    ${this.hass.localize("ui.panel.config.updates.no_updates")}
+                  `}
+            </div>
+          </ha-card>
+        </div>
+      </hass-subpage>
+    `;
+  }
+
+  private _handleAction(ev: CustomEvent<ActionDetail>) {
+    switch (ev.detail.index) {
+      case 0:
+        this._showSkipped = !this._showSkipped;
+        break;
+      case 1:
+        this._toggleBeta();
+        break;
+    }
+  }
+
+  private async _toggleBeta(): Promise<void> {
+    if (this._supervisorInfo!.channel === "stable") {
+      const confirmed = await showConfirmationDialog(this, {
+        title: this.hass.localize("ui.dialogs.join_beta_channel.title"),
+        text: html`${this.hass.localize("ui.dialogs.join_beta_channel.warning")}
+          <br />
+          <b> ${this.hass.localize("ui.dialogs.join_beta_channel.backup")} </b>
+          <br /><br />
+          ${this.hass.localize("ui.dialogs.join_beta_channel.release_items")}
+          <ul>
+            <li>Home Assistant Core</li>
+            <li>Home Assistant Supervisor</li>
+            <li>Home Assistant Operating System</li>
+          </ul>
+          <br />
+          ${this.hass.localize("ui.dialogs.join_beta_channel.confirm")}`,
+        confirmText: this.hass.localize("ui.panel.config.updates.join_beta"),
+        dismissText: this.hass.localize("ui.common.cancel"),
+      });
+
+      if (!confirmed) {
+        return;
+      }
+    }
+
+    try {
+      const data: Partial<SupervisorOptions> = {
+        channel: this._supervisorInfo!.channel === "stable" ? "beta" : "stable",
+      };
+      await setSupervisorOption(this.hass, data);
+      await reloadSupervisor(this.hass);
+    } catch (err: any) {
+      showAlertDialog(this, {
+        text: extractApiErrorMessage(err),
+      });
+    }
+  }
+
+  private async _checkUpdates(): Promise<void> {
+    checkForEntityUpdates(this, this.hass);
+  }
+
+  private _filterUpdateEntitiesWithInstall = memoizeOne(
+    (entities: HassEntities, showSkipped: boolean) =>
+      filterUpdateEntitiesWithInstall(entities, showSkipped)
+  );
+
+  static styles = css`
+    .content {
+      padding: 28px 20px 0;
+      max-width: 1040px;
+      margin: 0 auto;
+    }
+    ha-card {
+      max-width: 600px;
+      margin: 0 auto;
+      height: 100%;
+      justify-content: space-between;
+      flex-direction: column;
+      display: flex;
+      margin-bottom: max(24px, env(safe-area-inset-bottom));
+    }
+
+    .card-content {
+      display: flex;
+      justify-content: space-between;
+      flex-direction: column;
+      padding: 16px;
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-config-section-updates": HaConfigSectionUpdates;
+  }
+}

src/panels/config/core/ha-config-system-navigation.ts

@@ -1,8 +1,12 @@
+import { ActionDetail } from "@material/mwc-list";
+import { mdiDotsVertical } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
+import { canShowPage } from "../../../common/config/can_show_page";
 import "../../../components/ha-card";
 import "../../../components/ha-navigation-list";
 import { CloudStatus } from "../../../data/cloud";
+import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
 import "../../../layouts/hass-subpage";
 import { haStyle } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
@@ -23,29 +27,45 @@ class HaConfigSystemNavigation extends LitElement {
   @property({ type: Boolean }) public showAdvanced!: boolean;
 
   protected render(): TemplateResult {
-    const pages = configSections.general.map((page) => ({
-      ...page,
-      name: page.translationKey
-        ? this.hass.localize(page.translationKey)
-        : page.name,
-    }));
+    const pages = configSections.general
+      .filter((page) => canShowPage(this.hass, page))
+      .map((page) => ({
+        ...page,
+        name: page.translationKey
+          ? this.hass.localize(page.translationKey)
+          : page.name,
+      }));
 
     return html`
       <hass-subpage
         back-path="/config"
-        .header=${this.hass.localize("ui.panel.config.dashboard.system.title")}
+        .header=${this.hass.localize("ui.panel.config.dashboard.system.main")}
       >
+        <ha-button-menu
+          corner="BOTTOM_START"
+          slot="toolbar-icon"
+          @action=${this._handleAction}
+        >
+          <ha-icon-button
+            slot="trigger"
+            .label=${this.hass.localize("ui.common.overflow_menu")}
+            .path=${mdiDotsVertical}
+          ></ha-icon-button>
+          <mwc-list-item>
+            ${this.hass.localize(
+              "ui.panel.config.system_dashboard.restart_homeassistant"
+            )}
+          </mwc-list-item>
+        </ha-button-menu>
         <ha-config-section
           .narrow=${this.narrow}
           .isWide=${this.isWide}
           full-width
         >
-          <ha-card>
+          <ha-card outlined>
             ${this.narrow
               ? html`<div class="title">
-                  ${this.hass.localize(
-                    "ui.panel.config.dashboard.system.title"
-                  )}
+                  ${this.hass.localize("ui.panel.config.dashboard.system.main")}
                 </div>`
               : ""}
             <ha-navigation-list
@@ -59,13 +79,25 @@ class HaConfigSystemNavigation extends LitElement {
     `;
   }
 
+  private _handleAction(ev: CustomEvent<ActionDetail>) {
+    switch (ev.detail.index) {
+      case 0:
+        showConfirmationDialog(this, {
+          text: this.hass.localize(
+            "ui.panel.config.system_dashboard.confirm_restart"
+          ),
+          confirm: () => {
+            this.hass.callService("homeassistant", "restart");
+          },
+        });
+        break;
+    }
+  }
+
   static get styles(): CSSResultGroup {
     return [
       haStyle,
       css`
-        ha-card {
-          margin-bottom: env(safe-area-inset-bottom);
-        }
         :host(:not([narrow])) ha-card {
           margin-bottom: max(24px, env(safe-area-inset-bottom));
         }
@@ -78,6 +110,8 @@ class HaConfigSystemNavigation extends LitElement {
 
         ha-card {
           overflow: hidden;
+          margin-bottom: 24px;
+          margin-bottom: max(24px, env(safe-area-inset-bottom));
         }
 
         ha-card a {
@@ -102,6 +136,7 @@ class HaConfigSystemNavigation extends LitElement {
 
         ha-navigation-list {
           --navigation-list-item-title-font-size: 16px;
+          --navigation-list-item-padding: 4px;
         }
       `,
     ];

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

@@ -1,15 +1,9 @@
 import type { ActionDetail } from "@material/mwc-list";
 import "@material/mwc-list/mwc-list-item";
-import {
-  mdiCloudLock,
-  mdiDotsVertical,
-  mdiLightbulbOutline,
-  mdiMagnify,
-  mdiNewBox,
-} from "@mdi/js";
+import { mdiCloudLock, mdiDotsVertical, mdiMagnify } from "@mdi/js";
 import "@polymer/app-layout/app-header/app-header";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
-import type { HassEntities } from "home-assistant-js-websocket";
+import { HassEntities } from "home-assistant-js-websocket";
 import {
   css,
   CSSResultGroup,
@@ -21,24 +15,25 @@ import {
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
-import { computeStateDomain } from "../../../common/entity/compute_state_domain";
-import { caseInsensitiveStringCompare } from "../../../common/string/compare";
 import "../../../components/ha-button-menu";
 import "../../../components/ha-card";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-icon-next";
 import "../../../components/ha-menu-button";
 import "../../../components/ha-svg-icon";
+import "../../../components/ha-tip";
 import { CloudStatus } from "../../../data/cloud";
-import { updateCanInstall, UpdateEntity } from "../../../data/update";
-import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
+import {
+  checkForEntityUpdates,
+  filterUpdateEntitiesWithInstall,
+  UpdateEntity,
+} from "../../../data/update";
 import { showQuickBar } from "../../../dialogs/quick-bar/show-dialog-quick-bar";
 import "../../../layouts/ha-app-layout";
 import { PageNavigation } from "../../../layouts/hass-tabs-subpage";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 import { documentationUrl } from "../../../util/documentation-url";
-import { showToast } from "../../../util/toast";
 import "../ha-config-section";
 import { configSections } from "../ha-panel-config";
 import "./ha-config-navigation";
@@ -86,12 +81,12 @@ const randomTip = (hass: HomeAssistant) => {
             rel="noreferrer"
             >Newsletter</a
           >
-          <ha-svg-icon class="new" .path=${mdiNewBox}></ha-svg-icon
-        ></span>`
+        </span>`
       ),
       weight: 2,
     },
-    { content: hass.localize("ui.dialogs.quick-bar.key_c_hint"), weight: 1 },
+    { content: hass.localize("ui.tips.key_c_hint"), weight: 1 },
+    { content: hass.localize("ui.tips.key_m_hint"), weight: 1 },
   ];
 
   tips.forEach((tip) => {
@@ -118,8 +113,6 @@ class HaConfigDashboard extends LitElement {
 
   @state() private _tip?: string;
 
-  private _notifyUpdates = false;
-
   private _pages = memoizeOne((clouStatus, isLoaded) => {
     const pages: PageNavigation[] = [];
     if (clouStatus && isLoaded) {
@@ -136,9 +129,8 @@ class HaConfigDashboard extends LitElement {
   });
 
   protected render(): TemplateResult {
-    const canInstallUpdates = this._filterUpdateEntitiesWithInstall(
-      this.hass.states
-    );
+    const [canInstallUpdates, totalUpdates] =
+      this._filterUpdateEntitiesWithInstall(this.hass.states);
 
     return html`
       <ha-app-layout>
@@ -178,15 +170,26 @@ class HaConfigDashboard extends LitElement {
           full-width
         >
           ${canInstallUpdates.length
-            ? html`<ha-card>
+            ? html`<ha-card outlined>
                 <ha-config-updates
                   .hass=${this.hass}
                   .narrow=${this.narrow}
+                  .total=${totalUpdates}
                   .updateEntities=${canInstallUpdates}
                 ></ha-config-updates>
+                ${totalUpdates > canInstallUpdates.length
+                  ? html`<a class="button" href="/config/updates">
+                      ${this.hass.localize(
+                        "ui.panel.config.updates.more_updates",
+                        {
+                          count: totalUpdates - canInstallUpdates.length,
+                        }
+                      )}
+                    </a>`
+                  : ""}
               </ha-card>`
             : ""}
-          <ha-card>
+          <ha-card outlined>
             ${this.narrow && canInstallUpdates.length
               ? html`<div class="title">
                   ${this.hass.localize("panel.config")}
@@ -202,11 +205,7 @@ class HaConfigDashboard extends LitElement {
               )}
             ></ha-config-navigation>
           </ha-card>
-          <div class="tips">
-            <ha-svg-icon .path=${mdiLightbulbOutline}></ha-svg-icon>
-            <span class="tip-word">Tip!</span>
-            <span class="text">${this._tip}</span>
-          </div>
+          <ha-tip>${this._tip}</ha-tip>
         </ha-config-section>
       </ha-app-layout>
     `;
@@ -218,60 +217,17 @@ class HaConfigDashboard extends LitElement {
     if (!this._tip && changedProps.has("hass")) {
       this._tip = randomTip(this.hass);
     }
-
-    if (!changedProps.has("hass") || !this._notifyUpdates) {
-      return;
-    }
-    this._notifyUpdates = false;
-    if (this._filterUpdateEntitiesWithInstall(this.hass.states).length) {
-      showToast(this, {
-        message: this.hass.localize(
-          "ui.panel.config.updates.updates_refreshed"
-        ),
-      });
-    } else {
-      showToast(this, {
-        message: this.hass.localize("ui.panel.config.updates.no_new_updates"),
-      });
-    }
   }
 
-  private _filterUpdateEntities = memoizeOne((entities: HassEntities) =>
-    (
-      Object.values(entities).filter(
-        (entity) => computeStateDomain(entity) === "update"
-      ) as UpdateEntity[]
-    ).sort((a, b) => {
-      if (a.attributes.title === "Home Assistant Core") {
-        return -3;
-      }
-      if (b.attributes.title === "Home Assistant Core") {
-        return 3;
-      }
-      if (a.attributes.title === "Home Assistant Operating System") {
-        return -2;
-      }
-      if (b.attributes.title === "Home Assistant Operating System") {
-        return 2;
-      }
-      if (a.attributes.title === "Home Assistant Supervisor") {
-        return -1;
-      }
-      if (b.attributes.title === "Home Assistant Supervisor") {
-        return 1;
-      }
-      return caseInsensitiveStringCompare(
-        a.attributes.title || a.attributes.friendly_name || "",
-        b.attributes.title || b.attributes.friendly_name || ""
-      );
-    })
-  );
-
   private _filterUpdateEntitiesWithInstall = memoizeOne(
-    (entities: HassEntities) =>
-      this._filterUpdateEntities(entities).filter((entity) =>
-        updateCanInstall(entity)
-      )
+    (entities: HassEntities): [UpdateEntity[], number] => {
+      const updates = filterUpdateEntitiesWithInstall(entities);
+
+      return [
+        updates.slice(0, updates.length === 3 ? updates.length : 2),
+        updates.length,
+      ];
+    }
   );
 
   private _showQuickBar(): void {
@@ -282,27 +238,9 @@ class HaConfigDashboard extends LitElement {
   }
 
   private async _handleMenuAction(ev: CustomEvent<ActionDetail>) {
-    const _entities = this._filterUpdateEntities(this.hass.states).map(
-      (entity) => entity.entity_id
-    );
     switch (ev.detail.index) {
       case 0:
-        if (_entities.length) {
-          this._notifyUpdates = true;
-          await this.hass.callService("homeassistant", "update_entity", {
-            entity_id: _entities,
-          });
-          return;
-        }
-        showAlertDialog(this, {
-          title: this.hass.localize(
-            "ui.panel.config.updates.no_update_entities.title"
-          ),
-          text: this.hass.localize(
-            "ui.panel.config.updates.no_update_entities.description"
-          ),
-          warning: true,
-        });
+        checkForEntityUpdates(this, this.hass);
         break;
     }
   }
@@ -329,6 +267,11 @@ class HaConfigDashboard extends LitElement {
           text-decoration: none;
           color: var(--primary-text-color);
         }
+        a.button {
+          display: block;
+          color: var(--primary-color);
+          padding: 16px;
+        }
         .title {
           font-size: 16px;
           padding: 16px;
@@ -343,19 +286,10 @@ class HaConfigDashboard extends LitElement {
           margin-top: -42px;
         }
 
-        .tips {
-          text-align: center;
+        ha-tip {
           margin-bottom: max(env(safe-area-inset-bottom), 8px);
         }
 
-        .tips .text {
-          color: var(--secondary-text-color);
-        }
-
-        .tip-word {
-          font-weight: 500;
-        }
-
         .new {
           color: var(--primary-color);
         }

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

@@ -1,6 +1,6 @@
 import "@material/mwc-list/mwc-list";
 import "@material/mwc-list/mwc-list-item";
-import { html, LitElement, TemplateResult } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { canShowPage } from "../../../common/config/can_show_page";
 import "../../../components/ha-card";
@@ -30,7 +30,7 @@ class HaConfigNavigation extends LitElement {
         name:
           page.name ||
           this.hass.localize(
-            `ui.panel.config.dashboard.${page.translationKey}.title`
+            `ui.panel.config.dashboard.${page.translationKey}.main`
           ),
         description:
           page.component === "cloud" && (page.info as CloudStatus)
@@ -51,7 +51,7 @@ class HaConfigNavigation extends LitElement {
                 ${
                   page.description ||
                   this.hass.localize(
-                    `ui.panel.config.dashboard.${page.translationKey}.description`
+                    `ui.panel.config.dashboard.${page.translationKey}.secondary`
                   )
                 }
               `,
@@ -81,6 +81,12 @@ class HaConfigNavigation extends LitElement {
       });
     }
   }
+
+  static styles: CSSResultGroup = css`
+    ha-navigation-list {
+      --navigation-list-item-title-font-size: 16px;
+    }
+  `;
 }
 
 declare global {

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

@@ -1,14 +1,14 @@
 import "@material/mwc-button/mwc-button";
-import "@polymer/paper-item/paper-icon-item";
-import "@polymer/paper-item/paper-item-body";
+import "@material/mwc-list/mwc-list";
+import "@material/mwc-list/mwc-list-item";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
 import "../../../components/entity/state-badge";
 import "../../../components/ha-alert";
 import "../../../components/ha-icon-next";
 import type { UpdateEntity } from "../../../data/update";
-import { HomeAssistant } from "../../../types";
+import type { HomeAssistant } from "../../../types";
 
 @customElement("ha-config-updates")
 class HaConfigUpdates extends LitElement {
@@ -19,62 +19,60 @@ class HaConfigUpdates extends LitElement {
   @property({ attribute: false })
   public updateEntities?: UpdateEntity[];
 
-  @state() private _showAll = false;
+  @property({ type: Number })
+  public total?: number;
 
   protected render(): TemplateResult {
     if (!this.updateEntities?.length) {
       return html``;
     }
 
-    const updates =
-      this._showAll || this.updateEntities.length <= 3
-        ? this.updateEntities
-        : this.updateEntities.slice(0, 2);
+    const updates = this.updateEntities;
 
     return html`
       <div class="title">
         ${this.hass.localize("ui.panel.config.updates.title", {
-          count: this.updateEntities.length,
+          count: this.total || this.updateEntities.length,
         })}
       </div>
-      ${updates.map(
-        (entity) => html`
-          <paper-icon-item
-            @click=${this._openMoreInfo}
-            .entity_id=${entity.entity_id}
-          >
-            <span slot="item-icon" class="icon">
+      <mwc-list>
+        ${updates.map(
+          (entity) => html`
+            <mwc-list-item
+              twoline
+              graphic="avatar"
+              class=${entity.attributes.skipped_version ? "skipped" : ""}
+              .entity_id=${entity.entity_id}
+              .hasMeta=${!this.narrow}
+              @click=${this._openMoreInfo}
+            >
               <state-badge
+                slot="graphic"
                 .title=${entity.attributes.title ||
                 entity.attributes.friendly_name}
                 .stateObj=${entity}
-                slot="item-icon"
               ></state-badge>
-            </span>
-            <paper-item-body two-line>
-              ${entity.attributes.title || entity.attributes.friendly_name}
-              <div secondary>
+              <span
+                >${entity.attributes.title ||
+                entity.attributes.friendly_name}</span
+              >
+              <span slot="secondary">
                 ${this.hass.localize(
                   "ui.panel.config.updates.version_available",
                   {
                     version_available: entity.attributes.latest_version,
                   }
-                )}
-              </div>
-            </paper-item-body>
-            ${!this.narrow ? html`<ha-icon-next></ha-icon-next>` : ""}
-          </paper-icon-item>
-        `
-      )}
-      ${!this._showAll && this.updateEntities.length >= 4
-        ? html`
-            <button class="show-more" @click=${this._showAllClicked}>
-              ${this.hass.localize("ui.panel.config.updates.more_updates", {
-                count: this.updateEntities!.length - updates.length,
-              })}
-            </button>
+                )}${entity.attributes.skipped_version
+                  ? `(${this.hass.localize("ui.panel.config.updates.skipped")})`
+                  : ""}
+              </span>
+              ${!this.narrow
+                ? html`<ha-icon-next slot="meta"></ha-icon-next>`
+                : ""}
+            </mwc-list-item>
           `
-        : ""}
+        )}
+      </mwc-list>
     `;
   }
 
@@ -84,22 +82,19 @@ class HaConfigUpdates extends LitElement {
     });
   }
 
-  private _showAllClicked() {
-    this._showAll = true;
-  }
-
   static get styles(): CSSResultGroup[] {
     return [
       css`
+        :host {
+          --mdc-list-vertical-padding: 0;
+        }
         .title {
           font-size: 16px;
           padding: 16px;
           padding-bottom: 0;
         }
-        .icon {
-          display: inline-flex;
-          height: 100%;
-          align-items: center;
+        .skipped {
+          background: var(--secondary-background-color);
         }
         ha-icon-next {
           color: var(--secondary-text-color);
@@ -122,8 +117,9 @@ class HaConfigUpdates extends LitElement {
           outline: none;
           text-decoration: underline;
         }
-        paper-icon-item {
+        mwc-list-item {
           cursor: pointer;
+          font-size: 16px;
         }
       `,
     ];

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

@@ -197,7 +197,10 @@ export class HaConfigDeviceDashboard extends LitElement {
         ),
         model: device.model || "<unknown>",
         manufacturer: device.manufacturer || "<unknown>",
-        area: device.area_id ? areaLookup[device.area_id].name : "—",
+        area:
+          device.area_id && areaLookup[device.area_id]
+            ? areaLookup[device.area_id].name
+            : "—",
         integration: device.config_entries.length
           ? device.config_entries
               .filter((entId) => entId in entryLookup)

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

@@ -276,6 +276,7 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
                 @selected=${this._deviceClassChanged}
                 @closed=${stopPropagation}
               >
+                <mwc-list-item></mwc-list-item>
                 ${this._deviceClassesSorted(
                   domain,
                   this._deviceClassOptions[0],
@@ -355,6 +356,25 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
               )}
             </ha-select>`
           : ""}
+        ${this._helperConfigEntry
+          ? html`
+              <div class="row">
+                <mwc-button
+                  @click=${this._showOptionsFlow}
+                  .disabled=${this._submitting}
+                >
+                  ${this.hass.localize(
+                    "ui.dialogs.entity_registry.editor.configure_state",
+                    "integration",
+                    domainToName(
+                      this.hass.localize,
+                      this._helperConfigEntry.domain
+                    )
+                  )}
+                </mwc-button>
+              </div>
+            `
+          : ""}
         <ha-textfield
           error-message="Domain needs to stay the same"
           .value=${this._entityId}
@@ -372,20 +392,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
               @value-changed=${this._areaPicked}
             ></ha-area-picker>`
           : ""}
-        ${this._helperConfigEntry
-          ? html`
-              <div class="row">
-                <mwc-button
-                  @click=${this._showOptionsFlow}
-                  .disabled=${this._submitting}
-                >
-                  ${this.hass.localize(
-                    "ui.dialogs.entity_registry.editor.configure_state"
-                  )}
-                </mwc-button>
-              </div>
-            `
-          : ""}
 
         <ha-expansion-panel
           .header=${this.hass.localize(

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

@@ -4,14 +4,15 @@ import {
   mdiBadgeAccountHorizontal,
   mdiCellphoneCog,
   mdiCog,
-  mdiCpu32Bit,
+  mdiDatabase,
   mdiDevices,
-  mdiHomeAssistant,
+  mdiHeart,
   mdiInformation,
   mdiInformationOutline,
   mdiLightningBolt,
   mdiMapMarkerRadius,
   mdiMathLog,
+  mdiMemory,
   mdiNetwork,
   mdiNfcVariant,
   mdiPalette,
@@ -19,7 +20,6 @@ import {
   mdiPuzzle,
   mdiRobot,
   mdiScriptText,
-  mdiServer,
   mdiShape,
   mdiSofa,
   mdiTools,
@@ -68,13 +68,6 @@ export const configSections: { [name: string]: PageNavigation[] } = {
       iconColor: "#E48629",
       components: ["zone"],
     },
-    {
-      path: "/config/backup",
-      translationKey: "backup",
-      iconPath: mdiBackupRestore,
-      iconColor: "#4084CD",
-      component: "backup",
-    },
     {
       path: "/hassio",
       translationKey: "supervisor",
@@ -100,7 +93,7 @@ export const configSections: { [name: string]: PageNavigation[] } = {
       path: "/config/person",
       translationKey: "people",
       iconPath: mdiAccount,
-      iconColor: "#E48629",
+      iconColor: "#832EA6",
       components: ["person", "users"],
     },
     {
@@ -262,48 +255,39 @@ export const configSections: { [name: string]: PageNavigation[] } = {
   ],
   general: [
     {
-      component: "core",
-      path: "/config/core",
-      translationKey: "ui.panel.config.core.caption",
-      iconPath: mdiHomeAssistant,
-      iconColor: "#4A5963",
-      core: true,
-    },
-    {
-      component: "server_control",
-      path: "/config/server_control",
-      translationKey: "ui.panel.config.server_control.caption",
-      iconPath: mdiServer,
-      iconColor: "#4A5963",
-      core: true,
+      path: "/config/updates",
+      translationKey: "ui.panel.config.updates.caption",
+      iconPath: mdiUpdate,
+      iconColor: "#3B808E",
     },
     {
       component: "logs",
       path: "/config/logs",
       translationKey: "ui.panel.config.logs.caption",
       iconPath: mdiMathLog,
-      iconColor: "#4A5963",
+      iconColor: "#C65326",
       core: true,
     },
     {
       path: "/config/backup",
       translationKey: "ui.panel.config.backup.caption",
       iconPath: mdiBackupRestore,
-      iconColor: "#4084CD",
+      iconColor: "#0D47A1",
       component: "backup",
     },
+    {
+      path: "/hassio/backups",
+      translationKey: "ui.panel.config.backup.caption",
+      iconPath: mdiBackupRestore,
+      iconColor: "#0D47A1",
+      component: "hassio",
+    },
     {
       path: "/config/analytics",
       translationKey: "ui.panel.config.analytics.caption",
       iconPath: mdiShape,
       iconColor: "#f1c447",
     },
-    {
-      path: "/config/hardware",
-      translationKey: "ui.panel.config.hardware.caption",
-      iconPath: mdiCpu32Bit,
-      iconColor: "#4A5963",
-    },
     {
       path: "/config/network",
       translationKey: "ui.panel.config.network.caption",
@@ -313,14 +297,30 @@ export const configSections: { [name: string]: PageNavigation[] } = {
     {
       path: "/config/storage",
       translationKey: "ui.panel.config.storage.caption",
-      iconPath: mdiServer,
+      iconPath: mdiDatabase,
       iconColor: "#518C43",
+      component: "hassio",
     },
     {
-      path: "/config/update",
-      translationKey: "ui.panel.config.updates.caption",
-      iconPath: mdiUpdate,
-      iconColor: "#4A5963",
+      path: "/config/hardware",
+      translationKey: "ui.panel.config.hardware.caption",
+      iconPath: mdiMemory,
+      iconColor: "#301A8E",
+      component: "hassio",
+    },
+    {
+      path: "/config/system_health",
+      translationKey: "ui.panel.config.system_health.caption",
+      iconPath: mdiHeart,
+      iconColor: "#507FfE",
+      components: ["system_health", "hassio"],
+    },
+    {
+      path: "/config/general",
+      translationKey: "ui.panel.config.core.caption",
+      iconPath: mdiCog,
+      iconColor: "#653249",
+      core: true,
     },
   ],
   about: [
@@ -374,10 +374,6 @@ class HaPanelConfig extends HassRouterPage {
         tag: "ha-config-cloud",
         load: () => import("./cloud/ha-config-cloud"),
       },
-      core: {
-        tag: "ha-config-core",
-        load: () => import("./core/ha-config-core"),
-      },
       devices: {
         tag: "ha-config-devices",
         load: () => import("./devices/ha-config-devices"),
@@ -408,6 +404,10 @@ class HaPanelConfig extends HassRouterPage {
         tag: "ha-config-energy",
         load: () => import("./energy/ha-config-energy"),
       },
+      hardware: {
+        tag: "ha-config-hardware",
+        load: () => import("./hardware/ha-config-hardware"),
+      },
       integrations: {
         tag: "ha-config-integrations",
         load: () => import("./integrations/ha-config-integrations"),
@@ -418,7 +418,7 @@ class HaPanelConfig extends HassRouterPage {
       },
       network: {
         tag: "ha-config-section-network",
-        load: () => import("./core/ha-config-section-network"),
+        load: () => import("./network/ha-config-section-network"),
       },
       person: {
         tag: "ha-config-person",
@@ -436,13 +436,17 @@ class HaPanelConfig extends HassRouterPage {
         tag: "ha-config-helpers",
         load: () => import("./helpers/ha-config-helpers"),
       },
-      server_control: {
-        tag: "ha-config-server-control",
-        load: () => import("./server_control/ha-config-server-control"),
-      },
       storage: {
         tag: "ha-config-section-storage",
-        load: () => import("./core/ha-config-section-storage"),
+        load: () => import("./storage/ha-config-section-storage"),
+      },
+      system_health: {
+        tag: "ha-config-system-health",
+        load: () => import("./system-health/ha-config-system-health"),
+      },
+      updates: {
+        tag: "ha-config-section-updates",
+        load: () => import("./core/ha-config-section-updates"),
       },
       users: {
         tag: "ha-config-users",
@@ -452,6 +456,10 @@ class HaPanelConfig extends HassRouterPage {
         tag: "ha-config-zone",
         load: () => import("./zone/ha-config-zone"),
       },
+      general: {
+        tag: "ha-config-section-general",
+        load: () => import("./core/ha-config-section-general"),
+      },
       zha: {
         tag: "zha-config-dashboard-router",
         load: () =>
@@ -530,6 +538,10 @@ class HaPanelConfig extends HassRouterPage {
       "--app-header-border-bottom",
       "1px solid var(--divider-color)"
     );
+    this.style.setProperty(
+      "--ha-card-border-radius",
+      "var(--ha-config-card-border-radius, 8px)"
+    );
   }
 
   protected updatePageEl(el) {

src/panels/config/hardware/dialog-hardware-available.ts

@@ -0,0 +1,213 @@
+import { mdiClose } from "@mdi/js";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import memoizeOne from "memoize-one";
+import { fireEvent } from "../../../common/dom/fire_event";
+import { stringCompare } from "../../../common/string/compare";
+import "../../../components/ha-dialog";
+import "../../../components/ha-expansion-panel";
+import "../../../components/ha-icon-next";
+import "../../../components/search-input";
+import { extractApiErrorMessage } from "../../../data/hassio/common";
+import {
+  fetchHassioHardwareInfo,
+  HassioHardwareInfo,
+} from "../../../data/hassio/hardware";
+import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
+import type { HassDialog } from "../../../dialogs/make-dialog-manager";
+import { dump } from "../../../resources/js-yaml-dump";
+import { haStyle, haStyleDialog } from "../../../resources/styles";
+import type { HomeAssistant } from "../../../types";
+
+const _filterDevices = memoizeOne(
+  (showAdvanced: boolean, hardware: HassioHardwareInfo, filter: string) =>
+    hardware.devices
+      .filter(
+        (device) =>
+          (showAdvanced ||
+            ["tty", "gpio", "input"].includes(device.subsystem)) &&
+          (device.by_id?.toLowerCase().includes(filter) ||
+            device.name.toLowerCase().includes(filter) ||
+            device.dev_path.toLocaleLowerCase().includes(filter) ||
+            JSON.stringify(device.attributes)
+              .toLocaleLowerCase()
+              .includes(filter))
+      )
+      .sort((a, b) => stringCompare(a.name, b.name))
+);
+
+@customElement("ha-dialog-hardware-available")
+class DialogHardwareAvailable extends LitElement implements HassDialog {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @state() private _hardware?: HassioHardwareInfo;
+
+  @state() private _filter?: string;
+
+  public async showDialog(): Promise<Promise<void>> {
+    try {
+      this._hardware = await fetchHassioHardwareInfo(this.hass);
+    } catch (err: any) {
+      await showAlertDialog(this, {
+        title: this.hass.localize(
+          "ui.panel.config.hardware.available_hardware.failed_to_get"
+        ),
+        text: extractApiErrorMessage(err),
+      });
+    }
+  }
+
+  public closeDialog(): void {
+    this._hardware = undefined;
+    fireEvent(this, "dialog-closed", { dialog: this.localName });
+  }
+
+  protected render(): TemplateResult {
+    if (!this._hardware) {
+      return html``;
+    }
+
+    const devices = _filterDevices(
+      this.hass.userData?.showAdvanced || false,
+      this._hardware,
+      (this._filter || "").toLowerCase()
+    );
+
+    return html`
+      <ha-dialog
+        open
+        hideActions
+        @closed=${this.closeDialog}
+        .heading=${this.hass.localize(
+          "ui.panel.config.hardware.available_hardware.title"
+        )}
+      >
+        <div class="header" slot="heading">
+          <h2>
+            ${this.hass.localize(
+              "ui.panel.config.hardware.available_hardware.title"
+            )}
+          </h2>
+          <ha-icon-button
+            .label=${this.hass.localize("common.close")}
+            .path=${mdiClose}
+            dialogAction="close"
+          ></ha-icon-button>
+          <search-input
+            .hass=${this.hass}
+            .filter=${this._filter}
+            @value-changed=${this._handleSearchChange}
+            .label=${this.hass.localize("common.search")}
+          >
+          </search-input>
+        </div>
+        ${devices.map(
+          (device) =>
+            html`
+              <ha-expansion-panel
+                .header=${device.name}
+                .secondary=${device.by_id || undefined}
+                outlined
+              >
+                <div class="device-property">
+                  <span>
+                    ${this.hass.localize(
+                      "ui.panel.config.hardware.available_hardware.subsystem"
+                    )}:
+                  </span>
+                  <span>${device.subsystem}</span>
+                </div>
+                <div class="device-property">
+                  <span>
+                    ${this.hass.localize(
+                      "ui.panel.config.hardware.available_hardware.device_path"
+                    )}:
+                  </span>
+                  <code>${device.dev_path}</code>
+                </div>
+                ${device.by_id
+                  ? html`
+                      <div class="device-property">
+                        <span>
+                          ${this.hass.localize(
+                            "ui.panel.config.hardware.available_hardware.id"
+                          )}:
+                        </span>
+                        <code>${device.by_id}</code>
+                      </div>
+                    `
+                  : ""}
+                <div class="attributes">
+                  <span>
+                    ${this.hass.localize(
+                      "ui.panel.config.hardware.available_hardware.attributes"
+                    )}:
+                  </span>
+                  <pre>${dump(device.attributes, { indent: 2 })}</pre>
+                </div>
+              </ha-expansion-panel>
+            `
+        )}
+      </ha-dialog>
+    `;
+  }
+
+  private _handleSearchChange(ev: CustomEvent) {
+    this._filter = ev.detail.value;
+  }
+
+  static get styles(): CSSResultGroup {
+    return [
+      haStyle,
+      haStyleDialog,
+      css`
+        ha-icon-button {
+          position: absolute;
+          right: 16px;
+          top: 10px;
+          text-decoration: none;
+          color: var(--primary-text-color);
+        }
+        h2 {
+          margin: 18px 42px 0 18px;
+          color: var(--primary-text-color);
+        }
+        ha-expansion-panel {
+          margin: 4px 0;
+        }
+        pre,
+        code {
+          background-color: var(--markdown-code-background-color, none);
+          border-radius: 3px;
+        }
+        pre {
+          padding: 16px;
+          overflow: auto;
+          line-height: 1.45;
+          font-family: var(--code-font-family, monospace);
+        }
+        code {
+          font-size: 85%;
+          padding: 0.2em 0.4em;
+        }
+        search-input {
+          margin: 8px 16px 0;
+          display: block;
+        }
+        .device-property {
+          display: flex;
+          justify-content: space-between;
+        }
+        .attributes {
+          margin-top: 12px;
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-dialog-hardware-available": DialogHardwareAvailable;
+  }
+}

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

@@ -0,0 +1,256 @@
+import "@material/mwc-list/mwc-list-item";
+import { mdiDotsVertical } from "@mdi/js";
+import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
+import "../../../components/buttons/ha-progress-button";
+import "../../../components/ha-alert";
+import "../../../components/ha-button-menu";
+import "../../../components/ha-card";
+import "../../../components/ha-settings-row";
+import {
+  extractApiErrorMessage,
+  ignoreSupervisorError,
+} from "../../../data/hassio/common";
+import {
+  fetchHassioHassOsInfo,
+  fetchHassioHostInfo,
+  HassioHassOSInfo,
+  HassioHostInfo,
+  rebootHost,
+  shutdownHost,
+} from "../../../data/hassio/host";
+import {
+  showAlertDialog,
+  showConfirmationDialog,
+} from "../../../dialogs/generic/show-dialog-box";
+import "../../../layouts/hass-subpage";
+import { haStyle } from "../../../resources/styles";
+import type { HomeAssistant } from "../../../types";
+import { showhardwareAvailableDialog } from "./show-dialog-hardware-available";
+
+@customElement("ha-config-hardware")
+class HaConfigHardware extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ type: Boolean }) public narrow!: boolean;
+
+  @state() private _error?: { code: string; message: string };
+
+  @state() private _OSData?: HassioHassOSInfo;
+
+  @state() private _hostData?: HassioHostInfo;
+
+  protected firstUpdated(changedProps: PropertyValues) {
+    super.firstUpdated(changedProps);
+    if (isComponentLoaded(this.hass, "hassio")) {
+      this._load();
+    }
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      <hass-subpage
+        back-path="/config/system"
+        .hass=${this.hass}
+        .narrow=${this.narrow}
+        .header=${this.hass.localize("ui.panel.config.hardware.caption")}
+      >
+        ${this._error
+          ? html`
+              <ha-alert alert-type="error"
+                >${this._error.message || this._error.code}</ha-alert
+              >
+            `
+          : ""}
+        ${this._OSData && this._hostData
+          ? html`
+              <div class="content">
+                <ha-card outlined>
+                  <div class="card-content">
+                    <ha-settings-row>
+                      <span slot="heading"
+                        >${this.hass.localize(
+                          "ui.panel.config.hardware.board"
+                        )}</span
+                      >
+                      <div slot="description">
+                        <span class="value">${this._OSData.board}</span>
+                      </div>
+                    </ha-settings-row>
+                  </div>
+                  <div class="card-actions">
+                    <div class="buttons">
+                      ${this._hostData.features.includes("reboot")
+                        ? html`
+                            <ha-progress-button
+                              class="warning"
+                              @click=${this._hostReboot}
+                            >
+                              ${this.hass.localize(
+                                "ui.panel.config.hardware.reboot_host"
+                              )}
+                            </ha-progress-button>
+                          `
+                        : ""}
+                      ${this._hostData.features.includes("shutdown")
+                        ? html`
+                            <ha-progress-button
+                              class="warning"
+                              @click=${this._hostShutdown}
+                            >
+                              ${this.hass.localize(
+                                "ui.panel.config.hardware.shutdown_host"
+                              )}
+                            </ha-progress-button>
+                          `
+                        : ""}
+                    </div>
+                    <ha-button-menu corner="BOTTOM_START">
+                      <ha-icon-button
+                        .label=${this.hass.localize("common.menu")}
+                        .path=${mdiDotsVertical}
+                        slot="trigger"
+                      ></ha-icon-button>
+                      <mwc-list-item
+                        .action=${"hardware"}
+                        @click=${this._openHardware}
+                      >
+                        ${this.hass.localize(
+                          "ui.panel.config.hardware.available_hardware.title"
+                        )}
+                      </mwc-list-item>
+                    </ha-button-menu>
+                  </div>
+                </ha-card>
+              </div>
+            `
+          : ""}
+      </hass-subpage>
+    `;
+  }
+
+  private async _load() {
+    try {
+      this._OSData = await fetchHassioHassOsInfo(this.hass);
+      this._hostData = await fetchHassioHostInfo(this.hass);
+    } catch (err: any) {
+      this._error = err.message || err;
+    }
+  }
+
+  private async _openHardware() {
+    showhardwareAvailableDialog(this);
+  }
+
+  private async _hostReboot(ev: CustomEvent): Promise<void> {
+    const button = ev.currentTarget as any;
+    button.progress = true;
+
+    const confirmed = await showConfirmationDialog(this, {
+      title: this.hass.localize("ui.panel.config.hardware.reboot_host"),
+      text: this.hass.localize("ui.panel.config.hardware.reboot_host_confirm"),
+      confirmText: this.hass.localize("ui.panel.config.hardware.reboot_host"),
+      dismissText: this.hass.localize("common.cancel"),
+    });
+
+    if (!confirmed) {
+      button.progress = false;
+      return;
+    }
+
+    try {
+      await rebootHost(this.hass);
+    } catch (err: any) {
+      // Ignore connection errors, these are all expected
+      if (this.hass.connection.connected && !ignoreSupervisorError(err)) {
+        showAlertDialog(this, {
+          title: this.hass.localize(
+            "ui.panel.config.hardware.failed_to_reboot_host"
+          ),
+          text: extractApiErrorMessage(err),
+        });
+      }
+    }
+    button.progress = false;
+  }
+
+  private async _hostShutdown(ev: CustomEvent): Promise<void> {
+    const button = ev.currentTarget as any;
+    button.progress = true;
+
+    const confirmed = await showConfirmationDialog(this, {
+      title: this.hass.localize("ui.panel.config.hardware.shutdown_host"),
+      text: this.hass.localize(
+        "ui.panel.config.hardware.shutdown_host_confirm"
+      ),
+      confirmText: this.hass.localize("ui.panel.config.hardware.shutdown_host"),
+      dismissText: this.hass.localize("common.cancel"),
+    });
+
+    if (!confirmed) {
+      button.progress = false;
+      return;
+    }
+
+    try {
+      await shutdownHost(this.hass);
+    } catch (err: any) {
+      // Ignore connection errors, these are all expected
+      if (this.hass.connection.connected && !ignoreSupervisorError(err)) {
+        showAlertDialog(this, {
+          title: this.hass.localize(
+            "ui.panel.config.hardware.failed_to_shutdown_host"
+          ),
+          text: extractApiErrorMessage(err),
+        });
+      }
+    }
+    button.progress = false;
+  }
+
+  static styles = [
+    haStyle,
+    css`
+      .content {
+        padding: 28px 20px 0;
+        max-width: 1040px;
+        margin: 0 auto;
+      }
+      ha-card {
+        max-width: 600px;
+        margin: 0 auto;
+        height: 100%;
+        justify-content: space-between;
+        flex-direction: column;
+        display: flex;
+      }
+      .card-content {
+        display: flex;
+        justify-content: space-between;
+        flex-direction: column;
+        padding: 16px 16px 0 16px;
+      }
+      ha-button-menu {
+        color: var(--secondary-text-color);
+        --mdc-menu-min-width: 200px;
+      }
+      .card-actions {
+        height: 48px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+      .buttons {
+        display: flex;
+        align-items: center;
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-config-hardware": HaConfigHardware;
+  }
+}

src/panels/config/hardware/show-dialog-hardware-available.ts

@@ -0,0 +1,12 @@
+import { fireEvent } from "../../../common/dom/fire_event";
+
+export const loadHardwareAvailableDialog = () =>
+  import("./dialog-hardware-available");
+
+export const showhardwareAvailableDialog = (element: HTMLElement): void => {
+  fireEvent(element, "show-dialog", {
+    dialogTag: "ha-dialog-hardware-available",
+    dialogImport: loadHardwareAvailableDialog,
+    dialogParams: {},
+  });
+};

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

@@ -79,9 +79,11 @@ class HaInputSelectForm extends LitElement {
             "ui.dialogs.helper_settings.generic.icon"
           )}
         ></ha-icon-picker>
-        ${this.hass!.localize(
-          "ui.dialogs.helper_settings.input_select.options"
-        )}:
+        <div class="header">
+          ${this.hass!.localize(
+            "ui.dialogs.helper_settings.input_select.options"
+          )}:
+        </div>
         ${this._options.length
           ? this._options.map(
               (option, index) => html`
@@ -206,6 +208,10 @@ class HaInputSelectForm extends LitElement {
         #option_input {
           margin-top: 8px;
         }
+        .header {
+          margin-top: 8px;
+          margin-bottom: 8px;
+        }
       `,
     ];
   }

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

@@ -1,12 +1,19 @@
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { property } from "lit/decorators";
+import { property, state } from "lit/decorators";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import "../../../components/ha-logo-svg";
+import {
+  fetchHassioHostInfo,
+  fetchHassioHassOsInfo,
+  HassioHassOSInfo,
+  HassioHostInfo,
+} from "../../../data/hassio/host";
+import { HassioInfo, fetchHassioInfo } from "../../../data/hassio/supervisor";
 import "../../../layouts/hass-subpage";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant, Route } from "../../../types";
 import { documentationUrl } from "../../../util/documentation-url";
 import "./integrations-card";
-import "./system-health-card";
 
 const JS_TYPE = __BUILD__;
 const JS_VERSION = __VERSION__;
@@ -22,6 +29,12 @@ class HaConfigInfo extends LitElement {
 
   @property() public route!: Route;
 
+  @state() private _hostInfo?: HassioHostInfo;
+
+  @state() private _osInfo?: HassioHassOSInfo;
+
+  @state() private _hassioInfo?: HassioInfo;
+
   protected render(): TemplateResult {
     const hass = this.hass;
     const customUiList: Array<{ name: string; url: string; version: string }> =
@@ -48,7 +61,19 @@ class HaConfigInfo extends LitElement {
             </ha-logo-svg>
           </a>
           <br />
-          <h2>Home Assistant ${hass.connection.haVersion}</h2>
+          <h2>Home Assistant Core ${hass.connection.haVersion}</h2>
+          ${this._hassioInfo
+            ? html`<h2>
+                Home Assistant Supervisor ${this._hassioInfo.supervisor}
+              </h2>`
+            : ""}
+          ${this._osInfo?.version
+            ? html`<h2>Home Assistant OS ${this._osInfo.version}</h2>`
+            : ""}
+          ${this._hostInfo
+            ? html`<h4>Kernel version ${this._hostInfo.kernel}</h4>
+                <h4>Agent version ${this._hostInfo.agent_version}</h4>`
+            : ""}
           <p>
             ${this.hass.localize(
               "ui.panel.config.info.path_configuration",
@@ -111,33 +136,30 @@ class HaConfigInfo extends LitElement {
               "type",
               JS_TYPE
             )}
-            ${
-              customUiList.length > 0
-                ? html`
-                    <div>
-                      ${this.hass.localize("ui.panel.config.info.custom_uis")}
-                      ${customUiList.map(
-                        (item) => html`
-                          <div>
-                            <a href=${item.url} target="_blank"> ${item.name}</a
-                            >: ${item.version}
-                          </div>
-                        `
-                      )}
-                    </div>
-                  `
-                : ""
-            }
+            ${customUiList.length > 0
+              ? html`
+                  <div>
+                    ${this.hass.localize("ui.panel.config.info.custom_uis")}
+                    ${customUiList.map(
+                      (item) => html`
+                        <div>
+                          <a href=${item.url} target="_blank"> ${item.name}</a>:
+                          ${item.version}
+                        </div>
+                      `
+                    )}
+                  </div>
+                `
+              : ""}
           </p>
         </div>
         <div>
-          <system-health-card .hass=${this.hass}></system-health-card>
           <integrations-card
             .hass=${this.hass}
             .narrow=${this.narrow}
           ></integrations-card>
         </div>
-      </hass-tabs-subpage>
+      </hass-subpage>
     `;
   }
 
@@ -151,6 +173,22 @@ class HaConfigInfo extends LitElement {
         this.requestUpdate();
       }
     }, 1000);
+
+    if (isComponentLoaded(this.hass, "hassio")) {
+      this._loadSupervisorInfo();
+    }
+  }
+
+  private async _loadSupervisorInfo(): Promise<void> {
+    const [hostInfo, osInfo, hassioInfo] = await Promise.all([
+      fetchHassioHostInfo(this.hass),
+      fetchHassioHassOsInfo(this.hass),
+      fetchHassioInfo(this.hass),
+    ]);
+
+    this._hassioInfo = hassioInfo;
+    this._osInfo = osInfo;
+    this._hostInfo = hostInfo;
   }
 
   static get styles(): CSSResultGroup {
@@ -180,7 +218,6 @@ class HaConfigInfo extends LitElement {
           color: var(--primary-color);
         }
 
-        system-health-card,
         integrations-card {
           display: block;
           max-width: 600px;

src/panels/config/info/system-health-card.ts

@@ -1,298 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
-import "@material/mwc-list/mwc-list-item";
-import { mdiContentCopy } from "@mdi/js";
-import "@polymer/paper-tooltip/paper-tooltip";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { property, state } from "lit/decorators";
-import { isComponentLoaded } from "../../../common/config/is_component_loaded";
-import { formatDateTime } from "../../../common/datetime/format_date_time";
-import { copyToClipboard } from "../../../common/util/copy-clipboard";
-import "../../../components/ha-button-menu";
-import "../../../components/ha-card";
-import "../../../components/ha-circular-progress";
-import "../../../components/ha-icon-button";
-import { domainToName } from "../../../data/integration";
-import {
-  subscribeSystemHealthInfo,
-  SystemCheckValueObject,
-  SystemHealthInfo,
-} from "../../../data/system_health";
-import { HomeAssistant } from "../../../types";
-import { showToast } from "../../../util/toast";
-
-const sortKeys = (a: string, b: string) => {
-  if (a === "homeassistant") {
-    return -1;
-  }
-  if (b === "homeassistant") {
-    return 1;
-  }
-  if (a < b) {
-    return -1;
-  }
-  if (b < a) {
-    return 1;
-  }
-  return 0;
-};
-
-class SystemHealthCard extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @state() private _info?: SystemHealthInfo;
-
-  protected render(): TemplateResult {
-    if (!this.hass) {
-      return html``;
-    }
-    const sections: TemplateResult[] = [];
-
-    if (!this._info) {
-      sections.push(
-        html`
-          <div class="loading-container">
-            <ha-circular-progress active></ha-circular-progress>
-          </div>
-        `
-      );
-    } else {
-      const domains = Object.keys(this._info).sort(sortKeys);
-      for (const domain of domains) {
-        const domainInfo = this._info[domain];
-        const keys: TemplateResult[] = [];
-
-        for (const key of Object.keys(domainInfo.info)) {
-          let value: unknown;
-
-          if (
-            domainInfo.info[key] &&
-            typeof domainInfo.info[key] === "object"
-          ) {
-            const info = domainInfo.info[key] as SystemCheckValueObject;
-
-            if (info.type === "pending") {
-              value = html`
-                <ha-circular-progress active size="tiny"></ha-circular-progress>
-              `;
-            } else if (info.type === "failed") {
-              value = html`
-                <span class="error">${info.error}</span>${!info.more_info
-                  ? ""
-                  : html`
-                      –
-                      <a
-                        href=${info.more_info}
-                        target="_blank"
-                        rel="noreferrer noopener"
-                      >
-                        ${this.hass.localize(
-                          "ui.panel.config.info.system_health.more_info"
-                        )}
-                      </a>
-                    `}
-              `;
-            } else if (info.type === "date") {
-              value = formatDateTime(new Date(info.value), this.hass.locale);
-            }
-          } else {
-            value = domainInfo.info[key];
-          }
-
-          keys.push(html`
-            <tr>
-              <td>
-                ${this.hass.localize(
-                  `component.${domain}.system_health.info.${key}`
-                ) || key}
-              </td>
-              <td>${value}</td>
-            </tr>
-          `);
-        }
-        if (domain !== "homeassistant") {
-          sections.push(
-            html`
-              <div class="card-header">
-                <h3>${domainToName(this.hass.localize, domain)}</h3>
-                ${!domainInfo.manage_url
-                  ? ""
-                  : html`
-                      <a class="manage" href=${domainInfo.manage_url}>
-                        <mwc-button>
-                          ${this.hass.localize(
-                            "ui.panel.config.info.system_health.manage"
-                          )}
-                        </mwc-button>
-                      </a>
-                    `}
-              </div>
-            `
-          );
-        }
-        sections.push(html`
-          <table>
-            ${keys}
-          </table>
-        `);
-      }
-    }
-
-    return html`
-      <ha-card>
-        <h1 class="card-header">
-          <div class="card-header-text">
-            ${domainToName(this.hass.localize, "system_health")}
-          </div>
-          <ha-button-menu
-            corner="BOTTOM_START"
-            slot="toolbar-icon"
-            @action=${this._copyInfo}
-          >
-            <ha-icon-button
-              slot="trigger"
-              .label=${this.hass.localize("ui.panel.config.info.copy_menu")}
-              .path=${mdiContentCopy}
-            ></ha-icon-button>
-            <mwc-list-item>
-              ${this.hass.localize("ui.panel.config.info.copy_raw")}
-            </mwc-list-item>
-            <mwc-list-item>
-              ${this.hass.localize("ui.panel.config.info.copy_github")}
-            </mwc-list-item>
-          </ha-button-menu>
-        </h1>
-        <div class="card-content">${sections}</div>
-      </ha-card>
-    `;
-  }
-
-  protected firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-
-    this.hass!.loadBackendTranslation("system_health");
-
-    if (!isComponentLoaded(this.hass!, "system_health")) {
-      this._info = {
-        system_health: {
-          info: {
-            error: this.hass.localize(
-              "ui.panel.config.info.system_health_error"
-            ),
-          },
-        },
-      };
-      return;
-    }
-
-    subscribeSystemHealthInfo(this.hass!, (info) => {
-      this._info = info;
-    });
-  }
-
-  private async _copyInfo(ev: CustomEvent<ActionDetail>): Promise<void> {
-    const github = ev.detail.index === 1;
-    let haContent: string | undefined;
-    const domainParts: string[] = [];
-
-    for (const domain of Object.keys(this._info!).sort(sortKeys)) {
-      const domainInfo = this._info![domain];
-      let first = true;
-      const parts = [
-        `${
-          github && domain !== "homeassistant"
-            ? `<details><summary>${domainToName(
-                this.hass.localize,
-                domain
-              )}</summary>\n`
-            : ""
-        }`,
-      ];
-
-      for (const key of Object.keys(domainInfo.info)) {
-        let value: unknown;
-
-        if (typeof domainInfo.info[key] === "object") {
-          const info = domainInfo.info[key] as SystemCheckValueObject;
-
-          if (info.type === "pending") {
-            value = "pending";
-          } else if (info.type === "failed") {
-            value = `failed to load: ${info.error}`;
-          } else if (info.type === "date") {
-            value = formatDateTime(new Date(info.value), this.hass.locale);
-          }
-        } else {
-          value = domainInfo.info[key];
-        }
-        if (github && first) {
-          parts.push(`${key} | ${value}\n-- | --`);
-          first = false;
-        } else {
-          parts.push(`${key}${github ? " | " : ": "}${value}`);
-        }
-      }
-
-      if (domain === "homeassistant") {
-        haContent = parts.join("\n");
-      } else {
-        domainParts.push(parts.join("\n"));
-        if (github && domain !== "homeassistant") {
-          domainParts.push("</details>");
-        }
-      }
-    }
-
-    await copyToClipboard(
-      `${github ? "## " : ""}System Health\n${haContent}\n\n${domainParts.join(
-        "\n\n"
-      )}`
-    );
-
-    showToast(this, {
-      message: this.hass.localize("ui.common.copied_clipboard"),
-    });
-  }
-
-  static get styles(): CSSResultGroup {
-    return css`
-      table {
-        width: 100%;
-      }
-
-      td:first-child {
-        width: 45%;
-      }
-
-      td:last-child {
-        direction: ltr;
-      }
-
-      .loading-container {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-
-      .card-header {
-        justify-content: space-between;
-        display: flex;
-        align-items: center;
-      }
-
-      .error {
-        color: var(--error-color);
-      }
-
-      a {
-        color: var(--primary-color);
-      }
-
-      a.manage {
-        text-decoration: none;
-      }
-    `;
-  }
-}
-
-customElements.define("system-health-card", SystemHealthCard);

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

@@ -111,7 +111,7 @@ const groupByIntegration = (
 class HaConfigIntegrations extends SubscribeMixin(LitElement) {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property() public narrow!: boolean;
+  @property({ type: Boolean, reflect: true }) public narrow!: boolean;
 
   @property() public isWide!: boolean;
 
@@ -709,6 +709,9 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
     return [
       haStyle,
       css`
+        :host([narrow]) hass-tabs-subpage {
+          --main-title-margin: 0;
+        }
         ha-button-menu {
           margin-left: 8px;
         }

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

@@ -143,6 +143,10 @@ export class HaIntegrationHeader extends LitElement {
       width: 40px;
       height: 40px;
     }
+    :host-context([style*="direction: rtl;"]) .header img {
+      margin-right: auto !important;
+      margin-left: 16px;
+    }
     .header .info {
       flex: 1;
       align-self: center;

src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts

@@ -214,7 +214,9 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
         <br />
         <span>${item.property}</span>
       </span>
-      <span slot="heading">${item.metadata.label}</span>
+      <span slot="heading" .title=${item.metadata.label}>
+        ${item.metadata.label}
+      </span>
       <span slot="description">
         ${item.metadata.description}
         ${item.metadata.description !== null && !item.metadata.writeable

src/panels/config/logs/dialog-system-log-detail.ts

@@ -228,6 +228,7 @@ class DialogSystemLogDetail extends LitElement {
         .contents {
           padding: 16px;
           outline: none;
+          direction: ltr;
         }
         .error {
           color: var(--error-color);

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

@@ -1,98 +1,142 @@
 import "@material/mwc-button";
+import "@material/mwc-list/mwc-list-item";
 import { mdiRefresh } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { property, state } from "lit/decorators";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  PropertyValues,
+  TemplateResult,
+} from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
+import "../../../components/ha-alert";
+import "../../../components/ha-ansi-to-html";
+import "../../../components/ha-card";
 import "../../../components/ha-icon-button";
+import "../../../components/ha-select";
+import { computeRTLDirection } from "../../../common/util/compute_rtl";
 import { fetchErrorLog } from "../../../data/error_log";
+import { extractApiErrorMessage } from "../../../data/hassio/common";
+import { fetchHassioLogs } from "../../../data/hassio/supervisor";
 import { HomeAssistant } from "../../../types";
 
+@customElement("error-log-card")
 class ErrorLogCard extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property() public filter = "";
 
+  @property() public provider!: string;
+
+  @property({ type: Boolean, attribute: true }) public show = false;
+
   @state() private _isLogLoaded = false;
 
-  @state() private _errorHTML!: TemplateResult[] | string;
+  @state() private _logHTML?: TemplateResult[] | TemplateResult | string;
+
+  @state() private _error?: string;
 
   protected render(): TemplateResult {
     return html`
       <div class="error-log-intro">
-        ${this._errorHTML
+        ${this._error
+          ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+          : ""}
+        ${this._logHTML
           ? html`
-              <ha-card>
-                <ha-icon-button
-                  .path=${mdiRefresh}
-                  @click=${this._refreshErrorLog}
-                  .label=${this.hass.localize("ui.common.refresh")}
-                ></ha-icon-button>
-                <div class="card-content error-log">${this._errorHTML}</div>
+              <ha-card outlined>
+                <div class="header">
+                  <h2>
+                    ${this.hass.localize("ui.panel.config.logs.full_logs")}
+                  </h2>
+                  <ha-icon-button
+                    .path=${mdiRefresh}
+                    @click=${this._refresh}
+                    .label=${this.hass.localize("ui.common.refresh")}
+                  ></ha-icon-button>
+                </div>
+                <div class="card-content error-log">${this._logHTML}</div>
               </ha-card>
             `
-          : html`
-              <mwc-button raised @click=${this._refreshErrorLog}>
-                ${this.hass.localize("ui.panel.config.logs.load_full_log")}
+          : ""}
+        ${!this._logHTML
+          ? html`
+              <mwc-button
+                raised
+                @click=${this._refreshLogs}
+                dir=${computeRTLDirection(this.hass)}
+              >
+                ${this.hass.localize("ui.panel.config.logs.load_logs")}
               </mwc-button>
-            `}
+            `
+          : ""}
       </div>
     `;
   }
 
-  protected firstUpdated(changedProps) {
+  protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
 
-    if (this.hass?.config.safe_mode) {
+    if (this.hass?.config.safe_mode || this.show) {
       this.hass.loadFragmentTranslation("config");
-      this._refreshErrorLog();
+      this._refreshLogs();
     }
   }
 
   protected updated(changedProps) {
     super.updated(changedProps);
 
-    if (changedProps.has("filter") && this._isLogLoaded) {
-      this._refreshErrorLog();
+    if (changedProps.has("provider")) {
+      this._logHTML = undefined;
+    }
+
+    if (
+      (changedProps.has("filter") && this._isLogLoaded) ||
+      (changedProps.has("show") && this.show) ||
+      (changedProps.has("provider") && this.show)
+    ) {
+      this._refreshLogs();
     }
   }
 
-  static get styles(): CSSResultGroup {
-    return css`
-      .error-log-intro {
-        text-align: center;
-        margin: 16px;
-      }
+  private async _refresh(ev: CustomEvent): Promise<void> {
+    const button = ev.currentTarget as any;
+    button.progress = true;
 
-      ha-icon-button {
-        float: right;
-      }
-
-      .error-log {
-        font-family: var(--code-font-family, monospace);
-        clear: both;
-        text-align: left;
-        padding-top: 12px;
-      }
-
-      .error-log > div:hover {
-        background-color: var(--secondary-background-color);
-      }
-
-      .error {
-        color: var(--error-color);
-      }
-
-      .warning {
-        color: var(--warning-color);
-      }
-    `;
+    await this._refreshLogs();
+    button.progress = false;
   }
 
-  private async _refreshErrorLog(): Promise<void> {
-    this._errorHTML = this.hass.localize("ui.panel.config.logs.loading_log");
-    const log = await fetchErrorLog(this.hass!);
+  private async _refreshLogs(): Promise<void> {
+    this._logHTML = this.hass.localize("ui.panel.config.logs.loading_log");
+    let log: string;
+
+    if (isComponentLoaded(this.hass, "hassio")) {
+      try {
+        log = await fetchHassioLogs(this.hass, this.provider);
+        this._logHTML = html`<ha-ansi-to-html .content=${log}>
+        </ha-ansi-to-html>`;
+        this._isLogLoaded = true;
+        return;
+      } catch (err: any) {
+        this._error = this.hass.localize(
+          "ui.panel.config.logs.failed_get_logs",
+          "provider",
+          this.provider,
+          "error",
+          extractApiErrorMessage(err)
+        );
+        return;
+      }
+    } else {
+      log = await fetchErrorLog(this.hass!);
+    }
+
     this._isLogLoaded = true;
 
-    this._errorHTML = log
+    this._logHTML = log
       ? log
           .split("\n")
           .filter((entry) => {
@@ -119,6 +163,61 @@ class ErrorLogCard extends LitElement {
           })
       : this.hass.localize("ui.panel.config.logs.no_errors");
   }
+
+  static styles: CSSResultGroup = css`
+    .error-log-intro {
+      text-align: center;
+      margin: 16px;
+    }
+
+    .header {
+      display: flex;
+      justify-content: space-between;
+      padding: 16px;
+    }
+
+    ha-select {
+      display: block;
+      max-width: 500px;
+      width: 100%;
+    }
+
+    ha-icon-button {
+      float: right;
+    }
+
+    .error-log {
+      font-family: var(--code-font-family, monospace);
+      clear: both;
+      text-align: left;
+      padding-top: 12px;
+    }
+
+    .error-log > div {
+      overflow: auto;
+      overflow-wrap: break-word;
+    }
+
+    .error-log > div:hover {
+      background-color: var(--secondary-background-color);
+    }
+
+    .error {
+      color: var(--error-color);
+    }
+
+    .warning {
+      color: var(--warning-color);
+    }
+
+    :host-context([style*="direction: rtl;"]) mwc-button {
+      direction: rtl;
+    }
+  `;
 }
 
-customElements.define("error-log-card", ErrorLogCard);
+declare global {
+  interface HTMLElementTagNameMap {
+    "error-log-card": ErrorLogCard;
+  }
+}

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

@@ -1,7 +1,11 @@
+import { mdiChevronDown } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { extractSearchParam } from "../../../common/url/search-params";
+import "../../../components/ha-button-menu";
 import "../../../components/search-input";
+import { LogProvider } from "../../../data/error_log";
 import "../../../layouts/hass-subpage";
 import "../../../layouts/hass-tabs-subpage";
 import { haStyle } from "../../../resources/styles";
@@ -10,22 +14,51 @@ import "./error-log-card";
 import "./system-log-card";
 import type { SystemLogCard } from "./system-log-card";
 
+const logProviders: LogProvider[] = [
+  {
+    key: "core",
+    name: "Home Assistant Core",
+  },
+  {
+    key: "supervisor",
+    name: "Supervisor",
+  },
+  {
+    key: "host",
+    name: "Host",
+  },
+  {
+    key: "dns",
+    name: "DNS",
+  },
+  {
+    key: "audio",
+    name: "Audio",
+  },
+  {
+    key: "multicast",
+    name: "Multicast",
+  },
+];
+
 @customElement("ha-config-logs")
 export class HaConfigLogs extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property() public narrow!: boolean;
+  @property({ type: Boolean }) public narrow!: boolean;
 
-  @property() public isWide!: boolean;
+  @property({ type: Boolean }) public isWide!: boolean;
 
-  @property() public showAdvanced!: boolean;
+  @property({ type: Boolean }) public showAdvanced!: boolean;
 
-  @property() public route!: Route;
+  @property({ attribute: false }) public route!: Route;
 
   @state() private _filter = extractSearchParam("filter") || "";
 
   @query("system-log-card", true) private systemLog?: SystemLogCard;
 
+  @state() private _selectedLogProvider = "core";
+
   public connectedCallback() {
     super.connectedCallback();
     if (this.systemLog && this.systemLog.loaded) {
@@ -68,21 +101,60 @@ export class HaConfigLogs extends LitElement {
         .header=${this.hass.localize("ui.panel.config.logs.caption")}
         back-path="/config/system"
       >
+        ${isComponentLoaded(this.hass, "hassio") &&
+        this.hass.userData?.showAdvanced
+          ? html`
+              <ha-button-menu corner="BOTTOM_START" slot="toolbar-icon">
+                <mwc-button
+                  slot="trigger"
+                  .label=${logProviders.find(
+                    (p) => p.key === this._selectedLogProvider
+                  )!.name}
+                >
+                  <ha-svg-icon
+                    slot="trailingIcon"
+                    .path=${mdiChevronDown}
+                  ></ha-svg-icon>
+                </mwc-button>
+                ${logProviders.map(
+                  (provider) => html`
+                    <mwc-list-item
+                      ?selected=${provider.key === this._selectedLogProvider}
+                      .provider=${provider.key}
+                      @click=${this._selectProvider}
+                    >
+                      ${provider.name}
+                    </mwc-list-item>
+                  `
+                )}
+              </ha-button-menu>
+            `
+          : ""}
         ${search}
         <div class="content">
-          <system-log-card
-            .hass=${this.hass}
-            .filter=${this._filter}
-          ></system-log-card>
+          ${this._selectedLogProvider === "core"
+            ? html`
+                <system-log-card
+                  .hass=${this.hass}
+                  .filter=${this._filter}
+                ></system-log-card>
+              `
+            : ""}
           <error-log-card
             .hass=${this.hass}
             .filter=${this._filter}
+            .provider=${this._selectedLogProvider}
+            .show=${this._selectedLogProvider !== "core"}
           ></error-log-card>
         </div>
       </hass-subpage>
     `;
   }
 
+  private _selectProvider(ev) {
+    this._selectedLogProvider = (ev.currentTarget as any).provider;
+  }
+
   static get styles(): CSSResultGroup {
     return [
       haStyle,
@@ -108,6 +180,11 @@ export class HaConfigLogs extends LitElement {
         .content {
           direction: ltr;
         }
+
+        mwc-button[slot="trigger"] {
+          --mdc-theme-primary: var(--primary-text-color);
+          --mdc-icon-size: 36px;
+        }
       `,
     ];
   }