Change function name

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "Dockerfile",
     "context": ".."
   },
-  "appPort": "8124:8123",
+  "appPort": 8123,
   "context": "..",
   "postCreateCommand": "script/bootstrap",
   "extensions": [

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,138 +0,0 @@
-name: Report a bug with the UI, Frontend or Lovelace
-about: Report an issue related to the Home Assistant frontend.
-labels: bug
-title: ""
-issue_body: true
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Make sure you are running the [latest version of Home Assistant][releases] before reporting an issue.
-
-        If you have a feature or enhancement request for the frontend, please [start an discussion][fr] instead of creating an issue.
-
-        **Please not not report issues for custom Lovelace cards.**
-
-        [fr]: https://github.com/home-assistant/frontend/discussions
-        [releases]: https://github.com/home-assistant/home-assistant/releases
-  - type: checkboxes
-    attributes:
-      label: Checklist
-      description: Please verify that you've followed these steps
-      options:
-        - label: I have updated to the latest available Home Assistant version.
-          required: true
-        - label: I have cleared the cache of my browser.
-          required: true
-        - label: I have tried a different browser to see if it is related to my browser.
-          required: true
-  - type: markdown
-    attributes:
-      value: |
-        ## The problem
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Describe the issue you are experiencing
-      description: Provide a clear and concise description of what the bug is.
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Describe the behavior you expected
-      description: Describe what you expected to happen or it should look/behave.
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Steps to reproduce the issue
-      description: |
-        Please tell us exactly how to reproduce your issue.
-        Provide clear and concise step by step instructions and add code snippets if needed.
-      value: |
-        1.
-        2.
-        3.
-        ...
-  - type: markdown
-    attributes:
-      value: |
-        ## Environment
-  - type: input
-    validations:
-      required: true
-    attributes:
-      label: What version of Home Assistant Core has the issue?
-      placeholder: core-
-      description: >
-        Can be found in the Configuration panel -> Info.
-  - type: input
-    attributes:
-      label: What was the last working version of Home Assistant Core?
-      placeholder: core-
-      description: >
-        If known, otherwise leave blank.
-  - type: input
-    attributes:
-      label: In which browser are you experiencing the issue with?
-      placeholder: Google Chrome 88.0.4324.150
-      description: >
-        Provide the full name and don't forget to add the version!
-  - type: input
-    attributes:
-      label: Which operating system are you using to run this browser?
-      placeholder: macOS Big Sur (1.11)
-      description: >
-        Don't forget to add the version!
-  - type: markdown
-    attributes:
-      value: |
-        # Details
-
-  - type: textarea
-    attributes:
-      label: State of relevant entities
-      description: >
-        If your issue is about how an entity is shown in the UI, please add the
-        state and attributes for all situations. You can find this information
-        at Developer Tools -> States.
-      value: |
-        ```yaml
-        # Paste your state here.
-
-        ```
-  - type: textarea
-    attributes:
-      label: Problem-relevant frontend configuration
-      description: >
-        An example configuration that caused the problem for you, e.g., the YAML
-        configuration of the used cards. Fill this out even if it seems
-        unimportant to you. Please be sure to remove personal information like
-        passwords, private URLs and other credentials.
-      value: |
-        ```yaml
-        # Paste your YAML here.
-
-        ```
-  - type: textarea
-    attributes:
-      label: Javascript errors shown in your browser console/inspector
-      description: >
-        If you come across any Javascript or other error logs, e.g., in your
-        browser console/inspector please provide them.
-      value: |
-        ```txt
-        # Paste your logs here.
-
-        ```
-  - type: markdown
-    attributes:
-      value: |
-        ## Additional information
-  - type: markdown
-    attributes:
-      value: |
-        If you have any additional information for us, use the field below.
-        Please note, you can attach screenshots or screen recordings here,
-        by dragging and dropping files in the field below.

.github/workflows/translations.yaml

@@ -7,7 +7,7 @@ on:
     branches:
       - dev
     paths:
-      - src/translations/en.json
+      - translations/en.json
 
 env:
   NODE_VERSION: 12

build-scripts/gulp/gather-static.js

@@ -85,11 +85,6 @@ gulp.task("copy-translations-app", async () => {
   copyTranslations(staticDir);
 });
 
-gulp.task("copy-translations-supervisor", async () => {
-  const staticDir = paths.hassio_output_static;
-  copyTranslations(staticDir);
-});
-
 gulp.task("copy-static-app", async () => {
   const staticDir = paths.app_output_static;
   // Basic static files

build-scripts/gulp/hassio.js

@@ -10,8 +10,6 @@ require("./gen-icons-json.js");
 require("./webpack.js");
 require("./compress.js");
 require("./rollup.js");
-require("./gather-static.js");
-require("./translations.js");
 
 gulp.task(
   "develop-hassio",
@@ -22,8 +20,6 @@ gulp.task(
     "clean-hassio",
     "gen-icons-json",
     "gen-index-hassio-dev",
-    "build-supervisor-translations",
-    "copy-translations-supervisor",
     env.useRollup() ? "rollup-watch-hassio" : "webpack-watch-hassio"
   )
 );
@@ -36,8 +32,6 @@ gulp.task(
     },
     "clean-hassio",
     "gen-icons-json",
-    "build-supervisor-translations",
-    "copy-translations-supervisor",
     env.useRollup() ? "rollup-prod-hassio" : "webpack-prod-hassio",
     "gen-index-hassio-prod",
     ...// Don't compress running tests

build-scripts/gulp/translations.js

@@ -266,7 +266,6 @@ gulp.task(taskName, function () {
         TRANSLATION_FRAGMENTS.forEach((fragment) => {
           delete data.ui.panel[fragment];
         });
-        delete data.supervisor;
         return data;
       })
     )
@@ -343,62 +342,6 @@ gulp.task(
   }
 );
 
-gulp.task("build-translation-fragment-supervisor", function () {
-  return gulp
-    .src(fullDir + "/*.json")
-    .pipe(transform((data) => data.supervisor))
-    .pipe(gulp.dest(workDir + "/supervisor"));
-});
-
-gulp.task("build-translation-flatten-supervisor", function () {
-  return gulp
-    .src(workDir + "/supervisor/*.json")
-    .pipe(
-      transform(function (data) {
-        // Polymer.AppLocalizeBehavior requires flattened json
-        return flatten(data);
-      })
-    )
-    .pipe(gulp.dest(outDir));
-});
-
-gulp.task("build-translation-write-metadata", function writeMetadata() {
-  return gulp
-    .src(
-      [
-        path.join(paths.translations_src, "translationMetadata.json"),
-        workDir + "/testMetadata.json",
-        workDir + "/translationFingerprints.json",
-      ],
-      { allowEmpty: true }
-    )
-    .pipe(merge({}))
-    .pipe(
-      transform(function (data) {
-        const newData = {};
-        Object.entries(data).forEach(([key, value]) => {
-          // Filter out translations without native name.
-          if (value.nativeName) {
-            newData[key] = value;
-          } else {
-            console.warn(
-              `Skipping language ${key}. Native name was not translated.`
-            );
-          }
-        });
-        return newData;
-      })
-    )
-    .pipe(
-      transform((data) => ({
-        fragments: TRANSLATION_FRAGMENTS,
-        translations: data,
-      }))
-    )
-    .pipe(rename("translationMetadata.json"))
-    .pipe(gulp.dest(workDir));
-});
-
 gulp.task(
   "build-translations",
   gulp.series(
@@ -410,20 +353,42 @@ gulp.task(
     gulp.parallel(...splitTasks),
     "build-flattened-translations",
     "build-translation-fingerprints",
-    "build-translation-write-metadata"
-  )
-);
-
-gulp.task(
-  "build-supervisor-translations",
-  gulp.series(
-    "clean-translations",
-    "ensure-translations-build-dir",
-    "build-master-translation",
-    "build-merged-translations",
-    "build-translation-fragment-supervisor",
-    "build-translation-flatten-supervisor",
-    "build-translation-fingerprints",
-    "build-translation-write-metadata"
+    function writeMetadata() {
+      return gulp
+        .src(
+          [
+            path.join(paths.translations_src, "translationMetadata.json"),
+            workDir + "/testMetadata.json",
+            workDir + "/translationFingerprints.json",
+          ],
+          { allowEmpty: true }
+        )
+        .pipe(merge({}))
+        .pipe(
+          transform(function (data) {
+            const newData = {};
+            Object.entries(data).forEach(([key, value]) => {
+              // Filter out translations without native name.
+              if (data[key].nativeName) {
+                newData[key] = data[key];
+              } else {
+                console.warn(
+                  `Skipping language ${key}. Native name was not translated.`
+                );
+              }
+              if (data[key]) newData[key] = value;
+            });
+            return newData;
+          })
+        )
+        .pipe(
+          transform((data) => ({
+            fragments: TRANSLATION_FRAGMENTS,
+            translations: data,
+          }))
+        )
+        .pipe(rename("translationMetadata.json"))
+        .pipe(gulp.dest(workDir));
+    }
   )
 );

build-scripts/gulp/webpack.js

@@ -137,12 +137,7 @@ gulp.task("webpack-watch-hassio", () => {
       isProdBuild: false,
       latestBuild: true,
     })
-  ).watch({ ignored: /build-translations/ }, doneHandler());
-
-  gulp.watch(
-    path.join(paths.translations_src, "en.json"),
-    gulp.series("build-supervisor-translations", "copy-translations-supervisor")
-  );
+  ).watch({}, doneHandler());
 });
 
 gulp.task("webpack-prod-hassio", () =>

build-scripts/paths.js

@@ -34,7 +34,6 @@ module.exports = {
 
   hassio_dir: path.resolve(__dirname, "../hassio"),
   hassio_output_root: path.resolve(__dirname, "../hassio/build"),
-  hassio_output_static: path.resolve(__dirname, "../hassio/build/static"),
   hassio_output_latest: path.resolve(
     __dirname,
     "../hassio/build/frontend_latest"

build-scripts/webpack.js

@@ -1,7 +1,7 @@
 const webpack = require("webpack");
 const path = require("path");
 const TerserPlugin = require("terser-webpack-plugin");
-const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
+const ManifestPlugin = require("webpack-manifest-plugin");
 const paths = require("./paths.js");
 const bundle = require("./bundle");
 const log = require("fancy-log");
@@ -68,7 +68,7 @@ const createWebpackConfig = ({
       ],
     },
     plugins: [
-      new WebpackManifestPlugin({
+      new ManifestPlugin({
         // Only include the JS of entrypoints
         filter: (file) => file.isInitial && !file.name.endsWith(".map"),
       }),

cast/src/launcher/layout/hc-cast.ts

@@ -48,7 +48,7 @@ class HcCast extends LitElement {
 
   protected render(): TemplateResult {
     if (this.lovelaceConfig === undefined) {
-      return html`<hass-loading-screen no-toolbar></hass-loading-screen>`;
+      return html` <hass-loading-screen no-toolbar></hass-loading-screen>> `;
     }
 
     const error =

cast/src/launcher/layout/hc-layout.ts

@@ -98,12 +98,8 @@ class HcLayout extends LitElement {
         line-height: 32px;
         padding: 24px 16px 16px;
         display: block;
-        margin: 0;
-      }
-	
-      .hero {
-        border-radius: 4px 4px 0 0;
       }
+
       .subtitle {
         font-size: 14px;
         color: var(--secondary-text-color);

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

@@ -15,7 +15,6 @@ import {
   HassioAddonInfo,
   HassioAddonRepository,
 } from "../../../src/data/hassio/addon";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import { HomeAssistant } from "../../../src/types";
 import "../components/hassio-card-content";
 import { filterAndSort } from "../components/hassio-filter-addons";
@@ -24,8 +23,6 @@ import { hassioStyle } from "../resources/hassio-style";
 class HassioAddonRepositoryEl extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public repo!: HassioAddonRepository;
 
   @property({ attribute: false }) public addons!: HassioAddonInfo[];
@@ -57,11 +54,7 @@ class HassioAddonRepositoryEl extends LitElement {
       return html`
         <div class="content">
           <p class="description">
-            ${this.supervisor.localize(
-              "store.no_results_found",
-              "repository",
-              repo.name
-            )}
+            No results found in "${repo.name}."
           </p>
         </div>
       `;
@@ -90,13 +83,11 @@ class HassioAddonRepositoryEl extends LitElement {
                       : mdiPuzzle}
                     .iconTitle=${addon.installed
                       ? addon.update_available
-                        ? this.supervisor.localize(
-                            "common.new_version_available"
-                          )
-                        : this.supervisor.localize("addon.installed")
+                        ? "New version available"
+                        : "Add-on is installed"
                       : addon.available
-                      ? this.supervisor.localize("addon.not_installed")
-                      : this.supervisor.localize("addon.not_available")}
+                      ? "Add-on is not installed"
+                      : "Add-on is not available on your system"}
                     .iconClass=${addon.installed
                       ? addon.update_available
                         ? "update"

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

@@ -11,18 +11,19 @@ import {
   PropertyValues,
 } from "lit-element";
 import { html, TemplateResult } from "lit-html";
-import memoizeOne from "memoize-one";
 import { atLeastVersion } from "../../../src/common/config/version";
 import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/common/search/search-input";
 import "../../../src/components/ha-button-menu";
 import "../../../src/components/ha-svg-icon";
 import {
+  fetchHassioAddonsInfo,
   HassioAddonInfo,
   HassioAddonRepository,
   reloadHassioAddons,
 } from "../../../src/data/hassio/addon";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
+import { extractApiErrorMessage } from "../../../src/data/hassio/common";
+import { fetchHassioSupervisorInfo } from "../../../src/data/hassio/supervisor";
 import "../../../src/layouts/hass-loading-screen";
 import "../../../src/layouts/hass-tabs-subpage";
 import { HomeAssistant, Route } from "../../../src/types";
@@ -50,43 +51,58 @@ const sortRepos = (a: HassioAddonRepository, b: HassioAddonRepository) => {
 class HassioAddonStore extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ type: Boolean }) public narrow!: boolean;
 
   @property({ attribute: false }) public route!: Route;
 
+  @property({ attribute: false }) private _addons?: HassioAddonInfo[];
+
+  @property({ attribute: false }) private _repos?: HassioAddonRepository[];
+
   @internalProperty() private _filter?: string;
 
   public async refreshData() {
+    this._repos = undefined;
+    this._addons = undefined;
+    this._filter = undefined;
     await reloadHassioAddons(this.hass);
     await this._loadData();
   }
 
   protected render(): TemplateResult {
-    let repos: TemplateResult[] = [];
+    const repos: TemplateResult[] = [];
 
-    if (this.supervisor.addon.repositories) {
-      repos = this.addonRepositories(
-        this.supervisor.addon.repositories,
-        this.supervisor.addon.addons,
-        this._filter
-      );
+    if (this._repos) {
+      for (const repo of this._repos) {
+        const addons = this._addons!.filter(
+          (addon) => addon.repository === repo.slug
+        );
+
+        if (addons.length === 0) {
+          continue;
+        }
+
+        repos.push(html`
+          <hassio-addon-repository
+            .hass=${this.hass}
+            .repo=${repo}
+            .addons=${addons}
+            .filter=${this._filter!}
+          ></hassio-addon-repository>
+        `);
+      }
     }
 
     return html`
       <hass-tabs-subpage
         .hass=${this.hass}
-        .localizeFunc=${this.supervisor.localize}
         .narrow=${this.narrow}
         .route=${this.route}
-        .tabs=${supervisorTabs}
+        hassio
         main-page
-        supervisor
+        .tabs=${supervisorTabs}
       >
-        <span slot="header">
-          ${this.supervisor.localize("panel.store")}
-        </span>
+        <span slot="header">Add-on Store</span>
         <ha-button-menu
           corner="BOTTOM_START"
           slot="toolbar-icon"
@@ -96,15 +112,15 @@ class HassioAddonStore extends LitElement {
             <ha-svg-icon .path=${mdiDotsVertical}></ha-svg-icon>
           </mwc-icon-button>
           <mwc-list-item>
-            ${this.supervisor.localize("store.repositories")}
+            Repositories
           </mwc-list-item>
           <mwc-list-item>
-            ${this.supervisor.localize("common.reload")}
+            Reload
           </mwc-list-item>
           ${this.hass.userData?.showAdvanced &&
           atLeastVersion(this.hass.config.version, 0, 117)
             ? html`<mwc-list-item>
-                ${this.supervisor.localize("store.registries")}
+                Registries
               </mwc-list-item>`
             : ""}
         </ha-button-menu>
@@ -125,9 +141,11 @@ class HassioAddonStore extends LitElement {
         ${!this.hass.userData?.showAdvanced
           ? html`
               <div class="advanced">
+                Missing add-ons? Enable advanced mode on
                 <a href="/profile" target="_top">
-                  ${this.supervisor.localize("store.missing_addons")}
+                  your profile page
                 </a>
+                .
               </div>
             `
           : ""}
@@ -141,32 +159,6 @@ class HassioAddonStore extends LitElement {
     this._loadData();
   }
 
-  private addonRepositories = memoizeOne(
-    (
-      repositories: HassioAddonRepository[],
-      addons: HassioAddonInfo[],
-      filter?: string
-    ) => {
-      return repositories.sort(sortRepos).map((repo) => {
-        const filteredAddons = addons.filter(
-          (addon) => addon.repository === repo.slug
-        );
-
-        return filteredAddons.length !== 0
-          ? html`
-              <hassio-addon-repository
-                .hass=${this.hass}
-                .repo=${repo}
-                .addons=${filteredAddons}
-                .filter=${filter!}
-                .supervisor=${this.supervisor}
-              ></hassio-addon-repository>
-            `
-          : html``;
-      });
-    }
-  );
-
   private _handleAction(ev: CustomEvent<ActionDetail>) {
     switch (ev.detail.index) {
       case 0:
@@ -189,20 +181,28 @@ class HassioAddonStore extends LitElement {
 
   private async _manageRepositories() {
     showRepositoriesDialog(this, {
-      supervisor: this.supervisor,
+      repos: this._repos!,
       loadData: () => this._loadData(),
     });
   }
 
   private async _manageRegistries() {
-    showRegistriesDialog(this, { supervisor: this.supervisor });
+    showRegistriesDialog(this);
   }
 
   private async _loadData() {
-    fireEvent(this, "supervisor-colllection-refresh", { colllection: "addon" });
-    fireEvent(this, "supervisor-colllection-refresh", {
-      colllection: "supervisor",
-    });
+    try {
+      const [addonsInfo, supervisor] = await Promise.all([
+        fetchHassioAddonsInfo(this.hass),
+        fetchHassioSupervisorInfo(this.hass),
+      ]);
+      fireEvent(this, "supervisor-update", { supervisor });
+      this._repos = addonsInfo.repositories;
+      this._repos.sort(sortRepos);
+      this._addons = addonsInfo.addons;
+    } catch (err) {
+      alert(extractApiErrorMessage(err));
+    }
   }
 
   private async _filterChanged(e) {

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

@@ -25,7 +25,6 @@ import {
   fetchHassioHardwareAudio,
   HassioHardwareAudioDevice,
 } from "../../../../src/data/hassio/hardware";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import { haStyle } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
 import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
@@ -35,8 +34,6 @@ import { hassioStyle } from "../../resources/hassio-style";
 class HassioAddonAudio extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public addon!: HassioAddonDetails;
 
   @internalProperty() private _error?: string;
@@ -51,16 +48,12 @@ class HassioAddonAudio extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <ha-card
-        .header=${this.supervisor.localize("addon.configuration.audio.header")}
-      >
+      <ha-card header="Audio">
         <div class="card-content">
           ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
 
           <paper-dropdown-menu
-            .label=${this.supervisor.localize(
-              "addon.configuration.audio.input"
-            )}
+            label="Input"
             @iron-select=${this._setInputDevice}
           >
             <paper-listbox
@@ -71,17 +64,15 @@ class HassioAddonAudio extends LitElement {
               ${this._inputDevices &&
               this._inputDevices.map((item) => {
                 return html`
-                  <paper-item device=${item.device || ""}>
-                    ${item.name}
-                  </paper-item>
+                  <paper-item device=${item.device || ""}
+                    >${item.name}</paper-item
+                  >
                 `;
               })}
             </paper-listbox>
           </paper-dropdown-menu>
           <paper-dropdown-menu
-            .label=${this.supervisor.localize(
-              "addon.configuration.audio.output"
-            )}
+            label="Output"
             @iron-select=${this._setOutputDevice}
           >
             <paper-listbox
@@ -102,7 +93,7 @@ class HassioAddonAudio extends LitElement {
         </div>
         <div class="card-actions">
           <ha-progress-button @click=${this._saveSettings}>
-            ${this.supervisor.localize("common.save")}
+            Save
           </ha-progress-button>
         </div>
       </ha-card>
@@ -161,7 +152,7 @@ class HassioAddonAudio extends LitElement {
 
     const noDevice: HassioHardwareAudioDevice = {
       device: "default",
-      name: this.supervisor.localize("addon.configuration.audio.default"),
+      name: "Default",
     };
 
     try {
@@ -198,7 +189,7 @@ class HassioAddonAudio extends LitElement {
     try {
       await setHassioAddonOption(this.hass, this.addon.slug, data);
       if (this.addon?.state === "started") {
-        await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
+        await suggestAddonRestart(this, this.hass, this.addon);
       }
     } catch {
       this._error = "Failed to set addon audio device";

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

@@ -9,7 +9,6 @@ import {
 } from "lit-element";
 import "../../../../src/components/ha-circular-progress";
 import { HassioAddonDetails } from "../../../../src/data/hassio/addon";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import { haStyle } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
 import { hassioStyle } from "../../resources/hassio-style";
@@ -21,28 +20,26 @@ import "./hassio-addon-network";
 class HassioAddonConfigDashboard extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public addon?: HassioAddonDetails;
 
   protected render(): TemplateResult {
     if (!this.addon) {
       return html`<ha-circular-progress active></ha-circular-progress>`;
     }
-    const hasConfiguration =
-      (this.addon.options && Object.keys(this.addon.options).length) ||
-      (this.addon.schema && Object.keys(this.addon.schema).length);
+    const hasOptions =
+      this.addon.options && Object.keys(this.addon.options).length;
+    const hasSchema =
+      this.addon.schema && Object.keys(this.addon.schema).length;
 
     return html`
       <div class="content">
-        ${hasConfiguration || this.addon.network || this.addon.audio
+        ${hasOptions || hasSchema || this.addon.network || this.addon.audio
           ? html`
-              ${hasConfiguration
+              ${hasOptions || hasSchema
                 ? html`
                     <hassio-addon-config
                       .hass=${this.hass}
                       .addon=${this.addon}
-                      .supervisor=${this.supervisor}
                     ></hassio-addon-config>
                   `
                 : ""}
@@ -51,7 +48,6 @@ class HassioAddonConfigDashboard extends LitElement {
                     <hassio-addon-network
                       .hass=${this.hass}
                       .addon=${this.addon}
-                      .supervisor=${this.supervisor}
                     ></hassio-addon-network>
                   `
                 : ""}
@@ -60,12 +56,11 @@ class HassioAddonConfigDashboard extends LitElement {
                     <hassio-addon-audio
                       .hass=${this.hass}
                       .addon=${this.addon}
-                      .supervisor=${this.supervisor}
                     ></hassio-addon-audio>
                   `
                 : ""}
             `
-          : this.supervisor.localize("addon.configuration.no_configuration")}
+          : "This add-on does not expose configuration for you to mess with.... 👋"}
       </div>
     `;
   }

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

@@ -15,15 +15,11 @@ import {
   query,
   TemplateResult,
 } from "lit-element";
-import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-button-menu";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-form/ha-form";
-import type { HaFormSchema } from "../../../../src/components/ha-form/ha-form";
-import "../../../../src/components/ha-formfield";
-import "../../../../src/components/ha-switch";
 import "../../../../src/components/ha-yaml-editor";
 import type { HaYamlEditor } from "../../../../src/components/ha-yaml-editor";
 import {
@@ -32,7 +28,6 @@ import {
   setHassioAddonOption,
 } from "../../../../src/data/hassio/addon";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import { showConfirmationDialog } from "../../../../src/dialogs/generic/show-dialog-box";
 import { haStyle } from "../../../../src/resources/styles";
 import type { HomeAssistant } from "../../../../src/types";
@@ -47,16 +42,12 @@ class HassioAddonConfig extends LitElement {
 
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ type: Boolean }) private _configHasChanged = false;
 
   @property({ type: Boolean }) private _valid = true;
 
   @internalProperty() private _canShowSchema = false;
 
-  @internalProperty() private _showOptional = false;
-
   @internalProperty() private _error?: string;
 
   @internalProperty() private _options?: Record<string, unknown>;
@@ -65,70 +56,33 @@ class HassioAddonConfig extends LitElement {
 
   @query("ha-yaml-editor") private _editor?: HaYamlEditor;
 
-  public computeLabel = (entry: HaFormSchema): string => {
-    return (
-      this.addon.translations[this.hass.language]?.configuration?.[entry.name]
-        ?.name ||
-      this.addon.translations.en?.configuration?.[entry.name].name ||
-      entry.name
-    );
-  };
-
-  private _filteredShchema = memoizeOne(
-    (options: Record<string, unknown>, schema: HaFormSchema[]) => {
-      return schema.filter((entry) => entry.name in options || entry.required);
-    }
-  );
-
   protected render(): TemplateResult {
-    const showForm =
-      !this._yamlMode && this._canShowSchema && this.addon.schema;
-    const hasHiddenOptions =
-      showForm &&
-      JSON.stringify(this.addon.schema) !==
-        JSON.stringify(
-          this._filteredShchema(this.addon.options, this.addon.schema!)
-        );
     return html`
       <h1>${this.addon.name}</h1>
       <ha-card>
         <div class="header">
-          <h2>
-            ${this.supervisor.localize("addon.configuration.options.header")}
-          </h2>
+          <h2>Configuration</h2>
           <div class="card-menu">
             <ha-button-menu corner="BOTTOM_START" @action=${this._handleAction}>
               <mwc-icon-button slot="trigger">
                 <ha-svg-icon .path=${mdiDotsVertical}></ha-svg-icon>
               </mwc-icon-button>
               <mwc-list-item .disabled=${!this._canShowSchema}>
-                ${this._yamlMode
-                  ? this.supervisor.localize(
-                      "addon.configuration.options.edit_in_ui"
-                    )
-                  : this.supervisor.localize(
-                      "addon.configuration.options.edit_in_yaml"
-                    )}
+                ${this._yamlMode ? "Edit in UI" : "Edit in YAML"}
               </mwc-list-item>
               <mwc-list-item class="warning">
-                ${this.supervisor.localize("common.reset_defaults")}
+                Reset to defaults
               </mwc-list-item>
             </ha-button-menu>
           </div>
         </div>
 
         <div class="card-content">
-          ${showForm
+          ${!this._yamlMode && this._canShowSchema && this.addon.schema
             ? html`<ha-form
                 .data=${this._options!}
                 @value-changed=${this._configChanged}
-                .computeLabel=${this.computeLabel}
-                .schema=${this._showOptional
-                  ? this.addon.schema!
-                  : this._filteredShchema(
-                      this.addon.options,
-                      this.addon.schema!
-                    )}
+                .schema=${this.addon.schema}
               ></ha-form>`
             : html` <ha-yaml-editor
                 @value-changed=${this._configChanged}
@@ -138,34 +92,14 @@ class HassioAddonConfig extends LitElement {
           (this._canShowSchema && this.addon.schema) ||
           this._valid
             ? ""
-            : html`
-                <div class="errors">
-                  ${this.supervisor.localize(
-                    "addon.configuration.options.invalid_yaml"
-                  )}
-                </div>
-              `}
+            : html` <div class="errors">Invalid YAML</div> `}
         </div>
-        ${hasHiddenOptions
-          ? html`<ha-formfield
-              class="show-additional"
-              .label=${this.supervisor.localize(
-                "addon.configuration.options.show_unused_optional"
-              )}
-            >
-              <ha-switch
-                @change=${this._toggleOptional}
-                .checked=${this._showOptional}
-              >
-              </ha-switch>
-            </ha-formfield>`
-          : ""}
-        <div class="card-actions right">
+        <div class="card-actions">
           <ha-progress-button
             @click=${this._saveTapped}
             .disabled=${!this._configHasChanged || !this._valid}
           >
-            Save ${this.supervisor.localize("common.save")}
+            Save
           </ha-progress-button>
         </div>
       </ha-card>
@@ -174,7 +108,7 @@ class HassioAddonConfig extends LitElement {
 
   protected firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
-    this._canShowSchema = !this.addon.schema!.find(
+    this._canShowSchema = !this.addon.schema.find(
       // @ts-ignore
       (entry) => !SUPPORTED_UI_TYPES.includes(entry.type) || entry.multiple
     );
@@ -210,19 +144,17 @@ class HassioAddonConfig extends LitElement {
     }
   }
 
-  private _toggleOptional() {
-    this._showOptional = !this._showOptional;
-  }
-
   private _configChanged(ev): void {
     if (this.addon.schema && this._canShowSchema && !this._yamlMode) {
       this._valid = true;
       this._configHasChanged = true;
-      this._options! = ev.detail.value;
     } else {
       this._configHasChanged = true;
       this._valid = ev.detail.isValid;
     }
+    if (this._valid) {
+      this._options! = ev.detail.value;
+    }
   }
 
   private async _resetTapped(ev: CustomEvent): Promise<void> {
@@ -230,10 +162,10 @@ class HassioAddonConfig extends LitElement {
     button.progress = true;
 
     const confirmed = await showConfirmationDialog(this, {
-      title: this.supervisor.localize("confirm.reset_options.title"),
-      text: this.supervisor.localize("confirm.reset_options.text"),
-      confirmText: this.supervisor.localize("common.reset_options"),
-      dismissText: this.supervisor.localize("common.cancel"),
+      title: this.addon.name,
+      text: "Are you sure you want to reset all your options?",
+      confirmText: "reset options",
+      dismissText: "no",
     });
 
     if (!confirmed) {
@@ -255,11 +187,9 @@ class HassioAddonConfig extends LitElement {
       };
       fireEvent(this, "hass-api-called", eventdata);
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.common.update_available",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to reset addon configuration, ${extractApiErrorMessage(
+        err
+      )}`;
     }
     button.progress = false;
   }
@@ -272,9 +202,8 @@ class HassioAddonConfig extends LitElement {
 
     try {
       await setHassioAddonOption(this.hass, this.addon.slug, {
-        options: this._yamlMode ? this._editor?.value : this._options,
+        options: this._options!,
       });
-
       this._configHasChanged = false;
       const eventdata = {
         success: true,
@@ -283,14 +212,12 @@ class HassioAddonConfig extends LitElement {
       };
       fireEvent(this, "hass-api-called", eventdata);
       if (this.addon?.state === "started") {
-        await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
+        await suggestAddonRestart(this, this.hass, this.addon);
       }
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.configuration.options.failed_to_save",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to save addon configuration, ${extractApiErrorMessage(
+        err
+      )}`;
     }
     button.progress = false;
   }
@@ -344,13 +271,6 @@ class HassioAddonConfig extends LitElement {
           margin-block: 0px;
           font-weight: normal;
         }
-        .card-actions.right {
-          justify-content: flex-end;
-        }
-
-        .show-additional {
-          padding: 16px;
-        }
       `,
     ];
   }

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

@@ -19,7 +19,6 @@ import {
   setHassioAddonOption,
 } from "../../../../src/data/hassio/addon";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import { haStyle } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
 import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
@@ -39,8 +38,6 @@ interface NetworkItemInput extends PaperInputElement {
 class HassioAddonNetwork extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public addon!: HassioAddonDetails;
 
   @internalProperty() private _error?: string;
@@ -58,30 +55,16 @@ class HassioAddonNetwork extends LitElement {
     }
 
     return html`
-      <ha-card
-        .header=${this.supervisor.localize(
-          "addon.configuration.network.header"
-        )}
-      >
+      <ha-card header="Network">
         <div class="card-content">
           ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
 
           <table>
             <tbody>
               <tr>
-                <th>
-                  ${this.supervisor.localize(
-                    "addon.configuration.network.container"
-                  )}
-                </th>
-                <th>
-                  ${this.supervisor.localize(
-                    "addon.configuration.network.host"
-                  )}
-                </th>
-                <th>
-                  ${this.supervisor.localize("common.description")}
-                </th>
+                <th>Container</th>
+                <th>Host</th>
+                <th>Description</th>
               </tr>
               ${this._config!.map((item) => {
                 return html`
@@ -90,15 +73,13 @@ class HassioAddonNetwork extends LitElement {
                     <td>
                       <paper-input
                         @value-changed=${this._configChanged}
-                        placeholder="${this.supervisor.localize(
-                          "addon.configuration.network.disabled"
-                        )}"
+                        placeholder="disabled"
                         .value=${item.host ? String(item.host) : ""}
                         .container=${item.container}
                         no-label-float
                       ></paper-input>
                     </td>
-                    <td>${this._computeDescription(item)}</td>
+                    <td>${item.description}</td>
                   </tr>
                 `;
               })}
@@ -107,10 +88,10 @@ class HassioAddonNetwork extends LitElement {
         </div>
         <div class="card-actions">
           <ha-progress-button class="warning" @click=${this._resetTapped}>
-            ${this.supervisor.localize("common.reset_defaults")}
+            Reset to defaults
           </ha-progress-button>
           <ha-progress-button @click=${this._saveTapped}>
-            ${this.supervisor.localize("common.save")}
+            Save
           </ha-progress-button>
         </div>
       </ha-card>
@@ -124,15 +105,6 @@ class HassioAddonNetwork extends LitElement {
     }
   }
 
-  private _computeDescription = (item: NetworkItem): string => {
-    return (
-      this.addon.translations[this.hass.language]?.network?.[item.container]
-        ?.description ||
-      this.addon.translations.en?.network?.[item.container]?.description ||
-      item.description
-    );
-  };
-
   private _setNetworkConfig(): void {
     const network = this.addon.network || {};
     const description = this.addon.network_description || {};
@@ -175,14 +147,12 @@ class HassioAddonNetwork extends LitElement {
       };
       fireEvent(this, "hass-api-called", eventdata);
       if (this.addon?.state === "started") {
-        await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
+        await suggestAddonRestart(this, this.hass, this.addon);
       }
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.failed_to_reset",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to set addon network configuration, ${extractApiErrorMessage(
+        err
+      )}`;
     }
 
     button.progress = false;
@@ -211,14 +181,12 @@ class HassioAddonNetwork extends LitElement {
       };
       fireEvent(this, "hass-api-called", eventdata);
       if (this.addon?.state === "started") {
-        await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
+        await suggestAddonRestart(this, this.hass, this.addon);
       }
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.failed_to_save",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to set addon network configuration, ${extractApiErrorMessage(
+        err
+      )}`;
     }
     button.progress = false;
   }

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

@@ -1,4 +1,3 @@
-import "../../../../src/components/ha-card";
 import {
   css,
   CSSResult,
@@ -20,14 +19,11 @@ import "../../../../src/layouts/hass-loading-screen";
 import { haStyle } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
 import { hassioStyle } from "../../resources/hassio-style";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 
 @customElement("hassio-addon-documentation-tab")
 class HassioAddonDocumentationDashboard extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public addon?: HassioAddonDetails;
 
   @internalProperty() private _error?: string;
@@ -85,11 +81,9 @@ class HassioAddonDocumentationDashboard extends LitElement {
         this.addon!.slug
       );
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.documentation.get_logs",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to get addon documentation, ${extractApiErrorMessage(
+        err
+      )}`;
     }
   }
 }

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

@@ -9,24 +9,16 @@ import {
   CSSResult,
   customElement,
   html,
-  internalProperty,
   LitElement,
   property,
   TemplateResult,
 } from "lit-element";
 import memoizeOne from "memoize-one";
-import { fireEvent } from "../../../src/common/dom/fire_event";
-import { navigate } from "../../../src/common/navigate";
-import { extractSearchParam } from "../../../src/common/url/search-params";
 import "../../../src/components/ha-circular-progress";
 import {
   fetchHassioAddonInfo,
   HassioAddonDetails,
 } from "../../../src/data/hassio/addon";
-import { extractApiErrorMessage } from "../../../src/data/hassio/common";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
-import "../../../src/layouts/hass-error-screen";
-import "../../../src/layouts/hass-loading-screen";
 import "../../../src/layouts/hass-tabs-subpage";
 import type { PageNavigation } from "../../../src/layouts/hass-tabs-subpage";
 import { haStyle } from "../../../src/resources/styles";
@@ -43,16 +35,12 @@ import "./log/hassio-addon-logs";
 class HassioAddonDashboard extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public route!: Route;
 
   @property({ attribute: false }) public addon?: HassioAddonDetails;
 
   @property({ type: Boolean }) public narrow!: boolean;
 
-  @internalProperty() _error?: string;
-
   private _computeTail = memoizeOne((route: Route) => {
     const dividerPos = route.path.indexOf("/", 1);
     return dividerPos === -1
@@ -67,19 +55,13 @@ class HassioAddonDashboard extends LitElement {
   });
 
   protected render(): TemplateResult {
-    if (this._error) {
-      return html`<hass-error-screen
-        .error=${this._error}
-      ></hass-error-screen>`;
-    }
-
     if (!this.addon) {
-      return html`<hass-loading-screen></hass-loading-screen>`;
+      return html`<ha-circular-progress active></ha-circular-progress>`;
     }
 
     const addonTabs: PageNavigation[] = [
       {
-        translationKey: "addon.panel.info",
+        name: "Info",
         path: `/hassio/addon/${this.addon.slug}/info`,
         iconPath: mdiInformationVariant,
       },
@@ -87,7 +69,7 @@ class HassioAddonDashboard extends LitElement {
 
     if (this.addon.documentation) {
       addonTabs.push({
-        translationKey: "addon.panel.documentation",
+        name: "Documentation",
         path: `/hassio/addon/${this.addon.slug}/documentation`,
         iconPath: mdiFileDocument,
       });
@@ -96,12 +78,12 @@ class HassioAddonDashboard extends LitElement {
     if (this.addon.version) {
       addonTabs.push(
         {
-          translationKey: "addon.panel.configuration",
+          name: "Configuration",
           path: `/hassio/addon/${this.addon.slug}/config`,
           iconPath: mdiCogs,
         },
         {
-          translationKey: "addon.panel.log",
+          name: "Log",
           path: `/hassio/addon/${this.addon.slug}/logs`,
           iconPath: mdiMathLog,
         }
@@ -113,19 +95,17 @@ class HassioAddonDashboard extends LitElement {
     return html`
       <hass-tabs-subpage
         .hass=${this.hass}
-        .localizeFunc=${this.supervisor.localize}
         .narrow=${this.narrow}
         .backPath=${this.addon.version ? "/hassio/dashboard" : "/hassio/store"}
         .route=${route}
+        hassio
         .tabs=${addonTabs}
-        supervisor
       >
         <span slot="header">${this.addon.name}</span>
         <hassio-addon-router
           .route=${route}
           .narrow=${this.narrow}
           .hass=${this.hass}
-          .supervisor=${this.supervisor}
           .addon=${this.addon}
         ></hassio-addon-router>
       </hass-tabs-subpage>
@@ -172,53 +152,30 @@ class HassioAddonDashboard extends LitElement {
   }
 
   protected async firstUpdated(): Promise<void> {
-    if (this.route.path === "") {
-      const addon = extractSearchParam("addon");
-      if (addon) {
-        navigate(this, `/hassio/addon/${addon}`, true);
-      }
-    }
+    await this._routeDataChanged(this.route);
     this.addEventListener("hass-api-called", (ev) => this._apiCalled(ev));
   }
 
   private async _apiCalled(ev): Promise<void> {
-    const pathSplit: string[] = ev.detail.path?.split("/");
+    const path: string = ev.detail.path;
 
-    if (!pathSplit || pathSplit.length === 0) {
+    if (!path) {
       return;
     }
 
-    const path: string = pathSplit[pathSplit.length - 1];
-
-    if (["uninstall", "install", "update", "start", "stop"].includes(path)) {
-      fireEvent(this, "supervisor-colllection-refresh", {
-        colllection: "supervisor",
-      });
-    }
-
     if (path === "uninstall") {
-      window.history.back();
+      history.back();
     } else {
-      await this._routeDataChanged();
+      await this._routeDataChanged(this.route);
     }
   }
 
-  protected updated(changedProperties) {
-    if (changedProperties.has("route") && !this.addon) {
-      this._routeDataChanged();
-    }
-  }
-
-  private async _routeDataChanged(): Promise<void> {
-    const addon = this.route.path.split("/")[1];
-    if (!addon) {
-      return;
-    }
+  private async _routeDataChanged(routeData: Route): Promise<void> {
+    const addon = routeData.path.split("/")[1];
     try {
       const addoninfo = await fetchHassioAddonInfo(this.hass, addon);
       this.addon = addoninfo;
-    } catch (err) {
-      this._error = `Error fetching addon info: ${extractApiErrorMessage(err)}`;
+    } catch {
       this.addon = undefined;
     }
   }

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

@@ -1,6 +1,5 @@
 import { customElement, property } from "lit-element";
 import { HassioAddonDetails } from "../../../src/data/hassio/addon";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import {
   HassRouterPage,
   RouterOptions,
@@ -18,8 +17,6 @@ class HassioAddonRouter extends HassRouterPage {
 
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public addon!: HassioAddonDetails;
 
   protected routerOptions: RouterOptions = {
@@ -44,7 +41,6 @@ class HassioAddonRouter extends HassRouterPage {
   protected updatePageEl(el) {
     el.route = this.routeTail;
     el.hass = this.hass;
-    el.supervisor = this.supervisor;
     el.addon = this.addon;
     el.narrow = this.narrow;
   }

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

@@ -9,7 +9,6 @@ import {
 } from "lit-element";
 import "../../../../src/components/ha-circular-progress";
 import { HassioAddonDetails } from "../../../../src/data/hassio/addon";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import { haStyle } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
 import { hassioStyle } from "../../resources/hassio-style";
@@ -21,8 +20,6 @@ class HassioAddonInfoDashboard extends LitElement {
 
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public addon?: HassioAddonDetails;
 
   protected render(): TemplateResult {
@@ -35,7 +32,6 @@ class HassioAddonInfoDashboard extends LitElement {
         <hassio-addon-info
           .narrow=${this.narrow}
           .hass=${this.hass}
-          .supervisor=${this.supervisor}
           .addon=${this.addon}
         ></hassio-addon-info>
       </div>

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

@@ -25,7 +25,6 @@ import {
   TemplateResult,
 } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
-import memoizeOne from "memoize-one";
 import { atLeastVersion } from "../../../../src/common/config/version";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import { navigate } from "../../../../src/common/navigate";
@@ -44,13 +43,10 @@ import {
   HassioAddonSetOptionParams,
   HassioAddonSetSecurityParams,
   installHassioAddon,
-  restartHassioAddon,
   setHassioAddonOption,
   setHassioAddonSecurity,
   startHassioAddon,
-  stopHassioAddon,
   uninstallHassioAddon,
-  updateHassioAddon,
   validateHassioAddonOption,
 } from "../../../../src/data/hassio/addon";
 import {
@@ -58,8 +54,6 @@ import {
   fetchHassioStats,
   HassioStats,
 } from "../../../../src/data/hassio/common";
-import { StoreAddon } from "../../../../src/data/supervisor/store";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import {
   showAlertDialog,
   showConfirmationDialog,
@@ -70,9 +64,7 @@ import { bytesToString } from "../../../../src/util/bytes-to-string";
 import "../../components/hassio-card-content";
 import "../../components/supervisor-metric";
 import { showHassioMarkdownDialog } from "../../dialogs/markdown/show-dialog-hassio-markdown";
-import { showDialogSupervisorUpdate } from "../../dialogs/update/show-dialog-update";
 import { hassioStyle } from "../../resources/hassio-style";
-import { addonArchIsSupported } from "../../util/addon";
 
 const STAGE_ICON = {
   stable: mdiCheckCircle,
@@ -80,6 +72,63 @@ const STAGE_ICON = {
   deprecated: mdiExclamationThick,
 };
 
+const PERMIS_DESC = {
+  stage: {
+    title: "Add-on Stage",
+    description: `Add-ons can have one of three stages:\n\n<ha-svg-icon path="${STAGE_ICON.stable}"></ha-svg-icon> **Stable**: These are add-ons ready to be used in production.\n\n<ha-svg-icon path="${STAGE_ICON.experimental}"></ha-svg-icon> **Experimental**: These may contain bugs, and may be unfinished.\n\n<ha-svg-icon path="${STAGE_ICON.deprecated}"></ha-svg-icon> **Deprecated**: These add-ons will no longer receive any updates.`,
+  },
+  rating: {
+    title: "Add-on Security Rating",
+    description:
+      "Home Assistant provides a security rating to each of the add-ons, which indicates the risks involved when using this add-on. The more access an add-on requires on your system, the lower the score, thus raising the possible security risks.\n\nA score is on a scale from 1 to 6. Where 1 is the lowest score (considered the most insecure and highest risk) and a score of 6 is the highest score (considered the most secure and lowest risk).",
+  },
+  host_network: {
+    title: "Host Network",
+    description:
+      "Add-ons usually run in their own isolated network layer, which prevents them from accessing the network of the host operating system. In some cases, this network isolation can limit add-ons in providing their services and therefore, the isolation can be lifted by the add-on author, giving the add-on full access to the network capabilities of the host machine. This gives the add-on more networking capabilities but lowers the security, hence, the security rating of the add-on will be lowered when this option is used by the add-on.",
+  },
+  homeassistant_api: {
+    title: "Home Assistant API Access",
+    description:
+      "This add-on is allowed to access your running Home Assistant instance directly via the Home Assistant API. This mode handles authentication for the add-on as well, which enables an add-on to interact with Home Assistant without the need for additional authentication tokens.",
+  },
+  full_access: {
+    title: "Full Hardware Access",
+    description:
+      "This add-on is given full access to the hardware of your system, by request of the add-on author. Access is comparable to the privileged mode in Docker. Since this opens up possible security risks, this feature impacts the add-on security score negatively.\n\nThis level of access is not granted automatically and needs to be confirmed by you. To do this, you need to disable the protection mode on the add-on manually. Only disable the protection mode if you know, need AND trust the source of this add-on.",
+  },
+  hassio_api: {
+    title: "Supervisor API Access",
+    description:
+      "The add-on was given access to the Supervisor API, by request of the add-on author. By default, the add-on can access general version information of your system. When the add-on requests 'manager' or 'admin' level access to the API, it will gain access to control multiple parts of your Home Assistant system. This permission is indicated by this badge and will impact the security score of the addon negatively.",
+  },
+  docker_api: {
+    title: "Full Docker Access",
+    description:
+      "The add-on author has requested the add-on to have management access to the Docker instance running on your system. This mode gives the add-on full access and control to your entire Home Assistant system, which adds security risks, and could damage your system when misused. Therefore, this feature impacts the add-on security score negatively.\n\nThis level of access is not granted automatically and needs to be confirmed by you. To do this, you need to disable the protection mode on the add-on manually. Only disable the protection mode if you know, need AND trust the source of this add-on.",
+  },
+  host_pid: {
+    title: "Host Processes Namespace",
+    description:
+      "Usually, the processes the add-on runs, are isolated from all other system processes. The add-on author has requested the add-on to have access to the system processes running on the host system instance, and allow the add-on to spawn processes on the host system as well. This mode gives the add-on full access and control to your entire Home Assistant system, which adds security risks, and could damage your system when misused. Therefore, this feature impacts the add-on security score negatively.\n\nThis level of access is not granted automatically and needs to be confirmed by you. To do this, you need to disable the protection mode on the add-on manually. Only disable the protection mode if you know, need AND trust the source of this add-on.",
+  },
+  apparmor: {
+    title: "AppArmor",
+    description:
+      "AppArmor ('Application Armor') is a Linux kernel security module that restricts add-ons capabilities like network access, raw socket access, and permission to read, write, or execute specific files.\n\nAdd-on authors can provide their security profiles, optimized for the add-on, or request it to be disabled. If AppArmor is disabled, it will raise security risks and therefore, has a negative impact on the security score of the add-on.",
+  },
+  auth_api: {
+    title: "Home Assistant Authentication",
+    description:
+      "An add-on can authenticate users against Home Assistant, allowing add-ons to give users the possibility to log into applications running inside add-ons, using their Home Assistant username/password. This badge indicates if the add-on author requests this capability.",
+  },
+  ingress: {
+    title: "Ingress",
+    description:
+      "This add-on is using Ingress to embed its interface securely into Home Assistant.",
+  },
+};
+
 @customElement("hassio-addon-info")
 class HassioAddonInfo extends LitElement {
   @property({ type: Boolean }) public narrow!: boolean;
@@ -88,29 +137,18 @@ class HassioAddonInfo extends LitElement {
 
   @property({ attribute: false }) public addon!: HassioAddonDetails;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @internalProperty() private _metrics?: HassioStats;
 
   @internalProperty() private _error?: string;
 
-  private _addonStoreInfo = memoizeOne(
-    (slug: string, storeAddons: StoreAddon[]) =>
-      storeAddons.find((addon) => addon.slug === slug)
-  );
-
   protected render(): TemplateResult {
-    const addonStoreInfo =
-      !this.addon.detached && !this.addon.available
-        ? this._addonStoreInfo(this.addon.slug, this.supervisor.store.addons)
-        : undefined;
     const metrics = [
       {
-        description: this.supervisor.localize("addon.dashboard.cpu_usage"),
+        description: "Add-on CPU Usage",
         value: this._metrics?.cpu_percent,
       },
       {
-        description: this.supervisor.localize("addon.dashboard.ram_usage"),
+        description: "Add-on RAM Usage",
         value: this._metrics?.memory_percent,
         tooltip: `${bytesToString(this._metrics?.memory_usage)}/${bytesToString(
           this._metrics?.memory_limit
@@ -120,64 +158,37 @@ class HassioAddonInfo extends LitElement {
     return html`
       ${this.addon.update_available
         ? html`
-            <ha-card
-              .header="${this.supervisor.localize(
-                "common.update_available",
-                "count",
-                1
-              )}🎉"
-            >
+            <ha-card header="Update available! 🎉">
               <div class="card-content">
                 <hassio-card-content
                   .hass=${this.hass}
-                  .title="${this.supervisor.localize(
-                    "addon.dashboard.new_update_available",
-                    "name",
-                    this.addon.name,
-                    "version",
-                    this.addon.version_latest
-                  )}"
-                  .description="${this.supervisor.localize(
-                    "common.running_version",
-                    "version",
-                    this.addon.version
-                  )}"
+                  .title="${this.addon.name} ${this.addon
+                    .version_latest} is available"
+                  .description="You are currently running version ${this.addon
+                    .version}"
                   icon=${mdiArrowUpBoldCircle}
                   iconClass="update"
                 ></hassio-card-content>
-                ${!this.addon.available && addonStoreInfo
-                  ? !addonArchIsSupported(
-                      this.supervisor.info.supported_arch,
-                      this.addon.arch
-                    )
-                    ? html`
-                        <p class="warning">
-                          ${this.supervisor.localize(
-                            "addon.dashboard.not_available_arch"
-                          )}
-                        </p>
-                      `
-                    : html`
-                        <p class="warning">
-                          ${this.supervisor.localize(
-                            "addon.dashboard.not_available_arch",
-                            "core_version_installed",
-                            this.supervisor.core.version,
-                            "core_version_needed",
-                            addonStoreInfo.homeassistant
-                          )}
-                        </p>
-                      `
+                ${!this.addon.available
+                  ? html`
+                      <p>
+                        This update is no longer compatible with your system.
+                      </p>
+                    `
                   : ""}
               </div>
               <div class="card-actions">
-                <mwc-button @click=${this._updateClicked}>
-                  ${this.supervisor.localize("common.update")}
-                </mwc-button>
+                <ha-call-api-button
+                  .hass=${this.hass}
+                  .disabled=${!this.addon.available}
+                  path="hassio/addons/${this.addon.slug}/update"
+                >
+                  Update
+                </ha-call-api-button>
                 ${this.addon.changelog
                   ? html`
                       <mwc-button @click=${this._openChangelog}>
-                        ${this.supervisor.localize("addon.dashboard.changelog")}
+                        Changelog
                       </mwc-button>
                     `
                   : ""}
@@ -188,19 +199,12 @@ class HassioAddonInfo extends LitElement {
       ${!this.addon.protected
         ? html`
         <ha-card class="warning">
-          <h1 class="card-header">${this.supervisor.localize(
-            "addon.dashboard.protection_mode.title"
-          )}
-          </h1>
+          <h1 class="card-header">Warning: Protection mode is disabled!</h1>
           <div class="card-content">
-          ${this.supervisor.localize("addon.dashboard.protection_mode.content")}
+            Protection mode on this add-on is disabled! This gives the add-on full access to the entire system, which adds security risks, and could damage your system when used incorrectly. Only disable the protection mode if you know, need AND trust the source of this add-on.
           </div>
           <div class="card-actions protection-enable">
-              <mwc-button @click=${this._protectionToggled}>
-              ${this.supervisor.localize(
-                "addon.dashboard.protection_mode.enable"
-              )}
-              </mwc-button>
+              <mwc-button @click=${this._protectionToggled}>Enable Protection mode</mwc-button>
             </div>
           </div>
         </ha-card>
@@ -217,18 +221,14 @@ class HassioAddonInfo extends LitElement {
                     ${this._computeIsRunning
                       ? html`
                           <ha-svg-icon
-                            .title=${this.supervisor.localize(
-                              "dashboard.addon_running"
-                            )}
+                            title="Add-on is running"
                             class="running"
                             .path=${mdiCircle}
                           ></ha-svg-icon>
                         `
                       : html`
                           <ha-svg-icon
-                            .title=${this.supervisor.localize(
-                              "dashboard.addon_stopped"
-                            )}
+                            title="Add-on is stopped"
                             class="stopped"
                             .path=${mdiCircle}
                           ></ha-svg-icon>
@@ -242,29 +242,21 @@ class HassioAddonInfo extends LitElement {
               ? html`
                   Current version: ${this.addon.version}
                   <div class="changelog" @click=${this._openChangelog}>
-                    (<span class="changelog-link">
-                      ${this.supervisor.localize("addon.dashboard.changelog")} </span
-                    >)
+                    (<span class="changelog-link">changelog</span>)
                   </div>
                 `
-              : html`<span class="changelog-link" @click=${this._openChangelog}>
-                  ${this.supervisor.localize("addon.dashboard.changelog")}
-                </span>`}
+              : html`<span class="changelog-link" @click=${this._openChangelog}
+                  >Changelog</span
+                >`}
           </div>
 
           <div class="description light-color">
             ${this.addon.description}.<br />
-            ${this.supervisor.localize(
-              "addon.dashboard.visit_addon_page",
-              "name",
-              html`<a
-                href="${this.addon.url!}"
-                target="_blank"
-                rel="noreferrer"
-              >
-                ${this.addon.name}
-              </a>`
-            )}
+            Visit
+            <a href="${this.addon.url!}" target="_blank" rel="noreferrer">
+              ${this.addon.name} page</a
+            >
+            for details.
           </div>
           <div class="addon-container">
             <div>
@@ -285,9 +277,7 @@ class HassioAddonInfo extends LitElement {
                       })}
                       @click=${this._showMoreInfo}
                       id="stage"
-                      .label=${this.supervisor.localize(
-                        "addon.dashboard.capability.label.stage"
-                      )}
+                      label="stage"
                       description=""
                     >
                       <ha-svg-icon
@@ -313,9 +303,7 @@ class HassioAddonInfo extends LitElement {
                       <ha-label-badge
                         @click=${this._showMoreInfo}
                         id="host_network"
-                        .label=${this.supervisor.localize(
-                          "addon.dashboard.capability.label.host"
-                        )}
+                        label="host"
                         description=""
                       >
                         <ha-svg-icon .path=${mdiNetwork}></ha-svg-icon>
@@ -327,9 +315,7 @@ class HassioAddonInfo extends LitElement {
                       <ha-label-badge
                         @click=${this._showMoreInfo}
                         id="full_access"
-                        .label=${this.supervisor.localize(
-                          "addon.dashboard.capability.label.hardware"
-                        )}
+                        label="hardware"
                         description=""
                       >
                         <ha-svg-icon .path=${mdiChip}></ha-svg-icon>
@@ -341,9 +327,7 @@ class HassioAddonInfo extends LitElement {
                       <ha-label-badge
                         @click=${this._showMoreInfo}
                         id="homeassistant_api"
-                        .label=${this.supervisor.localize(
-                          "addon.dashboard.capability.label.hass"
-                        )}
+                        label="hass"
                         description=""
                       >
                         <ha-svg-icon .path=${mdiHomeAssistant}></ha-svg-icon>
@@ -355,12 +339,8 @@ class HassioAddonInfo extends LitElement {
                       <ha-label-badge
                         @click=${this._showMoreInfo}
                         id="hassio_api"
-                        .label=${this.supervisor.localize(
-                          "addon.dashboard.capability.label.hassio"
-                        )}
-                        .description=${this.supervisor.localize(
-                          `addon.dashboard.capability.role.${this.addon.hassio_role}`
-                        ) || this.addon.hassio_role}
+                        label="hassio"
+                        .description=${this.addon.hassio_role}
                       >
                         <ha-svg-icon .path=${mdiHomeAssistant}></ha-svg-icon>
                       </ha-label-badge>
@@ -371,9 +351,7 @@ class HassioAddonInfo extends LitElement {
                       <ha-label-badge
                         @click=${this._showMoreInfo}
                         id="docker_api"
-                        .label=".${this.supervisor.localize(
-                          "addon.dashboard.capability.label.docker"
-                        )}"
+                        label="docker"
                         description=""
                       >
                         <ha-svg-icon .path=${mdiDocker}></ha-svg-icon>
@@ -385,9 +363,7 @@ class HassioAddonInfo extends LitElement {
                       <ha-label-badge
                         @click=${this._showMoreInfo}
                         id="host_pid"
-                        .label=${this.supervisor.localize(
-                          "addon.dashboard.capability.label.host_pid"
-                        )}
+                        label="host pid"
                         description=""
                       >
                         <ha-svg-icon .path=${mdiPound}></ha-svg-icon>
@@ -400,9 +376,7 @@ class HassioAddonInfo extends LitElement {
                         @click=${this._showMoreInfo}
                         class=${this._computeApparmorClassName}
                         id="apparmor"
-                        .label=${this.supervisor.localize(
-                          "addon.dashboard.capability.label.apparmor"
-                        )}
+                        label="apparmor"
                         description=""
                       >
                         <ha-svg-icon .path=${mdiShield}></ha-svg-icon>
@@ -414,9 +388,7 @@ class HassioAddonInfo extends LitElement {
                       <ha-label-badge
                         @click=${this._showMoreInfo}
                         id="auth_api"
-                        .label=${this.supervisor.localize(
-                          "addon.dashboard.capability.label.auth"
-                        )}
+                        label="auth"
                         description=""
                       >
                         <ha-svg-icon .path=${mdiKey}></ha-svg-icon>
@@ -428,9 +400,7 @@ class HassioAddonInfo extends LitElement {
                       <ha-label-badge
                         @click=${this._showMoreInfo}
                         id="ingress"
-                        .label=${this.supervisor.localize(
-                          "addon.dashboard.capability.label.ingress"
-                        )}
+                        label="ingress"
                         description=""
                       >
                         <ha-svg-icon
@@ -451,14 +421,10 @@ class HassioAddonInfo extends LitElement {
                     >
                       <ha-settings-row ?three-line=${this.narrow}>
                         <span slot="heading">
-                          ${this.supervisor.localize(
-                            "addon.dashboard.option.boot.title"
-                          )}
+                          Start on boot
                         </span>
                         <span slot="description">
-                          ${this.supervisor.localize(
-                            "addon.dashboard.option.boot.description"
-                          )}
+                          Make the add-on start during a system boot
                         </span>
                         <ha-switch
                           @change=${this._startOnBootToggled}
@@ -471,14 +437,10 @@ class HassioAddonInfo extends LitElement {
                         ? html`
                             <ha-settings-row ?three-line=${this.narrow}>
                               <span slot="heading">
-                                ${this.supervisor.localize(
-                                  "addon.dashboard.option.watchdog.title"
-                                )}
+                                Watchdog
                               </span>
                               <span slot="description">
-                                ${this.supervisor.localize(
-                                  "addon.dashboard.option.boot.description"
-                                )}
+                                This will start the add-on if it crashes
                               </span>
                               <ha-switch
                                 @change=${this._watchdogToggled}
@@ -493,14 +455,11 @@ class HassioAddonInfo extends LitElement {
                         ? html`
                             <ha-settings-row ?three-line=${this.narrow}>
                               <span slot="heading">
-                                ${this.supervisor.localize(
-                                  "addon.dashboard.option.auto_update.title"
-                                )}
+                                Auto update
                               </span>
                               <span slot="description">
-                                ${this.supervisor.localize(
-                                  "addon.dashboard.option.boot.description"
-                                )}
+                                Auto update the add-on when there is a new
+                                version available
                               </span>
                               <ha-switch
                                 @change=${this._autoUpdateToggled}
@@ -510,22 +469,21 @@ class HassioAddonInfo extends LitElement {
                             </ha-settings-row>
                           `
                         : ""}
-                      ${!this._computeCannotIngressSidebar && this.addon.ingress
+                      ${this.addon.ingress
                         ? html`
                             <ha-settings-row ?three-line=${this.narrow}>
                               <span slot="heading">
-                                ${this.supervisor.localize(
-                                  "addon.dashboard.option.ingress_panel.title"
-                                )}
+                                Show in sidebar
                               </span>
                               <span slot="description">
-                                ${this.supervisor.localize(
-                                  "addon.dashboard.option.ingress_panel.description"
-                                )}
+                                ${this._computeCannotIngressSidebar
+                                  ? "This option requires Home Assistant 0.92 or later."
+                                  : "Add this add-on to your sidebar"}
                               </span>
                               <ha-switch
                                 @change=${this._panelToggled}
                                 .checked=${this.addon.ingress_panel}
+                                .disabled=${this._computeCannotIngressSidebar}
                                 haptic
                               ></ha-switch>
                             </ha-settings-row>
@@ -535,14 +493,10 @@ class HassioAddonInfo extends LitElement {
                         ? html`
                             <ha-settings-row ?three-line=${this.narrow}>
                               <span slot="heading">
-                                ${this.supervisor.localize(
-                                  "addon.dashboard.option.protected.title"
-                                )}
+                                Protection mode
                               </span>
                               <span slot="description">
-                                ${this.supervisor.localize(
-                                  "addon.dashboard.option.protected.description"
-                                )}
+                                Blocks elevated system access from the add-on
                               </span>
                               <ha-switch
                                 @change=${this._protectionToggled}
@@ -560,7 +514,7 @@ class HassioAddonInfo extends LitElement {
               ${this.addon.state === "started"
                 ? html`<ha-settings-row ?three-line=${this.narrow}>
                       <span slot="heading">
-                        ${this.supervisor.localize("addon.dashboard.hostname")}
+                        Hostname
                       </span>
                       <code slot="description">
                         ${this.addon.hostname}
@@ -580,109 +534,87 @@ class HassioAddonInfo extends LitElement {
             </div>
           </div>
           ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
-          ${!this.addon.version && addonStoreInfo && !this.addon.available
-            ? !addonArchIsSupported(
-                this.supervisor.info.supported_arch,
-                this.addon.arch
-              )
-              ? html`
-                  <p class="warning">
-                    ${this.supervisor.localize(
-                      "addon.dashboard.not_available_arch"
-                    )}
-                  </p>
-                `
-              : html`
-                  <p class="warning">
-                    ${this.supervisor.localize(
-                      "addon.dashboard.not_available_version",
-                      "core_version_installed",
-                      this.supervisor.core.version,
-                      "core_version_needed",
-                      addonStoreInfo!.homeassistant
-                    )}
-                  </p>
-                `
-            : ""}
         </div>
         <div class="card-actions">
-          <div>
-            ${this.addon.version
-              ? this._computeIsRunning
-                ? html`
-                    <ha-progress-button
-                      class="warning"
-                      @click=${this._stopClicked}
-                    >
-                      ${this.supervisor.localize("addon.dashboard.stop")}
-                    </ha-progress-button>
-                    <ha-progress-button
-                      class="warning"
-                      @click=${this._restartClicked}
-                    >
-                      ${this.supervisor.localize("addon.dashboard.restart")}
-                    </ha-progress-button>
-                  `
-                : html`
-                    <ha-progress-button @click=${this._startClicked}>
-                      ${this.supervisor.localize("addon.dashboard.start")}
-                    </ha-progress-button>
-                  `
-              : html`
-                  <ha-progress-button
-                    .disabled=${!this.addon.available}
-                    @click=${this._installClicked}
-                  >
-                    ${this.supervisor.localize("addon.dashboard.install")}
-                  </ha-progress-button>
-                `}
-          </div>
-          <div>
-            ${this.addon.version
-              ? html` ${this._computeShowWebUI
-                    ? html`
-                        <a
-                          href=${this._pathWebui!}
-                          tabindex="-1"
-                          target="_blank"
-                          rel="noopener"
-                        >
-                          <mwc-button>
-                            ${this.supervisor.localize(
-                              "addon.dashboard.open_web_ui"
-                            )}
-                          </mwc-button>
-                        </a>
-                      `
-                    : ""}
-                  ${this._computeShowIngressUI
-                    ? html`
-                        <mwc-button @click=${this._openIngress}>
-                          ${this.supervisor.localize(
-                            "addon.dashboard.open_web_ui"
-                          )}
+          ${this.addon.version
+            ? html`
+                ${this._computeIsRunning
+                  ? html`
+                      <ha-call-api-button
+                        class="warning"
+                        .hass=${this.hass}
+                        .path="hassio/addons/${this.addon.slug}/stop"
+                      >
+                        Stop
+                      </ha-call-api-button>
+                      <ha-call-api-button
+                        class="warning"
+                        .hass=${this.hass}
+                        .path="hassio/addons/${this.addon.slug}/restart"
+                      >
+                        Restart
+                      </ha-call-api-button>
+                    `
+                  : html`
+                      <ha-progress-button @click=${this._startClicked}>
+                        Start
+                      </ha-progress-button>
+                    `}
+                ${this._computeShowWebUI
+                  ? html`
+                      <a
+                        href=${this._pathWebui!}
+                        tabindex="-1"
+                        target="_blank"
+                        class="right"
+                        rel="noopener"
+                      >
+                        <mwc-button>
+                          Open web UI
                         </mwc-button>
-                      `
-                    : ""}
-                  <ha-progress-button
-                    class="warning"
-                    @click=${this._uninstallClicked}
-                  >
-                    ${this.supervisor.localize("addon.dashboard.uninstall")}
-                  </ha-progress-button>
-                  ${this.addon.build
-                    ? html`
-                        <ha-call-api-button
-                          class="warning"
-                          .hass=${this.hass}
-                          .path="hassio/addons/${this.addon.slug}/rebuild"
-                        >
-                          ${this.supervisor.localize("addon.dashboard.rebuild")}
-                        </ha-call-api-button>
-                      `
-                    : ""}`
-              : ""}
-          </div>
+                      </a>
+                    `
+                  : ""}
+                ${this._computeShowIngressUI
+                  ? html`
+                      <mwc-button class="right" @click=${this._openIngress}>
+                        Open web UI
+                      </mwc-button>
+                    `
+                  : ""}
+                <ha-progress-button
+                  class=" right warning"
+                  @click=${this._uninstallClicked}
+                >
+                  Uninstall
+                </ha-progress-button>
+                ${this.addon.build
+                  ? html`
+                      <ha-call-api-button
+                        class="warning right"
+                        .hass=${this.hass}
+                        .path="hassio/addons/${this.addon.slug}/rebuild"
+                      >
+                        Rebuild
+                      </ha-call-api-button>
+                    `
+                  : ""}
+              `
+            : html`
+                ${!this.addon.available
+                  ? html`
+                      <p class="warning">
+                        This add-on is not available on your system.
+                      </p>
+                    `
+                  : ""}
+                <ha-progress-button
+                  .disabled=${!this.addon.available}
+                  @click=${this._installClicked}
+                >
+                  Install
+                </ha-progress-button>
+              `}
         </div>
       </ha-card>
 
@@ -737,21 +669,8 @@ class HassioAddonInfo extends LitElement {
   private _showMoreInfo(ev): void {
     const id = ev.currentTarget.id;
     showHassioMarkdownDialog(this, {
-      title: this.supervisor.localize(`addon.dashboard.capability.${id}.title`),
-      content:
-        id === "stage"
-          ? this.supervisor.localize(
-              `addon.dashboard.capability.${id}.description`,
-              "icon_stable",
-              `<ha-svg-icon path="${STAGE_ICON.stable}"></ha-svg-icon>`,
-              "icon_experimental",
-              `<ha-svg-icon path="${STAGE_ICON.experimental}"></ha-svg-icon>`,
-              "icon_deprecated",
-              `<ha-svg-icon path="${STAGE_ICON.deprecated}"></ha-svg-icon>`
-            )
-          : this.supervisor.localize(
-              `addon.dashboard.capability.${id}.description`
-            ),
+      title: PERMIS_DESC[id].title,
+      content: PERMIS_DESC[id].description,
     });
   }
 
@@ -804,11 +723,9 @@ class HassioAddonInfo extends LitElement {
       };
       fireEvent(this, "hass-api-called", eventdata);
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.failed_to_save",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to set addon option, ${extractApiErrorMessage(
+        err
+      )}`;
     }
   }
 
@@ -826,11 +743,9 @@ class HassioAddonInfo extends LitElement {
       };
       fireEvent(this, "hass-api-called", eventdata);
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.failed_to_save",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to set addon option, ${extractApiErrorMessage(
+        err
+      )}`;
     }
   }
 
@@ -848,11 +763,9 @@ class HassioAddonInfo extends LitElement {
       };
       fireEvent(this, "hass-api-called", eventdata);
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.failed_to_save",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to set addon option, ${extractApiErrorMessage(
+        err
+      )}`;
     }
   }
 
@@ -870,11 +783,9 @@ class HassioAddonInfo extends LitElement {
       };
       fireEvent(this, "hass-api-called", eventdata);
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.failed_to_save",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to set addon security option, ${extractApiErrorMessage(
+        err
+      )}`;
     }
   }
 
@@ -892,11 +803,9 @@ class HassioAddonInfo extends LitElement {
       };
       fireEvent(this, "hass-api-called", eventdata);
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.failed_to_save",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to set addon option, ${extractApiErrorMessage(
+        err
+      )}`;
     }
   }
 
@@ -907,14 +816,12 @@ class HassioAddonInfo extends LitElement {
         this.addon.slug
       );
       showHassioMarkdownDialog(this, {
-        title: this.supervisor.localize("addon.dashboard.changelog"),
+        title: "Changelog",
         content,
       });
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize(
-          "addon.dashboard.action_error.get_changelog"
-        ),
+        title: "Failed to get addon changelog",
         text: extractApiErrorMessage(err),
       });
     }
@@ -934,82 +841,13 @@ class HassioAddonInfo extends LitElement {
       fireEvent(this, "hass-api-called", eventdata);
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize("addon.dashboard.action_error.install"),
+        title: "Failed to install addon",
         text: extractApiErrorMessage(err),
       });
     }
     button.progress = false;
   }
 
-  private async _stopClicked(ev: CustomEvent): Promise<void> {
-    const button = ev.currentTarget as any;
-    button.progress = true;
-
-    try {
-      await stopHassioAddon(this.hass, this.addon.slug);
-      const eventdata = {
-        success: true,
-        response: undefined,
-        path: "stop",
-      };
-      fireEvent(this, "hass-api-called", eventdata);
-    } catch (err) {
-      showAlertDialog(this, {
-        title: this.supervisor.localize("addon.dashboard.action_error.stop"),
-        text: extractApiErrorMessage(err),
-      });
-    }
-    button.progress = false;
-  }
-
-  private async _restartClicked(ev: CustomEvent): Promise<void> {
-    const button = ev.currentTarget as any;
-    button.progress = true;
-
-    try {
-      await restartHassioAddon(this.hass, this.addon.slug);
-      const eventdata = {
-        success: true,
-        response: undefined,
-        path: "stop",
-      };
-      fireEvent(this, "hass-api-called", eventdata);
-    } catch (err) {
-      showAlertDialog(this, {
-        title: this.supervisor.localize("addon.dashboard.action_error.restart"),
-        text: extractApiErrorMessage(err),
-      });
-    }
-    button.progress = false;
-  }
-
-  private async _updateClicked(): Promise<void> {
-    showDialogSupervisorUpdate(this, {
-      supervisor: this.supervisor,
-      name: this.addon.name,
-      version: this.addon.version_latest,
-      snapshotParams: {
-        name: `addon_${this.addon.slug}_${this.addon.version}`,
-        addons: [this.addon.slug],
-        homeassistant: false,
-      },
-      updateHandler: async () => await this._updateAddon(),
-    });
-  }
-
-  private async _updateAddon(): Promise<void> {
-    await updateHassioAddon(this.hass, this.addon.slug);
-    fireEvent(this, "supervisor-colllection-refresh", {
-      colllection: "addon",
-    });
-    const eventdata = {
-      success: true,
-      response: undefined,
-      path: "update",
-    };
-    fireEvent(this, "hass-api-called", eventdata);
-  }
-
   private async _startClicked(ev: CustomEvent): Promise<void> {
     const button = ev.currentTarget as any;
     button.progress = true;
@@ -1018,17 +856,13 @@ class HassioAddonInfo extends LitElement {
         this.hass,
         this.addon.slug
       );
-      if (!validate.valid) {
+      if (!validate.data.valid) {
         await showConfirmationDialog(this, {
-          title: this.supervisor.localize(
-            "addon.dashboard.action_error.start_invalid_config"
-          ),
-          text: validate.message.split(" Got ")[0],
+          title: "Failed to start addon - configuration validation failed!",
+          text: validate.data.message.split(" Got ")[0],
           confirm: () => this._openConfiguration(),
-          confirmText: this.supervisor.localize(
-            "addon.dashboard.action_error.go_to_config"
-          ),
-          dismissText: this.supervisor.localize("common.cancel"),
+          confirmText: "Go to configuration",
+          dismissText: "Cancel",
         });
         button.progress = false;
         return;
@@ -1045,15 +879,9 @@ class HassioAddonInfo extends LitElement {
     try {
       await startHassioAddon(this.hass, this.addon.slug);
       this.addon = await fetchHassioAddonInfo(this.hass, this.addon.slug);
-      const eventdata = {
-        success: true,
-        response: undefined,
-        path: "start",
-      };
-      fireEvent(this, "hass-api-called", eventdata);
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize("addon.dashboard.action_error.start"),
+        title: "Failed to start addon",
         text: extractApiErrorMessage(err),
       });
     }
@@ -1091,9 +919,7 @@ class HassioAddonInfo extends LitElement {
       fireEvent(this, "hass-api-called", eventdata);
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize(
-          "addon.dashboard.action_error.uninstall"
-        ),
+        title: "Failed to uninstall addon",
         text: extractApiErrorMessage(err),
       });
     }
@@ -1168,6 +994,9 @@ class HassioAddonInfo extends LitElement {
           font-weight: 500;
           color: var(--primary-color);
         }
+        .right {
+          float: right;
+        }
         protection-enable mwc-button {
           --mdc-theme-primary: white;
         }
@@ -1190,8 +1019,7 @@ class HassioAddonInfo extends LitElement {
           margin-bottom: 16px;
         }
         .card-actions {
-          justify-content: space-between;
-          display: flex;
+          display: flow-root;
         }
         .security h3 {
           margin-bottom: 8px;
@@ -1227,16 +1055,18 @@ class HassioAddonInfo extends LitElement {
         }
 
         .addon-options {
+          max-width: 50%;
+        }
+        .addon-options.started {
           max-width: 90%;
         }
 
         .addon-container {
           display: grid;
           grid-auto-flow: column;
-          grid-template-columns: 60% 40%;
+          grid-template-columns: 1fr auto;
         }
-
-        .addon-container > div:last-of-type {
+        .addon-container div:last-of-type {
           align-self: end;
         }
 

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

@@ -9,7 +9,6 @@ import {
 } from "lit-element";
 import "../../../../src/components/ha-circular-progress";
 import { HassioAddonDetails } from "../../../../src/data/hassio/addon";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import { haStyle } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
 import { hassioStyle } from "../../resources/hassio-style";
@@ -19,8 +18,6 @@ import "./hassio-addon-logs";
 class HassioAddonLogDashboard extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public addon?: HassioAddonDetails;
 
   protected render(): TemplateResult {
@@ -31,7 +28,6 @@ class HassioAddonLogDashboard extends LitElement {
       <div class="content">
         <hassio-addon-logs
           .hass=${this.hass}
-          .supervisor=${this.supervisor}
           .addon=${this.addon}
         ></hassio-addon-logs>
       </div>

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

@@ -15,7 +15,6 @@ import {
   HassioAddonDetails,
 } from "../../../../src/data/hassio/addon";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import { haStyle } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
 import "../../components/hassio-ansi-to-html";
@@ -25,8 +24,6 @@ import { hassioStyle } from "../../resources/hassio-style";
 class HassioAddonLogs extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public addon!: HassioAddonDetails;
 
   @internalProperty() private _error?: string;
@@ -51,9 +48,7 @@ class HassioAddonLogs extends LitElement {
             : ""}
         </div>
         <div class="card-actions">
-          <mwc-button @click=${this._refresh}>
-            ${this.supervisor.localize("common.refresh")}
-          </mwc-button>
+          <mwc-button @click=${this._refresh}>Refresh</mwc-button>
         </div>
       </ha-card>
     `;
@@ -81,11 +76,7 @@ class HassioAddonLogs extends LitElement {
     try {
       this._content = await fetchHassioAddonLogs(this.hass, this.addon.slug);
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "addon.logs.get_logs",
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to get addon logs, ${extractApiErrorMessage(err)}`;
     }
   }
 

hassio/src/components/hassio-card-content.ts

@@ -44,7 +44,7 @@ class HassioCardContent extends LitElement {
       ${this.iconImage
         ? html`
             <div class="icon_image ${this.iconClass}">
-              <img src="${this.iconImage}" .title=${this.iconTitle} />
+              <img src="${this.iconImage}" title="${this.iconTitle}" />
               <div></div>
             </div>
           `

hassio/src/components/supervisor-metric.ts

@@ -26,7 +26,7 @@ class SupervisorMetric extends LitElement {
       <span slot="heading">
         ${this.description}
       </span>
-      <div slot="description" .title=${this.tooltip ?? ""}>
+      <div slot="description" title="${this.tooltip ?? ""}">
         <span class="value">
           ${roundedValue}%
         </span>

hassio/src/dashboard/hassio-addons.ts

@@ -27,15 +27,17 @@ class HassioAddons extends LitElement {
   protected render(): TemplateResult {
     return html`
       <div class="content">
-        <h1>${this.supervisor.localize("dashboard.addons")}</h1>
+        <h1>Add-ons</h1>
         <div class="card-group">
           ${!this.supervisor.supervisor.addons?.length
             ? html`
                 <ha-card>
                   <div class="card-content">
+                    You don't have any add-ons installed yet. Head over to
                     <button class="link" @click=${this._openStore}>
-                      ${this.supervisor.localize("dashboard.no_addons")}
+                      the add-on store
                     </button>
+                    to get started!
                   </div>
                 </ha-card>
               `
@@ -56,16 +58,10 @@ class HassioAddons extends LitElement {
                             ? mdiArrowUpBoldCircle
                             : mdiPuzzle}
                           .iconTitle=${addon.state !== "started"
-                            ? this.supervisor.localize(
-                                "dashboard.addon_stopped"
-                              )
+                            ? "Add-on is stopped"
                             : addon.update_available!
-                            ? this.supervisor.localize(
-                                "dashboard.addon_new_version"
-                              )
-                            : this.supervisor.localize(
-                                "dashboard.addon_running"
-                              )}
+                            ? "New version available"
+                            : "Add-on is running"}
                           .iconClass=${addon.update_available
                             ? addon.state === "started"
                               ? "update"

hassio/src/dashboard/hassio-dashboard.ts

@@ -29,16 +29,13 @@ class HassioDashboard extends LitElement {
     return html`
       <hass-tabs-subpage
         .hass=${this.hass}
-        .localizeFunc=${this.supervisor.localize}
         .narrow=${this.narrow}
+        hassio
+        main-page
         .route=${this.route}
         .tabs=${supervisorTabs}
-        main-page
-        supervisor
       >
-        <span slot="header">
-          ${this.supervisor.localize("panel.dashboard")}
-        </span>
+        <span slot="header">Dashboard</span>
         <div class="content">
           <hassio-update
             .hass=${this.hass}

hassio/src/dashboard/hassio-update.ts

@@ -10,11 +10,8 @@ import {
   TemplateResult,
 } from "lit-element";
 import memoizeOne from "memoize-one";
-import { atLeastVersion } from "../../../src/common/config/version";
-import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/buttons/ha-progress-button";
 import "../../../src/components/ha-card";
-import "../../../src/components/ha-settings-row";
 import "../../../src/components/ha-svg-icon";
 import {
   extractApiErrorMessage,
@@ -26,24 +23,15 @@ import {
   HassioHomeAssistantInfo,
   HassioSupervisorInfo,
 } from "../../../src/data/hassio/supervisor";
-import { updateCore } from "../../../src/data/supervisor/core";
-import {
-  Supervisor,
-  supervisorApiWsRequest,
-} from "../../../src/data/supervisor/supervisor";
+import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import {
   showAlertDialog,
   showConfirmationDialog,
 } from "../../../src/dialogs/generic/show-dialog-box";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
-import { showDialogSupervisorUpdate } from "../dialogs/update/show-dialog-update";
 import { hassioStyle } from "../resources/hassio-style";
 
-const computeVersion = (key: string, version: string): string => {
-  return key === "os" ? version : `${key}-${version}`;
-};
-
 @customElement("hassio-update")
 export class HassioUpdate extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -69,17 +57,13 @@ export class HassioUpdate extends LitElement {
     return html`
       <div class="content">
         <h1>
-          ${this.supervisor.localize(
-            "common.update_available",
-            "count",
-            updatesAvailable
-          )}
-          🎉
+          ${updatesAvailable > 1
+            ? "Updates Available 🎉"
+            : "Update Available 🎉"}
         </h1>
         <div class="card-group">
           ${this._renderUpdateCard(
             "Home Assistant Core",
-            "core",
             this.supervisor.core,
             "hassio/homeassistant/update",
             `https://${
@@ -88,7 +72,6 @@ export class HassioUpdate extends LitElement {
           )}
           ${this._renderUpdateCard(
             "Supervisor",
-            "supervisor",
             this.supervisor.supervisor,
             "hassio/supervisor/update",
             `https://github.com//home-assistant/hassio/releases/tag/${this.supervisor.supervisor.version_latest}`
@@ -96,7 +79,6 @@ export class HassioUpdate extends LitElement {
           ${this.supervisor.host.features.includes("hassos")
             ? this._renderUpdateCard(
                 "Operating System",
-                "os",
                 this.supervisor.os,
                 "hassio/os/update",
                 `https://github.com//home-assistant/hassos/releases/tag/${this.supervisor.os.version_latest}`
@@ -109,7 +91,6 @@ export class HassioUpdate extends LitElement {
 
   private _renderUpdateCard(
     name: string,
-    key: string,
     object: HassioHomeAssistantInfo | HassioSupervisorInfo | HassioHassOSInfo,
     apiPath: string,
     releaseNotesUrl: string
@@ -123,39 +104,22 @@ export class HassioUpdate extends LitElement {
           <div class="icon">
             <ha-svg-icon .path=${mdiHomeAssistant}></ha-svg-icon>
           </div>
-          <div class="update-heading">${name}</div>
-          <ha-settings-row two-line>
-            <span slot="heading">
-              ${this.supervisor.localize("common.version")}
-            </span>
-            <span slot="description">
-              ${computeVersion(key, object.version!)}
-            </span>
-          </ha-settings-row>
-
-          <ha-settings-row two-line>
-            <span slot="heading">
-              ${this.supervisor.localize("common.newest_version")}
-            </span>
-            <span slot="description">
-              ${computeVersion(key, object.version_latest!)}
-            </span>
-          </ha-settings-row>
+          <div class="update-heading">${name} ${object.version_latest}</div>
+          <div class="warning">
+            You are currently running version ${object.version}
+          </div>
         </div>
         <div class="card-actions">
           <a href="${releaseNotesUrl}" target="_blank" rel="noreferrer">
-            <mwc-button>
-              ${this.supervisor.localize("common.release_notes")}
-            </mwc-button>
+            <mwc-button>Release notes</mwc-button>
           </a>
           <ha-progress-button
             .apiPath=${apiPath}
             .name=${name}
-            .key=${key}
             .version=${object.version_latest}
             @click=${this._confirmUpdate}
           >
-            ${this.supervisor.localize("common.update")}
+            Update
           </ha-progress-button>
         </div>
       </ha-card>
@@ -164,36 +128,12 @@ export class HassioUpdate extends LitElement {
 
   private async _confirmUpdate(ev): Promise<void> {
     const item = ev.currentTarget;
-    if (item.key === "core") {
-      showDialogSupervisorUpdate(this, {
-        supervisor: this.supervisor,
-        name: "Home Assistant Core",
-        version: this.supervisor.core.version,
-        snapshotParams: {
-          name: `core_${this.supervisor.core.version}`,
-          folders: ["homeassistant"],
-          homeassistant: true,
-        },
-        updateHandler: async () => this._updateCore(),
-      });
-      return;
-    }
     item.progress = true;
     const confirmed = await showConfirmationDialog(this, {
-      title: this.supervisor.localize(
-        "confirm.update.title",
-        "name",
-        item.name
-      ),
-      text: this.supervisor.localize(
-        "confirm.update.text",
-        "name",
-        item.name,
-        "version",
-        computeVersion(item.key, item.version)
-      ),
-      confirmText: this.supervisor.localize("common.update"),
-      dismissText: this.supervisor.localize("common.cancel"),
+      title: `Update ${item.name}`,
+      text: `Are you sure you want to update ${item.name} to version ${item.version}?`,
+      confirmText: "update",
+      dismissText: "cancel",
     });
 
     if (!confirmed) {
@@ -201,28 +141,13 @@ export class HassioUpdate extends LitElement {
       return;
     }
     try {
-      if (atLeastVersion(this.hass.config.version, 2021, 2, 4)) {
-        await supervisorApiWsRequest(this.hass.connection, {
-          method: "post",
-          endpoint: item.apiPath.replace("hassio", ""),
-          timeout: null,
-        });
-      } else {
-        await this.hass.callApi<HassioResponse<void>>("POST", item.apiPath);
-      }
-      fireEvent(this, "supervisor-colllection-refresh", {
-        colllection: item.key,
-      });
+      await this.hass.callApi<HassioResponse<void>>("POST", item.apiPath);
     } catch (err) {
       // Only show an error if the status code was not expected (user behind proxy)
       // or no status at all(connection terminated)
-      if (
-        this.hass.connection.connected &&
-        err.status_code &&
-        !ignoredStatusCodes.has(err.status_code)
-      ) {
+      if (err.status_code && !ignoredStatusCodes.has(err.status_code)) {
         showAlertDialog(this, {
-          title: this.supervisor.localize("common.error.update_failed"),
+          title: "Update failed",
           text: extractApiErrorMessage(err),
         });
       }
@@ -230,13 +155,6 @@ export class HassioUpdate extends LitElement {
     item.progress = false;
   }
 
-  private async _updateCore(): Promise<void> {
-    await updateCore(this.hass);
-    fireEvent(this, "supervisor-colllection-refresh", {
-      colllection: "core",
-    });
-  }
-
   static get styles(): CSSResult[] {
     return [
       haStyle,
@@ -254,6 +172,9 @@ export class HassioUpdate extends LitElement {
           margin-bottom: 0.5em;
           color: var(--primary-text-color);
         }
+        .warning {
+          color: var(--secondary-text-color);
+        }
         .card-content {
           height: calc(100% - 47px);
           box-sizing: border-box;
@@ -261,13 +182,13 @@ export class HassioUpdate extends LitElement {
         .card-actions {
           text-align: right;
         }
+        .errors {
+          color: var(--error-color);
+          padding: 16px;
+        }
         a {
           text-decoration: none;
         }
-        ha-settings-row {
-          padding: 0;
-          --paper-item-body-two-line-min-height: 32px;
-        }
       `,
     ];
   }

hassio/src/dialogs/network/dialog-hassio-network.ts

@@ -35,7 +35,6 @@ import {
   updateNetworkInterface,
   WifiConfiguration,
 } from "../../../../src/data/hassio/network";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import {
   showAlertDialog,
   showConfirmationDialog,
@@ -52,8 +51,6 @@ export class DialogHassioNetwork extends LitElement
   implements HassDialog<HassioNetworkDialogParams> {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @internalProperty() private _accessPoints?: AccessPoints;
 
   @internalProperty() private _curTabIndex = 0;
@@ -76,8 +73,7 @@ export class DialogHassioNetwork extends LitElement
     this._params = params;
     this._dirty = false;
     this._curTabIndex = 0;
-    this.supervisor = params.supervisor;
-    this._interfaces = params.supervisor.network.interfaces.sort((a, b) => {
+    this._interfaces = params.network.interfaces.sort((a, b) => {
       return a.primary > b.primary ? -1 : 1;
     });
     this._interface = { ...this._interfaces[this._curTabIndex] };
@@ -108,7 +104,7 @@ export class DialogHassioNetwork extends LitElement
         <div slot="heading">
           <ha-header-bar>
             <span slot="title">
-              ${this.supervisor.localize("dialog.network.title")}
+              Network settings
             </span>
             <mwc-icon-button slot="actionItems" dialogAction="cancel">
               <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
@@ -143,13 +139,7 @@ export class DialogHassioNetwork extends LitElement
           ? html`
               <ha-expansion-panel header="Wi-Fi" outlined>
                 ${this._interface?.wifi?.ssid
-                  ? html`<p>
-                      ${this.supervisor.localize(
-                        "dialog.network.connected_to",
-                        "ssid",
-                        this._interface?.wifi?.ssid
-                      )}
-                    </p>`
+                  ? html`<p>Connected to: ${this._interface?.wifi?.ssid}</p>`
                   : ""}
                 <mwc-button
                   class="scan"
@@ -159,7 +149,7 @@ export class DialogHassioNetwork extends LitElement
                   ${this._scanning
                     ? html`<ha-circular-progress active size="small">
                       </ha-circular-progress>`
-                    : this.supervisor.localize("dialog.network.scan_ap")}
+                    : "Scan for accesspoints"}
                 </mwc-button>
                 ${this._accessPoints &&
                 this._accessPoints.accesspoints &&
@@ -191,11 +181,7 @@ export class DialogHassioNetwork extends LitElement
                 ${this._wifiConfiguration
                   ? html`
                       <div class="radio-row">
-                        <ha-formfield
-                          .label=${this.supervisor.localize(
-                            "dialog.network.open"
-                          )}
-                        >
+                        <ha-formfield label="open">
                           <ha-radio
                             @change=${this._handleRadioValueChangedAp}
                             .ap=${this._wifiConfiguration}
@@ -207,11 +193,7 @@ export class DialogHassioNetwork extends LitElement
                           >
                           </ha-radio>
                         </ha-formfield>
-                        <ha-formfield
-                          .label=${this.supervisor.localize(
-                            "dialog.network.wep"
-                          )}
-                        >
+                        <ha-formfield label="wep">
                           <ha-radio
                             @change=${this._handleRadioValueChangedAp}
                             .ap=${this._wifiConfiguration}
@@ -221,11 +203,7 @@ export class DialogHassioNetwork extends LitElement
                           >
                           </ha-radio>
                         </ha-formfield>
-                        <ha-formfield
-                          .label=${this.supervisor.localize(
-                            "dialog.network.wpa"
-                          )}
-                        >
+                        <ha-formfield label="wpa-psk">
                           <ha-radio
                             @change=${this._handleRadioValueChangedAp}
                             .ap=${this._wifiConfiguration}
@@ -259,21 +237,18 @@ export class DialogHassioNetwork extends LitElement
           : ""}
         ${this._dirty
           ? html`<div class="warning">
-              ${this.supervisor.localize("dialog.network.warning")}
+              If you are changing the Wi-Fi, IP or gateway addresses, you might
+              lose the connection!
             </div>`
           : ""}
       </div>
       <div class="buttons">
-        <mwc-button
-          .label=${this.supervisor.localize("common.cancel")}
-          @click=${this.closeDialog}
-        >
-        </mwc-button>
+        <mwc-button label="close" @click=${this.closeDialog}> </mwc-button>
         <mwc-button @click=${this._updateNetwork} .disabled=${!this._dirty}>
           ${this._processing
             ? html`<ha-circular-progress active size="small">
               </ha-circular-progress>`
-            : this.supervisor.localize("common.save")}
+            : "Save"}
         </mwc-button>
       </div>`;
   }
@@ -310,9 +285,7 @@ export class DialogHassioNetwork extends LitElement
         outlined
       >
         <div class="radio-row">
-          <ha-formfield
-            .label=${this.supervisor.localize("dialog.network.dhcp")}
-          >
+          <ha-formfield label="DHCP">
             <ha-radio
               @change=${this._handleRadioValueChanged}
               .version=${version}
@@ -322,9 +295,7 @@ export class DialogHassioNetwork extends LitElement
             >
             </ha-radio>
           </ha-formfield>
-          <ha-formfield
-            .label=${this.supervisor.localize("dialog.network.static")}
-          >
+          <ha-formfield label="Static">
             <ha-radio
               @change=${this._handleRadioValueChanged}
               .version=${version}
@@ -334,10 +305,7 @@ export class DialogHassioNetwork extends LitElement
             >
             </ha-radio>
           </ha-formfield>
-          <ha-formfield
-            .label=${this.supervisor.localize("dialog.network.disabled")}
-            class="warning"
-          >
+          <ha-formfield label="Disabled" class="warning">
             <ha-radio
               @change=${this._handleRadioValueChanged}
               .version=${version}
@@ -353,7 +321,7 @@ export class DialogHassioNetwork extends LitElement
               <paper-input
                 class="flex-auto"
                 id="address"
-                .label=${this.supervisor.localize("dialog.network.ip_netmask")}
+                label="IP address/Netmask"
                 .version=${version}
                 .value=${this._toString(this._interface![version].address)}
                 @value-changed=${this._handleInputValueChanged}
@@ -362,7 +330,7 @@ export class DialogHassioNetwork extends LitElement
               <paper-input
                 class="flex-auto"
                 id="gateway"
-                .label=${this.supervisor.localize("dialog.network.gateway")}
+                label="Gateway address"
                 .version=${version}
                 .value=${this._interface![version].gateway}
                 @value-changed=${this._handleInputValueChanged}
@@ -371,7 +339,7 @@ export class DialogHassioNetwork extends LitElement
               <paper-input
                 class="flex-auto"
                 id="nameservers"
-                .label=${this.supervisor.localize("dialog.network.dns_servers")}
+                label="DNS servers"
                 .version=${version}
                 .value=${this._toString(this._interface![version].nameservers)}
                 @value-changed=${this._handleInputValueChanged}
@@ -456,7 +424,7 @@ export class DialogHassioNetwork extends LitElement
       );
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize("dialog.network.failed_to_change"),
+        title: "Failed to change network settings",
         text: extractApiErrorMessage(err),
       });
       this._processing = false;
@@ -469,9 +437,10 @@ export class DialogHassioNetwork extends LitElement
   private async _handleTabActivated(ev: CustomEvent): Promise<void> {
     if (this._dirty) {
       const confirm = await showConfirmationDialog(this, {
-        text: this.supervisor.localize("dialog.network.unsaved"),
-        confirmText: this.supervisor.localize("common.yes"),
-        dismissText: this.supervisor.localize("common.no"),
+        text:
+          "You have unsaved changes, these will get lost if you change tabs, do you want to continue?",
+        confirmText: "yes",
+        dismissText: "no",
       });
       if (!confirm) {
         this.requestUpdate("_interface");

hassio/src/dialogs/network/show-dialog-network.ts

@@ -1,9 +1,9 @@
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
+import { NetworkInfo } from "../../../../src/data/hassio/network";
 import "./dialog-hassio-network";
 
 export interface HassioNetworkDialogParams {
-  supervisor: Supervisor;
+  network: NetworkInfo;
   loadData: () => Promise<void>;
 }
 

hassio/src/dialogs/registries/dialog-hassio-registries.ts

@@ -22,18 +22,14 @@ import {
   fetchHassioDockerRegistries,
   removeHassioDockerRegistry,
 } from "../../../../src/data/hassio/docker";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import { showAlertDialog } from "../../../../src/dialogs/generic/show-dialog-box";
 import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
 import type { HomeAssistant } from "../../../../src/types";
-import { RegistriesDialogParams } from "./show-dialog-registries";
 
 @customElement("dialog-hassio-registries")
 class HassioRegistriesDialog extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) private _registries?: {
     registry: string;
     username: string;
@@ -59,8 +55,8 @@ class HassioRegistriesDialog extends LitElement {
         .heading=${createCloseHeading(
           this.hass,
           this._addingRegistry
-            ? this.supervisor.localize("dialog.registries.title_add")
-            : this.supervisor.localize("dialog.registries.title_manage")
+            ? "Add New Docker Registry"
+            : "Manage Docker Registries"
         )}
       >
         <div class="form">
@@ -70,9 +66,7 @@ class HassioRegistriesDialog extends LitElement {
                   @value-changed=${this._inputChanged}
                   class="flex-auto"
                   name="registry"
-                  .label=${this.supervisor.localize(
-                    "dialog.registries.registry"
-                  )}
+                  label="Registry"
                   required
                   auto-validate
                 ></paper-input>
@@ -80,9 +74,7 @@ class HassioRegistriesDialog extends LitElement {
                   @value-changed=${this._inputChanged}
                   class="flex-auto"
                   name="username"
-                  .label=${this.supervisor.localize(
-                    "dialog.registries.username"
-                  )}
+                  label="Username"
                   required
                   auto-validate
                 ></paper-input>
@@ -90,9 +82,7 @@ class HassioRegistriesDialog extends LitElement {
                   @value-changed=${this._inputChanged}
                   class="flex-auto"
                   name="password"
-                  .label=${this.supervisor.localize(
-                    "dialog.registries.password"
-                  )}
+                  label="Password"
                   type="password"
                   required
                   auto-validate
@@ -104,7 +94,7 @@ class HassioRegistriesDialog extends LitElement {
                   )}
                   @click=${this._addNewRegistry}
                 >
-                  ${this.supervisor.localize("dialog.registries.add_registry")}
+                  Add registry
                 </mwc-button>
               `
             : html`${this._registries?.length
@@ -113,16 +103,11 @@ class HassioRegistriesDialog extends LitElement {
                         <mwc-list-item class="option" hasMeta twoline>
                           <span>${entry.registry}</span>
                           <span slot="secondary"
-                            >${this.supervisor.localize(
-                              "dialog.registries.username"
-                            )}:
-                            ${entry.username}</span
+                            >Username: ${entry.username}</span
                           >
                           <mwc-icon-button
                             .entry=${entry}
-                            .title=${this.supervisor.localize(
-                              "dialog.registries.remove"
-                            )}
+                            title="Remove"
                             slot="meta"
                             @click=${this._removeRegistry}
                           >
@@ -133,17 +118,11 @@ class HassioRegistriesDialog extends LitElement {
                     })
                   : html`
                       <mwc-list-item>
-                        <span
-                          >${this.supervisor.localize(
-                            "dialog.registries.no_registries"
-                          )}</span
-                        >
+                        <span>No registries configured</span>
                       </mwc-list-item>
                     `}
                 <mwc-button @click=${this._addRegistry}>
-                  ${this.supervisor.localize(
-                    "dialog.registries.add_new_registry"
-                  )}
+                  Add new registry
                 </mwc-button> `}
         </div>
       </ha-dialog>
@@ -155,9 +134,8 @@ class HassioRegistriesDialog extends LitElement {
     this[`_${target.name}`] = target.value;
   }
 
-  public async showDialog(dialogParams: RegistriesDialogParams): Promise<void> {
+  public async showDialog(_dialogParams: any): Promise<void> {
     this._opened = true;
-    this.supervisor = dialogParams.supervisor;
     await this._loadRegistries();
     await this.updateComplete;
   }
@@ -200,7 +178,7 @@ class HassioRegistriesDialog extends LitElement {
       this._addingRegistry = false;
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize("dialog.registries.failed_to_add"),
+        title: "Failed to add registry",
         text: extractApiErrorMessage(err),
       });
     }
@@ -214,7 +192,7 @@ class HassioRegistriesDialog extends LitElement {
       await this._loadRegistries();
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize("dialog.registries.failed_to_remove"),
+        title: "Failed to remove registry",
         text: extractApiErrorMessage(err),
       });
     }

hassio/src/dialogs/registries/show-dialog-registries.ts

@@ -1,18 +1,10 @@
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 import "./dialog-hassio-registries";
 
-export interface RegistriesDialogParams {
-  supervisor: Supervisor;
-}
-
-export const showRegistriesDialog = (
-  element: HTMLElement,
-  dialogParams: RegistriesDialogParams
-): void => {
+export const showRegistriesDialog = (element: HTMLElement): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-registries",
     dialogImport: () => import("./dialog-hassio-registries"),
-    dialogParams,
+    dialogParams: {},
   });
 };

hassio/src/dialogs/repositories/dialog-hassio-repositories.ts

@@ -18,7 +18,7 @@ import {
 } from "lit-element";
 import memoizeOne from "memoize-one";
 import "../../../../src/components/ha-circular-progress";
-import { createCloseHeading } from "../../../../src/components/ha-dialog";
+import "../../../../src/components/ha-dialog";
 import "../../../../src/components/ha-svg-icon";
 import {
   fetchHassioAddonsInfo,
@@ -26,7 +26,6 @@ import {
 } 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 { haStyle, haStyleDialog } from "../../../../src/resources/styles";
 import type { HomeAssistant } from "../../../../src/types";
 import { HassioRepositoryDialogParams } from "./show-dialog-repositories";
@@ -35,8 +34,6 @@ import { HassioRepositoryDialogParams } from "./show-dialog-repositories";
 class HassioRepositoriesDialog extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) private _repos: HassioAddonRepository[] = [];
 
   @property({ attribute: false })
@@ -50,11 +47,9 @@ class HassioRepositoriesDialog extends LitElement {
 
   @internalProperty() private _error?: string;
 
-  public async showDialog(
-    dialogParams: HassioRepositoryDialogParams
-  ): Promise<void> {
-    this._dialogParams = dialogParams;
-    this.supervisor = dialogParams.supervisor;
+  public async showDialog(_dialogParams: any): Promise<void> {
+    this._dialogParams = _dialogParams;
+    this._repos = _dialogParams.repos;
     this._opened = true;
     await this.updateComplete;
   }
@@ -71,19 +66,14 @@ class HassioRepositoriesDialog extends LitElement {
   );
 
   protected render(): TemplateResult {
-    const repositories = this._filteredRepositories(
-      this.supervisor.addon.repositories
-    );
+    const repositories = this._filteredRepositories(this._repos);
     return html`
       <ha-dialog
         .open=${this._opened}
         @closing=${this.closeDialog}
         scrimClickAction
         escapeKeyAction
-        .heading=${createCloseHeading(
-          this.hass,
-          this.supervisor.localize("dialog.repositories.title")
-        )}
+        heading="Manage add-on repositories"
       >
         ${this._error ? html`<div class="error">${this._error}</div>` : ""}
         <div class="form">
@@ -98,9 +88,7 @@ class HassioRepositoriesDialog extends LitElement {
                     </paper-item-body>
                     <mwc-icon-button
                       .slug=${repo.slug}
-                      .title=${this.supervisor.localize(
-                        "dialog.repositories.remove"
-                      )}
+                      title="Remove"
                       @click=${this._removeRepository}
                     >
                       <ha-svg-icon .path=${mdiDelete}></ha-svg-icon>
@@ -117,13 +105,13 @@ class HassioRepositoriesDialog extends LitElement {
             <paper-input
               class="flex-auto"
               id="repository_input"
-              .label=${this.supervisor.localize("dialog.repositories.add")}
+              label="Add repository"
               @keydown=${this._handleKeyAdd}
             ></paper-input>
             <mwc-button @click=${this._addRepository}>
               ${this._prosessing
                 ? html`<ha-circular-progress active></ha-circular-progress>`
-                : this.supervisor.localize("dialog.repositories.add")}
+                : "Add"}
             </mwc-button>
           </div>
         </div>

hassio/src/dialogs/repositories/show-dialog-repositories.ts

@@ -1,9 +1,9 @@
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
+import { HassioAddonRepository } from "../../../../src/data/hassio/addon";
 import "./dialog-hassio-repositories";
 
 export interface HassioRepositoryDialogParams {
-  supervisor: Supervisor;
+  repos: HassioAddonRepository[];
   loadData: () => Promise<void>;
 }
 

hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts

@@ -22,11 +22,7 @@ import {
   fetchHassioSnapshotInfo,
   HassioSnapshotDetail,
 } from "../../../../src/data/hassio/snapshot";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
-import {
-  showAlertDialog,
-  showConfirmationDialog,
-} from "../../../../src/dialogs/generic/show-dialog-box";
+import { showConfirmationDialog } from "../../../../src/dialogs/generic/show-dialog-box";
 import { PolymerChangedEvent } from "../../../../src/polymer-types";
 import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
@@ -79,8 +75,6 @@ interface FolderItem {
 class HassioSnapshotDialog extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor?: Supervisor;
-
   @internalProperty() private _error?: string;
 
   @internalProperty() private _onboarding = false;
@@ -95,7 +89,7 @@ class HassioSnapshotDialog extends LitElement {
 
   @internalProperty() private _snapshotPassword!: string;
 
-  @internalProperty() private _restoreHass = true;
+  @internalProperty() private _restoreHass: boolean | null | undefined = true;
 
   public async showDialog(params: HassioSnapshotDialogParams) {
     this._snapshot = await fetchHassioSnapshotInfo(this.hass, params.slug);
@@ -108,10 +102,6 @@ class HassioSnapshotDialog extends LitElement {
 
     this._dialogParams = params;
     this._onboarding = params.onboarding ?? false;
-    this.supervisor = params.supervisor;
-    if (!this._snapshot.homeassistant) {
-      this._restoreHass = false;
-    }
   }
 
   protected render(): TemplateResult {
@@ -137,17 +127,15 @@ class HassioSnapshotDialog extends LitElement {
           (${this._computeSize})<br />
           ${this._formatDatetime(this._snapshot.date)}
         </div>
-        ${this._snapshot.homeassistant
-          ? html`<div>Home Assistant:</div>
-              <paper-checkbox
-                .checked=${this._restoreHass}
-                @change="${(ev: Event) => {
-                  this._restoreHass = (ev.target as PaperCheckboxElement).checked!;
-                }}"
-              >
-                Home Assistant ${this._snapshot.homeassistant}
-              </paper-checkbox>`
-          : ""}
+        <div>Home Assistant:</div>
+        <paper-checkbox
+          .checked=${this._restoreHass}
+          @change="${(ev: Event) => {
+            this._restoreHass = (ev.target as PaperCheckboxElement).checked;
+          }}"
+        >
+          Home Assistant ${this._snapshot.homeassistant}
+        </paper-checkbox>
         ${this._folders.length
           ? html`
               <div>Folders:</div>
@@ -310,16 +298,6 @@ class HassioSnapshotDialog extends LitElement {
   }
 
   private async _partialRestoreClicked() {
-    if (
-      this.supervisor !== undefined &&
-      this.supervisor.info.state !== "running"
-    ) {
-      await showAlertDialog(this, {
-        title: "Could not restore snapshot",
-        text: `Restoring a snapshot is not possible right now because the system is in ${this.supervisor.info.state} state.`,
-      });
-      return;
-    }
     if (
       !(await showConfirmationDialog(this, {
         title: "Are you sure you want partially to restore this snapshot?",
@@ -339,7 +317,7 @@ class HassioSnapshotDialog extends LitElement {
       .map((folder) => folder.slug);
 
     const data: {
-      homeassistant: boolean;
+      homeassistant: boolean | null | undefined;
       addons: any;
       folders: any;
       password?: string;
@@ -381,16 +359,6 @@ class HassioSnapshotDialog extends LitElement {
   }
 
   private async _fullRestoreClicked() {
-    if (
-      this.supervisor !== undefined &&
-      this.supervisor.info.state !== "running"
-    ) {
-      await showAlertDialog(this, {
-        title: "Could not restore snapshot",
-        text: `Restoring a snapshot is not possible right now because the system is in ${this.supervisor.info.state} state.`,
-      });
-      return;
-    }
     if (
       !(await showConfirmationDialog(this, {
         title:

hassio/src/dialogs/snapshot/show-dialog-hassio-snapshot.ts

@@ -1,11 +1,9 @@
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 
 export interface HassioSnapshotDialogParams {
   slug: string;
   onDelete?: () => void;
   onboarding?: boolean;
-  supervisor?: Supervisor;
 }
 
 export const showHassioSnapshotDialog = (

hassio/src/dialogs/suggestAddonRestart.ts

@@ -4,7 +4,6 @@ import {
   restartHassioAddon,
 } from "../../../src/data/hassio/addon";
 import { extractApiErrorMessage } from "../../../src/data/hassio/common";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import {
   showAlertDialog,
   showConfirmationDialog,
@@ -14,25 +13,20 @@ import { HomeAssistant } from "../../../src/types";
 export const suggestAddonRestart = async (
   element: LitElement,
   hass: HomeAssistant,
-  supervisor: Supervisor,
   addon: HassioAddonDetails
 ): Promise<void> => {
   const confirmed = await showConfirmationDialog(element, {
-    title: supervisor.localize("common.restart_name", "name", addon.name),
-    text: supervisor.localize("dialog.restart_addon.text"),
-    confirmText: supervisor.localize("dialog.restart_addon.confirm_text"),
-    dismissText: supervisor.localize("common.cancel"),
+    title: addon.name,
+    text: "Do you want to restart the add-on with your changes?",
+    confirmText: "restart add-on",
+    dismissText: "no",
   });
   if (confirmed) {
     try {
       await restartHassioAddon(hass, addon.slug);
     } catch (err) {
       showAlertDialog(element, {
-        title: supervisor.localize(
-          "common.failed_to_restart_name",
-          "name",
-          addon.name
-        ),
+        title: "Failed to restart",
         text: extractApiErrorMessage(err),
       });
     }

hassio/src/dialogs/update/dialog-supervisor-update.ts

@@ -1,203 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import {
-  css,
-  CSSResult,
-  customElement,
-  html,
-  internalProperty,
-  LitElement,
-  TemplateResult,
-} from "lit-element";
-import { fireEvent } from "../../../../src/common/dom/fire_event";
-import "../../../../src/components/ha-circular-progress";
-import "../../../../src/components/ha-dialog";
-import "../../../../src/components/ha-settings-row";
-import "../../../../src/components/ha-svg-icon";
-import "../../../../src/components/ha-switch";
-import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
-import { createHassioPartialSnapshot } from "../../../../src/data/hassio/snapshot";
-import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
-import type { HomeAssistant } from "../../../../src/types";
-import { SupervisorDialogSupervisorUpdateParams } from "./show-dialog-update";
-
-@customElement("dialog-supervisor-update")
-class DialogSupervisorUpdate extends LitElement {
-  public hass!: HomeAssistant;
-
-  @internalProperty() private _opened = false;
-
-  @internalProperty() private _createSnapshot = true;
-
-  @internalProperty() private _action: "snapshot" | "update" | null = null;
-
-  @internalProperty() private _error?: string;
-
-  @internalProperty()
-  private _dialogParams?: SupervisorDialogSupervisorUpdateParams;
-
-  public async showDialog(
-    params: SupervisorDialogSupervisorUpdateParams
-  ): Promise<void> {
-    this._opened = true;
-    this._dialogParams = params;
-    await this.updateComplete;
-  }
-
-  public closeDialog(): void {
-    this._action = null;
-    this._createSnapshot = true;
-    this._error = undefined;
-    this._dialogParams = undefined;
-    fireEvent(this, "dialog-closed", { dialog: this.localName });
-  }
-
-  public focus(): void {
-    this.updateComplete.then(() =>
-      (this.shadowRoot?.querySelector(
-        "[dialogInitialFocus]"
-      ) as HTMLElement)?.focus()
-    );
-  }
-
-  protected render(): TemplateResult {
-    if (!this._dialogParams) {
-      return html``;
-    }
-    return html`
-      <ha-dialog .open=${this._opened} scrimClickAction escapeKeyAction>
-        ${this._action === null
-          ? html`<slot name="heading">
-                <h2 id="title" class="header_title">
-                  ${this._dialogParams.supervisor.localize(
-                    "confirm.update.title",
-                    "name",
-                    this._dialogParams.name
-                  )}
-                </h2>
-              </slot>
-              <div>
-                ${this._dialogParams.supervisor.localize(
-                  "confirm.update.text",
-                  "name",
-                  this._dialogParams.name,
-                  "version",
-                  this._dialogParams.version
-                )}
-              </div>
-
-              <ha-settings-row>
-                <span slot="heading">
-                  ${this._dialogParams.supervisor.localize(
-                    "dialog.update.snapshot"
-                  )}
-                </span>
-                <span slot="description">
-                  ${this._dialogParams.supervisor.localize(
-                    "dialog.update.create_snapshot",
-                    "name",
-                    this._dialogParams.name
-                  )}
-                </span>
-                <ha-switch
-                  .checked=${this._createSnapshot}
-                  haptic
-                  @click=${this._toggleSnapshot}
-                >
-                </ha-switch>
-              </ha-settings-row>
-              <mwc-button @click=${this.closeDialog} slot="secondaryAction">
-                ${this._dialogParams.supervisor.localize("common.cancel")}
-              </mwc-button>
-              <mwc-button
-                .disabled=${this._error !== undefined}
-                @click=${this._update}
-                slot="primaryAction"
-              >
-                ${this._dialogParams.supervisor.localize("common.update")}
-              </mwc-button>`
-          : html`<ha-circular-progress alt="Updating" size="large" active>
-              </ha-circular-progress>
-              <p class="progress-text">
-                ${this._action === "update"
-                  ? this._dialogParams.supervisor.localize(
-                      "dialog.update.updating",
-                      "name",
-                      this._dialogParams.name,
-                      "version",
-                      this._dialogParams.version
-                    )
-                  : this._dialogParams.supervisor.localize(
-                      "dialog.update.snapshotting",
-                      "name",
-                      this._dialogParams.name
-                    )}
-              </p>`}
-        ${this._error ? html`<p class="error">${this._error}</p>` : ""}
-      </ha-dialog>
-    `;
-  }
-
-  private _toggleSnapshot() {
-    this._createSnapshot = !this._createSnapshot;
-  }
-
-  private async _update() {
-    if (this._createSnapshot) {
-      this._action = "snapshot";
-      try {
-        await createHassioPartialSnapshot(
-          this.hass,
-          this._dialogParams!.snapshotParams
-        );
-      } catch (err) {
-        this._error = extractApiErrorMessage(err);
-        this._action = null;
-        return;
-      }
-    }
-
-    this._action = "update";
-    try {
-      await this._dialogParams!.updateHandler!();
-    } catch (err) {
-      this._error = extractApiErrorMessage(err);
-      this._action = null;
-      return;
-    }
-
-    this.closeDialog();
-  }
-
-  static get styles(): CSSResult[] {
-    return [
-      haStyle,
-      haStyleDialog,
-      css`
-        .form {
-          color: var(--primary-text-color);
-        }
-
-        ha-settings-row {
-          margin-top: 32px;
-          padding: 0;
-        }
-
-        ha-circular-progress {
-          display: block;
-          margin: 32px;
-          text-align: center;
-        }
-
-        .progress-text {
-          text-align: center;
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "dialog-supervisor-update": DialogSupervisorUpdate;
-  }
-}

hassio/src/dialogs/update/show-dialog-update.ts

@@ -1,21 +0,0 @@
-import { fireEvent } from "../../../../src/common/dom/fire_event";
-import { Supervisor } from "../../../../src/data/supervisor/supervisor";
-
-export interface SupervisorDialogSupervisorUpdateParams {
-  supervisor: Supervisor;
-  name: string;
-  version: string;
-  snapshotParams: any;
-  updateHandler: () => Promise<void>;
-}
-
-export const showDialogSupervisorUpdate = (
-  element: HTMLElement,
-  dialogParams: SupervisorDialogSupervisorUpdateParams
-): void => {
-  fireEvent(element, "show-dialog", {
-    dialogTag: "dialog-supervisor-update",
-    dialogImport: () => import("./dialog-supervisor-update"),
-    dialogParams,
-  });
-};

hassio/src/hassio-main.ts

@@ -3,9 +3,7 @@ import { atLeastVersion } from "../../src/common/config/version";
 import { applyThemesOnElement } from "../../src/common/dom/apply_themes_on_element";
 import { fireEvent } from "../../src/common/dom/fire_event";
 import { HassioPanelInfo } from "../../src/data/hassio/supervisor";
-import { Supervisor } from "../../src/data/supervisor/supervisor";
 import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
-import "../../src/layouts/hass-loading-screen";
 import { HomeAssistant, Route } from "../../src/types";
 import "./hassio-router";
 import { SupervisorBaseElement } from "./supervisor-base-element";
@@ -14,8 +12,6 @@ import { SupervisorBaseElement } from "./supervisor-base-element";
 export class HassioMain extends SupervisorBaseElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public panel!: HassioPanelInfo;
 
   @property({ type: Boolean }) public narrow!: boolean;
@@ -74,6 +70,9 @@ export class HassioMain extends SupervisorBaseElement {
   }
 
   protected render() {
+    if (!this.supervisor || !this.hass) {
+      return html``;
+    }
     return html`
       <hassio-router
         .hass=${this.hass}

hassio/src/hassio-my-redirect.ts

@@ -1,133 +0,0 @@
-import {
-  customElement,
-  html,
-  internalProperty,
-  LitElement,
-  property,
-  TemplateResult,
-} from "lit-element";
-import { sanitizeUrl } from "@braintree/sanitize-url";
-import {
-  createSearchParam,
-  extractSearchParamsObject,
-} from "../../src/common/url/search-params";
-import "../../src/layouts/hass-error-screen";
-import {
-  ParamType,
-  Redirect,
-  Redirects,
-} from "../../src/panels/my/ha-panel-my";
-import { navigate } from "../../src/common/navigate";
-import { HomeAssistant, Route } from "../../src/types";
-import { Supervisor } from "../../src/data/supervisor/supervisor";
-
-const REDIRECTS: Redirects = {
-  supervisor_logs: {
-    redirect: "/hassio/system",
-  },
-  supervisor_info: {
-    redirect: "/hassio/system",
-  },
-  supervisor_snapshots: {
-    redirect: "/hassio/snapshots",
-  },
-  supervisor_store: {
-    redirect: "/hassio/store",
-  },
-  supervisor: {
-    redirect: "/hassio/dashboard",
-  },
-  supervisor_addon: {
-    redirect: "/hassio/addon",
-    params: {
-      addon: "string",
-    },
-  },
-};
-
-@customElement("hassio-my-redirect")
-class HassioMyRedirect extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
-  @property({ attribute: false }) public route!: Route;
-
-  @internalProperty() public _error?: TemplateResult | string;
-
-  connectedCallback() {
-    super.connectedCallback();
-    const path = this.route.path.substr(1);
-    const redirect = REDIRECTS[path];
-
-    if (!redirect) {
-      this._error = this.supervisor.localize(
-        "my.not_supported",
-        "link",
-        html`<a
-          target="_blank"
-          rel="noreferrer noopener"
-          href="https://my.home-assistant.io/faq.html#supported-pages"
-        >
-          ${this.supervisor.localize("my.faq_link")}
-        </a>`
-      );
-      return;
-    }
-
-    let url: string;
-    try {
-      url = this._createRedirectUrl(redirect);
-    } catch (err) {
-      this._error = this.supervisor.localize("my.error");
-      return;
-    }
-
-    navigate(this, url, true);
-  }
-
-  protected render(): TemplateResult {
-    if (this._error) {
-      return html`<hass-error-screen
-        .error=${this._error}
-      ></hass-error-screen>`;
-    }
-    return html``;
-  }
-
-  private _createRedirectUrl(redirect: Redirect): string {
-    const params = this._createRedirectParams(redirect);
-    return `${redirect.redirect}${params}`;
-  }
-
-  private _createRedirectParams(redirect: Redirect): string {
-    const params = extractSearchParamsObject();
-    if (!redirect.params && !Object.keys(params).length) {
-      return "";
-    }
-    const resultParams = {};
-    Object.entries(redirect.params || {}).forEach(([key, type]) => {
-      if (!params[key] || !this._checkParamType(type, params[key])) {
-        throw Error();
-      }
-      resultParams[key] = params[key];
-    });
-    return `?${createSearchParam(resultParams)}`;
-  }
-
-  private _checkParamType(type: ParamType, value: string) {
-    if (type === "string") {
-      return true;
-    }
-    if (type === "url") {
-      return value && value === sanitizeUrl(value);
-    }
-    return false;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "hassio-my-redirect": HassioMyRedirect;
-  }
-}

hassio/src/hassio-panel.ts

@@ -7,10 +7,7 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
-import {
-  Supervisor,
-  supervisorCollection,
-} from "../../src/data/supervisor/supervisor";
+import { Supervisor } from "../../src/data/supervisor/supervisor";
 import { HomeAssistant, Route } from "../../src/types";
 import "./hassio-panel-router";
 
@@ -25,17 +22,6 @@ class HassioPanel extends LitElement {
   @property({ attribute: false }) public route!: Route;
 
   protected render(): TemplateResult {
-    if (!this.hass) {
-      return html`<hass-loading-screen></hass-loading-screen>`;
-    }
-
-    if (
-      Object.keys(supervisorCollection).some(
-        (colllection) => !this.supervisor[colllection]
-      )
-    ) {
-      return html`<hass-loading-screen></hass-loading-screen>`;
-    }
     return html`
       <hassio-panel-router
         .hass=${this.hass}

hassio/src/hassio-router.ts

@@ -23,7 +23,7 @@ class HassioRouter extends HassRouterPage {
   protected routerOptions: RouterOptions = {
     // Hass.io has a page with tabs, so we route all non-matching routes to it.
     defaultPage: "dashboard",
-    initialLoad: () => this._redirectIngress(),
+    initialLoad: () => this._fetchData(),
     showLoading: true,
     routes: {
       dashboard: {
@@ -41,42 +41,32 @@ class HassioRouter extends HassRouterPage {
         tag: "hassio-ingress-view",
         load: () => import("./ingress-view/hassio-ingress-view"),
       },
-      _my_redirect: {
-        tag: "hassio-my-redirect",
-        load: () => import("./hassio-my-redirect"),
-      },
     },
   };
 
   protected updatePageEl(el) {
     // the tabs page does its own routing so needs full route.
-    const hassioPanel = el.nodeName === "HASSIO-PANEL";
-    const route = hassioPanel ? this.route : this.routeTail;
-
-    if (hassioPanel && this.panel.config?.ingress) {
-      this._redirectIngress();
-      return;
-    }
+    const route = el.nodeName === "HASSIO-PANEL" ? this.route : this.routeTail;
 
     el.hass = this.hass;
+    el.supervisor = this.supervisor;
     el.narrow = this.narrow;
     el.route = route;
 
     if (el.localName === "hassio-ingress-view") {
       el.ingressPanel = this.panel.config && this.panel.config.ingress;
-    } else {
-      el.supervisor = this.supervisor;
     }
   }
 
-  private async _redirectIngress() {
+  private async _fetchData() {
     if (this.panel.config && this.panel.config.ingress) {
-      this.route = {
-        prefix: "/hassio",
-        path: `/ingress/${this.panel.config.ingress}`,
-      };
+      this._redirectIngress(this.panel.config.ingress);
     }
   }
+
+  private _redirectIngress(addonSlug: string) {
+    this.route = { prefix: "/hassio", path: `/ingress/${addonSlug}` };
+  }
 }
 
 declare global {

hassio/src/hassio-tabs.ts

@@ -3,22 +3,22 @@ import type { PageNavigation } from "../../src/layouts/hass-tabs-subpage";
 
 export const supervisorTabs: PageNavigation[] = [
   {
-    translationKey: "panel.dashboard",
+    name: "Dashboard",
     path: `/hassio/dashboard`,
     iconPath: mdiViewDashboard,
   },
   {
-    translationKey: "panel.store",
+    name: "Add-on Store",
     path: `/hassio/store`,
     iconPath: mdiStore,
   },
   {
-    translationKey: "panel.snapshots",
+    name: "Snapshots",
     path: `/hassio/snapshots`,
     iconPath: mdiBackupRestore,
   },
   {
-    translationKey: "panel.system",
+    name: "System",
     path: `/hassio/system`,
     iconPath: mdiCogs,
   },

hassio/src/snapshots/hassio-snapshots.ts

@@ -41,7 +41,6 @@ import {
   reloadHassioSnapshots,
 } from "../../../src/data/hassio/snapshot";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
-import { showAlertDialog } from "../../../src/dialogs/generic/show-dialog-box";
 import "../../../src/layouts/hass-tabs-subpage";
 import { PolymerChangedEvent } from "../../../src/polymer-types";
 import { haStyle } from "../../../src/resources/styles";
@@ -55,8 +54,8 @@ import { hassioStyle } from "../resources/hassio-style";
 
 interface CheckboxItem {
   slug: string;
+  name: string;
   checked: boolean;
-  name?: string;
 }
 
 @customElement("hassio-snapshots")
@@ -84,12 +83,13 @@ class HassioSnapshots extends LitElement {
   @internalProperty() private _folderList: CheckboxItem[] = [
     {
       slug: "homeassistant",
+      name: "Home Assistant configuration",
       checked: true,
     },
-    { slug: "ssl", checked: true },
-    { slug: "share", checked: true },
-    { slug: "media", checked: true },
-    { slug: "addons/local", checked: true },
+    { slug: "ssl", name: "SSL", checked: true },
+    { slug: "share", name: "Share", checked: true },
+    { slug: "media", name: "Media", checked: true },
+    { slug: "addons/local", name: "Local add-ons", checked: true },
   ];
 
   @internalProperty() private _error = "";
@@ -103,16 +103,13 @@ class HassioSnapshots extends LitElement {
     return html`
       <hass-tabs-subpage
         .hass=${this.hass}
-        .localizeFunc=${this.supervisor.localize}
         .narrow=${this.narrow}
+        hassio
+        main-page
         .route=${this.route}
         .tabs=${supervisorTabs}
-        main-page
-        supervisor
       >
-        <span slot="header">
-          ${this.supervisor.localize("panel.snapshots")}
-        </span>
+        <span slot="header">Snapshots</span>
         <ha-button-menu
           corner="BOTTOM_START"
           slot="toolbar-icon"
@@ -122,50 +119,50 @@ class HassioSnapshots extends LitElement {
             <ha-svg-icon .path=${mdiDotsVertical}></ha-svg-icon>
           </mwc-icon-button>
           <mwc-list-item>
-            ${this.supervisor.localize("common.reload")}
+            Reload
           </mwc-list-item>
           ${atLeastVersion(this.hass.config.version, 0, 116)
             ? html`<mwc-list-item>
-                ${this.supervisor.localize("snapshot.upload_snapshot")}
+                Upload snapshot
               </mwc-list-item>`
             : ""}
         </ha-button-menu>
 
         <div class="content">
           <h1>
-            ${this.supervisor.localize("snapshot.create_snapshot")}
+            Create Snapshot
           </h1>
           <p class="description">
-            ${this.supervisor.localize("snapshot.description")}
+            Snapshots allow you to easily backup and restore all data of your
+            Home Assistant instance.
           </p>
           <div class="card-group">
             <ha-card>
               <div class="card-content">
                 <paper-input
                   autofocus
-                  .label=${this.supervisor.localize("snapshot.name")}
+                  label="Name"
                   name="snapshotName"
                   .value=${this._snapshotName}
                   @value-changed=${this._handleTextValueChanged}
                 ></paper-input>
-                ${this.supervisor.localize("snapshot.type")}:
+                Type:
                 <paper-radio-group
                   name="snapshotType"
-                  type="${this.supervisor.localize("snapshot.type")}"
                   .selected=${this._snapshotType}
                   @selected-changed=${this._handleRadioValueChanged}
                 >
                   <paper-radio-button name="full">
-                    ${this.supervisor.localize("snapshot.full_snapshot")}
+                    Full snapshot
                   </paper-radio-button>
                   <paper-radio-button name="partial">
-                    ${this.supervisor.localize("snapshot.partial_snapshot")}
+                    Partial snapshot
                   </paper-radio-button>
                 </paper-radio-group>
                 ${this._snapshotType === "full"
                   ? undefined
                   : html`
-                      ${this.supervisor.localize("snapshot.folders")}:
+                      Folders:
                       ${this._folderList.map(
                         (folder, idx) => html`
                           <paper-checkbox
@@ -173,13 +170,11 @@ class HassioSnapshots extends LitElement {
                             .checked=${folder.checked}
                             @checked-changed=${this._folderChecked}
                           >
-                            ${this.supervisor.localize(
-                              `snapshot.folder.${folder.slug}`
-                            )}
+                            ${folder.name}
                           </paper-checkbox>
                         `
                       )}
-                      ${this.supervisor.localize("snapshot.addons")}:
+                      Add-ons:
                       ${this._addonList.map(
                         (addon, idx) => html`
                           <paper-checkbox
@@ -192,18 +187,18 @@ class HassioSnapshots extends LitElement {
                         `
                       )}
                     `}
-                ${this.supervisor.localize("snapshot.security")}:
+                Security:
                 <paper-checkbox
                   name="snapshotHasPassword"
                   .checked=${this._snapshotHasPassword}
                   @checked-changed=${this._handleCheckboxValueChanged}
                 >
-                  ${this.supervisor.localize("snapshot.password_protection")}
+                  Password protection
                 </paper-checkbox>
                 ${this._snapshotHasPassword
                   ? html`
                       <paper-input
-                        .label=${this.supervisor.localize("snapshot.password")}
+                        label="Password"
                         type="password"
                         name="snapshotPassword"
                         .value=${this._snapshotPassword}
@@ -216,24 +211,14 @@ class HassioSnapshots extends LitElement {
                   : undefined}
               </div>
               <div class="card-actions">
-                <ha-progress-button
-                  @click=${this._createSnapshot}
-                  .title=${this.supervisor.info.state !== "running"
-                    ? this.supervisor.localize(
-                        "snapshot.create_blocked_not_running",
-                        "state",
-                        this.supervisor.info.state
-                      )
-                    : ""}
-                  .disabled=${this.supervisor.info.state !== "running"}
-                >
-                  ${this.supervisor.localize("snapshot.create")}
+                <ha-progress-button @click=${this._createSnapshot}>
+                  Create
                 </ha-progress-button>
               </div>
             </ha-card>
           </div>
 
-          <h1>${this.supervisor.localize("snapshot.available_snapshots")}</h1>
+          <h1>Available Snapshots</h1>
           <div class="card-group">
             ${this._snapshots === undefined
               ? undefined
@@ -241,7 +226,7 @@ class HassioSnapshots extends LitElement {
               ? html`
                   <ha-card>
                     <div class="card-content">
-                      ${this.supervisor.localize("snapshot.no_snapshots")}
+                      You don't have any snapshots yet.
                     </div>
                   </ha-card>
                 `
@@ -340,22 +325,12 @@ class HassioSnapshots extends LitElement {
   }
 
   private async _createSnapshot(ev: CustomEvent): Promise<void> {
-    if (this.supervisor.info.state !== "running") {
-      await showAlertDialog(this, {
-        title: this.supervisor.localize("snapshot.could_not_create"),
-        text: this.supervisor.localize(
-          "snapshot.create_blocked_not_running",
-          "state",
-          this.supervisor.info.state
-        ),
-      });
-    }
     const button = ev.currentTarget as any;
     button.progress = true;
 
     this._error = "";
     if (this._snapshotHasPassword && !this._snapshotPassword.length) {
-      this._error = this.supervisor.localize("snapshot.enter_password");
+      this._error = "Please enter a password.";
       button.progress = false;
       return;
     }
@@ -404,16 +379,13 @@ class HassioSnapshots extends LitElement {
 
   private _computeDetails(snapshot: HassioSnapshot) {
     const type =
-      snapshot.type === "full"
-        ? this.supervisor.localize("snapshot.full_snapshot")
-        : this.supervisor.localize("snapshot.partial_snapshot");
+      snapshot.type === "full" ? "Full snapshot" : "Partial snapshot";
     return snapshot.protected ? `${type}, password protected` : type;
   }
 
   private _snapshotClicked(ev) {
     showHassioSnapshotDialog(this, {
       slug: ev.currentTarget!.snapshot.slug,
-      supervisor: this.supervisor,
       onDelete: () => this._updateSnapshots(),
     });
   }
@@ -423,7 +395,6 @@ class HassioSnapshots extends LitElement {
       showSnapshot: (slug: string) =>
         showHassioSnapshotDialog(this, {
           slug,
-          supervisor: this.supervisor,
           onDelete: () => this._updateSnapshots(),
         }),
       reloadSnapshot: () => this.refreshData(),

hassio/src/supervisor-base-element.ts

@@ -1,14 +1,4 @@
-import { Collection, UnsubscribeFunc } from "home-assistant-js-websocket";
-import {
-  internalProperty,
-  LitElement,
-  property,
-  PropertyValues,
-} from "lit-element";
-import { atLeastVersion } from "../../src/common/config/version";
-import { computeLocalize } from "../../src/common/translations/localize";
-import { fetchHassioAddonsInfo } from "../../src/data/hassio/addon";
-import { HassioResponse } from "../../src/data/hassio/common";
+import { LitElement, property, PropertyValues } from "lit-element";
 import {
   fetchHassioHassOsInfo,
   fetchHassioHostInfo,
@@ -20,186 +10,60 @@ import {
   fetchHassioInfo,
   fetchHassioSupervisorInfo,
 } from "../../src/data/hassio/supervisor";
-import { fetchSupervisorStore } from "../../src/data/supervisor/store";
-import {
-  getSupervisorEventCollection,
-  subscribeSupervisorEvents,
-  Supervisor,
-  SupervisorObject,
-  supervisorCollection,
-} from "../../src/data/supervisor/supervisor";
+import { Supervisor } from "../../src/data/supervisor/supervisor";
 import { ProvideHassLitMixin } from "../../src/mixins/provide-hass-lit-mixin";
 import { urlSyncMixin } from "../../src/state/url-sync-mixin";
-import { getTranslation } from "../../src/util/common-translation";
 
 declare global {
   interface HASSDomEvents {
     "supervisor-update": Partial<Supervisor>;
-    "supervisor-colllection-refresh": { colllection: SupervisorObject };
   }
 }
 
 export class SupervisorBaseElement extends urlSyncMixin(
   ProvideHassLitMixin(LitElement)
 ) {
-  @property({ attribute: false }) public supervisor: Partial<Supervisor> = {
-    localize: () => "",
-  };
-
-  @internalProperty() private _unsubs: Record<string, UnsubscribeFunc> = {};
-
-  @internalProperty() private _collections: Record<
-    string,
-    Collection<unknown>
-  > = {};
-
-  @internalProperty() private _resources?: Record<string, any>;
-
-  @internalProperty() private _language = "en";
-
-  public connectedCallback(): void {
-    super.connectedCallback();
-    this._initializeLocalize();
-  }
-
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    Object.keys(this._unsubs).forEach((unsub) => {
-      this._unsubs[unsub]();
-    });
-  }
-
-  protected updated(changedProperties: PropertyValues) {
-    super.updated(changedProperties);
-
-    if (changedProperties.has("_language")) {
-      if (changedProperties.get("_language") !== this._language) {
-        this._initializeLocalize();
-      }
-    }
-  }
+  @property({ attribute: false }) public supervisor?: Supervisor;
 
   protected _updateSupervisor(obj: Partial<Supervisor>): void {
-    this.supervisor = { ...this.supervisor, ...obj };
+    this.supervisor = { ...this.supervisor!, ...obj };
   }
 
   protected firstUpdated(changedProps: PropertyValues): void {
     super.firstUpdated(changedProps);
-    if (this._language !== this.hass.language) {
-      this._language = this.hass.language;
-    }
-    this._initializeLocalize();
     this._initSupervisor();
-  }
-
-  private async _initializeLocalize() {
-    const { language, data } = await getTranslation(
-      null,
-      this._language,
-      "/api/hassio/app/static/translations"
+    this.addEventListener("supervisor-update", (ev) =>
+      this._updateSupervisor(ev.detail)
     );
-
-    this._resources = {
-      [language]: data,
-    };
-
-    this.supervisor = {
-      ...this.supervisor,
-      localize: await computeLocalize(
-        this.constructor.prototype,
-        this._language,
-        this._resources
-      ),
-    };
-  }
-
-  private async _handleSupervisorStoreRefreshEvent(ev) {
-    const colllection = ev.detail.colllection;
-    if (atLeastVersion(this.hass.config.version, 2021, 2, 4)) {
-      this._collections[colllection].refresh();
-      return;
-    }
-
-    const response = await this.hass.callApi<HassioResponse<any>>(
-      "GET",
-      `hassio${supervisorCollection[colllection]}`
-    );
-    this._updateSupervisor({ [colllection]: response.data });
   }
 
   private async _initSupervisor(): Promise<void> {
-    this.addEventListener(
-      "supervisor-colllection-refresh",
-      this._handleSupervisorStoreRefreshEvent
-    );
+    const [
+      supervisor,
+      host,
+      core,
+      info,
+      os,
+      network,
+      resolution,
+    ] = await Promise.all([
+      fetchHassioSupervisorInfo(this.hass),
+      fetchHassioHostInfo(this.hass),
+      fetchHassioHomeAssistantInfo(this.hass),
+      fetchHassioInfo(this.hass),
+      fetchHassioHassOsInfo(this.hass),
+      fetchNetworkInfo(this.hass),
+      fetchHassioResolution(this.hass),
+    ]);
 
-    if (atLeastVersion(this.hass.config.version, 2021, 2, 4)) {
-      Object.keys(supervisorCollection).forEach((colllection) => {
-        this._unsubs[colllection] = subscribeSupervisorEvents(
-          this.hass,
-          (data) => this._updateSupervisor({ [colllection]: data }),
-          colllection,
-          supervisorCollection[colllection]
-        );
-        if (this._collections[colllection]) {
-          this._collections[colllection].refresh();
-        } else {
-          this._collections[colllection] = getSupervisorEventCollection(
-            this.hass.connection,
-            colllection,
-            supervisorCollection[colllection]
-          );
-        }
-      });
-
-      Object.keys(this._collections).forEach((collection) => {
-        if (
-          this.supervisor === undefined ||
-          this.supervisor[collection] === undefined
-        ) {
-          this._updateSupervisor({
-            [collection]: this._collections[collection].state,
-          });
-        }
-      });
-    } else {
-      const [
-        addon,
-        supervisor,
-        host,
-        core,
-        info,
-        os,
-        network,
-        resolution,
-        store,
-      ] = await Promise.all([
-        fetchHassioAddonsInfo(this.hass),
-        fetchHassioSupervisorInfo(this.hass),
-        fetchHassioHostInfo(this.hass),
-        fetchHassioHomeAssistantInfo(this.hass),
-        fetchHassioInfo(this.hass),
-        fetchHassioHassOsInfo(this.hass),
-        fetchNetworkInfo(this.hass),
-        fetchHassioResolution(this.hass),
-        fetchSupervisorStore(this.hass),
-      ]);
-
-      this._updateSupervisor({
-        addon,
-        supervisor,
-        host,
-        core,
-        info,
-        os,
-        network,
-        resolution,
-        store,
-      });
-
-      this.addEventListener("supervisor-update", (ev) =>
-        this._updateSupervisor(ev.detail)
-      );
-    }
+    this.supervisor = {
+      supervisor,
+      host,
+      core,
+      info,
+      os,
+      network,
+      resolution,
+    };
   }
 }

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

@@ -10,7 +10,6 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
-import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/buttons/ha-progress-button";
 import "../../../src/components/ha-button-menu";
 import "../../../src/components/ha-card";
@@ -30,7 +29,6 @@ import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
 import { bytesToString } from "../../../src/util/bytes-to-string";
 import "../components/supervisor-metric";
-import { showDialogSupervisorUpdate } from "../dialogs/update/show-dialog-update";
 import { hassioStyle } from "../resources/hassio-style";
 
 @customElement("hassio-core-info")
@@ -44,11 +42,11 @@ class HassioCoreInfo extends LitElement {
   protected render(): TemplateResult | void {
     const metrics = [
       {
-        description: this.supervisor.localize("system.core.cpu_usage"),
+        description: "Core CPU Usage",
         value: this._metrics?.cpu_percent,
       },
       {
-        description: this.supervisor.localize("system.core.ram_usage"),
+        description: "Core RAM Usage",
         value: this._metrics?.memory_percent,
         tooltip: `${bytesToString(this._metrics?.memory_usage)}/${bytesToString(
           this._metrics?.memory_limit
@@ -62,7 +60,7 @@ class HassioCoreInfo extends LitElement {
           <div>
             <ha-settings-row>
               <span slot="heading">
-                ${this.supervisor.localize("common.version")}
+                Version
               </span>
               <span slot="description">
                 core-${this.supervisor.core.version}
@@ -70,7 +68,7 @@ class HassioCoreInfo extends LitElement {
             </ha-settings-row>
             <ha-settings-row>
               <span slot="heading">
-                ${this.supervisor.localize("common.newest_version")}
+                Newest Version
               </span>
               <span slot="description">
                 core-${this.supervisor.core.version_latest}
@@ -78,10 +76,10 @@ class HassioCoreInfo extends LitElement {
               ${this.supervisor.core.update_available
                 ? html`
                     <ha-progress-button
-                      .title=${this.supervisor.localize("common.update")}
+                      title="Update the core"
                       @click=${this._coreUpdate}
                     >
-                      ${this.supervisor.localize("common.update")}
+                      Update
                     </ha-progress-button>
                   `
                 : ""}
@@ -105,13 +103,9 @@ class HassioCoreInfo extends LitElement {
             slot="primaryAction"
             class="warning"
             @click=${this._coreRestart}
-            .title=${this.supervisor.localize(
-              "common.restart_name",
-              "name",
-              "Core"
-            )}
+            title="Restart Home Assistant Core"
           >
-            ${this.supervisor.localize("common.restart_name", "name", "Core")}
+            Restart Core
           </ha-progress-button>
         </div>
       </ha-card>
@@ -131,18 +125,10 @@ class HassioCoreInfo extends LitElement {
     button.progress = true;
 
     const confirmed = await showConfirmationDialog(this, {
-      title: this.supervisor.localize(
-        "confirm.restart.title",
-        "name",
-        "Home Assistant Core"
-      ),
-      text: this.supervisor.localize(
-        "confirm.restart.text",
-        "name",
-        "Home Assistant Core"
-      ),
-      confirmText: this.supervisor.localize("common.restart"),
-      dismissText: this.supervisor.localize("common.cancel"),
+      title: "Restart Home Assistant Core",
+      text: "Are you sure you want to restart Home Assistant Core",
+      confirmText: "restart",
+      dismissText: "cancel",
     });
 
     if (!confirmed) {
@@ -153,40 +139,41 @@ class HassioCoreInfo extends LitElement {
     try {
       await restartCore(this.hass);
     } catch (err) {
-      if (this.hass.connection.connected) {
-        showAlertDialog(this, {
-          title: this.supervisor.localize(
-            "common.failed_to_restart_name",
-            "name",
-            "Home AssistantCore"
-          ),
-          text: extractApiErrorMessage(err),
-        });
-      }
+      showAlertDialog(this, {
+        title: "Failed to restart Home Assistant Core",
+        text: extractApiErrorMessage(err),
+      });
     } finally {
       button.progress = false;
     }
   }
 
-  private async _coreUpdate(): Promise<void> {
-    showDialogSupervisorUpdate(this, {
-      supervisor: this.supervisor,
-      name: "Home Assistant Core",
-      version: this.supervisor.core.version,
-      snapshotParams: {
-        name: `core_${this.supervisor.core.version}`,
-        folders: ["homeassistant"],
-        homeassistant: true,
-      },
-      updateHandler: async () => await this._updateCore(),
-    });
-  }
+  private async _coreUpdate(ev: CustomEvent): Promise<void> {
+    const button = ev.currentTarget as any;
+    button.progress = true;
 
-  private async _updateCore(): Promise<void> {
-    await updateCore(this.hass);
-    fireEvent(this, "supervisor-colllection-refresh", {
-      colllection: "core",
+    const confirmed = await showConfirmationDialog(this, {
+      title: "Update Home Assistant Core",
+      text: `Are you sure you want to update Home Assistant Core to version ${this.supervisor.core.version_latest}?`,
+      confirmText: "update",
+      dismissText: "cancel",
     });
+
+    if (!confirmed) {
+      button.progress = false;
+      return;
+    }
+
+    try {
+      await updateCore(this.hass);
+    } catch (err) {
+      showAlertDialog(this, {
+        title: "Failed to update Home Assistant Core",
+        text: extractApiErrorMessage(err),
+      });
+    } finally {
+      button.progress = false;
+    }
   }
 
   static get styles(): CSSResult[] {

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

@@ -13,7 +13,6 @@ import {
   TemplateResult,
 } from "lit-element";
 import memoizeOne from "memoize-one";
-import { atLeastVersion } from "../../../src/common/config/version";
 import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/buttons/ha-progress-button";
 import "../../../src/components/ha-button-menu";
@@ -27,6 +26,7 @@ import { fetchHassioHardwareInfo } from "../../../src/data/hassio/hardware";
 import {
   changeHostOptions,
   configSyncOS,
+  fetchHassioHostInfo,
   rebootHost,
   shutdownHost,
   updateOS,
@@ -65,7 +65,7 @@ class HassioHostInfo extends LitElement {
 
     const metrics = [
       {
-        description: this.supervisor.localize("system.host.used_space"),
+        description: "Used Space",
         value: this._getUsedSpace(
           this.supervisor.host.disk_used,
           this.supervisor.host.disk_total
@@ -80,13 +80,14 @@ class HassioHostInfo extends LitElement {
             ${this.supervisor.host.features.includes("hostname")
               ? html`<ha-settings-row>
                   <span slot="heading">
-                    ${this.supervisor.localize("system.host.hostname")}
+                    Hostname
                   </span>
                   <span slot="description">
                     ${this.supervisor.host.hostname}
                   </span>
                   <mwc-button
-                    .label=${this.supervisor.localize("system.host.change")}
+                    title="Change the hostname"
+                    label="Change"
                     @click=${this._changeHostnameClicked}
                   >
                   </mwc-button>
@@ -95,13 +96,14 @@ class HassioHostInfo extends LitElement {
             ${this.supervisor.host.features.includes("network")
               ? html` <ha-settings-row>
                   <span slot="heading">
-                    ${this.supervisor.localize("system.host.ip_address")}
+                    IP Address
                   </span>
                   <span slot="description">
                     ${primaryIpAddress}
                   </span>
                   <mwc-button
-                    .label=${this.supervisor.localize("system.host.change")}
+                    title="Change the network"
+                    label="Change"
                     @click=${this._changeNetworkClicked}
                   >
                   </mwc-button>
@@ -110,15 +112,18 @@ class HassioHostInfo extends LitElement {
 
             <ha-settings-row>
               <span slot="heading">
-                ${this.supervisor.localize("system.host.operating_system")}
+                Operating System
               </span>
               <span slot="description">
                 ${this.supervisor.host.operating_system}
               </span>
               ${this.supervisor.os.update_available
                 ? html`
-                    <ha-progress-button @click=${this._osUpdate}>
-                      ${this.supervisor.localize("commmon.update")}
+                    <ha-progress-button
+                      title="Update the host OS"
+                      @click=${this._osUpdate}
+                    >
+                      Update
                     </ha-progress-button>
                   `
                 : ""}
@@ -126,7 +131,7 @@ class HassioHostInfo extends LitElement {
             ${!this.supervisor.host.features.includes("hassos")
               ? html`<ha-settings-row>
                   <span slot="heading">
-                    ${this.supervisor.localize("system.host.docker_version")}
+                    Docker version
                   </span>
                   <span slot="description">
                     ${this.supervisor.info.docker}
@@ -136,7 +141,7 @@ class HassioHostInfo extends LitElement {
             ${this.supervisor.host.deployment
               ? html`<ha-settings-row>
                   <span slot="heading">
-                    ${this.supervisor.localize("system.host.deployment")}
+                    Deployment
                   </span>
                   <span slot="description">
                     ${this.supervisor.host.deployment}
@@ -145,20 +150,6 @@ class HassioHostInfo extends LitElement {
               : ""}
           </div>
           <div>
-            ${this.supervisor.host.disk_life_time !== "" &&
-            this.supervisor.host.disk_life_time >= 10
-              ? html` <ha-settings-row>
-                  <span slot="heading">
-                    ${this.supervisor.localize(
-                      "system.host.emmc_lifetime_used"
-                    )}
-                  </span>
-                  <span slot="description">
-                    ${this.supervisor.host.disk_life_time - 10}% -
-                    ${this.supervisor.host.disk_life_time}%
-                  </span>
-                </ha-settings-row>`
-              : ""}
             ${metrics.map(
               (metric) =>
                 html`
@@ -174,18 +165,23 @@ class HassioHostInfo extends LitElement {
         <div class="card-actions">
           ${this.supervisor.host.features.includes("reboot")
             ? html`
-                <ha-progress-button class="warning" @click=${this._hostReboot}>
-                  ${this.supervisor.localize("system.host.reboot_host")}
+                <ha-progress-button
+                  title="Reboot the host OS"
+                  class="warning"
+                  @click=${this._hostReboot}
+                >
+                  Reboot Host
                 </ha-progress-button>
               `
             : ""}
           ${this.supervisor.host.features.includes("shutdown")
             ? html`
                 <ha-progress-button
+                  title="Shutdown the host OS"
                   class="warning"
                   @click=${this._hostShutdown}
                 >
-                  ${this.supervisor.localize("system.host.shutdown_host")}
+                  Shutdown Host
                 </ha-progress-button>
               `
             : ""}
@@ -197,12 +193,14 @@ class HassioHostInfo extends LitElement {
             <mwc-icon-button slot="trigger">
               <ha-svg-icon .path=${mdiDotsVertical}></ha-svg-icon>
             </mwc-icon-button>
-            <mwc-list-item>
-              ${this.supervisor.localize("system.host.hardware")}
+            <mwc-list-item title="Show a list of hardware">
+              Hardware
             </mwc-list-item>
             ${this.supervisor.host.features.includes("hassos")
-              ? html`<mwc-list-item>
-                  ${this.supervisor.localize("system.host.import_from_usb")}
+              ? html`<mwc-list-item
+                  title="Load HassOS configs or updates from USB"
+                >
+                  Import from USB
                 </mwc-list-item>`
               : ""}
           </ha-button-menu>
@@ -241,14 +239,12 @@ class HassioHostInfo extends LitElement {
     try {
       const content = await fetchHassioHardwareInfo(this.hass);
       showHassioMarkdownDialog(this, {
-        title: this.supervisor.localize("system.host.hardware"),
+        title: "Hardware",
         content: `<pre>${safeDump(content, { indent: 2 })}</pre>`,
       });
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize(
-          "system.host.failed_to_get_hardware_list"
-        ),
+        title: "Failed to get hardware list",
         text: extractApiErrorMessage(err),
       });
     }
@@ -259,10 +255,10 @@ class HassioHostInfo extends LitElement {
     button.progress = true;
 
     const confirmed = await showConfirmationDialog(this, {
-      title: this.supervisor.localize("system.host.reboot_host"),
-      text: this.supervisor.localize("system.host.confirm_reboot"),
-      confirmText: this.supervisor.localize("system.host.reboot_host"),
-      dismissText: this.supervisor.localize("common.cancel"),
+      title: "Reboot",
+      text: "Are you sure you want to reboot the host?",
+      confirmText: "reboot host",
+      dismissText: "no",
     });
 
     if (!confirmed) {
@@ -276,7 +272,7 @@ class HassioHostInfo extends LitElement {
       // Ignore connection errors, these are all expected
       if (err.status_code && !ignoredStatusCodes.has(err.status_code)) {
         showAlertDialog(this, {
-          title: this.supervisor.localize("system.host.failed_to_reboot"),
+          title: "Failed to reboot",
           text: extractApiErrorMessage(err),
         });
       }
@@ -289,10 +285,10 @@ class HassioHostInfo extends LitElement {
     button.progress = true;
 
     const confirmed = await showConfirmationDialog(this, {
-      title: this.supervisor.localize("system.host.shutdown_host"),
-      text: this.supervisor.localize("system.host.confirm_shutdown"),
-      confirmText: this.supervisor.localize("system.host.shutdown_host"),
-      dismissText: this.supervisor.localize("common.cancel"),
+      title: "Shutdown",
+      text: "Are you sure you want to shutdown the host?",
+      confirmText: "shutdown host",
+      dismissText: "no",
     });
 
     if (!confirmed) {
@@ -306,7 +302,7 @@ class HassioHostInfo extends LitElement {
       // Ignore connection errors, these are all expected
       if (err.status_code && !ignoredStatusCodes.has(err.status_code)) {
         showAlertDialog(this, {
-          title: this.supervisor.localize("system.host.failed_to_shutdown"),
+          title: "Failed to shutdown",
           text: extractApiErrorMessage(err),
         });
       }
@@ -319,19 +315,9 @@ class HassioHostInfo extends LitElement {
     button.progress = true;
 
     const confirmed = await showConfirmationDialog(this, {
-      title: this.supervisor.localize(
-        "confirm.update.title",
-        "name",
-        "Home Assistant Operating System"
-      ),
-      text: this.supervisor.localize(
-        "confirm.update.text",
-        "name",
-        "Home Assistant Operating System",
-        "version",
-        this.supervisor.os.version_latest
-      ),
-      confirmText: this.supervisor.localize("common.update"),
+      title: "Update",
+      text: "Are you sure you want to update the OS?",
+      confirmText: "update os",
       dismissText: "no",
     });
 
@@ -342,25 +328,18 @@ class HassioHostInfo extends LitElement {
 
     try {
       await updateOS(this.hass);
-      fireEvent(this, "supervisor-colllection-refresh", { colllection: "os" });
     } catch (err) {
-      if (this.hass.connection.connected) {
-        showAlertDialog(this, {
-          title: this.supervisor.localize(
-            "common.failed_to_update_name",
-            "name",
-            "Home Assistant Operating System"
-          ),
-          text: extractApiErrorMessage(err),
-        });
-      }
+      showAlertDialog(this, {
+        title: "Failed to update",
+        text: extractApiErrorMessage(err),
+      });
     }
     button.progress = false;
   }
 
   private async _changeNetworkClicked(): Promise<void> {
     showNetworkDialog(this, {
-      supervisor: this.supervisor,
+      network: this.supervisor.network!,
       loadData: () => this._loadData(),
     });
   }
@@ -368,22 +347,20 @@ class HassioHostInfo extends LitElement {
   private async _changeHostnameClicked(): Promise<void> {
     const curHostname: string = this.supervisor.host.hostname;
     const hostname = await showPromptDialog(this, {
-      title: this.supervisor.localize("system.host.change_hostname"),
-      inputLabel: this.supervisor.localize("system.host.new_hostname"),
+      title: "Change Hostname",
+      inputLabel: "Please enter a new hostname:",
       inputType: "string",
       defaultValue: curHostname,
-      confirmText: this.supervisor.localize("common.update"),
     });
 
     if (hostname && hostname !== curHostname) {
       try {
         await changeHostOptions(this.hass, { hostname });
-        fireEvent(this, "supervisor-colllection-refresh", {
-          colllection: "host",
-        });
+        const host = await fetchHassioHostInfo(this.hass);
+        fireEvent(this, "supervisor-update", { host });
       } catch (err) {
         showAlertDialog(this, {
-          title: this.supervisor.localize("system.host.failed_to_set_hostname"),
+          title: "Setting hostname failed",
           text: extractApiErrorMessage(err),
         });
       }
@@ -393,28 +370,19 @@ class HassioHostInfo extends LitElement {
   private async _importFromUSB(): Promise<void> {
     try {
       await configSyncOS(this.hass);
-      fireEvent(this, "supervisor-colllection-refresh", {
-        colllection: "host",
-      });
+      const host = await fetchHassioHostInfo(this.hass);
+      fireEvent(this, "supervisor-update", { host });
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize(
-          "system.host.failed_to_import_from_usb"
-        ),
+        title: "Failed to import from USB",
         text: extractApiErrorMessage(err),
       });
     }
   }
 
   private async _loadData(): Promise<void> {
-    if (atLeastVersion(this.hass.config.version, 2021, 2, 4)) {
-      fireEvent(this, "supervisor-colllection-refresh", {
-        colllection: "network",
-      });
-    } else {
-      const network = await fetchNetworkInfo(this.hass);
-      fireEvent(this, "supervisor-update", { network });
-    }
+    const network = await fetchNetworkInfo(this.hass);
+    fireEvent(this, "supervisor-update", { network });
   }
 
   static get styles(): CSSResult[] {

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

@@ -19,6 +19,7 @@ import {
   HassioStats,
 } from "../../../src/data/hassio/common";
 import {
+  fetchHassioSupervisorInfo,
   reloadSupervisor,
   restartSupervisor,
   setSupervisorOption,
@@ -37,24 +38,54 @@ import { documentationUrl } from "../../../src/util/documentation-url";
 import "../components/supervisor-metric";
 import { hassioStyle } from "../resources/hassio-style";
 
-const UNSUPPORTED_REASON_URL = {
-  container: "/more-info/unsupported/container",
-  dbus: "/more-info/unsupported/dbus",
-  docker_configuration: "/more-info/unsupported/docker_configuration",
-  docker_version: "/more-info/unsupported/docker_version",
-  job_conditions: "/more-info/unsupported/job_conditions",
-  lxc: "/more-info/unsupported/lxc",
-  network_manager: "/more-info/unsupported/network_manager",
-  os: "/more-info/unsupported/os",
-  privileged: "/more-info/unsupported/privileged",
-  systemd: "/more-info/unsupported/systemd",
+const UNSUPPORTED_REASON = {
+  container: {
+    title: "Containers known to cause issues",
+    url: "/more-info/unsupported/container",
+  },
+  dbus: { title: "DBUS", url: "/more-info/unsupported/dbus" },
+  docker_configuration: {
+    title: "Docker Configuration",
+    url: "/more-info/unsupported/docker_configuration",
+  },
+  docker_version: {
+    title: "Docker Version",
+    url: "/more-info/unsupported/docker_version",
+  },
+  job_conditions: {
+    title: "Ignored job conditions",
+    url: "/more-info/unsupported/job_conditions",
+  },
+  lxc: { title: "LXC", url: "/more-info/unsupported/lxc" },
+  network_manager: {
+    title: "Network Manager",
+    url: "/more-info/unsupported/network_manager",
+  },
+  os: { title: "Operating System", url: "/more-info/unsupported/os" },
+  privileged: {
+    title: "Supervisor is not privileged",
+    url: "/more-info/unsupported/privileged",
+  },
+  systemd: { title: "Systemd", url: "/more-info/unsupported/systemd" },
 };
 
-const UNHEALTHY_REASON_URL = {
-  privileged: "/more-info/unsupported/privileged",
-  supervisor: "/more-info/unhealthy/supervisor",
-  setup: "/more-info/unhealthy/setup",
-  docker: "/more-info/unhealthy/docker",
+const UNHEALTHY_REASON = {
+  privileged: {
+    title: "Supervisor is not privileged",
+    url: "/more-info/unsupported/privileged",
+  },
+  supervisor: {
+    title: "Supervisor was not able to update",
+    url: "/more-info/unhealthy/supervisor",
+  },
+  setup: {
+    title: "Setup of the Supervisor failed",
+    url: "/more-info/unhealthy/setup",
+  },
+  docker: {
+    title: "The Docker environment is not working properly",
+    url: "/more-info/unhealthy/docker",
+  },
 };
 
 @customElement("hassio-supervisor-info")
@@ -68,11 +99,11 @@ class HassioSupervisorInfo extends LitElement {
   protected render(): TemplateResult | void {
     const metrics = [
       {
-        description: this.supervisor.localize("system.supervisor.cpu_usage"),
+        description: "Supervisor CPU Usage",
         value: this._metrics?.cpu_percent,
       },
       {
-        description: this.supervisor.localize("system.supervisor.ram_usage"),
+        description: "Supervisor RAM Usage",
         value: this._metrics?.memory_percent,
         tooltip: `${bytesToString(this._metrics?.memory_usage)}/${bytesToString(
           this._metrics?.memory_limit
@@ -85,7 +116,7 @@ class HassioSupervisorInfo extends LitElement {
           <div>
             <ha-settings-row>
               <span slot="heading">
-                ${this.supervisor.localize("common.version")}
+                Version
               </span>
               <span slot="description">
                 supervisor-${this.supervisor.supervisor.version}
@@ -93,7 +124,7 @@ class HassioSupervisorInfo extends LitElement {
             </ha-settings-row>
             <ha-settings-row>
               <span slot="heading">
-                ${this.supervisor.localize("common.newest_version")}
+                Newest Version
               </span>
               <span slot="description">
                 supervisor-${this.supervisor.supervisor.version_latest}
@@ -101,19 +132,17 @@ class HassioSupervisorInfo extends LitElement {
               ${this.supervisor.supervisor.update_available
                 ? html`
                     <ha-progress-button
-                      .title=${this.supervisor.localize(
-                        "system.supervisor.update_supervisor"
-                      )}
+                      title="Update the supervisor"
                       @click=${this._supervisorUpdate}
                     >
-                      ${this.supervisor.localize("common.update")}
+                      Update
                     </ha-progress-button>
                   `
                 : ""}
             </ha-settings-row>
             <ha-settings-row>
               <span slot="heading">
-                ${this.supervisor.localize("system.supervisor.channel")}
+                Channel
               </span>
               <span slot="description">
                 ${this.supervisor.supervisor.channel}
@@ -122,26 +151,18 @@ class HassioSupervisorInfo extends LitElement {
                 ? html`
                     <ha-progress-button
                       @click=${this._toggleBeta}
-                      .title=${this.supervisor.localize(
-                        "system.supervisor.leave_beta_description"
-                      )}
+                      title="Get stable updates for Home Assistant, supervisor and host"
                     >
-                      ${this.supervisor.localize(
-                        "system.supervisor.leave_beta_action"
-                      )}
+                      Leave beta channel
                     </ha-progress-button>
                   `
                 : this.supervisor.supervisor.channel === "stable"
                 ? html`
                     <ha-progress-button
                       @click=${this._toggleBeta}
-                      .title=${this.supervisor.localize(
-                        "system.supervisor.join_beta_description"
-                      )}
+                      title="Get beta updates for Home Assistant (RCs), supervisor and host"
                     >
-                      ${this.supervisor.localize(
-                        "system.supervisor.join_beta_action"
-                      )}
+                      Join beta channel
                     </ha-progress-button>
                   `
                 : ""}
@@ -150,20 +171,16 @@ class HassioSupervisorInfo extends LitElement {
             ${this.supervisor.supervisor.supported
               ? html` <ha-settings-row three-line>
                   <span slot="heading">
-                    ${this.supervisor.localize(
-                      "system.supervisor.share_diagnostics"
-                    )}
+                    Share Diagnostics
                   </span>
                   <div slot="description" class="diagnostics-description">
-                    ${this.supervisor.localize(
-                      "system.supervisor.share_diagnostics_description"
-                    )}
+                    Share crash reports and diagnostic information.
                     <button
                       class="link"
-                      .title=${this.supervisor.localize("common.show_more")}
+                      title="Show more information about this"
                       @click=${this._diagnosticsInformationDialog}
                     >
-                      ${this.supervisor.localize("common.learn_more")}
+                      Learn more
                     </button>
                   </div>
                   <ha-switch
@@ -173,12 +190,10 @@ class HassioSupervisorInfo extends LitElement {
                   ></ha-switch>
                 </ha-settings-row>`
               : html`<div class="error">
-                  ${this.supervisor.localize(
-                    "system.supervisor.unsupported_title"
-                  )}
+                  You are running an unsupported installation.
                   <button
                     class="link"
-                    .title=${this.supervisor.localize("common.learn_more")}
+                    title="Learn more about how you can make your system compliant"
                     @click=${this._unsupportedDialog}
                   >
                     Learn more
@@ -186,12 +201,10 @@ class HassioSupervisorInfo extends LitElement {
                 </div>`}
             ${!this.supervisor.supervisor.healthy
               ? html`<div class="error">
-                  ${this.supervisor.localize(
-                    "system.supervisor.unhealthy_title"
-                  )}
+                  Your installation is running in an unhealthy state.
                   <button
                     class="link"
-                    .title=${this.supervisor.localize("common.learn_more")}
+                    title="Learn more about why your system is marked as unhealthy"
                     @click=${this._unhealthyDialog}
                   >
                     Learn more
@@ -215,26 +228,16 @@ class HassioSupervisorInfo extends LitElement {
         <div class="card-actions">
           <ha-progress-button
             @click=${this._supervisorReload}
-            .title=${this.supervisor.localize(
-              "system.supervisor.reload_supervisor"
-            )}
+            title="Reload parts of the Supervisor"
           >
-            ${this.supervisor.localize("system.supervisor.reload_supervisor")}
+            Reload Supervisor
           </ha-progress-button>
           <ha-progress-button
             class="warning"
             @click=${this._supervisorRestart}
-            .title=${this.supervisor.localize(
-              "common.restart_name",
-              "name",
-              "Supervisor"
-            )}
+            title="Restart the Supervisor"
           >
-            ${this.supervisor.localize(
-              "common.restart_name",
-              "name",
-              "Supervisor"
-            )}
+            Restart Supervisor
           </ha-progress-button>
         </div>
       </ha-card>
@@ -255,23 +258,23 @@ class HassioSupervisorInfo extends LitElement {
 
     if (this.supervisor.supervisor.channel === "stable") {
       const confirmed = await showConfirmationDialog(this, {
-        title: this.supervisor.localize("system.supervisor.warning"),
-        text: html`${this.supervisor.localize("system.supervisor.beta_warning")}
+        title: "WARNING",
+        text: html` Beta releases are for testers and early adopters and can
+          contain unstable code changes.
           <br />
           <b>
-            ${this.supervisor.localize("system.supervisor.beta_backup")}
+            Make sure you have backups of your data before you activate this
+            feature.
           </b>
           <br /><br />
-          ${this.supervisor.localize("system.supervisor.beta_release_items")}
+          This includes beta releases for:
           <li>Home Assistant Core</li>
           <li>Home Assistant Supervisor</li>
           <li>Home Assistant Operating System</li>
           <br />
-          ${this.supervisor.localize("system.supervisor.join_beta_action")}`,
-        confirmText: this.supervisor.localize(
-          "system.supervisor.beta_join_confirm"
-        ),
-        dismissText: this.supervisor.localize("common.cancel"),
+          Do you want to join the beta channel?`,
+        confirmText: "join beta",
+        dismissText: "no",
       });
 
       if (!confirmed) {
@@ -289,9 +292,7 @@ class HassioSupervisorInfo extends LitElement {
       await this._reloadSupervisor();
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize(
-          "system.supervisor.failed_to_set_option"
-        ),
+        title: "Failed to set supervisor option",
         text: extractApiErrorMessage(err),
       });
     } finally {
@@ -307,7 +308,7 @@ class HassioSupervisorInfo extends LitElement {
       await this._reloadSupervisor();
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize("system.supervisor.failed_to_reload"),
+        title: "Failed to reload the supervisor",
         text: extractApiErrorMessage(err),
       });
     } finally {
@@ -317,9 +318,8 @@ class HassioSupervisorInfo extends LitElement {
 
   private async _reloadSupervisor(): Promise<void> {
     await reloadSupervisor(this.hass);
-    fireEvent(this, "supervisor-colllection-refresh", {
-      colllection: "supervisor",
-    });
+    const supervisor = await fetchHassioSupervisorInfo(this.hass);
+    fireEvent(this, "supervisor-update", { supervisor });
   }
 
   private async _supervisorRestart(ev: CustomEvent): Promise<void> {
@@ -327,18 +327,10 @@ class HassioSupervisorInfo extends LitElement {
     button.progress = true;
 
     const confirmed = await showConfirmationDialog(this, {
-      title: this.supervisor.localize(
-        "confirm.restart.title",
-        "name",
-        "Supervisor"
-      ),
-      text: this.supervisor.localize(
-        "confirm.restart.text",
-        "name",
-        "Supervisor"
-      ),
-      confirmText: this.supervisor.localize("common.restart"),
-      dismissText: this.supervisor.localize("common.cancel"),
+      title: "Restart the Supervisor",
+      text: "Are you sure you want to restart the Supervisor",
+      confirmText: "restart",
+      dismissText: "cancel",
     });
 
     if (!confirmed) {
@@ -350,11 +342,7 @@ class HassioSupervisorInfo extends LitElement {
       await restartSupervisor(this.hass);
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize(
-          "common.failed_to_restart_name",
-          "name",
-          "Supervisor"
-        ),
+        title: "Failed to restart the supervisor",
         text: extractApiErrorMessage(err),
       });
     } finally {
@@ -367,16 +355,10 @@ class HassioSupervisorInfo extends LitElement {
     button.progress = true;
 
     const confirmed = await showConfirmationDialog(this, {
-      title: this.supervisor.localize("confirm.update", "name", "Supervisor"),
-      text: this.supervisor.localize(
-        "confirm.text",
-        "name",
-        "Supervisor",
-        "version",
-        this.supervisor.supervisor.version_latest
-      ),
-      confirmText: this.supervisor.localize("common.update"),
-      dismissText: this.supervisor.localize("common.cancel"),
+      title: "Update Supervisor",
+      text: `Are you sure you want to update supervisor to version ${this.supervisor.supervisor.version_latest}?`,
+      confirmText: "update",
+      dismissText: "cancel",
     });
 
     if (!confirmed) {
@@ -386,16 +368,9 @@ class HassioSupervisorInfo extends LitElement {
 
     try {
       await updateSupervisor(this.hass);
-      fireEvent(this, "supervisor-colllection-refresh", {
-        colllection: "supervisor",
-      });
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize(
-          "common.failed_to_update_name",
-          "name",
-          "Supervisor"
-        ),
+        title: "Failed to update the supervisor",
         text: extractApiErrorMessage(err),
       });
     } finally {
@@ -405,41 +380,40 @@ class HassioSupervisorInfo extends LitElement {
 
   private async _diagnosticsInformationDialog(): Promise<void> {
     await showAlertDialog(this, {
-      title: this.supervisor.localize(
-        "system.supervisor.share_diagonstics_title"
-      ),
-      text: this.supervisor.localize(
-        "system.supervisor.share_diagonstics_description",
-        "line_break",
-        html`<br /><br />`
-      ),
+      title: "Help Improve Home Assistant",
+      text: html`Would you want to automatically share crash reports and
+        diagnostic information when the supervisor encounters unexpected errors?
+        <br /><br />
+        This will allow us to fix the problems, the information is only
+        accessible to the Home Assistant Core team and will not be shared with
+        others.
+        <br /><br />
+        The data does not include any private/sensitive information and you can
+        disable this in settings at any time you want.`,
     });
   }
 
   private async _unsupportedDialog(): Promise<void> {
     await showAlertDialog(this, {
-      title: this.supervisor.localize("system.supervisor.unsupported_title"),
-      text: html`${this.supervisor.localize(
-          "system.supervisor.unsupported_description"
-        )} <br /><br />
+      title: "You are running an unsupported installation",
+      text: html`Below is a list of issues found with your installation, click
+        on the links to learn how you can resolve the issues. <br /><br />
         <ul>
           ${this.supervisor.resolution.unsupported.map(
-            (reason) => html`
+            (issue) => html`
               <li>
-                ${UNSUPPORTED_REASON_URL[reason]
+                ${UNSUPPORTED_REASON[issue]
                   ? html`<a
                       href="${documentationUrl(
                         this.hass,
-                        UNSUPPORTED_REASON_URL[reason]
+                        UNSUPPORTED_REASON[issue].url
                       )}"
                       target="_blank"
                       rel="noreferrer"
                     >
-                      ${this.supervisor.localize(
-                        `system.supervisor.unsupported_reason.${reason}`
-                      ) || reason}
+                      ${UNSUPPORTED_REASON[issue].title}
                     </a>`
-                  : reason}
+                  : issue}
               </li>
             `
           )}
@@ -449,28 +423,26 @@ class HassioSupervisorInfo extends LitElement {
 
   private async _unhealthyDialog(): Promise<void> {
     await showAlertDialog(this, {
-      title: this.supervisor.localize("system.supervisor.unhealthy_title"),
-      text: html`${this.supervisor.localize(
-          "system.supervisor.unhealthy_description"
-        )} <br /><br />
+      title: "Your installation is unhealthy",
+      text: html`Running an unhealthy installation will cause issues. Below is a
+        list of issues found with your installation, click on the links to learn
+        how you can resolve the issues. <br /><br />
         <ul>
           ${this.supervisor.resolution.unhealthy.map(
-            (reason) => html`
+            (issue) => html`
               <li>
-                ${UNHEALTHY_REASON_URL[reason]
+                ${UNHEALTHY_REASON[issue]
                   ? html`<a
                       href="${documentationUrl(
                         this.hass,
-                        UNHEALTHY_REASON_URL[reason]
+                        UNHEALTHY_REASON[issue].url
                       )}"
                       target="_blank"
                       rel="noreferrer"
                     >
-                      ${this.supervisor.localize(
-                        `system.supervisor.unhealthy_reason.${reason}`
-                      ) || reason}
+                      ${UNHEALTHY_REASON[issue].title}
                     </a>`
-                  : reason}
+                  : issue}
               </li>
             `
           )}
@@ -486,9 +458,7 @@ class HassioSupervisorInfo extends LitElement {
       await setSupervisorOption(this.hass, data);
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize(
-          "system.supervisor.failed_to_set_option"
-        ),
+        title: "Failed to set supervisor option",
         text: extractApiErrorMessage(err),
       });
     }

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

@@ -16,7 +16,6 @@ import "../../../src/components/buttons/ha-progress-button";
 import "../../../src/components/ha-card";
 import { extractApiErrorMessage } from "../../../src/data/hassio/common";
 import { fetchHassioLogs } from "../../../src/data/hassio/supervisor";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import "../../../src/layouts/hass-loading-screen";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
@@ -59,8 +58,6 @@ const logProviders: LogProvider[] = [
 class HassioSupervisorLog extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @internalProperty() private _error?: string;
 
   @internalProperty() private _selectedLogProvider = "supervisor";
@@ -79,7 +76,7 @@ class HassioSupervisorLog extends LitElement {
         ${this.hass.userData?.showAdvanced
           ? html`
               <paper-dropdown-menu
-                .label=${this.supervisor.localize("system.log.log_provider")}
+                label="Log Provider"
                 @iron-select=${this._setLogProvider}
               >
                 <paper-listbox
@@ -89,9 +86,9 @@ class HassioSupervisorLog extends LitElement {
                 >
                   ${logProviders.map((provider) => {
                     return html`
-                      <paper-item provider=${provider.key}>
-                        ${provider.name}
-                      </paper-item>
+                      <paper-item provider=${provider.key}
+                        >${provider.name}</paper-item
+                      >
                     `;
                   })}
                 </paper-listbox>
@@ -101,13 +98,14 @@ class HassioSupervisorLog extends LitElement {
 
         <div class="card-content" id="content">
           ${this._content
-            ? html`<hassio-ansi-to-html .content=${this._content}>
-              </hassio-ansi-to-html>`
+            ? html`<hassio-ansi-to-html
+                .content=${this._content}
+              ></hassio-ansi-to-html>`
             : html`<hass-loading-screen no-toolbar></hass-loading-screen>`}
         </div>
         <div class="card-actions">
           <ha-progress-button @click=${this._refresh}>
-            ${this.supervisor.localize("common.refresh")}
+            Refresh
           </ha-progress-button>
         </div>
       </ha-card>
@@ -136,13 +134,9 @@ class HassioSupervisorLog extends LitElement {
         this._selectedLogProvider
       );
     } catch (err) {
-      this._error = this.supervisor.localize(
-        "system.log.get_logs",
-        "provider",
-        this._selectedLogProvider,
-        "error",
-        extractApiErrorMessage(err)
-      );
+      this._error = `Failed to get supervisor logs, ${extractApiErrorMessage(
+        err
+      )}`;
     }
   }
 

hassio/src/system/hassio-system.ts

@@ -32,16 +32,13 @@ class HassioSystem extends LitElement {
     return html`
       <hass-tabs-subpage
         .hass=${this.hass}
-        .localizeFunc=${this.supervisor.localize}
         .narrow=${this.narrow}
+        hassio
+        main-page
         .route=${this.route}
         .tabs=${supervisorTabs}
-        main-page
-        supervisor
       >
-        <span slot="header">
-          ${this.supervisor.localize("panel.system")}
-        </span>
+        <span slot="header">System</span>
         <div class="content">
           <div class="card-group">
             <hassio-core-info
@@ -57,10 +54,7 @@ class HassioSystem extends LitElement {
               .supervisor=${this.supervisor}
             ></hassio-host-info>
           </div>
-          <hassio-supervisor-log
-            .hass=${this.hass}
-            .supervisor=${this.supervisor}
-          ></hassio-supervisor-log>
+          <hassio-supervisor-log .hass=${this.hass}></hassio-supervisor-log>
         </div>
       </hass-tabs-subpage>
     `;

hassio/src/util/addon.ts

@@ -1,7 +0,0 @@
-import memoizeOne from "memoize-one";
-import { SupervisorArch } from "../../../src/data/supervisor/supervisor";
-
-export const addonArchIsSupported = memoizeOne(
-  (supported_archs: SupervisorArch[], addon_archs: SupervisorArch[]) =>
-    addon_archs.some((arch) => supported_archs.includes(arch))
-);

package.json

@@ -22,17 +22,6 @@
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@braintree/sanitize-url": "^5.0.0",
-    "@codemirror/commands": "^0.17.0",
-    "@codemirror/gutter": "^0.17.0",
-    "@codemirror/highlight": "^0.17.0",
-    "@codemirror/history": "^0.17.0",
-    "@codemirror/legacy-modes": "^0.17.0",
-    "@codemirror/search": "^0.17.0",
-    "@codemirror/state": "^0.17.0",
-    "@codemirror/stream-parser": "^0.17.0",
-    "@codemirror/text": "^0.17.0",
-    "@codemirror/view": "^0.17.0",
     "@formatjs/intl-getcanonicallocales": "^1.4.6",
     "@formatjs/intl-pluralrules": "^3.4.10",
     "@fullcalendar/common": "5.1.0",
@@ -56,8 +45,8 @@
     "@material/mwc-tab": "^0.20.0",
     "@material/mwc-tab-bar": "^0.20.0",
     "@material/top-app-bar": "=9.0.0-canary.1c156d69d.0",
-    "@mdi/js": "5.9.55",
-    "@mdi/svg": "5.9.55",
+    "@mdi/js": "5.6.55",
+    "@mdi/svg": "5.6.55",
     "@polymer/app-layout": "^3.0.2",
     "@polymer/app-route": "^3.0.2",
     "@polymer/app-storage": "^3.0.2",
@@ -111,7 +100,7 @@
     "fuse.js": "^6.0.0",
     "google-timezones-json": "^1.0.2",
     "hls.js": "^0.13.2",
-    "home-assistant-js-websocket": "^5.9.0",
+    "home-assistant-js-websocket": "^5.4.1",
     "idb-keyval": "^3.2.0",
     "intl-messageformat": "^8.3.9",
     "js-yaml": "^3.13.1",
@@ -120,7 +109,7 @@
     "lit-element": "^2.4.0",
     "lit-html": "^1.3.0",
     "lit-virtualizer": "^0.4.2",
-    "marked": "2.0.0",
+    "marked": "^1.1.1",
     "mdn-polyfills": "^5.16.0",
     "memoize-one": "^5.0.2",
     "node-vibrant": "3.2.1-alpha.1",
@@ -171,7 +160,7 @@
     "@types/js-yaml": "^3.12.1",
     "@types/leaflet": "^1.4.3",
     "@types/leaflet-draw": "^1.0.1",
-    "@types/marked": "^1.2.2",
+    "@types/marked": "^1.1.0",
     "@types/memoize-one": "4.1.0",
     "@types/mocha": "^7.0.2",
     "@types/resize-observer-browser": "^0.1.3",
@@ -187,7 +176,7 @@
     "eslint": "^6.8.0",
     "eslint-config-airbnb-typescript": "^7.2.1",
     "eslint-config-prettier": "^6.10.1",
-    "eslint-import-resolver-webpack": "^0.13.0",
+    "eslint-import-resolver-webpack": "^0.12.2",
     "eslint-plugin-disable": "^2.0.1",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-lit": "^1.2.0",
@@ -223,16 +212,16 @@
     "sinon": "^7.3.1",
     "source-map-url": "^0.4.0",
     "systemjs": "^6.3.2",
-    "terser-webpack-plugin": "^5.1.1",
+    "terser-webpack-plugin": "^5.0.0",
     "ts-lit-plugin": "^1.2.1",
     "ts-mocha": "^7.0.0",
     "typescript": "^4.0.3",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
-    "webpack": "^5.24.1",
-    "webpack-cli": "^4.5.0",
-    "webpack-dev-server": "^3.11.2",
-    "webpack-manifest-plugin": "^3.0.0",
+    "webpack": "5.1.3",
+    "webpack-cli": "4.1.0",
+    "webpack-dev-server": "^3.11.0",
+    "webpack-manifest-plugin": "3.0.0-rc.0",
     "workbox-build": "^5.1.3"
   },
   "_comment": "Polymer fixed to 3.1 because 3.2 throws on logbook page",

script/release

@@ -12,5 +12,5 @@ yarn install
 script/build_frontend
 
 rm -rf dist
-python3 setup.py -q sdist
+python3 setup.py sdist
 python3 -m twine upload dist/* --skip-existing

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20210302.0",
+    version="20210127.1",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",

src/common/config/version.ts

@@ -1,20 +1,11 @@
 export const atLeastVersion = (
   version: string,
   major: number,
-  minor: number,
-  patch?: number
+  minor: number
 ): boolean => {
-  const [haMajor, haMinor, haPatch] = version.split(".", 3);
-
+  const [haMajor, haMinor] = version.split(".", 2);
   return (
     Number(haMajor) > major ||
-    (Number(haMajor) === major &&
-      (patch === undefined
-        ? Number(haMinor) >= minor
-        : Number(haMinor) > minor)) ||
-    (patch !== undefined &&
-      Number(haMajor) === major &&
-      Number(haMinor) === minor &&
-      Number(haPatch) >= patch)
+    (Number(haMajor) === major && Number(haMinor) >= minor)
   );
 };

src/common/const.ts

@@ -103,7 +103,6 @@ export const DOMAINS_WITH_MORE_INFO = [
   "lock",
   "media_player",
   "person",
-  "remote",
   "script",
   "sun",
   "timer",

src/common/entity/battery_icon.ts

@@ -8,19 +8,12 @@ export const batteryIcon = (
   const battery = Number(batteryState.state);
   const battery_charging =
     batteryChargingState && batteryChargingState.state === "on";
-  let icon = "hass:battery";
 
   if (isNaN(battery)) {
-    if (batteryState.state === "off") {
-      icon += "-full";
-    } else if (batteryState.state === "on") {
-      icon += "-alert";
-    } else {
-      icon += "-unknown";
-    }
-    return icon;
+    return "hass:battery-unknown";
   }
 
+  let icon = "hass:battery";
   const batteryRound = Math.round(battery / 10) * 10;
   if (battery_charging && battery > 10) {
     icon += `-charging-${batteryRound}`;

src/common/style/icon_color_css.ts

@@ -15,7 +15,7 @@ export const iconColorCSS = css`
   ha-icon[data-domain="media_player"][data-state="on"],
   ha-icon[data-domain="media_player"][data-state="paused"],
   ha-icon[data-domain="media_player"][data-state="playing"],
-  ha-icon[data-domain="script"][data-state="on"],
+  ha-icon[data-domain="script"][data-state="running"],
   ha-icon[data-domain="sun"][data-state="above_horizon"],
   ha-icon[data-domain="switch"][data-state="on"],
   ha-icon[data-domain="timer"][data-state="active"],

src/common/url/search-params.ts

@@ -6,16 +6,3 @@ export const extractSearchParamsObject = (): Record<string, string> => {
   }
   return query;
 };
-
-export const extractSearchParam = (param: string): string | null => {
-  const urlParams = new URLSearchParams(window.location.search);
-  return urlParams.get(param);
-};
-
-export const createSearchParam = (params: Record<string, string>): string => {
-  const urlParams = new URLSearchParams();
-  Object.entries(params).forEach(([key, value]) => {
-    urlParams.append(key, value);
-  });
-  return urlParams.toString();
-};

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

@@ -1,12 +1,16 @@
+import "@material/mwc-icon-button/mwc-icon-button";
+import { mdiClose, mdiMenuDown, mdiMenuUp } from "@mdi/js";
+import "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
+import "@polymer/paper-listbox/paper-listbox";
+import "@vaadin/vaadin-combo-box/theme/material/vaadin-combo-box-light";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import {
   css,
   CSSResult,
   customElement,
   html,
-  internalProperty,
   LitElement,
   property,
   PropertyValues,
@@ -34,8 +38,7 @@ import {
 import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
-import type { HaComboBox } from "../ha-combo-box";
-import "../ha-combo-box";
+import "../ha-svg-icon";
 
 interface Device {
   name: string;
@@ -109,11 +112,10 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
 
   @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc;
 
-  @property({ type: Boolean }) public disabled?: boolean;
+  @property({ type: Boolean })
+  private _opened?: boolean;
 
-  @internalProperty() private _opened?: boolean;
-
-  @query("ha-combo-box", true) private _comboBox!: HaComboBox;
+  @query("vaadin-combo-box-light", true) private _comboBox!: HTMLElement;
 
   private _init = false;
 
@@ -242,11 +244,15 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
   );
 
   public open() {
-    this._comboBox?.open();
+    this.updateComplete.then(() => {
+      (this.shadowRoot?.querySelector("vaadin-combo-box-light") as any)?.open();
+    });
   }
 
   public focus() {
-    this._comboBox?.focus();
+    this.updateComplete.then(() => {
+      this.shadowRoot?.querySelector("paper-input")?.focus();
+    });
   }
 
   public hassSubscribe(): UnsubscribeFunc[] {
@@ -286,29 +292,70 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
       return html``;
     }
     return html`
-      <ha-combo-box
-        .hass=${this.hass}
-        .label=${this.label === undefined && this.hass
-          ? this.hass.localize("ui.components.device-picker.device")
-          : this.label}
-        .value=${this._value}
-        .renderer=${rowRenderer}
-        .disabled=${this.disabled}
+      <vaadin-combo-box-light
         item-value-path="id"
         item-id-path="id"
         item-label-path="name"
+        .value=${this._value}
+        .renderer=${rowRenderer}
         @opened-changed=${this._openedChanged}
         @value-changed=${this._deviceChanged}
-      ></ha-combo-box>
+      >
+        <paper-input
+          .label=${this.label === undefined && this.hass
+            ? this.hass.localize("ui.components.device-picker.device")
+            : this.label}
+          class="input"
+          autocapitalize="none"
+          autocomplete="off"
+          autocorrect="off"
+          spellcheck="false"
+        >
+          ${this.value
+            ? html`
+                <mwc-icon-button
+                  .label=${this.hass.localize(
+                    "ui.components.device-picker.clear"
+                  )}
+                  slot="suffix"
+                  class="clear-button"
+                  @click=${this._clearValue}
+                >
+                  <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
+                </mwc-icon-button>
+              `
+            : ""}
+
+          <mwc-icon-button
+            .label=${this.hass.localize(
+              "ui.components.device-picker.show_devices"
+            )}
+            slot="suffix"
+            class="toggle-button"
+          >
+            <ha-svg-icon
+              .path=${this._opened ? mdiMenuUp : mdiMenuDown}
+            ></ha-svg-icon>
+          </mwc-icon-button>
+        </paper-input>
+      </vaadin-combo-box-light>
     `;
   }
 
+  private _clearValue(ev: Event) {
+    ev.stopPropagation();
+    this._setValue("");
+  }
+
   private get _value() {
     return this.value || "";
   }
 
+  private _openedChanged(ev: PolymerChangedEvent<boolean>) {
+    this._opened = ev.detail.value;
+  }
+
   private _deviceChanged(ev: PolymerChangedEvent<string>) {
-    ev.stopPropagation();
     const newValue = ev.detail.value;
 
     if (newValue !== this._value) {
@@ -316,10 +363,6 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
     }
   }
 
-  private _openedChanged(ev: PolymerChangedEvent<boolean>) {
-    this._opened = ev.detail.value;
-  }
-
   private _setValue(value: string) {
     this.value = value;
     setTimeout(() => {

src/components/entity/state-badge.ts

@@ -115,7 +115,7 @@ export class StateBadge extends LitElement {
             // eslint-disable-next-line
             console.warn(errorMessage);
           }
-          // lowest brightness will be around 50% (that's pretty dark)
+          // lowest brighntess will be around 50% (that's pretty dark)
           iconStyle.filter = `brightness(${(brightness + 245) / 5}%)`;
         }
       }

src/components/ha-addon-picker.ts

@@ -1,148 +0,0 @@
-import {
-  customElement,
-  html,
-  internalProperty,
-  LitElement,
-  property,
-  query,
-  TemplateResult,
-} from "lit-element";
-import { isComponentLoaded } from "../common/config/is_component_loaded";
-import { fireEvent } from "../common/dom/fire_event";
-import { compare } from "../common/string/compare";
-import { HassioAddonInfo } from "../data/hassio/addon";
-import { fetchHassioSupervisorInfo } from "../data/hassio/supervisor";
-import { showAlertDialog } from "../dialogs/generic/show-dialog-box";
-import { PolymerChangedEvent } from "../polymer-types";
-import { HomeAssistant } from "../types";
-import { HaComboBox } from "./ha-combo-box";
-
-const rowRenderer = (
-  root: HTMLElement,
-  _owner,
-  model: { item: HassioAddonInfo }
-) => {
-  if (!root.firstElementChild) {
-    root.innerHTML = `
-    <style>
-      paper-item {
-        margin: -10px 0;
-        padding: 0;
-      }
-    </style>
-    <paper-item>
-      <paper-item-body two-line="">
-        <div class='name'>[[item.name]]</div>
-        <div secondary>[[item.slug]]</div>
-      </paper-item-body>
-    </paper-item>
-    `;
-  }
-
-  root.querySelector(".name")!.textContent = model.item.name;
-  root.querySelector("[secondary]")!.textContent = model.item.slug;
-};
-
-@customElement("ha-addon-picker")
-class HaAddonPicker extends LitElement {
-  public hass!: HomeAssistant;
-
-  @property() public label?: string;
-
-  @property() public value = "";
-
-  @internalProperty() private _addons?: HassioAddonInfo[];
-
-  @property({ type: Boolean }) public disabled = false;
-
-  @query("ha-combo-box") private _comboBox!: HaComboBox;
-
-  public open() {
-    this._comboBox?.open();
-  }
-
-  public focus() {
-    this._comboBox?.focus();
-  }
-
-  protected firstUpdated() {
-    this._getAddons();
-  }
-
-  protected render(): TemplateResult {
-    if (!this._addons) {
-      return html``;
-    }
-    return html`
-      <ha-combo-box
-        .hass=${this.hass}
-        .label=${this.label === undefined && this.hass
-          ? this.hass.localize("ui.components.addon-picker.addon")
-          : this.label}
-        .value=${this._value}
-        .renderer=${rowRenderer}
-        .items=${this._addons}
-        item-value-path="slug"
-        item-id-path="slug"
-        item-label-path="name"
-        @value-changed=${this._addonChanged}
-      ></ha-combo-box>
-    `;
-  }
-
-  private async _getAddons() {
-    try {
-      if (isComponentLoaded(this.hass, "hassio")) {
-        const supervisorInfo = await fetchHassioSupervisorInfo(this.hass);
-        this._addons = supervisorInfo.addons.sort((a, b) =>
-          compare(a.name, b.name)
-        );
-      } else {
-        showAlertDialog(this, {
-          title: this.hass.localize(
-            "ui.componencts.addon-picker.error.no_supervisor.title"
-          ),
-          text: this.hass.localize(
-            "ui.componencts.addon-picker.error.no_supervisor.description"
-          ),
-        });
-      }
-    } catch (error) {
-      showAlertDialog(this, {
-        title: this.hass.localize(
-          "ui.componencts.addon-picker.error.fetch_addons.title"
-        ),
-        text: this.hass.localize(
-          "ui.componencts.addon-picker.error.fetch_addons.description"
-        ),
-      });
-    }
-  }
-
-  private get _value() {
-    return this.value || "";
-  }
-
-  private _addonChanged(ev: PolymerChangedEvent<string>) {
-    ev.stopPropagation();
-    const newValue = ev.detail.value;
-
-    if (newValue !== this._value) {
-      this._setValue(newValue);
-    }
-  }
-
-  private _setValue(value: string) {
-    this.value = value;
-    setTimeout(() => {
-      fireEvent(this, "value-changed", { value });
-      fireEvent(this, "change");
-    }, 0);
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-addon-picker": HaAddonPicker;
-  }
-}

src/components/ha-area-picker.ts

@@ -117,8 +117,6 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
 
   @property() public entityFilter?: (entity: EntityRegistryEntry) => boolean;
 
-  @property({ type: Boolean }) public disabled?: boolean;
-
   @internalProperty() private _areas?: AreaRegistryEntry[];
 
   @internalProperty() private _devices?: DeviceRegistryEntry[];
@@ -140,7 +138,7 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
         this._devices = devices;
       }),
       subscribeEntityRegistry(this.hass.connection!, (entities) => {
-        this._entities = entities.filter((entity) => entity.area_id);
+        this._entities = entities;
       }),
     ];
   }
@@ -193,14 +191,11 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
           deviceEntityLookup[entity.device_id].push(entity);
         }
         inputDevices = devices;
-        inputEntities = entities;
-      } else {
-        if (deviceFilter) {
-          inputDevices = devices;
-        }
-        if (entityFilter) {
-          inputEntities = entities;
-        }
+        inputEntities = entities.filter((entity) => entity.area_id);
+      } else if (deviceFilter) {
+        inputDevices = devices;
+      } else if (entityFilter) {
+        inputEntities = entities.filter((entity) => entity.area_id);
       }
 
       if (includeDomains) {
@@ -344,7 +339,6 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
         item-label-path="name"
         .value=${this._value}
         .renderer=${rowRenderer}
-        .disabled=${this.disabled}
         @opened-changed=${this._openedChanged}
         @value-changed=${this._areaChanged}
       >
@@ -355,7 +349,6 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
           .placeholder=${this.placeholder
             ? this._area(this.placeholder)?.name
             : undefined}
-          .disabled=${this.disabled}
           class="input"
           autocapitalize="none"
           autocomplete="off"

src/components/ha-code-editor.ts

@@ -1,5 +1,4 @@
-import type { StreamLanguage } from "@codemirror/stream-parser";
-import type { EditorView, KeyBinding, ViewUpdate } from "@codemirror/view";
+import { Editor } from "codemirror";
 import {
   customElement,
   internalProperty,
@@ -16,40 +15,32 @@ declare global {
   }
 }
 
-const modeTag = Symbol("mode");
-
-const readOnlyTag = Symbol("readOnly");
-
-const saveKeyBinding: KeyBinding = {
-  key: "Mod-s",
-  run: (view: EditorView) => {
-    fireEvent(view.dom, "editor-save");
-    return true;
-  },
-};
-
 @customElement("ha-code-editor")
 export class HaCodeEditor extends UpdatingElement {
-  public codemirror?: EditorView;
+  public codemirror?: Editor;
 
-  @property() public mode = "yaml";
+  @property() public mode?: string;
 
   @property({ type: Boolean }) public autofocus = false;
 
   @property({ type: Boolean }) public readOnly = false;
 
+  @property() public rtl = false;
+
   @property() public error = false;
 
   @internalProperty() private _value = "";
 
-  @internalProperty() private _langs?: Record<string, StreamLanguage<unknown>>;
-
   public set value(value: string) {
     this._value = value;
   }
 
   public get value(): string {
-    return this.codemirror ? this.codemirror.state.doc.toString() : this._value;
+    return this.codemirror ? this.codemirror.getValue() : this._value;
+  }
+
+  public get hasComments(): boolean {
+    return !!this.shadowRoot!.querySelector("span.cm-comment");
   }
 
   public connectedCallback() {
@@ -57,6 +48,7 @@ export class HaCodeEditor extends UpdatingElement {
     if (!this.codemirror) {
       return;
     }
+    this.codemirror.refresh();
     if (this.autofocus !== false) {
       this.codemirror.focus();
     }
@@ -70,27 +62,17 @@ export class HaCodeEditor extends UpdatingElement {
     }
 
     if (changedProps.has("mode")) {
-      this.codemirror.dispatch({
-        reconfigure: {
-          [modeTag]: this._mode,
-        },
-      });
+      this.codemirror.setOption("mode", this.mode);
     }
-    if (changedProps.has("readOnly")) {
-      this.codemirror.dispatch({
-        reconfigure: {
-          [readOnlyTag]: !this.readOnly,
-        },
-      });
+    if (changedProps.has("autofocus")) {
+      this.codemirror.setOption("autofocus", this.autofocus !== false);
     }
     if (changedProps.has("_value") && this._value !== this.value) {
-      this.codemirror.dispatch({
-        changes: {
-          from: 0,
-          to: this.codemirror.state.doc.length,
-          insert: this._value,
-        },
-      });
+      this.codemirror.setValue(this._value);
+    }
+    if (changedProps.has("rtl")) {
+      this.codemirror.setOption("gutters", this._calcGutters());
+      this._setScrollBarDirection();
     }
     if (changedProps.has("error")) {
       this.classList.toggle("error-state", this.error);
@@ -103,66 +85,159 @@ export class HaCodeEditor extends UpdatingElement {
     this._load();
   }
 
-  private get _mode() {
-    return this._langs![this.mode];
-  }
-
   private async _load(): Promise<void> {
     const loaded = await loadCodeMirror();
 
-    this._langs = loaded.langs;
+    const codeMirror = loaded.codeMirror;
 
     const shadowRoot = this.attachShadow({ mode: "open" });
 
-    shadowRoot!.innerHTML = `<style>
-      :host(.error-state) div.cm-wrap .cm-gutters {
+    shadowRoot!.innerHTML = `
+    <style>
+      ${loaded.codeMirrorCss}
+      .CodeMirror {
+        height: var(--code-mirror-height, auto);
+        direction: var(--code-mirror-direction, ltr);
+        font-family: var(--code-font-family, monospace);
+      }
+      .CodeMirror-scroll {
+        max-height: var(--code-mirror-max-height, --code-mirror-height);
+      }
+      :host(.error-state) .CodeMirror-gutters {
         border-color: var(--error-state-color, red);
       }
+      .CodeMirror-focused .CodeMirror-gutters {
+        border-right: 2px solid var(--paper-input-container-focus-color, var(--primary-color));
+      }
+      .CodeMirror-linenumber {
+        color: var(--paper-dialog-color, var(--secondary-text-color));
+      }
+      .rtl .CodeMirror-vscrollbar {
+        right: auto;
+        left: 0px;
+      }
+      .rtl-gutter {
+        width: 20px;
+      }
+      .CodeMirror-gutters {
+        border-right: 1px solid var(--paper-input-container-color, var(--secondary-text-color));
+        background-color: var(--paper-dialog-background-color, var(--primary-background-color));
+        transition: 0.2s ease border-right;
+      }
+      .cm-s-default.CodeMirror {
+        background-color: var(--code-editor-background-color, var(--card-background-color));
+        color: var(--primary-text-color);
+      }
+      .cm-s-default .CodeMirror-cursor {
+        border-left: 1px solid var(--secondary-text-color);
+      }
+
+      .cm-s-default div.CodeMirror-selected, .cm-s-default.CodeMirror-focused div.CodeMirror-selected {
+        background: rgba(var(--rgb-primary-color), 0.2);
+      }
+
+      .cm-s-default .CodeMirror-line::selection,
+      .cm-s-default .CodeMirror-line>span::selection,
+      .cm-s-default .CodeMirror-line>span>span::selection {
+        background: rgba(var(--rgb-primary-color), 0.2);
+      }
+
+      .cm-s-default .cm-keyword {
+        color: var(--codemirror-keyword, #6262FF);
+      }
+
+      .cm-s-default .cm-operator {
+        color: var(--codemirror-operator, #cda869);
+      }
+
+      .cm-s-default .cm-variable-2 {
+        color: var(--codemirror-variable-2, #690);
+      }
+
+      .cm-s-default .cm-builtin {
+        color: var(--codemirror-builtin, #9B7536);
+      }
+
+      .cm-s-default .cm-atom {
+        color: var(--codemirror-atom, #F90);
+      }
+
+      .cm-s-default .cm-number {
+        color: var(--codemirror-number, #ca7841);
+      }
+
+      .cm-s-default .cm-def {
+        color: var(--codemirror-def, #8DA6CE);
+      }
+
+      .cm-s-default .cm-string {
+        color: var(--codemirror-string, #07a);
+      }
+
+      .cm-s-default .cm-string-2 {
+        color: var(--codemirror-string-2, #bd6b18);
+      }
+
+      .cm-s-default .cm-comment {
+        color: var(--codemirror-comment, #777);
+      }
+
+      .cm-s-default .cm-variable {
+        color: var(--codemirror-variable, #07a);
+      }
+
+      .cm-s-default .cm-tag {
+        color: var(--codemirror-tag, #997643);
+      }
+
+      .cm-s-default .cm-meta {
+        color: var(--codemirror-meta, var(--primary-text-color));
+      }
+
+      .cm-s-default .cm-attribute {
+        color: var(--codemirror-attribute, #d6bb6d);
+      }
+
+      .cm-s-default .cm-property {
+        color: var(--codemirror-property, #905);
+      }
+
+      .cm-s-default .cm-qualifier {
+        color: var(--codemirror-qualifier, #690);
+      }
+
+      .cm-s-default .cm-variable-3  {
+        color: var(--codemirror-variable-3, #07a);
+      }
+
+      .cm-s-default .cm-type {
+        color: var(--codemirror-type, #07a);
+      }
     </style>`;
 
-    const container = document.createElement("span");
-
-    shadowRoot.appendChild(container);
-
-    this.codemirror = new loaded.EditorView({
-      state: loaded.EditorState.create({
-        doc: this._value,
-        extensions: [
-          loaded.lineNumbers(),
-          loaded.history(),
-          loaded.highlightSelectionMatches(),
-          loaded.keymap.of([
-            ...loaded.defaultKeymap,
-            ...loaded.searchKeymap,
-            ...loaded.historyKeymap,
-            ...loaded.tabKeyBindings,
-            saveKeyBinding,
-          ] as KeyBinding[]),
-          loaded.tagExtension(modeTag, this._mode),
-          loaded.theme,
-          loaded.Prec.fallback(loaded.highlightStyle),
-          loaded.tagExtension(
-            readOnlyTag,
-            loaded.EditorView.editable.of(!this.readOnly)
-          ),
-          loaded.EditorView.updateListener.of((update) =>
-            this._onUpdate(update)
-          ),
-        ],
-      }),
-      root: shadowRoot,
-      parent: container,
+    this.codemirror = codeMirror(shadowRoot, {
+      value: this._value,
+      lineNumbers: true,
+      tabSize: 2,
+      mode: this.mode,
+      autofocus: this.autofocus !== false,
+      viewportMargin: Infinity,
+      readOnly: this.readOnly,
+      extraKeys: {
+        Tab: "indentMore",
+        "Shift-Tab": "indentLess",
+      },
+      gutters: this._calcGutters(),
     });
+    this._setScrollBarDirection();
+    this.codemirror!.on("changes", () => this._onChange());
   }
 
   private _blockKeyboardShortcuts() {
     this.addEventListener("keydown", (ev) => ev.stopPropagation());
   }
 
-  private _onUpdate(update: ViewUpdate): void {
-    if (!update.docChanged) {
-      return;
-    }
+  private _onChange(): void {
     const newValue = this.value;
     if (newValue === this._value) {
       return;
@@ -170,6 +245,16 @@ export class HaCodeEditor extends UpdatingElement {
     this._value = newValue;
     fireEvent(this, "value-changed", { value: this._value });
   }
+
+  private _calcGutters(): string[] {
+    return this.rtl ? ["rtl-gutter", "CodeMirror-linenumbers"] : [];
+  }
+
+  private _setScrollBarDirection(): void {
+    if (this.codemirror) {
+      this.codemirror.getWrapperElement().classList.toggle("rtl", this.rtl);
+    }
+  }
 }
 
 declare global {

src/components/ha-combo-box.js

@@ -0,0 +1,116 @@
+import "@polymer/paper-input/paper-input";
+import "@polymer/paper-item/paper-item";
+import { html } from "@polymer/polymer/lib/utils/html-tag";
+/* eslint-plugin-disable lit */
+import { PolymerElement } from "@polymer/polymer/polymer-element";
+import "@vaadin/vaadin-combo-box/theme/material/vaadin-combo-box-light";
+import { EventsMixin } from "../mixins/events-mixin";
+import "./ha-icon-button";
+
+class HaComboBox extends EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+      <style>
+        paper-input > ha-icon-button {
+          --mdc-icon-button-size: 24px;
+          padding: 2px;
+          color: var(--secondary-text-color);
+        }
+        [hidden] {
+          display: none;
+        }
+      </style>
+      <vaadin-combo-box-light
+        items="[[_items]]"
+        item-value-path="[[itemValuePath]]"
+        item-label-path="[[itemLabelPath]]"
+        value="{{value}}"
+        opened="{{opened}}"
+        allow-custom-value="[[allowCustomValue]]"
+        on-change="_fireChanged"
+      >
+        <paper-input
+          autofocus="[[autofocus]]"
+          label="[[label]]"
+          class="input"
+          value="[[value]]"
+        >
+          <ha-icon-button
+            slot="suffix"
+            class="clear-button"
+            icon="hass:close"
+            hidden$="[[!value]]"
+            >Clear</ha-icon-button
+          >
+          <ha-icon-button
+            slot="suffix"
+            class="toggle-button"
+            icon="[[_computeToggleIcon(opened)]]"
+            hidden$="[[!items.length]]"
+            >Toggle</ha-icon-button
+          >
+        </paper-input>
+        <template>
+          <style>
+            paper-item {
+              margin: -5px -10px;
+              padding: 0;
+            }
+          </style>
+          <paper-item>[[_computeItemLabel(item, itemLabelPath)]]</paper-item>
+        </template>
+      </vaadin-combo-box-light>
+    `;
+  }
+
+  static get properties() {
+    return {
+      allowCustomValue: Boolean,
+      items: {
+        type: Object,
+        observer: "_itemsChanged",
+      },
+      _items: Object,
+      itemLabelPath: String,
+      itemValuePath: String,
+      autofocus: Boolean,
+      label: String,
+      opened: {
+        type: Boolean,
+        value: false,
+        observer: "_openedChanged",
+      },
+      value: {
+        type: String,
+        notify: true,
+      },
+    };
+  }
+
+  _openedChanged(newVal) {
+    if (!newVal) {
+      this._items = this.items;
+    }
+  }
+
+  _itemsChanged(newVal) {
+    if (!this.opened) {
+      this._items = newVal;
+    }
+  }
+
+  _computeToggleIcon(opened) {
+    return opened ? "hass:menu-up" : "hass:menu-down";
+  }
+
+  _computeItemLabel(item, itemLabelPath) {
+    return itemLabelPath ? item[itemLabelPath] : item;
+  }
+
+  _fireChanged(ev) {
+    ev.stopPropagation();
+    this.fire("change");
+  }
+}
+
+customElements.define("ha-combo-box", HaComboBox);

src/components/ha-combo-box.ts

@@ -1,181 +0,0 @@
-import "@material/mwc-icon-button/mwc-icon-button";
-import { mdiClose, mdiMenuDown, mdiMenuUp } from "@mdi/js";
-import "@polymer/paper-input/paper-input";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-item/paper-item-body";
-import "@polymer/paper-listbox/paper-listbox";
-import "@vaadin/vaadin-combo-box/theme/material/vaadin-combo-box-light";
-import {
-  css,
-  CSSResult,
-  customElement,
-  html,
-  internalProperty,
-  LitElement,
-  property,
-  query,
-  TemplateResult,
-} from "lit-element";
-import { fireEvent } from "../common/dom/fire_event";
-import { PolymerChangedEvent } from "../polymer-types";
-import { HomeAssistant } from "../types";
-import "./ha-svg-icon";
-
-const defaultRowRenderer = (
-  root: HTMLElement,
-  _owner,
-  model: { item: any }
-) => {
-  if (!root.firstElementChild) {
-    root.innerHTML = `
-    <style>
-      paper-item {
-        margin: -5px -10px;
-        padding: 0;
-      }
-    </style>
-    <paper-item></paper-item>
-    `;
-  }
-
-  root.querySelector("paper-item")!.textContent = model.item;
-};
-
-@customElement("ha-combo-box")
-export class HaComboBox extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property() public label?: string;
-
-  @property() public value?: string;
-
-  @property() public items?: [];
-
-  @property() public filteredItems?: [];
-
-  @property({ attribute: "allow-custom-value", type: Boolean })
-  public allowCustomValue?: boolean;
-
-  @property({ attribute: "item-value-path" }) public itemValuePath?: string;
-
-  @property({ attribute: "item-label-path" }) public itemLabelPath?: string;
-
-  @property({ attribute: "item-id-path" }) public itemIdPath?: string;
-
-  @property() public renderer?: (
-    root: HTMLElement,
-    owner: HTMLElement,
-    model: { item: any }
-  ) => void;
-
-  @property({ type: Boolean }) public disabled?: boolean;
-
-  @internalProperty() private _opened?: boolean;
-
-  @query("vaadin-combo-box-light", true) private _comboBox!: HTMLElement;
-
-  public open() {
-    this.updateComplete.then(() => {
-      (this._comboBox as any)?.open();
-    });
-  }
-
-  public focus() {
-    this.updateComplete.then(() => {
-      this.shadowRoot?.querySelector("paper-input")?.focus();
-    });
-  }
-
-  protected render(): TemplateResult {
-    return html`
-      <vaadin-combo-box-light
-        .itemValuePath=${this.itemValuePath}
-        .itemIdPath=${this.itemIdPath}
-        .itemLabelPath=${this.itemLabelPath}
-        .value=${this.value}
-        .items=${this.items}
-        .filteredItems=${this.filteredItems}
-        .renderer=${this.renderer || defaultRowRenderer}
-        .allowCustomValue=${this.allowCustomValue}
-        .disabled=${this.disabled}
-        @opened-changed=${this._openedChanged}
-        @filter-changed=${this._filterChanged}
-        @value-changed=${this._valueChanged}
-      >
-        <paper-input
-          .label=${this.label}
-          .disabled=${this.disabled}
-          class="input"
-          autocapitalize="none"
-          autocomplete="off"
-          autocorrect="off"
-          spellcheck="false"
-        >
-          ${this.value
-            ? html`
-                <mwc-icon-button
-                  .label=${this.hass.localize("ui.components.combo-box.clear")}
-                  slot="suffix"
-                  class="clear-button"
-                  @click=${this._clearValue}
-                >
-                  <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
-                </mwc-icon-button>
-              `
-            : ""}
-
-          <mwc-icon-button
-            .label=${this.hass.localize("ui.components.combo-box.show")}
-            slot="suffix"
-            class="toggle-button"
-          >
-            <ha-svg-icon
-              .path=${this._opened ? mdiMenuUp : mdiMenuDown}
-            ></ha-svg-icon>
-          </mwc-icon-button>
-        </paper-input>
-      </vaadin-combo-box-light>
-    `;
-  }
-
-  private _clearValue(ev: Event) {
-    ev.stopPropagation();
-    fireEvent(this, "value-changed", { value: undefined });
-  }
-
-  private _openedChanged(ev: PolymerChangedEvent<boolean>) {
-    this._opened = ev.detail.value;
-    // @ts-ignore
-    fireEvent(this, ev.type, ev.detail);
-  }
-
-  private _filterChanged(ev: PolymerChangedEvent<boolean>) {
-    // @ts-ignore
-    fireEvent(this, ev.type, ev.detail);
-  }
-
-  private _valueChanged(ev: PolymerChangedEvent<string>) {
-    ev.stopPropagation();
-    const newValue = ev.detail.value;
-
-    if (newValue !== this.value) {
-      fireEvent(this, "value-changed", { value: newValue });
-    }
-  }
-
-  static get styles(): CSSResult {
-    return css`
-      paper-input > mwc-icon-button {
-        --mdc-icon-button-size: 24px;
-        padding: 2px;
-        color: var(--secondary-text-color);
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-combo-box": HaComboBox;
-  }
-}

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

@@ -1,9 +1,6 @@
-import { mdiEye, mdiEyeOff } from "@mdi/js";
 import "@polymer/paper-input/paper-input";
 import type { PaperInputElement } from "@polymer/paper-input/paper-input";
 import {
-  css,
-  CSSResult,
   customElement,
   html,
   internalProperty,
@@ -13,13 +10,12 @@ import {
   TemplateResult,
 } from "lit-element";
 import { fireEvent } from "../../common/dom/fire_event";
-import "../ha-svg-icon";
+import "../ha-icon-button";
 import type {
   HaFormElement,
   HaFormStringData,
   HaFormStringSchema,
 } from "./ha-form";
-import "@material/mwc-icon-button/mwc-icon-button";
 
 @customElement("ha-form-string")
 export class HaFormString extends LitElement implements HaFormElement {
@@ -52,17 +48,16 @@ export class HaFormString extends LitElement implements HaFormElement {
             .autoValidate=${this.schema.required}
             @value-changed=${this._valueChanged}
           >
-            <mwc-icon-button
+            <ha-icon-button
               toggles
               slot="suffix"
+              .icon=${this._unmaskedPassword ? "hass:eye-off" : "hass:eye"}
               id="iconButton"
               title="Click to toggle between masked and clear password"
               @click=${this._toggleUnmaskedPassword}
               tabindex="-1"
-              ><ha-svg-icon
-                .path=${this._unmaskedPassword ? mdiEyeOff : mdiEye}
-              ></ha-svg-icon>
-            </mwc-icon-button>
+            >
+            </ha-icon-button>
           </paper-input>
         `
       : html`
@@ -103,15 +98,6 @@ export class HaFormString extends LitElement implements HaFormElement {
     }
     return "text";
   }
-
-  static get styles(): CSSResult {
-    return css`
-      mwc-icon-button {
-        --mdc-icon-button-size: 24px;
-        color: var(--secondary-text-color);
-      }
-    `;
-  }
 }
 
 declare global {

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

@@ -202,8 +202,9 @@ export class HaForm extends LitElement implements HaFormElement {
     ev.stopPropagation();
     const schema = (ev.target as HaFormElement).schema as HaFormSchema;
     const data = this.data as HaFormDataContainer;
+    data[schema.name] = ev.detail.value;
     fireEvent(this, "value-changed", {
-      value: { ...data, [schema.name]: ev.detail.value },
+      value: { ...data },
     });
   }
 

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

@@ -21,11 +21,8 @@ export class HaActionSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property({ type: Boolean, reflect: true }) public disabled = false;
-
   protected render() {
     return html`<ha-automation-action
-      .disabled=${this.disabled}
       .actions=${this.value || []}
       .hass=${this.hass}
     ></ha-automation-action>`;
@@ -37,10 +34,6 @@ export class HaActionSelector extends LitElement {
         display: block;
         margin-bottom: 16px;
       }
-      :host([disabled]) ha-automation-action {
-        opacity: var(--light-disabled-opacity);
-        pointer-events: none;
-      }
     `;
   }
 }

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

@@ -1,30 +0,0 @@
-import { customElement, html, LitElement, property } from "lit-element";
-import { AddonSelector } from "../../data/selector";
-import { HomeAssistant } from "../../types";
-import "../ha-addon-picker";
-
-@customElement("ha-selector-addon")
-export class HaAddonSelector extends LitElement {
-  @property() public hass!: HomeAssistant;
-
-  @property() public selector!: AddonSelector;
-
-  @property() public value?: any;
-
-  @property() public label?: string;
-
-  protected render() {
-    return html`<ha-addon-picker
-      .hass=${this.hass}
-      .value=${this.value}
-      .label=${this.label}
-      allow-custom-entity
-    ></ha-addon-picker>`;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-selector-addon": HaAddonSelector;
-  }
-}

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

@@ -24,8 +24,6 @@ export class HaAreaSelector extends LitElement {
 
   @internalProperty() public _configEntries?: ConfigEntry[];
 
-  @property({ type: Boolean }) public disabled = false;
-
   protected updated(changedProperties) {
     if (changedProperties.has("selector")) {
       const oldSelector = changedProperties.get("selector");
@@ -52,7 +50,6 @@ export class HaAreaSelector extends LitElement {
       .includeDomains=${this.selector.area.entity?.domain
         ? [this.selector.area.entity.domain]
         : undefined}
-      .disabled=${this.disabled}
     ></ha-area-picker>`;
   }
 

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

@@ -19,14 +19,11 @@ export class HaBooleanSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property({ type: Boolean }) public disabled = false;
-
   protected render() {
     return html` <ha-formfield alignEnd spaceBetween .label=${this.label}>
       <ha-switch
         .checked=${this.value}
         @change=${this._handleChange}
-        .disabled=${this.disabled}
       ></ha-switch>
     </ha-formfield>`;
   }

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

@@ -23,12 +23,10 @@ export class HaDeviceSelector extends LitElement {
 
   @internalProperty() public _configEntries?: ConfigEntry[];
 
-  @property({ type: Boolean }) public disabled = false;
-
   protected updated(changedProperties) {
     if (changedProperties.has("selector")) {
       const oldSelector = changedProperties.get("selector");
-      if (oldSelector !== this.selector && this.selector.device?.integration) {
+      if (oldSelector !== this.selector && this.selector.device.integration) {
         this._loadConfigEntries();
       }
     }
@@ -46,25 +44,24 @@ export class HaDeviceSelector extends LitElement {
       .includeDomains=${this.selector.device.entity?.domain
         ? [this.selector.device.entity.domain]
         : undefined}
-      .disabled=${this.disabled}
       allow-custom-entity
     ></ha-device-picker>`;
   }
 
   private _filterDevices(device: DeviceRegistryEntry): boolean {
     if (
-      this.selector.device?.manufacturer &&
+      this.selector.device.manufacturer &&
       device.manufacturer !== this.selector.device.manufacturer
     ) {
       return false;
     }
     if (
-      this.selector.device?.model &&
+      this.selector.device.model &&
       device.model !== this.selector.device.model
     ) {
       return false;
     }
-    if (this.selector.device?.integration) {
+    if (this.selector.device.integration) {
       if (
         this._configEntries &&
         !this._configEntries.some((entry) =>

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

@@ -25,15 +25,12 @@ export class HaEntitySelector extends SubscribeMixin(LitElement) {
 
   @property() public label?: string;
 
-  @property({ type: Boolean }) public disabled = false;
-
   protected render() {
     return html`<ha-entity-picker
       .hass=${this.hass}
       .value=${this.value}
       .label=${this.label}
       .entityFilter=${(entity) => this._filterEntities(entity)}
-      .disabled=${this.disabled}
       allow-custom-entity
     ></ha-entity-picker>`;
   }
@@ -54,12 +51,12 @@ export class HaEntitySelector extends SubscribeMixin(LitElement) {
   }
 
   private _filterEntities(entity: HassEntity): boolean {
-    if (this.selector.entity?.domain) {
+    if (this.selector.entity.domain) {
       if (computeStateDomain(entity) !== this.selector.entity.domain) {
         return false;
       }
     }
-    if (this.selector.entity?.device_class) {
+    if (this.selector.entity.device_class) {
       if (
         !entity.attributes.device_class ||
         entity.attributes.device_class !== this.selector.entity.device_class
@@ -67,7 +64,7 @@ export class HaEntitySelector extends SubscribeMixin(LitElement) {
         return false;
       }
     }
-    if (this.selector.entity?.integration) {
+    if (this.selector.entity.integration) {
       if (
         !this._entityPlaformLookup ||
         this._entityPlaformLookup[entity.entity_id] !==

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

@@ -21,12 +21,8 @@ export class HaNumberSelector extends LitElement {
 
   @property() public value?: number;
 
-  @property() public placeholder?: number;
-
   @property() public label?: string;
 
-  @property({ type: Boolean }) public disabled = false;
-
   protected render() {
     return html`${this.label}
       ${this.selector.number.mode === "slider"
@@ -35,7 +31,6 @@ export class HaNumberSelector extends LitElement {
             .max=${this.selector.number.max}
             .value=${this._value}
             .step=${this.selector.number.step}
-            .disabled=${this.disabled}
             pin
             ignore-bar-touch
             @change=${this._handleSliderChange}
@@ -47,14 +42,12 @@ export class HaNumberSelector extends LitElement {
         .label=${this.selector.number.mode === "slider"
           ? undefined
           : this.label}
-        .placeholder=${this.placeholder}
         .noLabelFloat=${this.selector.number.mode === "slider"}
         class=${classMap({ single: this.selector.number.mode === "box" })}
         .min=${this.selector.number.min}
         .max=${this.selector.number.max}
-        .value=${this.value}
+        .value=${this._value}
         .step=${this.selector.number.step}
-        .disabled=${this.disabled}
         type="number"
         auto-validate
         @value-changed=${this._handleInputChange}
@@ -72,21 +65,16 @@ export class HaNumberSelector extends LitElement {
   }
 
   private _handleInputChange(ev) {
-    ev.stopPropagation();
-    const value =
-      ev.detail.value === "" || isNaN(ev.detail.value)
-        ? undefined
-        : Number(ev.detail.value);
-    if (this.value === value) {
+    const value = ev.detail.value;
+    if (this._value === value) {
       return;
     }
     fireEvent(this, "value-changed", { value });
   }
 
   private _handleSliderChange(ev) {
-    ev.stopPropagation();
-    const value = Number(ev.target.value);
-    if (this.value === value) {
+    const value = ev.target.value;
+    if (this._value === value) {
       return;
     }
     fireEvent(this, "value-changed", { value });

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

@@ -11,14 +11,8 @@ export class HaObjectSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public placeholder?: string;
-
-  @property({ type: Boolean }) public disabled = false;
-
   protected render() {
     return html`<ha-yaml-editor
-      .disabled=${this.disabled}
-      .placeholder=${this.placeholder}
       .defaultValue=${this.value}
       @value-changed=${this._handleChange}
     ></ha-yaml-editor>`;

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

@@ -1,78 +0,0 @@
-import {
-  css,
-  CSSResult,
-  customElement,
-  html,
-  LitElement,
-  property,
-} from "lit-element";
-import { fireEvent } from "../../common/dom/fire_event";
-import { HomeAssistant } from "../../types";
-import { SelectSelector } from "../../data/selector";
-import "../ha-paper-dropdown-menu";
-
-@customElement("ha-selector-select")
-export class HaSelectSelector extends LitElement {
-  @property() public hass!: HomeAssistant;
-
-  @property() public selector!: SelectSelector;
-
-  @property() public value?: string;
-
-  @property() public label?: string;
-
-  @property({ type: Boolean }) public disabled = false;
-
-  protected render() {
-    return html`<ha-paper-dropdown-menu
-      .disabled=${this.disabled}
-      .label=${this.label}
-    >
-      <paper-listbox
-        slot="dropdown-content"
-        attr-for-selected="item-value"
-        .selected=${this.value}
-        @selected-item-changed=${this._valueChanged}
-      >
-        ${this.selector.select.options.map(
-          (item: string) => html`
-            <paper-item .itemValue=${item}>
-              ${item}
-            </paper-item>
-          `
-        )}
-      </paper-listbox>
-    </ha-paper-dropdown-menu>`;
-  }
-
-  private _valueChanged(ev) {
-    if (this.disabled || !ev.detail.value) {
-      return;
-    }
-    fireEvent(this, "value-changed", {
-      value: ev.detail.value.itemValue,
-    });
-  }
-
-  static get styles(): CSSResult {
-    return css`
-      ha-paper-dropdown-menu {
-        width: 100%;
-        min-width: 200px;
-        display: block;
-      }
-      paper-listbox {
-        min-width: 200px;
-      }
-      paper-item {
-        cursor: pointer;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-selector-select": HaSelectSelector;
-  }
-}

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

@@ -3,11 +3,7 @@ import "@material/mwc-list/mwc-list-item";
 import "@material/mwc-tab-bar/mwc-tab-bar";
 import "@material/mwc-tab/mwc-tab";
 import "@polymer/paper-input/paper-input";
-import {
-  HassEntity,
-  HassServiceTarget,
-  UnsubscribeFunc,
-} from "home-assistant-js-websocket";
+import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import {
   css,
   CSSResult,
@@ -24,6 +20,7 @@ import {
   subscribeEntityRegistry,
 } from "../../data/entity_registry";
 import { TargetSelector } from "../../data/selector";
+import { Target } from "../../data/target";
 import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { HomeAssistant } from "../../types";
 import "../ha-target-picker";
@@ -34,7 +31,7 @@ export class HaTargetSelector extends SubscribeMixin(LitElement) {
 
   @property() public selector!: TargetSelector;
 
-  @property() public value?: HassServiceTarget;
+  @property() public value?: Target;
 
   @property() public label?: string;
 
@@ -42,8 +39,6 @@ export class HaTargetSelector extends SubscribeMixin(LitElement) {
 
   @internalProperty() private _configEntries?: ConfigEntry[];
 
-  @property({ type: Boolean }) public disabled = false;
-
   public hassSubscribe(): UnsubscribeFunc[] {
     return [
       subscribeEntityRegistry(this.hass.connection!, (entities) => {
@@ -64,8 +59,7 @@ export class HaTargetSelector extends SubscribeMixin(LitElement) {
       const oldSelector = changedProperties.get("selector");
       if (
         oldSelector !== this.selector &&
-        (this.selector.target.device?.integration ||
-          this.selector.target.entity?.integration)
+        this.selector.target.device?.integration
       ) {
         this._loadConfigEntries();
       }
@@ -86,20 +80,15 @@ export class HaTargetSelector extends SubscribeMixin(LitElement) {
       .includeDomains=${this.selector.target.entity?.domain
         ? [this.selector.target.entity.domain]
         : undefined}
-      .disabled=${this.disabled}
     ></ha-target-picker>`;
   }
 
   private _filterEntities(entity: HassEntity): boolean {
-    if (
-      this.selector.target.entity?.integration ||
-      this.selector.target.device?.integration
-    ) {
+    if (this.selector.target.entity?.integration) {
       if (
         !this._entityPlaformLookup ||
         this._entityPlaformLookup[entity.entity_id] !==
-          (this.selector.target.entity?.integration ||
-            this.selector.target.device?.integration)
+          this.selector.target.entity.integration
       ) {
         return false;
       }
@@ -129,10 +118,7 @@ export class HaTargetSelector extends SubscribeMixin(LitElement) {
     ) {
       return false;
     }
-    if (
-      this.selector.target.device?.integration ||
-      this.selector.target.entity?.integration
-    ) {
+    if (this.selector.target.device?.integration) {
       if (
         !this._configEntries?.some((entry) =>
           device.config_entries.includes(entry.entry_id)
@@ -146,16 +132,14 @@ export class HaTargetSelector extends SubscribeMixin(LitElement) {
 
   private async _loadConfigEntries() {
     this._configEntries = (await getConfigEntries(this.hass)).filter(
-      (entry) =>
-        entry.domain ===
-        (this.selector.target.device?.integration ||
-          this.selector.target.entity?.integration)
+      (entry) => entry.domain === this.selector.target.device?.integration
     );
   }
 
   static get styles(): CSSResult {
     return css`
       ha-target-picker {
+        margin: 0 -8px;
         display: block;
       }
     `;

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

@@ -13,20 +13,14 @@ export class HaTextSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public placeholder?: string;
-
   @property() public selector!: StringSelector;
 
-  @property({ type: Boolean }) public disabled = false;
-
   protected render() {
     if (this.selector.text?.multiline) {
       return html`<paper-textarea
         .label=${this.label}
-        .placeholder=${this.placeholder}
-        .value=${this.value}
-        .disabled=${this.disabled}
-        @value-changed=${this._handleChange}
+        .value="${this.value}"
+        @value-changed="${this._handleChange}"
         autocapitalize="none"
         autocomplete="off"
         spellcheck="false"
@@ -35,8 +29,6 @@ export class HaTextSelector extends LitElement {
     return html`<paper-input
       required
       .value=${this.value}
-      .placeholder=${this.placeholder}
-      .disabled=${this.disabled}
       @value-changed=${this._handleChange}
       .label=${this.label}
     ></paper-input>`;

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

@@ -17,8 +17,6 @@ export class HaTimeSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property({ type: Boolean }) public disabled = false;
-
   protected render() {
     const parts = this.value?.split(":") || [];
     const hours = useAMPM ? parts[0] ?? "12" : parts[0] ?? "0";
@@ -31,7 +29,6 @@ export class HaTimeSelector extends LitElement {
         .sec=${parts[2] ?? "00"}
         .format=${useAMPM ? 12 : 24}
         .amPm=${useAMPM && (Number(hours) > 12 ? "PM" : "AM")}
-        .disabled=${this.disabled}
         @change=${this._timeChanged}
         @am-pm-changed=${this._timeChanged}
         hide-label

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

@@ -3,7 +3,6 @@ import { dynamicElement } from "../../common/dom/dynamic-element-directive";
 import { Selector } from "../../data/selector";
 import { HomeAssistant } from "../../types";
 import "./ha-selector-action";
-import "./ha-selector-addon";
 import "./ha-selector-area";
 import "./ha-selector-boolean";
 import "./ha-selector-device";
@@ -13,7 +12,6 @@ import "./ha-selector-target";
 import "./ha-selector-time";
 import "./ha-selector-object";
 import "./ha-selector-text";
-import "./ha-selector-select";
 
 @customElement("ha-selector")
 export class HaSelector extends LitElement {
@@ -25,10 +23,6 @@ export class HaSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public placeholder?: any;
-
-  @property({ type: Boolean }) public disabled = false;
-
   public focus() {
     const input = this.shadowRoot!.getElementById("selector");
     if (!input) {
@@ -48,8 +42,6 @@ export class HaSelector extends LitElement {
         selector: this.selector,
         value: this.value,
         label: this.label,
-        placeholder: this.placeholder,
-        disabled: this.disabled,
         id: "selector",
       })}
     `;

src/components/ha-service-control.ts

@@ -1,407 +0,0 @@
-import { HassService, HassServiceTarget } from "home-assistant-js-websocket";
-import {
-  css,
-  CSSResult,
-  customElement,
-  html,
-  internalProperty,
-  LitElement,
-  property,
-  PropertyValues,
-  query,
-} from "lit-element";
-import memoizeOne from "memoize-one";
-import { fireEvent } from "../common/dom/fire_event";
-import { computeDomain } from "../common/entity/compute_domain";
-import { computeObjectId } from "../common/entity/compute_object_id";
-import { ENTITY_COMPONENT_DOMAINS } from "../data/entity";
-import { Selector } from "../data/selector";
-import { PolymerChangedEvent } from "../polymer-types";
-import { HomeAssistant } from "../types";
-import "./ha-selector/ha-selector";
-import "./ha-service-picker";
-import "./ha-settings-row";
-import "./ha-yaml-editor";
-import "./ha-checkbox";
-import type { HaYamlEditor } from "./ha-yaml-editor";
-
-interface ExtHassService extends Omit<HassService, "fields"> {
-  fields: {
-    key: string;
-    name?: string;
-    description: string;
-    required?: boolean;
-    advanced?: boolean;
-    default?: any;
-    example?: any;
-    selector?: Selector;
-  }[];
-}
-
-@customElement("ha-service-control")
-export class HaServiceControl extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public value?: {
-    service: string;
-    target?: HassServiceTarget;
-    data?: Record<string, any>;
-  };
-
-  @property({ reflect: true, type: Boolean }) public narrow!: boolean;
-
-  @property({ type: Boolean }) public showAdvanced?: boolean;
-
-  @internalProperty() private _serviceData?: ExtHassService;
-
-  @internalProperty() private _checkedKeys = new Set();
-
-  @query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor;
-
-  protected updated(changedProperties: PropertyValues) {
-    if (!changedProperties.has("value")) {
-      return;
-    }
-    const oldValue = changedProperties.get("value") as
-      | undefined
-      | this["value"];
-
-    if (oldValue?.service !== this.value?.service) {
-      this._checkedKeys = new Set();
-    }
-
-    this._serviceData = this.value?.service
-      ? this._getServiceInfo(this.value.service)
-      : undefined;
-
-    if (
-      this._serviceData &&
-      "target" in this._serviceData &&
-      (this.value?.data?.entity_id ||
-        this.value?.data?.area_id ||
-        this.value?.data?.device_id)
-    ) {
-      const target = {
-        ...this.value.target,
-      };
-
-      if (this.value.data.entity_id && !this.value.target?.entity_id) {
-        target.entity_id = this.value.data.entity_id;
-      }
-      if (this.value.data.area_id && !this.value.target?.area_id) {
-        target.area_id = this.value.data.area_id;
-      }
-      if (this.value.data.device_id && !this.value.target?.device_id) {
-        target.device_id = this.value.data.device_id;
-      }
-
-      this.value = {
-        ...this.value,
-        target,
-        data: { ...this.value.data },
-      };
-
-      delete this.value.data!.entity_id;
-      delete this.value.data!.device_id;
-      delete this.value.data!.area_id;
-    }
-
-    if (this.value?.data) {
-      const yamlEditor = this._yamlEditor;
-      if (yamlEditor && yamlEditor.value !== this.value.data) {
-        yamlEditor.setValue(this.value.data);
-      }
-    }
-  }
-
-  private _domainFilter = memoizeOne((service: string) => {
-    const domain = computeDomain(service);
-    return ENTITY_COMPONENT_DOMAINS.includes(domain) ? [domain] : null;
-  });
-
-  private _getServiceInfo = memoizeOne((service: string):
-    | ExtHassService
-    | undefined => {
-    if (!service) {
-      return undefined;
-    }
-    const domain = computeDomain(service);
-    const serviceName = computeObjectId(service);
-    const serviceDomains = this.hass.services;
-    if (!(domain in serviceDomains)) {
-      return undefined;
-    }
-    if (!(serviceName in serviceDomains[domain])) {
-      return undefined;
-    }
-
-    const fields = Object.entries(
-      serviceDomains[domain][serviceName].fields
-    ).map(([key, value]) => {
-      return {
-        key,
-        ...value,
-        selector: value.selector as Selector | undefined,
-      };
-    });
-    return {
-      ...serviceDomains[domain][serviceName],
-      fields,
-    };
-  });
-
-  protected render() {
-    const legacy =
-      this._serviceData?.fields.length &&
-      !this._serviceData.fields.some((field) => field.selector);
-
-    const entityId =
-      legacy &&
-      this._serviceData?.fields.find((field) => field.key === "entity_id");
-
-    const hasOptional = Boolean(
-      !legacy &&
-        this._serviceData?.fields.some(
-          (field) => field.selector && !field.required
-        )
-    );
-
-    return html`<ha-service-picker
-        .hass=${this.hass}
-        .value=${this.value?.service}
-        @value-changed=${this._serviceChanged}
-      ></ha-service-picker>
-      <p>${this._serviceData?.description}</p>
-      ${this._serviceData && "target" in this._serviceData
-        ? html`<ha-settings-row .narrow=${this.narrow}>
-            ${hasOptional
-              ? html`<div slot="prefix" class="checkbox-spacer"></div>`
-              : ""}
-            <span slot="heading"
-              >${this.hass.localize(
-                "ui.components.service-control.target"
-              )}</span
-            >
-            <span slot="description"
-              >${this.hass.localize(
-                "ui.components.service-control.target_description"
-              )}</span
-            ><ha-selector
-              .hass=${this.hass}
-              .selector=${this._serviceData.target
-                ? { target: this._serviceData.target }
-                : {
-                    target: {
-                      entity: { domain: computeDomain(this.value!.service) },
-                    },
-                  }}
-              @value-changed=${this._targetChanged}
-              .value=${this.value?.target}
-            ></ha-selector
-          ></ha-settings-row>`
-        : entityId
-        ? html`<ha-entity-picker
-            .hass=${this.hass}
-            .value=${this.value?.data?.entity_id}
-            .label=${entityId.description}
-            .includeDomains=${this._domainFilter(this.value!.service)}
-            @value-changed=${this._entityPicked}
-            allow-custom-entity
-          ></ha-entity-picker>`
-        : ""}
-      ${legacy
-        ? html`<ha-yaml-editor
-            .label=${this.hass.localize(
-              "ui.components.service-control.service_data"
-            )}
-            .name=${"data"}
-            .defaultValue=${this.value?.data}
-            @value-changed=${this._dataChanged}
-          ></ha-yaml-editor>`
-        : this._serviceData?.fields.map((dataField) =>
-            dataField.selector && (!dataField.advanced || this.showAdvanced)
-              ? html`<ha-settings-row .narrow=${this.narrow}>
-                  ${dataField.required
-                    ? hasOptional
-                      ? html`<div slot="prefix" class="checkbox-spacer"></div>`
-                      : ""
-                    : html`<ha-checkbox
-                        .key=${dataField.key}
-                        .checked=${this._checkedKeys.has(dataField.key) ||
-                        (this.value?.data &&
-                          this.value.data[dataField.key] !== undefined)}
-                        @change=${this._checkboxChanged}
-                        slot="prefix"
-                      ></ha-checkbox>`}
-                  <span slot="heading">${dataField.name || dataField.key}</span>
-                  <span slot="description">${dataField?.description}</span
-                  ><ha-selector
-                    .disabled=${!dataField.required &&
-                    !this._checkedKeys.has(dataField.key) &&
-                    (!this.value?.data ||
-                      this.value.data[dataField.key] === undefined)}
-                    .hass=${this.hass}
-                    .selector=${dataField.selector}
-                    .key=${dataField.key}
-                    @value-changed=${this._serviceDataChanged}
-                    .value=${this.value?.data &&
-                    this.value.data[dataField.key] !== undefined
-                      ? this.value.data[dataField.key]
-                      : dataField.default}
-                  ></ha-selector
-                ></ha-settings-row>`
-              : ""
-          )} `;
-  }
-
-  private _checkboxChanged(ev) {
-    const checked = ev.currentTarget.checked;
-    const key = ev.currentTarget.key;
-    if (checked) {
-      this._checkedKeys.add(key);
-    } else {
-      this._checkedKeys.delete(key);
-      const data = { ...this.value?.data };
-
-      delete data[key];
-
-      fireEvent(this, "value-changed", {
-        value: {
-          ...this.value,
-          data,
-        },
-      });
-    }
-    this.requestUpdate("_checkedKeys");
-  }
-
-  private _serviceChanged(ev: PolymerChangedEvent<string>) {
-    ev.stopPropagation();
-    if (ev.detail.value === this.value?.service) {
-      return;
-    }
-    fireEvent(this, "value-changed", {
-      value: { service: ev.detail.value || "" },
-    });
-  }
-
-  private _entityPicked(ev: CustomEvent) {
-    ev.stopPropagation();
-    const newValue = ev.detail.value;
-    if (this.value?.data?.entity_id === newValue) {
-      return;
-    }
-    let value;
-    if (!newValue && this.value?.data) {
-      value = { ...this.value };
-      delete value.data.entity_id;
-    } else {
-      value = {
-        ...this.value,
-        data: { ...this.value?.data, entity_id: ev.detail.value },
-      };
-    }
-    fireEvent(this, "value-changed", {
-      value,
-    });
-  }
-
-  private _targetChanged(ev: CustomEvent) {
-    ev.stopPropagation();
-    const newValue = ev.detail.value;
-    if (this.value?.target === newValue) {
-      return;
-    }
-    let value;
-    if (!newValue) {
-      value = { ...this.value };
-      delete value.target;
-    } else {
-      value = { ...this.value, target: ev.detail.value };
-    }
-    fireEvent(this, "value-changed", {
-      value,
-    });
-  }
-
-  private _serviceDataChanged(ev: CustomEvent) {
-    ev.stopPropagation();
-    const key = (ev.currentTarget as any).key;
-    const value = ev.detail.value;
-    if (this.value?.data && this.value.data[key] === value) {
-      return;
-    }
-
-    const data = { ...this.value?.data, [key]: value };
-
-    if (value === "" || value === undefined) {
-      delete data[key];
-    }
-
-    fireEvent(this, "value-changed", {
-      value: {
-        ...this.value,
-        data,
-      },
-    });
-  }
-
-  private _dataChanged(ev: CustomEvent) {
-    ev.stopPropagation();
-    if (!ev.detail.isValid) {
-      return;
-    }
-    fireEvent(this, "value-changed", {
-      value: {
-        ...this.value,
-        data: ev.detail.value,
-      },
-    });
-  }
-
-  static get styles(): CSSResult {
-    return css`
-      ha-settings-row {
-        padding: var(--service-control-padding, 0 16px);
-      }
-      ha-settings-row {
-        --paper-time-input-justify-content: flex-end;
-        border-top: var(
-          --service-control-items-border-top,
-          1px solid var(--divider-color)
-        );
-      }
-      ha-service-picker,
-      ha-entity-picker,
-      ha-yaml-editor {
-        display: block;
-        margin: var(--service-control-padding, 0 16px);
-      }
-      ha-yaml-editor {
-        padding: 16px 0;
-      }
-      p {
-        margin: var(--service-control-padding, 0 16px);
-        padding: 16px 0;
-      }
-      :host(:not([narrow])) ha-settings-row paper-input {
-        width: 60%;
-      }
-      :host(:not([narrow])) ha-settings-row ha-selector {
-        width: 60%;
-      }
-      .checkbox-spacer {
-        width: 32px;
-      }
-      ha-checkbox {
-        margin-left: -16px;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-service-control": HaServiceControl;
-  }
-}

src/components/ha-service-picker.js

@@ -0,0 +1,60 @@
+import { html } from "@polymer/polymer/lib/utils/html-tag";
+/* eslint-plugin-disable lit */
+import { PolymerElement } from "@polymer/polymer/polymer-element";
+import LocalizeMixin from "../mixins/localize-mixin";
+import "./ha-combo-box";
+
+/*
+ * @appliesMixin LocalizeMixin
+ */
+class HaServicePicker extends LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+      <ha-combo-box
+        label="[[localize('ui.components.service-picker.service')]]"
+        items="[[_services]]"
+        value="{{value}}"
+        allow-custom-value=""
+      ></ha-combo-box>
+    `;
+  }
+
+  static get properties() {
+    return {
+      hass: {
+        type: Object,
+        observer: "_hassChanged",
+      },
+      _services: Array,
+      value: {
+        type: String,
+        notify: true,
+      },
+    };
+  }
+
+  _hassChanged(hass, oldHass) {
+    if (!hass) {
+      this._services = [];
+      return;
+    }
+    if (oldHass && hass.services === oldHass.services) {
+      return;
+    }
+    const result = [];
+
+    Object.keys(hass.services)
+      .sort()
+      .forEach((domain) => {
+        const services = Object.keys(hass.services[domain]).sort();
+
+        for (let i = 0; i < services.length; i++) {
+          result.push(`${domain}.${services[i]}`);
+        }
+      });
+
+    this._services = result;
+  }
+}
+
+customElements.define("ha-service-picker", HaServicePicker);

src/components/ha-service-picker.ts

@@ -1,135 +0,0 @@
-import { html, internalProperty, LitElement, property } from "lit-element";
-import memoizeOne from "memoize-one";
-import { fireEvent } from "../common/dom/fire_event";
-import { LocalizeFunc } from "../common/translations/localize";
-import { domainToName } from "../data/integration";
-import { HomeAssistant } from "../types";
-import "./ha-combo-box";
-
-const rowRenderer = (
-  root: HTMLElement,
-  _owner,
-  model: { item: { service: string; name: string } }
-) => {
-  if (!root.firstElementChild) {
-    root.innerHTML = `
-    <style>
-      paper-item {
-        margin: -10px 0;
-        padding: 0;
-      }
-    </style>
-    <paper-item>
-      <paper-item-body two-line="">
-        <div class='name'>[[item.name]]</div>
-        <div secondary>[[item.service]]</div>
-      </paper-item-body>
-    </paper-item>
-    `;
-  }
-
-  root.querySelector(".name")!.textContent = model.item.name;
-  root.querySelector("[secondary]")!.textContent =
-    model.item.name === model.item.service ? "" : model.item.service;
-};
-
-class HaServicePicker extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property() public value?: string;
-
-  @internalProperty() private _filter?: string;
-
-  protected render() {
-    return html`
-      <ha-combo-box
-        .hass=${this.hass}
-        .label=${this.hass.localize("ui.components.service-picker.service")}
-        .filteredItems=${this._filteredServices(
-          this.hass.localize,
-          this.hass.services,
-          this._filter
-        )}
-        .value=${this.value}
-        .renderer=${rowRenderer}
-        item-value-path="service"
-        item-label-path="name"
-        allow-custom-value
-        @filter-changed=${this._filterChanged}
-        @value-changed=${this._valueChanged}
-      ></ha-combo-box>
-    `;
-  }
-
-  private _services = memoizeOne(
-    (
-      localize: LocalizeFunc,
-      services: HomeAssistant["services"]
-    ): {
-      service: string;
-      name: string;
-    }[] => {
-      if (!services) {
-        return [];
-      }
-      const result: { service: string; name: string }[] = [];
-
-      Object.keys(services)
-        .sort()
-        .forEach((domain) => {
-          const services_keys = Object.keys(services[domain]).sort();
-
-          for (const service of services_keys) {
-            result.push({
-              service: `${domain}.${service}`,
-              name: `${domainToName(localize, domain)}: ${
-                services[domain][service].name || service
-              }`,
-            });
-          }
-        });
-
-      return result;
-    }
-  );
-
-  private _filteredServices = memoizeOne(
-    (
-      localize: LocalizeFunc,
-      services: HomeAssistant["services"],
-      filter?: string
-    ) => {
-      if (!services) {
-        return [];
-      }
-      const processedServices = this._services(localize, services);
-
-      if (!filter) {
-        return processedServices;
-      }
-      return processedServices.filter(
-        (service) =>
-          service.service.toLowerCase().includes(filter) ||
-          service.name?.toLowerCase().includes(filter)
-      );
-    }
-  );
-
-  private _filterChanged(ev: CustomEvent): void {
-    this._filter = ev.detail.value.toLowerCase();
-  }
-
-  private _valueChanged(ev) {
-    this.value = ev.detail.value;
-    fireEvent(this, "change");
-    fireEvent(this, "value-changed", { value: this.value });
-  }
-}
-
-customElements.define("ha-service-picker", HaServicePicker);
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-service-picker": HaServicePicker;
-  }
-}

src/components/ha-settings-row.ts

@@ -6,7 +6,7 @@ import {
   html,
   LitElement,
   property,
-  TemplateResult,
+  SVGTemplateResult,
 } from "lit-element";
 
 @customElement("ha-settings-row")
@@ -16,18 +16,15 @@ export class HaSettingsRow extends LitElement {
   @property({ type: Boolean, attribute: "three-line" })
   public threeLine = false;
 
-  protected render(): TemplateResult {
+  protected render(): SVGTemplateResult {
     return html`
-      <div class="prefix-wrap">
-        <slot name="prefix"></slot>
-        <paper-item-body
-          ?two-line=${!this.threeLine}
-          ?three-line=${this.threeLine}
-        >
-          <slot name="heading"></slot>
-          <div secondary><slot name="description"></slot></div>
-        </paper-item-body>
-      </div>
+      <paper-item-body
+        ?two-line=${!this.threeLine}
+        ?three-line=${this.threeLine}
+      >
+        <slot name="heading"></slot>
+        <div secondary><slot name="description"></slot></div>
+      </paper-item-body>
       <slot></slot>
     `;
   }
@@ -48,7 +45,6 @@ export class HaSettingsRow extends LitElement {
         min-height: calc(
           var(--paper-item-body-two-line-min-height, 72px) - 16px
         );
-        flex: 1;
       }
       :host([narrow]) {
         align-items: normal;
@@ -62,13 +58,6 @@ export class HaSettingsRow extends LitElement {
       div[secondary] {
         white-space: normal;
       }
-      .prefix-wrap {
-        display: contents;
-      }
-      :host([narrow]) .prefix-wrap {
-        display: flex;
-        align-items: center;
-      }
     `;
   }
 }

src/components/ha-slider.js

@@ -79,14 +79,6 @@ class HaSlider extends PaperSliderClass {
     return subTemplate;
   }
 
-  _setImmediateValue(newImmediateValue) {
-    super._setImmediateValue(
-      this.step >= 1
-        ? Math.round(newImmediateValue)
-        : Math.round(newImmediateValue * 100) / 100
-    );
-  }
-
   _calcStep(value) {
     if (!this.step) {
       return parseFloat(value);

src/components/ha-target-picker.ts

@@ -10,10 +10,7 @@ import {
   mdiUnfoldMoreVertical,
 } from "@mdi/js";
 import "@polymer/paper-tooltip/paper-tooltip";
-import {
-  HassServiceTarget,
-  UnsubscribeFunc,
-} from "home-assistant-js-websocket";
+import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import {
   css,
   CSSResult,
@@ -44,6 +41,7 @@ import {
   EntityRegistryEntry,
   subscribeEntityRegistry,
 } from "../data/entity_registry";
+import { Target } from "../data/target";
 import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { HomeAssistant } from "../types";
 import "./device/ha-device-picker";
@@ -58,7 +56,7 @@ import "./ha-svg-icon";
 export class HaTargetPicker extends SubscribeMixin(LitElement) {
   @property() public hass!: HomeAssistant;
 
-  @property() public value?: HassServiceTarget;
+  @property() public value?: Target;
 
   @property() public label?: string;
 
@@ -84,8 +82,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
 
   @property() public entityFilter?: HaEntityPickerEntityFilterFunc;
 
-  @property({ type: Boolean, reflect: true }) public disabled = false;
-
   @internalProperty() private _areas?: { [areaId: string]: AreaRegistryEntry };
 
   @internalProperty() private _devices?: {
@@ -440,9 +436,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
     type: string,
     id: string
   ): this["value"] {
-    const newVal = ensureArray(value![type])!.filter(
-      (val) => String(val) !== id
-    );
+    const newVal = ensureArray(value![type])!.filter((val) => val !== id);
     if (newVal.length) {
       return {
         ...value,
@@ -536,9 +530,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
       .items {
         z-index: 2;
       }
-      .mdc-chip-set {
-        padding: 4px 0;
-      }
       .mdc-chip.add {
         color: rgba(0, 0, 0, 0.87);
       }
@@ -603,10 +594,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
       paper-tooltip.expand {
         min-width: 200px;
       }
-      :host([disabled]) .mdc-chip {
-        opacity: var(--light-disabled-opacity);
-        pointer-events: none;
-      }
     `;
   }
 }

src/components/ha-yaml-editor.ts

@@ -5,10 +5,20 @@ import {
   internalProperty,
   LitElement,
   property,
+  query,
   TemplateResult,
 } from "lit-element";
 import { fireEvent } from "../common/dom/fire_event";
+import { afterNextRender } from "../common/util/render-status";
 import "./ha-code-editor";
+import type { HaCodeEditor } from "./ha-code-editor";
+
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "editor-refreshed": undefined;
+  }
+}
 
 const isEmpty = (obj: Record<string, unknown>): boolean => {
   if (typeof obj !== "object") {
@@ -34,14 +44,22 @@ export class HaYamlEditor extends LitElement {
 
   @internalProperty() private _yaml = "";
 
+  @query("ha-code-editor", true) private _editor?: HaCodeEditor;
+
   public setValue(value): void {
     try {
       this._yaml = value && !isEmpty(value) ? safeDump(value) : "";
     } catch (err) {
       // eslint-disable-next-line no-console
-      console.error(err, value);
+      console.error(err);
       alert(`There was an error converting to YAML: ${err}`);
     }
+    afterNextRender(() => {
+      if (this._editor?.codemirror) {
+        this._editor.codemirror.refresh();
+      }
+      afterNextRender(() => fireEvent(this, "editor-refreshed"));
+    });
   }
 
   protected firstUpdated(): void {
@@ -55,7 +73,7 @@ export class HaYamlEditor extends LitElement {
       return html``;
     }
     return html`
-      ${this.label ? html`<p>${this.label}</p>` : ""}
+      ${this.label ? html` <p>${this.label}</p> ` : ""}
       <ha-code-editor
         .value=${this._yaml}
         mode="yaml"
@@ -67,13 +85,13 @@ export class HaYamlEditor extends LitElement {
 
   private _onChange(ev: CustomEvent): void {
     ev.stopPropagation();
-    this._yaml = ev.detail.value;
+    const value = ev.detail.value;
     let parsed;
     let isValid = true;
 
-    if (this._yaml) {
+    if (value) {
       try {
-        parsed = safeLoad(this._yaml);
+        parsed = safeLoad(value);
       } catch (err) {
         // Invalid YAML
         isValid = false;
@@ -89,7 +107,7 @@ export class HaYamlEditor extends LitElement {
   }
 
   get yaml() {
-    return this._yaml;
+    return this._editor?.value;
   }
 }
 

src/components/state-history-charts.ts

@@ -6,7 +6,6 @@ import {
   html,
   LitElement,
   property,
-  PropertyValues,
   TemplateResult,
 } from "lit-element";
 import "./state-history-chart-line";
@@ -84,10 +83,6 @@ class StateHistoryCharts extends LitElement {
     `;
   }
 
-  protected shouldUpdate(changedProps: PropertyValues): boolean {
-    return !(changedProps.size === 1 && changedProps.has("hass"));
-  }
-
   private _isHistoryEmpty(): boolean {
     const historyDataEmpty =
       !this.historyData ||

src/data/automation.ts

@@ -205,13 +205,9 @@ export type Condition =
   | DeviceCondition
   | LogicalCondition;
 
-export const triggerAutomationActions = (
-  hass: HomeAssistant,
-  entityId: string
-) => {
+export const triggerAutomation = (hass: HomeAssistant, entityId: string) => {
   hass.callService("automation", "trigger", {
     entity_id: entityId,
-    skip_condition: true,
   });
 };
 

src/data/config_entries.ts

@@ -9,7 +9,6 @@ export interface ConfigEntry {
   connection_class: string;
   supports_options: boolean;
   supports_unload: boolean;
-  disabled_by: string | null;
 }
 
 export interface ConfigEntryMutableParams {
@@ -44,27 +43,6 @@ export const reloadConfigEntry = (hass: HomeAssistant, configEntryId: string) =>
     require_restart: boolean;
   }>("POST", `config/config_entries/entry/${configEntryId}/reload`);
 
-export const disableConfigEntry = (
-  hass: HomeAssistant,
-  configEntryId: string
-) =>
-  hass.callWS<{
-    require_restart: boolean;
-  }>({
-    type: "config_entries/disable",
-    entry_id: configEntryId,
-    disabled_by: "user",
-  });
-
-export const enableConfigEntry = (hass: HomeAssistant, configEntryId: string) =>
-  hass.callWS<{
-    require_restart: boolean;
-  }>({
-    type: "config_entries/disable",
-    entry_id: configEntryId,
-    disabled_by: null,
-  });
-
 export const getConfigEntrySystemOptions = (
   hass: HomeAssistant,
   configEntryId: string

src/data/config_flow.ts

@@ -65,18 +65,16 @@ export const deleteConfigFlow = (hass: HomeAssistant, flowId: string) =>
 export const getConfigFlowHandlers = (hass: HomeAssistant) =>
   hass.callApi<string[]>("GET", "config/config_entries/flow_handlers");
 
-export const fetchConfigFlowInProgress = (
-  conn: Connection
-): Promise<DataEntryFlowProgress[]> =>
+const fetchConfigFlowInProgress = (conn) =>
   conn.sendMessagePromise({
     type: "config_entries/flow/progress",
   });
 
-const subscribeConfigFlowInProgressUpdates = (conn: Connection, store) =>
+const subscribeConfigFlowInProgressUpdates = (conn, store) =>
   conn.subscribeEvents(
     debounce(
       () =>
-        fetchConfigFlowInProgress(conn).then((flows: DataEntryFlowProgress[]) =>
+        fetchConfigFlowInProgress(conn).then((flows) =>
           store.setState(flows, true)
         ),
       500,

src/data/hassio/addon.ts

@@ -1,40 +1,21 @@
-import { atLeastVersion } from "../../common/config/version";
 import { HaFormSchema } from "../../components/ha-form/ha-form";
 import { HomeAssistant } from "../../types";
-import { SupervisorArch } from "../supervisor/supervisor";
 import { hassioApiResultExtractor, HassioResponse } from "./common";
 
-export type AddonStage = "stable" | "experimental" | "deprecated";
-export type AddonAppArmour = "disable" | "default" | "profile";
-export type AddonRole = "default" | "homeassistant" | "manager" | "admin";
-export type AddonStartup =
-  | "initialize"
-  | "system"
-  | "services"
-  | "application"
-  | "once";
-export type AddonState = "started" | "stopped" | null;
-export type AddonRepository = "core" | "local" | string;
-
-interface AddonTranslations {
-  [key: string]: Record<string, Record<string, Record<string, string>>>;
-}
-
 export interface HassioAddonInfo {
   advanced: boolean;
   available: boolean;
   build: boolean;
   description: string;
   detached: boolean;
-  homeassistant: string;
   icon: boolean;
   installed: boolean;
   logo: boolean;
   name: string;
-  repository: AddonRepository;
+  repository: "core" | "local" | string;
   slug: string;
-  stage: AddonStage;
-  state: AddonState;
+  stage: "stable" | "experimental" | "deprecated";
+  state: "started" | "stopped" | null;
   update_available: boolean;
   url: string | null;
   version_latest: string;
@@ -42,8 +23,8 @@ export interface HassioAddonInfo {
 }
 
 export interface HassioAddonDetails extends HassioAddonInfo {
-  apparmor: AddonAppArmour;
-  arch: SupervisorArch[];
+  apparmor: "disable" | "default" | "profile";
+  arch: "armhf" | "aarch64" | "i386" | "amd64";
   audio_input: null | string;
   audio_output: null | string;
   audio: boolean;
@@ -60,9 +41,10 @@ export interface HassioAddonDetails extends HassioAddonInfo {
   full_access: boolean;
   gpio: boolean;
   hassio_api: boolean;
-  hassio_role: AddonRole;
+  hassio_role: "default" | "homeassistant" | "manager" | "admin";
   hostname: string;
   homeassistant_api: boolean;
+  homeassistant: string;
   host_dbus: boolean;
   host_ipc: boolean;
   host_network: boolean;
@@ -81,12 +63,11 @@ export interface HassioAddonDetails extends HassioAddonInfo {
   privileged: any;
   protected: boolean;
   rating: "1-6";
-  schema: HaFormSchema[] | null;
+  schema: HaFormSchema[];
   services_role: string[];
   slug: string;
-  startup: AddonStartup;
+  startup: "initialize" | "system" | "services" | "application" | "once";
   stdin: boolean;
-  translations: AddonTranslations;
   watchdog: null | boolean;
   webui: null | string;
 }
@@ -120,28 +101,10 @@ export interface HassioAddonSetOptionParams {
 }
 
 export const reloadHassioAddons = async (hass: HomeAssistant) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/addons/reload",
-      method: "post",
-    });
-    return;
-  }
   await hass.callApi<HassioResponse<void>>("POST", `hassio/addons/reload`);
 };
 
-export const fetchHassioAddonsInfo = async (
-  hass: HomeAssistant
-): Promise<HassioAddonsInfo> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/addons",
-      method: "get",
-    });
-  }
-
+export const fetchHassioAddonsInfo = async (hass: HomeAssistant) => {
   return hassioApiResultExtractor(
     await hass.callApi<HassioResponse<HassioAddonsInfo>>("GET", `hassio/addons`)
   );
@@ -150,15 +113,7 @@ export const fetchHassioAddonsInfo = async (
 export const fetchHassioAddonInfo = async (
   hass: HomeAssistant,
   slug: string
-): Promise<HassioAddonDetails> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/addons/${slug}/info`,
-      method: "get",
-    });
-  }
-
+) => {
   return hassioApiResultExtractor(
     await hass.callApi<HassioResponse<HassioAddonDetails>>(
       "GET",
@@ -193,16 +148,6 @@ export const setHassioAddonOption = async (
   slug: string,
   data: HassioAddonSetOptionParams
 ) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/addons/${slug}/options`,
-      method: "post",
-      data,
-    });
-    return;
-  }
-
   await hass.callApi<HassioResponse<void>>(
     "POST",
     `hassio/addons/${slug}/options`,
@@ -213,64 +158,21 @@ export const setHassioAddonOption = async (
 export const validateHassioAddonOption = async (
   hass: HomeAssistant,
   slug: string
-): Promise<{ message: string; valid: boolean }> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/addons/${slug}/options/validate`,
-      method: "post",
-    });
-  }
-
-  return (
-    await hass.callApi<HassioResponse<{ message: string; valid: boolean }>>(
-      "POST",
-      `hassio/addons/${slug}/options/validate`
-    )
-  ).data;
+) => {
+  return await hass.callApi<
+    HassioResponse<{ message: string; valid: boolean }>
+  >("POST", `hassio/addons/${slug}/options/validate`);
 };
 
 export const startHassioAddon = async (hass: HomeAssistant, slug: string) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/addons/${slug}/start`,
-      method: "post",
-      timeout: null,
-    });
-  }
-
   return hass.callApi<string>("POST", `hassio/addons/${slug}/start`);
 };
 
-export const stopHassioAddon = async (hass: HomeAssistant, slug: string) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/addons/${slug}/stop`,
-      method: "post",
-      timeout: null,
-    });
-  }
-
-  return hass.callApi<string>("POST", `hassio/addons/${slug}/stop`);
-};
-
 export const setHassioAddonSecurity = async (
   hass: HomeAssistant,
   slug: string,
   data: HassioAddonSetSecurityParams
 ) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/addons/${slug}/security`,
-      method: "post",
-      data,
-    });
-    return;
-  }
-
   await hass.callApi<HassioResponse<void>>(
     "POST",
     `hassio/addons/${slug}/security`,
@@ -278,60 +180,15 @@ export const setHassioAddonSecurity = async (
   );
 };
 
-export const installHassioAddon = async (
-  hass: HomeAssistant,
-  slug: string
-): Promise<void> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/addons/${slug}/install`,
-      method: "post",
-      timeout: null,
-    });
-    return;
-  }
-
-  await hass.callApi<HassioResponse<void>>(
+export const installHassioAddon = async (hass: HomeAssistant, slug: string) => {
+  return hass.callApi<HassioResponse<void>>(
     "POST",
     `hassio/addons/${slug}/install`
   );
 };
 
-export const updateHassioAddon = async (
-  hass: HomeAssistant,
-  slug: string
-): Promise<void> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/store/addons/${slug}/update`,
-      method: "post",
-      timeout: null,
-    });
-  } else {
-    await hass.callApi<HassioResponse<void>>(
-      "POST",
-      `hassio/addons/${slug}/update`
-    );
-  }
-};
-
-export const restartHassioAddon = async (
-  hass: HomeAssistant,
-  slug: string
-): Promise<void> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/addons/${slug}/restart`,
-      method: "post",
-      timeout: null,
-    });
-    return;
-  }
-
-  await hass.callApi<HassioResponse<void>>(
+export const restartHassioAddon = async (hass: HomeAssistant, slug: string) => {
+  return hass.callApi<HassioResponse<void>>(
     "POST",
     `hassio/addons/${slug}/restart`
   );
@@ -341,16 +198,6 @@ export const uninstallHassioAddon = async (
   hass: HomeAssistant,
   slug: string
 ) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/addons/${slug}/uninstall`,
-      method: "post",
-      timeout: null,
-    });
-    return;
-  }
-
   await hass.callApi<HassioResponse<void>>(
     "POST",
     `hassio/addons/${slug}/uninstall`

src/data/hassio/common.ts

@@ -1,4 +1,3 @@
-import { atLeastVersion } from "../../common/config/version";
 import { HomeAssistant } from "../../types";
 
 export interface HassioResponse<T> {
@@ -34,14 +33,6 @@ export const fetchHassioStats = async (
   hass: HomeAssistant,
   container: string
 ): Promise<HassioStats> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/${container}/stats`,
-      method: "get",
-    });
-  }
-
   return hassioApiResultExtractor(
     await hass.callApi<HassioResponse<HassioStats>>(
       "GET",

src/data/hassio/docker.ts

@@ -1,4 +1,3 @@
-import { atLeastVersion } from "../../common/config/version";
 import { HomeAssistant } from "../../types";
 import { hassioApiResultExtractor, HassioResponse } from "./common";
 
@@ -6,17 +5,7 @@ interface HassioDockerRegistries {
   [key: string]: { username: string; password?: string };
 }
 
-export const fetchHassioDockerRegistries = async (
-  hass: HomeAssistant
-): Promise<HassioDockerRegistries> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/docker/registries`,
-      method: "get",
-    });
-  }
-
+export const fetchHassioDockerRegistries = async (hass: HomeAssistant) => {
   return hassioApiResultExtractor(
     await hass.callApi<HassioResponse<HassioDockerRegistries>>(
       "GET",
@@ -29,16 +18,6 @@ export const addHassioDockerRegistry = async (
   hass: HomeAssistant,
   data: HassioDockerRegistries
 ) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/docker/registries`,
-      method: "post",
-      data,
-    });
-    return;
-  }
-
   await hass.callApi<HassioResponse<HassioDockerRegistries>>(
     "POST",
     "hassio/docker/registries",
@@ -50,15 +29,6 @@ export const removeHassioDockerRegistry = async (
   hass: HomeAssistant,
   registry: string
 ) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/docker/registries/${registry}`,
-      method: "delete",
-    });
-    return;
-  }
-
   await hass.callApi<HassioResponse<void>>(
     "DELETE",
     `hassio/docker/registries/${registry}`

src/data/hassio/hardware.ts

@@ -1,4 +1,3 @@
-import { atLeastVersion } from "../../common/config/version";
 import { HomeAssistant } from "../../types";
 import { hassioApiResultExtractor, HassioResponse } from "./common";
 
@@ -22,17 +21,7 @@ export interface HassioHardwareInfo {
   audio: Record<string, unknown>;
 }
 
-export const fetchHassioHardwareAudio = async (
-  hass: HomeAssistant
-): Promise<HassioHardwareAudioList> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/hardware/audio`,
-      method: "get",
-    });
-  }
-
+export const fetchHassioHardwareAudio = async (hass: HomeAssistant) => {
   return hassioApiResultExtractor(
     await hass.callApi<HassioResponse<HassioHardwareAudioList>>(
       "GET",
@@ -41,17 +30,7 @@ export const fetchHassioHardwareAudio = async (
   );
 };
 
-export const fetchHassioHardwareInfo = async (
-  hass: HomeAssistant
-): Promise<HassioHardwareInfo> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/hardware/info`,
-      method: "get",
-    });
-  }
-
+export const fetchHassioHardwareInfo = async (hass: HomeAssistant) => {
   return hassioApiResultExtractor(
     await hass.callApi<HassioResponse<HassioHardwareInfo>>(
       "GET",

src/data/hassio/host.ts

@@ -1,4 +1,3 @@
-import { atLeastVersion } from "../../common/config/version";
 import { HomeAssistant } from "../../types";
 import { hassioApiResultExtractor, HassioResponse } from "./common";
 
@@ -6,7 +5,6 @@ export type HassioHostInfo = {
   chassis: string;
   cpe: string;
   deployment: string;
-  disk_life_time: number | "";
   disk_free: number;
   disk_total: number;
   disk_used: number;
@@ -24,17 +22,7 @@ export interface HassioHassOSInfo {
   version: string | null;
 }
 
-export const fetchHassioHostInfo = async (
-  hass: HomeAssistant
-): Promise<HassioHostInfo> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/host/info",
-      method: "get",
-    });
-  }
-
+export const fetchHassioHostInfo = async (hass: HomeAssistant) => {
   const response = await hass.callApi<HassioResponse<HassioHostInfo>>(
     "GET",
     "hassio/host/info"
@@ -42,17 +30,7 @@ export const fetchHassioHostInfo = async (
   return hassioApiResultExtractor(response);
 };
 
-export const fetchHassioHassOsInfo = async (
-  hass: HomeAssistant
-): Promise<HassioHassOSInfo> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/os/info",
-      method: "get",
-    });
-  }
-
+export const fetchHassioHassOsInfo = async (hass: HomeAssistant) => {
   return hassioApiResultExtractor(
     await hass.callApi<HassioResponse<HassioHassOSInfo>>(
       "GET",
@@ -62,67 +40,22 @@ export const fetchHassioHassOsInfo = async (
 };
 
 export const rebootHost = async (hass: HomeAssistant) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/host/reboot",
-      method: "post",
-      timeout: null,
-    });
-  }
-
   return hass.callApi<HassioResponse<void>>("POST", "hassio/host/reboot");
 };
 
 export const shutdownHost = async (hass: HomeAssistant) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/host/shutdown",
-      method: "post",
-      timeout: null,
-    });
-  }
-
   return hass.callApi<HassioResponse<void>>("POST", "hassio/host/shutdown");
 };
 
 export const updateOS = async (hass: HomeAssistant) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/os/update",
-      method: "post",
-      timeout: null,
-    });
-  }
-
   return hass.callApi<HassioResponse<void>>("POST", "hassio/os/update");
 };
 
 export const configSyncOS = async (hass: HomeAssistant) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "os/config/sync",
-      method: "post",
-      timeout: null,
-    });
-  }
-
   return hass.callApi<HassioResponse<void>>("POST", "hassio/os/config/sync");
 };
 
 export const changeHostOptions = async (hass: HomeAssistant, options: any) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    return await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/host/options",
-      method: "post",
-      data: options,
-    });
-  }
-
   return hass.callApi<HassioResponse<void>>(
     "POST",
     "hassio/host/options",