Adjust to new element name/API/css vars/events

* Add duration for stage

* formatNumber

.github/dependabot.yml

@@ -6,15 +6,3 @@ updates:
       interval: weekly
       time: "06:00"
     open-pull-requests-limit: 10
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "daily"
-      time: "03:00"
-    open-pull-requests-limit: 10
-    labels:
-      - "dependencies"
-    ignore:
-      # Ignore rollup and plugins until everything else is updated
-      - dependency-name: "*rollup*"
-      - dependency-name: "@rollup/*"

.yarnrc.yml

@@ -1,3 +1,5 @@
+defaultSemverRangePrefix: ""
+
 nodeLinker: node-modules
 
 plugins:
@@ -6,4 +8,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.5.0.cjs

build-scripts/bundle.js

@@ -2,6 +2,15 @@ const path = require("path");
 const env = require("./env.js");
 const paths = require("./paths.js");
 
+// GitHub base URL to use for production source maps
+// Nightly builds use the commit SHA, otherwise assumes there is a tag that matches the version
+module.exports.sourceMapURL = () => {
+  const ref = env.version().endsWith("dev")
+    ? process.env.GITHUB_SHA || "dev"
+    : env.version();
+  return `https://raw.githubusercontent.com/home-assistant/frontend/${ref}`;
+};
+
 // Files from NPM Packages that should not be imported
 // eslint-disable-next-line unused-imports/no-unused-vars
 module.exports.ignorePackages = ({ latestBuild }) => [
@@ -65,13 +74,14 @@ const htmlMinifierOptions = {
   },
 };
 
-module.exports.terserOptions = (latestBuild) => ({
+module.exports.terserOptions = ({ latestBuild, isTestBuild }) => ({
   safari10: !latestBuild,
   ecma: latestBuild ? undefined : 5,
-  output: { comments: false },
+  format: { comments: false },
+  sourceMap: !isTestBuild,
 });
 
-module.exports.babelOptions = ({ latestBuild, isProdBuild }) => ({
+module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
   babelrc: false,
   compact: false,
   presets: [
@@ -109,6 +119,7 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild }) => ({
     "@babel/plugin-proposal-optional-chaining",
     "@babel/plugin-proposal-nullish-coalescing-operator",
     ["@babel/plugin-proposal-decorators", { decoratorsBeforeExport: true }],
+    "@babel/plugin-proposal-class-static-block",
     ["@babel/plugin-proposal-private-methods", { loose: true }],
     ["@babel/plugin-proposal-private-property-in-object", { loose: true }],
     ["@babel/plugin-proposal-class-properties", { loose: true }],
@@ -135,8 +146,11 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild }) => ({
     /node_modules[\\/]core-js/,
     /node_modules[\\/]webpack[\\/]buildin/,
   ],
+  sourceMaps: !isTestBuild,
 });
 
+const nameSuffix = (latestBuild) => (latestBuild ? "-latest" : "-es5");
+
 const outputPath = (outputRoot, latestBuild) =>
   path.resolve(outputRoot, latestBuild ? "frontend_latest" : "frontend_es5");
 
@@ -159,14 +173,17 @@ BundleConfig {
   latestBuild: boolean,
   // If we're doing a stats build (create nice chunk names)
   isStatsBuild: boolean,
+  // If it's just a test build in CI, skip time on source map generation
+  isTestBuild: boolean,
   // Names of entrypoints that should not be hashed
   dontHash: Set<string>
 }
 */
 
 module.exports.config = {
-  app({ isProdBuild, latestBuild, isStatsBuild, isWDS }) {
+  app({ isProdBuild, latestBuild, isStatsBuild, isTestBuild, isWDS }) {
     return {
+      name: "app" + nameSuffix(latestBuild),
       entry: {
         service_worker: "./src/entrypoints/service_worker.ts",
         app: "./src/entrypoints/app.ts",
@@ -180,12 +197,14 @@ module.exports.config = {
       isProdBuild,
       latestBuild,
       isStatsBuild,
+      isTestBuild,
       isWDS,
     };
   },
 
   demo({ isProdBuild, latestBuild, isStatsBuild }) {
     return {
+      name: "demo" + nameSuffix(latestBuild),
       entry: {
         main: path.resolve(paths.demo_dir, "src/entrypoint.ts"),
       },
@@ -215,6 +234,7 @@ module.exports.config = {
     }
 
     return {
+      name: "cast" + nameSuffix(latestBuild),
       entry,
       outputPath: outputPath(paths.cast_output_root, latestBuild),
       publicPath: publicPath(latestBuild),
@@ -226,8 +246,9 @@ module.exports.config = {
     };
   },
 
-  hassio({ isProdBuild, latestBuild }) {
+  hassio({ isProdBuild, latestBuild, isStatsBuild, isTestBuild }) {
     return {
+      name: "supervisor" + nameSuffix(latestBuild),
       entry: {
         entrypoint: path.resolve(paths.hassio_dir, "src/entrypoint.ts"),
       },
@@ -235,6 +256,8 @@ module.exports.config = {
       publicPath: publicPath(latestBuild, paths.hassio_publicPath),
       isProdBuild,
       latestBuild,
+      isStatsBuild,
+      isTestBuild,
       isHassioBuild: true,
       defineOverlay: {
         __SUPERVISOR__: true,
@@ -244,6 +267,7 @@ module.exports.config = {
 
   gallery({ isProdBuild, latestBuild }) {
     return {
+      name: "gallery" + nameSuffix(latestBuild),
       entry: {
         entrypoint: path.resolve(paths.gallery_dir, "src/entrypoint.js"),
       },

build-scripts/env.js

@@ -17,7 +17,7 @@ module.exports = {
   isStatsBuild() {
     return process.env.STATS === "1";
   },
-  isTest() {
+  isTestBuild() {
     return process.env.IS_TEST === "true";
   },
   isNetlify() {

build-scripts/gulp/app.js

@@ -1,8 +1,7 @@
 // Run HA develop mode
+
 const gulp = require("gulp");
-
 const env = require("../env");
-
 require("./clean.js");
 require("./translations.js");
 require("./locale-data.js");
@@ -50,7 +49,7 @@ gulp.task(
     "copy-static-app",
     env.useRollup() ? "rollup-prod-app" : "webpack-prod-app",
     // Don't compress running tests
-    ...(env.isTest() ? [] : ["compress-app"]),
+    ...(env.isTestBuild() ? [] : ["compress-app"]),
     gulp.parallel(
       "gen-pages-prod",
       "gen-index-app-prod",

build-scripts/gulp/gallery.js

@@ -20,7 +20,7 @@ require("./rollup.js");
 
 gulp.task("gather-gallery-pages", async function gatherPages() {
   const pageDir = path.resolve(paths.gallery_dir, "src/pages");
-  const files = glob.sync(path.resolve(pageDir, "**/*"));
+  const files = await glob(path.resolve(pageDir, "**/*"));
 
   const galleryBuild = path.resolve(paths.gallery_dir, "build");
   fs.mkdirSync(galleryBuild, { recursive: true });

build-scripts/gulp/hassio.js

@@ -1,7 +1,5 @@
 const gulp = require("gulp");
-
 const env = require("../env");
-
 require("./clean.js");
 require("./gen-icons-json.js");
 require("./webpack.js");
@@ -43,6 +41,6 @@ gulp.task(
     env.useRollup() ? "rollup-prod-hassio" : "webpack-prod-hassio",
     "gen-index-hassio-prod",
     ...// Don't compress running tests
-    (env.isTest() ? [] : ["compress-hassio"])
+    (env.isTestBuild() ? [] : ["compress-hassio"])
   )
 );

build-scripts/gulp/webpack.js

@@ -5,6 +5,7 @@ const webpack = require("webpack");
 const WebpackDevServer = require("webpack-dev-server");
 const log = require("fancy-log");
 const path = require("path");
+const env = require("../env");
 const paths = require("../paths");
 const {
   createAppConfig,
@@ -104,6 +105,8 @@ gulp.task("webpack-prod-app", () =>
   prodBuild(
     bothBuilds(createAppConfig, {
       isProdBuild: true,
+      isStatsBuild: env.isStatsBuild(),
+      isTestBuild: env.isTestBuild(),
     })
   )
 );
@@ -161,6 +164,8 @@ gulp.task("webpack-prod-hassio", () =>
   prodBuild(
     bothBuilds(createHassioConfig, {
       isProdBuild: true,
+      isStatsBuild: env.isStatsBuild(),
+      isTestBuild: env.isTestBuild(),
     })
   )
 );

build-scripts/removedIcons.json

@@ -1,30 +1 @@
-[
-  {
-    "path": "M20,20H7A2,2 0 0,1 5,18V8.94L2.23,5.64C2.09,5.47 2,5.24 2,5A1,1 0 0,1 3,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20M8.5,7A0.5,0.5 0 0,0 8,7.5V8.5A0.5,0.5 0 0,0 8.5,9H18.5A0.5,0.5 0 0,0 19,8.5V7.5A0.5,0.5 0 0,0 18.5,7H8.5M8.5,11A0.5,0.5 0 0,0 8,11.5V12.5A0.5,0.5 0 0,0 8.5,13H18.5A0.5,0.5 0 0,0 19,12.5V11.5A0.5,0.5 0 0,0 18.5,11H8.5M8.5,15A0.5,0.5 0 0,0 8,15.5V16.5A0.5,0.5 0 0,0 8.5,17H13.5A0.5,0.5 0 0,0 14,16.5V15.5A0.5,0.5 0 0,0 13.5,15H8.5Z",
-    "name": "android-messages"
-  },
-  {
-    "path": "M4,6H2V20A2,2 0 0,0 4,22H18V20H4V6M20,2H8A2,2 0 0,0 6,4V16A2,2 0 0,0 8,18H20A2,2 0 0,0 22,16V4A2,2 0 0,0 20,2M20,12L17.5,10.5L15,12V4H20V12Z",
-    "name": "book-variant-multiple"
-  },
-  {
-    "path": "M21,14H3V4H21M21,2H3C1.89,2 1,2.89 1,4V16A2,2 0 0,0 3,18H10L8,21V22H16V21L14,18H21A2,2 0 0,0 23,16V4C23,2.89 22.1,2 21,2Z",
-    "name": "desktop-mac"
-  },
-  {
-    "path": "M21,14V4H3V14H21M21,2A2,2 0 0,1 23,4V16A2,2 0 0,1 21,18H14L16,21V22H8V21L10,18H3C1.89,18 1,17.1 1,16V4C1,2.89 1.89,2 3,2H21M4,5H15V10H4V5M16,5H20V7H16V5M20,8V13H16V8H20M4,11H9V13H4V11M10,11H15V13H10V11Z",
-    "name": "desktop-mac-dashboard"
-  },
-  {
-    "path": "M22,24L16.75,19L17.38,21H4.5A2.5,2.5 0 0,1 2,18.5V3.5A2.5,2.5 0 0,1 4.5,1H19.5A2.5,2.5 0 0,1 22,3.5V24M12,6.8C9.32,6.8 7.44,7.95 7.44,7.95C8.47,7.03 10.27,6.5 10.27,6.5L10.1,6.33C8.41,6.36 6.88,7.53 6.88,7.53C5.16,11.12 5.27,14.22 5.27,14.22C6.67,16.03 8.75,15.9 8.75,15.9L9.46,15C8.21,14.73 7.42,13.62 7.42,13.62C7.42,13.62 9.3,14.9 12,14.9C14.7,14.9 16.58,13.62 16.58,13.62C16.58,13.62 15.79,14.73 14.54,15L15.25,15.9C15.25,15.9 17.33,16.03 18.73,14.22C18.73,14.22 18.84,11.12 17.12,7.53C17.12,7.53 15.59,6.36 13.9,6.33L13.73,6.5C13.73,6.5 15.53,7.03 16.56,7.95C16.56,7.95 14.68,6.8 12,6.8M9.93,10.59C10.58,10.59 11.11,11.16 11.1,11.86C11.1,12.55 10.58,13.13 9.93,13.13C9.29,13.13 8.77,12.55 8.77,11.86C8.77,11.16 9.28,10.59 9.93,10.59M14.1,10.59C14.75,10.59 15.27,11.16 15.27,11.86C15.27,12.55 14.75,13.13 14.1,13.13C13.46,13.13 12.94,12.55 12.94,11.86C12.94,11.16 13.45,10.59 14.1,10.59Z",
-    "name": "discord"
-  },
-  {
-    "path": "M8.06,7.78C7.5,7.78 7.17,7.73 7.08,7.64L6.66,13.73C7.19,14.05 7.88,14.3 8.72,14.5C9.56,14.71 10.78,14.77 12.38,14.67C13.97,14.58 15.63,14.23 17.34,13.64L16.55,4.22C15.67,5.09 14.38,5.91 12.66,6.66C11.13,7.31 9.81,7.69 8.72,7.78H8.06M7.97,5.34C7.28,5.94 7,6.34 7.13,6.56C7.22,6.78 7.7,6.84 8.58,6.75C9.67,6.66 10.91,6.31 12.28,5.72C13.22,5.31 14.03,4.88 14.72,4.41C15.41,3.94 15.88,3.55 16.13,3.23C16.38,2.92 16.47,2.7 16.41,2.58C16.34,2.42 16.03,2.34 15.47,2.34C14.34,2.34 12.94,2.7 11.25,3.42C9.81,4.05 8.72,4.69 7.97,5.34M17.34,2.2C17.41,2.33 17.44,2.47 17.44,2.63L18.61,17C18.61,18.73 18,20.09 16.83,21.07C15.64,22.05 14.03,22.55 12,22.55C10,22.55 8.4,22.04 7.2,21C6,20 5.39,18.64 5.39,16.92L6.09,6.47C6.09,6.22 6.2,5.94 6.42,5.63C6.64,5.31 6.84,5.06 7.03,4.88L7.36,4.59C8.33,3.78 9.5,3.08 10.88,2.5C11.81,2.08 12.73,1.77 13.62,1.57C14.5,1.37 15.3,1.3 16,1.38C16.71,1.46 17.16,1.73 17.34,2.2Z",
-    "name": "google-home"
-  },
-  {
-    "path": "M19.25,19H4.75V3H19.25M14,22H10V21H14M18,0H6A3,3 0 0,0 3,3V21A3,3 0 0,0 6,24H18A3,3 0 0,0 21,21V3A3,3 0 0,0 18,0Z",
-    "name": "tablet-android"
-  }
-]
+[]

build-scripts/rollup.js

@@ -39,7 +39,7 @@ const createRollupConfig = ({
   inputOptions: {
     input: entry,
     // Some entry points contain no JavaScript. This setting silences a warning about that.
-    // https://rollupjs.org/guide/en/#preserveentrysignatures
+    // https://rollupjs.org/configuration-options/#preserveentrysignatures
     preserveEntrySignatures: false,
     plugins: [
       ignore({
@@ -76,7 +76,7 @@ const createRollupConfig = ({
         }),
       !isWDS && worker(),
       !isWDS && dontHashPlugin({ dontHash }),
-      !isWDS && isProdBuild && terser(bundle.terserOptions(latestBuild)),
+      !isWDS && isProdBuild && terser(bundle.terserOptions({ latestBuild })),
       !isWDS &&
         isStatsBuild &&
         visualizer({
@@ -90,20 +90,20 @@ const createRollupConfig = ({
    * @type { import("rollup").OutputOptions }
    */
   outputOptions: {
-    // https://rollupjs.org/guide/en/#outputdir
+    // https://rollupjs.org/configuration-options/#output-dir
     dir: outputPath,
-    // https://rollupjs.org/guide/en/#outputformat
+    // https://rollupjs.org/configuration-options/#output-format
     format: latestBuild ? "es" : "systemjs",
-    // https://rollupjs.org/guide/en/#outputexternallivebindings
+    // https://rollupjs.org/configuration-options/#output-externallivebindings
     externalLiveBindings: false,
-    // https://rollupjs.org/guide/en/#outputentryfilenames
-    // https://rollupjs.org/guide/en/#outputchunkfilenames
-    // https://rollupjs.org/guide/en/#outputassetfilenames
+    // https://rollupjs.org/configuration-options/#output-entryfilenames
+    // https://rollupjs.org/configuration-options/#output-chunkfilenames
+    // https://rollupjs.org/configuration-options/#output-assetfilenames
     entryFileNames:
       isProdBuild && !isStatsBuild ? "[name]-[hash].js" : "[name].js",
     chunkFileNames: isProdBuild && !isStatsBuild ? "c.[hash].js" : "[name].js",
     assetFileNames: isProdBuild && !isStatsBuild ? "a.[hash].js" : "[name].js",
-    // https://rollupjs.org/guide/en/#outputsourcemap
+    // https://rollupjs.org/configuration-options/#output-sourcemap
     sourcemap: isProdBuild ? true : "inline",
   },
 });

build-scripts/webpack.js

@@ -22,6 +22,7 @@ class LogStartCompilePlugin {
 }
 
 const createWebpackConfig = ({
+  name,
   entry,
   outputPath,
   publicPath,
@@ -29,6 +30,7 @@ const createWebpackConfig = ({
   isProdBuild,
   latestBuild,
   isStatsBuild,
+  isTestBuild,
   isHassioBuild,
   dontHash,
 }) => {
@@ -37,10 +39,16 @@ const createWebpackConfig = ({
   }
   const ignorePackages = bundle.ignorePackages({ latestBuild });
   return {
+    name,
     mode: isProdBuild ? "production" : "development",
     target: ["web", latestBuild ? "es2017" : "es5"],
-    devtool: isProdBuild
-      ? "cheap-module-source-map"
+    // For tests/CI, source maps are skipped to gain build speed
+    // For production, generate source maps for accurate stack traces without source code
+    // For development, generate "cheap" versions that can map to original line numbers
+    devtool: isTestBuild
+      ? false
+      : isProdBuild
+      ? "nosources-source-map"
       : "eval-cheap-module-source-map",
     entry,
     node: false,
@@ -51,11 +59,14 @@ const createWebpackConfig = ({
           use: {
             loader: "babel-loader",
             options: {
-              ...bundle.babelOptions({ latestBuild, isProdBuild }),
+              ...bundle.babelOptions({ latestBuild, isProdBuild, isTestBuild }),
               cacheDirectory: !isProdBuild,
               cacheCompression: false,
             },
           },
+          resolve: {
+            fullySpecified: false,
+          },
         },
         {
           test: /\.css$/,
@@ -68,7 +79,7 @@ const createWebpackConfig = ({
         new TerserPlugin({
           parallel: true,
           extractComments: true,
-          terserOptions: bundle.terserOptions(latestBuild),
+          terserOptions: bundle.terserOptions({ latestBuild, isTestBuild }),
         }),
       ],
       moduleIds: isProdBuild && !isStatsBuild ? "deterministic" : "named",
@@ -153,6 +164,22 @@ const createWebpackConfig = ({
       publicPath,
       // To silence warning in worker plugin
       globalObject: "self",
+      // Since production source maps don't include sources, we need to point to them elsewhere
+      // For dependencies, just provide the path (no source in browser)
+      // Otherwise, point to the raw code on GitHub for browser to load
+      devtoolModuleFilenameTemplate:
+        !isTestBuild && isProdBuild
+          ? (info) => {
+              const sourcePath = info.resourcePath.replace(/^\.\//, "");
+              if (
+                sourcePath.startsWith("node_modules") ||
+                sourcePath.startsWith("webpack")
+              ) {
+                return `no-source/${sourcePath}`;
+              }
+              return `${bundle.sourceMapURL()}/${sourcePath}`;
+            }
+          : undefined,
     },
     experiments: {
       topLevelAwait: true,
@@ -160,9 +187,14 @@ const createWebpackConfig = ({
   };
 };
 
-const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
+const createAppConfig = ({
+  isProdBuild,
+  latestBuild,
+  isStatsBuild,
+  isTestBuild,
+}) =>
   createWebpackConfig(
-    bundle.config.app({ isProdBuild, latestBuild, isStatsBuild })
+    bundle.config.app({ isProdBuild, latestBuild, isStatsBuild, isTestBuild })
   );
 
 const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
@@ -173,8 +205,20 @@ const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
 const createCastConfig = ({ isProdBuild, latestBuild }) =>
   createWebpackConfig(bundle.config.cast({ isProdBuild, latestBuild }));
 
-const createHassioConfig = ({ isProdBuild, latestBuild }) =>
-  createWebpackConfig(bundle.config.hassio({ isProdBuild, latestBuild }));
+const createHassioConfig = ({
+  isProdBuild,
+  latestBuild,
+  isStatsBuild,
+  isTestBuild,
+}) =>
+  createWebpackConfig(
+    bundle.config.hassio({
+      isProdBuild,
+      latestBuild,
+      isStatsBuild,
+      isTestBuild,
+    })
+  );
 
 const createGalleryConfig = ({ isProdBuild, latestBuild }) =>
   createWebpackConfig(bundle.config.gallery({ isProdBuild, latestBuild }));

gallery/src/pages/components/ha-control-select.markdown

@@ -0,0 +1,3 @@
+---
+title: Control Select
+---

gallery/src/pages/components/ha-control-select.ts

@@ -0,0 +1,212 @@
+import { mdiFanOff, mdiFanSpeed1, mdiFanSpeed2, mdiFanSpeed3 } from "@mdi/js";
+import { css, html, LitElement, TemplateResult } from "lit";
+import { customElement, state } from "lit/decorators";
+import { ifDefined } from "lit/directives/if-defined";
+import { repeat } from "lit/directives/repeat";
+import "../../../../src/components/ha-card";
+import "../../../../src/components/ha-control-select";
+import type { ControlSelectOption } from "../../../../src/components/ha-control-select";
+
+const fullOptions: ControlSelectOption[] = [
+  {
+    value: "off",
+    label: "Off",
+    path: mdiFanOff,
+  },
+  {
+    value: "low",
+    label: "Low",
+    path: mdiFanSpeed1,
+  },
+  {
+    value: "medium",
+    label: "Medium",
+    path: mdiFanSpeed2,
+  },
+  {
+    value: "high",
+    label: "High",
+    path: mdiFanSpeed3,
+  },
+];
+
+const iconOptions: ControlSelectOption[] = [
+  {
+    value: "off",
+    path: mdiFanOff,
+  },
+  {
+    value: "low",
+    path: mdiFanSpeed1,
+  },
+  {
+    value: "medium",
+    path: mdiFanSpeed2,
+  },
+  {
+    value: "high",
+    path: mdiFanSpeed3,
+  },
+];
+
+const labelOptions: ControlSelectOption[] = [
+  {
+    value: "off",
+    label: "Off",
+  },
+  {
+    value: "low",
+    label: "Low",
+  },
+  {
+    value: "medium",
+    label: "Medium",
+  },
+  {
+    value: "high",
+    label: "High",
+  },
+];
+
+const selects: {
+  id: string;
+  label: string;
+  class?: string;
+  options: ControlSelectOption[];
+  disabled?: boolean;
+}[] = [
+  {
+    id: "label",
+    label: "Select with labels",
+    options: labelOptions,
+  },
+  {
+    id: "icon",
+    label: "Select with icons",
+    options: iconOptions,
+  },
+  {
+    id: "icon",
+    label: "Disabled select",
+    options: iconOptions,
+    disabled: true,
+  },
+  {
+    id: "custom",
+    label: "Select and custom style",
+    class: "custom",
+    options: fullOptions,
+  },
+];
+
+@customElement("demo-components-ha-control-select")
+export class DemoHaControlSelect extends LitElement {
+  @state() private value?: string = "off";
+
+  handleValueChanged(e: CustomEvent) {
+    this.value = e.detail.value as string;
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      <ha-card>
+        <div class="card-content">
+          <p><b>Slider values</b></p>
+          <table>
+            <tbody>
+              <tr>
+                <td>value</td>
+                <td>${this.value ?? "-"}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </ha-card>
+      ${repeat(selects, (select) => {
+        const { id, label, options, ...config } = select;
+        return html`
+          <ha-card>
+            <div class="card-content">
+              <label id=${id}>${label}</label>
+              <pre>Config: ${JSON.stringify(config)}</pre>
+              <ha-control-select
+                .value=${this.value}
+                .options=${options}
+                class=${ifDefined(config.class)}
+                @value-changed=${this.handleValueChanged}
+                aria-labelledby=${id}
+                disabled=${ifDefined(config.disabled)}
+              >
+              </ha-control-select>
+            </div>
+          </ha-card>
+        `;
+      })}
+      <ha-card>
+        <div class="card-content">
+          <p class="title"><b>Vertical</b></p>
+          <div class="vertical-selects">
+            ${repeat(selects, (select) => {
+              const { id, label, options, ...config } = select;
+              return html`
+                <ha-control-select
+                  .value=${this.value}
+                  .options=${options}
+                  vertical
+                  class=${ifDefined(config.class)}
+                  @value-changed=${this.handleValueChanged}
+                  aria-labelledby=${id}
+                  disabled=${ifDefined(config.disabled)}
+                >
+                </ha-control-select>
+              `;
+            })}
+          </div>
+        </div>
+      </ha-card>
+    `;
+  }
+
+  static get styles() {
+    return css`
+      ha-card {
+        max-width: 600px;
+        margin: 24px auto;
+      }
+      pre {
+        margin-top: 0;
+        margin-bottom: 8px;
+      }
+      p {
+        margin: 0;
+      }
+      label {
+        font-weight: 600;
+      }
+      .custom {
+        --mdc-icon-size: 24px;
+        --control-select-color: var(--state-fan-active-color);
+        --control-select-thickness: 100px;
+        --control-select-border-radius: 24px;
+      }
+      .vertical-selects {
+        height: 300px;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+      }
+      p.title {
+        margin-bottom: 12px;
+      }
+      .vertical-selects > *:not(:last-child) {
+        margin-right: 4px;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "demo-components-ha-control-select": DemoHaControlSelect;
+  }
+}

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

@@ -16,6 +16,7 @@ import { getSignedPath } from "../../../../src/data/auth";
 import {
   fetchHassioBackupInfo,
   HassioBackupDetail,
+  removeBackup,
 } from "../../../../src/data/hassio/backup";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
@@ -286,24 +287,15 @@ class HassioBackupDialog
       return;
     }
 
-    this.hass!.callApi(
-      atLeastVersion(this.hass!.config.version, 2021, 9) ? "DELETE" : "POST",
-      `hassio/${
-        atLeastVersion(this.hass!.config.version, 2021, 9)
-          ? `backups/${this._backup!.slug}`
-          : `snapshots/${this._backup!.slug}/remove`
-      }`
-    ).then(
-      () => {
-        if (this._dialogParams!.onDelete) {
-          this._dialogParams!.onDelete();
-        }
-        this.closeDialog();
-      },
-      (error) => {
-        this._error = error.body.message;
+    try {
+      await removeBackup(this.hass!, this._backup!.slug);
+      if (this._dialogParams!.onDelete) {
+        this._dialogParams!.onDelete();
       }
-    );
+      this.closeDialog();
+    } catch (err: any) {
+      this._error = err.body.message;
+    }
   }
 
   private async _downloadClicked() {

package.json

@@ -24,229 +24,230 @@
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@braintree/sanitize-url": "^6.0.2",
-    "@codemirror/autocomplete": "^6.4.2",
-    "@codemirror/commands": "^6.2.1",
-    "@codemirror/language": "^6.6.0",
-    "@codemirror/legacy-modes": "^6.3.1",
-    "@codemirror/search": "^6.2.3",
-    "@codemirror/state": "^6.2.0",
-    "@codemirror/view": "^6.9.1",
-    "@egjs/hammerjs": "^2.0.17",
-    "@formatjs/intl-datetimeformat": "^6.5.1",
-    "@formatjs/intl-getcanonicallocales": "^2.1.0",
-    "@formatjs/intl-locale": "^3.1.1",
-    "@formatjs/intl-numberformat": "^8.3.5",
-    "@formatjs/intl-pluralrules": "^5.1.10",
-    "@formatjs/intl-relativetimeformat": "^11.1.10",
-    "@fullcalendar/core": "^6.1.4",
-    "@fullcalendar/daygrid": "^6.1.4",
-    "@fullcalendar/interaction": "^6.1.4",
-    "@fullcalendar/list": "^6.1.4",
-    "@fullcalendar/timegrid": "^6.1.4",
-    "@lezer/highlight": "^1.1.3",
-    "@lit-labs/motion": "^1.0.3",
-    "@lit-labs/virtualizer": "^1.0.1",
+    "@braintree/sanitize-url": "6.0.2",
+    "@codemirror/autocomplete": "6.4.2",
+    "@codemirror/commands": "6.2.2",
+    "@codemirror/language": "6.6.0",
+    "@codemirror/legacy-modes": "6.3.1",
+    "@codemirror/search": "6.2.3",
+    "@codemirror/state": "6.2.0",
+    "@codemirror/view": "6.9.2",
+    "@egjs/hammerjs": "2.0.17",
+    "@formatjs/intl-datetimeformat": "6.5.1",
+    "@formatjs/intl-getcanonicallocales": "2.1.0",
+    "@formatjs/intl-locale": "3.1.1",
+    "@formatjs/intl-numberformat": "8.3.5",
+    "@formatjs/intl-pluralrules": "5.1.10",
+    "@formatjs/intl-relativetimeformat": "11.1.10",
+    "@fullcalendar/core": "6.1.4",
+    "@fullcalendar/daygrid": "6.1.4",
+    "@fullcalendar/interaction": "6.1.4",
+    "@fullcalendar/list": "6.1.4",
+    "@fullcalendar/timegrid": "6.1.4",
+    "@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/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",
-    "@material/web": "=1.0.0-pre.3",
+    "@material/web": "=1.0.0-pre.4",
     "@mdi/js": "7.1.96",
     "@mdi/svg": "7.1.96",
-    "@polymer/app-layout": "^3.1.0",
-    "@polymer/iron-flex-layout": "^3.0.1",
-    "@polymer/iron-icon": "^3.0.1",
-    "@polymer/iron-input": "^3.0.1",
-    "@polymer/iron-resizable-behavior": "^3.0.1",
-    "@polymer/paper-input": "^3.2.1",
-    "@polymer/paper-item": "^3.0.1",
-    "@polymer/paper-listbox": "^3.0.1",
-    "@polymer/paper-slider": "^3.0.1",
-    "@polymer/paper-styles": "^3.0.1",
-    "@polymer/paper-tabs": "^3.1.0",
-    "@polymer/paper-toast": "^3.0.1",
-    "@polymer/paper-tooltip": "^3.0.1",
+    "@polymer/app-layout": "3.1.0",
+    "@polymer/iron-flex-layout": "3.0.1",
+    "@polymer/iron-icon": "3.0.1",
+    "@polymer/iron-input": "3.0.1",
+    "@polymer/iron-resizable-behavior": "3.0.1",
+    "@polymer/paper-input": "3.2.1",
+    "@polymer/paper-item": "3.0.1",
+    "@polymer/paper-listbox": "3.0.1",
+    "@polymer/paper-slider": "3.0.1",
+    "@polymer/paper-styles": "3.0.1",
+    "@polymer/paper-tabs": "3.1.0",
+    "@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.7",
-    "@vaadin/vaadin-themable-mixin": "^23.3.7",
-    "@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",
-    "@webcomponents/scoped-custom-element-registry": "^0.0.8",
-    "@webcomponents/webcomponentsjs": "^2.7.0",
-    "app-datepicker": "^5.1.0",
-    "chart.js": "^3.3.2",
-    "comlink": "^4.4.1",
-    "core-js": "^3.29.0",
-    "cropperjs": "^1.5.13",
-    "date-fns": "^2.29.3",
-    "date-fns-tz": "^2.0.0",
-    "deep-clone-simple": "^1.1.1",
-    "deep-freeze": "^0.0.1",
-    "fuse.js": "^6.6.2",
-    "google-timezones-json": "^1.0.2",
-    "hls.js": "^1.3.4",
-    "home-assistant-js-websocket": "^8.0.1",
-    "idb-keyval": "^6.2.0",
-    "intl-messageformat": "^10.3.1",
-    "js-yaml": "^4.1.0",
-    "leaflet": "^1.9.3",
-    "leaflet-draw": "^1.0.4",
-    "lit": "^2.6.1",
-    "marked": "^4.2.12",
-    "memoize-one": "^6.0.0",
+    "@vaadin/combo-box": "23.3.8",
+    "@vaadin/vaadin-themable-mixin": "23.3.8",
+    "@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",
+    "@webcomponents/scoped-custom-element-registry": "0.0.8",
+    "@webcomponents/webcomponentsjs": "2.7.0",
+    "app-datepicker": "6.0.0-rc.32",
+    "chart.js": "3.3.2",
+    "comlink": "4.4.1",
+    "core-js": "3.29.1",
+    "cropperjs": "1.5.13",
+    "date-fns": "2.29.3",
+    "date-fns-tz": "2.0.0",
+    "deep-clone-simple": "1.1.1",
+    "deep-freeze": "0.0.1",
+    "fuse.js": "6.6.2",
+    "google-timezones-json": "1.0.2",
+    "hls.js": "1.3.4",
+    "home-assistant-js-websocket": "8.0.1",
+    "idb-keyval": "6.2.0",
+    "intl-messageformat": "10.3.1",
+    "js-yaml": "4.1.0",
+    "leaflet": "1.9.3",
+    "leaflet-draw": "1.0.4",
+    "lit": "2.6.1",
+    "marked": "4.2.12",
+    "memoize-one": "6.0.0",
     "node-vibrant": "3.2.1-alpha.1",
-    "proxy-polyfill": "^0.3.2",
-    "punycode": "^2.3.0",
-    "qr-scanner": "^1.4.2",
-    "qrcode": "^1.5.1",
-    "regenerator-runtime": "^0.13.11",
-    "resize-observer-polyfill": "^1.5.1",
-    "roboto-fontface": "^0.10.0",
-    "rrule": "^2.7.2",
-    "sortablejs": "^1.15.0",
-    "superstruct": "^1.0.3",
-    "tinykeys": "^1.4.0",
-    "tsparticles-engine": "^2.9.3",
-    "tsparticles-preset-links": "^2.9.3",
-    "unfetch": "^5.0.0",
-    "vis-data": "^7.1.4",
-    "vis-network": "^9.1.4",
-    "vue": "^2.7.14",
-    "vue2-daterange-picker": "^0.6.8",
-    "weekstart": "^2.0.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"
+    "proxy-polyfill": "0.3.2",
+    "punycode": "2.3.0",
+    "qr-scanner": "1.4.2",
+    "qrcode": "1.5.1",
+    "regenerator-runtime": "0.13.11",
+    "resize-observer-polyfill": "1.5.1",
+    "roboto-fontface": "0.10.0",
+    "rrule": "2.7.2",
+    "sortablejs": "1.15.0",
+    "superstruct": "1.0.3",
+    "tinykeys": "1.4.0",
+    "tsparticles-engine": "2.9.3",
+    "tsparticles-preset-links": "2.9.3",
+    "unfetch": "5.0.0",
+    "vis-data": "7.1.4",
+    "vis-network": "9.1.4",
+    "vue": "2.7.14",
+    "vue2-daterange-picker": "0.6.8",
+    "weekstart": "2.0.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"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.0",
-    "@babel/plugin-external-helpers": "^7.18.6",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.21.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-syntax-import-meta": "^7.10.4",
-    "@babel/plugin-syntax-top-level-await": "^7.14.5",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-typescript": "^7.21.0",
-    "@koa/cors": "^4.0.0",
-    "@octokit/auth-oauth-device": "^4.0.4",
-    "@octokit/rest": "^19.0.7",
-    "@open-wc/dev-server-hmr": "^0.1.3",
-    "@rollup/plugin-babel": "^5.2.1",
-    "@rollup/plugin-commonjs": "^11.1.0",
-    "@rollup/plugin-json": "^4.0.3",
-    "@rollup/plugin-node-resolve": "^7.1.3",
-    "@rollup/plugin-replace": "^2.3.2",
+    "@babel/core": "7.21.3",
+    "@babel/plugin-external-helpers": "7.18.6",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
+    "@babel/plugin-proposal-class-static-block": "7.21.0",
+    "@babel/plugin-proposal-decorators": "7.21.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
+    "@babel/plugin-proposal-object-rest-spread": "7.20.7",
+    "@babel/plugin-proposal-optional-chaining": "7.21.0",
+    "@babel/plugin-syntax-dynamic-import": "7.8.3",
+    "@babel/plugin-syntax-import-meta": "7.10.4",
+    "@babel/plugin-syntax-top-level-await": "7.14.5",
+    "@babel/preset-env": "7.20.2",
+    "@babel/preset-typescript": "7.21.0",
+    "@koa/cors": "4.0.0",
+    "@octokit/auth-oauth-device": "4.0.4",
+    "@octokit/rest": "19.0.7",
+    "@open-wc/dev-server-hmr": "0.1.4",
+    "@rollup/plugin-babel": "6.0.3",
+    "@rollup/plugin-commonjs": "24.0.1",
+    "@rollup/plugin-json": "6.0.0",
+    "@rollup/plugin-node-resolve": "15.0.1",
+    "@rollup/plugin-replace": "5.0.2",
     "@types/chromecast-caf-receiver": "5.0.12",
-    "@types/chromecast-caf-sender": "^1.0.5",
-    "@types/esprima": "^4",
-    "@types/glob": "^8",
-    "@types/js-yaml": "^4",
-    "@types/leaflet": "^1",
-    "@types/leaflet-draw": "^1",
-    "@types/marked": "^4",
-    "@types/mocha": "^10",
-    "@types/qrcode": "^1.5.0",
-    "@types/serve-handler": "^6",
-    "@types/sortablejs": "^1",
-    "@types/tar": "^6",
-    "@types/webspeechapi": "^0.0.29",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^5.54.0",
-    "@web/dev-server": "^0.1.35",
-    "@web/dev-server-rollup": "^0.2.11",
-    "babel-loader": "^9.1.2",
-    "babel-plugin-template-html-minifier": "^4.1.0",
-    "chai": "^4.3.7",
-    "del": "^7.0.0",
-    "eslint": "^8.35.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-import-resolver-webpack": "^0.13.2",
-    "eslint-plugin-disable": "^2.0.3",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-lit": "^1.8.2",
-    "eslint-plugin-lit-a11y": "^2.3.0",
-    "eslint-plugin-unused-imports": "^2.0.0",
-    "eslint-plugin-wc": "^1.4.0",
-    "esprima": "^4.0.1",
-    "fancy-log": "^2.0.0",
-    "fs-extra": "^11.1.0",
-    "glob": "^8.1.0",
-    "gulp": "^4.0.2",
-    "gulp-flatmap": "^1.0.2",
-    "gulp-json-transform": "^0.4.8",
-    "gulp-merge-json": "^2.1.2",
-    "gulp-rename": "^2.0.0",
-    "gulp-zopfli-green": "^6.0.1",
-    "html-minifier": "^4.0.0",
-    "husky": "^8.0.3",
-    "instant-mocha": "^1.5.0",
-    "jszip": "^3.10.1",
-    "lint-staged": "^13.1.2",
-    "lit-analyzer": "^1.2.1",
-    "lodash.template": "^4.5.0",
-    "magic-string": "^0.30.0",
-    "map-stream": "^0.0.7",
-    "merge-stream": "^2.0.0",
-    "mocha": "^10.2.0",
-    "object-hash": "^3.0.0",
-    "open": "^8.4.1",
-    "pinst": "^3.0.0",
-    "prettier": "^2.8.4",
-    "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",
-    "serve-handler": "^6.1.5",
-    "sinon": "^15.0.1",
-    "source-map-url": "^0.4.1",
-    "systemjs": "^6.14.0",
-    "tar": "^6.1.13",
-    "terser-webpack-plugin": "^5.3.6",
-    "ts-lit-plugin": "^1.2.1",
-    "typescript": "^4.9.5",
-    "vinyl-buffer": "^1.0.1",
-    "vinyl-source-stream": "^2.0.0",
+    "@types/chromecast-caf-sender": "1.0.5",
+    "@types/esprima": "4.0.3",
+    "@types/glob": "8.1.0",
+    "@types/js-yaml": "4.0.5",
+    "@types/leaflet": "1.9.3",
+    "@types/leaflet-draw": "1.0.6",
+    "@types/marked": "4.0.8",
+    "@types/mocha": "10.0.1",
+    "@types/qrcode": "1.5.0",
+    "@types/serve-handler": "6.1.1",
+    "@types/sortablejs": "1.15.1",
+    "@types/tar": "6.1.4",
+    "@types/webspeechapi": "0.0.29",
+    "@typescript-eslint/eslint-plugin": "5.55.0",
+    "@typescript-eslint/parser": "5.55.0",
+    "@web/dev-server": "0.1.36",
+    "@web/dev-server-rollup": "0.4.0",
+    "babel-loader": "9.1.2",
+    "babel-plugin-template-html-minifier": "4.1.0",
+    "chai": "4.3.7",
+    "del": "7.0.0",
+    "eslint": "8.36.0",
+    "eslint-config-airbnb-base": "15.0.0",
+    "eslint-config-airbnb-typescript": "17.0.0",
+    "eslint-config-prettier": "8.7.0",
+    "eslint-import-resolver-webpack": "0.13.2",
+    "eslint-plugin-disable": "2.0.3",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-lit": "1.8.2",
+    "eslint-plugin-lit-a11y": "2.4.0",
+    "eslint-plugin-unused-imports": "2.0.0",
+    "eslint-plugin-wc": "1.4.0",
+    "esprima": "4.0.1",
+    "fancy-log": "2.0.0",
+    "fs-extra": "11.1.0",
+    "glob": "9.3.0",
+    "gulp": "4.0.2",
+    "gulp-flatmap": "1.0.2",
+    "gulp-json-transform": "0.4.8",
+    "gulp-merge-json": "2.1.2",
+    "gulp-rename": "2.0.0",
+    "gulp-zopfli-green": "6.0.1",
+    "html-minifier": "4.0.0",
+    "husky": "8.0.3",
+    "instant-mocha": "1.5.0",
+    "jszip": "3.10.1",
+    "lint-staged": "13.2.0",
+    "lit-analyzer": "1.2.1",
+    "lodash.template": "4.5.0",
+    "magic-string": "0.30.0",
+    "map-stream": "0.0.7",
+    "merge-stream": "2.0.0",
+    "mocha": "10.2.0",
+    "object-hash": "3.0.0",
+    "open": "8.4.2",
+    "pinst": "3.0.0",
+    "prettier": "2.8.4",
+    "require-dir": "1.2.0",
+    "rollup": "2.79.1",
+    "rollup-plugin-string": "3.0.0",
+    "rollup-plugin-terser": "7.0.2",
+    "rollup-plugin-visualizer": "5.9.0",
+    "serve-handler": "6.1.5",
+    "sinon": "15.0.2",
+    "source-map-url": "0.4.1",
+    "systemjs": "6.14.0",
+    "tar": "6.1.13",
+    "terser-webpack-plugin": "5.3.7",
+    "ts-lit-plugin": "1.2.1",
+    "typescript": "4.9.5",
+    "vinyl-buffer": "1.0.1",
+    "vinyl-source-stream": "2.0.0",
     "webpack": "=5.72.1",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1",
-    "webpack-manifest-plugin": "^5.0.0",
-    "webpackbar": "^5.0.2",
-    "workbox-build": "^6.5.4"
+    "webpack-cli": "5.0.1",
+    "webpack-dev-server": "4.12.0",
+    "webpack-manifest-plugin": "5.0.0",
+    "webpackbar": "5.0.2",
+    "workbox-build": "6.5.4"
   },
   "_comment": "Polymer 3.2 contained a bug, fixed in https://github.com/Polymer/polymer/pull/5569, add as patch",
   "resolutions": {
@@ -257,5 +258,5 @@
     "trailingComma": "es5",
     "arrowParens": "always"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.5.0"
 }

pyproject.toml

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

renovate.json

@@ -0,0 +1,32 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    ":ignoreModulesAndTests",
+    ":label(dependencies)",
+    ":pinVersions",
+    ":prConcurrentLimit10",
+    ":semanticCommitsDisabled",
+    "group:monorepos",
+    "group:recommended",
+    "npm:unpublishSafe"
+  ],
+  "enabledManagers": ["npm"],
+  "postUpdateOptions": ["yarnDedupeHighest"],
+  "lockFileMaintenance": {
+    "description": ["Run after patch releases but before next beta"],
+    "enabled": true,
+    "schedule": ["on the 19th day of the month"]
+  },
+  "packageRules": [
+    {
+      "description": ["MDC packages are pinned to the same version as MWC"],
+      "extends": ["monorepo:material-components-web"],
+      "enabled": false
+    },
+    {
+      "description": ["Vue is only used by date range which is only v2"],
+      "matchPackageNames": ["vue"],
+      "allowedVersions": "< 3"
+    }
+  ]
+}

src/common/entity/compute_attribute_display.ts

@@ -1,30 +1,126 @@
 import { HassEntity } from "home-assistant-js-websocket";
+import { html, TemplateResult } from "lit";
+import { until } from "lit/directives/until";
 import { EntityRegistryDisplayEntry } from "../../data/entity_registry";
 import { HomeAssistant } from "../../types";
+import checkValidDate from "../datetime/check_valid_date";
+import { formatDate } from "../datetime/format_date";
+import { formatDateTimeWithSeconds } from "../datetime/format_date_time";
+import { formatNumber } from "../number/format_number";
+import { capitalizeFirstLetter } from "../string/capitalize-first-letter";
+import { isDate } from "../string/is_date";
+import { isTimestamp } from "../string/is_timestamp";
 import { LocalizeFunc } from "../translations/localize";
 import { computeDomain } from "./compute_domain";
+import { FrontendLocaleData } from "../../data/translation";
+
+let jsYamlPromise: Promise<typeof import("../../resources/js-yaml-dump")>;
 
 export const computeAttributeValueDisplay = (
   localize: LocalizeFunc,
   stateObj: HassEntity,
+  locale: FrontendLocaleData,
   entities: HomeAssistant["entities"],
   attribute: string,
   value?: any
-): string => {
-  const entityId = stateObj.entity_id;
+): string | TemplateResult => {
   const attributeValue =
     value !== undefined ? value : stateObj.attributes[attribute];
+
+  // Null value, the state is unknown
+  if (attributeValue === null) {
+    return localize("state.default.unknown");
+  }
+
+  // Number value, return formatted number
+  if (typeof attributeValue === "number") {
+    return formatNumber(attributeValue, locale);
+  }
+
+  // Special handling in case this is a string with an known format
+  if (typeof attributeValue === "string") {
+    // URL handling
+    if (attributeValue.startsWith("http")) {
+      try {
+        // If invalid URL, exception will be raised
+        const url = new URL(attributeValue);
+        if (url.protocol === "http:" || url.protocol === "https:")
+          return html`<a target="_blank" rel="noreferrer" href=${value}
+            >${attributeValue}</a
+          >`;
+      } catch (_) {
+        // Nothing to do here
+      }
+    }
+
+    // Date handling
+    if (isDate(attributeValue, true)) {
+      // Timestamp handling
+      if (isTimestamp(attributeValue)) {
+        const date = new Date(attributeValue);
+        if (checkValidDate(date)) {
+          return formatDateTimeWithSeconds(date, locale);
+        }
+      }
+
+      // Value was not a timestamp, so only do date formatting
+      const date = new Date(attributeValue);
+      if (checkValidDate(date)) {
+        return formatDate(date, locale);
+      }
+    }
+  }
+
+  // Values are objects, render object
+  if (
+    (Array.isArray(attributeValue) &&
+      attributeValue.some((val) => val instanceof Object)) ||
+    (!Array.isArray(attributeValue) && attributeValue instanceof Object)
+  ) {
+    if (!jsYamlPromise) {
+      jsYamlPromise = import("../../resources/js-yaml-dump");
+    }
+    const yaml = jsYamlPromise.then((jsYaml) => jsYaml.dump(attributeValue));
+    return html`<pre>${until(yaml, "")}</pre>`;
+  }
+
+  // If this is an array, try to determine the display value for each item
+  if (Array.isArray(attributeValue)) {
+    return attributeValue
+      .map((item) =>
+        computeAttributeValueDisplay(
+          localize,
+          stateObj,
+          locale,
+          entities,
+          attribute,
+          item
+        )
+      )
+      .join(", ");
+  }
+
+  // We've explored all known value handling, so now we'll try to find a
+  // translation for the value.
+  const entityId = stateObj.entity_id;
   const domain = computeDomain(entityId);
-  const entity = entities[entityId] as EntityRegistryDisplayEntry | undefined;
-  const translationKey = entity?.translation_key;
+  const deviceClass = stateObj.attributes.device_class;
+  const registryEntry = entities[entityId] as
+    | EntityRegistryDisplayEntry
+    | undefined;
+  const translationKey = registryEntry?.translation_key;
 
   return (
     (translationKey &&
       localize(
-        `component.${entity.platform}.entity.${domain}.${translationKey}.state_attributes.${attribute}.state.${attributeValue}`
+        `component.${registryEntry.platform}.entity.${domain}.${translationKey}.state_attributes.${attribute}.state.${attributeValue}`
+      )) ||
+    (deviceClass &&
+      localize(
+        `component.${domain}.entity_component.${deviceClass}.state_attributes.${attribute}.state.${attributeValue}`
       )) ||
     localize(
-      `component.${domain}.state_attributes._.${attribute}.state.${attributeValue}`
+      `component.${domain}.entity_component._.state_attributes.${attribute}.state.${attributeValue}`
     ) ||
     attributeValue
   );
@@ -37,6 +133,7 @@ export const computeAttributeNameDisplay = (
   attribute: string
 ): string => {
   const entityId = stateObj.entity_id;
+  const deviceClass = stateObj.attributes.device_class;
   const domain = computeDomain(entityId);
   const entity = entities[entityId] as EntityRegistryDisplayEntry | undefined;
   const translationKey = entity?.translation_key;
@@ -46,7 +143,20 @@ export const computeAttributeNameDisplay = (
       localize(
         `component.${entity.platform}.entity.${domain}.${translationKey}.state_attributes.${attribute}.name`
       )) ||
-    localize(`component.${domain}.state_attributes._.${attribute}.name`) ||
-    attribute
+    (deviceClass &&
+      localize(
+        `component.${domain}.entity_component.${deviceClass}.state_attributes.${attribute}.name`
+      )) ||
+    localize(
+      `component.${domain}.entity_component._.state_attributes.${attribute}.name`
+    ) ||
+    capitalizeFirstLetter(
+      attribute
+        .replace(/_/g, " ")
+        .replace(/\bid\b/g, "ID")
+        .replace(/\bip\b/g, "IP")
+        .replace(/\bmac\b/g, "MAC")
+        .replace(/\bgps\b/g, "GPS")
+    )
   );
 };

src/common/entity/compute_state_display.ts

@@ -71,6 +71,11 @@ export const computeStateDisplayFromEntityAttributes = (
           style: "currency",
           currency: attributes.unit_of_measurement,
           minimumFractionDigits: 2,
+          // Override monetary options with number format
+          ...getNumberFormatOptions(
+            { state, attributes } as HassEntity,
+            entity
+          ),
         });
       } catch (_err) {
         // fallback to default
@@ -209,10 +214,10 @@ export const computeStateDisplayFromEntityAttributes = (
     // Return device class translation
     (attributes.device_class &&
       localize(
-        `component.${domain}.state.${attributes.device_class}.${state}`
+        `component.${domain}.entity_component.${attributes.device_class}.state.${state}`
       )) ||
     // Return default translation
-    localize(`component.${domain}.state._.${state}`) ||
+    localize(`component.${domain}.entity_component._.state.${state}`) ||
     // We don't know! Return the raw state.
     state
   );

src/common/number/format_number.ts

@@ -82,17 +82,14 @@ export const formatNumber = (
     !Number.isNaN(Number(num)) &&
     num !== "" &&
     localeOptions?.number_format === NumberFormat.none &&
-    Intl &&
-    (options?.maximumFractionDigits != null ||
-      options?.minimumFractionDigits != null)
+    Intl
   ) {
-    // If NumberFormat is none, just set the digits options for precision and use en-US format without grouping.
+    // If NumberFormat is none, use en-US format without grouping.
     return new Intl.NumberFormat(
       "en-US",
       getDefaultFormatOptions(num, {
+        ...options,
         useGrouping: false,
-        maximumFractionDigits: options?.maximumFractionDigits,
-        minimumFractionDigits: options?.minimumFractionDigits,
       })
     ).format(Number(num));
   }

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

@@ -143,11 +143,16 @@ export class StateHistoryChartTimeline extends LitElement {
             }
           },
           afterUpdate: (y) => {
+            const yWidth = this.showNames
+              ? y.width ?? 0
+              : computeRTL(this.hass)
+              ? 0
+              : y.left ?? 0;
             if (
-              this._yWidth !== Math.floor(y.width) &&
+              this._yWidth !== Math.floor(yWidth) &&
               y.ticks.length === this.data.length
             ) {
-              this._yWidth = Math.floor(y.width);
+              this._yWidth = Math.floor(yWidth);
               fireEvent(this, "y-width-changed", {
                 value: this._yWidth,
                 chartIndex: this.chartIndex,

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

@@ -175,15 +175,14 @@ export class StateHistoryCharts extends LitElement {
     if (changedProps.has("_chartCount")) {
       if (this._chartCount < this._childYWidths.length) {
         this._childYWidths.length = this._chartCount;
-        this._maxYWidth =
-          this._childYWidths.length === 0 ? 0 : Math.max(...this._childYWidths);
+        this._maxYWidth = Math.max(...Object.values(this._childYWidths), 0);
       }
     }
   }
 
   private _yWidthChanged(e: CustomEvent<HASSDomEvents["y-width-changed"]>) {
     this._childYWidths[e.detail.chartIndex] = e.detail.value;
-    this._maxYWidth = Math.max(...this._childYWidths);
+    this._maxYWidth = Math.max(...Object.values(this._childYWidths), 0);
   }
 
   private _isHistoryEmpty(): boolean {

src/components/date-range-picker.ts

@@ -6,6 +6,21 @@ import DateRangePicker from "vue2-daterange-picker";
 import dateRangePickerStyles from "vue2-daterange-picker/dist/vue2-daterange-picker.css";
 import { fireEvent } from "../common/dom/fire_event";
 
+// Set the current date to the left picker instead of the right picker because the right is hidden
+const CustomDateRangePicker = Vue.extend({
+  mixins: [DateRangePicker],
+  methods: {
+    selectMonthDate() {
+      const dt: Date = this.end || new Date();
+      // @ts-ignore
+      this.changeLeftMonth({
+        year: dt.getFullYear(),
+        month: dt.getMonth() + 1,
+      });
+    },
+  },
+});
+
 const Component = Vue.extend({
   props: {
     timePicker: {
@@ -47,7 +62,7 @@ const Component = Vue.extend({
   },
   render(createElement) {
     // @ts-expect-error
-    return createElement(DateRangePicker, {
+    return createElement(CustomDateRangePicker, {
       props: {
         "time-picker": this.timePicker,
         "auto-apply": this.autoApply,

src/components/entity/ha-entity-attribute-picker.ts

@@ -1,7 +1,7 @@
 import { HassEntity } from "home-assistant-js-websocket";
 import { html, LitElement, PropertyValues, nothing } from "lit";
 import { customElement, property, query } from "lit/decorators";
-import { formatAttributeName } from "../../data/entity_attributes";
+import { computeAttributeNameDisplay } from "../../common/entity/compute_attribute_display";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import "../ha-combo-box";
@@ -54,7 +54,12 @@ class HaEntityAttributePicker extends LitElement {
             .filter((key) => !this.hideAttributes?.includes(key))
             .map((key) => ({
               value: key,
-              label: formatAttributeName(key),
+              label: computeAttributeNameDisplay(
+                this.hass.localize,
+                state,
+                this.hass.entities,
+                key
+              ),
             }))
         : [];
     }
@@ -68,7 +73,14 @@ class HaEntityAttributePicker extends LitElement {
     return html`
       <ha-combo-box
         .hass=${this.hass}
-        .value=${this.value ? formatAttributeName(this.value) : ""}
+        .value=${this.value
+          ? computeAttributeNameDisplay(
+              this.hass.localize,
+              this.hass.states[this.entityId!],
+              this.hass.entities,
+              this.value
+            )
+          : ""}
         .autofocus=${this.autofocus}
         .label=${this.label ??
         this.hass.localize(

src/components/entity/ha-entity-state-picker.ts

@@ -4,7 +4,7 @@ import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeStateDisplay } from "../../common/entity/compute_state_display";
 import { getStates } from "../../common/entity/get_states";
-import { formatAttributeValue } from "../../data/entity_attributes";
+import { computeAttributeValueDisplay } from "../../common/entity/compute_attribute_display";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import "../ha-combo-box";
@@ -58,7 +58,14 @@ class HaEntityStatePicker extends LitElement {
                     this.hass.entities,
                     key
                   )
-                : formatAttributeValue(this.hass, key),
+                : computeAttributeValueDisplay(
+                    this.hass.localize,
+                    state,
+                    this.hass.locale,
+                    this.hass.entities,
+                    this.attribute,
+                    key
+                  ),
             }))
           : [];
     }

src/components/entity/ha-statistic-picker.ts

@@ -30,6 +30,9 @@ export class HaStatisticPicker extends LitElement {
   @property({ attribute: "statistic-types" })
   public statisticTypes?: "mean" | "sum";
 
+  @property({ type: Boolean, attribute: "allow-custom-entity" })
+  public allowCustomEntity;
+
   @property({ type: Array }) public statisticIds?: StatisticsMetaData[];
 
   @property({ type: Boolean }) public disabled?: boolean;
@@ -245,6 +248,7 @@ export class HaStatisticPicker extends LitElement {
         .value=${this._value}
         .renderer=${this._rowRenderer}
         .disabled=${this.disabled}
+        .allowCustomValue=${this.allowCustomEntity}
         item-value-path="id"
         item-id-path="id"
         item-label-path="name"

src/components/entity/ha-statistics-picker.ts

@@ -22,6 +22,9 @@ class HaStatisticsPicker extends LitElement {
   @property({ attribute: "pick-statistic-label" })
   public pickStatisticLabel?: string;
 
+  @property({ type: Boolean, attribute: "allow-custom-entity" })
+  public allowCustomEntity;
+
   /**
    * Show only statistics natively stored with these units of measurements.
    * @attr include-statistics-unit-of-measurement
@@ -71,6 +74,9 @@ class HaStatisticsPicker extends LitElement {
     const includeUnitClassCurrent = ignoreRestriction
       ? undefined
       : this.includeUnitClass;
+    const includeDeviceClassCurrent = ignoreRestriction
+      ? undefined
+      : this.includeDeviceClass;
     const includeStatisticTypesCurrent = ignoreRestriction
       ? undefined
       : this.statisticTypes;
@@ -84,10 +90,12 @@ class HaStatisticsPicker extends LitElement {
               .hass=${this.hass}
               .includeStatisticsUnitOfMeasurement=${includeStatisticsUnitCurrent}
               .includeUnitClass=${includeUnitClassCurrent}
+              .includeDeviceClass=${includeDeviceClassCurrent}
               .value=${statisticId}
               .statisticTypes=${includeStatisticTypesCurrent}
               .statisticIds=${this.statisticIds}
               .label=${this.pickedStatisticLabel}
+              .allowCustomEntity=${this.allowCustomEntity}
               @value-changed=${this._statisticChanged}
             ></ha-statistic-picker>
           </div>
@@ -103,6 +111,7 @@ class HaStatisticsPicker extends LitElement {
           .statisticTypes=${this.statisticTypes}
           .statisticIds=${this.statisticIds}
           .label=${this.pickStatisticLabel}
+          .allowCustomEntity=${this.allowCustomEntity}
           @value-changed=${this._addStatistic}
         ></ha-statistic-picker>
       </div>

src/components/ha-analytics-learn-more.ts

@@ -1,11 +0,0 @@
-import { html } from "lit";
-import { HomeAssistant } from "../types";
-import { documentationUrl } from "../util/documentation-url";
-
-export const analyticsLearnMore = (hass: HomeAssistant) => html`<a
-  .href=${documentationUrl(hass, "/integrations/analytics/")}
-  target="_blank"
-  rel="noreferrer"
->
-  How we process your data
-</a>`;

src/components/ha-analytics.ts

@@ -9,18 +9,7 @@ import "./ha-settings-row";
 import "./ha-switch";
 import type { HaSwitch } from "./ha-switch";
 
-const ADDITIONAL_PREFERENCES = [
-  {
-    key: "usage",
-    title: "Usage",
-    description: "Details of what you use with Home Assistant",
-  },
-  {
-    key: "statistics",
-    title: "Statistical data",
-    description: "Counts containing total number of datapoints",
-  },
-];
+const ADDITIONAL_PREFERENCES = ["usage", "statistics"] as const;
 
 declare global {
   interface HASSDomEvents {
@@ -34,15 +23,25 @@ export class HaAnalytics extends LitElement {
 
   @property({ attribute: false }) public analytics?: Analytics;
 
+  @property({ attribute: "translation_key_panel" }) public translationKeyPanel:
+    | "page-onboarding"
+    | "config" = "config";
+
   protected render(): TemplateResult {
     const loading = this.analytics === undefined;
     const baseEnabled = !loading && this.analytics!.preferences.base;
 
     return html`
       <ha-settings-row>
-        <span slot="heading" data-for="base"> Basic analytics </span>
+        <span slot="heading" data-for="base">
+          ${this.hass.localize(
+            `ui.panel.${this.translationKeyPanel}.analytics.preferences.base.title`
+          )}
+        </span>
         <span slot="description" data-for="base">
-          This includes information about your system.
+          ${this.hass.localize(
+            `ui.panel.${this.translationKeyPanel}.analytics.preferences.base.description`
+          )}
         </span>
         <ha-switch
           @change=${this._handleRowClick}
@@ -57,25 +56,30 @@ export class HaAnalytics extends LitElement {
         (preference) =>
           html`
             <ha-settings-row>
-              <span slot="heading" data-for=${preference.key}>
-                ${preference.title}
+              <span slot="heading" data-for=${preference}>
+                ${this.hass.localize(
+                  `ui.panel.${this.translationKeyPanel}.analytics.preferences.${preference}.title`
+                )}
               </span>
-              <span slot="description" data-for=${preference.key}>
-                ${preference.description}
+              <span slot="description" data-for=${preference}>
+                ${this.hass.localize(
+                  `ui.panel.${this.translationKeyPanel}.analytics.preferences.${preference}.description`
+                )}
               </span>
               <span>
                 <ha-switch
                   @change=${this._handleRowClick}
-                  .checked=${this.analytics?.preferences[preference.key]}
-                  .preference=${preference.key}
-                  name=${preference.key}
+                  .checked=${this.analytics?.preferences[preference]}
+                  .preference=${preference}
+                  name=${preference}
                 >
                 </ha-switch>
                 ${!baseEnabled
                   ? html`
                       <paper-tooltip animation-delay="0" position="right">
-                        You need to enable basic analytics for this option to be
-                        available
+                        ${this.hass.localize(
+                          `ui.panel.${this.translationKeyPanel}.analytics.need_base_enabled`
+                        )}
                       </paper-tooltip>
                     `
                   : ""}
@@ -84,9 +88,15 @@ export class HaAnalytics extends LitElement {
           `
       )}
       <ha-settings-row>
-        <span slot="heading" data-for="diagnostics"> Diagnostics </span>
+        <span slot="heading" data-for="diagnostics">
+          ${this.hass.localize(
+            `ui.panel.${this.translationKeyPanel}.analytics.preferences.diagnostics.title`
+          )}
+        </span>
         <span slot="description" data-for="diagnostics">
-          Share crash reports when unexpected errors occur.
+          ${this.hass.localize(
+            `ui.panel.${this.translationKeyPanel}.analytics.preferences.diagnostics.description`
+          )}
         </span>
         <ha-switch
           @change=${this._handleRowClick}
@@ -132,7 +142,7 @@ export class HaAnalytics extends LitElement {
     preferences[preference] = target.checked;
 
     if (
-      ADDITIONAL_PREFERENCES.some((entry) => entry.key === preference) &&
+      ADDITIONAL_PREFERENCES.some((entry) => entry === preference) &&
       target.checked
     ) {
       preferences.base = true;

src/components/ha-attributes.ts

@@ -1,18 +1,11 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import {
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  TemplateResult,
-  nothing,
-} from "lit";
+import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import {
-  formatAttributeName,
-  formatAttributeValue,
-  STATE_ATTRIBUTES,
-} from "../data/entity_attributes";
+  computeAttributeNameDisplay,
+  computeAttributeValueDisplay,
+} from "../common/entity/compute_attribute_display";
+import { STATE_ATTRIBUTES } from "../data/entity_attributes";
 import { haStyle } from "../resources/styles";
 import { HomeAssistant } from "../types";
 
@@ -56,9 +49,22 @@ class HaAttributes extends LitElement {
                 ${attributes.map(
                   (attribute) => html`
                     <div class="data-entry">
-                      <div class="key">${formatAttributeName(attribute)}</div>
+                      <div class="key">
+                        ${computeAttributeNameDisplay(
+                          this.hass.localize,
+                          this.stateObj!,
+                          this.hass.entities,
+                          attribute
+                        )}
+                      </div>
                       <div class="value">
-                        ${this.formatAttribute(attribute)}
+                        ${computeAttributeValueDisplay(
+                          this.hass.localize,
+                          this.stateObj!,
+                          this.hass.locale,
+                          this.hass.entities,
+                          attribute
+                        )}
                       </div>
                     </div>
                   `
@@ -128,14 +134,6 @@ class HaAttributes extends LitElement {
     );
   }
 
-  private formatAttribute(attribute: string): string | TemplateResult {
-    if (!this.stateObj) {
-      return "—";
-    }
-    const value = this.stateObj.attributes[attribute];
-    return formatAttributeValue(this.hass, value);
-  }
-
   private expandedChanged(ev) {
     this._expanded = ev.detail.expanded;
   }

src/components/ha-climate-state.ts

@@ -27,6 +27,7 @@ class HaClimateState extends LitElement {
                     ${computeAttributeValueDisplay(
                       this.hass.localize,
                       this.stateObj,
+                      this.hass.locale,
                       this.hass.entities,
                       "preset_mode"
                     )}`
@@ -142,6 +143,7 @@ class HaClimateState extends LitElement {
       ? `${computeAttributeValueDisplay(
           this.hass.localize,
           this.stateObj,
+          this.hass.locale,
           this.hass.entities,
           "hvac_action"
         )} (${stateString})`

src/components/ha-control-button.ts

@@ -107,8 +107,9 @@ export class HaControlButton extends LitElement {
         outline: none;
         overflow: hidden;
         background: none;
-        z-index: 1;
         --mdc-ripple-color: var(--control-button-background-color);
+        /* For safari border-radius overflow */
+        z-index: 0;
       }
       .button::before {
         content: "";

src/components/ha-control-select.ts

@@ -0,0 +1,333 @@
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  nothing,
+  PropertyValues,
+} from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
+import { ifDefined } from "lit/directives/if-defined";
+import { repeat } from "lit/directives/repeat";
+import { fireEvent } from "../common/dom/fire_event";
+import "./ha-icon";
+import "./ha-svg-icon";
+
+export type ControlSelectOption = {
+  value: string;
+  label?: string;
+  icon?: string;
+  path?: string;
+};
+
+@customElement("ha-control-select")
+export class HaControlSelect extends LitElement {
+  @property({ type: Boolean, reflect: true }) disabled = false;
+
+  @property() public label?: string;
+
+  @property() public options?: ControlSelectOption[];
+
+  @property() public value?: string;
+
+  @property({ type: Boolean, reflect: true })
+  public vertical = false;
+
+  @property({ type: Boolean, attribute: "hide-label" })
+  public hideLabel = false;
+
+  @state() private _activeIndex?: number;
+
+  protected firstUpdated(changedProperties: PropertyValues): void {
+    super.firstUpdated(changedProperties);
+    this.setAttribute("role", "listbox");
+    if (!this.hasAttribute("tabindex")) {
+      this.setAttribute("tabindex", "0");
+    }
+  }
+
+  protected updated(changedProps: PropertyValues) {
+    super.updated(changedProps);
+    if (changedProps.has("_activeIndex")) {
+      const activeValue =
+        this._activeIndex != null
+          ? this.options?.[this._activeIndex]?.value
+          : undefined;
+      const activedescendant =
+        activeValue != null ? `option-${activeValue}` : undefined;
+      this.setAttribute("aria-activedescendant", activedescendant ?? "");
+    }
+    if (changedProps.has("vertical")) {
+      const orientation = this.vertical ? "vertical" : "horizontal";
+      this.setAttribute("aria-orientation", orientation);
+    }
+  }
+
+  public connectedCallback(): void {
+    super.connectedCallback();
+    this._setupListeners();
+  }
+
+  public disconnectedCallback(): void {
+    super.disconnectedCallback();
+    this._destroyListeners();
+  }
+
+  private _setupListeners() {
+    this.addEventListener("focus", this._handleFocus);
+    this.addEventListener("blur", this._handleBlur);
+    this.addEventListener("keydown", this._handleKeydown);
+  }
+
+  private _destroyListeners() {
+    this.removeEventListener("focus", this._handleFocus);
+    this.removeEventListener("blur", this._handleBlur);
+    this.removeEventListener("keydown", this._handleKeydown);
+  }
+
+  private _handleFocus() {
+    if (this.disabled) return;
+    this._activeIndex =
+      (this.value != null
+        ? this.options?.findIndex((option) => option.value === this.value)
+        : undefined) ?? 0;
+  }
+
+  private _handleBlur() {
+    this._activeIndex = undefined;
+  }
+
+  private _handleKeydown(ev: KeyboardEvent) {
+    if (!this.options || this._activeIndex == null || this.disabled) return;
+    switch (ev.key) {
+      case " ":
+        this.value = this.options[this._activeIndex].value;
+        fireEvent(this, "value-changed", { value: this.value });
+        break;
+      case "ArrowUp":
+      case "ArrowLeft":
+        this._activeIndex =
+          this._activeIndex <= 0
+            ? this.options.length - 1
+            : this._activeIndex - 1;
+        break;
+      case "ArrowDown":
+      case "ArrowRight":
+        this._activeIndex = (this._activeIndex + 1) % this.options.length;
+        break;
+      case "Home":
+        this._activeIndex = 0;
+        break;
+      case "End":
+        this._activeIndex = this.options.length - 1;
+        break;
+      default:
+        return;
+    }
+    ev.preventDefault();
+  }
+
+  private _handleOptionClick(ev: MouseEvent) {
+    if (this.disabled) return;
+    const value = (ev.target as any).value;
+    this.value = value;
+    fireEvent(this, "value-changed", { value: this.value });
+  }
+
+  private _handleOptionMouseDown(ev: MouseEvent) {
+    if (this.disabled) return;
+    ev.preventDefault();
+    const value = (ev.target as any).value;
+    this._activeIndex = this.options?.findIndex(
+      (option) => option.value === value
+    );
+  }
+
+  private _handleOptionMouseUp(ev: MouseEvent) {
+    ev.preventDefault();
+    this._activeIndex = undefined;
+  }
+
+  protected render() {
+    return html`
+      <div class="container">
+        ${this.options
+          ? repeat(
+              this.options,
+              (option) => option.value,
+              (option, idx) => this._renderOption(option, idx)
+            )
+          : nothing}
+      </div>
+    `;
+  }
+
+  private _renderOption(option: ControlSelectOption, index: number) {
+    return html`
+      <div
+        id=${`option-${option.value}`}
+        class=${classMap({
+          option: true,
+          selected: this.value === option.value,
+          focused: this._activeIndex === index,
+        })}
+        role="option"
+        .value=${option.value}
+        aria-selected=${this.value === option.value}
+        aria-label=${ifDefined(option.label)}
+        @click=${this._handleOptionClick}
+        @mousedown=${this._handleOptionMouseDown}
+        @mouseup=${this._handleOptionMouseUp}
+      >
+        <div class="content">
+          ${option.path
+            ? html`<ha-svg-icon .path=${option.path}></ha-svg-icon>`
+            : option.icon
+            ? html`<ha-icon .icon=${option.icon}></ha-icon> `
+            : nothing}
+          ${option.label && !this.hideLabel
+            ? html`<span>${option.label}</span>`
+            : nothing}
+        </div>
+      </div>
+    `;
+  }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      :host {
+        display: block;
+        --control-select-color: var(--primary-color);
+        --control-select-focused-opacity: 0.2;
+        --control-select-selected-opacity: 1;
+        --control-select-background: var(--disabled-color);
+        --control-select-background-opacity: 0.2;
+        --control-select-thickness: 40px;
+        --control-select-border-radius: 12px;
+        --control-select-padding: 4px;
+        --mdc-icon-size: 20px;
+        height: var(--control-select-thickness);
+        width: 100%;
+        border-radius: var(--control-select-border-radius);
+        outline: none;
+        transition: box-shadow 180ms ease-in-out;
+        font-style: normal;
+        font-weight: 500;
+        user-select: none;
+        -webkit-tap-highlight-color: transparent;
+      }
+      :host(:focus-visible) {
+        box-shadow: 0 0 0 2px var(--control-select-color);
+      }
+      :host([vertical]) {
+        width: var(--control-select-thickness);
+        height: 100%;
+      }
+      .container {
+        position: relative;
+        height: 100%;
+        width: 100%;
+        border-radius: var(--control-select-border-radius);
+        transform: translateZ(0);
+        overflow: hidden;
+        display: flex;
+        flex-direction: row;
+        padding: var(--control-select-padding);
+        box-sizing: border-box;
+      }
+      .container::before {
+        position: absolute;
+        content: "";
+        top: 0;
+        left: 0;
+        height: 100%;
+        width: 100%;
+        background: var(--control-select-background);
+        opacity: var(--control-select-background-opacity);
+      }
+
+      .container > *:not(:last-child) {
+        margin-right: var(--control-select-padding);
+        margin-inline-end: var(--control-select-padding);
+        margin-inline-start: initial;
+        direction: var(--direction);
+      }
+      .option {
+        cursor: pointer;
+        position: relative;
+        flex: 1;
+        height: 100%;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: calc(
+          var(--control-select-border-radius) - var(--control-select-padding)
+        );
+        overflow: hidden;
+        color: var(--primary-text-color);
+        /* For safari border-radius overflow */
+        z-index: 0;
+      }
+      .content > *:not(:last-child) {
+        margin-bottom: 4px;
+      }
+      .option::before {
+        position: absolute;
+        content: "";
+        top: 0;
+        left: 0;
+        height: 100%;
+        width: 100%;
+        background-color: var(--control-select-color);
+        opacity: 0;
+        transition: background-color ease-in-out 180ms, opacity ease-in-out 80ms;
+      }
+      .option.focused::before,
+      .option:hover::before {
+        opacity: var(--control-select-focused-opacity);
+      }
+      .option.selected {
+        color: white;
+      }
+      .option.selected::before {
+        opacity: var(--control-select-selected-opacity);
+      }
+      .option .content {
+        position: relative;
+        pointer-events: none;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        text-align: center;
+      }
+      :host([vertical]) {
+        width: var(--control-select-thickness);
+        height: auto;
+      }
+      :host([vertical]) .container {
+        flex-direction: column;
+      }
+      :host([vertical]) .container > *:not(:last-child) {
+        margin-right: initial;
+        margin-inline-end: initial;
+        margin-bottom: var(--control-select-padding);
+      }
+      :host([disabled]) {
+        --control-select-color: var(--disabled-color);
+        --control-select-focused-opacity: 0;
+      }
+      :host([disabled]) .option {
+        cursor: not-allowed;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-control-select": HaControlSelect;
+  }
+}

src/components/ha-control-slider.ts

@@ -29,19 +29,6 @@ const A11Y_KEY_CODES = new Set([
   "End",
 ]);
 
-const getPercentageFromEvent = (e: HammerInput, vertical: boolean) => {
-  if (vertical) {
-    const y = e.center.y;
-    const offset = e.target.getBoundingClientRect().top;
-    const total = e.target.clientHeight;
-    return Math.max(Math.min(1, 1 - (y - offset) / total), 0);
-  }
-  const x = e.center.x;
-  const offset = e.target.getBoundingClientRect().left;
-  const total = e.target.clientWidth;
-  return Math.max(Math.min(1, (x - offset) / total), 0);
-};
-
 @customElement("ha-control-slider")
 export class HaControlSlider extends LitElement {
   @property({ type: Boolean, reflect: true })
@@ -157,7 +144,7 @@ export class HaControlSlider extends LitElement {
       });
       this._mc.on("panmove", (e) => {
         if (this.disabled) return;
-        const percentage = getPercentageFromEvent(e, this.vertical);
+        const percentage = this._getPercentageFromEvent(e);
         this.value = this.percentageToValue(percentage);
         const value = this.steppedValue(this.value);
         fireEvent(this, "slider-moved", { value });
@@ -165,7 +152,7 @@ export class HaControlSlider extends LitElement {
       this._mc.on("panend", (e) => {
         if (this.disabled) return;
         this.pressed = false;
-        const percentage = getPercentageFromEvent(e, this.vertical);
+        const percentage = this._getPercentageFromEvent(e);
         this.value = this.steppedValue(this.percentageToValue(percentage));
         fireEvent(this, "slider-moved", { value: undefined });
         fireEvent(this, "value-changed", { value: this.value });
@@ -173,7 +160,7 @@ export class HaControlSlider extends LitElement {
 
       this._mc.on("singletap", (e) => {
         if (this.disabled) return;
-        const percentage = getPercentageFromEvent(e, this.vertical);
+        const percentage = this._getPercentageFromEvent(e);
         this.value = this.steppedValue(this.percentageToValue(percentage));
         fireEvent(this, "value-changed", { value: this.value });
       });
@@ -234,6 +221,19 @@ export class HaControlSlider extends LitElement {
     fireEvent(this, "value-changed", { value: this.value });
   }
 
+  private _getPercentageFromEvent = (e: HammerInput) => {
+    if (this.vertical) {
+      const y = e.center.y;
+      const offset = e.target.getBoundingClientRect().top;
+      const total = e.target.clientHeight;
+      return Math.max(Math.min(1, 1 - (y - offset) / total), 0);
+    }
+    const x = e.center.x;
+    const offset = e.target.getBoundingClientRect().left;
+    const total = e.target.clientWidth;
+    return Math.max(Math.min(1, (x - offset) / total), 0);
+  };
+
   protected render(): TemplateResult {
     return html`
       <div
@@ -250,7 +250,6 @@ export class HaControlSlider extends LitElement {
                 <div
                   class=${classMap({
                     "slider-track-cursor": true,
-                    vertical: this.vertical,
                   })}
                 ></div>
               `
@@ -259,7 +258,6 @@ export class HaControlSlider extends LitElement {
               <div
                 class=${classMap({
                   "slider-track-bar": true,
-                  vertical: this.vertical,
                   [this.mode ?? "start"]: true,
                   "show-handle": this.showHandle,
                 })}
@@ -369,7 +367,7 @@ export class HaControlSlider extends LitElement {
         left: var(--handle-margin);
       }
 
-      .slider .slider-track-bar.vertical {
+      :host([vertical]) .slider .slider-track-bar {
         bottom: 0;
         left: 0;
         transform: translate3d(
@@ -379,7 +377,7 @@ export class HaControlSlider extends LitElement {
         );
         border-radius: var(--border-radius) var(--border-radius) 0 0;
       }
-      .slider .slider-track-bar.vertical:after {
+      :host([vertical]) .slider .slider-track-bar:after {
         top: var(--handle-margin);
         right: 0;
         left: 0;
@@ -387,7 +385,7 @@ export class HaControlSlider extends LitElement {
         width: 50%;
         height: var(--handle-size);
       }
-      .slider .slider-track-bar.vertical.end {
+      :host([vertical]) .slider .slider-track-bar.end {
         top: 0;
         bottom: initial;
         transform: translate3d(
@@ -397,7 +395,7 @@ export class HaControlSlider extends LitElement {
         );
         border-radius: 0 0 var(--border-radius) var(--border-radius);
       }
-      .slider .slider-track-bar.vertical.end::after {
+      :host([vertical]) .slider .slider-track-bar.end::after {
         top: initial;
         bottom: var(--handle-margin);
       }
@@ -432,7 +430,7 @@ export class HaControlSlider extends LitElement {
         width: var(--handle-size);
       }
 
-      .slider .slider-track-cursor.vertical {
+      :host([vertical]) .slider .slider-track-cursor {
         top: initial;
         right: 0;
         left: 0;
@@ -440,7 +438,7 @@ export class HaControlSlider extends LitElement {
         height: var(--cursor-size);
         width: 100%;
       }
-      .slider .slider-track-cursor.vertical:after {
+      :host([vertical]) .slider .slider-track-cursor:after {
         height: var(--handle-size);
         width: 50%;
       }

src/components/ha-dialog-date-picker.ts

@@ -41,14 +41,14 @@ export class HaDialogDatePicker extends LitElement {
       return nothing;
     }
     return html`<ha-dialog open @closed=${this.closeDialog}>
-      <app-datepicker
+      <app-date-picker
         .value=${this._value}
         .min=${this._params.min}
         .max=${this._params.max}
         .locale=${this._params.locale}
-        @datepicker-value-updated=${this._valueChanged}
+        @date-updated=${this._valueChanged}
         .firstDayOfWeek=${this._params.firstWeekday}
-      ></app-datepicker>
+      ></app-date-picker>
       <mwc-button slot="secondaryAction" @click=${this._setToday}>
         ${this.hass.localize("ui.dialogs.date-picker.today")}
       </mwc-button>
@@ -79,32 +79,32 @@ export class HaDialogDatePicker extends LitElement {
     haStyleDialog,
     css`
       ha-dialog {
-        --dialog-content-padding: 0;
         --justify-action-buttons: space-between;
       }
-      app-datepicker {
-        --app-datepicker-accent-color: var(--primary-color);
-        --app-datepicker-bg-color: transparent;
-        --app-datepicker-color: var(--primary-text-color);
-        --app-datepicker-disabled-day-color: var(--disabled-text-color);
-        --app-datepicker-focused-day-color: var(--text-primary-color);
-        --app-datepicker-focused-year-bg-color: var(--primary-color);
-        --app-datepicker-selector-color: var(--secondary-text-color);
-        --app-datepicker-separator-color: var(--divider-color);
-        --app-datepicker-weekday-color: var(--secondary-text-color);
+      app-date-picker {
+        --app-focus: var(--primary-text-color);
+        --app-hover: var(--primary-color);
+        --app-on-disabled: var(--disabled-color);
+        --app-on-focus: var(--primary-text-color);
+        --app-on-hover: var(--primary-text-color);
+        --app-on-primary: var(--text-primary-color);
+        --app-on-surface: var(--primary-text-color);
+        --app-on-today: var(--primary-text-color);
+        --app-on-week-number: var(--secondary-text-color);
+        --app-on-weekday: var(--secondary-text-color);
+        --app-primary: var(--primary-color);
+        --app-selected-focus: var(--primary-text-color);
+        --app-selected-hover: var(--primary-color);
+        --app-selected-on-focus: var(--text-primary-color);
+        --app-selected-on-hover: var(--text-primary-color);
+        --app-shape: var(--mdc-shape-medium);
+        --app-surface: transparent;
+        --app-today: var(--primary-text-color);
+
+        margin: auto;
       }
-      app-datepicker::part(calendar-day):focus {
-        outline: none;
-      }
-      @media all and (min-width: 450px) {
-        ha-dialog {
-          --mdc-dialog-min-width: 300px;
-        }
-      }
-      @media all and (max-width: 450px), all and (max-height: 500px) {
-        app-datepicker {
-          width: 100%;
-        }
+      ha-dialog {
+        --mdc-dialog-min-width: 300px;
       }
     `,
   ];

src/components/ha-icon.ts

@@ -29,102 +29,7 @@ interface DeprecatedIcon {
   };
 }
 
-const mdiDeprecatedIcons: DeprecatedIcon = {
-  "android-messages": {
-    newName: "message-text",
-    removeIn: "2022.10",
-  },
-  "book-variant-multiple": {
-    newName: "bookmark-box-multiple",
-    removeIn: "2022.10",
-  },
-  "desktop-mac": {
-    newName: "monitor",
-    removeIn: "2022.10",
-  },
-  "desktop-mac-dashboard": {
-    newName: "monitor-dashboard",
-    removeIn: "2022.10",
-  },
-  discord: {
-    removeIn: "2022.10",
-  },
-  "diving-scuba": {
-    newName: "diving-scuba-mask",
-    removeIn: "2022.10",
-  },
-  "email-send": {
-    newName: "email-arrow-right",
-    removeIn: "2022.10",
-  },
-  "email-send-outline": {
-    newName: "email-arrow-right-outline",
-    removeIn: "2022.10",
-  },
-  "email-receive": {
-    newName: "email-arrow-left",
-    removeIn: "2022.10",
-  },
-  "email-receive-outline": {
-    newName: "email-arrow-left-outline",
-    removeIn: "2022.10",
-  },
-  "format-textdirection-r-to-l": {
-    newName: "format-pilcrow-arrow-left",
-    removeIn: "2022.10",
-  },
-  "format-textdirection-l-to-r": {
-    newName: "format-pilcrow-arrow-right",
-    removeIn: "2022.10",
-  },
-  "google-controller": {
-    newName: "controller",
-    removeIn: "2022.10",
-  },
-  "google-controller-off": {
-    newName: "controller-off",
-    removeIn: "2022.10",
-  },
-  "google-home": {
-    removeIn: "2022.10",
-  },
-  lecturn: {
-    newName: "lectern",
-    removeIn: "2022.10",
-  },
-  receipt: {
-    newName: "receipt-text",
-    removeIn: "2022.10",
-  },
-  "receipt-outline": {
-    newName: "receipt-text-outline",
-    removeIn: "2022.10",
-  },
-  "tablet-android": {
-    newName: "tablet",
-    removeIn: "2022.10",
-  },
-  "text-to-speech": {
-    newName: "microphone-message",
-    removeIn: "2022.10",
-  },
-  "text-to-speech-off": {
-    newName: "microphone-message-off",
-    removeIn: "2022.10",
-  },
-  "timeline-help": {
-    newName: "timeline-question",
-    removeIn: "2022.10",
-  },
-  "timeline-help-outline": {
-    newName: "timeline-question-outline",
-    removeIn: "2022.10",
-  },
-  "vector-point": {
-    newName: "vector-point-select",
-    removeIn: "2022.10",
-  },
-};
+const mdiDeprecatedIcons: DeprecatedIcon = {};
 
 const chunks: Chunks = {};
 

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

@@ -59,7 +59,8 @@ export class HaSelectorAttribute extends LitElement {
 
     if (
       !this.context ||
-      oldContext?.filter_entity === this.context.filter_entity
+      !oldContext ||
+      oldContext.filter_entity === this.context.filter_entity
     ) {
       return;
     }

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

@@ -0,0 +1,38 @@
+import { LitElement, nothing } from "lit";
+import { customElement, property } from "lit/decorators";
+import { ConstantSelector } from "../../data/selector";
+
+@customElement("ha-selector-constant")
+export class HaSelectorConstant extends LitElement {
+  @property() public selector!: ConstantSelector;
+
+  @property({ type: Boolean }) public disabled = false;
+
+  @property() public localizeValue?: (key: string) => string;
+
+  protected render() {
+    if (this.disabled) {
+      return nothing;
+    }
+
+    const translationKey = this.selector.constant?.translation_key;
+
+    const translatedLabel =
+      translationKey && this.localizeValue
+        ? this.localizeValue(`${translationKey}.value`)
+        : undefined;
+
+    return (
+      translatedLabel ??
+      this.selector.constant?.label ??
+      this.selector.constant?.value ??
+      nothing
+    );
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-selector-constant": HaSelectorConstant;
+  }
+}

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

@@ -17,6 +17,7 @@ const LOAD_ELEMENTS = {
   boolean: () => import("./ha-selector-boolean"),
   color_rgb: () => import("./ha-selector-color-rgb"),
   config_entry: () => import("./ha-selector-config-entry"),
+  constant: () => import("./ha-selector-constant"),
   date: () => import("./ha-selector-date"),
   datetime: () => import("./ha-selector-datetime"),
   device: () => import("./ha-selector-device"),

src/components/ha-service-control.ts

@@ -136,6 +136,7 @@ export class HaServiceControl extends LitElement {
     if (oldValue?.service !== this.value?.service) {
       let updatedDefaultValue = false;
       if (this._value && serviceData) {
+        const loadDefaults = this.value && !("data" in this.value);
         // Set mandatory bools without a default value to false
         if (!this._value.data) {
           this._value.data = {};
@@ -152,6 +153,7 @@ export class HaServiceControl extends LitElement {
             this._value!.data![field.key] = false;
           }
           if (
+            loadDefaults &&
             field.selector &&
             field.default !== undefined &&
             this._value!.data![field.key] === undefined
@@ -341,10 +343,10 @@ export class HaServiceControl extends LitElement {
                     .selector=${dataField.selector}
                     .key=${dataField.key}
                     @value-changed=${this._serviceDataChanged}
-                    .value=${this._value?.data &&
-                    this._value.data[dataField.key] !== undefined
+                    .value=${this._value?.data
                       ? this._value.data[dataField.key]
-                      : dataField.default}
+                      : undefined}
+                    .placeholder=${dataField.default}
                   ></ha-selector>
                 </ha-settings-row>`
               : "";
@@ -358,11 +360,22 @@ export class HaServiceControl extends LitElement {
 
     if (checked) {
       this._checkedKeys.add(key);
-      const defaultValue = this._getServiceInfo(
+      const field = this._getServiceInfo(
         this._value?.service,
         this.hass.services
-      )?.fields.find((field) => field.key === key)?.default;
-      if (defaultValue) {
+      )?.fields.find((_field) => _field.key === key);
+
+      let defaultValue = field?.default;
+
+      if (
+        defaultValue == null &&
+        field?.selector &&
+        "constant" in field.selector
+      ) {
+        defaultValue = field.selector.constant?.value;
+      }
+
+      if (defaultValue != null) {
         data = {
           ...this._value?.data,
           [key]: defaultValue,

src/components/ha-vacuum-state.js

@@ -76,7 +76,7 @@ class HaVacuumState extends LocalizeMixin(PolymerElement) {
       ? this.localize(
           `ui.card.vacuum.actions.${STATES_INTERCEPTABLE[state].action}`
         )
-      : this.localize(`component.vacuum._.${state}`);
+      : this.localize(`component.vacuum.entity_component._.state.${state}`);
   }
 
   _callService(ev) {

src/data/automation_i18n.ts

@@ -10,7 +10,7 @@ import {
   localizeDeviceAutomationCondition,
   localizeDeviceAutomationTrigger,
 } from "./device_automation";
-import { formatAttributeName } from "./entity_attributes";
+import { computeAttributeNameDisplay } from "../common/entity/compute_attribute_display";
 
 const describeDuration = (forTime: number | string | ForDict) => {
   let duration: string | null;
@@ -67,7 +67,12 @@ export const describeTrigger = (
     const entity = stateObj ? computeStateName(stateObj) : trigger.entity_id;
 
     if (trigger.attribute) {
-      base += ` ${formatAttributeName(trigger.attribute)} from`;
+      base += ` ${computeAttributeNameDisplay(
+        hass.localize,
+        stateObj,
+        hass.entities,
+        trigger.attribute
+      )} from`;
     }
 
     base += ` ${entity} is`;
@@ -98,11 +103,18 @@ export const describeTrigger = (
   if (trigger.platform === "state") {
     let base = "When";
     let entities = "";
-
     const states = hass.states;
 
     if (trigger.attribute) {
-      base += ` ${formatAttributeName(trigger.attribute)} from`;
+      const stateObj = Array.isArray(trigger.entity_id)
+        ? hass.states[trigger.entity_id[0]]
+        : hass.states[trigger.entity_id];
+      base += ` ${computeAttributeNameDisplay(
+        hass.localize,
+        stateObj,
+        hass.entities,
+        trigger.attribute
+      )} from`;
     }
 
     if (Array.isArray(trigger.entity_id)) {

src/data/cloud.ts

@@ -11,8 +11,6 @@ interface CloudStatusNotLoggedIn {
 
 export interface GoogleEntityConfig {
   should_expose?: boolean | null;
-  override_name?: string;
-  aliases?: string[];
   disable_2fa?: boolean;
 }
 

src/data/conversation.ts

@@ -44,7 +44,7 @@ interface IntentResultError extends IntentResultBase {
   };
 }
 
-interface ConversationResult {
+export interface ConversationResult {
   conversation_id: string | null;
   response:
     | IntentResultActionDone

src/data/entity_attributes.ts

@@ -1,16 +1,3 @@
-import { html, TemplateResult } from "lit";
-import { until } from "lit/directives/until";
-import checkValidDate from "../common/datetime/check_valid_date";
-import { formatDate } from "../common/datetime/format_date";
-import { formatDateTimeWithSeconds } from "../common/datetime/format_date_time";
-import { formatNumber } from "../common/number/format_number";
-import { capitalizeFirstLetter } from "../common/string/capitalize-first-letter";
-import { isDate } from "../common/string/is_date";
-import { isTimestamp } from "../common/string/is_timestamp";
-import { HomeAssistant } from "../types";
-
-let jsYamlPromise: Promise<typeof import("../resources/js-yaml-dump")>;
-
 export const STATE_ATTRIBUTES = [
   "assumed_state",
   "attribution",
@@ -32,74 +19,3 @@ export const STATE_ATTRIBUTES = [
   "supported_features",
   "unit_of_measurement",
 ];
-
-// Convert from internal snake_case format to user-friendly format
-export function formatAttributeName(value: string): string {
-  value = value
-    .replace(/_/g, " ")
-    .replace(/\bid\b/g, "ID")
-    .replace(/\bip\b/g, "IP")
-    .replace(/\bmac\b/g, "MAC")
-    .replace(/\bgps\b/g, "GPS");
-  return capitalizeFirstLetter(value);
-}
-
-export function formatAttributeValue(
-  hass: HomeAssistant,
-  value: any
-): string | TemplateResult {
-  if (value === null) {
-    return "—";
-  }
-
-  // YAML handling
-  if (
-    (Array.isArray(value) && value.some((val) => val instanceof Object)) ||
-    (!Array.isArray(value) && value instanceof Object)
-  ) {
-    if (!jsYamlPromise) {
-      jsYamlPromise = import("../resources/js-yaml-dump");
-    }
-    const yaml = jsYamlPromise.then((jsYaml) => jsYaml.dump(value));
-    return html`<pre>${until(yaml, "")}</pre>`;
-  }
-
-  if (typeof value === "number") {
-    return formatNumber(value, hass.locale);
-  }
-
-  if (typeof value === "string") {
-    // URL handling
-    if (value.startsWith("http")) {
-      try {
-        // If invalid URL, exception will be raised
-        const url = new URL(value);
-        if (url.protocol === "http:" || url.protocol === "https:")
-          return html`<a target="_blank" rel="noreferrer" href=${value}
-            >${value}</a
-          >`;
-      } catch (_) {
-        // Nothing to do here
-      }
-    }
-
-    // Date handling
-    if (isDate(value, true)) {
-      // Timestamp handling
-      if (isTimestamp(value)) {
-        const date = new Date(value);
-        if (checkValidDate(date)) {
-          return formatDateTimeWithSeconds(date, hass.locale);
-        }
-      }
-
-      // Value was not a timestamp, so only do date formatting
-      const date = new Date(value);
-      if (checkValidDate(date)) {
-        return formatDate(date, hass.locale);
-      }
-    }
-  }
-
-  return Array.isArray(value) ? value.join(", ") : value;
-}

src/data/history.ts

@@ -232,7 +232,8 @@ export const subscribeHistoryStatesTimeWindow = (
   hoursToShow: number,
   entityIds: string[],
   minimalResponse = true,
-  significantChangesOnly = true
+  significantChangesOnly = true,
+  noAttributes?: boolean
 ): Promise<() => Promise<void>> => {
   const params = {
     type: "history/stream",
@@ -242,9 +243,11 @@ export const subscribeHistoryStatesTimeWindow = (
     ).toISOString(),
     minimal_response: minimalResponse,
     significant_changes_only: significantChangesOnly,
-    no_attributes: !entityIds.some((entityId) =>
-      entityIdHistoryNeedsAttributes(hass, entityId)
-    ),
+    no_attributes:
+      noAttributes ??
+      !entityIds.some((entityId) =>
+        entityIdHistoryNeedsAttributes(hass, entityId)
+      ),
   };
   const stream = new HistoryStream(hass, hoursToShow);
   return hass.connection.subscribeMessage<HistoryStreamMessage>(

src/data/selector.ts

@@ -13,6 +13,7 @@ export type Selector =
   | ColorRGBSelector
   | ColorTempSelector
   | ConfigEntrySelector
+  | ConstantSelector
   | DateSelector
   | DateTimeSelector
   | DeviceSelector
@@ -88,6 +89,14 @@ export interface ConfigEntrySelector {
   } | null;
 }
 
+export interface ConstantSelector {
+  constant: {
+    value: string | number | boolean;
+    label?: string;
+    translation_key?: string;
+  } | null;
+}
+
 export interface DateSelector {
   // eslint-disable-next-line @typescript-eslint/ban-types
   date: {} | null;

src/data/translation.ts

@@ -44,8 +44,8 @@ declare global {
 export type TranslationCategory =
   | "title"
   | "state"
-  | "state_attributes"
   | "entity"
+  | "entity_component"
   | "config"
   | "config_panel"
   | "options"

src/data/voice_assistant.ts

@@ -0,0 +1,155 @@
+import { HomeAssistant } from "../types";
+import { ConversationResult } from "./conversation";
+
+interface PipelineEventBase {
+  timestamp: string;
+}
+
+interface PipelineRunStartEvent extends PipelineEventBase {
+  type: "run-start";
+  data: {
+    pipeline: string;
+    language: string;
+  };
+}
+interface PipelineRunFinishEvent extends PipelineEventBase {
+  type: "run-finish";
+  data: Record<string, never>;
+}
+
+interface PipelineErrorEvent extends PipelineEventBase {
+  type: "error";
+  data: {
+    code: string;
+    message: string;
+  };
+}
+
+interface PipelineSTTStartEvent extends PipelineEventBase {
+  type: "stt-start";
+  data: Record<string, never>;
+}
+interface PipelineSTTFinishEvent extends PipelineEventBase {
+  type: "stt-finish";
+  data: Record<string, never>;
+}
+
+interface PipelineIntentStartEvent extends PipelineEventBase {
+  type: "intent-start";
+  data: {
+    engine: string;
+    intent_input: string;
+  };
+}
+interface PipelineIntentFinishEvent extends PipelineEventBase {
+  type: "intent-finish";
+  data: {
+    intent_output: ConversationResult;
+  };
+}
+
+interface PipelineTTSStartEvent extends PipelineEventBase {
+  type: "tts-start";
+  data: Record<string, never>;
+}
+interface PipelineTTSFinishEvent extends PipelineEventBase {
+  type: "tts-finish";
+  data: Record<string, never>;
+}
+
+type PipelineRunEvent =
+  | PipelineRunStartEvent
+  | PipelineRunFinishEvent
+  | PipelineErrorEvent
+  | PipelineSTTStartEvent
+  | PipelineSTTFinishEvent
+  | PipelineIntentStartEvent
+  | PipelineIntentFinishEvent
+  | PipelineTTSStartEvent
+  | PipelineTTSFinishEvent;
+
+interface PipelineRunOptions {
+  pipeline?: string;
+  intent_input?: string;
+  conversation_id?: string | null;
+}
+
+export interface PipelineRun {
+  init_options: PipelineRunOptions;
+  events: PipelineRunEvent[];
+  stage: "ready" | "stt" | "intent" | "tts" | "done" | "error";
+  run: PipelineRunStartEvent["data"];
+  error?: PipelineErrorEvent["data"];
+  stt?: PipelineSTTStartEvent["data"] & Partial<PipelineSTTFinishEvent["data"]>;
+  intent?: PipelineIntentStartEvent["data"] &
+    Partial<PipelineIntentFinishEvent["data"]>;
+  tts?: PipelineTTSStartEvent["data"] & Partial<PipelineTTSFinishEvent["data"]>;
+}
+
+export const runPipelineFromText = (
+  hass: HomeAssistant,
+  callback: (event: PipelineRun) => void,
+  options: PipelineRunOptions = {}
+) => {
+  let run: PipelineRun | undefined;
+
+  const unsubProm = hass.connection.subscribeMessage<PipelineRunEvent>(
+    (updateEvent) => {
+      if (updateEvent.type === "run-start") {
+        run = {
+          init_options: options,
+          stage: "ready",
+          run: updateEvent.data,
+          error: undefined,
+          stt: undefined,
+          intent: undefined,
+          tts: undefined,
+          events: [updateEvent],
+        };
+        callback(run);
+        return;
+      }
+
+      if (!run) {
+        // eslint-disable-next-line no-console
+        console.warn(
+          "Received unexpected event before receiving session",
+          updateEvent
+        );
+        return;
+      }
+
+      if (updateEvent.type === "stt-start") {
+        run = { ...run, stage: "stt", stt: updateEvent.data };
+      } else if (updateEvent.type === "stt-finish") {
+        run = { ...run, stt: { ...run.stt!, ...updateEvent.data } };
+      } else if (updateEvent.type === "intent-start") {
+        run = { ...run, stage: "intent", intent: updateEvent.data };
+      } else if (updateEvent.type === "intent-finish") {
+        run = { ...run, intent: { ...run.intent!, ...updateEvent.data } };
+      } else if (updateEvent.type === "tts-start") {
+        run = { ...run, stage: "tts", tts: updateEvent.data };
+      } else if (updateEvent.type === "tts-finish") {
+        run = { ...run, tts: { ...run.tts!, ...updateEvent.data } };
+      } else if (updateEvent.type === "run-finish") {
+        run = { ...run, stage: "done" };
+        unsubProm.then((unsub) => unsub());
+      } else if (updateEvent.type === "error") {
+        run = { ...run, stage: "error", error: updateEvent.data };
+        unsubProm.then((unsub) => unsub());
+      } else {
+        run = { ...run };
+      }
+
+      run.events = [...run.events, updateEvent];
+
+      callback(run);
+    },
+    {
+      ...options,
+      type: "voice_assistant/run",
+    }
+  );
+
+  return unsubProm;
+};

src/dialogs/config-flow/show-dialog-config-flow.ts

@@ -55,7 +55,8 @@ export const showConfigFlowDialog = (
     renderShowFormStepHeader(hass, step) {
       return (
         hass.localize(
-          `component.${step.handler}.config.step.${step.step_id}.title`
+          `component.${step.handler}.config.step.${step.step_id}.title`,
+          step.description_placeholders
         ) || hass.localize(`component.${step.handler}.title`)
       );
     },

src/dialogs/config-flow/show-dialog-options-flow.ts

@@ -67,7 +67,8 @@ export const showOptionsFlowDialog = (
       renderShowFormStepHeader(hass, step) {
         return (
           hass.localize(
-            `component.${configEntry.domain}.options.step.${step.step_id}.title`
+            `component.${configEntry.domain}.options.step.${step.step_id}.title`,
+            step.description_placeholders
           ) || hass.localize(`ui.dialogs.options_flow.form.header`)
         );
       },

src/dialogs/more-info/components/lights/ha-more-info-view-light-color-picker.ts

@@ -201,10 +201,11 @@ class MoreInfoViewLightColorPicker extends LitElement {
       this._brightnessAdjusted = undefined;
       if (
         stateObj.attributes.color_mode === LightColorMode.RGB &&
+        stateObj.attributes.rgb_color &&
         !lightSupportsColorMode(stateObj, LightColorMode.RGBWW) &&
         !lightSupportsColorMode(stateObj, LightColorMode.RGBW)
       ) {
-        const maxVal = Math.max(...stateObj.attributes.rgb_color!);
+        const maxVal = Math.max(...stateObj.attributes.rgb_color);
 
         if (maxVal < 255) {
           this._brightnessAdjusted = maxVal;
@@ -216,16 +217,19 @@ class MoreInfoViewLightColorPicker extends LitElement {
           : undefined;
 
       this._wvSliderValue =
-        stateObj.attributes.color_mode === LightColorMode.RGBW
-          ? Math.round((stateObj.attributes.rgbw_color![3] * 100) / 255)
+        stateObj.attributes.color_mode === LightColorMode.RGBW &&
+        stateObj.attributes.rgbw_color
+          ? Math.round((stateObj.attributes.rgbw_color[3] * 100) / 255)
           : undefined;
       this._cwSliderValue =
-        stateObj.attributes.color_mode === LightColorMode.RGBWW
-          ? Math.round((stateObj.attributes.rgbww_color![3] * 100) / 255)
+        stateObj.attributes.color_mode === LightColorMode.RGBWW &&
+        stateObj.attributes.rgbww_color
+          ? Math.round((stateObj.attributes.rgbww_color[3] * 100) / 255)
           : undefined;
       this._wwSliderValue =
-        stateObj.attributes.color_mode === LightColorMode.RGBWW
-          ? Math.round((stateObj.attributes.rgbww_color![4] * 100) / 255)
+        stateObj.attributes.color_mode === LightColorMode.RGBWW &&
+        stateObj.attributes.rgbww_color
+          ? Math.round((stateObj.attributes.rgbww_color[4] * 100) / 255)
           : undefined;
 
       const currentRgbColor = getLightCurrentModeRgbColor(stateObj);

src/dialogs/more-info/controls/more-info-climate.ts

@@ -235,6 +235,7 @@ class MoreInfoClimate extends LitElement {
                         ${computeAttributeValueDisplay(
                           hass.localize,
                           stateObj,
+                          hass.locale,
                           hass.entities,
                           "preset_mode",
                           mode
@@ -268,6 +269,7 @@ class MoreInfoClimate extends LitElement {
                         ${computeAttributeValueDisplay(
                           hass.localize,
                           stateObj,
+                          hass.locale,
                           hass.entities,
                           "fan_mode",
                           mode
@@ -301,6 +303,7 @@ class MoreInfoClimate extends LitElement {
                         ${computeAttributeValueDisplay(
                           hass.localize,
                           stateObj,
+                          hass.locale,
                           hass.entities,
                           "swing_mode",
                           mode

src/dialogs/more-info/controls/more-info-light.ts

@@ -148,7 +148,7 @@ class MoreInfoLight extends LitElement {
                       </md-outlined-icon-button>
                     `
                   : null}
-                ${supportsEffects
+                ${supportsEffects && this.stateObj.attributes.effect_list
                   ? html`
                       <ha-button-menu
                         corner="BOTTOM_START"
@@ -169,7 +169,7 @@ class MoreInfoLight extends LitElement {
                         >
                           <ha-svg-icon .path=${mdiCreation}></ha-svg-icon>
                         </md-outlined-icon-button>
-                        ${this.stateObj.attributes.effect_list!.map(
+                        ${this.stateObj.attributes.effect_list.map(
                           (effect: string) => html`
                             <mwc-list-item
                               .value=${effect}

src/dialogs/more-info/controls/more-info-vacuum.ts

@@ -115,7 +115,7 @@ class MoreInfoVacuum extends LitElement {
                       <strong>
                         ${stateObj.attributes.status ||
                         this.hass.localize(
-                          `component.vacuum.state._.${stateObj.state}`
+                          `component.vacuum.entity_component._.state.${stateObj.state}`
                         ) ||
                         stateObj.state}
                       </strong>

src/dialogs/more-info/controls/more-info-water_heater.js

@@ -225,7 +225,10 @@ class MoreInfoWaterHeater extends LocalizeMixin(EventsMixin(PolymerElement)) {
   }
 
   _localizeOperationMode(localize, mode) {
-    return localize(`component.water_heater.state._.${mode}`) || mode;
+    return (
+      localize(`component.water_heater.entity_component._.state.${mode}`) ||
+      mode
+    );
   }
 }
 

src/dialogs/more-info/ha-more-info-dialog.ts

@@ -8,7 +8,7 @@ import {
   mdiPencilOutline,
 } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
-import { css, html, LitElement, PropertyValues } from "lit";
+import { css, html, LitElement, nothing, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { cache } from "lit/directives/cache";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
@@ -151,20 +151,34 @@ export class MoreInfoDialog extends LitElement {
     return entity?.device_id ?? null;
   }
 
+  private setView(view: View) {
+    history.replaceState(
+      {
+        ...history.state,
+        dialogParams: {
+          ...history.state?.dialogParams,
+          view,
+        },
+      },
+      ""
+    );
+    this._currView = view;
+  }
+
   private _goBack() {
     if (this._childView) {
       this._childView = undefined;
     } else {
-      this._currView = "info";
+      this.setView("info");
     }
   }
 
   private _goToHistory() {
-    this._currView = "history";
+    this.setView("history");
   }
 
   private _goToSettings(): void {
-    this._currView = "settings";
+    this.setView("settings");
   }
 
   private async _showChildView(ev: CustomEvent): Promise<void> {
@@ -206,12 +220,12 @@ export class MoreInfoDialog extends LitElement {
 
   private _goToRelated(ev): void {
     if (!shouldHandleRequestSelectedEvent(ev)) return;
-    this._currView = "related";
+    this.setView("related");
   }
 
   protected render() {
     if (!this._entityId) {
-      return null;
+      return nothing;
     }
     const entityId = this._entityId;
     const stateObj = this.hass.states[entityId] as HassEntity | undefined;
@@ -261,7 +275,7 @@ export class MoreInfoDialog extends LitElement {
                 >
                   ${title}
                 </div>`
-              : null}
+              : nothing}
             ${isInfoView
               ? html`
                   ${this.shouldShowHistory(domain)
@@ -275,77 +289,79 @@ export class MoreInfoDialog extends LitElement {
                           @click=${this._goToHistory}
                         ></ha-icon-button>
                       `
-                    : null}
-                  <ha-icon-button
-                    slot="actionItems"
-                    .label=${this.hass.localize(
-                      "ui.dialogs.more_info_control.settings"
-                    )}
-                    .path=${mdiCogOutline}
-                    @click=${this._goToSettings}
-                  ></ha-icon-button>
+                    : nothing}
                   ${isAdmin
-                    ? html`<ha-button-menu
-                        corner="BOTTOM_END"
-                        menuCorner="END"
-                        slot="actionItems"
-                        @closed=${stopPropagation}
-                        fixed
-                      >
+                    ? html`
                         <ha-icon-button
-                          slot="trigger"
-                          .label=${this.hass.localize("ui.common.menu")}
-                          .path=${mdiDotsVertical}
-                        ></ha-icon-button>
-
-                        ${deviceId
-                          ? html`
-                              <ha-list-item
-                                graphic="icon"
-                                @request-selected=${this._goToDevice}
-                              >
-                                ${this.hass.localize(
-                                  "ui.dialogs.more_info_control.device_info"
-                                )}
-                                <ha-svg-icon
-                                  slot="graphic"
-                                  .path=${mdiDevices}
-                                ></ha-svg-icon>
-                              </ha-list-item>
-                            `
-                          : null}
-                        ${this.shouldShowEditIcon(domain, stateObj)
-                          ? html`
-                              <ha-list-item
-                                graphic="icon"
-                                @request-selected=${this._goToEdit}
-                              >
-                                ${this.hass.localize(
-                                  "ui.dialogs.more_info_control.edit"
-                                )}
-                                <ha-svg-icon
-                                  slot="graphic"
-                                  .path=${mdiPencilOutline}
-                                ></ha-svg-icon>
-                              </ha-list-item>
-                            `
-                          : null}
-                        <ha-list-item
-                          graphic="icon"
-                          @request-selected=${this._goToRelated}
-                        >
-                          ${this.hass.localize(
-                            "ui.dialogs.more_info_control.related"
+                          slot="actionItems"
+                          .label=${this.hass.localize(
+                            "ui.dialogs.more_info_control.settings"
                           )}
-                          <ha-svg-icon
-                            slot="graphic"
-                            .path=${mdiInformationOutline}
-                          ></ha-svg-icon>
-                        </ha-list-item>
-                      </ha-button-menu>`
-                    : null}
+                          .path=${mdiCogOutline}
+                          @click=${this._goToSettings}
+                        ></ha-icon-button>
+                        <ha-button-menu
+                          corner="BOTTOM_END"
+                          menuCorner="END"
+                          slot="actionItems"
+                          @closed=${stopPropagation}
+                          fixed
+                        >
+                          <ha-icon-button
+                            slot="trigger"
+                            .label=${this.hass.localize("ui.common.menu")}
+                            .path=${mdiDotsVertical}
+                          ></ha-icon-button>
+
+                          ${deviceId
+                            ? html`
+                                <ha-list-item
+                                  graphic="icon"
+                                  @request-selected=${this._goToDevice}
+                                >
+                                  ${this.hass.localize(
+                                    "ui.dialogs.more_info_control.device_info"
+                                  )}
+                                  <ha-svg-icon
+                                    slot="graphic"
+                                    .path=${mdiDevices}
+                                  ></ha-svg-icon>
+                                </ha-list-item>
+                              `
+                            : nothing}
+                          ${this.shouldShowEditIcon(domain, stateObj)
+                            ? html`
+                                <ha-list-item
+                                  graphic="icon"
+                                  @request-selected=${this._goToEdit}
+                                >
+                                  ${this.hass.localize(
+                                    "ui.dialogs.more_info_control.edit"
+                                  )}
+                                  <ha-svg-icon
+                                    slot="graphic"
+                                    .path=${mdiPencilOutline}
+                                  ></ha-svg-icon>
+                                </ha-list-item>
+                              `
+                            : nothing}
+                          <ha-list-item
+                            graphic="icon"
+                            @request-selected=${this._goToRelated}
+                          >
+                            ${this.hass.localize(
+                              "ui.dialogs.more_info_control.related"
+                            )}
+                            <ha-svg-icon
+                              slot="graphic"
+                              .path=${mdiInformationOutline}
+                            ></ha-svg-icon>
+                          </ha-list-item>
+                        </ha-button-menu>
+                      `
+                    : nothing}
                 `
-              : null}
+              : nothing}
           </ha-header-bar>
         </div>
         <div
@@ -396,7 +412,7 @@ export class MoreInfoDialog extends LitElement {
                         itemType="entity"
                       ></ha-related-items>
                     `
-                  : null
+                  : nothing
               )}
         </div>
       </ha-dialog>

src/dialogs/more-info/ha-more-info-history.ts

@@ -4,6 +4,7 @@ import { customElement, property, state } from "lit/decorators";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeDomain } from "../../common/entity/compute_domain";
+import { createSearchParam } from "../../common/url/search-params";
 import "../../components/chart/state-history-charts";
 import "../../components/chart/statistics-chart";
 import {
@@ -100,9 +101,13 @@ export class MoreInfoHistory extends LitElement {
         return;
       }
 
-      this._showMoreHref = `/history?entity_id=${
-        this.entityId
-      }&start_date=${startOfYesterday().toISOString()}`;
+      const params = {
+        entity_id: this.entityId,
+        start_date: startOfYesterday().toISOString(),
+        back: "1",
+      };
+
+      this._showMoreHref = `/history?${createSearchParam(params)}`;
 
       this._getStateHistory();
     }

src/dialogs/more-info/ha-more-info-logbook.ts

@@ -4,6 +4,7 @@ import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import { fireEvent } from "../../common/dom/fire_event";
+import { createSearchParam } from "../../common/url/search-params";
 import "../../panels/logbook/ha-logbook";
 import type { HomeAssistant } from "../../types";
 
@@ -55,9 +56,13 @@ export class MoreInfoLogbook extends LitElement {
     super.willUpdate(changedProps);
 
     if (changedProps.has("entityId") && this.entityId) {
-      this._showMoreHref = `/logbook?entity_id=${
-        this.entityId
-      }&start_date=${startOfYesterday().toISOString()}`;
+      const params = {
+        entity_id: this.entityId,
+        start_date: startOfYesterday().toISOString(),
+        back: "1",
+      };
+
+      this._showMoreHref = `/logbook?${createSearchParam(params)}`;
     }
   }
 

src/layouts/home-assistant.ts

@@ -136,12 +136,14 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
   protected hassConnected() {
     super.hassConnected();
     // @ts-ignore
-    this._loadHassTranslations(this.hass!.language, "state");
-    // @ts-ignore
-    this._loadHassTranslations(this.hass!.language, "state_attributes");
+    this._loadHassTranslations(this.hass!.language, "entity_component");
     // @ts-ignore
     this._loadHassTranslations(this.hass!.language, "entity");
 
+    // Backwards compatibility for custom integrations
+    // @ts-ignore
+    this._loadHassTranslations(this.hass!.language, "state");
+
     document.addEventListener(
       "visibilitychange",
       () => this._checkVisibility(),

src/onboarding/onboarding-analytics.ts

@@ -4,10 +4,10 @@ import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { LocalizeFunc } from "../common/translations/localize";
 import "../components/ha-analytics";
-import { analyticsLearnMore } from "../components/ha-analytics-learn-more";
 import { Analytics, setAnalyticsPreferences } from "../data/analytics";
 import { onboardAnalyticsStep } from "../data/onboarding";
 import type { HomeAssistant } from "../types";
+import { documentationUrl } from "../util/documentation-url";
 
 @customElement("onboarding-analytics")
 class OnboardingAnalytics extends LitElement {
@@ -23,12 +23,9 @@ class OnboardingAnalytics extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <p>
-        Share anonymized information from your installation to help make Home
-        Assistant better and help us convince manufacturers to add local control
-        and privacy-focused features.
-      </p>
+      <p>${this.hass.localize("ui.panel.page-onboarding.analytics.intro")}</p>
       <ha-analytics
+        translation_key_panel="page-onboarding"
         @analytics-preferences-changed=${this._preferencesChanged}
         .hass=${this.hass}
         .analytics=${this._analyticsDetails}
@@ -39,7 +36,13 @@ class OnboardingAnalytics extends LitElement {
         <mwc-button @click=${this._save} .disabled=${!this._analyticsDetails}>
           ${this.localize("ui.panel.page-onboarding.analytics.finish")}
         </mwc-button>
-        ${analyticsLearnMore(this.hass)}
+        <a
+          .href=${documentationUrl(this.hass, "/integrations/analytics/")}
+          target="_blank"
+          rel="noreferrer"
+        >
+          ${this.hass.localize("ui.panel.page-onboarding.analytics.learn_more")}
+        </a>
       </div>
     `;
   }

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

@@ -173,7 +173,7 @@ class DialogNewAutomation extends LitElement implements HassDialog {
                 </a>
               `
             : html`
-                <ha-tip>
+                <ha-tip .hass=${this.hass}>
                   <a
                     href=${documentationUrl(this.hass, "/get-blueprints")}
                     target="_blank"

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

@@ -40,13 +40,16 @@ export class HaNumericStateTrigger extends LitElement {
                 "available_modes",
                 "away_mode",
                 "changed_by",
+                "code_arm_required",
                 "code_format",
+                "color_mode",
                 "color_modes",
                 "current_activity",
                 "device_class",
                 "editable",
                 "effect_list",
                 "effect",
+                "entity_id",
                 "entity_picture",
                 "fan_mode",
                 "fan_modes",
@@ -60,11 +63,20 @@ export class HaNumericStateTrigger extends LitElement {
                 "hvac_mode",
                 "hvac_modes",
                 "icon",
+                "id",
+                "latest_version",
+                "max_color_temp_kelvin",
+                "max_mireds",
+                "max_temp",
                 "media_album_name",
                 "media_artist",
                 "media_content_type",
                 "media_position_updated_at",
                 "media_title",
+                "min_color_temp_kelvin",
+                "min_mireds",
+                "min_temp",
+                "mode",
                 "next_dawn",
                 "next_dusk",
                 "next_midnight",
@@ -74,8 +86,11 @@ export class HaNumericStateTrigger extends LitElement {
                 "operation_list",
                 "operation_mode",
                 "options",
+                "percentage_step",
+                "precipitation_unit",
                 "preset_mode",
                 "preset_modes",
+                "pressure_unit",
                 "release_notes",
                 "release_summary",
                 "release_url",
@@ -83,19 +98,27 @@ export class HaNumericStateTrigger extends LitElement {
                 "rgb_color",
                 "rgbw_color",
                 "shuffle",
+                "skipped_version",
                 "sound_mode_list",
                 "sound_mode",
                 "source_list",
                 "source_type",
                 "source",
                 "state_class",
+                "step",
+                "supported_color_modes",
                 "supported_features",
                 "swing_mode",
-                "swing_mode",
                 "swing_modes",
+                "target_temp_step",
+                "temperature_unit",
                 "title",
                 "token",
                 "unit_of_measurement",
+                "user_id",
+                "uuid",
+                "visibility_unit",
+                "wind_speed_unit",
                 "xy_color",
               ],
             },

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

@@ -64,28 +64,51 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
               hide_attributes: [
                 "access_token",
                 "available_modes",
+                "code_arm_required",
+                "code_format",
                 "color_modes",
                 "device_class",
                 "editable",
                 "effect_list",
+                "entity_id",
                 "entity_picture",
                 "fan_modes",
                 "fan_speed_list",
                 "friendly_name",
+                "frontend_stream_type",
                 "has_date",
                 "has_time",
                 "hvac_modes",
                 "icon",
+                "id",
+                "max_color_temp_kelvin",
+                "max_mireds",
+                "max_temp",
+                "max",
+                "min_color_temp_kelvin",
+                "min_mireds",
+                "min_temp",
+                "min",
+                "mode",
                 "operation_list",
                 "options",
+                "percentage_step",
+                "precipitation_unit",
                 "preset_modes",
+                "pressure_unit",
                 "sound_mode_list",
                 "source_list",
                 "state_class",
+                "step",
+                "supported_color_modes",
                 "supported_features",
                 "swing_modes",
+                "target_temp_step",
+                "temperature_unit",
                 "token",
                 "unit_of_measurement",
+                "visibility_unit",
+                "wind_speed_unit",
               ],
             },
           },

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

@@ -10,7 +10,6 @@ import {
 import { customElement, property, state } from "lit/decorators";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import "../../../components/ha-analytics";
-import { analyticsLearnMore } from "../../../components/ha-analytics-learn-more";
 import "../../../components/ha-card";
 import "../../../components/ha-checkbox";
 import "../../../components/ha-settings-row";
@@ -21,6 +20,7 @@ import {
 } from "../../../data/analytics";
 import { haStyle } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
+import { documentationUrl } from "../../../util/documentation-url";
 
 @customElement("ha-config-analytics")
 class ConfigAnalytics extends LitElement {
@@ -41,12 +41,9 @@ class ConfigAnalytics extends LitElement {
       <ha-card outlined>
         <div class="card-content">
           ${error ? html`<div class="error">${error}</div>` : ""}
-          <p>
-            Share anonymized information from your installation to help make
-            Home Assistant better and help us convince manufacturers to add
-            local control and privacy-focused features.
-          </p>
+          <p>${this.hass.localize("ui.panel.config.analytics.intro")}</p>
           <ha-analytics
+            translation_key_panel="config"
             @analytics-preferences-changed=${this._preferencesChanged}
             .hass=${this.hass}
             .analytics=${this._analyticsDetails}
@@ -60,7 +57,15 @@ class ConfigAnalytics extends LitElement {
           </mwc-button>
         </div>
       </ha-card>
-      <div class="footer">${analyticsLearnMore(this.hass)}</div>
+      <div class="footer">
+        <a
+          .href=${documentationUrl(this.hass, "/integrations/analytics/")}
+          target="_blank"
+          rel="noreferrer"
+        >
+          ${this.hass.localize("ui.panel.config.analytics.learn_more")}
+        </a>
+      </div>
     `;
   }
 

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

@@ -100,14 +100,14 @@ export class EnergyBatterySettings extends LitElement {
                     ></ha-icon>`
                   : html`<ha-svg-icon .path=${mdiBatteryHigh}></ha-svg-icon>`}
                 <div class="content">
-                  <span
+                  <span class="label"
                     >${getStatisticLabel(
                       this.hass,
                       source.stat_energy_from,
                       this.statsMetadata?.[source.stat_energy_from]
                     )}</span
                   >
-                  <span
+                  <span class="label"
                     >${getStatisticLabel(
                       this.hass,
                       source.stat_energy_to,
@@ -213,6 +213,10 @@ export class EnergyBatterySettings extends LitElement {
           display: flex;
           flex-direction: column;
         }
+        .label {
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
       `,
     ];
   }

src/panels/config/energy/components/styles.ts

@@ -36,6 +36,8 @@ export const energyCardStyles = css`
   }
   .row .content {
     flex-grow: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
   ha-icon-button {
     color: var(--secondary-text-color);

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

@@ -353,6 +353,13 @@ class HaPanelConfig extends HassRouterPage {
         tag: "ha-config-areas",
         load: () => import("./areas/ha-config-areas"),
       },
+      voice_assistant: {
+        tag: "assist-pipeline-debug",
+        load: () =>
+          import(
+            "./integrations/integration-panels/voice_assistant/assist/assist-pipeline-debug"
+          ),
+      },
       automation: {
         tag: "ha-config-automation",
         load: () => import("./automation/ha-config-automation"),

src/panels/config/integrations/integration-panels/voice_assistant/assist/assist-pipeline-debug.ts

@@ -0,0 +1,227 @@
+import { css, html, LitElement, TemplateResult } from "lit";
+import { customElement, property, query, state } from "lit/decorators";
+import "../../../../../../components/ha-card";
+import "../../../../../../components/ha-button";
+import "../../../../../../components/ha-circular-progress";
+import "../../../../../../components/ha-expansion-panel";
+import "../../../../../../components/ha-textfield";
+import {
+  PipelineRun,
+  runPipelineFromText,
+} from "../../../../../../data/voice_assistant";
+import "../../../../../../layouts/hass-subpage";
+import { SubscribeMixin } from "../../../../../../mixins/subscribe-mixin";
+import { haStyle } from "../../../../../../resources/styles";
+import { HomeAssistant } from "../../../../../../types";
+import { formatNumber } from "../../../../../../common/number/format_number";
+
+const RUN_DATA = {
+  pipeline: "Pipeline",
+  language: "Language",
+};
+
+const ERROR_DATA = {
+  code: "Code",
+  message: "Message",
+};
+
+const INTENT_DATA = {
+  engine: "Engine",
+  intent_input: "Input",
+};
+
+const renderProgress = (
+  hass: HomeAssistant,
+  pipelineRun: PipelineRun,
+  stage: PipelineRun["stage"]
+) => {
+  const startEvent = pipelineRun.events.find(
+    (ev) => ev.type === `${stage}-start`
+  );
+  const finishEvent = pipelineRun.events.find(
+    (ev) => ev.type === `${stage}-finish`
+  );
+
+  if (!startEvent) {
+    return "";
+  }
+
+  if (!finishEvent) {
+    return html`<ha-circular-progress
+      size="tiny"
+      active
+    ></ha-circular-progress>`;
+  }
+
+  const duration =
+    new Date(finishEvent.timestamp).getTime() -
+    new Date(startEvent.timestamp).getTime();
+  const durationString = formatNumber(duration / 1000, hass.locale, {
+    maximumFractionDigits: 2,
+  });
+  return html`${durationString}s ✅`;
+};
+
+const renderData = (data: Record<string, any>, keys: Record<string, string>) =>
+  Object.entries(keys).map(
+    ([key, label]) =>
+      html`
+        <div class="row">
+          <div>${label}</div>
+          <div>${data[key]}</div>
+        </div>
+      `
+  );
+
+const dataMinusKeysRender = (
+  data: Record<string, any>,
+  keys: Record<string, string>
+) => {
+  const result = {};
+  let render = false;
+  for (const key in data) {
+    if (key in keys) {
+      continue;
+    }
+    render = true;
+    result[key] = data[key];
+  }
+  return render ? html`<pre>${JSON.stringify(result, null, 2)}</pre>` : "";
+};
+
+@customElement("assist-pipeline-debug")
+export class AssistPipelineDebug extends SubscribeMixin(LitElement) {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ type: Boolean }) public narrow!: boolean;
+
+  @query("#run-input", true)
+  private _newRunInput!: HTMLInputElement;
+
+  @state()
+  private _pipelineRun?: PipelineRun;
+
+  protected render(): TemplateResult {
+    return html`
+      <hass-subpage
+        .narrow=${this.narrow}
+        .hass=${this.hass}
+        header="Assist Pipeline"
+      >
+        <div class="content">
+          <ha-card header="Run pipeline" class="run-pipeline-card">
+            <div class="card-content">
+              <ha-textfield
+                id="run-input"
+                label="Input"
+                value="Are the lights on?"
+              ></ha-textfield>
+            </div>
+            <div class="card-actions">
+              <ha-button
+                @click=${this._runPipeline}
+                .disabled=${this._pipelineRun &&
+                !["error", "done"].includes(this._pipelineRun.stage)}
+              >
+                Run
+              </ha-button>
+            </div>
+          </ha-card>
+          ${this._pipelineRun
+            ? html`
+                <ha-card>
+                  <div class="card-content">
+                    <div class="row heading">
+                      <div>Run</div>
+                      <div>${this._pipelineRun.stage}</div>
+                    </div>
+
+                    ${renderData(this._pipelineRun.run, RUN_DATA)}
+                    ${this._pipelineRun.error
+                      ? renderData(this._pipelineRun.error, ERROR_DATA)
+                      : ""}
+                  </div>
+                </ha-card>
+                <ha-card>
+                  <div class="card-content">
+                    <div class="row heading">
+                      <span>Natural Language Processing</span>
+                      ${renderProgress(this.hass, this._pipelineRun, "intent")}
+                    </div>
+                    ${this._pipelineRun.intent
+                      ? html`
+                          <div class="card-content">
+                            ${renderData(this._pipelineRun.intent, INTENT_DATA)}
+                            ${dataMinusKeysRender(
+                              this._pipelineRun.intent,
+                              INTENT_DATA
+                            )}
+                          </div>
+                        `
+                      : ""}
+                  </div>
+                </ha-card>
+                <ha-card>
+                  <ha-expansion-panel>
+                    <span slot="header">Raw</span>
+                    <pre>${JSON.stringify(this._pipelineRun, null, 2)}</pre>
+                  </ha-expansion-panel>
+                </ha-card>
+              `
+            : ""}
+        </div>
+      </hass-subpage>
+    `;
+  }
+
+  private _runPipeline(): void {
+    this._pipelineRun = undefined;
+    runPipelineFromText(
+      this.hass,
+      (run) => {
+        this._pipelineRun = run;
+      },
+      {
+        intent_input: this._newRunInput.value,
+      }
+    );
+  }
+
+  static styles = [
+    haStyle,
+    css`
+      .content {
+        padding: 24px 0 32px;
+        max-width: 600px;
+        margin: 0 auto;
+        direction: ltr;
+      }
+      ha-card {
+        margin-bottom: 16px;
+      }
+      .run-pipeline-card ha-textfield {
+        display: block;
+      }
+      .row {
+        display: flex;
+        justify-content: space-between;
+      }
+      pre {
+        margin: 0;
+      }
+      ha-expansion-panel {
+        padding-left: 8px;
+      }
+      .heading {
+        font-weight: 500;
+        margin-bottom: 16px;
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "assist-pipeline-debug": AssistPipelineDebug;
+  }
+}

src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts

@@ -18,7 +18,6 @@ import {
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import memoizeOne from "memoize-one";
-import { debounce } from "../../../../../common/util/debounce";
 import "../../../../../components/ha-alert";
 import "../../../../../components/ha-card";
 import "../../../../../components/ha-icon-next";
@@ -210,7 +209,7 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
             </em>`
           : ""}
         ${result?.status
-          ? html` <p
+          ? html`<p
               class="result ${classMap({
                 [result.status]: true,
               })}"
@@ -264,11 +263,9 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
           .propertyKey=${item.property_key}
           .key=${id}
           .disabled=${!item.metadata.writeable}
-          @input=${this._numericInputChanged}
+          @change=${this._numericInputChanged}
+          .suffix=${item.metadata.unit}
         >
-          ${item.metadata.unit
-            ? html`<span slot="suffix">${item.metadata.unit}</span>`
-            : ""}
         </ha-textfield>`;
     }
 
@@ -340,12 +337,6 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
     this._updateConfigParameter(ev.target, Number(ev.target.value));
   }
 
-  private debouncedUpdate = debounce((target, value) => {
-    this._config![target.key].value = value;
-
-    this._updateConfigParameter(target, value);
-  }, 1000);
-
   private _numericInputChanged(ev) {
     if (ev.target === undefined || this._config![ev.target.key] === undefined) {
       return;
@@ -355,7 +346,7 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
       return;
     }
     this.setResult(ev.target.key, undefined);
-    this.debouncedUpdate(ev.target, value);
+    this._updateConfigParameter(ev.target, value);
   }
 
   private async _updateConfigParameter(target, value) {

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

@@ -344,7 +344,8 @@ class ConfigUrlForm extends LitElement {
       }
 
       .card-actions {
-        text-align: right;
+        display: flex;
+        flex-direction: row-reverse;
       }
 
       a {

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

@@ -51,22 +51,23 @@ export class HassioHostname extends LitElement {
       <ha-card
         class="no-padding"
         outlined
-        .header=${this.hass.localize("ui.panel.config.network.hostname.title")}
+        .header=${this.hass.localize(
+          "ui.panel.config.network.supervisor.hostname.title"
+        )}
       >
-        <div>
-          <ha-settings-row .narrow=${this.narrow}>
-            <span slot="heading">Hostname</span>
-            <span slot="description"
-              >The name your instance will have on your network</span
-            >
-            <ha-textfield
-              .disabled=${this._processing}
-              .value=${this._hostname}
-              @change=${this._handleChange}
-              placeholder="homeassistant"
-            >
-            </ha-textfield>
-          </ha-settings-row>
+        <div class="card-content">
+          <p>
+            ${this.hass.localize(
+              "ui.panel.config.network.supervisor.hostname.description"
+            )}
+          </p>
+          <ha-textfield
+            .disabled=${this._processing}
+            .value=${this._hostname}
+            @change=${this._handleChange}
+            placeholder="homeassistant"
+          >
+          </ha-textfield>
         </div>
         <div class="card-actions">
           <mwc-button @click=${this._save} .disabled=${this._processing}>
@@ -91,7 +92,7 @@ export class HassioHostname extends LitElement {
     } catch (err: any) {
       showAlertDialog(this, {
         title: this.hass.localize(
-          "ui.panel.config.network.hostname.failed_to_set_hostname"
+          "ui.panel.config.network.supervisor.hostname.failed_to_set_hostname"
         ),
         text: extractApiErrorMessage(err),
       });
@@ -110,8 +111,8 @@ export class HassioHostname extends LitElement {
       justify-content: space-between;
       align-items: center;
     }
-    ha-settings-row {
-      border-top: none;
+    .card-content > p {
+      padding-bottom: 1em;
     }
   `;
 }

src/panels/developer-tools/statistics/developer-tools-statistics.ts

@@ -263,7 +263,7 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
         showAlertDialog(this, {
           title: "Entity not recorded",
           text: html`State changes of this entity are not recorded, therefore,
-            we can not track long term statistics for it. <br /><br />You
+            we cannot track long term statistics for it. <br /><br />You
             probably excluded this entity, or have just included some
             entities.<br /><br />See the
             <a
@@ -281,9 +281,9 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
           title: "Entity no longer recorded",
           text: html`We have generated statistics for this entity in the past,
             but state changes of this entity are no longer recorded, therefore,
-            we can not track long term statistics for it anymore.
-            <br /><br />You probably excluded this entity, or have just included
-            some entities.<br /><br />See the
+            we cannot track long term statistics for it anymore. <br /><br />You
+            probably excluded this entity, or have just included some
+            entities.<br /><br />See the
             <a
               href="https://www.home-assistant.io/integrations/recorder/#configure-filter"
               target="_blank"
@@ -298,7 +298,7 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
         showConfirmationDialog(this, {
           title: "Unsupported state class",
           text: html`The state class of this entity, ${issue.data.state_class}
-            is not supported. <br />Statistics can not be generated until this
+            is not supported. <br />Statistics cannot be generated until this
             entity has a supported state class.<br /><br />If this state class
             was provided by an integration, this is a bug. Please report an
             issue.<br /><br />If you have set this state class yourself, please

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

@@ -21,9 +21,11 @@ import { ensureArray } from "../../common/array/ensure-array";
 import { firstWeekdayIndex } from "../../common/datetime/first_weekday";
 import { LocalStorage } from "../../common/decorators/local-storage";
 import { navigate } from "../../common/navigate";
+import { constructUrlCurrentPath } from "../../common/url/construct-url";
 import {
   createSearchParam,
   extractSearchParamsObject,
+  removeSearchParam,
 } from "../../common/url/search-params";
 import { computeRTL } from "../../common/util/compute_rtl";
 import { MIN_TIME_BETWEEN_UPDATES } from "../../components/chart/ha-chart-base";
@@ -83,6 +85,9 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
 
   @state() private _areaDeviceLookup?: AreaDeviceLookup;
 
+  @state()
+  private _showBack?: boolean;
+
   @query("state-history-charts")
   private _stateHistoryCharts?: StateHistoryCharts;
 
@@ -126,15 +131,27 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
     ];
   }
 
+  private _goBack(): void {
+    history.back();
+  }
+
   protected render() {
     return html`
       <ha-app-layout>
         <app-header slot="header" fixed>
           <app-toolbar>
-            <ha-menu-button
-              .hass=${this.hass}
-              .narrow=${this.narrow}
-            ></ha-menu-button>
+            ${this._showBack
+              ? html`
+                  <ha-icon-button-arrow-prev
+                    @click=${this._goBack}
+                  ></ha-icon-button-arrow-prev>
+                `
+              : html`
+                  <ha-menu-button
+                    .hass=${this.hass}
+                    .narrow=${this.narrow}
+                  ></ha-menu-button>
+                `}
             <div main-title>${this.hass.localize("panel.history")}</div>
             ${this._targetPickerValue
               ? html`
@@ -252,6 +269,17 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
     }
   }
 
+  protected firstUpdated(changedProps: PropertyValues) {
+    super.firstUpdated(changedProps);
+    const searchParams = extractSearchParamsObject();
+    if (searchParams.back === "1" && history.length > 1) {
+      this._showBack = true;
+      navigate(constructUrlCurrentPath(removeSearchParam("back")), {
+        replace: true,
+      });
+    }
+  }
+
   protected updated(changedProps: PropertyValues) {
     if (
       this._targetPickerValue &&

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

@@ -14,9 +14,11 @@ import { css, html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { firstWeekdayIndex } from "../../common/datetime/first_weekday";
 import { navigate } from "../../common/navigate";
+import { constructUrlCurrentPath } from "../../common/url/construct-url";
 import {
   createSearchParam,
   extractSearchParamsObject,
+  removeSearchParam,
 } from "../../common/url/search-params";
 import "../../components/entity/ha-entity-picker";
 import "../../components/ha-date-range-picker";
@@ -41,6 +43,9 @@ export class HaPanelLogbook extends LitElement {
 
   @state() private _ranges?: DateRangePickerRanges;
 
+  @state()
+  private _showBack?: boolean;
+
   public constructor() {
     super();
 
@@ -53,15 +58,27 @@ export class HaPanelLogbook extends LitElement {
     this._time = { range: [start, end] };
   }
 
+  private _goBack(): void {
+    history.back();
+  }
+
   protected render() {
     return html`
       <ha-app-layout>
         <app-header slot="header" fixed>
           <app-toolbar>
-            <ha-menu-button
-              .hass=${this.hass}
-              .narrow=${this.narrow}
-            ></ha-menu-button>
+            ${this._showBack
+              ? html`
+                  <ha-icon-button-arrow-prev
+                    @click=${this._goBack}
+                  ></ha-icon-button-arrow-prev>
+                `
+              : html`
+                  <ha-menu-button
+                    .hass=${this.hass}
+                    .narrow=${this.narrow}
+                  ></ha-menu-button>
+                `}
             <div main-title>${this.hass.localize("panel.logbook")}</div>
             <ha-icon-button
               @click=${this._refreshLogbook}
@@ -132,6 +149,14 @@ export class HaPanelLogbook extends LitElement {
   protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
     this.hass.loadBackendTranslation("title");
+
+    const searchParams = extractSearchParamsObject();
+    if (searchParams.back === "1" && history.length > 1) {
+      this._showBack = true;
+      navigate(constructUrlCurrentPath(removeSearchParam("back")), {
+        replace: true,
+      });
+    }
   }
 
   public connectedCallback(): void {

src/panels/lovelace/cards/hui-alarm-panel-card.ts

@@ -236,7 +236,7 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
     return entityState === UNAVAILABLE
       ? this.hass!.localize("state.default.unavailable")
       : this.hass!.localize(
-          `component.alarm_control_panel.state._.${entityState}`
+          `component.alarm_control_panel.entity_component._.state.${entityState}`
         ) || entityState;
   }
 

src/panels/lovelace/cards/hui-entity-card.ts

@@ -27,7 +27,7 @@ import "../../../components/ha-card";
 import "../../../components/ha-icon";
 import { HVAC_ACTION_TO_MODE } from "../../../data/climate";
 import { isUnavailableState } from "../../../data/entity";
-import { formatAttributeValue } from "../../../data/entity_attributes";
+import { computeAttributeValueDisplay } from "../../../common/entity/compute_attribute_display";
 import { LightEntity } from "../../../data/light";
 import { HomeAssistant } from "../../../types";
 import { computeCardSize } from "../common/compute-card-size";
@@ -159,9 +159,12 @@ export class HuiEntityCard extends LitElement implements LovelaceCard {
           <span class="value"
             >${"attribute" in this._config
               ? stateObj.attributes[this._config.attribute!] !== undefined
-                ? formatAttributeValue(
-                    this.hass,
-                    stateObj.attributes[this._config.attribute!]
+                ? computeAttributeValueDisplay(
+                    this.hass.localize,
+                    stateObj,
+                    this.hass.locale,
+                    this.hass.entities,
+                    this._config.attribute!
                   )
                 : this.hass.localize("state.default.unknown")
               : isNumericState(stateObj) || this._config.unit

src/panels/lovelace/cards/hui-map-card.ts

@@ -216,6 +216,7 @@ class HuiMapCard extends LitElement implements LovelaceCard {
       this._config!.hours_to_show! ?? DEFAULT_HOURS_TO_SHOW,
       this._configEntities!,
       false,
+      false,
       false
     ).catch((err) => {
       this._subscribed = undefined;

src/panels/lovelace/cards/hui-thermostat-card.ts

@@ -234,6 +234,7 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
                 ? computeAttributeValueDisplay(
                     this.hass.localize,
                     stateObj,
+                    this.hass.locale,
                     this.hass.entities,
                     "hvac_action"
                   )
@@ -252,6 +253,7 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
                     ${computeAttributeValueDisplay(
                       this.hass.localize,
                       stateObj,
+                      this.hass.locale,
                       this.hass.entities,
                       "preset_mode"
                     )}
@@ -478,7 +480,9 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
         @click=${this._handleAction}
         tabindex="0"
         .path=${modeIcons[mode]}
-        .label=${this.hass!.localize(`component.climate.state._.${mode}`)}
+        .label=${this.hass!.localize(
+          `component.climate.entity_component._.state.${mode}`
+        ) || mode}
       >
       </ha-icon-button>
     `;

src/panels/lovelace/cards/hui-tile-card.ts

@@ -224,7 +224,10 @@ export class HuiTileCard extends LitElement implements LovelaceCard {
       this.hass!.entities
     );
 
-    if (domain === "cover" && stateObj.state === "open") {
+    if (
+      domain === "cover" &&
+      ["open", "opening", "closing"].includes(stateObj.state)
+    ) {
       const position = (stateObj as CoverEntity).attributes.current_position;
       if (position && position !== 100) {
         return `${stateDisplay} - ${Math.round(position)}${blankBeforePercent(

src/panels/lovelace/components/hui-action-editor.ts

@@ -57,7 +57,9 @@ export class HuiActionEditor extends LitElement {
   private _serviceAction = memoizeOne(
     (config: CallServiceActionConfig): ServiceAction => ({
       service: this._service,
-      data: config.data ?? config.service_data,
+      ...(config.data || config.service_data
+        ? { data: config.data ?? config.service_data }
+        : null),
       target: config.target,
     })
   );
@@ -196,9 +198,12 @@ export class HuiActionEditor extends LitElement {
     const value = {
       ...this.config!,
       service: ev.detail.value.service || "",
-      data: ev.detail.value.data || {},
+      data: ev.detail.value.data,
       target: ev.detail.value.target || {},
     };
+    if (!ev.detail.value.data) {
+      delete value.data;
+    }
     // "service_data" is allowed for backwards compatibility but replaced with "data" on write
     if ("service_data" in value) {
       delete value.service_data;

src/panels/lovelace/components/hui-entity-editor.ts

@@ -5,7 +5,10 @@ import { repeat } from "lit/directives/repeat";
 import type { SortableEvent } from "sortablejs";
 import { fireEvent } from "../../../common/dom/fire_event";
 import "../../../components/entity/ha-entity-picker";
-import type { HaEntityPicker } from "../../../components/entity/ha-entity-picker";
+import type {
+  HaEntityPicker,
+  HaEntityPickerEntityFilterFunc,
+} from "../../../components/entity/ha-entity-picker";
 import "../../../components/ha-icon-button";
 import { sortableStyles } from "../../../resources/ha-sortable-style";
 import {
@@ -21,6 +24,8 @@ export class HuiEntityEditor extends LitElement {
 
   @property({ attribute: false }) protected entities?: EntityConfig[];
 
+  @property() protected entityFilter?: HaEntityPickerEntityFilterFunc;
+
   @property() protected label?: string;
 
   private _entityKeys = new WeakMap<EntityConfig, string>();
@@ -65,6 +70,7 @@ export class HuiEntityEditor extends LitElement {
                 .hass=${this.hass}
                 .value=${entityConf.entity}
                 .index=${index}
+                .entityFilter=${this.entityFilter}
                 @value-changed=${this._valueChanged}
                 allow-custom-entity
               ></ha-entity-picker>
@@ -75,6 +81,7 @@ export class HuiEntityEditor extends LitElement {
       <ha-entity-picker
         class="add-entity"
         .hass=${this.hass}
+        .entityFilter=${this.entityFilter}
         @value-changed=${this._addEntity}
       ></ha-entity-picker>
     `;

src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts

@@ -27,6 +27,7 @@ import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { entitiesConfigStruct } from "../structs/entities-struct";
 import { EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { hasLocation } from "../../../../common/entity/has_location";
 
 const cardConfigStruct = assign(
   baseLovelaceCardConfig,
@@ -93,6 +94,7 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
         <hui-entity-editor
           .hass=${this.hass}
           .entities=${this._configEntities}
+          .entityFilter=${hasLocation}
           @entities-changed=${this._entitiesValueChanged}
         ></hui-entity-editor>
         <h3>

src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts

@@ -121,7 +121,9 @@ export class HuiStatisticsGraphCardEditor
       !deepEqual(this._configEntities, changedProps.get("_configEntities"))
     ) {
       this._metaDatas = undefined;
-      this._getStatisticsMetaData(this._configEntities);
+      if (this._configEntities?.length) {
+        this._getStatisticsMetaData(this._configEntities);
+      }
     }
   }
 
@@ -274,6 +276,7 @@ export class HuiStatisticsGraphCardEditor
         @value-changed=${this._valueChanged}
       ></ha-form>
         <ha-statistics-picker
+          allow-custom-entity
           .hass=${this.hass}
           .pickStatisticLabel=${this.hass!.localize(
             "ui.panel.lovelace.editor.card.statistics-graph.pick_statistic"
@@ -297,18 +300,26 @@ export class HuiStatisticsGraphCardEditor
   }
 
   private async _entitiesChanged(ev: CustomEvent): Promise<void> {
-    const config = { ...this._config!, entities: ev.detail.value };
+    const newEntityIds = ev.detail.value;
+
+    // Save the EntityConfig objects from being replaced with strings
+    const newEntities = newEntityIds.map((newEnt) => {
+      const matchEntity = this._config!.entities.find(
+        (oldEnt) => typeof oldEnt !== "string" && oldEnt.entity === newEnt
+      );
+      return matchEntity ?? newEnt;
+    });
+
+    const config = { ...this._config!, entities: newEntities };
     if (
-      config.entities?.some((statistic_id) =>
-        isExternalStatistic(statistic_id)
-      ) &&
+      newEntityIds?.some((statistic_id) => isExternalStatistic(statistic_id)) &&
       config.period === "5minute"
     ) {
       delete config.period;
     }
     const metadata =
       config.stat_types || config.unit
-        ? await getStatisticMetadata(this.hass!, config.entities)
+        ? await getStatisticMetadata(this.hass!, newEntityIds)
         : undefined;
     if (config.stat_types && config.entities.length) {
       config.stat_types = ensureArray(config.stat_types).filter((stat_type) =>

src/panels/lovelace/editor/config-util.ts

@@ -191,7 +191,7 @@ export const moveCard = (
   toPath: [number]
 ): LovelaceConfig => {
   if (fromPath[0] === toPath[0]) {
-    throw new Error("You can not move a card to the view it is in.");
+    throw new Error("You cannot move a card to the view it is in.");
   }
   const fromView = config.views[fromPath[0]];
   const card = fromView.cards![fromPath[1]];

src/panels/lovelace/special-rows/hui-attribute-row.ts

@@ -8,14 +8,13 @@ import {
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import checkValidDate from "../../../common/datetime/check_valid_date";
-import { formatNumber } from "../../../common/number/format_number";
-import { formatAttributeValue } from "../../../data/entity_attributes";
 import { HomeAssistant } from "../../../types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-generic-entity-row";
 import "../components/hui-timestamp-display";
 import { createEntityNotFoundWarning } from "../components/hui-warning";
 import { AttributeRowConfig, LovelaceRow } from "../entity-rows/types";
+import { computeAttributeValueDisplay } from "../../../common/entity/compute_attribute_display";
 
 @customElement("hui-attribute-row")
 class HuiAttributeRow extends LitElement implements LovelaceRow {
@@ -71,10 +70,15 @@ class HuiAttributeRow extends LitElement implements LovelaceRow {
               .format=${this._config.format}
               capitalize
             ></hui-timestamp-display>`
-          : typeof attribute === "number"
-          ? formatNumber(attribute, this.hass.locale)
           : attribute !== undefined
-          ? formatAttributeValue(this.hass, attribute)
+          ? computeAttributeValueDisplay(
+              this.hass.localize,
+              stateObj,
+              this.hass.locale,
+              this.hass.entities,
+              this._config.attribute,
+              attribute
+            )
           : "—"}
         ${this._config.suffix}
       </hui-generic-entity-row>

src/translations/en.json

@@ -2000,7 +2000,7 @@
             "enable": "[%key:ui::common::enable%]",
             "disable": "[%key:ui::common::disable%]",
             "disabled": "Automation is disabled",
-            "read_only": "This automation can not be edited from the UI, because it is not stored in the automations.yaml file, or doesn't have an ID.",
+            "read_only": "This automation cannot be edited from the UI, because it is not stored in the automations.yaml file, or doesn't have an ID.",
             "migrate": "Migrate",
             "duplicate": "[%key:ui::common::duplicate%]",
             "run": "[%key:ui::panel::config::automation::editor::actions::run%]",
@@ -2491,7 +2491,7 @@
             "introduction": "Use scripts to run a sequence of actions.",
             "show_trace": "[%key:ui::panel::config::automation::editor::show_trace%]",
             "show_info": "[%key:ui::panel::config::automation::editor::show_info%]",
-            "read_only": "This script can not be edited from the UI, because it is not stored in the ''scripts.yaml'' file.",
+            "read_only": "This script cannot be edited from the UI, because it is not stored in the ''scripts.yaml'' file.",
             "migrate": "Migrate",
             "duplicate": "[%key:ui::common::duplicate%]",
             "header": "Script: {name}",
@@ -3146,7 +3146,7 @@
             "submit": "Submit",
             "next": "Next",
             "found_following_devices": "We found the following devices",
-            "yaml_only_title": "This device can not be added from the UI",
+            "yaml_only_title": "This device cannot be added from the UI",
             "yaml_only": "You can add this device by adding it to your ''configuration.yaml''. See the documentation for more information.",
             "open_documentation": "Open documentation",
             "no_config_flow": "This integration does not support configuration via the UI. If you followed this link from the Home Assistant website, make sure you run the latest version of Home Assistant.",
@@ -3753,7 +3753,28 @@
         },
         "analytics": {
           "caption": "Analytics",
-          "description": "Learn how to share data to improve Home Assistant"
+          "description": "Learn how to share data to improve Home Assistant",
+          "preferences": {
+            "base": {
+              "title": "Basic analytics",
+              "description": "This includes information about your system."
+            },
+            "usage": {
+              "title": "Usage",
+              "description": "Details of what you use with Home Assistant"
+            },
+            "statistics": {
+              "title": "Statistical data",
+              "description": "Counts containing total number of datapoints."
+            },
+            "diagnostics": {
+              "title": "Diagnostics",
+              "description": "Share crash reports when unexpected errors occur."
+            }
+          },
+          "need_base_enabled": "You need to enable basic analytics for this option to be available",
+          "learn_more": "How we process your data",
+          "intro": "Share anonymized information from your installation to help make Home Assistant better and help us convince manufacturers to add local control and privacy-focused features."
         },
         "network": {
           "caption": "Network",
@@ -3778,7 +3799,12 @@
             "gateway": "Gateway address",
             "dns_servers": "DNS Servers",
             "unsaved": "You have unsaved changes, these will get lost if you change tabs, do you want to continue?",
-            "failed_to_change": "Failed to change network settings"
+            "failed_to_change": "Failed to change network settings",
+            "hostname": {
+              "title": "Host Name",
+              "description": "The name your instance will have on your network",
+              "failed_to_set_hostname": "Setting hostname failed"
+            }
           }
         },
         "storage": {
@@ -5021,7 +5047,28 @@
           "finish": "Finish"
         },
         "analytics": {
-          "finish": "Next"
+          "finish": "Next",
+          "preferences": {
+            "base": {
+              "title": "[%key:ui::panel::config::analytics::preferences::base::title%]",
+              "description": "[%key:ui::panel::config::analytics::preferences::base::description%]"
+            },
+            "usage": {
+              "title": "[%key:ui::panel::config::analytics::preferences::usage::title%]",
+              "description": "[%key:ui::panel::config::analytics::preferences::usage::description%]"
+            },
+            "statistics": {
+              "title": "[%key:ui::panel::config::analytics::preferences::statistics::title%]",
+              "description": "[%key:ui::panel::config::analytics::preferences::statistics::description%]"
+            },
+            "diagnostics": {
+              "title": "[%key:ui::panel::config::analytics::preferences::diagnostics::title%]",
+              "description": "[%key:ui::panel::config::analytics::preferences::diagnostics::description%]"
+            }
+          },
+          "need_base_enabled": "[%key:ui::panel::config::analytics::need_base_enabled%]",
+          "learn_more": "[%key:ui::panel::config::analytics::learn_more%]",
+          "intro": "[%key:ui::panel::config::analytics::intro%]"
         },
         "restore": {
           "description": "Alternatively you can restore from a previous backup.",

test/common/entity/compute_state_display.ts

@@ -32,7 +32,7 @@ describe("computeStateDisplay", () => {
     };
     assert.strictEqual(
       computeStateDisplay(localize, stateObj, localeData, {}),
-      "component.binary_sensor.state._.off"
+      "component.binary_sensor.entity_component._.state.off"
     );
   });
 
@@ -154,7 +154,9 @@ describe("computeStateDisplay", () => {
 
   it("Localizes sensor value with component translation", () => {
     const altLocalize = (message, ...args) => {
-      if (message !== "component.sensor.state._.custom_state") {
+      if (
+        message !== "component.sensor.entity_component._.state.custom_state"
+      ) {
         return "";
       }
       return localize(message, ...args);
@@ -166,7 +168,7 @@ describe("computeStateDisplay", () => {
     };
     assert.strictEqual(
       computeStateDisplay(altLocalize, stateObj, localeData, {}),
-      "component.sensor.state._.custom_state"
+      "component.sensor.entity_component._.state.custom_state"
     );
   });
 

test/common/string/format_number.ts

@@ -22,7 +22,7 @@ describe("formatNumber", () => {
     first_weekday: FirstWeekday.language,
   };
 
-  // Node only ships with English support for `Intl`, so we can not test for other number formats here.
+  // Node only ships with English support for `Intl`, so we cannot test for other number formats here.
   it("Formats English numbers", () => {
     assert.strictEqual(formatNumber(1234.5, defaultLocale), "1,234.5");
   });

test/panels/lovelace/editor/config-util.spec.ts

@@ -126,7 +126,7 @@ describe("moveCard", () => {
     assert.throws(
       result,
       Error,
-      "You can not move a card to the view it is in."
+      "You cannot move a card to the view it is in."
     );
   });
 });

webpack.config.js

@@ -1,5 +1,12 @@
+/* eslint-disable import/extensions */
+/* eslint-disable @typescript-eslint/no-var-requires */
+
 const { createAppConfig } = require("./build-scripts/webpack.js");
-const { isProdBuild, isStatsBuild } = require("./build-scripts/env.js");
+const {
+  isProdBuild,
+  isStatsBuild,
+  isTestBuild,
+} = require("./build-scripts/env.js");
 
 // This file exists because we haven't migrated the stats script yet
 
@@ -7,6 +14,7 @@ const configs = [
   createAppConfig({
     isProdBuild: isProdBuild(),
     isStatsBuild: isStatsBuild(),
+    isTestBuild: isTestBuild(),
     latestBuild: true,
   }),
 ];
@@ -16,6 +24,7 @@ if (isProdBuild && !isStatsBuild) {
     createAppConfig({
       isProdBuild: isProdBuild(),
       isStatsBuild: isStatsBuild(),
+      isTestBuild: isTestBuild(),
       latestBuild: false,
     })
   );