Add Redirect for Server Controls

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,4 +1,4 @@
-name: Report a bug with the UI / Dashboards
+name: Report a bug with the UI, Frontend or Lovelace
 description: Report an issue related to the Home Assistant frontend.
 labels: bug
 body:
@@ -9,7 +9,7 @@ body:
 
         If you have a feature or enhancement request for the frontend, please [start an discussion][fr] instead of creating an issue.
 
-        **Please not not report issues for custom cards.**
+        **Please not not report issues for custom Lovelace cards.**
 
         [fr]: https://github.com/home-assistant/frontend/discussions
         [releases]: https://github.com/home-assistant/home-assistant/releases

.github/ISSUE_TEMPLATE/config.yml

@@ -1,17 +1,17 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Request a feature for the UI / Dashboards
+  - name: Request a feature for the UI, Frontend or Lovelace
     url: https://github.com/home-assistant/frontend/discussions/category_choices
     about: Request an new feature for the Home Assistant frontend.
-  - name: Report a bug that is NOT related to the UI / Dashboards
+  - name: Report a bug that is NOT related to the UI, Frontend or Lovelace
     url: https://github.com/home-assistant/core/issues
-    about: This is the issue tracker for our frontend. Please report other issues in the backend ("core") repository.
+    about: This is the issue tracker for our frontend. Please report other issues with the backend repository.
   - name: Report incorrect or missing information on our website
     url: https://github.com/home-assistant/home-assistant.io/issues
     about: Our documentation has its own issue tracker. Please report issues with the website there.
   - name: I have a question or need support
     url: https://www.home-assistant.io/help
-    about: We use GitHub for tracking bugs. Check our website for resources on getting help.
+    about: We use GitHub for tracking bugs, check our website for resources on getting help.
   - name: I'm unsure where to go
     url: https://www.home-assistant.io/join-chat
     about: If you are unsure where to go, then joining our chat is recommended; Just ask!

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

@@ -62,45 +62,6 @@ const ACTIONS = [
       entity_id: "input_boolean.toggle_4",
     },
   },
-  {
-    parallel: [
-      { scene: "scene.kitchen_morning" },
-      {
-        service: "media_player.play_media",
-        target: { entity_id: "media_player.living_room" },
-        data: { media_content_id: "", media_content_type: "" },
-        metadata: { title: "Happy Song" },
-      },
-    ],
-  },
-  {
-    stop: "No one is home!",
-  },
-  { repeat: { count: 3, sequence: [{ delay: "00:00:01" }] } },
-  {
-    repeat: {
-      for_each: ["bread", "butter", "cheese"],
-      sequence: [{ delay: "00:00:01" }],
-    },
-  },
-  {
-    if: [{ condition: "state" }],
-    then: [{ delay: "00:00:01" }],
-    else: [{ delay: "00:00:05" }],
-  },
-  {
-    choose: [
-      {
-        conditions: [{ condition: "state" }],
-        sequence: [{ delay: "00:00:01" }],
-      },
-      {
-        conditions: [{ condition: "sun" }],
-        sequence: [{ delay: "00:00:05" }],
-      },
-    ],
-    default: [{ delay: "00:00:03" }],
-  },
 ];
 
 @customElement("demo-automation-describe-action")

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

@@ -20,10 +20,6 @@ import { HaWaitForTriggerAction } from "../../../../src/panels/config/automation
 import { HaWaitAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-wait_template";
 import { Action } from "../../../../src/data/script";
 import { HaConditionAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-condition";
-import { HaParallelAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-parallel";
-import { HaIfAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-if";
-import { HaStopAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-stop";
-import { HaPlayMediaAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-play_media";
 
 const SCHEMAS: { name: string; actions: Action[] }[] = [
   { name: "Event", actions: [HaEventAction.defaultConfig] },
@@ -32,15 +28,11 @@ const SCHEMAS: { name: string; actions: Action[] }[] = [
   { name: "Condition", actions: [HaConditionAction.defaultConfig] },
   { name: "Delay", actions: [HaDelayAction.defaultConfig] },
   { name: "Scene", actions: [HaSceneAction.defaultConfig] },
-  { name: "Play media", actions: [HaPlayMediaAction.defaultConfig] },
   { name: "Wait", actions: [HaWaitAction.defaultConfig] },
   { name: "WaitForTrigger", actions: [HaWaitForTriggerAction.defaultConfig] },
   { name: "Repeat", actions: [HaRepeatAction.defaultConfig] },
-  { name: "If-Then", actions: [HaIfAction.defaultConfig] },
   { name: "Choose", actions: [HaChooseAction.defaultConfig] },
   { name: "Variables", actions: [{ variables: { hello: "1" } }] },
-  { name: "Parallel", actions: [HaParallelAction.defaultConfig] },
-  { name: "Stop", actions: [HaStopAction.defaultConfig] },
 ];
 
 @customElement("demo-automation-editor-action")
@@ -94,6 +86,6 @@ class DemoHaAutomationEditorAction extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "demo-automation-editor-action": DemoHaAutomationEditorAction;
+    "demo-ha-automation-editor-action": DemoHaAutomationEditorAction;
   }
 }

hassio/src/addon-store/hassio-addon-repository.ts

@@ -68,7 +68,6 @@ class HassioAddonRepositoryEl extends LitElement {
           ${addons.map(
             (addon) => html`
               <ha-card
-                outlined
                 .addon=${addon}
                 class=${addon.available ? "" : "not_available"}
                 @click=${this._addonTapped}

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

@@ -50,7 +50,6 @@ class HassioAddonAudio extends LitElement {
   protected render(): TemplateResult {
     return html`
       <ha-card
-        outlined
         .header=${this.supervisor.localize("addon.configuration.audio.header")}
       >
         <div class="card-content">

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

@@ -162,7 +162,7 @@ class HassioAddonConfig extends LitElement {
         );
     return html`
       <h1>${this.addon.name}</h1>
-      <ha-card outlined>
+      <ha-card>
         <div class="header">
           <h2>
             ${this.supervisor.localize("addon.configuration.options.header")}

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

@@ -58,7 +58,6 @@ class HassioAddonNetwork extends LitElement {
 
     return html`
       <ha-card
-        outlined
         .header=${this.supervisor.localize(
           "addon.configuration.network.header"
         )}

hassio/src/addon-view/documentation/hassio-addon-documentation-tab.ts

@@ -38,7 +38,7 @@ class HassioAddonDocumentationDashboard extends LitElement {
     }
     return html`
       <div class="content">
-        <ha-card outlined>
+        <ha-card>
           ${this._error
             ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
             : ""}

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

@@ -17,9 +17,7 @@ import {
   HassioAddonDetails,
 } from "../../../src/data/hassio/addon";
 import { extractApiErrorMessage } from "../../../src/data/hassio/common";
-import { setSupervisorOption } from "../../../src/data/hassio/supervisor";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
-import { showConfirmationDialog } from "../../../src/dialogs/generic/show-dialog-box";
 import "../../../src/layouts/hass-error-screen";
 import "../../../src/layouts/hass-loading-screen";
 import "../../../src/layouts/hass-tabs-subpage";
@@ -168,42 +166,6 @@ class HassioAddonDashboard extends LitElement {
   protected async firstUpdated(): Promise<void> {
     if (this.route.path === "") {
       const requestedAddon = extractSearchParam("addon");
-      const requestedAddonRepository = extractSearchParam("repository_url");
-      if (
-        requestedAddonRepository &&
-        !this.supervisor.supervisor.addons_repositories.find(
-          (repo) => repo === requestedAddonRepository
-        )
-      ) {
-        if (
-          !(await showConfirmationDialog(this, {
-            title: this.supervisor.localize("my.add_addon_repository_title"),
-            text: this.supervisor.localize(
-              "my.add_addon_repository_description",
-              { addon: requestedAddon, repository: requestedAddonRepository }
-            ),
-            confirmText: this.supervisor.localize("common.add"),
-            dismissText: this.supervisor.localize("common.cancel"),
-          }))
-        ) {
-          this._error = this.supervisor.localize(
-            "my.error_repository_not_found"
-          );
-          return;
-        }
-
-        try {
-          await setSupervisorOption(this.hass, {
-            addons_repositories: [
-              ...this.supervisor.supervisor.addons_repositories,
-              requestedAddonRepository,
-            ],
-          });
-        } catch (err: any) {
-          this._error = extractApiErrorMessage(err);
-        }
-      }
-
       if (requestedAddon) {
         const addonsInfo = await fetchHassioAddonsInfo(this.hass);
         const validAddon = addonsInfo.addons.some(

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

@@ -166,7 +166,7 @@ class HassioAddonInfo extends LitElement {
           `
         : ""}
 
-      <ha-card outlined>
+      <ha-card>
         <div class="card-content">
           <div class="addon-header">
             ${!this.narrow ? this.addon.name : ""}
@@ -649,7 +649,7 @@ class HassioAddonInfo extends LitElement {
 
       ${this.addon.long_description
         ? html`
-            <ha-card outlined>
+            <ha-card>
               <div class="card-content">
                 <ha-markdown
                   .content=${this.addon.long_description}

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

@@ -34,7 +34,7 @@ class HassioAddonLogs extends LitElement {
   protected render(): TemplateResult {
     return html`
       <h1>${this.addon.name}</h1>
-      <ha-card outlined>
+      <ha-card>
         ${this._error
           ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
           : ""}

hassio/src/dashboard/hassio-addons.ts

@@ -26,7 +26,7 @@ class HassioAddons extends LitElement {
         <div class="card-group">
           ${!this.supervisor.supervisor.addons?.length
             ? html`
-                <ha-card outlined>
+                <ha-card>
                   <div class="card-content">
                     <button class="link" @click=${this._openStore}>
                       ${this.supervisor.localize("dashboard.no_addons")}
@@ -38,11 +38,7 @@ class HassioAddons extends LitElement {
                 .sort((a, b) => caseInsensitiveStringCompare(a.name, b.name))
                 .map(
                   (addon) => html`
-                    <ha-card
-                      outlined
-                      .addon=${addon}
-                      @click=${this._addonTapped}
-                    >
+                    <ha-card .addon=${addon} @click=${this._addonTapped}>
                       <div class="card-content">
                         <hassio-card-content
                           .hass=${this.hass}

hassio/src/dashboard/hassio-update.ts

@@ -85,7 +85,7 @@ export class HassioUpdate extends LitElement {
       return html``;
     }
     return html`
-      <ha-card outlined>
+      <ha-card>
         <div class="card-content">
           <div class="icon">
             <ha-svg-icon .path=${mdiHomeAssistant}></ha-svg-icon>

hassio/src/hassio-main.ts

@@ -74,11 +74,7 @@ export class HassioMain extends SupervisorBaseElement {
     });
 
     // Forward keydown events to the main window for quickbar access
-    document.body.addEventListener("keydown", (ev: KeyboardEvent) => {
-      if (ev.altKey || ev.ctrlKey || ev.shiftKey || ev.metaKey) {
-        // Ignore if modifier keys are pressed
-        return;
-      }
+    document.body.addEventListener("keydown", (ev) => {
       // @ts-ignore
       fireEvent(mainWindow, "hass-quick-bar-trigger", ev, {
         bubbles: false,

hassio/src/hassio-my-redirect.ts

@@ -42,9 +42,6 @@ export const REDIRECTS: Redirects = {
     params: {
       addon: "string",
     },
-    optional_params: {
-      repository_url: "url",
-    },
   },
   supervisor_ingress: {
     redirect: "/hassio/ingress",
@@ -127,14 +124,6 @@ class HassioMyRedirect extends LitElement {
       }
       resultParams[key] = params[key];
     });
-    Object.entries(redirect.optional_params || {}).forEach(([key, type]) => {
-      if (params[key]) {
-        if (!this._checkParamType(type, params[key])) {
-          throw Error();
-        }
-        resultParams[key] = params[key];
-      }
-    });
     return `?${createSearchParam(resultParams)}`;
   }
 

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

@@ -48,7 +48,7 @@ class HassioCoreInfo extends LitElement {
     ];
 
     return html`
-      <ha-card header="Core" outlined>
+      <ha-card header="Core">
         <div class="card-content">
           <div>
             <ha-settings-row>

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

@@ -66,7 +66,7 @@ class HassioHostInfo extends LitElement {
       },
     ];
     return html`
-      <ha-card header="Host" outlined>
+      <ha-card header="Host">
         <div class="card-content">
           <div>
             ${this.supervisor.host.features.includes("hostname")

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

@@ -57,7 +57,7 @@ class HassioSupervisorInfo extends LitElement {
       },
     ];
     return html`
-      <ha-card header="Supervisor" outlined>
+      <ha-card header="Supervisor">
         <div class="card-content">
           <div>
             <ha-settings-row>

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

@@ -65,7 +65,7 @@ class HassioSupervisorLog extends LitElement {
 
   protected render(): TemplateResult | void {
     return html`
-      <ha-card outlined>
+      <ha-card>
         ${this._error
           ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
           : ""}

hassio/src/update-available/update-available-card.ts

@@ -128,7 +128,6 @@ class UpdateAvailableCard extends LitElement {
 
     return html`
       <ha-card
-        outlined
         .header=${this.supervisor.localize("update_available.update_name", {
           name: this._name,
         })}

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      = 20220504.0
+version      = 20220427.0
 author       = The Home Assistant Authors
 author_email = hello@home-assistant.io
 license      = Apache-2.0

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/components/data-table/ha-data-table.ts

@@ -269,8 +269,8 @@ export class HaDataTable extends LitElement {
                       @change=${this._handleHeaderRowCheckboxClick}
                       .indeterminate=${this._checkedRows.length &&
                       this._checkedRows.length !== this._checkableRowsCount}
-                      .checked=${this._checkedRows.length &&
-                      this._checkedRows.length === this._checkableRowsCount}
+                      .checked=${this._checkedRows.length ===
+                      this._checkableRowsCount}
                     >
                     </ha-checkbox>
                   </div>

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

@@ -5,7 +5,6 @@ import { fireEvent } from "../../common/dom/fire_event";
 import {
   DeviceAutomation,
   deviceAutomationsEqual,
-  sortDeviceAutomations,
 } from "../../data/device_automation";
 import { HomeAssistant } from "../../types";
 import "../ha-select";
@@ -128,9 +127,7 @@ export abstract class HaDeviceAutomationPicker<
 
   private async _updateDeviceInfo() {
     this._automations = this.deviceId
-      ? (await this._fetchDeviceAutomations(this.hass, this.deviceId)).sort(
-          sortDeviceAutomations
-        )
+      ? await this._fetchDeviceAutomations(this.hass, this.deviceId)
       : // No device, clear the list of automations
         [];
 
@@ -164,9 +161,8 @@ export abstract class HaDeviceAutomationPicker<
     if (this.value && deviceAutomationsEqual(automation, this.value)) {
       return;
     }
-    const value = { ...automation };
-    delete value.metadata;
-    fireEvent(this, "value-changed", { value });
+    fireEvent(this, "change");
+    fireEvent(this, "value-changed", { value: automation });
   }
 
   static get styles(): CSSResultGroup {

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-clickable-list-item.ts

@@ -12,8 +12,6 @@ export class HaClickableListItem extends ListItemBase {
   // property used only in css
   @property({ type: Boolean, reflect: true }) public rtl = false;
 
-  @property({ type: Boolean, reflect: true }) public openNewTab = false;
-
   @query("a") private _anchor!: HTMLAnchorElement;
 
   public render() {
@@ -22,12 +20,7 @@ export class HaClickableListItem extends ListItemBase {
 
     return html`${this.disableHref
       ? html`<a aria-role="option">${r}</a>`
-      : html`<a
-          aria-role="option"
-          target=${this.openNewTab ? "_blank" : ""}
-          href=${href}
-          >${r}</a
-        >`}`;
+      : html`<a aria-role="option" href=${href}>${r}</a>`}`;
   }
 
   firstUpdated() {
@@ -47,6 +40,10 @@ export class HaClickableListItem extends ListItemBase {
           padding-left: 0px;
           padding-right: 0px;
         }
+        :host([rtl]) span {
+          margin-left: var(--mdc-list-item-graphic-margin, 20px) !important;
+          margin-right: 0px !important;
+        }
         :host([graphic="avatar"]:not([twoLine])),
         :host([graphic="icon"]:not([twoLine])) {
           height: 48px;
@@ -58,17 +55,6 @@ export class HaClickableListItem extends ListItemBase {
           align-items: center;
           padding-left: var(--mdc-list-side-padding, 20px);
           padding-right: var(--mdc-list-side-padding, 20px);
-          overflow: hidden;
-        }
-        :host-context([style*="direction: rtl;"])
-          span.material-icons:first-of-type {
-          margin-left: var(--mdc-list-item-graphic-margin, 16px) !important;
-          margin-right: 0px !important;
-        }
-        :host-context([style*="direction: rtl;"])
-          span.material-icons:last-of-type {
-          margin-left: 0px !important;
-          margin-right: auto !important;
         }
       `,
     ];

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

@@ -132,11 +132,6 @@ export class HaFormString extends LitElement implements HaFormElement {
         --mdc-icon-button-size: 24px;
         color: var(--secondary-text-color);
       }
-
-      :host-context([style*="direction: rtl;"]) ha-icon-button {
-        right: auto;
-        left: 12px;
-      }
     `;
   }
 }

src/components/ha-navigation-list.ts

@@ -59,6 +59,13 @@ class HaNavigationList extends LitElement {
     :host {
       --mdc-list-vertical-padding: 0;
     }
+    a {
+      text-decoration: none;
+      color: var(--primary-text-color);
+      position: relative;
+      display: block;
+      outline: 0;
+    }
     ha-svg-icon,
     ha-icon-next {
       color: var(--secondary-text-color);

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

@@ -27,8 +27,8 @@ export class HaColorTempSelector extends LitElement {
         pin
         icon="hass:thermometer"
         .caption=${this.label || ""}
-        .min=${this.selector.color_temp?.min_mireds ?? 153}
-        .max=${this.selector.color_temp?.max_mireds ?? 500}
+        .min=${this.selector.color_temp.min_mireds ?? 153}
+        .max=${this.selector.color_temp.max_mireds ?? 500}
         .value=${this.value}
         .disabled=${this.disabled}
         .helper=${this.helper}

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

@@ -302,10 +302,6 @@ class DialogMediaManage extends LitElement {
           --mdc-theme-primary: var(--mdc-theme-on-primary);
         }
 
-        mwc-list {
-          direction: ltr;
-        }
-
         .danger {
           --mdc-theme-primary: var(--error-color);
         }
@@ -314,11 +310,6 @@ class DialogMediaManage extends LitElement {
           vertical-align: middle;
         }
 
-        :host-context([style*="direction: rtl;"]) ha-svg-icon[slot="icon"] {
-          margin-left: 8px !important;
-          margin-right: 0px !important;
-        }
-
         .refresh {
           display: flex;
           height: 200px;

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

@@ -152,7 +152,6 @@ class DialogMediaPlayerBrowse extends LitElement {
         ha-media-player-browse {
           --media-browser-max-height: calc(100vh - 65px);
           height: calc(100vh - 65px);
-          direction: ltr;
         }
 
         @media (min-width: 800px) {

src/components/media-player/ha-media-manage-button.ts

@@ -59,11 +59,6 @@ class MediaManageButton extends LitElement {
     ha-circular-progress[slot="icon"] {
       vertical-align: middle;
     }
-
-    :host-context([style*="direction: rtl;"]) ha-svg-icon[slot="icon"] {
-      margin-left: 8px;
-      margin-right: 0px;
-    }
   `;
 }
 

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

@@ -1,11 +1,10 @@
-import "@lit-labs/virtualizer";
-import type { LitVirtualizer } from "@lit-labs/virtualizer";
-import { grid } from "@lit-labs/virtualizer/layouts/grid";
 import "@material/mwc-button/mwc-button";
 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,
@@ -22,12 +21,10 @@ import {
   state,
 } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-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,
@@ -42,7 +39,6 @@ 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";
@@ -53,6 +49,8 @@ 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 {
@@ -102,10 +100,6 @@ export class HaMediaPlayerBrowse extends LitElement {
 
   @query(".content") private _content?: HTMLDivElement;
 
-  @query("lit-virtualizer") private _virtualizer?: LitVirtualizer;
-
-  private _observed = false;
-
   private _headerOffsetHeight = 0;
 
   private _resizeObserver?: ResizeObserver;
@@ -286,19 +280,6 @@ export class HaMediaPlayerBrowse extends LitElement {
       this._animateHeaderHeight();
     } else if (changedProps.has("_currentItem")) {
       this._setHeaderHeight();
-
-      // This fixes a race condition for resizing of the cards using the grid layout
-      if (this._observed) {
-        return;
-      }
-
-      // @ts-ignore
-      const virtualizer = this._virtualizer?._virtualizer;
-
-      if (virtualizer) {
-        this._observed = true;
-        setTimeout(() => virtualizer._observeMutations(), 0);
-      }
     }
   }
 
@@ -496,9 +477,6 @@ export class HaMediaPlayerBrowse extends LitElement {
                       <lit-virtualizer
                         scroller
                         .items=${children}
-                        style=${styleMap({
-                          height: `${children.length * 72 + 26}px`,
-                        })}
                         .renderItem=${this._renderListItem}
                       ></lit-virtualizer>
                       ${currentItem.not_shown
@@ -628,6 +606,7 @@ export class HaMediaPlayerBrowse extends LitElement {
         </div>
         <span class="title">${child.title}</span>
       </mwc-list-item>
+      <li divider role="separator"></li>
     `;
   };
 

src/components/media-player/ha-media-upload-button.ts

@@ -119,11 +119,6 @@ class MediaUploadButton extends LitElement {
     ha-circular-progress[slot="icon"] {
       vertical-align: middle;
     }
-
-    :host-context([style*="direction: rtl;"]) ha-svg-icon[slot="icon"] {
-      margin-left: 8px;
-      margin-right: 0px;
-    }
   `;
 }
 

src/components/trace/ha-timeline.ts

@@ -10,8 +10,6 @@ export class HaTimeline extends LitElement {
 
   @property({ type: Boolean, reflect: true }) public raised = false;
 
-  @property({ reflect: true, type: Boolean }) notEnabled = false;
-
   @property({ type: Boolean }) public lastItem = false;
 
   @property({ type: String }) public icon?: string;
@@ -78,9 +76,6 @@ export class HaTimeline extends LitElement {
           margin-right: 8px;
           width: 24px;
         }
-        :host([notEnabled]) ha-svg-icon {
-          opacity: 0.5;
-        }
         ha-svg-icon {
           color: var(
             --timeline-ball-color,

src/components/trace/ha-trace-path-details.ts

@@ -114,11 +114,6 @@ export class HaTracePathDetails extends LitElement {
           const { path, timestamp, result, error, changed_variables, ...rest } =
             trace as any;
 
-          if (result?.enabled === false) {
-            return html`This node was disabled and skipped during execution so
-            no further trace information is available.`;
-          }
-
           return html`
             ${curPath === this.selected.path
               ? ""

src/components/trace/hat-graph-node.ts

@@ -19,8 +19,6 @@ export class HatGraphNode extends LitElement {
 
   @property({ reflect: true, type: Boolean }) disabled?: boolean;
 
-  @property({ reflect: true, type: Boolean }) notEnabled = false;
-
   @property({ reflect: true, type: Boolean }) graphStart?: boolean;
 
   @property({ type: Boolean, attribute: "nofocus" }) noFocus = false;
@@ -116,14 +114,8 @@ export class HatGraphNode extends LitElement {
         --stroke-clr: var(--hover-clr);
         --icon-clr: var(--default-icon-clr);
       }
-      :host([notEnabled]) circle {
-        --stroke-clr: var(--disabled-clr);
-      }
-      :host([notEnabled][active]) circle {
-        --stroke-clr: var(--disabled-active-clr);
-      }
-      :host([notEnabled]:hover) circle {
-        --stroke-clr: var(--disabled-hover-clr);
+      :host([disabled]) circle {
+        stroke: var(--disabled-clr);
       }
       svg {
         width: 100%;

src/components/trace/hat-script-graph.ts

@@ -1,11 +1,7 @@
 import {
   mdiAbTesting,
-  mdiAlertOctagon,
-  mdiArrowDecision,
   mdiArrowUp,
   mdiAsterisk,
-  mdiCallMissed,
-  mdiCallReceived,
   mdiCallSplit,
   mdiCheckboxBlankOutline,
   mdiCheckboxMarkedOutline,
@@ -13,12 +9,10 @@ import {
   mdiChevronRight,
   mdiChevronUp,
   mdiClose,
-  mdiCloseOctagon,
   mdiCodeBrackets,
   mdiDevices,
   mdiExclamation,
   mdiRefresh,
-  mdiShuffleDisabled,
   mdiTimerOutline,
   mdiTrafficLight,
 } from "@mdi/js";
@@ -33,9 +27,6 @@ import {
   DelayAction,
   DeviceAction,
   EventAction,
-  IfAction,
-  ManualScriptConfig,
-  ParallelAction,
   RepeatAction,
   SceneAction,
   ServiceAction,
@@ -45,8 +36,6 @@ import {
 import {
   ChooseActionTraceStep,
   ConditionTraceStep,
-  IfActionTraceStep,
-  StopActionTraceStep,
   TraceExtended,
 } from "../../data/trace";
 import "../ha-icon-button";
@@ -96,7 +85,6 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(config, path)}
         ?active=${this.selected === path}
         .iconPath=${mdiAsterisk}
-        .notEnabled=${config.enabled === false}
         tabindex=${track ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -113,9 +101,6 @@ export class HatScriptGraph extends LitElement {
 
   private typeRenderers = {
     condition: this.render_condition_node,
-    and: this.render_condition_node,
-    or: this.render_condition_node,
-    not: this.render_condition_node,
     delay: this.render_delay_node,
     event: this.render_event_node,
     scene: this.render_scene_node,
@@ -125,37 +110,23 @@ export class HatScriptGraph extends LitElement {
     repeat: this.render_repeat_node,
     choose: this.render_choose_node,
     device_id: this.render_device_node,
-    if: this.render_if_node,
-    stop: this.render_stop_node,
-    parallel: this.render_parallel_node,
     other: this.render_other_node,
   };
 
-  private render_action_node(
-    node: Action,
-    path: string,
-    graphStart = false,
-    disabled = false
-  ) {
+  private render_action_node(node: Action, path: string, graphStart = false) {
     const type =
       Object.keys(this.typeRenderers).find((key) => key in node) || "other";
     this.renderedNodes[path] = { config: node, path };
     if (this.trace && path in this.trace.trace) {
       this.trackedNodes[path] = this.renderedNodes[path];
     }
-    return this.typeRenderers[type].bind(this)(
-      node,
-      path,
-      graphStart,
-      disabled
-    );
+    return this.typeRenderers[type].bind(this)(node, path, graphStart);
   }
 
   private render_choose_node(
     config: ChooseAction,
     path: string,
-    graphStart = false,
-    disabled = false
+    graphStart = false
   ) {
     const trace = this.trace.trace[path] as ChooseActionTraceStep[] | undefined;
     const trace_path = trace
@@ -172,14 +143,12 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(config, path)}
         ?track=${trace !== undefined}
         ?active=${this.selected === path}
-        .notEnabled=${disabled || config.enabled === false}
       >
         <hat-graph-node
           .graphStart=${graphStart}
-          .iconPath=${mdiArrowDecision}
+          .iconPath=${mdiCallSplit}
           ?track=${trace !== undefined}
           ?active=${this.selected === path}
-          .notEnabled=${disabled || config.enabled === false}
           slot="head"
           nofocus
         ></hat-graph-node>
@@ -202,15 +171,12 @@ export class HatScriptGraph extends LitElement {
                     @focus=${this.selectNode(config, branch_path)}
                     ?track=${track_this}
                     ?active=${this.selected === branch_path}
-                    .notEnabled=${disabled || config.enabled === false}
                   ></hat-graph-node>
                   ${branch.sequence !== null
                     ? ensureArray(branch.sequence).map((action, j) =>
                         this.render_action_node(
                           action,
-                          `${branch_path}/sequence/${j}`,
-                          false,
-                          disabled || config.enabled === false
+                          `${branch_path}/sequence/${j}`
                         )
                       )
                     : ""}
@@ -222,12 +188,7 @@ export class HatScriptGraph extends LitElement {
           <hat-graph-spacer ?track=${track_default}></hat-graph-spacer>
           ${config.default !== null
             ? ensureArray(config.default)?.map((action, i) =>
-                this.render_action_node(
-                  action,
-                  `${path}/default/${i}`,
-                  false,
-                  disabled || config.enabled === false
-                )
+                this.render_action_node(action, `${path}/default/${i}`)
               )
             : ""}
         </div>
@@ -235,88 +196,10 @@ export class HatScriptGraph extends LitElement {
     `;
   }
 
-  private render_if_node(
-    config: IfAction,
-    path: string,
-    graphStart = false,
-    disabled = false
-  ) {
-    const trace = this.trace.trace[path] as IfActionTraceStep[] | undefined;
-    let trackThen = false;
-    let trackElse = false;
-    for (const trc of trace || []) {
-      if (!trackThen && trc.result?.choice === "then") {
-        trackThen = true;
-      }
-      if ((!trackElse && trc.result?.choice === "else") || !trc.result) {
-        trackElse = true;
-      }
-      if (trackElse && trackThen) {
-        break;
-      }
-    }
-    return html`
-      <hat-graph-branch
-        tabindex=${trace === undefined ? "-1" : "0"}
-        @focus=${this.selectNode(config, path)}
-        ?track=${trace !== undefined}
-        ?active=${this.selected === path}
-        .notEnabled=${disabled || config.enabled === false}
-      >
-        <hat-graph-node
-          .graphStart=${graphStart}
-          .iconPath=${mdiCallSplit}
-          ?track=${trace !== undefined}
-          ?active=${this.selected === path}
-          .notEnabled=${disabled || config.enabled === false}
-          slot="head"
-          nofocus
-        ></hat-graph-node>
-        ${config.else
-          ? html`<div class="graph-container" ?track=${trackElse}>
-              <hat-graph-node
-                .iconPath=${mdiCallMissed}
-                ?track=${trackElse}
-                ?active=${this.selected === path}
-                .notEnabled=${disabled || config.enabled === false}
-                nofocus
-              ></hat-graph-node
-              >${ensureArray(config.else).map((action, j) =>
-                this.render_action_node(
-                  action,
-                  `${path}/else/${j}`,
-                  false,
-                  disabled || config.enabled === false
-                )
-              )}
-            </div>`
-          : html`<hat-graph-spacer ?track=${trackElse}></hat-graph-spacer>`}
-        <div class="graph-container" ?track=${trackThen}>
-          <hat-graph-node
-            .iconPath=${mdiCallReceived}
-            ?track=${trackThen}
-            ?active=${this.selected === path}
-            .notEnabled=${disabled || config.enabled === false}
-            nofocus
-          ></hat-graph-node>
-          ${ensureArray(config.then).map((action, j) =>
-            this.render_action_node(
-              action,
-              `${path}/then/${j}`,
-              false,
-              disabled || config.enabled === false
-            )
-          )}
-        </div>
-      </hat-graph-branch>
-    `;
-  }
-
   private render_condition_node(
     node: Condition,
     path: string,
-    graphStart = false,
-    disabled = false
+    graphStart = false
   ) {
     const trace = this.trace.trace[path] as ConditionTraceStep[] | undefined;
     let track = false;
@@ -342,7 +225,6 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(node, path)}
         ?track=${track}
         ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
         tabindex=${trace === undefined ? "-1" : "0"}
         short
       >
@@ -351,7 +233,6 @@ export class HatScriptGraph extends LitElement {
           slot="head"
           ?track=${track}
           ?active=${this.selected === path}
-          .notEnabled=${disabled || node.enabled === false}
           .iconPath=${mdiAbTesting}
           nofocus
         ></hat-graph-node>
@@ -366,7 +247,6 @@ export class HatScriptGraph extends LitElement {
           nofocus
           ?track=${trackFailed}
           ?active=${this.selected === path}
-          .notEnabled=${disabled || node.enabled === false}
         ></hat-graph-node>
       </hat-graph-branch>
     `;
@@ -375,8 +255,7 @@ export class HatScriptGraph extends LitElement {
   private render_delay_node(
     node: DelayAction,
     path: string,
-    graphStart = false,
-    disabled = false
+    graphStart = false
   ) {
     return html`
       <hat-graph-node
@@ -385,7 +264,6 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(node, path)}
         ?track=${path in this.trace.trace}
         ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -394,8 +272,7 @@ export class HatScriptGraph extends LitElement {
   private render_device_node(
     node: DeviceAction,
     path: string,
-    graphStart = false,
-    disabled = false
+    graphStart = false
   ) {
     return html`
       <hat-graph-node
@@ -404,7 +281,6 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(node, path)}
         ?track=${path in this.trace.trace}
         ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -413,8 +289,7 @@ export class HatScriptGraph extends LitElement {
   private render_event_node(
     node: EventAction,
     path: string,
-    graphStart = false,
-    disabled = false
+    graphStart = false
   ) {
     return html`
       <hat-graph-node
@@ -423,7 +298,6 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(node, path)}
         ?track=${path in this.trace.trace}
         ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -432,8 +306,7 @@ export class HatScriptGraph extends LitElement {
   private render_repeat_node(
     node: RepeatAction,
     path: string,
-    graphStart = false,
-    disabled = false
+    graphStart = false
   ) {
     const trace: any = this.trace.trace[path];
     const repeats = this.trace?.trace[`${path}/repeat/sequence/0`]?.length;
@@ -443,14 +316,12 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(node, path)}
         ?track=${path in this.trace.trace}
         ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
       >
         <hat-graph-node
           .graphStart=${graphStart}
           .iconPath=${mdiRefresh}
           ?track=${path in this.trace.trace}
           ?active=${this.selected === path}
-          .notEnabled=${disabled || node.enabled === false}
           slot="head"
           nofocus
         ></hat-graph-node>
@@ -458,18 +329,12 @@ export class HatScriptGraph extends LitElement {
           .iconPath=${mdiArrowUp}
           ?track=${repeats > 1}
           ?active=${this.selected === path}
-          .notEnabled=${disabled || node.enabled === false}
           nofocus
           .badge=${repeats > 1 ? repeats : undefined}
         ></hat-graph-node>
         <div ?track=${trace}>
           ${ensureArray(node.repeat.sequence).map((action, i) =>
-            this.render_action_node(
-              action,
-              `${path}/repeat/sequence/${i}`,
-              false,
-              disabled || node.enabled === false
-            )
+            this.render_action_node(action, `${path}/repeat/sequence/${i}`)
           )}
         </div>
       </hat-graph-branch>
@@ -479,8 +344,7 @@ export class HatScriptGraph extends LitElement {
   private render_scene_node(
     node: SceneAction,
     path: string,
-    graphStart = false,
-    disabled = false
+    graphStart = false
   ) {
     return html`
       <hat-graph-node
@@ -489,7 +353,6 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(node, path)}
         ?track=${path in this.trace.trace}
         ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -498,8 +361,7 @@ export class HatScriptGraph extends LitElement {
   private render_service_node(
     node: ServiceAction,
     path: string,
-    graphStart = false,
-    disabled = false
+    graphStart = false
   ) {
     return html`
       <hat-graph-node
@@ -508,7 +370,6 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(node, path)}
         ?track=${path in this.trace.trace}
         ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -517,8 +378,7 @@ export class HatScriptGraph extends LitElement {
   private render_wait_node(
     node: WaitAction | WaitForTriggerAction,
     path: string,
-    graphStart = false,
-    disabled = false
+    graphStart = false
   ) {
     return html`
       <hat-graph-node
@@ -527,87 +387,12 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(node, path)}
         ?track=${path in this.trace.trace}
         ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
   }
 
-  private render_parallel_node(
-    node: ParallelAction,
-    path: string,
-    graphStart = false,
-    disabled = false
-  ) {
-    const trace: any = this.trace.trace[path];
-    return html`
-      <hat-graph-branch
-        tabindex=${trace === undefined ? "-1" : "0"}
-        @focus=${this.selectNode(node, path)}
-        ?track=${path in this.trace.trace}
-        ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
-      >
-        <hat-graph-node
-          .graphStart=${graphStart}
-          .iconPath=${mdiShuffleDisabled}
-          ?track=${path in this.trace.trace}
-          ?active=${this.selected === path}
-          .notEnabled=${disabled || node.enabled === false}
-          slot="head"
-          nofocus
-        ></hat-graph-node>
-        ${ensureArray(node.parallel).map((action, i) =>
-          "sequence" in action
-            ? html`<div ?track=${path in this.trace.trace}>
-                ${ensureArray((action as ManualScriptConfig).sequence).map(
-                  (sAction, j) =>
-                    this.render_action_node(
-                      sAction,
-                      `${path}/parallel/${i}/sequence/${j}`,
-                      false,
-                      disabled || node.enabled === false
-                    )
-                )}
-              </div>`
-            : this.render_action_node(
-                action,
-                `${path}/parallel/${i}/sequence/0`,
-                false,
-                disabled || node.enabled === false
-              )
-        )}
-      </hat-graph-branch>
-    `;
-  }
-
-  private render_stop_node(
-    node: Action,
-    path: string,
-    graphStart = false,
-    disabled = false
-  ) {
-    const trace = this.trace.trace[path] as StopActionTraceStep[] | undefined;
-    return html`
-      <hat-graph-node
-        .graphStart=${graphStart}
-        .iconPath=${trace?.[0].result?.error
-          ? mdiAlertOctagon
-          : mdiCloseOctagon}
-        @focus=${this.selectNode(node, path)}
-        ?track=${path in this.trace.trace}
-        ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
-      ></hat-graph-node>
-    `;
-  }
-
-  private render_other_node(
-    node: Action,
-    path: string,
-    graphStart = false,
-    disabled = false
-  ) {
+  private render_other_node(node: Action, path: string, graphStart = false) {
     return html`
       <hat-graph-node
         .graphStart=${graphStart}
@@ -615,7 +400,6 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(node, path)}
         ?track=${path in this.trace.trace}
         ?active=${this.selected === path}
-        .notEnabled=${disabled || node.enabled === false}
       ></hat-graph-node>
     `;
   }
@@ -754,8 +538,6 @@ export class HatScriptGraph extends LitElement {
         --track-clr: var(--track-color, var(--accent-color));
         --hover-clr: var(--hover-color, var(--primary-color));
         --disabled-clr: var(--disabled-color, var(--disabled-text-color));
-        --disabled-active-clr: rgba(var(--rgb-primary-color), 0.5);
-        --disabled-hover-clr: rgba(var(--rgb-primary-color), 0.7);
         --default-trigger-color: 3, 169, 244;
         --rgb-trigger-color: var(--trigger-color, var(--default-trigger-color));
         --background-clr: var(--background-color, white);

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

@@ -25,17 +25,12 @@ import {
   ChooseAction,
   ChooseActionChoice,
   getActionType,
-  IfAction,
-  ParallelAction,
-  RepeatAction,
 } from "../../data/script";
 import { describeAction } from "../../data/script_i18n";
 import {
-  ActionTraceStep,
   AutomationTraceExtended,
   ChooseActionTraceStep,
   getDataFromPath,
-  IfActionTraceStep,
   isTriggerPath,
   TriggerTraceStep,
 } from "../../data/trace";
@@ -110,7 +105,7 @@ class LogbookRenderer {
   }
 
   get hasNext() {
-    return this.curIndex < this.logbookEntries.length;
+    return this.curIndex !== this.logbookEntries.length;
   }
 
   maybeRenderItem() {
@@ -206,7 +201,7 @@ class ActionRenderer {
   }
 
   get hasNext() {
-    return this.curIndex < this.keys.length;
+    return this.curIndex !== this.keys.length;
   }
 
   renderItem() {
@@ -219,31 +214,15 @@ class ActionRenderer {
 
   private _renderItem(
     index: number,
-    actionType?: ReturnType<typeof getActionType>,
-    renderAllIterations?: boolean
+    actionType?: ReturnType<typeof getActionType>
   ): number {
     const value = this._getItem(index);
 
-    if (renderAllIterations) {
-      let i;
-      value.forEach((item) => {
-        i = this._renderIteration(index, item, actionType);
-      });
-      return i;
-    }
-    return this._renderIteration(index, value[0], actionType);
-  }
-
-  private _renderIteration(
-    index: number,
-    value: ActionTraceStep,
-    actionType?: ReturnType<typeof getActionType>
-  ) {
-    if (isTriggerPath(value.path)) {
-      return this._handleTrigger(index, value as TriggerTraceStep);
+    if (isTriggerPath(value[0].path)) {
+      return this._handleTrigger(index, value[0] as TriggerTraceStep);
     }
 
-    const timestamp = new Date(value.timestamp);
+    const timestamp = new Date(value[0].timestamp);
 
     // Render all logbook items that are in front of this item.
     while (
@@ -256,7 +235,7 @@ class ActionRenderer {
     this.logbookRenderer.flush();
     this.timeTracker.maybeRenderTime(timestamp);
 
-    const path = value.path;
+    const path = value[0].path;
     let data;
     try {
       data = getDataFromPath(this.trace.config, path);
@@ -284,24 +263,7 @@ class ActionRenderer {
       return this._handleChoose(index);
     }
 
-    if (actionType === "repeat") {
-      return this._handleRepeat(index);
-    }
-
-    if (actionType === "if") {
-      return this._handleIf(index);
-    }
-
-    if (actionType === "parallel") {
-      return this._handleParallel(index);
-    }
-
-    this._renderEntry(
-      path,
-      describeAction(this.hass, data, actionType),
-      undefined,
-      data.enabled === false
-    );
+    this._renderEntry(path, describeAction(this.hass, data, actionType));
 
     let i = index + 1;
 
@@ -354,16 +316,10 @@ class ActionRenderer {
     const chooseConfig = this._getDataFromPath(
       this.keys[index]
     ) as ChooseAction;
-    const disabled = chooseConfig.enabled === false;
     const name = chooseConfig.alias || "Choose";
 
     if (defaultExecuted) {
-      this._renderEntry(
-        choosePath,
-        `${name}: Default action executed`,
-        undefined,
-        disabled
-      );
+      this._renderEntry(choosePath, `${name}: Default action executed`);
     } else if (chooseTrace.result) {
       const choiceNumeric =
         chooseTrace.result.choice !== "default"
@@ -375,19 +331,9 @@ class ActionRenderer {
       const choiceName = choiceConfig
         ? `${choiceConfig.alias || `Option ${choiceNumeric}`} executed`
         : `Error: ${chooseTrace.error}`;
-      this._renderEntry(
-        choosePath,
-        `${name}: ${choiceName}`,
-        undefined,
-        disabled
-      );
+      this._renderEntry(choosePath, `${name}: ${choiceName}`);
     } else {
-      this._renderEntry(
-        choosePath,
-        `${name}: No action taken`,
-        undefined,
-        disabled
-      );
+      this._renderEntry(choosePath, `${name}: No action taken`);
     }
 
     let i;
@@ -428,130 +374,14 @@ class ActionRenderer {
     return i;
   }
 
-  private _handleRepeat(index: number): number {
-    const repeatPath = this.keys[index];
-    const startLevel = repeatPath.split("/").length;
-
-    const repeatConfig = this._getDataFromPath(
-      this.keys[index]
-    ) as RepeatAction;
-    const disabled = repeatConfig.enabled === false;
-
-    const name = repeatConfig.alias || describeAction(this.hass, repeatConfig);
-
-    this._renderEntry(repeatPath, name, undefined, disabled);
-
-    let i;
-
-    for (i = index + 1; i < this.keys.length; i++) {
-      const path = this.keys[i];
-      const parts = path.split("/");
-
-      // We're done if no more sequence in current level
-      if (parts.length <= startLevel) {
-        return i;
-      }
-
-      i = this._renderItem(i, getActionType(this._getDataFromPath(path)), true);
-    }
-
-    return i;
-  }
-
-  private _handleIf(index: number): number {
-    const ifPath = this.keys[index];
-    const startLevel = ifPath.split("/").length;
-
-    const ifTrace = this._getItem(index)[0] as IfActionTraceStep;
-    const ifConfig = this._getDataFromPath(this.keys[index]) as IfAction;
-    const disabled = ifConfig.enabled === false;
-    const name = ifConfig.alias || "If";
-
-    if (ifTrace.result?.choice) {
-      const choiceConfig = this._getDataFromPath(
-        `${this.keys[index]}/${ifTrace.result.choice}/`
-      ) as any;
-      const choiceName = choiceConfig
-        ? `${choiceConfig.alias || `${ifTrace.result.choice} action executed`}`
-        : `Error: ${ifTrace.error}`;
-      this._renderEntry(ifPath, `${name}: ${choiceName}`, undefined, disabled);
-    } else {
-      this._renderEntry(
-        ifPath,
-        `${name}: No action taken`,
-        undefined,
-        disabled
-      );
-    }
-
-    let i;
-
-    // Skip over conditions
-    for (i = index + 1; i < this.keys.length; i++) {
-      const path = this.keys[i];
-      const parts = this.keys[i].split("/");
-
-      // We're done if no more sequence in current level
-      if (parts.length <= startLevel) {
-        return i;
-      }
-
-      // We're going to skip all conditions
-      if (
-        parts[startLevel + 1] === "condition" ||
-        parts.length < startLevel + 2
-      ) {
-        continue;
-      }
-
-      i = this._renderItem(i, getActionType(this._getDataFromPath(path)));
-    }
-
-    return i;
-  }
-
-  private _handleParallel(index: number): number {
-    const parallelPath = this.keys[index];
-    const startLevel = parallelPath.split("/").length;
-
-    const parallelConfig = this._getDataFromPath(
-      this.keys[index]
-    ) as ParallelAction;
-
-    const disabled = parallelConfig.enabled === false;
-
-    const name = parallelConfig.alias || "Execute in parallel";
-
-    this._renderEntry(parallelPath, name, undefined, disabled);
-
-    let i;
-
-    for (i = index + 1; i < this.keys.length; i++) {
-      const path = this.keys[i];
-      const parts = path.split("/");
-
-      // We're done if no more sequence in current level
-      if (parts.length <= startLevel) {
-        return i;
-      }
-
-      i = this._renderItem(i, getActionType(this._getDataFromPath(path)));
-    }
-
-    return i;
-  }
-
   private _renderEntry(
     path: string,
     description: string,
-    icon = mdiRecordCircleOutline,
-    disabled = false
+    icon = mdiRecordCircleOutline
   ) {
     this.entries.push(html`
-      <ha-timeline .icon=${icon} data-path=${path} .notEnabled=${disabled}>
-        ${description}${disabled
-          ? html`<span class="disabled"> (disabled)</span>`
-          : ""}
+      <ha-timeline .icon=${icon} data-path=${path}>
+        ${description}
       </ha-timeline>
     `);
   }

src/data/application_credential.ts

@@ -1,44 +0,0 @@
-import { HomeAssistant } from "../types";
-
-export interface ApplicationCredentialsConfig {
-  domains: string[];
-}
-
-export interface ApplicationCredential {
-  id: string;
-  domain: string;
-  client_id: string;
-  client_secret: string;
-}
-
-export const fetchApplicationCredentialsConfig = async (hass: HomeAssistant) =>
-  hass.callWS<ApplicationCredentialsConfig>({
-    type: "application_credentials/config",
-  });
-
-export const fetchApplicationCredentials = async (hass: HomeAssistant) =>
-  hass.callWS<ApplicationCredential[]>({
-    type: "application_credentials/list",
-  });
-
-export const createApplicationCredential = async (
-  hass: HomeAssistant,
-  domain: string,
-  clientId: string,
-  clientSecret: string
-) =>
-  hass.callWS<ApplicationCredential>({
-    type: "application_credentials/create",
-    domain,
-    client_id: clientId,
-    client_secret: clientSecret,
-  });
-
-export const deleteApplicationCredential = async (
-  hass: HomeAssistant,
-  applicationCredentialsId: string
-) =>
-  hass.callWS<void>({
-    type: "application_credentials/delete",
-    application_credentials_id: applicationCredentialsId,
-  });

src/data/automation.ts

@@ -65,7 +65,6 @@ export interface BaseTrigger {
   platform: string;
   id?: string;
   variables?: Record<string, unknown>;
-  enabled?: boolean;
 }
 
 export interface StateTrigger extends BaseTrigger {
@@ -179,7 +178,6 @@ export type Trigger =
 interface BaseCondition {
   condition: string;
   alias?: string;
-  enabled?: boolean;
 }
 
 export interface LogicalCondition extends BaseCondition {
@@ -237,10 +235,6 @@ export interface TriggerCondition extends BaseCondition {
 
 type ShorthandBaseCondition = Omit<BaseCondition, "condition">;
 
-export interface ShorthandAndConditionList extends ShorthandBaseCondition {
-  condition: Condition[];
-}
-
 export interface ShorthandAndCondition extends ShorthandBaseCondition {
   and: Condition[];
 }
@@ -266,33 +260,10 @@ export type Condition =
 
 export type ConditionWithShorthand =
   | Condition
-  | ShorthandAndConditionList
   | ShorthandAndCondition
   | ShorthandOrCondition
   | ShorthandNotCondition;
 
-export const expandConditionWithShorthand = (
-  cond: ConditionWithShorthand
-): Condition => {
-  if ("condition" in cond && Array.isArray(cond.condition)) {
-    return {
-      condition: "and",
-      conditions: cond.condition,
-    };
-  }
-
-  for (const condition of ["and", "or", "not"]) {
-    if (condition in cond) {
-      return {
-        condition,
-        conditions: cond[condition],
-      } as Condition;
-    }
-  }
-
-  return cond as Condition;
-};
-
 export const triggerAutomationActions = (
   hass: HomeAssistant,
   entityId: string

src/data/device_automation.ts

@@ -11,8 +11,6 @@ export interface DeviceAutomation {
   type?: string;
   subtype?: string;
   event?: string;
-  enabled?: boolean;
-  metadata?: { secondary: boolean };
 }
 
 export interface DeviceAction extends DeviceAutomation {
@@ -181,16 +179,3 @@ export const localizeDeviceAutomationTrigger = (
     (trigger.subtype ? `"${trigger.subtype}" ${trigger.type}` : trigger.type!)
   );
 };
-
-export const sortDeviceAutomations = (
-  automationA: DeviceAutomation,
-  automationB: DeviceAutomation
-) => {
-  if (automationA.metadata?.secondary && !automationB.metadata?.secondary) {
-    return 1;
-  }
-  if (!automationA.metadata?.secondary && automationB.metadata?.secondary) {
-    return -1;
-  }
-  return 0;
-};

src/data/hardware.ts

@@ -1,22 +0,0 @@
-// Keep in sync with https://github.com/home-assistant/analytics.home-assistant.io/blob/dev/site/src/analytics-os-boards.ts#L6-L24
-export const BOARD_NAMES: Record<string, string> = {
-  "odroid-n2": "Home Assistant Blue / ODROID-N2",
-  "odroid-xu4": "ODROID-XU4",
-  "odroid-c2": "ODROID-C2",
-  "odroid-c4": "ODROID-C4",
-  rpi: "Raspberry Pi",
-  rpi0: "Raspberry Pi Zero",
-  "rpi0-w": "Raspberry Pi Zero W",
-  rpi2: "Raspberry Pi 2",
-  rpi3: "Raspberry Pi 3 (32-bit)",
-  "rpi3-64": "Raspberry Pi 3",
-  rpi4: "Raspberry Pi 4 (32-bit)",
-  "rpi4-64": "Raspberry Pi 4",
-  tinker: "ASUS Tinker Board",
-  "khadas-vim3": "Khadas VIM3",
-  "generic-aarch64": "Generic AArch64",
-  ova: "Virtual Machine",
-  "generic-x86-64": "Generic x86-64",
-  "intel-nuc": "Intel NUC",
-  yellow: "Home Assistant Yellow",
-};

src/data/hassio/supervisor.ts

@@ -1,7 +1,7 @@
 import { atLeastVersion } from "../../common/config/version";
 import { HomeAssistant, PanelInfo } from "../../types";
 import { SupervisorArch } from "../supervisor/supervisor";
-import { HassioAddonInfo } from "./addon";
+import { HassioAddonInfo, HassioAddonRepository } from "./addon";
 import { hassioApiResultExtractor, HassioResponse } from "./common";
 
 export type HassioHomeAssistantInfo = {
@@ -23,7 +23,7 @@ export type HassioHomeAssistantInfo = {
 
 export type HassioSupervisorInfo = {
   addons: HassioAddonInfo[];
-  addons_repositories: string[];
+  addons_repositories: HassioAddonRepository[];
   arch: SupervisorArch;
   channel: string;
   debug: boolean;
@@ -179,10 +179,7 @@ export const fetchHassioInfo = async (
 };
 
 export const fetchHassioLogs = async (hass: HomeAssistant, provider: string) =>
-  hass.callApi<string>(
-    "GET",
-    `hassio/${provider.includes("_") ? `addons/${provider}` : provider}/logs`
-  );
+  hass.callApi<string>("GET", `hassio/${provider}/logs`);
 
 export const setSupervisorOption = async (
   hass: HomeAssistant,

src/data/script.ts

@@ -13,18 +13,11 @@ import {
   literal,
   is,
   Describe,
-  boolean,
 } from "superstruct";
 import { computeObjectId } from "../common/entity/compute_object_id";
 import { navigate } from "../common/navigate";
 import { HomeAssistant } from "../types";
-import {
-  Condition,
-  ShorthandAndCondition,
-  ShorthandNotCondition,
-  ShorthandOrCondition,
-  Trigger,
-} from "./automation";
+import { Condition, Trigger } from "./automation";
 import { BlueprintInput } from "./blueprint";
 
 export const MODES = ["single", "restart", "queued", "parallel"] as const;
@@ -32,7 +25,6 @@ export const MODES_MAX = ["queued", "parallel"];
 
 export const baseActionStruct = object({
   alias: optional(string()),
-  enabled: optional(boolean()),
 });
 
 const targetStruct = object({
@@ -96,18 +88,15 @@ export interface BlueprintScriptConfig extends ManualScriptConfig {
   use_blueprint: { path: string; input?: BlueprintInput };
 }
 
-interface BaseAction {
+export interface EventAction {
   alias?: string;
-  enabled?: boolean;
-}
-
-export interface EventAction extends BaseAction {
   event: string;
   event_data?: Record<string, any>;
   event_data_template?: Record<string, any>;
 }
 
-export interface ServiceAction extends BaseAction {
+export interface ServiceAction {
+  alias?: string;
   service?: string;
   service_template?: string;
   entity_id?: string;
@@ -115,48 +104,55 @@ export interface ServiceAction extends BaseAction {
   data?: Record<string, unknown>;
 }
 
-export interface DeviceAction extends BaseAction {
+export interface DeviceAction {
+  alias?: string;
   type: string;
   device_id: string;
   domain: string;
   entity_id: string;
 }
 
-export interface DelayActionParts extends BaseAction {
+export interface DelayActionParts {
   milliseconds?: number;
   seconds?: number;
   minutes?: number;
   hours?: number;
   days?: number;
 }
-export interface DelayAction extends BaseAction {
+export interface DelayAction {
+  alias?: string;
   delay: number | Partial<DelayActionParts> | string;
 }
 
-export interface ServiceSceneAction extends BaseAction {
+export interface ServiceSceneAction {
+  alias?: string;
   service: "scene.turn_on";
   target?: { entity_id?: string };
   entity_id?: string;
   metadata: Record<string, unknown>;
 }
-export interface LegacySceneAction extends BaseAction {
+export interface LegacySceneAction {
+  alias?: string;
   scene: string;
 }
 export type SceneAction = ServiceSceneAction | LegacySceneAction;
 
-export interface WaitAction extends BaseAction {
+export interface WaitAction {
+  alias?: string;
   wait_template: string;
   timeout?: number;
   continue_on_timeout?: boolean;
 }
 
-export interface WaitForTriggerAction extends BaseAction {
+export interface WaitForTriggerAction {
+  alias?: string;
   wait_for_trigger: Trigger | Trigger[];
   timeout?: number;
   continue_on_timeout?: boolean;
 }
 
-export interface PlayMediaAction extends BaseAction {
+export interface PlayMediaAction {
+  alias?: string;
   service: "media_player.play_media";
   target?: { entity_id?: string };
   entity_id?: string;
@@ -164,11 +160,13 @@ export interface PlayMediaAction extends BaseAction {
   metadata: Record<string, unknown>;
 }
 
-export interface RepeatAction extends BaseAction {
-  repeat: CountRepeat | WhileRepeat | UntilRepeat | ForEachRepeat;
+export interface RepeatAction {
+  alias?: string;
+  repeat: CountRepeat | WhileRepeat | UntilRepeat;
 }
 
-interface BaseRepeat extends BaseAction {
+interface BaseRepeat {
+  alias?: string;
   sequence: Action | Action[];
 }
 
@@ -184,40 +182,38 @@ export interface UntilRepeat extends BaseRepeat {
   until: Condition[];
 }
 
-export interface ForEachRepeat extends BaseRepeat {
-  for_each: string | any[];
-}
-
-export interface ChooseActionChoice extends BaseAction {
+export interface ChooseActionChoice {
+  alias?: string;
   conditions: string | Condition[];
   sequence: Action | Action[];
 }
 
-export interface ChooseAction extends BaseAction {
+export interface ChooseAction {
+  alias?: string;
   choose: ChooseActionChoice | ChooseActionChoice[] | null;
   default?: Action | Action[];
 }
 
-export interface IfAction extends BaseAction {
+export interface IfAction {
+  alias?: string;
   if: string | Condition[];
   then: Action | Action[];
   else?: Action | Action[];
 }
 
-export interface VariablesAction extends BaseAction {
+export interface VariablesAction {
+  alias?: string;
   variables: Record<string, unknown>;
 }
 
-export interface StopAction extends BaseAction {
+export interface StopAction {
+  alias?: string;
   stop: string;
   error?: boolean;
 }
 
-export interface ParallelAction extends BaseAction {
-  parallel: ManualScriptConfig | Action | (ManualScriptConfig | Action)[];
-}
-
-interface UnknownAction extends BaseAction {
+interface UnknownAction {
+  alias?: string;
   [key: string]: unknown;
 }
 
@@ -226,9 +222,6 @@ export type Action =
   | DeviceAction
   | ServiceAction
   | Condition
-  | ShorthandAndCondition
-  | ShorthandOrCondition
-  | ShorthandNotCondition
   | DelayAction
   | SceneAction
   | WaitAction
@@ -239,7 +232,6 @@ export type Action =
   | VariablesAction
   | PlayMediaAction
   | StopAction
-  | ParallelAction
   | UnknownAction;
 
 export interface ActionTypes {
@@ -257,7 +249,6 @@ export interface ActionTypes {
   service: ServiceAction;
   play_media: PlayMediaAction;
   stop: StopAction;
-  parallel: ParallelAction;
   unknown: UnknownAction;
 }
 
@@ -307,7 +298,7 @@ export const getActionType = (action: Action): ActionType => {
   if ("wait_template" in action) {
     return "wait_template";
   }
-  if (["condition", "and", "or", "not"].some((key) => key in action)) {
+  if ("condition" in action) {
     return "check_condition";
   }
   if ("event" in action) {
@@ -337,9 +328,6 @@ export const getActionType = (action: Action): ActionType => {
   if ("stop" in action) {
     return "stop";
   }
-  if ("parallel" in action) {
-    return "parallel";
-  }
   if ("service" in action) {
     if ("metadata" in action) {
       if (is(action, activateSceneActionStruct)) {

src/data/script_i18n.ts

@@ -8,17 +8,12 @@ import { describeCondition, describeTrigger } from "./automation_i18n";
 import {
   ActionType,
   ActionTypes,
-  ChooseAction,
   DelayAction,
   DeviceAction,
   EventAction,
   getActionType,
-  IfAction,
-  ParallelAction,
   PlayMediaAction,
-  RepeatAction,
   SceneAction,
-  StopAction,
   VariablesAction,
   WaitForTriggerAction,
 } from "./script";
@@ -166,81 +161,6 @@ export const describeAction = <T extends ActionType>(
     return `Test ${describeCondition(action as Condition)}`;
   }
 
-  if (actionType === "stop") {
-    const config = action as StopAction;
-    return `Stopped${config.stop ? ` because: ${config.stop}` : ""}`;
-  }
-
-  if (actionType === "if") {
-    const config = action as IfAction;
-    return `If ${
-      typeof config.if === "string"
-        ? config.if
-        : ensureArray(config.if)
-            .map((condition) => describeCondition(condition))
-            .join(", ")
-    } then ${ensureArray(config.then).map((thenAction) =>
-      describeAction(hass, thenAction)
-    )}${
-      config.else
-        ? ` else ${ensureArray(config.else).map((elseAction) =>
-            describeAction(hass, elseAction)
-          )}`
-        : ""
-    }`;
-  }
-
-  if (actionType === "choose") {
-    const config = action as ChooseAction;
-    return config.choose
-      ? `If ${ensureArray(config.choose)
-          .map(
-            (chooseAction) =>
-              `${
-                typeof chooseAction.conditions === "string"
-                  ? chooseAction.conditions
-                  : ensureArray(chooseAction.conditions)
-                      .map((condition) => describeCondition(condition))
-                      .join(", ")
-              } then ${ensureArray(chooseAction.sequence)
-                .map((chooseSeq) => describeAction(hass, chooseSeq))
-                .join(", ")}`
-          )
-          .join(", else if ")}${
-          config.default
-            ? `. If none match: ${ensureArray(config.default)
-                .map((dAction) => describeAction(hass, dAction))
-                .join(", ")}`
-            : ""
-        }`
-      : "Choose";
-  }
-
-  if (actionType === "repeat") {
-    const config = action as RepeatAction;
-    return `Repeat ${ensureArray(config.repeat.sequence).map((repeatAction) =>
-      describeAction(hass, repeatAction)
-    )} ${"count" in config.repeat ? `${config.repeat.count} times` : ""}${
-      "while" in config.repeat
-        ? `while ${ensureArray(config.repeat.while)
-            .map((condition) => describeCondition(condition))
-            .join(", ")} is true`
-        : "until" in config.repeat
-        ? `until ${ensureArray(config.repeat.until)
-            .map((condition) => describeCondition(condition))
-            .join(", ")} is true`
-        : "for_each" in config.repeat
-        ? `for every item: ${ensureArray(config.repeat.for_each)
-            .map((item) => JSON.stringify(item))
-            .join(", ")}`
-        : ""
-    }`;
-  }
-
-  if (actionType === "check_condition") {
-    return `Test ${describeCondition(action as Condition)}`;
-  }
-
   if (actionType === "device_action") {
     const config = action as DeviceAction;
     const stateObj = hass.states[config.entity_id as string];
@@ -249,12 +169,5 @@ export const describeAction = <T extends ActionType>(
     }`;
   }
 
-  if (actionType === "parallel") {
-    const config = action as ParallelAction;
-    return `Run in parallel: ${ensureArray(config.parallel)
-      .map((pAction) => describeAction(hass, pAction))
-      .join(", ")}`;
-  }
-
   return actionType;
 };

src/data/trace.ts

@@ -44,14 +44,6 @@ export interface ChooseActionTraceStep extends BaseTraceStep {
   result?: { choice: number | "default" };
 }
 
-export interface IfActionTraceStep extends BaseTraceStep {
-  result?: { choice: "then" | "else" };
-}
-
-export interface StopActionTraceStep extends BaseTraceStep {
-  result?: { stop: string; error: boolean };
-}
-
 export interface ChooseChoiceActionTraceStep extends BaseTraceStep {
   result?: { result: boolean };
 }
@@ -185,11 +177,7 @@ export const getDataFromPath = (
     const asNumber = Number(raw);
 
     if (isNaN(asNumber)) {
-      const tempResult = result[raw];
-      if (!tempResult && raw === "sequence") {
-        continue;
-      }
-      result = tempResult;
+      result = result[raw];
       continue;
     }
 

src/data/update.ts

@@ -2,10 +2,8 @@ import type {
   HassEntities,
   HassEntityAttributeBase,
   HassEntityBase,
-  HassEvent,
 } from "home-assistant-js-websocket";
 import { BINARY_STATE_ON } from "../common/const";
-import { computeDomain } from "../common/entity/compute_domain";
 import { computeStateDomain } from "../common/entity/compute_state_domain";
 import { supportsFeature } from "../common/entity/supports-feature";
 import { caseInsensitiveStringCompare } from "../common/string/compare";
@@ -112,32 +110,15 @@ export const checkForEntityUpdates = async (
     return;
   }
 
-  let updated = 0;
-
-  const unsubscribeEvents = await hass.connection.subscribeEvents<HassEvent>(
-    (event) => {
-      if (computeDomain(event.data.entity_id) === "update") {
-        updated++;
-        showToast(element, {
-          message: hass.localize("ui.panel.config.updates.updates_refreshed", {
-            count: updated,
-          }),
-        });
-      }
-    },
-    "state_changed"
-  );
-
   await hass.callService("homeassistant", "update_entity", {
     entity_id: entities,
   });
 
-  // there is no reliable way to know if all the updates are done updating, so we just wait a bit for now...
-  await new Promise((r) => setTimeout(r, 10000));
-
-  unsubscribeEvents();
-
-  if (updated === 0) {
+  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/dialogs/config-flow/dialog-data-entry-flow.ts

@@ -312,7 +312,6 @@ class DataEntryFlowDialog extends LitElement {
                         .flowConfig=${this._params.flowConfig}
                         .step=${this._step}
                         .hass=${this.hass}
-                        .domain=${this._step.handler}
                       ></step-flow-abort>
                     `
                   : this._step.type === "progress"

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

@@ -15,11 +15,13 @@ class StepFlowAbort extends LitElement {
 
   @property({ attribute: false }) public step!: DataEntryFlowStepAbort;
 
-  @property({ attribute: false }) public domain!: string;
-
   protected render(): TemplateResult {
     return html`
-      <h2>${this.hass.localize(`component.${this.domain}.title`)}</h2>
+      <h2>
+        ${this.hass.localize(
+          "ui.panel.config.integrations.config_flow.aborted"
+        )}
+      </h2>
       <div class="content">
         ${this.flowConfig.renderAbortDescription(this.hass, this.step)}
       </div>

src/dialogs/generic/dialog-box.ts

@@ -1,13 +1,12 @@
 import "@material/mwc-button/mwc-button";
 import { mdiAlertOutline } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../../components/ha-dialog";
 import "../../components/ha-svg-icon";
 import "../../components/ha-switch";
-import { HaTextField } from "../../components/ha-textfield";
+import "../../components/ha-textfield";
 import { haStyleDialog } from "../../resources/styles";
 import { HomeAssistant } from "../../types";
 import { DialogBoxParams } from "./show-dialog-box";
@@ -18,10 +17,13 @@ class DialogBox extends LitElement {
 
   @state() private _params?: DialogBoxParams;
 
-  @query("ha-textfield") private _textField?: HaTextField;
+  @state() private _value?: string;
 
   public async showDialog(params: DialogBoxParams): Promise<void> {
     this._params = params;
+    if (params.prompt) {
+      this._value = params.defaultValue;
+    }
   }
 
   public closeDialog(): boolean {
@@ -73,7 +75,9 @@ class DialogBox extends LitElement {
             ? html`
                 <ha-textfield
                   dialogInitialFocus
-                  value=${ifDefined(this._params.defaultValue)}
+                  .value=${this._value || ""}
+                  @keyup=${this._handleKeyUp}
+                  @input=${this._valueChanged}
                   .label=${this._params.inputLabel
                     ? this._params.inputLabel
                     : ""}
@@ -105,6 +109,10 @@ class DialogBox extends LitElement {
     `;
   }
 
+  private _valueChanged(ev) {
+    this._value = ev.target.value;
+  }
+
   private _dismiss(): void {
     if (this._params?.cancel) {
       this._params.cancel();
@@ -112,9 +120,15 @@ class DialogBox extends LitElement {
     this._close();
   }
 
+  private _handleKeyUp(ev: KeyboardEvent) {
+    if (ev.keyCode === 13) {
+      this._confirm();
+    }
+  }
+
   private _confirm(): void {
     if (this._params!.confirm) {
-      this._params!.confirm(this._textField?.value);
+      this._params!.confirm(this._value);
     }
     this._close();
   }

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

@@ -17,7 +17,6 @@ import { styleMap } from "lit/directives/style-map";
 import memoizeOne from "memoize-one";
 import { canShowPage } from "../../common/config/can_show_page";
 import { componentsWithService } from "../../common/config/components_with_service";
-import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
@@ -25,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";
@@ -34,7 +33,6 @@ import "../../components/ha-circular-progress";
 import "../../components/ha-header-bar";
 import "../../components/ha-icon-button";
 import "../../components/ha-textfield";
-import { fetchHassioSupervisorInfo } from "../../data/hassio/supervisor";
 import { domainToName } from "../../data/integration";
 import { getPanelNameTranslationKey } from "../../data/panel";
 import { PageNavigation } from "../../layouts/hass-tabs-subpage";
@@ -247,10 +245,9 @@ export class QuickBar extends LitElement {
     `;
   }
 
-  private async _initializeItemsIfNeeded() {
+  private _initializeItemsIfNeeded() {
     if (this._commandMode) {
-      this._commandItems =
-        this._commandItems || (await this._generateCommandItems());
+      this._commandItems = this._commandItems || this._generateCommandItems();
     } else {
       this._entityItems = this._entityItems || this._generateEntityItems();
     }
@@ -488,11 +485,11 @@ export class QuickBar extends LitElement {
       );
   }
 
-  private async _generateCommandItems(): Promise<CommandItem[]> {
+  private _generateCommandItems(): CommandItem[] {
     return [
       ...this._generateReloadCommands(),
       ...this._generateServerControlCommands(),
-      ...(await this._generateNavigationCommands()),
+      ...this._generateNavigationCommands(),
     ].sort((a, b) =>
       caseInsensitiveStringCompare(a.strings.join(" "), b.strings.join(" "))
     );
@@ -581,40 +578,11 @@ export class QuickBar extends LitElement {
     });
   }
 
-  private async _generateNavigationCommands(): Promise<CommandItem[]> {
+  private _generateNavigationCommands(): CommandItem[] {
     const panelItems = this._generateNavigationPanelCommands();
     const sectionItems = this._generateNavigationConfigSectionCommands();
-    const supervisorItems: BaseNavigationCommand[] = [];
-    if (isComponentLoaded(this.hass, "hassio")) {
-      const supervisorInfo = await fetchHassioSupervisorInfo(this.hass);
-      supervisorItems.push({
-        path: "/hassio/store",
-        primaryText: this.hass.localize(
-          "ui.dialogs.quick-bar.commands.navigation.addon_store"
-        ),
-      });
-      supervisorItems.push({
-        path: "/hassio/dashboard",
-        primaryText: this.hass.localize(
-          "ui.dialogs.quick-bar.commands.navigation.addon_dashboard"
-        ),
-      });
-      for (const addon of supervisorInfo.addons) {
-        supervisorItems.push({
-          path: `/hassio/addon/${addon.slug}`,
-          primaryText: this.hass.localize(
-            "ui.dialogs.quick-bar.commands.navigation.addon_info",
-            { addon: addon.name }
-          ),
-        });
-      }
-    }
 
-    return this._finalizeNavigationCommands([
-      ...panelItems,
-      ...sectionItems,
-      ...supervisorItems,
-    ]);
+    return this._finalizeNavigationCommands([...panelItems, ...sectionItems]);
   }
 
   private _generateNavigationPanelCommands(): BaseNavigationCommand[] {
@@ -642,14 +610,20 @@ export class QuickBar extends LitElement {
         if (!canShowPage(this.hass, page)) {
           continue;
         }
-
+        if (!page.component) {
+          continue;
+        }
         const info = this._getNavigationInfoFromConfig(page);
 
         if (!info) {
           continue;
         }
         // Add to list, but only if we do not already have an entry for the same path and component
-        if (items.some((e) => e.path === info.path)) {
+        if (
+          items.some(
+            (e) => e.path === info.path && e.component === info.component
+          )
+        ) {
           continue;
         }
 
@@ -663,19 +637,14 @@ export class QuickBar extends LitElement {
   private _getNavigationInfoFromConfig(
     page: PageNavigation
   ): NavigationInfo | undefined {
-    const path = page.path.substring(1);
+    if (!page.component) {
+      return undefined;
+    }
+    const caption = this.hass.localize(
+      `ui.dialogs.quick-bar.commands.navigation.${page.component}`
+    );
 
-    let name = path.substring(path.indexOf("/") + 1);
-    name = name.indexOf("/") > -1 ? name.substring(0, name.indexOf("/")) : name;
-
-    const caption =
-      (name &&
-        this.hass.localize(
-          `ui.dialogs.quick-bar.commands.navigation.${name}`
-        )) ||
-      (page.translationKey && this.hass.localize(page.translationKey));
-
-    if (caption) {
+    if (page.translationKey && caption) {
       return { ...page, primaryText: caption };
     }
 
@@ -725,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() {

src/panels/calendar/ha-full-calendar.ts

@@ -11,7 +11,14 @@ import listPlugin from "@fullcalendar/list";
 // @ts-ignore
 import listStyle from "@fullcalendar/list/main.css";
 import "@material/mwc-button";
-import { mdiViewAgenda, mdiViewDay, mdiViewModule, mdiViewWeek } from "@mdi/js";
+import {
+  mdiChevronLeft,
+  mdiChevronRight,
+  mdiViewAgenda,
+  mdiViewDay,
+  mdiViewModule,
+  mdiViewWeek,
+} from "@mdi/js";
 import {
   css,
   CSSResultGroup,
@@ -26,6 +33,7 @@ import memoize from "memoize-one";
 import { useAmPm } from "../../common/datetime/use_am_pm";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../../components/ha-button-toggle-group";
+import "../../components/ha-icon-button";
 import "../../components/ha-icon-button-prev";
 import "../../components/ha-icon-button-next";
 import { haStyle } from "../../resources/styles";
@@ -144,18 +152,20 @@ export class HAFullCalendar extends LitElement {
                     <div class="controls">
                       <h1>${this.calendar.view.title}</h1>
                       <div>
-                        <ha-icon-button-prev
+                        <ha-icon-button
                           .label=${this.hass.localize("ui.common.previous")}
+                          .path=${mdiChevronLeft}
                           class="prev"
                           @click=${this._handlePrev}
                         >
-                        </ha-icon-button-prev>
-                        <ha-icon-button-next
+                        </ha-icon-button>
+                        <ha-icon-button
                           .label=${this.hass.localize("ui.common.next")}
+                          .path=${mdiChevronRight}
                           class="next"
                           @click=${this._handleNext}
                         >
-                        </ha-icon-button-next>
+                        </ha-icon-button>
                       </div>
                     </div>
                     <div class="controls">

src/panels/config/application_credentials/dialog-add-application-credential.ts

@@ -1,224 +0,0 @@
-import "@material/mwc-button";
-import "@material/mwc-list/mwc-list-item";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { ComboBoxLitRenderer } from "lit-vaadin-helpers";
-import { fireEvent } from "../../../common/dom/fire_event";
-import "../../../components/ha-circular-progress";
-import "../../../components/ha-combo-box";
-import { createCloseHeading } from "../../../components/ha-dialog";
-import "../../../components/ha-textfield";
-import {
-  fetchApplicationCredentialsConfig,
-  createApplicationCredential,
-  ApplicationCredential,
-} from "../../../data/application_credential";
-import { domainToName } from "../../../data/integration";
-import { PolymerChangedEvent } from "../../../polymer-types";
-import { haStyleDialog } from "../../../resources/styles";
-import { HomeAssistant } from "../../../types";
-import { AddApplicationCredentialDialogParams } from "./show-dialog-add-application-credential";
-
-interface Domain {
-  id: string;
-  name: string;
-}
-
-const rowRenderer: ComboBoxLitRenderer<Domain> = (item) => html`<mwc-list-item>
-  <span>${item.name}</span>
-</mwc-list-item>`;
-
-@customElement("dialog-add-application-credential")
-export class DialogAddApplicationCredential extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @state() private _loading = false;
-
-  // Error message when can't talk to server etc
-  @state() private _error?: string;
-
-  @state() private _params?: AddApplicationCredentialDialogParams;
-
-  @state() private _domain?: string;
-
-  @state() private _clientId?: string;
-
-  @state() private _clientSecret?: string;
-
-  @state() private _domains?: Domain[];
-
-  public showDialog(params: AddApplicationCredentialDialogParams) {
-    this._params = params;
-    this._domain = "";
-    this._clientId = "";
-    this._clientSecret = "";
-    this._error = undefined;
-    this._loading = false;
-    this._fetchConfig();
-  }
-
-  private async _fetchConfig() {
-    const config = await fetchApplicationCredentialsConfig(this.hass);
-    this._domains = config.domains.map((domain) => ({
-      id: domain,
-      name: domainToName(this.hass.localize, domain),
-    }));
-  }
-
-  protected render(): TemplateResult {
-    if (!this._params || !this._domains) {
-      return html``;
-    }
-    return html`
-      <ha-dialog
-        open
-        @closed=${this.closeDialog}
-        scrimClickAction
-        escapeKeyAction
-        .heading=${createCloseHeading(
-          this.hass,
-          this.hass.localize(
-            "ui.panel.config.application_credentials.editor.caption"
-          )
-        )}
-      >
-        <div>
-          ${this._error ? html` <div class="error">${this._error}</div> ` : ""}
-          <ha-combo-box
-            name="domain"
-            .hass=${this.hass}
-            .label=${this.hass.localize(
-              "ui.panel.config.application_credentials.editor.domain"
-            )}
-            .value=${this._domain}
-            .renderer=${rowRenderer}
-            .items=${this._domains}
-            item-id-path="id"
-            item-value-path="id"
-            item-label-path="name"
-            required
-            @value-changed=${this._handleDomainPicked}
-          ></ha-combo-box>
-          <ha-textfield
-            class="clientId"
-            name="clientId"
-            .label=${this.hass.localize(
-              "ui.panel.config.application_credentials.editor.client_id"
-            )}
-            .value=${this._clientId}
-            required
-            @input=${this._handleValueChanged}
-            error-message=${this.hass.localize("ui.common.error_required")}
-            dialogInitialFocus
-          ></ha-textfield>
-          <ha-textfield
-            .label=${this.hass.localize(
-              "ui.panel.config.application_credentials.editor.client_secret"
-            )}
-            type="password"
-            name="clientSecret"
-            .value=${this._clientSecret}
-            required
-            @input=${this._handleValueChanged}
-            error-message=${this.hass.localize("ui.common.error_required")}
-          ></ha-textfield>
-        </div>
-        ${this._loading
-          ? html`
-              <div slot="primaryAction" class="submit-spinner">
-                <ha-circular-progress active></ha-circular-progress>
-              </div>
-            `
-          : html`
-              <mwc-button
-                slot="primaryAction"
-                .disabled=${!this._domain ||
-                !this._clientId ||
-                !this._clientSecret}
-                @click=${this._createApplicationCredential}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.application_credentials.editor.create"
-                )}
-              </mwc-button>
-            `}
-      </ha-dialog>
-    `;
-  }
-
-  public closeDialog() {
-    this._params = undefined;
-    this._domains = undefined;
-    fireEvent(this, "dialog-closed", { dialog: this.localName });
-  }
-
-  private async _handleDomainPicked(ev: PolymerChangedEvent<string>) {
-    const target = ev.target as any;
-    if (target.selectedItem) {
-      this._domain = target.selectedItem.id;
-    }
-  }
-
-  private _handleValueChanged(ev: CustomEvent) {
-    this._error = undefined;
-    const name = (ev.target as any).name;
-    const value = (ev.target as any).value;
-    this[`_${name}`] = value;
-  }
-
-  private async _createApplicationCredential(ev) {
-    ev.preventDefault();
-    if (!this._domain || !this._clientId || !this._clientSecret) {
-      return;
-    }
-
-    this._loading = true;
-    this._error = "";
-
-    let applicationCredential: ApplicationCredential;
-    try {
-      applicationCredential = await createApplicationCredential(
-        this.hass,
-        this._domain,
-        this._clientId,
-        this._clientSecret
-      );
-    } catch (err: any) {
-      this._loading = false;
-      this._error = err.message;
-      return;
-    }
-    this._params!.applicationCredentialAddedCallback(applicationCredential);
-    this.closeDialog();
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      haStyleDialog,
-      css`
-        ha-dialog {
-          --mdc-dialog-max-width: 500px;
-          --dialog-z-index: 10;
-        }
-        .row {
-          display: flex;
-          padding: 8px 0;
-        }
-        ha-combo-box {
-          display: block;
-          margin-bottom: 24px;
-        }
-        ha-textfield {
-          display: block;
-          margin-bottom: 24px;
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "dialog-add-application-credential": DialogAddApplicationCredential;
-  }
-}

src/panels/config/application_credentials/ha-config-application-credentials.ts

@@ -1,259 +0,0 @@
-import { mdiDelete, mdiPlus } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
-import memoizeOne from "memoize-one";
-import type { HASSDomEvent } from "../../../common/dom/fire_event";
-import { LocalizeFunc } from "../../../common/translations/localize";
-import {
-  DataTableColumnContainer,
-  SelectionChangedEvent,
-} from "../../../components/data-table/ha-data-table";
-import "../../../components/data-table/ha-data-table-icon";
-import "../../../components/ha-fab";
-import "../../../components/ha-help-tooltip";
-import "../../../components/ha-svg-icon";
-import {
-  ApplicationCredential,
-  deleteApplicationCredential,
-  fetchApplicationCredentials,
-} from "../../../data/application_credential";
-import { domainToName } from "../../../data/integration";
-import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
-import "../../../layouts/hass-tabs-subpage-data-table";
-import type { HaTabsSubpageDataTable } from "../../../layouts/hass-tabs-subpage-data-table";
-import { HomeAssistant, Route } from "../../../types";
-import { configSections } from "../ha-panel-config";
-import { showAddApplicationCredentialDialog } from "./show-dialog-add-application-credential";
-
-@customElement("ha-config-application-credentials")
-export class HaConfigApplicationCredentials extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @state() public _applicationCredentials: ApplicationCredential[] = [];
-
-  @property() public isWide!: boolean;
-
-  @property() public narrow!: boolean;
-
-  @property() public route!: Route;
-
-  @state() private _selected: string[] = [];
-
-  @query("hass-tabs-subpage-data-table", true)
-  private _dataTable!: HaTabsSubpageDataTable;
-
-  private _columns = memoizeOne(
-    (narrow: boolean, localize: LocalizeFunc): DataTableColumnContainer => {
-      const columns: DataTableColumnContainer<ApplicationCredential> = {
-        clientId: {
-          title: localize(
-            "ui.panel.config.application_credentials.picker.headers.client_id"
-          ),
-          width: "25%",
-          direction: "asc",
-          grows: true,
-          template: (_, entry: ApplicationCredential) =>
-            html`${entry.client_id}`,
-        },
-        application: {
-          title: localize(
-            "ui.panel.config.application_credentials.picker.headers.application"
-          ),
-          sortable: true,
-          width: "20%",
-          direction: "asc",
-          hidden: narrow,
-          template: (_, entry) => html`${domainToName(localize, entry.domain)}`,
-        },
-      };
-
-      return columns;
-    }
-  );
-
-  protected firstUpdated(changedProperties: PropertyValues) {
-    super.firstUpdated(changedProperties);
-    this._loadTranslations();
-    this._fetchApplicationCredentials();
-  }
-
-  protected render() {
-    return html`
-      <hass-tabs-subpage-data-table
-        .hass=${this.hass}
-        .narrow=${this.narrow}
-        .route=${this.route}
-        backPath="/config"
-        .tabs=${configSections.devices}
-        .columns=${this._columns(this.narrow, this.hass.localize)}
-        .data=${this._applicationCredentials}
-        hasFab
-        selectable
-        @selection-changed=${this._handleSelectionChanged}
-      >
-        ${this._selected.length
-          ? html`
-              <div
-                class=${classMap({
-                  "header-toolbar": this.narrow,
-                  "table-header": !this.narrow,
-                })}
-                slot="header"
-              >
-                <p class="selected-txt">
-                  ${this.hass.localize(
-                    "ui.panel.config.application_credentials.picker.selected",
-                    "number",
-                    this._selected.length
-                  )}
-                </p>
-                <div class="header-btns">
-                  ${!this.narrow
-                    ? html`
-                        <mwc-button
-                          @click=${this._removeSelected}
-                          class="warning"
-                          >${this.hass.localize(
-                            "ui.panel.config.application_credentials.picker.remove_selected.button"
-                          )}</mwc-button
-                        >
-                      `
-                    : html`
-                        <ha-icon-button
-                          class="warning"
-                          id="remove-btn"
-                          @click=${this._removeSelected}
-                          .path=${mdiDelete}
-                          .label=${this.hass.localize("ui.common.remove")}
-                        ></ha-icon-button>
-                        <ha-help-tooltip
-                          .label=${this.hass.localize(
-                            "ui.panel.config.application_credentials.picker.remove_selected.button"
-                          )}
-                        >
-                        </ha-help-tooltip>
-                      `}
-                </div>
-              </div>
-            `
-          : html``}
-        <ha-fab
-          slot="fab"
-          .label=${this.hass.localize(
-            "ui.panel.config.application_credentials.picker.add_application_credential"
-          )}
-          extended
-          @click=${this._addApplicationCredential}
-        >
-          <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
-        </ha-fab>
-      </hass-tabs-subpage-data-table>
-    `;
-  }
-
-  private _handleSelectionChanged(
-    ev: HASSDomEvent<SelectionChangedEvent>
-  ): void {
-    this._selected = ev.detail.value;
-  }
-
-  private _removeSelected() {
-    showConfirmationDialog(this, {
-      title: this.hass.localize(
-        `ui.panel.config.application_credentials.picker.remove_selected.confirm_title`,
-        "number",
-        this._selected.length
-      ),
-      text: this.hass.localize(
-        "ui.panel.config.application_credentials.picker.remove_selected.confirm_text"
-      ),
-      confirmText: this.hass.localize("ui.common.remove"),
-      dismissText: this.hass.localize("ui.common.cancel"),
-      confirm: async () => {
-        await Promise.all(
-          this._selected.map(async (applicationCredential) => {
-            await deleteApplicationCredential(this.hass, applicationCredential);
-          })
-        );
-        this._dataTable.clearSelection();
-        this._fetchApplicationCredentials();
-      },
-    });
-  }
-
-  private async _loadTranslations() {
-    await this.hass.loadBackendTranslation("title", undefined, true);
-  }
-
-  private async _fetchApplicationCredentials() {
-    this._applicationCredentials = await fetchApplicationCredentials(this.hass);
-  }
-
-  private _addApplicationCredential() {
-    showAddApplicationCredentialDialog(this, {
-      applicationCredentialAddedCallback: async (
-        applicationCredential: ApplicationCredential
-      ) => {
-        if (applicationCredential) {
-          this._applicationCredentials = [
-            ...this._applicationCredentials,
-            applicationCredential,
-          ];
-        }
-      },
-    });
-  }
-
-  static get styles(): CSSResultGroup {
-    return css`
-      .table-header {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        height: 56px;
-        background-color: var(--mdc-text-field-fill-color, whitesmoke);
-        border-bottom: 1px solid
-          var(--mdc-text-field-idle-line-color, rgba(0, 0, 0, 0.42));
-        box-sizing: border-box;
-      }
-      .header-toolbar {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        color: var(--secondary-text-color);
-        position: relative;
-        top: -4px;
-      }
-      .selected-txt {
-        font-weight: bold;
-        padding-left: 16px;
-      }
-      .table-header .selected-txt {
-        margin-top: 20px;
-      }
-      .header-toolbar .selected-txt {
-        font-size: 16px;
-      }
-      .header-toolbar .header-btns {
-        margin-right: -12px;
-      }
-      .header-btns {
-        display: flex;
-      }
-      .header-btns > mwc-button,
-      .header-btns > ha-icon-button {
-        margin: 8px;
-      }
-      ha-button-menu {
-        margin-left: 8px;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-config-application-credentials": HaConfigApplicationCredentials;
-  }
-}

src/panels/config/application_credentials/show-dialog-add-application-credential.ts

@@ -1,22 +0,0 @@
-import { fireEvent } from "../../../common/dom/fire_event";
-import { ApplicationCredential } from "../../../data/application_credential";
-
-export interface AddApplicationCredentialDialogParams {
-  applicationCredentialAddedCallback: (
-    applicationCredential: ApplicationCredential
-  ) => void;
-}
-
-export const loadAddApplicationCredentialDialog = () =>
-  import("./dialog-add-application-credential");
-
-export const showAddApplicationCredentialDialog = (
-  element: HTMLElement,
-  dialogParams: AddApplicationCredentialDialogParams
-): void => {
-  fireEvent(element, "show-dialog", {
-    dialogTag: "dialog-add-application-credential",
-    dialogImport: loadAddApplicationCredentialDialog,
-    dialogParams,
-  });
-};

src/panels/config/areas/ha-config-area-page.ts

@@ -259,7 +259,6 @@ class HaConfigAreaPage extends LitElement {
                   <ha-svg-icon .path=${mdiImagePlus} slot="icon"></ha-svg-icon>
                 </mwc-button>`}
             <ha-card
-              outlined
               .header=${this.hass.localize("ui.panel.config.devices.caption")}
               >${devices.length
                 ? devices.map(
@@ -282,7 +281,6 @@ class HaConfigAreaPage extends LitElement {
                   `}
             </ha-card>
             <ha-card
-              outlined
               .header=${this.hass.localize(
                 "ui.panel.config.areas.editor.linked_entities_caption"
               )}
@@ -316,7 +314,6 @@ class HaConfigAreaPage extends LitElement {
             ${isComponentLoaded(this.hass, "automation")
               ? html`
                   <ha-card
-                    outlined
                     .header=${this.hass.localize(
                       "ui.panel.config.devices.automation.automations_heading"
                     )}
@@ -364,7 +361,6 @@ class HaConfigAreaPage extends LitElement {
             ${isComponentLoaded(this.hass, "scene")
               ? html`
                   <ha-card
-                    outlined
                     .header=${this.hass.localize(
                       "ui.panel.config.devices.scene.scenes_heading"
                     )}
@@ -404,7 +400,6 @@ class HaConfigAreaPage extends LitElement {
             ${isComponentLoaded(this.hass, "script")
               ? html`
                   <ha-card
-                    outlined
                     .header=${this.hass.localize(
                       "ui.panel.config.devices.script.scripts_heading"
                     )}

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

@@ -33,7 +33,6 @@ import "./types/ha-automation-action-delay";
 import "./types/ha-automation-action-device_id";
 import "./types/ha-automation-action-event";
 import "./types/ha-automation-action-if";
-import "./types/ha-automation-action-parallel";
 import "./types/ha-automation-action-play_media";
 import "./types/ha-automation-action-repeat";
 import "./types/ha-automation-action-service";
@@ -55,7 +54,6 @@ const OPTIONS = [
   "if",
   "device_id",
   "stop",
-  "parallel",
 ];
 
 const getType = (action: Action | undefined) => {
@@ -65,9 +63,6 @@ const getType = (action: Action | undefined) => {
   if ("service" in action || "scene" in action) {
     return getActionType(action);
   }
-  if (["and", "or", "not"].some((key) => key in action)) {
-    return "condition";
-  }
   return OPTIONS.find((option) => option in action);
 };
 
@@ -164,83 +159,63 @@ export default class HaAutomationActionRow extends LitElement {
     const yamlMode = this._yamlMode;
 
     return html`
-      <ha-card outlined>
-        ${this.action.enabled === false
-          ? html`<div class="disabled-bar">
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.disabled"
-              )}
-            </div>`
-          : ""}
-        <div class="card-menu">
-          ${this.index !== 0
-            ? html`
-                <ha-icon-button
-                  .label=${this.hass.localize(
-                    "ui.panel.config.automation.editor.move_up"
-                  )}
-                  .path=${mdiArrowUp}
-                  @click=${this._moveUp}
-                ></ha-icon-button>
-              `
-            : ""}
-          ${this.index !== this.totalActions - 1
-            ? html`
-                <ha-icon-button
-                  .label=${this.hass.localize(
-                    "ui.panel.config.automation.editor.move_down"
-                  )}
-                  .path=${mdiArrowDown}
-                  @click=${this._moveDown}
-                ></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>
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.run_action"
-              )}
-            </mwc-list-item>
-            <mwc-list-item .disabled=${!this._uiModeAvailable}>
-              ${yamlMode
-                ? this.hass.localize(
-                    "ui.panel.config.automation.editor.edit_ui"
-                  )
-                : this.hass.localize(
-                    "ui.panel.config.automation.editor.edit_yaml"
-                  )}
-            </mwc-list-item>
-            <mwc-list-item>
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.duplicate"
-              )}
-            </mwc-list-item>
-            <mwc-list-item>
-              ${this.action.enabled === false
-                ? this.hass.localize(
-                    "ui.panel.config.automation.editor.actions.enable"
-                  )
-                : this.hass.localize(
-                    "ui.panel.config.automation.editor.actions.disable"
-                  )}
-            </mwc-list-item>
-            <mwc-list-item class="warning">
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.delete"
-              )}
-            </mwc-list-item>
-          </ha-button-menu>
-        </div>
-        <div
-          class="card-content ${this.action.enabled === false
-            ? "disabled"
-            : ""}"
-        >
+      <ha-card>
+        <div class="card-content">
+          <div class="card-menu">
+            ${this.index !== 0
+              ? html`
+                  <ha-icon-button
+                    .label=${this.hass.localize(
+                      "ui.panel.config.automation.editor.move_up"
+                    )}
+                    .path=${mdiArrowUp}
+                    @click=${this._moveUp}
+                  ></ha-icon-button>
+                `
+              : ""}
+            ${this.index !== this.totalActions - 1
+              ? html`
+                  <ha-icon-button
+                    .label=${this.hass.localize(
+                      "ui.panel.config.automation.editor.move_down"
+                    )}
+                    .path=${mdiArrowDown}
+                    @click=${this._moveDown}
+                  ></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>
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.run_action"
+                )}
+              </mwc-list-item>
+              <mwc-list-item .disabled=${!this._uiModeAvailable}>
+                ${yamlMode
+                  ? this.hass.localize(
+                      "ui.panel.config.automation.editor.edit_ui"
+                    )
+                  : this.hass.localize(
+                      "ui.panel.config.automation.editor.edit_yaml"
+                    )}
+              </mwc-list-item>
+              <mwc-list-item>
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.duplicate"
+                )}
+              </mwc-list-item>
+              <mwc-list-item class="warning">
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.delete"
+                )}
+              </mwc-list-item>
+            </ha-button-menu>
+          </div>
           ${this._warnings
             ? html`<ha-alert
                 alert-type="warning"
@@ -339,23 +314,11 @@ export default class HaAutomationActionRow extends LitElement {
         fireEvent(this, "duplicate");
         break;
       case 3:
-        this._onDisable();
-        break;
-      case 4:
         this._onDelete();
         break;
     }
   }
 
-  private _onDisable() {
-    const enabled = !(this.action.enabled ?? true);
-    const value = { ...this.action, enabled };
-    fireEvent(this, "value-changed", { value });
-    if (this._yamlMode) {
-      this._yamlEditor?.setValue(value);
-    }
-  }
-
   private async _runAction() {
     const validated = await validateConfig(this.hass, {
       action: this.action,
@@ -445,27 +408,11 @@ export default class HaAutomationActionRow extends LitElement {
     return [
       haStyle,
       css`
-        .disabled {
-          opacity: 0.5;
-          pointer-events: none;
-        }
-        .card-content {
-          padding-top: 16px;
-          margin-top: 0;
-        }
-        .disabled-bar {
-          background: var(--divider-color, #e0e0e0);
-          text-align: center;
-          border-top-right-radius: var(--ha-card-border-radius);
-          border-top-left-radius: var(--ha-card-border-radius);
-        }
         .card-menu {
-          float: right;
+          position: absolute;
+          right: 16px;
           z-index: 3;
-          margin: 4px;
           --mdc-theme-text-primary-on-background: var(--primary-text-color);
-          display: flex;
-          align-items: center;
         }
         :host-context([style*="direction: rtl;"]) .card-menu {
           right: initial;

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

@@ -1,4 +1,3 @@
-import deepClone from "deep-clone-simple";
 import "@material/mwc-button";
 import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -33,7 +32,7 @@ export default class HaAutomationAction extends LitElement {
           ></ha-automation-action-row>
         `
       )}
-      <ha-card outlined>
+      <ha-card>
         <div class="card-actions add-card">
           <mwc-button @click=${this._addAction}>
             ${this.hass.localize(
@@ -84,7 +83,7 @@ export default class HaAutomationAction extends LitElement {
     ev.stopPropagation();
     const index = (ev.target as any).index;
     fireEvent(this, "value-changed", {
-      value: this.actions.concat(deepClone(this.actions[index])),
+      value: this.actions.concat(this.actions[index]),
     });
   }
 

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

@@ -69,7 +69,7 @@ export class HaChooseAction extends LitElement implements ActionElement {
           </div>
         </ha-card>`
       )}
-      <ha-card outlined>
+      <ha-card>
         <div class="card-actions add-card">
           <mwc-button @click=${this._addOption}>
             ${this.hass.localize(

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

@@ -1,56 +0,0 @@
-import { CSSResultGroup, html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators";
-import { fireEvent } from "../../../../../common/dom/fire_event";
-import { Action, ParallelAction } from "../../../../../data/script";
-import { HaDeviceAction } from "./ha-automation-action-device_id";
-import { haStyle } from "../../../../../resources/styles";
-import type { HomeAssistant } from "../../../../../types";
-import "../ha-automation-action";
-import "../../../../../components/ha-textfield";
-import type { ActionElement } from "../ha-automation-action-row";
-
-@customElement("ha-automation-action-parallel")
-export class HaParallelAction extends LitElement implements ActionElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public action!: ParallelAction;
-
-  public static get defaultConfig() {
-    return {
-      parallel: [HaDeviceAction.defaultConfig],
-    };
-  }
-
-  protected render() {
-    const action = this.action;
-
-    return html`
-      <ha-automation-action
-        .actions=${action.parallel}
-        @value-changed=${this._actionsChanged}
-        .hass=${this.hass}
-      ></ha-automation-action>
-    `;
-  }
-
-  private _actionsChanged(ev: CustomEvent) {
-    ev.stopPropagation();
-    const value = ev.detail.value as Action[];
-    fireEvent(this, "value-changed", {
-      value: {
-        ...this.action,
-        parallel: value,
-      },
-    });
-  }
-
-  static get styles(): CSSResultGroup {
-    return haStyle;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-automation-action-parallel": HaParallelAction;
-  }
-}

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

@@ -33,7 +33,7 @@ export class HaWaitAction extends LitElement implements ActionElement {
   @property({ attribute: false }) public action!: WaitAction;
 
   public static get defaultConfig() {
-    return { wait_template: "", continue_on_timeout: true };
+    return { wait_template: "" };
   }
 
   protected render() {

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

@@ -75,7 +75,7 @@ export class HaBlueprintAutomationEditor extends LitElement {
             "ui.panel.config.automation.editor.introduction"
           )}
         </span>
-        <ha-card outlined>
+        <ha-card>
           <div class="card-content">
             <ha-textfield
               .label=${this.hass.localize(
@@ -145,7 +145,6 @@ export class HaBlueprintAutomationEditor extends LitElement {
       </ha-config-section>
 
       <ha-card
-        outlined
         class="blueprint"
         .header=${this.hass.localize(
           "ui.panel.config.automation.editor.blueprint.header"

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

@@ -5,11 +5,11 @@ import { dynamicElement } from "../../../../common/dom/dynamic-element-directive
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { stringCompare } from "../../../../common/string/compare";
 import type { LocalizeFunc } from "../../../../common/translations/localize";
+import "../../../../components/ha-card";
 import "../../../../components/ha-select";
 import type { HaSelect } from "../../../../components/ha-select";
 import "../../../../components/ha-yaml-editor";
 import type { Condition } from "../../../../data/automation";
-import { expandConditionWithShorthand } from "../../../../data/automation";
 import { haStyle } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
 import "./types/ha-automation-condition-and";
@@ -42,14 +42,10 @@ const OPTIONS = [
 export default class HaAutomationConditionEditor extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property() condition!: Condition;
+  @property() public condition!: Condition;
 
   @property() public yamlMode = false;
 
-  private _processedCondition = memoizeOne((condition) =>
-    expandConditionWithShorthand(condition)
-  );
-
   private _processedTypes = memoizeOne(
     (localize: LocalizeFunc): [string, string][] =>
       OPTIONS.map(
@@ -64,8 +60,7 @@ export default class HaAutomationConditionEditor extends LitElement {
   );
 
   protected render() {
-    const condition = this._processedCondition(this.condition);
-    const selected = OPTIONS.indexOf(condition.condition);
+    const selected = OPTIONS.indexOf(this.condition.condition);
     const yamlMode = this.yamlMode || selected === -1;
     return html`
       ${yamlMode
@@ -75,7 +70,7 @@ export default class HaAutomationConditionEditor extends LitElement {
                   ${this.hass.localize(
                     "ui.panel.config.automation.editor.conditions.unsupported_condition",
                     "condition",
-                    condition.condition
+                    this.condition.condition
                   )}
                 `
               : ""}
@@ -95,7 +90,7 @@ export default class HaAutomationConditionEditor extends LitElement {
               .label=${this.hass.localize(
                 "ui.panel.config.automation.editor.conditions.type_select"
               )}
-              .value=${condition.condition}
+              .value=${this.condition.condition}
               naturalMenuWidth
               @selected=${this._typeChanged}
             >
@@ -108,8 +103,8 @@ export default class HaAutomationConditionEditor extends LitElement {
 
             <div>
               ${dynamicElement(
-                `ha-automation-condition-${condition.condition}`,
-                { hass: this.hass, condition: condition }
+                `ha-automation-condition-${this.condition.condition}`,
+                { hass: this.hass, condition: this.condition }
               )}
             </div>
           `}
@@ -129,7 +124,7 @@ export default class HaAutomationConditionEditor extends LitElement {
       defaultConfig: Omit<Condition, "condition">;
     };
 
-    if (type !== this._processedCondition(this.condition).condition) {
+    if (type !== this.condition.condition) {
       fireEvent(this, "value-changed", {
         value: {
           condition: type,

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

@@ -2,7 +2,7 @@ import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
 import "@material/mwc-list/mwc-list-item";
 import { mdiDotsVertical } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { handleStructError } from "../../../../common/structs/handle-errors";
 import "../../../../components/ha-button-menu";
@@ -19,7 +19,6 @@ import { haStyle } from "../../../../resources/styles";
 import { HomeAssistant } from "../../../../types";
 import "./ha-automation-condition-editor";
 import { validateConfig } from "../../../../data/config";
-import { HaYamlEditor } from "../../../../components/ha-yaml-editor";
 
 export interface ConditionElement extends LitElement {
   condition: Condition;
@@ -60,69 +59,47 @@ export default class HaAutomationConditionRow extends LitElement {
 
   @state() private _warnings?: string[];
 
-  @query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor;
-
   protected render() {
     if (!this.condition) {
       return html``;
     }
     return html`
-      <ha-card outlined>
-        ${this.condition.enabled === false
-          ? html`<div class="disabled-bar">
+      <ha-card>
+        <div class="card-content">
+          <div class="card-menu">
+            <ha-progress-button @click=${this._testCondition}>
               ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.disabled"
+                "ui.panel.config.automation.editor.conditions.test"
               )}
-            </div>`
-          : ""}
-        <div class="card-menu">
-          <ha-progress-button @click=${this._testCondition}>
-            ${this.hass.localize(
-              "ui.panel.config.automation.editor.conditions.test"
-            )}
-          </ha-progress-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>
-              ${this._yamlMode
-                ? this.hass.localize(
-                    "ui.panel.config.automation.editor.edit_ui"
-                  )
-                : this.hass.localize(
-                    "ui.panel.config.automation.editor.edit_yaml"
-                  )}
-            </mwc-list-item>
-            <mwc-list-item>
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.duplicate"
-              )}
-            </mwc-list-item>
-            <mwc-list-item>
-              ${this.condition.enabled === false
-                ? this.hass.localize(
-                    "ui.panel.config.automation.editor.actions.enable"
-                  )
-                : this.hass.localize(
-                    "ui.panel.config.automation.editor.actions.disable"
-                  )}
-            </mwc-list-item>
-            <mwc-list-item class="warning">
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.delete"
-              )}
-            </mwc-list-item>
-          </ha-button-menu>
-        </div>
-        <div
-          class="card-content ${this.condition.enabled === false
-            ? "disabled"
-            : ""}"
-        >
+            </ha-progress-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>
+                ${this._yamlMode
+                  ? this.hass.localize(
+                      "ui.panel.config.automation.editor.edit_ui"
+                    )
+                  : this.hass.localize(
+                      "ui.panel.config.automation.editor.edit_yaml"
+                    )}
+              </mwc-list-item>
+              <mwc-list-item>
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.duplicate"
+                )}
+              </mwc-list-item>
+              <mwc-list-item class="warning">
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.delete"
+                )}
+              </mwc-list-item>
+            </ha-button-menu>
+          </div>
           ${this._warnings
             ? html`<ha-alert
                 alert-type="warning"
@@ -176,23 +153,11 @@ export default class HaAutomationConditionRow extends LitElement {
         fireEvent(this, "duplicate");
         break;
       case 2:
-        this._onDisable();
-        break;
-      case 3:
         this._onDelete();
         break;
     }
   }
 
-  private _onDisable() {
-    const enabled = !(this.condition.enabled ?? true);
-    const value = { ...this.condition, enabled };
-    fireEvent(this, "value-changed", { value });
-    if (this._yamlMode) {
-      this._yamlEditor?.setValue(value);
-    }
-  }
-
   private _onDelete() {
     showConfirmationDialog(this, {
       text: this.hass.localize(
@@ -273,24 +238,9 @@ export default class HaAutomationConditionRow extends LitElement {
     return [
       haStyle,
       css`
-        .disabled {
-          opacity: 0.5;
-          pointer-events: none;
-        }
-        .card-content {
-          padding-top: 16px;
-          margin-top: 0;
-        }
-        .disabled-bar {
-          background: var(--divider-color, #e0e0e0);
-          text-align: center;
-          border-top-right-radius: var(--ha-card-border-radius);
-          border-top-left-radius: var(--ha-card-border-radius);
-        }
         .card-menu {
           float: right;
           z-index: 3;
-          margin: 4px;
           --mdc-theme-text-primary-on-background: var(--primary-text-color);
           display: flex;
           align-items: center;

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

@@ -1,4 +1,3 @@
-import deepClone from "deep-clone-simple";
 import "@material/mwc-button";
 import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -57,7 +56,7 @@ export default class HaAutomationCondition extends LitElement {
           ></ha-automation-condition-row>
         `
       )}
-      <ha-card outlined>
+      <ha-card>
         <div class="card-actions add-card">
           <mwc-button @click=${this._addCondition}>
             ${this.hass.localize(
@@ -97,7 +96,7 @@ export default class HaAutomationCondition extends LitElement {
     ev.stopPropagation();
     const index = (ev.target as any).index;
     fireEvent(this, "value-changed", {
-      value: this.conditions.concat(deepClone(this.conditions[index])),
+      value: this.conditions.concat(this.conditions[index]),
     });
   }
 

src/panels/config/automation/dialog-new-automation.ts

@@ -3,6 +3,7 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
 import "../../../components/ha-blueprint-picker";
+import "../../../components/ha-card";
 import "../../../components/ha-circular-progress";
 import { createCloseHeading } from "../../../components/ha-dialog";
 import { showAutomationEditor } from "../../../data/automation";

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

@@ -239,8 +239,8 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
                   ? html`
                       ${!this.narrow
                         ? html`
-                            <ha-card outlined>
-                              <div class="card-header">
+                            <ha-card
+                              ><div class="card-header">
                                 ${this._config.alias}
                               </div>
                               ${stateObj
@@ -275,8 +275,8 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
                         .defaultValue=${this._preprocessYaml()}
                         @value-changed=${this._yamlChanged}
                       ></ha-yaml-editor>
-                      <ha-card outlined>
-                        <div class="card-actions">
+                      <ha-card
+                        ><div class="card-actions">
                           <mwc-button @click=${this._copyYaml}>
                             ${this.hass.localize(
                               "ui.panel.config.automation.editor.copy_to_clipboard"

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

@@ -47,7 +47,7 @@ export class HaManualAutomationEditor extends LitElement {
             "ui.panel.config.automation.editor.introduction"
           )}
         </span>
-        <ha-card outlined>
+        <ha-card>
           <div class="card-content">
             <ha-textfield
               .label=${this.hass.localize(

src/panels/config/automation/structs.ts

@@ -1,9 +1,8 @@
-import { object, optional, number, string, boolean } from "superstruct";
+import { object, optional, number, string } from "superstruct";
 
 export const baseTriggerStruct = object({
   platform: string(),
   id: optional(string()),
-  enabled: optional(boolean()),
 });
 
 export const forDictStruct = object({

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

@@ -3,7 +3,7 @@ import "@material/mwc-list/mwc-list-item";
 import { mdiDotsVertical } from "@mdi/js";
 import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import memoizeOne from "memoize-one";
 import { dynamicElement } from "../../../../common/dom/dynamic-element-directive";
@@ -16,7 +16,7 @@ import "../../../../components/ha-alert";
 import "../../../../components/ha-button-menu";
 import "../../../../components/ha-card";
 import "../../../../components/ha-icon-button";
-import { HaYamlEditor } from "../../../../components/ha-yaml-editor";
+import "../../../../components/ha-yaml-editor";
 import "../../../../components/ha-select";
 import type { HaSelect } from "../../../../components/ha-select";
 import "../../../../components/ha-textfield";
@@ -104,8 +104,6 @@ export default class HaAutomationTriggerRow extends LitElement {
 
   @state() private _triggerColor = false;
 
-  @query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor;
-
   private _triggerUnsub?: Promise<UnsubscribeFunc>;
 
   private _processedTypes = memoizeOne(
@@ -127,61 +125,41 @@ export default class HaAutomationTriggerRow extends LitElement {
     const showId = "id" in this.trigger || this._requestShowId;
 
     return html`
-      <ha-card outlined>
-        ${this.trigger.enabled === false
-          ? html`<div class="disabled-bar">
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.disabled"
-              )}
-            </div>`
-          : ""}
-        <div class="card-menu">
-          <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>
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.triggers.edit_id"
-              )}
-            </mwc-list-item>
-            <mwc-list-item .disabled=${selected === -1}>
-              ${yamlMode
-                ? this.hass.localize(
-                    "ui.panel.config.automation.editor.edit_ui"
-                  )
-                : this.hass.localize(
-                    "ui.panel.config.automation.editor.edit_yaml"
-                  )}
-            </mwc-list-item>
-            <mwc-list-item>
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.duplicate"
-              )}
-            </mwc-list-item>
-            <mwc-list-item>
-              ${this.trigger.enabled === false
-                ? this.hass.localize(
-                    "ui.panel.config.automation.editor.actions.enable"
-                  )
-                : this.hass.localize(
-                    "ui.panel.config.automation.editor.actions.disable"
-                  )}
-            </mwc-list-item>
-            <mwc-list-item class="warning">
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.delete"
-              )}
-            </mwc-list-item>
-          </ha-button-menu>
-        </div>
-        <div
-          class="card-content ${this.trigger.enabled === false
-            ? "disabled"
-            : ""}"
-        >
+      <ha-card>
+        <div class="card-content">
+          <div class="card-menu">
+            <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>
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.triggers.edit_id"
+                )}
+              </mwc-list-item>
+              <mwc-list-item .disabled=${selected === -1}>
+                ${yamlMode
+                  ? this.hass.localize(
+                      "ui.panel.config.automation.editor.edit_ui"
+                    )
+                  : this.hass.localize(
+                      "ui.panel.config.automation.editor.edit_yaml"
+                    )}
+              </mwc-list-item>
+              <mwc-list-item>
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.duplicate"
+                )}
+              </mwc-list-item>
+              <mwc-list-item class="warning">
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.delete"
+                )}
+              </mwc-list-item>
+            </ha-button-menu>
+          </div>
           ${this._warnings
             ? html`<ha-alert
                 alert-type="warning"
@@ -236,6 +214,7 @@ export default class HaAutomationTriggerRow extends LitElement {
                     `
                   )}
                 </ha-select>
+
                 ${showId
                   ? html`
                       <ha-textfield
@@ -271,7 +250,7 @@ export default class HaAutomationTriggerRow extends LitElement {
     `;
   }
 
-  protected override updated(changedProps: PropertyValues<this>): void {
+  protected override updated(changedProps: PropertyValues): void {
     super.updated(changedProps);
     if (changedProps.has("trigger")) {
       this._subscribeTrigger();
@@ -368,9 +347,6 @@ export default class HaAutomationTriggerRow extends LitElement {
         fireEvent(this, "duplicate");
         break;
       case 3:
-        this._onDisable();
-        break;
-      case 4:
         this._onDelete();
         break;
     }
@@ -389,15 +365,6 @@ export default class HaAutomationTriggerRow extends LitElement {
     });
   }
 
-  private _onDisable() {
-    const enabled = !(this.trigger.enabled ?? true);
-    const value = { ...this.trigger, enabled };
-    fireEvent(this, "value-changed", { value });
-    if (this._yamlMode) {
-      this._yamlEditor?.setValue(value);
-    }
-  }
-
   private _typeChanged(ev: CustomEvent) {
     const type = (ev.target as HaSelect).value;
 
@@ -472,27 +439,10 @@ export default class HaAutomationTriggerRow extends LitElement {
     return [
       haStyle,
       css`
-        .disabled {
-          opacity: 0.5;
-          pointer-events: none;
-        }
-        .card-content {
-          padding-top: 16px;
-          margin-top: 0;
-        }
-        .disabled-bar {
-          background: var(--divider-color, #e0e0e0);
-          text-align: center;
-          border-top-right-radius: var(--ha-card-border-radius);
-          border-top-left-radius: var(--ha-card-border-radius);
-        }
         .card-menu {
           float: right;
           z-index: 3;
-          margin: 4px;
           --mdc-theme-text-primary-on-background: var(--primary-text-color);
-          display: flex;
-          align-items: center;
         }
         :host-context([style*="direction: rtl;"]) .card-menu {
           float: left;

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

@@ -1,4 +1,3 @@
-import deepClone from "deep-clone-simple";
 import "@material/mwc-button";
 import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -28,7 +27,7 @@ export default class HaAutomationTrigger extends LitElement {
           ></ha-automation-trigger-row>
         `
       )}
-      <ha-card outlined>
+      <ha-card>
         <div class="card-actions add-card">
           <mwc-button @click=${this._addTrigger}>
             ${this.hass.localize(
@@ -68,7 +67,7 @@ export default class HaAutomationTrigger extends LitElement {
     ev.stopPropagation();
     const index = (ev.target as any).index;
     fireEvent(this, "value-changed", {
-      value: this.triggers.concat(deepClone(this.triggers[index])),
+      value: this.triggers.concat(this.triggers[index]),
     });
   }
 

src/panels/config/cloud/account/cloud-account.ts

@@ -1,28 +1,26 @@
 import "@material/mwc-button";
-import type { ActionDetail } from "@material/mwc-list";
 import "@material/mwc-list/mwc-list-item";
-import { mdiDotsVertical } from "@mdi/js";
+import type { ActionDetail } from "@material/mwc-list";
 import "@polymer/paper-item/paper-item-body";
-import { css, html, LitElement, PropertyValues } from "lit";
+import { mdiDotsVertical } from "@mdi/js";
+import { LitElement, css, html, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { formatDateTime } from "../../../../common/datetime/format_date_time";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeRTLDirection } from "../../../../common/util/compute_rtl";
-import { debounce } from "../../../../common/util/debounce";
 import "../../../../components/buttons/ha-call-api-button";
+import "../../../../components/ha-card";
 import "../../../../components/ha-alert";
 import "../../../../components/ha-button-menu";
-import "../../../../components/ha-card";
 import "../../../../components/ha-icon-button";
+import { debounce } from "../../../../common/util/debounce";
 import {
   cloudLogout,
   CloudStatusLoggedIn,
   fetchCloudSubscriptionInfo,
   SubscriptionInfo,
 } from "../../../../data/cloud";
-import { showConfirmationDialog } from "../../../../dialogs/generic/show-dialog-box";
 import "../../../../layouts/hass-subpage";
-import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import { HomeAssistant } from "../../../../types";
 import "../../ha-config-section";
 import "./cloud-alexa-pref";
@@ -30,6 +28,8 @@ import "./cloud-google-pref";
 import "./cloud-remote-pref";
 import "./cloud-tts-pref";
 import "./cloud-webhooks";
+import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
+import { showConfirmationDialog } from "../../../../dialogs/generic/show-dialog-box";
 
 @customElement("cloud-account")
 export class CloudAccount extends SubscribeMixin(LitElement) {
@@ -81,7 +81,6 @@ export class CloudAccount extends SubscribeMixin(LitElement) {
             </div>
 
             <ha-card
-              outlined
               .header=${this.hass.localize(
                 "ui.panel.config.cloud.account.nabu_casa_account"
               )}
@@ -211,7 +210,6 @@ export class CloudAccount extends SubscribeMixin(LitElement) {
 
             <cloud-webhooks
               .hass=${this.hass}
-              .narrow=${this.narrow}
               .cloudStatus=${this.cloudStatus}
               dir=${this._rtlDirection}
             ></cloud-webhooks>

src/panels/config/cloud/account/cloud-alexa-pref.ts

@@ -26,7 +26,6 @@ export class CloudAlexaPref extends LitElement {
 
     return html`
       <ha-card
-        outlined
         header=${this.hass!.localize(
           "ui.panel.config.cloud.account.alexa.title"
         )}

src/panels/config/cloud/account/cloud-google-pref.ts

@@ -31,7 +31,6 @@ export class CloudGooglePref extends LitElement {
 
     return html`
       <ha-card
-        outlined
         header=${this.hass.localize(
           "ui.panel.config.cloud.account.google.title"
         )}

src/panels/config/cloud/account/cloud-remote-pref.ts

@@ -34,7 +34,6 @@ export class CloudRemotePref extends LitElement {
     if (!remote_certificate) {
       return html`
         <ha-card
-          outlined
           header=${this.hass.localize(
             "ui.panel.config.cloud.account.remote.title"
           )}
@@ -50,7 +49,6 @@ export class CloudRemotePref extends LitElement {
 
     return html`
       <ha-card
-        outlined
         header=${this.hass.localize(
           "ui.panel.config.cloud.account.remote.title"
         )}

src/panels/config/cloud/account/cloud-tts-pref.ts

@@ -44,7 +44,6 @@ export class CloudTTSPref extends LitElement {
 
     return html`
       <ha-card
-        outlined
         header=${this.hass.localize("ui.panel.config.cloud.account.tts.title")}
       >
         <div class="card-content">

src/panels/config/cloud/account/cloud-webhooks.ts

@@ -40,7 +40,6 @@ export class CloudWebhooks extends LitElement {
   protected render() {
     return html`
       <ha-card
-        outlined
         header=${this.hass!.localize(
           "ui.panel.config.cloud.account.webhooks.title"
         )}

src/panels/config/cloud/alexa/cloud-alexa.ts

@@ -153,7 +153,7 @@ class CloudAlexa extends SubscribeMixin(LitElement) {
       ></ha-icon-button>`;
 
       target.push(html`
-        <ha-card outlined>
+        <ha-card>
           <div class="card-content">
             <div class="top-line">
               <state-info

src/panels/config/cloud/forgot-password/cloud-forgot-password.ts

@@ -36,7 +36,6 @@ export class CloudForgotPassword extends LitElement {
       >
         <div class="content">
           <ha-card
-            outlined
             .header=${this.hass.localize(
               "ui.panel.config.cloud.forgot_password.subtitle"
             )}

src/panels/config/cloud/google-assistant/cloud-google-assistant.ts

@@ -159,7 +159,7 @@ class CloudGoogleAssistant extends SubscribeMixin(LitElement) {
       ></ha-icon-button>`;
 
       target.push(html`
-        <ha-card outlined>
+        <ha-card>
           <div class="card-content">
             <div class="top-line">
               <state-info

src/panels/config/cloud/login/cloud-login.ts

@@ -99,7 +99,6 @@ export class CloudLogin extends LitElement {
               : ""}
 
             <ha-card
-              outlined
               .header=${this.hass.localize(
                 "ui.panel.config.cloud.login.sign_in"
               )}
@@ -158,7 +157,7 @@ export class CloudLogin extends LitElement {
               </div>
             </ha-card>
 
-            <ha-card outlined>
+            <ha-card>
               <paper-item @click=${this._handleRegister}>
                 <paper-item-body two-line>
                   ${this.hass.localize(

src/panels/config/cloud/register/cloud-register.ts

@@ -121,7 +121,6 @@ export class CloudRegister extends LitElement {
               </ul>
             </div>
             <ha-card
-              outlined
               .header=${this.hass.localize(
                 "ui.panel.config.cloud.register.create_account"
               )}

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

@@ -110,9 +110,7 @@ class ConfigAnalytics extends LitElement {
         ha-settings-row {
           padding: 0;
         }
-        p {
-          margin-top: 0;
-        }
+
         .card-actions {
           display: flex;
           flex-direction: row-reverse;

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

@@ -187,7 +187,6 @@ class HaConfigSectionGeneral extends LitElement {
                   href="https://en.wikipedia.org/wiki/ISO_4217#Active_codes"
                   target="_blank"
                   rel="noopener noreferrer"
-                  class="find-value"
                   >${this.hass.localize(
                     "ui.panel.config.core.section.core.core_config.find_currency_value"
                   )}</a
@@ -346,10 +345,6 @@ class HaConfigSectionGeneral extends LitElement {
       ha-select {
         display: block;
       }
-      a.find-value {
-        margin-top: 8px;
-        display: inline-block;
-      }
       ha-locations-editor {
         display: block;
         height: 400px;

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

@@ -109,11 +109,7 @@ class HaConfigSectionUpdates extends LitElement {
                     ></ha-config-updates>
                   `
                 : html`
-                    <div class="no-updates">
-                      ${this.hass.localize(
-                        "ui.panel.config.updates.no_updates"
-                      )}
-                    </div>
+                    ${this.hass.localize("ui.panel.config.updates.no_updates")}
                   `}
             </div>
           </ha-card>
@@ -200,10 +196,6 @@ class HaConfigSectionUpdates extends LitElement {
       display: flex;
       justify-content: space-between;
       flex-direction: column;
-      padding: 0;
-    }
-
-    .no-updates {
       padding: 16px;
     }
   `;

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

@@ -1,25 +1,12 @@
+import { ActionDetail } from "@material/mwc-list";
+import { mdiDotsVertical } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { canShowPage } from "../../../common/config/can_show_page";
-import { isComponentLoaded } from "../../../common/config/is_component_loaded";
-import { relativeTime } from "../../../common/datetime/relative_time";
 import "../../../components/ha-card";
 import "../../../components/ha-navigation-list";
-import "../../../components/ha-tip";
-import { BackupContent, fetchBackupInfo } from "../../../data/backup";
-import { CloudStatus, fetchCloudStatus } from "../../../data/cloud";
-import { BOARD_NAMES } from "../../../data/hardware";
-import { fetchHassioBackups, HassioBackup } from "../../../data/hassio/backup";
-import {
-  fetchHassioHassOsInfo,
-  fetchHassioHostInfo,
-  HassioHassOSInfo,
-  HassioHostInfo,
-} from "../../../data/hassio/host";
-import {
-  showAlertDialog,
-  showConfirmationDialog,
-} from "../../../dialogs/generic/show-dialog-box";
+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";
@@ -39,93 +26,37 @@ class HaConfigSystemNavigation extends LitElement {
 
   @property({ type: Boolean }) public showAdvanced!: boolean;
 
-  @state() private _latestBackupDate?: string;
-
-  @state() private _boardName?: string;
-
-  @state() private _storageInfo?: { used: number; free: number; total: number };
-
-  @state() private _externalAccess = false;
-
   protected render(): TemplateResult {
     const pages = configSections.general
       .filter((page) => canShowPage(this.hass, page))
-      .map((page) => {
-        let description = "";
-
-        switch (page.translationKey) {
-          case "backup":
-            description = this._latestBackupDate
-              ? this.hass.localize(
-                  "ui.panel.config.backup.description",
-                  "relative_time",
-                  relativeTime(
-                    new Date(this._latestBackupDate),
-                    this.hass.locale
-                  )
-                )
-              : this.hass.localize(
-                  "ui.panel.config.backup.description_no_backup"
-                );
-            break;
-          case "network":
-            description = this.hass.localize(
-              "ui.panel.config.network.description",
-              "state",
-              this._externalAccess
-                ? this.hass.localize("ui.panel.config.network.enabled")
-                : this.hass.localize("ui.panel.config.network.disabled")
-            );
-            break;
-          case "storage":
-            description = this._storageInfo
-              ? this.hass.localize(
-                  "ui.panel.config.storage.description",
-                  "percent_used",
-                  `${Math.round(
-                    (this._storageInfo.used / this._storageInfo.total) * 100
-                  )}%`,
-                  "free_space",
-                  `${this._storageInfo.free} GB`
-                )
-              : "";
-            break;
-          case "hardware":
-            description =
-              this._boardName ||
-              this.hass.localize("ui.panel.config.hardware.description");
-            break;
-
-          default:
-            description = this.hass.localize(
-              `ui.panel.config.${page.translationKey}.description`
-            );
-            break;
-        }
-
-        return {
-          ...page,
-          name: page.translationKey
-            ? this.hass.localize(
-                `ui.panel.config.${page.translationKey}.caption`
-              )
-            : page.name,
-          description,
-        };
-      });
+      .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.main")}
       >
-        <mwc-button
+        <ha-button-menu
+          corner="BOTTOM_START"
+          @action=${this._handleAction}
           slot="toolbar-icon"
-          .label=${this.hass.localize(
-            "ui.panel.config.system_dashboard.restart_homeassistant_short"
-          )}
-          @click=${this._restart}
-        ></mwc-button>
+        >
+          <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}
@@ -136,97 +67,28 @@ class HaConfigSystemNavigation extends LitElement {
               .hass=${this.hass}
               .narrow=${this.narrow}
               .pages=${pages}
-              hasSecondary
             ></ha-navigation-list>
           </ha-card>
-          ${this.hass.userData?.showAdvanced
-            ? html`<ha-tip>
-                Looking for YAML Configuration? It has moved to
-                <a href="/developer-tools/yaml">Developer Tools</a>
-              </ha-tip>`
-            : ""}
         </ha-config-section>
       </hass-subpage>
     `;
   }
 
-  protected firstUpdated(_changedProperties): void {
-    super.firstUpdated(_changedProperties);
-
-    this._fetchNetworkStatus();
-    const isHassioLoaded = isComponentLoaded(this.hass, "hassio");
-    this._fetchBackupInfo(isHassioLoaded);
-    if (isHassioLoaded) {
-      this._fetchHardwareInfo();
-      this._fetchStorageInfo();
-    }
-  }
-
-  private _restart() {
-    showConfirmationDialog(this, {
-      title: this.hass.localize(
-        "ui.panel.config.system_dashboard.confirm_restart_title"
-      ),
-      text: this.hass.localize(
-        "ui.panel.config.system_dashboard.confirm_restart_text"
-      ),
-      confirmText: this.hass.localize(
-        "ui.panel.config.system_dashboard.restart_homeassistant_short"
-      ),
-      confirm: () => {
-        this.hass.callService("homeassistant", "restart").catch((reason) => {
-          showAlertDialog(this, {
-            title: this.hass.localize(
-              "ui.panel.config.system_dashboard.restart_error"
-            ),
-            text: reason.message,
-          });
+  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");
+          },
         });
-      },
-    });
-  }
-
-  private async _fetchBackupInfo(isHassioLoaded: boolean) {
-    const backups: BackupContent[] | HassioBackup[] = isHassioLoaded
-      ? await fetchHassioBackups(this.hass)
-      : await fetchBackupInfo(this.hass).then(
-          (backupData) => backupData.backups
-        );
-
-    if (backups.length > 0) {
-      this._latestBackupDate = (backups as any[]).reduce((a, b) =>
-        a.date > b.date ? a : b
-      ).date;
+        break;
     }
   }
 
-  private async _fetchHardwareInfo() {
-    const osData: HassioHassOSInfo = await fetchHassioHassOsInfo(this.hass);
-    if (osData.board) {
-      this._boardName = BOARD_NAMES[osData.board];
-    }
-  }
-
-  private async _fetchStorageInfo() {
-    const hostInfo: HassioHostInfo = await fetchHassioHostInfo(this.hass);
-    this._storageInfo = {
-      used: hostInfo.disk_used,
-      free: hostInfo.disk_free,
-      total: hostInfo.disk_total,
-    };
-  }
-
-  private async _fetchNetworkStatus() {
-    if (isComponentLoaded(this.hass, "cloud")) {
-      const cloudStatus = await fetchCloudStatus(this.hass);
-      if (cloudStatus.logged_in) {
-        this._externalAccess = true;
-        return;
-      }
-    }
-    this._externalAccess = this.hass.config.external_url !== null;
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyle,
@@ -258,22 +120,18 @@ class HaConfigSystemNavigation extends LitElement {
           padding-bottom: 0;
         }
 
-        @media all and (max-width: 600px) {
-          ha-card {
-            border-width: 1px 0;
-            border-radius: 0;
-            box-shadow: unset;
-          }
-          ha-config-section {
-            margin-top: -42px;
-          }
+        :host([narrow]) ha-card {
+          border-radius: 0;
+          box-shadow: unset;
+        }
+
+        :host([narrow]) ha-config-section {
+          margin-top: -42px;
         }
 
         ha-navigation-list {
           --navigation-list-item-title-font-size: 16px;
-        }
-        ha-tip {
-          margin-bottom: max(env(safe-area-inset-bottom), 8px);
+          --navigation-list-item-padding: 4px;
         }
       `,
     ];

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

@@ -39,9 +39,9 @@ import { configSections } from "../ha-panel-config";
 import "./ha-config-navigation";
 import "./ha-config-updates";
 
-const randomTip = (hass: HomeAssistant, narrow: boolean) => {
+const randomTip = (hass: HomeAssistant) => {
   const weighted: string[] = [];
-  let tips = [
+  const tips = [
     {
       content: hass.localize(
         "ui.panel.config.tips.join",
@@ -84,16 +84,11 @@ const randomTip = (hass: HomeAssistant, narrow: boolean) => {
         </span>`
       ),
       weight: 2,
-      narrow: true,
     },
-    { content: hass.localize("ui.tips.key_c_hint"), weight: 1, narrow: false },
-    { content: hass.localize("ui.tips.key_m_hint"), weight: 1, narrow: false },
+    { content: hass.localize("ui.tips.key_c_hint"), weight: 1 },
+    { content: hass.localize("ui.tips.key_m_hint"), weight: 1 },
   ];
 
-  if (narrow) {
-    tips = tips.filter((tip) => tip.narrow);
-  }
-
   tips.forEach((tip) => {
     for (let i = 0; i < tip.weight; i++) {
       weighted.push(tip.content);
@@ -195,6 +190,11 @@ class HaConfigDashboard extends LitElement {
               </ha-card>`
             : ""}
           <ha-card outlined>
+            ${this.narrow && canInstallUpdates.length
+              ? html`<div class="title">
+                  ${this.hass.localize("panel.config")}
+                </div>`
+              : ""}
             <ha-config-navigation
               .hass=${this.hass}
               .narrow=${this.narrow}
@@ -215,7 +215,7 @@ class HaConfigDashboard extends LitElement {
     super.updated(changedProps);
 
     if (!this._tip && changedProps.has("hass")) {
-      this._tip = randomTip(this.hass, this.narrow);
+      this._tip = randomTip(this.hass);
     }
   }
 
@@ -277,16 +277,13 @@ class HaConfigDashboard extends LitElement {
           padding: 16px;
           padding-bottom: 0;
         }
+        :host([narrow]) ha-card {
+          border-radius: 0;
+          box-shadow: unset;
+        }
 
-        @media all and (max-width: 600px) {
-          ha-card {
-            border-width: 1px 0;
-            border-radius: 0;
-            box-shadow: unset;
-          }
-          ha-config-section {
-            margin-top: -42px;
-          }
+        :host([narrow]) ha-config-section {
+          margin-top: -42px;
         }
 
         ha-tip {

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

@@ -6,7 +6,7 @@ import { canShowPage } from "../../../common/config/can_show_page";
 import "../../../components/ha-card";
 import "../../../components/ha-icon-next";
 import "../../../components/ha-navigation-list";
-import type { CloudStatus } from "../../../data/cloud";
+import type { CloudStatus, CloudStatusLoggedIn } from "../../../data/cloud";
 import type { PageNavigation } from "../../../layouts/hass-tabs-subpage";
 import type { HomeAssistant } from "../../../types";
 
@@ -37,7 +37,9 @@ class HaConfigNavigation extends LitElement {
             ? page.info.logged_in
               ? `
                   ${this.hass.localize(
-                    "ui.panel.config.cloud.description_login"
+                    "ui.panel.config.cloud.description_login",
+                    "email",
+                    (page.info as CloudStatusLoggedIn).email
                   )}
                 `
               : `

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

@@ -9,7 +9,6 @@ import "../../../components/ha-alert";
 import "../../../components/ha-icon-next";
 import type { UpdateEntity } from "../../../data/update";
 import type { HomeAssistant } from "../../../types";
-import "../../../components/ha-circular-progress";
 
 @customElement("ha-config-updates")
 class HaConfigUpdates extends LitElement {
@@ -52,18 +51,7 @@ class HaConfigUpdates extends LitElement {
                 .title=${entity.attributes.title ||
                 entity.attributes.friendly_name}
                 .stateObj=${entity}
-                class=${this.narrow && entity.attributes.in_progress
-                  ? "updating"
-                  : ""}
               ></state-badge>
-              ${this.narrow && entity.attributes.in_progress
-                ? html`<ha-circular-progress
-                    active
-                    size="small"
-                    slot="graphic"
-                    class="absolute"
-                  ></ha-circular-progress>`
-                : ""}
               <span
                 >${entity.attributes.title ||
                 entity.attributes.friendly_name}</span
@@ -79,13 +67,7 @@ class HaConfigUpdates extends LitElement {
                   : ""}
               </span>
               ${!this.narrow
-                ? entity.attributes.in_progress
-                  ? html`<ha-circular-progress
-                      active
-                      size="small"
-                      slot="meta"
-                    ></ha-circular-progress>`
-                  : html`<ha-icon-next slot="meta"></ha-icon-next>`
+                ? html`<ha-icon-next slot="meta"></ha-icon-next>`
                 : ""}
             </mwc-list-item>
           `
@@ -139,12 +121,6 @@ class HaConfigUpdates extends LitElement {
           cursor: pointer;
           font-size: 16px;
         }
-        ha-circular-progress.absolute {
-          position: absolute;
-        }
-        state-badge.updating {
-          opacity: 0.5;
-        }
       `,
     ];
   }

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

@@ -1,4 +1,5 @@
 import { customElement } from "lit/decorators";
+import "../../../../components/ha-card";
 import {
   DeviceAction,
   localizeDeviceAutomationAction,

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

@@ -1,6 +1,7 @@
-import { css, html, LitElement, TemplateResult } from "lit";
-import { property, state } from "lit/decorators";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { property } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
+import "../../../../components/ha-card";
 import "../../../../components/ha-chip";
 import "../../../../components/ha-chip-set";
 import { showAutomationEditor } from "../../../../data/automation";
@@ -9,7 +10,6 @@ import {
   DeviceAutomation,
 } from "../../../../data/device_automation";
 import { showScriptEditor } from "../../../../data/script";
-import { buttonLinkStyle } from "../../../../resources/styles";
 import { HomeAssistant } from "../../../../types";
 
 declare global {
@@ -29,8 +29,6 @@ export abstract class HaDeviceAutomationCard<
 
   @property() public automations: T[] = [];
 
-  @state() public _showSecondary = false;
-
   protected headerKey = "";
 
   protected type = "";
@@ -62,47 +60,28 @@ export abstract class HaDeviceAutomationCard<
     if (this.automations.length === 0) {
       return html``;
     }
-    const automations = this._showSecondary
-      ? this.automations
-      : this.automations.filter(
-          (automation) => automation.metadata?.secondary === false
-        );
     return html`
       <h3>${this.hass.localize(this.headerKey)}</h3>
       <div class="content">
         <ha-chip-set>
-          ${automations.map(
+          ${this.automations.map(
             (automation, idx) =>
               html`
-                <ha-chip
-                  .index=${idx}
-                  @click=${this._handleAutomationClicked}
-                  class=${automation.metadata?.secondary ? "secondary" : ""}
-                >
+                <ha-chip .index=${idx} @click=${this._handleAutomationClicked}>
                   ${this._localizeDeviceAutomation(this.hass, automation)}
                 </ha-chip>
               `
           )}
         </ha-chip-set>
-        ${!this._showSecondary && automations.length < this.automations.length
-          ? html`<button class="link" @click=${this._toggleSecondary}>
-              Show ${this.automations.length - automations.length} more...
-            </button>`
-          : ""}
       </div>
     `;
   }
 
-  private _toggleSecondary() {
-    this._showSecondary = !this._showSecondary;
-  }
-
   private _handleAutomationClicked(ev: CustomEvent) {
-    const automation = { ...this.automations[(ev.currentTarget as any).index] };
+    const automation = this.automations[(ev.currentTarget as any).index];
     if (!automation) {
       return;
     }
-    delete automation.metadata;
     if (this.script) {
       showScriptEditor({ sequence: [automation as DeviceAction] });
       fireEvent(this, "entry-selected");
@@ -114,18 +93,11 @@ export abstract class HaDeviceAutomationCard<
     fireEvent(this, "entry-selected");
   }
 
-  static styles = [
-    buttonLinkStyle,
-    css`
+  static get styles(): CSSResultGroup {
+    return css`
       h3 {
         color: var(--primary-text-color);
       }
-      .secondary {
-        --ha-chip-background-color: rgba(var(--rgb-primary-text-color), 0.07);
-      }
-      button.link {
-        color: var(--primary-color);
-      }
-    `,
-  ];
+    `;
+  }
 }

src/panels/config/devices/device-detail/ha-device-automation-dialog.ts

@@ -10,7 +10,6 @@ import {
   fetchDeviceActions,
   fetchDeviceConditions,
   fetchDeviceTriggers,
-  sortDeviceAutomations,
 } from "../../../../data/device_automation";
 import { haStyleDialog } from "../../../../resources/styles";
 import { HomeAssistant } from "../../../../types";
@@ -64,16 +63,16 @@ export class DialogDeviceAutomation extends LitElement {
     const { device, script } = this._params;
 
     fetchDeviceActions(this.hass, device.id).then((actions) => {
-      this._actions = actions.sort(sortDeviceAutomations);
+      this._actions = actions;
     });
     if (script) {
       return;
     }
     fetchDeviceTriggers(this.hass, device.id).then((triggers) => {
-      this._triggers = triggers.sort(sortDeviceAutomations);
+      this._triggers = triggers;
     });
     fetchDeviceConditions(this.hass, device.id).then((conditions) => {
-      this._conditions = conditions.sort(sortDeviceAutomations);
+      this._conditions = conditions;
     });
   }
 

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

@@ -1,4 +1,5 @@
 import { customElement } from "lit/decorators";
+import "../../../../components/ha-card";
 import {
   DeviceCondition,
   localizeDeviceAutomationCondition,

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

@@ -62,7 +62,7 @@ export class HaDeviceEntitiesCard extends LitElement {
   protected render(): TemplateResult {
     if (!this.entities.length) {
       return html`
-        <ha-card outlined .header=${this.header}>
+        <ha-card .header=${this.header}>
           <div class="empty card-content">
             ${this.hass.localize("ui.panel.config.devices.entities.none")}
           </div>
@@ -89,7 +89,7 @@ export class HaDeviceEntitiesCard extends LitElement {
     });
 
     return html`
-      <ha-card outlined .header=${this.header}>
+      <ha-card .header=${this.header}>
         <div id="entities" @hass-more-info=${this._overrideMoreInfo}>
           ${shownEntities.map((entry) =>
             this.hass.states[entry.entity_id]