Add Redirect for Server Controls

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/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)}`;
   }
 

setup.cfg

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

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/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() {
@@ -62,7 +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;
         }
       `,
     ];

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-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/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/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/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";
@@ -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 };
     }
 

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/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

@@ -32,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(

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

@@ -56,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(

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

@@ -27,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(

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

@@ -196,7 +196,7 @@ class HaConfigSectionUpdates extends LitElement {
       display: flex;
       justify-content: space-between;
       flex-direction: column;
-      padding: 0;
+      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,95 +67,25 @@ 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;
-    }
-  }
-
-  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")) {
-      fetchCloudStatus(this.hass).then((cloudStatus) => {
-        if (cloudStatus.logged_in) {
-          this._externalAccess = true;
-        }
-      });
-    } else {
-      this._externalAccess = this.hass.config.external_url !== null;
+        break;
     }
   }
 
@@ -259,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/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]

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

@@ -1,6 +1,5 @@
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
-import "../../../../components/ha-card";
 import { AreaRegistryEntry } from "../../../../data/area_registry";
 import {
   computeDeviceName,
@@ -25,7 +24,6 @@ export class HaDeviceCard extends LitElement {
   protected render(): TemplateResult {
     return html`
       <ha-card
-        outlined
         .header=${this.hass.localize(
           "ui.panel.config.devices.device_info",
           "type",
@@ -147,9 +145,3 @@ export class HaDeviceCard extends LitElement {
     ];
   }
 }
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-device-info-card": HaDeviceCard;
-  }
-}

src/panels/config/devices/ha-config-device-page.ts

@@ -579,7 +579,7 @@ export class HaConfigDevicePage extends LitElement {
             ${
               isComponentLoaded(this.hass, "automation")
                 ? html`
-                    <ha-card outlined>
+                    <ha-card>
                       <h1 class="card-header">
                         ${this.hass.localize(
                           "ui.panel.config.devices.automation.automations_heading"
@@ -673,7 +673,7 @@ export class HaConfigDevicePage extends LitElement {
             ${
               isComponentLoaded(this.hass, "scene") && entities.length
                 ? html`
-                    <ha-card outlined>
+                    <ha-card>
                       <h1 class="card-header">
                         ${this.hass.localize(
                           "ui.panel.config.devices.scene.scenes_heading"
@@ -771,7 +771,7 @@ export class HaConfigDevicePage extends LitElement {
               ${
                 isComponentLoaded(this.hass, "script")
                   ? html`
-                      <ha-card outlined>
+                      <ha-card>
                         <h1 class="card-header">
                           ${this.hass.localize(
                             "ui.panel.config.devices.script.scripts_heading"

src/panels/config/energy/components/ha-energy-battery-settings.ts

@@ -51,7 +51,7 @@ export class EnergyBatterySettings extends LitElement {
     });
 
     return html`
-      <ha-card outlined>
+      <ha-card>
         <h1 class="card-header">
           <ha-svg-icon .path=${mdiBatteryHigh}></ha-svg-icon>
           ${this.hass.localize("ui.panel.config.energy.battery.title")}

src/panels/config/energy/components/ha-energy-device-settings.ts

@@ -36,7 +36,7 @@ export class EnergyDeviceSettings extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <ha-card outlined>
+      <ha-card>
         <h1 class="card-header">
           <ha-svg-icon .path=${mdiDevices}></ha-svg-icon>
           ${this.hass.localize(

src/panels/config/energy/components/ha-energy-gas-settings.ts

@@ -51,7 +51,7 @@ export class EnergyGasSettings extends LitElement {
     });
 
     return html`
-      <ha-card outlined>
+      <ha-card>
         <h1 class="card-header">
           <ha-svg-icon .path=${mdiFire}></ha-svg-icon>
           ${this.hass.localize("ui.panel.config.energy.gas.title")}

src/panels/config/energy/components/ha-energy-grid-settings.ts

@@ -80,7 +80,7 @@ export class EnergyGridSettings extends LitElement {
     }
 
     return html`
-      <ha-card outlined>
+      <ha-card>
         <h1 class="card-header">
           <ha-svg-icon .path=${mdiTransmissionTower}></ha-svg-icon>
           ${this.hass.localize("ui.panel.config.energy.grid.title")}

src/panels/config/energy/components/ha-energy-solar-settings.ts

@@ -54,7 +54,7 @@ export class EnergySolarSettings extends LitElement {
     });
 
     return html`
-      <ha-card outlined>
+      <ha-card>
         <h1 class="card-header">
           <ha-svg-icon .path=${mdiSolarPower}></ha-svg-icon>
           ${this.hass.localize("ui.panel.config.energy.solar.title")}

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

@@ -93,7 +93,7 @@ export const configSections: { [name: string]: PageNavigation[] } = {
       path: "/config/person",
       translationKey: "people",
       iconPath: mdiAccount,
-      iconColor: "#5A87FA",
+      iconColor: "#832EA6",
       components: ["person", "users"],
     },
     {
@@ -224,14 +224,14 @@ export const configSections: { [name: string]: PageNavigation[] } = {
       path: "/config/person",
       translationKey: "ui.panel.config.person.caption",
       iconPath: mdiAccount,
-      iconColor: "#5A87FA",
+      iconColor: "#E48629",
     },
     {
       component: "users",
       path: "/config/users",
       translationKey: "ui.panel.config.users.caption",
       iconPath: mdiBadgeAccountHorizontal,
-      iconColor: "#5A87FA",
+      iconColor: "#E48629",
       core: true,
       advancedOnly: true,
     },
@@ -254,74 +254,74 @@ export const configSections: { [name: string]: PageNavigation[] } = {
     },
   ],
   general: [
-    {
-      path: "/config/general",
-      translationKey: "core",
-      iconPath: mdiCog,
-      iconColor: "#653249",
-      core: true,
-    },
     {
       path: "/config/updates",
-      translationKey: "updates",
+      translationKey: "ui.panel.config.updates.caption",
       iconPath: mdiUpdate,
       iconColor: "#3B808E",
     },
     {
       component: "logs",
       path: "/config/logs",
-      translationKey: "logs",
+      translationKey: "ui.panel.config.logs.caption",
       iconPath: mdiMathLog,
       iconColor: "#C65326",
       core: true,
     },
     {
       path: "/config/backup",
-      translationKey: "backup",
+      translationKey: "ui.panel.config.backup.caption",
       iconPath: mdiBackupRestore,
       iconColor: "#0D47A1",
       component: "backup",
     },
     {
       path: "/hassio/backups",
-      translationKey: "backup",
+      translationKey: "ui.panel.config.backup.caption",
       iconPath: mdiBackupRestore,
       iconColor: "#0D47A1",
       component: "hassio",
     },
     {
       path: "/config/analytics",
-      translationKey: "analytics",
+      translationKey: "ui.panel.config.analytics.caption",
       iconPath: mdiShape,
       iconColor: "#f1c447",
     },
     {
       path: "/config/network",
-      translationKey: "network",
+      translationKey: "ui.panel.config.network.caption",
       iconPath: mdiNetwork,
       iconColor: "#B1345C",
     },
     {
       path: "/config/storage",
-      translationKey: "storage",
+      translationKey: "ui.panel.config.storage.caption",
       iconPath: mdiDatabase,
       iconColor: "#518C43",
       component: "hassio",
     },
     {
       path: "/config/hardware",
-      translationKey: "hardware",
+      translationKey: "ui.panel.config.hardware.caption",
       iconPath: mdiMemory,
       iconColor: "#301A8E",
       component: "hassio",
     },
     {
       path: "/config/system_health",
-      translationKey: "system_health",
+      translationKey: "ui.panel.config.system_health.caption",
       iconPath: mdiHeart,
       iconColor: "#507FfE",
       components: ["system_health", "hassio"],
     },
+    {
+      path: "/config/general",
+      translationKey: "ui.panel.config.core.caption",
+      iconPath: mdiCog,
+      iconColor: "#653249",
+      core: true,
+    },
   ],
   about: [
     {
@@ -345,6 +345,8 @@ class HaPanelConfig extends HassRouterPage {
 
   protected routerOptions: RouterOptions = {
     defaultPage: "dashboard",
+    beforeRender: (page) =>
+      page === "server_control" ? "../developer-tools/yaml" : undefined,
     routes: {
       analytics: {
         tag: "ha-config-section-analytics",

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

@@ -8,7 +8,6 @@ import "../../../components/ha-alert";
 import "../../../components/ha-button-menu";
 import "../../../components/ha-card";
 import "../../../components/ha-settings-row";
-import { BOARD_NAMES } from "../../../data/hardware";
 import {
   extractApiErrorMessage,
   ignoreSupervisorError,
@@ -57,18 +56,6 @@ class HaConfigHardware extends LitElement {
         .narrow=${this.narrow}
         .header=${this.hass.localize("ui.panel.config.hardware.caption")}
       >
-        <ha-button-menu corner="BOTTOM_START" slot="toolbar-icon">
-          <ha-icon-button
-            .label=${this.hass.localize("ui.common.menu")}
-            .path=${mdiDotsVertical}
-            slot="trigger"
-          ></ha-icon-button>
-          <mwc-list-item @click=${this._openHardware}
-            >${this.hass.localize(
-              "ui.panel.config.hardware.available_hardware.title"
-            )}</mwc-list-item
-          >
-        </ha-button-menu>
         ${this._error
           ? html`
               <ha-alert alert-type="error"
@@ -76,57 +63,65 @@ class HaConfigHardware extends LitElement {
               >
             `
           : ""}
-        ${this._OSData || this._hostData
+        ${this._OSData && this._hostData
           ? html`
               <div class="content">
                 <ha-card outlined>
-                  ${this._OSData?.board
-                    ? html`
-                        <div class="card-content">
-                          <ha-settings-row>
-                            <span slot="heading"
-                              >${BOARD_NAMES[this._OSData.board] ||
-                              this.hass.localize(
-                                "ui.panel.config.hardware.board"
-                              )}</span
+                  <div class="card-content">
+                    <ha-settings-row>
+                      <span slot="heading"
+                        >${this.hass.localize(
+                          "ui.panel.config.hardware.board"
+                        )}</span
+                      >
+                      <div slot="description">
+                        <span class="value">${this._OSData.board}</span>
+                      </div>
+                    </ha-settings-row>
+                  </div>
+                  <div class="card-actions">
+                    <div class="buttons">
+                      ${this._hostData.features.includes("reboot")
+                        ? html`
+                            <ha-progress-button
+                              class="warning"
+                              @click=${this._hostReboot}
                             >
-                            <div slot="description">
-                              <span class="value">${this._OSData.board}</span>
-                            </div>
-                          </ha-settings-row>
-                        </div>
-                      `
-                    : ""}
-                  ${this._hostData
-                    ? html`
-                        <div class="card-actions">
-                          ${this._hostData.features.includes("reboot")
-                            ? html`
-                                <ha-progress-button
-                                  class="warning"
-                                  @click=${this._hostReboot}
-                                >
-                                  ${this.hass.localize(
-                                    "ui.panel.config.hardware.reboot_host"
-                                  )}
-                                </ha-progress-button>
-                              `
-                            : ""}
-                          ${this._hostData.features.includes("shutdown")
-                            ? html`
-                                <ha-progress-button
-                                  class="warning"
-                                  @click=${this._hostShutdown}
-                                >
-                                  ${this.hass.localize(
-                                    "ui.panel.config.hardware.shutdown_host"
-                                  )}
-                                </ha-progress-button>
-                              `
-                            : ""}
-                        </div>
-                      `
-                    : ""}
+                              ${this.hass.localize(
+                                "ui.panel.config.hardware.reboot_host"
+                              )}
+                            </ha-progress-button>
+                          `
+                        : ""}
+                      ${this._hostData.features.includes("shutdown")
+                        ? html`
+                            <ha-progress-button
+                              class="warning"
+                              @click=${this._hostShutdown}
+                            >
+                              ${this.hass.localize(
+                                "ui.panel.config.hardware.shutdown_host"
+                              )}
+                            </ha-progress-button>
+                          `
+                        : ""}
+                    </div>
+                    <ha-button-menu corner="BOTTOM_START">
+                      <ha-icon-button
+                        .label=${this.hass.localize("common.menu")}
+                        .path=${mdiDotsVertical}
+                        slot="trigger"
+                      ></ha-icon-button>
+                      <mwc-list-item
+                        .action=${"hardware"}
+                        @click=${this._openHardware}
+                      >
+                        ${this.hass.localize(
+                          "ui.panel.config.hardware.available_hardware.title"
+                        )}
+                      </mwc-list-item>
+                    </ha-button-menu>
+                  </div>
                 </ha-card>
               </div>
             `
@@ -246,6 +241,10 @@ class HaConfigHardware extends LitElement {
         justify-content: space-between;
         align-items: center;
       }
+      .buttons {
+        display: flex;
+        align-items: center;
+      }
     `,
   ];
 }

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

@@ -3,16 +3,17 @@ import { property, state } from "lit/decorators";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import "../../../components/ha-logo-svg";
 import {
-  fetchHassioHassOsInfo,
   fetchHassioHostInfo,
+  fetchHassioHassOsInfo,
   HassioHassOSInfo,
   HassioHostInfo,
 } from "../../../data/hassio/host";
-import { fetchHassioInfo, HassioInfo } from "../../../data/hassio/supervisor";
+import { HassioInfo, fetchHassioInfo } from "../../../data/hassio/supervisor";
 import "../../../layouts/hass-subpage";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant, Route } from "../../../types";
 import { documentationUrl } from "../../../util/documentation-url";
+import "./integrations-card";
 
 const JS_TYPE = __BUILD__;
 const JS_VERSION = __VERSION__;
@@ -20,13 +21,13 @@ const JS_VERSION = __VERSION__;
 class HaConfigInfo extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ type: Boolean }) public narrow!: boolean;
+  @property() public narrow!: boolean;
 
-  @property({ type: Boolean }) public isWide!: boolean;
+  @property() public isWide!: boolean;
 
-  @property({ type: Boolean }) public showAdvanced!: boolean;
+  @property() public showAdvanced!: boolean;
 
-  @property({ attribute: false }) public route!: Route;
+  @property() public route!: Route;
 
   @state() private _hostInfo?: HassioHostInfo;
 
@@ -60,22 +61,18 @@ class HaConfigInfo extends LitElement {
             </ha-logo-svg>
           </a>
           <br />
-          <h3>Home Assistant Core ${hass.connection.haVersion}</h3>
+          <h2>Home Assistant Core ${hass.connection.haVersion}</h2>
           ${this._hassioInfo
-            ? html`
-                <h3>
-                  Home Assistant Supervisor ${this._hassioInfo.supervisor}
-                </h3>
-              `
+            ? html`<h2>
+                Home Assistant Supervisor ${this._hassioInfo.supervisor}
+              </h2>`
             : ""}
           ${this._osInfo?.version
-            ? html`<h3>Home Assistant OS ${this._osInfo.version}</h3>`
+            ? html`<h2>Home Assistant OS ${this._osInfo.version}</h2>`
             : ""}
           ${this._hostInfo
-            ? html`
-                <h4>Kernel version ${this._hostInfo.kernel}</h4>
-                <h4>Agent version ${this._hostInfo.agent_version}</h4>
-              `
+            ? html`<h4>Kernel version ${this._hostInfo.kernel}</h4>
+                <h4>Agent version ${this._hostInfo.agent_version}</h4>`
             : ""}
           <p>
             ${this.hass.localize(
@@ -156,6 +153,12 @@ class HaConfigInfo extends LitElement {
               : ""}
           </p>
         </div>
+        <div>
+          <integrations-card
+            .hass=${this.hass}
+            .narrow=${this.narrow}
+          ></integrations-card>
+        </div>
       </hass-subpage>
     `;
   }
@@ -214,15 +217,18 @@ class HaConfigInfo extends LitElement {
         .about a {
           color: var(--primary-color);
         }
+
+        integrations-card {
+          display: block;
+          max-width: 600px;
+          margin: 0 auto;
+          padding-bottom: 16px;
+        }
         ha-logo-svg {
           padding: 12px;
           height: 180px;
           width: 180px;
         }
-
-        h4 {
-          font-weight: 400;
-        }
       `,
     ];
   }

src/panels/config/info/integrations-card.ts

@@ -0,0 +1,210 @@
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import memoizeOne from "memoize-one";
+import "../../../components/ha-card";
+import {
+  domainToName,
+  fetchIntegrationManifests,
+  fetchIntegrationSetups,
+  integrationIssuesUrl,
+  IntegrationManifest,
+  IntegrationSetup,
+} from "../../../data/integration";
+import { HomeAssistant } from "../../../types";
+import { brandsUrl } from "../../../util/brands-url";
+import { documentationUrl } from "../../../util/documentation-url";
+
+@customElement("integrations-card")
+class IntegrationsCard extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ type: Boolean }) public narrow = false;
+
+  @state() private _manifests?: {
+    [domain: string]: IntegrationManifest;
+  };
+
+  @state() private _setups?: {
+    [domain: string]: IntegrationSetup;
+  };
+
+  private _sortedIntegrations = memoizeOne((components: string[]) =>
+    Array.from(
+      new Set(
+        components.map((comp) =>
+          comp.includes(".") ? comp.split(".")[1] : comp
+        )
+      )
+    ).sort()
+  );
+
+  firstUpdated(changedProps) {
+    super.firstUpdated(changedProps);
+    this._fetchManifests();
+    this._fetchSetups();
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      <ha-card
+        .header=${this.hass.localize("ui.panel.config.info.integrations")}
+      >
+        <table class="card-content">
+          <thead>
+            <tr>
+              <th></th>
+              ${!this.narrow
+                ? html`<th></th>
+                    <th></th>
+                    <th></th>`
+                : ""}
+              <th>${this.hass.localize("ui.panel.config.info.setup_time")}</th>
+            </tr>
+          </thead>
+          <tbody>
+            ${this._sortedIntegrations(this.hass!.config.components).map(
+              (domain) => {
+                const manifest = this._manifests && this._manifests[domain];
+                const docLink = manifest
+                  ? html`<a
+                      href=${manifest.is_built_in
+                        ? documentationUrl(
+                            this.hass,
+                            `/integrations/${manifest.domain}`
+                          )
+                        : manifest.documentation}
+                      target="_blank"
+                      rel="noreferrer"
+                      >${this.hass.localize(
+                        "ui.panel.config.info.documentation"
+                      )}</a
+                    >`
+                  : "";
+                const issueLink =
+                  manifest && (manifest.is_built_in || manifest.issue_tracker)
+                    ? html`
+                        <a
+                          href=${integrationIssuesUrl(domain, manifest)}
+                          target="_blank"
+                          rel="noreferrer"
+                          >${this.hass.localize(
+                            "ui.panel.config.info.issues"
+                          )}</a
+                        >
+                      `
+                    : "";
+                const setupSeconds =
+                  this._setups?.[domain]?.seconds?.toFixed(2);
+                return html`
+                  <tr>
+                    <td>
+                      <img
+                        loading="lazy"
+                        src=${brandsUrl({
+                          domain: domain,
+                          type: "icon",
+                          useFallback: true,
+                          darkOptimized: this.hass.themes?.darkMode,
+                        })}
+                        referrerpolicy="no-referrer"
+                      />
+                    </td>
+                    <td class="name">
+                      ${domainToName(
+                        this.hass.localize,
+                        domain,
+                        manifest
+                      )}<br />
+                      <span class="domain">${domain}</span>
+                      ${this.narrow
+                        ? html`<div class="mobile-row">
+                            <div>${docLink} ${issueLink}</div>
+                            ${setupSeconds ? html`${setupSeconds} s` : ""}
+                          </div>`
+                        : ""}
+                    </td>
+                    ${this.narrow
+                      ? ""
+                      : html`
+                          <td>${docLink}</td>
+                          <td>${issueLink}</td>
+                          <td class="setup">
+                            ${setupSeconds ? html`${setupSeconds} s` : ""}
+                          </td>
+                        `}
+                  </tr>
+                `;
+              }
+            )}
+          </tbody>
+        </table>
+      </ha-card>
+    `;
+  }
+
+  private async _fetchManifests() {
+    const manifests = {};
+    for (const manifest of await fetchIntegrationManifests(this.hass)) {
+      manifests[manifest.domain] = manifest;
+    }
+    this._manifests = manifests;
+  }
+
+  private async _fetchSetups() {
+    const setups = {};
+    for (const setup of await fetchIntegrationSetups(this.hass)) {
+      setups[setup.domain] = setup;
+    }
+    this._setups = setups;
+  }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      table {
+        width: 100%;
+      }
+      td,
+      th {
+        padding: 0 8px;
+      }
+      td:first-child {
+        padding-left: 0;
+      }
+      td.name {
+        padding: 8px;
+      }
+      td.setup {
+        text-align: right;
+        white-space: nowrap;
+        direction: ltr;
+      }
+      th {
+        text-align: right;
+      }
+      .domain {
+        color: var(--secondary-text-color);
+      }
+      .mobile-row {
+        display: flex;
+        justify-content: space-between;
+      }
+      .mobile-row a:not(:last-of-type) {
+        margin-right: 4px;
+      }
+      img {
+        display: block;
+        max-height: 40px;
+        max-width: 40px;
+      }
+      a {
+        color: var(--primary-color);
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "integrations-card": IntegrationsCard;
+  }
+}

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

@@ -21,7 +21,6 @@ import { fetchErrorLog } from "../../../data/error_log";
 import { extractApiErrorMessage } from "../../../data/hassio/common";
 import { fetchHassioLogs } from "../../../data/hassio/supervisor";
 import { HomeAssistant } from "../../../types";
-import { debounce } from "../../../common/util/debounce";
 
 @customElement("error-log-card")
 class ErrorLogCard extends LitElement {
@@ -77,12 +76,6 @@ class ErrorLogCard extends LitElement {
     `;
   }
 
-  private _debounceSearch = debounce(
-    () => (this._isLogLoaded ? this._refreshLogs() : this._debounceSearch()),
-    150,
-    false
-  );
-
   protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
 
@@ -100,15 +93,11 @@ class ErrorLogCard extends LitElement {
     }
 
     if (
+      (changedProps.has("filter") && this._isLogLoaded) ||
       (changedProps.has("show") && this.show) ||
       (changedProps.has("provider") && this.show)
     ) {
       this._refreshLogs();
-      return;
-    }
-
-    if (changedProps.has("filter")) {
-      this._debounceSearch();
     }
   }
 
@@ -127,18 +116,6 @@ class ErrorLogCard extends LitElement {
     if (isComponentLoaded(this.hass, "hassio")) {
       try {
         log = await fetchHassioLogs(this.hass, this.provider);
-        if (this.filter) {
-          log = log
-            .split("\n")
-            .filter((entry) =>
-              entry.toLowerCase().includes(this.filter.toLowerCase())
-            )
-            .join("\n");
-        }
-        if (!log) {
-          this._logHTML = this.hass.localize("ui.panel.config.logs.no_errors");
-          return;
-        }
         this._logHTML = html`<ha-ansi-to-html .content=${log}>
         </ha-ansi-to-html>`;
         this._isLogLoaded = true;
@@ -159,33 +136,31 @@ class ErrorLogCard extends LitElement {
 
     this._isLogLoaded = true;
 
-    const split = log && log.split("\n");
+    this._logHTML = log
+      ? log
+          .split("\n")
+          .filter((entry) => {
+            if (this.filter) {
+              return entry.toLowerCase().includes(this.filter.toLowerCase());
+            }
+            return entry;
+          })
+          .map((entry) => {
+            if (entry.includes("INFO"))
+              return html`<div class="info">${entry}</div>`;
 
-    this._logHTML = split
-      ? (this.filter
-          ? split.filter((entry) => {
-              if (this.filter) {
-                return entry.toLowerCase().includes(this.filter.toLowerCase());
-              }
-              return entry;
-            })
-          : split
-        ).map((entry) => {
-          if (entry.includes("INFO"))
-            return html`<div class="info">${entry}</div>`;
+            if (entry.includes("WARNING"))
+              return html`<div class="warning">${entry}</div>`;
 
-          if (entry.includes("WARNING"))
-            return html`<div class="warning">${entry}</div>`;
+            if (
+              entry.includes("ERROR") ||
+              entry.includes("FATAL") ||
+              entry.includes("CRITICAL")
+            )
+              return html`<div class="error">${entry}</div>`;
 
-          if (
-            entry.includes("ERROR") ||
-            entry.includes("FATAL") ||
-            entry.includes("CRITICAL")
-          )
-            return html`<div class="error">${entry}</div>`;
-
-          return html`<div>${entry}</div>`;
-        })
+            return html`<div>${entry}</div>`;
+          })
       : this.hass.localize("ui.panel.config.logs.no_errors");
   }
 

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

@@ -6,7 +6,6 @@ import { extractSearchParam } from "../../../common/url/search-params";
 import "../../../components/ha-button-menu";
 import "../../../components/search-input";
 import { LogProvider } from "../../../data/error_log";
-import { fetchHassioSupervisorInfo } from "../../../data/hassio/supervisor";
 import "../../../layouts/hass-subpage";
 import "../../../layouts/hass-tabs-subpage";
 import { haStyle } from "../../../resources/styles";
@@ -60,8 +59,6 @@ export class HaConfigLogs extends LitElement {
 
   @state() private _selectedLogProvider = "core";
 
-  @state() private _logProviders = logProviders;
-
   public connectedCallback() {
     super.connectedCallback();
     if (this.systemLog && this.systemLog.loaded) {
@@ -69,13 +66,6 @@ export class HaConfigLogs extends LitElement {
     }
   }
 
-  protected firstUpdated(changedProps): void {
-    super.firstUpdated(changedProps);
-    if (isComponentLoaded(this.hass, "hassio")) {
-      this._getInstalledAddons();
-    }
-  }
-
   private async _filterChanged(ev) {
     this._filter = ev.detail.value;
   }
@@ -117,7 +107,7 @@ export class HaConfigLogs extends LitElement {
               <ha-button-menu corner="BOTTOM_START" slot="toolbar-icon">
                 <mwc-button
                   slot="trigger"
-                  .label=${this._logProviders.find(
+                  .label=${logProviders.find(
                     (p) => p.key === this._selectedLogProvider
                   )!.name}
                 >
@@ -126,7 +116,7 @@ export class HaConfigLogs extends LitElement {
                     .path=${mdiChevronDown}
                   ></ha-svg-icon>
                 </mwc-button>
-                ${this._logProviders.map(
+                ${logProviders.map(
                   (provider) => html`
                     <mwc-list-item
                       ?selected=${provider.key === this._selectedLogProvider}
@@ -165,21 +155,6 @@ export class HaConfigLogs extends LitElement {
     this._selectedLogProvider = (ev.currentTarget as any).provider;
   }
 
-  private async _getInstalledAddons() {
-    try {
-      const supervisorInfo = await fetchHassioSupervisorInfo(this.hass);
-      this._logProviders = [
-        ...this._logProviders,
-        ...supervisorInfo.addons.map((addon) => ({
-          key: addon.slug,
-          name: addon.name,
-        })),
-      ];
-    } catch (err) {
-      // Ignore, nothing the user can do anyway
-    }
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyle,

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

@@ -252,8 +252,6 @@ class ConfigUrlForm extends LitElement {
         this._cloudStatus = cloudStatus;
         if (cloudStatus.logged_in) {
           this._showCustomExternalUrl = this._externalUrlValue !== null;
-        } else {
-          this._showCustomExternalUrl = true;
         }
       });
     } else {

src/panels/config/network/supervisor-hostname.ts

@@ -111,9 +111,6 @@ export class HassioHostname extends LitElement {
       justify-content: space-between;
       align-items: center;
     }
-    ha-settings-row {
-      border-top: none;
-    }
   `;
 }
 

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

@@ -88,7 +88,7 @@ class HaConfigPerson extends LitElement {
             </a>
           </span>
 
-          <ha-card outlined class="storage">
+          <ha-card class="storage">
             ${this._storageItems.map(
               (entry) => html`
                 <paper-icon-item @click=${this._openEditEntry} .entry=${entry}>
@@ -117,7 +117,7 @@ class HaConfigPerson extends LitElement {
           </ha-card>
           ${this._configItems.length > 0
             ? html`
-                <ha-card outlined header="Configuration.yaml persons">
+                <ha-card header="Configuration.yaml persons">
                   ${this._configItems.map(
                     (entry) => html`
                       <paper-icon-item>

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

@@ -287,7 +287,7 @@ export class HaSceneEditor extends SubscribeMixin(
                       "ui.panel.config.scene.editor.introduction"
                     )}
                   </div>
-                  <ha-card outlined>
+                  <ha-card>
                     <div class="card-content">
                       <ha-textfield
                         .value=${this._config.name}
@@ -335,7 +335,7 @@ export class HaSceneEditor extends SubscribeMixin(
                   ${devices.map(
                     (device) =>
                       html`
-                        <ha-card outlined>
+                        <ha-card>
                           <h1 class="card-header">
                             ${device.name}
                             <ha-icon-button
@@ -373,7 +373,6 @@ export class HaSceneEditor extends SubscribeMixin(
                   )}
 
                   <ha-card
-                    outlined
                     .header=${this.hass.localize(
                       "ui.panel.config.scene.editor.devices.add"
                     )}
@@ -406,7 +405,6 @@ export class HaSceneEditor extends SubscribeMixin(
                         ${entities.length
                           ? html`
                               <ha-card
-                                outlined
                                 class="entities"
                                 .header=${this.hass.localize(
                                   "ui.panel.config.scene.editor.entities.without_device"
@@ -447,7 +445,6 @@ export class HaSceneEditor extends SubscribeMixin(
                           : ""}
 
                         <ha-card
-                          outlined
                           header=${this.hass.localize(
                             "ui.panel.config.scene.editor.entities.add"
                           )}

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

@@ -51,7 +51,7 @@ export class HaBlueprintScriptEditor extends LitElement {
           "ui.panel.config.automation.editor.blueprint.header"
         )}</span
       >
-      <ha-card outlined>
+      <ha-card>
         <div class="blueprint-picker-container">
           ${this._blueprints
             ? Object.keys(this._blueprints).length

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

@@ -290,7 +290,7 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
                               "ui.panel.config.script.editor.introduction"
                             )}
                           </span>
-                          <ha-card outlined>
+                          <ha-card>
                             <div class="card-content">
                               <ha-form
                                 .schema=${schema}
@@ -387,8 +387,8 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
             ? html`
                 ${!this.narrow
                   ? html`
-                      <ha-card outlined>
-                        <div class="card-header">${this._config?.alias}</div>
+                      <ha-card
+                        ><div class="card-header">${this._config?.alias}</div>
                         <div
                           class="card-actions layout horizontal justified center"
                         >
@@ -412,8 +412,8 @@ export class HaScriptEditor 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/storage/ha-config-section-storage.ts

@@ -3,7 +3,6 @@ import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import "../../../components/ha-alert";
-import "../../../components/ha-button-menu";
 import "../../../components/ha-metric";
 import { fetchHassioHostInfo, HassioHostInfo } from "../../../data/hassio/host";
 import "../../../layouts/hass-subpage";
@@ -47,7 +46,7 @@ class HaConfigSectionStorage extends LitElement {
               <ha-button-menu corner="BOTTOM_START" slot="toolbar-icon">
                 <ha-icon-button
                   slot="trigger"
-                  .label=${this.hass.localize("ui.common.menu")}
+                  .label=${this.hass.localize("ui.common.overflow")}
                   .path=${mdiDotsVertical}
                 ></ha-icon-button>
                 <mwc-list-item @click=${this._moveDatadisk}>

src/panels/config/system-health/ha-config-system-health.ts

@@ -30,7 +30,6 @@ import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import type { HomeAssistant } from "../../../types";
 import { documentationUrl } from "../../../util/documentation-url";
 import { showToast } from "../../../util/toast";
-import "./integrations-card";
 
 const sortKeys = (a: string, b: string) => {
   if (a === "homeassistant") {
@@ -318,11 +317,6 @@ class HaConfigSystemHealth extends SubscribeMixin(LitElement) {
                   </div>
                 </ha-card>
               `}
-
-          <integrations-card
-            .hass=${this.hass}
-            .narrow=${this.narrow}
-          ></integrations-card>
         </div>
       </hass-subpage>
     `;
@@ -456,20 +450,12 @@ class HaConfigSystemHealth extends SubscribeMixin(LitElement) {
       max-width: 1040px;
       margin: 0 auto;
     }
-    integrations-card {
-      max-width: 600px;
-      display: block;
-      max-width: 600px;
-      margin: 0 auto;
-      margin-bottom: 24px;
-      margin-bottom: max(24px, env(safe-area-inset-bottom));
-    }
     ha-card {
       display: block;
       max-width: 600px;
       margin: 0 auto;
       padding-bottom: 16px;
-      margin-bottom: 24px;
+      margin-bottom: max(24px, env(safe-area-inset-bottom));
     }
     ha-alert {
       display: block;

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

@@ -1,154 +0,0 @@
-import "@material/mwc-list/mwc-list";
-import {
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  PropertyValues,
-  TemplateResult,
-} from "lit";
-import { customElement, property, state } from "lit/decorators";
-import "../../../components/ha-card";
-import "../../../components/ha-clickable-list-item";
-import {
-  domainToName,
-  fetchIntegrationManifests,
-  fetchIntegrationSetups,
-  IntegrationManifest,
-  IntegrationSetup,
-} from "../../../data/integration";
-import type { HomeAssistant } from "../../../types";
-import { brandsUrl } from "../../../util/brands-url";
-import { documentationUrl } from "../../../util/documentation-url";
-
-@customElement("integrations-card")
-class IntegrationsCard extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ type: Boolean }) public narrow = false;
-
-  @state() private _manifests?: {
-    [domain: string]: IntegrationManifest;
-  };
-
-  @state() private _setups?: IntegrationSetup[];
-
-  protected firstUpdated(changedProps: PropertyValues) {
-    super.firstUpdated(changedProps);
-    this._fetchManifests();
-    this._fetchSetups();
-  }
-
-  protected render(): TemplateResult {
-    if (!this._setups) {
-      return html``;
-    }
-
-    return html`
-      <ha-card
-        outlined
-        .header=${this.hass.localize(
-          "ui.panel.config.system_health.integration_start_time"
-        )}
-      >
-        <mwc-list>
-          ${this._setups?.map((setup) => {
-            const manifest = this._manifests && this._manifests[setup.domain];
-            const docLink = manifest
-              ? manifest.is_built_in
-                ? documentationUrl(
-                    this.hass,
-                    `/integrations/${manifest.domain}`
-                  )
-                : manifest.documentation
-              : "";
-
-            const setupSeconds = setup.seconds?.toFixed(2);
-            return html`
-              <ha-clickable-list-item
-                graphic="avatar"
-                twoline
-                hasMeta
-                openNewTab
-                @click=${this._entryClicked}
-                href=${docLink}
-              >
-                <img
-                  loading="lazy"
-                  src=${brandsUrl({
-                    domain: setup.domain,
-                    type: "icon",
-                    useFallback: true,
-                    darkOptimized: this.hass.themes?.darkMode,
-                  })}
-                  referrerpolicy="no-referrer"
-                  slot="graphic"
-                />
-                <span>
-                  ${domainToName(this.hass.localize, setup.domain, manifest)}
-                </span>
-                <span slot="secondary">${setup.domain}</span>
-                <div slot="meta">
-                  ${setupSeconds ? html`${setupSeconds} s` : ""}
-                </div>
-              </ha-clickable-list-item>
-            `;
-          })}
-        </mwc-list>
-      </ha-card>
-    `;
-  }
-
-  private async _fetchManifests() {
-    const manifests = {};
-    for (const manifest of await fetchIntegrationManifests(this.hass)) {
-      manifests[manifest.domain] = manifest;
-    }
-    this._manifests = manifests;
-  }
-
-  private async _fetchSetups() {
-    const setups = await fetchIntegrationSetups(this.hass);
-    this._setups = setups.sort((a, b) => {
-      if (a.seconds === b.seconds) {
-        return 0;
-      }
-      if (a.seconds === undefined) {
-        return 1;
-      }
-      if (b.seconds === undefined) {
-        return 1;
-      }
-      return b.seconds - a.seconds;
-    });
-  }
-
-  private _entryClicked(ev) {
-    ev.currentTarget.blur();
-  }
-
-  static get styles(): CSSResultGroup {
-    return css`
-      ha-clickable-list-item {
-        --mdc-list-item-meta-size: 64px;
-        --mdc-typography-caption-font-size: 12px;
-      }
-      img {
-        display: block;
-        max-height: 40px;
-        max-width: 40px;
-      }
-      div[slot="meta"] {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "integrations-card": IntegrationsCard;
-  }
-}

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

@@ -9,6 +9,7 @@ import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { DataTableColumnContainer } from "../../../components/data-table/ha-data-table";
+import "../../../components/ha-card";
 import "../../../components/ha-fab";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-relative-time";