Align entity registry buttons

.devcontainer/devcontainer.json

@@ -5,39 +5,33 @@
     "context": ".."
   },
   "appPort": "8124:8123",
+  "context": "..",
   "postCreateCommand": "script/bootstrap",
+  "extensions": [
+    "github.vscode-pull-request-github",
+    "dbaeumer.vscode-eslint",
+    "ms-vscode.vscode-typescript-tslint-plugin",
+    "esbenp.prettier-vscode",
+    "bierner.lit-html",
+    "runem.lit-plugin",
+    "ms-python.vscode-pylance"
+  ],
   "containerEnv": {
     "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
   },
-  "customizations": {
+  "settings": {
-    "vscode": {
+    "terminal.integrated.shell.linux": "/bin/bash",
-      "extensions": [
+    "files.eol": "\n",
-        "dbaeumer.vscode-eslint",
+    "editor.tabSize": 2,
-        "esbenp.prettier-vscode",
+    "editor.formatOnPaste": false,
-        "runem.lit-plugin",
+    "editor.formatOnSave": true,
-        "github.vscode-pull-request-github",
+    "editor.formatOnType": true,
-        "eamodio.gitlens"
+    "[typescript]": {
-      ],
+      "editor.defaultFormatter": "esbenp.prettier-vscode"
-      "settings": {
+    },
-        "files.eol": "\n",
+    "[javascript]": {
-        "editor.tabSize": 2,
+      "editor.defaultFormatter": "esbenp.prettier-vscode"
-        "editor.formatOnPaste": false,
+    },
-        "editor.formatOnSave": true,
+    "files.trimTrailingWhitespace": true
-        "editor.formatOnType": true,
-        "editor.renderWhitespace": "boundary",
-        "editor.rulers": [80],
-        "[typescript]": {
-          "editor.defaultFormatter": "esbenp.prettier-vscode"
-        },
-        "[javascript]": {
-          "editor.defaultFormatter": "esbenp.prettier-vscode"
-        },
-        "files.trimTrailingWhitespace": true,
-        "terminal.integrated.shell.linux": "/usr/bin/zsh",
-        "gitlens.showWelcomeOnInstall": false,
-        "gitlens.showWhatsNewAfterUpgrades": false,
-        "workbench.startupEditor": "none"
-      }
-    }
   }
 }

.github/dependabot.yml

@@ -6,9 +6,3 @@ updates:
       interval: weekly
       time: "06:00"
     open-pull-requests-limit: 10
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "daily"
-      time: "06:00"
-    open-pull-requests-limit: 5

.github/workflows/cast_deployment.yaml

@@ -1,90 +0,0 @@
-name: Cast deployment
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *"
-  push:
-    branches:
-      - master
-
-env:
-  NODE_VERSION: 16
-  NODE_OPTIONS: --max_old_space_size=6144
-
-jobs:
-  deploy_dev:
-    runs-on: ubuntu-latest
-    name: Deploy Development
-    if: github.event_name != 'push'
-    environment:
-      name: Cast Development
-      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
-        with:
-          ref: dev
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-
-      - name: Build Cast
-        run: ./node_modules/.bin/gulp build-cast
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Deploy to Netlify
-        id: deploy
-        uses: netlify/actions/cli@master
-        with:
-          args: deploy --dir=cast/dist --alias dev
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_CAST_SITE_ID }}
-
-  deploy_master:
-    runs-on: ubuntu-latest
-    name: Deploy Production
-    if: github.event_name == 'push'
-    environment:
-      name: Cast Production
-      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
-        with:
-          ref: master
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-
-      - name: Build Cast
-        run: ./node_modules/.bin/gulp build-cast
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Deploy to Netlify
-        id: deploy
-        uses: netlify/actions/cli@master
-        with:
-          args: deploy --dir=cast/dist --prod
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_CAST_SITE_ID }}

.github/workflows/ci.yaml

@@ -13,16 +13,15 @@ on:
 env:
   NODE_VERSION: 16
   NODE_OPTIONS: --max_old_space_size=6144
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -44,9 +43,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -63,9 +62,9 @@ jobs:
     needs: [lint, test]
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -82,9 +81,9 @@ jobs:
     needs: [lint, test]
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.2.0
+      uses: actions/checkout@v3
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

.github/workflows/demo.yaml

@@ -0,0 +1,35 @@
+name: Demo
+
+on:
+  push:
+    branches:
+      - dev
+
+env:
+  NODE_VERSION: 16
+  NODE_OPTIONS: --max_old_space_size=6144
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out files from GitHub
+        uses: actions/checkout@v3
+      - name: Set up Node ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: yarn
+      - name: Install dependencies
+        run: yarn install
+        env:
+          CI: true
+      - name: Build Demo
+        run: ./node_modules/.bin/gulp build-demo
+      - name: Deploy to Netlify
+        uses: netlify/actions/cli@master
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEMO_DEV_SITE_ID }}
+        with:
+          args: deploy --dir=demo/dist --prod

.github/workflows/demo_deployment.yaml

@@ -1,91 +0,0 @@
-name: Demo deployment
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *"
-  push:
-    branches:
-      - dev
-      - master
-
-env:
-  NODE_VERSION: 16
-  NODE_OPTIONS: --max_old_space_size=6144
-
-jobs:
-  deploy_dev:
-    runs-on: ubuntu-latest
-    name: Demo Development
-    if: github.event_name != 'push' || github.ref != 'master'
-    environment:
-      name: Demo Development
-      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
-        with:
-          ref: dev
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-
-      - name: Build Demo
-        run: ./node_modules/.bin/gulp build-demo
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Deploy to Netlify
-        id: deploy
-        uses: netlify/actions/cli@master
-        with:
-          args: deploy --dir=demo/dist --prod
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEMO_DEV_SITE_ID }}
-
-  deploy_master:
-    runs-on: ubuntu-latest
-    name: Demo Production
-    if: github.event_name == 'push' && github.ref == 'master'
-    environment:
-      name: Demo Production
-      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
-        with:
-          ref: master
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-
-      - name: Build Demo
-        run: ./node_modules/.bin/gulp build-demo
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Deploy to Netlify
-        id: deploy
-        uses: netlify/actions/cli@master
-        with:
-          args: deploy --dir=demo/dist --prod
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEMO_SITE_ID }}

.github/workflows/design_deployment.yaml

@@ -1,45 +0,0 @@
-name: Design deployment
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *"
-
-env:
-  NODE_VERSION: 16
-  NODE_OPTIONS: --max_old_space_size=6144
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    environment:
-      name: Design
-      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-
-      - name: Build Gallery
-        run: ./node_modules/.bin/gulp build-gallery
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Deploy to Netlify
-        id: deploy
-        uses: netlify/actions/cli@master
-        with:
-          args: deploy --dir=gallery/dist --prod
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_GALLERY_SITE_ID }}

.github/workflows/design_preview.yaml

@@ -1,54 +0,0 @@
-name: Design preview
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - labeled
-    branches:
-      - dev
-
-env:
-  NODE_VERSION: 16
-  NODE_OPTIONS: --max_old_space_size=6144
-
-jobs:
-  preview:
-    runs-on: ubuntu-latest
-    # Skip running on forks since it won't have access to secrets
-    # Skip running PRs without 'needs design preview' label
-    if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview')
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-
-      - name: Build Gallery
-        run: ./node_modules/.bin/gulp build-gallery
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Deploy preview to Netlify
-        id: deploy
-        uses: netlify/actions/cli@master
-        with:
-          args: deploy --dir=gallery/dist --alias "deploy-preview-${{ github.event.number }}"
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_GALLERY_SITE_ID }}
-
-      - name: Generate summary
-        run: |
-          echo "${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}" >> "$GITHUB_STEP_SUMMARY"

.github/workflows/lock.yml

@@ -9,7 +9,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4.0.0
+      - uses: dessant/lock-threads@v3.0.0
         with:
           github-token: ${{ github.token }}
           issue-lock-inactive-days: "30"

.github/workflows/netflify.yml

@@ -0,0 +1,19 @@
+name: Netlify
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  trigger_builds:
+    name: Trigger netlify build preview
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: Trigger Cast build
+        run: curl -X POST -d {} https://api.netlify.com/build_hooks/${{ secrets.NETLIFY_CAST_DEV_BUILD_HOOK }}
+
+      - name: Trigger Demo build
+        run: curl -X POST -d {} https://api.netlify.com/build_hooks/${{ secrets.NETLIFY_DEMO_DEV_BUILD_HOOK }}
+
+      - name: Trigger Design build
+        run: curl -X POST -d "NIGHTLY" https://api.netlify.com/build_hooks/${{ secrets.NETLIFY_GALLERY_DEV_BUILD_HOOK }}

.github/workflows/nightly.yaml

@@ -21,7 +21,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v4
@@ -29,7 +29,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -49,8 +49,9 @@ jobs:
         run: |
           pip install build
           yarn install
-          export SKIP_FETCH_NIGHTLY_TRANSLATIONS=1
+
           script/build_frontend
+
           rm -rf dist home_assistant_frontend.egg-info
           python3 -m build
 

.github/workflows/release.yaml

@@ -24,7 +24,7 @@ jobs:
       contents: write # Required to upload release assets
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3
 
       - name: Verify version
         uses: home-assistant/actions/helpers/verify-version@master
@@ -35,7 +35,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -52,11 +52,11 @@ jobs:
           python3 -m pip install twine build
           export TWINE_USERNAME="__token__"
           export TWINE_PASSWORD="${{ secrets.TWINE_TOKEN }}"
-          export SKIP_FETCH_NIGHTLY_TRANSLATIONS=1
+
           script/release
 
       - name: Upload release assets
-        uses: softprops/action-gh-release@v0.1.15
+        uses: softprops/action-gh-release@v0.1.14
         with:
           files: |
             dist/*.whl
@@ -75,7 +75,7 @@ jobs:
           echo "home-assistant-frontend==$version" > ./requirements.txt
 
       - name: Build wheels
-        uses: home-assistant/wheels@2022.10.1
+        uses: home-assistant/wheels@2022.06.7
         with:
           abi: cp310
           tag: musllinux_1_2

.github/workflows/stale.yml

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

.github/workflows/translations.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3
 
       - name: Upload Translations
         run: |

.gitignore

@@ -2,20 +2,19 @@
 .reify-cache
 
 # build
-build/
+build
-dist/
+hass_frontend/*
-/hass_frontend/
+dist
-/translations/
 
 # yarn
-.yarn/**
+.yarn/*
 !.yarn/patches
 !.yarn/releases
 !.yarn/plugins
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
-/node_modules/
+node_modules/*
 yarn-error.log
 npm-debug.log
 
@@ -27,11 +26,11 @@ npm-debug.log
 # venv stuff
 pyvenv.cfg
 pip-selfcheck.json
-/venv/
+venv/*
 .venv
 
 # vscode
-.vscode/**
+.vscode/*
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/tasks.json
@@ -46,4 +45,4 @@ src/cast/dev_const.ts
 .tool-versions
 
 # Home Assistant config
-/config/
+/config

.vscode/extensions.json

@@ -2,8 +2,7 @@
   "recommendations": [
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
-    "runem.lit-plugin",
+    "bierner.lit-html",
-    "github.vscode-pull-request-github",
+    "runem.lit-plugin"
-    "eamodio.gitlens"
   ]
 }

.vscode/tasks.json

@@ -191,13 +191,7 @@
       "runOptions": {
         "instanceLimit": 1
       }
-    },
+    }
-    {
-      "label": "Setup and fetch nightly translations",
-      "type": "gulp",
-      "task": "setup-and-fetch-nightly-translations",
-      "problemMatcher": []
-          }
   ],
   "inputs": [
     {

.yarnrc.yml

@@ -6,4 +6,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.2.3.cjs
+yarnPath: .yarn/releases/yarn-3.2.0.cjs

build-scripts/.eslintrc

@@ -0,0 +1,7 @@
+{
+  "rules": {
+    "import/no-extraneous-dependencies": 0,
+    "no-restricted-syntax": 0,
+    "no-console": 0
+  }
+}

build-scripts/.eslintrc.json

@@ -1,12 +1,7 @@
 {
   "extends": "../.eslintrc.json",
   "rules": {
-    "no-console": "off",
+    "import/no-extraneous-dependencies": 0,
-    "import/no-extraneous-dependencies": "off",
+    "global-require": 0
-    "import/extensions": "off",
-    "import/no-dynamic-require": "off",
-    "global-require": "off",
-    "@typescript-eslint/no-var-requires": "off",
-    "prefer-arrow-callback": "off"
   }
 }

build-scripts/babel-plugins/inline-constants-plugin.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require("path");
 
 // Currently only supports CommonJS modules, as require is synchronous. `import` would need babel running asynchronous.
@@ -28,6 +29,7 @@ module.exports = function inlineConstants(babel, options, cwd) {
       const absolute = module.startsWith(".")
         ? require.resolve(module, { paths: [cwd] })
         : module;
+      // eslint-disable-next-line import/no-dynamic-require
       return [absolute, require(absolute)];
     })
   );

build-scripts/bundle.js

@@ -1,9 +1,9 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require("path");
 const env = require("./env.js");
 const paths = require("./paths.js");
 
 // Files from NPM Packages that should not be imported
-// eslint-disable-next-line unused-imports/no-unused-vars
 module.exports.ignorePackages = ({ latestBuild }) => [
   // Part of yaml.js and only used for !!js functions that we don't use
   require.resolve("esprima"),

build-scripts/env.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const fs = require("fs");
 const path = require("path");
 const paths = require("./paths.js");

build-scripts/gulp/download_translations.js

@@ -1,12 +1,17 @@
+const del = require("del");
 const gulp = require("gulp");
-const fs = require("fs/promises");
+const fs = require("fs");
 const mapStream = require("map-stream");
 
 const inDirFrontend = "translations/frontend";
 const inDirBackend = "translations/backend";
+const downloadDir = "translations/downloads";
 const srcMeta = "src/translations/translationMetadata.json";
+
 const encoding = "utf8";
 
+const tasks = [];
+
 function hasHtml(data) {
   return /<[a-z][\s\S]*>/i.test(data);
 }
@@ -41,29 +46,50 @@ function checkHtml() {
   });
 }
 
-// Backend translations do not currently pass HTML check so are excluded here for now
+let taskName = "clean-downloaded-translations";
-gulp.task("check-translations-html", function () {
+gulp.task(taskName, function () {
-  return gulp.src([`${inDirFrontend}/*.json`]).pipe(checkHtml());
+  return del([`${downloadDir}/**`]);
 });
+tasks.push(taskName);
 
-gulp.task("check-all-files-exist", async function () {
+taskName = "check-translations-html";
-  const file = await fs.readFile(srcMeta, { encoding });
+gulp.task(taskName, function () {
+  return gulp.src(`${downloadDir}/*.json`).pipe(checkHtml());
+});
+tasks.push(taskName);
+
+taskName = "check-all-files-exist";
+gulp.task(taskName, function () {
+  const file = fs.readFileSync(srcMeta, { encoding });
   const meta = JSON.parse(file);
-  const writings = [];
   Object.keys(meta).forEach((lang) => {
-    writings.push(
+    if (!fs.existsSync(`${inDirFrontend}/${lang}.json`)) {
-      fs.writeFile(`${inDirFrontend}/${lang}.json`, JSON.stringify({}), {
+      fs.writeFileSync(`${inDirFrontend}/${lang}.json`, JSON.stringify({}));
-        flag: "wx",
+    }
-      }),
+    if (!fs.existsSync(`${inDirBackend}/${lang}.json`)) {
-      fs.writeFile(`${inDirBackend}/${lang}.json`, JSON.stringify({}), {
+      fs.writeFileSync(`${inDirBackend}/${lang}.json`, JSON.stringify({}));
-        flag: "wx",
+    }
-      })
-    );
   });
-  await Promise.allSettled(writings);
+  return Promise.resolve();
 });
+tasks.push(taskName);
 
+taskName = "move-downloaded-translations";
+gulp.task(taskName, function () {
+  return gulp.src(`${downloadDir}/*.json`).pipe(gulp.dest(inDirFrontend));
+});
+tasks.push(taskName);
+
+taskName = "check-downloaded-translations";
 gulp.task(
-  "check-downloaded-translations",
+  taskName,
-  gulp.series("check-translations-html", "check-all-files-exist")
+  gulp.series(
+    "check-translations-html",
+    "move-downloaded-translations",
+    "check-all-files-exist",
+    "clean-downloaded-translations"
+  )
 );
+tasks.push(taskName);
+
+module.exports = tasks;

build-scripts/gulp/entry-html.js

@@ -1,4 +1,6 @@
 // Tasks to generate entry HTML
+/* eslint-disable import/no-dynamic-require */
+/* eslint-disable global-require */
 const gulp = require("gulp");
 const fs = require("fs-extra");
 const path = require("path");
@@ -89,9 +91,7 @@ gulp.task("gen-pages-prod", (done) => {
 });
 
 gulp.task("gen-index-app-dev", (done) => {
-  let latestAppJS;
+  let latestAppJS, latestCoreJS, latestCustomPanelJS;
-  let latestCoreJS;
-  let latestCustomPanelJS;
 
   if (env.useWDS()) {
     latestAppJS = "http://localhost:8000/src/entrypoints/app.ts";

build-scripts/gulp/fetch-nightly_translations.js

@@ -1,170 +0,0 @@
-// Task to download the latest Lokalise translations from the nightly workflow artifacts
-
-const fs = require("fs/promises");
-const path = require("path");
-const process = require("process");
-const del = require("del");
-const gulp = require("gulp");
-const jszip = require("jszip");
-const tar = require("tar");
-const { Octokit } = require("@octokit/rest");
-const { createOAuthDeviceAuth } = require("@octokit/auth-oauth-device");
-
-const MAX_AGE = 24; // hours
-const OWNER = "home-assistant";
-const REPO = "frontend";
-const WORKFLOW_NAME = "nightly.yaml";
-const ARTIFACT_NAME = "translations";
-const CLIENT_ID = "Iv1.3914e28cb27834d1";
-const EXTRACT_DIR = "translations";
-const TOKEN_FILE = path.join(EXTRACT_DIR, "token.json");
-const ARTIFACT_FILE = path.join(EXTRACT_DIR, "artifact.json");
-
-let allowTokenSetup = false;
-gulp.task("allow-setup-fetch-nightly-translations", (done) => {
-  allowTokenSetup = true;
-  done();
-});
-
-gulp.task("fetch-nightly-translations", async function () {
-  // Skip all when environment flag is set (assumes translations are already in place)
-  if (process.env?.SKIP_FETCH_NIGHTLY_TRANSLATIONS) {
-    console.log("Skipping fetch due to environment signal");
-    return;
-  }
-
-  // Read current translations artifact info if it exists,
-  // and stop if they are not old enough
-  let currentArtifact;
-  try {
-    currentArtifact = JSON.parse(await fs.readFile(ARTIFACT_FILE, "utf-8"));
-    const currentAge =
-      (Date.now() - Date.parse(currentArtifact.created_at)) / 3600000;
-    if (currentAge < MAX_AGE) {
-      console.log(
-        "Keeping current translations (only %s hours old)",
-        currentAge.toFixed(1)
-      );
-      return;
-    }
-  } catch {
-    currentArtifact = null;
-  }
-
-  // To store file writing promises
-  const createExtractDir = fs.mkdir(EXTRACT_DIR, { recursive: true });
-  const writings = [];
-
-  // Authenticate to GitHub using GitHub action token if it exists,
-  // otherwise look for a saved user token or generate a new one if none
-  let tokenAuth;
-  if (process.env.GITHUB_TOKEN) {
-    tokenAuth = { token: process.env.GITHUB_TOKEN };
-  } else {
-    try {
-      tokenAuth = JSON.parse(await fs.readFile(TOKEN_FILE, "utf-8"));
-    } catch {
-      if (!allowTokenSetup) {
-        console.log("No token found so  build wil continue with English only");
-        return;
-      }
-      const auth = createOAuthDeviceAuth({
-        clientType: "github-app",
-        clientId: CLIENT_ID,
-        onVerification: (verification) => {
-          console.log(
-            "Task needs to authenticate to GitHub to fetch the translations from nightly workflow\n" +
-              "Please go to %s to authorize this task\n" +
-              "\nEnter user code: %s\n\n" +
-              "This code will expire in %s minutes\n" +
-              "Task will automatically continue after authorization and token will be saved for future use",
-            verification.verification_uri,
-            verification.user_code,
-            (verification.expires_in / 60).toFixed(0)
-          );
-        },
-      });
-      tokenAuth = await auth({ type: "oauth" });
-      writings.push(
-        createExtractDir.then(
-          fs.writeFile(TOKEN_FILE, JSON.stringify(tokenAuth, null, 2))
-        )
-      );
-    }
-  }
-
-  // Authenticate with token and request workflow runs from GitHub
-  console.log("Fetching new translations...");
-  const octokit = new Octokit({
-    userAgent: "Fetch Nightly Translations",
-    auth: tokenAuth.token,
-  });
-
-  const workflowRunsResponse = await octokit.rest.actions.listWorkflowRuns({
-    owner: OWNER,
-    repo: REPO,
-    workflow_id: WORKFLOW_NAME,
-    status: "success",
-    event: "schedule",
-    per_page: 1,
-    exclude_pull_requests: true,
-  });
-  if (workflowRunsResponse.data.total_count === 0) {
-    throw Error("No successful nightly workflow runs found");
-  }
-  const latestNightlyRun = workflowRunsResponse.data.workflow_runs[0];
-
-  // Stop if current is already the latest, otherwise Find the translations artifact
-  if (currentArtifact?.workflow_run.id === latestNightlyRun.id) {
-    console.log("Stopping because current translations are still the latest");
-    return;
-  }
-  const latestArtifact = (
-    await octokit.actions.listWorkflowRunArtifacts({
-      owner: OWNER,
-      repo: REPO,
-      run_id: latestNightlyRun.id,
-    })
-  ).data.artifacts.find((artifact) => artifact.name === ARTIFACT_NAME);
-  if (!latestArtifact) {
-    throw Error("Latest nightly workflow run has no translations artifact");
-  }
-  writings.push(
-    createExtractDir.then(
-      fs.writeFile(ARTIFACT_FILE, JSON.stringify(latestArtifact, null, 2))
-    )
-  );
-
-  // Remove the current translations
-  const deleteCurrent = Promise.all(writings).then(
-    del([`${EXTRACT_DIR}/*`, `!${ARTIFACT_FILE}`, `!${TOKEN_FILE}`])
-  );
-
-  // Get the download URL and follow the redirect to download (stored as ArrayBuffer)
-  const downloadResponse = await octokit.actions.downloadArtifact({
-    owner: OWNER,
-    repo: REPO,
-    artifact_id: latestArtifact.id,
-    archive_format: "zip",
-  });
-  if (downloadResponse.status !== 200) {
-    throw Error("Failure downloading translations artifact");
-  }
-
-  // Artifact is a tarball, but GitHub adds it to a zip file
-  console.log("Unpacking downloaded translations...");
-  const zip = await jszip.loadAsync(downloadResponse.data);
-  await deleteCurrent;
-  const extractStream = zip.file(/.*/)[0].nodeStream().pipe(tar.extract());
-  await new Promise((resolve, reject) => {
-    extractStream.on("close", resolve).on("error", reject);
-  });
-});
-
-gulp.task(
-  "setup-and-fetch-nightly-translations",
-  gulp.series(
-    "allow-setup-fetch-nightly-translations",
-    "fetch-nightly-translations"
-  )
-);

build-scripts/gulp/gallery.js

@@ -1,3 +1,4 @@
+/* eslint-disable */
 // Run demo develop mode
 const gulp = require("gulp");
 const fs = require("fs");
@@ -40,7 +41,7 @@ gulp.task("gather-gallery-pages", async function gatherPages() {
     }
     processed.add(pageId);
 
-    const [category] = pageId.split("/", 2);
+    const [category, name] = pageId.split("/", 2);
 
     const demoFile = path.resolve(pageDir, `${pageId}.ts`);
     const descriptionFile = path.resolve(pageDir, `${pageId}.markdown`);

build-scripts/gulp/locale-data.js

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+
 const del = require("del");
 const path = require("path");
 const gulp = require("gulp");

build-scripts/gulp/rollup.js

@@ -5,9 +5,9 @@ const rollup = require("rollup");
 const handler = require("serve-handler");
 const http = require("http");
 const log = require("fancy-log");
-const open = require("open");
 const rollupConfig = require("../rollup");
 const paths = require("../paths");
+const open = require("open");
 
 const bothBuilds = (createConfigFunc, params) =>
   gulp.series(
@@ -30,11 +30,11 @@ const bothBuilds = (createConfigFunc, params) =>
   );
 
 function createServer(serveOptions) {
-  const server = http.createServer((request, response) =>
+  const server = http.createServer((request, response) => {
-    handler(request, response, {
+    return handler(request, response, {
       public: serveOptions.root,
-    })
+    });
-  );
+  });
 
   server.listen(
     serveOptions.port,

build-scripts/gulp/service-worker.js

@@ -1,5 +1,7 @@
 // Generate service worker.
 // Based on manifest, create a file with the content as service_worker.js
+/* eslint-disable import/no-dynamic-require */
+/* eslint-disable global-require */
 const gulp = require("gulp");
 const path = require("path");
 const fs = require("fs-extra");

build-scripts/gulp/translations.js

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+
 const crypto = require("crypto");
 const del = require("del");
 const path = require("path");
@@ -13,8 +15,6 @@ const { mapFiles } = require("../util");
 const env = require("../env");
 const paths = require("../paths");
 
-require("./fetch-nightly_translations");
-
 const inFrontendDir = "translations/frontend";
 const inBackendDir = "translations/backend";
 const workDir = "build/translations";
@@ -23,13 +23,10 @@ const coreDir = workDir + "/core";
 const outDir = workDir + "/output";
 let mergeBackend = false;
 
-gulp.task(
+gulp.task("translations-enable-merge-backend", (done) => {
-  "translations-enable-merge-backend",
+  mergeBackend = true;
-  gulp.parallel((done) => {
+  done();
-    mergeBackend = true;
+});
-    done();
-  }, "allow-setup-fetch-nightly-translations")
-);
 
 // Panel translations which should be split from the core translations.
 const TRANSLATION_FRAGMENTS = Object.keys(
@@ -173,24 +170,17 @@ gulp.task("build-master-translation", () => {
     .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
     .pipe(
       merge({
-        fileName: "en.json",
+        fileName: "translationMaster.json",
       })
     )
-    .pipe(gulp.dest(fullDir));
+    .pipe(gulp.dest(workDir));
 });
 
 gulp.task("build-merged-translations", () =>
   gulp
-    .src(
+    .src([inFrontendDir + "/*.json", workDir + "/test.json"], {
-      [
+      allowEmpty: true,
-        inFrontendDir + "/*.json",
+    })
-        "!" + inFrontendDir + "/en.json",
-        workDir + "/test.json",
-      ],
-      {
-        allowEmpty: true,
-      }
-    )
     .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
     .pipe(
       flatmap((stream, file) => {
@@ -203,7 +193,7 @@ gulp.task("build-merged-translations", () =>
         //       than a base translation + region.
         const tr = path.basename(file.history[0], ".json");
         const subtags = tr.split("-");
-        const src = [fullDir + "/en.json"];
+        const src = [workDir + "/translationMaster.json"];
         for (let i = 1; i <= subtags.length; i++) {
           const lang = subtags.slice(0, i).join("-");
           if (lang === "test") {
@@ -388,6 +378,7 @@ gulp.task("build-translation-write-metadata", () =>
           if (value.nativeName) {
             newData[key] = value;
           } else {
+            // eslint-disable-next-line no-console
             console.warn(
               `Skipping language ${key}. Native name was not translated.`
             );
@@ -420,10 +411,8 @@ gulp.task(
 gulp.task(
   "build-translations",
   gulp.series(
-    gulp.parallel(
+    "clean-translations",
-      "fetch-nightly-translations",
+    "ensure-translations-build-dir",
-      gulp.series("clean-translations", "ensure-translations-build-dir")
-    ),
     "create-translations",
     "build-translation-fingerprints",
     "build-translation-write-metadata"
@@ -433,10 +422,8 @@ gulp.task(
 gulp.task(
   "build-supervisor-translations",
   gulp.series(
-    gulp.parallel(
+    "clean-translations",
-      "fetch-nightly-translations",
+    "ensure-translations-build-dir",
-      gulp.series("clean-translations", "ensure-translations-build-dir")
-    ),
     "build-master-translation",
     "build-merged-translations",
     "build-translation-fragment-supervisor",

build-scripts/gulp/webpack.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 // Tasks to run webpack.
 const fs = require("fs");
 const gulp = require("gulp");
@@ -68,6 +69,7 @@ const doneHandler = (done) => (err, stats) => {
   }
 
   if (stats.hasErrors() || stats.hasWarnings()) {
+    // eslint-disable-next-line no-console
     console.log(stats.toString("minimal"));
   }
 

build-scripts/paths.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require("path");
 
 module.exports = {

build-scripts/rollup-plugins/worker-plugin.js

@@ -81,13 +81,13 @@ module.exports = function (opts = {}) {
         opts.workerRegexp.flags
       );
       if (!workerRegexp.test(code)) {
-        return undefined;
+        return;
       }
 
       const ms = new MagicString(code);
       // Reset the regexp
       workerRegexp.lastIndex = 0;
-      for (;;) {
+      while (true) {
         const match = workerRegexp.exec(code);
         if (!match) {
           break;
@@ -98,7 +98,6 @@ module.exports = function (opts = {}) {
         // Parse the optional options object
         if (match[3] && match[3].length > 0) {
           // FIXME: ooooof!
-          // eslint-disable-next-line @typescript-eslint/no-implied-eval
           optionsObject = new Function(`return ${match[3].slice(1)};`)();
         }
         delete optionsObject.type;
@@ -111,14 +110,12 @@ module.exports = function (opts = {}) {
         }
 
         // Find worker file and store it as a chunk with ID prefixed for our loader
-        // eslint-disable-next-line no-await-in-loop
         const resolvedWorkerFile = (await this.resolve(workerFile, id)).id;
         let chunkRefId;
         if (resolvedWorkerFile in refIds) {
           chunkRefId = refIds[resolvedWorkerFile];
         } else {
           this.addWatchFile(resolvedWorkerFile);
-          // eslint-disable-next-line no-await-in-loop
           const source = await getBundledWorker(
             resolvedWorkerFile,
             rollupOptions

build-scripts/rollup.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require("path");
 
 const commonjs = require("@rollup/plugin-commonjs");

build-scripts/util.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require("path");
 const fs = require("fs");
 

build-scripts/webpack.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const webpack = require("webpack");
 const path = require("path");
 const TerserPlugin = require("terser-webpack-plugin");
@@ -102,6 +103,7 @@ const createWebpackConfig = ({
               ? path.resolve(context, resource)
               : require.resolve(resource);
           } catch (err) {
+            // eslint-disable-next-line no-console
             console.error(
               "Error in Home Assistant ignore plugin",
               resource,

cast/src/html/launcher-faq.html.template

@@ -213,7 +213,7 @@
         </p>
         <ul>
           <li>Google Chrome (all platforms except iOS)</li>
-          <li>Microsoft Edge (all platforms except iOS)</li>
+          <li>Microsoft Edge (all platforms)</li>
         </ul>
       </div>
 

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

@@ -88,7 +88,7 @@ class HcCast extends LitElement {
               >
                 ${(this.lovelaceConfig
                   ? this.lovelaceConfig.views
-                  : [generateDefaultViewConfig({}, {}, {}, {}, () => "")]
+                  : [generateDefaultViewConfig([], [], [], {}, () => "")]
                 ).map(
                   (view, idx) => html`
                     <paper-icon-item
@@ -181,7 +181,7 @@ class HcCast extends LitElement {
   private async _handlePickView(ev: Event) {
     const path = (ev.currentTarget as any).getAttribute("data-path");
     await ensureConnectedCastSession(this.castManager!, this.auth!);
-    castSendShowLovelaceView(this.castManager, path, this.auth.data.hassUrl);
+    castSendShowLovelaceView(this.castManager, path);
   }
 
   private async _handleLogout() {

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

@@ -44,7 +44,7 @@ class HcLayout extends LitElement {
       <div class="footer">
         <a href="./faq.html">Frequently Asked Questions</a> – Found a bug?
         <a
-          href="https://github.com/home-assistant/frontend/issues"
+          href="https://github.com/home-assistant/home-assistant-polymer/issues"
           target="_blank"
           >Let us know!</a
         >

cast/src/receiver/layout/hc-main.ts

@@ -33,6 +33,7 @@ import { castContext } from "../cast_context";
 import "./hc-launch-screen";
 
 let resourcesLoaded = false;
+
 @customElement("hc-main")
 export class HcMain extends HassElement {
   @state() private _showDemo = false;
@@ -45,8 +46,6 @@ export class HcMain extends HassElement {
 
   @state() private _urlPath?: string | null;
 
-  private _hassUUID?: string;
-
   private _unsubLovelace?: UnsubscribeFunc;
 
   public processIncomingMessage(msg: HassMessage) {
@@ -126,7 +125,6 @@ export class HcMain extends HassElement {
 
     if (this.hass) {
       status.hassUrl = this.hass.auth.data.hassUrl;
-      status.hassUUID = this._hassUUID;
       status.lovelacePath = this._lovelacePath;
       status.urlPath = this._urlPath;
     }
@@ -165,18 +163,6 @@ export class HcMain extends HassElement {
   };
 
   private async _handleGetStatusMessage(msg: GetStatusMessage) {
-    if (
-      (this.hass && msg.hassUUID && msg.hassUUID !== this._hassUUID) ||
-      (this.hass && msg.hassUrl && msg.hassUrl !== this.hass.auth.data.hassUrl)
-    ) {
-      this._error = "Not connected to the same Home Assistant instance.";
-      this._sendError(
-        ReceiverErrorCode.WRONG_INSTANCE,
-        this._error,
-        msg.senderId!
-      );
-    }
-
     this._sendStatus(msg.senderId!);
   }
 
@@ -193,7 +179,6 @@ export class HcMain extends HassElement {
           expires_in: 0,
         }),
       });
-      this._hassUUID = msg.hassUUID;
     } catch (err: any) {
       const errorMessage = this._getErrorMessage(err);
       this._error = errorMessage;
@@ -224,29 +209,9 @@ export class HcMain extends HassElement {
     if (!this.hass) {
       this._sendStatus(msg.senderId!);
       this._error = "Cannot show Lovelace because we're not connected.";
-      this._sendError(
+      this._sendError(ReceiverErrorCode.NOT_CONNECTED, this._error);
-        ReceiverErrorCode.NOT_CONNECTED,
-        this._error,
-        msg.senderId!
-      );
       return;
     }
-
-    if (
-      (msg.hassUUID && msg.hassUUID !== this._hassUUID) ||
-      (msg.hassUrl && msg.hassUrl !== this.hass.auth.data.hassUrl)
-    ) {
-      this._sendStatus(msg.senderId!);
-      this._error =
-        "Cannot show Lovelace because we're not connected to the same Home Assistant instance.";
-      this._sendError(
-        ReceiverErrorCode.WRONG_INSTANCE,
-        this._error,
-        msg.senderId!
-      );
-      return;
-    }
-
     this._error = undefined;
     if (msg.urlPath === "lovelace") {
       msg.urlPath = null;

demo/src/configs/arsaboo/entities.ts

@@ -508,7 +508,7 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         origin_addresses: ["XYZ"],
         status: "OK",
         mode: "driving",
-        units: "us_customary",
+        units: "imperial",
         duration_in_traffic: "41 mins",
         duration: "44 mins",
         distance: "34.3 mi",
@@ -527,7 +527,7 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         origin_addresses: ["XYZ"],
         status: "OK",
         mode: "driving",
-        units: "us_customary",
+        units: "imperial",
         duration_in_traffic: "37 mins",
         duration: "37 mins",
         distance: "30.2 mi",

demo/src/configs/jimpower/lovelace.ts

@@ -1196,7 +1196,7 @@ export const demoLovelaceJimpower: DemoConfig["lovelace"] = () => ({
                       left: "15%",
                     },
                     type: "state-icon",
-                    entity: "binary_sensor.water_leak_sensor_158d00026e26dc",
+                    entity: "binary_sensor.water_leak_sensor_158d0002338651",
                   },
                   {
                     prefix: "Kitchen: ",
@@ -1206,7 +1206,7 @@ export const demoLovelaceJimpower: DemoConfig["lovelace"] = () => ({
                       top: "89%",
                       left: "32%",
                     },
-                    entity: "binary_sensor.water_leak_sensor_158d00026e26dc",
+                    entity: "binary_sensor.water_leak_sensor_158d0002338651",
                   },
                   {
                     style: {
@@ -1215,7 +1215,7 @@ export const demoLovelaceJimpower: DemoConfig["lovelace"] = () => ({
                       left: "60%",
                     },
                     type: "state-icon",
-                    entity: "binary_sensor.water_leak_sensor_158d0002338651",
+                    entity: "binary_sensor.water_leak_sensor_158d00026e26dc",
                   },
                   {
                     prefix: "Bathroom: ",
@@ -1225,7 +1225,7 @@ export const demoLovelaceJimpower: DemoConfig["lovelace"] = () => ({
                       top: "89%",
                       left: "77%",
                     },
-                    entity: "binary_sensor.water_leak_sensor_158d0002338651",
+                    entity: "binary_sensor.water_leak_sensor_158d00026e26dc",
                   },
                 ],
                 type: "picture-elements",

demo/src/custom-cards/card-tools.js

@@ -138,7 +138,7 @@ if (!window.cardTools) {
       return cardTools.createThing("row", config);
 
     const domain = config.entity.split(".", 1)[0];
-    Object.assign(config, { type: DEFAULT_ROWS[domain] || "simple" });
+    Object.assign(config, { type: DEFAULT_ROWS[domain] || "text" });
     return cardTools.createThing("entity-row", config);
   };
 

demo/src/ha-demo.ts

@@ -20,7 +20,6 @@ import { mockHistory } from "./stubs/history";
 import { mockLovelace } from "./stubs/lovelace";
 import { mockMediaPlayer } from "./stubs/media_player";
 import { mockPersistentNotification } from "./stubs/persistent_notification";
-import { mockRecorder } from "./stubs/recorder";
 import { mockShoppingList } from "./stubs/shopping_list";
 import { mockSystemLog } from "./stubs/system_log";
 import { mockTemplate } from "./stubs/template";
@@ -46,7 +45,6 @@ class HaDemo extends HomeAssistantAppEl {
     mockAuth(hass);
     mockTranslations(hass);
     mockHistory(hass);
-    mockRecorder(hass);
     mockShoppingList(hass);
     mockSystemLog(hass);
     mockTemplate(hass);
@@ -63,14 +61,12 @@ class HaDemo extends HomeAssistantAppEl {
         area_id: null,
         disabled_by: null,
         entity_id: "sensor.co2_intensity",
-        id: "sensor.co2_intensity",
         name: null,
         icon: null,
         platform: "co2signal",
         hidden_by: null,
         entity_category: null,
         has_entity_name: false,
-        unique_id: "co2_intensity",
       },
       {
         config_entry_id: "co2signal",
@@ -78,14 +74,12 @@ class HaDemo extends HomeAssistantAppEl {
         area_id: null,
         disabled_by: null,
         entity_id: "sensor.grid_fossil_fuel_percentage",
-        id: "sensor.co2_intensity",
         name: null,
         icon: null,
         platform: "co2signal",
         hidden_by: null,
         entity_category: null,
         has_entity_name: false,
-        unique_id: "grid_fossil_fuel_percentage",
       },
     ]);
 
@@ -122,9 +116,3 @@ class HaDemo extends HomeAssistantAppEl {
 }
 
 customElements.define("ha-demo", HaDemo);
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-demo": HaDemo;
-  }
-}

demo/src/stubs/energy.ts

@@ -1,101 +1,90 @@
 import { format, startOfToday, startOfTomorrow } from "date-fns/esm";
-import {
+import { EnergySolarForecasts } from "../../../src/data/energy";
-  EnergyInfo,
-  EnergyPreferences,
-  EnergySolarForecasts,
-  FossilEnergyConsumption,
-} from "../../../src/data/energy";
 import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockEnergy = (hass: MockHomeAssistant) => {
-  hass.mockWS(
+  hass.mockWS("energy/get_prefs", () => ({
-    "energy/get_prefs",
+    energy_sources: [
-    (): EnergyPreferences => ({
+      {
-      energy_sources: [
+        type: "grid",
-        {
+        flow_from: [
-          type: "grid",
+          {
-          flow_from: [
+            stat_energy_from: "sensor.energy_consumption_tarif_1",
-            {
+            stat_cost: "sensor.energy_consumption_tarif_1_cost",
-              stat_energy_from: "sensor.energy_consumption_tarif_1",
+            entity_energy_from: "sensor.energy_consumption_tarif_1",
-              stat_cost: "sensor.energy_consumption_tarif_1_cost",
+            entity_energy_price: null,
-              entity_energy_price: null,
+            number_energy_price: null,
-              number_energy_price: null,
+          },
-            },
+          {
-            {
+            stat_energy_from: "sensor.energy_consumption_tarif_2",
-              stat_energy_from: "sensor.energy_consumption_tarif_2",
+            stat_cost: "sensor.energy_consumption_tarif_2_cost",
-              stat_cost: "sensor.energy_consumption_tarif_2_cost",
+            entity_energy_from: "sensor.energy_consumption_tarif_2",
-              entity_energy_price: null,
+            entity_energy_price: null,
-              number_energy_price: null,
+            number_energy_price: null,
-            },
+          },
-          ],
+        ],
-          flow_to: [
+        flow_to: [
-            {
+          {
-              stat_energy_to: "sensor.energy_production_tarif_1",
+            stat_energy_to: "sensor.energy_production_tarif_1",
-              stat_compensation:
+            stat_compensation: "sensor.energy_production_tarif_1_compensation",
-                "sensor.energy_production_tarif_1_compensation",
+            entity_energy_to: "sensor.energy_production_tarif_1",
-              entity_energy_price: null,
+            entity_energy_price: null,
-              number_energy_price: null,
+            number_energy_price: null,
-            },
+          },
-            {
+          {
-              stat_energy_to: "sensor.energy_production_tarif_2",
+            stat_energy_to: "sensor.energy_production_tarif_2",
-              stat_compensation:
+            stat_compensation: "sensor.energy_production_tarif_2_compensation",
-                "sensor.energy_production_tarif_2_compensation",
+            entity_energy_to: "sensor.energy_production_tarif_2",
-              entity_energy_price: null,
+            entity_energy_price: null,
-              number_energy_price: null,
+            number_energy_price: null,
-            },
+          },
-          ],
+        ],
-          cost_adjustment_day: 0,
+        cost_adjustment_day: 0,
-        },
+      },
-        {
+      {
-          type: "solar",
+        type: "solar",
-          stat_energy_from: "sensor.solar_production",
+        stat_energy_from: "sensor.solar_production",
-          config_entry_solar_forecast: ["solar_forecast"],
+        config_entry_solar_forecast: ["solar_forecast"],
-        },
+      },
-        /*         {
+      /* {
-          type: "battery",
+        type: "battery",
-          stat_energy_from: "sensor.battery_output",
+        stat_energy_from: "sensor.battery_output",
-          stat_energy_to: "sensor.battery_input",
+        stat_energy_to: "sensor.battery_input",
-        }, */
+      }, */
-        {
+      {
-          type: "gas",
+        type: "gas",
-          stat_energy_from: "sensor.energy_gas",
+        stat_energy_from: "sensor.energy_gas",
-          stat_cost: "sensor.energy_gas_cost",
+        stat_cost: "sensor.energy_gas_cost",
-          entity_energy_price: null,
+        entity_energy_from: "sensor.energy_gas",
-          number_energy_price: null,
+        entity_energy_price: null,
-        },
+        number_energy_price: null,
-      ],
+      },
-      device_consumption: [
+    ],
-        {
+    device_consumption: [
-          stat_consumption: "sensor.energy_car",
+      {
-        },
+        stat_consumption: "sensor.energy_car",
-        {
+      },
-          stat_consumption: "sensor.energy_ac",
+      {
-        },
+        stat_consumption: "sensor.energy_ac",
-        {
+      },
-          stat_consumption: "sensor.energy_washing_machine",
+      {
-        },
+        stat_consumption: "sensor.energy_washing_machine",
-        {
+      },
-          stat_consumption: "sensor.energy_dryer",
+      {
-        },
+        stat_consumption: "sensor.energy_dryer",
-        {
+      },
-          stat_consumption: "sensor.energy_heat_pump",
+      {
-        },
+        stat_consumption: "sensor.energy_heat_pump",
-        {
+      },
-          stat_consumption: "sensor.energy_boiler",
+      {
-        },
+        stat_consumption: "sensor.energy_boiler",
-      ],
+      },
-    })
+    ],
-  );
+  }));
-  hass.mockWS(
+  hass.mockWS("energy/info", () => ({ cost_sensors: [] }));
-    "energy/info",
+  hass.mockWS("energy/fossil_energy_consumption", ({ period }) => ({
-    (): EnergyInfo => ({ cost_sensors: {}, solar_forecast_domains: [] })
+    start: period === "month" ? 250 : period === "day" ? 10 : 2,
-  );
+  }));
-  hass.mockWS(
-    "energy/fossil_energy_consumption",
-    ({ period }): FossilEnergyConsumption => ({
-      start: period === "month" ? 250 : period === "day" ? 10 : 2,
-    })
-  );
   const todayString = format(startOfToday(), "yyyy-MM-dd");
   const tomorrowString = format(startOfTomorrow(), "yyyy-MM-dd");
   hass.mockWS(

demo/src/stubs/history.ts

@@ -1,4 +1,12 @@
+import {
+  addDays,
+  addHours,
+  addMonths,
+  differenceInHours,
+  endOfDay,
+} from "date-fns/esm";
 import { HassEntity } from "home-assistant-js-websocket";
+import { StatisticValue } from "../../../src/data/history";
 import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 interface HistoryQueryParams {
@@ -64,6 +72,331 @@ const generateHistory = (state, deltas) => {
 
 const incrementalUnits = ["clients", "queries", "ads"];
 
+const generateMeanStatistics = (
+  id: string,
+  start: Date,
+  end: Date,
+  period: "5minute" | "hour" | "day" | "month" = "hour",
+  initValue: number,
+  maxDiff: number
+) => {
+  const statistics: StatisticValue[] = [];
+  let currentDate = new Date(start);
+  currentDate.setMinutes(0, 0, 0);
+  let lastVal = initValue;
+  const now = new Date();
+  while (end > currentDate && currentDate < now) {
+    const delta = Math.random() * maxDiff;
+    const mean = lastVal + delta;
+    statistics.push({
+      statistic_id: id,
+      start: currentDate.toISOString(),
+      end: currentDate.toISOString(),
+      mean,
+      min: mean - Math.random() * maxDiff,
+      max: mean + Math.random() * maxDiff,
+      last_reset: "1970-01-01T00:00:00+00:00",
+      state: mean,
+      sum: null,
+    });
+    lastVal = mean;
+    currentDate =
+      period === "day"
+        ? addDays(currentDate, 1)
+        : period === "month"
+        ? addMonths(currentDate, 1)
+        : addHours(currentDate, 1);
+  }
+  return statistics;
+};
+
+const generateSumStatistics = (
+  id: string,
+  start: Date,
+  end: Date,
+  period: "5minute" | "hour" | "day" | "month" = "hour",
+  initValue: number,
+  maxDiff: number
+) => {
+  const statistics: StatisticValue[] = [];
+  let currentDate = new Date(start);
+  currentDate.setMinutes(0, 0, 0);
+  let sum = initValue;
+  const now = new Date();
+  while (end > currentDate && currentDate < now) {
+    const add = Math.random() * maxDiff;
+    sum += add;
+    statistics.push({
+      statistic_id: id,
+      start: currentDate.toISOString(),
+      end: currentDate.toISOString(),
+      mean: null,
+      min: null,
+      max: null,
+      last_reset: "1970-01-01T00:00:00+00:00",
+      state: initValue + sum,
+      sum,
+    });
+    currentDate =
+      period === "day"
+        ? addDays(currentDate, 1)
+        : period === "month"
+        ? addMonths(currentDate, 1)
+        : addHours(currentDate, 1);
+  }
+  return statistics;
+};
+
+const generateCurvedStatistics = (
+  id: string,
+  start: Date,
+  end: Date,
+  _period: "5minute" | "hour" | "day" | "month" = "hour",
+  initValue: number,
+  maxDiff: number,
+  metered: boolean
+) => {
+  const statistics: StatisticValue[] = [];
+  let currentDate = new Date(start);
+  currentDate.setMinutes(0, 0, 0);
+  let sum = initValue;
+  const hours = differenceInHours(end, start) - 1;
+  let i = 0;
+  let half = false;
+  const now = new Date();
+  while (end > currentDate && currentDate < now) {
+    const add = Math.random() * maxDiff;
+    sum += i * add;
+    statistics.push({
+      statistic_id: id,
+      start: currentDate.toISOString(),
+      end: currentDate.toISOString(),
+      mean: null,
+      min: null,
+      max: null,
+      last_reset: "1970-01-01T00:00:00+00:00",
+      state: initValue + sum,
+      sum: metered ? sum : null,
+    });
+    currentDate = addHours(currentDate, 1);
+    if (!half && i > hours / 2) {
+      half = true;
+    }
+    i += half ? -1 : 1;
+  }
+  return statistics;
+};
+
+const statisticsFunctions: Record<
+  string,
+  (
+    id: string,
+    start: Date,
+    end: Date,
+    period: "5minute" | "hour" | "day" | "month"
+  ) => StatisticValue[]
+> = {
+  "sensor.energy_consumption_tarif_1": (
+    id: string,
+    start: Date,
+    end: Date,
+    period = "hour"
+  ) => {
+    if (period !== "hour") {
+      return generateSumStatistics(
+        id,
+        start,
+        end,
+        period,
+        0,
+        period === "day" ? 17 : 504
+      );
+    }
+    const morningEnd = new Date(start.getTime() + 10 * 60 * 60 * 1000);
+    const morningLow = generateSumStatistics(
+      id,
+      start,
+      morningEnd,
+      period,
+      0,
+      0.7
+    );
+    const eveningStart = new Date(start.getTime() + 20 * 60 * 60 * 1000);
+    const morningFinalVal = morningLow.length
+      ? morningLow[morningLow.length - 1].sum!
+      : 0;
+    const empty = generateSumStatistics(
+      id,
+      morningEnd,
+      eveningStart,
+      period,
+      morningFinalVal,
+      0
+    );
+    const eveningLow = generateSumStatistics(
+      id,
+      eveningStart,
+      end,
+      period,
+      morningFinalVal,
+      0.7
+    );
+    return [...morningLow, ...empty, ...eveningLow];
+  },
+  "sensor.energy_consumption_tarif_2": (
+    id: string,
+    start: Date,
+    end: Date,
+    period = "hour"
+  ) => {
+    if (period !== "hour") {
+      return generateSumStatistics(
+        id,
+        start,
+        end,
+        period,
+        0,
+        period === "day" ? 17 : 504
+      );
+    }
+    const morningEnd = new Date(start.getTime() + 9 * 60 * 60 * 1000);
+    const eveningStart = new Date(start.getTime() + 20 * 60 * 60 * 1000);
+    const highTarif = generateSumStatistics(
+      id,
+      morningEnd,
+      eveningStart,
+      period,
+      0,
+      0.3
+    );
+    const highTarifFinalVal = highTarif.length
+      ? highTarif[highTarif.length - 1].sum!
+      : 0;
+    const morning = generateSumStatistics(id, start, morningEnd, period, 0, 0);
+    const evening = generateSumStatistics(
+      id,
+      eveningStart,
+      end,
+      period,
+      highTarifFinalVal,
+      0
+    );
+    return [...morning, ...highTarif, ...evening];
+  },
+  "sensor.energy_production_tarif_1": (id, start, end, period = "hour") =>
+    generateSumStatistics(id, start, end, period, 0, 0),
+  "sensor.energy_production_tarif_1_compensation": (
+    id,
+    start,
+    end,
+    period = "hour"
+  ) => generateSumStatistics(id, start, end, period, 0, 0),
+  "sensor.energy_production_tarif_2": (id, start, end, period = "hour") => {
+    if (period !== "hour") {
+      return generateSumStatistics(
+        id,
+        start,
+        end,
+        period,
+        0,
+        period === "day" ? 17 : 504
+      );
+    }
+    const productionStart = new Date(start.getTime() + 9 * 60 * 60 * 1000);
+    const productionEnd = new Date(start.getTime() + 21 * 60 * 60 * 1000);
+    const dayEnd = new Date(endOfDay(productionEnd));
+    const production = generateCurvedStatistics(
+      id,
+      productionStart,
+      productionEnd,
+      period,
+      0,
+      0.15,
+      true
+    );
+    const productionFinalVal = production.length
+      ? production[production.length - 1].sum!
+      : 0;
+    const morning = generateSumStatistics(
+      id,
+      start,
+      productionStart,
+      period,
+      0,
+      0
+    );
+    const evening = generateSumStatistics(
+      id,
+      productionEnd,
+      dayEnd,
+      period,
+      productionFinalVal,
+      0
+    );
+    const rest = generateSumStatistics(
+      id,
+      dayEnd,
+      end,
+      period,
+      productionFinalVal,
+      1
+    );
+    return [...morning, ...production, ...evening, ...rest];
+  },
+  "sensor.solar_production": (id, start, end, period = "hour") => {
+    if (period !== "hour") {
+      return generateSumStatistics(
+        id,
+        start,
+        end,
+        period,
+        0,
+        period === "day" ? 17 : 504
+      );
+    }
+    const productionStart = new Date(start.getTime() + 7 * 60 * 60 * 1000);
+    const productionEnd = new Date(start.getTime() + 23 * 60 * 60 * 1000);
+    const dayEnd = new Date(endOfDay(productionEnd));
+    const production = generateCurvedStatistics(
+      id,
+      productionStart,
+      productionEnd,
+      period,
+      0,
+      0.3,
+      true
+    );
+    const productionFinalVal = production.length
+      ? production[production.length - 1].sum!
+      : 0;
+    const morning = generateSumStatistics(
+      id,
+      start,
+      productionStart,
+      period,
+      0,
+      0
+    );
+    const evening = generateSumStatistics(
+      id,
+      productionEnd,
+      dayEnd,
+      period,
+      productionFinalVal,
+      0
+    );
+    const rest = generateSumStatistics(
+      id,
+      dayEnd,
+      end,
+      period,
+      productionFinalVal,
+      2
+    );
+    return [...morning, ...production, ...evening, ...rest];
+  },
+};
+
 export const mockHistory = (mockHass: MockHomeAssistant) => {
   mockHass.mockAPI(
     new RegExp("history/period/.+"),
@@ -133,4 +466,43 @@ export const mockHistory = (mockHass: MockHomeAssistant) => {
       return results;
     }
   );
+  mockHass.mockWS("recorder/get_statistics_metadata", () => []);
+  mockHass.mockWS("history/list_statistic_ids", () => []);
+  mockHass.mockWS(
+    "history/statistics_during_period",
+    ({ statistic_ids, start_time, end_time, period }, hass) => {
+      const start = new Date(start_time);
+      const end = end_time ? new Date(end_time) : new Date();
+
+      const statistics: Record<string, StatisticValue[]> = {};
+
+      statistic_ids.forEach((id: string) => {
+        if (id in statisticsFunctions) {
+          statistics[id] = statisticsFunctions[id](id, start, end, period);
+        } else {
+          const entityState = hass.states[id];
+          const state = entityState ? Number(entityState.state) : 1;
+          statistics[id] =
+            entityState && "last_reset" in entityState.attributes
+              ? generateSumStatistics(
+                  id,
+                  start,
+                  end,
+                  period,
+                  state,
+                  state * (state > 80 ? 0.01 : 0.05)
+                )
+              : generateMeanStatistics(
+                  id,
+                  start,
+                  end,
+                  period,
+                  state,
+                  state * (state > 80 ? 0.05 : 0.1)
+                );
+        }
+      });
+      return statistics;
+    }
+  );
 };

demo/src/stubs/recorder.ts

@@ -1,342 +0,0 @@
-import {
-  addDays,
-  addHours,
-  addMonths,
-  differenceInHours,
-  endOfDay,
-} from "date-fns";
-import {
-  Statistics,
-  StatisticsMetaData,
-  StatisticValue,
-} from "../../../src/data/recorder";
-import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-const generateMeanStatistics = (
-  start: Date,
-  end: Date,
-  period: "5minute" | "hour" | "day" | "month" = "hour",
-  initValue: number,
-  maxDiff: number
-): StatisticValue[] => {
-  const statistics: StatisticValue[] = [];
-  let currentDate = new Date(start);
-  currentDate.setMinutes(0, 0, 0);
-  let lastVal = initValue;
-  const now = new Date();
-  while (end > currentDate && currentDate < now) {
-    const delta = Math.random() * maxDiff;
-    const mean = lastVal + delta;
-    statistics.push({
-      start: currentDate.getTime(),
-      end: currentDate.getTime(),
-      mean,
-      min: mean - Math.random() * maxDiff,
-      max: mean + Math.random() * maxDiff,
-      last_reset: 0,
-      state: mean,
-      sum: null,
-    });
-    lastVal = mean;
-    currentDate =
-      period === "day"
-        ? addDays(currentDate, 1)
-        : period === "month"
-        ? addMonths(currentDate, 1)
-        : addHours(currentDate, 1);
-  }
-  return statistics;
-};
-
-const generateSumStatistics = (
-  start: Date,
-  end: Date,
-  period: "5minute" | "hour" | "day" | "month" = "hour",
-  initValue: number,
-  maxDiff: number
-): StatisticValue[] => {
-  const statistics: StatisticValue[] = [];
-  let currentDate = new Date(start);
-  currentDate.setMinutes(0, 0, 0);
-  let sum = initValue;
-  const now = new Date();
-  while (end > currentDate && currentDate < now) {
-    const add = Math.random() * maxDiff;
-    sum += add;
-    statistics.push({
-      start: currentDate.getTime(),
-      end: currentDate.getTime(),
-      mean: null,
-      min: null,
-      max: null,
-      last_reset: 0,
-      state: initValue + sum,
-      sum,
-    });
-    currentDate =
-      period === "day"
-        ? addDays(currentDate, 1)
-        : period === "month"
-        ? addMonths(currentDate, 1)
-        : addHours(currentDate, 1);
-  }
-  return statistics;
-};
-
-const generateCurvedStatistics = (
-  start: Date,
-  end: Date,
-  _period: "5minute" | "hour" | "day" | "month" = "hour",
-  initValue: number,
-  maxDiff: number,
-  metered: boolean
-): StatisticValue[] => {
-  const statistics: StatisticValue[] = [];
-  let currentDate = new Date(start);
-  currentDate.setMinutes(0, 0, 0);
-  let sum = initValue;
-  const hours = differenceInHours(end, start) - 1;
-  let i = 0;
-  let half = false;
-  const now = new Date();
-  while (end > currentDate && currentDate < now) {
-    const add = Math.random() * maxDiff;
-    sum += i * add;
-    statistics.push({
-      start: currentDate.getTime(),
-      end: currentDate.getTime(),
-      mean: null,
-      min: null,
-      max: null,
-      last_reset: 0,
-      state: initValue + sum,
-      sum: metered ? sum : null,
-    });
-    currentDate = addHours(currentDate, 1);
-    if (!half && i > hours / 2) {
-      half = true;
-    }
-    i += half ? -1 : 1;
-  }
-  return statistics;
-};
-
-const statisticsFunctions: Record<
-  string,
-  (
-    id: string,
-    start: Date,
-    end: Date,
-    period: "5minute" | "hour" | "day" | "month"
-  ) => StatisticValue[]
-> = {
-  "sensor.energy_consumption_tarif_1": (
-    _id: string,
-    start: Date,
-    end: Date,
-    period = "hour"
-  ) => {
-    if (period !== "hour") {
-      return generateSumStatistics(
-        start,
-        end,
-        period,
-        0,
-        period === "day" ? 17 : 504
-      );
-    }
-    const morningEnd = new Date(start.getTime() + 10 * 60 * 60 * 1000);
-    const morningLow = generateSumStatistics(start, morningEnd, period, 0, 0.7);
-    const eveningStart = new Date(start.getTime() + 20 * 60 * 60 * 1000);
-    const morningFinalVal = morningLow.length
-      ? morningLow[morningLow.length - 1].sum!
-      : 0;
-    const empty = generateSumStatistics(
-      morningEnd,
-      eveningStart,
-      period,
-      morningFinalVal,
-      0
-    );
-    const eveningLow = generateSumStatistics(
-      eveningStart,
-      end,
-      period,
-      morningFinalVal,
-      0.7
-    );
-    return [...morningLow, ...empty, ...eveningLow];
-  },
-  "sensor.energy_consumption_tarif_2": (
-    _id: string,
-    start: Date,
-    end: Date,
-    period = "hour"
-  ) => {
-    if (period !== "hour") {
-      return generateSumStatistics(
-        start,
-        end,
-        period,
-        0,
-        period === "day" ? 17 : 504
-      );
-    }
-    const morningEnd = new Date(start.getTime() + 9 * 60 * 60 * 1000);
-    const eveningStart = new Date(start.getTime() + 20 * 60 * 60 * 1000);
-    const highTarif = generateSumStatistics(
-      morningEnd,
-      eveningStart,
-      period,
-      0,
-      0.3
-    );
-    const highTarifFinalVal = highTarif.length
-      ? highTarif[highTarif.length - 1].sum!
-      : 0;
-    const morning = generateSumStatistics(start, morningEnd, period, 0, 0);
-    const evening = generateSumStatistics(
-      eveningStart,
-      end,
-      period,
-      highTarifFinalVal,
-      0
-    );
-    return [...morning, ...highTarif, ...evening];
-  },
-  "sensor.energy_production_tarif_1": (_id, start, end, period = "hour") =>
-    generateSumStatistics(start, end, period, 0, 0),
-  "sensor.energy_production_tarif_1_compensation": (
-    _id,
-    start,
-    end,
-    period = "hour"
-  ) => generateSumStatistics(start, end, period, 0, 0),
-  "sensor.energy_production_tarif_2": (_id, start, end, period = "hour") => {
-    if (period !== "hour") {
-      return generateSumStatistics(
-        start,
-        end,
-        period,
-        0,
-        period === "day" ? 17 : 504
-      );
-    }
-    const productionStart = new Date(start.getTime() + 9 * 60 * 60 * 1000);
-    const productionEnd = new Date(start.getTime() + 21 * 60 * 60 * 1000);
-    const dayEnd = new Date(endOfDay(productionEnd));
-    const production = generateCurvedStatistics(
-      productionStart,
-      productionEnd,
-      period,
-      0,
-      0.15,
-      true
-    );
-    const productionFinalVal = production.length
-      ? production[production.length - 1].sum!
-      : 0;
-    const morning = generateSumStatistics(start, productionStart, period, 0, 0);
-    const evening = generateSumStatistics(
-      productionEnd,
-      dayEnd,
-      period,
-      productionFinalVal,
-      0
-    );
-    const rest = generateSumStatistics(
-      dayEnd,
-      end,
-      period,
-      productionFinalVal,
-      1
-    );
-    return [...morning, ...production, ...evening, ...rest];
-  },
-  "sensor.solar_production": (_id, start, end, period = "hour") => {
-    if (period !== "hour") {
-      return generateSumStatistics(
-        start,
-        end,
-        period,
-        0,
-        period === "day" ? 17 : 504
-      );
-    }
-    const productionStart = new Date(start.getTime() + 7 * 60 * 60 * 1000);
-    const productionEnd = new Date(start.getTime() + 23 * 60 * 60 * 1000);
-    const dayEnd = new Date(endOfDay(productionEnd));
-    const production = generateCurvedStatistics(
-      productionStart,
-      productionEnd,
-      period,
-      0,
-      0.3,
-      true
-    );
-    const productionFinalVal = production.length
-      ? production[production.length - 1].sum!
-      : 0;
-    const morning = generateSumStatistics(start, productionStart, period, 0, 0);
-    const evening = generateSumStatistics(
-      productionEnd,
-      dayEnd,
-      period,
-      productionFinalVal,
-      0
-    );
-    const rest = generateSumStatistics(
-      dayEnd,
-      end,
-      period,
-      productionFinalVal,
-      2
-    );
-    return [...morning, ...production, ...evening, ...rest];
-  },
-};
-export const mockRecorder = (mockHass: MockHomeAssistant) => {
-  mockHass.mockWS(
-    "recorder/get_statistics_metadata",
-    (): StatisticsMetaData[] => []
-  );
-  mockHass.mockWS(
-    "recorder/list_statistic_ids",
-    (): StatisticsMetaData[] => []
-  );
-  mockHass.mockWS(
-    "recorder/statistics_during_period",
-    ({ statistic_ids, start_time, end_time, period }, hass): Statistics => {
-      const start = new Date(start_time);
-      const end = end_time ? new Date(end_time) : new Date();
-
-      const statistics: Record<string, StatisticValue[]> = {};
-
-      statistic_ids.forEach((id: string) => {
-        if (id in statisticsFunctions) {
-          statistics[id] = statisticsFunctions[id](id, start, end, period);
-        } else {
-          const entityState = hass.states[id];
-          const state = entityState ? Number(entityState.state) : 1;
-          statistics[id] =
-            entityState && "last_reset" in entityState.attributes
-              ? generateSumStatistics(
-                  start,
-                  end,
-                  period,
-                  state,
-                  state * (state > 80 ? 0.01 : 0.05)
-                )
-              : generateMeanStatistics(
-                  start,
-                  end,
-                  period,
-                  state,
-                  state * (state > 80 ? 0.05 : 0.1)
-                );
-        }
-      });
-      return statistics;
-    }
-  );
-};

gallery/script/netlify_build_gallery

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+TARGET_LABEL="needs design preview"
+
+if [[ "$NETLIFY" != "true" ]]; then
+  echo "This script can only be run on Netlify"
+  exit 1
+fi
+
+function createStatus() {
+  state="$1"
+  description="$2"
+  target_url="$3"
+  curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token $GITHUB_TOKEN" \
+    "https://api.github.com/repos/home-assistant/frontend/statuses/$COMMIT_REF" \
+    -d '{"state": "'"${state}"'", "context": "Netlify/Design Preview Build", "description": "'"$description"'", "target_url":  "'"$target_url"'"}'
+}
+
+
+if [[ "${PULL_REQUEST}" == "true" ]]; then
+  if [[ "$(curl -sSLf -H "Accept: application/vnd.github.v3+json" -H "Authorization: token $GITHUB_TOKEN" \
+    "https://api.github.com/repos/home-assistant/frontend/pulls/${REVIEW_ID}" | jq '.labels[].name' -r)" =~ "$TARGET_LABEL" ]]; then
+    createStatus "pending" "Building design preview" "https://app.netlify.com/sites/home-assistant-gallery/deploys/$BUILD_ID"
+    gulp build-gallery
+    if [ $? -eq 0 ]; then
+      createStatus "success" "Build complete" "$DEPLOY_PRIME_URL"
+    else
+      createStatus "error" "Build failed" "https://app.netlify.com/sites/home-assistant-gallery/deploys/$BUILD_ID"
+    fi
+  else
+    createStatus "success" "Build was not requested by PR label"
+  fi
+elif [[ "$INCOMING_HOOK_BODY" == "NIGHTLY" ]]; then
+  gulp build-gallery
+fi

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

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

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

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

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

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

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

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

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

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

gallery/src/pages/brand/logo.markdown

@@ -2,6 +2,8 @@
 title: "Logo"
 ---
 
+![Using our logo](/images/using-our-logo.png)
+
 # Using our logo
 
 As a community, we are proud of our logo. Follow these guidelines to ensure it always looks its best. Our logo follows Google's material design spec and uses the blue interface color.

gallery/src/pages/components/dialogs.markdown

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

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

@@ -1,5 +1,5 @@
 ---
-title: Alert
+title: Alerts
 subtitle: An alert displays a short, important message in a way that attracts the user's attention without interrupting the user's task.
 ---
 

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

@@ -98,9 +98,7 @@ const alerts: {
     description: "Alert with slotted image",
     type: "warning",
     iconSlot: html`<span slot="icon" class="image"
-      ><img
+      ><img src="https://www.home-assistant.io/images/home-assistant-logo.svg"
-        alt="Home Assistant logo"
-        src="https://www.home-assistant.io/images/home-assistant-logo.svg"
     /></span>`,
   },
   {

gallery/src/pages/components/ha-bar-slider.markdown

@@ -1,3 +0,0 @@
----
-title: Bar Slider
----

gallery/src/pages/components/ha-bar-slider.ts

@@ -1,170 +0,0 @@
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, state } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
-import { repeat } from "lit/directives/repeat";
-import "../../../../src/components/ha-bar-slider";
-import "../../../../src/components/ha-card";
-
-const sliders: {
-  id: string;
-  label: string;
-  mode?: "start" | "end" | "cursor";
-  class?: string;
-}[] = [
-  {
-    id: "slider-start",
-    label: "Slider (start mode)",
-    mode: "start",
-  },
-  {
-    id: "slider-end",
-    label: "Slider (end mode)",
-    mode: "end",
-  },
-  {
-    id: "slider-cursor",
-    label: "Slider (cursor mode)",
-    mode: "cursor",
-  },
-  {
-    id: "slider-start-custom",
-    label: "Slider (start mode) and custom style",
-    mode: "start",
-    class: "custom",
-  },
-  {
-    id: "slider-end-custom",
-    label: "Slider (end mode) and custom style",
-    mode: "end",
-    class: "custom",
-  },
-  {
-    id: "slider-cursor-custom",
-    label: "Slider (cursor mode) and custom style",
-    mode: "cursor",
-    class: "custom",
-  },
-];
-
-@customElement("demo-components-ha-bar-slider")
-export class DemoHaBarSlider extends LitElement {
-  @state() private value = 50;
-
-  @state() private sliderPosition?: number;
-
-  handleValueChanged(e: CustomEvent) {
-    this.value = e.detail.value as number;
-  }
-
-  handleSliderMoved(e: CustomEvent) {
-    this.sliderPosition = e.detail.value as number;
-  }
-
-  protected render(): TemplateResult {
-    return html`
-      <ha-card>
-        <div class="card-content">
-          <p><b>Slider values</b></p>
-          <table>
-            <tbody>
-              <tr>
-                <td>position</td>
-                <td>${this.sliderPosition ?? "-"}</td>
-              </tr>
-              <tr>
-                <td>value</td>
-                <td>${this.value ?? "-"}</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </ha-card>
-      ${repeat(sliders, (slider) => {
-        const { id, label, ...config } = slider;
-        return html`
-          <ha-card>
-            <div class="card-content">
-              <label id=${id}>${label}</label>
-              <pre>Config: ${JSON.stringify(config)}</pre>
-              <ha-bar-slider
-                .value=${this.value}
-                .mode=${config.mode}
-                class=${ifDefined(config.class)}
-                @value-changed=${this.handleValueChanged}
-                @slider-moved=${this.handleSliderMoved}
-                aria-labelledby=${id}
-              >
-              </ha-bar-slider>
-            </div>
-          </ha-card>
-        `;
-      })}
-      <ha-card>
-        <div class="card-content">
-          <p class="title"><b>Vertical</b></p>
-          <div class="vertical-sliders">
-            ${repeat(sliders, (slider) => {
-              const { id, label, ...config } = slider;
-              return html`
-                <ha-bar-slider
-                  .value=${this.value}
-                  .mode=${config.mode}
-                  vertical
-                  class=${ifDefined(config.class)}
-                  @value-changed=${this.handleValueChanged}
-                  @slider-moved=${this.handleSliderMoved}
-                  aria-label=${label}
-                >
-                </ha-bar-slider>
-              `;
-            })}
-          </div>
-        </div>
-      </ha-card>
-    `;
-  }
-
-  static get styles() {
-    return css`
-      ha-card {
-        max-width: 600px;
-        margin: 24px auto;
-      }
-      pre {
-        margin-top: 0;
-        margin-bottom: 8px;
-      }
-      p {
-        margin: 0;
-      }
-      label {
-        font-weight: 600;
-      }
-      .custom {
-        --slider-bar-color: #ffcf4c;
-        --slider-bar-background: #ffcf4c;
-        --slider-bar-background-opacity: 0.2;
-        --slider-bar-thickness: 100px;
-        --slider-bar-border-radius: 24px;
-      }
-      .vertical-sliders {
-        height: 300px;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-      }
-      p.title {
-        margin-bottom: 12px;
-      }
-      .vertical-sliders > *:not(:last-child) {
-        margin-right: 4px;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "demo-components-ha-bar-slider": DemoHaBarSlider;
-  }
-}

gallery/src/pages/components/ha-bar-switch.markdown

@@ -1,3 +0,0 @@
----
-title: Bar Switch
----

gallery/src/pages/components/ha-bar-switch.ts

@@ -1,145 +0,0 @@
-import {
-  mdiGarage,
-  mdiGarageOpen,
-  mdiLightbulb,
-  mdiLightbulbOff,
-} from "@mdi/js";
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, state } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
-import { repeat } from "lit/directives/repeat";
-import "../../../../src/components/ha-bar-switch";
-import "../../../../src/components/ha-card";
-
-const switches: {
-  id: string;
-  label: string;
-  class?: string;
-  reversed?: boolean;
-  disabled?: boolean;
-}[] = [
-  {
-    id: "switch",
-    label: "Switch",
-  },
-  {
-    id: "switch-reversed",
-    label: "Switch Reversed",
-    reversed: true,
-  },
-  {
-    id: "switch-custom",
-    label: "Switch and custom style",
-    class: "custom",
-  },
-  {
-    id: "switch-disabled",
-    label: "Disabled Switch",
-    disabled: true,
-  },
-];
-
-@customElement("demo-components-ha-bar-switch")
-export class DemoHaBarSwitch extends LitElement {
-  @state() private checked = false;
-
-  handleValueChanged(e: any) {
-    this.checked = e.target.checked as boolean;
-  }
-
-  protected render(): TemplateResult {
-    return html`
-      ${repeat(switches, (sw) => {
-        const { id, label, ...config } = sw;
-        return html`
-          <ha-card>
-            <div class="card-content">
-              <label id=${id}>${label}</label>
-              <pre>Config: ${JSON.stringify(config)}</pre>
-              <ha-bar-switch
-                .checked=${this.checked}
-                class=${ifDefined(config.class)}
-                @change=${this.handleValueChanged}
-                .pathOn=${mdiLightbulb}
-                .pathOff=${mdiLightbulbOff}
-                aria-labelledby=${id}
-                disabled=${ifDefined(config.disabled)}
-                reversed=${ifDefined(config.reversed)}
-              >
-              </ha-bar-switch>
-            </div>
-          </ha-card>
-        `;
-      })}
-      <ha-card>
-        <div class="card-content">
-          <p class="title"><b>Vertical</b></p>
-          <div class="vertical-switches">
-            ${repeat(switches, (sw) => {
-              const { id, label, ...config } = sw;
-              return html`
-                <ha-bar-switch
-                  .checked=${this.checked}
-                  vertical
-                  class=${ifDefined(config.class)}
-                  @change=${this.handleValueChanged}
-                  aria-label=${label}
-                  .pathOn=${mdiGarageOpen}
-                  .pathOff=${mdiGarage}
-                  disabled=${ifDefined(config.disabled)}
-                  reversed=${ifDefined(config.reversed)}
-                >
-                </ha-bar-switch>
-              `;
-            })}
-          </div>
-        </div>
-      </ha-card>
-    `;
-  }
-
-  static get styles() {
-    return css`
-      ha-card {
-        max-width: 600px;
-        margin: 24px auto;
-      }
-      pre {
-        margin-top: 0;
-        margin-bottom: 8px;
-      }
-      p {
-        margin: 0;
-      }
-      label {
-        font-weight: 600;
-      }
-      .custom {
-        --switch-bar-on-color: rgb(var(--rgb-green-color));
-        --switch-bar-off-color: rgb(var(--rgb-red-color));
-        --switch-bar-thickness: 100px;
-        --switch-bar-border-radius: 24px;
-        --switch-bar-padding: 6px;
-        --mdc-icon-size: 24px;
-      }
-      .vertical-switches {
-        height: 300px;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-      }
-      p.title {
-        margin-bottom: 12px;
-      }
-      .vertical-switches > *:not(:last-child) {
-        margin-right: 4px;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "demo-components-ha-bar-switch": DemoHaBarSwitch;
-  }
-}

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

@@ -1,4 +1,3 @@
 ---
-title: Bar
+title: Progress Bars
-subtitle: Can be used to communicate progress of a task.
 ---

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

@@ -1,3 +1,3 @@
 ---
-title: Chip
+title: Chips
 ---

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

@@ -1,61 +0,0 @@
----
-title: Gauge
----
-
-<style>
-  ha-gauge {
-    display: block;
-    width: 200px;
-    margin-top: 15px;
-    margin-bottom: 50px;
-  }
-</style>
-
-# Gauge `<ha-gauge>`
-
-A gauge that can be used to represent sensor data and provide visual feedback about the value and the corresponding severity (success, warning, error).
-
-## Examples
-
-Info color gauge
-<ha-gauge value="75" style="--gauge-color: var(--info-color)"></ha-gauge>
-
-Success color gauge
-<ha-gauge value="25" style="--gauge-color: var(--success-color)" label="°C"></ha-gauge>
-
-Warning color gauge
-<ha-gauge value="50" style="--gauge-color: var(--warning-color)" label="°C"></ha-gauge>
-
-Error color gauge
-<ha-gauge value="75" style="--gauge-color: var(--error-color)" label="°C"></ha-gauge>
-
-Gauge with background color
-<ha-gauge value="75" style="--gauge-color: var(--info-color); --primary-background-color: lightgray"></ha-gauge>
-
-
-## CSS variables
-
-### Gauge
-
-`primary-background-color`  
-Background color of the dial (rounded arch)
-
-`primary-text-color`  
-Text color below dial (value and unit of measurement) plus needle color (if gauge is in needle mode)
-
-#### Dial colors
-
-`gauge-color`  
-Used in the coding to control what color the gauge value is rendered with, but cannot be set via theme since its value will dynamically be set (either to `info-color` or to the matching severity variable if the severity color mode is used). To control the used colors, adjust the following variables.
-
-`success-color`  
-Dial color for the "green" severity level
-
-`warning-color`  
-Dial color for the "yellow" severity level
-
-`error-color`  
-Dial color for the "red" severity level
-
-`info-color`  
-Static dial color if not in severity color mode

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

@@ -1 +0,0 @@
-import "../../../../src/components/ha-gauge";

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

@@ -1,5 +1,5 @@
 ---
-title: Selector
+title: Selectors
 ---
 
 See the website for [list of available selectors](https://www.home-assistant.io/docs/blueprint/selectors/).

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

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

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

@@ -1,39 +0,0 @@
----
-title: Switch / Toggle
----
-
-<style>
-  ha-switch {
-    display: block;
-  }
-</style>
-
-# Switch `<ha-switch>`
-
-A toggle switch can represent two states: on and off.
-
-## Examples
-
-Switch in on state
-<ha-switch checked></ha-switch>
-
-Switch in off state
-<ha-switch></ha-switch>
-
-Disabled switch
-<ha-switch disabled></ha-switch>
-
-## CSS variables
-
-For the switch / toggle there are always two variables, one for the on / checked state and one for the off / unchecked state.
-
-The track element (background rounded rectangle that the round circular handle travels on) is set to being half transparent, so the final color will also be impacted by the color behind the track.
-
-`switch-checked-color` / `switch-unchecked-color`  
-Set both the color of the round handle  and the track behind it. If you want to control them separately, use the variables below instead.
-
-`switch-checked-button-color` / `switch-unchecked-button-color`  
-Color of the round handle
-
-`switch-checked-track-color` / `switch-unchecked-track-color`  
-Color of the track behind the round handle

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

@@ -1 +0,0 @@
-import "../../../../src/components/ha-switch";

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

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

gallery/src/pages/lovelace/entities-card.ts

@@ -98,9 +98,6 @@ const ENTITIES = [
     minimum: 0,
     maximum: 10,
   }),
-  getEntity("text", "message", "Hello!", {
-    friendly_name: "Message",
-  }),
 
   getEntity("light", "unavailable", "unavailable", {
     friendly_name: "Bed Light",
@@ -132,9 +129,6 @@ const ENTITIES = [
     friendly_name: "Who cooks",
     icon: "mdi:cheff",
   }),
-  getEntity("text", "unavailable", "unavailable", {
-    friendly_name: "Message",
-  }),
 ];
 
 const CONFIGS = [
@@ -153,26 +147,6 @@ const CONFIGS = [
     - climate.ecobee
     - input_number.number
     - sensor.humidity
-    - text.message
-    `,
-  },
-  {
-    heading: "With enabled state color",
-    config: `
-- type: entities
-  state_color: true
-  entities:
-    - scene.romantic_lights
-    - device_tracker.demo_paulus
-    - cover.kitchen_window
-    - group.kitchen
-    - lock.kitchen_door
-    - light.bed_light
-    - light.non_existing
-    - climate.ecobee
-    - input_number.number
-    - sensor.humidity
-    - text.message
     `,
   },
   {
@@ -245,7 +219,6 @@ const CONFIGS = [
     - climate.unavailable
     - input_number.unavailable
     - input_select.unavailable
-    - text.unavailable
     `,
   },
   {

gallery/src/pages/lovelace/entity-button-card.ts

@@ -35,11 +35,11 @@ const CONFIGS = [
     `,
   },
   {
-    heading: "With State",
+    heading: "Without State",
     config: `
 - type: button
   entity: light.bed_light
-  show_state: true
+  show_state: false
     `,
   },
   {

gallery/src/pages/lovelace/gauge-card.ts

@@ -23,12 +23,13 @@ const CONFIGS = [
     heading: "Basic example",
     config: `
 - type: gauge
+  title: Humidity
   entity: sensor.outside_humidity
   name: Outside Humidity
     `,
   },
   {
-    heading: "Custom unit of measurement",
+    heading: "Custom Unit of Measurement",
     config: `
 - type: gauge
   entity: sensor.outside_temperature
@@ -37,16 +38,7 @@ const CONFIGS = [
     `,
   },
   {
-    heading: "Rendering needle",
+    heading: "Setting Severity Levels",
-    config: `
-- type: gauge
-  entity: sensor.outside_humidity
-  name: Outside Humidity
-  needle: true
-    `,
-  },
-  {
-    heading: "Setting severity levels",
     config: `
 - type: gauge
   entity: sensor.brightness
@@ -58,7 +50,7 @@ const CONFIGS = [
     `,
   },
   {
-    heading: "Setting severity levels",
+    heading: "Setting Severity Levels",
     config: `
 - type: gauge
   entity: sensor.brightness_medium
@@ -70,7 +62,7 @@ const CONFIGS = [
     `,
   },
   {
-    heading: "Setting severity levels",
+    heading: "Setting Severity Levels",
     config: `
 - type: gauge
   entity: sensor.brightness_high
@@ -82,7 +74,7 @@ const CONFIGS = [
     `,
   },
   {
-    heading: "Setting min (0) and mx (15) values",
+    heading: "Setting Min (0) and Max (15) Values",
     config: `
 - type: gauge
   entity: sensor.brightness
@@ -92,14 +84,14 @@ const CONFIGS = [
     `,
   },
   {
-    heading: "Invalid entity",
+    heading: "Invalid Entity",
     config: `
 - type: gauge
   entity: sensor.invalid_entity
     `,
   },
   {
-    heading: "Non-numeric value",
+    heading: "Non-Numeric Value",
     config: `
 - type: gauge
   entity: plant.bonsai

gallery/src/pages/lovelace/glance-card.ts

@@ -62,21 +62,6 @@ const CONFIGS = [
     heading: "Basic example",
     config: `
 - type: glance
-  entities:
-    - device_tracker.demo_paulus
-    - media_player.living_room
-    - sun.sun
-    - cover.kitchen_window
-    - light.kitchen_lights
-    - lock.kitchen_door
-    - light.ceiling_lights
-    `,
-  },
-  {
-    heading: "No state colors",
-    config: `
-- type: glance
-  state_color: false
   entities:
     - device_tracker.demo_paulus
     - media_player.living_room

gallery/src/pages/lovelace/grid-and-stack-card.markdown

@@ -1,3 +1,3 @@
 ---
-title: Grid and Stack Card
+title: Grid And Stack Card
 ---

gallery/src/pages/misc/entity-state.markdown

@@ -1,3 +0,0 @@
----
-title: Entity State
----

gallery/src/pages/misc/entity-state.ts

@@ -1,411 +0,0 @@
-import {
-  HassEntity,
-  HassEntityAttributeBase,
-} from "home-assistant-js-websocket";
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { computeDomain } from "../../../../src/common/entity/compute_domain";
-import { computeStateDisplay } from "../../../../src/common/entity/compute_state_display";
-import "../../../../src/components/data-table/ha-data-table";
-import type { DataTableColumnContainer } from "../../../../src/components/data-table/ha-data-table";
-import "../../../../src/components/entity/state-badge";
-import "../../../../src/components/ha-chip";
-import { provideHass } from "../../../../src/fake_data/provide_hass";
-import { HomeAssistant } from "../../../../src/types";
-
-const SENSOR_DEVICE_CLASSES = [
-  "apparent_power",
-  "aqi",
-  // "battery"
-  "carbon_dioxide",
-  "carbon_monoxide",
-  "current",
-  "date",
-  "distance",
-  "duration",
-  "energy",
-  "frequency",
-  "gas",
-  "humidity",
-  "illuminance",
-  "moisture",
-  "monetary",
-  "nitrogen_dioxide",
-  "nitrogen_monoxide",
-  "nitrous_oxide",
-  "ozone",
-  "pm1",
-  "pm10",
-  "pm25",
-  "power_factor",
-  "power",
-  "precipitation",
-  "precipitation_intensity",
-  "pressure",
-  "reactive_power",
-  "signal_strength",
-  "speed",
-  "sulphur_dioxide",
-  "temperature",
-  "timestamp",
-  "volatile_organic_compounds",
-  "voltage",
-  "volume",
-  "water",
-  "weight",
-  "wind_speed",
-];
-
-const BINARY_SENSOR_DEVICE_CLASSES = [
-  "battery",
-  "battery_charging",
-  "carbon_monoxide",
-  "cold",
-  "connectivity",
-  "door",
-  "garage_door",
-  "gas",
-  "heat",
-  "light",
-  "lock",
-  "moisture",
-  "motion",
-  "moving",
-  "occupancy",
-  "opening",
-  "plug",
-  "power",
-  "presence",
-  "problem",
-  "running",
-  "safety",
-  "smoke",
-  "sound",
-  "tamper",
-  "update",
-  "vibration",
-  "window",
-];
-
-const ENTITIES: HassEntity[] = [
-  // Alarm control panel
-  createEntity("alarm_control_panel.disarmed", "disarmed"),
-  createEntity("alarm_control_panel.armed_home", "armed_home"),
-  createEntity("alarm_control_panel.armed_away", "armed_away"),
-  createEntity("alarm_control_panel.armed_night", "armed_night"),
-  createEntity("alarm_control_panel.armed_vacation", "armed_vacation"),
-  createEntity(
-    "alarm_control_panel.armed_custom_bypass",
-    "armed_custom_bypass"
-  ),
-  createEntity("alarm_control_panel.pending", "pending"),
-  createEntity("alarm_control_panel.arming", "arming"),
-  createEntity("alarm_control_panel.disarming", "disarming"),
-  createEntity("alarm_control_panel.triggered", "triggered"),
-  // Alert
-  createEntity("alert.off", "off"),
-  createEntity("alert.on", "on"),
-  createEntity("alert.idle", "idle"),
-  // Automation
-  createEntity("automation.off", "off"),
-  createEntity("automation.on", "on"),
-  // Binary Sensor
-  ...BINARY_SENSOR_DEVICE_CLASSES.map((dc) =>
-    createEntity(`binary_sensor.${dc}`, "on", dc)
-  ),
-  // Button
-  createEntity("button.restart", "unknown", "restart"),
-  createEntity("button.update", "unknown", "update"),
-  // Calendar
-  createEntity("calendar.off", "off"),
-  createEntity("calendar.on", "on"),
-  // Camera
-  createEntity("camera.idle", "idle"),
-  createEntity("camera.streaming", "streaming"),
-  // Climate
-  createEntity("climate.off", "off"),
-  createEntity("climate.heat", "heat"),
-  createEntity("climate.cool", "cool"),
-  createEntity("climate.heat_cool", "heat_cool"),
-  createEntity("climate.auto", "auto"),
-  createEntity("climate.dry", "dry"),
-  createEntity("climate.fan_only", "fan_only"),
-  createEntity("climate.auto_idle", "auto", undefined, { hvac_action: "idle" }),
-  createEntity("climate.auto_off", "auto", undefined, { hvac_action: "off" }),
-  createEntity("climate.auto_heating", "auto", undefined, {
-    hvac_action: "heating",
-  }),
-  createEntity("climate.auto_cooling", "auto", undefined, {
-    hvac_action: "cooling",
-  }),
-  createEntity("climate.auto_dry", "auto", undefined, {
-    hvac_action: "drying",
-  }),
-  // Cover
-  createEntity("cover.closing", "closing"),
-  createEntity("cover.closed", "closed"),
-  createEntity("cover.opening", "opening"),
-  createEntity("cover.open", "open"),
-  createEntity("cover.awning", "open", "awning"),
-  createEntity("cover.blind", "open", "blind"),
-  createEntity("cover.curtain", "open", "curtain"),
-  createEntity("cover.damper", "open", "damper"),
-  createEntity("cover.door", "open", "door"),
-  createEntity("cover.garage", "open", "garage"),
-  createEntity("cover.gate", "open", "gate"),
-  createEntity("cover.shade", "open", "shade"),
-  createEntity("cover.shutter", "open", "shutter"),
-  createEntity("cover.window", "open", "window"),
-  // Device tracker/person
-  createEntity("device_tracker.not_home", "not_home"),
-  createEntity("device_tracker.home", "home"),
-  createEntity("device_tracker.work", "work"),
-  createEntity("person.home", "home"),
-  createEntity("person.not_home", "not_home"),
-  createEntity("person.work", "work"),
-  // Fan
-  createEntity("fan.off", "off"),
-  createEntity("fan.on", "on"),
-  // Camera
-  createEntity("group.off", "off"),
-  createEntity("group.on", "on"),
-  // Humidifier
-  createEntity("humidifier.off", "off"),
-  createEntity("humidifier.on", "on"),
-  // Helpers
-  createEntity("input_boolean.off", "off"),
-  createEntity("input_boolean.on", "on"),
-  // Light
-  createEntity("light.off", "off"),
-  createEntity("light.on", "on"),
-  // Locks
-  createEntity("lock.unlocked", "unlocked"),
-  createEntity("lock.locked", "locked"),
-  createEntity("lock.locking", "locking"),
-  createEntity("lock.unlocking", "unlocking"),
-  createEntity("lock.jammed", "jammed"),
-  // Media Player
-  createEntity("media_player.off", "off"),
-  createEntity("media_player.on", "on"),
-  createEntity("media_player.idle", "idle"),
-  createEntity("media_player.playing", "playing"),
-  createEntity("media_player.paused", "paused"),
-  createEntity("media_player.standby", "standby"),
-  createEntity("media_player.buffering", "buffering"),
-  createEntity("media_player.tv_off", "off", "tv"),
-  createEntity("media_player.tv_playing", "playing", "tv"),
-  createEntity("media_player.tv_paused", "paused", "tv"),
-  createEntity("media_player.tv_standby", "standby", "tv"),
-  createEntity("media_player.receiver_off", "off", "receiver"),
-  createEntity("media_player.receiver_playing", "playing", "receiver"),
-  createEntity("media_player.receiver_paused", "paused", "receiver"),
-  createEntity("media_player.receiver_standby", "standby", "receiver"),
-  createEntity("media_player.speaker_off", "off", "speaker"),
-  createEntity("media_player.speaker_playing", "playing", "speaker"),
-  createEntity("media_player.speaker_paused", "paused", "speaker"),
-  createEntity("media_player.speaker_standby", "standby", "speaker"),
-  // Remote
-  createEntity("remote.off", "off"),
-  createEntity("remote.on", "on"),
-  // Script
-  createEntity("script.off", "off"),
-  createEntity("script.on", "on"),
-  // Sensor
-  ...SENSOR_DEVICE_CLASSES.map((dc) => createEntity(`sensor.${dc}`, "10", dc)),
-  // Battery sensor
-  ...[0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100].map((value) =>
-    createEntity(`sensor.battery_${value}`, value.toString(), "battery")
-  ),
-  // Siren
-  createEntity("siren.off", "off"),
-  createEntity("siren.on", "on"),
-  // Sun
-  createEntity("sun.below", "below_horizon"),
-  createEntity("sun.above", "above_horizon"),
-  createEntity("sun.unknown", "unknown"),
-  createEntity("sun.unavailable", "unavailable"),
-  // Switch
-  createEntity("switch.off", "off"),
-  createEntity("switch.on", "on"),
-  createEntity("switch.outlet_off", "off", "outlet"),
-  createEntity("switch.outlet_on", "on", "outlet"),
-  createEntity("switch.switch_off", "off", "switch"),
-  createEntity("switch.switch_on", "on", "switch"),
-  // Timer
-  createEntity("timer.idle", "idle"),
-  createEntity("timer.active", "active"),
-  createEntity("timer.paused", "paused"),
-  // Vacuum
-  createEntity("vacuum.docked", "docked"),
-  createEntity("vacuum.cleaning", "cleaning"),
-  createEntity("vacuum.paused", "paused"),
-  createEntity("vacuum.idle", "idle"),
-  createEntity("vacuum.returning", "returning"),
-  createEntity("vacuum.error", "error"),
-  createEntity("vacuum.cleaning", "cleaning"),
-  createEntity("vacuum.off", "off"),
-  createEntity("vacuum.on", "on"),
-  // Update
-  createEntity("update.off", "off", undefined, {
-    installed_version: "1.0.0",
-    latest_version: "2.0.0",
-  }),
-  createEntity("update.on", "on", undefined, {
-    installed_version: "1.0.0",
-    latest_version: "2.0.0",
-  }),
-  createEntity("update.installing", "on", undefined, {
-    installed_version: "1.0.0",
-    latest_version: "2.0.0",
-    in_progress: true,
-  }),
-  createEntity("update.off", "off", "firmware", {
-    installed_version: "1.0.0",
-    latest_version: "2.0.0",
-  }),
-  createEntity("update.on", "on", "firmware", {
-    installed_version: "1.0.0",
-    latest_version: "2.0.0",
-  }),
-];
-
-function createEntity(
-  entity_id: string,
-  state: string,
-  device_class?: string,
-  attributes?: HassEntityAttributeBase | HassEntity["attributes"]
-): HassEntity {
-  return {
-    entity_id,
-    state,
-    attributes: {
-      ...attributes,
-      device_class: device_class,
-    },
-    last_changed: new Date().toString(),
-    last_updated: new Date().toString(),
-    context: {
-      id: "1",
-      parent_id: null,
-      user_id: null,
-    },
-  };
-}
-
-type EntityRowData = {
-  stateObj: HassEntity;
-  entity_id: string;
-  state: string;
-  device_class?: string;
-  domain: string;
-};
-
-function createRowData(stateObj: HassEntity): EntityRowData {
-  return {
-    stateObj,
-    entity_id: stateObj.entity_id,
-    state: stateObj.state,
-    device_class: stateObj.attributes.device_class,
-    domain: computeDomain(stateObj.entity_id),
-  };
-}
-
-@customElement("demo-misc-entity-state")
-export class DemoEntityState extends LitElement {
-  @property({ attribute: false }) hass?: HomeAssistant;
-
-  private _columns = memoizeOne(
-    (hass: HomeAssistant): DataTableColumnContainer => {
-      const columns: DataTableColumnContainer<EntityRowData> = {
-        icon: {
-          title: "Icon",
-          template: (_, entry) => html`
-            <state-badge
-              .stateObj=${entry.stateObj}
-              .stateColor=${true}
-            ></state-badge>
-          `,
-        },
-        entity_id: {
-          title: "Entity ID",
-          width: "30%",
-          filterable: true,
-          sortable: true,
-        },
-        state: {
-          title: "State",
-          width: "20%",
-          sortable: true,
-          template: (_, entry) =>
-            html`${computeStateDisplay(
-              hass.localize,
-              entry.stateObj,
-              hass.locale,
-              hass.entities
-            )}`,
-        },
-        device_class: {
-          title: "Device class",
-          template: (dc) => html`${dc ?? "-"}`,
-          width: "20%",
-          filterable: true,
-          sortable: true,
-        },
-        domain: {
-          title: "Domain",
-          template: (_, entry) => html`${computeDomain(entry.entity_id)}`,
-          width: "20%",
-          filterable: true,
-          sortable: true,
-        },
-      };
-
-      return columns;
-    }
-  );
-
-  private _rows = memoizeOne((): EntityRowData[] =>
-    ENTITIES.map(createRowData)
-  );
-
-  protected firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-    const hass = provideHass(this);
-    hass.updateTranslations(null, "en");
-    hass.updateTranslations("config", "en");
-  }
-
-  protected render(): TemplateResult {
-    if (!this.hass) {
-      return html``;
-    }
-
-    return html`
-      <ha-data-table
-        .hass=${this.hass}
-        .columns=${this._columns(this.hass)}
-        .data=${this._rows()}
-        auto-height
-      ></ha-data-table>
-    `;
-  }
-
-  static get styles() {
-    return css`
-      .color {
-        display: block;
-        height: 20px;
-        width: 20px;
-        border-radius: 10px;
-        background-color: rgb(--color);
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "demo-misc-entity-state": DemoEntityState;
-  }
-}

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

@@ -191,12 +191,10 @@ const createEntityRegistryEntries = (
     hidden_by: null,
     entity_category: null,
     entity_id: "binary_sensor.updater",
-    id: "binary_sensor.updater",
     name: null,
     icon: null,
     platform: "updater",
     has_entity_name: false,
-    unique_id: "updater",
   },
 ];
 
@@ -283,7 +281,7 @@ export class DemoIntegrationCard extends LitElement {
               .deviceRegistryEntries=${createDeviceRegistryEntries(
                 info.items[0]
               )}
-              ?entryDisabled=${info.disabled}
+              ?disabled=${info.disabled}
               .selectedConfigEntryId=${info.highlight}
             ></ha-integration-card>
           `

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

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

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

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

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

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

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

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

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

@@ -139,13 +139,6 @@ const ENTITIES = [
     title: undefined,
     friendly_name: "Installing without title",
   }),
-  getEntity("update", "update21", "on", {
-    ...base_attributes,
-    in_progress: true,
-    friendly_name: "Update with in_progress true and UPDATE_SUPPORT_PROGRESS",
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_PROGRESS,
-  }),
 ];
 
 @customElement("demo-more-info-update")

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

@@ -29,9 +29,7 @@ class HassioAddonRepositoryEl extends LitElement {
     if (filter) {
       return filterAndSort(addons, filter);
     }
-    return addons.sort((a, b) =>
+    return addons.sort((a, b) => caseInsensitiveStringCompare(a.name, b.name));
-      caseInsensitiveStringCompare(a.name, b.name, this.hass.locale.language)
-    );
   });
 
   protected render(): TemplateResult {
@@ -120,7 +118,7 @@ class HassioAddonRepositoryEl extends LitElement {
   }
 
   private _addonTapped(ev) {
-    navigate(`/hassio/addon/${ev.currentTarget.addon.slug}?store=true`);
+    navigate(`/hassio/addon/${ev.currentTarget.addon.slug}`);
   }
 
   static get styles(): CSSResultGroup {

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

@@ -53,13 +53,7 @@ class HassioAddonDashboard extends LitElement {
 
   @property({ type: Boolean }) public narrow!: boolean;
 
-  @state() private _error?: string;
+  @state() _error?: string;
-
-  private _backPath = new URLSearchParams(window.parent.location.search).get(
-    "store"
-  )
-    ? "/hassio/store"
-    : "/hassio/dashboard";
 
   private _computeTail = memoizeOne((route: Route) => {
     const dividerPos = route.path.indexOf("/", 1);
@@ -125,7 +119,6 @@ class HassioAddonDashboard extends LitElement {
         .narrow=${this.narrow}
         .route=${route}
         .tabs=${addonTabs}
-        .backPath=${this._backPath}
         supervisor
       >
         <span slot="header">${this.addon.name}</span>

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

@@ -404,7 +404,6 @@ class HassioAddonInfo extends LitElement {
                 ? html`
                     <img
                       class="logo"
-                      alt=""
                       src="/api/hassio/addons/${this.addon.slug}/logo"
                     />
                   `
@@ -1025,13 +1024,10 @@ class HassioAddonInfo extends LitElement {
     button.progress = true;
 
     const confirmed = await showConfirmationDialog(this, {
-      title: this.supervisor.localize("dialog.uninstall_addon.title", {
+      title: this.addon.name,
-        name: this.addon.name,
+      text: "Are you sure you want to uninstall this add-on?",
-      }),
+      confirmText: "uninstall add-on",
-      text: this.supervisor.localize("dialog.uninstall_addon.text"),
+      dismissText: "no",
-      confirmText: this.supervisor.localize("dialog.uninstall_addon.uninstall"),
-      dismissText: this.supervisor.localize("common.cancel"),
-      destructive: true,
     });
 
     if (!confirmed) {

hassio/src/backups/hassio-backups.ts

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

hassio/src/dashboard/hassio-addons.ts

@@ -35,13 +35,7 @@ class HassioAddons extends LitElement {
                 </ha-card>
               `
             : this.supervisor.addon.addons
-                .sort((a, b) =>
+                .sort((a, b) => caseInsensitiveStringCompare(a.name, b.name))
-                  caseInsensitiveStringCompare(
-                    a.name,
-                    b.name,
-                    this.hass.locale.language
-                  )
-                )
                 .map(
                   (addon) => html`
                     <ha-card

hassio/src/dashboard/hassio-dashboard.ts

@@ -28,7 +28,6 @@ class HassioDashboard extends LitElement {
         .hass=${this.hass}
         .narrow=${this.narrow}
         .route=${this.route}
-        back-path="/config"
         .header=${this.supervisor.localize("panel.addons")}
       >
         <hassio-addons

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

@@ -15,12 +15,7 @@ import { HomeAssistant } from "../../../../src/types";
 import { HassioHardwareDialogParams } from "./show-dialog-hassio-hardware";
 
 const _filterDevices = memoizeOne(
-  (
+  (showAdvanced: boolean, hardware: HassioHardwareInfo, filter: string) =>
-    showAdvanced: boolean,
-    hardware: HassioHardwareInfo,
-    filter: string,
-    language: string
-  ) =>
     hardware.devices
       .filter(
         (device) =>
@@ -33,7 +28,7 @@ const _filterDevices = memoizeOne(
               .toLocaleLowerCase()
               .includes(filter))
       )
-      .sort((a, b) => stringCompare(a.name, b.name, language))
+      .sort((a, b) => stringCompare(a.name, b.name))
 );
 
 @customElement("dialog-hassio-hardware")
@@ -61,8 +56,7 @@ class HassioHardwareDialog extends LitElement {
     const devices = _filterDevices(
       this.hass.userData?.showAdvanced || false,
       this._dialogParams.hardware,
-      (this._filter || "").toLowerCase(),
+      (this._filter || "").toLowerCase()
-      this.hass.locale.language
     );
 
     return html`

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

@@ -68,9 +68,7 @@ class HassioRepositoriesDialog extends LitElement {
           repo.slug !== "a0d7b954" && // Home Assistant Community Add-ons
           repo.slug !== "5c53de3b" // The ESPHome repository
       )
-      .sort((a, b) =>
+      .sort((a, b) => caseInsensitiveStringCompare(a.name, b.name))
-        caseInsensitiveStringCompare(a.name, b.name, this.hass.locale.language)
-      )
   );
 
   private _filteredUsedRepositories = memoizeOne(

hassio/src/dialogs/suggestAddonRestart.ts

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

hassio/src/ingress-view/hassio-ingress-view.ts

@@ -59,11 +59,7 @@ class HassioIngressView extends LitElement {
       return html` <hass-loading-screen></hass-loading-screen> `;
     }
 
-    const iframe = html`<iframe
+    const iframe = html`<iframe src=${this._addon.ingress_url!}></iframe>`;
-      .title=${this._addon.name}
-      .src=${this._addon.ingress_url!}
-    >
-    </iframe>`;
 
     if (!this.ingressPanel) {
       return html`<hass-subpage

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

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