Gallery: Added switch and gauge component pagess + CSS vars

.devcontainer.json

@@ -1,50 +0,0 @@
-{
-  "name": "Home Assistant Frontend",
-  "image": "mcr.microsoft.com/devcontainers/python:0-3.10",
-  "appPort": "8124:8123",
-  "postCreateCommand": "script/bootstrap",
-  "containerEnv": {
-    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}",
-    "DEVCONTAINER": "true"
-  },
-  "remoteUser": "vscode",
-  "remoteEnv": {
-    "PATH": "${containerEnv:PATH}:${containerWorkspaceFolder}/node_modules/.bin:/home/vscode/.local/bin"
-  },
-  "features": {
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "16"
-    }
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode",
-        "runem.lit-plugin",
-        "github.vscode-pull-request-github",
-        "eamodio.gitlens"
-      ],
-      "settings": {
-        "files.eol": "\n",
-        "editor.tabSize": 2,
-        "editor.formatOnPaste": false,
-        "editor.formatOnSave": 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"
-      }
-    }
-  }
-}

.devcontainer/Dockerfile

@@ -0,0 +1,13 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.1/containers/python-3/.devcontainer/base.Dockerfile
+FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.9
+
+ENV \
+  DEBIAN_FRONTEND=noninteractive \
+  DEVCONTAINER=true \
+  PATH=$PATH:./node_modules/.bin
+
+# Install nvm
+COPY .nvmrc /tmp/.nvmrc
+RUN \
+  su vscode -c \
+    "source /usr/local/share/nvm/nvm.sh && nvm install $(cat /tmp/.nvmrc) 2>&1"

.devcontainer/devcontainer.json

@@ -0,0 +1,37 @@
+{
+  "name": "Home Assistant Frontend",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "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}"
+  },
+  "settings": {
+    "terminal.integrated.shell.linux": "/bin/bash",
+    "files.eol": "\n",
+    "editor.tabSize": 2,
+    "editor.formatOnPaste": false,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": true,
+    "[typescript]": {
+      "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[javascript]": {
+      "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "files.trimTrailingWhitespace": true
+  }
+}

.github/dependabot.yml

@@ -6,13 +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
-    ignore:
-      # Ignore rollup and plugins until everything else is updated
-      - dependency-name: "*rollup*"
-      - dependency-name: "@rollup/*"

.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.3.0
-        with:
-          ref: dev
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
-        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.3.0
-        with:
-          ref: master
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
-        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

@@ -20,9 +20,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -44,9 +44,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -63,9 +63,9 @@ jobs:
     needs: [lint, test]
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -82,9 +82,9 @@ jobs:
     needs: [lint, test]
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        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.3.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

@@ -1,9 +1,9 @@
-name: Design deployment
+name: Demo
 
 on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *"
+  push:
+    branches:
+      - dev
 
 env:
   NODE_VERSION: 16
@@ -12,34 +12,24 @@ env:
 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.3.0
-
+        uses: actions/checkout@v3
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3
         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
+      - 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=gallery/dist --prod
+        run: npx netlify-cli deploy --dir=demo/dist --prod
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_GALLERY_SITE_ID }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEMO_DEV_SITE_ID }}

.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.3.0
-        with:
-          ref: dev
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
-        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.3.0
-        with:
-          ref: master
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
-        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_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.3.0
-
-      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
-        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.3.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.6.0
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

.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.3.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.6.0
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

.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@v6.0.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.3.0
+        uses: actions/checkout@v3
 
       - name: Upload Translations
         run: |

.gitignore

@@ -2,10 +2,10 @@
 .reify-cache
 
 # build
-build/
-dist/
-/hass_frontend/
-/translations/
+build
+hass_frontend/*
+dist
+translations
 
 # yarn
 .yarn/*
@@ -15,7 +15,7 @@ dist/
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
-/node_modules/
+node_modules/*
 yarn-error.log
 npm-debug.log
 
@@ -27,7 +27,7 @@ npm-debug.log
 # venv stuff
 pyvenv.cfg
 pip-selfcheck.json
-/venv/
+venv/*
 .venv
 
 # vscode
@@ -46,4 +46,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",
-    "github.vscode-pull-request-github",
-    "eamodio.gitlens"
+    "bierner.lit-html",
+    "runem.lit-plugin"
   ]
 }

.yarn/patches/@lit-labs/virtualizer/event-target-shim.patch

@@ -0,0 +1,29 @@
+diff --git a/polyfillLoaders/EventTarget.js b/polyfillLoaders/EventTarget.js
+index 4e18ade7ba485849f17f28c94c42f0e0e01ac387..8f34f4f646c7f7becc208fb5a546c96034fc74dc 100644
+--- a/polyfillLoaders/EventTarget.js
++++ b/polyfillLoaders/EventTarget.js
+@@ -6,16 +6,15 @@
+ let _ET;
+ let ET;
+ export default async function EventTarget() {
+-    return ET || init();
++  return ET || init();
+ }
+ async function init() {
+-    _ET = window.EventTarget;
+-    try {
+-        new _ET();
+-    }
+-    catch (_a) {
+-        _ET = (await import('event-target-shim')).EventTarget;
+-    }
+-    return (ET = _ET);
++  _ET = window.EventTarget;
++  try {
++    new _ET();
++  } catch (_a) {
++    _ET = (await import("event-target-shim")).default.EventTarget;
++  }
++  return (ET = _ET);
+ }
+ //# sourceMappingURL=EventTarget.js.map

.yarn/patches/@material/mwc-icon-button/remove-icon.patch

@@ -0,0 +1,12 @@
+diff --git a/mwc-icon-button-base.js b/mwc-icon-button-base.js
+index 45cdaab93ccc0a6daaaaabc01266dcdc32e46bfd..b3ea5b541597308d85f86ce6c23fd00785fda835 100644
+--- a/mwc-icon-button-base.js
++++ b/mwc-icon-button-base.js
+@@ -63,7 +63,6 @@ export class IconButtonBase extends LitElement {
+         @touchend="${this.handleRippleDeactivate}"
+         @touchcancel="${this.handleRippleDeactivate}"
+     >${this.renderRipple()}
+-    <i class="material-icons">${this.icon}</i>
+     <span
+       ><slot></slot
+     ></span>

.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.3.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.3.cjs

build-scripts/gulp/clean.js

@@ -1,40 +1,36 @@
-const del = import("del");
+const del = require("del");
 const gulp = require("gulp");
 const paths = require("../paths");
 require("./translations");
 
 gulp.task(
   "clean",
-  gulp.parallel("clean-translations", async () =>
-    (await del).deleteSync([paths.app_output_root, paths.build_dir])
+  gulp.parallel("clean-translations", () =>
+    del([paths.app_output_root, paths.build_dir])
   )
 );
 
 gulp.task(
   "clean-demo",
-  gulp.parallel("clean-translations", async () =>
-    (await del).deleteSync([paths.demo_output_root, paths.build_dir])
+  gulp.parallel("clean-translations", () =>
+    del([paths.demo_output_root, paths.build_dir])
   )
 );
 
 gulp.task(
   "clean-cast",
-  gulp.parallel("clean-translations", async () =>
-    (await del).deleteSync([paths.cast_output_root, paths.build_dir])
+  gulp.parallel("clean-translations", () =>
+    del([paths.cast_output_root, paths.build_dir])
   )
 );
 
-gulp.task("clean-hassio", async () =>
-  (await del).deleteSync([paths.hassio_output_root, paths.build_dir])
+gulp.task("clean-hassio", () =>
+  del([paths.hassio_output_root, paths.build_dir])
 );
 
 gulp.task(
   "clean-gallery",
-  gulp.parallel("clean-translations", async () =>
-    (await del).deleteSync([
-      paths.gallery_output_root,
-      paths.gallery_build,
-      paths.build_dir,
-    ])
+  gulp.parallel("clean-translations", () =>
+    del([paths.gallery_output_root, paths.gallery_build, paths.build_dir])
   )
 );

build-scripts/gulp/download_translations.js

@@ -1,5 +1,5 @@
 const gulp = require("gulp");
-const fs = require("fs/promises");
+const fs = require("fs");
 const mapStream = require("map-stream");
 
 const inDirFrontend = "translations/frontend";
@@ -46,21 +46,18 @@ gulp.task("check-translations-html", function () {
   return gulp.src([`${inDirFrontend}/*.json`]).pipe(checkHtml());
 });
 
-gulp.task("check-all-files-exist", async function () {
-  const file = await fs.readFile(srcMeta, { encoding });
+gulp.task("check-all-files-exist", function () {
+  const file = fs.readFileSync(srcMeta, { encoding });
   const meta = JSON.parse(file);
-  const writings = [];
   Object.keys(meta).forEach((lang) => {
-    writings.push(
-      fs.writeFile(`${inDirFrontend}/${lang}.json`, JSON.stringify({}), {
-        flag: "wx",
-      }),
-      fs.writeFile(`${inDirBackend}/${lang}.json`, JSON.stringify({}), {
-        flag: "wx",
-      })
-    );
+    if (!fs.existsSync(`${inDirFrontend}/${lang}.json`)) {
+      fs.writeFileSync(`${inDirFrontend}/${lang}.json`, JSON.stringify({}));
+    }
+    if (!fs.existsSync(`${inDirBackend}/${lang}.json`)) {
+      fs.writeFileSync(`${inDirBackend}/${lang}.json`, JSON.stringify({}));
+    }
   });
-  await Promise.allSettled(writings);
+  return Promise.resolve();
 });
 
 gulp.task(

build-scripts/gulp/fetch-nightly_translations.js

@@ -1,9 +1,9 @@
 // Task to download the latest Lokalise translations from the nightly workflow artifacts
 
-const del = import("del");
 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");
@@ -17,8 +17,8 @@ const WORKFLOW_NAME = "nightly.yaml";
 const ARTIFACT_NAME = "translations";
 const CLIENT_ID = "Iv1.3914e28cb27834d1";
 const EXTRACT_DIR = "translations";
-const TOKEN_FILE = path.posix.join(EXTRACT_DIR, "token.json");
-const ARTIFACT_FILE = path.posix.join(EXTRACT_DIR, "artifact.json");
+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) => {
@@ -137,11 +137,7 @@ gulp.task("fetch-nightly-translations", async function () {
 
   // Remove the current translations
   const deleteCurrent = Promise.all(writings).then(
-    (await del).deleteAsync([
-      `${EXTRACT_DIR}/*`,
-      `!${ARTIFACT_FILE}`,
-      `!${TOKEN_FILE}`,
-    ])
+    del([`${EXTRACT_DIR}/*`, `!${ARTIFACT_FILE}`, `!${TOKEN_FILE}`])
   );
 
   // Get the download URL and follow the redirect to download (stored as ArrayBuffer)

build-scripts/gulp/locale-data.js

@@ -1,4 +1,4 @@
-const del = import("del");
+const del = require("del");
 const path = require("path");
 const gulp = require("gulp");
 const fs = require("fs");
@@ -6,7 +6,7 @@ const paths = require("../paths");
 
 const outDir = "build/locale-data";
 
-gulp.task("clean-locale-data", async () => (await del).deleteSync([outDir]));
+gulp.task("clean-locale-data", () => del([outDir]));
 
 gulp.task("ensure-locale-data-build-dir", (done) => {
   if (!fs.existsSync(outDir)) {

build-scripts/gulp/translations.js

@@ -1,5 +1,5 @@
-const del = import("del");
 const crypto = require("crypto");
+const del = require("del");
 const path = require("path");
 const source = require("vinyl-source-stream");
 const vinylBuffer = require("vinyl-buffer");
@@ -13,7 +13,7 @@ const { mapFiles } = require("../util");
 const env = require("../env");
 const paths = require("../paths");
 
-require("./fetch-nightly-translations");
+require("./fetch-nightly_translations");
 
 const inFrontendDir = "translations/frontend";
 const inBackendDir = "translations/backend";
@@ -120,7 +120,7 @@ function lokaliseTransform(data, original, file) {
   return output;
 }
 
-gulp.task("clean-translations", async () => (await del).deleteSync([workDir]));
+gulp.task("clean-translations", () => del([workDir]));
 
 gulp.task("ensure-translations-build-dir", (done) => {
   if (!fs.existsSync(workDir)) {

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

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

@@ -22,11 +22,7 @@ class HcLayout extends LitElement {
     return html`
       <ha-card>
         <div class="layout">
-          <img
-            class="hero"
-            alt="A Google Nest Hub with a Home Assistant dashboard on its screen"
-            src="/images/google-nest-hub.png"
-          />
+          <img class="hero" src="/images/google-nest-hub.png" />
           <h1 class="card-header">
             Home Assistant Cast${this.subtitle ? ` – ${this.subtitle}` : ""}
             ${this.auth

cast/src/receiver/layout/hc-launch-screen.ts

@@ -12,7 +12,6 @@ class HcLaunchScreen extends LitElement {
     return html`
       <div class="container">
         <img
-          alt="Home Assistant logo on left, Nabu Casa logo on right, and red heart in center"
           src="https://www.home-assistant.io/images/blog/2018-09-thinking-big/social.png"
         />
         <div class="status">

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(
-        ReceiverErrorCode.NOT_CONNECTED,
-        this._error,
-        msg.senderId!
-      );
+      this._sendError(ReceiverErrorCode.NOT_CONNECTED, this._error);
       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;

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/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
-        alt="Home Assistant logo"
-        src="https://www.home-assistant.io/images/home-assistant-logo.svg"
+      ><img src="https://www.home-assistant.io/images/home-assistant-logo.svg"
     /></span>`,
   },
   {

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

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

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

@@ -8,7 +8,7 @@ import "../../../../src/components/ha-card";
 const sliders: {
   id: string;
   label: string;
-  mode?: "start" | "end" | "cursor";
+  mode?: "start" | "end" | "indicator";
   class?: string;
 }[] = [
   {
@@ -22,9 +22,9 @@ const sliders: {
     mode: "end",
   },
   {
-    id: "slider-cursor",
-    label: "Slider (cursor mode)",
-    mode: "cursor",
+    id: "slider-indicator",
+    label: "Slider (indicator mode)",
+    mode: "indicator",
   },
   {
     id: "slider-start-custom",
@@ -39,9 +39,9 @@ const sliders: {
     class: "custom",
   },
   {
-    id: "slider-cursor-custom",
-    label: "Slider (cursor mode) and custom style",
-    mode: "cursor",
+    id: "slider-indicator-custom",
+    label: "Slider (indicator mode) and custom style",
+    mode: "indicator",
     class: "custom",
   },
 ];
@@ -142,8 +142,7 @@ export class DemoHaBarSlider extends LitElement {
       }
       .custom {
         --slider-bar-color: #ffcf4c;
-        --slider-bar-background: #ffcf4c;
-        --slider-bar-background-opacity: 0.2;
+        --slider-bar-background: #ffcf4c64;
         --slider-bar-thickness: 100px;
         --slider-bar-border-radius: 24px;
       }

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

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

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

@@ -115,8 +115,8 @@ export class DemoHaBarSwitch extends LitElement {
         font-weight: 600;
       }
       .custom {
-        --switch-bar-on-color: var(--green-color);
-        --switch-bar-off-color: var(--red-color);
+        --switch-bar-color-on: var(--rgb-green-color);
+        --switch-bar-color-off: var(--rgb-red-color);
         --switch-bar-thickness: 100px;
         --switch-bar-border-radius: 24px;
         --switch-bar-padding: 6px;

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

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

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

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

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

@@ -1,5 +1,5 @@
 ---
-title: Dialog
+title: Dialogs
 subtitle: Dialogs provide important prompts in a user flow.
 ---
 

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

@@ -99,19 +99,16 @@ const AREAS = [
     area_id: "backyard",
     name: "Backyard",
     picture: null,
-    aliases: [],
   },
   {
     area_id: "bedroom",
     name: "Bedroom",
     picture: null,
-    aliases: [],
   },
   {
     area_id: "livingroom",
     name: "Livingroom",
     picture: null,
-    aliases: [],
   },
 ];
 

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

@@ -95,19 +95,16 @@ const AREAS = [
     area_id: "backyard",
     name: "Backyard",
     picture: null,
-    aliases: [],
   },
   {
     area_id: "bedroom",
     name: "Bedroom",
     picture: null,
-    aliases: [],
   },
   {
     area_id: "livingroom",
     name: "Livingroom",
     picture: null,
-    aliases: [],
   },
 ];
 

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

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

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

@@ -142,25 +142,6 @@ const CONFIGS = [
     heading: "Basic",
     config: `
 - type: entities
-  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
-    `,
-  },
-  {
-    heading: "With enabled state color",
-    config: `
-- type: entities
-  state_color: true
   entities:
     - scene.romantic_lights
     - device_tracker.demo_paulus

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

@@ -4,12 +4,14 @@ import {
 } from "home-assistant-js-websocket";
 import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
+import { styleMap } from "lit/directives/style-map";
 import memoizeOne from "memoize-one";
 import { computeDomain } from "../../../../src/common/entity/compute_domain";
 import { computeStateDisplay } from "../../../../src/common/entity/compute_state_display";
+import { stateColorCss } from "../../../../src/common/entity/state_color";
+import { stateIconPath } from "../../../../src/common/entity/state_icon_path";
 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";
@@ -103,27 +105,16 @@ const ENTITIES: HassEntity[] = [
   createEntity("alarm_control_panel.arming", "arming"),
   createEntity("alarm_control_panel.disarming", "disarming"),
   createEntity("alarm_control_panel.triggered", "triggered"),
-  // Alert
-  createEntity("alert.idle", "idle"),
-  createEntity("alert.off", "off"),
-  createEntity("alert.on", "on"),
-  // Automation
-  createEntity("automation.off", "off"),
-  createEntity("automation.on", "on"),
   // Binary Sensor
-  ...BINARY_SENSOR_DEVICE_CLASSES.map((dc) => [
-    createEntity(`binary_sensor.${dc}`, "off", dc),
-    createEntity(`binary_sensor.${dc}`, "on", dc),
-  ]).reduce((arr, item) => [...arr, ...item], []),
+  ...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"),
+  createEntity("calendar.off", "off"),
   // Climate
   createEntity("climate.off", "off"),
   createEntity("climate.heat", "heat"),
@@ -132,25 +123,11 @@ const ENTITIES: HassEntity[] = [
   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",
-  }),
-  createEntity("climate.auto_fan", "auto", undefined, {
-    hvac_action: "fan",
-  }),
   // Cover
-  createEntity("cover.closing", "closing"),
-  createEntity("cover.closed", "closed"),
   createEntity("cover.opening", "opening"),
   createEntity("cover.open", "open"),
+  createEntity("cover.closing", "closing"),
+  createEntity("cover.closed", "closed"),
   createEntity("cover.awning", "open", "awning"),
   createEntity("cover.blind", "open", "blind"),
   createEntity("cover.curtain", "open", "curtain"),
@@ -162,27 +139,21 @@ const ENTITIES: HassEntity[] = [
   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.not_home", "not_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"),
+  createEntity("fan.off", "off"),
   // Humidifier
-  createEntity("humidifier.off", "off"),
   createEntity("humidifier.on", "on"),
-  // Helpers
-  createEntity("input_boolean.off", "off"),
-  createEntity("input_boolean.on", "on"),
+  createEntity("humidifier.off", "off"),
   // Light
-  createEntity("light.off", "off"),
   createEntity("light.on", "on"),
+  createEntity("light.off", "off"),
   // Locks
   createEntity("lock.locked", "locked"),
   createEntity("lock.unlocked", "unlocked"),
@@ -209,33 +180,15 @@ const ENTITIES: HassEntity[] = [
   createEntity("media_player.speaker_playing", "playing", "speaker"),
   createEntity("media_player.speaker_paused", "paused", "speaker"),
   createEntity("media_player.speaker_standby", "standby", "speaker"),
-  // Plant
-  createEntity("plant.ok", "ok"),
-  createEntity("plant.problem", "problem"),
-  // Remote
-  createEntity("remote.off", "off"),
-  createEntity("remote.on", "on"),
-  // Schedule
-  createEntity("schedule.off", "off"),
-  createEntity("schedule.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, "unknown", "not_valid"].map(
-    (value) =>
-      createEntity(`sensor.battery_${value}`, value.toString(), "battery")
+  ...[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"),
@@ -243,13 +196,9 @@ const ENTITIES: HassEntity[] = [
   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.docked", "docked"),
   createEntity("vacuum.paused", "paused"),
   createEntity("vacuum.idle", "idle"),
   createEntity("vacuum.returning", "returning"),
@@ -331,15 +280,21 @@ export class DemoEntityState extends LitElement {
       const columns: DataTableColumnContainer<EntityRowData> = {
         icon: {
           title: "Icon",
-          template: (_, entry) => html`
-            <state-badge
-              .stateObj=${entry.stateObj}
-              .stateColor=${true}
-            ></state-badge>
-          `,
+          template: (_, entry) => {
+            const cssColor = stateColorCss(entry.stateObj);
+            return html`
+              <ha-svg-icon
+                style=${styleMap({
+                  color: `rgb(${cssColor})`,
+                })}
+                .path=${stateIconPath(entry.stateObj)}
+              >
+              </ha-svg-icon>
+            `;
+          },
         },
         entity_id: {
-          title: "Entity ID",
+          title: "Entity id",
           width: "30%",
           filterable: true,
           sortable: true,
@@ -352,8 +307,7 @@ export class DemoEntityState extends LitElement {
             html`${computeStateDisplay(
               hass.localize,
               entry.stateObj,
-              hass.locale,
-              hass.entities
+              hass.locale
             )}`,
         },
         device_class: {

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) =>
-      caseInsensitiveStringCompare(a.name, b.name, this.hass.locale.language)
-    );
+    return addons.sort((a, b) => caseInsensitiveStringCompare(a.name, b.name));
   });
 
   protected render(): TemplateResult {

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

hassio/src/components/supervisor-formfield-label.ts

@@ -15,7 +15,7 @@ class SupervisorFormfieldLabel extends LitElement {
   protected render(): TemplateResult {
     return html`
       ${this.imageUrl
-        ? html`<img loading="lazy" alt="" src=${this.imageUrl} class="icon" />`
+        ? html`<img loading="lazy" .src=${this.imageUrl} class="icon" />`
         : this.iconPath
         ? html`<ha-svg-icon .path=${this.iconPath} class="icon"></ha-svg-icon>`
         : ""}

hassio/src/dashboard/hassio-addons.ts

@@ -35,13 +35,7 @@ class HassioAddons extends LitElement {
                 </ha-card>
               `
             : this.supervisor.addon.addons
-                .sort((a, b) =>
-                  caseInsensitiveStringCompare(
-                    a.name,
-                    b.name,
-                    this.hass.locale.language
-                  )
-                )
+                .sort((a, b) => caseInsensitiveStringCompare(a.name, b.name))
                 .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,
-    language: string
-  ) =>
+  (showAdvanced: boolean, hardware: HassioHardwareInfo, filter: 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.hass.locale.language
+      (this._filter || "").toLowerCase()
     );
 
     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) =>
-        caseInsensitiveStringCompare(a.name, b.name, this.hass.locale.language)
-      )
+      .sort((a, b) => caseInsensitiveStringCompare(a.name, b.name))
   );
 
   private _filteredUsedRepositories = memoizeOne(

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
-      title=${this._addon.name}
-      src=${this._addon.ingress_url!}
-    >
-    </iframe>`;
+    const iframe = html`<iframe src=${this._addon.ingress_url!}></iframe>`;
 
     if (!this.ingressPanel) {
       return html`<hass-subpage

lint-staged.config.js

@@ -5,5 +5,4 @@ module.exports = {
     'printf "%s\n" "Translation files should not be added or modified here. Instead, make the necessary modifications in src/translations/en.json. Other languages are managed externally. Please see https://developers.home-assistant.io/docs/translations/ for details." ' +
     files.join(" ") +
     " >&2 && exit 1",
-  "/yarn.lock": () => "yarn dedupe",
 };

package.json

@@ -24,17 +24,22 @@
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@braintree/sanitize-url": "^6.0.0",
-    "@codemirror/autocomplete": "^6.4.0",
-    "@codemirror/commands": "^6.1.3",
-    "@codemirror/language": "^6.4.0",
-    "@codemirror/legacy-modes": "^6.3.1",
-    "@codemirror/search": "^6.2.3",
-    "@codemirror/state": "^6.2.0",
-    "@codemirror/view": "^6.7.1",
+    "@braintree/sanitize-url": "^5.0.2",
+    "@codemirror/autocomplete": "^0.19.12",
+    "@codemirror/commands": "^0.19.8",
+    "@codemirror/gutter": "^0.19.9",
+    "@codemirror/highlight": "^0.19.7",
+    "@codemirror/history": "^0.19.2",
+    "@codemirror/legacy-modes": "^0.19.0",
+    "@codemirror/rectangular-selection": "^0.19.1",
+    "@codemirror/search": "^0.19.6",
+    "@codemirror/state": "^0.19.6",
+    "@codemirror/stream-parser": "^0.19.5",
+    "@codemirror/text": "^0.19.6",
+    "@codemirror/view": "^0.19.40",
     "@formatjs/intl-datetimeformat": "^4.2.5",
-    "@formatjs/intl-getcanonicallocales": "^2.0.5",
-    "@formatjs/intl-locale": "^3.0.11",
+    "@formatjs/intl-getcanonicallocales": "^1.8.0",
+    "@formatjs/intl-locale": "^2.4.40",
     "@formatjs/intl-numberformat": "^7.2.5",
     "@formatjs/intl-pluralrules": "^4.1.5",
     "@formatjs/intl-relativetimeformat": "^9.3.2",
@@ -44,35 +49,34 @@
     "@fullcalendar/interaction": "5.9.0",
     "@fullcalendar/list": "5.9.0",
     "@fullcalendar/timegrid": "5.9.0",
-    "@lezer/highlight": "^1.1.3",
-    "@lit-labs/motion": "^1.0.3",
-    "@lit-labs/virtualizer": "^1.0.1",
-    "@material/chips": "=14.0.0-canary.53b3cad2f.0",
-    "@material/data-table": "=14.0.0-canary.53b3cad2f.0",
-    "@material/mwc-button": "^0.27.0",
-    "@material/mwc-checkbox": "^0.27.0",
-    "@material/mwc-circular-progress": "^0.27.0",
-    "@material/mwc-dialog": "^0.27.0",
-    "@material/mwc-drawer": "^0.27.0",
-    "@material/mwc-fab": "^0.27.0",
-    "@material/mwc-formfield": "^0.27.0",
-    "@material/mwc-icon-button": "^0.27.0",
-    "@material/mwc-linear-progress": "^0.27.0",
-    "@material/mwc-list": "^0.27.0",
-    "@material/mwc-menu": "^0.27.0",
-    "@material/mwc-radio": "^0.27.0",
-    "@material/mwc-ripple": "^0.27.0",
-    "@material/mwc-select": "^0.27.0",
-    "@material/mwc-slider": "^0.27.0",
-    "@material/mwc-switch": "^0.27.0",
-    "@material/mwc-tab": "^0.27.0",
-    "@material/mwc-tab-bar": "^0.27.0",
-    "@material/mwc-textarea": "^0.27.0",
-    "@material/mwc-textfield": "^0.27.0",
-    "@material/mwc-top-app-bar-fixed": "^0.27.0",
-    "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
-    "@mdi/js": "7.1.96",
-    "@mdi/svg": "7.1.96",
+    "@lit-labs/motion": "^1.0.2",
+    "@lit-labs/virtualizer": "patch:@lit-labs/virtualizer@0.7.0-pre.2#./.yarn/patches/@lit-labs/virtualizer/event-target-shim.patch",
+    "@material/chips": "14.0.0-canary.261f2db59.0",
+    "@material/data-table": "14.0.0-canary.261f2db59.0",
+    "@material/mwc-button": "0.25.3",
+    "@material/mwc-checkbox": "0.25.3",
+    "@material/mwc-circular-progress": "0.25.3",
+    "@material/mwc-dialog": "0.25.3",
+    "@material/mwc-drawer": "^0.25.3",
+    "@material/mwc-fab": "0.25.3",
+    "@material/mwc-formfield": "0.25.3",
+    "@material/mwc-icon-button": "patch:@material/mwc-icon-button@0.25.3#./.yarn/patches/@material/mwc-icon-button/remove-icon.patch",
+    "@material/mwc-linear-progress": "0.25.3",
+    "@material/mwc-list": "^0.25.3",
+    "@material/mwc-menu": "0.25.3",
+    "@material/mwc-radio": "0.25.3",
+    "@material/mwc-ripple": "0.25.3",
+    "@material/mwc-select": "0.25.3",
+    "@material/mwc-slider": "0.25.3",
+    "@material/mwc-switch": "0.25.3",
+    "@material/mwc-tab": "0.25.3",
+    "@material/mwc-tab-bar": "0.25.3",
+    "@material/mwc-textarea": "^0.25.3",
+    "@material/mwc-textfield": "0.25.3",
+    "@material/mwc-top-app-bar-fixed": "^0.25.3",
+    "@material/top-app-bar": "14.0.0-canary.261f2db59.0",
+    "@mdi/js": "7.0.96",
+    "@mdi/svg": "7.0.96",
     "@polymer/app-layout": "^3.1.0",
     "@polymer/iron-flex-layout": "^3.0.1",
     "@polymer/iron-icon": "^3.0.1",
@@ -87,48 +91,46 @@
     "@polymer/paper-toast": "^3.0.1",
     "@polymer/paper-tooltip": "^3.0.1",
     "@polymer/polymer": "3.4.1",
-    "@thomasloven/round-slider": "0.6.0",
-    "@vaadin/combo-box": "^23.3.5",
-    "@vaadin/vaadin-themable-mixin": "^23.3.5",
+    "@thomasloven/round-slider": "0.5.4",
+    "@vaadin/combo-box": "^23.2.9",
+    "@vaadin/vaadin-themable-mixin": "^23.2.9",
     "@vibrant/color": "^3.2.1-alpha.1",
     "@vibrant/core": "^3.2.1-alpha.1",
     "@vibrant/quantizer-mmcq": "^3.2.1-alpha.1",
-    "@vue/web-component-wrapper": "^1.3.0",
+    "@vue/web-component-wrapper": "^1.2.0",
     "@webcomponents/scoped-custom-element-registry": "^0.0.5",
     "@webcomponents/webcomponentsjs": "^2.2.10",
-    "app-datepicker": "^5.1.0",
+    "app-datepicker": "^5.0.1",
     "chart.js": "^3.3.2",
     "comlink": "^4.3.1",
     "core-js": "^3.15.2",
-    "cropperjs": "^1.5.13",
-    "date-fns": "^2.29.3",
-    "date-fns-tz": "^1.3.7",
+    "cropperjs": "^1.5.12",
+    "date-fns": "^2.23.0",
     "deep-clone-simple": "^1.1.1",
     "deep-freeze": "^0.0.1",
-    "fuse.js": "^6.6.2",
+    "fuse.js": "^6.0.0",
     "google-timezones-json": "^1.0.2",
     "hammerjs": "^2.0.8",
-    "hls.js": "^1.3.1",
+    "hls.js": "^1.2.5",
     "home-assistant-js-websocket": "^8.0.1",
     "idb-keyval": "^5.1.3",
-    "intl-messageformat": "^10.2.5",
+    "intl-messageformat": "^9.9.1",
     "js-yaml": "^4.1.0",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
-    "lit": "^2.6.1",
+    "lit": "^2.1.2",
     "marked": "^4.0.12",
-    "memoize-one": "^6.0.0",
+    "memoize-one": "^5.2.1",
     "node-vibrant": "3.2.1-alpha.1",
     "proxy-polyfill": "^0.3.2",
-    "punycode": "^2.3.0",
+    "punycode": "^2.1.1",
     "qr-scanner": "^1.3.0",
-    "qrcode": "^1.5.1",
-    "regenerator-runtime": "^0.13.11",
+    "qrcode": "^1.4.4",
+    "regenerator-runtime": "^0.13.8",
     "resize-observer-polyfill": "^1.5.1",
     "roboto-fontface": "^0.10.0",
-    "rrule": "^2.7.1",
     "sortablejs": "^1.14.0",
-    "superstruct": "^1.0.3",
+    "superstruct": "^0.15.2",
     "tinykeys": "^1.1.3",
     "tsparticles": "^1.34.0",
     "unfetch": "^4.1.0",
@@ -137,19 +139,19 @@
     "vue": "^2.6.12",
     "vue2-daterange-picker": "^0.5.1",
     "weekstart": "^1.1.0",
-    "workbox-cacheable-response": "^6.5.4",
-    "workbox-core": "^6.5.4",
-    "workbox-expiration": "^6.5.4",
-    "workbox-precaching": "^6.5.4",
-    "workbox-routing": "^6.5.4",
-    "workbox-strategies": "^6.5.4",
-    "xss": "^1.0.14"
+    "workbox-cacheable-response": "^6.4.2",
+    "workbox-core": "^6.4.2",
+    "workbox-expiration": "^6.4.2",
+    "workbox-precaching": "^6.4.2",
+    "workbox-routing": "^6.4.2",
+    "workbox-strategies": "^6.4.2",
+    "xss": "^1.0.9"
   },
   "devDependencies": {
     "@babel/core": "^7.20.2",
     "@babel/plugin-external-helpers": "^7.18.6",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.2",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.2",
     "@babel/plugin-proposal-optional-chaining": "^7.18.9",
@@ -160,7 +162,7 @@
     "@babel/preset-typescript": "^7.18.6",
     "@koa/cors": "^3.1.0",
     "@octokit/auth-oauth-device": "^4.0.2",
-    "@octokit/rest": "^19.0.7",
+    "@octokit/rest": "^19.0.4",
     "@open-wc/dev-server-hmr": "^0.0.2",
     "@rollup/plugin-babel": "^5.2.1",
     "@rollup/plugin-commonjs": "^11.1.0",
@@ -169,89 +171,94 @@
     "@rollup/plugin-replace": "^2.3.2",
     "@types/chromecast-caf-receiver": "5.0.12",
     "@types/chromecast-caf-sender": "^1.0.3",
-    "@types/glob": "^8",
+    "@types/glob": "^7",
     "@types/hammerjs": "^2.0.41",
     "@types/js-yaml": "^4",
     "@types/leaflet": "^1",
     "@types/leaflet-draw": "^1",
     "@types/marked": "^4",
     "@types/mocha": "^8",
-    "@types/qrcode": "^1.5.0",
+    "@types/qrcode": "^1.4.2",
     "@types/sortablejs": "^1",
     "@types/tar": "^6",
     "@types/webspeechapi": "^0.0.29",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.49.0",
+    "@typescript-eslint/eslint-plugin": "^5.44.0",
+    "@typescript-eslint/parser": "^5.44.0",
     "@web/dev-server": "^0.0.24",
     "@web/dev-server-rollup": "^0.2.11",
     "babel-loader": "^9.1.0",
     "chai": "^4.3.4",
-    "del": "^7.0.0",
+    "del": "^4.0.0",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-airbnb-typescript": "^14.0.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-webpack": "^0.13.1",
     "eslint-plugin-disable": "^2.0.1",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-lit": "^1.6.1",
+    "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-unused-imports": "^1.1.5",
-    "eslint-plugin-wc": "^1.4.0",
-    "fancy-log": "^2.0.0",
-    "fs-extra": "^11.1.0",
-    "glob": "^8.1.0",
+    "eslint-plugin-wc": "^1.3.2",
+    "fancy-log": "^1.3.3",
+    "fs-extra": "^7.0.1",
+    "glob": "^7.2.0",
     "gulp": "^4.0.2",
     "gulp-flatmap": "^1.0.2",
     "gulp-json-transform": "^0.4.6",
-    "gulp-merge-json": "^2.1.2",
+    "gulp-merge-json": "^1.3.1",
     "gulp-rename": "^2.0.0",
     "gulp-zopfli-green": "^3.0.1",
     "html-minifier": "^4.0.0",
-    "husky": "^8.0.3",
+    "husky": "^8.0.1",
     "instant-mocha": "^1.3.1",
     "jszip": "^3.10.1",
-    "lint-staged": "^13.1.0",
+    "lint-staged": "^13.0.3",
     "lit-analyzer": "^1.2.1",
     "lodash.template": "^4.5.0",
     "magic-string": "^0.25.7",
     "map-stream": "^0.0.7",
     "merge-stream": "^1.0.1",
     "mocha": "^8.4.0",
-    "object-hash": "^3.0.0",
-    "open": "^8.4.0",
+    "object-hash": "^2.0.3",
+    "open": "^7.0.4",
     "pinst": "^3.0.0",
-    "prettier": "^2.8.3",
+    "prettier": "^2.4.1",
     "require-dir": "^1.2.0",
     "rollup": "^2.8.2",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^5.3.0",
-    "rollup-plugin-visualizer": "^5.9.0",
+    "rollup-plugin-visualizer": "^4.0.4",
     "serve": "^11.3.2",
-    "sinon": "^15.0.1",
+    "sinon": "^11.0.0",
     "source-map-url": "^0.4.0",
     "systemjs": "^6.3.2",
     "tar": "^6.1.11",
     "terser-webpack-plugin": "^5.2.4",
     "ts-lit-plugin": "^1.2.1",
-    "typescript": "^4.9.4",
+    "typescript": "^4.9.3",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
     "webpack": "^5.55.1",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1",
+    "webpack-cli": "^4.8.0",
+    "webpack-dev-server": "^4.3.0",
     "webpack-manifest-plugin": "^4.0.2",
-    "webpackbar": "^5.0.2",
-    "workbox-build": "^6.5.4"
+    "webpackbar": "^5.0.0-3",
+    "workbox-build": "^6.4.2"
   },
   "_comment": "Polymer 3.2 contained a bug, fixed in https://github.com/Polymer/polymer/pull/5569, add as patch",
   "resolutions": {
     "@polymer/polymer": "patch:@polymer/polymer@3.4.1#./.yarn/patches/@polymer/polymer/pr-5569.patch",
-    "@webcomponents/webcomponentsjs": "^2.2.10"
+    "@webcomponents/webcomponentsjs": "^2.2.10",
+    "lit": "^2.1.2",
+    "lit-html": "2.1.2",
+    "lit-element": "3.1.2",
+    "@lit/reactive-element": "1.2.1"
   },
   "main": "src/home-assistant.js",
   "prettier": {
     "trailingComma": "es5",
     "arrowParens": "always"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.2.3"
 }

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20230128.0"
+version      = "20221108.0"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"

script/bootstrap

@@ -7,4 +7,4 @@ set -e
 cd "$(dirname "$0")/.."
 
 # Install node modules
-yarn install
+yarn install

script/setup_translations

@@ -1,9 +0,0 @@
-#!/bin/sh
-# Setup translation fetching during development
-
-# Stop on errors
-set -e
-
-cd "$(dirname "$0")/.."
-
-./node_modules/.bin/gulp setup-and-fetch-nightly-translations

src/cast/receiver_messages.ts

@@ -8,8 +8,6 @@ import { BaseCastMessage } from "./types";
 
 export interface GetStatusMessage extends BaseCastMessage {
   type: "get_status";
-  hassUrl?: string;
-  hassUUID?: string;
 }
 
 export interface ConnectMessage extends BaseCastMessage {
@@ -17,15 +15,12 @@ export interface ConnectMessage extends BaseCastMessage {
   refreshToken: string;
   clientId: string | null;
   hassUrl: string;
-  hassUUID?: string;
 }
 
 export interface ShowLovelaceViewMessage extends BaseCastMessage {
   type: "show_lovelace_view";
   viewPath: string | number | null;
   urlPath: string | null;
-  hassUrl: string;
-  hassUUID?: string;
 }
 
 export interface ShowDemoMessage extends BaseCastMessage {
@@ -48,7 +43,6 @@ export const castSendAuth = (cast: CastManager, auth: Auth) =>
 
 export const castSendShowLovelaceView = (
   cast: CastManager,
-  hassUrl: string,
   viewPath: ShowLovelaceViewMessage["viewPath"],
   urlPath?: string | null
 ) =>
@@ -56,7 +50,6 @@ export const castSendShowLovelaceView = (
     type: "show_lovelace_view",
     viewPath,
     urlPath: urlPath || null,
-    hassUrl: CAST_DEV ? CAST_DEV_HASS_URL : hassUrl,
   });
 
 export const castSendShowDemo = (cast: CastManager) =>

src/cast/sender_messages.ts

@@ -7,7 +7,6 @@ export interface ReceiverStatusMessage extends BaseCastMessage {
   connected: boolean;
   showDemo: boolean;
   hassUrl?: string;
-  hassUUID?: string;
   lovelacePath?: string | number | null;
   urlPath?: string | null;
 }
@@ -24,7 +23,6 @@ export const enum ReceiverErrorCode {
   CONNECTION_LOST = 3,
   HASS_URL_MISSING = 4,
   NO_HTTPS = 5,
-  WRONG_INSTANCE = 20,
   NOT_CONNECTED = 21,
   FETCH_CONFIG_FAILED = 22,
 }

src/common/array/literal-includes.ts

@@ -1,5 +0,0 @@
-// Creates a type predicate function for determining if an array literal includes a given value
-export const arrayLiteralIncludes =
-  <T extends readonly unknown[]>(array: T) =>
-  (searchElement: unknown, fromIndex?: number): searchElement is T[number] =>
-    array.includes(searchElement as T[number], fromIndex);

src/common/color/compute-color.ts

@@ -1,3 +1,5 @@
+import { hex2rgb } from "./convert-color";
+
 export const THEME_COLORS = new Set([
   "primary",
   "accent",
@@ -19,17 +21,22 @@ export const THEME_COLORS = new Set([
   "orange",
   "deep-orange",
   "brown",
-  "light-grey",
   "grey",
-  "dark-grey",
   "blue-grey",
   "black",
   "white",
 ]);
 
-export function computeCssColor(color: string): string {
+export function computeRgbColor(color: string): string {
   if (THEME_COLORS.has(color)) {
-    return `var(--${color}-color)`;
+    return `var(--rgb-${color}-color)`;
+  }
+  if (color.startsWith("#")) {
+    try {
+      return hex2rgb(color).join(", ");
+    } catch (err) {
+      return "";
+    }
   }
   return color;
 }

src/common/const.ts

@@ -21,8 +21,6 @@ import {
   mdiCommentAlert,
   mdiCounter,
   mdiCurrentAc,
-  mdiDatabase,
-  mdiEarHearing,
   mdiEye,
   mdiFan,
   mdiFlash,
@@ -54,12 +52,9 @@ import {
   mdiScriptText,
   mdiSineWave,
   mdiSpeedometer,
-  mdiSunWireless,
   mdiThermometer,
-  mdiThermometerLines,
   mdiThermostat,
   mdiTimerOutline,
-  mdiTransmissionTower,
   mdiVideo,
   mdiWater,
   mdiWaterPercent,
@@ -131,13 +126,10 @@ export const FIXED_DOMAIN_ICONS = {
 export const FIXED_DEVICE_CLASS_ICONS = {
   apparent_power: mdiFlash,
   aqi: mdiAirFilter,
-  atmospheric_pressure: mdiThermometerLines,
   // battery: mdiBattery, => not included by design since `sensorIcon()` will dynamically determine the icon
   carbon_dioxide: mdiMoleculeCo2,
   carbon_monoxide: mdiMoleculeCo,
   current: mdiCurrentAc,
-  data_rate: mdiTransmissionTower,
-  data_size: mdiDatabase,
   date: mdiCalendar,
   distance: mdiArrowLeftRight,
   duration: mdiProgressClock,
@@ -146,7 +138,6 @@ export const FIXED_DEVICE_CLASS_ICONS = {
   gas: mdiMeterGas,
   humidity: mdiWaterPercent,
   illuminance: mdiBrightness5,
-  irradiance: mdiSunWireless,
   moisture: mdiWaterPercent,
   monetary: mdiCash,
   nitrogen_dioxide: mdiMolecule,
@@ -163,7 +154,6 @@ export const FIXED_DEVICE_CLASS_ICONS = {
   pressure: mdiGauge,
   reactive_power: mdiFlash,
   signal_strength: mdiWifi,
-  sound_pressure: mdiEarHearing,
   speed: mdiSpeedometer,
   sulphur_dioxide: mdiMolecule,
   temperature: mdiThermometer,
@@ -198,15 +188,6 @@ export const DOMAINS_WITH_CARD = [
   "water_heater",
 ];
 
-export const SENSOR_ENTITIES = [
-  "sensor",
-  "binary_sensor",
-  "calendar",
-  "camera",
-  "device_tracker",
-  "weather",
-];
-
 /** Domains that render an input element instead of a text value when displayed in a row.
  *  Those rows should then not show a cursor pointer when hovered (which would normally
  *  be the default) unless the element itself enforces it (e.g. a button). Also those elements

src/common/datetime/format_date.ts

@@ -7,12 +7,10 @@ if (__BUILD__ === "latest" && polyfillsLoaded) {
 }
 
 // Tuesday, August 10
-export const formatDateWeekdayDay = (
-  dateObj: Date,
-  locale: FrontendLocaleData
-) => formatDateWeekdayDayMem(locale).format(dateObj);
+export const formatDateWeekday = (dateObj: Date, locale: FrontendLocaleData) =>
+  formatDateWeekdayMem(locale).format(dateObj);
 
-const formatDateWeekdayDayMem = memoizeOne(
+const formatDateWeekdayMem = memoizeOne(
   (locale: FrontendLocaleData) =>
     new Intl.DateTimeFormat(locale.language, {
       weekday: "long",
@@ -94,14 +92,3 @@ const formatDateYearMem = memoizeOne(
       year: "numeric",
     })
 );
-
-// Monday
-export const formatDateWeekday = (dateObj: Date, locale: FrontendLocaleData) =>
-  formatDateWeekdayMem(locale).format(dateObj);
-
-const formatDateWeekdayMem = memoizeOne(
-  (locale: FrontendLocaleData) =>
-    new Intl.DateTimeFormat(locale.language, {
-      weekday: "long",
-    })
-);

src/common/datetime/relative_time.ts

@@ -18,7 +18,7 @@ export const relativeTime = (
   to?: Date,
   includeTense = true
 ): string => {
-  const diff = selectUnit(from, to, locale);
+  const diff = selectUnit(from, to);
   if (includeTense) {
     return formatRelTimeMem(locale).format(diff.value, diff.unit);
   }

src/common/dom/scroll-to-target.ts

@@ -39,5 +39,5 @@ export default function scrollToTarget(element, target) {
       );
       requestAnimationFrame(updateFrame.bind(element));
     }
-  }).call(element);
+  }.call(element));
 }

src/common/entity/color/alarm_control_panel_color.ts

@@ -0,0 +1,19 @@
+export const alarmControlPanelColor = (state?: string): string | undefined => {
+  switch (state) {
+    case "armed_away":
+    case "armed_vacation":
+    case "armed_home":
+    case "armed_night":
+    case "armed_custom_bypass":
+      return "alarm-armed";
+    case "pending":
+      return "alarm-pending";
+    case "arming":
+    case "disarming":
+      return "alarm-arming";
+    case "triggered":
+      return "alarm-triggered";
+    default:
+      return undefined;
+  }
+};

src/common/entity/color/battery_color.ts

@@ -1,15 +1,15 @@
-export const batteryStateColorProperty = (
-  state: string
-): string | undefined => {
-  const value = Number(state);
+import { HassEntity } from "home-assistant-js-websocket";
+
+export const batteryStateColor = (stateObj: HassEntity) => {
+  const value = Number(stateObj.state);
   if (isNaN(value)) {
-    return undefined;
+    return "sensor-battery-unknown";
   }
   if (value >= 70) {
-    return "--state-sensor-battery-high-color";
+    return "sensor-battery-high";
   }
   if (value >= 30) {
-    return "--state-sensor-battery-medium-color";
+    return "sensor-battery-medium";
   }
-  return "--state-sensor-battery-low-color";
+  return "sensor-battery-low";
 };

src/common/entity/color/binary_sensor_color.ts

@@ -0,0 +1,20 @@
+import { HassEntity } from "home-assistant-js-websocket";
+
+const ALERTING_DEVICE_CLASSES = new Set([
+  "battery",
+  "carbon_monoxide",
+  "gas",
+  "heat",
+  "problem",
+  "safety",
+  "smoke",
+  "tamper",
+]);
+
+export const binarySensorColor = (stateObj: HassEntity): string | undefined => {
+  const deviceClass = stateObj?.attributes.device_class;
+
+  return deviceClass && ALERTING_DEVICE_CLASSES.has(deviceClass)
+    ? "binary-sensor-alerting"
+    : "binary-sensor";
+};

src/common/entity/color/climate_color.ts

@@ -0,0 +1,18 @@
+export const climateColor = (state: string): string | undefined => {
+  switch (state) {
+    case "auto":
+      return "climate-auto";
+    case "cool":
+      return "climate-cool";
+    case "dry":
+      return "climate-dry";
+    case "fan_only":
+      return "climate-fan-only";
+    case "heat":
+      return "climate-heat";
+    case "heat_cool":
+      return "climate-heat-cool";
+    default:
+      return undefined;
+  }
+};

src/common/entity/color/lock_color.ts

@@ -0,0 +1,13 @@
+export const lockColor = (state?: string): string | undefined => {
+  switch (state) {
+    case "locked":
+      return "lock-locked";
+    case "jammed":
+      return "lock-jammed";
+    case "locking":
+    case "unlocking":
+      return "lock-pending";
+    default:
+      return undefined;
+  }
+};

src/common/entity/color/sensor_color.ts

@@ -0,0 +1,12 @@
+import { HassEntity } from "home-assistant-js-websocket";
+import { batteryStateColor } from "./battery_color";
+
+export const sensorColor = (stateObj: HassEntity): string | undefined => {
+  const deviceClass = stateObj?.attributes.device_class;
+
+  if (deviceClass === "battery") {
+    return batteryStateColor(stateObj);
+  }
+
+  return undefined;
+};

src/common/entity/compute_attribute_display.ts

@@ -1,52 +0,0 @@
-import { HassEntity } from "home-assistant-js-websocket";
-import { EntityRegistryEntry } from "../../data/entity_registry";
-import { HomeAssistant } from "../../types";
-import { LocalizeFunc } from "../translations/localize";
-import { computeDomain } from "./compute_domain";
-
-export const computeAttributeValueDisplay = (
-  localize: LocalizeFunc,
-  stateObj: HassEntity,
-  entities: HomeAssistant["entities"],
-  attribute: string,
-  value?: any
-): string => {
-  const entityId = stateObj.entity_id;
-  const attributeValue =
-    value !== undefined ? value : stateObj.attributes[attribute];
-  const domain = computeDomain(entityId);
-  const entity = entities[entityId] as EntityRegistryEntry | undefined;
-  const translationKey = entity?.translation_key;
-
-  return (
-    (translationKey &&
-      localize(
-        `component.${entity.platform}.entity.${domain}.${translationKey}.state_attributes.${attribute}.state.${attributeValue}`
-      )) ||
-    localize(
-      `component.${domain}.state_attributes._.${attribute}.state.${attributeValue}`
-    ) ||
-    attributeValue
-  );
-};
-
-export const computeAttributeNameDisplay = (
-  localize: LocalizeFunc,
-  stateObj: HassEntity,
-  entities: HomeAssistant["entities"],
-  attribute: string
-): string => {
-  const entityId = stateObj.entity_id;
-  const domain = computeDomain(entityId);
-  const entity = entities[entityId] as EntityRegistryEntry | undefined;
-  const translationKey = entity?.translation_key;
-
-  return (
-    (translationKey &&
-      localize(
-        `component.${entity.platform}.entity.${domain}.${translationKey}.state_attributes.${attribute}.name`
-      )) ||
-    localize(`component.${domain}.state_attributes._.${attribute}.name`) ||
-    attribute
-  );
-};

src/common/entity/compute_state_display.ts

@@ -1,12 +1,10 @@
 import { HassEntity } from "home-assistant-js-websocket";
 import { UNAVAILABLE, UNKNOWN } from "../../data/entity";
-import { EntityRegistryEntry } from "../../data/entity_registry";
 import { FrontendLocaleData } from "../../data/translation";
 import {
   updateIsInstallingFromAttributes,
   UPDATE_SUPPORT_PROGRESS,
 } from "../../data/update";
-import { HomeAssistant } from "../../types";
 import { formatDuration, UNIT_TO_SECOND_CONVERT } from "../datetime/duration";
 import { formatDate } from "../datetime/format_date";
 import { formatDateTime } from "../datetime/format_date_time";
@@ -25,13 +23,11 @@ export const computeStateDisplay = (
   localize: LocalizeFunc,
   stateObj: HassEntity,
   locale: FrontendLocaleData,
-  entities: HomeAssistant["entities"],
   state?: string
 ): string =>
   computeStateDisplayFromEntityAttributes(
     localize,
     locale,
-    entities,
     stateObj.entity_id,
     stateObj.attributes,
     state !== undefined ? state : stateObj.state
@@ -40,7 +36,6 @@ export const computeStateDisplay = (
 export const computeStateDisplayFromEntityAttributes = (
   localize: LocalizeFunc,
   locale: FrontendLocaleData,
-  entities: HomeAssistant["entities"],
   entityId: string,
   attributes: any,
   state: string
@@ -199,13 +194,7 @@ export const computeStateDisplayFromEntityAttributes = (
       : localize("ui.card.update.up_to_date");
   }
 
-  const entity = entities[entityId] as EntityRegistryEntry | undefined;
-
   return (
-    (entity?.translation_key &&
-      localize(
-        `component.${entity.platform}.entity.${domain}.${entity.translation_key}.state.${state}`
-      )) ||
     // Return device class translation
     (attributes.device_class &&
       localize(

src/common/entity/domain_icon.ts

@@ -3,8 +3,6 @@ import {
   mdiAccountArrowRight,
   mdiAirHumidifier,
   mdiAirHumidifierOff,
-  mdiAudioVideo,
-  mdiAudioVideoOff,
   mdiBluetooth,
   mdiBluetoothConnect,
   mdiCalendar,
@@ -27,6 +25,8 @@ import {
   mdiPackageUp,
   mdiPowerPlug,
   mdiPowerPlugOff,
+  mdiAudioVideo,
+  mdiAudioVideoOff,
   mdiRestart,
   mdiSpeaker,
   mdiSpeakerOff,
@@ -53,7 +53,6 @@ import { DEFAULT_DOMAIN_ICON, FIXED_DOMAIN_ICONS } from "../const";
 import { alarmPanelIcon } from "./alarm_panel_icon";
 import { binarySensorIcon } from "./binary_sensor_icon";
 import { coverIcon } from "./cover_icon";
-import { numberIcon } from "./number_icon";
 import { sensorIcon } from "./sensor_icon";
 
 export const domainIcon = (
@@ -109,7 +108,7 @@ export const domainIconWithoutDefault = (
       return compareState === "not_home" ? mdiAccountArrowRight : mdiAccount;
 
     case "humidifier":
-      return compareState === "off" ? mdiAirHumidifierOff : mdiAirHumidifier;
+      return state && state === "off" ? mdiAirHumidifierOff : mdiAirHumidifier;
 
     case "input_boolean":
       return compareState === "on"
@@ -181,18 +180,6 @@ export const domainIconWithoutDefault = (
           }
       }
 
-    case "number": {
-      const icon = numberIcon(stateObj);
-      if (icon) {
-        return icon;
-      }
-
-      break;
-    }
-
-    case "person":
-      return compareState === "not_home" ? mdiAccountArrowRight : mdiAccount;
-
     case "switch":
       switch (stateObj?.attributes.device_class) {
         case "outlet":

src/common/entity/get_states.ts

@@ -2,7 +2,7 @@ import { HassEntity } from "home-assistant-js-websocket";
 import { computeStateDomain } from "./compute_state_domain";
 import { UNAVAILABLE_STATES } from "../../data/entity";
 
-export const FIXED_DOMAIN_STATES = {
+const FIXED_DOMAIN_STATES = {
   alarm_control_panel: [
     "armed_away",
     "armed_custom_bypass",
@@ -57,7 +57,7 @@ export const FIXED_DOMAIN_STATES = {
     "windy-variant",
     "windy",
   ],
-} as const;
+};
 
 const FIXED_DOMAIN_ATTRIBUTE_STATES = {
   alarm_control_panel: {
@@ -261,11 +261,6 @@ export const getStates = (
         result.push(...state.attributes.activity_list);
       }
       break;
-    case "sensor":
-      if (!attribute && state.attributes.device_class === "enum") {
-        result.push(...state.attributes.options);
-      }
-      break;
     case "vacuum":
       if (attribute === "fan_speed") {
         result.push(...state.attributes.fan_speed_list);

src/common/entity/number_icon.ts

@@ -1,13 +0,0 @@
-/** Return an icon representing a number state. */
-import { HassEntity } from "home-assistant-js-websocket";
-import { FIXED_DEVICE_CLASS_ICONS } from "../const";
-
-export const numberIcon = (stateObj?: HassEntity): string | undefined => {
-  const dclass = stateObj?.attributes.device_class;
-
-  if (dclass && dclass in FIXED_DEVICE_CLASS_ICONS) {
-    return FIXED_DEVICE_CLASS_ICONS[dclass];
-  }
-
-  return undefined;
-};

src/common/entity/state_active.ts

@@ -1,5 +1,5 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import { isUnavailableState, OFF, UNAVAILABLE } from "../../data/entity";
+import { OFF_STATES, UNAVAILABLE } from "../../data/entity";
 import { computeDomain } from "./compute_domain";
 
 export function stateActive(stateObj: HassEntity, state?: string): boolean {
@@ -10,32 +10,21 @@ export function stateActive(stateObj: HassEntity, state?: string): boolean {
     return compareState !== UNAVAILABLE;
   }
 
-  if (isUnavailableState(compareState)) {
-    return false;
-  }
-
-  // The "off" check is relevant for most domains, but there are exceptions
-  // such as "alert" where "off" is still a somewhat active state and
-  // therefore gets a custom color and "idle" is instead the state that
-  // matches what most other domains consider inactive.
-  if (compareState === OFF && domain !== "alert") {
+  if (OFF_STATES.includes(compareState)) {
     return false;
   }
 
   // Custom cases
   switch (domain) {
-    case "alarm_control_panel":
-      return compareState !== "disarmed";
-    case "alert":
-      // "on" and "off" are active, as "off" just means alert was acknowledged but is still active
-      return compareState !== "idle";
     case "cover":
-      return compareState !== "closed";
+      return !["closed", "closing"].includes(compareState);
     case "device_tracker":
     case "person":
       return compareState !== "not_home";
+    case "alarm_control_panel":
+      return compareState !== "disarmed";
     case "lock":
-      return compareState !== "locked";
+      return compareState !== "unlocked";
     case "media_player":
       return compareState !== "standby";
     case "vacuum":
@@ -44,11 +33,7 @@ export function stateActive(stateObj: HassEntity, state?: string): boolean {
       return compareState === "problem";
     case "group":
       return ["on", "home", "open", "locked", "problem"].includes(compareState);
-    case "timer":
-      return compareState === "active";
-    case "camera":
-      return compareState === "streaming";
+    default:
+      return true;
   }
-
-  return true;
 }

src/common/entity/state_color.ts

@@ -1,102 +1,79 @@
 /** Return an color representing a state. */
 import { HassEntity } from "home-assistant-js-websocket";
-import { UNAVAILABLE } from "../../data/entity";
-import { computeCssVariable } from "../../resources/css-variables";
-import { slugify } from "../string/slugify";
-import { batteryStateColorProperty } from "./color/battery_color";
+import { UpdateEntity, updateIsInstalling } from "../../data/update";
+import { alarmControlPanelColor } from "./color/alarm_control_panel_color";
+import { binarySensorColor } from "./color/binary_sensor_color";
+import { climateColor } from "./color/climate_color";
+import { lockColor } from "./color/lock_color";
+import { sensorColor } from "./color/sensor_color";
 import { computeDomain } from "./compute_domain";
 import { stateActive } from "./state_active";
 
-const STATE_COLORED_DOMAIN = new Set([
-  "alarm_control_panel",
-  "alert",
-  "automation",
-  "binary_sensor",
-  "calendar",
-  "camera",
-  "climate",
-  "cover",
-  "device_tracker",
-  "fan",
-  "group",
-  "humidifier",
-  "input_boolean",
-  "light",
-  "lock",
-  "media_player",
-  "person",
-  "plant",
-  "remote",
-  "schedule",
-  "script",
-  "siren",
-  "sun",
-  "switch",
-  "timer",
-  "update",
-  "vacuum",
-]);
-
-export const stateColorCss = (stateObj: HassEntity, state?: string) => {
-  const compareState = state !== undefined ? state : stateObj?.state;
-  if (compareState === UNAVAILABLE) {
-    return `var(--state-unavailable-color)`;
+export const stateColorCss = (stateObj?: HassEntity, state?: string) => {
+  if (!stateObj || !stateActive(stateObj, state)) {
+    return `var(--rgb-disabled-color)`;
   }
 
-  const properties = stateColorProperties(stateObj, state);
-  if (properties) {
-    return computeCssVariable(properties);
-  }
-
-  return undefined;
-};
-
-export const domainStateColorProperties = (
-  stateObj: HassEntity,
-  state?: string
-): string[] => {
-  const compareState = state !== undefined ? state : stateObj.state;
-  const domain = computeDomain(stateObj.entity_id);
-  const active = stateActive(stateObj, state);
-
-  const properties: string[] = [];
-
-  const stateKey = slugify(compareState, "_");
-  const activeKey = active ? "active" : "inactive";
-
-  const dc = stateObj.attributes.device_class;
-
-  if (dc) {
-    properties.push(`--state-${domain}-${dc}-${stateKey}-color`);
-  }
-
-  properties.push(
-    `--state-${domain}-${stateKey}-color`,
-    `--state-${domain}-${activeKey}-color`,
-    `--state-${activeKey}-color`
-  );
-
-  return properties;
-};
-
-export const stateColorProperties = (
-  stateObj: HassEntity,
-  state?: string
-): string[] | undefined => {
-  const compareState = state !== undefined ? state : stateObj?.state;
-  const domain = computeDomain(stateObj.entity_id);
-  const dc = stateObj.attributes.device_class;
-
-  // Special rules for battery coloring
-  if (domain === "sensor" && dc === "battery") {
-    const property = batteryStateColorProperty(compareState);
-    if (property) {
-      return [property];
-    }
-  }
-
-  if (STATE_COLORED_DOMAIN.has(domain)) {
-    return domainStateColorProperties(stateObj, state);
+  const color = stateColor(stateObj, state);
+
+  if (color) {
+    return `var(--rgb-state-${color}-color)`;
+  }
+
+  return `var(--rgb-state-default-color)`;
+};
+
+export const stateColor = (stateObj: HassEntity, state?: string) => {
+  const compareState = state !== undefined ? state : stateObj?.state;
+  const domain = computeDomain(stateObj.entity_id);
+
+  switch (domain) {
+    case "alarm_control_panel":
+      return alarmControlPanelColor(compareState);
+
+    case "binary_sensor":
+      return binarySensorColor(stateObj);
+
+    case "cover":
+      return "cover";
+
+    case "climate":
+      return climateColor(compareState);
+
+    case "fan":
+      return "fan";
+
+    case "lock":
+      return lockColor(compareState);
+
+    case "light":
+      return "light";
+
+    case "humidifier":
+      return "humidifier";
+
+    case "media_player":
+      return "media-player";
+
+    case "sensor":
+      return sensorColor(stateObj);
+
+    case "vacuum":
+      return "vacuum";
+
+    case "siren":
+      return "siren";
+
+    case "sun":
+      return compareState === "above_horizon" ? "sun-day" : "sun-night";
+
+    case "switch":
+      return "switch";
+
+    case "update":
+      return updateIsInstalling(stateObj as UpdateEntity)
+        ? "update-installing"
+        : "update";
   }
 
   return undefined;

src/common/integrations/protocolIntegrationPicked.ts

@@ -86,7 +86,7 @@ export const protocolIntegrationPicked = async (
           "ui.panel.config.integrations.config_flow.missing_zwave_zigbee",
           {
             integration: "Zigbee",
-            brand: options?.brand || options?.domain || "Zigbee",
+            brand: options?.brand || options?.domain || "Z-Wave",
             supported_hardware_link: html`<a
               href=${documentationUrl(
                 hass,

src/common/string/compare.ts

@@ -1,15 +1,4 @@
-import memoizeOne from "memoize-one";
-
-const collator = memoizeOne(
-  (language: string | undefined) => new Intl.Collator(language)
-);
-
-const caseInsensitiveCollator = memoizeOne(
-  (language: string | undefined) =>
-    new Intl.Collator(language, { sensitivity: "accent" })
-);
-
-const fallbackStringCompare = (a: string, b: string) => {
+export const stringCompare = (a: string, b: string) => {
   if (a < b) {
     return -1;
   }
@@ -20,28 +9,5 @@ const fallbackStringCompare = (a: string, b: string) => {
   return 0;
 };
 
-export const stringCompare = (
-  a: string,
-  b: string,
-  language: string | undefined = undefined
-) => {
-  // @ts-ignore
-  if (Intl?.Collator) {
-    return collator(language).compare(a, b);
-  }
-
-  return fallbackStringCompare(a, b);
-};
-
-export const caseInsensitiveStringCompare = (
-  a: string,
-  b: string,
-  language: string | undefined = undefined
-) => {
-  // @ts-ignore
-  if (Intl?.Collator) {
-    return caseInsensitiveCollator(language).compare(a, b);
-  }
-
-  return fallbackStringCompare(a.toLowerCase(), b.toLowerCase());
-};
+export const caseInsensitiveStringCompare = (a: string, b: string) =>
+  stringCompare(a.toLowerCase(), b.toLowerCase());

src/common/style/icon_color_css.ts

@@ -1,10 +1,32 @@
 import { css } from "lit";
 
 export const iconColorCSS = css`
-  ha-state-icon[data-domain="alarm_control_panel"][data-state="pending"],
-  ha-state-icon[data-domain="alarm_control_panel"][data-state="arming"],
-  ha-state-icon[data-domain="alarm_control_panel"][data-state="triggered"],
-  ha-state-icon[data-domain="lock"][data-state="jammed"] {
+  ha-state-icon[data-active][data-domain="alert"],
+  ha-state-icon[data-active][data-domain="automation"],
+  ha-state-icon[data-active][data-domain="binary_sensor"],
+  ha-state-icon[data-active][data-domain="calendar"],
+  ha-state-icon[data-active][data-domain="camera"],
+  ha-state-icon[data-active][data-domain="cover"],
+  ha-state-icon[data-active][data-domain="device_tracker"],
+  ha-state-icon[data-active][data-domain="fan"],
+  ha-state-icon[data-active][data-domain="humidifier"],
+  ha-state-icon[data-active][data-domain="light"],
+  ha-state-icon[data-active][data-domain="input_boolean"],
+  ha-state-icon[data-active][data-domain="lock"],
+  ha-state-icon[data-active][data-domain="media_player"],
+  ha-state-icon[data-active][data-domain="remote"],
+  ha-state-icon[data-active][data-domain="script"],
+  ha-state-icon[data-active][data-domain="sun"],
+  ha-state-icon[data-active][data-domain="switch"],
+  ha-state-icon[data-active][data-domain="timer"],
+  ha-state-icon[data-active][data-domain="vacuum"],
+  ha-state-icon[data-active][data-domain="group"] {
+    color: var(--paper-item-icon-active-color, #fdd835);
+  }
+
+  ha-state-icon[data-active][data-domain="alarm_control_panel"][data-state="pending"],
+  ha-state-icon[data-active][data-domain="alarm_control_panel"][data-state="arming"],
+  ha-state-icon[data-active][data-domain="alarm_control_panel"][data-state="triggered"] {
     animation: pulse 1s infinite;
   }
 

src/common/translations/day_names.ts

@@ -1,10 +0,0 @@
-import { addDays, startOfWeek } from "date-fns";
-import memoizeOne from "memoize-one";
-import { FrontendLocaleData } from "../../data/translation";
-import { formatDateWeekday } from "../datetime/format_date";
-
-export const dayNames = memoizeOne((locale: FrontendLocaleData): string[] =>
-  Array.from({ length: 7 }, (_, d) =>
-    formatDateWeekday(addDays(startOfWeek(new Date()), d), locale)
-  )
-);

src/common/translations/localize.ts

@@ -12,10 +12,12 @@ import { getLocalLanguage } from "../../util/common-translation";
 export type LocalizeKeys =
   | FlattenObjectKeys<Omit<TranslationDict, "supervisor">>
   | `panel.${string}`
+  | `state.${string}`
+  | `state_attributes.${string}`
+  | `state_badge.${string}`
   | `ui.card.alarm_control_panel.${string}`
   | `ui.card.weather.attributes.${string}`
   | `ui.card.weather.cardinal_direction.${string}`
-  | `ui.components.calendar.event.rrule.${string}`
   | `ui.components.logbook.${string}`
   | `ui.components.selectors.file.${string}`
   | `ui.dialogs.entity_registry.editor.${string}`
@@ -28,10 +30,13 @@ export type LocalizeKeys =
   | `ui.panel.config.dashboard.${string}`
   | `ui.panel.config.devices.${string}`
   | `ui.panel.config.energy.${string}`
+  | `ui.panel.config.helpers.${string}`
   | `ui.panel.config.info.${string}`
+  | `ui.panel.config.logs.${string}`
   | `ui.panel.config.lovelace.${string}`
   | `ui.panel.config.network.${string}`
   | `ui.panel.config.scene.${string}`
+  | `ui.panel.config.url.${string}`
   | `ui.panel.config.zha.${string}`
   | `ui.panel.config.zwave_js.${string}`
   | `ui.panel.lovelace.card.${string}`

src/common/translations/month_names.ts

@@ -1,10 +0,0 @@
-import { addMonths, startOfYear } from "date-fns";
-import memoizeOne from "memoize-one";
-import { FrontendLocaleData } from "../../data/translation";
-import { formatDateMonth } from "../datetime/format_date";
-
-export const monthNames = memoizeOne((locale: FrontendLocaleData): string[] =>
-  Array.from({ length: 12 }, (_, m) =>
-    formatDateMonth(addMonths(startOfYear(new Date()), m), locale)
-  )
-);

src/common/util/select-unit.ts

@@ -1,7 +1,3 @@
-import { differenceInDays, differenceInWeeks, startOfWeek } from "date-fns/esm";
-import { FrontendLocaleData } from "../../data/translation";
-import { firstWeekdayIndex } from "../datetime/first_weekday";
-
 export type Unit =
   | "second"
   | "minute"
@@ -15,12 +11,13 @@ export type Unit =
 const MS_PER_SECOND = 1e3;
 const SECS_PER_MIN = 60;
 const SECS_PER_HOUR = SECS_PER_MIN * 60;
+const SECS_PER_DAY = SECS_PER_HOUR * 24;
+const SECS_PER_WEEK = SECS_PER_DAY * 7;
 
 // Adapted from https://github.com/formatjs/formatjs/blob/186cef62f980ec66252ee232f438a42d0b51b9f9/packages/intl-utils/src/diff.ts
 export function selectUnit(
   from: Date | number,
   to: Date | number = Date.now(),
-  locale: FrontendLocaleData,
   thresholds: Partial<Thresholds> = {}
 ): { value: number; unit: Unit } {
   const resolvedThresholds: Thresholds = {
@@ -52,56 +49,29 @@ export function selectUnit(
     };
   }
 
-  const fromDate = new Date(from);
-  const toDate = new Date(to);
-
-  // Set time component to zero, which allows us to compare only the days
-  fromDate.setHours(0, 0, 0, 0);
-  toDate.setHours(0, 0, 0, 0);
-
-  const days = differenceInDays(fromDate, toDate);
-  if (days === 0) {
-    return {
-      value: Math.round(hours),
-      unit: "hour",
-    };
-  }
+  const days = secs / SECS_PER_DAY;
   if (Math.abs(days) < resolvedThresholds.day) {
     return {
-      value: days,
+      value: Math.round(days),
       unit: "day",
     };
   }
 
-  const firstWeekday = firstWeekdayIndex(locale);
-  const fromWeek = startOfWeek(fromDate, { weekStartsOn: firstWeekday });
-  const toWeek = startOfWeek(toDate, { weekStartsOn: firstWeekday });
-
-  const weeks = differenceInWeeks(fromWeek, toWeek);
-  if (weeks === 0) {
-    return {
-      value: days,
-      unit: "day",
-    };
-  }
+  const weeks = secs / SECS_PER_WEEK;
   if (Math.abs(weeks) < resolvedThresholds.week) {
     return {
-      value: weeks,
+      value: Math.round(weeks),
       unit: "week",
     };
   }
 
+  const fromDate = new Date(from);
+  const toDate = new Date(to);
   const years = fromDate.getFullYear() - toDate.getFullYear();
   const months = years * 12 + fromDate.getMonth() - toDate.getMonth();
-  if (months === 0) {
+  if (Math.round(Math.abs(months)) < resolvedThresholds.month) {
     return {
-      value: weeks,
-      unit: "week",
-    };
-  }
-  if (Math.abs(months) < resolvedThresholds.month || years === 0) {
-    return {
-      value: months,
+      value: Math.round(months),
       unit: "month",
     };
   }

src/components/chart/chart-date-adapter.ts

@@ -40,7 +40,7 @@ import {
   formatDateMonth,
   formatDateMonthYear,
   formatDateShort,
-  formatDateWeekdayDay,
+  formatDateWeekday,
   formatDateYear,
 } from "../../common/datetime/format_date";
 import {
@@ -92,7 +92,7 @@ _adapters._date.override({
       case "hour":
         return formatTime(new Date(time), this.options.locale);
       case "weekday":
-        return formatDateWeekdayDay(new Date(time), this.options.locale);
+        return formatDateWeekday(new Date(time), this.options.locale);
       case "date":
         return formatDate(new Date(time), this.options.locale);
       case "day":

src/components/chart/ha-chart-base.ts

@@ -10,8 +10,6 @@ import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { clamp } from "../../common/number/clamp";
-import { computeRTL } from "../../common/util/compute_rtl";
-import { HomeAssistant } from "../../types";
 
 export const MIN_TIME_BETWEEN_UPDATES = 60 * 5 * 1000;
 
@@ -24,8 +22,6 @@ interface Tooltip extends TooltipModel<any> {
 export default class HaChartBase extends LitElement {
   public chart?: Chart;
 
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
   @property({ attribute: "chart-type", reflect: true })
   public chartType: ChartType = "line";
 
@@ -37,8 +33,6 @@ export default class HaChartBase extends LitElement {
 
   @property({ type: Number }) public height?: number;
 
-  @property({ type: Number }) public paddingYAxis = 0;
-
   @state() private _chartHeight?: number;
 
   @state() private _tooltip?: Tooltip;
@@ -134,8 +128,6 @@ export default class HaChartBase extends LitElement {
         style=${styleMap({
           height: `${this.height ?? this._chartHeight}px`,
           overflow: this._chartHeight ? "initial" : "hidden",
-          "padding-left": `${computeRTL(this.hass) ? 0 : this.paddingYAxis}px`,
-          "padding-right": `${computeRTL(this.hass) ? this.paddingYAxis : 0}px`,
         })}
       >
         <canvas></canvas>

src/components/chart/state-history-chart-line.ts

@@ -2,8 +2,6 @@ import type { ChartData, ChartDataset, ChartOptions } from "chart.js";
 import { html, LitElement, PropertyValues } from "lit";
 import { property, state } from "lit/decorators";
 import { getGraphColorByIndex } from "../../common/color/colors";
-import { fireEvent } from "../../common/dom/fire_event";
-import { computeRTL } from "../../common/util/compute_rtl";
 import {
   formatNumber,
   numberFormatToLocale,
@@ -28,36 +26,28 @@ class StateHistoryChartLine extends LitElement {
 
   @property() public identifier?: string;
 
-  @property({ type: Boolean }) public showNames = true;
+  @property({ type: Boolean }) public isSingleDevice = false;
 
   @property({ attribute: false }) public endTime!: Date;
 
-  @property({ type: Number }) public paddingYAxis = 0;
-
-  @property({ type: Number }) public chartIndex?;
-
   @state() private _chartData?: ChartData<"line">;
 
   @state() private _chartOptions?: ChartOptions;
 
-  @state() private _yWidth = 0;
-
   private _chartTime: Date = new Date();
 
   protected render() {
     return html`
       <ha-chart-base
-        .hass=${this.hass}
         .data=${this._chartData}
         .options=${this._chartOptions}
-        .paddingYAxis=${this.paddingYAxis - this._yWidth}
         chart-type="line"
       ></ha-chart-base>
     `;
   }
 
   public willUpdate(changedProps: PropertyValues) {
-    if (!this.hasUpdated || changedProps.has("showNames")) {
+    if (!this.hasUpdated) {
       this._chartOptions = {
         parsing: false,
         animation: false,
@@ -94,16 +84,6 @@ class StateHistoryChartLine extends LitElement {
               display: true,
               text: this.unit,
             },
-            afterUpdate: (y) => {
-              if (this._yWidth !== Math.floor(y.width)) {
-                this._yWidth = Math.floor(y.width);
-                fireEvent(this, "y-width-changed", {
-                  value: this._yWidth,
-                  chartIndex: this.chartIndex,
-                });
-              }
-            },
-            position: computeRTL(this.hass) ? "right" : "left",
           },
         },
         plugins: {
@@ -121,7 +101,7 @@ class StateHistoryChartLine extends LitElement {
             propagate: true,
           },
           legend: {
-            display: this.showNames,
+            display: !this.isSingleDevice,
             labels: {
               usePointStyle: true,
             },

src/components/chart/state-history-chart-timeline.ts

@@ -1,15 +1,73 @@
 import type { ChartData, ChartDataset, ChartOptions } from "chart.js";
+import { HassEntity } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { getGraphColorByIndex } from "../../common/color/colors";
+import { rgb2hex } from "../../common/color/convert-color";
 import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_time";
-import { fireEvent } from "../../common/dom/fire_event";
+import { stateActive } from "../../common/entity/state_active";
+import { stateColor } from "../../common/entity/state_color";
 import { numberFormatToLocale } from "../../common/number/format_number";
 import { computeRTL } from "../../common/util/compute_rtl";
 import { TimelineEntity } from "../../data/history";
 import { HomeAssistant } from "../../types";
 import { MIN_TIME_BETWEEN_UPDATES } from "./ha-chart-base";
 import type { TimeLineData } from "./timeline-chart/const";
-import { computeTimelineColor } from "./timeline-chart/timeline-color";
+
+const stateColorTokenMap: Map<string, string> = new Map();
+const stateColorMap: Map<string, string> = new Map();
+
+let colorIndex = 0;
+
+export const getStateColorToken = (
+  stateString: string,
+  entityState?: HassEntity
+) => {
+  if (!entityState || !stateActive(entityState, stateString)) {
+    return `disabled`;
+  }
+  const color = stateColor(entityState, stateString);
+  if (color) {
+    return `state-${color}`;
+  }
+  return undefined;
+};
+
+const getColor = (
+  stateString: string,
+  computedStyles: CSSStyleDeclaration,
+  entityState?: HassEntity
+) => {
+  const stateColorToken = getStateColorToken(stateString, entityState);
+
+  if (stateColorToken) {
+    if (stateColorTokenMap.has(stateColorToken)) {
+      return stateColorTokenMap.get(stateColorToken);
+    }
+    const value = computedStyles.getPropertyValue(
+      `--rgb-${stateColorToken}-color`
+    );
+
+    if (value) {
+      const parsedValue = value.split(",").map((v) => Number(v)) as [
+        number,
+        number,
+        number
+      ];
+      const hexValue = rgb2hex(parsedValue);
+      stateColorTokenMap.set(stateColorToken, hexValue);
+      return hexValue;
+    }
+  }
+
+  if (stateColorMap.has(stateString)) {
+    return stateColorMap.get(stateString);
+  }
+  const color = getGraphColorByIndex(colorIndex, computedStyles);
+  colorIndex++;
+  stateColorMap.set(stateString, color);
+  return color;
+};
 
 @customElement("state-history-chart-timeline")
 export class StateHistoryChartTimeline extends LitElement {
@@ -25,7 +83,7 @@ export class StateHistoryChartTimeline extends LitElement {
 
   @property() public identifier?: string;
 
-  @property({ type: Boolean }) public showNames = true;
+  @property({ type: Boolean }) public isSingleDevice = false;
 
   @property({ type: Boolean }) public chunked = false;
 
@@ -33,26 +91,18 @@ export class StateHistoryChartTimeline extends LitElement {
 
   @property({ attribute: false }) public endTime!: Date;
 
-  @property({ type: Number }) public paddingYAxis = 0;
-
-  @property({ type: Number }) public chartIndex?;
-
   @state() private _chartData?: ChartData<"timeline">;
 
   @state() private _chartOptions?: ChartOptions<"timeline">;
 
-  @state() private _yWidth = 0;
-
   private _chartTime: Date = new Date();
 
   protected render() {
     return html`
       <ha-chart-base
-        .hass=${this.hass}
         .data=${this._chartData}
         .options=${this._chartOptions}
         .height=${this.data.length * 30 + 30}
-        .paddingYAxis=${this.paddingYAxis - this._yWidth}
         chart-type="timeline"
       ></ha-chart-base>
     `;
@@ -73,11 +123,7 @@ export class StateHistoryChartTimeline extends LitElement {
       this._generateData();
     }
 
-    if (
-      changedProps.has("startTime") ||
-      changedProps.has("endTime") ||
-      changedProps.has("showNames")
-    ) {
+    if (changedProps.has("startTime") || changedProps.has("endTime")) {
       this._createOptions();
     }
   }
@@ -129,7 +175,8 @@ export class StateHistoryChartTimeline extends LitElement {
             drawTicks: false,
           },
           ticks: {
-            display: this.chunked || this.showNames,
+            display:
+              this.chunked || !this.isSingleDevice || this.data.length !== 1,
           },
           afterSetDimensions: (y) => {
             y.maxWidth = y.chart.width * 0.18;
@@ -140,15 +187,6 @@ export class StateHistoryChartTimeline extends LitElement {
               scaleInstance.width = narrow ? 105 : 185;
             }
           },
-          afterUpdate: (y) => {
-            if (this._yWidth !== Math.floor(y.width)) {
-              this._yWidth = Math.floor(y.width);
-              fireEvent(this, "y-width-changed", {
-                value: this._yWidth,
-                chartIndex: this.chartIndex,
-              });
-            }
-          },
           position: computeRTL(this.hass) ? "right" : "left",
         },
       },
@@ -233,7 +271,7 @@ export class StateHistoryChartTimeline extends LitElement {
             start: prevLastChanged,
             end: newLastChanged,
             label: locState,
-            color: computeTimelineColor(
+            color: getColor(
               prevState,
               computedStyles,
               this.hass.states[stateInfo.entity_id]
@@ -251,7 +289,7 @@ export class StateHistoryChartTimeline extends LitElement {
           start: prevLastChanged,
           end: endTime,
           label: locState,
-          color: computeTimelineColor(
+          color: getColor(
             prevState,
             computedStyles,
             this.hass.states[stateInfo.entity_id]