From 5e279405c725462ccc2c0d623804d8516cfe1cd6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 20:32:43 -0500 Subject: [PATCH 001/361] Update typescript-eslint monorepo to v6.16.0 (#19174) --- package.json | 4 +- yarn.lock | 121 ++++++++++++++++++++++++++------------------------- 2 files changed, 63 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index d8b369de1280..339896248684 100644 --- a/package.json +++ b/package.json @@ -184,8 +184,8 @@ "@types/tar": "6.1.10", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", - "@typescript-eslint/eslint-plugin": "6.15.0", - "@typescript-eslint/parser": "6.15.0", + "@typescript-eslint/eslint-plugin": "6.16.0", + "@typescript-eslint/parser": "6.16.0", "@web/dev-server": "0.1.38", "@web/dev-server-rollup": "0.4.1", "babel-loader": "9.1.3", diff --git a/yarn.lock b/yarn.lock index 66ab497b9976..e3f41249e572 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4566,15 +4566,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.15.0": - version: 6.15.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.15.0" +"@typescript-eslint/eslint-plugin@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.16.0" dependencies: "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:6.15.0" - "@typescript-eslint/type-utils": "npm:6.15.0" - "@typescript-eslint/utils": "npm:6.15.0" - "@typescript-eslint/visitor-keys": "npm:6.15.0" + "@typescript-eslint/scope-manager": "npm:6.16.0" + "@typescript-eslint/type-utils": "npm:6.16.0" + "@typescript-eslint/utils": "npm:6.16.0" + "@typescript-eslint/visitor-keys": "npm:6.16.0" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" ignore: "npm:^5.2.4" @@ -4587,44 +4587,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 9020370c5e89b52b65ed2373c755d4b70f57ec7ebcf02d3e2f323f31ec81717af110d8e5f903b189b71e0a952f042e0fe2b637e77959c3102907efed4ba55512 + checksum: 4bedce948ac3c20492a59813ee5d4f1f2306310857864dfaac2736f6c38e18785002c36844fd64c9fbdf3059fc390b29412be105fd7a118177f1eeeb1eb533f7 languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.15.0": - version: 6.15.0 - resolution: "@typescript-eslint/parser@npm:6.15.0" +"@typescript-eslint/parser@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/parser@npm:6.16.0" dependencies: - "@typescript-eslint/scope-manager": "npm:6.15.0" - "@typescript-eslint/types": "npm:6.15.0" - "@typescript-eslint/typescript-estree": "npm:6.15.0" - "@typescript-eslint/visitor-keys": "npm:6.15.0" + "@typescript-eslint/scope-manager": "npm:6.16.0" + "@typescript-eslint/types": "npm:6.16.0" + "@typescript-eslint/typescript-estree": "npm:6.16.0" + "@typescript-eslint/visitor-keys": "npm:6.16.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: fdd1f584e5068216c36a01e40750950ef309b36a522f6ecde36931690558a319960a702b4b4a806f335fb28ca99f8a07bb206571141550aaab1f6f40066f6605 + checksum: 3d941ce345dc2ce29957e2110957662873d514b094b8939923c3281d858c11cd1f9058db862644afe14f68d087770f39a0a1f9e523a2013ed5d2fdf3421b34d0 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.15.0": - version: 6.15.0 - resolution: "@typescript-eslint/scope-manager@npm:6.15.0" +"@typescript-eslint/scope-manager@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/scope-manager@npm:6.16.0" dependencies: - "@typescript-eslint/types": "npm:6.15.0" - "@typescript-eslint/visitor-keys": "npm:6.15.0" - checksum: 168d783c06a99784362e2eaaa56396b31716ee785779707ef984c2abb3e822c56440473efc6580cb8b84b2da508731ad184a00b3618bc7f3f93d8243804f2fcf + "@typescript-eslint/types": "npm:6.16.0" + "@typescript-eslint/visitor-keys": "npm:6.16.0" + checksum: 3360aae4b85f5c31d20ad48d771cc09a6f8f6b1811b00d94f06e55b5a09c610ac75631b1c4edecb3bec682d41351b87e7d14d42bee84aa032064d0e13463035b languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.15.0": - version: 6.15.0 - resolution: "@typescript-eslint/type-utils@npm:6.15.0" +"@typescript-eslint/type-utils@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/type-utils@npm:6.16.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:6.15.0" - "@typescript-eslint/utils": "npm:6.15.0" + "@typescript-eslint/typescript-estree": "npm:6.16.0" + "@typescript-eslint/utils": "npm:6.16.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.0.1" peerDependencies: @@ -4632,59 +4632,60 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 8dabb355f09f57de8b46d726ad95a57593e5b87427dee5182afecb490624424afec02b69a27018b352dcb5f930eb391cb8cdc12cd60a93231d4f04e63e2f2c0b + checksum: 5964b87a87252bed278a248eb568902babd7c34defd3af8c3df371926d96aec716f33f1dc14bde170e93f73ed1b0af6e591e647853d0f33f378e2c7b3b73fc5b languageName: node linkType: hard -"@typescript-eslint/types@npm:6.15.0": - version: 6.15.0 - resolution: "@typescript-eslint/types@npm:6.15.0" - checksum: d55de64d532c9016c922cc36b86ab661d7d64d942057486a0bca7a7db07fade95c3de59bfe364bc76ab538fb979ca2e4e6744c3acf8919a2d61e73cc7f544363 +"@typescript-eslint/types@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/types@npm:6.16.0" + checksum: 236ca318c2440c95068e5d4d147e2bfed62447775e18695e21c8ca04a341a74d01c37ed2b417629b7bf2fb91ad4fd5e2a6570215d16fc24dd1507ce6973b4e22 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.15.0": - version: 6.15.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.15.0" +"@typescript-eslint/typescript-estree@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.16.0" dependencies: - "@typescript-eslint/types": "npm:6.15.0" - "@typescript-eslint/visitor-keys": "npm:6.15.0" + "@typescript-eslint/types": "npm:6.16.0" + "@typescript-eslint/visitor-keys": "npm:6.16.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" + minimatch: "npm:9.0.3" semver: "npm:^7.5.4" ts-api-utils: "npm:^1.0.1" peerDependenciesMeta: typescript: optional: true - checksum: 920f7f3bfe463a9da943e1a686b7f13ac802a5e33be52f39ac711aa53a1e274dbe173b41bba05581c560fabfc3e1fadcfd81ab53a036afe25fb1a76651fcad7a + checksum: 8e1ef03ecabaf3791b11240a51217836dbb74850e458258db77ac5eab5508cd9c63fb671924993d1e7654718c0c857c3550d51ecba0845fe489d143bb858e1b1 languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.15.0": - version: 6.15.0 - resolution: "@typescript-eslint/utils@npm:6.15.0" +"@typescript-eslint/utils@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/utils@npm:6.16.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" "@types/json-schema": "npm:^7.0.12" "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:6.15.0" - "@typescript-eslint/types": "npm:6.15.0" - "@typescript-eslint/typescript-estree": "npm:6.15.0" + "@typescript-eslint/scope-manager": "npm:6.16.0" + "@typescript-eslint/types": "npm:6.16.0" + "@typescript-eslint/typescript-estree": "npm:6.16.0" semver: "npm:^7.5.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 7895240933ad28295508f8c4286a8b905550a35eda83a11ecf9511e53078e0af07e75a1872f1bc757f165b41fdc84616ea97c1e2e3bf80cff985935f25596228 + checksum: 84dd02f7c8e47fae699cc222da5cbea08b28c6e1cc7827860430bc86c2a17ee3f86e198a4356902b95930f85785aa662266ea9c476f69bf80c6a5f648e55f9f4 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.15.0": - version: 6.15.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.15.0" +"@typescript-eslint/visitor-keys@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.16.0" dependencies: - "@typescript-eslint/types": "npm:6.15.0" + "@typescript-eslint/types": "npm:6.16.0" eslint-visitor-keys: "npm:^3.4.1" - checksum: 4641a829485f67a5d9d3558aa0d152e5ab57b468cfd9653168ce9a141e1f051730669a024505183b64f7a7e5d8f62533af4ebd4ad7366b551390461e9c45ec18 + checksum: 19e559f14ea0092585a374b8c5f1aca9b6b271fc23909d9857de9cf71a1e1d3abc0afd237e9c02d7a5fbdfe8e3be7853cf9fedf40a6f16bac3495cb7f4e67982 languageName: node linkType: hard @@ -9618,8 +9619,8 @@ __metadata: "@types/tar": "npm:6.1.10" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" - "@typescript-eslint/eslint-plugin": "npm:6.15.0" - "@typescript-eslint/parser": "npm:6.15.0" + "@typescript-eslint/eslint-plugin": "npm:6.16.0" + "@typescript-eslint/parser": "npm:6.16.0" "@vaadin/combo-box": "npm:24.3.2" "@vaadin/vaadin-themable-mixin": "npm:24.3.2" "@vibrant/color": "npm:3.2.1-alpha.1" @@ -11859,21 +11860,21 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^5.0.1": - version: 5.1.6 - resolution: "minimatch@npm:5.1.6" +"minimatch@npm:9.0.3, minimatch@npm:^9.0.1": + version: 9.0.3 + resolution: "minimatch@npm:9.0.3" dependencies: brace-expansion: "npm:^2.0.1" - checksum: 126b36485b821daf96d33b5c821dac600cc1ab36c87e7a532594f9b1652b1fa89a1eebcaad4dff17c764dce1a7ac1531327f190fed5f97d8f6e5f889c116c429 + checksum: c81b47d28153e77521877649f4bab48348d10938df9e8147a58111fe00ef89559a2938de9f6632910c4f7bf7bb5cd81191a546167e58d357f0cfb1e18cecc1c5 languageName: node linkType: hard -"minimatch@npm:^9.0.1": - version: 9.0.3 - resolution: "minimatch@npm:9.0.3" +"minimatch@npm:^5.0.1": + version: 5.1.6 + resolution: "minimatch@npm:5.1.6" dependencies: brace-expansion: "npm:^2.0.1" - checksum: c81b47d28153e77521877649f4bab48348d10938df9e8147a58111fe00ef89559a2938de9f6632910c4f7bf7bb5cd81191a546167e58d357f0cfb1e18cecc1c5 + checksum: 126b36485b821daf96d33b5c821dac600cc1ab36c87e7a532594f9b1652b1fa89a1eebcaad4dff17c764dce1a7ac1531327f190fed5f97d8f6e5f889c116c429 languageName: node linkType: hard From c25baf25ad137f09a54ced2b7408b02417f4e72f Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Fri, 29 Dec 2023 18:41:10 +0100 Subject: [PATCH 002/361] Exclude hidden entities from scenes (#19179) --- src/panels/config/scene/ha-scene-editor.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts index ea28abb08b1a..da9817835151 100644 --- a/src/panels/config/scene/ha-scene-editor.ts +++ b/src/panels/config/scene/ha-scene-editor.ts @@ -513,6 +513,7 @@ export class HaSceneEditor extends SubscribeMixin( if ( !entity.device_id || entity.entity_category || + entity.hidden_by || SCENE_IGNORED_DOMAINS.includes(computeDomain(entity.entity_id)) ) { continue; From 442cce15741d0fa19665c60192e7b4684f052695 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 29 Dec 2023 18:56:15 +0100 Subject: [PATCH 003/361] Fix play media action not shown (#19187) --- src/panels/config/automation/add-automation-element-dialog.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index fdf1d97f4086..f05d9ef3fe3c 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -198,7 +198,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { ): ListItem[] => { if (type === "action" && isService(group)) { const result = this._services(localize, services, manifests, group); - if (group === "service_media_player") { + if (group === `${SERVICE_PREFIX}media_player`) { result.unshift(this._convertToItem("play_media", {}, type, localize)); } return result; From cb568d005e8f2b635475dafc373798153e82ba5c Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 29 Dec 2023 18:59:11 +0100 Subject: [PATCH 004/361] dont allow UI editor when templates are used in repeat (#19188) --- .../types/ha-automation-action-repeat.ts | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/panels/config/automation/action/types/ha-automation-action-repeat.ts b/src/panels/config/automation/action/types/ha-automation-action-repeat.ts index 890133d25019..becc0f6f75b0 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-repeat.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-repeat.ts @@ -1,4 +1,4 @@ -import { css, CSSResultGroup, html, LitElement } from "lit"; +import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit"; import { customElement, property } from "lit/decorators"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../../../../common/dom/fire_event"; @@ -12,6 +12,7 @@ import type { ActionElement } from "../ha-automation-action-row"; import type { LocalizeFunc } from "../../../../../common/translations/localize"; import "../../../../../components/ha-form/ha-form"; import type { SchemaUnion } from "../../../../../components/ha-form/types"; +import { hasTemplate } from "../../../../../common/string/has-template"; const OPTIONS = ["count", "while", "until", "for_each"] as const; @@ -31,6 +32,20 @@ export class HaRepeatAction extends LitElement implements ActionElement { return { repeat: { count: 2, sequence: [] } }; } + public willUpdate(changedProperties: PropertyValues) { + if (!changedProperties.has("action")) { + return; + } + // Check for templates in action. If found, revert to YAML mode. + if (this.action && hasTemplate(this.action)) { + fireEvent( + this, + "ui-mode-not-available", + Error(this.hass.localize("ui.errors.config.no_template_editor_support")) + ); + } + } + private _schema = memoizeOne( (localize: LocalizeFunc, type: string, reOrderMode: boolean) => [ @@ -92,7 +107,7 @@ export class HaRepeatAction extends LitElement implements ActionElement { this.reOrderMode ); const data = { ...action, type }; - return html` Date: Fri, 29 Dec 2023 20:45:51 +0100 Subject: [PATCH 005/361] Use username in example on empty automation page (#19189) --- src/components/media-player/ha-browse-media-tts.ts | 2 +- src/panels/config/automation/ha-automation-picker.ts | 3 ++- src/panels/config/automation/manual-automation-editor.ts | 2 +- src/translations/en.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/media-player/ha-browse-media-tts.ts b/src/components/media-player/ha-browse-media-tts.ts index 39e36b60b7b5..cb10b053c421 100644 --- a/src/components/media-player/ha-browse-media-tts.ts +++ b/src/components/media-player/ha-browse-media-tts.ts @@ -62,7 +62,7 @@ class BrowseMediaTTS extends LitElement { this.hass.localize( "ui.components.media-browser.tts.example_message", { - name: this.hass.user?.name || "", + name: this.hass.user?.name || "Alice", } )} > diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index a29a88d6a35c..7fe54ec1f818 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -342,7 +342,8 @@ class HaAutomationPicker extends LitElement {

${this.hass.localize( - "ui.panel.config.automation.picker.empty_text_2" + "ui.panel.config.automation.picker.empty_text_2", + { user: this.hass.user?.name || "Alice" } )}

${this.hass.localize( "ui.panel.config.automation.editor.conditions.description", - { user: this.hass.user?.name } + { user: this.hass.user?.name || "Alice" } )}

` : nothing} diff --git a/src/translations/en.json b/src/translations/en.json index 0209a3ffb70b..76eab13fdbe3 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2386,7 +2386,7 @@ }, "empty_header": "Start automating", "empty_text_1": "Automations make Home Assistant automatically respond to things happening in and around your home.", - "empty_text_2": "Automations connect triggers to actions in a ''when trigger then action'' fashion with optional conditions. For example: ''When the sun sets and if Alice is home, then turn on the lights''." + "empty_text_2": "Automations connect triggers to actions in a ''when trigger then action'' fashion with optional conditions. For example: ''When the sun sets and if {user} is home, then turn on the lights''." }, "dialog_new": { "header": "Create automation", From 7e6d974438cb75c74c8ab97955060842f75f1c99 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Sat, 30 Dec 2023 14:08:01 +0100 Subject: [PATCH 006/361] Fix iteration index when displaying changed variables (#19184) --- src/components/trace/ha-trace-path-details.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/trace/ha-trace-path-details.ts b/src/components/trace/ha-trace-path-details.ts index f87d9006ef4e..bd827283728b 100644 --- a/src/components/trace/ha-trace-path-details.ts +++ b/src/components/trace/ha-trace-path-details.ts @@ -212,7 +212,7 @@ export class HaTracePathDetails extends LitElement {
${data.map( (trace, idx) => html` - ${idx > 0 + ${data.length > 1 ? html`

${this.hass!.localize( "ui.panel.config.automation.trace.path.iteration", From 3c2fed504123cad2df38976d3b341f1e0b68ab89 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Sat, 30 Dec 2023 18:08:24 +0100 Subject: [PATCH 007/361] Improve message when an automation step was not executed (#19185) * Improve message when an automation step was not executed * Use step instead of node --- src/components/trace/ha-trace-path-details.ts | 4 ++-- src/translations/en.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/trace/ha-trace-path-details.ts b/src/components/trace/ha-trace-path-details.ts index bd827283728b..33a73af3ed45 100644 --- a/src/components/trace/ha-trace-path-details.ts +++ b/src/components/trace/ha-trace-path-details.ts @@ -133,7 +133,7 @@ export class HaTracePathDetails extends LitElement { if (result?.enabled === false) { return html`${this.hass!.localize( - "ui.panel.config.automation.trace.path.disabled_node" + "ui.panel.config.automation.trace.path.disabled_step" )}`; } @@ -240,7 +240,7 @@ export class HaTracePathDetails extends LitElement { if (index === -1) { return html`

${this.hass!.localize( - "ui.panel.config.automation.trace.path.node_not_tracked" + "ui.panel.config.automation.trace.path.step_not_executed" )}
`; } diff --git a/src/translations/en.json b/src/translations/en.json index 76eab13fdbe3..b78aebb34507 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -3114,15 +3114,15 @@ "blueprint_config": "Blueprint Config" }, "path": { - "choose": "Select a node on the left for more information.", + "choose": "Select a step on the left for more information.", "default_action_executed": "The default action was executed because no options matched.", - "no_further_execution": "This node was not executed and so no further trace information is available.", - "disabled_node": "This node was disabled and skipped during execution so no further trace information is available.", + "no_further_execution": "This step was not executed and so no further trace information is available.", + "disabled_step": "This step was disabled and skipped during execution so no further trace information is available.", "iteration": "Iteration {number}", "executed": "Executed: {time}", "error": "Error: {error}", "result": "Result:", - "node_not_tracked": "Node not tracked.", + "step_not_executed": "This step was not executed.", "no_logbook_entries": "No Logbook entries found for this step.", "no_variables_changed": "No variables changed", "unable_to_find_config": "Unable to find config" From c584f830719b0d081f3672bb75200d4cee2cdeba Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Sat, 30 Dec 2023 18:16:54 +0100 Subject: [PATCH 008/361] Fix display of variables tab when automation step not executed (#19186) Co-authored-by: Bram Kragten --- src/components/trace/ha-trace-path-details.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/trace/ha-trace-path-details.ts b/src/components/trace/ha-trace-path-details.ts index 33a73af3ed45..514377e61f4f 100644 --- a/src/components/trace/ha-trace-path-details.ts +++ b/src/components/trace/ha-trace-path-details.ts @@ -208,6 +208,14 @@ export class HaTracePathDetails extends LitElement { const paths = this.trace.trace; const data: ActionTraceStep[] = paths[this.selected.path]; + if (data === undefined) { + return html`
+ ${this.hass!.localize( + "ui.panel.config.automation.trace.path.step_not_executed" + )} +
`; + } + return html`
${data.map( From 721ec8e559c5c35d4d78470367dc4afb86e110aa Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Sat, 30 Dec 2023 09:37:50 -0800 Subject: [PATCH 009/361] Localize some strings in integration panel (#19200) --- .../config/integrations/dialog-add-integration.ts | 10 +++++++--- src/translations/en.json | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/panels/config/integrations/dialog-add-integration.ts b/src/panels/config/integrations/dialog-add-integration.ts index 757f23160276..65edfbfccf67 100644 --- a/src/panels/config/integrations/dialog-add-integration.ts +++ b/src/panels/config/integrations/dialog-add-integration.ts @@ -340,7 +340,9 @@ class AddIntegrationDialog extends LitElement { !("integrations" in integration) && !this._flowsInProgress?.length ) { - return "What type of device is it?"; + return this.hass.localize( + "ui.panel.config.integrations.what_device_type" + ); } if ( integration && @@ -348,9 +350,11 @@ class AddIntegrationDialog extends LitElement { !("integrations" in integration) && this._flowsInProgress?.length ) { - return "Want to add these discovered devices?"; + return this.hass.localize( + "ui.panel.config.integrations.confirm_add_discovered" + ); } - return "What do you want to add?"; + return this.hass.localize("ui.panel.config.integrations.what_to_add"); } private _renderIntegration( diff --git a/src/translations/en.json b/src/translations/en.json index b78aebb34507..be18b476ad29 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -3799,6 +3799,9 @@ "add_zwave_js_device": "Add Z-Wave device", "add_zha_device": "Add Zigbee device", "add_matter_device": "Add Matter device", + "what_device_type": "What type of device is it?", + "what_to_add": "What do you want to add?", + "confirm_add_discovered": "Want to add these discovered devices?", "disable": { "show_disabled": "Show disabled integrations", "disabled_integrations": "{number} disabled", From ee57f26415d087bbffbb61321335d1778df262d8 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Sat, 30 Dec 2023 18:39:21 +0100 Subject: [PATCH 010/361] Sort domains correctly, scroll to top on back (#19197) --- .../add-automation-element-dialog.ts | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index f05d9ef3fe3c..b96283a61dd8 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -254,31 +254,29 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { return []; } const result: ListItem[] = []; - Object.keys(services) - .sort() - .forEach((domain) => { - const manifest = manifests[domain]; - if ( - (type === undefined && - manifest?.integration_type === "entity" && - !ENTITY_DOMAINS_OTHER.has(domain)) || - (type === "helper" && manifest?.integration_type === "helper") || - (type === "other" && - (ENTITY_DOMAINS_OTHER.has(domain) || - !["helper", "entity"].includes( - manifest?.integration_type || "" - ))) - ) { - result.push({ - group: true, - icon: domainIcon(domain), - key: `${SERVICE_PREFIX}${domain}`, - name: domainToName(localize, domain, manifest), - description: "", - }); - } - }); - return result; + Object.keys(services).forEach((domain) => { + const manifest = manifests[domain]; + if ( + (type === undefined && + manifest?.integration_type === "entity" && + !ENTITY_DOMAINS_OTHER.has(domain)) || + (type === "helper" && manifest?.integration_type === "helper") || + (type === "other" && + (ENTITY_DOMAINS_OTHER.has(domain) || + !["helper", "entity"].includes(manifest?.integration_type || ""))) + ) { + result.push({ + group: true, + icon: domainIcon(domain), + key: `${SERVICE_PREFIX}${domain}`, + name: domainToName(localize, domain, manifest), + description: "", + }); + } + }); + return result.sort((a, b) => + stringCompare(a.name, b.name, this.hass.locale.language) + ); } ); @@ -515,6 +513,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { } private _back() { + this._dialog!.scrollToPos(0, 0); if (this._filter) { this._filter = ""; return; From fe18f70e51c76b7da0a67d6ffd2696eb9f408e0c Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Sat, 30 Dec 2023 18:40:01 +0100 Subject: [PATCH 011/361] Only make count field template (#19198) --- .../types/ha-automation-action-repeat.ts | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/src/panels/config/automation/action/types/ha-automation-action-repeat.ts b/src/panels/config/automation/action/types/ha-automation-action-repeat.ts index becc0f6f75b0..7a1ad36e8156 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-repeat.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-repeat.ts @@ -1,4 +1,4 @@ -import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit"; +import { css, CSSResultGroup, html, LitElement } from "lit"; import { customElement, property } from "lit/decorators"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../../../../common/dom/fire_event"; @@ -9,10 +9,10 @@ import type { HomeAssistant } from "../../../../../types"; import "../ha-automation-action"; import type { ActionElement } from "../ha-automation-action-row"; +import { isTemplate } from "../../../../../common/string/has-template"; import type { LocalizeFunc } from "../../../../../common/translations/localize"; import "../../../../../components/ha-form/ha-form"; import type { SchemaUnion } from "../../../../../components/ha-form/types"; -import { hasTemplate } from "../../../../../common/string/has-template"; const OPTIONS = ["count", "while", "until", "for_each"] as const; @@ -32,22 +32,13 @@ export class HaRepeatAction extends LitElement implements ActionElement { return { repeat: { count: 2, sequence: [] } }; } - public willUpdate(changedProperties: PropertyValues) { - if (!changedProperties.has("action")) { - return; - } - // Check for templates in action. If found, revert to YAML mode. - if (this.action && hasTemplate(this.action)) { - fireEvent( - this, - "ui-mode-not-available", - Error(this.hass.localize("ui.errors.config.no_template_editor_support")) - ); - } - } - private _schema = memoizeOne( - (localize: LocalizeFunc, type: string, reOrderMode: boolean) => + ( + localize: LocalizeFunc, + type: string, + reOrderMode: boolean, + template: boolean + ) => [ { name: "type", @@ -68,7 +59,9 @@ export class HaRepeatAction extends LitElement implements ActionElement { { name: "count", required: true, - selector: { number: { mode: "box", min: 1 } }, + selector: template + ? ({ template: {} } as const) + : ({ number: { mode: "box", min: 1 } } as const), }, ] as const) : []), @@ -104,7 +97,10 @@ export class HaRepeatAction extends LitElement implements ActionElement { const schema = this._schema( this.hass.localize, type ?? "count", - this.reOrderMode + this.reOrderMode, + "count" in action && typeof action.count === "string" + ? isTemplate(action.count) + : false ); const data = { ...action, type }; return html` Date: Sat, 30 Dec 2023 20:21:33 +0100 Subject: [PATCH 012/361] Allow to clear due date (#19201) --- src/components/ha-date-input.ts | 18 ++++++++++++++++-- src/components/ha-dialog-date-picker.ts | 14 ++++++++++++++ src/data/todo.ts | 8 ++++---- src/panels/todo/dialog-todo-item-editor.ts | 17 +++++++++++------ src/translations/en.json | 3 ++- 5 files changed, 47 insertions(+), 13 deletions(-) diff --git a/src/components/ha-date-input.ts b/src/components/ha-date-input.ts index d3b5a0607eb3..d4d9922639d9 100644 --- a/src/components/ha-date-input.ts +++ b/src/components/ha-date-input.ts @@ -18,7 +18,8 @@ export interface datePickerDialogParams { max?: string; locale?: string; firstWeekday?: number; - onChange: (value: string) => void; + canClear?: boolean; + onChange: (value: string | undefined) => void; } const showDatePickerDialog = ( @@ -49,6 +50,8 @@ export class HaDateInput extends LitElement { @property() public helper?: string; + @property({ type: Boolean }) public canClear?: boolean; + render() { return html` this._valueChanged(value), locale: this.locale.language, firstWeekday: firstWeekdayIndex(this.locale), }); } - private _valueChanged(value: string) { + private _keyDown(ev: KeyboardEvent) { + if (!this.canClear) { + return; + } + if (["Backspace", "Delete"].includes(ev.key)) { + this._valueChanged(undefined); + } + } + + private _valueChanged(value: string | undefined) { if (this.value !== value) { this.value = value; fireEvent(this, "change"); diff --git a/src/components/ha-dialog-date-picker.ts b/src/components/ha-dialog-date-picker.ts index 2422754cfb15..b71e063ae410 100644 --- a/src/components/ha-dialog-date-picker.ts +++ b/src/components/ha-dialog-date-picker.ts @@ -50,6 +50,15 @@ export class HaDialogDatePicker extends LitElement { @datepicker-value-updated=${this._valueChanged} .firstDayOfWeek=${this._params.firstWeekday} > + ${this._params.canClear + ? html` + ${this.hass.localize("ui.dialogs.date-picker.clear")} + ` + : nothing} ${this.hass.localize("ui.dialogs.date-picker.today")} @@ -66,6 +75,11 @@ export class HaDialogDatePicker extends LitElement { this._value = ev.detail.value; } + private _clear() { + this._params?.onChange(undefined); + this.closeDialog(); + } + private _setToday() { const today = new Date(); this._value = format(today, "yyyy-MM-dd"); diff --git a/src/data/todo.ts b/src/data/todo.ts index e4f99090776b..9af8ef0f4cc6 100644 --- a/src/data/todo.ts +++ b/src/data/todo.ts @@ -18,8 +18,8 @@ export interface TodoItem { uid: string; summary: string; status: TodoItemStatus; - description?: string; - due?: string; + description?: string | null; + due?: string | null; } export const enum TodoListEntityFeature { @@ -83,9 +83,9 @@ export const updateItem = ( item: item.uid, rename: item.summary, status: item.status, - description: item.description || undefined, + description: item.description || null, due_datetime: item.due?.includes("T") ? item.due : undefined, - due_date: item.due?.includes("T") ? undefined : item.due || undefined, + due_date: item.due?.includes("T") ? undefined : item.due || null, }, { entity_id } ); diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts index 5206bfe8a877..c81b9e4dbec3 100644 --- a/src/panels/todo/dialog-todo-item-editor.ts +++ b/src/panels/todo/dialog-todo-item-editor.ts @@ -161,7 +161,8 @@ class DialogTodoItemEditor extends LitElement { .value=${dueDate} .locale=${this.hass.locale} .disabled=${!canUpdate} - @value-changed=${this._endDateChanged} + @value-changed=${this._dueDateChanged} + canClear > ${this._todoListSupportsFeature( TodoListEntityFeature.SET_DUE_DATETIME_ON_ITEM @@ -170,7 +171,7 @@ class DialogTodoItemEditor extends LitElement { .value=${dueTime} .locale=${this.hass.locale} .disabled=${!canUpdate} - @value-changed=${this._endTimeChanged} + @value-changed=${this._dueTimeChanged} >` : nothing}
@@ -259,12 +260,16 @@ class DialogTodoItemEditor extends LitElement { this._description = ev.target.value; } - private _endDateChanged(ev: CustomEvent) { + private _dueDateChanged(ev: CustomEvent) { + if (!ev.detail.value) { + this._due = undefined; + return; + } const time = this._due ? this._formatTime(this._due) : undefined; this._due = this._parseDate(`${ev.detail.value}${time ? `T${time}` : ""}`); } - private _endTimeChanged(ev: CustomEvent) { + private _dueTimeChanged(ev: CustomEvent) { this._hasTime = true; this._due = this._parseDate( `${this._formatDate(this._due || new Date())}T${ev.detail.value}` @@ -320,13 +325,13 @@ class DialogTodoItemEditor extends LitElement { TodoListEntityFeature.SET_DESCRIPTION_ON_ITEM ) ? // backend should accept null to clear the field, but it doesn't now - " " + null : undefined), due: this._due ? this._hasTime ? this._due.toISOString() : this._formatDate(this._due) - : undefined, + : null, status: this._checked ? TodoItemStatus.Completed : TodoItemStatus.NeedsAction, diff --git a/src/translations/en.json b/src/translations/en.json index be18b476ad29..0039d9926f56 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1009,7 +1009,8 @@ "crop_image": "Picture to crop" }, "date-picker": { - "today": "Today" + "today": "Today", + "clear": "Clear" }, "more_info_control": { "dismiss": "Dismiss dialog", From e7cc842be46a734f44bbeb560449adefc3a709f7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Dec 2023 21:05:23 -0500 Subject: [PATCH 013/361] Update dependency rollup-plugin-visualizer to v5.12.0 (#19204) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 339896248684..232e4b0beaf5 100644 --- a/package.json +++ b/package.json @@ -229,7 +229,7 @@ "rollup": "2.79.1", "rollup-plugin-string": "3.0.0", "rollup-plugin-terser": "7.0.2", - "rollup-plugin-visualizer": "5.11.0", + "rollup-plugin-visualizer": "5.12.0", "serve-handler": "6.1.5", "sinon": "17.0.1", "source-map-url": "0.4.1", diff --git a/yarn.lock b/yarn.lock index e3f41249e572..08117eab574a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9701,7 +9701,7 @@ __metadata: rollup: "npm:2.79.1" rollup-plugin-string: "npm:3.0.0" rollup-plugin-terser: "npm:7.0.2" - rollup-plugin-visualizer: "npm:5.11.0" + rollup-plugin-visualizer: "npm:5.12.0" rrule: "npm:2.8.1" serve-handler: "npm:6.1.5" sinon: "npm:17.0.1" @@ -13846,9 +13846,9 @@ __metadata: languageName: node linkType: hard -"rollup-plugin-visualizer@npm:5.11.0": - version: 5.11.0 - resolution: "rollup-plugin-visualizer@npm:5.11.0" +"rollup-plugin-visualizer@npm:5.12.0": + version: 5.12.0 + resolution: "rollup-plugin-visualizer@npm:5.12.0" dependencies: open: "npm:^8.4.0" picomatch: "npm:^2.3.1" @@ -13861,7 +13861,7 @@ __metadata: optional: true bin: rollup-plugin-visualizer: dist/bin/cli.js - checksum: 947238aa22706a47a4d3e8ce616855f0e5cb969ed9f61b9a268eaede0a86f461ecb38e27b4e6bf00f4b5e3f63677667f65e0d4af89a659a5160f74add1f192bb + checksum: 47358feb672291d6edcfd94197577c192a84c24cb644119425dae8241fb6f5a52556efd0c501f38b276c07534642a80c0885ef681babb474e83c7b5a3b475b84 languageName: node linkType: hard From bf5c5bc46fa79f6f20127dab55a26bef19b34e97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Dec 2023 21:06:30 -0500 Subject: [PATCH 014/361] Update dependency open to v10.0.2 (#19206) --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 232e4b0beaf5..be8b0f961a1c 100644 --- a/package.json +++ b/package.json @@ -223,7 +223,7 @@ "map-stream": "0.0.7", "mocha": "10.2.0", "object-hash": "3.0.0", - "open": "10.0.1", + "open": "10.0.2", "pinst": "3.0.0", "prettier": "3.1.1", "rollup": "2.79.1", diff --git a/yarn.lock b/yarn.lock index 08117eab574a..812ddda50de9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7228,13 +7228,13 @@ __metadata: languageName: node linkType: hard -"default-browser@npm:^5.2.0": - version: 5.2.0 - resolution: "default-browser@npm:5.2.0" +"default-browser@npm:^5.2.1": + version: 5.2.1 + resolution: "default-browser@npm:5.2.1" dependencies: bundle-name: "npm:^4.1.0" default-browser-id: "npm:^5.0.0" - checksum: 95530de0dca75892b4382d086f42bd798f54a1e25eab748e84e1b64566568b1a02cf1eccfb60a8fbab303d72c09938c2d34e0b38e57d85efd24f13a60d2de802 + checksum: afab7eff7b7f5f7a94d9114d1ec67273d3fbc539edf8c0f80019879d53aa71e867303c6f6d7cffeb10a6f3cfb59d4f963dba3f9c96830b4540cc7339a1bf9840 languageName: node linkType: hard @@ -9690,7 +9690,7 @@ __metadata: mocha: "npm:10.2.0" node-vibrant: "npm:3.2.1-alpha.1" object-hash: "npm:3.0.0" - open: "npm:10.0.1" + open: "npm:10.0.2" pinst: "npm:3.0.0" prettier: "npm:3.1.1" proxy-polyfill: "npm:0.3.2" @@ -12530,15 +12530,15 @@ __metadata: languageName: node linkType: hard -"open@npm:10.0.1": - version: 10.0.1 - resolution: "open@npm:10.0.1" +"open@npm:10.0.2": + version: 10.0.2 + resolution: "open@npm:10.0.2" dependencies: - default-browser: "npm:^5.2.0" + default-browser: "npm:^5.2.1" define-lazy-prop: "npm:^3.0.0" is-inside-container: "npm:^1.0.0" is-wsl: "npm:^3.1.0" - checksum: 7ce545e2e68775f06ab800c2a2ef20369bce2738e1219fd31179e1a1773f2c33fcc6b7f816a4f5e9214821cb58ae9c50f2e3f7dd8f5b02e418fbcafabf481f03 + checksum: 6f7f9e08204af00930f2998690293df1a919a61c98b225ff9e3aa09a765254b8a98bec101644ffe991452c6aabea0c6f9e49670b559d48a44bfc5238f6b58351 languageName: node linkType: hard From b92d25e28af9159c82cff6ad9532bddf55f5a503 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Dec 2023 21:08:13 -0500 Subject: [PATCH 015/361] Update Material Design Icons to v7.4.47 (#19192) --- package.json | 4 ++-- yarn.lock | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index be8b0f961a1c..a66ec2870b52 100644 --- a/package.json +++ b/package.json @@ -81,8 +81,8 @@ "@material/mwc-top-app-bar-fixed": "0.27.0", "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0", "@material/web": "=1.1.1", - "@mdi/js": "7.3.67", - "@mdi/svg": "7.3.67", + "@mdi/js": "7.4.47", + "@mdi/svg": "7.4.47", "@polymer/paper-input": "3.2.1", "@polymer/paper-item": "3.0.1", "@polymer/paper-listbox": "3.0.1", diff --git a/yarn.lock b/yarn.lock index 812ddda50de9..313883fac92f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3146,17 +3146,17 @@ __metadata: languageName: node linkType: hard -"@mdi/js@npm:7.3.67": - version: 7.3.67 - resolution: "@mdi/js@npm:7.3.67" - checksum: 0f54a632d4ab3213931cc348d524f0f5e6b492ea74f8f1babe00298a8e7ae07b2fec88cfaf0cf7be0f1e427026a8da23fb8bed55b22892ad3b40b482e01cfb17 +"@mdi/js@npm:7.4.47": + version: 7.4.47 + resolution: "@mdi/js@npm:7.4.47" + checksum: c1a8fc82f23030bccc0cf324b13b73a0034d06140e79f8bc7b0e4e59275624c470e5ca6524d6141ad8c4fe3ad0f314c7af99afb3e38df163eb50d3b13b9eab17 languageName: node linkType: hard -"@mdi/svg@npm:7.3.67": - version: 7.3.67 - resolution: "@mdi/svg@npm:7.3.67" - checksum: bd9593e6cc16d140b681dedacd2a164da7884186d496c89809a9389c980c295d16edf4ba8744338d28bb6e627b1801f47c4c0cbf7b8faf7084ee87cd5d7b4250 +"@mdi/svg@npm:7.4.47": + version: 7.4.47 + resolution: "@mdi/svg@npm:7.4.47" + checksum: e5a6b80bb82cc7b7c98e9a018883aee1eaa0e98edfb62192e7ec5798fa573f30b9226629361d747de6e0a81fe6657fb37e9bc2fd89c68e9b094a07e863be4fba languageName: node linkType: hard @@ -9585,8 +9585,8 @@ __metadata: "@material/mwc-top-app-bar-fixed": "npm:0.27.0" "@material/top-app-bar": "npm:=14.0.0-canary.53b3cad2f.0" "@material/web": "npm:=1.1.1" - "@mdi/js": "npm:7.3.67" - "@mdi/svg": "npm:7.3.67" + "@mdi/js": "npm:7.4.47" + "@mdi/svg": "npm:7.4.47" "@octokit/auth-oauth-device": "npm:6.0.1" "@octokit/plugin-retry": "npm:6.0.1" "@octokit/rest": "npm:20.0.2" From d25f49b694265d4b5db3f060a041e59c369ede9e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 31 Dec 2023 13:46:23 -0500 Subject: [PATCH 016/361] Update dependency chai to v5 (#19208) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 70 ++++++++++++++++++++++++---------------------------- 2 files changed, 33 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index a66ec2870b52..3288ca8cd62f 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "@web/dev-server-rollup": "0.4.1", "babel-loader": "9.1.3", "babel-plugin-template-html-minifier": "4.1.0", - "chai": "4.3.10", + "chai": "5.0.0", "del": "7.1.0", "eslint": "8.56.0", "eslint-config-airbnb-base": "15.0.0", diff --git a/yarn.lock b/yarn.lock index 313883fac92f..d2f7e2f24c12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5895,10 +5895,10 @@ __metadata: languageName: node linkType: hard -"assertion-error@npm:^1.1.0": - version: 1.1.0 - resolution: "assertion-error@npm:1.1.0" - checksum: fd9429d3a3d4fd61782eb3962ae76b6d08aa7383123fca0596020013b3ebd6647891a85b05ce821c47d1471ed1271f00b0545cf6a4326cf2fc91efcc3b0fbecf +"assertion-error@npm:^2.0.1": + version: 2.0.1 + resolution: "assertion-error@npm:2.0.1" + checksum: a0789dd882211b87116e81e2648ccb7f60340b34f19877dd020b39ebb4714e475eb943e14ba3e22201c221ef6645b7bfe10297e76b6ac95b48a9898c1211ce66 languageName: node linkType: hard @@ -6434,18 +6434,16 @@ __metadata: languageName: node linkType: hard -"chai@npm:4.3.10": - version: 4.3.10 - resolution: "chai@npm:4.3.10" +"chai@npm:5.0.0": + version: 5.0.0 + resolution: "chai@npm:5.0.0" dependencies: - assertion-error: "npm:^1.1.0" - check-error: "npm:^1.0.3" - deep-eql: "npm:^4.1.3" - get-func-name: "npm:^2.0.2" - loupe: "npm:^2.3.6" - pathval: "npm:^1.1.1" - type-detect: "npm:^4.0.8" - checksum: 9e545fd60f5efee4f06f7ad62f7b1b142932b08fbb3454db69defd511e7c58771ce51843764212da1e129b2c9d1b029fbf5f98da030fe67a95a0853e8679524f + assertion-error: "npm:^2.0.1" + check-error: "npm:^2.0.0" + deep-eql: "npm:^5.0.1" + loupe: "npm:^3.0.0" + pathval: "npm:^2.0.0" + checksum: c23d1bb3912cc36d12861d7e4010bb992aabf923a8d393bc71e776218c39f5f40778ab9f398ff962dd26857edee07ce732c9ad28a678feb1b76f99384d2e4a90 languageName: node linkType: hard @@ -6495,12 +6493,10 @@ __metadata: languageName: node linkType: hard -"check-error@npm:^1.0.3": - version: 1.0.3 - resolution: "check-error@npm:1.0.3" - dependencies: - get-func-name: "npm:^2.0.2" - checksum: e2131025cf059b21080f4813e55b3c480419256914601750b0fee3bd9b2b8315b531e551ef12560419b8b6d92a3636511322752b1ce905703239e7cc451b6399 +"check-error@npm:^2.0.0": + version: 2.0.0 + resolution: "check-error@npm:2.0.0" + checksum: 120f252c2e1ad82ef82a616662805345c6c361347bfd6203f8a28c53a158811dd0ea21278f29c8136cc9df12fc7f077d1a07124569d98fb396b3072d08f2f092 languageName: node linkType: hard @@ -7184,12 +7180,10 @@ __metadata: languageName: node linkType: hard -"deep-eql@npm:^4.1.3": - version: 4.1.3 - resolution: "deep-eql@npm:4.1.3" - dependencies: - type-detect: "npm:^4.0.0" - checksum: 12ce93ae63de187e77b076d3d51bfc28b11f98910a22c18714cce112791195e86a94f97788180994614b14562a86c9763f67c69f785e4586f806b5df39bf9301 +"deep-eql@npm:^5.0.1": + version: 5.0.1 + resolution: "deep-eql@npm:5.0.1" + checksum: f8846820213462cdca23700873810c8bc01263dcc6a1e0f8694964b64f48a6dcb1f323ef7bb8678b15553f4b82420eda19092d4ae2e2709c56af7ea77bd8e6ab languageName: node linkType: hard @@ -8966,7 +8960,7 @@ __metadata: languageName: node linkType: hard -"get-func-name@npm:^2.0.1, get-func-name@npm:^2.0.2": +"get-func-name@npm:^2.0.1": version: 2.0.2 resolution: "get-func-name@npm:2.0.2" checksum: 3f62f4c23647de9d46e6f76d2b3eafe58933a9b3830c60669e4180d6c601ce1b4aa310ba8366143f55e52b139f992087a9f0647274e8745621fa2af7e0acf13b @@ -9634,7 +9628,7 @@ __metadata: app-datepicker: "npm:5.1.1" babel-loader: "npm:9.1.3" babel-plugin-template-html-minifier: "npm:4.1.0" - chai: "npm:4.3.10" + chai: "npm:5.0.0" chart.js: "npm:4.4.1" comlink: "npm:4.4.1" core-js: "npm:3.34.0" @@ -11533,12 +11527,12 @@ __metadata: languageName: node linkType: hard -"loupe@npm:^2.3.6": - version: 2.3.7 - resolution: "loupe@npm:2.3.7" +"loupe@npm:^3.0.0": + version: 3.0.2 + resolution: "loupe@npm:3.0.2" dependencies: get-func-name: "npm:^2.0.1" - checksum: 635c8f0914c2ce7ecfe4e239fbaf0ce1d2c00e4246fafcc4ed000bfdb1b8f89d05db1a220054175cca631ebf3894872a26fffba0124477fcb562f78762848fb1 + checksum: 256467bf10afaca4a5dd79b32e36fcd042bc2a247232e940c62bcc07cb114c2d7a549218eb103598e7cdb8bd32c6601fe230d80e03b8d49782973d4da11c08ed languageName: node linkType: hard @@ -12960,10 +12954,10 @@ __metadata: languageName: node linkType: hard -"pathval@npm:^1.1.1": - version: 1.1.1 - resolution: "pathval@npm:1.1.1" - checksum: b50a4751068aa3a5428f5a0b480deecedc6f537666a3630a0c2ae2d5e7c0f4bf0ee77b48404441ec1220bef0c91625e6030b3d3cf5a32ab0d9764018d1d9dbb6 +"pathval@npm:^2.0.0": + version: 2.0.0 + resolution: "pathval@npm:2.0.0" + checksum: b91575bf9cdf01757afd7b5e521eb8a0b874a49bc972d08e0047cfea0cd3c019f5614521d4bc83d2855e3fcc331db6817dfd533dd8f3d90b16bc76fad2450fc1 languageName: node linkType: hard @@ -15406,7 +15400,7 @@ __metadata: languageName: node linkType: hard -"type-detect@npm:4.0.8, type-detect@npm:^4.0.0, type-detect@npm:^4.0.8": +"type-detect@npm:4.0.8, type-detect@npm:^4.0.8": version: 4.0.8 resolution: "type-detect@npm:4.0.8" checksum: 5179e3b8ebc51fce1b13efb75fdea4595484433f9683bbc2dca6d99789dba4e602ab7922d2656f2ce8383987467f7770131d4a7f06a26287db0615d2f4c4ce7d From 6cc9a99b770c98220d08d9da7dab4008bf6d5c20 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 31 Dec 2023 13:47:55 -0500 Subject: [PATCH 017/361] Update dependency terser-webpack-plugin to v5.3.10 (#19211) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 3288ca8cd62f..3f4e61c24329 100644 --- a/package.json +++ b/package.json @@ -235,7 +235,7 @@ "source-map-url": "0.4.1", "systemjs": "6.14.2", "tar": "6.2.0", - "terser-webpack-plugin": "5.3.9", + "terser-webpack-plugin": "5.3.10", "ts-lit-plugin": "2.0.1", "typescript": "5.3.3", "vinyl-buffer": "1.0.1", diff --git a/yarn.lock b/yarn.lock index d2f7e2f24c12..510c103b2e84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2043,7 +2043,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": +"@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.9": version: 0.3.20 resolution: "@jridgewell/trace-mapping@npm:0.3.20" dependencies: @@ -9705,7 +9705,7 @@ __metadata: superstruct: "npm:1.0.3" systemjs: "npm:6.14.2" tar: "npm:6.2.0" - terser-webpack-plugin: "npm:5.3.9" + terser-webpack-plugin: "npm:5.3.10" tinykeys: "npm:2.1.0" ts-lit-plugin: "npm:2.0.1" tsparticles-engine: "npm:2.12.0" @@ -15005,15 +15005,15 @@ __metadata: languageName: node linkType: hard -"terser-webpack-plugin@npm:5.3.9, terser-webpack-plugin@npm:^5.3.7": - version: 5.3.9 - resolution: "terser-webpack-plugin@npm:5.3.9" +"terser-webpack-plugin@npm:5.3.10, terser-webpack-plugin@npm:^5.3.7": + version: 5.3.10 + resolution: "terser-webpack-plugin@npm:5.3.10" dependencies: - "@jridgewell/trace-mapping": "npm:^0.3.17" + "@jridgewell/trace-mapping": "npm:^0.3.20" jest-worker: "npm:^27.4.5" schema-utils: "npm:^3.1.1" serialize-javascript: "npm:^6.0.1" - terser: "npm:^5.16.8" + terser: "npm:^5.26.0" peerDependencies: webpack: ^5.1.0 peerDependenciesMeta: @@ -15023,7 +15023,7 @@ __metadata: optional: true uglify-js: optional: true - checksum: 339737a407e034b7a9d4a66e31d84d81c10433e41b8eae2ca776f0e47c2048879be482a9aa08e8c27565a2a949bc68f6e07f451bf4d9aa347dd61b3d000f5353 + checksum: fb1c2436ae1b4e983be043fa0a3d355c047b16b68f102437d08c736d7960c001e7420e2f722b9d99ce0dc70ca26a68cc63c0b82bc45f5b48671142b352a9d938 languageName: node linkType: hard @@ -15040,7 +15040,7 @@ __metadata: languageName: node linkType: hard -"terser@npm:^5.0.0, terser@npm:^5.15.1, terser@npm:^5.16.8": +"terser@npm:^5.0.0, terser@npm:^5.15.1, terser@npm:^5.26.0": version: 5.26.0 resolution: "terser@npm:5.26.0" dependencies: From d0c1481f76688a4fe836330e0972b04299b251bf Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 1 Jan 2024 13:58:47 +0100 Subject: [PATCH 018/361] Bumped version to 20240101.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4617d88e3cd2..d1e5abd3d1c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20231228.0" +version = "20240101.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 428604d91d2885e71b9ba23e559e9c036fea9cd5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 20:15:34 -0500 Subject: [PATCH 019/361] Update babel monorepo to v7.23.7 (#19220) --- package.json | 10 ++--- yarn.lock | 123 +++++++++++++++++++++++++-------------------------- 2 files changed, 65 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index 3f4e61c24329..7b3ad9c6a114 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "license": "Apache-2.0", "type": "module", "dependencies": { - "@babel/runtime": "7.23.6", + "@babel/runtime": "7.23.7", "@braintree/sanitize-url": "7.0.0", "@codemirror/autocomplete": "6.11.1", "@codemirror/commands": "6.3.2", @@ -150,11 +150,11 @@ "xss": "1.0.14" }, "devDependencies": { - "@babel/core": "7.23.6", + "@babel/core": "7.23.7", "@babel/helper-define-polyfill-provider": "0.4.4", - "@babel/plugin-proposal-decorators": "7.23.6", - "@babel/plugin-transform-runtime": "7.23.6", - "@babel/preset-env": "7.23.6", + "@babel/plugin-proposal-decorators": "7.23.7", + "@babel/plugin-transform-runtime": "7.23.7", + "@babel/preset-env": "7.23.7", "@babel/preset-typescript": "7.23.3", "@bundle-stats/plugin-webpack-filter": "4.8.3", "@koa/cors": "5.0.0", diff --git a/yarn.lock b/yarn.lock index 510c103b2e84..dd2a90537271 100644 --- a/yarn.lock +++ b/yarn.lock @@ -62,26 +62,26 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.23.6, @babel/core@npm:^7.11.1, @babel/core@npm:^7.12.3": - version: 7.23.6 - resolution: "@babel/core@npm:7.23.6" +"@babel/core@npm:7.23.7, @babel/core@npm:^7.11.1, @babel/core@npm:^7.12.3": + version: 7.23.7 + resolution: "@babel/core@npm:7.23.7" dependencies: "@ampproject/remapping": "npm:^2.2.0" "@babel/code-frame": "npm:^7.23.5" "@babel/generator": "npm:^7.23.6" "@babel/helper-compilation-targets": "npm:^7.23.6" "@babel/helper-module-transforms": "npm:^7.23.3" - "@babel/helpers": "npm:^7.23.6" + "@babel/helpers": "npm:^7.23.7" "@babel/parser": "npm:^7.23.6" "@babel/template": "npm:^7.22.15" - "@babel/traverse": "npm:^7.23.6" + "@babel/traverse": "npm:^7.23.7" "@babel/types": "npm:^7.23.6" convert-source-map: "npm:^2.0.0" debug: "npm:^4.1.0" gensync: "npm:^1.0.0-beta.2" json5: "npm:^2.2.3" semver: "npm:^6.3.1" - checksum: a72ba71d2f557d09ff58a5f0846344b9cea9dfcbd7418729a3a74d5b0f37a5ca024942fef4d19f248de751928a1be3d5cb0488746dd8896009dd55b974bb552e + checksum: 956841695ea801c8b4196d01072e6c1062335960715a6fcfd4009831003b526b00627c78b373ed49b1658c3622c71142f7ff04235fe839cac4a1a25ed51b90aa languageName: node linkType: hard @@ -128,9 +128,9 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.23.6": - version: 7.23.6 - resolution: "@babel/helper-create-class-features-plugin@npm:7.23.6" +"@babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.23.6, @babel/helper-create-class-features-plugin@npm:^7.23.7": + version: 7.23.7 + resolution: "@babel/helper-create-class-features-plugin@npm:7.23.7" dependencies: "@babel/helper-annotate-as-pure": "npm:^7.22.5" "@babel/helper-environment-visitor": "npm:^7.22.20" @@ -143,7 +143,7 @@ __metadata: semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: 5e0cff67a6809d2285215057be45de9dd8900b91e3526fad5eac79023c1d6bee32aed1a04fcdf0e4d99ee4bd49ea5459cb98260c13222edf3bb983621bb452f4 + checksum: c8b3ef58fca399a25f00d703b0fb2ac1d86642d9e3bd7af04df77857641ed08aaca042ffb271ef93771f9272481fd1cf102a9bddfcee407fb126c927deeef6a7 languageName: node linkType: hard @@ -335,14 +335,14 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.23.6": - version: 7.23.6 - resolution: "@babel/helpers@npm:7.23.6" +"@babel/helpers@npm:^7.23.7": + version: 7.23.7 + resolution: "@babel/helpers@npm:7.23.7" dependencies: "@babel/template": "npm:^7.22.15" - "@babel/traverse": "npm:^7.23.6" + "@babel/traverse": "npm:^7.23.7" "@babel/types": "npm:^7.23.6" - checksum: 2a85fd2bcbc15a6c94dbe7b9e94d8920f9de76d164179d6895fee89c4339079d9e3e56f572bf19b5e7d1e6f1997d7fbaeaa686b47d35136852631dfd09e85c2f + checksum: ec07061dc871d406ed82c8757c4d7a510aaf15145799fb0a2c3bd3c72ca101fe82a02dd5f83ca604fbbba5de5408dd731bb1452150562bed4f3b0a2846f81f61 languageName: node linkType: hard @@ -390,31 +390,28 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.3" +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.7": + version: 7.23.7 + resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.7" dependencies: "@babel/helper-environment-visitor": "npm:^7.22.20" "@babel/helper-plugin-utils": "npm:^7.22.5" peerDependencies: "@babel/core": ^7.0.0 - checksum: 6e13f14949eb943d33cf4d3775a7195fa93c92851dfb648931038e9eb92a9b1709fdaa5a0ff6cf063cfcd68b3e52d280f3ebc0f3085b3e006e64dd6196ecb72a + checksum: 3b0c9554cd0048e6e7341d7b92f29d400dbc6a5a4fc2f86dbed881d32e02ece9b55bc520387bae2eac22a5ab38a0b205c29b52b181294d99b4dd75e27309b548 languageName: node linkType: hard -"@babel/plugin-proposal-decorators@npm:7.23.6": - version: 7.23.6 - resolution: "@babel/plugin-proposal-decorators@npm:7.23.6" +"@babel/plugin-proposal-decorators@npm:7.23.7": + version: 7.23.7 + resolution: "@babel/plugin-proposal-decorators@npm:7.23.7" dependencies: - "@babel/helper-create-class-features-plugin": "npm:^7.23.6" + "@babel/helper-create-class-features-plugin": "npm:^7.23.7" "@babel/helper-plugin-utils": "npm:^7.22.5" - "@babel/helper-replace-supers": "npm:^7.22.20" - "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5" - "@babel/helper-split-export-declaration": "npm:^7.22.6" "@babel/plugin-syntax-decorators": "npm:^7.23.3" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 091796967ad728c7a00ae60c978d20f17cea08fa37bf977568880324b2619f8ce11b4a3797ef1b3137085fcb890639c49462f6be19f7cc3707e17e057df11c75 + checksum: 1fc506b113fa204323537b3299686641c29b7626f05aa098c68a818da65ce657d2398c49aea69af91c45bbdfca6086424e28d283729dba401eb93c8a16826c95 languageName: node linkType: hard @@ -670,9 +667,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-async-generator-functions@npm:^7.23.4": - version: 7.23.4 - resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.4" +"@babel/plugin-transform-async-generator-functions@npm:^7.23.7": + version: 7.23.7 + resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.7" dependencies: "@babel/helper-environment-visitor": "npm:^7.22.20" "@babel/helper-plugin-utils": "npm:^7.22.5" @@ -680,7 +677,7 @@ __metadata: "@babel/plugin-syntax-async-generators": "npm:^7.8.4" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e2fc132c9033711d55209f4781e1fc73f0f4da5e0ca80a2da73dec805166b73c92a6e83571a8994cd2c893a28302e24107e90856202b24781bab734f800102bb + checksum: b1f66b23423933c27336b1161ac92efef46683321caea97e2255a666f992979376f47a5559f64188d3831fa66a4b24c2a7a40838cc0e9737e90eebe20e8e6372 languageName: node linkType: hard @@ -1137,19 +1134,19 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-runtime@npm:7.23.6": - version: 7.23.6 - resolution: "@babel/plugin-transform-runtime@npm:7.23.6" +"@babel/plugin-transform-runtime@npm:7.23.7": + version: 7.23.7 + resolution: "@babel/plugin-transform-runtime@npm:7.23.7" dependencies: "@babel/helper-module-imports": "npm:^7.22.15" "@babel/helper-plugin-utils": "npm:^7.22.5" - babel-plugin-polyfill-corejs2: "npm:^0.4.6" - babel-plugin-polyfill-corejs3: "npm:^0.8.5" - babel-plugin-polyfill-regenerator: "npm:^0.5.3" + babel-plugin-polyfill-corejs2: "npm:^0.4.7" + babel-plugin-polyfill-corejs3: "npm:^0.8.7" + babel-plugin-polyfill-regenerator: "npm:^0.5.4" semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 54e540ec04f05f664c69db36a78b5db56b0d3e25bbe34d7f11cfe21cc5aad5240661f5ada630c7b2abcae99d229851aafbb6b2218cf285771379e0844a3f24a9 + checksum: 1e0b21c943e565e6a2a859991059f5b5a8b917689aab9b3beb172babece1843b42f9ae9ff9913f01134fb201fd67ac2831559578949c7287e7c782e6d6740de8 languageName: node linkType: hard @@ -1270,9 +1267,9 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.23.6, @babel/preset-env@npm:^7.11.0": - version: 7.23.6 - resolution: "@babel/preset-env@npm:7.23.6" +"@babel/preset-env@npm:7.23.7, @babel/preset-env@npm:^7.11.0": + version: 7.23.7 + resolution: "@babel/preset-env@npm:7.23.7" dependencies: "@babel/compat-data": "npm:^7.23.5" "@babel/helper-compilation-targets": "npm:^7.23.6" @@ -1280,7 +1277,7 @@ __metadata: "@babel/helper-validator-option": "npm:^7.23.5" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.23.3" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.23.3" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.23.3" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.23.7" "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2" "@babel/plugin-syntax-async-generators": "npm:^7.8.4" "@babel/plugin-syntax-class-properties": "npm:^7.12.13" @@ -1301,7 +1298,7 @@ __metadata: "@babel/plugin-syntax-top-level-await": "npm:^7.14.5" "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6" "@babel/plugin-transform-arrow-functions": "npm:^7.23.3" - "@babel/plugin-transform-async-generator-functions": "npm:^7.23.4" + "@babel/plugin-transform-async-generator-functions": "npm:^7.23.7" "@babel/plugin-transform-async-to-generator": "npm:^7.23.3" "@babel/plugin-transform-block-scoped-functions": "npm:^7.23.3" "@babel/plugin-transform-block-scoping": "npm:^7.23.4" @@ -1349,14 +1346,14 @@ __metadata: "@babel/plugin-transform-unicode-regex": "npm:^7.23.3" "@babel/plugin-transform-unicode-sets-regex": "npm:^7.23.3" "@babel/preset-modules": "npm:0.1.6-no-external-plugins" - babel-plugin-polyfill-corejs2: "npm:^0.4.6" - babel-plugin-polyfill-corejs3: "npm:^0.8.5" - babel-plugin-polyfill-regenerator: "npm:^0.5.3" + babel-plugin-polyfill-corejs2: "npm:^0.4.7" + babel-plugin-polyfill-corejs3: "npm:^0.8.7" + babel-plugin-polyfill-regenerator: "npm:^0.5.4" core-js-compat: "npm:^3.31.0" semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b47e9e7cdb0d31b2a6919ffb1b767f8159a69b000e257c1dad1121dea8c42d7ec12a892a691d1a8e90cde86edd41b017254574ec6b82a984013bb3c9e3df2b36 + checksum: 2059dee350c39aba0a1f128d00ccfd7abf97f92a9b661f4db07a96c11d91c928a9f1df39477583f068090627bff571b4415f1a4f94008d29f6ad8b124e69804e languageName: node linkType: hard @@ -1395,12 +1392,12 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.23.6, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4": - version: 7.23.6 - resolution: "@babel/runtime@npm:7.23.6" +"@babel/runtime@npm:7.23.7, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4": + version: 7.23.7 + resolution: "@babel/runtime@npm:7.23.7" dependencies: regenerator-runtime: "npm:^0.14.0" - checksum: 4c4ab16f0361c59fb23956e4d0a29935f1f8a64aa8dd37876ce38355b6f4d8f0e54237aacb89c73b1532def60539ddde2d651523c8fa887b30b19a8cf0c465b0 + checksum: b29cf3ca6277aea8c5c823d9b86e7f7153757f07eaaa81d726f125de00ac0e7451c90845770f919826a94ade8f71a6bda9c0421410dfcc285ee17a40f8f8ca00 languageName: node linkType: hard @@ -1415,9 +1412,9 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.23.6": - version: 7.23.6 - resolution: "@babel/traverse@npm:7.23.6" +"@babel/traverse@npm:^7.23.7": + version: 7.23.7 + resolution: "@babel/traverse@npm:7.23.7" dependencies: "@babel/code-frame": "npm:^7.23.5" "@babel/generator": "npm:^7.23.6" @@ -1429,7 +1426,7 @@ __metadata: "@babel/types": "npm:^7.23.6" debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: ee4434a3ce792ee8956b64d76843caa1dda4779bb621ed9f951dd3551965bf1f292f097011c9730ecbc0b57f02434b1fa5a771610a2ef570726b0df0fc3332d9 + checksum: 3215e59429963c8dac85c26933372cdd322952aa9930e4bc5ef2d0e4bd7a1510d1ecf8f8fd860ace5d4d9fe496d23805a1ea019a86410aee4111de5f63ee84f9 languageName: node linkType: hard @@ -6003,7 +6000,7 @@ __metadata: languageName: node linkType: hard -"babel-plugin-polyfill-corejs2@npm:^0.4.6": +"babel-plugin-polyfill-corejs2@npm:^0.4.7": version: 0.4.7 resolution: "babel-plugin-polyfill-corejs2@npm:0.4.7" dependencies: @@ -6016,7 +6013,7 @@ __metadata: languageName: node linkType: hard -"babel-plugin-polyfill-corejs3@npm:^0.8.5": +"babel-plugin-polyfill-corejs3@npm:^0.8.7": version: 0.8.7 resolution: "babel-plugin-polyfill-corejs3@npm:0.8.7" dependencies: @@ -6028,7 +6025,7 @@ __metadata: languageName: node linkType: hard -"babel-plugin-polyfill-regenerator@npm:^0.5.3": +"babel-plugin-polyfill-regenerator@npm:^0.5.4": version: 0.5.4 resolution: "babel-plugin-polyfill-regenerator@npm:0.5.4" dependencies: @@ -9514,13 +9511,13 @@ __metadata: version: 0.0.0-use.local resolution: "home-assistant-frontend@workspace:." dependencies: - "@babel/core": "npm:7.23.6" + "@babel/core": "npm:7.23.7" "@babel/helper-define-polyfill-provider": "npm:0.4.4" - "@babel/plugin-proposal-decorators": "npm:7.23.6" - "@babel/plugin-transform-runtime": "npm:7.23.6" - "@babel/preset-env": "npm:7.23.6" + "@babel/plugin-proposal-decorators": "npm:7.23.7" + "@babel/plugin-transform-runtime": "npm:7.23.7" + "@babel/preset-env": "npm:7.23.7" "@babel/preset-typescript": "npm:7.23.3" - "@babel/runtime": "npm:7.23.6" + "@babel/runtime": "npm:7.23.7" "@braintree/sanitize-url": "npm:7.0.0" "@bundle-stats/plugin-webpack-filter": "npm:4.8.3" "@codemirror/autocomplete": "npm:6.11.1" From c650e23432d9f0d1a875c258f5cffc5d6f0bed55 Mon Sep 17 00:00:00 2001 From: JLo Date: Tue, 2 Jan 2024 12:08:05 +0100 Subject: [PATCH 020/361] Review on automation editor text (#19223) - Added `.` to bloc descriptions - Changed "Other" into "OTher triggers" "Other conditions" and "Other actions" - Adapted a few descriptions --- src/translations/en.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/translations/en.json b/src/translations/en.json index 0039d9926f56..0ea3cf853f2e 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2492,13 +2492,13 @@ "groups": { "entity": { "label": "Entity", - "description": "When something happens to an entity" + "description": "When something happens to an entity." }, "time_location": { "label": "Time and location", "description": "When someone enters or leaves a zone, or at a specific time." }, - "other": { "label": "Other" } + "other": { "label": "Other triggers" } }, "type": { "calendar": { @@ -2534,7 +2534,7 @@ "context_user_picked": "User firing event", "context_user_pick": "Select user", "description": { - "picker": "When an event is being received (event is an advanced concept in Home Assistant)", + "picker": "When an event is being received (event is an advanced concept in Home Assistant).", "full": "When {eventTypes} event is fired" } }, @@ -2546,7 +2546,7 @@ "enter": "Enter", "leave": "Leave", "description": { - "picker": "When an entity created by a geolocation platform appears in or disappears from a zone", + "picker": "When an entity created by a geolocation platform appears in or disappears from a zone.", "full": "When {source} {event, select, \n enter {enters}\n leave {leaves} other {} \n} {zone} {numberOfZones, plural,\n one {zone}\n other {zones}\n}" } }, @@ -2608,7 +2608,7 @@ "updated": "updated" }, "description": { - "picker": "When a persistent notification is added or removed", + "picker": "When a persistent notification is added or removed.", "full": "When a persistent notification is updated" } }, @@ -2619,7 +2619,7 @@ "sunset": "Sunset", "offset": "Offset (optional)", "description": { - "picker": "When the sun sets or rises", + "picker": "When the sun sets or rises.", "sets": "When the sun sets{hasDuration, select, \n true { offset by {duration}} \n other {}\n }", "rises": "When the sun rises{hasDuration, select, \n true { offset by {duration}} \n other {}\n }" } @@ -2648,7 +2648,7 @@ "value_template": "Value template", "for": "For", "description": { - "picker": "When a template is evaluated to true.", + "picker": "When a template evaluates to true.", "full": "When a template changes from false to true{hasDuration, select, \n true { for {duration}} \n other {}\n }" } }, @@ -2669,7 +2669,7 @@ "minutes": "Minutes", "seconds": "Seconds", "description": { - "picker": "Periodically, every defined interval of time." + "picker": "Periodically, at a defined interval." } }, "webhook": { @@ -2692,7 +2692,7 @@ "enter": "Enter", "leave": "Leave", "description": { - "picker": "When someone (or something) enters or leaves a zone", + "picker": "When someone (or something) enters or leaves a zone.", "full": "When {entity} {event, select, \n enter {enters}\n leave {leaves} other {} \n} {zone} {numberOfZones, plural,\n one {zone} \n other {zones}\n}" } } @@ -2734,7 +2734,7 @@ "label": "Time and location", "description": "If someone is in a zone or if the current time is before or after a specified time." }, - "other": { "label": "Other" }, + "other": { "label": "Other conditions" }, "building_blocks": { "label": "Building blocks", "description": "Build more complex conditions." @@ -2766,7 +2766,7 @@ "not": { "label": "Not", "description": { - "picker": "Test if a condition is not true", + "picker": "Test if a condition is not true.", "no_conditions": "Test if no condition matches", "one_condition": "Test if 1 condition does not match", "full": "Test if none of {count} conditions match" @@ -2800,7 +2800,7 @@ "label": "[%key:ui::panel::config::automation::editor::triggers::type::state::label%]", "state": "[%key:ui::panel::config::automation::editor::triggers::type::state::label%]", "description": { - "picker": "If an entity (or attribute) is in a specific state", + "picker": "If an entity (or attribute) is in a specific state.", "no_entity": "Confirm state", "full": "Confirm{hasAttribute, select, \n true { {attribute} of}\n other {}\n} {numberOfEntities, plural,\n zero {an entity is}\n one {{entities} is}\n other {{entities} are}\n} {numberOfStates, plural,\n zero {a state}\n other {{states}}\n}{hasDuration, select, \n true { for {duration}} \n other {}\n }" } @@ -2821,7 +2821,7 @@ "label": "[%key:ui::panel::config::automation::editor::triggers::type::template::label%]", "value_template": "[%key:ui::panel::config::automation::editor::triggers::type::template::value_template%]", "description": { - "picker": "If a template is evaluated to true.", + "picker": "If a template evaluates to true.", "full": "Test if template renders a value equal to true" } }, @@ -2844,7 +2844,7 @@ "sun": "Sunday" }, "description": { - "picker": "If the current time is before or after a specified time", + "picker": "If the current time is before or after a specified time.", "full": "Confirm the {hasTime, select, \n after {time is after {time_after}}\n before {time is before {time_before}}\n after_before {time is after {time_after} and before {time_before}} \n other {}\n }{hasTimeAndDay, select, \n true { and the }\n other {}\n}{hasDay, select, \n true { day is {day}}\n other {}\n}" } }, @@ -2862,7 +2862,7 @@ "entity": "[%key:ui::panel::config::automation::editor::triggers::type::zone::entity%]", "zone": "[%key:ui::panel::config::automation::editor::triggers::type::zone::label%]", "description": { - "picker": "If someone (or something) is in a zone", + "picker": "If someone (or something) is in a zone.", "full": "Confirm {entity} {numberOfEntities, plural,\n one {is}\n other {are}\n} in {zone} {numberOfZones, plural,\n one {zone} \n other {zones}\n} " } } @@ -2899,7 +2899,7 @@ "continue_on_error": "Continue on error", "groups": { "helpers": { "label": "Helpers" }, - "other": { "label": "Other" }, + "other": { "label": "Other actions" }, "building_blocks": { "label": "Building blocks", "description": "Build more complex sequences of actions." @@ -3069,14 +3069,14 @@ "response_variable": "The name of the variable to use as response", "error": "Stop because of an unexpected error", "description": { - "picker": "Stop the sequence of actions", + "picker": "Stop the sequence of actions.", "full": "Stop {hasReason, select, \n true { because: {reason}} \n other {}\n }" } }, "parallel": { "label": "Run in parallel", "description": { - "picker": "perform a sequence of actions in parallel.", + "picker": "Perform a sequence of actions in parallel.", "full": "Run {number} {number, plural,\n one {action}\n other {actions}\n} in parallel" } }, From 52fcf64cfdb86e3958af9beca9e069a0a734f8eb Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 13:36:06 +0100 Subject: [PATCH 021/361] Automation editor tweaks (#19225) * Automation editor tweaks * fix styling --- src/data/condition.ts | 1 - .../add-automation-element-dialog.ts | 145 +++++++++++++----- .../condition/ha-automation-condition.ts | 1 + .../types/ha-automation-condition-device.ts | 1 + .../show-add-automation-element-dialog.ts | 1 + .../types/ha-automation-trigger-device.ts | 1 + 6 files changed, 108 insertions(+), 42 deletions(-) diff --git a/src/data/condition.ts b/src/data/condition.ts index 44a0e218609c..d8c7af44fecc 100644 --- a/src/data/condition.ts +++ b/src/data/condition.ts @@ -46,7 +46,6 @@ export const CONDITION_GROUPS: AutomationElementGroup = { icon: mdiDotsHorizontal, members: { template: {}, - trigger: {}, }, }, } as const; diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index b96283a61dd8..31760dca1bc1 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -1,7 +1,14 @@ import "@material/mwc-list/mwc-list"; import { mdiClose, mdiContentPaste, mdiPlus } from "@mdi/js"; import Fuse, { IFuseOptions } from "fuse.js"; -import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; +import { + CSSResultGroup, + LitElement, + PropertyValues, + css, + html, + nothing, +} from "lit"; import { customElement, property, query, state } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; import { repeat } from "lit/directives/repeat"; @@ -42,6 +49,8 @@ import { AddAutomationElementDialogParams, PASTE_VALUE, } from "./show-add-automation-element-dialog"; +import { computeDomain } from "../../../common/entity/compute_domain"; +import { deepEqual } from "../../../common/util/deep-equal"; const TYPES = { trigger: { groups: TRIGGER_GROUPS, icons: TRIGGER_ICONS }, @@ -93,13 +102,15 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { @state() private _manifests?: DomainManifestLookup; + @state() private _domains?: Set; + @query("ha-dialog") private _dialog?: HaDialog; private _fullScreen = false; - private _width?: number; + @state() private _width?: number; - private _height?: number; + @state() private _height?: number; public showDialog(params): void { this._params = params; @@ -124,6 +135,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { this._prev = undefined; this._filter = ""; this._manifests = undefined; + this._domains = undefined; } private _convertToItem = ( @@ -152,6 +164,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { private _getFilteredItems = memoizeOne( ( type: AddAutomationElementDialogParams["type"], + root: AddAutomationElementDialogParams["root"], group: string | undefined, filter: string, localize: LocalizeFunc, @@ -164,6 +177,10 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { : TYPES[type].groups[group].members! : TYPES[type].groups; + if (type === "condition" && group === "other" && !root) { + groups.trigger = {}; + } + const flattenGroups = (grp: AutomationElementGroup) => Object.entries(grp).map(([key, options]) => options.members @@ -191,7 +208,9 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { private _getGroupItems = memoizeOne( ( type: AddAutomationElementDialogParams["type"], + root: AddAutomationElementDialogParams["root"], group: string | undefined, + domains: Set | undefined, localize: LocalizeFunc, services: HomeAssistant["services"], manifests?: DomainManifestLookup @@ -208,6 +227,10 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { ? TYPES[type].groups[group].members! : TYPES[type].groups; + if (type === "condition" && group === "other" && !root) { + groups.trigger = {}; + } + const result = Object.entries(groups).map(([key, options]) => this._convertToItem(key, options, type, localize) ); @@ -215,15 +238,33 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { if (type === "action") { if (!this._group) { result.unshift( - ...this._serviceGroups(localize, services, manifests, undefined) + ...this._serviceGroups( + localize, + services, + manifests, + domains, + undefined + ) ); } else if (this._group === "helpers") { result.unshift( - ...this._serviceGroups(localize, services, manifests, "helper") + ...this._serviceGroups( + localize, + services, + manifests, + domains, + "helper" + ) ); } else if (this._group === "other") { result.unshift( - ...this._serviceGroups(localize, services, manifests, "other") + ...this._serviceGroups( + localize, + services, + manifests, + domains, + "other" + ) ); } } @@ -243,42 +284,44 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { } ); - private _serviceGroups = memoizeOne( - ( - localize: LocalizeFunc, - services: HomeAssistant["services"], - manifests: DomainManifestLookup | undefined, - type: "helper" | "other" | undefined - ): ListItem[] => { - if (!services || !manifests) { - return []; - } - const result: ListItem[] = []; - Object.keys(services).forEach((domain) => { - const manifest = manifests[domain]; - if ( - (type === undefined && - manifest?.integration_type === "entity" && - !ENTITY_DOMAINS_OTHER.has(domain)) || - (type === "helper" && manifest?.integration_type === "helper") || - (type === "other" && - (ENTITY_DOMAINS_OTHER.has(domain) || - !["helper", "entity"].includes(manifest?.integration_type || ""))) - ) { - result.push({ - group: true, - icon: domainIcon(domain), - key: `${SERVICE_PREFIX}${domain}`, - name: domainToName(localize, domain, manifest), - description: "", - }); - } - }); - return result.sort((a, b) => - stringCompare(a.name, b.name, this.hass.locale.language) - ); + private _serviceGroups = ( + localize: LocalizeFunc, + services: HomeAssistant["services"], + manifests: DomainManifestLookup | undefined, + domains: Set | undefined, + type: "helper" | "other" | undefined + ): ListItem[] => { + if (!services || !manifests) { + return []; } - ); + const result: ListItem[] = []; + Object.keys(services).forEach((domain) => { + const manifest = manifests[domain]; + const domainUsed = !domains ? true : domains.has(domain); + if ( + (type === undefined && + manifest?.integration_type === "entity" && + domainUsed && + !ENTITY_DOMAINS_OTHER.has(domain)) || + (type === "helper" && manifest?.integration_type === "helper") || + (type === "other" && + (ENTITY_DOMAINS_OTHER.has(domain) || + (!domainUsed && manifest?.integration_type === "entity") || + !["helper", "entity"].includes(manifest?.integration_type || ""))) + ) { + result.push({ + group: true, + icon: domainIcon(domain), + key: `${SERVICE_PREFIX}${domain}`, + name: domainToName(localize, domain, manifest), + description: "", + }); + } + }); + return result.sort((a, b) => + stringCompare(a.name, b.name, this.hass.locale.language) + ); + }; private _services = memoizeOne( ( @@ -368,6 +411,19 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { this._height = boundingRect?.height; } + protected willUpdate(changedProperties: PropertyValues): void { + if ( + this._params?.type === "action" && + changedProperties.has("hass") && + changedProperties.get("hass")?.states !== this.hass.states + ) { + const domains = new Set(Object.keys(this.hass.states).map(computeDomain)); + if (!deepEqual(domains, this._domains)) { + this._domains = domains; + } + } + } + protected render() { if (!this._params) { return nothing; @@ -376,6 +432,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { const items = this._filter ? this._getFilteredItems( this._params.type, + this._params.root, this._group, this._filter, this.hass.localize, @@ -384,7 +441,9 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { ) : this._getGroupItems( this._params.type, + this._params.root, this._group, + this._domains, this.hass.localize, this.hass.services, this._manifests @@ -562,6 +621,10 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { ha-icon-next { width: 24px; } + mwc-list { + max-height: 468px; + max-width: 100vw; + } search-input { display: block; margin: 0 16px; diff --git a/src/panels/config/automation/condition/ha-automation-condition.ts b/src/panels/config/automation/condition/ha-automation-condition.ts index 27364b92a3ed..ecf4f8823770 100644 --- a/src/panels/config/automation/condition/ha-automation-condition.ts +++ b/src/panels/config/automation/condition/ha-automation-condition.ts @@ -203,6 +203,7 @@ export default class HaAutomationCondition extends LitElement { showAddAutomationElementDialog(this, { type: "condition", add: this._addCondition, + root: !this.nested, clipboardItem: this._clipboard?.condition?.condition, }); } diff --git a/src/panels/config/automation/condition/types/ha-automation-condition-device.ts b/src/panels/config/automation/condition/types/ha-automation-condition-device.ts index 71568fe02c10..4593a5f70123 100644 --- a/src/panels/config/automation/condition/types/ha-automation-condition-device.ts +++ b/src/panels/config/automation/condition/types/ha-automation-condition-device.ts @@ -168,6 +168,7 @@ export class HaDeviceCondition extends LitElement { } ha-form { + display: block; margin-top: 24px; } `; diff --git a/src/panels/config/automation/show-add-automation-element-dialog.ts b/src/panels/config/automation/show-add-automation-element-dialog.ts index c497ca85c620..55453505121d 100644 --- a/src/panels/config/automation/show-add-automation-element-dialog.ts +++ b/src/panels/config/automation/show-add-automation-element-dialog.ts @@ -6,6 +6,7 @@ export interface AddAutomationElementDialogParams { type: "trigger" | "condition" | "action"; add: (key: string) => void; clipboardItem: string | undefined; + root?: boolean; group?: string; } const loadDialog = () => import("./add-automation-element-dialog"); diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts index 8b3a63575220..1b94ff6138b2 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts @@ -174,6 +174,7 @@ export class HaDeviceTrigger extends LitElement { } ha-form { + display: block; margin-top: 24px; } `; From 1b6def487550eeb6b97e4edcd6fcf901ed306e6c Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Tue, 2 Jan 2024 05:07:34 -0800 Subject: [PATCH 022/361] Localize a device action string (#19203) --- src/data/script_i18n.ts | 4 +++- src/translations/en.json | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/data/script_i18n.ts b/src/data/script_i18n.ts index 1ba30198bd3e..4b07b84f0ed5 100644 --- a/src/data/script_i18n.ts +++ b/src/data/script_i18n.ts @@ -404,7 +404,9 @@ const tryDescribeAction = ( if (actionType === "device_action") { const config = action as DeviceAction; if (!config.device_id) { - return "Device action"; + return hass.localize( + `${actionTranslationBaseKey}.device_id.description.no_device` + ); } const localized = localizeDeviceAutomationAction( hass, diff --git a/src/translations/en.json b/src/translations/en.json index 0ea3cf853f2e..c176cf65c96a 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2990,7 +2990,8 @@ "flash": "Flash" }, "description": { - "picker": "Do something on a device. Great way to start." + "picker": "Do something on a device. Great way to start.", + "no_device": "Device action" } }, "activate_scene": { From 5ac03604949cf8bf3ab616d9d22ff472f428ede4 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 16:08:26 +0100 Subject: [PATCH 023/361] Remove references to "service call" from actions (#19226) --- src/components/ha-service-control.ts | 28 ++++++++++++++----- src/data/script.ts | 2 ++ src/data/script_i18n.ts | 5 +++- .../action/ha-automation-action-row.ts | 10 ++++++- .../automation/action/ha-automation-action.ts | 1 + src/translations/en.json | 1 + 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/components/ha-service-control.ts b/src/components/ha-service-control.ts index f1ae8ee54bac..119418355c64 100644 --- a/src/components/ha-service-control.ts +++ b/src/components/ha-service-control.ts @@ -4,7 +4,14 @@ import { HassServices, HassServiceTarget, } from "home-assistant-js-websocket"; -import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit"; +import { + css, + CSSResultGroup, + html, + LitElement, + PropertyValues, + nothing, +} from "lit"; import { customElement, property, query, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { ensureArray } from "../common/array/ensure-array"; @@ -83,6 +90,8 @@ export class HaServiceControl extends LitElement { @property({ type: Boolean }) public showAdvanced?: boolean; + @property({ type: Boolean, reflect: true }) public hidePicker?: boolean; + @state() private _value!: this["value"]; @state() private _checkedKeys = new Set(); @@ -363,12 +372,14 @@ export class HaServiceControl extends LitElement { )) || serviceData?.description; - return html` + return html`${this.hidePicker + ? nothing + : html``}
${description ? html`

${description}

` : ""} ${this._manifest @@ -735,6 +746,9 @@ export class HaServiceControl extends LitElement { margin: var(--service-control-padding, 0 16px); padding: 16px 0; } + :host([hidePicker]) p { + padding-top: 0; + } .checkbox-spacer { width: 32px; } diff --git a/src/data/script.ts b/src/data/script.ts index f0b5e7151b51..08910dc88fcb 100644 --- a/src/data/script.ts +++ b/src/data/script.ts @@ -52,6 +52,7 @@ export const serviceActionStruct: Describe = assign( target: optional(targetStruct), data: optional(object()), response_variable: optional(string()), + metadata: optional(object()), }) ); @@ -133,6 +134,7 @@ export interface ServiceAction extends BaseAction { target?: HassServiceTarget; data?: Record; response_variable?: string; + metadata?: Record; } export interface DeviceAction extends BaseAction { diff --git a/src/data/script_i18n.ts b/src/data/script_i18n.ts index 4b07b84f0ed5..3d7d8c5a1da4 100644 --- a/src/data/script_i18n.ts +++ b/src/data/script_i18n.ts @@ -168,8 +168,11 @@ const tryDescribeAction = ( const service = hass.localize(`component.${domain}.services.${serviceName}.name`) || hass.services[domain][serviceName]?.name; + return hass.localize( - `${actionTranslationBaseKey}.service.description.service_based_on_name`, + `${actionTranslationBaseKey}.service.description.${ + config.metadata ? "service_name" : "service_based_on_name" + }`, { name: service ? `${domainToName(hass.localize, domain)}: ${service}` diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts index f09c901c8e1a..0e58c0e8b2b5 100644 --- a/src/panels/config/automation/action/ha-automation-action-row.ts +++ b/src/panels/config/automation/action/ha-automation-action-row.ts @@ -29,6 +29,8 @@ import { classMap } from "lit/directives/class-map"; import { storage } from "../../../../common/decorators/storage"; import { dynamicElement } from "../../../../common/dom/dynamic-element-directive"; import { fireEvent } from "../../../../common/dom/fire_event"; +import { computeDomain } from "../../../../common/entity/compute_domain"; +import { domainIconWithoutDefault } from "../../../../common/entity/domain_icon"; import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter"; import { handleStructError } from "../../../../common/structs/handle-errors"; import "../../../../components/ha-alert"; @@ -190,7 +192,13 @@ export default class HaAutomationActionRow extends LitElement {

${capitalizeFirstLetter( describeAction(this.hass, this._entityReg, this.action) diff --git a/src/panels/config/automation/action/ha-automation-action.ts b/src/panels/config/automation/action/ha-automation-action.ts index dca4bab6acde..ce312a7bd399 100644 --- a/src/panels/config/automation/action/ha-automation-action.ts +++ b/src/panels/config/automation/action/ha-automation-action.ts @@ -191,6 +191,7 @@ export default class HaAutomationAction extends LitElement { } else if (isService(action)) { actions = this.actions.concat({ service: getService(action), + metadata: {}, }); } else { const elClass = customElements.get( diff --git a/src/translations/en.json b/src/translations/en.json index c176cf65c96a..e771c8fe1910 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2914,6 +2914,7 @@ "description": { "service_based_on_template": "Call a service based on a template on {targets}", "service_based_on_name": "Call a service ''{name}'' on {targets}", + "service_name": "''{name}'' on {targets}", "service": "Call a service", "target_template": "templated {name}", "target_unknown_entity": "unknown entity", From 6f7da16d1d367a354073d5b3d804cfb6103b36e9 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 18:11:34 +0100 Subject: [PATCH 024/361] Use brand icons in actions (#19227) --- src/common/const.ts | 4 ++ .../add-automation-element-dialog.ts | 39 ++++++++++++++++--- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/common/const.ts b/src/common/const.ts index 66c14e64e140..68f4fa97b1c1 100644 --- a/src/common/const.ts +++ b/src/common/const.ts @@ -29,6 +29,7 @@ import { mdiFlash, mdiFlower, mdiFormatListBulleted, + mdiFormatListCheckbox, mdiFormTextbox, mdiGauge, mdiGoogleAssistant, @@ -64,6 +65,7 @@ import { mdiTransmissionTower, mdiWater, mdiWaterPercent, + mdiWeatherPartlyCloudy, mdiWeatherPouring, mdiWeatherRainy, mdiWeatherWindy, @@ -128,6 +130,7 @@ export const FIXED_DOMAIN_ICONS = { updater: mdiCloudUpload, vacuum: mdiRobotVacuum, wake_word: mdiChatSleep, + weather: mdiWeatherPartlyCloudy, zone: mdiMapMarkerRadius, }; @@ -166,6 +169,7 @@ export const FIXED_DEVICE_CLASS_ICONS = { precipitation_intensity: mdiWeatherPouring, pressure: mdiGauge, reactive_power: mdiFlash, + shopping_List: mdiFormatListCheckbox, signal_strength: mdiWifi, sound_pressure: mdiEarHearing, speed: mdiSpeedometer, diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index 31760dca1bc1..0e930b7c9916 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -15,7 +15,7 @@ import { repeat } from "lit/directives/repeat"; import { styleMap } from "lit/directives/style-map"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../../common/dom/fire_event"; -import { domainIcon } from "../../../common/entity/domain_icon"; +import { domainIconWithoutDefault } from "../../../common/entity/domain_icon"; import { shouldHandleRequestSelectedEvent } from "../../../common/mwc/handle-request-selected-event"; import { stringCompare } from "../../../common/string/compare"; import { LocalizeFunc } from "../../../common/translations/localize"; @@ -45,6 +45,7 @@ import { TRIGGER_GROUPS, TRIGGER_ICONS } from "../../../data/trigger"; import { HassDialog } from "../../../dialogs/make-dialog-manager"; import { haStyle, haStyleDialog } from "../../../resources/styles"; import { HomeAssistant } from "../../../types"; +import { brandsUrl } from "../../../util/brands-url"; import { AddAutomationElementDialogParams, PASTE_VALUE, @@ -68,7 +69,8 @@ interface ListItem { key: string; name: string; description: string; - icon: string; + icon?: string; + image?: string; group: boolean; } @@ -309,9 +311,17 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { (!domainUsed && manifest?.integration_type === "entity") || !["helper", "entity"].includes(manifest?.integration_type || ""))) ) { + const icon = domainIconWithoutDefault(domain); result.push({ group: true, - icon: domainIcon(domain), + icon, + image: !icon + ? brandsUrl({ + domain, + type: "icon", + darkOptimized: this.hass.themes?.darkMode, + }) + : undefined, key: `${SERVICE_PREFIX}${domain}`, name: domainToName(localize, domain, manifest), description: "", @@ -345,9 +355,17 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { const services_keys = Object.keys(services[dmn]); for (const service of services_keys) { + const icon = domainIconWithoutDefault(dmn); result.push({ group: false, - icon: domainIcon(dmn), + icon, + image: !icon + ? brandsUrl({ + domain: dmn, + type: "icon", + darkOptimized: this.hass.themes?.darkMode, + }) + : undefined, key: `${SERVICE_PREFIX}${dmn}.${service}`, name: `${domain ? "" : `${domainToName(localize, dmn)}: `}${ this.hass.localize(`component.${dmn}.services.${service}.name`) || @@ -556,7 +574,18 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { > ${item.name} ${item.description} - + ${item.icon + ? html`` + : html``} ${item.group ? html`` : html` Date: Tue, 2 Jan 2024 18:31:18 +0100 Subject: [PATCH 025/361] Change format of service description (#19229) --- src/data/script_i18n.ts | 15 ++++++++++++--- src/translations/en.json | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/data/script_i18n.ts b/src/data/script_i18n.ts index 3d7d8c5a1da4..40c823bc862f 100644 --- a/src/data/script_i18n.ts +++ b/src/data/script_i18n.ts @@ -169,10 +169,19 @@ const tryDescribeAction = ( hass.localize(`component.${domain}.services.${serviceName}.name`) || hass.services[domain][serviceName]?.name; + if (config.metadata) { + return hass.localize( + `${actionTranslationBaseKey}.service.description.service_name`, + { + domain: domainToName(hass.localize, domain), + name: service || config.service, + targets: formatListWithAnds(hass.locale, targets), + } + ); + } + return hass.localize( - `${actionTranslationBaseKey}.service.description.${ - config.metadata ? "service_name" : "service_based_on_name" - }`, + `${actionTranslationBaseKey}.service.description.service_based_on_name`, { name: service ? `${domainToName(hass.localize, domain)}: ${service}` diff --git a/src/translations/en.json b/src/translations/en.json index e771c8fe1910..6ef41c81c129 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2914,7 +2914,7 @@ "description": { "service_based_on_template": "Call a service based on a template on {targets}", "service_based_on_name": "Call a service ''{name}'' on {targets}", - "service_name": "''{name}'' on {targets}", + "service_name": "{domain} ''{name}'' on {targets}", "service": "Call a service", "target_template": "templated {name}", "target_unknown_entity": "unknown entity", From def2eadc24b58e4f4af9bf4bb29ef59614564427 Mon Sep 17 00:00:00 2001 From: Josh McCarty Date: Tue, 2 Jan 2024 10:35:08 -0700 Subject: [PATCH 026/361] Add missing device classes for entity-registry-settings-editor (#19231) * Add connectivity device class for binary sensors * Add update device class * Separate connectivity and update --- src/panels/config/entities/entity-registry-settings-editor.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/panels/config/entities/entity-registry-settings-editor.ts b/src/panels/config/entities/entity-registry-settings-editor.ts index 14d88e12afc7..9e7213e41475 100644 --- a/src/panels/config/entities/entity-registry-settings-editor.ts +++ b/src/panels/config/entities/entity-registry-settings-editor.ts @@ -118,6 +118,8 @@ const OVERRIDE_DEVICE_CLASSES = { "carbon_monoxide", "moisture", ], // Alarm + ["connectivity"], // Connectivity + ["update"], // Update ], }; From 7d6dfaad153d4f587a7dde3a734d282ea1cb3789 Mon Sep 17 00:00:00 2001 From: JLo Date: Tue, 2 Jan 2024 18:39:55 +0100 Subject: [PATCH 027/361] New copy for device trigger in automation editor (#19232) New copy for device trigger in automation editor: "Set of conditions provided by your device. Great way to start." --- src/translations/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations/en.json b/src/translations/en.json index 6ef41c81c129..53306cd8b77d 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2760,7 +2760,7 @@ "preset_mode": "Preset mode" }, "description": { - "picker": "If a device is in a certain state. Great way to start." + "picker": "Set of conditions provided by your device. Great way to start." } }, "not": { From 2add88ccc23d87a92329b3ee07128389ef1c0ed4 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Tue, 2 Jan 2024 05:07:34 -0800 Subject: [PATCH 028/361] Localize a device action string (#19203) --- src/data/script_i18n.ts | 4 +++- src/translations/en.json | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/data/script_i18n.ts b/src/data/script_i18n.ts index 1ba30198bd3e..4b07b84f0ed5 100644 --- a/src/data/script_i18n.ts +++ b/src/data/script_i18n.ts @@ -404,7 +404,9 @@ const tryDescribeAction = ( if (actionType === "device_action") { const config = action as DeviceAction; if (!config.device_id) { - return "Device action"; + return hass.localize( + `${actionTranslationBaseKey}.device_id.description.no_device` + ); } const localized = localizeDeviceAutomationAction( hass, diff --git a/src/translations/en.json b/src/translations/en.json index 0039d9926f56..a3070c0787b1 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2990,7 +2990,8 @@ "flash": "Flash" }, "description": { - "picker": "Do something on a device. Great way to start." + "picker": "Do something on a device. Great way to start.", + "no_device": "Device action" } }, "activate_scene": { From 4fcf99faa7b6735aee1550b785a76df8e633dcca Mon Sep 17 00:00:00 2001 From: JLo Date: Tue, 2 Jan 2024 12:08:05 +0100 Subject: [PATCH 029/361] Review on automation editor text (#19223) - Added `.` to bloc descriptions - Changed "Other" into "OTher triggers" "Other conditions" and "Other actions" - Adapted a few descriptions --- src/translations/en.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/translations/en.json b/src/translations/en.json index a3070c0787b1..c176cf65c96a 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2492,13 +2492,13 @@ "groups": { "entity": { "label": "Entity", - "description": "When something happens to an entity" + "description": "When something happens to an entity." }, "time_location": { "label": "Time and location", "description": "When someone enters or leaves a zone, or at a specific time." }, - "other": { "label": "Other" } + "other": { "label": "Other triggers" } }, "type": { "calendar": { @@ -2534,7 +2534,7 @@ "context_user_picked": "User firing event", "context_user_pick": "Select user", "description": { - "picker": "When an event is being received (event is an advanced concept in Home Assistant)", + "picker": "When an event is being received (event is an advanced concept in Home Assistant).", "full": "When {eventTypes} event is fired" } }, @@ -2546,7 +2546,7 @@ "enter": "Enter", "leave": "Leave", "description": { - "picker": "When an entity created by a geolocation platform appears in or disappears from a zone", + "picker": "When an entity created by a geolocation platform appears in or disappears from a zone.", "full": "When {source} {event, select, \n enter {enters}\n leave {leaves} other {} \n} {zone} {numberOfZones, plural,\n one {zone}\n other {zones}\n}" } }, @@ -2608,7 +2608,7 @@ "updated": "updated" }, "description": { - "picker": "When a persistent notification is added or removed", + "picker": "When a persistent notification is added or removed.", "full": "When a persistent notification is updated" } }, @@ -2619,7 +2619,7 @@ "sunset": "Sunset", "offset": "Offset (optional)", "description": { - "picker": "When the sun sets or rises", + "picker": "When the sun sets or rises.", "sets": "When the sun sets{hasDuration, select, \n true { offset by {duration}} \n other {}\n }", "rises": "When the sun rises{hasDuration, select, \n true { offset by {duration}} \n other {}\n }" } @@ -2648,7 +2648,7 @@ "value_template": "Value template", "for": "For", "description": { - "picker": "When a template is evaluated to true.", + "picker": "When a template evaluates to true.", "full": "When a template changes from false to true{hasDuration, select, \n true { for {duration}} \n other {}\n }" } }, @@ -2669,7 +2669,7 @@ "minutes": "Minutes", "seconds": "Seconds", "description": { - "picker": "Periodically, every defined interval of time." + "picker": "Periodically, at a defined interval." } }, "webhook": { @@ -2692,7 +2692,7 @@ "enter": "Enter", "leave": "Leave", "description": { - "picker": "When someone (or something) enters or leaves a zone", + "picker": "When someone (or something) enters or leaves a zone.", "full": "When {entity} {event, select, \n enter {enters}\n leave {leaves} other {} \n} {zone} {numberOfZones, plural,\n one {zone} \n other {zones}\n}" } } @@ -2734,7 +2734,7 @@ "label": "Time and location", "description": "If someone is in a zone or if the current time is before or after a specified time." }, - "other": { "label": "Other" }, + "other": { "label": "Other conditions" }, "building_blocks": { "label": "Building blocks", "description": "Build more complex conditions." @@ -2766,7 +2766,7 @@ "not": { "label": "Not", "description": { - "picker": "Test if a condition is not true", + "picker": "Test if a condition is not true.", "no_conditions": "Test if no condition matches", "one_condition": "Test if 1 condition does not match", "full": "Test if none of {count} conditions match" @@ -2800,7 +2800,7 @@ "label": "[%key:ui::panel::config::automation::editor::triggers::type::state::label%]", "state": "[%key:ui::panel::config::automation::editor::triggers::type::state::label%]", "description": { - "picker": "If an entity (or attribute) is in a specific state", + "picker": "If an entity (or attribute) is in a specific state.", "no_entity": "Confirm state", "full": "Confirm{hasAttribute, select, \n true { {attribute} of}\n other {}\n} {numberOfEntities, plural,\n zero {an entity is}\n one {{entities} is}\n other {{entities} are}\n} {numberOfStates, plural,\n zero {a state}\n other {{states}}\n}{hasDuration, select, \n true { for {duration}} \n other {}\n }" } @@ -2821,7 +2821,7 @@ "label": "[%key:ui::panel::config::automation::editor::triggers::type::template::label%]", "value_template": "[%key:ui::panel::config::automation::editor::triggers::type::template::value_template%]", "description": { - "picker": "If a template is evaluated to true.", + "picker": "If a template evaluates to true.", "full": "Test if template renders a value equal to true" } }, @@ -2844,7 +2844,7 @@ "sun": "Sunday" }, "description": { - "picker": "If the current time is before or after a specified time", + "picker": "If the current time is before or after a specified time.", "full": "Confirm the {hasTime, select, \n after {time is after {time_after}}\n before {time is before {time_before}}\n after_before {time is after {time_after} and before {time_before}} \n other {}\n }{hasTimeAndDay, select, \n true { and the }\n other {}\n}{hasDay, select, \n true { day is {day}}\n other {}\n}" } }, @@ -2862,7 +2862,7 @@ "entity": "[%key:ui::panel::config::automation::editor::triggers::type::zone::entity%]", "zone": "[%key:ui::panel::config::automation::editor::triggers::type::zone::label%]", "description": { - "picker": "If someone (or something) is in a zone", + "picker": "If someone (or something) is in a zone.", "full": "Confirm {entity} {numberOfEntities, plural,\n one {is}\n other {are}\n} in {zone} {numberOfZones, plural,\n one {zone} \n other {zones}\n} " } } @@ -2899,7 +2899,7 @@ "continue_on_error": "Continue on error", "groups": { "helpers": { "label": "Helpers" }, - "other": { "label": "Other" }, + "other": { "label": "Other actions" }, "building_blocks": { "label": "Building blocks", "description": "Build more complex sequences of actions." @@ -3070,14 +3070,14 @@ "response_variable": "The name of the variable to use as response", "error": "Stop because of an unexpected error", "description": { - "picker": "Stop the sequence of actions", + "picker": "Stop the sequence of actions.", "full": "Stop {hasReason, select, \n true { because: {reason}} \n other {}\n }" } }, "parallel": { "label": "Run in parallel", "description": { - "picker": "perform a sequence of actions in parallel.", + "picker": "Perform a sequence of actions in parallel.", "full": "Run {number} {number, plural,\n one {action}\n other {actions}\n} in parallel" } }, From f099f66065ead07852d268773eecb468523550eb Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 13:36:06 +0100 Subject: [PATCH 030/361] Automation editor tweaks (#19225) * Automation editor tweaks * fix styling --- src/data/condition.ts | 1 - .../add-automation-element-dialog.ts | 145 +++++++++++++----- .../condition/ha-automation-condition.ts | 1 + .../types/ha-automation-condition-device.ts | 1 + .../show-add-automation-element-dialog.ts | 1 + .../types/ha-automation-trigger-device.ts | 1 + 6 files changed, 108 insertions(+), 42 deletions(-) diff --git a/src/data/condition.ts b/src/data/condition.ts index 44a0e218609c..d8c7af44fecc 100644 --- a/src/data/condition.ts +++ b/src/data/condition.ts @@ -46,7 +46,6 @@ export const CONDITION_GROUPS: AutomationElementGroup = { icon: mdiDotsHorizontal, members: { template: {}, - trigger: {}, }, }, } as const; diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index b96283a61dd8..31760dca1bc1 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -1,7 +1,14 @@ import "@material/mwc-list/mwc-list"; import { mdiClose, mdiContentPaste, mdiPlus } from "@mdi/js"; import Fuse, { IFuseOptions } from "fuse.js"; -import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; +import { + CSSResultGroup, + LitElement, + PropertyValues, + css, + html, + nothing, +} from "lit"; import { customElement, property, query, state } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; import { repeat } from "lit/directives/repeat"; @@ -42,6 +49,8 @@ import { AddAutomationElementDialogParams, PASTE_VALUE, } from "./show-add-automation-element-dialog"; +import { computeDomain } from "../../../common/entity/compute_domain"; +import { deepEqual } from "../../../common/util/deep-equal"; const TYPES = { trigger: { groups: TRIGGER_GROUPS, icons: TRIGGER_ICONS }, @@ -93,13 +102,15 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { @state() private _manifests?: DomainManifestLookup; + @state() private _domains?: Set; + @query("ha-dialog") private _dialog?: HaDialog; private _fullScreen = false; - private _width?: number; + @state() private _width?: number; - private _height?: number; + @state() private _height?: number; public showDialog(params): void { this._params = params; @@ -124,6 +135,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { this._prev = undefined; this._filter = ""; this._manifests = undefined; + this._domains = undefined; } private _convertToItem = ( @@ -152,6 +164,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { private _getFilteredItems = memoizeOne( ( type: AddAutomationElementDialogParams["type"], + root: AddAutomationElementDialogParams["root"], group: string | undefined, filter: string, localize: LocalizeFunc, @@ -164,6 +177,10 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { : TYPES[type].groups[group].members! : TYPES[type].groups; + if (type === "condition" && group === "other" && !root) { + groups.trigger = {}; + } + const flattenGroups = (grp: AutomationElementGroup) => Object.entries(grp).map(([key, options]) => options.members @@ -191,7 +208,9 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { private _getGroupItems = memoizeOne( ( type: AddAutomationElementDialogParams["type"], + root: AddAutomationElementDialogParams["root"], group: string | undefined, + domains: Set | undefined, localize: LocalizeFunc, services: HomeAssistant["services"], manifests?: DomainManifestLookup @@ -208,6 +227,10 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { ? TYPES[type].groups[group].members! : TYPES[type].groups; + if (type === "condition" && group === "other" && !root) { + groups.trigger = {}; + } + const result = Object.entries(groups).map(([key, options]) => this._convertToItem(key, options, type, localize) ); @@ -215,15 +238,33 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { if (type === "action") { if (!this._group) { result.unshift( - ...this._serviceGroups(localize, services, manifests, undefined) + ...this._serviceGroups( + localize, + services, + manifests, + domains, + undefined + ) ); } else if (this._group === "helpers") { result.unshift( - ...this._serviceGroups(localize, services, manifests, "helper") + ...this._serviceGroups( + localize, + services, + manifests, + domains, + "helper" + ) ); } else if (this._group === "other") { result.unshift( - ...this._serviceGroups(localize, services, manifests, "other") + ...this._serviceGroups( + localize, + services, + manifests, + domains, + "other" + ) ); } } @@ -243,42 +284,44 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { } ); - private _serviceGroups = memoizeOne( - ( - localize: LocalizeFunc, - services: HomeAssistant["services"], - manifests: DomainManifestLookup | undefined, - type: "helper" | "other" | undefined - ): ListItem[] => { - if (!services || !manifests) { - return []; - } - const result: ListItem[] = []; - Object.keys(services).forEach((domain) => { - const manifest = manifests[domain]; - if ( - (type === undefined && - manifest?.integration_type === "entity" && - !ENTITY_DOMAINS_OTHER.has(domain)) || - (type === "helper" && manifest?.integration_type === "helper") || - (type === "other" && - (ENTITY_DOMAINS_OTHER.has(domain) || - !["helper", "entity"].includes(manifest?.integration_type || ""))) - ) { - result.push({ - group: true, - icon: domainIcon(domain), - key: `${SERVICE_PREFIX}${domain}`, - name: domainToName(localize, domain, manifest), - description: "", - }); - } - }); - return result.sort((a, b) => - stringCompare(a.name, b.name, this.hass.locale.language) - ); + private _serviceGroups = ( + localize: LocalizeFunc, + services: HomeAssistant["services"], + manifests: DomainManifestLookup | undefined, + domains: Set | undefined, + type: "helper" | "other" | undefined + ): ListItem[] => { + if (!services || !manifests) { + return []; } - ); + const result: ListItem[] = []; + Object.keys(services).forEach((domain) => { + const manifest = manifests[domain]; + const domainUsed = !domains ? true : domains.has(domain); + if ( + (type === undefined && + manifest?.integration_type === "entity" && + domainUsed && + !ENTITY_DOMAINS_OTHER.has(domain)) || + (type === "helper" && manifest?.integration_type === "helper") || + (type === "other" && + (ENTITY_DOMAINS_OTHER.has(domain) || + (!domainUsed && manifest?.integration_type === "entity") || + !["helper", "entity"].includes(manifest?.integration_type || ""))) + ) { + result.push({ + group: true, + icon: domainIcon(domain), + key: `${SERVICE_PREFIX}${domain}`, + name: domainToName(localize, domain, manifest), + description: "", + }); + } + }); + return result.sort((a, b) => + stringCompare(a.name, b.name, this.hass.locale.language) + ); + }; private _services = memoizeOne( ( @@ -368,6 +411,19 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { this._height = boundingRect?.height; } + protected willUpdate(changedProperties: PropertyValues): void { + if ( + this._params?.type === "action" && + changedProperties.has("hass") && + changedProperties.get("hass")?.states !== this.hass.states + ) { + const domains = new Set(Object.keys(this.hass.states).map(computeDomain)); + if (!deepEqual(domains, this._domains)) { + this._domains = domains; + } + } + } + protected render() { if (!this._params) { return nothing; @@ -376,6 +432,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { const items = this._filter ? this._getFilteredItems( this._params.type, + this._params.root, this._group, this._filter, this.hass.localize, @@ -384,7 +441,9 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { ) : this._getGroupItems( this._params.type, + this._params.root, this._group, + this._domains, this.hass.localize, this.hass.services, this._manifests @@ -562,6 +621,10 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { ha-icon-next { width: 24px; } + mwc-list { + max-height: 468px; + max-width: 100vw; + } search-input { display: block; margin: 0 16px; diff --git a/src/panels/config/automation/condition/ha-automation-condition.ts b/src/panels/config/automation/condition/ha-automation-condition.ts index 27364b92a3ed..ecf4f8823770 100644 --- a/src/panels/config/automation/condition/ha-automation-condition.ts +++ b/src/panels/config/automation/condition/ha-automation-condition.ts @@ -203,6 +203,7 @@ export default class HaAutomationCondition extends LitElement { showAddAutomationElementDialog(this, { type: "condition", add: this._addCondition, + root: !this.nested, clipboardItem: this._clipboard?.condition?.condition, }); } diff --git a/src/panels/config/automation/condition/types/ha-automation-condition-device.ts b/src/panels/config/automation/condition/types/ha-automation-condition-device.ts index 71568fe02c10..4593a5f70123 100644 --- a/src/panels/config/automation/condition/types/ha-automation-condition-device.ts +++ b/src/panels/config/automation/condition/types/ha-automation-condition-device.ts @@ -168,6 +168,7 @@ export class HaDeviceCondition extends LitElement { } ha-form { + display: block; margin-top: 24px; } `; diff --git a/src/panels/config/automation/show-add-automation-element-dialog.ts b/src/panels/config/automation/show-add-automation-element-dialog.ts index c497ca85c620..55453505121d 100644 --- a/src/panels/config/automation/show-add-automation-element-dialog.ts +++ b/src/panels/config/automation/show-add-automation-element-dialog.ts @@ -6,6 +6,7 @@ export interface AddAutomationElementDialogParams { type: "trigger" | "condition" | "action"; add: (key: string) => void; clipboardItem: string | undefined; + root?: boolean; group?: string; } const loadDialog = () => import("./add-automation-element-dialog"); diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts index 8b3a63575220..1b94ff6138b2 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts @@ -174,6 +174,7 @@ export class HaDeviceTrigger extends LitElement { } ha-form { + display: block; margin-top: 24px; } `; From c125ec087a11c0b584a85b10b6907cae764c9e73 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 16:08:26 +0100 Subject: [PATCH 031/361] Remove references to "service call" from actions (#19226) --- src/components/ha-service-control.ts | 28 ++++++++++++++----- src/data/script.ts | 2 ++ src/data/script_i18n.ts | 5 +++- .../action/ha-automation-action-row.ts | 10 ++++++- .../automation/action/ha-automation-action.ts | 1 + src/translations/en.json | 1 + 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/components/ha-service-control.ts b/src/components/ha-service-control.ts index f1ae8ee54bac..119418355c64 100644 --- a/src/components/ha-service-control.ts +++ b/src/components/ha-service-control.ts @@ -4,7 +4,14 @@ import { HassServices, HassServiceTarget, } from "home-assistant-js-websocket"; -import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit"; +import { + css, + CSSResultGroup, + html, + LitElement, + PropertyValues, + nothing, +} from "lit"; import { customElement, property, query, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { ensureArray } from "../common/array/ensure-array"; @@ -83,6 +90,8 @@ export class HaServiceControl extends LitElement { @property({ type: Boolean }) public showAdvanced?: boolean; + @property({ type: Boolean, reflect: true }) public hidePicker?: boolean; + @state() private _value!: this["value"]; @state() private _checkedKeys = new Set(); @@ -363,12 +372,14 @@ export class HaServiceControl extends LitElement { )) || serviceData?.description; - return html` + return html`${this.hidePicker + ? nothing + : html``}
${description ? html`

${description}

` : ""} ${this._manifest @@ -735,6 +746,9 @@ export class HaServiceControl extends LitElement { margin: var(--service-control-padding, 0 16px); padding: 16px 0; } + :host([hidePicker]) p { + padding-top: 0; + } .checkbox-spacer { width: 32px; } diff --git a/src/data/script.ts b/src/data/script.ts index f0b5e7151b51..08910dc88fcb 100644 --- a/src/data/script.ts +++ b/src/data/script.ts @@ -52,6 +52,7 @@ export const serviceActionStruct: Describe = assign( target: optional(targetStruct), data: optional(object()), response_variable: optional(string()), + metadata: optional(object()), }) ); @@ -133,6 +134,7 @@ export interface ServiceAction extends BaseAction { target?: HassServiceTarget; data?: Record; response_variable?: string; + metadata?: Record; } export interface DeviceAction extends BaseAction { diff --git a/src/data/script_i18n.ts b/src/data/script_i18n.ts index 4b07b84f0ed5..3d7d8c5a1da4 100644 --- a/src/data/script_i18n.ts +++ b/src/data/script_i18n.ts @@ -168,8 +168,11 @@ const tryDescribeAction = ( const service = hass.localize(`component.${domain}.services.${serviceName}.name`) || hass.services[domain][serviceName]?.name; + return hass.localize( - `${actionTranslationBaseKey}.service.description.service_based_on_name`, + `${actionTranslationBaseKey}.service.description.${ + config.metadata ? "service_name" : "service_based_on_name" + }`, { name: service ? `${domainToName(hass.localize, domain)}: ${service}` diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts index f09c901c8e1a..0e58c0e8b2b5 100644 --- a/src/panels/config/automation/action/ha-automation-action-row.ts +++ b/src/panels/config/automation/action/ha-automation-action-row.ts @@ -29,6 +29,8 @@ import { classMap } from "lit/directives/class-map"; import { storage } from "../../../../common/decorators/storage"; import { dynamicElement } from "../../../../common/dom/dynamic-element-directive"; import { fireEvent } from "../../../../common/dom/fire_event"; +import { computeDomain } from "../../../../common/entity/compute_domain"; +import { domainIconWithoutDefault } from "../../../../common/entity/domain_icon"; import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter"; import { handleStructError } from "../../../../common/structs/handle-errors"; import "../../../../components/ha-alert"; @@ -190,7 +192,13 @@ export default class HaAutomationActionRow extends LitElement {

${capitalizeFirstLetter( describeAction(this.hass, this._entityReg, this.action) diff --git a/src/panels/config/automation/action/ha-automation-action.ts b/src/panels/config/automation/action/ha-automation-action.ts index dca4bab6acde..ce312a7bd399 100644 --- a/src/panels/config/automation/action/ha-automation-action.ts +++ b/src/panels/config/automation/action/ha-automation-action.ts @@ -191,6 +191,7 @@ export default class HaAutomationAction extends LitElement { } else if (isService(action)) { actions = this.actions.concat({ service: getService(action), + metadata: {}, }); } else { const elClass = customElements.get( diff --git a/src/translations/en.json b/src/translations/en.json index c176cf65c96a..e771c8fe1910 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2914,6 +2914,7 @@ "description": { "service_based_on_template": "Call a service based on a template on {targets}", "service_based_on_name": "Call a service ''{name}'' on {targets}", + "service_name": "''{name}'' on {targets}", "service": "Call a service", "target_template": "templated {name}", "target_unknown_entity": "unknown entity", From f2226cdec24760fce2172978f97a07b609675372 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 18:11:34 +0100 Subject: [PATCH 032/361] Use brand icons in actions (#19227) --- src/common/const.ts | 4 ++ .../add-automation-element-dialog.ts | 39 ++++++++++++++++--- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/common/const.ts b/src/common/const.ts index 66c14e64e140..68f4fa97b1c1 100644 --- a/src/common/const.ts +++ b/src/common/const.ts @@ -29,6 +29,7 @@ import { mdiFlash, mdiFlower, mdiFormatListBulleted, + mdiFormatListCheckbox, mdiFormTextbox, mdiGauge, mdiGoogleAssistant, @@ -64,6 +65,7 @@ import { mdiTransmissionTower, mdiWater, mdiWaterPercent, + mdiWeatherPartlyCloudy, mdiWeatherPouring, mdiWeatherRainy, mdiWeatherWindy, @@ -128,6 +130,7 @@ export const FIXED_DOMAIN_ICONS = { updater: mdiCloudUpload, vacuum: mdiRobotVacuum, wake_word: mdiChatSleep, + weather: mdiWeatherPartlyCloudy, zone: mdiMapMarkerRadius, }; @@ -166,6 +169,7 @@ export const FIXED_DEVICE_CLASS_ICONS = { precipitation_intensity: mdiWeatherPouring, pressure: mdiGauge, reactive_power: mdiFlash, + shopping_List: mdiFormatListCheckbox, signal_strength: mdiWifi, sound_pressure: mdiEarHearing, speed: mdiSpeedometer, diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index 31760dca1bc1..0e930b7c9916 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -15,7 +15,7 @@ import { repeat } from "lit/directives/repeat"; import { styleMap } from "lit/directives/style-map"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../../common/dom/fire_event"; -import { domainIcon } from "../../../common/entity/domain_icon"; +import { domainIconWithoutDefault } from "../../../common/entity/domain_icon"; import { shouldHandleRequestSelectedEvent } from "../../../common/mwc/handle-request-selected-event"; import { stringCompare } from "../../../common/string/compare"; import { LocalizeFunc } from "../../../common/translations/localize"; @@ -45,6 +45,7 @@ import { TRIGGER_GROUPS, TRIGGER_ICONS } from "../../../data/trigger"; import { HassDialog } from "../../../dialogs/make-dialog-manager"; import { haStyle, haStyleDialog } from "../../../resources/styles"; import { HomeAssistant } from "../../../types"; +import { brandsUrl } from "../../../util/brands-url"; import { AddAutomationElementDialogParams, PASTE_VALUE, @@ -68,7 +69,8 @@ interface ListItem { key: string; name: string; description: string; - icon: string; + icon?: string; + image?: string; group: boolean; } @@ -309,9 +311,17 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { (!domainUsed && manifest?.integration_type === "entity") || !["helper", "entity"].includes(manifest?.integration_type || ""))) ) { + const icon = domainIconWithoutDefault(domain); result.push({ group: true, - icon: domainIcon(domain), + icon, + image: !icon + ? brandsUrl({ + domain, + type: "icon", + darkOptimized: this.hass.themes?.darkMode, + }) + : undefined, key: `${SERVICE_PREFIX}${domain}`, name: domainToName(localize, domain, manifest), description: "", @@ -345,9 +355,17 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { const services_keys = Object.keys(services[dmn]); for (const service of services_keys) { + const icon = domainIconWithoutDefault(dmn); result.push({ group: false, - icon: domainIcon(dmn), + icon, + image: !icon + ? brandsUrl({ + domain: dmn, + type: "icon", + darkOptimized: this.hass.themes?.darkMode, + }) + : undefined, key: `${SERVICE_PREFIX}${dmn}.${service}`, name: `${domain ? "" : `${domainToName(localize, dmn)}: `}${ this.hass.localize(`component.${dmn}.services.${service}.name`) || @@ -556,7 +574,18 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { > ${item.name} ${item.description} - + ${item.icon + ? html`` + : html``} ${item.group ? html`` : html` Date: Tue, 2 Jan 2024 18:31:18 +0100 Subject: [PATCH 033/361] Change format of service description (#19229) --- src/data/script_i18n.ts | 15 ++++++++++++--- src/translations/en.json | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/data/script_i18n.ts b/src/data/script_i18n.ts index 3d7d8c5a1da4..40c823bc862f 100644 --- a/src/data/script_i18n.ts +++ b/src/data/script_i18n.ts @@ -169,10 +169,19 @@ const tryDescribeAction = ( hass.localize(`component.${domain}.services.${serviceName}.name`) || hass.services[domain][serviceName]?.name; + if (config.metadata) { + return hass.localize( + `${actionTranslationBaseKey}.service.description.service_name`, + { + domain: domainToName(hass.localize, domain), + name: service || config.service, + targets: formatListWithAnds(hass.locale, targets), + } + ); + } + return hass.localize( - `${actionTranslationBaseKey}.service.description.${ - config.metadata ? "service_name" : "service_based_on_name" - }`, + `${actionTranslationBaseKey}.service.description.service_based_on_name`, { name: service ? `${domainToName(hass.localize, domain)}: ${service}` diff --git a/src/translations/en.json b/src/translations/en.json index e771c8fe1910..6ef41c81c129 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2914,7 +2914,7 @@ "description": { "service_based_on_template": "Call a service based on a template on {targets}", "service_based_on_name": "Call a service ''{name}'' on {targets}", - "service_name": "''{name}'' on {targets}", + "service_name": "{domain} ''{name}'' on {targets}", "service": "Call a service", "target_template": "templated {name}", "target_unknown_entity": "unknown entity", From 18b5fd59a629268bce2d5d7aa6e7fd390e1d6ab1 Mon Sep 17 00:00:00 2001 From: Josh McCarty Date: Tue, 2 Jan 2024 10:35:08 -0700 Subject: [PATCH 034/361] Add missing device classes for entity-registry-settings-editor (#19231) * Add connectivity device class for binary sensors * Add update device class * Separate connectivity and update --- src/panels/config/entities/entity-registry-settings-editor.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/panels/config/entities/entity-registry-settings-editor.ts b/src/panels/config/entities/entity-registry-settings-editor.ts index 14d88e12afc7..9e7213e41475 100644 --- a/src/panels/config/entities/entity-registry-settings-editor.ts +++ b/src/panels/config/entities/entity-registry-settings-editor.ts @@ -118,6 +118,8 @@ const OVERRIDE_DEVICE_CLASSES = { "carbon_monoxide", "moisture", ], // Alarm + ["connectivity"], // Connectivity + ["update"], // Update ], }; From 01bd88ce101c1c0909c093d55afdaab1cd24073d Mon Sep 17 00:00:00 2001 From: JLo Date: Tue, 2 Jan 2024 18:39:55 +0100 Subject: [PATCH 035/361] New copy for device trigger in automation editor (#19232) New copy for device trigger in automation editor: "Set of conditions provided by your device. Great way to start." --- src/translations/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations/en.json b/src/translations/en.json index 6ef41c81c129..53306cd8b77d 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2760,7 +2760,7 @@ "preset_mode": "Preset mode" }, "description": { - "picker": "If a device is in a certain state. Great way to start." + "picker": "Set of conditions provided by your device. Great way to start." } }, "not": { From f994b378f1be438ae46730412b1cc6109ee71490 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 18:47:39 +0100 Subject: [PATCH 036/361] Update add-automation-element-dialog.ts --- src/panels/config/automation/add-automation-element-dialog.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index 0e930b7c9916..d498e8375cd8 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -528,7 +528,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { rootTabbable style=${styleMap({ width: this._width ? `${this._width}px` : "auto", - height: this._height ? `${Math.min(468, this._height)}px` : "auto", + height: this._height ? `${Math.min(670, this._height)}px` : "auto", })} > ${this._params.clipboardItem && @@ -651,7 +651,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { width: 24px; } mwc-list { - max-height: 468px; + max-height: 670px; max-width: 100vw; } search-input { From 8d496e1511c0ed56116da4829141239ef92e0423 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 18:47:39 +0100 Subject: [PATCH 037/361] Update add-automation-element-dialog.ts --- src/panels/config/automation/add-automation-element-dialog.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index 0e930b7c9916..d498e8375cd8 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -528,7 +528,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { rootTabbable style=${styleMap({ width: this._width ? `${this._width}px` : "auto", - height: this._height ? `${Math.min(468, this._height)}px` : "auto", + height: this._height ? `${Math.min(670, this._height)}px` : "auto", })} > ${this._params.clipboardItem && @@ -651,7 +651,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { width: 24px; } mwc-list { - max-height: 468px; + max-height: 670px; max-width: 100vw; } search-input { From 5eaa6dafd902b2abdce044bb67fe772ad36cd573 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 18:48:34 +0100 Subject: [PATCH 038/361] Give todo and calendar edit static header (#19233) --- src/panels/calendar/dialog-calendar-event-editor.ts | 6 +++--- src/panels/todo/dialog-todo-item-editor.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts index 7c06cac92cf1..e5925b1243e2 100644 --- a/src/panels/calendar/dialog-calendar-event-editor.ts +++ b/src/panels/calendar/dialog-calendar-event-editor.ts @@ -144,9 +144,9 @@ class DialogCalendarEventEditor extends LitElement { escapeKeyAction .heading=${createCloseHeading( this.hass, - isCreate - ? this.hass.localize("ui.components.calendar.event.add") - : this._summary + this.hass.localize( + `ui.components.calendar.event.${isCreate ? "add" : "edit"}` + ) )} >
diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts index c81b9e4dbec3..cd26ad35fc28 100644 --- a/src/panels/todo/dialog-todo-item-editor.ts +++ b/src/panels/todo/dialog-todo-item-editor.ts @@ -101,9 +101,9 @@ class DialogTodoItemEditor extends LitElement { scrimClickAction .heading=${createCloseHeading( this.hass, - isCreate - ? this.hass.localize("ui.components.todo.item.add") - : this._summary + this.hass.localize( + `ui.components.todo.item.${isCreate ? "add" : "edit"}` + ) )} >
From de3b9a5bb2a847cc7353ec9e960a83363b57ba25 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 18:48:34 +0100 Subject: [PATCH 039/361] Give todo and calendar edit static header (#19233) --- src/panels/calendar/dialog-calendar-event-editor.ts | 6 +++--- src/panels/todo/dialog-todo-item-editor.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts index 7c06cac92cf1..e5925b1243e2 100644 --- a/src/panels/calendar/dialog-calendar-event-editor.ts +++ b/src/panels/calendar/dialog-calendar-event-editor.ts @@ -144,9 +144,9 @@ class DialogCalendarEventEditor extends LitElement { escapeKeyAction .heading=${createCloseHeading( this.hass, - isCreate - ? this.hass.localize("ui.components.calendar.event.add") - : this._summary + this.hass.localize( + `ui.components.calendar.event.${isCreate ? "add" : "edit"}` + ) )} >
diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts index c81b9e4dbec3..cd26ad35fc28 100644 --- a/src/panels/todo/dialog-todo-item-editor.ts +++ b/src/panels/todo/dialog-todo-item-editor.ts @@ -101,9 +101,9 @@ class DialogTodoItemEditor extends LitElement { scrimClickAction .heading=${createCloseHeading( this.hass, - isCreate - ? this.hass.localize("ui.components.todo.item.add") - : this._summary + this.hass.localize( + `ui.components.todo.item.${isCreate ? "add" : "edit"}` + ) )} >
From 7d412a9913defcf67b59d04ea49c7eebf497d745 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 18:49:31 +0100 Subject: [PATCH 040/361] Bumped version to 20240102.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d1e5abd3d1c4..7d09a1121ede 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240101.0" +version = "20240102.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 53dedc6c6587b2eeb9f76b53f55ccb5129e99612 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 18:49:31 +0100 Subject: [PATCH 041/361] Bumped version to 20240102.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d1e5abd3d1c4..7d09a1121ede 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240101.0" +version = "20240102.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 2933d642edfb5250b140e8154d6ff15eccf4f902 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 13:55:44 -0500 Subject: [PATCH 042/361] Update dependency @bundle-stats/plugin-webpack-filter to v4.8.4 (#19230) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7b3ad9c6a114..663a412014d2 100644 --- a/package.json +++ b/package.json @@ -156,7 +156,7 @@ "@babel/plugin-transform-runtime": "7.23.7", "@babel/preset-env": "7.23.7", "@babel/preset-typescript": "7.23.3", - "@bundle-stats/plugin-webpack-filter": "4.8.3", + "@bundle-stats/plugin-webpack-filter": "4.8.4", "@koa/cors": "5.0.0", "@lokalise/node-api": "12.1.0", "@octokit/auth-oauth-device": "6.0.1", diff --git a/yarn.lock b/yarn.lock index dd2a90537271..2f9b96e6b6ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1448,12 +1448,12 @@ __metadata: languageName: node linkType: hard -"@bundle-stats/plugin-webpack-filter@npm:4.8.3": - version: 4.8.3 - resolution: "@bundle-stats/plugin-webpack-filter@npm:4.8.3" +"@bundle-stats/plugin-webpack-filter@npm:4.8.4": + version: 4.8.4 + resolution: "@bundle-stats/plugin-webpack-filter@npm:4.8.4" peerDependencies: core-js: ^3.0.0 - checksum: a832be786197b0cd534e4ccb35cd7230f322b2b77697f5f4ac0b098e51f7867bff0364020f6015d31f2963619e1408933454841baac035452a9fec37d921f841 + checksum: 7a33a19094fb32579ca215cfee7c536a7e524558e6a17bee0376377691b4957bd1346531dfe3b01e8daf364acef75e1926f3d1aed76d986be79ba374157782fb languageName: node linkType: hard @@ -9519,7 +9519,7 @@ __metadata: "@babel/preset-typescript": "npm:7.23.3" "@babel/runtime": "npm:7.23.7" "@braintree/sanitize-url": "npm:7.0.0" - "@bundle-stats/plugin-webpack-filter": "npm:4.8.3" + "@bundle-stats/plugin-webpack-filter": "npm:4.8.4" "@codemirror/autocomplete": "npm:6.11.1" "@codemirror/commands": "npm:6.3.2" "@codemirror/language": "npm:6.9.3" From e72148175725b29a28dc216fd3eeb4d28c11729b Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 19:58:37 +0100 Subject: [PATCH 043/361] Move notification services to main list (#19235) --- .../config/automation/add-automation-element-dialog.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index d498e8375cd8..06a77884f1c6 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -90,6 +90,8 @@ const ENTITY_DOMAINS_OTHER = new Set([ "image_processing", ]); +const ENTITY_DOMAINS_MAIN = new Set(["notify"]); + @customElement("add-automation-element-dialog") class DialogAddAutomationElement extends LitElement implements HassDialog { @property({ attribute: false }) public hass!: HomeAssistant; @@ -302,11 +304,13 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { const domainUsed = !domains ? true : domains.has(domain); if ( (type === undefined && - manifest?.integration_type === "entity" && - domainUsed && - !ENTITY_DOMAINS_OTHER.has(domain)) || + (ENTITY_DOMAINS_MAIN.has(domain) || + (manifest?.integration_type === "entity" && + domainUsed && + !ENTITY_DOMAINS_OTHER.has(domain)))) || (type === "helper" && manifest?.integration_type === "helper") || (type === "other" && + !ENTITY_DOMAINS_MAIN.has(domain) && (ENTITY_DOMAINS_OTHER.has(domain) || (!domainUsed && manifest?.integration_type === "entity") || !["helper", "entity"].includes(manifest?.integration_type || ""))) From 8a8b04ed004a3927ead29d5b80e7689d8f73951f Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Tue, 2 Jan 2024 20:00:19 +0100 Subject: [PATCH 044/361] Set default values for required and disabled for labeled slider (#19246) Set default values --- src/components/ha-labeled-slider.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ha-labeled-slider.ts b/src/components/ha-labeled-slider.ts index 366eb4f5555c..5faf7a8b96b2 100644 --- a/src/components/ha-labeled-slider.ts +++ b/src/components/ha-labeled-slider.ts @@ -10,9 +10,9 @@ class HaLabeledSlider extends LitElement { @property() public caption?: string; - @property() public disabled?: boolean; + @property({ type: Boolean }) public disabled = false; - @property() public required?: boolean; + @property({ type: Boolean }) public required = true; @property() public min: number = 0; From 7354988ec96e1abf1e96dc4df755cf4ea0c4e599 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Jan 2024 19:58:37 +0100 Subject: [PATCH 045/361] Move notification services to main list (#19235) --- .../config/automation/add-automation-element-dialog.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index d498e8375cd8..06a77884f1c6 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -90,6 +90,8 @@ const ENTITY_DOMAINS_OTHER = new Set([ "image_processing", ]); +const ENTITY_DOMAINS_MAIN = new Set(["notify"]); + @customElement("add-automation-element-dialog") class DialogAddAutomationElement extends LitElement implements HassDialog { @property({ attribute: false }) public hass!: HomeAssistant; @@ -302,11 +304,13 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { const domainUsed = !domains ? true : domains.has(domain); if ( (type === undefined && - manifest?.integration_type === "entity" && - domainUsed && - !ENTITY_DOMAINS_OTHER.has(domain)) || + (ENTITY_DOMAINS_MAIN.has(domain) || + (manifest?.integration_type === "entity" && + domainUsed && + !ENTITY_DOMAINS_OTHER.has(domain)))) || (type === "helper" && manifest?.integration_type === "helper") || (type === "other" && + !ENTITY_DOMAINS_MAIN.has(domain) && (ENTITY_DOMAINS_OTHER.has(domain) || (!domainUsed && manifest?.integration_type === "entity") || !["helper", "entity"].includes(manifest?.integration_type || ""))) From c2f3e43ee50fcabd26254ebd3412217b6f49a045 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Tue, 2 Jan 2024 20:00:19 +0100 Subject: [PATCH 046/361] Set default values for required and disabled for labeled slider (#19246) Set default values --- src/components/ha-labeled-slider.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ha-labeled-slider.ts b/src/components/ha-labeled-slider.ts index 366eb4f5555c..5faf7a8b96b2 100644 --- a/src/components/ha-labeled-slider.ts +++ b/src/components/ha-labeled-slider.ts @@ -10,9 +10,9 @@ class HaLabeledSlider extends LitElement { @property() public caption?: string; - @property() public disabled?: boolean; + @property({ type: Boolean }) public disabled = false; - @property() public required?: boolean; + @property({ type: Boolean }) public required = true; @property() public min: number = 0; From 46565715c9fb46273d22292c7cc245b0b69dd12e Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 10:37:30 +0100 Subject: [PATCH 047/361] Calculate used domains on open of action dialog (#19255) --- .../automation/add-automation-element-dialog.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index 06a77884f1c6..f8be65baf183 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -122,6 +122,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { if (this._params?.type === "action") { this.hass.loadBackendTranslation("services"); this._fetchManifests(); + this._calculateUsedDomains(); } this._fullScreen = matchMedia( "all and (max-width: 450px), all and (max-height: 500px)" @@ -425,6 +426,13 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { this._manifests = manifests; } + private _calculateUsedDomains() { + const domains = new Set(Object.keys(this.hass.states).map(computeDomain)); + if (!deepEqual(domains, this._domains)) { + this._domains = domains; + } + } + protected _opened(): void { // Store the width and height so that when we search, box doesn't jump const boundingRect = @@ -439,10 +447,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { changedProperties.has("hass") && changedProperties.get("hass")?.states !== this.hass.states ) { - const domains = new Set(Object.keys(this.hass.states).map(computeDomain)); - if (!deepEqual(domains, this._domains)) { - this._domains = domains; - } + this._calculateUsedDomains(); } } From c7a98fa5a1f25b283dfcff91ef4efb4a697372e9 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 10:37:59 +0100 Subject: [PATCH 048/361] Bumped version to 20240103.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7d09a1121ede..f43e4cf0dc55 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240102.0" +version = "20240103.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 8ee4aa9e634a2f391b4aa51f2a9cfeb116ce77d8 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 10:37:59 +0100 Subject: [PATCH 049/361] Bumped version to 20240103.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7d09a1121ede..f43e4cf0dc55 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240102.0" +version = "20240103.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 6e7366bf690f500f9cfa4f81aefd002c822dc9ed Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 10:37:30 +0100 Subject: [PATCH 050/361] Calculate used domains on open of action dialog (#19255) --- .../automation/add-automation-element-dialog.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index 06a77884f1c6..f8be65baf183 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -122,6 +122,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { if (this._params?.type === "action") { this.hass.loadBackendTranslation("services"); this._fetchManifests(); + this._calculateUsedDomains(); } this._fullScreen = matchMedia( "all and (max-width: 450px), all and (max-height: 500px)" @@ -425,6 +426,13 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { this._manifests = manifests; } + private _calculateUsedDomains() { + const domains = new Set(Object.keys(this.hass.states).map(computeDomain)); + if (!deepEqual(domains, this._domains)) { + this._domains = domains; + } + } + protected _opened(): void { // Store the width and height so that when we search, box doesn't jump const boundingRect = @@ -439,10 +447,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { changedProperties.has("hass") && changedProperties.get("hass")?.states !== this.hass.states ) { - const domains = new Set(Object.keys(this.hass.states).map(computeDomain)); - if (!deepEqual(domains, this._domains)) { - this._domains = domains; - } + this._calculateUsedDomains(); } } From 29fefa1d602c2c1912a2e02afbaed9f80010cca9 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 12:20:11 +0100 Subject: [PATCH 051/361] Revert conditional rendering of condition (#19257) * Fix conditionally showing `triggered by` * revert conditional rendering * Update add-automation-element-dialog.ts * Update add-automation-element-dialog.ts --- src/data/condition.ts | 1 + .../add-automation-element-dialog.ts | 43 ++++++++----------- .../condition/ha-automation-condition.ts | 1 - .../show-add-automation-element-dialog.ts | 1 - 4 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/data/condition.ts b/src/data/condition.ts index d8c7af44fecc..44a0e218609c 100644 --- a/src/data/condition.ts +++ b/src/data/condition.ts @@ -46,6 +46,7 @@ export const CONDITION_GROUPS: AutomationElementGroup = { icon: mdiDotsHorizontal, members: { template: {}, + trigger: {}, }, }, } as const; diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index f8be65baf183..cf5874f80cd8 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -143,6 +143,16 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { this._domains = undefined; } + private _getGroups = ( + type: AddAutomationElementDialogParams["type"], + group: string | undefined + ): AutomationElementGroup => + group + ? isService(group) + ? {} + : TYPES[type].groups[group].members! + : TYPES[type].groups; + private _convertToItem = ( key: string, options, @@ -169,22 +179,13 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { private _getFilteredItems = memoizeOne( ( type: AddAutomationElementDialogParams["type"], - root: AddAutomationElementDialogParams["root"], group: string | undefined, filter: string, localize: LocalizeFunc, services: HomeAssistant["services"], manifests?: DomainManifestLookup ): ListItem[] => { - const groups: AutomationElementGroup = group - ? isService(group) - ? {} - : TYPES[type].groups[group].members! - : TYPES[type].groups; - - if (type === "condition" && group === "other" && !root) { - groups.trigger = {}; - } + const groups = this._getGroups(type, group); const flattenGroups = (grp: AutomationElementGroup) => Object.entries(grp).map(([key, options]) => @@ -213,7 +214,6 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { private _getGroupItems = memoizeOne( ( type: AddAutomationElementDialogParams["type"], - root: AddAutomationElementDialogParams["root"], group: string | undefined, domains: Set | undefined, localize: LocalizeFunc, @@ -221,20 +221,17 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { manifests?: DomainManifestLookup ): ListItem[] => { if (type === "action" && isService(group)) { - const result = this._services(localize, services, manifests, group); + let result = this._services(localize, services, manifests, group); if (group === `${SERVICE_PREFIX}media_player`) { - result.unshift(this._convertToItem("play_media", {}, type, localize)); + result = [ + this._convertToItem("play_media", {}, type, localize), + ...result, + ]; } return result; } - const groups: AutomationElementGroup = group - ? TYPES[type].groups[group].members! - : TYPES[type].groups; - - if (type === "condition" && group === "other" && !root) { - groups.trigger = {}; - } + const groups = this._getGroups(type, group); const result = Object.entries(groups).map(([key, options]) => this._convertToItem(key, options, type, localize) @@ -459,7 +456,6 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { const items = this._filter ? this._getFilteredItems( this._params.type, - this._params.root, this._group, this._filter, this.hass.localize, @@ -468,7 +464,6 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { ) : this._getGroupItems( this._params.type, - this._params.root, this._group, this._domains, this.hass.localize, @@ -537,7 +532,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { rootTabbable style=${styleMap({ width: this._width ? `${this._width}px` : "auto", - height: this._height ? `${Math.min(670, this._height)}px` : "auto", + height: this._height ? `${Math.min(468, this._height)}px` : "auto", })} > ${this._params.clipboardItem && @@ -660,7 +655,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { width: 24px; } mwc-list { - max-height: 670px; + max-height: 468px; max-width: 100vw; } search-input { diff --git a/src/panels/config/automation/condition/ha-automation-condition.ts b/src/panels/config/automation/condition/ha-automation-condition.ts index ecf4f8823770..27364b92a3ed 100644 --- a/src/panels/config/automation/condition/ha-automation-condition.ts +++ b/src/panels/config/automation/condition/ha-automation-condition.ts @@ -203,7 +203,6 @@ export default class HaAutomationCondition extends LitElement { showAddAutomationElementDialog(this, { type: "condition", add: this._addCondition, - root: !this.nested, clipboardItem: this._clipboard?.condition?.condition, }); } diff --git a/src/panels/config/automation/show-add-automation-element-dialog.ts b/src/panels/config/automation/show-add-automation-element-dialog.ts index 55453505121d..c497ca85c620 100644 --- a/src/panels/config/automation/show-add-automation-element-dialog.ts +++ b/src/panels/config/automation/show-add-automation-element-dialog.ts @@ -6,7 +6,6 @@ export interface AddAutomationElementDialogParams { type: "trigger" | "condition" | "action"; add: (key: string) => void; clipboardItem: string | undefined; - root?: boolean; group?: string; } const loadDialog = () => import("./add-automation-element-dialog"); From 6224cb69941b22c3b14ee6b622d338460cd85623 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 12:28:46 +0100 Subject: [PATCH 052/361] Bumped version to 20240103.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f43e4cf0dc55..570bc96eaf74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240103.0" +version = "20240103.1" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From c9a0ae6e2d35488304c5ad0a62b528e4c64fe615 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 12:28:46 +0100 Subject: [PATCH 053/361] Bumped version to 20240103.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f43e4cf0dc55..570bc96eaf74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240103.0" +version = "20240103.1" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 336214d97f3715a866988a257edf939ec37b25d5 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 12:20:11 +0100 Subject: [PATCH 054/361] Revert conditional rendering of condition (#19257) * Fix conditionally showing `triggered by` * revert conditional rendering * Update add-automation-element-dialog.ts * Update add-automation-element-dialog.ts --- src/data/condition.ts | 1 + .../add-automation-element-dialog.ts | 43 ++++++++----------- .../condition/ha-automation-condition.ts | 1 - .../show-add-automation-element-dialog.ts | 1 - 4 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/data/condition.ts b/src/data/condition.ts index d8c7af44fecc..44a0e218609c 100644 --- a/src/data/condition.ts +++ b/src/data/condition.ts @@ -46,6 +46,7 @@ export const CONDITION_GROUPS: AutomationElementGroup = { icon: mdiDotsHorizontal, members: { template: {}, + trigger: {}, }, }, } as const; diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index f8be65baf183..cf5874f80cd8 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -143,6 +143,16 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { this._domains = undefined; } + private _getGroups = ( + type: AddAutomationElementDialogParams["type"], + group: string | undefined + ): AutomationElementGroup => + group + ? isService(group) + ? {} + : TYPES[type].groups[group].members! + : TYPES[type].groups; + private _convertToItem = ( key: string, options, @@ -169,22 +179,13 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { private _getFilteredItems = memoizeOne( ( type: AddAutomationElementDialogParams["type"], - root: AddAutomationElementDialogParams["root"], group: string | undefined, filter: string, localize: LocalizeFunc, services: HomeAssistant["services"], manifests?: DomainManifestLookup ): ListItem[] => { - const groups: AutomationElementGroup = group - ? isService(group) - ? {} - : TYPES[type].groups[group].members! - : TYPES[type].groups; - - if (type === "condition" && group === "other" && !root) { - groups.trigger = {}; - } + const groups = this._getGroups(type, group); const flattenGroups = (grp: AutomationElementGroup) => Object.entries(grp).map(([key, options]) => @@ -213,7 +214,6 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { private _getGroupItems = memoizeOne( ( type: AddAutomationElementDialogParams["type"], - root: AddAutomationElementDialogParams["root"], group: string | undefined, domains: Set | undefined, localize: LocalizeFunc, @@ -221,20 +221,17 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { manifests?: DomainManifestLookup ): ListItem[] => { if (type === "action" && isService(group)) { - const result = this._services(localize, services, manifests, group); + let result = this._services(localize, services, manifests, group); if (group === `${SERVICE_PREFIX}media_player`) { - result.unshift(this._convertToItem("play_media", {}, type, localize)); + result = [ + this._convertToItem("play_media", {}, type, localize), + ...result, + ]; } return result; } - const groups: AutomationElementGroup = group - ? TYPES[type].groups[group].members! - : TYPES[type].groups; - - if (type === "condition" && group === "other" && !root) { - groups.trigger = {}; - } + const groups = this._getGroups(type, group); const result = Object.entries(groups).map(([key, options]) => this._convertToItem(key, options, type, localize) @@ -459,7 +456,6 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { const items = this._filter ? this._getFilteredItems( this._params.type, - this._params.root, this._group, this._filter, this.hass.localize, @@ -468,7 +464,6 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { ) : this._getGroupItems( this._params.type, - this._params.root, this._group, this._domains, this.hass.localize, @@ -537,7 +532,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { rootTabbable style=${styleMap({ width: this._width ? `${this._width}px` : "auto", - height: this._height ? `${Math.min(670, this._height)}px` : "auto", + height: this._height ? `${Math.min(468, this._height)}px` : "auto", })} > ${this._params.clipboardItem && @@ -660,7 +655,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { width: 24px; } mwc-list { - max-height: 670px; + max-height: 468px; max-width: 100vw; } search-input { diff --git a/src/panels/config/automation/condition/ha-automation-condition.ts b/src/panels/config/automation/condition/ha-automation-condition.ts index ecf4f8823770..27364b92a3ed 100644 --- a/src/panels/config/automation/condition/ha-automation-condition.ts +++ b/src/panels/config/automation/condition/ha-automation-condition.ts @@ -203,7 +203,6 @@ export default class HaAutomationCondition extends LitElement { showAddAutomationElementDialog(this, { type: "condition", add: this._addCondition, - root: !this.nested, clipboardItem: this._clipboard?.condition?.condition, }); } diff --git a/src/panels/config/automation/show-add-automation-element-dialog.ts b/src/panels/config/automation/show-add-automation-element-dialog.ts index 55453505121d..c497ca85c620 100644 --- a/src/panels/config/automation/show-add-automation-element-dialog.ts +++ b/src/panels/config/automation/show-add-automation-element-dialog.ts @@ -6,7 +6,6 @@ export interface AddAutomationElementDialogParams { type: "trigger" | "condition" | "action"; add: (key: string) => void; clipboardItem: string | undefined; - root?: boolean; group?: string; } const loadDialog = () => import("./add-automation-element-dialog"); From acbb7e0453e20da93e536aa5c5d8d122cdfdb46e Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Wed, 3 Jan 2024 14:26:40 +0100 Subject: [PATCH 055/361] Display edit button for climate fan mode feature (#19259) --- .../lovelace/editor/config-elements/hui-card-features-editor.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts b/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts index 49290ba57102..8693be890d8d 100644 --- a/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts @@ -81,6 +81,7 @@ const EDITABLES_FEATURE_TYPES = new Set([ "humidifier-modes", "water-heater-operation-modes", "lawn-mower-commands", + "climate-fan-modes", "climate-preset-modes", "numeric-input", "update-actions", From 8368fb44081a20a78f01ce76b770bdbb0bb1a826 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 14:58:36 +0100 Subject: [PATCH 056/361] Fix checking todo item that dont support due date (#19262) * Fix checking todo item that dont support due date * make cleaner * Revert "make cleaner" This reverts commit fa33b3361451dd334d9f69142f9754a1ea2c1ca4. * Update dialog-todo-item-editor.ts * do check in 1 place --- src/data/todo.ts | 12 +++++++++--- src/panels/lovelace/cards/hui-todo-list-card.ts | 3 ++- src/panels/todo/dialog-todo-item-editor.ts | 12 +++++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/data/todo.ts b/src/data/todo.ts index 9af8ef0f4cc6..659c8d0c3c24 100644 --- a/src/data/todo.ts +++ b/src/data/todo.ts @@ -83,9 +83,12 @@ export const updateItem = ( item: item.uid, rename: item.summary, status: item.status, - description: item.description || null, + description: item.description, due_datetime: item.due?.includes("T") ? item.due : undefined, - due_date: item.due?.includes("T") ? undefined : item.due || null, + due_date: + item.due === undefined || item.due?.includes("T") + ? undefined + : item.due, }, { entity_id } ); @@ -102,7 +105,10 @@ export const createItem = ( item: item.summary, description: item.description || undefined, due_datetime: item.due?.includes("T") ? item.due : undefined, - due_date: item.due?.includes("T") ? undefined : item.due, + due_date: + item.due === undefined || item.due?.includes("T") + ? undefined + : item.due, }, { entity_id } ); diff --git a/src/panels/lovelace/cards/hui-todo-list-card.ts b/src/panels/lovelace/cards/hui-todo-list-card.ts index 3352f7a42b43..d1d62880f8ed 100644 --- a/src/panels/lovelace/cards/hui-todo-list-card.ts +++ b/src/panels/lovelace/cards/hui-todo-list-card.ts @@ -476,7 +476,8 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { return; } await updateItem(this.hass!, this._entityId!, { - ...item, + uid: item.uid, + summary: item.summary, status: item.status === TodoItemStatus.NeedsAction ? TodoItemStatus.Completed diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts index cd26ad35fc28..daa5eff68627 100644 --- a/src/panels/todo/dialog-todo-item-editor.ts +++ b/src/panels/todo/dialog-todo-item-editor.ts @@ -324,14 +324,20 @@ class DialogTodoItemEditor extends LitElement { (this._todoListSupportsFeature( TodoListEntityFeature.SET_DESCRIPTION_ON_ITEM ) - ? // backend should accept null to clear the field, but it doesn't now - null + ? null : undefined), due: this._due ? this._hasTime ? this._due.toISOString() : this._formatDate(this._due) - : null, + : this._todoListSupportsFeature( + TodoListEntityFeature.SET_DUE_DATETIME_ON_ITEM + ) || + this._todoListSupportsFeature( + TodoListEntityFeature.SET_DUE_DATE_ON_ITEM + ) + ? null + : undefined, status: this._checked ? TodoItemStatus.Completed : TodoItemStatus.NeedsAction, From 41bb677ebe86531e76b4aca5610bc56727c477fc Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Wed, 3 Jan 2024 05:58:59 -0800 Subject: [PATCH 057/361] Remove tile pointer/ripple/index when it has no action (#19137) * Remove tile pointer/ripple/index when it has no action * update * Apply suggestions from code review Co-authored-by: Paul Bottein --------- Co-authored-by: Paul Bottein --- src/panels/lovelace/cards/hui-tile-card.ts | 27 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/panels/lovelace/cards/hui-tile-card.ts b/src/panels/lovelace/cards/hui-tile-card.ts index 1c06426d1acb..b3470aeed569 100644 --- a/src/panels/lovelace/cards/hui-tile-card.ts +++ b/src/panels/lovelace/cards/hui-tile-card.ts @@ -287,21 +287,40 @@ export class HuiTileCard extends LitElement implements LovelaceCard { @eventOptions({ passive: true }) private handleRippleActivate(evt?: Event) { + if (!this.hasCardAction) return; this._rippleHandlers.startPress(evt); } private handleRippleDeactivate() { + if (!this.hasCardAction) return; this._rippleHandlers.endPress(); } private handleRippleMouseEnter() { + if (!this.hasCardAction) return; this._rippleHandlers.startHover(); } private handleRippleMouseLeave() { + if (!this.hasCardAction) return; this._rippleHandlers.endHover(); } + get hasCardAction() { + return ( + !this._config?.tap_action || + hasAction(this._config?.tap_action) || + hasAction(this._config?.hold_action) || + hasAction(this._config?.double_tap_action) + ); + } + + get hasIconAction() { + return ( + !this._config?.icon_tap_action || hasAction(this._config?.icon_tap_action) + ); + } + protected render() { if (!this._config || !this.hass) { return nothing; @@ -368,8 +387,8 @@ export class HuiTileCard extends LitElement implements LovelaceCard { hasHold: hasAction(this._config!.hold_action), hasDoubleClick: hasAction(this._config!.double_tap_action), })} - role="button" - tabindex="0" + role=${ifDefined(this.hasCardAction ? "button" : undefined)} + tabindex=${ifDefined(this.hasCardAction ? "0" : undefined)} aria-labelledby="info" @mousedown=${this.handleRippleActivate} @mouseup=${this.handleRippleDeactivate} @@ -386,8 +405,8 @@ export class HuiTileCard extends LitElement implements LovelaceCard {
From 6929a9c6037b987a1ede770625ad4ef290b47fb2 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 14:59:45 +0100 Subject: [PATCH 058/361] Bumped version to 20240103.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 570bc96eaf74..f43e4cf0dc55 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240103.1" +version = "20240103.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From ae0eac3415f9df2cbab002c1f09742f0ee70c573 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 14:59:45 +0100 Subject: [PATCH 059/361] Bumped version to 20240103.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 570bc96eaf74..f43e4cf0dc55 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240103.1" +version = "20240103.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 22929672a069db25a0a94f230c8c9f57ac0afdd7 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Wed, 3 Jan 2024 05:58:59 -0800 Subject: [PATCH 060/361] Remove tile pointer/ripple/index when it has no action (#19137) * Remove tile pointer/ripple/index when it has no action * update * Apply suggestions from code review Co-authored-by: Paul Bottein --------- Co-authored-by: Paul Bottein --- src/panels/lovelace/cards/hui-tile-card.ts | 27 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/panels/lovelace/cards/hui-tile-card.ts b/src/panels/lovelace/cards/hui-tile-card.ts index 1c06426d1acb..b3470aeed569 100644 --- a/src/panels/lovelace/cards/hui-tile-card.ts +++ b/src/panels/lovelace/cards/hui-tile-card.ts @@ -287,21 +287,40 @@ export class HuiTileCard extends LitElement implements LovelaceCard { @eventOptions({ passive: true }) private handleRippleActivate(evt?: Event) { + if (!this.hasCardAction) return; this._rippleHandlers.startPress(evt); } private handleRippleDeactivate() { + if (!this.hasCardAction) return; this._rippleHandlers.endPress(); } private handleRippleMouseEnter() { + if (!this.hasCardAction) return; this._rippleHandlers.startHover(); } private handleRippleMouseLeave() { + if (!this.hasCardAction) return; this._rippleHandlers.endHover(); } + get hasCardAction() { + return ( + !this._config?.tap_action || + hasAction(this._config?.tap_action) || + hasAction(this._config?.hold_action) || + hasAction(this._config?.double_tap_action) + ); + } + + get hasIconAction() { + return ( + !this._config?.icon_tap_action || hasAction(this._config?.icon_tap_action) + ); + } + protected render() { if (!this._config || !this.hass) { return nothing; @@ -368,8 +387,8 @@ export class HuiTileCard extends LitElement implements LovelaceCard { hasHold: hasAction(this._config!.hold_action), hasDoubleClick: hasAction(this._config!.double_tap_action), })} - role="button" - tabindex="0" + role=${ifDefined(this.hasCardAction ? "button" : undefined)} + tabindex=${ifDefined(this.hasCardAction ? "0" : undefined)} aria-labelledby="info" @mousedown=${this.handleRippleActivate} @mouseup=${this.handleRippleDeactivate} @@ -386,8 +405,8 @@ export class HuiTileCard extends LitElement implements LovelaceCard {
From 62dafac72b2c4fcc3975122aaa2c390dc1abcc80 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Wed, 3 Jan 2024 14:26:40 +0100 Subject: [PATCH 061/361] Display edit button for climate fan mode feature (#19259) --- .../lovelace/editor/config-elements/hui-card-features-editor.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts b/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts index 49290ba57102..8693be890d8d 100644 --- a/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts @@ -81,6 +81,7 @@ const EDITABLES_FEATURE_TYPES = new Set([ "humidifier-modes", "water-heater-operation-modes", "lawn-mower-commands", + "climate-fan-modes", "climate-preset-modes", "numeric-input", "update-actions", From 2c69fe8c53cca9b1d3a1cda718b16cb06f8d23d4 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 14:58:36 +0100 Subject: [PATCH 062/361] Fix checking todo item that dont support due date (#19262) * Fix checking todo item that dont support due date * make cleaner * Revert "make cleaner" This reverts commit fa33b3361451dd334d9f69142f9754a1ea2c1ca4. * Update dialog-todo-item-editor.ts * do check in 1 place --- src/data/todo.ts | 12 +++++++++--- src/panels/lovelace/cards/hui-todo-list-card.ts | 3 ++- src/panels/todo/dialog-todo-item-editor.ts | 12 +++++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/data/todo.ts b/src/data/todo.ts index 9af8ef0f4cc6..659c8d0c3c24 100644 --- a/src/data/todo.ts +++ b/src/data/todo.ts @@ -83,9 +83,12 @@ export const updateItem = ( item: item.uid, rename: item.summary, status: item.status, - description: item.description || null, + description: item.description, due_datetime: item.due?.includes("T") ? item.due : undefined, - due_date: item.due?.includes("T") ? undefined : item.due || null, + due_date: + item.due === undefined || item.due?.includes("T") + ? undefined + : item.due, }, { entity_id } ); @@ -102,7 +105,10 @@ export const createItem = ( item: item.summary, description: item.description || undefined, due_datetime: item.due?.includes("T") ? item.due : undefined, - due_date: item.due?.includes("T") ? undefined : item.due, + due_date: + item.due === undefined || item.due?.includes("T") + ? undefined + : item.due, }, { entity_id } ); diff --git a/src/panels/lovelace/cards/hui-todo-list-card.ts b/src/panels/lovelace/cards/hui-todo-list-card.ts index 3352f7a42b43..d1d62880f8ed 100644 --- a/src/panels/lovelace/cards/hui-todo-list-card.ts +++ b/src/panels/lovelace/cards/hui-todo-list-card.ts @@ -476,7 +476,8 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { return; } await updateItem(this.hass!, this._entityId!, { - ...item, + uid: item.uid, + summary: item.summary, status: item.status === TodoItemStatus.NeedsAction ? TodoItemStatus.Completed diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts index cd26ad35fc28..daa5eff68627 100644 --- a/src/panels/todo/dialog-todo-item-editor.ts +++ b/src/panels/todo/dialog-todo-item-editor.ts @@ -324,14 +324,20 @@ class DialogTodoItemEditor extends LitElement { (this._todoListSupportsFeature( TodoListEntityFeature.SET_DESCRIPTION_ON_ITEM ) - ? // backend should accept null to clear the field, but it doesn't now - null + ? null : undefined), due: this._due ? this._hasTime ? this._due.toISOString() : this._formatDate(this._due) - : null, + : this._todoListSupportsFeature( + TodoListEntityFeature.SET_DUE_DATETIME_ON_ITEM + ) || + this._todoListSupportsFeature( + TodoListEntityFeature.SET_DUE_DATE_ON_ITEM + ) + ? null + : undefined, status: this._checked ? TodoItemStatus.Completed : TodoItemStatus.NeedsAction, From 288d173a4d2fcf4ec665e4fffee4015550dafa67 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 15:02:14 +0100 Subject: [PATCH 063/361] Bumped version to 20240103.3 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f43e4cf0dc55..b1f2ee8ea705 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240103.0" +version = "20240103.3" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 7a6fc573c206d096ef61b8fe59e9170d5b52daaf Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 15:19:30 +0100 Subject: [PATCH 064/361] Fix version bump script (#19264) --- script/{version_bump.cjs => version_bump.js} | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) rename script/{version_bump.cjs => version_bump.js} (83%) diff --git a/script/version_bump.cjs b/script/version_bump.js similarity index 83% rename from script/version_bump.cjs rename to script/version_bump.js index a1c8f9c9be6f..fbba50b6a7ab 100755 --- a/script/version_bump.cjs +++ b/script/version_bump.js @@ -1,7 +1,10 @@ #!/usr/bin/env node -const fs = require("fs"); -const util = require("util"); -const exec = util.promisify(require("child_process").exec); +/* eslint-disable no-console */ +import fs from "fs"; +import util from "util"; +import child_process from "child_process"; + +const exec = util.promisify(child_process.exec); function patch(version) { const parts = version.split("."); @@ -18,7 +21,7 @@ function today() { function auto(version) { const todayVersion = today(); - if (todayVersion !== version) { + if (todayVersion.split(".")[0] !== version.split(".")[0]) { return todayVersion; } return patch(version); @@ -44,7 +47,7 @@ async function main(args) { commit = true; } else { method = args.length > 0 && methods[args[0]]; - commit = args.length > 1 && args[1] == "--commit"; + commit = args.length > 1 && args[1] === "--commit"; } if (!method) { From 979085a9defd27e6b8936aa6be2d0d45843921df Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jan 2024 20:35:54 +0100 Subject: [PATCH 065/361] Fix supervisor dev build (#19266) --- build-scripts/gulp/translations.js | 1 + 1 file changed, 1 insertion(+) diff --git a/build-scripts/gulp/translations.js b/build-scripts/gulp/translations.js index 967da71efdfc..fd4cccc013a8 100755 --- a/build-scripts/gulp/translations.js +++ b/build-scripts/gulp/translations.js @@ -426,6 +426,7 @@ gulp.task( "fetch-nightly-translations", gulp.series("clean-translations", "ensure-translations-build-dir") ), + gulp.parallel("create-test-metadata", "create-test-translation"), "build-master-translation", "build-merged-translations", "build-translation-fragment-supervisor", From 3984702d3eba9fde82c405fcea2a60cedc75a961 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:36:59 -0800 Subject: [PATCH 066/361] Fix select view dialog (#19267) * Fix select view dialog * add import --- .../select-view/hui-dialog-select-view.ts | 21 ++++++++++++++----- src/translations/en.json | 4 +++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts b/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts index 6a9c8eb04fdc..5f3e073f3a4f 100644 --- a/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts +++ b/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts @@ -8,6 +8,7 @@ import { stopPropagation } from "../../../../common/dom/stop_propagation"; import { createCloseHeading } from "../../../../components/ha-dialog"; import "../../../../components/ha-icon"; import "../../../../components/ha-select"; +import "../../../../components/ha-alert"; import { fetchConfig, LovelaceConfig, @@ -104,8 +105,15 @@ export class HuiDialogSelectView extends LitElement { })} ` : ""} - ${this._config - ? this._config.views.length > 1 + ${!this._config || (this._config.views || []).length < 1 + ? html`${this.hass.localize( + this._config + ? "ui.panel.lovelace.editor.select_view.no_views" + : "ui.panel.lovelace.editor.select_view.no_config" + )}` + : this._config.views.length > 1 ? html` ${this._config.views.map( @@ -125,8 +133,7 @@ export class HuiDialogSelectView extends LitElement { )} ` - : "" - : html`
No config found.
`} + : ""} ${this.hass!.localize("ui.common.cancel")} - + ${this._params.actionLabel || this.hass!.localize("ui.common.move")} diff --git a/src/translations/en.json b/src/translations/en.json index 53306cd8b77d..74467bcbf1ab 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -5020,7 +5020,9 @@ "select_view": { "header": "Choose a view", "dashboard_label": "Dashboard", - "views_label": "View" + "views_label": "View", + "no_config": "No config found.", + "no_views": "No views in this dashboard." }, "suggest_card": { "header": "We created a suggestion for you", From 0d8c0ac1a0c84cee9d1e14f1bc306b8424294c7d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 17:45:46 -0500 Subject: [PATCH 067/361] Update dependency marked to v11.1.1 (#19254) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 663a412014d2..8f2a790e78e0 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "leaflet-draw": "1.0.4", "lit": "2.8.0", "luxon": "3.4.4", - "marked": "11.1.0", + "marked": "11.1.1", "memoize-one": "6.0.0", "node-vibrant": "3.2.1-alpha.1", "proxy-polyfill": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 2f9b96e6b6ef..59d16bf0e735 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9676,7 +9676,7 @@ __metadata: luxon: "npm:3.4.4" magic-string: "npm:0.30.5" map-stream: "npm:0.0.7" - marked: "npm:11.1.0" + marked: "npm:11.1.1" memoize-one: "npm:6.0.0" mocha: "npm:10.2.0" node-vibrant: "npm:3.2.1-alpha.1" @@ -11652,12 +11652,12 @@ __metadata: languageName: node linkType: hard -"marked@npm:11.1.0": - version: 11.1.0 - resolution: "marked@npm:11.1.0" +"marked@npm:11.1.1": + version: 11.1.1 + resolution: "marked@npm:11.1.1" bin: marked: bin/marked.js - checksum: 4636b16283c1963a715e97578d9fd91588b11949276e633a4de53dc408bcdab7b846d2b5c2cf3239f6d2dc8affe5294a0895954b5e3d9562d77301d8847a8915 + checksum: c2e15a330ac75cca2e12e25aae09985a78ad7e96a84418964dcdd3ee776764a38812dc0e94e9fcbacac43113d1650ca7946f9dc0bab800d72181e56a37e7631e languageName: node linkType: hard From 4f05bd9e22f8cd91f288e4af88ddcb5dd8ab6c15 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 03:21:42 +0100 Subject: [PATCH 068/361] Fix circular progress size + fix bug in assist pipeline debug (#19268) --- src/auth/ha-auth-textfield.ts | 2 +- src/components/media-player/ha-media-upload-button.ts | 2 +- src/panels/config/repairs/dialog-system-information.ts | 2 +- .../voice-assistants/debug/assist-pipeline-run-debug.ts | 7 +++++-- .../voice-assistants/debug/assist-render-pipeline-run.ts | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/auth/ha-auth-textfield.ts b/src/auth/ha-auth-textfield.ts index 123deef03fe9..20d5e66174c8 100644 --- a/src/auth/ha-auth-textfield.ts +++ b/src/auth/ha-auth-textfield.ts @@ -47,7 +47,7 @@ export class HaAuthTextField extends HaTextField { // TODO: live() directive needs casting for lit-analyzer // https://github.com/runem/lit-analyzer/pull/91/files // TODO: lit-analyzer labels min/max as (number|string) instead of string - return html` 0 ? html` `; } else if (info.type === "failed") { diff --git a/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts b/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts index 67b902ba6581..f7df3507fa4e 100644 --- a/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts +++ b/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts @@ -247,7 +247,7 @@ export class AssistPipelineRunDebug extends LitElement { } // Play audio when we're done. - if (updatedRun.stage === "done") { + if (updatedRun.stage === "done" && !updatedRun.error) { const url = updatedRun.tts!.tts_output!.url; const audio = new Audio(url); audio.addEventListener("ended", () => { @@ -261,7 +261,10 @@ export class AssistPipelineRunDebug extends LitElement { } }); audio.play(); - } else if (updatedRun.stage === "error") { + } else if ( + (updatedRun.stage === "done" && updatedRun.error) || + updatedRun.stage === "error" + ) { this._finished = true; } }, diff --git a/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts b/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts index 05da128692af..ae455152beb0 100644 --- a/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts +++ b/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts @@ -90,7 +90,7 @@ const renderProgress = ( return html`❌`; } return html` - + `; } From e427ffca5fc136d5c16a4503a6fe8b68ac449606 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 03:27:30 +0100 Subject: [PATCH 069/361] Fix turning valve on/off (#19269) --- src/common/const.ts | 1 + src/panels/lovelace/common/entity/turn-on-off-entity.ts | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/common/const.ts b/src/common/const.ts index 68f4fa97b1c1..bc114f2f1703 100644 --- a/src/common/const.ts +++ b/src/common/const.ts @@ -272,6 +272,7 @@ export const DOMAINS_TOGGLE = new Set([ "group", "automation", "humidifier", + "valve", ]); /** Domains that have a dynamic entity image / picture. */ diff --git a/src/panels/lovelace/common/entity/turn-on-off-entity.ts b/src/panels/lovelace/common/entity/turn-on-off-entity.ts index 701c2c4996ab..5be6beaea844 100644 --- a/src/panels/lovelace/common/entity/turn-on-off-entity.ts +++ b/src/panels/lovelace/common/entity/turn-on-off-entity.ts @@ -24,6 +24,9 @@ export const turnOnOffEntity = ( case "scene": service = "turn_on"; break; + case "valve": + service = turnOn ? "open_valve" : "close_valve"; + break; default: service = turnOn ? "turn_on" : "turn_off"; } From e5d31d85dd91c1387fbddd5b8ad2a0fbfeef04d0 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 4 Jan 2024 10:54:20 +0100 Subject: [PATCH 070/361] Update getStates to support valves (#19277) --- src/common/entity/get_states.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/entity/get_states.ts b/src/common/entity/get_states.ts index 29c11ca48c42..456ce27bcea5 100644 --- a/src/common/entity/get_states.ts +++ b/src/common/entity/get_states.ts @@ -50,6 +50,7 @@ export const FIXED_DOMAIN_STATES = { timer: ["active", "idle", "paused"], update: ["on", "off"], vacuum: ["cleaning", "docked", "error", "idle", "paused", "returning"], + valve: ["closed", "closing", "open", "opening"], weather: [ "clear-night", "cloudy", From ecadc06b452c180d97c8fa9d8f776fb3a690712f Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 11:52:38 +0100 Subject: [PATCH 071/361] fix valve entities row (#19278) --- src/common/const.ts | 1 + src/data/valve.ts | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/common/const.ts b/src/common/const.ts index bc114f2f1703..2e7d2f7c77d7 100644 --- a/src/common/const.ts +++ b/src/common/const.ts @@ -254,6 +254,7 @@ export const DOMAINS_INPUT_ROW = [ "text", "time", "vacuum", + "valve", ]; /** States that we consider "off". */ diff --git a/src/data/valve.ts b/src/data/valve.ts index 73f5d428ae18..645ca82e4954 100644 --- a/src/data/valve.ts +++ b/src/data/valve.ts @@ -14,14 +14,20 @@ export const enum ValveEntityFeature { } export function isFullyOpen(stateObj: ValveEntity) { - if (stateObj.attributes.current_position !== undefined) { + if ( + stateObj.attributes.current_position !== undefined && + stateObj.attributes.current_position !== null + ) { return stateObj.attributes.current_position === 100; } return stateObj.state === "open"; } export function isFullyClosed(stateObj: ValveEntity) { - if (stateObj.attributes.current_position !== undefined) { + if ( + stateObj.attributes.current_position !== undefined && + stateObj.attributes.current_position !== null + ) { return stateObj.attributes.current_position === 0; } return stateObj.state === "closed"; From fd6cae48b7e2940356589881d4b0d0f3f34b0a31 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 13:20:35 +0100 Subject: [PATCH 072/361] Remove overflow hidden from profile (#19279) --- src/panels/profile/ha-panel-profile.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/panels/profile/ha-panel-profile.ts b/src/panels/profile/ha-panel-profile.ts index 1756af4d9333..9e82e842df5f 100644 --- a/src/panels/profile/ha-panel-profile.ts +++ b/src/panels/profile/ha-panel-profile.ts @@ -250,7 +250,6 @@ class HaPanelProfile extends LitElement { max-width: 600px; margin: 0 auto; padding-bottom: env(safe-area-inset-bottom); - overflow: hidden; } .content > * { From 8615b799c6ede94aabca3a8a0ae54d8fdbf5b8fe Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 14:24:33 +0100 Subject: [PATCH 073/361] Fix due date when no time in certain timezones (#19280) * Fix due date when no time in certain timezones * Update dialog-todo-item-editor.ts --- src/panels/lovelace/cards/hui-todo-list-card.ts | 2 +- src/panels/todo/dialog-todo-item-editor.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/panels/lovelace/cards/hui-todo-list-card.ts b/src/panels/lovelace/cards/hui-todo-list-card.ts index d1d62880f8ed..1d1c6b6c8243 100644 --- a/src/panels/lovelace/cards/hui-todo-list-card.ts +++ b/src/panels/lovelace/cards/hui-todo-list-card.ts @@ -335,7 +335,7 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { const due = item.due ? item.due.includes("T") ? new Date(item.due) - : endOfDay(new Date(item.due)) + : endOfDay(new Date(`${item.due}T00:00:00`)) : undefined; const today = due && !item.due!.includes("T") && isSameDay(new Date(), due); diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts index daa5eff68627..be03e260eccf 100644 --- a/src/panels/todo/dialog-todo-item-editor.ts +++ b/src/panels/todo/dialog-todo-item-editor.ts @@ -60,8 +60,10 @@ class DialogTodoItemEditor extends LitElement { this._checked = entry.status === TodoItemStatus.Completed; this._summary = entry.summary; this._description = entry.description || ""; - this._due = entry.due ? new Date(entry.due) : undefined; this._hasTime = entry.due?.includes("T") || false; + this._due = entry.due + ? new Date(this._hasTime ? entry.due : `${entry.due}T00:00:00`) + : undefined; } else { this._hasTime = false; this._checked = false; From 72dedc7596a0626f858848afebf71ed77cf21ddd Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 4 Jan 2024 16:18:16 +0100 Subject: [PATCH 074/361] Fix thermostat and humidifier card rendering when off (#19281) * Fix thermostat and humidifier card rendering when off * Fix action color --- .../ha-state-control-climate-temperature.ts | 43 +++++++++++++------ .../ha-state-control-humidifier-humidity.ts | 37 ++++++++++++---- .../state-control-circular-slider-style.ts | 13 +++++- 3 files changed, 71 insertions(+), 22 deletions(-) diff --git a/src/state-control/climate/ha-state-control-climate-temperature.ts b/src/state-control/climate/ha-state-control-climate-temperature.ts index 7634fd2f2d18..0264af5ec7b3 100644 --- a/src/state-control/climate/ha-state-control-climate-temperature.ts +++ b/src/state-control/climate/ha-state-control-climate-temperature.ts @@ -177,11 +177,20 @@ export class HaStateControlClimateTemperature extends LitElement { const action = this.stateObj.attributes.hvac_action; + const isTemperatureDisplayed = + (this.stateObj.attributes.current_temperature != null && + this.showCurrentAsPrimary) || + ((this._supportsTargetTemperature || + this._supportsTargetTemperatureRange) && + !this.showCurrentAsPrimary); + return html`

- ${action + ${action && action !== "off" ? this.hass.formatEntityAttributeValue(this.stateObj, "hvac_action") - : this.hass.formatEntityState(this.stateObj)} + : isTemperatureDisplayed + ? this.hass.formatEntityState(this.stateObj) + : nothing}

`; } @@ -315,6 +324,14 @@ export class HaStateControlClimateTemperature extends LitElement { `; } + if (this.stateObj.state !== UNAVAILABLE) { + return html` +

+ ${this.hass.formatEntityState(this.stateObj)} +

+ `; + } + return nothing; } @@ -373,6 +390,14 @@ export class HaStateControlClimateTemperature extends LitElement { return html`

`; } + private _renderInfo() { + return html` +
+ ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()} +
+ `; + } + get _supportsTargetTemperature() { return ( supportsFeature(this.stateObj, ClimateEntityFeature.TARGET_TEMPERATURE) && @@ -447,10 +472,7 @@ export class HaStateControlClimateTemperature extends LitElement { @value-changing=${this._valueChanging} > -
- ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()} -
- ${this._renderTemperatureButtons("value")} + ${this._renderInfo()} ${this._renderTemperatureButtons("value")}
`; } @@ -484,9 +506,7 @@ export class HaStateControlClimateTemperature extends LitElement { @high-changing=${this._valueChanging} > -
- ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()} -
+ ${this._renderInfo()} ${this._renderTemperatureButtons(this._selectTargetTemperature, true)}
`; @@ -497,6 +517,7 @@ export class HaStateControlClimateTemperature extends LitElement { class="container${containerSizeClass}" style=${styleMap({ "--state-color": stateColor, + "--action-color": actionColor, })} > -
- ${this._renderLabel()} ${this._renderSecondary()} -
+ ${this._renderInfo()}
`; } diff --git a/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts b/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts index 6078180cd849..459e8d611730 100644 --- a/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts +++ b/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts @@ -105,11 +105,18 @@ export class HaStateControlHumidifierHumidity extends LitElement { const action = this.stateObj.attributes.action; + const isHumidityDisplayed = + (this.stateObj.attributes.current_humidity != null && + this.showCurrentAsPrimary) || + (this._targetHumidity != null && !this.showCurrentAsPrimary); + return html`

- ${action + ${action && action !== "off" ? this.hass.formatEntityAttributeValue(this.stateObj, "action") - : this.hass.formatEntityState(this.stateObj)} + : isHumidityDisplayed + ? this.hass.formatEntityState(this.stateObj) + : nothing}

`; } @@ -144,6 +151,14 @@ export class HaStateControlHumidifierHumidity extends LitElement { return this._renderTarget(this._targetHumidity!, "big"); } + if (this.stateObj.state !== UNAVAILABLE) { + return html` +

+ ${this.hass.formatEntityState(this.stateObj)} +

+ `; + } + return nothing; } @@ -225,6 +240,14 @@ export class HaStateControlHumidifierHumidity extends LitElement { `; } + private _renderInfo() { + return html` +
+ ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()} +
+ `; + } + protected render() { const stateColor = stateColorCss(this.stateObj); const active = stateActive(this.stateObj); @@ -272,10 +295,7 @@ export class HaStateControlHumidifierHumidity extends LitElement { @value-changing=${this._valueChanging} > -
- ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()} -
- ${this._renderButtons()} + ${this._renderInfo()} ${this._renderButtons()}
`; } @@ -284,6 +304,7 @@ export class HaStateControlHumidifierHumidity extends LitElement {
@@ -296,9 +317,7 @@ export class HaStateControlHumidifierHumidity extends LitElement { disabled > -
- ${this._renderLabel()} ${this._renderSecondary()} -
+ ${this._renderInfo()}
`; } diff --git a/src/state-control/state-control-circular-slider-style.ts b/src/state-control/state-control-circular-slider-style.ts index cc1c9366d7e9..b5d4d5281a03 100644 --- a/src/state-control/state-control-circular-slider-style.ts +++ b/src/state-control/state-control-circular-slider-style.ts @@ -54,7 +54,6 @@ export const stateControlCircularSliderStyle = css` .label.disabled { color: var(--secondary-text-color); } - .buttons { position: absolute; bottom: 10px; @@ -67,6 +66,9 @@ export const stateControlCircularSliderStyle = css` align-items: center; justify-content: center; } + .primary-state { + font-size: 36px; + } .buttons ha-outlined-icon-button { --md-outlined-icon-button-container-width: 48px; @@ -77,6 +79,9 @@ export const stateControlCircularSliderStyle = css` .container.md ha-big-number { font-size: 44px; } + .container.md .state { + font-size: 30px; + } .container.md .info { margin-top: 12px; gap: 6px; @@ -91,6 +96,9 @@ export const stateControlCircularSliderStyle = css` .container.sm ha-big-number { font-size: 32px; } + .container.sm .state { + font-size: 26px; + } .container.sm .info { margin-top: 12px; font-size: 14px; @@ -107,6 +115,9 @@ export const stateControlCircularSliderStyle = css` .container.xs ha-big-number { font-size: 32px; } + .container.xs .state { + font-size: 16px; + } .container.xs .info { margin-top: 12px; } From fe5431976d5c8c4a77e525f60a95ddbebb907baf Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 17:43:37 +0100 Subject: [PATCH 075/361] Bumped version to 20240104.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f43e4cf0dc55..d9414825fabf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240103.0" +version = "20240104.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From fef2c44cb8ffe4ff3b0827365da3ba068e193ad3 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 17:43:37 +0100 Subject: [PATCH 076/361] Bumped version to 20240104.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b1f2ee8ea705..d9414825fabf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240103.3" +version = "20240104.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 030566c1e849997c3ec39ec82c6b86ac9c2048fc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 17:45:46 -0500 Subject: [PATCH 077/361] Update dependency marked to v11.1.1 (#19254) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 3f4e61c24329..0d2a855179f1 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "leaflet-draw": "1.0.4", "lit": "2.8.0", "luxon": "3.4.4", - "marked": "11.1.0", + "marked": "11.1.1", "memoize-one": "6.0.0", "node-vibrant": "3.2.1-alpha.1", "proxy-polyfill": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 510c103b2e84..3997cc2fa300 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9679,7 +9679,7 @@ __metadata: luxon: "npm:3.4.4" magic-string: "npm:0.30.5" map-stream: "npm:0.0.7" - marked: "npm:11.1.0" + marked: "npm:11.1.1" memoize-one: "npm:6.0.0" mocha: "npm:10.2.0" node-vibrant: "npm:3.2.1-alpha.1" @@ -11655,12 +11655,12 @@ __metadata: languageName: node linkType: hard -"marked@npm:11.1.0": - version: 11.1.0 - resolution: "marked@npm:11.1.0" +"marked@npm:11.1.1": + version: 11.1.1 + resolution: "marked@npm:11.1.1" bin: marked: bin/marked.js - checksum: 4636b16283c1963a715e97578d9fd91588b11949276e633a4de53dc408bcdab7b846d2b5c2cf3239f6d2dc8affe5294a0895954b5e3d9562d77301d8847a8915 + checksum: c2e15a330ac75cca2e12e25aae09985a78ad7e96a84418964dcdd3ee776764a38812dc0e94e9fcbacac43113d1650ca7946f9dc0bab800d72181e56a37e7631e languageName: node linkType: hard From 0b20725f5f42824d67168714f50632fd11e013bc Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:36:59 -0800 Subject: [PATCH 078/361] Fix select view dialog (#19267) * Fix select view dialog * add import --- .../select-view/hui-dialog-select-view.ts | 21 ++++++++++++++----- src/translations/en.json | 4 +++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts b/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts index 6a9c8eb04fdc..5f3e073f3a4f 100644 --- a/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts +++ b/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts @@ -8,6 +8,7 @@ import { stopPropagation } from "../../../../common/dom/stop_propagation"; import { createCloseHeading } from "../../../../components/ha-dialog"; import "../../../../components/ha-icon"; import "../../../../components/ha-select"; +import "../../../../components/ha-alert"; import { fetchConfig, LovelaceConfig, @@ -104,8 +105,15 @@ export class HuiDialogSelectView extends LitElement { })} ` : ""} - ${this._config - ? this._config.views.length > 1 + ${!this._config || (this._config.views || []).length < 1 + ? html`${this.hass.localize( + this._config + ? "ui.panel.lovelace.editor.select_view.no_views" + : "ui.panel.lovelace.editor.select_view.no_config" + )}` + : this._config.views.length > 1 ? html` ${this._config.views.map( @@ -125,8 +133,7 @@ export class HuiDialogSelectView extends LitElement { )} ` - : "" - : html`
No config found.
`} + : ""} ${this.hass!.localize("ui.common.cancel")} - + ${this._params.actionLabel || this.hass!.localize("ui.common.move")} diff --git a/src/translations/en.json b/src/translations/en.json index 53306cd8b77d..74467bcbf1ab 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -5020,7 +5020,9 @@ "select_view": { "header": "Choose a view", "dashboard_label": "Dashboard", - "views_label": "View" + "views_label": "View", + "no_config": "No config found.", + "no_views": "No views in this dashboard." }, "suggest_card": { "header": "We created a suggestion for you", From efddbfcfa0941eccce4565a30c12dd689c7d6624 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 03:21:42 +0100 Subject: [PATCH 079/361] Fix circular progress size + fix bug in assist pipeline debug (#19268) --- src/auth/ha-auth-textfield.ts | 2 +- src/components/media-player/ha-media-upload-button.ts | 2 +- src/panels/config/repairs/dialog-system-information.ts | 2 +- .../voice-assistants/debug/assist-pipeline-run-debug.ts | 7 +++++-- .../voice-assistants/debug/assist-render-pipeline-run.ts | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/auth/ha-auth-textfield.ts b/src/auth/ha-auth-textfield.ts index 123deef03fe9..20d5e66174c8 100644 --- a/src/auth/ha-auth-textfield.ts +++ b/src/auth/ha-auth-textfield.ts @@ -47,7 +47,7 @@ export class HaAuthTextField extends HaTextField { // TODO: live() directive needs casting for lit-analyzer // https://github.com/runem/lit-analyzer/pull/91/files // TODO: lit-analyzer labels min/max as (number|string) instead of string - return html` 0 ? html` `; } else if (info.type === "failed") { diff --git a/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts b/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts index 67b902ba6581..f7df3507fa4e 100644 --- a/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts +++ b/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts @@ -247,7 +247,7 @@ export class AssistPipelineRunDebug extends LitElement { } // Play audio when we're done. - if (updatedRun.stage === "done") { + if (updatedRun.stage === "done" && !updatedRun.error) { const url = updatedRun.tts!.tts_output!.url; const audio = new Audio(url); audio.addEventListener("ended", () => { @@ -261,7 +261,10 @@ export class AssistPipelineRunDebug extends LitElement { } }); audio.play(); - } else if (updatedRun.stage === "error") { + } else if ( + (updatedRun.stage === "done" && updatedRun.error) || + updatedRun.stage === "error" + ) { this._finished = true; } }, diff --git a/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts b/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts index 05da128692af..ae455152beb0 100644 --- a/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts +++ b/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts @@ -90,7 +90,7 @@ const renderProgress = ( return html`❌`; } return html` - + `; } From 32fd8270d77ce80be6944d40807bcf6a6dcf1a07 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 03:27:30 +0100 Subject: [PATCH 080/361] Fix turning valve on/off (#19269) --- src/common/const.ts | 1 + src/panels/lovelace/common/entity/turn-on-off-entity.ts | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/common/const.ts b/src/common/const.ts index 68f4fa97b1c1..bc114f2f1703 100644 --- a/src/common/const.ts +++ b/src/common/const.ts @@ -272,6 +272,7 @@ export const DOMAINS_TOGGLE = new Set([ "group", "automation", "humidifier", + "valve", ]); /** Domains that have a dynamic entity image / picture. */ diff --git a/src/panels/lovelace/common/entity/turn-on-off-entity.ts b/src/panels/lovelace/common/entity/turn-on-off-entity.ts index 701c2c4996ab..5be6beaea844 100644 --- a/src/panels/lovelace/common/entity/turn-on-off-entity.ts +++ b/src/panels/lovelace/common/entity/turn-on-off-entity.ts @@ -24,6 +24,9 @@ export const turnOnOffEntity = ( case "scene": service = "turn_on"; break; + case "valve": + service = turnOn ? "open_valve" : "close_valve"; + break; default: service = turnOn ? "turn_on" : "turn_off"; } From 8d541595b80638dc9ff5f4762bb243a8d77cce87 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 4 Jan 2024 10:54:20 +0100 Subject: [PATCH 081/361] Update getStates to support valves (#19277) --- src/common/entity/get_states.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/entity/get_states.ts b/src/common/entity/get_states.ts index 29c11ca48c42..456ce27bcea5 100644 --- a/src/common/entity/get_states.ts +++ b/src/common/entity/get_states.ts @@ -50,6 +50,7 @@ export const FIXED_DOMAIN_STATES = { timer: ["active", "idle", "paused"], update: ["on", "off"], vacuum: ["cleaning", "docked", "error", "idle", "paused", "returning"], + valve: ["closed", "closing", "open", "opening"], weather: [ "clear-night", "cloudy", From f147a5e909bc94e6bc1ed5364d9ac8791e2002a2 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 11:52:38 +0100 Subject: [PATCH 082/361] fix valve entities row (#19278) --- src/common/const.ts | 1 + src/data/valve.ts | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/common/const.ts b/src/common/const.ts index bc114f2f1703..2e7d2f7c77d7 100644 --- a/src/common/const.ts +++ b/src/common/const.ts @@ -254,6 +254,7 @@ export const DOMAINS_INPUT_ROW = [ "text", "time", "vacuum", + "valve", ]; /** States that we consider "off". */ diff --git a/src/data/valve.ts b/src/data/valve.ts index 73f5d428ae18..645ca82e4954 100644 --- a/src/data/valve.ts +++ b/src/data/valve.ts @@ -14,14 +14,20 @@ export const enum ValveEntityFeature { } export function isFullyOpen(stateObj: ValveEntity) { - if (stateObj.attributes.current_position !== undefined) { + if ( + stateObj.attributes.current_position !== undefined && + stateObj.attributes.current_position !== null + ) { return stateObj.attributes.current_position === 100; } return stateObj.state === "open"; } export function isFullyClosed(stateObj: ValveEntity) { - if (stateObj.attributes.current_position !== undefined) { + if ( + stateObj.attributes.current_position !== undefined && + stateObj.attributes.current_position !== null + ) { return stateObj.attributes.current_position === 0; } return stateObj.state === "closed"; From a1cf18468b2bafade0bbb4f4e0552bdc1fd955b3 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 13:20:35 +0100 Subject: [PATCH 083/361] Remove overflow hidden from profile (#19279) --- src/panels/profile/ha-panel-profile.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/panels/profile/ha-panel-profile.ts b/src/panels/profile/ha-panel-profile.ts index 1756af4d9333..9e82e842df5f 100644 --- a/src/panels/profile/ha-panel-profile.ts +++ b/src/panels/profile/ha-panel-profile.ts @@ -250,7 +250,6 @@ class HaPanelProfile extends LitElement { max-width: 600px; margin: 0 auto; padding-bottom: env(safe-area-inset-bottom); - overflow: hidden; } .content > * { From a31b9f1b4d952353a3f61b5905fdf6ee1eeec8ef Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jan 2024 14:24:33 +0100 Subject: [PATCH 084/361] Fix due date when no time in certain timezones (#19280) * Fix due date when no time in certain timezones * Update dialog-todo-item-editor.ts --- src/panels/lovelace/cards/hui-todo-list-card.ts | 2 +- src/panels/todo/dialog-todo-item-editor.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/panels/lovelace/cards/hui-todo-list-card.ts b/src/panels/lovelace/cards/hui-todo-list-card.ts index d1d62880f8ed..1d1c6b6c8243 100644 --- a/src/panels/lovelace/cards/hui-todo-list-card.ts +++ b/src/panels/lovelace/cards/hui-todo-list-card.ts @@ -335,7 +335,7 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { const due = item.due ? item.due.includes("T") ? new Date(item.due) - : endOfDay(new Date(item.due)) + : endOfDay(new Date(`${item.due}T00:00:00`)) : undefined; const today = due && !item.due!.includes("T") && isSameDay(new Date(), due); diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts index daa5eff68627..be03e260eccf 100644 --- a/src/panels/todo/dialog-todo-item-editor.ts +++ b/src/panels/todo/dialog-todo-item-editor.ts @@ -60,8 +60,10 @@ class DialogTodoItemEditor extends LitElement { this._checked = entry.status === TodoItemStatus.Completed; this._summary = entry.summary; this._description = entry.description || ""; - this._due = entry.due ? new Date(entry.due) : undefined; this._hasTime = entry.due?.includes("T") || false; + this._due = entry.due + ? new Date(this._hasTime ? entry.due : `${entry.due}T00:00:00`) + : undefined; } else { this._hasTime = false; this._checked = false; From 456c011f3edc0e31e3c49434dfaf37f3f715d485 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 4 Jan 2024 16:18:16 +0100 Subject: [PATCH 085/361] Fix thermostat and humidifier card rendering when off (#19281) * Fix thermostat and humidifier card rendering when off * Fix action color --- .../ha-state-control-climate-temperature.ts | 43 +++++++++++++------ .../ha-state-control-humidifier-humidity.ts | 37 ++++++++++++---- .../state-control-circular-slider-style.ts | 13 +++++- 3 files changed, 71 insertions(+), 22 deletions(-) diff --git a/src/state-control/climate/ha-state-control-climate-temperature.ts b/src/state-control/climate/ha-state-control-climate-temperature.ts index 7634fd2f2d18..0264af5ec7b3 100644 --- a/src/state-control/climate/ha-state-control-climate-temperature.ts +++ b/src/state-control/climate/ha-state-control-climate-temperature.ts @@ -177,11 +177,20 @@ export class HaStateControlClimateTemperature extends LitElement { const action = this.stateObj.attributes.hvac_action; + const isTemperatureDisplayed = + (this.stateObj.attributes.current_temperature != null && + this.showCurrentAsPrimary) || + ((this._supportsTargetTemperature || + this._supportsTargetTemperatureRange) && + !this.showCurrentAsPrimary); + return html`

- ${action + ${action && action !== "off" ? this.hass.formatEntityAttributeValue(this.stateObj, "hvac_action") - : this.hass.formatEntityState(this.stateObj)} + : isTemperatureDisplayed + ? this.hass.formatEntityState(this.stateObj) + : nothing}

`; } @@ -315,6 +324,14 @@ export class HaStateControlClimateTemperature extends LitElement { `; } + if (this.stateObj.state !== UNAVAILABLE) { + return html` +

+ ${this.hass.formatEntityState(this.stateObj)} +

+ `; + } + return nothing; } @@ -373,6 +390,14 @@ export class HaStateControlClimateTemperature extends LitElement { return html`

`; } + private _renderInfo() { + return html` +
+ ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()} +
+ `; + } + get _supportsTargetTemperature() { return ( supportsFeature(this.stateObj, ClimateEntityFeature.TARGET_TEMPERATURE) && @@ -447,10 +472,7 @@ export class HaStateControlClimateTemperature extends LitElement { @value-changing=${this._valueChanging} > -
- ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()} -
- ${this._renderTemperatureButtons("value")} + ${this._renderInfo()} ${this._renderTemperatureButtons("value")}
`; } @@ -484,9 +506,7 @@ export class HaStateControlClimateTemperature extends LitElement { @high-changing=${this._valueChanging} > -
- ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()} -
+ ${this._renderInfo()} ${this._renderTemperatureButtons(this._selectTargetTemperature, true)}
`; @@ -497,6 +517,7 @@ export class HaStateControlClimateTemperature extends LitElement { class="container${containerSizeClass}" style=${styleMap({ "--state-color": stateColor, + "--action-color": actionColor, })} > -
- ${this._renderLabel()} ${this._renderSecondary()} -
+ ${this._renderInfo()}
`; } diff --git a/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts b/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts index 6078180cd849..459e8d611730 100644 --- a/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts +++ b/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts @@ -105,11 +105,18 @@ export class HaStateControlHumidifierHumidity extends LitElement { const action = this.stateObj.attributes.action; + const isHumidityDisplayed = + (this.stateObj.attributes.current_humidity != null && + this.showCurrentAsPrimary) || + (this._targetHumidity != null && !this.showCurrentAsPrimary); + return html`

- ${action + ${action && action !== "off" ? this.hass.formatEntityAttributeValue(this.stateObj, "action") - : this.hass.formatEntityState(this.stateObj)} + : isHumidityDisplayed + ? this.hass.formatEntityState(this.stateObj) + : nothing}

`; } @@ -144,6 +151,14 @@ export class HaStateControlHumidifierHumidity extends LitElement { return this._renderTarget(this._targetHumidity!, "big"); } + if (this.stateObj.state !== UNAVAILABLE) { + return html` +

+ ${this.hass.formatEntityState(this.stateObj)} +

+ `; + } + return nothing; } @@ -225,6 +240,14 @@ export class HaStateControlHumidifierHumidity extends LitElement { `; } + private _renderInfo() { + return html` +
+ ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()} +
+ `; + } + protected render() { const stateColor = stateColorCss(this.stateObj); const active = stateActive(this.stateObj); @@ -272,10 +295,7 @@ export class HaStateControlHumidifierHumidity extends LitElement { @value-changing=${this._valueChanging} > -
- ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()} -
- ${this._renderButtons()} + ${this._renderInfo()} ${this._renderButtons()}
`; } @@ -284,6 +304,7 @@ export class HaStateControlHumidifierHumidity extends LitElement {
@@ -296,9 +317,7 @@ export class HaStateControlHumidifierHumidity extends LitElement { disabled > -
- ${this._renderLabel()} ${this._renderSecondary()} -
+ ${this._renderInfo()}
`; } diff --git a/src/state-control/state-control-circular-slider-style.ts b/src/state-control/state-control-circular-slider-style.ts index cc1c9366d7e9..b5d4d5281a03 100644 --- a/src/state-control/state-control-circular-slider-style.ts +++ b/src/state-control/state-control-circular-slider-style.ts @@ -54,7 +54,6 @@ export const stateControlCircularSliderStyle = css` .label.disabled { color: var(--secondary-text-color); } - .buttons { position: absolute; bottom: 10px; @@ -67,6 +66,9 @@ export const stateControlCircularSliderStyle = css` align-items: center; justify-content: center; } + .primary-state { + font-size: 36px; + } .buttons ha-outlined-icon-button { --md-outlined-icon-button-container-width: 48px; @@ -77,6 +79,9 @@ export const stateControlCircularSliderStyle = css` .container.md ha-big-number { font-size: 44px; } + .container.md .state { + font-size: 30px; + } .container.md .info { margin-top: 12px; gap: 6px; @@ -91,6 +96,9 @@ export const stateControlCircularSliderStyle = css` .container.sm ha-big-number { font-size: 32px; } + .container.sm .state { + font-size: 26px; + } .container.sm .info { margin-top: 12px; font-size: 14px; @@ -107,6 +115,9 @@ export const stateControlCircularSliderStyle = css` .container.xs ha-big-number { font-size: 32px; } + .container.xs .state { + font-size: 16px; + } .container.xs .info { margin-top: 12px; } From 249c89669e67d420918609df807aa5aa47d5b2cb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 13:11:06 -0500 Subject: [PATCH 086/361] Update dependency systemjs to v6.14.3 (#19282) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8f2a790e78e0..c512c677b083 100644 --- a/package.json +++ b/package.json @@ -233,7 +233,7 @@ "serve-handler": "6.1.5", "sinon": "17.0.1", "source-map-url": "0.4.1", - "systemjs": "6.14.2", + "systemjs": "6.14.3", "tar": "6.2.0", "terser-webpack-plugin": "5.3.10", "ts-lit-plugin": "2.0.1", diff --git a/yarn.lock b/yarn.lock index 59d16bf0e735..7f38d4b8e0d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9700,7 +9700,7 @@ __metadata: source-map-url: "npm:0.4.1" stacktrace-js: "npm:2.0.2" superstruct: "npm:1.0.3" - systemjs: "npm:6.14.2" + systemjs: "npm:6.14.3" tar: "npm:6.2.0" terser-webpack-plugin: "npm:5.3.10" tinykeys: "npm:2.1.0" @@ -14931,10 +14931,10 @@ __metadata: languageName: node linkType: hard -"systemjs@npm:6.14.2": - version: 6.14.2 - resolution: "systemjs@npm:6.14.2" - checksum: 5e126987ab10c3a19c3134d1ca82ab18cbf05018b396b0cc64c31c9cd561e5129f134cd0985d1987d7f82bd115a9b03182658ea76d612c58e8acfd446cda550f +"systemjs@npm:6.14.3": + version: 6.14.3 + resolution: "systemjs@npm:6.14.3" + checksum: 5d79c3b7dbd68b246fba6a9fe2372b88765c61cb1dbbd550beaaae0a4b38a1f19de302e203f2106845f959d00c1e7f9976bccf9b0527e907d5f3d8b5c6c5f61a languageName: node linkType: hard From 554e5b7be55f2898fd3a251a9a657a2da30d780b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 19:48:57 -0500 Subject: [PATCH 087/361] Update typescript-eslint monorepo to v6.17.0 (#19286) --- package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index c512c677b083..492548711772 100644 --- a/package.json +++ b/package.json @@ -184,8 +184,8 @@ "@types/tar": "6.1.10", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", - "@typescript-eslint/eslint-plugin": "6.16.0", - "@typescript-eslint/parser": "6.16.0", + "@typescript-eslint/eslint-plugin": "6.17.0", + "@typescript-eslint/parser": "6.17.0", "@web/dev-server": "0.1.38", "@web/dev-server-rollup": "0.4.1", "babel-loader": "9.1.3", diff --git a/yarn.lock b/yarn.lock index 7f38d4b8e0d3..d96a28098a86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4563,15 +4563,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.16.0": - version: 6.16.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.16.0" +"@typescript-eslint/eslint-plugin@npm:6.17.0": + version: 6.17.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.17.0" dependencies: "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:6.16.0" - "@typescript-eslint/type-utils": "npm:6.16.0" - "@typescript-eslint/utils": "npm:6.16.0" - "@typescript-eslint/visitor-keys": "npm:6.16.0" + "@typescript-eslint/scope-manager": "npm:6.17.0" + "@typescript-eslint/type-utils": "npm:6.17.0" + "@typescript-eslint/utils": "npm:6.17.0" + "@typescript-eslint/visitor-keys": "npm:6.17.0" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" ignore: "npm:^5.2.4" @@ -4584,44 +4584,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 4bedce948ac3c20492a59813ee5d4f1f2306310857864dfaac2736f6c38e18785002c36844fd64c9fbdf3059fc390b29412be105fd7a118177f1eeeb1eb533f7 + checksum: f2a5774e9cc03e491a5a488501e5622c7eebd766f5a4fc2c30642864a3b89b0807946bde33a678f326ba7032f3f6a51aa0bf9c2d10adc823804fc9fb47db55a6 languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.16.0": - version: 6.16.0 - resolution: "@typescript-eslint/parser@npm:6.16.0" +"@typescript-eslint/parser@npm:6.17.0": + version: 6.17.0 + resolution: "@typescript-eslint/parser@npm:6.17.0" dependencies: - "@typescript-eslint/scope-manager": "npm:6.16.0" - "@typescript-eslint/types": "npm:6.16.0" - "@typescript-eslint/typescript-estree": "npm:6.16.0" - "@typescript-eslint/visitor-keys": "npm:6.16.0" + "@typescript-eslint/scope-manager": "npm:6.17.0" + "@typescript-eslint/types": "npm:6.17.0" + "@typescript-eslint/typescript-estree": "npm:6.17.0" + "@typescript-eslint/visitor-keys": "npm:6.17.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 3d941ce345dc2ce29957e2110957662873d514b094b8939923c3281d858c11cd1f9058db862644afe14f68d087770f39a0a1f9e523a2013ed5d2fdf3421b34d0 + checksum: 2ed0ed4a5b30e953430ce3279df3655af09fa1caed2abf11804d239717daefc32a22864f6620ef57bb9c684c74a99a13241384fea5096e961385e3678fc2e920 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.16.0": - version: 6.16.0 - resolution: "@typescript-eslint/scope-manager@npm:6.16.0" +"@typescript-eslint/scope-manager@npm:6.17.0": + version: 6.17.0 + resolution: "@typescript-eslint/scope-manager@npm:6.17.0" dependencies: - "@typescript-eslint/types": "npm:6.16.0" - "@typescript-eslint/visitor-keys": "npm:6.16.0" - checksum: 3360aae4b85f5c31d20ad48d771cc09a6f8f6b1811b00d94f06e55b5a09c610ac75631b1c4edecb3bec682d41351b87e7d14d42bee84aa032064d0e13463035b + "@typescript-eslint/types": "npm:6.17.0" + "@typescript-eslint/visitor-keys": "npm:6.17.0" + checksum: fe09c628553c9336e6a36d32c1d34e78ebd20aa02130a6bf535329621ba5a98aaac171f607bc6e4d17b3478c42e7de6476376636897ce3f227c754eb99acd07e languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.16.0": - version: 6.16.0 - resolution: "@typescript-eslint/type-utils@npm:6.16.0" +"@typescript-eslint/type-utils@npm:6.17.0": + version: 6.17.0 + resolution: "@typescript-eslint/type-utils@npm:6.17.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:6.16.0" - "@typescript-eslint/utils": "npm:6.16.0" + "@typescript-eslint/typescript-estree": "npm:6.17.0" + "@typescript-eslint/utils": "npm:6.17.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.0.1" peerDependencies: @@ -4629,23 +4629,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 5964b87a87252bed278a248eb568902babd7c34defd3af8c3df371926d96aec716f33f1dc14bde170e93f73ed1b0af6e591e647853d0f33f378e2c7b3b73fc5b + checksum: dc7938429193acfda61b7282197ec046039e2c4da41cdcddf4daaf300d10229e4e23bb0fcf0503b19c0b99a874849c8a9f5bb35ce106260f56a14106d2b41d8c languageName: node linkType: hard -"@typescript-eslint/types@npm:6.16.0": - version: 6.16.0 - resolution: "@typescript-eslint/types@npm:6.16.0" - checksum: 236ca318c2440c95068e5d4d147e2bfed62447775e18695e21c8ca04a341a74d01c37ed2b417629b7bf2fb91ad4fd5e2a6570215d16fc24dd1507ce6973b4e22 +"@typescript-eslint/types@npm:6.17.0": + version: 6.17.0 + resolution: "@typescript-eslint/types@npm:6.17.0" + checksum: 87ab1b5a3270ab34b917c22a2fb90a9ad7d9f3b19d73a337bc9efbe65f924da13482c97e8ccbe3bd3d081aa96039eeff50de41c1da2a2128066429b931cdb21d languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.16.0": - version: 6.16.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.16.0" +"@typescript-eslint/typescript-estree@npm:6.17.0": + version: 6.17.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.17.0" dependencies: - "@typescript-eslint/types": "npm:6.16.0" - "@typescript-eslint/visitor-keys": "npm:6.16.0" + "@typescript-eslint/types": "npm:6.17.0" + "@typescript-eslint/visitor-keys": "npm:6.17.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -4655,34 +4655,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 8e1ef03ecabaf3791b11240a51217836dbb74850e458258db77ac5eab5508cd9c63fb671924993d1e7654718c0c857c3550d51ecba0845fe489d143bb858e1b1 + checksum: 1671b0d2f2fdf07074fb1e2524d61935cec173bd8db6e482cc5b2dcc77aed3ffa831396736ffa0ee2fdbddd8585ae9ca8d6c97bcaea1385b23907a1ec0508f83 languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.16.0": - version: 6.16.0 - resolution: "@typescript-eslint/utils@npm:6.16.0" +"@typescript-eslint/utils@npm:6.17.0": + version: 6.17.0 + resolution: "@typescript-eslint/utils@npm:6.17.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" "@types/json-schema": "npm:^7.0.12" "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:6.16.0" - "@typescript-eslint/types": "npm:6.16.0" - "@typescript-eslint/typescript-estree": "npm:6.16.0" + "@typescript-eslint/scope-manager": "npm:6.17.0" + "@typescript-eslint/types": "npm:6.17.0" + "@typescript-eslint/typescript-estree": "npm:6.17.0" semver: "npm:^7.5.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 84dd02f7c8e47fae699cc222da5cbea08b28c6e1cc7827860430bc86c2a17ee3f86e198a4356902b95930f85785aa662266ea9c476f69bf80c6a5f648e55f9f4 + checksum: 37c63afcf66124bf84808699997953b8c84a378aa2c490a771b611d82cdac8499c58fac8eeb8378528e97660b59563d99297bfec4b982cd68760b0ffe54aa714 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.16.0": - version: 6.16.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.16.0" +"@typescript-eslint/visitor-keys@npm:6.17.0": + version: 6.17.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.17.0" dependencies: - "@typescript-eslint/types": "npm:6.16.0" + "@typescript-eslint/types": "npm:6.17.0" eslint-visitor-keys: "npm:^3.4.1" - checksum: 19e559f14ea0092585a374b8c5f1aca9b6b271fc23909d9857de9cf71a1e1d3abc0afd237e9c02d7a5fbdfe8e3be7853cf9fedf40a6f16bac3495cb7f4e67982 + checksum: a2aed0e1437fdab8858ab9c7c8e355f8b72a5fa4b0adc54f28b8a2bbc29d4bb93214968ee940f83d013d0a4b83d00cd4eeeb05fb4c2c7d0ead324c6793f7d6d4 languageName: node linkType: hard @@ -9610,8 +9610,8 @@ __metadata: "@types/tar": "npm:6.1.10" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" - "@typescript-eslint/eslint-plugin": "npm:6.16.0" - "@typescript-eslint/parser": "npm:6.16.0" + "@typescript-eslint/eslint-plugin": "npm:6.17.0" + "@typescript-eslint/parser": "npm:6.17.0" "@vaadin/combo-box": "npm:24.3.2" "@vaadin/vaadin-themable-mixin": "npm:24.3.2" "@vibrant/color": "npm:3.2.1-alpha.1" From be7b3a56f9ca933f4869d6947310ddc2a0772f40 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 20:36:13 -0500 Subject: [PATCH 088/361] Update dependency core-js to v3.35.0 (#19215) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 492548711772..ce2e0a01eb14 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "app-datepicker": "5.1.1", "chart.js": "4.4.1", "comlink": "4.4.1", - "core-js": "3.34.0", + "core-js": "3.35.0", "cropperjs": "1.6.1", "date-fns": "2.30.0", "date-fns-tz": "2.0.0", diff --git a/yarn.lock b/yarn.lock index d96a28098a86..44814ecb620e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7024,10 +7024,10 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.34.0": - version: 3.34.0 - resolution: "core-js@npm:3.34.0" - checksum: 054474ab6a0a08a2277ca2c1c953e5789c562bbe144f6a43786b0f4167b4a76c671833bd0a112e275e1d99d84fa157e64814ff23aa01532e08e3b46403d7f7f4 +"core-js@npm:3.35.0": + version: 3.35.0 + resolution: "core-js@npm:3.35.0" + checksum: 0815fce6bcc91d79d4b28885975453b0faa4d17fc2230635102b4f3832cd621035e4032aa3307e1dbe0ee14d5e34bcb64b507fd89bd8f567aedaf29538522e6a languageName: node linkType: hard @@ -9628,7 +9628,7 @@ __metadata: chai: "npm:5.0.0" chart.js: "npm:4.4.1" comlink: "npm:4.4.1" - core-js: "npm:3.34.0" + core-js: "npm:3.35.0" cropperjs: "npm:1.6.1" date-fns: "npm:2.30.0" date-fns-tz: "npm:2.0.0" From 53be012b3454b4c1dd34a4bb30b20b2d96ae0008 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 20:42:11 -0500 Subject: [PATCH 089/361] Update CodeMirror (#19214) --- package.json | 8 ++++---- yarn.lock | 46 +++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index ce2e0a01eb14..a466d708db51 100644 --- a/package.json +++ b/package.json @@ -28,12 +28,12 @@ "@babel/runtime": "7.23.7", "@braintree/sanitize-url": "7.0.0", "@codemirror/autocomplete": "6.11.1", - "@codemirror/commands": "6.3.2", - "@codemirror/language": "6.9.3", + "@codemirror/commands": "6.3.3", + "@codemirror/language": "6.10.0", "@codemirror/legacy-modes": "6.3.3", "@codemirror/search": "6.5.5", - "@codemirror/state": "6.3.3", - "@codemirror/view": "6.22.3", + "@codemirror/state": "6.4.0", + "@codemirror/view": "6.23.0", "@egjs/hammerjs": "2.0.17", "@formatjs/intl-datetimeformat": "6.12.0", "@formatjs/intl-displaynames": "6.6.4", diff --git a/yarn.lock b/yarn.lock index 44814ecb620e..49ff1a2017b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1474,29 +1474,29 @@ __metadata: languageName: node linkType: hard -"@codemirror/commands@npm:6.3.2": - version: 6.3.2 - resolution: "@codemirror/commands@npm:6.3.2" +"@codemirror/commands@npm:6.3.3": + version: 6.3.3 + resolution: "@codemirror/commands@npm:6.3.3" dependencies: "@codemirror/language": "npm:^6.0.0" - "@codemirror/state": "npm:^6.2.0" + "@codemirror/state": "npm:^6.4.0" "@codemirror/view": "npm:^6.0.0" "@lezer/common": "npm:^1.1.0" - checksum: 85bf8242645e3f8c52b143883e837277795f9c50ad76f28f72d0d55ec921750f15ef5b4fa156b37e123b51e540d96c8db89b48bf0460cbe4a6f7b57271a65ba6 + checksum: 4b398b102d6afcbf0e0018b426287a7458867497811c9155790a3cc679b880765cd756bdb96bf35abc28fecb85c0938e618d39469ce8bc0724d4dea5d88f6ac2 languageName: node linkType: hard -"@codemirror/language@npm:6.9.3, @codemirror/language@npm:^6.0.0": - version: 6.9.3 - resolution: "@codemirror/language@npm:6.9.3" +"@codemirror/language@npm:6.10.0, @codemirror/language@npm:^6.0.0": + version: 6.10.0 + resolution: "@codemirror/language@npm:6.10.0" dependencies: "@codemirror/state": "npm:^6.0.0" - "@codemirror/view": "npm:^6.0.0" + "@codemirror/view": "npm:^6.23.0" "@lezer/common": "npm:^1.1.0" "@lezer/highlight": "npm:^1.0.0" "@lezer/lr": "npm:^1.0.0" style-mod: "npm:^4.0.0" - checksum: 331230a3876ed469cbf18dc2733040aa42a175b1a038080e4c317cf7f1fd8e929dc6838ba4749ea52992805f20be85878214cab6e0e7c7ab5fda872844611b7a + checksum: 674f87a5f7cae19a5e0cbdd0e06beade7f3694809cc30b31939aa04790dd43008942e3cd3b537ba5729fd14fed81c8ff62b7dcf51800db815cbf8d19d1d6a763 languageName: node linkType: hard @@ -1520,21 +1520,21 @@ __metadata: languageName: node linkType: hard -"@codemirror/state@npm:6.3.3, @codemirror/state@npm:^6.0.0, @codemirror/state@npm:^6.1.4, @codemirror/state@npm:^6.2.0": - version: 6.3.3 - resolution: "@codemirror/state@npm:6.3.3" - checksum: c0db0fc943ed36925238242522a8f4b2a4e3ecc4489cc013ea6d32be2bc615ecd813c98ff6a4c8f8ec1179376e555ec93a07dc1f0d1751aae721b5b38f812c08 +"@codemirror/state@npm:6.4.0, @codemirror/state@npm:^6.0.0, @codemirror/state@npm:^6.4.0": + version: 6.4.0 + resolution: "@codemirror/state@npm:6.4.0" + checksum: d9129c456d1589ca376594620bad10c51d3dcdb57950f34637cea0e2ea073a695d426dc1cfc9b909b07365c236a6312da1eaf740c384c853009742493b8c9935 languageName: node linkType: hard -"@codemirror/view@npm:6.22.3, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0": - version: 6.22.3 - resolution: "@codemirror/view@npm:6.22.3" +"@codemirror/view@npm:6.23.0, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0": + version: 6.23.0 + resolution: "@codemirror/view@npm:6.23.0" dependencies: - "@codemirror/state": "npm:^6.1.4" + "@codemirror/state": "npm:^6.4.0" style-mod: "npm:^4.1.0" w3c-keyname: "npm:^2.2.4" - checksum: c0ad3e9ab49ca9aba214cfe317e506f25d094bb3243cafd0309093279eb99084810f289a5cc019db6c35463813707bdc31557b28afb30d390f4736dd0dadc541 + checksum: 3fc1c39e6d0b2550d3f4e207705f953956baa7ce768eed0258373260db86f65ae3c1eea050e8fdfe3266d4f365828f90f4341cea71b0f0e4f19515a5341e5706 languageName: node linkType: hard @@ -9521,12 +9521,12 @@ __metadata: "@braintree/sanitize-url": "npm:7.0.0" "@bundle-stats/plugin-webpack-filter": "npm:4.8.4" "@codemirror/autocomplete": "npm:6.11.1" - "@codemirror/commands": "npm:6.3.2" - "@codemirror/language": "npm:6.9.3" + "@codemirror/commands": "npm:6.3.3" + "@codemirror/language": "npm:6.10.0" "@codemirror/legacy-modes": "npm:6.3.3" "@codemirror/search": "npm:6.5.5" - "@codemirror/state": "npm:6.3.3" - "@codemirror/view": "npm:6.22.3" + "@codemirror/state": "npm:6.4.0" + "@codemirror/view": "npm:6.23.0" "@egjs/hammerjs": "npm:2.0.17" "@formatjs/intl-datetimeformat": "npm:6.12.0" "@formatjs/intl-displaynames": "npm:6.6.4" From 7a8f5c0cc93722334cf20ff9012508ab691d1719 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Fri, 5 Jan 2024 14:31:58 +0100 Subject: [PATCH 090/361] Replace remaining paper inputs (#19292) --- .../components/supervisor-backup-content.ts | 36 +++++++-------- .../dialogs/network/dialog-hassio-network.ts | 46 +++++++++---------- .../dialog-hassio-repositories.ts | 10 ++-- package.json | 1 - yarn.lock | 39 ---------------- 5 files changed, 44 insertions(+), 88 deletions(-) diff --git a/hassio/src/components/supervisor-backup-content.ts b/hassio/src/components/supervisor-backup-content.ts index 8174debcefc5..ff67b511c023 100644 --- a/hassio/src/components/supervisor-backup-content.ts +++ b/hassio/src/components/supervisor-backup-content.ts @@ -1,6 +1,4 @@ import { mdiFolder, mdiPuzzle } from "@mdi/js"; -import "@polymer/paper-input/paper-input"; -import type { PaperInputElement } from "@polymer/paper-input/paper-input"; import { CSSResultGroup, LitElement, @@ -16,6 +14,7 @@ import { formatDateTime } from "../../../src/common/datetime/format_date_time"; import { LocalizeFunc } from "../../../src/common/translations/localize"; import "../../../src/components/ha-checkbox"; import "../../../src/components/ha-formfield"; +import "../../../src/components/ha-textfield"; import "../../../src/components/ha-radio"; import type { HaRadio } from "../../../src/components/ha-radio"; import { @@ -25,12 +24,9 @@ import { } from "../../../src/data/hassio/backup"; import { Supervisor } from "../../../src/data/supervisor/supervisor"; import { mdiHomeAssistant } from "../../../src/resources/home-assistant-logo-svg"; -import { - HomeAssistant, - TranslationDict, - ValueChangedEvent, -} from "../../../src/types"; +import { HomeAssistant, TranslationDict } from "../../../src/types"; import "./supervisor-formfield-label"; +import type { HaTextField } from "../../../src/components/ha-textfield"; type BackupOrRestoreKey = keyof TranslationDict["supervisor"]["backup"] & keyof TranslationDict["ui"]["panel"]["page-onboarding"]["restore"]; @@ -100,7 +96,7 @@ export class SupervisorBackupContent extends LitElement { @property() public confirmBackupPassword = ""; - @query("paper-input, ha-radio, ha-checkbox", true) private _focusTarget; + @query("ha-textfield, ha-radio, ha-checkbox", true) private _focusTarget; public willUpdate(changedProps) { super.willUpdate(changedProps); @@ -151,13 +147,13 @@ export class SupervisorBackupContent extends LitElement { ) : this.backup.date}

` - : html` - `} + `} ${!this.backup || this.backup.type === "full" ? html`
${!this.backup @@ -265,23 +261,23 @@ export class SupervisorBackupContent extends LitElement { : ""} ${this.backupHasPassword ? html` - - + ${!this.backup - ? html` - ` + ` : ""} ` : ""} @@ -429,9 +425,9 @@ export class SupervisorBackupContent extends LitElement { this[input.name] = input.value; } - private _handleTextValueChanged(ev: ValueChangedEvent) { - const input = ev.currentTarget as PaperInputElement; - this[input.name!] = ev.detail.value; + private _handleTextValueChanged(ev: InputEvent) { + const input = ev.currentTarget as HaTextField; + this[input.name!] = input.value; } private _toggleHasPassword(): void { diff --git a/hassio/src/dialogs/network/dialog-hassio-network.ts b/hassio/src/dialogs/network/dialog-hassio-network.ts index c831fb6c221d..b36b734a08e8 100644 --- a/hassio/src/dialogs/network/dialog-hassio-network.ts +++ b/hassio/src/dialogs/network/dialog-hassio-network.ts @@ -4,7 +4,6 @@ import "@material/mwc-list/mwc-list-item"; import "@material/mwc-tab"; import "@material/mwc-tab-bar"; import { mdiClose } from "@mdi/js"; -import { PaperInputElement } from "@polymer/paper-input/paper-input"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { cache } from "lit/directives/cache"; @@ -14,6 +13,7 @@ import "../../../../src/components/ha-circular-progress"; import "../../../../src/components/ha-dialog"; import "../../../../src/components/ha-expansion-panel"; import "../../../../src/components/ha-formfield"; +import "../../../../src/components/ha-textfield"; import "../../../../src/components/ha-header-bar"; import "../../../../src/components/ha-icon-button"; import "../../../../src/components/ha-radio"; @@ -34,6 +34,7 @@ import { HassDialog } from "../../../../src/dialogs/make-dialog-manager"; import { haStyleDialog } from "../../../../src/resources/styles"; import type { HomeAssistant } from "../../../../src/types"; import { HassioNetworkDialogParams } from "./show-dialog-network"; +import type { HaTextField } from "../../../../src/components/ha-textfield"; const IP_VERSIONS = ["ipv4", "ipv6"]; @@ -245,7 +246,7 @@ export class DialogHassioNetwork ${this._wifiConfiguration.auth === "wpa-psk" || this._wifiConfiguration.auth === "wep" ? html` - - + ` : ""} ` @@ -358,33 +358,33 @@ export class DialogHassioNetwork
${this._interface![version].method === "static" ? html` - - - + - - + - + ` : ""} @@ -517,11 +517,11 @@ export class DialogHassioNetwork this.requestUpdate("_wifiConfiguration"); } - private _handleInputValueChanged(ev: CustomEvent): void { - const value: string | null | undefined = (ev.target as PaperInputElement) - .value; + private _handleInputValueChanged(ev: Event): void { + const source = ev.target as HaTextField; + const value = source.value; const version = (ev.target as any).version as "ipv4" | "ipv6"; - const id = (ev.target as PaperInputElement).id; + const id = source.id; if ( !value || @@ -535,10 +535,10 @@ export class DialogHassioNetwork this._interface[version]![id] = value; } - private _handleInputValueChangedWifi(ev: CustomEvent): void { - const value: string | null | undefined = (ev.target as PaperInputElement) - .value; - const id = (ev.target as PaperInputElement).id; + private _handleInputValueChangedWifi(ev: Event): void { + const source = ev.target as HaTextField; + const value = source.value; + const id = source.id; if ( !value || @@ -630,7 +630,7 @@ export class DialogHassioNetwork --expansion-panel-summary-padding: 0 16px; margin: 4px 0; } - paper-input { + ha-textfield { padding: 0 14px; } mwc-list-item { diff --git a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts index 98dfc32b2417..5443d7ed44c1 100644 --- a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts +++ b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts @@ -1,7 +1,5 @@ import "@material/mwc-button/mwc-button"; import { mdiDelete, mdiDeleteOff } from "@mdi/js"; -import "@polymer/paper-input/paper-input"; -import type { PaperInputElement } from "@polymer/paper-input/paper-input"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-item/paper-item-body"; import "@lrnwebcomponents/simple-tooltip/simple-tooltip"; @@ -27,12 +25,14 @@ import { import { haStyle, haStyleDialog } from "../../../../src/resources/styles"; import type { HomeAssistant } from "../../../../src/types"; import { HassioRepositoryDialogParams } from "./show-dialog-repositories"; +import type { HaTextField } from "../../../../src/components/ha-textfield"; +import "../../../../src/components/ha-textfield"; @customElement("dialog-hassio-repositories") class HassioRepositoriesDialog extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @query("#repository_input", true) private _optionInput?: PaperInputElement; + @query("#repository_input", true) private _optionInput?: HaTextField; @state() private _repositories?: HassioAddonRepository[]; @@ -145,7 +145,7 @@ class HassioRepositoriesDialog extends LitElement { ) : html` No repositories `}
- + > ${this._processing ? html` Date: Fri, 5 Jan 2024 15:56:15 +0200 Subject: [PATCH 091/361] Fix for RTL in Supervisor dashboards (#19290) --- hassio/src/dashboard/hassio-addons.ts | 1 + hassio/src/dashboard/hassio-dashboard.ts | 2 ++ hassio/src/supervisor-base-element.ts | 10 ++++++++++ 3 files changed, 13 insertions(+) diff --git a/hassio/src/dashboard/hassio-addons.ts b/hassio/src/dashboard/hassio-addons.ts index 7b3c9d166f0e..daeb867ef66d 100644 --- a/hassio/src/dashboard/hassio-addons.ts +++ b/hassio/src/dashboard/hassio-addons.ts @@ -128,6 +128,7 @@ class HassioAddons extends LitElement { ha-card { cursor: pointer; overflow: hidden; + direction: ltr; } .search { position: sticky; diff --git a/hassio/src/dashboard/hassio-dashboard.ts b/hassio/src/dashboard/hassio-dashboard.ts index d60819861c15..a38c37b8a822 100644 --- a/hassio/src/dashboard/hassio-dashboard.ts +++ b/hassio/src/dashboard/hassio-dashboard.ts @@ -133,6 +133,8 @@ class HassioDashboard extends LitElement { position: fixed; right: calc(16px + env(safe-area-inset-right)); bottom: calc(16px + env(safe-area-inset-bottom)); + inset-inline-end: calc(16px + env(safe-area-inset-right)); + inset-inline-start: initial; z-index: 1; } `, diff --git a/hassio/src/supervisor-base-element.ts b/hassio/src/supervisor-base-element.ts index 9402728160de..86dc81998887 100644 --- a/hassio/src/supervisor-base-element.ts +++ b/hassio/src/supervisor-base-element.ts @@ -29,6 +29,10 @@ import { ProvideHassLitMixin } from "../../src/mixins/provide-hass-lit-mixin"; import { urlSyncMixin } from "../../src/state/url-sync-mixin"; import { HomeAssistant, Route } from "../../src/types"; import { getTranslation } from "../../src/util/common-translation"; +import { + computeRTLDirection, + setDirectionStyles, +} from "../../src/common/util/compute_rtl"; declare global { interface HASSDomEvents { @@ -95,6 +99,7 @@ export class SupervisorBaseElement extends urlSyncMixin( if (changedProperties.has("_language") || !this.hasUpdated) { this._initializeLocalize(); + this._applyDirection(this.hass); } } @@ -215,4 +220,9 @@ export class SupervisorBaseElement extends urlSyncMixin( ); } } + + private _applyDirection(hass: HomeAssistant) { + const direction = computeRTLDirection(hass); + setDirectionStyles(direction, this); + } } From 8960f5fef9b32a1b4c11949783b26bec5f3dd087 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 6 Jan 2024 20:50:10 -0500 Subject: [PATCH 092/361] Update dependency @types/luxon to v3.3.8 (#19308) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b7a0cba7a7ca..0c7a6998ca19 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "@types/js-yaml": "4.0.9", "@types/leaflet": "1.9.8", "@types/leaflet-draw": "1.0.11", - "@types/luxon": "3.3.7", + "@types/luxon": "3.3.8", "@types/mocha": "10.0.6", "@types/qrcode": "1.5.5", "@types/serve-handler": "6.1.4", diff --git a/yarn.lock b/yarn.lock index c43ac1d4b56f..ef48030ab766 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4271,10 +4271,10 @@ __metadata: languageName: node linkType: hard -"@types/luxon@npm:3.3.7": - version: 3.3.7 - resolution: "@types/luxon@npm:3.3.7" - checksum: 282ac72fd55da0c9d57f376ba9061ce83506cf6239c32259dacde0800964089f6183d2e449ef2ddd89b079fb8bfdffd7e5dbf187eb5c9f106aeaeca2aa60ed09 +"@types/luxon@npm:3.3.8": + version: 3.3.8 + resolution: "@types/luxon@npm:3.3.8" + checksum: 2176c394e7ee3b8580e9f30bedac29048fabe32589c6561a9654b242b9c2c08ff9b93206f0eca07e495f900a352ac1446236c310eacda574b3c2d6238a9173a7 languageName: node linkType: hard @@ -9563,7 +9563,7 @@ __metadata: "@types/js-yaml": "npm:4.0.9" "@types/leaflet": "npm:1.9.8" "@types/leaflet-draw": "npm:1.0.11" - "@types/luxon": "npm:3.3.7" + "@types/luxon": "npm:3.3.8" "@types/mocha": "npm:10.0.6" "@types/qrcode": "npm:1.5.5" "@types/serve-handler": "npm:6.1.4" From 90965a4f4db29fdb03647c16c9000c6bcdc99244 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Sat, 6 Jan 2024 20:19:44 -0800 Subject: [PATCH 093/361] Localize statistics datatable string (#19289) --- .../developer-tools/statistics/developer-tools-statistics.ts | 4 +++- src/translations/en.json | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/panels/developer-tools/statistics/developer-tools-statistics.ts b/src/panels/developer-tools/statistics/developer-tools-statistics.ts index 878a4fa73978..25339a91e27c 100644 --- a/src/panels/developer-tools/statistics/developer-tools-statistics.ts +++ b/src/panels/developer-tools/statistics/developer-tools-statistics.ts @@ -177,7 +177,9 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) { .hass=${this.hass} .columns=${this._columns(this.hass.localize)} .data=${this._displayData(this._data, this.hass.localize)} - noDataText="No statistics" + .noDataText=${this.hass.localize( + "ui.panel.developer-tools.tabs.statistics.data_table.no_statistics" + )} id="statistic_id" clickable @row-click=${this._rowClicked} diff --git a/src/translations/en.json b/src/translations/en.json index 74467bcbf1ab..01cd81a568e1 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -6190,7 +6190,8 @@ "statistic_id": "Statistic id", "statistics_unit": "Statistics unit", "source": "Source", - "issue": "Issue" + "issue": "Issue", + "no_statistics": "[%key:ui::components::statistics_charts::no_statistics_found%]" } }, "yaml": { From 17e62c10d49d1823cab2874deae88232ca92e6f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 08:17:13 +0100 Subject: [PATCH 094/361] Bump home-assistant/wheels from 2023.10.5 to 2024.01.0 (#19321) --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8bded3fcc5e2..dc843252dd02 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -74,7 +74,7 @@ jobs: echo "home-assistant-frontend==$version" > ./requirements.txt - name: Build wheels - uses: home-assistant/wheels@2023.10.5 + uses: home-assistant/wheels@2024.01.0 with: abi: cp311 tag: musllinux_1_2 From 104aef3dec2e8856d5323aecad9fea9666301776 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 8 Jan 2024 14:02:41 +0100 Subject: [PATCH 095/361] Add ha-sortable component (#19294) --- .../ha-selector/ha-selector-select.ts | 175 ++++---- src/components/ha-sidebar.ts | 111 ++--- src/components/ha-sortable.ts | 153 +++++++ src/dialogs/area-filter/area-filter-dialog.ts | 144 +++---- .../ha-more-info-light-favorite-colors.ts | 182 ++++---- .../automation/action/ha-automation-action.ts | 221 +++++----- .../types/ha-automation-action-choose.ts | 387 ++++++++---------- .../condition/ha-automation-condition.ts | 228 +++++------ .../trigger/ha-automation-trigger.ts | 233 +++++------ .../helpers/forms/ha-input_select-form.ts | 122 ++---- src/panels/config/script/ha-script-fields.ts | 24 +- .../lovelace/cards/hui-todo-list-card.ts | 320 +++++++-------- .../lovelace/components/hui-entity-editor.ts | 160 +++----- .../hui-card-features-editor.ts | 310 ++++++-------- .../editor/hui-entities-card-row-editor.ts | 279 ++++++------- ...able-style.ts => ha-sidebar-edit-style.ts} | 30 +- 16 files changed, 1371 insertions(+), 1708 deletions(-) create mode 100644 src/components/ha-sortable.ts rename src/resources/{ha-sortable-style.ts => ha-sidebar-edit-style.ts} (74%) diff --git a/src/components/ha-selector/ha-selector-select.ts b/src/components/ha-selector/ha-selector-select.ts index a20559f91bfe..0f1301d28680 100644 --- a/src/components/ha-selector/ha-selector-select.ts +++ b/src/components/ha-selector/ha-selector-select.ts @@ -1,16 +1,13 @@ import "@material/mwc-list/mwc-list-item"; import { mdiDrag } from "@mdi/js"; -import { LitElement, PropertyValues, css, html, nothing } from "lit"; +import { LitElement, css, html, nothing } from "lit"; import { customElement, property, query } from "lit/decorators"; import { repeat } from "lit/directives/repeat"; -import { SortableEvent } from "sortablejs"; import { ensureArray } from "../../common/array/ensure-array"; import { fireEvent } from "../../common/dom/fire_event"; import { stopPropagation } from "../../common/dom/stop_propagation"; import { caseInsensitiveStringCompare } from "../../common/string/compare"; import type { SelectOption, SelectSelector } from "../../data/selector"; -import { sortableStyles } from "../../resources/ha-sortable-style"; -import { SortableInstance } from "../../resources/sortable"; import type { HomeAssistant } from "../../types"; import "../chips/ha-chip-set"; import "../chips/ha-input-chip"; @@ -21,6 +18,7 @@ import "../ha-formfield"; import "../ha-input-helper-text"; import "../ha-radio"; import "../ha-select"; +import "../ha-sortable"; @customElement("ha-selector-select") export class HaSelectSelector extends LitElement { @@ -42,50 +40,10 @@ export class HaSelectSelector extends LitElement { @query("ha-combo-box", true) private comboBox!: HaComboBox; - private _sortable?: SortableInstance; - - protected updated(changedProps: PropertyValues): void { - if (changedProps.has("value") || changedProps.has("selector")) { - const sortableNeeded = - this.selector.select?.multiple && - this.selector.select.reorder && - this.value?.length; - if (!this._sortable && sortableNeeded) { - this._createSortable(); - } else if (this._sortable && !sortableNeeded) { - this._destroySortable(); - } - } - } - - private async _createSortable() { - const Sortable = (await import("../../resources/sortable")).default; - this._sortable = new Sortable( - this.shadowRoot!.querySelector("ha-chip-set")!, - { - animation: 150, - fallbackClass: "sortable-fallback", - draggable: "ha-input-chip", - onChoose: (evt: SortableEvent) => { - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._dragged(evt); - }, - } - ); - } - - private _dragged(ev: SortableEvent): void { - if (ev.oldIndex === ev.newIndex) return; - this._move(ev.oldIndex!, ev.newIndex!); + private _itemMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; + this._move(oldIndex!, newIndex); } private _move(index: number, newIndex: number) { @@ -99,11 +57,6 @@ export class HaSelectSelector extends LitElement { }); } - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - private _filter = ""; protected render() { @@ -195,37 +148,43 @@ export class HaSelectSelector extends LitElement { return html` ${value?.length ? html` - - ${repeat( - value, - (item) => item, - (item, idx) => { - const label = - options.find((option) => option.value === item)?.label || - item; - return html` - - ${this.selector.select?.reorder - ? html` - - ` - : nothing} - ${options.find((option) => option.value === item) - ?.label || item} - - `; - } - )} - + + + ${repeat( + value, + (item) => item, + (item, idx) => { + const label = + options.find((option) => option.value === item) + ?.label || item; + return html` + + ${this.selector.select?.reorder + ? html` + + ` + : nothing} + ${options.find((option) => option.value === item) + ?.label || item} + + `; + } + )} + + ` : nothing} @@ -419,25 +378,35 @@ export class HaSelectSelector extends LitElement { this.comboBox.filteredItems = filteredItems; } - static styles = [ - sortableStyles, - css` - :host { - position: relative; - } - ha-select, - mwc-formfield, - ha-formfield { - display: block; - } - mwc-list-item[disabled] { - --mdc-theme-text-primary-on-background: var(--disabled-text-color); - } - ha-chip-set { - padding: 8px 0; - } - `, - ]; + static styles = css` + :host { + position: relative; + } + ha-select, + mwc-formfield, + ha-formfield { + display: block; + } + mwc-list-item[disabled] { + --mdc-theme-text-primary-on-background: var(--disabled-text-color); + } + ha-chip-set { + padding: 8px 0; + } + + .sortable-fallback { + display: none; + opacity: 0; + } + + .sortable-ghost { + opacity: 0.4; + } + + .sortable-drag { + cursor: grabbing; + } + `; } declare global { diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts index 50b5e1cba96c..352f0130f98c 100644 --- a/src/components/ha-sidebar.ts +++ b/src/components/ha-sidebar.ts @@ -33,7 +33,6 @@ import { } from "lit"; import { customElement, eventOptions, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; -import { guard } from "lit/directives/guard"; import memoizeOne from "memoize-one"; import { storage } from "../common/decorators/storage"; import { fireEvent } from "../common/dom/fire_event"; @@ -50,12 +49,12 @@ import { subscribeRepairsIssueRegistry } from "../data/repairs"; import { UpdateEntity, updateCanInstall } from "../data/update"; import { SubscribeMixin } from "../mixins/subscribe-mixin"; import { actionHandler } from "../panels/lovelace/common/directives/action-handler-directive"; -import type { SortableInstance } from "../resources/sortable"; import { haStyleScrollbar } from "../resources/styles"; import type { HomeAssistant, PanelInfo, Route } from "../types"; import "./ha-icon"; import "./ha-icon-button"; import "./ha-menu-button"; +import "./ha-sortable"; import "./ha-svg-icon"; import "./user/ha-user-badge"; @@ -204,15 +203,13 @@ class HaSidebar extends SubscribeMixin(LitElement) { @state() private _issuesCount = 0; - @state() private _renderEmptySortable = false; - private _mouseLeaveTimeout?: number; private _tooltipHideTimeout?: number; private _recentKeydownActiveUntil = 0; - private sortableStyleLoaded = false; + private _editStyleLoaded = false; @storage({ key: "sidebarPanelOrder", @@ -228,8 +225,6 @@ class HaSidebar extends SubscribeMixin(LitElement) { }) private _hiddenPanels: string[] = []; - private _sortable?: SortableInstance; - public hassSubscribe(): UnsubscribeFunc[] { return this.hass.user?.is_admin ? [ @@ -264,14 +259,13 @@ class HaSidebar extends SubscribeMixin(LitElement) { changedProps.has("expanded") || changedProps.has("narrow") || changedProps.has("alwaysExpand") || + changedProps.has("editMode") || changedProps.has("_externalConfig") || changedProps.has("_updatesCount") || changedProps.has("_issuesCount") || changedProps.has("_notifications") || - changedProps.has("editMode") || - changedProps.has("_renderEmptySortable") || changedProps.has("_hiddenPanels") || - (changedProps.has("_panelOrder") && !this.editMode) + changedProps.has("_panelOrder") ) { return true; } @@ -306,12 +300,8 @@ class HaSidebar extends SubscribeMixin(LitElement) { if (changedProps.has("alwaysExpand")) { toggleAttribute(this, "expanded", this.alwaysExpand); } - if (changedProps.has("editMode")) { - if (this.editMode) { - this._activateEditMode(); - } else { - this._deactivateEditMode(); - } + if (changedProps.has("editMode") && this.editMode) { + this._editModeActivated(); } if (!changedProps.has("hass")) { return; @@ -470,15 +460,36 @@ class HaSidebar extends SubscribeMixin(LitElement) { `; } + private _panelMoved(ev: CustomEvent) { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; + + const [beforeSpacer] = computePanels( + this.hass.panels, + this.hass.defaultPanel, + this._panelOrder, + this._hiddenPanels, + this.hass.locale + ); + + const panelOrder = beforeSpacer.map((panel) => panel.url_path); + const panel = panelOrder.splice(oldIndex, 1)[0]; + panelOrder.splice(newIndex, 0, panel); + + this._panelOrder = panelOrder; + } + private _renderPanelsEdit(beforeSpacer: PanelInfo[]) { - // prettier-ignore - return html`
- ${guard([this._hiddenPanels, this._renderEmptySortable], () => - this._renderEmptySortable ? "" : this._renderPanels(beforeSpacer) - )} -
- ${this._renderSpacer()} - ${this._renderHiddenPanels()} `; + return html` + +
${this._renderPanels(beforeSpacer)}
+ + ${this._renderSpacer()}${this._renderHiddenPanels()} + `; } private _renderHiddenPanels() { @@ -674,44 +685,22 @@ class HaSidebar extends SubscribeMixin(LitElement) { fireEvent(this, "hass-edit-sidebar", { editMode: true }); } - private async _activateEditMode() { - await Promise.all([this._loadSortableStyle(), this._createSortable()]); + private async _editModeActivated() { + await this._loadEditStyle(); } - private async _loadSortableStyle() { - if (this.sortableStyleLoaded) return; + private async _loadEditStyle() { + if (this._editStyleLoaded) return; - const sortStylesImport = await import("../resources/ha-sortable-style"); + const editStylesImport = await import("../resources/ha-sidebar-edit-style"); const style = document.createElement("style"); - style.innerHTML = (sortStylesImport.sortableStyles as CSSResult).cssText; + style.innerHTML = (editStylesImport.sidebarEditStyle as CSSResult).cssText; this.shadowRoot!.appendChild(style); - this.sortableStyleLoaded = true; await this.updateComplete; } - private async _createSortable() { - const Sortable = (await import("../resources/sortable")).default; - this._sortable = new Sortable( - this.shadowRoot!.getElementById("sortable")!, - { - animation: 150, - fallbackClass: "sortable-fallback", - dataIdAttr: "data-panel", - handle: "paper-icon-item", - onSort: async () => { - this._panelOrder = this._sortable!.toArray(); - }, - } - ); - } - - private _deactivateEditMode() { - this._sortable?.destroy(); - this._sortable = undefined; - } - private _closeEditMode() { fireEvent(this, "hass-edit-sidebar", { editMode: false }); } @@ -724,13 +713,8 @@ class HaSidebar extends SubscribeMixin(LitElement) { } // Make a copy for Memoize this._hiddenPanels = [...this._hiddenPanels, panel]; - this._renderEmptySortable = true; - await this.updateComplete; - const container = this.shadowRoot!.getElementById("sortable")!; - while (container.lastElementChild) { - container.removeChild(container.lastElementChild); - } - this._renderEmptySortable = false; + // Remove it from the panel order + this._panelOrder = this._panelOrder.filter((order) => order !== panel); } private async _unhidePanel(ev: Event) { @@ -739,13 +723,6 @@ class HaSidebar extends SubscribeMixin(LitElement) { this._hiddenPanels = this._hiddenPanels.filter( (hidden) => hidden !== panel ); - this._renderEmptySortable = true; - await this.updateComplete; - const container = this.shadowRoot!.getElementById("sortable")!; - while (container.lastElementChild) { - container.removeChild(container.lastElementChild); - } - this._renderEmptySortable = false; } private _itemMouseEnter(ev: MouseEvent) { @@ -910,7 +887,7 @@ class HaSidebar extends SubscribeMixin(LitElement) { .menu mwc-button { width: 100%; } - #sortable, + .reorder-list, .hidden-panel { display: none; } diff --git a/src/components/ha-sortable.ts b/src/components/ha-sortable.ts new file mode 100644 index 000000000000..aed068a83af7 --- /dev/null +++ b/src/components/ha-sortable.ts @@ -0,0 +1,153 @@ +/* eslint-disable lit/prefer-static-styles */ +import { html, LitElement, nothing, PropertyValues } from "lit"; +import { customElement, property } from "lit/decorators"; +import type { SortableEvent } from "sortablejs"; +import { fireEvent } from "../common/dom/fire_event"; +import type { SortableInstance } from "../resources/sortable"; + +declare global { + interface HASSDomEvents { + "item-moved": { + oldIndex: number; + newIndex: number; + }; + } +} + +@customElement("ha-sortable") +export class HaSortable extends LitElement { + private _sortable?: SortableInstance; + + @property({ type: Boolean }) + public disabled = false; + + @property({ type: Boolean, attribute: "no-style" }) + public noStyle: boolean = false; + + @property({ type: String, attribute: "draggable-selector" }) + public draggableSelector?: string; + + @property({ type: String, attribute: "handle-selector" }) + public handleSelector?: string; + + protected updated(changedProperties: PropertyValues) { + if (changedProperties.has("disabled")) { + if (this.disabled) { + this._destroySortable(); + } else { + this._createSortable(); + } + } + } + + // Workaround for connectedCallback just after disconnectedCallback (when dragging sortable with sortable children) + private _shouldBeDestroy = false; + + public disconnectedCallback() { + super.disconnectedCallback(); + this._shouldBeDestroy = true; + setTimeout(() => { + if (this._shouldBeDestroy) { + this._destroySortable(); + this._shouldBeDestroy = false; + } + }, 1); + } + + public connectedCallback() { + super.connectedCallback(); + this._shouldBeDestroy = false; + } + + protected createRenderRoot() { + return this; + } + + protected render() { + if (this.noStyle) return nothing; + return html` + + `; + } + + private async _createSortable() { + if (this._sortable) return; + const container = this.children[0] as HTMLElement | undefined; + + if (!container) return; + + const Sortable = (await import("../resources/sortable")).default; + + const options: SortableInstance.Options = { + animation: 150, + onChoose: this._handleChoose, + onEnd: this._handleEnd, + }; + + if (this.draggableSelector) { + options.draggable = this.draggableSelector; + } + if (this.handleSelector) { + options.handle = this.handleSelector; + } + this._sortable = new Sortable(container, options); + } + + private _handleEnd = (evt: SortableEvent) => { + // put back in original location + if ((evt.item as any).placeholder) { + (evt.item as any).placeholder.replaceWith(evt.item); + delete (evt.item as any).placeholder; + } + // if item was not moved, ignore + if ( + evt.oldIndex === undefined || + evt.newIndex === undefined || + evt.oldIndex === evt.newIndex + ) { + return; + } + + fireEvent(this, "item-moved", { + oldIndex: evt.oldIndex!, + newIndex: evt.newIndex!, + }); + }; + + private _handleChoose = (evt: SortableEvent) => { + (evt.item as any).placeholder = document.createComment("sort-placeholder"); + evt.item.after((evt.item as any).placeholder); + }; + + private _destroySortable() { + if (!this._sortable) return; + this._sortable.destroy(); + this._sortable = undefined; + } +} + +declare global { + interface HTMLElementTagNameMap { + "ha-sortable": HaSortable; + } +} diff --git a/src/dialogs/area-filter/area-filter-dialog.ts b/src/dialogs/area-filter/area-filter-dialog.ts index 2dc7cacadcb2..d82a515c0929 100644 --- a/src/dialogs/area-filter/area-filter-dialog.ts +++ b/src/dialogs/area-filter/area-filter-dialog.ts @@ -4,15 +4,13 @@ import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { repeat } from "lit/directives/repeat"; -import type { SortableEvent } from "sortablejs"; import { fireEvent } from "../../common/dom/fire_event"; import type { AreaFilterValue } from "../../components/ha-area-filter"; import "../../components/ha-button"; import "../../components/ha-icon-button"; import "../../components/ha-list-item"; +import "../../components/ha-sortable"; import { areaCompare } from "../../data/area_registry"; -import { sortableStyles } from "../../resources/ha-sortable-style"; -import type { SortableInstance } from "../../resources/sortable"; import { haStyleDialog } from "../../resources/styles"; import { HomeAssistant } from "../../types"; import { HassDialog } from "../make-dialog-manager"; @@ -31,23 +29,18 @@ export class DialogAreaFilter @state() private _areas: string[] = []; - private _sortable?: SortableInstance; - - public async showDialog(dialogParams: AreaFilterDialogParams): Promise { + public showDialog(dialogParams: AreaFilterDialogParams): void { this._dialogParams = dialogParams; this._hidden = dialogParams.initialValue?.hidden ?? []; const order = dialogParams.initialValue?.order ?? []; const allAreas = Object.keys(this.hass!.areas); this._areas = allAreas.concat().sort(areaCompare(this.hass!.areas, order)); - await this.updateComplete; - this._createSortable(); } public closeDialog(): void { this._dialogParams = undefined; this._hidden = []; this._areas = []; - this._destroySortable(); fireEvent(this, "dialog-closed", { dialog: this.localName }); } @@ -66,42 +59,14 @@ export class DialogAreaFilter this.closeDialog(); } - private async _createSortable() { - const Sortable = (await import("../../resources/sortable")).default; - if (this._sortable) return; - this._sortable = new Sortable(this.shadowRoot!.querySelector(".areas")!, { - animation: 150, - fallbackClass: "sortable-fallback", - handle: ".handle", - draggable: ".draggable", - onChoose: (evt: SortableEvent) => { - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._dragged(evt); - }, - }); - } - - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - - private _dragged(ev: SortableEvent): void { - if (ev.oldIndex === ev.newIndex) return; + private _areaMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; const areas = this._areas.concat(); - const option = areas.splice(ev.oldIndex!, 1)[0]; - areas.splice(ev.newIndex!, 0, option); + const option = areas.splice(oldIndex, 1)[0]; + areas.splice(newIndex, 0, option); this._areas = areas; } @@ -120,50 +85,56 @@ export class DialogAreaFilter .heading=${this._dialogParams.title ?? this.hass.localize("ui.components.area-filter.title")} > - - ${repeat( - allAreas, - (area) => area, - (area, _idx) => { - const isVisible = !this._hidden.includes(area); - const name = this.hass!.areas[area]?.name || area; - return html` - - ${isVisible - ? html`` - : nothing} - ${name} - - - `; - } - )} - + + + ${repeat( + allAreas, + (area) => area, + (area, _idx) => { + const isVisible = !this._hidden.includes(area); + const name = this.hass!.areas[area]?.name || area; + return html` + + ${isVisible + ? html`` + : nothing} + ${name} + + + `; + } + )} + + ${this.hass.localize("ui.common.cancel")} @@ -192,7 +163,6 @@ export class DialogAreaFilter static get styles(): CSSResultGroup { return [ - sortableStyles, haStyleDialog, css` ha-dialog { diff --git a/src/dialogs/more-info/components/lights/ha-more-info-light-favorite-colors.ts b/src/dialogs/more-info/components/lights/ha-more-info-light-favorite-colors.ts index 9a2cbd6caf31..93a6b1528fd5 100644 --- a/src/dialogs/more-info/components/lights/ha-more-info-light-favorite-colors.ts +++ b/src/dialogs/more-info/components/lights/ha-more-info-light-favorite-colors.ts @@ -10,9 +10,9 @@ import { } from "lit"; import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; -import type { SortableEvent } from "sortablejs"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-control-slider"; +import "../../../../components/ha-sortable"; import { UNAVAILABLE } from "../../../../data/entity"; import { ExtEntityRegistryEntry, @@ -24,7 +24,6 @@ import { computeDefaultFavoriteColors, } from "../../../../data/light"; import { actionHandler } from "../../../../panels/lovelace/common/directives/action-handler-directive"; -import type { SortableInstance } from "../../../../resources/sortable"; import { HomeAssistant } from "../../../../types"; import { showConfirmationDialog } from "../../../generic/show-dialog-box"; import "./ha-favorite-color-button"; @@ -48,16 +47,7 @@ export class HaMoreInfoLightFavoriteColors extends LitElement { @state() private _favoriteColors: LightColor[] = []; - private _sortable?: SortableInstance; - protected updated(changedProps: PropertyValues): void { - if (changedProps.has("editMode")) { - if (this.editMode) { - this._createSortable(); - } else { - this._destroySortable(); - } - } if (changedProps.has("entry")) { if (this.entry) { if (this.entry.options?.light?.favorite_colors) { @@ -69,34 +59,10 @@ export class HaMoreInfoLightFavoriteColors extends LitElement { } } - private async _createSortable() { - const Sortable = (await import("../../../../resources/sortable")).default; - this._sortable = new Sortable( - this.shadowRoot!.querySelector(".container")!, - { - animation: 150, - fallbackClass: "sortable-fallback", - draggable: ".color", - onChoose: (evt: SortableEvent) => { - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._dragged(evt); - }, - } - ); - } - - private _dragged(ev: SortableEvent): void { - if (ev.oldIndex === ev.newIndex) return; - this._move(ev.oldIndex!, ev.newIndex!); + private _colorMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; + this._move(oldIndex, newIndex); } private _move(index: number, newIndex: number) { @@ -107,11 +73,6 @@ export class HaMoreInfoLightFavoriteColors extends LitElement { this._save(favoriteColors); } - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - private _apply = (index: number) => { const favorite = this._favoriteColors[index]; this.hass.callService("light", "turn_on", { @@ -223,72 +184,79 @@ export class HaMoreInfoLightFavoriteColors extends LitElement { protected render(): TemplateResult { return html` -
- ${this._favoriteColors.map( - (color, index) => html` -
-
- +
+ ${this._favoriteColors.map( + (color, index) => html` +
+
- - ${this.editMode - ? html` - - ` - : nothing} + + + ${this.editMode + ? html` + + ` + : nothing} +
-
- ` - )} - ${this.editMode - ? html` - - - - - - ` - : nothing} -
+ )} + ${this.editMode + ? html` + + + + + + + ` + : nothing} +
+ `; } diff --git a/src/panels/config/automation/action/ha-automation-action.ts b/src/panels/config/automation/action/ha-automation-action.ts index ce312a7bd399..ba1208930788 100644 --- a/src/panels/config/automation/action/ha-automation-action.ts +++ b/src/panels/config/automation/action/ha-automation-action.ts @@ -1,19 +1,16 @@ -import "@material/mwc-button"; import { mdiArrowDown, mdiArrowUp, mdiDrag, mdiPlus } from "@mdi/js"; import deepClone from "deep-clone-simple"; import { CSSResultGroup, LitElement, PropertyValues, css, html } from "lit"; import { customElement, property } from "lit/decorators"; import { repeat } from "lit/directives/repeat"; -import type { SortableEvent } from "sortablejs"; import { storage } from "../../../../common/decorators/storage"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-button"; import "../../../../components/ha-svg-icon"; +import "../../../../components/ha-sortable"; import { getService, isService } from "../../../../data/action"; import type { AutomationClipboard } from "../../../../data/automation"; import { Action } from "../../../../data/script"; -import { sortableStyles } from "../../../../resources/ha-sortable-style"; -import type { SortableInstance } from "../../../../resources/sortable"; import { HomeAssistant } from "../../../../types"; import { PASTE_VALUE, @@ -48,8 +45,6 @@ export default class HaAutomationAction extends LitElement { private _actionKeys = new WeakMap(); - private _sortable?: SortableInstance; - protected render() { return html` ${this.reOrderMode && !this.nested @@ -63,62 +58,68 @@ export default class HaAutomationAction extends LitElement { ${this.hass.localize( "ui.panel.config.automation.editor.re_order_mode.description_actions" )} - + ${this.hass.localize( "ui.panel.config.automation.editor.re_order_mode.exit" )} - + ` : null} -
- ${repeat( - this.actions, - (action) => this._getKey(action), - (action, idx) => html` - - ${this.reOrderMode - ? html` - - -
- -
- ` - : ""} - - ` - )} -
+ +
+ ${repeat( + this.actions, + (action) => this._getKey(action), + (action, idx) => html` + + ${this.reOrderMode + ? html` + + +
+ +
+ ` + : ""} + + ` + )} +
+
{ - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._dragged(evt); - }, - }); - } - - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - private _getKey(action: Action) { if (!this._actionKeys.has(action)) { this._actionKeys.set(action, Math.random().toString()); @@ -262,11 +229,6 @@ export default class HaAutomationAction extends LitElement { this._move(index, newIndex); } - private _dragged(ev: SortableEvent): void { - if (ev.oldIndex === ev.newIndex) return; - this._move(ev.oldIndex!, ev.newIndex!); - } - private _move(index: number, newIndex: number) { const actions = this.actions.concat(); const action = actions.splice(index, 1)[0]; @@ -274,6 +236,12 @@ export default class HaAutomationAction extends LitElement { fireEvent(this, "value-changed", { value: actions }); } + private _actionMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; + this._move(oldIndex, newIndex); + } + private _actionChanged(ev: CustomEvent) { ev.stopPropagation(); const actions = [...this.actions]; @@ -302,39 +270,36 @@ export default class HaAutomationAction extends LitElement { } static get styles(): CSSResultGroup { - return [ - sortableStyles, - css` - ha-automation-action-row { - display: block; - margin-bottom: 16px; - scroll-margin-top: 48px; - } - ha-svg-icon { - height: 20px; - } - ha-alert { - display: block; - margin-bottom: 16px; - border-radius: var(--ha-card-border-radius, 12px); - overflow: hidden; - } - .handle { - cursor: move; /* fallback if grab cursor is unsupported */ - cursor: grab; - padding: 12px; - } - .handle ha-svg-icon { - pointer-events: none; - height: 24px; - } - .buttons { - display: flex; - flex-wrap: wrap; - gap: 8px; - } - `, - ]; + return css` + ha-automation-action-row { + display: block; + margin-bottom: 16px; + scroll-margin-top: 48px; + } + ha-svg-icon { + height: 20px; + } + ha-alert { + display: block; + margin-bottom: 16px; + border-radius: var(--ha-card-border-radius, 12px); + overflow: hidden; + } + .handle { + padding: 12px; + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + } + .handle ha-svg-icon { + pointer-events: none; + height: 24px; + } + .buttons { + display: flex; + flex-wrap: wrap; + gap: 8px; + } + `; } } diff --git a/src/panels/config/automation/action/types/ha-automation-action-choose.ts b/src/panels/config/automation/action/types/ha-automation-action-choose.ts index 5c0ee0763790..1b4bebb273f2 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-choose.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-choose.ts @@ -1,29 +1,31 @@ import { consume } from "@lit-labs/context"; -import type { SortableEvent } from "sortablejs"; +import type { ActionDetail } from "@material/mwc-list"; import { - mdiDotsVertical, - mdiRenameBox, - mdiSort, + mdiArrowDown, + mdiArrowUp, mdiContentDuplicate, mdiDelete, - mdiPlus, - mdiArrowUp, - mdiArrowDown, + mdiDotsVertical, mdiDrag, + mdiPlus, + mdiRenameBox, + mdiSort, } from "@mdi/js"; import deepClone from "deep-clone-simple"; import { CSSResultGroup, LitElement, PropertyValues, css, html } from "lit"; import { customElement, property, state } from "lit/decorators"; import { repeat } from "lit/directives/repeat"; -import type { ActionDetail } from "@material/mwc-list"; -import type { SortableInstance } from "../../../../../resources/sortable"; import { ensureArray } from "../../../../../common/array/ensure-array"; import { fireEvent } from "../../../../../common/dom/fire_event"; import { capitalizeFirstLetter } from "../../../../../common/string/capitalize-first-letter"; import "../../../../../components/ha-button"; -import "../../../../../components/ha-icon-button"; import "../../../../../components/ha-button-menu"; +import "../../../../../components/ha-icon-button"; +import "../../../../../components/ha-sortable"; import { Condition } from "../../../../../data/automation"; +import { describeCondition } from "../../../../../data/automation_i18n"; +import { fullEntitiesContext } from "../../../../../data/context"; +import { EntityRegistryEntry } from "../../../../../data/entity_registry"; import { Action, ChooseAction, @@ -36,10 +38,6 @@ import { import { haStyle } from "../../../../../resources/styles"; import { HomeAssistant } from "../../../../../types"; import { ActionElement } from "../ha-automation-action-row"; -import { describeCondition } from "../../../../../data/automation_i18n"; -import { fullEntitiesContext } from "../../../../../data/context"; -import { EntityRegistryEntry } from "../../../../../data/entity_registry"; -import { sortableStyles } from "../../../../../resources/ha-sortable-style"; const preventDefault = (ev) => ev.preventDefault(); @@ -63,8 +61,6 @@ export class HaChooseAction extends LitElement implements ActionElement { private _expandLast = false; - private _sortable?: SortableInstance; - public static get defaultConfig() { return { choose: [{ conditions: [], sequence: [] }] }; } @@ -100,157 +96,166 @@ export class HaChooseAction extends LitElement implements ActionElement { const action = this.action; return html` -
- ${repeat( - action.choose ? ensureArray(action.choose) : [], - (option) => option, - (option, idx) => - html` - -

- ${this.hass.localize( - "ui.panel.config.automation.editor.actions.type.choose.option", - { number: idx + 1 } - )}: - ${option.alias || - (this._expandedStates[idx] - ? "" - : this._getDescription(option))} -

- ${this.reOrderMode - ? html` - - +
+ ${repeat( + action.choose ? ensureArray(action.choose) : [], + (option) => option, + (option, idx) => html` +
+ + +

+ ${this.hass.localize( + "ui.panel.config.automation.editor.actions.type.choose.option", + { number: idx + 1 } + )}: + ${option.alias || + (this._expandedStates[idx] + ? "" + : this._getDescription(option))} +

+ ${this.reOrderMode + ? html` + + +
+ +
+ ` + : html` + + + + ${this.hass.localize( + "ui.panel.config.automation.editor.actions.rename" + )} + + + + ${this.hass.localize( + "ui.panel.config.automation.editor.actions.re_order" + )} + + + + + ${this.hass.localize( + "ui.panel.config.automation.editor.actions.duplicate" + )} + + + + + ${this.hass.localize( + "ui.panel.config.automation.editor.actions.type.choose.remove_option" + )} + + + + `} +
+

+ ${this.hass.localize( + "ui.panel.config.automation.editor.actions.type.choose.conditions" + )}: +

+ ( + option.conditions )} - .path=${mdiArrowDown} - @click=${this._moveDown} - .disabled=${idx === - ensureArray(this.action.choose).length - 1} - > -
- -
- ` - : html` - - - - ${this.hass.localize( - "ui.panel.config.automation.editor.actions.rename" - )} - - - - ${this.hass.localize( - "ui.panel.config.automation.editor.actions.re_order" - )} - - - - - ${this.hass.localize( - "ui.panel.config.automation.editor.actions.duplicate" - )} - - - - - ${this.hass.localize( - "ui.panel.config.automation.editor.actions.type.choose.remove_option" - )} - - - - `} -
-

- ${this.hass.localize( - "ui.panel.config.automation.editor.actions.type.choose.conditions" - )}: -

- ( - option.conditions - )} - .reOrderMode=${this.reOrderMode} - .disabled=${this.disabled} - .hass=${this.hass} - .idx=${idx} - @value-changed=${this._conditionChanged} - > -

- ${this.hass.localize( - "ui.panel.config.automation.editor.actions.type.choose.sequence" - )}: -

- -
- - ` - )} -
+ @value-changed=${this._conditionChanged} + > +

+ ${this.hass.localize( + "ui.panel.config.automation.editor.actions.type.choose.sequence" + )}: +

+ +
+ + +
+ ` + )} +
+ { - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._dragged(evt); - }, - }); - } - - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - static get styles(): CSSResultGroup { return [ haStyle, - sortableStyles, css` - ha-card { + .option { margin: 0 0 16px 0; } .add-card mwc-button { @@ -543,9 +512,9 @@ export class HaChooseAction extends LitElement implements ActionElement { padding: 0 16px 16px 16px; } .handle { + padding: 12px; cursor: move; /* fallback if grab cursor is unsupported */ cursor: grab; - padding: 12px; } .handle ha-svg-icon { pointer-events: none; diff --git a/src/panels/config/automation/condition/ha-automation-condition.ts b/src/panels/config/automation/condition/ha-automation-condition.ts index 27364b92a3ed..c240c2ae6cbc 100644 --- a/src/panels/config/automation/condition/ha-automation-condition.ts +++ b/src/panels/config/automation/condition/ha-automation-condition.ts @@ -1,4 +1,3 @@ -import "@material/mwc-button"; import { mdiArrowDown, mdiArrowUp, mdiDrag, mdiPlus } from "@mdi/js"; import deepClone from "deep-clone-simple"; import { @@ -11,18 +10,16 @@ import { } from "lit"; import { customElement, property } from "lit/decorators"; import { repeat } from "lit/directives/repeat"; -import type { SortableEvent } from "sortablejs"; import { storage } from "../../../../common/decorators/storage"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-button"; import "../../../../components/ha-button-menu"; +import "../../../../components/ha-sortable"; import "../../../../components/ha-svg-icon"; import type { AutomationClipboard, Condition, } from "../../../../data/automation"; -import { sortableStyles } from "../../../../resources/ha-sortable-style"; -import type { SortableInstance } from "../../../../resources/sortable"; import type { HomeAssistant } from "../../../../types"; import { PASTE_VALUE, @@ -55,17 +52,7 @@ export default class HaAutomationCondition extends LitElement { private _conditionKeys = new WeakMap(); - private _sortable?: SortableInstance; - protected updated(changedProperties: PropertyValues) { - if (changedProperties.has("reOrderMode")) { - if (this.reOrderMode) { - this._createSortable(); - } else { - this._destroySortable(); - } - } - if (!changedProperties.has("conditions")) { return; } @@ -118,63 +105,70 @@ export default class HaAutomationCondition extends LitElement { ${this.hass.localize( "ui.panel.config.automation.editor.re_order_mode.description_conditions" )} - + ${this.hass.localize( "ui.panel.config.automation.editor.re_order_mode.exit" )} - + ` : null} -
- ${repeat( - this.conditions.filter((c) => typeof c === "object"), - (condition) => this._getKey(condition), - (cond, idx) => html` - - ${this.reOrderMode - ? html` - - -
- -
- ` - : ""} - - ` - )} -
+ + +
+ ${repeat( + this.conditions.filter((c) => typeof c === "object"), + (condition) => this._getKey(condition), + (cond, idx) => html` + + ${this.reOrderMode + ? html` + + +
+ +
+ ` + : ""} + + ` + )} +
+
{ - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._dragged(evt); - }, - } - ); - } - - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - private _getKey(condition: Condition) { if (!this._conditionKeys.has(condition)) { this._conditionKeys.set(condition, Math.random().toString()); @@ -298,11 +262,6 @@ export default class HaAutomationCondition extends LitElement { this._move(index, newIndex); } - private _dragged(ev: SortableEvent): void { - if (ev.oldIndex === ev.newIndex) return; - this._move(ev.oldIndex!, ev.newIndex!); - } - private _move(index: number, newIndex: number) { const conditions = this.conditions.concat(); const condition = conditions.splice(index, 1)[0]; @@ -310,6 +269,12 @@ export default class HaAutomationCondition extends LitElement { fireEvent(this, "value-changed", { value: conditions }); } + private _conditionMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; + this._move(oldIndex, newIndex); + } + private _conditionChanged(ev: CustomEvent) { ev.stopPropagation(); const conditions = [...this.conditions]; @@ -340,39 +305,36 @@ export default class HaAutomationCondition extends LitElement { } static get styles(): CSSResultGroup { - return [ - sortableStyles, - css` - ha-automation-condition-row { - display: block; - margin-bottom: 16px; - scroll-margin-top: 48px; - } - ha-svg-icon { - height: 20px; - } - ha-alert { - display: block; - margin-bottom: 16px; - border-radius: var(--ha-card-border-radius, 12px); - overflow: hidden; - } - .handle { - cursor: move; /* fallback if grab cursor is unsupported */ - cursor: grab; - padding: 12px; - } - .handle ha-svg-icon { - pointer-events: none; - height: 24px; - } - .buttons { - display: flex; - flex-wrap: wrap; - gap: 8px; - } - `, - ]; + return css` + ha-automation-condition-row { + display: block; + margin-bottom: 16px; + scroll-margin-top: 48px; + } + ha-svg-icon { + height: 20px; + } + ha-alert { + display: block; + margin-bottom: 16px; + border-radius: var(--ha-card-border-radius, 12px); + overflow: hidden; + } + .handle { + padding: 12px; + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + } + .handle ha-svg-icon { + pointer-events: none; + height: 24px; + } + .buttons { + display: flex; + flex-wrap: wrap; + gap: 8px; + } + `; } } diff --git a/src/panels/config/automation/trigger/ha-automation-trigger.ts b/src/panels/config/automation/trigger/ha-automation-trigger.ts index 90467f61e0b8..167a9ab2531a 100644 --- a/src/panels/config/automation/trigger/ha-automation-trigger.ts +++ b/src/panels/config/automation/trigger/ha-automation-trigger.ts @@ -1,25 +1,22 @@ -import "@material/mwc-button"; import { mdiArrowDown, mdiArrowUp, mdiDrag, mdiPlus } from "@mdi/js"; import deepClone from "deep-clone-simple"; import { CSSResultGroup, LitElement, PropertyValues, css, html } from "lit"; import { customElement, property } from "lit/decorators"; import { repeat } from "lit/directives/repeat"; -import type { SortableEvent } from "sortablejs"; import { storage } from "../../../../common/decorators/storage"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-button"; import "../../../../components/ha-button-menu"; +import "../../../../components/ha-sortable"; import "../../../../components/ha-svg-icon"; import { AutomationClipboard, Trigger } from "../../../../data/automation"; -import { sortableStyles } from "../../../../resources/ha-sortable-style"; -import type { SortableInstance } from "../../../../resources/sortable"; import { HomeAssistant } from "../../../../types"; -import "./ha-automation-trigger-row"; -import type HaAutomationTriggerRow from "./ha-automation-trigger-row"; import { PASTE_VALUE, showAddAutomationElementDialog, } from "../show-add-automation-element-dialog"; +import "./ha-automation-trigger-row"; +import type HaAutomationTriggerRow from "./ha-automation-trigger-row"; @customElement("ha-automation-trigger") export default class HaAutomationTrigger extends LitElement { @@ -45,8 +42,6 @@ export default class HaAutomationTrigger extends LitElement { private _triggerKeys = new WeakMap(); - private _sortable?: SortableInstance; - protected render() { return html` ${this.reOrderMode && !this.nested @@ -60,70 +55,76 @@ export default class HaAutomationTrigger extends LitElement { ${this.hass.localize( "ui.panel.config.automation.editor.re_order_mode.description_triggers" )} - + ${this.hass.localize( "ui.panel.config.automation.editor.re_order_mode.exit" )} - + ` : null} -
- ${repeat( - this.triggers, - (trigger) => this._getKey(trigger), - (trg, idx) => html` - - ${this.reOrderMode - ? html` - - -
- -
- ` - : ""} - - ` - )} - +
+ ${repeat( + this.triggers, + (trigger) => this._getKey(trigger), + (trg, idx) => html` + + ${this.reOrderMode + ? html` + + +
+ +
+ ` + : ""} + + ` )} - .disabled=${this.disabled} - @click=${this._addTriggerDialog} - > - - -
+
+ + + + `; } @@ -158,14 +159,6 @@ export default class HaAutomationTrigger extends LitElement { protected updated(changedProps: PropertyValues) { super.updated(changedProps); - if (changedProps.has("reOrderMode")) { - if (this.reOrderMode) { - this._createSortable(); - } else { - this._destroySortable(); - } - } - if (changedProps.has("triggers") && this._focusLastTriggerOnChange) { this._focusLastTriggerOnChange = false; @@ -190,36 +183,6 @@ export default class HaAutomationTrigger extends LitElement { this.reOrderMode = false; } - private async _createSortable() { - const Sortable = (await import("../../../../resources/sortable")).default; - this._sortable = new Sortable( - this.shadowRoot!.querySelector(".triggers")!, - { - animation: 150, - fallbackClass: "sortable-fallback", - handle: ".handle", - onChoose: (evt: SortableEvent) => { - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._dragged(evt); - }, - } - ); - } - - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - private _getKey(action: Trigger) { if (!this._triggerKeys.has(action)) { this._triggerKeys.set(action, Math.random().toString()); @@ -240,11 +203,6 @@ export default class HaAutomationTrigger extends LitElement { this._move(index, newIndex); } - private _dragged(ev: SortableEvent): void { - if (ev.oldIndex === ev.newIndex) return; - this._move(ev.oldIndex!, ev.newIndex!); - } - private _move(index: number, newIndex: number) { const triggers = this.triggers.concat(); const trigger = triggers.splice(index, 1)[0]; @@ -252,6 +210,12 @@ export default class HaAutomationTrigger extends LitElement { fireEvent(this, "value-changed", { value: triggers }); } + private _triggerMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; + this._move(oldIndex, newIndex); + } + private _triggerChanged(ev: CustomEvent) { ev.stopPropagation(); const triggers = [...this.triggers]; @@ -280,34 +244,31 @@ export default class HaAutomationTrigger extends LitElement { } static get styles(): CSSResultGroup { - return [ - sortableStyles, - css` - ha-automation-trigger-row { - display: block; - margin-bottom: 16px; - scroll-margin-top: 48px; - } - ha-svg-icon { - height: 20px; - } - ha-alert { - display: block; - margin-bottom: 16px; - border-radius: var(--ha-card-border-radius, 16px); - overflow: hidden; - } - .handle { - cursor: move; /* fallback if grab cursor is unsupported */ - cursor: grab; - padding: 12px; - } - .handle ha-svg-icon { - pointer-events: none; - height: 24px; - } - `, - ]; + return css` + ha-automation-trigger-row { + display: block; + margin-bottom: 16px; + scroll-margin-top: 48px; + } + ha-svg-icon { + height: 20px; + } + ha-alert { + display: block; + margin-bottom: 16px; + border-radius: var(--ha-card-border-radius, 16px); + overflow: hidden; + } + .handle { + padding: 12px; + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + } + .handle ha-svg-icon { + pointer-events: none; + height: 24px; + } + `; } } diff --git a/src/panels/config/helpers/forms/ha-input_select-form.ts b/src/panels/config/helpers/forms/ha-input_select-form.ts index e8be0fe50418..69c328f2a0b4 100644 --- a/src/panels/config/helpers/forms/ha-input_select-form.ts +++ b/src/panels/config/helpers/forms/ha-input_select-form.ts @@ -1,22 +1,20 @@ import "@material/mwc-list/mwc-list"; import { mdiDelete, mdiDrag } from "@mdi/js"; -import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; +import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property, query, state } from "lit/decorators"; import { repeat } from "lit/directives/repeat"; -import type { SortableEvent } from "sortablejs"; -import { sortableStyles } from "../../../../resources/ha-sortable-style"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-button"; import "../../../../components/ha-icon-button"; -import "../../../../components/ha-list-item"; import "../../../../components/ha-icon-picker"; +import "../../../../components/ha-list-item"; +import "../../../../components/ha-sortable"; import "../../../../components/ha-textfield"; import type { HaTextField } from "../../../../components/ha-textfield"; import type { InputSelect } from "../../../../data/input_select"; import { showConfirmationDialog } from "../../../../dialogs/generic/show-dialog-box"; import { haStyle } from "../../../../resources/styles"; import type { HomeAssistant } from "../../../../types"; -import type { SortableInstance } from "../../../../resources/sortable"; @customElement("ha-input_select-form") class HaInputSelectForm extends LitElement { @@ -32,59 +30,20 @@ class HaInputSelectForm extends LitElement { @state() private _options: string[] = []; - private _sortable?: SortableInstance; - @query("#option_input", true) private _optionInput?: HaTextField; - public connectedCallback() { - super.connectedCallback(); - this._createSortable(); - } - - public disconnectedCallback() { - super.disconnectedCallback(); - this._destroySortable(); - } - - private async _createSortable() { - const Sortable = (await import("../../../../resources/sortable")).default; - this._sortable = new Sortable(this.shadowRoot!.querySelector(".options")!, { - animation: 150, - fallbackClass: "sortable-fallback", - handle: ".handle", - onChoose: (evt: SortableEvent) => { - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._dragged(evt); - }, - }); - } - - private _dragged(ev: SortableEvent): void { - if (ev.oldIndex === ev.newIndex) return; - + private _optionMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; const options = this._options.concat(); - const option = options.splice(ev.oldIndex!, 1)[0]; - options.splice(ev.newIndex!, 0, option); + const option = options.splice(oldIndex, 1)[0]; + options.splice(newIndex, 0, option); fireEvent(this, "value-changed", { value: { ...this._item, options }, }); } - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - set item(item: InputSelect) { this._item = item; if (item) { @@ -142,39 +101,41 @@ class HaInputSelectForm extends LitElement { "ui.dialogs.helper_settings.input_select.options" )}:
- - ${this._options.length - ? repeat( - this._options, - (option) => option, - (option, index) => html` - -
-
- + + + ${this._options.length + ? repeat( + this._options, + (option) => option, + (option, index) => html` + +
+
+ +
+ ${option}
- ${option} -
- + + + ` + ) + : html` + + ${this.hass!.localize( + "ui.dialogs.helper_settings.input_select.no_options" + )} - ` - ) - : html` - - ${this.hass!.localize( - "ui.dialogs.helper_settings.input_select.no_options" - )} - - `} - + `} + +
; - private _sortable?: SortableInstance; - - @query("#unchecked") private _uncheckedContainer?: HTMLElement; - connectedCallback(): void { super.connectedCallback(); if (this.hasUpdated) { @@ -264,9 +258,15 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { ` : nothing}
- - ${this._renderItems(uncheckedItems, unavailable)} - ` + + + ${this._renderItems(uncheckedItems, unavailable)} + + ` : html`

${this.hass.localize( "ui.panel.lovelace.cards.todo-list.no_unchecked_items" @@ -553,43 +553,12 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { private async _toggleReorder() { this._reordering = !this._reordering; - await this.updateComplete; - if (this._reordering) { - this._createSortable(); - } else { - this._sortable?.destroy(); - this._sortable = undefined; - } } - private async _createSortable() { - const Sortable = (await import("../../../resources/sortable")).default; - this._sortable = new Sortable(this._uncheckedContainer!, { - animation: 150, - fallbackClass: "sortable-fallback", - dataIdAttr: "item-id", - handle: "ha-svg-icon", - onChoose: (evt: SortableEvent) => { - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - if (evt.newIndex === undefined || evt.oldIndex === undefined) { - return; - } - // Since this is `onEnd` event, it's possible that - // an item was dragged away and was put back to its original position. - if (evt.oldIndex !== evt.newIndex) { - this._moveItem(evt.oldIndex, evt.newIndex); - } - }, - }); + private async _itemMoved(ev: CustomEvent) { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; + this._moveItem(oldIndex, newIndex); } private async _moveItem(oldIndex: number, newIndex: number) { @@ -621,165 +590,162 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { } static get styles(): CSSResultGroup { - return [ - sortableStyles, - css` - ha-card { - height: 100%; - box-sizing: border-box; - } + return css` + ha-card { + height: 100%; + box-sizing: border-box; + } - .has-header { - padding-top: 0; - } + .has-header { + padding-top: 0; + } - .addRow { - padding: 16px; - padding-bottom: 0; - position: relative; - } + .addRow { + padding: 16px; + padding-bottom: 0; + position: relative; + } - .addRow ha-icon-button { - position: absolute; - right: 16px; - inset-inline-start: initial; - inset-inline-end: 16px; - } + .addRow ha-icon-button { + position: absolute; + right: 16px; + inset-inline-start: initial; + inset-inline-end: 16px; + } - .addRow, - .header { - display: flex; - flex-direction: row; - align-items: center; - } + .addRow, + .header { + display: flex; + flex-direction: row; + align-items: center; + } - .header { - padding-left: 30px; - padding-right: 16px; - padding-inline-start: 30px; - padding-inline-end: 16px; - margin-top: 8px; - justify-content: space-between; - direction: var(--direction); - } + .header { + padding-left: 30px; + padding-right: 16px; + padding-inline-start: 30px; + padding-inline-end: 16px; + margin-top: 8px; + justify-content: space-between; + direction: var(--direction); + } - .header span { - color: var(--primary-text-color); - font-weight: 500; - } + .header span { + color: var(--primary-text-color); + font-weight: 500; + } - .empty { - padding: 16px 32px; - } + .empty { + padding: 16px 32px; + } - .item { - margin-top: 8px; - } + .item { + margin-top: 8px; + } - ha-check-list-item { - --mdc-list-item-meta-size: 56px; - min-height: 56px; - height: auto; - } + ha-check-list-item { + --mdc-list-item-meta-size: 56px; + min-height: 56px; + height: auto; + } - ha-check-list-item.multiline { - align-items: flex-start; - --check-list-item-graphic-margin-top: 8px; - } + ha-check-list-item.multiline { + align-items: flex-start; + --check-list-item-graphic-margin-top: 8px; + } - .row { - display: flex; - justify-content: space-between; - } + .row { + display: flex; + justify-content: space-between; + } - .multiline .column { - display: flex; - flex-direction: column; - margin-top: 18px; - margin-bottom: 12px; - } + .multiline .column { + display: flex; + flex-direction: column; + margin-top: 18px; + margin-bottom: 12px; + } - .completed .summary { - text-decoration: line-through; - } + .completed .summary { + text-decoration: line-through; + } - .description, - .due { - font-size: 12px; - color: var(--secondary-text-color); - } + .description, + .due { + font-size: 12px; + color: var(--secondary-text-color); + } - .description { - white-space: initial; - overflow: hidden; - display: -webkit-box; - -webkit-line-clamp: 3; - line-clamp: 3; - -webkit-box-orient: vertical; - } + .description { + white-space: initial; + overflow: hidden; + display: -webkit-box; + -webkit-line-clamp: 3; + line-clamp: 3; + -webkit-box-orient: vertical; + } - .description p { - margin: 0; - } + .description p { + margin: 0; + } - .description a { - color: var(--primary-color); - } + .description a { + color: var(--primary-color); + } - .due { - display: flex; - align-items: center; - } + .due { + display: flex; + align-items: center; + } - .due ha-svg-icon { - margin-right: 4px; - --mdc-icon-size: 14px; - } + .due ha-svg-icon { + margin-right: 4px; + --mdc-icon-size: 14px; + } - .due.overdue { - color: var(--warning-color); - } + .due.overdue { + color: var(--warning-color); + } - .completed .due.overdue { - color: var(--secondary-text-color); - } + .completed .due.overdue { + color: var(--secondary-text-color); + } - .handle { - cursor: move; /* fallback if grab cursor is unsupported */ - cursor: grab; - height: 24px; - padding: 16px 4px; - } + .handle { + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + height: 24px; + padding: 16px 4px; + } - .deleteItemButton { - position: relative; - left: 8px; - } + .deleteItemButton { + position: relative; + left: 8px; + } - ha-textfield { - flex-grow: 1; - } + ha-textfield { + flex-grow: 1; + } - .divider { - height: 1px; - background-color: var(--divider-color); - margin: 10px 0; - } + .divider { + height: 1px; + background-color: var(--divider-color); + margin: 10px 0; + } - .clearall { - cursor: pointer; - } + .clearall { + cursor: pointer; + } - .todoList { - display: block; - padding: 8px; - } + .todoList { + display: block; + padding: 8px; + } - .warning { - color: var(--error-color); - } - `, - ]; + .warning { + color: var(--error-color); + } + `; } } diff --git a/src/panels/lovelace/components/hui-entity-editor.ts b/src/panels/lovelace/components/hui-entity-editor.ts index 22ac4f8aa08d..0af08f1180f8 100644 --- a/src/panels/lovelace/components/hui-entity-editor.ts +++ b/src/panels/lovelace/components/hui-entity-editor.ts @@ -2,7 +2,6 @@ import { mdiDrag } from "@mdi/js"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { customElement, property } from "lit/decorators"; 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 { @@ -10,8 +9,7 @@ import type { HaEntityPickerEntityFilterFunc, } from "../../../components/entity/ha-entity-picker"; import "../../../components/ha-icon-button"; -import { sortableStyles } from "../../../resources/ha-sortable-style"; -import type { SortableInstance } from "../../../resources/sortable"; +import "../../../components/ha-sortable"; import { HomeAssistant } from "../../../types"; import { EntityConfig } from "../entity-rows/types"; @@ -27,13 +25,6 @@ export class HuiEntityEditor extends LitElement { private _entityKeys = new WeakMap(); - private _sortable?: SortableInstance; - - public disconnectedCallback() { - super.disconnectedCallback(); - this._destroySortable(); - } - private _getKey(action: EntityConfig) { if (!this._entityKeys.has(action)) { this._entityKeys.set(action, Math.random().toString()); @@ -55,27 +46,29 @@ export class HuiEntityEditor extends LitElement { this.hass!.localize("ui.panel.lovelace.editor.card.config.required") + ")"}

-
- ${repeat( - this.entities, - (entityConf) => this._getKey(entityConf), - (entityConf, index) => html` -
-
- + +
+ ${repeat( + this.entities, + (entityConf) => this._getKey(entityConf), + (entityConf, index) => html` +
+
+ +
+
- -
- ` - )} -
+ ` + )} +
+ { - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._entityMoved(evt); - }, - } - ); - } - - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - private async _addEntity(ev: CustomEvent): Promise { const value = ev.detail.value; if (value === "") { @@ -132,14 +90,13 @@ export class HuiEntityEditor extends LitElement { fireEvent(this, "entities-changed", { entities: newConfigEntities }); } - private _entityMoved(ev: SortableEvent): void { - if (ev.oldIndex === ev.newIndex) { - return; - } + private _entityMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; const newEntities = this.entities!.concat(); - newEntities.splice(ev.newIndex!, 0, newEntities.splice(ev.oldIndex!, 1)[0]); + newEntities.splice(newIndex, 0, newEntities.splice(oldIndex, 1)[0]); fireEvent(this, "entities-changed", { entities: newEntities }); } @@ -162,39 +119,36 @@ export class HuiEntityEditor extends LitElement { } static get styles(): CSSResultGroup { - return [ - sortableStyles, - css` - ha-entity-picker { - margin-top: 8px; - } - .add-entity { - display: block; - margin-left: 31px; - margin-inline-start: 31px; - margin-inline-end: initial; - direction: var(--direction); - } - .entity { - display: flex; - align-items: center; - } - .entity .handle { - padding-right: 8px; - cursor: move; /* fallback if grab cursor is unsupported */ - cursor: grab; - padding-inline-end: 8px; - padding-inline-start: initial; - direction: var(--direction); - } - .entity .handle > * { - pointer-events: none; - } - .entity ha-entity-picker { - flex-grow: 1; - } - `, - ]; + return css` + ha-entity-picker { + margin-top: 8px; + } + .add-entity { + display: block; + margin-left: 31px; + margin-inline-start: 31px; + margin-inline-end: initial; + direction: var(--direction); + } + .entity { + display: flex; + align-items: center; + } + .entity .handle { + padding-right: 8px; + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + padding-inline-end: 8px; + padding-inline-start: initial; + direction: var(--direction); + } + .entity .handle > * { + pointer-events: none; + } + .entity ha-entity-picker { + flex-grow: 1; + } + `; } } diff --git a/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts b/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts index 8693be890d8d..d8fe23d0a7c9 100644 --- a/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts @@ -3,13 +3,13 @@ import { HassEntity } from "home-assistant-js-websocket"; import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property } from "lit/decorators"; import { repeat } from "lit/directives/repeat"; -import type { SortableEvent } from "sortablejs"; import { fireEvent } from "../../../../common/dom/fire_event"; import { stopPropagation } from "../../../../common/dom/stop_propagation"; import "../../../../components/entity/ha-entity-picker"; import "../../../../components/ha-button"; import "../../../../components/ha-icon-button"; import "../../../../components/ha-list-item"; +import "../../../../components/ha-sortable"; import "../../../../components/ha-svg-icon"; import { CUSTOM_TYPE_PREFIX, @@ -18,8 +18,6 @@ import { isCustomType, stripCustomPrefix, } from "../../../../data/lovelace_custom_cards"; -import { sortableStyles } from "../../../../resources/ha-sortable-style"; -import type { SortableInstance } from "../../../../resources/sortable"; import { HomeAssistant } from "../../../../types"; import { supportsAlarmModesCardFeature } from "../../card-features/hui-alarm-modes-card-feature"; import { supportsClimateFanModesCardFeature } from "../../card-features/hui-climate-fan-modes-card-feature"; @@ -39,11 +37,11 @@ import { supportsNumericInputCardFeature } from "../../card-features/hui-numeric import { supportsSelectOptionsCardFeature } from "../../card-features/hui-select-options-card-feature"; import { supportsTargetHumidityCardFeature } from "../../card-features/hui-target-humidity-card-feature"; import { supportsTargetTemperatureCardFeature } from "../../card-features/hui-target-temperature-card-feature"; +import { supportsUpdateActionsCardFeature } from "../../card-features/hui-update-actions-card-feature"; import { supportsVacuumCommandsCardFeature } from "../../card-features/hui-vacuum-commands-card-feature"; import { supportsWaterHeaterOperationModesCardFeature } from "../../card-features/hui-water-heater-operation-modes-card-feature"; import { LovelaceCardFeatureConfig } from "../../card-features/types"; import { getCardFeatureElementClass } from "../../create-element/create-card-feature-element"; -import { supportsUpdateActionsCardFeature } from "../../card-features/hui-update-actions-card-feature"; export type FeatureType = LovelaceCardFeatureConfig["type"]; type SupportsFeature = (stateObj: HassEntity) => boolean; @@ -149,13 +147,6 @@ export class HuiCardFeaturesEditor extends LitElement { private _featuresKeys = new WeakMap(); - private _sortable?: SortableInstance; - - public disconnectedCallback() { - super.disconnectedCallback(); - this._destroySortable(); - } - private _supportsFeatureType(type: string): boolean { if (!this.stateObj) return false; @@ -205,10 +196,6 @@ export class HuiCardFeaturesEditor extends LitElement { return this._featuresKeys.get(feature)!; } - protected firstUpdated() { - this._createSortable(); - } - private _getSupportedFeaturesType() { const featuresTypes = UI_FEATURE_TYPES.filter( (type) => !this.featuresTypes || this.featuresTypes.includes(type) @@ -249,61 +236,66 @@ export class HuiCardFeaturesEditor extends LitElement { ` : nothing} -
- ${repeat( - this.features, - (featureConf) => this._getKey(featureConf), - (featureConf, index) => { - const type = featureConf.type; - const supported = this._supportsFeatureType(type); - const editable = this._isFeatureTypeEditable(type); - return html` -
-
- -
-
-
- ${this._getFeatureTypeLabel(type)} - ${this.stateObj && !supported - ? html` - - ${this.hass!.localize( - "ui.panel.lovelace.editor.features.not_compatible" - )} - - ` - : nothing} + +
+ ${repeat( + this.features, + (featureConf) => this._getKey(featureConf), + (featureConf, index) => { + const type = featureConf.type; + const supported = this._supportsFeatureType(type); + const editable = this._isFeatureTypeEditable(type); + return html` +
+
+ +
+
+
+ ${this._getFeatureTypeLabel(type)} + ${this.stateObj && !supported + ? html` + + ${this.hass!.localize( + "ui.panel.lovelace.editor.features.not_compatible" + )} + + ` + : nothing} +
+ ${editable + ? html` + + ` + : nothing} +
- ${editable - ? html` - - ` - : nothing} - -
- `; - } - )} -
+ `; + } + )} +
+ ${supportedFeaturesType.length > 0 ? html` { - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._rowMoved(evt); - }, - } - ); - } - - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - private async _addFeature(ev: CustomEvent): Promise { const index = ev.detail.index as number; @@ -395,14 +357,13 @@ export class HuiCardFeaturesEditor extends LitElement { fireEvent(this, "features-changed", { features: newConfigFeature }); } - private _rowMoved(ev: SortableEvent): void { - if (ev.oldIndex === ev.newIndex) { - return; - } + private _featureMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; const newFeatures = this.features!.concat(); - newFeatures.splice(ev.newIndex!, 0, newFeatures.splice(ev.oldIndex!, 1)[0]); + newFeatures.splice(newIndex, 0, newFeatures.splice(oldIndex, 1)[0]); fireEvent(this, "features-changed", { features: newFeatures }); } @@ -428,79 +389,76 @@ export class HuiCardFeaturesEditor extends LitElement { } static get styles(): CSSResultGroup { - return [ - sortableStyles, - css` - :host { - display: flex !important; - flex-direction: column; - } - .content { - padding: 12px; - } - ha-expansion-panel { - display: block; - --expansion-panel-content-padding: 0; - border-radius: 6px; - } - h3 { - margin: 0; - font-size: inherit; - font-weight: inherit; - } - ha-svg-icon, - ha-icon { - color: var(--secondary-text-color); - } - ha-button-menu { - margin-top: 8px; - } - .feature { - display: flex; - align-items: center; - } - .feature .handle { - padding-right: 8px; - cursor: move; /* fallback if grab cursor is unsupported */ - cursor: grab; - padding-inline-end: 8px; - padding-inline-start: initial; - direction: var(--direction); - } - .feature .handle > * { - pointer-events: none; - } - - .feature-content { - height: 60px; - font-size: 16px; - display: flex; - align-items: center; - justify-content: space-between; - flex-grow: 1; - } - - .feature-content div { - display: flex; - flex-direction: column; - } - - .remove-icon, - .edit-icon { - --mdc-icon-button-size: 36px; - color: var(--secondary-text-color); - } - - .secondary { - font-size: 12px; - color: var(--secondary-text-color); - } - - li[divider] { - border-bottom-color: var(--divider-color); - } - `, - ]; + return css` + :host { + display: flex !important; + flex-direction: column; + } + .content { + padding: 12px; + } + ha-expansion-panel { + display: block; + --expansion-panel-content-padding: 0; + border-radius: 6px; + } + h3 { + margin: 0; + font-size: inherit; + font-weight: inherit; + } + ha-svg-icon, + ha-icon { + color: var(--secondary-text-color); + } + ha-button-menu { + margin-top: 8px; + } + .feature { + display: flex; + align-items: center; + } + .feature .handle { + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + padding-right: 8px; + padding-inline-end: 8px; + padding-inline-start: initial; + direction: var(--direction); + } + .feature .handle > * { + pointer-events: none; + } + + .feature-content { + height: 60px; + font-size: 16px; + display: flex; + align-items: center; + justify-content: space-between; + flex-grow: 1; + } + + .feature-content div { + display: flex; + flex-direction: column; + } + + .remove-icon, + .edit-icon { + --mdc-icon-button-size: 36px; + color: var(--secondary-text-color); + } + + .secondary { + font-size: 12px; + color: var(--secondary-text-color); + } + + li[divider] { + border-bottom-color: var(--divider-color); + } + `; } } diff --git a/src/panels/lovelace/editor/hui-entities-card-row-editor.ts b/src/panels/lovelace/editor/hui-entities-card-row-editor.ts index 231305a1a3aa..58891055fc8c 100644 --- a/src/panels/lovelace/editor/hui-entities-card-row-editor.ts +++ b/src/panels/lovelace/editor/hui-entities-card-row-editor.ts @@ -1,15 +1,13 @@ import { mdiClose, mdiDrag, mdiPencil } from "@mdi/js"; -import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; +import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property } from "lit/decorators"; 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 "../../../components/ha-icon-button"; +import "../../../components/ha-sortable"; import "../../../components/ha-svg-icon"; -import { sortableStyles } from "../../../resources/ha-sortable-style"; -import type { SortableInstance } from "../../../resources/sortable"; import { HomeAssistant } from "../../../types"; import { EntityConfig, LovelaceRowConfig } from "../entity-rows/types"; @@ -31,13 +29,6 @@ export class HuiEntitiesCardRowEditor extends LitElement { private _entityKeys = new WeakMap(); - private _sortable?: SortableInstance; - - public disconnectedCallback() { - super.disconnectedCallback(); - this._destroySortable(); - } - private _getKey(action: LovelaceRowConfig) { if (!this._entityKeys.has(action)) { this._entityKeys.set(action, Math.random().toString()); @@ -60,64 +51,66 @@ export class HuiEntitiesCardRowEditor extends LitElement { "ui.panel.lovelace.editor.card.config.required" )})`} -
- ${repeat( - this.entities, - (entityConf) => this._getKey(entityConf), - (entityConf, index) => html` -
-
- -
- ${entityConf.type - ? html` -
-
- - ${this.hass!.localize( - `ui.panel.lovelace.editor.card.entities.entity_row.${entityConf.type}` - )} - - ${this.hass!.localize( - "ui.panel.lovelace.editor.card.entities.edit_special_row" - )} + +
+ ${repeat( + this.entities, + (entityConf) => this._getKey(entityConf), + (entityConf, index) => html` +
+
+ +
+ ${entityConf.type + ? html` +
+
+ + ${this.hass!.localize( + `ui.panel.lovelace.editor.card.entities.entity_row.${entityConf.type}` + )} + + ${this.hass!.localize( + "ui.panel.lovelace.editor.card.entities.edit_special_row" + )} +
-
- ` - : html` - - `} - - -
- ` - )} -
+ ` + : html` + + `} + + +
+ ` + )} +
+ { - (evt.item as any).placeholder = - document.createComment("sort-placeholder"); - evt.item.after((evt.item as any).placeholder); - }, - onEnd: (evt: SortableEvent) => { - // put back in original location - if ((evt.item as any).placeholder) { - (evt.item as any).placeholder.replaceWith(evt.item); - delete (evt.item as any).placeholder; - } - this._rowMoved(evt); - }, - } - ); - } - - private _destroySortable() { - this._sortable?.destroy(); - this._sortable = undefined; - } - private async _addEntity(ev: CustomEvent): Promise { const value = ev.detail.value; if (value === "") { @@ -172,14 +131,13 @@ export class HuiEntitiesCardRowEditor extends LitElement { fireEvent(this, "entities-changed", { entities: newConfigEntities }); } - private _rowMoved(ev: SortableEvent): void { - if (ev.oldIndex === ev.newIndex) { - return; - } + private _rowMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex } = ev.detail; const newEntities = this.entities!.concat(); - newEntities.splice(ev.newIndex!, 0, newEntities.splice(ev.oldIndex!, 1)[0]); + newEntities.splice(newIndex, 0, newEntities.splice(oldIndex, 1)[0]); fireEvent(this, "entities-changed", { entities: newEntities }); } @@ -222,67 +180,64 @@ export class HuiEntitiesCardRowEditor extends LitElement { } static get styles(): CSSResultGroup { - return [ - sortableStyles, - css` - ha-entity-picker { - margin-top: 8px; - } - .add-entity { - display: block; - margin-left: 31px; - margin-right: 71px; - margin-inline-start: 31px; - margin-inline-end: 71px; - direction: var(--direction); - } - .entity { - display: flex; - align-items: center; - } + return css` + ha-entity-picker { + margin-top: 8px; + } + .add-entity { + display: block; + margin-left: 31px; + margin-right: 71px; + margin-inline-start: 31px; + margin-inline-end: 71px; + direction: var(--direction); + } + .entity { + display: flex; + align-items: center; + } - .entity .handle { - padding-right: 8px; - cursor: move; /* fallback if grab cursor is unsupported */ - cursor: grab; - padding-inline-end: 8px; - padding-inline-start: initial; - direction: var(--direction); - } - .entity .handle > * { - pointer-events: none; - } + .entity .handle { + padding-right: 8px; + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + padding-inline-end: 8px; + padding-inline-start: initial; + direction: var(--direction); + } + .entity .handle > * { + pointer-events: none; + } - .entity ha-entity-picker { - flex-grow: 1; - } + .entity ha-entity-picker { + flex-grow: 1; + } - .special-row { - height: 60px; - font-size: 16px; - display: flex; - align-items: center; - justify-content: space-between; - flex-grow: 1; - } + .special-row { + height: 60px; + font-size: 16px; + display: flex; + align-items: center; + justify-content: space-between; + flex-grow: 1; + } - .special-row div { - display: flex; - flex-direction: column; - } + .special-row div { + display: flex; + flex-direction: column; + } - .remove-icon, - .edit-icon { - --mdc-icon-button-size: 36px; - color: var(--secondary-text-color); - } + .remove-icon, + .edit-icon { + --mdc-icon-button-size: 36px; + color: var(--secondary-text-color); + } - .secondary { - font-size: 12px; - color: var(--secondary-text-color); - } - `, - ]; + .secondary { + font-size: 12px; + color: var(--secondary-text-color); + } + `; } } diff --git a/src/resources/ha-sortable-style.ts b/src/resources/ha-sidebar-edit-style.ts similarity index 74% rename from src/resources/ha-sortable-style.ts rename to src/resources/ha-sidebar-edit-style.ts index a1fcfe920900..50bf37c75616 100644 --- a/src/resources/ha-sortable-style.ts +++ b/src/resources/ha-sidebar-edit-style.ts @@ -1,7 +1,7 @@ import { css } from "lit"; -export const sortableStyles = css` - #sortable a:nth-of-type(2n) paper-icon-item { +export const sidebarEditStyle = css` + .reorder-list a:nth-of-type(2n) paper-icon-item { animation-name: keyframes1; animation-iteration-count: infinite; transform-origin: 50% 10%; @@ -9,7 +9,7 @@ export const sortableStyles = css` animation-duration: 0.25s; } - #sortable a:nth-of-type(2n-1) paper-icon-item { + .reorder-list a:nth-of-type(2n-1) paper-icon-item { animation-name: keyframes2; animation-iteration-count: infinite; animation-direction: alternate; @@ -18,12 +18,12 @@ export const sortableStyles = css` animation-duration: 0.33s; } - #sortable a { + .reorder-list a { height: 48px; display: flex; } - #sortable { + .reorder-list { outline: none; display: block !important; } @@ -32,26 +32,6 @@ export const sortableStyles = css` display: flex !important; } - .sortable-fallback { - display: none; - opacity: 0; - } - - .sortable-ghost { - border: 2px solid var(--primary-color); - background: rgba(var(--rgb-primary-color), 0.25); - border-radius: 4px; - opacity: 0.4; - } - - .sortable-drag { - border-radius: 4px; - opacity: 1; - background: var(--card-background-color); - box-shadow: 0px 4px 8px 3px #00000026; - cursor: grabbing; - } - @keyframes keyframes1 { 0% { transform: rotate(-1deg); From ae79df8c55c174e900a38669730eedf9e20bba60 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 8 Jan 2024 08:07:08 -0500 Subject: [PATCH 096/361] Allow TLA for legacy build and remove static Intl polyfills (#19207) --- build-scripts/webpack.cjs | 16 +++++----------- package.json | 1 + src/resources/intl-polyfill-legacy.ts | 19 ------------------- yarn.lock | 17 +++++++++++++++-- 4 files changed, 21 insertions(+), 32 deletions(-) delete mode 100644 src/resources/intl-polyfill-legacy.ts diff --git a/build-scripts/webpack.cjs b/build-scripts/webpack.cjs index 432cca35d2ca..e1047cadd4ba 100644 --- a/build-scripts/webpack.cjs +++ b/build-scripts/webpack.cjs @@ -7,6 +7,9 @@ const TerserPlugin = require("terser-webpack-plugin"); const { WebpackManifestPlugin } = require("webpack-manifest-plugin"); const log = require("fancy-log"); const WebpackBar = require("webpackbar"); +const { + TransformAsyncModulesPlugin, +} = require("transform-async-modules-webpack-plugin"); const paths = require("./paths.cjs"); const bundle = require("./bundle.cjs"); @@ -142,17 +145,6 @@ const createWebpackConfig = ({ ), path.resolve(paths.polymer_dir, "src/util/empty.js") ), - // See `src/resources/intl-polyfill-legacy.ts` for explanation - !latestBuild && - new webpack.NormalModuleReplacementPlugin( - new RegExp( - path.resolve(paths.polymer_dir, "src/resources/intl-polyfill.ts") - ), - path.resolve( - paths.polymer_dir, - "src/resources/intl-polyfill-legacy.ts" - ) - ), !isProdBuild && new LogStartCompilePlugin(), isProdBuild && new StatsWriterPlugin({ @@ -163,6 +155,8 @@ const createWebpackConfig = ({ stats: { assets: true, chunks: true, modules: true }, transform: (stats) => JSON.stringify(filterStats(stats)), }), + !latestBuild && + new TransformAsyncModulesPlugin({ browserslistEnv: "legacy" }), ].filter(Boolean), resolve: { extensions: [".ts", ".js", ".json"], diff --git a/package.json b/package.json index 0c7a6998ca19..818fa25fa128 100644 --- a/package.json +++ b/package.json @@ -235,6 +235,7 @@ "systemjs": "6.14.3", "tar": "6.2.0", "terser-webpack-plugin": "5.3.10", + "transform-async-modules-webpack-plugin": "1.0.2", "ts-lit-plugin": "2.0.1", "typescript": "5.3.3", "vinyl-buffer": "1.0.1", diff --git a/src/resources/intl-polyfill-legacy.ts b/src/resources/intl-polyfill-legacy.ts deleted file mode 100644 index 01a057d75a9b..000000000000 --- a/src/resources/intl-polyfill-legacy.ts +++ /dev/null @@ -1,19 +0,0 @@ -// This module is a simpler version of `intl-polyfill` without top level await, and replaces it for legacy builds. -// Babel cannot transform TLA, and Webpack uses an async function to support it, -// so builds with browser targets without async support will be broken. - -import "@formatjs/intl-getcanonicallocales/polyfill"; -import "@formatjs/intl-locale/polyfill"; -import "@formatjs/intl-pluralrules/polyfill"; -import "@formatjs/intl-pluralrules/locale-data/en"; -import "@formatjs/intl-numberformat/polyfill"; -import "@formatjs/intl-numberformat/locale-data/en"; -import "@formatjs/intl-relativetimeformat/polyfill"; -import "@formatjs/intl-relativetimeformat/locale-data/en"; -import "@formatjs/intl-datetimeformat/polyfill"; -import "@formatjs/intl-datetimeformat/locale-data/en"; -import "@formatjs/intl-datetimeformat/add-all-tz"; -import "@formatjs/intl-displaynames/polyfill"; -import "@formatjs/intl-displaynames/locale-data/en"; -import "@formatjs/intl-listformat/polyfill"; -import "@formatjs/intl-listformat/locale-data/en"; diff --git a/yarn.lock b/yarn.lock index ef48030ab766..70e9ccb6e016 100644 --- a/yarn.lock +++ b/yarn.lock @@ -62,7 +62,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.23.7, @babel/core@npm:^7.11.1, @babel/core@npm:^7.12.3": +"@babel/core@npm:7.23.7, @babel/core@npm:^7.0.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.12.3": version: 7.23.7 resolution: "@babel/core@npm:7.23.7" dependencies: @@ -1267,7 +1267,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.23.7, @babel/preset-env@npm:^7.11.0": +"@babel/preset-env@npm:7.23.7, @babel/preset-env@npm:^7.0.0, @babel/preset-env@npm:^7.11.0": version: 7.23.7 resolution: "@babel/preset-env@npm:7.23.7" dependencies: @@ -9665,6 +9665,7 @@ __metadata: tar: "npm:6.2.0" terser-webpack-plugin: "npm:5.3.10" tinykeys: "npm:2.1.0" + transform-async-modules-webpack-plugin: "npm:1.0.2" ts-lit-plugin: "npm:2.0.1" tsparticles-engine: "npm:2.12.0" tsparticles-preset-links: "npm:2.12.0" @@ -15201,6 +15202,18 @@ __metadata: languageName: node linkType: hard +"transform-async-modules-webpack-plugin@npm:1.0.2": + version: 1.0.2 + resolution: "transform-async-modules-webpack-plugin@npm:1.0.2" + dependencies: + "@babel/core": "npm:^7.0.0" + "@babel/preset-env": "npm:^7.0.0" + peerDependencies: + webpack: ^5.0.0 + checksum: 645df77c31e42f8ae57d86dfa023f67e4a3854f3b0848a9fd28392cb83d91fc05762150b909d01ad570e867b9e16e7e49c88a183d2dc7911d0e0154aaac21d52 + languageName: node + linkType: hard + "ts-api-utils@npm:^1.0.1": version: 1.0.3 resolution: "ts-api-utils@npm:1.0.3" From f5fc66f47eeb1eef9f9056e1a39612e9636019a6 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 8 Jan 2024 08:08:21 -0500 Subject: [PATCH 097/361] Better restrict applying dependencies label (#19319) --- .github/labeler.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index b09de205bac6..bc82f5f31a3e 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -25,13 +25,18 @@ Design: Dependencies: - changed-files: - - any-glob-to-any-file: + # Match when only these files are changed (i.e. don't match PRs that happen to add or remove packages) + - any-glob-to-all-files: - package.json - renovate.json - yarn.lock - .yarn/** - .yarnrc.yml - .nvmrc + # Dependabot and Renovate branches always match (i.e. compatibility tweaks by members considered minor) + - head-branch: + - "^renovate/" + - "^dependabot/" GitHub Actions: - changed-files: From ec2ae15e3fa890c47c1e4042eb8d1b820694cde2 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Mon, 8 Jan 2024 05:10:23 -0800 Subject: [PATCH 098/361] Cleanup else/default block when deleting all actions (#19298) --- .../types/ha-automation-action-choose.ts | 17 ++++++++++------- .../action/types/ha-automation-action-if.ts | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/panels/config/automation/action/types/ha-automation-action-choose.ts b/src/panels/config/automation/action/types/ha-automation-action-choose.ts index 1b4bebb273f2..5add402d207c 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-choose.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-choose.ts @@ -468,13 +468,16 @@ export class HaChooseAction extends LitElement implements ActionElement { private _defaultChanged(ev: CustomEvent) { ev.stopPropagation(); - const value = ev.detail.value as Action[]; - fireEvent(this, "value-changed", { - value: { - ...this.action, - default: value, - }, - }); + this._showDefault = true; + const defaultAction = ev.detail.value as Action[]; + const newValue: ChooseAction = { + ...this.action, + default: defaultAction, + }; + if (defaultAction.length === 0) { + delete newValue.default; + } + fireEvent(this, "value-changed", { value: newValue }); } static get styles(): CSSResultGroup { diff --git a/src/panels/config/automation/action/types/ha-automation-action-if.ts b/src/panels/config/automation/action/types/ha-automation-action-if.ts index 195590a6892b..a14fe2725d4c 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-if.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-if.ts @@ -117,14 +117,16 @@ export class HaIfAction extends LitElement implements ActionElement { private _elseChanged(ev: CustomEvent) { ev.stopPropagation(); - const value = ev.detail.value as Action[]; - - fireEvent(this, "value-changed", { - value: { - ...this.action, - else: value, - }, - }); + this._showElse = true; + const elseAction = ev.detail.value as Action[]; + const newValue: IfAction = { + ...this.action, + else: elseAction, + }; + if (elseAction.length === 0) { + delete newValue.else; + } + fireEvent(this, "value-changed", { value: newValue }); } static get styles(): CSSResultGroup { From e0f578c135eab685c8c587e48c927e3c09277f2b Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 8 Jan 2024 08:26:25 -0500 Subject: [PATCH 099/361] Start linting with lit-analyzer (#19302) --- .github/workflows/ci.yaml | 2 ++ lint-staged.config.js | 1 + package.json | 4 ++-- tsconfig.json | 24 +++++++++++++++++------- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index af8a33890396..85f34c02887d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,6 +48,8 @@ jobs: run: yarn run lint:eslint --quiet - name: Run tsc run: yarn run lint:types + - name: Run lit-analyzer + run: yarn run lint:lit --quiet - name: Run prettier run: yarn run lint:prettier test: diff --git a/lint-staged.config.js b/lint-staged.config.js index 8740aaab198a..5359a96eee05 100644 --- a/lint-staged.config.js +++ b/lint-staged.config.js @@ -2,6 +2,7 @@ export default { "*.?(c|m){js,ts}": [ "eslint --cache --cache-strategy=content --cache-location=node_modules/.cache/eslint/.eslintcache --fix", "prettier --cache --write", + "lit-analyzer", ], "*.{json,css,md,markdown,html,y?aml}": "prettier --cache --write", "translations/*/*.json": (files) => diff --git a/package.json b/package.json index 818fa25fa128..b591fab97d7c 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "lint:prettier": "prettier . --cache --check", "format:prettier": "prettier . --cache --write", "lint:types": "tsc", - "lint:lit": "lit-analyzer \"**/src/**/*.ts\" --format markdown --outFile result.md", - "lint": "yarn run lint:eslint && yarn run lint:prettier && yarn run lint:types", + "lint:lit": "lit-analyzer \"{.,*}/src/**/*.ts\"", + "lint": "yarn run lint:eslint && yarn run lint:prettier && yarn run lint:types && yarn run lint:lit", "format": "yarn run format:eslint && yarn run format:prettier", "postinstall": "husky install", "prepack": "pinst --disable", diff --git a/tsconfig.json b/tsconfig.json index a5bac525d4b4..0a45a72573b1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -25,15 +25,25 @@ "plugins": [ { "name": "ts-lit-plugin", - "strict": false, + "strict": true, "rules": { - "no-unknown-tag-name": "error", - "no-missing-import": "error", - "no-unclosed-tag": "error", - "no-incompatible-type-binding": "warning", - "no-invalid-css": "warning", + // Custom elements + "no-unclosed-tag": "warning", "no-missing-element-type-definition": "warning", - "no-property-visibility-mismatch": "error" + // Binding names + "no-legacy-attribute": "error", + // Binding types + "no-boolean-in-attribute-binding": "warning", + "no-expressionless-property-binding": "warning", + "no-complex-attribute-binding": "warning", + "no-nullable-attribute-binding": "warning", + "no-incompatible-type-binding": "warning", + "no-invalid-directive-binding": "warning", + // LitElement + "no-incompatible-property-type": "warning", + "no-property-visibility-mismatch": "warning", + // CSS + "no-invalid-css": "off" // warning does not work } } ] From 3b6b77c75b8f7d69076712559454e63a6e773fdd Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Mon, 8 Jan 2024 15:24:37 +0100 Subject: [PATCH 100/361] Localize time pattern trigger in automation editor (#19173) --- src/data/automation_i18n.ts | 136 ++++++++++++++++++++++++------------ src/translations/en.json | 6 +- 2 files changed, 98 insertions(+), 44 deletions(-) diff --git a/src/data/automation_i18n.ts b/src/data/automation_i18n.ts index aec2965cdf10..d7f186a0dc3b 100644 --- a/src/data/automation_i18n.ts +++ b/src/data/automation_i18n.ts @@ -64,23 +64,6 @@ const localizeTimeString = ( } }; -const ordinalSuffix = (n: number) => { - n %= 100; - if ([11, 12, 13].includes(n)) { - return "th"; - } - if (n % 10 === 1) { - return "st"; - } - if (n % 10 === 2) { - return "nd"; - } - if (n % 10 === 3) { - return "rd"; - } - return "th"; -}; - export const describeTrigger = ( trigger: Trigger, hass: HomeAssistant, @@ -401,14 +384,37 @@ const tryDescribeTrigger = ( // Time Pattern Trigger if (trigger.platform === "time_pattern") { if (!trigger.seconds && !trigger.minutes && !trigger.hours) { - return "When a time pattern matches"; + return hass.localize( + `${triggerTranslationBaseKey}.time_pattern.description.initial` + ); } - let result = "Trigger "; + + const invalidParts: Array<"seconds" | "minutes" | "hours"> = []; + + let secondsChoice: "every" | "every_interval" | "on_the_xth" | "other" = + "other"; + let minutesChoice: + | "every" + | "every_interval" + | "on_the_xth" + | "other" + | "has_seconds" = "other"; + let hoursChoice: + | "every" + | "every_interval" + | "on_the_xth" + | "other" + | "has_seconds_or_minutes" = "other"; + + let seconds = 0; + let minutes = 0; + let hours = 0; + if (trigger.seconds !== undefined) { const seconds_all = trigger.seconds === "*"; const seconds_interval = typeof trigger.seconds === "string" && trigger.seconds.startsWith("/"); - const seconds = seconds_all + seconds = seconds_all ? 0 : typeof trigger.seconds === "number" ? trigger.seconds @@ -422,22 +428,22 @@ const tryDescribeTrigger = ( seconds < 0 || (seconds_interval && seconds === 0) ) { - return "Invalid Time Pattern Seconds"; + invalidParts.push("seconds"); } if (seconds_all || (seconds_interval && seconds === 1)) { - result += "every second of "; + secondsChoice = "every"; } else if (seconds_interval) { - result += `every ${seconds} seconds of `; + secondsChoice = "every_interval"; } else { - result += `on the ${seconds}${ordinalSuffix(seconds)} second of `; + secondsChoice = "on_the_xth"; } } if (trigger.minutes !== undefined) { const minutes_all = trigger.minutes === "*"; const minutes_interval = typeof trigger.minutes === "string" && trigger.minutes.startsWith("/"); - const minutes = minutes_all + minutes = minutes_all ? 0 : typeof trigger.minutes === "number" ? trigger.minutes @@ -451,30 +457,30 @@ const tryDescribeTrigger = ( minutes < 0 || (minutes_interval && minutes === 0) ) { - return "Invalid Time Pattern Minutes"; + invalidParts.push("minutes"); } if (minutes_all || (minutes_interval && minutes === 1)) { - result += "every minute of "; + minutesChoice = "every"; } else if (minutes_interval) { - result += `every ${minutes} minutes of `; + minutesChoice = "every_interval"; } else { - result += `${ - trigger.seconds !== undefined ? "" : "on" - } the ${minutes}${ordinalSuffix(minutes)} minute of `; + minutesChoice = + trigger.seconds !== undefined ? "has_seconds" : "on_the_xth"; } } else if (trigger.seconds !== undefined) { if (trigger.hours !== undefined) { - result += `the 0${ordinalSuffix(0)} minute of `; + minutes = 0; + minutesChoice = "has_seconds"; } else { - result += "every minute of "; + minutesChoice = "every"; } } if (trigger.hours !== undefined) { const hours_all = trigger.hours === "*"; const hours_interval = typeof trigger.hours === "string" && trigger.hours.startsWith("/"); - const hours = hours_all + hours = hours_all ? 0 : typeof trigger.hours === "number" ? trigger.hours @@ -488,24 +494,68 @@ const tryDescribeTrigger = ( hours < 0 || (hours_interval && hours === 0) ) { - return "Invalid Time Pattern Hours"; + invalidParts.push("hours"); } if (hours_all || (hours_interval && hours === 1)) { - result += "every hour"; + hoursChoice = "every"; } else if (hours_interval) { - result += `every ${hours} hours`; + hoursChoice = "every_interval"; } else { - result += `${ + hoursChoice = trigger.seconds !== undefined || trigger.minutes !== undefined - ? "" - : "on" - } the ${hours}${ordinalSuffix(hours)} hour`; + ? "has_seconds_or_minutes" + : "on_the_xth"; } } else { - result += "every hour"; + hoursChoice = "every"; } - return result; + + if (invalidParts.length !== 0) { + return hass.localize( + `${triggerTranslationBaseKey}.time_pattern.description.invalid`, + { + parts: formatListWithAnds( + hass.locale, + invalidParts.map((invalidPart) => + hass.localize( + `${triggerTranslationBaseKey}.time_pattern.${invalidPart}` + ) + ) + ), + } + ); + } + + return hass.localize( + `${triggerTranslationBaseKey}.time_pattern.description.full`, + { + secondsChoice: secondsChoice, + minutesChoice: minutesChoice, + hoursChoice: hoursChoice, + seconds: seconds, + minutes: minutes, + hours: hours, + secondsWithOrdinal: hass.localize( + `${triggerTranslationBaseKey}.time_pattern.description.ordinal`, + { + part: seconds, + } + ), + minutesWithOrdinal: hass.localize( + `${triggerTranslationBaseKey}.time_pattern.description.ordinal`, + { + part: minutes, + } + ), + hoursWithOrdinal: hass.localize( + `${triggerTranslationBaseKey}.time_pattern.description.ordinal`, + { + part: hours, + } + ), + } + ); } // Zone Trigger diff --git a/src/translations/en.json b/src/translations/en.json index 01cd81a568e1..bd741720b336 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2669,7 +2669,11 @@ "minutes": "Minutes", "seconds": "Seconds", "description": { - "picker": "Periodically, at a defined interval." + "picker": "Periodically, at a defined interval.", + "initial": "When a time pattern matches", + "invalid": "Invalid Time Pattern for {parts}", + "full": "Trigger {secondsChoice, select, \n every {every second of }\n every_interval {every {seconds} seconds of }\n on_the_xth {on the {secondsWithOrdinal} second of }\n other {}\n} {minutesChoice, select, \n every {every minute of }\n every_interval {every {minutes} minutes of }\n has_seconds {the {minutesWithOrdinal} minute of }\n on_the_xth {on the {minutesWithOrdinal} minute of }\n other {}\n} {hoursChoice, select, \n every {every hour}\n every_interval {every {hours} hours}\n has_seconds_or_minutes {the {hoursWithOrdinal} hour}\n on_the_xth {on the {hoursWithOrdinal} hour}\n other {}\n}", + "ordinal": "{part, selectordinal, \none {#st}\ntwo {#nd}\nfew {#rd}\nother {#th}\n}" } }, "webhook": { From 2451cf77f9476bd8dc7a46c0fd3e4a439d1d700e Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 8 Jan 2024 09:43:53 -0500 Subject: [PATCH 101/361] Fix various missing component imports (#19296) --- src/onboarding/onboarding-core-config.ts | 1 + src/panels/calendar/dialog-calendar-event-detail.ts | 1 + src/panels/calendar/dialog-calendar-event-editor.ts | 4 ++++ src/panels/config/core/ha-config-section-general.ts | 2 +- src/panels/todo/dialog-todo-item-editor.ts | 3 +++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/onboarding/onboarding-core-config.ts b/src/onboarding/onboarding-core-config.ts index 7849ecfee63d..61cdad8d01e0 100644 --- a/src/onboarding/onboarding-core-config.ts +++ b/src/onboarding/onboarding-core-config.ts @@ -12,6 +12,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../common/dom/fire_event"; import type { LocalizeFunc } from "../common/translations/localize"; import "../components/ha-alert"; +import "../components/ha-circular-progress"; import "../components/ha-country-picker"; import { ConfigUpdateValues, saveCoreConfig } from "../data/core"; import { countryCurrency } from "../data/currency"; diff --git a/src/panels/calendar/dialog-calendar-event-detail.ts b/src/panels/calendar/dialog-calendar-event-detail.ts index ee091eac1652..5962aa83f147 100644 --- a/src/panels/calendar/dialog-calendar-event-detail.ts +++ b/src/panels/calendar/dialog-calendar-event-detail.ts @@ -10,6 +10,7 @@ import { formatTime } from "../../common/datetime/format_time"; import { fireEvent } from "../../common/dom/fire_event"; import { isDate } from "../../common/string/is_date"; import "../../components/entity/state-info"; +import "../../components/ha-alert"; import "../../components/ha-date-input"; import { createCloseHeading } from "../../components/ha-dialog"; import "../../components/ha-time-input"; diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts index e5925b1243e2..1f5e48ce9ddb 100644 --- a/src/panels/calendar/dialog-calendar-event-editor.ts +++ b/src/panels/calendar/dialog-calendar-event-editor.ts @@ -16,9 +16,13 @@ import { computeStateDomain } from "../../common/entity/compute_state_domain"; import { supportsFeature } from "../../common/entity/supports-feature"; import { isDate } from "../../common/string/is_date"; import "../../components/entity/ha-entity-picker"; +import "../../components/ha-alert"; import "../../components/ha-date-input"; import { createCloseHeading } from "../../components/ha-dialog"; +import "../../components/ha-formfield"; +import "../../components/ha-switch"; import "../../components/ha-textarea"; +import "../../components/ha-textfield"; import "../../components/ha-time-input"; import { CalendarEntityFeature, diff --git a/src/panels/config/core/ha-config-section-general.ts b/src/panels/config/core/ha-config-section-general.ts index 1d9e3794c0ac..22df34f25cfb 100644 --- a/src/panels/config/core/ha-config-section-general.ts +++ b/src/panels/config/core/ha-config-section-general.ts @@ -20,6 +20,7 @@ import type { HaRadio } from "../../../components/ha-radio"; import "../../../components/ha-select"; import "../../../components/ha-settings-row"; import "../../../components/ha-textfield"; +import type { HaTextField } from "../../../components/ha-textfield"; import "../../../components/ha-timezone-picker"; import "../../../components/map/ha-locations-editor"; import type { MarkerLocation } from "../../../components/map/ha-locations-editor"; @@ -28,7 +29,6 @@ import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box import "../../../layouts/hass-subpage"; import { haStyle } from "../../../resources/styles"; import type { HomeAssistant, ValueChangedEvent } from "../../../types"; -import type { HaTextField } from "../../../components/ha-textfield"; @customElement("ha-config-section-general") class HaConfigSectionGeneral extends LitElement { diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts index be03e260eccf..44a52d907ce4 100644 --- a/src/panels/todo/dialog-todo-item-editor.ts +++ b/src/panels/todo/dialog-todo-item-editor.ts @@ -5,9 +5,12 @@ import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../common/dom/fire_event"; import { supportsFeature } from "../../common/entity/supports-feature"; +import "../../components/ha-alert"; +import "../../components/ha-checkbox"; import "../../components/ha-date-input"; import { createCloseHeading } from "../../components/ha-dialog"; import "../../components/ha-textarea"; +import "../../components/ha-textfield"; import "../../components/ha-time-input"; import { TodoItemStatus, From d4ec608123f852753b578e8ae5d7c1940b1e564c Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 8 Jan 2024 09:45:24 -0500 Subject: [PATCH 102/361] Fix invalid media queries in calendar and todo editors (#19295) --- src/panels/calendar/dialog-calendar-event-editor.ts | 2 +- src/panels/todo/dialog-todo-item-editor.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts index 1f5e48ce9ddb..e1db40da695d 100644 --- a/src/panels/calendar/dialog-calendar-event-editor.ts +++ b/src/panels/calendar/dialog-calendar-event-editor.ts @@ -581,7 +581,7 @@ class DialogCalendarEventEditor extends LitElement { return [ haStyleDialog, css` - @media all and (min-width: 450px and min-height: 500px) { + @media all and (min-width: 450px) and (min-height: 500px) { ha-dialog { --mdc-dialog-min-width: min(600px, 95vw); --mdc-dialog-max-width: min(600px, 95vw); diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts index 44a52d907ce4..1afb0f66e4fe 100644 --- a/src/panels/todo/dialog-todo-item-editor.ts +++ b/src/panels/todo/dialog-todo-item-editor.ts @@ -385,7 +385,7 @@ class DialogTodoItemEditor extends LitElement { return [ haStyleDialog, css` - @media all and (min-width: 450px and min-height: 500px) { + @media all and (min-width: 450px) and (min-height: 500px) { ha-dialog { --mdc-dialog-min-width: min(600px, 95vw); --mdc-dialog-max-width: min(600px, 95vw); From 056eb888f3681a797e72819544a3f4b6233364f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 20:56:32 -0500 Subject: [PATCH 103/361] Update dependency @types/chromecast-caf-receiver to v6.0.13 (#19332) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b591fab97d7c..d98a7fd9c623 100644 --- a/package.json +++ b/package.json @@ -168,7 +168,7 @@ "@rollup/plugin-node-resolve": "15.2.3", "@rollup/plugin-replace": "5.0.5", "@types/babel__plugin-transform-runtime": "7.9.5", - "@types/chromecast-caf-receiver": "6.0.12", + "@types/chromecast-caf-receiver": "6.0.13", "@types/chromecast-caf-sender": "1.0.8", "@types/glob": "8.1.0", "@types/html-minifier-terser": "7.0.2", diff --git a/yarn.lock b/yarn.lock index 70e9ccb6e016..6b5dca8d072a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3988,10 +3988,10 @@ __metadata: languageName: node linkType: hard -"@types/chromecast-caf-receiver@npm:6.0.12": - version: 6.0.12 - resolution: "@types/chromecast-caf-receiver@npm:6.0.12" - checksum: f4bef9d3106b19aa8a85a3d41d4eb7b4d86c334275d829bce7194f6c4afc0b23a5b056899d97c5bc639211a00bf4506259e85b9935545b8502218cde77296442 +"@types/chromecast-caf-receiver@npm:6.0.13": + version: 6.0.13 + resolution: "@types/chromecast-caf-receiver@npm:6.0.13" + checksum: 4e2fb8628985cd61f206de5dfe6f3bcbcb2527024f03e36c6cad844fe7672ecd1c2b14cd2b91987f3ab0f67a8b6430008e2a567cfa6b5df8cb09b204e7b72094 languageName: node linkType: hard @@ -9556,7 +9556,7 @@ __metadata: "@rollup/plugin-replace": "npm:5.0.5" "@thomasloven/round-slider": "npm:0.6.0" "@types/babel__plugin-transform-runtime": "npm:7.9.5" - "@types/chromecast-caf-receiver": "npm:6.0.12" + "@types/chromecast-caf-receiver": "npm:6.0.13" "@types/chromecast-caf-sender": "npm:1.0.8" "@types/glob": "npm:8.1.0" "@types/html-minifier-terser": "npm:7.0.2" From 80b1a6297be33783d900ef24026c0e88fe3ff1bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 20:57:22 -0500 Subject: [PATCH 104/361] Update dependency @types/luxon to v3.4.0 (#19333) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d98a7fd9c623..dc36dcc68d9b 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "@types/js-yaml": "4.0.9", "@types/leaflet": "1.9.8", "@types/leaflet-draw": "1.0.11", - "@types/luxon": "3.3.8", + "@types/luxon": "3.4.0", "@types/mocha": "10.0.6", "@types/qrcode": "1.5.5", "@types/serve-handler": "6.1.4", diff --git a/yarn.lock b/yarn.lock index 6b5dca8d072a..e138ec3bce88 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4271,10 +4271,10 @@ __metadata: languageName: node linkType: hard -"@types/luxon@npm:3.3.8": - version: 3.3.8 - resolution: "@types/luxon@npm:3.3.8" - checksum: 2176c394e7ee3b8580e9f30bedac29048fabe32589c6561a9654b242b9c2c08ff9b93206f0eca07e495f900a352ac1446236c310eacda574b3c2d6238a9173a7 +"@types/luxon@npm:3.4.0": + version: 3.4.0 + resolution: "@types/luxon@npm:3.4.0" + checksum: cafe745e81765e71230a42520caf77d69556e22d50a464dcebd3b7da3989ab9c137de54dbfef60639ea4274326a57b762120c0088d3fb093c25f1ca752146c64 languageName: node linkType: hard @@ -9563,7 +9563,7 @@ __metadata: "@types/js-yaml": "npm:4.0.9" "@types/leaflet": "npm:1.9.8" "@types/leaflet-draw": "npm:1.0.11" - "@types/luxon": "npm:3.3.8" + "@types/luxon": "npm:3.4.0" "@types/mocha": "npm:10.0.6" "@types/qrcode": "npm:1.5.5" "@types/serve-handler": "npm:6.1.4" From 03a1c21f3428d675a6e825c47b31d525cdd65eb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 21:14:38 -0500 Subject: [PATCH 105/361] Bump follow-redirects from 1.15.3 to 1.15.4 (#19336) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e138ec3bce88..b008f90c71f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8679,12 +8679,12 @@ __metadata: linkType: hard "follow-redirects@npm:^1.0.0": - version: 1.15.3 - resolution: "follow-redirects@npm:1.15.3" + version: 1.15.4 + resolution: "follow-redirects@npm:1.15.4" peerDependenciesMeta: debug: optional: true - checksum: 60d98693f4976892f8c654b16ef6d1803887a951898857ab0cdc009570b1c06314ad499505b7a040ac5b98144939f8597766e5e6a6859c0945d157b473aa6f5f + checksum: 2e8f5f259a6b02dfa8dc199e08431848a7c3beed32eb4c19945966164a52c89f07b86c3afcc32ebe4279cf0a960520e45a63013d6350309c5ec90133c5d9351a languageName: node linkType: hard From 3edc77c978981bb50ec4141cee99d7ba0d5e0d96 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Tue, 9 Jan 2024 09:00:30 -0500 Subject: [PATCH 106/361] Fix missing element tag definitions (#19329) --- gallery/src/pages/automation/editor-condition.ts | 4 ++-- gallery/src/pages/automation/editor-trigger.ts | 4 ++-- gallery/src/pages/lovelace/media-player-row.ts | 4 ++-- gallery/src/pages/misc/util-long-press.ts | 6 ++++++ hassio/src/addon-store/hassio-addon-repository.ts | 6 ++++++ hassio/src/addon-store/hassio-addon-store.ts | 6 ++++++ hassio/src/dashboard/hassio-update.ts | 6 ++++++ src/auth/ha-authorize.ts | 6 ++++++ src/auth/ha-pick-auth-provider.ts | 3 +++ src/components/entity/ha-entity-toggle.ts | 15 ++++++++++----- src/components/ha-gauge.ts | 8 +++++++- src/components/ha-qr-code.ts | 6 ++++++ .../ha-selector/ha-selector-backup-location.ts | 2 +- .../ha-selector/ha-selector-tts-voice.ts | 2 +- .../ha-selector/ha-selector-ui-action.ts | 2 +- .../ha-selector/ha-selector-ui-color.ts | 2 +- src/components/ha-two-pane-top-app-bar-fixed.ts | 8 +++++++- .../zha/ha-device-info-zha.ts | 8 +++++++- .../settings/entity-settings-helper-tab.ts | 4 ++-- src/panels/config/helpers/ha-config-helpers.ts | 6 ++++++ .../matter/matter-config-dashboard.ts | 6 ++++++ .../integration-panels/mqtt/mqtt-config-panel.ts | 4 ++-- .../integration-panels/zha/zha-add-group-page.ts | 6 ++++++ .../integration-panels/zha/zha-group-page.ts | 6 ++++++ .../zha/zha-network-visualization-page.ts | 6 ++++++ .../dashboards/ha-config-lovelace-dashboards.ts | 6 ++++++ .../resources/ha-config-lovelace-resources.ts | 6 ++++++ src/panels/config/person/ha-config-person.ts | 11 ++++++++--- .../ha-config-voice-assistants-assistants.ts | 6 ++++++ src/panels/config/zone/ha-config-zone.ts | 6 ++++++ .../energy/strategies/energy-view-strategy.ts | 6 ++++++ src/panels/logbook/ha-panel-logbook.ts | 6 ++++++ .../lovelace/badges/hui-entity-filter-badge.ts | 15 ++++++++++++--- .../lovelace/cards/hui-entity-filter-card.ts | 15 ++++++++++++--- .../lovelace/cards/hui-horizontal-stack-card.ts | 8 ++++---- .../lovelace/components/hui-generic-entity-row.ts | 12 +++++++++--- src/panels/lovelace/ha-panel-lovelace.ts | 6 ++++++ .../original-states-dashboard-strategy.ts | 6 ++++++ .../strategies/original-states-view-strategy.ts | 6 ++++++ src/state-summary/state-card-update.ts | 6 ++++++ tsconfig.json | 2 +- 41 files changed, 220 insertions(+), 39 deletions(-) diff --git a/gallery/src/pages/automation/editor-condition.ts b/gallery/src/pages/automation/editor-condition.ts index 3a43eda71e0f..ed30c74272d7 100644 --- a/gallery/src/pages/automation/editor-condition.ts +++ b/gallery/src/pages/automation/editor-condition.ts @@ -80,7 +80,7 @@ const SCHEMAS: { name: string; conditions: ConditionWithShorthand[] }[] = [ ]; @customElement("demo-automation-editor-condition") -class DemoHaAutomationEditorCondition extends LitElement { +export class DemoAutomationEditorCondition extends LitElement { @state() private hass!: HomeAssistant; @state() private _disabled = false; @@ -155,6 +155,6 @@ class DemoHaAutomationEditorCondition extends LitElement { declare global { interface HTMLElementTagNameMap { - "demo-ha-automation-editor-condition": DemoHaAutomationEditorCondition; + "demo-automation-editor-condition": DemoAutomationEditorCondition; } } diff --git a/gallery/src/pages/automation/editor-trigger.ts b/gallery/src/pages/automation/editor-trigger.ts index 30c9721256e8..1ed11eb0a87c 100644 --- a/gallery/src/pages/automation/editor-trigger.ts +++ b/gallery/src/pages/automation/editor-trigger.ts @@ -126,7 +126,7 @@ const SCHEMAS: { name: string; triggers: Trigger[] }[] = [ ]; @customElement("demo-automation-editor-trigger") -class DemoHaAutomationEditorTrigger extends LitElement { +export class DemoAutomationEditorTrigger extends LitElement { @state() private hass!: HomeAssistant; @state() private _disabled = false; @@ -201,6 +201,6 @@ class DemoHaAutomationEditorTrigger extends LitElement { declare global { interface HTMLElementTagNameMap { - "demo-ha-automation-editor-trigger": DemoHaAutomationEditorTrigger; + "demo-automation-editor-trigger": DemoAutomationEditorTrigger; } } diff --git a/gallery/src/pages/lovelace/media-player-row.ts b/gallery/src/pages/lovelace/media-player-row.ts index 44433bc089be..eeba128c0630 100644 --- a/gallery/src/pages/lovelace/media-player-row.ts +++ b/gallery/src/pages/lovelace/media-player-row.ts @@ -55,7 +55,7 @@ const CONFIGS = [ ]; @customElement("demo-lovelace-media-player-row") -class DemoHuiMediaPlayerRow extends LitElement { +export class DemoLovelaceMediaPlayerRow extends LitElement { @query("#demos") private _demoRoot!: HTMLElement; protected render(): TemplateResult { @@ -73,6 +73,6 @@ class DemoHuiMediaPlayerRow extends LitElement { declare global { interface HTMLElementTagNameMap { - "demo-lovelace-media-player-rows": DemoHuiMediaPlayerRow; + "demo-lovelace-media-player-row": DemoLovelaceMediaPlayerRow; } } diff --git a/gallery/src/pages/misc/util-long-press.ts b/gallery/src/pages/misc/util-long-press.ts index 7ce2106ba236..05b4f6291e33 100644 --- a/gallery/src/pages/misc/util-long-press.ts +++ b/gallery/src/pages/misc/util-long-press.ts @@ -59,3 +59,9 @@ export class DemoUtilLongPress extends LitElement { } `; } + +declare global { + interface HTMLElementTagNameMap { + "demo-misc-util-long-press": DemoUtilLongPress; + } +} diff --git a/hassio/src/addon-store/hassio-addon-repository.ts b/hassio/src/addon-store/hassio-addon-repository.ts index 477a4361ab14..3c7ee0156608 100644 --- a/hassio/src/addon-store/hassio-addon-repository.ts +++ b/hassio/src/addon-store/hassio-addon-repository.ts @@ -140,3 +140,9 @@ export class HassioAddonRepositoryEl extends LitElement { ]; } } + +declare global { + interface HTMLElementTagNameMap { + "hassio-addon-repository": HassioAddonRepositoryEl; + } +} diff --git a/hassio/src/addon-store/hassio-addon-store.ts b/hassio/src/addon-store/hassio-addon-store.ts index a918c348203d..695f41df6db2 100644 --- a/hassio/src/addon-store/hassio-addon-store.ts +++ b/hassio/src/addon-store/hassio-addon-store.ts @@ -248,3 +248,9 @@ export class HassioAddonStore extends LitElement { `; } } + +declare global { + interface HTMLElementTagNameMap { + "hassio-addon-store": HassioAddonStore; + } +} diff --git a/hassio/src/dashboard/hassio-update.ts b/hassio/src/dashboard/hassio-update.ts index b331dc7609b6..b79aa14f18aa 100644 --- a/hassio/src/dashboard/hassio-update.ts +++ b/hassio/src/dashboard/hassio-update.ts @@ -151,3 +151,9 @@ export class HassioUpdate extends LitElement { ]; } } + +declare global { + interface HTMLElementTagNameMap { + "hassio-update": HassioUpdate; + } +} diff --git a/src/auth/ha-authorize.ts b/src/auth/ha-authorize.ts index 6af166f067ce..97fc3ef4790d 100644 --- a/src/auth/ha-authorize.ts +++ b/src/auth/ha-authorize.ts @@ -352,3 +352,9 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) { } } } + +declare global { + interface HTMLElementTagNameMap { + "ha-authorize": HaAuthorize; + } +} diff --git a/src/auth/ha-pick-auth-provider.ts b/src/auth/ha-pick-auth-provider.ts index 90a5c238b67b..e26030146cf9 100644 --- a/src/auth/ha-pick-auth-provider.ts +++ b/src/auth/ha-pick-auth-provider.ts @@ -8,6 +8,9 @@ import "../components/ha-list-item"; import { AuthProvider } from "../data/auth"; declare global { + interface HTMLElementTagNameMap { + "ha-pick-auth-provider": HaPickAuthProvider; + } interface HASSDomEvents { "pick-auth-provider": AuthProvider; } diff --git a/src/components/entity/ha-entity-toggle.ts b/src/components/entity/ha-entity-toggle.ts index 223b208e1e97..ba1da0e6a9c4 100644 --- a/src/components/entity/ha-entity-toggle.ts +++ b/src/components/entity/ha-entity-toggle.ts @@ -1,18 +1,18 @@ import { mdiFlash, mdiFlashOff } from "@mdi/js"; import { HassEntity } from "home-assistant-js-websocket"; import { - css, CSSResultGroup, - html, LitElement, PropertyValues, TemplateResult, + css, + html, } from "lit"; -import { property, state } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { STATES_OFF } from "../../common/const"; import { computeStateDomain } from "../../common/entity/compute_state_domain"; import { computeStateName } from "../../common/entity/compute_state_name"; -import { isUnavailableState, UNAVAILABLE, UNKNOWN } from "../../data/entity"; +import { UNAVAILABLE, UNKNOWN, isUnavailableState } from "../../data/entity"; import { forwardHaptic } from "../../data/haptics"; import { HomeAssistant } from "../../types"; import "../ha-formfield"; @@ -24,6 +24,7 @@ const isOn = (stateObj?: HassEntity) => !STATES_OFF.includes(stateObj.state) && !isUnavailableState(stateObj.state); +@customElement("ha-entity-toggle") export class HaEntityToggle extends LitElement { // hass is not a property so that we only re-render on stateObj changes public hass?: HomeAssistant; @@ -175,4 +176,8 @@ export class HaEntityToggle extends LitElement { } } -customElements.define("ha-entity-toggle", HaEntityToggle); +declare global { + interface HTMLElementTagNameMap { + "ha-entity-toggle": HaEntityToggle; + } +} diff --git a/src/components/ha-gauge.ts b/src/components/ha-gauge.ts index 53b573dc47db..de8322e1d85c 100644 --- a/src/components/ha-gauge.ts +++ b/src/components/ha-gauge.ts @@ -19,7 +19,7 @@ export interface LevelDefinition { } @customElement("ha-gauge") -export class Gauge extends LitElement { +export class HaGauge extends LitElement { @property({ type: Number }) public min = 0; @property({ type: Number }) public max = 100; @@ -216,3 +216,9 @@ export class Gauge extends LitElement { `; } } + +declare global { + interface HTMLElementTagNameMap { + "ha-gauge": HaGauge; + } +} diff --git a/src/components/ha-qr-code.ts b/src/components/ha-qr-code.ts index f6a686d06823..2c0228e9a430 100644 --- a/src/components/ha-qr-code.ts +++ b/src/components/ha-qr-code.ts @@ -112,3 +112,9 @@ export class HaQrCode extends LitElement { } `; } + +declare global { + interface HTMLElementTagNameMap { + "ha-qr-code": HaQrCode; + } +} diff --git a/src/components/ha-selector/ha-selector-backup-location.ts b/src/components/ha-selector/ha-selector-backup-location.ts index f20c447a7bfc..0a98806b8362 100644 --- a/src/components/ha-selector/ha-selector-backup-location.ts +++ b/src/components/ha-selector/ha-selector-backup-location.ts @@ -41,6 +41,6 @@ export class HaBackupLocationSelector extends LitElement { declare global { interface HTMLElementTagNameMap { - "ha-selector-backup-location": HaBackupLocationSelector; + "ha-selector-backup_location": HaBackupLocationSelector; } } diff --git a/src/components/ha-selector/ha-selector-tts-voice.ts b/src/components/ha-selector/ha-selector-tts-voice.ts index dc6b0c0fdc66..6098ed7ebb34 100644 --- a/src/components/ha-selector/ha-selector-tts-voice.ts +++ b/src/components/ha-selector/ha-selector-tts-voice.ts @@ -47,6 +47,6 @@ export class HaTTSVoiceSelector extends LitElement { declare global { interface HTMLElementTagNameMap { - "ha-selector-tts-voice": HaTTSVoiceSelector; + "ha-selector-tts_voice": HaTTSVoiceSelector; } } diff --git a/src/components/ha-selector/ha-selector-ui-action.ts b/src/components/ha-selector/ha-selector-ui-action.ts index 7888ec1128fa..34c71d280dfa 100644 --- a/src/components/ha-selector/ha-selector-ui-action.ts +++ b/src/components/ha-selector/ha-selector-ui-action.ts @@ -39,6 +39,6 @@ export class HaSelectorUiAction extends LitElement { declare global { interface HTMLElementTagNameMap { - "ha-selector-ui-action": HaSelectorUiAction; + "ha-selector-ui_action": HaSelectorUiAction; } } diff --git a/src/components/ha-selector/ha-selector-ui-color.ts b/src/components/ha-selector/ha-selector-ui-color.ts index 4d77d1e213f2..c88c083f8ef0 100644 --- a/src/components/ha-selector/ha-selector-ui-color.ts +++ b/src/components/ha-selector/ha-selector-ui-color.ts @@ -36,6 +36,6 @@ export class HaSelectorUiColor extends LitElement { declare global { interface HTMLElementTagNameMap { - "ha-selector-ui-color": HaSelectorUiColor; + "ha-selector-ui_color": HaSelectorUiColor; } } diff --git a/src/components/ha-two-pane-top-app-bar-fixed.ts b/src/components/ha-two-pane-top-app-bar-fixed.ts index df6477534c54..5cd5dbb2a234 100644 --- a/src/components/ha-two-pane-top-app-bar-fixed.ts +++ b/src/components/ha-two-pane-top-app-bar-fixed.ts @@ -17,7 +17,7 @@ export const passiveEventOptionsIfSupported = supportsPassiveEventListener : undefined; @customElement("ha-two-pane-top-app-bar-fixed") -export abstract class TopAppBarBaseBase extends BaseElement { +export class TopAppBarBaseBase extends BaseElement { protected override mdcFoundation!: MDCFixedTopAppBarFoundation; protected override mdcFoundationClass = MDCFixedTopAppBarFoundation; @@ -323,3 +323,9 @@ export abstract class TopAppBarBaseBase extends BaseElement { `, ]; } + +declare global { + interface HTMLElementTagNameMap { + "ha-two-pane-top-app-bar-fixed": TopAppBarBaseBase; + } +} diff --git a/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-info-zha.ts b/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-info-zha.ts index 227cfbd04313..da52b4dd2467 100644 --- a/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-info-zha.ts +++ b/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-info-zha.ts @@ -15,7 +15,7 @@ import { HomeAssistant } from "../../../../../../types"; import { formatAsPaddedHex } from "../../../../integrations/integration-panels/zha/functions"; @customElement("ha-device-info-zha") -export class HaDeviceActionsZha extends LitElement { +export class HaDeviceInfoZha extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @property() public device!: DeviceRegistryEntry; @@ -98,3 +98,9 @@ export class HaDeviceActionsZha extends LitElement { ]; } } + +declare global { + interface HTMLElementTagNameMap { + "ha-device-info-zha": HaDeviceInfoZha; + } +} diff --git a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts index 4aa558799462..dbe61afa3d6a 100644 --- a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts +++ b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts @@ -33,7 +33,7 @@ import "../../entity-registry-settings-editor"; import type { EntityRegistrySettingsEditor } from "../../entity-registry-settings-editor"; @customElement("entity-settings-helper-tab") -export class EntityRegistrySettingsHelper extends LitElement { +export class EntitySettingsHelperTab extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @property() public entry!: ExtEntityRegistryEntry; @@ -226,6 +226,6 @@ export class EntityRegistrySettingsHelper extends LitElement { declare global { interface HTMLElementTagNameMap { - "entity-platform-helper-tab": EntityRegistrySettingsHelper; + "entity-settings-helper-tab": EntitySettingsHelperTab; } } diff --git a/src/panels/config/helpers/ha-config-helpers.ts b/src/panels/config/helpers/ha-config-helpers.ts index ac517776f3f7..1982716efc61 100644 --- a/src/panels/config/helpers/ha-config-helpers.ts +++ b/src/panels/config/helpers/ha-config-helpers.ts @@ -418,3 +418,9 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) { showHelperDetailDialog(this, {}); } } + +declare global { + interface HTMLElementTagNameMap { + "ha-config-helpers": HaConfigHelpers; + } +} diff --git a/src/panels/config/integrations/integration-panels/matter/matter-config-dashboard.ts b/src/panels/config/integrations/integration-panels/matter/matter-config-dashboard.ts index 29e4a6265099..9eaa14ec3435 100644 --- a/src/panels/config/integrations/integration-panels/matter/matter-config-dashboard.ts +++ b/src/panels/config/integrations/integration-panels/matter/matter-config-dashboard.ts @@ -210,3 +210,9 @@ export class MatterConfigDashboard extends LitElement { `, ]; } + +declare global { + interface HTMLElementTagNameMap { + "matter-config-dashboard": MatterConfigDashboard; + } +} diff --git a/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts b/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts index 032ebf38edc1..76ebc93326e1 100644 --- a/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts +++ b/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts @@ -16,7 +16,7 @@ import "./mqtt-subscribe-card"; const qosLevel = ["0", "1", "2"]; @customElement("mqtt-config-panel") -class HaPanelDevMqtt extends LitElement { +export class MQTTConfigPanel extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) public narrow!: boolean; @@ -248,6 +248,6 @@ class HaPanelDevMqtt extends LitElement { declare global { interface HTMLElementTagNameMap { - "developer-tools-mqtt": HaPanelDevMqtt; + "mqtt-config-panel": MQTTConfigPanel; } } diff --git a/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts index 367485563c1b..2b13eb3d0868 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts @@ -198,3 +198,9 @@ export class ZHAAddGroupPage extends LitElement { ]; } } + +declare global { + interface HTMLElementTagNameMap { + "zha-add-group-page": ZHAAddGroupPage; + } +} diff --git a/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts index 7fde6ee13b47..f76583920656 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts @@ -324,3 +324,9 @@ export class ZHAGroupPage extends LitElement { ]; } } + +declare global { + interface HTMLElementTagNameMap { + "zha-group-page": ZHAGroupPage; + } +} diff --git a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts index 706c0e9b736d..2d9cd4bd9410 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts @@ -472,3 +472,9 @@ export class ZHANetworkVisualizationPage extends LitElement { ]; } } + +declare global { + interface HTMLElementTagNameMap { + "zha-network-visualization-page": ZHANetworkVisualizationPage; + } +} diff --git a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts index f246a48a1ba5..de05a5a0d6af 100644 --- a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts +++ b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts @@ -407,3 +407,9 @@ export class HaConfigLovelaceDashboards extends LitElement { }); } } + +declare global { + interface HTMLElementTagNameMap { + "ha-config-lovelace-dashboards": HaConfigLovelaceDashboards; + } +} diff --git a/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts b/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts index ec4b8f77d58d..71df3c3354da 100644 --- a/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts +++ b/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts @@ -253,3 +253,9 @@ export class HaConfigLovelaceRescources extends LitElement { ]; } } + +declare global { + interface HTMLElementTagNameMap { + "ha-config-lovelace-resources": HaConfigLovelaceRescources; + } +} diff --git a/src/panels/config/person/ha-config-person.ts b/src/panels/config/person/ha-config-person.ts index 61a54c258298..60311cd901eb 100644 --- a/src/panels/config/person/ha-config-person.ts +++ b/src/panels/config/person/ha-config-person.ts @@ -2,7 +2,7 @@ import { mdiPlus } from "@mdi/js"; import "@polymer/paper-item/paper-icon-item"; import "@polymer/paper-item/paper-item-body"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; -import { property, state } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { stringCompare } from "../../../common/string/compare"; import "../../../components/ha-card"; import "../../../components/ha-fab"; @@ -31,7 +31,8 @@ import { showPersonDetailDialog, } from "./show-dialog-person-detail"; -class HaConfigPerson extends LitElement { +@customElement("ha-config-person") +export class HaConfigPerson extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; @property() public isWide?: boolean; @@ -292,4 +293,8 @@ class HaConfigPerson extends LitElement { } } -customElements.define("ha-config-person", HaConfigPerson); +declare global { + interface HTMLElementTagNameMap { + "ha-config-person": HaConfigPerson; + } +} diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts index e88e0d9128e2..c932806fa89b 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts @@ -96,3 +96,9 @@ export class HaConfigVoiceAssistantsAssistants extends LitElement { } `; } + +declare global { + interface HTMLElementTagNameMap { + "ha-config-voice-assistants-assistants": HaConfigVoiceAssistantsAssistants; + } +} diff --git a/src/panels/config/zone/ha-config-zone.ts b/src/panels/config/zone/ha-config-zone.ts index c3e302cdd706..cbe1af87ddce 100644 --- a/src/panels/config/zone/ha-config-zone.ts +++ b/src/panels/config/zone/ha-config-zone.ts @@ -548,3 +548,9 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { `; } } + +declare global { + interface HTMLElementTagNameMap { + "ha-config-zone": HaConfigZone; + } +} diff --git a/src/panels/energy/strategies/energy-view-strategy.ts b/src/panels/energy/strategies/energy-view-strategy.ts index 0ca612065de9..27a0a9137184 100644 --- a/src/panels/energy/strategies/energy-view-strategy.ts +++ b/src/panels/energy/strategies/energy-view-strategy.ts @@ -166,3 +166,9 @@ export class EnergyViewStrategy extends ReactiveElement { return view; } } + +declare global { + interface HTMLElementTagNameMap { + "energy-view-strategy": EnergyViewStrategy; + } +} diff --git a/src/panels/logbook/ha-panel-logbook.ts b/src/panels/logbook/ha-panel-logbook.ts index d192b53edb65..2d4b754f548e 100644 --- a/src/panels/logbook/ha-panel-logbook.ts +++ b/src/panels/logbook/ha-panel-logbook.ts @@ -274,3 +274,9 @@ export class HaPanelLogbook extends LitElement { ]; } } + +declare global { + interface HTMLElementTagNameMap { + "ha-panel-logbook": HaPanelLogbook; + } +} diff --git a/src/panels/lovelace/badges/hui-entity-filter-badge.ts b/src/panels/lovelace/badges/hui-entity-filter-badge.ts index a45799695ac8..04cdd94a0f05 100644 --- a/src/panels/lovelace/badges/hui-entity-filter-badge.ts +++ b/src/panels/lovelace/badges/hui-entity-filter-badge.ts @@ -1,5 +1,5 @@ import { PropertyValues, ReactiveElement } from "lit"; -import { property, state } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { HomeAssistant } from "../../../types"; import { evaluateFilter } from "../common/evaluate-filter"; import { processConfigEntities } from "../common/process-config-entities"; @@ -8,7 +8,11 @@ import { EntityFilterEntityConfig } from "../entity-rows/types"; import { LovelaceBadge } from "../types"; import { EntityFilterBadgeConfig } from "./types"; -class EntityFilterBadge extends ReactiveElement implements LovelaceBadge { +@customElement("hui-entity-filter-badge") +export class HuiEntityFilterBadge + extends ReactiveElement + implements LovelaceBadge +{ @property({ attribute: false }) public hass!: HomeAssistant; @state() private _config?: EntityFilterBadgeConfig; @@ -153,4 +157,9 @@ class EntityFilterBadge extends ReactiveElement implements LovelaceBadge { return false; } } -customElements.define("hui-entity-filter-badge", EntityFilterBadge); + +declare global { + interface HTMLElementTagNameMap { + "hui-entity-filter-badge": HuiEntityFilterBadge; + } +} diff --git a/src/panels/lovelace/cards/hui-entity-filter-card.ts b/src/panels/lovelace/cards/hui-entity-filter-card.ts index ebd649bc530f..797d7114a74b 100644 --- a/src/panels/lovelace/cards/hui-entity-filter-card.ts +++ b/src/panels/lovelace/cards/hui-entity-filter-card.ts @@ -1,5 +1,5 @@ import { PropertyValues, ReactiveElement } from "lit"; -import { property, state } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { LovelaceCardConfig } from "../../../data/lovelace/config/card"; import { HomeAssistant } from "../../../types"; import { computeCardSize } from "../common/compute-card-size"; @@ -11,7 +11,11 @@ import { EntityFilterEntityConfig } from "../entity-rows/types"; import { LovelaceCard } from "../types"; import { EntityFilterCardConfig } from "./types"; -class EntityFilterCard extends ReactiveElement implements LovelaceCard { +@customElement("hui-entity-filter-card") +export class HuiEntityFilterCard + extends ReactiveElement + implements LovelaceCard +{ public static getStubConfig( hass: HomeAssistant, entities: string[], @@ -230,4 +234,9 @@ class EntityFilterCard extends ReactiveElement implements LovelaceCard { this._element = newCardEl; } } -customElements.define("hui-entity-filter-card", EntityFilterCard); + +declare global { + interface HTMLElementTagNameMap { + "hui-entity-filter-card": HuiEntityFilterCard; + } +} diff --git a/src/panels/lovelace/cards/hui-horizontal-stack-card.ts b/src/panels/lovelace/cards/hui-horizontal-stack-card.ts index 349f5867b701..72da14e3ea67 100644 --- a/src/panels/lovelace/cards/hui-horizontal-stack-card.ts +++ b/src/panels/lovelace/cards/hui-horizontal-stack-card.ts @@ -1,8 +1,10 @@ import { css, CSSResultGroup } from "lit"; +import { customElement } from "lit/decorators"; import { computeCardSize } from "../common/compute-card-size"; import { HuiStackCard } from "./hui-stack-card"; -class HuiHorizontalStackCard extends HuiStackCard { +@customElement("hui-horizontal-stack-card") +export class HuiHorizontalStackCard extends HuiStackCard { public async getCardSize(): Promise { if (!this._cards) { return 0; @@ -48,8 +50,6 @@ class HuiHorizontalStackCard extends HuiStackCard { declare global { interface HTMLElementTagNameMap { - "hui-horitzontal-stack-card": HuiHorizontalStackCard; + "hui-horizontal-stack-card": HuiHorizontalStackCard; } } - -customElements.define("hui-horizontal-stack-card", HuiHorizontalStackCard); diff --git a/src/panels/lovelace/components/hui-generic-entity-row.ts b/src/panels/lovelace/components/hui-generic-entity-row.ts index 4a6c8d920958..d426fde1fd35 100644 --- a/src/panels/lovelace/components/hui-generic-entity-row.ts +++ b/src/panels/lovelace/components/hui-generic-entity-row.ts @@ -6,7 +6,7 @@ import { html, nothing, } from "lit"; -import { property } from "lit/decorators"; +import { customElement, property } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { ifDefined } from "lit/directives/if-defined"; import { DOMAINS_INPUT_ROW } from "../../../common/const"; @@ -24,7 +24,8 @@ import { handleAction } from "../common/handle-action"; import { hasAction } from "../common/has-action"; import { createEntityNotFoundWarning } from "./hui-warning"; -class HuiGenericEntityRow extends LitElement { +@customElement("hui-generic-entity-row") +export class HuiGenericEntityRow extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; @property() public config?: EntitiesCardEntityConfig; @@ -249,4 +250,9 @@ class HuiGenericEntityRow extends LitElement { `; } } -customElements.define("hui-generic-entity-row", HuiGenericEntityRow); + +declare global { + interface HTMLElementTagNameMap { + "hui-generic-entity-row": HuiGenericEntityRow; + } +} diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts index 8b4cf33945e2..2ccca5e5d244 100644 --- a/src/panels/lovelace/ha-panel-lovelace.ts +++ b/src/panels/lovelace/ha-panel-lovelace.ts @@ -459,3 +459,9 @@ export class LovelacePanel extends LitElement { } } } + +declare global { + interface HTMLElementTagNameMap { + "ha-panel-lovelace": LovelacePanel; + } +} diff --git a/src/panels/lovelace/strategies/original-states-dashboard-strategy.ts b/src/panels/lovelace/strategies/original-states-dashboard-strategy.ts index 86f010d9a49e..0c7ae3c14f1f 100644 --- a/src/panels/lovelace/strategies/original-states-dashboard-strategy.ts +++ b/src/panels/lovelace/strategies/original-states-dashboard-strategy.ts @@ -33,3 +33,9 @@ export class OriginalStatesDashboardStrategy extends ReactiveElement { ); } } + +declare global { + interface HTMLElementTagNameMap { + "original-states-dashboard-strategy": OriginalStatesDashboardStrategy; + } +} diff --git a/src/panels/lovelace/strategies/original-states-view-strategy.ts b/src/panels/lovelace/strategies/original-states-view-strategy.ts index 9fcf20e974e3..386f953fcfcf 100644 --- a/src/panels/lovelace/strategies/original-states-view-strategy.ts +++ b/src/panels/lovelace/strategies/original-states-view-strategy.ts @@ -75,3 +75,9 @@ export class OriginalStatesViewStrategy extends ReactiveElement { return view; } } + +declare global { + interface HTMLElementTagNameMap { + "original-states-view-strategy": OriginalStatesViewStrategy; + } +} diff --git a/src/state-summary/state-card-update.ts b/src/state-summary/state-card-update.ts index fc307cb37227..85d34517a07b 100755 --- a/src/state-summary/state-card-update.ts +++ b/src/state-summary/state-card-update.ts @@ -54,3 +54,9 @@ export class StateCardUpdate extends LitElement { ]; } } + +declare global { + interface HTMLElementTagNameMap { + "state-card-update": StateCardUpdate; + } +} diff --git a/tsconfig.json b/tsconfig.json index 0a45a72573b1..81f29f08d90e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -29,7 +29,7 @@ "rules": { // Custom elements "no-unclosed-tag": "warning", - "no-missing-element-type-definition": "warning", + "no-missing-element-type-definition": "error", // Binding names "no-legacy-attribute": "error", // Binding types From 8583c879f2e2ecd4e76351d6154b4d4ef662c5a1 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Tue, 9 Jan 2024 09:00:59 -0500 Subject: [PATCH 107/361] Fix invalid directive bindings (#19330) --- src/dialogs/generic/dialog-box.ts | 2 +- tsconfig.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dialogs/generic/dialog-box.ts b/src/dialogs/generic/dialog-box.ts index 3b2ded7aad35..2660b5679971 100644 --- a/src/dialogs/generic/dialog-box.ts +++ b/src/dialogs/generic/dialog-box.ts @@ -74,7 +74,7 @@ class DialogBox extends LitElement { Date: Tue, 9 Jan 2024 09:02:15 -0500 Subject: [PATCH 108/361] Fix incompatible boolean property types (#19337) --- gallery/src/components/demo-black-white-row.ts | 2 +- gallery/src/components/demo-card.ts | 2 +- gallery/src/components/demo-more-info.ts | 2 +- src/components/chart/state-history-chart-timeline.ts | 2 +- src/components/chart/state-history-charts.ts | 2 +- src/components/entity/ha-state-label-badge.ts | 2 +- src/components/ha-assist-pipeline-picker.ts | 2 +- src/components/ha-date-range-picker.ts | 4 ++-- src/components/ha-labeled-slider.ts | 6 +++--- src/components/ha-menu-button.ts | 2 +- src/components/ha-theme-picker.ts | 2 +- src/panels/calendar/ha-recurrence-rule-editor.ts | 4 ++-- .../ha-config-application-credentials.ts | 4 ++-- src/panels/config/areas/ha-config-areas-dashboard.ts | 4 ++-- src/panels/config/areas/ha-config-areas.ts | 6 +++--- src/panels/config/automation/blueprint-automation-editor.ts | 2 +- src/panels/config/automation/ha-automation-editor.ts | 4 ++-- src/panels/config/automation/ha-config-automation.ts | 6 +++--- src/panels/config/blueprint/ha-config-blueprint.ts | 6 +++--- src/panels/config/cloud/ha-config-cloud.ts | 4 ++-- src/panels/config/dashboard/ha-config-dashboard.ts | 4 ++-- .../config/devices/device-detail/ha-device-entities-card.ts | 2 +- .../config/devices/device-detail/ha-device-info-card.ts | 2 +- .../integration-elements/mqtt/mqtt-discovery-payload.ts | 2 +- .../integration-elements/mqtt/mqtt-messages.ts | 4 ++-- src/panels/config/devices/ha-config-devices-dashboard.ts | 4 ++-- src/panels/config/devices/ha-config-devices.ts | 6 +++--- src/panels/config/ha-config-section.ts | 2 +- src/panels/config/ha-panel-config.ts | 2 +- src/panels/config/helpers/forms/ha-counter-form.ts | 2 +- src/panels/config/helpers/forms/ha-input_boolean-form.ts | 2 +- src/panels/config/helpers/forms/ha-input_button-form.ts | 2 +- src/panels/config/helpers/forms/ha-input_datetime-form.ts | 2 +- src/panels/config/helpers/forms/ha-input_number-form.ts | 2 +- src/panels/config/helpers/forms/ha-input_select-form.ts | 2 +- src/panels/config/helpers/forms/ha-input_text-form.ts | 2 +- src/panels/config/helpers/forms/ha-schedule-form.ts | 2 +- src/panels/config/helpers/forms/ha-timer-form.ts | 2 +- src/panels/config/helpers/ha-config-helpers.ts | 4 ++-- .../config/integrations/ha-config-integrations-dashboard.ts | 4 ++-- src/panels/config/integrations/ha-config-integrations.ts | 4 ++-- .../integration-panels/matter/matter-config-panel.ts | 4 ++-- .../integration-panels/zha/zha-cluster-commands.ts | 2 +- .../integration-panels/zha/zha-clusters-data-table.ts | 2 +- .../integration-panels/zha/zha-config-dashboard-router.ts | 4 ++-- .../integration-panels/zha/zha-manage-clusters.ts | 2 +- .../integration-panels/zwave_js/zwave_js-config-router.ts | 4 ++-- .../lovelace/dashboards/ha-config-lovelace-dashboards.ts | 4 ++-- src/panels/config/lovelace/ha-config-lovelace.ts | 4 ++-- .../lovelace/resources/ha-config-lovelace-resources.ts | 4 ++-- src/panels/config/person/ha-config-person.ts | 4 ++-- src/panels/config/scene/ha-config-scene.ts | 6 +++--- src/panels/config/scene/ha-scene-dashboard.ts | 4 ++-- src/panels/config/scene/ha-scene-editor.ts | 6 +++--- src/panels/config/script/ha-config-script.ts | 6 +++--- src/panels/config/script/ha-script-picker.ts | 4 ++-- src/panels/config/tags/ha-config-tags.ts | 4 ++-- .../ha-config-voice-assistants-assistants.ts | 4 ++-- .../config/voice-assistants/ha-config-voice-assistants.ts | 4 ++-- src/panels/config/zone/ha-config-zone.ts | 4 ++-- src/panels/custom/ha-panel-custom.ts | 2 +- src/panels/developer-tools/debug/ha-debug-connection-row.ts | 2 +- src/panels/developer-tools/developer-tools-router.ts | 2 +- src/panels/developer-tools/ha-panel-developer-tools.ts | 2 +- .../developer-tools/template/developer-tools-template.ts | 2 +- src/panels/lovelace/cards/hui-entity-filter-card.ts | 4 ++-- src/panels/lovelace/cards/hui-stack-card.ts | 2 +- src/panels/lovelace/components/hui-conditional-base.ts | 2 +- src/panels/lovelace/ha-panel-lovelace.ts | 2 +- src/panels/profile/ha-advanced-mode-row.ts | 2 +- src/panels/profile/ha-enable-shortcuts-row.ts | 2 +- src/panels/profile/ha-force-narrow-row.ts | 2 +- src/panels/profile/ha-pick-dashboard-row.ts | 2 +- src/panels/profile/ha-pick-date-format-row.ts | 2 +- src/panels/profile/ha-pick-first-weekday-row.ts | 2 +- src/panels/profile/ha-pick-language-row.ts | 2 +- src/panels/profile/ha-pick-number-format-row.ts | 2 +- src/panels/profile/ha-pick-time-format-row.ts | 2 +- src/panels/profile/ha-pick-time-zone-row.ts | 2 +- src/panels/profile/ha-push-notifications-row.ts | 2 +- src/panels/profile/ha-set-suspend-row.ts | 2 +- src/panels/profile/ha-set-vibrate-row.ts | 2 +- 82 files changed, 124 insertions(+), 124 deletions(-) diff --git a/gallery/src/components/demo-black-white-row.ts b/gallery/src/components/demo-black-white-row.ts index 43a58ea59e5b..30b2c533b762 100644 --- a/gallery/src/components/demo-black-white-row.ts +++ b/gallery/src/components/demo-black-white-row.ts @@ -11,7 +11,7 @@ class DemoBlackWhiteRow extends LitElement { @property() value!: any; - @property() disabled = false; + @property({ type: Boolean }) public disabled = false; protected render(): TemplateResult { return html` diff --git a/gallery/src/components/demo-card.ts b/gallery/src/components/demo-card.ts index 1c0879295204..b0ae74afdcab 100644 --- a/gallery/src/components/demo-card.ts +++ b/gallery/src/components/demo-card.ts @@ -15,7 +15,7 @@ class DemoCard extends LitElement { @property() public config!: DemoCardConfig; - @property() public showConfig = false; + @property({ type: Boolean }) public showConfig = false; @state() private _size?: number; diff --git a/gallery/src/components/demo-more-info.ts b/gallery/src/components/demo-more-info.ts index eeb5c9226465..5fb5fe502221 100644 --- a/gallery/src/components/demo-more-info.ts +++ b/gallery/src/components/demo-more-info.ts @@ -12,7 +12,7 @@ class DemoMoreInfo extends LitElement { @property() public entityId!: string; - @property() public showConfig!: boolean; + @property({ type: Boolean }) public showConfig = false; render() { const state = this._getState(this.entityId, this.hass.states); diff --git a/src/components/chart/state-history-chart-timeline.ts b/src/components/chart/state-history-chart-timeline.ts index d1c535e23cc4..4ed3eff474d3 100644 --- a/src/components/chart/state-history-chart-timeline.ts +++ b/src/components/chart/state-history-chart-timeline.ts @@ -23,7 +23,7 @@ export class StateHistoryChartTimeline extends LitElement { @property({ attribute: false }) public data: TimelineEntity[] = []; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public names?: Record; diff --git a/src/components/chart/state-history-charts.ts b/src/components/chart/state-history-charts.ts index 10bee3c74764..8c5736205477 100644 --- a/src/components/chart/state-history-charts.ts +++ b/src/components/chart/state-history-charts.ts @@ -52,7 +52,7 @@ export class StateHistoryCharts extends LitElement { @property({ attribute: false }) public historyData!: HistoryResult; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public names?: Record; diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts index f735452b6e89..9460c68147f5 100644 --- a/src/components/entity/ha-state-label-badge.ts +++ b/src/components/entity/ha-state-label-badge.ts @@ -61,7 +61,7 @@ export class HaStateLabelBadge extends LitElement { @property() public image?: string; - @property() public showName?: boolean; + @property({ type: Boolean }) public showName = false; @state() private _timerTimeRemaining?: number; diff --git a/src/components/ha-assist-pipeline-picker.ts b/src/components/ha-assist-pipeline-picker.ts index 80a69b2d2799..d6cb6c30bbe5 100644 --- a/src/components/ha-assist-pipeline-picker.ts +++ b/src/components/ha-assist-pipeline-picker.ts @@ -31,7 +31,7 @@ export class HaAssistPipelinePicker extends LitElement { @property({ type: Boolean }) public required = false; - @property() public includeLastUsed = false; + @property({ type: Boolean }) public includeLastUsed = false; @state() _pipelines?: AssistPipeline[]; diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index 7e16fecd22db..00f2f1a9fe29 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -54,9 +54,9 @@ export class HaDateRangePicker extends LitElement { @state() private _ranges?: DateRangePickerRanges; - @property() public autoApply = false; + @property({ type: Boolean }) public autoApply = false; - @property() public timePicker = true; + @property({ type: Boolean }) public timePicker = true; @property({ type: Boolean }) public disabled = false; diff --git a/src/components/ha-labeled-slider.ts b/src/components/ha-labeled-slider.ts index 5faf7a8b96b2..9bbf0e95371d 100644 --- a/src/components/ha-labeled-slider.ts +++ b/src/components/ha-labeled-slider.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../common/dom/fire_event"; @customElement("ha-labeled-slider") class HaLabeledSlider extends LitElement { - @property() public labeled? = false; + @property({ type: Boolean }) public labeled = false; @property() public caption?: string; @@ -22,7 +22,7 @@ class HaLabeledSlider extends LitElement { @property() public helper?: string; - @property() public extra = false; + @property({ type: Boolean }) public extra = false; @property() public icon?: string; @@ -38,7 +38,7 @@ class HaLabeledSlider extends LitElement { .min=${this.min} .max=${this.max} .step=${this.step} - labeled=${this.labeled} + .labeled=${this.labeled} .disabled=${this.disabled} .value=${this.value} @change=${this._inputChanged} diff --git a/src/components/ha-menu-button.ts b/src/components/ha-menu-button.ts index 0e7fac5aa390..63481ad1fd42 100644 --- a/src/components/ha-menu-button.ts +++ b/src/components/ha-menu-button.ts @@ -11,7 +11,7 @@ import "./ha-icon-button"; class HaMenuButton extends LitElement { @property({ type: Boolean }) public hassio = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public hass!: HomeAssistant; diff --git a/src/components/ha-theme-picker.ts b/src/components/ha-theme-picker.ts index 104c327cad4f..425b1a7227c6 100644 --- a/src/components/ha-theme-picker.ts +++ b/src/components/ha-theme-picker.ts @@ -21,7 +21,7 @@ export class HaThemePicker extends LitElement { @property() public label?: string; - @property() includeDefault?: boolean = false; + @property({ type: Boolean }) includeDefault = false; @property({ attribute: false }) public hass?: HomeAssistant; diff --git a/src/panels/calendar/ha-recurrence-rule-editor.ts b/src/panels/calendar/ha-recurrence-rule-editor.ts index d7f19d0b671b..7a131e23d856 100644 --- a/src/panels/calendar/ha-recurrence-rule-editor.ts +++ b/src/panels/calendar/ha-recurrence-rule-editor.ts @@ -35,13 +35,13 @@ import { export class RecurrenceRuleEditor extends LitElement { @property() public hass!: HomeAssistant; - @property() public disabled = false; + @property({ type: Boolean }) public disabled = false; @property() public value = ""; @property() public dtstart?: Date; - @property() public allDay?: boolean; + @property({ type: Boolean }) public allDay = false; @property({ attribute: false }) public locale!: HomeAssistant["locale"]; diff --git a/src/panels/config/application_credentials/ha-config-application-credentials.ts b/src/panels/config/application_credentials/ha-config-application-credentials.ts index d42f57f3f9ef..6752532e2922 100644 --- a/src/panels/config/application_credentials/ha-config-application-credentials.ts +++ b/src/panels/config/application_credentials/ha-config-application-credentials.ts @@ -41,9 +41,9 @@ export class HaConfigApplicationCredentials extends LitElement { @state() public _applicationCredentials: ApplicationCredential[] = []; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/areas/ha-config-areas-dashboard.ts b/src/panels/config/areas/ha-config-areas-dashboard.ts index 3623d585571b..62c3a047439c 100644 --- a/src/panels/config/areas/ha-config-areas-dashboard.ts +++ b/src/panels/config/areas/ha-config-areas-dashboard.ts @@ -36,9 +36,9 @@ import { export class HaConfigAreasDashboard extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide?: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/areas/ha-config-areas.ts b/src/panels/config/areas/ha-config-areas.ts index c5508eccfb9a..fd8959f050e2 100644 --- a/src/panels/config/areas/ha-config-areas.ts +++ b/src/panels/config/areas/ha-config-areas.ts @@ -11,11 +11,11 @@ import "./ha-config-areas-dashboard"; class HaConfigAreas extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; protected routerOptions: RouterOptions = { defaultPage: "dashboard", diff --git a/src/panels/config/automation/blueprint-automation-editor.ts b/src/panels/config/automation/blueprint-automation-editor.ts index 3f5a8ea65012..9f9e6c4e0824 100644 --- a/src/panels/config/automation/blueprint-automation-editor.ts +++ b/src/panels/config/automation/blueprint-automation-editor.ts @@ -24,7 +24,7 @@ import "../ha-config-section"; export class HaBlueprintAutomationEditor extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; @property({ type: Boolean }) public disabled = false; diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index c8ca54c3d7ee..a4f6f2ef3ed5 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -89,9 +89,9 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) { @property() public automations!: AutomationEntity[]; - @property() public isWide?: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/automation/ha-config-automation.ts b/src/panels/config/automation/ha-config-automation.ts index 1af2b4cadc1c..ef1182e98205 100644 --- a/src/panels/config/automation/ha-config-automation.ts +++ b/src/panels/config/automation/ha-config-automation.ts @@ -24,11 +24,11 @@ const equal = (a: AutomationEntity[], b: AutomationEntity[]): boolean => { class HaConfigAutomation extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; @property() public automations: AutomationEntity[] = []; diff --git a/src/panels/config/blueprint/ha-config-blueprint.ts b/src/panels/config/blueprint/ha-config-blueprint.ts index 68f50c94b4fa..1e6bbeed95b3 100644 --- a/src/panels/config/blueprint/ha-config-blueprint.ts +++ b/src/panels/config/blueprint/ha-config-blueprint.ts @@ -19,11 +19,11 @@ declare global { class HaConfigBlueprint extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; @property() public blueprints: Record = {}; diff --git a/src/panels/config/cloud/ha-config-cloud.ts b/src/panels/config/cloud/ha-config-cloud.ts index c48600fc3ea5..53d70fb7b973 100644 --- a/src/panels/config/cloud/ha-config-cloud.ts +++ b/src/panels/config/cloud/ha-config-cloud.ts @@ -16,9 +16,9 @@ const NOT_LOGGED_IN_URLS = ["login", "register", "forgot-password"]; class HaConfigCloud extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/dashboard/ha-config-dashboard.ts b/src/panels/config/dashboard/ha-config-dashboard.ts index 2ed6a9bb8f2c..f1f1e5ba7e05 100644 --- a/src/panels/config/dashboard/ha-config-dashboard.ts +++ b/src/panels/config/dashboard/ha-config-dashboard.ts @@ -117,11 +117,11 @@ class HaConfigDashboard extends SubscribeMixin(LitElement) { @property({ type: Boolean, reflect: true }) public narrow!: boolean; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; @property() public cloudStatus?: CloudStatus; - @property() public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; @state() private _tip?: string; diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts index fb5aad023e97..9de2c1e69aa3 100644 --- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts +++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts @@ -40,7 +40,7 @@ export class HaDeviceEntitiesCard extends LitElement { @property() public entities!: EntityRegistryStateEntry[]; - @property() public showHidden = false; + @property({ type: Boolean }) public showHidden = false; @state() private _extDisabledEntityEntries?: Record< string, diff --git a/src/panels/config/devices/device-detail/ha-device-info-card.ts b/src/panels/config/devices/device-detail/ha-device-info-card.ts index 524e57534a0a..0ec966058607 100644 --- a/src/panels/config/devices/device-detail/ha-device-info-card.ts +++ b/src/panels/config/devices/device-detail/ha-device-info-card.ts @@ -15,7 +15,7 @@ export class HaDeviceCard extends LitElement { @property() public device!: DeviceRegistryEntry; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { return html` diff --git a/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-discovery-payload.ts b/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-discovery-payload.ts index cb5e8e3b8469..f61c1995f3cc 100644 --- a/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-discovery-payload.ts +++ b/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-discovery-payload.ts @@ -7,7 +7,7 @@ import { classMap } from "lit/directives/class-map"; class MQTTDiscoveryPayload extends LitElement { @property() public payload!: Record; - @property() public showAsYaml = false; + @property({ type: Boolean }) public showAsYaml = false; @property() public summary!: string; diff --git a/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-messages.ts b/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-messages.ts index 2d3b5acd1fb4..31386b94021d 100644 --- a/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-messages.ts +++ b/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-messages.ts @@ -14,9 +14,9 @@ class MQTTMessages extends LitElement { @property() public direction!: string; - @property() public showAsYaml = false; + @property({ type: Boolean }) public showAsYaml = false; - @property() public showDeserialized = false; + @property({ type: Boolean }) public showDeserialized = false; @property() public subscribedTopic!: string; diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts index ca7c4fde9847..400c0baf31a7 100644 --- a/src/panels/config/devices/ha-config-devices-dashboard.ts +++ b/src/panels/config/devices/ha-config-devices-dashboard.ts @@ -62,9 +62,9 @@ interface DeviceRowData extends DeviceRegistryEntry { export class HaConfigDeviceDashboard extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow = false; + @property({ type: Boolean }) public narrow = false; - @property() public isWide = false; + @property({ type: Boolean }) public isWide = false; @property() public entries!: ConfigEntry[]; diff --git a/src/panels/config/devices/ha-config-devices.ts b/src/panels/config/devices/ha-config-devices.ts index 8b3329cec1fa..bfda9129cb51 100644 --- a/src/panels/config/devices/ha-config-devices.ts +++ b/src/panels/config/devices/ha-config-devices.ts @@ -16,11 +16,11 @@ import "./ha-config-devices-dashboard"; class HaConfigDevices extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; protected routerOptions: RouterOptions = { defaultPage: "dashboard", diff --git a/src/panels/config/ha-config-section.ts b/src/panels/config/ha-config-section.ts index 37ab1808a033..cf6088be9fc1 100644 --- a/src/panels/config/ha-config-section.ts +++ b/src/panels/config/ha-config-section.ts @@ -4,7 +4,7 @@ import { classMap } from "lit/directives/class-map"; @customElement("ha-config-section") export class HaConfigSection extends LitElement { - @property() public isWide = false; + @property({ type: Boolean }) public isWide = false; @property({ type: Boolean }) public vertical = false; diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts index ff4b4d4504f7..d8a26d529689 100644 --- a/src/panels/config/ha-panel-config.ts +++ b/src/panels/config/ha-panel-config.ts @@ -360,7 +360,7 @@ export const configSections: { [name: string]: PageNavigation[] } = { class HaPanelConfig extends SubscribeMixin(HassRouterPage) { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/helpers/forms/ha-counter-form.ts b/src/panels/config/helpers/forms/ha-counter-form.ts index 479abac63360..8f49d421c19a 100644 --- a/src/panels/config/helpers/forms/ha-counter-form.ts +++ b/src/panels/config/helpers/forms/ha-counter-form.ts @@ -13,7 +13,7 @@ import { HomeAssistant } from "../../../../types"; class HaCounterForm extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public new?: boolean; + @property({ type: Boolean }) public new = false; private _item?: Partial; diff --git a/src/panels/config/helpers/forms/ha-input_boolean-form.ts b/src/panels/config/helpers/forms/ha-input_boolean-form.ts index 870d83cf22ae..8a2c1eeacd8c 100644 --- a/src/panels/config/helpers/forms/ha-input_boolean-form.ts +++ b/src/panels/config/helpers/forms/ha-input_boolean-form.ts @@ -11,7 +11,7 @@ import { HomeAssistant } from "../../../../types"; class HaInputBooleanForm extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public new?: boolean; + @property({ type: Boolean }) public new = false; private _item?: InputBoolean; diff --git a/src/panels/config/helpers/forms/ha-input_button-form.ts b/src/panels/config/helpers/forms/ha-input_button-form.ts index 0b8ec14edeb6..940931175704 100644 --- a/src/panels/config/helpers/forms/ha-input_button-form.ts +++ b/src/panels/config/helpers/forms/ha-input_button-form.ts @@ -11,7 +11,7 @@ import { HomeAssistant } from "../../../../types"; class HaInputButtonForm extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public new?: boolean; + @property({ type: Boolean }) public new = false; @state() private _name!: string; diff --git a/src/panels/config/helpers/forms/ha-input_datetime-form.ts b/src/panels/config/helpers/forms/ha-input_datetime-form.ts index 76e3eac39923..dfb3dd65035d 100644 --- a/src/panels/config/helpers/forms/ha-input_datetime-form.ts +++ b/src/panels/config/helpers/forms/ha-input_datetime-form.ts @@ -14,7 +14,7 @@ import { HomeAssistant } from "../../../../types"; class HaInputDateTimeForm extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public new?: boolean; + @property({ type: Boolean }) public new = false; private _item?: InputDateTime; diff --git a/src/panels/config/helpers/forms/ha-input_number-form.ts b/src/panels/config/helpers/forms/ha-input_number-form.ts index 0c83b7861cdb..b047708d240f 100644 --- a/src/panels/config/helpers/forms/ha-input_number-form.ts +++ b/src/panels/config/helpers/forms/ha-input_number-form.ts @@ -14,7 +14,7 @@ import { HomeAssistant } from "../../../../types"; class HaInputNumberForm extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public new?: boolean; + @property({ type: Boolean }) public new = false; private _item?: Partial; diff --git a/src/panels/config/helpers/forms/ha-input_select-form.ts b/src/panels/config/helpers/forms/ha-input_select-form.ts index 69c328f2a0b4..4f5ed4c27176 100644 --- a/src/panels/config/helpers/forms/ha-input_select-form.ts +++ b/src/panels/config/helpers/forms/ha-input_select-form.ts @@ -20,7 +20,7 @@ import type { HomeAssistant } from "../../../../types"; class HaInputSelectForm extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public new?: boolean; + @property({ type: Boolean }) public new = false; private _item?: InputSelect; diff --git a/src/panels/config/helpers/forms/ha-input_text-form.ts b/src/panels/config/helpers/forms/ha-input_text-form.ts index 90252e2ab0d1..852b62d628c6 100644 --- a/src/panels/config/helpers/forms/ha-input_text-form.ts +++ b/src/panels/config/helpers/forms/ha-input_text-form.ts @@ -15,7 +15,7 @@ import { HomeAssistant } from "../../../../types"; class HaInputTextForm extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public new?: boolean; + @property({ type: Boolean }) public new = false; private _item?: InputText; diff --git a/src/panels/config/helpers/forms/ha-schedule-form.ts b/src/panels/config/helpers/forms/ha-schedule-form.ts index a1c08c083e6b..a4dd69bf4571 100644 --- a/src/panels/config/helpers/forms/ha-schedule-form.ts +++ b/src/panels/config/helpers/forms/ha-schedule-form.ts @@ -44,7 +44,7 @@ const defaultFullCalendarConfig: CalendarOptions = { class HaScheduleForm extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public new?: boolean; + @property({ type: Boolean }) public new = false; @state() private _name!: string; diff --git a/src/panels/config/helpers/forms/ha-timer-form.ts b/src/panels/config/helpers/forms/ha-timer-form.ts index 4108f7fa43b4..34ff52ad87f2 100644 --- a/src/panels/config/helpers/forms/ha-timer-form.ts +++ b/src/panels/config/helpers/forms/ha-timer-form.ts @@ -11,7 +11,7 @@ import { HomeAssistant } from "../../../../types"; class HaTimerForm extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public new?: boolean; + @property({ type: Boolean }) public new = false; private _item?: Timer; diff --git a/src/panels/config/helpers/ha-config-helpers.ts b/src/panels/config/helpers/ha-config-helpers.ts index 1982716efc61..f755092c7f4c 100644 --- a/src/panels/config/helpers/ha-config-helpers.ts +++ b/src/panels/config/helpers/ha-config-helpers.ts @@ -81,9 +81,9 @@ const getConfigEntry = ( export class HaConfigHelpers extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/integrations/ha-config-integrations-dashboard.ts b/src/panels/config/integrations/ha-config-integrations-dashboard.ts index ed2b52ce04e9..ded9e80b9884 100644 --- a/src/panels/config/integrations/ha-config-integrations-dashboard.ts +++ b/src/panels/config/integrations/ha-config-integrations-dashboard.ts @@ -94,9 +94,9 @@ class HaConfigIntegrationsDashboard extends SubscribeMixin(LitElement) { @property({ type: Boolean, reflect: true }) public narrow!: boolean; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; @property() public route!: Route; diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts index 42ff9330b44d..212427e492c3 100644 --- a/src/panels/config/integrations/ha-config-integrations.ts +++ b/src/panels/config/integrations/ha-config-integrations.ts @@ -53,9 +53,9 @@ class HaConfigIntegrations extends SubscribeMixin(HassRouterPage) { @property({ type: Boolean, reflect: true }) public narrow!: boolean; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; protected routerOptions: RouterOptions = { defaultPage: "dashboard", diff --git a/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts b/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts index e6aa5b102f33..22a11152c9d1 100644 --- a/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts +++ b/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts @@ -24,9 +24,9 @@ export const configTabs: PageNavigation[] = [ class MatterConfigRouter extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected routerOptions: RouterOptions = { defaultPage: "dashboard", diff --git a/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts b/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts index a63bc9e75d97..66e59c382d1c 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts @@ -28,7 +28,7 @@ import { IssueCommandServiceData } from "./types"; export class ZHAClusterCommands extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public isWide?: boolean; + @property({ type: Boolean }) public isWide = false; @property() public device?: ZHADevice; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts b/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts index bf45ceecbf19..1ceb7b2cb02d 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts @@ -20,7 +20,7 @@ export interface ClusterRowData extends Cluster { export class ZHAClustersDataTable extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow = false; + @property({ type: Boolean }) public narrow = false; @property() public clusters: Cluster[] = []; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard-router.ts b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard-router.ts index 758f8acf0e8d..f3104c8a71eb 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard-router.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard-router.ts @@ -10,9 +10,9 @@ import { HomeAssistant } from "../../../../../types"; class ZHAConfigDashboardRouter extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; private _configEntry = new URLSearchParams(window.location.search).get( "config_entry" diff --git a/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts b/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts index 65512ab1a2f1..cdc2deb0cd90 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts @@ -40,7 +40,7 @@ const tabs = ["attributes", "commands"] as const; export class ZHAManageClusters extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide?: boolean; + @property({ type: Boolean }) public isWide = false; @property() public device?: ZHADevice; diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts index a8be9fa857b3..15dba45a433f 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts @@ -26,9 +26,9 @@ export const configTabs: PageNavigation[] = [ class ZWaveJSConfigRouter extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; private _configEntry = new URLSearchParams(window.location.search).get( "config_entry" diff --git a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts index de05a5a0d6af..24a48a6c6821 100644 --- a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts +++ b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts @@ -56,9 +56,9 @@ type DataTableItem = Pick< export class HaConfigLovelaceDashboards extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/lovelace/ha-config-lovelace.ts b/src/panels/config/lovelace/ha-config-lovelace.ts index 727438f3b6dc..c494232bb865 100644 --- a/src/panels/config/lovelace/ha-config-lovelace.ts +++ b/src/panels/config/lovelace/ha-config-lovelace.ts @@ -19,9 +19,9 @@ export const lovelaceTabs = [ class HaConfigLovelace extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; protected routerOptions: RouterOptions = { defaultPage: "dashboards", diff --git a/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts b/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts index 71df3c3354da..5dbab9dfed27 100644 --- a/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts +++ b/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts @@ -41,9 +41,9 @@ import { showResourceDetailDialog } from "./show-dialog-lovelace-resource-detail export class HaConfigLovelaceRescources extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/person/ha-config-person.ts b/src/panels/config/person/ha-config-person.ts index 60311cd901eb..96d60fe92f49 100644 --- a/src/panels/config/person/ha-config-person.ts +++ b/src/panels/config/person/ha-config-person.ts @@ -35,9 +35,9 @@ import { export class HaConfigPerson extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public isWide?: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow?: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/scene/ha-config-scene.ts b/src/panels/config/scene/ha-config-scene.ts index ae0742e754f1..59a88b92c24a 100644 --- a/src/panels/config/scene/ha-config-scene.ts +++ b/src/panels/config/scene/ha-config-scene.ts @@ -24,11 +24,11 @@ const equal = (a: SceneEntity[], b: SceneEntity[]): boolean => { class HaConfigScene extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; @property() public scenes: SceneEntity[] = []; diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts index 0d3f9a7a0561..e6bc9476f1ca 100644 --- a/src/panels/config/scene/ha-scene-dashboard.ts +++ b/src/panels/config/scene/ha-scene-dashboard.ts @@ -64,9 +64,9 @@ type SceneItem = SceneEntity & { class HaSceneDashboard extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; @property() public route!: Route; diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts index da9817835151..5814ac7fd650 100644 --- a/src/panels/config/scene/ha-scene-editor.ts +++ b/src/panels/config/scene/ha-scene-editor.ts @@ -87,9 +87,9 @@ export class HaSceneEditor extends SubscribeMixin( ) { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; @property() public route!: Route; @@ -97,7 +97,7 @@ export class HaSceneEditor extends SubscribeMixin( @property() public scenes!: SceneEntity[]; - @property() public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; @state() private _dirty = false; diff --git a/src/panels/config/script/ha-config-script.ts b/src/panels/config/script/ha-config-script.ts index 45ff779f9123..3e96240f7a37 100644 --- a/src/panels/config/script/ha-config-script.ts +++ b/src/panels/config/script/ha-config-script.ts @@ -27,11 +27,11 @@ const equal = (a: ScriptEntity[], b: ScriptEntity[]): boolean => { class HaConfigScript extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; @property() public scripts: ScriptEntity[] = []; diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts index ac2ace77675e..82e369b9e0c4 100644 --- a/src/panels/config/script/ha-script-picker.ts +++ b/src/panels/config/script/ha-script-picker.ts @@ -70,9 +70,9 @@ class HaScriptPicker extends LitElement { @property() public scripts!: ScriptEntity[]; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/tags/ha-config-tags.ts b/src/panels/config/tags/ha-config-tags.ts index 5eb80452e232..493bdf402410 100644 --- a/src/panels/config/tags/ha-config-tags.ts +++ b/src/panels/config/tags/ha-config-tags.ts @@ -44,9 +44,9 @@ export interface TagRowData extends Tag { export class HaConfigTags extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts index c932806fa89b..918af55d23c2 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts @@ -27,9 +27,9 @@ export class HaConfigVoiceAssistantsAssistants extends LitElement { ExposeEntitySettings >; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants.ts index dd827fcfe043..4c94317ca760 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants.ts @@ -33,9 +33,9 @@ class HaConfigVoiceAssistants extends HassRouterPage { @property({ attribute: false }) public cloudStatus!: CloudStatus; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property() public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; @state() @consume({ context: entitiesContext, subscribe: true }) diff --git a/src/panels/config/zone/ha-config-zone.ts b/src/panels/config/zone/ha-config-zone.ts index cbe1af87ddce..6869293fb8bf 100644 --- a/src/panels/config/zone/ha-config-zone.ts +++ b/src/panels/config/zone/ha-config-zone.ts @@ -52,9 +52,9 @@ import { showZoneDetailDialog } from "./show-dialog-zone-detail"; export class HaConfigZone extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public isWide?: boolean; + @property({ type: Boolean }) public isWide = false; - @property() public narrow?: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/custom/ha-panel-custom.ts b/src/panels/custom/ha-panel-custom.ts index 9d685a18932e..975c5cff76f2 100644 --- a/src/panels/custom/ha-panel-custom.ts +++ b/src/panels/custom/ha-panel-custom.ts @@ -23,7 +23,7 @@ declare global { export class HaPanelCustom extends ReactiveElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route!: Route; diff --git a/src/panels/developer-tools/debug/ha-debug-connection-row.ts b/src/panels/developer-tools/debug/ha-debug-connection-row.ts index e4b1c5c3ff9b..764931f649a8 100644 --- a/src/panels/developer-tools/debug/ha-debug-connection-row.ts +++ b/src/panels/developer-tools/debug/ha-debug-connection-row.ts @@ -10,7 +10,7 @@ import { storeState } from "../../../util/ha-pref-storage"; class HaDebugConnectionRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { return html` diff --git a/src/panels/developer-tools/developer-tools-router.ts b/src/panels/developer-tools/developer-tools-router.ts index a205fa810dd1..6fdf6aa01080 100644 --- a/src/panels/developer-tools/developer-tools-router.ts +++ b/src/panels/developer-tools/developer-tools-router.ts @@ -6,7 +6,7 @@ import { HomeAssistant } from "../../types"; class DeveloperToolsRouter extends HassRouterPage { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected routerOptions: RouterOptions = { // defaultPage: "info", diff --git a/src/panels/developer-tools/ha-panel-developer-tools.ts b/src/panels/developer-tools/ha-panel-developer-tools.ts index de7ec5777c11..12fe04725a33 100644 --- a/src/panels/developer-tools/ha-panel-developer-tools.ts +++ b/src/panels/developer-tools/ha-panel-developer-tools.ts @@ -19,7 +19,7 @@ class PanelDeveloperTools extends LitElement { @property() public route!: Route; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected firstUpdated(changedProps) { super.firstUpdated(changedProps); diff --git a/src/panels/developer-tools/template/developer-tools-template.ts b/src/panels/developer-tools/template/developer-tools-template.ts index 734dff2ff461..0f6abb854ef3 100644 --- a/src/panels/developer-tools/template/developer-tools-template.ts +++ b/src/panels/developer-tools/template/developer-tools-template.ts @@ -41,7 +41,7 @@ For loop example getting entity values in the weather domain: class HaPanelDevTemplate extends LitElement { @property() public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _error?: string; diff --git a/src/panels/lovelace/cards/hui-entity-filter-card.ts b/src/panels/lovelace/cards/hui-entity-filter-card.ts index 797d7114a74b..a18026e24fcf 100644 --- a/src/panels/lovelace/cards/hui-entity-filter-card.ts +++ b/src/panels/lovelace/cards/hui-entity-filter-card.ts @@ -42,9 +42,9 @@ export class HuiEntityFilterCard @property({ attribute: false }) public hass?: HomeAssistant; - @property() public isPanel = false; + @property({ type: Boolean }) public isPanel = false; - @property() public editMode = false; + @property({ type: Boolean }) public editMode = false; @state() private _config?: EntityFilterCardConfig; diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts index dafda696dc0e..604797c21915 100644 --- a/src/panels/lovelace/cards/hui-stack-card.ts +++ b/src/panels/lovelace/cards/hui-stack-card.ts @@ -28,7 +28,7 @@ export abstract class HuiStackCard @property({ attribute: false }) public hass?: HomeAssistant; - @property() public editMode?: boolean; + @property({ type: Boolean }) public editMode = false; @property() protected _cards?: LovelaceCard[]; diff --git a/src/panels/lovelace/components/hui-conditional-base.ts b/src/panels/lovelace/components/hui-conditional-base.ts index 3ffa839fdd7e..a66a4a2e3a31 100644 --- a/src/panels/lovelace/components/hui-conditional-base.ts +++ b/src/panels/lovelace/components/hui-conditional-base.ts @@ -31,7 +31,7 @@ function extractMediaQueries( export class HuiConditionalBase extends ReactiveElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public editMode?: boolean; + @property({ type: Boolean }) public editMode = false; @property() protected _config?: ConditionalCardConfig | ConditionalRowConfig; diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts index 2ccca5e5d244..eb367df99e19 100644 --- a/src/panels/lovelace/ha-panel-lovelace.ts +++ b/src/panels/lovelace/ha-panel-lovelace.ts @@ -56,7 +56,7 @@ export class LovelacePanel extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public narrow?: boolean; + @property({ type: Boolean }) public narrow = false; @property() public route?: Route; diff --git a/src/panels/profile/ha-advanced-mode-row.ts b/src/panels/profile/ha-advanced-mode-row.ts index ce0c9ec50fad..3eed30ceed52 100644 --- a/src/panels/profile/ha-advanced-mode-row.ts +++ b/src/panels/profile/ha-advanced-mode-row.ts @@ -13,7 +13,7 @@ import { HomeAssistant } from "../../types"; class AdvancedModeRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() public coreUserData?: CoreFrontendUserData; diff --git a/src/panels/profile/ha-enable-shortcuts-row.ts b/src/panels/profile/ha-enable-shortcuts-row.ts index 429c439c698d..4d2c54d1bfef 100644 --- a/src/panels/profile/ha-enable-shortcuts-row.ts +++ b/src/panels/profile/ha-enable-shortcuts-row.ts @@ -10,7 +10,7 @@ import type { HomeAssistant } from "../../types"; class HaEnableShortcutsRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { return html` diff --git a/src/panels/profile/ha-force-narrow-row.ts b/src/panels/profile/ha-force-narrow-row.ts index 771f49c7d9cb..e42002e9f33b 100644 --- a/src/panels/profile/ha-force-narrow-row.ts +++ b/src/panels/profile/ha-force-narrow-row.ts @@ -10,7 +10,7 @@ import type { HomeAssistant } from "../../types"; class HaForcedNarrowRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { return html` diff --git a/src/panels/profile/ha-pick-dashboard-row.ts b/src/panels/profile/ha-pick-dashboard-row.ts index eebac9fe47e3..a94fb594d8be 100644 --- a/src/panels/profile/ha-pick-dashboard-row.ts +++ b/src/panels/profile/ha-pick-dashboard-row.ts @@ -14,7 +14,7 @@ import { HomeAssistant } from "../../types"; class HaPickDashboardRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _dashboards?: LovelaceDashboard[]; diff --git a/src/panels/profile/ha-pick-date-format-row.ts b/src/panels/profile/ha-pick-date-format-row.ts index ec4e1dae7cb7..500ab75d5736 100644 --- a/src/panels/profile/ha-pick-date-format-row.ts +++ b/src/panels/profile/ha-pick-date-format-row.ts @@ -13,7 +13,7 @@ import { HomeAssistant } from "../../types"; class DateFormatRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { const date = new Date(); diff --git a/src/panels/profile/ha-pick-first-weekday-row.ts b/src/panels/profile/ha-pick-first-weekday-row.ts index 6a615cc43326..aca53ca9d6a9 100644 --- a/src/panels/profile/ha-pick-first-weekday-row.ts +++ b/src/panels/profile/ha-pick-first-weekday-row.ts @@ -12,7 +12,7 @@ import { HomeAssistant } from "../../types"; class FirstWeekdayRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { return html` diff --git a/src/panels/profile/ha-pick-language-row.ts b/src/panels/profile/ha-pick-language-row.ts index 1ee3074b0967..44fc5de54ab0 100644 --- a/src/panels/profile/ha-pick-language-row.ts +++ b/src/panels/profile/ha-pick-language-row.ts @@ -9,7 +9,7 @@ import { HomeAssistant } from "../../types"; export class HaPickLanguageRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render() { return html` diff --git a/src/panels/profile/ha-pick-number-format-row.ts b/src/panels/profile/ha-pick-number-format-row.ts index 6c9a739dd7e7..18f9f140505d 100644 --- a/src/panels/profile/ha-pick-number-format-row.ts +++ b/src/panels/profile/ha-pick-number-format-row.ts @@ -13,7 +13,7 @@ import { HomeAssistant } from "../../types"; class NumberFormatRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { return html` diff --git a/src/panels/profile/ha-pick-time-format-row.ts b/src/panels/profile/ha-pick-time-format-row.ts index b9d24d597f3e..fa4ddcbe9567 100644 --- a/src/panels/profile/ha-pick-time-format-row.ts +++ b/src/panels/profile/ha-pick-time-format-row.ts @@ -13,7 +13,7 @@ import { HomeAssistant } from "../../types"; class TimeFormatRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { const date = new Date(); diff --git a/src/panels/profile/ha-pick-time-zone-row.ts b/src/panels/profile/ha-pick-time-zone-row.ts index c1bd070406c3..06ab7ffa1ea8 100644 --- a/src/panels/profile/ha-pick-time-zone-row.ts +++ b/src/panels/profile/ha-pick-time-zone-row.ts @@ -13,7 +13,7 @@ import { HomeAssistant } from "../../types"; class TimeZoneRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { const date = new Date(); diff --git a/src/panels/profile/ha-push-notifications-row.ts b/src/panels/profile/ha-push-notifications-row.ts index 92b2fc546f4c..a02f02347c4a 100644 --- a/src/panels/profile/ha-push-notifications-row.ts +++ b/src/panels/profile/ha-push-notifications-row.ts @@ -10,7 +10,7 @@ import { HomeAssistant } from "../../types"; class HaPushNotificationsRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { const platformLoaded = isComponentLoaded(this.hass, "notify.html5"); diff --git a/src/panels/profile/ha-set-suspend-row.ts b/src/panels/profile/ha-set-suspend-row.ts index 47a4d7f431ba..332e9fe6d974 100644 --- a/src/panels/profile/ha-set-suspend-row.ts +++ b/src/panels/profile/ha-set-suspend-row.ts @@ -23,7 +23,7 @@ declare global { class HaSetSuspendRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { return html` diff --git a/src/panels/profile/ha-set-vibrate-row.ts b/src/panels/profile/ha-set-vibrate-row.ts index 184b9b096f6b..a55769d4c5a3 100644 --- a/src/panels/profile/ha-set-vibrate-row.ts +++ b/src/panels/profile/ha-set-vibrate-row.ts @@ -11,7 +11,7 @@ import type { HomeAssistant } from "../../types"; class HaSetVibrateRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render(): TemplateResult { return html` From 88abeada44666e9edde84e2b3a021f16dadbb13d Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Tue, 9 Jan 2024 09:06:50 -0500 Subject: [PATCH 109/361] Remove Intl polyfill on connection and consistently resolve time zone (#19326) --- src/common/datetime/format_date.ts | 25 ++++++++++--------- src/common/datetime/format_date_time.ts | 9 ++++--- src/common/datetime/format_time.ts | 9 ++++--- src/common/datetime/localize_date.ts | 1 + src/common/datetime/resolve-time-zone.ts | 15 +++++++++++ src/onboarding/onboarding-core-config.ts | 4 +-- .../calendar/dialog-calendar-event-detail.ts | 7 ++++-- .../calendar/dialog-calendar-event-editor.ts | 12 ++++----- .../config/core/ha-config-section-general.ts | 5 +--- src/panels/profile/ha-pick-time-zone-row.ts | 8 +++--- src/panels/todo/dialog-todo-item-editor.ts | 10 ++++---- src/state/connection-mixin.ts | 12 +-------- 12 files changed, 63 insertions(+), 54 deletions(-) create mode 100644 src/common/datetime/resolve-time-zone.ts diff --git a/src/common/datetime/format_date.ts b/src/common/datetime/format_date.ts index 5f94177db045..2369eb46b608 100644 --- a/src/common/datetime/format_date.ts +++ b/src/common/datetime/format_date.ts @@ -1,7 +1,8 @@ import { HassConfig } from "home-assistant-js-websocket"; import memoizeOne from "memoize-one"; -import { FrontendLocaleData, DateFormat } from "../../data/translation"; +import { DateFormat, FrontendLocaleData } from "../../data/translation"; import "../../resources/intl-polyfill"; +import { resolveTimeZone } from "./resolve-time-zone"; // Tuesday, August 10 export const formatDateWeekdayDay = ( @@ -16,7 +17,7 @@ const formatDateWeekdayDayMem = memoizeOne( weekday: "long", month: "long", day: "numeric", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -33,7 +34,7 @@ const formatDateMem = memoizeOne( year: "numeric", month: "long", day: "numeric", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -50,7 +51,7 @@ const formatDateShortMem = memoizeOne( year: "numeric", month: "short", day: "numeric", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -105,7 +106,7 @@ const formatDateNumericMem = memoizeOne( year: "numeric", month: "numeric", day: "numeric", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }); } @@ -113,7 +114,7 @@ const formatDateNumericMem = memoizeOne( year: "numeric", month: "numeric", day: "numeric", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }); } ); @@ -130,7 +131,7 @@ const formatDateVeryShortMem = memoizeOne( new Intl.DateTimeFormat(locale.language, { day: "numeric", month: "short", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -146,7 +147,7 @@ const formatDateMonthYearMem = memoizeOne( new Intl.DateTimeFormat(locale.language, { month: "long", year: "numeric", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -161,7 +162,7 @@ const formatDateMonthMem = memoizeOne( (locale: FrontendLocaleData, serverTimeZone: string) => new Intl.DateTimeFormat(locale.language, { month: "long", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -176,7 +177,7 @@ const formatDateYearMem = memoizeOne( (locale: FrontendLocaleData, serverTimeZone: string) => new Intl.DateTimeFormat(locale.language, { year: "numeric", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -191,7 +192,7 @@ const formatDateWeekdayMem = memoizeOne( (locale: FrontendLocaleData, serverTimeZone: string) => new Intl.DateTimeFormat(locale.language, { weekday: "long", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -206,6 +207,6 @@ const formatDateWeekdayShortMem = memoizeOne( (locale: FrontendLocaleData, serverTimeZone: string) => new Intl.DateTimeFormat(locale.language, { weekday: "short", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); diff --git a/src/common/datetime/format_date_time.ts b/src/common/datetime/format_date_time.ts index 52700b4a2344..76a32e1accc1 100644 --- a/src/common/datetime/format_date_time.ts +++ b/src/common/datetime/format_date_time.ts @@ -4,6 +4,7 @@ import { FrontendLocaleData } from "../../data/translation"; import "../../resources/intl-polyfill"; import { formatDateNumeric } from "./format_date"; import { formatTime } from "./format_time"; +import { resolveTimeZone } from "./resolve-time-zone"; import { useAmPm } from "./use_am_pm"; // August 9, 2021, 8:23 AM @@ -22,7 +23,7 @@ const formatDateTimeMem = memoizeOne( hour: useAmPm(locale) ? "numeric" : "2-digit", minute: "2-digit", hourCycle: useAmPm(locale) ? "h12" : "h23", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -42,7 +43,7 @@ const formatShortDateTimeWithYearMem = memoizeOne( hour: useAmPm(locale) ? "numeric" : "2-digit", minute: "2-digit", hourCycle: useAmPm(locale) ? "h12" : "h23", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -61,7 +62,7 @@ const formatShortDateTimeMem = memoizeOne( hour: useAmPm(locale) ? "numeric" : "2-digit", minute: "2-digit", hourCycle: useAmPm(locale) ? "h12" : "h23", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -82,7 +83,7 @@ const formatDateTimeWithSecondsMem = memoizeOne( minute: "2-digit", second: "2-digit", hourCycle: useAmPm(locale) ? "h12" : "h23", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); diff --git a/src/common/datetime/format_time.ts b/src/common/datetime/format_time.ts index 948eb553fea4..ed3e6b603d29 100644 --- a/src/common/datetime/format_time.ts +++ b/src/common/datetime/format_time.ts @@ -2,6 +2,7 @@ import { HassConfig } from "home-assistant-js-websocket"; import memoizeOne from "memoize-one"; import { FrontendLocaleData } from "../../data/translation"; import "../../resources/intl-polyfill"; +import { resolveTimeZone } from "./resolve-time-zone"; import { useAmPm } from "./use_am_pm"; // 9:15 PM || 21:15 @@ -17,7 +18,7 @@ const formatTimeMem = memoizeOne( hour: "numeric", minute: "2-digit", hourCycle: useAmPm(locale) ? "h12" : "h23", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -35,7 +36,7 @@ const formatTimeWithSecondsMem = memoizeOne( minute: "2-digit", second: "2-digit", hourCycle: useAmPm(locale) ? "h12" : "h23", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -53,7 +54,7 @@ const formatTimeWeekdayMem = memoizeOne( hour: useAmPm(locale) ? "numeric" : "2-digit", minute: "2-digit", hourCycle: useAmPm(locale) ? "h12" : "h23", - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); @@ -71,6 +72,6 @@ const formatTime24hMem = memoizeOne( hour: "numeric", minute: "2-digit", hour12: false, - timeZone: locale.time_zone === "server" ? serverTimeZone : undefined, + timeZone: resolveTimeZone(locale.time_zone, serverTimeZone), }) ); diff --git a/src/common/datetime/localize_date.ts b/src/common/datetime/localize_date.ts index 428261801d58..9fa851d7c293 100644 --- a/src/common/datetime/localize_date.ts +++ b/src/common/datetime/localize_date.ts @@ -1,4 +1,5 @@ import memoizeOne from "memoize-one"; +import "../../resources/intl-polyfill"; export const localizeWeekdays = memoizeOne( (language: string, short: boolean): string[] => { diff --git a/src/common/datetime/resolve-time-zone.ts b/src/common/datetime/resolve-time-zone.ts new file mode 100644 index 000000000000..d085edac6abc --- /dev/null +++ b/src/common/datetime/resolve-time-zone.ts @@ -0,0 +1,15 @@ +import { TimeZone } from "../../data/translation"; + +// Browser time zone can be determined from Intl, with fallback to UTC for polyfill or no support. +// Alternatively, we could fallback to a fixed offset IANA zone (e.g. "Etc/GMT+5") using +// Date.prototype.getTimeOffset(), but IANA only has whole hour Etc zones, and problems +// might occur with relative time due to DST. +// Use optional chain instead of polyfill import since polyfill will always return UTC +export const LOCAL_TIME_ZONE = + Intl.DateTimeFormat?.().resolvedOptions?.().timeZone ?? "UTC"; + +// Pick time zone based on user profile option. Core zone is used when local cannot be determined. +export const resolveTimeZone = (option: TimeZone, serverTimeZone: string) => + option === TimeZone.local && LOCAL_TIME_ZONE !== "UTC" + ? LOCAL_TIME_ZONE + : serverTimeZone; diff --git a/src/onboarding/onboarding-core-config.ts b/src/onboarding/onboarding-core-config.ts index 61cdad8d01e0..73debff9cb40 100644 --- a/src/onboarding/onboarding-core-config.ts +++ b/src/onboarding/onboarding-core-config.ts @@ -9,6 +9,7 @@ import { TemplateResult, } from "lit"; import { customElement, property, state } from "lit/decorators"; +import { LOCAL_TIME_ZONE } from "../common/datetime/resolve-time-zone"; import { fireEvent } from "../common/dom/fire_event"; import type { LocalizeFunc } from "../common/translations/localize"; import "../components/ha-alert"; @@ -33,8 +34,7 @@ class OnboardingCoreConfig extends LitElement { private _elevation = "0"; - private _timeZone: ConfigUpdateValues["time_zone"] = - Intl.DateTimeFormat?.().resolvedOptions?.().timeZone; + private _timeZone: ConfigUpdateValues["time_zone"] = LOCAL_TIME_ZONE; private _language: ConfigUpdateValues["language"] = getLocalLanguage(); diff --git a/src/panels/calendar/dialog-calendar-event-detail.ts b/src/panels/calendar/dialog-calendar-event-detail.ts index 5962aa83f147..fc07fea31f34 100644 --- a/src/panels/calendar/dialog-calendar-event-detail.ts +++ b/src/panels/calendar/dialog-calendar-event-detail.ts @@ -25,6 +25,7 @@ import { renderRRuleAsText } from "./recurrence"; import { showConfirmEventDialog } from "./show-confirm-event-dialog-box"; import { CalendarEventDetailDialogParams } from "./show-dialog-calendar-event-detail"; import { showCalendarEventEditDialog } from "./show-dialog-calendar-event-editor"; +import { resolveTimeZone } from "../../common/datetime/resolve-time-zone"; class DialogCalendarEventDetail extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -138,8 +139,10 @@ class DialogCalendarEventDetail extends LitElement { } private _formatDateRange() { - // Parse a dates in the browser timezone - const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; + const timeZone = resolveTimeZone( + this.hass.locale.time_zone, + this.hass.config.time_zone + ); const start = toDate(this._data!.dtstart, { timeZone: timeZone }); const endValue = toDate(this._data!.dtend, { timeZone: timeZone }); // All day events should be displayed as a day earlier diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts index e1db40da695d..377f4ef65f57 100644 --- a/src/panels/calendar/dialog-calendar-event-editor.ts +++ b/src/panels/calendar/dialog-calendar-event-editor.ts @@ -11,6 +11,7 @@ import { HassEntity } from "home-assistant-js-websocket"; import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; +import { resolveTimeZone } from "../../common/datetime/resolve-time-zone"; import { fireEvent } from "../../common/dom/fire_event"; import { computeStateDomain } from "../../common/entity/compute_state_domain"; import { supportsFeature } from "../../common/entity/supports-feature"; @@ -32,7 +33,6 @@ import { deleteCalendarEvent, updateCalendarEvent, } from "../../data/calendar"; -import { TimeZone } from "../../data/translation"; import { haStyleDialog } from "../../resources/styles"; import { HomeAssistant } from "../../types"; import "../lovelace/components/hui-generic-entity-row"; @@ -68,7 +68,7 @@ class DialogCalendarEventEditor extends LitElement { @state() private _submitting = false; - // Dates are manipulated and displayed in the browser timezone + // Dates are displayed in the timezone according to the user's profile // which may be different from the Home Assistant timezone. When // events are persisted, they are relative to the Home Assistant // timezone, but floating without a timezone. @@ -85,10 +85,10 @@ class DialogCalendarEventEditor extends LitElement { computeStateDomain(stateObj) === "calendar" && supportsFeature(stateObj, CalendarEntityFeature.CREATE_EVENT) )?.entity_id; - this._timeZone = - this.hass.locale.time_zone === TimeZone.local - ? Intl.DateTimeFormat().resolvedOptions().timeZone - : this.hass.config.time_zone; + this._timeZone = resolveTimeZone( + this.hass.locale.time_zone, + this.hass.config.time_zone + ); if (params.entry) { const entry = params.entry!; this._allDay = isDate(entry.dtstart); diff --git a/src/panels/config/core/ha-config-section-general.ts b/src/panels/config/core/ha-config-section-general.ts index 22df34f25cfb..eb6681a26ac3 100644 --- a/src/panels/config/core/ha-config-section-general.ts +++ b/src/panels/config/core/ha-config-section-general.ts @@ -294,10 +294,7 @@ class HaConfigSectionGeneral extends LitElement { this._country = this.hass.config.country; this._language = this.hass.config.language; this._elevation = this.hass.config.elevation; - this._timeZone = - this.hass.config.time_zone || - Intl.DateTimeFormat?.().resolvedOptions?.().timeZone || - "Etc/GMT"; + this._timeZone = this.hass.config.time_zone || "Etc/GMT"; this._name = this.hass.config.location_name; this._updateUnits = true; } diff --git a/src/panels/profile/ha-pick-time-zone-row.ts b/src/panels/profile/ha-pick-time-zone-row.ts index 06ab7ffa1ea8..ef732bec1a6b 100644 --- a/src/panels/profile/ha-pick-time-zone-row.ts +++ b/src/panels/profile/ha-pick-time-zone-row.ts @@ -2,6 +2,7 @@ import "@material/mwc-list/mwc-list-item"; import { html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { formatDateTimeNumeric } from "../../common/datetime/format_date_time"; +import { resolveTimeZone } from "../../common/datetime/resolve-time-zone"; import { fireEvent } from "../../common/dom/fire_event"; import "../../components/ha-card"; import "../../components/ha-select"; @@ -48,10 +49,9 @@ class TimeZoneRow extends LitElement { >${this.hass.localize( `ui.panel.profile.time_zone.options.${format}`, { - timezone: (format === "server" - ? this.hass.config.time_zone - : Intl.DateTimeFormat?.().resolvedOptions?.().timeZone || - "" + timezone: resolveTimeZone( + format, + this.hass.config.time_zone ).replace("_", " "), } )}>( } this._updateHass({ areas }); }); - subscribeConfig(conn, (config) => { - if (this.hass?.config?.time_zone !== config.time_zone) { - import("../resources/intl-polyfill").then(() => { - if ("__setDefaultTimeZone" in Intl.DateTimeFormat) { - // @ts-ignore - Intl.DateTimeFormat.__setDefaultTimeZone(config.time_zone); - } - }); - } - this._updateHass({ config }); - }); + subscribeConfig(conn, (config) => this._updateHass({ config })); subscribeServices(conn, (services) => this._updateHass({ services })); subscribePanels(conn, (panels) => this._updateHass({ panels })); subscribeFrontendUserData(conn, "core", (userData) => From e8c1a34f3bb14ed09075dde2585bf40bcda9614d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 15:20:51 +0100 Subject: [PATCH 110/361] Update typescript-eslint monorepo to v6.18.0 (#19341) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index dc36dcc68d9b..d9f58c9e1bbc 100644 --- a/package.json +++ b/package.json @@ -183,8 +183,8 @@ "@types/tar": "6.1.10", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", - "@typescript-eslint/eslint-plugin": "6.17.0", - "@typescript-eslint/parser": "6.17.0", + "@typescript-eslint/eslint-plugin": "6.18.0", + "@typescript-eslint/parser": "6.18.0", "@web/dev-server": "0.1.38", "@web/dev-server-rollup": "0.4.1", "babel-loader": "9.1.3", diff --git a/yarn.lock b/yarn.lock index b008f90c71f4..4bf267a7a978 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4525,15 +4525,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.17.0": - version: 6.17.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.17.0" +"@typescript-eslint/eslint-plugin@npm:6.18.0": + version: 6.18.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.18.0" dependencies: "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:6.17.0" - "@typescript-eslint/type-utils": "npm:6.17.0" - "@typescript-eslint/utils": "npm:6.17.0" - "@typescript-eslint/visitor-keys": "npm:6.17.0" + "@typescript-eslint/scope-manager": "npm:6.18.0" + "@typescript-eslint/type-utils": "npm:6.18.0" + "@typescript-eslint/utils": "npm:6.18.0" + "@typescript-eslint/visitor-keys": "npm:6.18.0" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" ignore: "npm:^5.2.4" @@ -4546,44 +4546,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: f2a5774e9cc03e491a5a488501e5622c7eebd766f5a4fc2c30642864a3b89b0807946bde33a678f326ba7032f3f6a51aa0bf9c2d10adc823804fc9fb47db55a6 + checksum: 7810a84f6d9cb735f6848aa4a7ef64c77740812afc0248fda63ec182910a1d045cd9a32d8e49b0e5323266db6da12a2fe50171147927b3186815a56f12c16ee7 languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.17.0": - version: 6.17.0 - resolution: "@typescript-eslint/parser@npm:6.17.0" +"@typescript-eslint/parser@npm:6.18.0": + version: 6.18.0 + resolution: "@typescript-eslint/parser@npm:6.18.0" dependencies: - "@typescript-eslint/scope-manager": "npm:6.17.0" - "@typescript-eslint/types": "npm:6.17.0" - "@typescript-eslint/typescript-estree": "npm:6.17.0" - "@typescript-eslint/visitor-keys": "npm:6.17.0" + "@typescript-eslint/scope-manager": "npm:6.18.0" + "@typescript-eslint/types": "npm:6.18.0" + "@typescript-eslint/typescript-estree": "npm:6.18.0" + "@typescript-eslint/visitor-keys": "npm:6.18.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 2ed0ed4a5b30e953430ce3279df3655af09fa1caed2abf11804d239717daefc32a22864f6620ef57bb9c684c74a99a13241384fea5096e961385e3678fc2e920 + checksum: 6798332819f839454a8405e31cfaa0fe908d5966be929bef55e78ac51a0ff3868feb42b38e7772cedf88277f6b2841b3d91f6c573eacb945e2741ecae94047c7 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.17.0": - version: 6.17.0 - resolution: "@typescript-eslint/scope-manager@npm:6.17.0" +"@typescript-eslint/scope-manager@npm:6.18.0": + version: 6.18.0 + resolution: "@typescript-eslint/scope-manager@npm:6.18.0" dependencies: - "@typescript-eslint/types": "npm:6.17.0" - "@typescript-eslint/visitor-keys": "npm:6.17.0" - checksum: fe09c628553c9336e6a36d32c1d34e78ebd20aa02130a6bf535329621ba5a98aaac171f607bc6e4d17b3478c42e7de6476376636897ce3f227c754eb99acd07e + "@typescript-eslint/types": "npm:6.18.0" + "@typescript-eslint/visitor-keys": "npm:6.18.0" + checksum: c2c465e6803f78d3300142167a8a79dd2613c64cf464a40a9cf6b13a2c10c3d82ca30bb9c2d26aba7f054b8740b38e1d25f377fcdf917aba489d5b5ea2550858 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.17.0": - version: 6.17.0 - resolution: "@typescript-eslint/type-utils@npm:6.17.0" +"@typescript-eslint/type-utils@npm:6.18.0": + version: 6.18.0 + resolution: "@typescript-eslint/type-utils@npm:6.18.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:6.17.0" - "@typescript-eslint/utils": "npm:6.17.0" + "@typescript-eslint/typescript-estree": "npm:6.18.0" + "@typescript-eslint/utils": "npm:6.18.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.0.1" peerDependencies: @@ -4591,23 +4591,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: dc7938429193acfda61b7282197ec046039e2c4da41cdcddf4daaf300d10229e4e23bb0fcf0503b19c0b99a874849c8a9f5bb35ce106260f56a14106d2b41d8c + checksum: 9f4a392fe7b7f6b1fb02acbdaa331e764775f6404c29ca66774419e39552523d878227020526ca9c438d997555a99600f8d711496e9a435fb14a779e25ed094e languageName: node linkType: hard -"@typescript-eslint/types@npm:6.17.0": - version: 6.17.0 - resolution: "@typescript-eslint/types@npm:6.17.0" - checksum: 87ab1b5a3270ab34b917c22a2fb90a9ad7d9f3b19d73a337bc9efbe65f924da13482c97e8ccbe3bd3d081aa96039eeff50de41c1da2a2128066429b931cdb21d +"@typescript-eslint/types@npm:6.18.0": + version: 6.18.0 + resolution: "@typescript-eslint/types@npm:6.18.0" + checksum: fc507ca7a1bfec04467087165ff6722f7b9aa9a089ecf0c17656824a951b92ca014766e480122de850057c63a3066628985eb0681c5bbb80ab41d94e7bb52288 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.17.0": - version: 6.17.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.17.0" +"@typescript-eslint/typescript-estree@npm:6.18.0": + version: 6.18.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.18.0" dependencies: - "@typescript-eslint/types": "npm:6.17.0" - "@typescript-eslint/visitor-keys": "npm:6.17.0" + "@typescript-eslint/types": "npm:6.18.0" + "@typescript-eslint/visitor-keys": "npm:6.18.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -4617,34 +4617,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 1671b0d2f2fdf07074fb1e2524d61935cec173bd8db6e482cc5b2dcc77aed3ffa831396736ffa0ee2fdbddd8585ae9ca8d6c97bcaea1385b23907a1ec0508f83 + checksum: b65392e944baba97ed98e99a1e7122b7b05fa0d9a082b48d0190b377ae9e2ae4ed72d505a2f0f05f2ca78908f0e4b0f1acd44d345c7f4f4415fcec6bb2c57791 languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.17.0": - version: 6.17.0 - resolution: "@typescript-eslint/utils@npm:6.17.0" +"@typescript-eslint/utils@npm:6.18.0": + version: 6.18.0 + resolution: "@typescript-eslint/utils@npm:6.18.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" "@types/json-schema": "npm:^7.0.12" "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:6.17.0" - "@typescript-eslint/types": "npm:6.17.0" - "@typescript-eslint/typescript-estree": "npm:6.17.0" + "@typescript-eslint/scope-manager": "npm:6.18.0" + "@typescript-eslint/types": "npm:6.18.0" + "@typescript-eslint/typescript-estree": "npm:6.18.0" semver: "npm:^7.5.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 37c63afcf66124bf84808699997953b8c84a378aa2c490a771b611d82cdac8499c58fac8eeb8378528e97660b59563d99297bfec4b982cd68760b0ffe54aa714 + checksum: f91798069e337ed42b7e415aabded833d540dab9adf66ae88183003428892584946f20a5496aae2dc65fc0f65b66496baed785a3470ee782b6e2dd25b9200c6c languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.17.0": - version: 6.17.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.17.0" +"@typescript-eslint/visitor-keys@npm:6.18.0": + version: 6.18.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.18.0" dependencies: - "@typescript-eslint/types": "npm:6.17.0" + "@typescript-eslint/types": "npm:6.18.0" eslint-visitor-keys: "npm:^3.4.1" - checksum: a2aed0e1437fdab8858ab9c7c8e355f8b72a5fa4b0adc54f28b8a2bbc29d4bb93214968ee940f83d013d0a4b83d00cd4eeeb05fb4c2c7d0ead324c6793f7d6d4 + checksum: bf34a357549d515607c761f385b7c7c82aaa07795cada0be2e1e3860c5103fbf731408ac07eaeb0517b51426d77ef9b194dfb94f205c776107a46e0d0027b452 languageName: node linkType: hard @@ -9571,8 +9571,8 @@ __metadata: "@types/tar": "npm:6.1.10" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" - "@typescript-eslint/eslint-plugin": "npm:6.17.0" - "@typescript-eslint/parser": "npm:6.17.0" + "@typescript-eslint/eslint-plugin": "npm:6.18.0" + "@typescript-eslint/parser": "npm:6.18.0" "@vaadin/combo-box": "npm:24.3.2" "@vaadin/vaadin-themable-mixin": "npm:24.3.2" "@vibrant/color": "npm:3.2.1-alpha.1" From a5630a4a7d118950b2f44de331a463610e0f7b71 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Tue, 9 Jan 2024 16:15:33 +0100 Subject: [PATCH 111/361] Use switch for valve in entity row (#19342) --- src/components/entity/ha-entity-toggle.ts | 3 ++ .../entity-rows/hui-valve-entity-row.ts | 48 ++++++++++--------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/components/entity/ha-entity-toggle.ts b/src/components/entity/ha-entity-toggle.ts index ba1da0e6a9c4..21530a8a4cfc 100644 --- a/src/components/entity/ha-entity-toggle.ts +++ b/src/components/entity/ha-entity-toggle.ts @@ -129,6 +129,9 @@ export class HaEntityToggle extends LitElement { } else if (stateDomain === "cover") { serviceDomain = "cover"; service = turnOn ? "open_cover" : "close_cover"; + } else if (stateDomain === "valve") { + serviceDomain = "valve"; + service = turnOn ? "open_valve" : "close_valve"; } else if (stateDomain === "group") { serviceDomain = "homeassistant"; service = turnOn ? "turn_on" : "turn_off"; diff --git a/src/panels/lovelace/entity-rows/hui-valve-entity-row.ts b/src/panels/lovelace/entity-rows/hui-valve-entity-row.ts index 1d836e2ddb45..16e770b30c4e 100644 --- a/src/panels/lovelace/entity-rows/hui-valve-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-valve-entity-row.ts @@ -1,14 +1,7 @@ -import { - css, - CSSResultGroup, - html, - LitElement, - PropertyValues, - nothing, -} from "lit"; +import { LitElement, PropertyValues, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import "../../../components/ha-valve-controls"; -import { ValveEntity } from "../../../data/valve"; +import { isUnavailableState } from "../../../data/entity"; import { HomeAssistant } from "../../../types"; import { hasConfigOrEntityChanged } from "../common/has-changed"; import "../components/hui-generic-entity-row"; @@ -37,7 +30,7 @@ class HuiValveEntityRow extends LitElement implements LovelaceRow { return nothing; } - const stateObj = this.hass.states[this._config.entity] as ValveEntity; + const stateObj = this.hass.states[this._config.entity]; if (!stateObj) { return html` @@ -47,23 +40,32 @@ class HuiValveEntityRow extends LitElement implements LovelaceRow { `; } + const showToggle = + stateObj.state === "open" || + stateObj.state === "closed" || + isUnavailableState(stateObj.state); + return html` - - + + ${showToggle + ? html` + + ` + : html` +
+ ${this.hass.formatEntityState(stateObj)} +
+ `} `; } - - static get styles(): CSSResultGroup { - return css` - ha-valve-controls { - margin-right: -0.57em; - } - `; - } } declare global { From 6ab5116c34954dd7180c71658c345febdb27fd3c Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Wed, 10 Jan 2024 04:49:35 -0500 Subject: [PATCH 112/361] Fix incompatible number property types (#19349) --- src/components/chart/state-history-charts.ts | 2 +- src/components/ha-big-number.ts | 5 ++--- src/components/ha-labeled-slider.ts | 8 ++++---- src/components/ha-selector/ha-selector-boolean.ts | 2 +- src/components/ha-selector/ha-selector-number.ts | 4 ++-- src/state-summary/state-card-timer.ts | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/components/chart/state-history-charts.ts b/src/components/chart/state-history-charts.ts index 8c5736205477..dd68187f3007 100644 --- a/src/components/chart/state-history-charts.ts +++ b/src/components/chart/state-history-charts.ts @@ -65,7 +65,7 @@ export class StateHistoryCharts extends LitElement { @property({ type: Boolean, attribute: "up-to-now" }) public upToNow = false; - @property() public hoursToShow?: number; + @property({ type: Number }) public hoursToShow?: number; @property({ type: Boolean }) public showNames = true; diff --git a/src/components/ha-big-number.ts b/src/components/ha-big-number.ts index 85a7783c87c1..48abfe232709 100644 --- a/src/components/ha-big-number.ts +++ b/src/components/ha-big-number.ts @@ -7,15 +7,14 @@ import { HomeAssistant } from "../types"; @customElement("ha-big-number") export class HaBigNumber extends LitElement { - @property() public value!: number; + @property({ type: Number }) public value!: number; @property() public unit?: string; @property({ attribute: "unit-position" }) public unitPosition: "top" | "bottom" = "top"; - @property({ attribute: false }) - public hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; @property({ attribute: false }) public formatOptions: Intl.NumberFormatOptions = {}; diff --git a/src/components/ha-labeled-slider.ts b/src/components/ha-labeled-slider.ts index 9bbf0e95371d..1c507a0c668d 100644 --- a/src/components/ha-labeled-slider.ts +++ b/src/components/ha-labeled-slider.ts @@ -14,11 +14,11 @@ class HaLabeledSlider extends LitElement { @property({ type: Boolean }) public required = true; - @property() public min: number = 0; + @property({ type: Number }) public min = 0; - @property() public max: number = 100; + @property({ type: Number }) public max = 100; - @property() public step: number = 1; + @property({ type: Number }) public step = 1; @property() public helper?: string; @@ -26,7 +26,7 @@ class HaLabeledSlider extends LitElement { @property() public icon?: string; - @property() public value?: number; + @property({ type: Number }) public value?: number; protected render() { return html` diff --git a/src/components/ha-selector/ha-selector-boolean.ts b/src/components/ha-selector/ha-selector-boolean.ts index d99f980d8bd1..0d94d6de7b22 100644 --- a/src/components/ha-selector/ha-selector-boolean.ts +++ b/src/components/ha-selector/ha-selector-boolean.ts @@ -10,7 +10,7 @@ import "../ha-input-helper-text"; export class HaBooleanSelector extends LitElement { @property() public hass!: HomeAssistant; - @property() public value?: number; + @property({ type: Boolean }) public value = false; @property() public label?: string; diff --git a/src/components/ha-selector/ha-selector-number.ts b/src/components/ha-selector/ha-selector-number.ts index 1d4d2b98d4d5..672e9f8a5270 100644 --- a/src/components/ha-selector/ha-selector-number.ts +++ b/src/components/ha-selector/ha-selector-number.ts @@ -14,9 +14,9 @@ export class HaNumberSelector extends LitElement { @property() public selector!: NumberSelector; - @property() public value?: number; + @property({ type: Number }) public value?: number; - @property() public placeholder?: number; + @property({ type: Number }) public placeholder?: number; @property() public label?: string; diff --git a/src/state-summary/state-card-timer.ts b/src/state-summary/state-card-timer.ts index 2279d20cd868..d746ba860cab 100644 --- a/src/state-summary/state-card-timer.ts +++ b/src/state-summary/state-card-timer.ts @@ -21,7 +21,7 @@ class StateCardTimer extends LitElement { @property({ type: Boolean }) public inDialog = false; - @property() public timeRemaining?: number; + @property({ type: Number }) public timeRemaining?: number; private _updateRemaining: any; From adb851a2b487d4230d856d5c3e490d5b45a4f2ca Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Wed, 10 Jan 2024 04:53:03 -0500 Subject: [PATCH 113/361] Fix unclosed HTML tags (#19343) * Fix unclosed HTML tags * Add missing import and remove unused class for debug tools * Remove div from debug page --- src/components/ha-label.ts | 10 ++--- .../mqtt/dialog-mqtt-device-debug-info.ts | 4 +- .../assist/developer-tools-assist.ts | 2 +- .../debug/developer-tools-debug.ts | 37 +++++++++---------- tsconfig.json | 1 - 5 files changed, 25 insertions(+), 29 deletions(-) diff --git a/src/components/ha-label.ts b/src/components/ha-label.ts index ffb4d0612649..dd0ed75d44a6 100644 --- a/src/components/ha-label.ts +++ b/src/components/ha-label.ts @@ -5,11 +5,11 @@ import { customElement } from "lit/decorators"; class HaLabel extends LitElement { protected render(): TemplateResult { return html` - - - -
- `; + + + + + `; } static get styles(): CSSResultGroup { diff --git a/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts b/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts index 790df95b6778..3600514238dd 100644 --- a/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts +++ b/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts @@ -181,7 +181,7 @@ class DialogMQTTDeviceDebugInfo extends LitElement { { n: topic.messages.length } )} > - + ` )} @@ -204,7 +204,7 @@ class DialogMQTTDeviceDebugInfo extends LitElement { { n: topic.messages.length } )} > - + ` )} diff --git a/src/panels/developer-tools/assist/developer-tools-assist.ts b/src/panels/developer-tools/assist/developer-tools-assist.ts index 7c3bdb35068a..de7e22c36b6b 100644 --- a/src/panels/developer-tools/assist/developer-tools-assist.ts +++ b/src/panels/developer-tools/assist/developer-tools-assist.ts @@ -165,7 +165,7 @@ class HaPanelDevAssist extends SubscribeMixin(LitElement) { ${this.hass.localize( "ui.panel.developer-tools.tabs.assist.download_results" )} - +
` : ""} diff --git a/src/panels/developer-tools/debug/developer-tools-debug.ts b/src/panels/developer-tools/debug/developer-tools-debug.ts index 6a5aa730cd9d..3d06c4d065db 100644 --- a/src/panels/developer-tools/debug/developer-tools-debug.ts +++ b/src/panels/developer-tools/debug/developer-tools-debug.ts @@ -1,5 +1,6 @@ -import { CSSResultGroup, LitElement, css, html } from "lit"; +import { LitElement, css, html } from "lit"; import { customElement, property } from "lit/decorators"; +import "../../../components/ha-card"; import { SubscribeMixin } from "../../../mixins/subscribe-mixin"; import { haStyle } from "../../../resources/styles"; import { HomeAssistant } from "../../../types"; @@ -18,31 +19,27 @@ class HaPanelDevDebug extends SubscribeMixin(LitElement) { .header=${this.hass.localize( "ui.panel.developer-tools.tabs.debug.title" )} - class="form" > -
- +
`; } - static get styles(): CSSResultGroup { - return [ - haStyle, - css` - .content { - padding: 28px 20px 16px; - display: block; - max-width: 600px; - margin: 0 auto; - } - `, - ]; - } + static styles = [ + haStyle, + css` + .content { + padding: 28px 20px 16px; + display: block; + max-width: 600px; + margin: 0 auto; + } + `, + ]; } declare global { diff --git a/tsconfig.json b/tsconfig.json index 3c9fb36ebc15..f54276cf0be9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -28,7 +28,6 @@ "strict": true, "rules": { // Custom elements - "no-unclosed-tag": "warning", "no-missing-element-type-definition": "error", // Binding names "no-legacy-attribute": "error", From 877c9b007b1324166f81256005c07b4f91445937 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 07:33:15 -0500 Subject: [PATCH 114/361] Update dependency open to v10.0.3 (#19351) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d9f58c9e1bbc..89c6a5a839a1 100644 --- a/package.json +++ b/package.json @@ -222,7 +222,7 @@ "map-stream": "0.0.7", "mocha": "10.2.0", "object-hash": "3.0.0", - "open": "10.0.2", + "open": "10.0.3", "pinst": "3.0.0", "prettier": "3.1.1", "rollup": "2.79.1", diff --git a/yarn.lock b/yarn.lock index 4bf267a7a978..9f7aea707a17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9642,7 +9642,7 @@ __metadata: mocha: "npm:10.2.0" node-vibrant: "npm:3.2.1-alpha.1" object-hash: "npm:3.0.0" - open: "npm:10.0.2" + open: "npm:10.0.3" pinst: "npm:3.0.0" prettier: "npm:3.1.1" proxy-polyfill: "npm:0.3.2" @@ -12483,15 +12483,15 @@ __metadata: languageName: node linkType: hard -"open@npm:10.0.2": - version: 10.0.2 - resolution: "open@npm:10.0.2" +"open@npm:10.0.3": + version: 10.0.3 + resolution: "open@npm:10.0.3" dependencies: default-browser: "npm:^5.2.1" define-lazy-prop: "npm:^3.0.0" is-inside-container: "npm:^1.0.0" is-wsl: "npm:^3.1.0" - checksum: 6f7f9e08204af00930f2998690293df1a919a61c98b225ff9e3aa09a765254b8a98bec101644ffe991452c6aabea0c6f9e49670b559d48a44bfc5238f6b58351 + checksum: 4dc757ad1d3d63490822f991e9cbe3a7c05b7249fca2eaa571cb7d191e5cec88bc37e15d8ef4fd740d8989a288b661d8da253caa8d98e8c97430ddbbb0ae4ed1 languageName: node linkType: hard From 85beefec4c241833562930bdb3476eaf08177c19 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 10 Jan 2024 13:50:07 +0100 Subject: [PATCH 115/361] Fix logs, dont require advanced mode, allow provider in url and my (#19355) * Fix logs, dont require advanced mode, allow provider in url and my * Add params to my link with quick key `m` --- src/common/url/search-params.ts | 10 +++-- src/layouts/hass-subpage.ts | 1 - src/panels/config/logs/ha-config-logs.ts | 49 +++++++++++++++++++----- src/panels/my/ha-panel-my.ts | 3 ++ src/state/quick-bar-mixin.ts | 9 +++++ src/translations/en.json | 4 +- 6 files changed, 60 insertions(+), 16 deletions(-) diff --git a/src/common/url/search-params.ts b/src/common/url/search-params.ts index f4ebb347e8ea..a7bd025842a0 100644 --- a/src/common/url/search-params.ts +++ b/src/common/url/search-params.ts @@ -1,6 +1,8 @@ +import { mainWindow } from "../dom/get_main_window"; + export const extractSearchParamsObject = (): Record => { const query = {}; - const searchParams = new URLSearchParams(location.search); + const searchParams = new URLSearchParams(mainWindow.location.search); for (const [key, value] of searchParams.entries()) { query[key] = value; } @@ -8,7 +10,7 @@ export const extractSearchParamsObject = (): Record => { }; export const extractSearchParam = (param: string): string | null => { - const urlParams = new URLSearchParams(window.location.search); + const urlParams = new URLSearchParams(mainWindow.location.search); return urlParams.get(param); }; @@ -21,7 +23,7 @@ export const createSearchParam = (params: Record): string => { }; export const addSearchParam = (params: Record): string => { - const urlParams = new URLSearchParams(window.location.search); + const urlParams = new URLSearchParams(mainWindow.location.search); Object.entries(params).forEach(([key, value]) => { urlParams.set(key, value); }); @@ -29,7 +31,7 @@ export const addSearchParam = (params: Record): string => { }; export const removeSearchParam = (param: string): string => { - const urlParams = new URLSearchParams(window.location.search); + const urlParams = new URLSearchParams(mainWindow.location.search); urlParams.delete(param); return urlParams.toString(); }; diff --git a/src/layouts/hass-subpage.ts b/src/layouts/hass-subpage.ts index c0763b5790be..18483e218262 100644 --- a/src/layouts/hass-subpage.ts +++ b/src/layouts/hass-subpage.ts @@ -119,7 +119,6 @@ class HassSubpage extends LitElement { font-size: 20px; height: var(--header-height); padding: 8px 12px; - pointer-events: none; background-color: var(--app-header-background-color); font-weight: 400; color: var(--app-header-text-color, white); diff --git a/src/panels/config/logs/ha-config-logs.ts b/src/panels/config/logs/ha-config-logs.ts index 6d176fca5508..2ec2961b9a3c 100644 --- a/src/panels/config/logs/ha-config-logs.ts +++ b/src/panels/config/logs/ha-config-logs.ts @@ -14,6 +14,8 @@ import { HomeAssistant, Route } from "../../../types"; import "./error-log-card"; import "./system-log-card"; import type { SystemLogCard } from "./system-log-card"; +import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box"; +import { navigate } from "../../../common/navigate"; const logProviders: LogProvider[] = [ { @@ -50,13 +52,11 @@ export class HaConfigLogs extends LitElement { @property({ type: Boolean }) public isWide!: boolean; - @property({ type: Boolean }) public showAdvanced!: boolean; - @property({ attribute: false }) public route!: Route; @state() private _filter = extractSearchParam("filter") || ""; - @query("system-log-card", true) private systemLog?: SystemLogCard; + @query("system-log-card") private systemLog?: SystemLogCard; @state() private _selectedLogProvider = "core"; @@ -64,16 +64,15 @@ export class HaConfigLogs extends LitElement { public connectedCallback() { super.connectedCallback(); - if (this.systemLog && this.systemLog.loaded) { - this.systemLog.fetchData(); + const systemLog = this.systemLog; + if (systemLog && systemLog.loaded) { + systemLog.fetchData(); } } protected firstUpdated(changedProps): void { super.firstUpdated(changedProps); - if (isComponentLoaded(this.hass, "hassio")) { - this._getInstalledAddons(); - } + this._init(); } private async _filterChanged(ev) { @@ -111,8 +110,7 @@ export class HaConfigLogs extends LitElement { .header=${this.hass.localize("ui.panel.config.logs.caption")} back-path="/config/system" > - ${isComponentLoaded(this.hass, "hassio") && - this.hass.userData?.showAdvanced + ${isComponentLoaded(this.hass, "hassio") ? html` p.key === providerKey) + ) { + this._selectedLogProvider = providerKey; + } else { + showAlertDialog(this, { + title: + this.hass.localize("ui.panel.config.logs.provider_not_found") || + "Log provider not found", + text: this.hass.localize( + "ui.panel.config.logs.provider_not_available", + { + provider: + this._logProviders.find((p) => p.key === providerKey)?.name || + providerKey, + } + ), + }); + } + } } private async _getInstalledAddons() { @@ -209,6 +237,7 @@ export class HaConfigLogs extends LitElement { } search-input.header { --mdc-ripple-color: transparant; + margin-left: -16px; } .content { direction: ltr; diff --git a/src/panels/my/ha-panel-my.ts b/src/panels/my/ha-panel-my.ts index 55888fe09db5..c525fa2dee4d 100644 --- a/src/panels/my/ha-panel-my.ts +++ b/src/panels/my/ha-panel-my.ts @@ -189,6 +189,9 @@ export const getMyRedirects = (hasSupervisor: boolean): Redirects => ({ }, logs: { redirect: "/config/logs", + params: { + provider: "string?", + }, }, repairs: { component: "repairs", diff --git a/src/state/quick-bar-mixin.ts b/src/state/quick-bar-mixin.ts index f60cf0344f94..c1868f699d81 100644 --- a/src/state/quick-bar-mixin.ts +++ b/src/state/quick-bar-mixin.ts @@ -10,6 +10,7 @@ import { Constructor, HomeAssistant } from "../types"; import { storeState } from "../util/ha-pref-storage"; import { showToast } from "../util/toast"; import { HassElement } from "./hass-element"; +import { extractSearchParamsObject } from "../common/url/search-params"; declare global { interface HASSDomEvents { @@ -117,6 +118,14 @@ export default >(superClass: T) => )) { if (targetPath.startsWith(redirect.redirect)) { myParams.append("redirect", slug); + if (redirect.params) { + const params = extractSearchParamsObject(); + for (const key of Object.keys(redirect.params)) { + if (key in params) { + myParams.append(key, params[key]); + } + } + } window.open( `https://my.home-assistant.io/create-link/?${myParams.toString()}`, "_blank" diff --git a/src/translations/en.json b/src/translations/en.json index bd741720b336..adee4f24b8f4 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2157,7 +2157,9 @@ "custom_integration": "custom integration", "error_from_custom_integration": "This error originated from a custom integration.", "show_full_logs": "Show full logs", - "download_full_log": "Download full log" + "download_full_log": "Download full log", + "provider_not_found": "Log provider not found", + "provider_not_available": "Logs for ''{provider}'' are not available on your system." }, "lovelace": { "caption": "Dashboards", From de35e89c5880e4bf67b648b7c832d8ff1513fd6c Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 10 Jan 2024 15:21:54 +0100 Subject: [PATCH 116/361] Update ha-config-logs.ts --- src/panels/config/logs/ha-config-logs.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/config/logs/ha-config-logs.ts b/src/panels/config/logs/ha-config-logs.ts index 2ec2961b9a3c..9ec02e0312df 100644 --- a/src/panels/config/logs/ha-config-logs.ts +++ b/src/panels/config/logs/ha-config-logs.ts @@ -182,6 +182,7 @@ export class HaConfigLogs extends LitElement { ) { this._selectedLogProvider = providerKey; } else { + navigate("/config/logs", { replace: true }); showAlertDialog(this, { title: this.hass.localize("ui.panel.config.logs.provider_not_found") || From a136fa687f37c6c6ae1835651556c15bc9521305 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 10 Jan 2024 06:22:59 -0800 Subject: [PATCH 117/361] Add page to list assist devices (#19301) * Add page to list assist devices * Translate title too --- src/data/assist_pipeline.ts | 10 ++ .../config/voice-assistants/assist-pref.ts | 19 +++ ...-config-voice-assistants-assist-devices.ts | 148 ++++++++++++++++++ .../ha-config-voice-assistants.ts | 5 + src/translations/en.json | 9 +- 5 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 src/panels/config/voice-assistants/assist/ha-config-voice-assistants-assist-devices.ts diff --git a/src/data/assist_pipeline.ts b/src/data/assist_pipeline.ts index 3ee5a8a27a0c..e5f60c2d9ccf 100644 --- a/src/data/assist_pipeline.ts +++ b/src/data/assist_pipeline.ts @@ -18,6 +18,11 @@ export interface AssistPipeline { wake_word_id: string | null; } +export interface AssistDevice { + device_id: string; + pipeline_entity: string; +} + export interface AssistPipelineMutableParams { name: string; language: string; @@ -366,3 +371,8 @@ export const fetchAssistPipelineLanguages = (hass: HomeAssistant) => hass.callWS<{ languages: string[] }>({ type: "assist_pipeline/language/list", }); + +export const listAssistDevices = (hass: HomeAssistant) => + hass.callWS({ + type: "assist_pipeline/device/list", + }); diff --git a/src/panels/config/voice-assistants/assist-pref.ts b/src/panels/config/voice-assistants/assist-pref.ts index 7a39414f94a8..fa1350936fb8 100644 --- a/src/panels/config/voice-assistants/assist-pref.ts +++ b/src/panels/config/voice-assistants/assist-pref.ts @@ -12,9 +12,11 @@ import "../../../components/ha-list-item"; import "../../../components/ha-svg-icon"; import "../../../components/ha-switch"; import { + AssistDevice, AssistPipeline, createAssistPipeline, deleteAssistPipeline, + listAssistDevices, listAssistPipelines, setAssistPipelinePreferred, updateAssistPipeline, @@ -39,6 +41,8 @@ export class AssistPref extends LitElement { @state() private _preferred: string | null = null; + @state() private _devices: AssistDevice[] = []; + @property() public cloudStatus?: CloudStatus; protected firstUpdated(changedProps: PropertyValues) { @@ -48,6 +52,9 @@ export class AssistPref extends LitElement { this._pipelines = pipelines.pipelines; this._preferred = pipelines.preferred_pipeline; }); + listAssistDevices(this.hass).then((devices) => { + this._devices = devices; + }); } private _exposedEntitiesCount = memoizeOne( @@ -132,6 +139,18 @@ export class AssistPref extends LitElement { )} + ${this._devices?.length + ? html` + + + ${this.hass.localize( + "ui.panel.config.voice_assistants.assistants.pipeline.assist_devices", + { number: this._devices.length } + )} + + + ` + : ""}
`; diff --git a/src/panels/config/voice-assistants/assist/ha-config-voice-assistants-assist-devices.ts b/src/panels/config/voice-assistants/assist/ha-config-voice-assistants-assist-devices.ts new file mode 100644 index 000000000000..86c450f691a3 --- /dev/null +++ b/src/panels/config/voice-assistants/assist/ha-config-voice-assistants-assist-devices.ts @@ -0,0 +1,148 @@ +import { LitElement, PropertyValues, html } from "lit"; +import memoizeOne from "memoize-one"; +import { customElement, property, state } from "lit/decorators"; +import "../../../../layouts/hass-subpage"; +import "../../../../components/data-table/ha-data-table"; +import type { DataTableColumnContainer } from "../../../../components/data-table/ha-data-table"; +import { HomeAssistant } from "../../../../types"; +import { + AssistDevice, + AssistPipeline, + listAssistDevices, + listAssistPipelines, +} from "../../../../data/assist_pipeline"; +import { computeDeviceName } from "../../../../data/device_registry"; +import { navigate } from "../../../../common/navigate"; + +interface AssistDeviceExtra { + pipeline: string | undefined; + last_used: string | undefined; +} + +@customElement("ha-config-voice-assistants-assist-devices") +class AssistDevicesPage extends LitElement { + @property({ attribute: false }) public hass!: HomeAssistant; + + @property({ type: Boolean }) public narrow!: boolean; + + @state() private _pipelines: Record = {}; + + @state() private _preferred: string | null = null; + + @state() private _devices?: (AssistDevice | AssistDeviceExtra)[]; + + private _columns = memoizeOne( + ( + hass: HomeAssistant, + pipelines: Record, + preferred: string | null + ): DataTableColumnContainer => { + const columns: DataTableColumnContainer = { + name: { + title: hass.localize( + "ui.panel.config.voice_assistants.assistants.pipeline.devices.device" + ), + width: "50%", + filterable: true, + sortable: true, + template: (assistDevice) => + computeDeviceName(hass.devices[assistDevice.device_id], hass), + }, + pipeline: { + title: hass.localize( + "ui.panel.config.voice_assistants.assistants.pipeline.devices.pipeline" + ), + width: "30%", + filterable: true, + sortable: true, + template: (assistDevice) => { + let selected = hass.states[assistDevice.pipeline_entity].state; + if (!pipelines) { + return selected; + } + let isPreferred = false; + + if (selected === "preferred") { + isPreferred = true; + selected = preferred!; + } + + const name = pipelines[selected].name; + + return isPreferred + ? hass.localize("ui.components.pipeline-picker.preferred", { + preferred: name, + }) + : name; + }, + }, + area: { + title: hass.localize( + "ui.panel.config.voice_assistants.assistants.pipeline.devices.area" + ), + width: "20%", + template: (assistDevice) => { + const device = hass.devices[assistDevice.device_id]; + return ( + (device && device.area_id && hass.areas[device.area_id]?.name) || + "" + ); + }, + }, + }; + + return columns; + } + ); + + protected firstUpdated(changedProps: PropertyValues) { + super.firstUpdated(changedProps); + + listAssistPipelines(this.hass).then((pipelines) => { + const lookup: Record = {}; + for (const pipeline of pipelines.pipelines) { + lookup[pipeline.id] = pipeline; + } + + this._pipelines = lookup; + this._preferred = pipelines.preferred_pipeline; + }); + + listAssistDevices(this.hass).then((devices) => { + this._devices = devices; + }); + } + + render() { + return html` + + + + `; + } + + private _handleRowClicked(ev: CustomEvent) { + const device: AssistDevice = ev.detail.id; + navigate(`/config/devices/device/${device}`); + } +} + +declare global { + interface HTMLElementTagNameMap { + "ha-config-voice-assistants-assist-devices": AssistDevicesPage; + } +} diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants.ts index 4c94317ca760..8c99c7808b66 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants.ts @@ -75,6 +75,11 @@ class HaConfigVoiceAssistants extends HassRouterPage { tag: "assist-debug", load: () => import("./debug/assist-debug"), }, + assist: { + tag: "ha-config-voice-assistants-assist-devices", + load: () => + import("./assist/ha-config-voice-assistants-assist-devices"), + }, }, }; diff --git a/src/translations/en.json b/src/translations/en.json index adee4f24b8f4..0ef583607874 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2257,10 +2257,17 @@ "pipeline": { "add_assistant": "Add assistant", "exposed_entities": "[%key:ui::panel::config::cloud::account::google::exposed_entities%]", + "assist_devices": "{number} Assist {number, plural,\n one {device}\n other {devices}\n}", "delete": { "confirm_title": "Delete {name}?", "confirm_text": "{name} will be permanently deleted." }, + "devices": { + "title": "Assist devices", + "device": "Device", + "pipeline": "Assistant", + "area": "Area" + }, "detail": { "update_assistant_action": "Update", "add_assistant_title": "Add assistant", @@ -2269,7 +2276,7 @@ "debug": "Debug", "set_as_preferred": "Set as preferred", "form": { - "name": "Name", + "name": "[%key:ui::common::name%]", "conversation_engine": "Conversation agent", "conversation_language": "[%key:ui::panel::config::voice_assistants::assistants::pipeline::detail::form::language%]", "language": "Language", From b9069b25ade807dab2905c09bc4d355eeef2c03f Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 11 Jan 2024 09:48:10 +0100 Subject: [PATCH 118/361] Assist devices: Move logic from column to data (#19359) * Move logic from column to data * Type --- ...-config-voice-assistants-assist-devices.ts | 111 ++++++++++-------- 1 file changed, 61 insertions(+), 50 deletions(-) diff --git a/src/panels/config/voice-assistants/assist/ha-config-voice-assistants-assist-devices.ts b/src/panels/config/voice-assistants/assist/ha-config-voice-assistants-assist-devices.ts index 86c450f691a3..080ec7843218 100644 --- a/src/panels/config/voice-assistants/assist/ha-config-voice-assistants-assist-devices.ts +++ b/src/panels/config/voice-assistants/assist/ha-config-voice-assistants-assist-devices.ts @@ -1,10 +1,10 @@ import { LitElement, PropertyValues, html } from "lit"; -import memoizeOne from "memoize-one"; import { customElement, property, state } from "lit/decorators"; -import "../../../../layouts/hass-subpage"; +import memoizeOne from "memoize-one"; +import { navigate } from "../../../../common/navigate"; +import { LocalizeFunc } from "../../../../common/translations/localize"; import "../../../../components/data-table/ha-data-table"; import type { DataTableColumnContainer } from "../../../../components/data-table/ha-data-table"; -import { HomeAssistant } from "../../../../types"; import { AssistDevice, AssistPipeline, @@ -12,11 +12,13 @@ import { listAssistPipelines, } from "../../../../data/assist_pipeline"; import { computeDeviceName } from "../../../../data/device_registry"; -import { navigate } from "../../../../common/navigate"; +import "../../../../layouts/hass-subpage"; +import { HomeAssistant } from "../../../../types"; -interface AssistDeviceExtra { - pipeline: string | undefined; - last_used: string | undefined; +interface AssistDeviceExtra extends AssistDevice { + name: string; + pipeline: string; + area: string; } @customElement("ha-config-voice-assistants-assist-devices") @@ -29,65 +31,34 @@ class AssistDevicesPage extends LitElement { @state() private _preferred: string | null = null; - @state() private _devices?: (AssistDevice | AssistDeviceExtra)[]; + @state() private _devices?: AssistDevice[]; private _columns = memoizeOne( - ( - hass: HomeAssistant, - pipelines: Record, - preferred: string | null - ): DataTableColumnContainer => { - const columns: DataTableColumnContainer = { + (localize: LocalizeFunc): DataTableColumnContainer => { + const columns: DataTableColumnContainer = { name: { - title: hass.localize( + title: localize( "ui.panel.config.voice_assistants.assistants.pipeline.devices.device" ), - width: "50%", filterable: true, sortable: true, - template: (assistDevice) => - computeDeviceName(hass.devices[assistDevice.device_id], hass), + grows: true, }, pipeline: { - title: hass.localize( + title: localize( "ui.panel.config.voice_assistants.assistants.pipeline.devices.pipeline" ), width: "30%", filterable: true, sortable: true, - template: (assistDevice) => { - let selected = hass.states[assistDevice.pipeline_entity].state; - if (!pipelines) { - return selected; - } - let isPreferred = false; - - if (selected === "preferred") { - isPreferred = true; - selected = preferred!; - } - - const name = pipelines[selected].name; - - return isPreferred - ? hass.localize("ui.components.pipeline-picker.preferred", { - preferred: name, - }) - : name; - }, }, area: { - title: hass.localize( + title: localize( "ui.panel.config.voice_assistants.assistants.pipeline.devices.area" ), - width: "20%", - template: (assistDevice) => { - const device = hass.devices[assistDevice.device_id]; - return ( - (device && device.area_id && hass.areas[device.area_id]?.name) || - "" - ); - }, + filterable: true, + sortable: true, + width: "30%", }, }; @@ -95,6 +66,38 @@ class AssistDevicesPage extends LitElement { } ); + private _data = memoizeOne( + ( + localize: LocalizeFunc, + deviceReg: HomeAssistant["devices"], + areaReg: HomeAssistant["areas"], + states: HomeAssistant["states"], + pipelines: Record, + preferred: string | null, + assistDevices: AssistDevice[] + ): AssistDeviceExtra[] => + assistDevices.map((assistDevice) => { + const device = deviceReg[assistDevice.device_id]; + const selected = states[assistDevice.pipeline_entity]?.state; + const isPreferred = selected === "preferred"; + const pipeline = isPreferred ? preferred : selected; + const pipelineName = + (pipeline && pipelines[pipeline]?.name) || pipeline; + + return { + ...assistDevice, + name: device ? computeDeviceName(device, this.hass) : "", + pipeline: isPreferred + ? localize("ui.components.pipeline-picker.preferred", { + preferred: pipelineName, + }) + : pipelineName || "", + area: + (device && device.area_id && areaReg[device.area_id]?.name) || "", + }; + }) + ); + protected firstUpdated(changedProps: PropertyValues) { super.firstUpdated(changedProps); @@ -126,8 +129,16 @@ class AssistDevicesPage extends LitElement { clickable id="device_id" .hass=${this.hass} - .columns=${this._columns(this.hass, this._pipelines, this._preferred)} - .data=${this._devices || []} + .columns=${this._columns(this.hass.localize)} + .data=${this._data( + this.hass.localize, + this.hass.devices, + this.hass.areas, + this.hass.states, + this._pipelines, + this._preferred, + this._devices || [] + )} auto-height @row-click=${this._handleRowClicked} > From 03751d2581740e91278fc16ff879adf3d97f8a68 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 11 Jan 2024 09:48:20 +0100 Subject: [PATCH 119/361] =?UTF-8?q?Load=20registries=20in=20core,=20wait?= =?UTF-8?q?=20them=20to=20be=20loaded=20before=20generating=20das=E2=80=A6?= =?UTF-8?q?=20(#19356)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * load registries in core, wait them to be loaded before generating dashboard * import * improve * Split out subscribe functions --- src/data/area_registry.ts | 44 ++---------------------- src/data/device_registry.ts | 41 +++------------------- src/data/entity_registry.ts | 32 ++--------------- src/data/ws-area_registry.ts | 44 ++++++++++++++++++++++++ src/data/ws-device_registry.ts | 37 ++++++++++++++++++++ src/data/ws-entity_registry_display.ts | 35 +++++++++++++++++++ src/entrypoints/core.ts | 14 +++++--- src/panels/lovelace/ha-panel-lovelace.ts | 21 ++++++++--- 8 files changed, 153 insertions(+), 115 deletions(-) create mode 100644 src/data/ws-area_registry.ts create mode 100644 src/data/ws-device_registry.ts create mode 100644 src/data/ws-entity_registry_display.ts diff --git a/src/data/area_registry.ts b/src/data/area_registry.ts index d51f7c528f77..bd0e7c97c35a 100644 --- a/src/data/area_registry.ts +++ b/src/data/area_registry.ts @@ -1,11 +1,10 @@ -import { Connection, createCollection } from "home-assistant-js-websocket"; -import { Store } from "home-assistant-js-websocket/dist/store"; import { stringCompare } from "../common/string/compare"; -import { debounce } from "../common/util/debounce"; import { HomeAssistant } from "../types"; import { DeviceRegistryEntry } from "./device_registry"; import { EntityRegistryEntry } from "./entity_registry"; +export { subscribeAreaRegistry } from "./ws-area_registry"; + export interface AreaRegistryEntry { area_id: string; name: string; @@ -53,45 +52,6 @@ export const deleteAreaRegistryEntry = (hass: HomeAssistant, areaId: string) => area_id: areaId, }); -const fetchAreaRegistry = (conn: Connection) => - conn - .sendMessagePromise({ - type: "config/area_registry/list", - }) - .then((areas) => - (areas as AreaRegistryEntry[]).sort((ent1, ent2) => - stringCompare(ent1.name, ent2.name) - ) - ); - -const subscribeAreaRegistryUpdates = ( - conn: Connection, - store: Store -) => - conn.subscribeEvents( - debounce( - () => - fetchAreaRegistry(conn).then((areas: AreaRegistryEntry[]) => - store.setState(areas, true) - ), - 500, - true - ), - "area_registry_updated" - ); - -export const subscribeAreaRegistry = ( - conn: Connection, - onChange: (areas: AreaRegistryEntry[]) => void -) => - createCollection( - "_areaRegistry", - fetchAreaRegistry, - subscribeAreaRegistryUpdates, - conn, - onChange - ); - export const getAreaEntityLookup = ( entities: EntityRegistryEntry[] ): AreaEntityLookup => { diff --git a/src/data/device_registry.ts b/src/data/device_registry.ts index 4e2d308e0e6c..0127bdf7d383 100644 --- a/src/data/device_registry.ts +++ b/src/data/device_registry.ts @@ -1,8 +1,5 @@ -import { Connection, createCollection } from "home-assistant-js-websocket"; -import type { Store } from "home-assistant-js-websocket/dist/store"; import { computeStateName } from "../common/entity/compute_state_name"; import { caseInsensitiveStringCompare } from "../common/string/compare"; -import { debounce } from "../common/util/debounce"; import type { HomeAssistant } from "../types"; import type { EntityRegistryDisplayEntry, @@ -10,6 +7,11 @@ import type { } from "./entity_registry"; import type { EntitySources } from "./entity_sources"; +export { + fetchDeviceRegistry, + subscribeDeviceRegistry, +} from "./ws-device_registry"; + export interface DeviceRegistryEntry { id: string; config_entries: string[]; @@ -96,39 +98,6 @@ export const removeConfigEntryFromDevice = ( config_entry_id: configEntryId, }); -export const fetchDeviceRegistry = (conn: Connection) => - conn.sendMessagePromise({ - type: "config/device_registry/list", - }); - -const subscribeDeviceRegistryUpdates = ( - conn: Connection, - store: Store -) => - conn.subscribeEvents( - debounce( - () => - fetchDeviceRegistry(conn).then((devices) => - store.setState(devices, true) - ), - 500, - true - ), - "device_registry_updated" - ); - -export const subscribeDeviceRegistry = ( - conn: Connection, - onChange: (devices: DeviceRegistryEntry[]) => void -) => - createCollection( - "_dr", - fetchDeviceRegistry, - subscribeDeviceRegistryUpdates, - conn, - onChange - ); - export const sortDeviceRegistryByName = ( entries: DeviceRegistryEntry[], language: string diff --git a/src/data/entity_registry.ts b/src/data/entity_registry.ts index c55a09aaa33b..61da5aba2a73 100644 --- a/src/data/entity_registry.ts +++ b/src/data/entity_registry.ts @@ -8,6 +8,8 @@ import { HomeAssistant } from "../types"; import { LightColor } from "./light"; import { computeDomain } from "../common/entity/compute_domain"; +export { subscribeEntityRegistryDisplay } from "./ws-entity_registry_display"; + type entityCategory = "config" | "diagnostic"; export interface EntityRegistryDisplayEntry { @@ -22,7 +24,7 @@ export interface EntityRegistryDisplayEntry { display_precision?: number; } -interface EntityRegistryDisplayEntryResponse { +export interface EntityRegistryDisplayEntryResponse { entities: { ei: string; di?: string; @@ -255,34 +257,6 @@ export const subscribeEntityRegistry = ( onChange ); -const subscribeEntityRegistryDisplayUpdates = ( - conn: Connection, - store: Store -) => - conn.subscribeEvents( - debounce( - () => - fetchEntityRegistryDisplay(conn).then((entities) => - store.setState(entities, true) - ), - 500, - true - ), - "entity_registry_updated" - ); - -export const subscribeEntityRegistryDisplay = ( - conn: Connection, - onChange: (entities: EntityRegistryDisplayEntryResponse) => void -) => - createCollection( - "_entityRegistryDisplay", - fetchEntityRegistryDisplay, - subscribeEntityRegistryDisplayUpdates, - conn, - onChange - ); - export const sortEntityRegistryByName = ( entries: EntityRegistryEntry[], language: string diff --git a/src/data/ws-area_registry.ts b/src/data/ws-area_registry.ts new file mode 100644 index 000000000000..0f5c4a38544b --- /dev/null +++ b/src/data/ws-area_registry.ts @@ -0,0 +1,44 @@ +import { Connection, createCollection } from "home-assistant-js-websocket"; +import { Store } from "home-assistant-js-websocket/dist/store"; +import { stringCompare } from "../common/string/compare"; +import { AreaRegistryEntry } from "./area_registry"; +import { debounce } from "../common/util/debounce"; + +const fetchAreaRegistry = (conn: Connection) => + conn + .sendMessagePromise({ + type: "config/area_registry/list", + }) + .then((areas) => + (areas as AreaRegistryEntry[]).sort((ent1, ent2) => + stringCompare(ent1.name, ent2.name) + ) + ); + +const subscribeAreaRegistryUpdates = ( + conn: Connection, + store: Store +) => + conn.subscribeEvents( + debounce( + () => + fetchAreaRegistry(conn).then((areas: AreaRegistryEntry[]) => + store.setState(areas, true) + ), + 500, + true + ), + "area_registry_updated" + ); + +export const subscribeAreaRegistry = ( + conn: Connection, + onChange: (areas: AreaRegistryEntry[]) => void +) => + createCollection( + "_areaRegistry", + fetchAreaRegistry, + subscribeAreaRegistryUpdates, + conn, + onChange + ); diff --git a/src/data/ws-device_registry.ts b/src/data/ws-device_registry.ts new file mode 100644 index 000000000000..85cc26568151 --- /dev/null +++ b/src/data/ws-device_registry.ts @@ -0,0 +1,37 @@ +import { Connection, createCollection } from "home-assistant-js-websocket"; +import { Store } from "home-assistant-js-websocket/dist/store"; +import { DeviceRegistryEntry } from "./device_registry"; +import { debounce } from "../common/util/debounce"; + +export const fetchDeviceRegistry = (conn: Connection) => + conn.sendMessagePromise({ + type: "config/device_registry/list", + }); + +const subscribeDeviceRegistryUpdates = ( + conn: Connection, + store: Store +) => + conn.subscribeEvents( + debounce( + () => + fetchDeviceRegistry(conn).then((devices) => + store.setState(devices, true) + ), + 500, + true + ), + "device_registry_updated" + ); + +export const subscribeDeviceRegistry = ( + conn: Connection, + onChange: (devices: DeviceRegistryEntry[]) => void +) => + createCollection( + "_dr", + fetchDeviceRegistry, + subscribeDeviceRegistryUpdates, + conn, + onChange + ); diff --git a/src/data/ws-entity_registry_display.ts b/src/data/ws-entity_registry_display.ts new file mode 100644 index 000000000000..c57229b6189a --- /dev/null +++ b/src/data/ws-entity_registry_display.ts @@ -0,0 +1,35 @@ +import { Connection, createCollection } from "home-assistant-js-websocket"; +import { Store } from "home-assistant-js-websocket/dist/store"; +import { + EntityRegistryDisplayEntryResponse, + fetchEntityRegistryDisplay, +} from "./entity_registry"; +import { debounce } from "../common/util/debounce"; + +const subscribeEntityRegistryDisplayUpdates = ( + conn: Connection, + store: Store +) => + conn.subscribeEvents( + debounce( + () => + fetchEntityRegistryDisplay(conn).then((entities) => + store.setState(entities, true) + ), + 500, + true + ), + "entity_registry_updated" + ); + +export const subscribeEntityRegistryDisplay = ( + conn: Connection, + onChange: (entities: EntityRegistryDisplayEntryResponse) => void +) => + createCollection( + "_entityRegistryDisplay", + fetchEntityRegistryDisplay, + subscribeEntityRegistryDisplayUpdates, + conn, + onChange + ); diff --git a/src/entrypoints/core.ts b/src/entrypoints/core.ts index 6ca3c2805343..e9bf6b4c001b 100644 --- a/src/entrypoints/core.ts +++ b/src/entrypoints/core.ts @@ -11,19 +11,22 @@ import { import { loadTokens, saveTokens } from "../common/auth/token_storage"; import { hassUrl } from "../data/auth"; import { isExternal } from "../data/external"; -import { getRecorderInfo } from "../data/recorder"; import { subscribeFrontendUserData } from "../data/frontend"; import { fetchConfig } from "../data/lovelace/config/types"; import { fetchResources } from "../data/lovelace/resource"; +import { MAIN_WINDOW_NAME } from "../data/main_window"; +import { WindowWithPreloads } from "../data/preloads"; +import { getRecorderInfo } from "../data/recorder"; +import { subscribeRepairsIssueRegistry } from "../data/repairs"; +import { subscribeAreaRegistry } from "../data/ws-area_registry"; +import { subscribeDeviceRegistry } from "../data/ws-device_registry"; +import { subscribeEntityRegistryDisplay } from "../data/ws-entity_registry_display"; import { subscribePanels } from "../data/ws-panels"; import { subscribeThemes } from "../data/ws-themes"; -import { subscribeRepairsIssueRegistry } from "../data/repairs"; import { subscribeUser } from "../data/ws-user"; import type { ExternalAuth } from "../external_app/external_auth"; import "../resources/array.flat.polyfill"; import "../resources/safari-14-attachshadow-patch"; -import { MAIN_WINDOW_NAME } from "../data/main_window"; -import { WindowWithPreloads } from "../data/preloads"; window.name = MAIN_WINDOW_NAME; (window as any).frontendVersion = __VERSION__; @@ -113,6 +116,9 @@ window.hassConnection.then(({ conn }) => { // do nothing }; subscribeEntities(conn, noop); + subscribeEntityRegistryDisplay(conn, noop); + subscribeDeviceRegistry(conn, noop); + subscribeAreaRegistry(conn, noop); subscribeConfig(conn, noop); subscribeServices(conn, noop); subscribePanels(conn, noop); diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts index eb367df99e19..a767452e3e99 100644 --- a/src/panels/lovelace/ha-panel-lovelace.ts +++ b/src/panels/lovelace/ha-panel-lovelace.ts @@ -1,7 +1,7 @@ import "@material/mwc-button"; import deepFreeze from "deep-freeze"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; -import { html, LitElement, TemplateResult } from "lit"; +import { html, LitElement, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators"; import { constructUrlCurrentPath } from "../../common/url/construct-url"; import { @@ -161,10 +161,15 @@ export class LovelacePanel extends LitElement { `; } - protected firstUpdated(changedProps) { - super.firstUpdated(changedProps); + protected willUpdate(changedProps: PropertyValues) { + super.willUpdate(changedProps); + if (!this.lovelace && this._panelState !== "error") { + this._fetchConfig(false); + } + } - this._fetchConfig(false); + protected firstUpdated(changedProps: PropertyValues): void { + super.firstUpdated(changedProps); if (!this._unsubUpdates) { this._subscribeUpdates(); } @@ -267,6 +272,10 @@ export class LovelacePanel extends LitElement { // If strategy defined, apply it here. if (isStrategyDashboard(rawConf)) { + if (!this.hass?.entities || !this.hass.devices || !this.hass.areas) { + // We need these to generate a dashboard, wait for them + return; + } conf = await generateLovelaceDashboardStrategy( rawConf.strategy, this.hass! @@ -282,6 +291,10 @@ export class LovelacePanel extends LitElement { this._errorMsg = err.message; return; } + if (!this.hass?.entities || !this.hass.devices || !this.hass.areas) { + // We need these to generate a dashboard, wait for them + return; + } conf = await generateLovelaceDashboardStrategy( DEFAULT_CONFIG.strategy, this.hass! From 02a7d0e797a7c354fb7d787283330a5931d798d2 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 11 Jan 2024 11:03:32 +0100 Subject: [PATCH 120/361] Clean up local auth flow, preselect remember me (#19354) --- src/auth/ha-auth-flow.ts | 35 +-- src/auth/ha-authorize.ts | 62 ++--- src/auth/ha-local-auth-flow.ts | 485 --------------------------------- src/data/person.ts | 10 - 4 files changed, 34 insertions(+), 558 deletions(-) delete mode 100644 src/auth/ha-local-auth-flow.ts diff --git a/src/auth/ha-auth-flow.ts b/src/auth/ha-auth-flow.ts index 00070a57b664..fb1d7d7c32f5 100644 --- a/src/auth/ha-auth-flow.ts +++ b/src/auth/ha-auth-flow.ts @@ -21,7 +21,6 @@ import { DataEntryFlowStepForm, } from "../data/data_entry_flow"; import "./ha-auth-form"; -import { fireEvent } from "../common/dom/fire_event"; type State = "loading" | "error" | "step"; @@ -39,7 +38,9 @@ export class HaAuthFlow extends LitElement { @property({ attribute: false }) public step?: DataEntryFlowStep; - @property({ type: Boolean }) private storeToken = false; + @property({ type: Boolean }) private initStoreToken = false; + + @state() private _storeToken = false; @state() private _state: State = "loading"; @@ -56,6 +57,10 @@ export class HaAuthFlow extends LitElement { willUpdate(changedProps: PropertyValues) { super.willUpdate(changedProps); + if (!this.hasUpdated) { + this._storeToken = this.initStoreToken; + } + if (!changedProps.has("step")) { return; } @@ -155,11 +160,6 @@ export class HaAuthFlow extends LitElement { } private _renderForm() { - const showBack = - this.step?.type === "form" && - this.authProvider?.users && - !["select_mfa_module", "mfa"].includes(this.step.step_id); - switch (this._state) { case "step": if (this.step == null) { @@ -168,12 +168,7 @@ export class HaAuthFlow extends LitElement { return html` ${this._renderStep(this.step)} -
- ${showBack - ? html` - ${this.localize("ui.panel.page-authorize.form.previous")} - ` - : nothing} +
${this._computeStepDescription(step)} @@ -269,7 +264,7 @@ export class HaAuthFlow extends LitElement { } private _storeTokenChanged(e: CustomEvent) { - this.storeToken = (e.currentTarget as HTMLInputElement).checked; + this._storeToken = (e.currentTarget as HTMLInputElement).checked; } private async _providerChanged(newProvider?: AuthProvider) { @@ -303,7 +298,7 @@ export class HaAuthFlow extends LitElement { this.redirectUri!, data.result, this.oauth2State, - this.storeToken + this._storeToken ); return; } @@ -385,7 +380,7 @@ export class HaAuthFlow extends LitElement { this.redirectUri!, newStep.result, this.oauth2State, - this.storeToken + this._storeToken ); return; } @@ -400,10 +395,6 @@ export class HaAuthFlow extends LitElement { this._submitting = false; } } - - private _localFlow() { - fireEvent(this, "default-login-flow", { value: false }); - } } declare global { diff --git a/src/auth/ha-authorize.ts b/src/auth/ha-authorize.ts index 97fc3ef4790d..74b1e649d179 100644 --- a/src/auth/ha-authorize.ts +++ b/src/auth/ha-authorize.ts @@ -13,7 +13,6 @@ import { import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin"; import { registerServiceWorker } from "../util/register-service-worker"; import "./ha-auth-flow"; -import "./ha-local-auth-flow"; import("./ha-pick-auth-provider"); @@ -36,12 +35,12 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) { @state() private _authProviders?: AuthProvider[]; + @state() private _preselectStoreToken = false; + @state() private _ownInstance = false; @state() private _error?: string; - @state() private _forceDefaultLogin = false; - constructor() { super(); const query = extractSearchParamsObject() as AuthUrlSearchParams; @@ -84,8 +83,7 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) { display: block; margin-top: 24px; } - ha-auth-flow, - ha-local-auth-flow { + ha-auth-flow { display: flex; justify-content: center; flex-direction: column; @@ -176,44 +174,29 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) { ` : nothing} -
+
${!this._authProvider ? html`

${this.localize("ui.panel.page-authorize.initializing")}

` - : !this._forceDefaultLogin && - this._authProvider!.users && - this.clientId != null && - this.redirectUri != null - ? html`` - : html` - ${inactiveProviders!.length > 0 - ? html` - - ` - : ""}`} + .initStoreToken=${this._preselectStoreToken} + > + ${inactiveProviders!.length > 0 + ? html` + + ` + : ""}`}
; - - @state() private _selectedUser?: string; - - @state() private _unmaskedPassword = false; - - createRenderRoot() { - return this; - } - - willUpdate(changedProps: PropertyValues) { - super.willUpdate(changedProps); - - if (!this.hasUpdated) { - this._load(); - } - } - - protected render() { - if (!this.authProvider?.users || !this._persons) { - return nothing; - } - const userIds = Object.keys(this.authProvider.users).filter( - (userId) => userId in this._persons! - ); - return html` - - ${this._error - ? html`${this._error}` - : nothing} - ${this._step - ? html`` - : this._selectedUser - ? html`` - : html`

- ${this.localize("ui.panel.page-authorize.welcome_home")} -

- ${this.localize("ui.panel.page-authorize.who_is_logging_in")} -
- ${userIds.map((userId) => { - const person = this._persons![userId]; - - return html`
- -

${person.name}

-
`; - })} -
-
- -
`} - `; - } - - protected firstUpdated(changedProps: PropertyValues) { - super.firstUpdated(changedProps); - - this.addEventListener("keypress", (ev) => { - if (ev.key === "Enter") { - this._handleSubmit(ev); - } - }); - } - - protected updated(changedProps: PropertyValues) { - if (changedProps.has("_selectedUser") && this._selectedUser) { - const passwordElement = this.renderRoot.querySelector( - "#password" - ) as HaAuthTextField; - passwordElement.updateComplete.then(() => { - passwordElement.focus(); - }); - } - } - - private async _load() { - try { - this._persons = await listUserPersons(); - } catch { - this._persons = {}; - this._error = "Failed to fetch persons"; - } - } - - private _restart() { - this._selectedUser = undefined; - this._error = undefined; - } - - private _toggleUnmaskedPassword() { - this._unmaskedPassword = !this._unmaskedPassword; - } - - private _handleKeyUp(ev: KeyboardEvent) { - if (ev.key === "Enter" || ev.key === " ") { - this._personSelected(ev); - } - } - - private async _personSelected(ev) { - const userId = ev.currentTarget.userId; - if ( - this.ownInstance && - this.authProviders?.find((prv) => prv.type === "trusted_networks") - ) { - try { - const flowResponse = await createLoginFlow( - this.clientId, - this.redirectUri, - ["trusted_networks", null] - ); - - const data = await flowResponse.json(); - - if (data.type === "create_entry") { - redirectWithAuthCode( - this.redirectUri!, - data.result, - this.oauth2State, - true - ); - return; - } - - try { - if (!data.data_schema[0].options.find((opt) => opt[0] === userId)) { - throw new Error("User not available"); - } - - const postData = { user: userId, client_id: this.clientId }; - - const response = await submitLoginFlow(data.flow_id, postData); - - if (response.ok) { - const result = await response.json(); - - if (result.type === "create_entry") { - redirectWithAuthCode( - this.redirectUri!, - result.result, - this.oauth2State, - true - ); - return; - } - } else { - throw new Error("Invalid response"); - } - } catch { - deleteLoginFlow(data.flow_id).catch((err) => { - // eslint-disable-next-line no-console - console.error("Error delete obsoleted auth flow", err); - }); - } - } catch { - // Ignore - } - } - this._selectedUser = userId; - } - - private async _handleSubmit(ev: Event) { - ev.preventDefault(); - - if (!this.authProvider?.users || !this._selectedUser) { - return; - } - - this._error = undefined; - this._submitting = true; - - const flowResponse = await createLoginFlow( - this.clientId, - this.redirectUri, - ["homeassistant", null] - ); - - const data = await flowResponse.json(); - - const postData = { - username: this.authProvider.users[this._selectedUser], - password: (this.renderRoot.querySelector("#password") as HaAuthTextField) - .value, - client_id: this.clientId, - }; - - try { - const response = await submitLoginFlow(data.flow_id, postData); - - const newStep = await response.json(); - - if (response.status === 403) { - this._error = newStep.message; - return; - } - - if (newStep.type === "create_entry") { - redirectWithAuthCode( - this.redirectUri!, - newStep.result, - this.oauth2State, - true - ); - return; - } - - if (newStep.errors.base) { - this._error = this.localize( - `ui.panel.page-authorize.form.providers.homeassistant.error.${newStep.errors.base}` - ); - throw new Error(this._error); - } - - this._step = newStep; - } catch { - deleteLoginFlow(data.flow_id).catch((err) => { - // eslint-disable-next-line no-console - console.error("Error delete obsoleted auth flow", err); - }); - if (!this._error) { - this._error = this.localize( - "ui.panel.page-authorize.form.unknown_error" - ); - } - } finally { - this._submitting = false; - } - } - - private _otherLogin() { - fireEvent(this, "default-login-flow", { value: true }); - } -} - -declare global { - interface HTMLElementTagNameMap { - "ha-local-auth-flow": HaLocalAuthFlow; - } - interface HASSDomEvents { - "default-login-flow": { value: boolean }; - } -} diff --git a/src/data/person.ts b/src/data/person.ts index 122240aff998..d1a0cbdd6a45 100644 --- a/src/data/person.ts +++ b/src/data/person.ts @@ -24,16 +24,6 @@ export const fetchPersons = (hass: HomeAssistant) => config: Person[]; }>({ type: "person/list" }); -export const listUserPersons = (): Promise> => - fetch("/api/person/list", { - credentials: "same-origin", - }).then((resp) => { - if (resp.ok) { - return resp.json(); - } - throw new Error(resp.statusText); - }); - export const createPerson = ( hass: HomeAssistant, values: PersonMutableParams From d2019c2315d3c3d7ac40abfc24ba6a3d05c451ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 23:52:37 -0500 Subject: [PATCH 121/361] Update babel monorepo to v7.23.8 (#19368) * Update babel monorepo to v7.23.8 * bump @babel/helpers --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Steve Repsher --- package.json | 4 ++-- yarn.lock | 39 +++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 89c6a5a839a1..b0376b5aeb1b 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "license": "Apache-2.0", "type": "module", "dependencies": { - "@babel/runtime": "7.23.7", + "@babel/runtime": "7.23.8", "@braintree/sanitize-url": "7.0.0", "@codemirror/autocomplete": "6.11.1", "@codemirror/commands": "6.3.3", @@ -153,7 +153,7 @@ "@babel/helper-define-polyfill-provider": "0.4.4", "@babel/plugin-proposal-decorators": "7.23.7", "@babel/plugin-transform-runtime": "7.23.7", - "@babel/preset-env": "7.23.7", + "@babel/preset-env": "7.23.8", "@babel/preset-typescript": "7.23.3", "@bundle-stats/plugin-webpack-filter": "4.8.4", "@koa/cors": "5.0.0", diff --git a/yarn.lock b/yarn.lock index 9f7aea707a17..583a573b1404 100644 --- a/yarn.lock +++ b/yarn.lock @@ -336,13 +336,13 @@ __metadata: linkType: hard "@babel/helpers@npm:^7.23.7": - version: 7.23.7 - resolution: "@babel/helpers@npm:7.23.7" + version: 7.23.8 + resolution: "@babel/helpers@npm:7.23.8" dependencies: "@babel/template": "npm:^7.22.15" "@babel/traverse": "npm:^7.23.7" "@babel/types": "npm:^7.23.6" - checksum: ec07061dc871d406ed82c8757c4d7a510aaf15145799fb0a2c3bd3c72ca101fe82a02dd5f83ca604fbbba5de5408dd731bb1452150562bed4f3b0a2846f81f61 + checksum: 4c392351910102403b6a7c922319077b179c276e422a4e45b243b45610f813a05a043b6b116cbf5eb4b437fb51b9a2dfc2b7c65f38a0de7fde1f97d08a675313 languageName: node linkType: hard @@ -741,22 +741,21 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.23.5": - version: 7.23.5 - resolution: "@babel/plugin-transform-classes@npm:7.23.5" +"@babel/plugin-transform-classes@npm:^7.23.8": + version: 7.23.8 + resolution: "@babel/plugin-transform-classes@npm:7.23.8" dependencies: "@babel/helper-annotate-as-pure": "npm:^7.22.5" - "@babel/helper-compilation-targets": "npm:^7.22.15" + "@babel/helper-compilation-targets": "npm:^7.23.6" "@babel/helper-environment-visitor": "npm:^7.22.20" "@babel/helper-function-name": "npm:^7.23.0" - "@babel/helper-optimise-call-expression": "npm:^7.22.5" "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/helper-replace-supers": "npm:^7.22.20" "@babel/helper-split-export-declaration": "npm:^7.22.6" globals: "npm:^11.1.0" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f6c4fed2f48bdd46a4726b829ea2ddb5c9c97edd0e55dc53791d82927daad5725052b7e785a8b7e90a53b0606166b9c554469dc94f10fba59ca9642e997d97ee + checksum: 4bb4b19e7a39871c4414fb44fc5f2cc47c78f993b74c43238dfb99c9dac2d15cb99b43f8a3d42747580e1807d2b8f5e13ce7e95e593fd839bd176aa090bf9a23 languageName: node linkType: hard @@ -1267,9 +1266,9 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.23.7, @babel/preset-env@npm:^7.0.0, @babel/preset-env@npm:^7.11.0": - version: 7.23.7 - resolution: "@babel/preset-env@npm:7.23.7" +"@babel/preset-env@npm:7.23.8, @babel/preset-env@npm:^7.0.0, @babel/preset-env@npm:^7.11.0": + version: 7.23.8 + resolution: "@babel/preset-env@npm:7.23.8" dependencies: "@babel/compat-data": "npm:^7.23.5" "@babel/helper-compilation-targets": "npm:^7.23.6" @@ -1304,7 +1303,7 @@ __metadata: "@babel/plugin-transform-block-scoping": "npm:^7.23.4" "@babel/plugin-transform-class-properties": "npm:^7.23.3" "@babel/plugin-transform-class-static-block": "npm:^7.23.4" - "@babel/plugin-transform-classes": "npm:^7.23.5" + "@babel/plugin-transform-classes": "npm:^7.23.8" "@babel/plugin-transform-computed-properties": "npm:^7.23.3" "@babel/plugin-transform-destructuring": "npm:^7.23.3" "@babel/plugin-transform-dotall-regex": "npm:^7.23.3" @@ -1353,7 +1352,7 @@ __metadata: semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 2059dee350c39aba0a1f128d00ccfd7abf97f92a9b661f4db07a96c11d91c928a9f1df39477583f068090627bff571b4415f1a4f94008d29f6ad8b124e69804e + checksum: 74493faa8b3e4bdd07ab3fbde80d7b13cc05321877f997698177c0bb082669c9b6a87397bd79ca6656df3c80c05e514ffed6d81510e2d8719a6e9647c038b7b9 languageName: node linkType: hard @@ -1392,12 +1391,12 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.23.7, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4": - version: 7.23.7 - resolution: "@babel/runtime@npm:7.23.7" +"@babel/runtime@npm:7.23.8, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4": + version: 7.23.8 + resolution: "@babel/runtime@npm:7.23.8" dependencies: regenerator-runtime: "npm:^0.14.0" - checksum: b29cf3ca6277aea8c5c823d9b86e7f7153757f07eaaa81d726f125de00ac0e7451c90845770f919826a94ade8f71a6bda9c0421410dfcc285ee17a40f8f8ca00 + checksum: ec8f1967a36164da6cac868533ffdff97badd76d23d7d820cc84f0818864accef972f22f9c6a710185db1e3810e353fc18c3da721e5bb3ee8bc61bdbabce03ff languageName: node linkType: hard @@ -9477,9 +9476,9 @@ __metadata: "@babel/helper-define-polyfill-provider": "npm:0.4.4" "@babel/plugin-proposal-decorators": "npm:7.23.7" "@babel/plugin-transform-runtime": "npm:7.23.7" - "@babel/preset-env": "npm:7.23.7" + "@babel/preset-env": "npm:7.23.8" "@babel/preset-typescript": "npm:7.23.3" - "@babel/runtime": "npm:7.23.7" + "@babel/runtime": "npm:7.23.8" "@braintree/sanitize-url": "npm:7.0.0" "@bundle-stats/plugin-webpack-filter": "npm:4.8.4" "@codemirror/autocomplete": "npm:6.11.1" From 08b8978ee81e2348810f43a7ce832bff5be3cf18 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 23:57:25 -0500 Subject: [PATCH 122/361] Update dependency ts-lit-plugin to v2.0.2 (#19370) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b0376b5aeb1b..3b27d3668916 100644 --- a/package.json +++ b/package.json @@ -236,7 +236,7 @@ "tar": "6.2.0", "terser-webpack-plugin": "5.3.10", "transform-async-modules-webpack-plugin": "1.0.2", - "ts-lit-plugin": "2.0.1", + "ts-lit-plugin": "2.0.2", "typescript": "5.3.3", "vinyl-buffer": "1.0.1", "vinyl-source-stream": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 583a573b1404..39aecf1df6a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9665,7 +9665,7 @@ __metadata: terser-webpack-plugin: "npm:5.3.10" tinykeys: "npm:2.1.0" transform-async-modules-webpack-plugin: "npm:1.0.2" - ts-lit-plugin: "npm:2.0.1" + ts-lit-plugin: "npm:2.0.2" tsparticles-engine: "npm:2.12.0" tsparticles-preset-links: "npm:2.12.0" typescript: "npm:5.3.3" @@ -15222,13 +15222,13 @@ __metadata: languageName: node linkType: hard -"ts-lit-plugin@npm:2.0.1": - version: 2.0.1 - resolution: "ts-lit-plugin@npm:2.0.1" +"ts-lit-plugin@npm:2.0.2": + version: 2.0.2 + resolution: "ts-lit-plugin@npm:2.0.2" dependencies: lit-analyzer: "npm:^2.0.1" web-component-analyzer: "npm:^2.0.0" - checksum: c447865b13afdcdef103c939706498051190ca9d377f7c64038f22a8c2fbf2f805bf7b9ccb1824b09289b5dc8c9072538446f18a4369bee35e94813396e5816f + checksum: f355a5dc1a0c2fc3bb0e4b104596ee49a94d456a96b00b2195c0983b93027a2b2bad967e633bbe3373362d94a5edfd3c7cb101e09e4756735d16c8705b88df78 languageName: node linkType: hard From d3b0d03e708c860a5885ba48812122aecc4ab29b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 23:59:13 -0500 Subject: [PATCH 123/361] Update dependency lit-analyzer to v2.0.3 (#19369) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 3b27d3668916..22e963d1dd9b 100644 --- a/package.json +++ b/package.json @@ -216,7 +216,7 @@ "instant-mocha": "1.5.2", "jszip": "3.10.1", "lint-staged": "15.2.0", - "lit-analyzer": "2.0.2", + "lit-analyzer": "2.0.3", "lodash.template": "4.5.0", "magic-string": "0.30.5", "map-stream": "0.0.7", diff --git a/yarn.lock b/yarn.lock index 39aecf1df6a1..06690482fa8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9631,7 +9631,7 @@ __metadata: leaflet-draw: "npm:1.0.4" lint-staged: "npm:15.2.0" lit: "npm:2.8.0" - lit-analyzer: "npm:2.0.2" + lit-analyzer: "npm:2.0.3" lodash.template: "npm:4.5.0" luxon: "npm:3.4.4" magic-string: "npm:0.30.5" @@ -11249,9 +11249,9 @@ __metadata: languageName: node linkType: hard -"lit-analyzer@npm:2.0.2, lit-analyzer@npm:^2.0.1": - version: 2.0.2 - resolution: "lit-analyzer@npm:2.0.2" +"lit-analyzer@npm:2.0.3, lit-analyzer@npm:^2.0.1": + version: 2.0.3 + resolution: "lit-analyzer@npm:2.0.3" dependencies: "@vscode/web-custom-data": "npm:^0.4.2" chalk: "npm:^2.4.2" @@ -11264,7 +11264,7 @@ __metadata: web-component-analyzer: "npm:^2.0.0" bin: lit-analyzer: cli.js - checksum: 247de26c9de2a340d9bf0d82ce87c8ff1a32c399111c5e66485e6831e204d3e3393614d7a430b24869c392861a075dba581647185c66c4febec9cebf4c3433e8 + checksum: 596bb3463fa7d0da28d156ae3e2240f721273950a5acae09e6d4a4f339c87bce9d7d43b64cea6d7a0f55fcf75a03435f26b330576ccba23078ec461e50d31238 languageName: node linkType: hard From 2cfaa4f2618b3eeab094e58fb62df676994cbbc4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 05:11:37 +0000 Subject: [PATCH 124/361] Update typescript-eslint monorepo to v6.18.1 (#19371) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 22e963d1dd9b..eae881f50147 100644 --- a/package.json +++ b/package.json @@ -183,8 +183,8 @@ "@types/tar": "6.1.10", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", - "@typescript-eslint/eslint-plugin": "6.18.0", - "@typescript-eslint/parser": "6.18.0", + "@typescript-eslint/eslint-plugin": "6.18.1", + "@typescript-eslint/parser": "6.18.1", "@web/dev-server": "0.1.38", "@web/dev-server-rollup": "0.4.1", "babel-loader": "9.1.3", diff --git a/yarn.lock b/yarn.lock index 06690482fa8d..64754fefa78c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4524,15 +4524,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.18.0": - version: 6.18.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.18.0" +"@typescript-eslint/eslint-plugin@npm:6.18.1": + version: 6.18.1 + resolution: "@typescript-eslint/eslint-plugin@npm:6.18.1" dependencies: "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:6.18.0" - "@typescript-eslint/type-utils": "npm:6.18.0" - "@typescript-eslint/utils": "npm:6.18.0" - "@typescript-eslint/visitor-keys": "npm:6.18.0" + "@typescript-eslint/scope-manager": "npm:6.18.1" + "@typescript-eslint/type-utils": "npm:6.18.1" + "@typescript-eslint/utils": "npm:6.18.1" + "@typescript-eslint/visitor-keys": "npm:6.18.1" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" ignore: "npm:^5.2.4" @@ -4545,44 +4545,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 7810a84f6d9cb735f6848aa4a7ef64c77740812afc0248fda63ec182910a1d045cd9a32d8e49b0e5323266db6da12a2fe50171147927b3186815a56f12c16ee7 + checksum: 451abba1f784539ba38cbe40af26c461facd848e90cbf0c440a98ca2a770ff74a794bafe1df7240e52a97e7cd72bade97d5de751dffbac269643460ad65e3b19 languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.18.0": - version: 6.18.0 - resolution: "@typescript-eslint/parser@npm:6.18.0" +"@typescript-eslint/parser@npm:6.18.1": + version: 6.18.1 + resolution: "@typescript-eslint/parser@npm:6.18.1" dependencies: - "@typescript-eslint/scope-manager": "npm:6.18.0" - "@typescript-eslint/types": "npm:6.18.0" - "@typescript-eslint/typescript-estree": "npm:6.18.0" - "@typescript-eslint/visitor-keys": "npm:6.18.0" + "@typescript-eslint/scope-manager": "npm:6.18.1" + "@typescript-eslint/types": "npm:6.18.1" + "@typescript-eslint/typescript-estree": "npm:6.18.1" + "@typescript-eslint/visitor-keys": "npm:6.18.1" debug: "npm:^4.3.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 6798332819f839454a8405e31cfaa0fe908d5966be929bef55e78ac51a0ff3868feb42b38e7772cedf88277f6b2841b3d91f6c573eacb945e2741ecae94047c7 + checksum: b853d39dcf886668f9aa9ea12094e722d35be20855dc7f01c80ee847bf4f7e27aa74693c3a33d4d813705214bda28be1d6c7ca29e590233f894f556203171d29 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.18.0": - version: 6.18.0 - resolution: "@typescript-eslint/scope-manager@npm:6.18.0" +"@typescript-eslint/scope-manager@npm:6.18.1": + version: 6.18.1 + resolution: "@typescript-eslint/scope-manager@npm:6.18.1" dependencies: - "@typescript-eslint/types": "npm:6.18.0" - "@typescript-eslint/visitor-keys": "npm:6.18.0" - checksum: c2c465e6803f78d3300142167a8a79dd2613c64cf464a40a9cf6b13a2c10c3d82ca30bb9c2d26aba7f054b8740b38e1d25f377fcdf917aba489d5b5ea2550858 + "@typescript-eslint/types": "npm:6.18.1" + "@typescript-eslint/visitor-keys": "npm:6.18.1" + checksum: ab75663cda67a2c95267f240f2e062a0aafab0df6d625043a134c8e1d61e193c0d3cfa49c802bd554b3fd80f4b7df5ea3f86ef2eb6994ba8b5e0790cc9868c84 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.18.0": - version: 6.18.0 - resolution: "@typescript-eslint/type-utils@npm:6.18.0" +"@typescript-eslint/type-utils@npm:6.18.1": + version: 6.18.1 + resolution: "@typescript-eslint/type-utils@npm:6.18.1" dependencies: - "@typescript-eslint/typescript-estree": "npm:6.18.0" - "@typescript-eslint/utils": "npm:6.18.0" + "@typescript-eslint/typescript-estree": "npm:6.18.1" + "@typescript-eslint/utils": "npm:6.18.1" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.0.1" peerDependencies: @@ -4590,23 +4590,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 9f4a392fe7b7f6b1fb02acbdaa331e764775f6404c29ca66774419e39552523d878227020526ca9c438d997555a99600f8d711496e9a435fb14a779e25ed094e + checksum: f775011c35aef10b11e7cffde698fca8b06b313785cd44422c60a40b6643d85a38cbd9a3cbdef011d963680d65383c40988d983e9dfd01258ae50a2f37f6d293 languageName: node linkType: hard -"@typescript-eslint/types@npm:6.18.0": - version: 6.18.0 - resolution: "@typescript-eslint/types@npm:6.18.0" - checksum: fc507ca7a1bfec04467087165ff6722f7b9aa9a089ecf0c17656824a951b92ca014766e480122de850057c63a3066628985eb0681c5bbb80ab41d94e7bb52288 +"@typescript-eslint/types@npm:6.18.1": + version: 6.18.1 + resolution: "@typescript-eslint/types@npm:6.18.1" + checksum: e304620953257a5af3b323697845d3fb41ffbb7944df2f84559675ef8ad71cc33011be30149efd8d34c5dedcbe92c6abee67cb1b95cb3dd56f15b9393b3435a6 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.18.0": - version: 6.18.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.18.0" +"@typescript-eslint/typescript-estree@npm:6.18.1": + version: 6.18.1 + resolution: "@typescript-eslint/typescript-estree@npm:6.18.1" dependencies: - "@typescript-eslint/types": "npm:6.18.0" - "@typescript-eslint/visitor-keys": "npm:6.18.0" + "@typescript-eslint/types": "npm:6.18.1" + "@typescript-eslint/visitor-keys": "npm:6.18.1" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -4616,34 +4616,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: b65392e944baba97ed98e99a1e7122b7b05fa0d9a082b48d0190b377ae9e2ae4ed72d505a2f0f05f2ca78908f0e4b0f1acd44d345c7f4f4415fcec6bb2c57791 + checksum: 33307bc87c3270f84f149545da79a15afaafacc5671e42f4aa827947f09c35ed114705f108ffa59d6ab175f8b838aa08cf10f9efe5b7793aca0792f879bbc7ca languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.18.0": - version: 6.18.0 - resolution: "@typescript-eslint/utils@npm:6.18.0" +"@typescript-eslint/utils@npm:6.18.1": + version: 6.18.1 + resolution: "@typescript-eslint/utils@npm:6.18.1" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" "@types/json-schema": "npm:^7.0.12" "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:6.18.0" - "@typescript-eslint/types": "npm:6.18.0" - "@typescript-eslint/typescript-estree": "npm:6.18.0" + "@typescript-eslint/scope-manager": "npm:6.18.1" + "@typescript-eslint/types": "npm:6.18.1" + "@typescript-eslint/typescript-estree": "npm:6.18.1" semver: "npm:^7.5.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: f91798069e337ed42b7e415aabded833d540dab9adf66ae88183003428892584946f20a5496aae2dc65fc0f65b66496baed785a3470ee782b6e2dd25b9200c6c + checksum: 967728f062ec7ef434b9d05af6b45ae59e0f8f314e4aa7cefc8e2c30a277cf269b7913f3e9f8d26a86c3faf8b2c9385ba1221cfcd856e9b228421fc6508b41bc languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.18.0": - version: 6.18.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.18.0" +"@typescript-eslint/visitor-keys@npm:6.18.1": + version: 6.18.1 + resolution: "@typescript-eslint/visitor-keys@npm:6.18.1" dependencies: - "@typescript-eslint/types": "npm:6.18.0" + "@typescript-eslint/types": "npm:6.18.1" eslint-visitor-keys: "npm:^3.4.1" - checksum: bf34a357549d515607c761f385b7c7c82aaa07795cada0be2e1e3860c5103fbf731408ac07eaeb0517b51426d77ef9b194dfb94f205c776107a46e0d0027b452 + checksum: 2d6c5ffa52e89caec0b4958d7079fb4ca9f17c19b5f5d5b8446b4eef0079fd59cd9959f469cc13c4e7d72ef4c47849e561fe323f3cebafa01bc916d43082e57b languageName: node linkType: hard @@ -9570,8 +9570,8 @@ __metadata: "@types/tar": "npm:6.1.10" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" - "@typescript-eslint/eslint-plugin": "npm:6.18.0" - "@typescript-eslint/parser": "npm:6.18.0" + "@typescript-eslint/eslint-plugin": "npm:6.18.1" + "@typescript-eslint/parser": "npm:6.18.1" "@vaadin/combo-box": "npm:24.3.2" "@vaadin/vaadin-themable-mixin": "npm:24.3.2" "@vibrant/color": "npm:3.2.1-alpha.1" From 6cdf1c168910edc778ebed0910c6bd42e1684ece Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 12 Jan 2024 16:25:34 +0100 Subject: [PATCH 125/361] Bumped version to 20240112.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d9414825fabf..b316b4da84e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240104.0" +version = "20240112.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 11a9a2f56bb67aeb646879ed09edbb17850bfa9a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 13 Jan 2024 14:38:05 -0500 Subject: [PATCH 126/361] Update dependency @lit-labs/virtualizer to v2.0.12 (#19380) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index eae881f50147..8b51c1035617 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@lit-labs/context": "0.4.1", "@lit-labs/motion": "1.0.6", "@lit-labs/observers": "2.0.2", - "@lit-labs/virtualizer": "2.0.11", + "@lit-labs/virtualizer": "2.0.12", "@lrnwebcomponents/simple-tooltip": "7.0.18", "@material/chips": "=14.0.0-canary.53b3cad2f.0", "@material/data-table": "=14.0.0-canary.53b3cad2f.0", diff --git a/yarn.lock b/yarn.lock index 64754fefa78c..096f8277f40d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2132,13 +2132,13 @@ __metadata: languageName: node linkType: hard -"@lit-labs/virtualizer@npm:2.0.11": - version: 2.0.11 - resolution: "@lit-labs/virtualizer@npm:2.0.11" +"@lit-labs/virtualizer@npm:2.0.12": + version: 2.0.12 + resolution: "@lit-labs/virtualizer@npm:2.0.12" dependencies: lit: "npm:^3.1.0" tslib: "npm:^2.0.3" - checksum: 9b44ef579c35f2063a67ec80db60813ffc9f84a3e66b4c7def46bdc6dad0507c4a8a867637233899d3671a34643bcf31f12801136946f62203e34de41810a53d + checksum: e3568ea6ef5d9362959ea2da873aaa2af27ef28c511189f38555aadbbf79919d5840f97926c62c56dd62aa8f1fd220eab88106802411cffce1121233c602cf73 languageName: node linkType: hard @@ -9508,7 +9508,7 @@ __metadata: "@lit-labs/context": "npm:0.4.1" "@lit-labs/motion": "npm:1.0.6" "@lit-labs/observers": "npm:2.0.2" - "@lit-labs/virtualizer": "npm:2.0.11" + "@lit-labs/virtualizer": "npm:2.0.12" "@lokalise/node-api": "npm:12.1.0" "@lrnwebcomponents/simple-tooltip": "npm:7.0.18" "@material/chips": "npm:=14.0.0-canary.53b3cad2f.0" From 148c0c98d3903184ae27cea145c59c91f0d914dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 13 Jan 2024 14:39:08 -0500 Subject: [PATCH 127/361] Update dependency hls.js to v1.5.0 (#19377) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8b51c1035617..c7870cb867c9 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "element-internals-polyfill": "1.3.10", "fuse.js": "7.0.0", "google-timezones-json": "1.2.0", - "hls.js": "1.4.14", + "hls.js": "1.5.0", "home-assistant-js-websocket": "9.1.0", "idb-keyval": "6.2.1", "intl-messageformat": "10.5.8", diff --git a/yarn.lock b/yarn.lock index 096f8277f40d..995ccfe1c61b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9461,10 +9461,10 @@ __metadata: languageName: node linkType: hard -"hls.js@npm:1.4.14": - version: 1.4.14 - resolution: "hls.js@npm:1.4.14" - checksum: 9b4bbb379022da6a0c923d351c4592aac3be271d7458804ee7beaf6fa61f58a2538f16b5b23e180c7d636aa033ba373a32829b803dd654627fac5b647fac9e67 +"hls.js@npm:1.5.0": + version: 1.5.0 + resolution: "hls.js@npm:1.5.0" + checksum: ba63871fba052a2e6f7bd744333a1ff18edd61535b51cd5a6b3f0331527333ce1954c3a4d5e95bcb20c1fc8c7c87a75ca338f008ac213486f7ca4a9e08982f92 languageName: node linkType: hard @@ -9618,7 +9618,7 @@ __metadata: gulp-merge-json: "npm:2.1.2" gulp-rename: "npm:2.0.0" gulp-zopfli-green: "npm:6.0.1" - hls.js: "npm:1.4.14" + hls.js: "npm:1.5.0" home-assistant-js-websocket: "npm:9.1.0" html-minifier-terser: "npm:7.2.0" husky: "npm:8.0.3" From 01e80108d7826888afcc1a7fb8b0121e6c05d3a4 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Sat, 13 Jan 2024 23:30:47 +0100 Subject: [PATCH 128/361] Fix nightly builds (#19386) --- .github/workflows/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 4ff941bb8ac2..6ff98e862292 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -42,7 +42,7 @@ jobs: LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }} - name: Bump version - run: script/version_bump.cjs nightly + run: script/version_bump.js nightly - name: Build nightly Python wheels run: | From f63ba0c20ac8743ecef848210742d6537a07ca54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 13 Jan 2024 22:36:10 -0500 Subject: [PATCH 129/361] Update dependency hls.js to v1.5.1 (#19387) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c7870cb867c9..cf5b5b429d61 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "element-internals-polyfill": "1.3.10", "fuse.js": "7.0.0", "google-timezones-json": "1.2.0", - "hls.js": "1.5.0", + "hls.js": "1.5.1", "home-assistant-js-websocket": "9.1.0", "idb-keyval": "6.2.1", "intl-messageformat": "10.5.8", diff --git a/yarn.lock b/yarn.lock index 995ccfe1c61b..4b2815b76fa3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9461,10 +9461,10 @@ __metadata: languageName: node linkType: hard -"hls.js@npm:1.5.0": - version: 1.5.0 - resolution: "hls.js@npm:1.5.0" - checksum: ba63871fba052a2e6f7bd744333a1ff18edd61535b51cd5a6b3f0331527333ce1954c3a4d5e95bcb20c1fc8c7c87a75ca338f008ac213486f7ca4a9e08982f92 +"hls.js@npm:1.5.1": + version: 1.5.1 + resolution: "hls.js@npm:1.5.1" + checksum: 1e2452892ec62a370fecf5c8d643154fdb7f49c41693a9b757c3d9f62a1383402f1d4be78456a764956533621676a67bc584fec7b7c1ed50c1415951b125b02b languageName: node linkType: hard @@ -9618,7 +9618,7 @@ __metadata: gulp-merge-json: "npm:2.1.2" gulp-rename: "npm:2.0.0" gulp-zopfli-green: "npm:6.0.1" - hls.js: "npm:1.5.0" + hls.js: "npm:1.5.1" home-assistant-js-websocket: "npm:9.1.0" html-minifier-terser: "npm:7.2.0" husky: "npm:8.0.3" From 7c389a6cf0e925325c90d8948a9fb7dc7f070bb5 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Sun, 14 Jan 2024 03:32:28 -0500 Subject: [PATCH 130/361] Fix dependencies labeler (#19391) --- .github/labeler.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index bc82f5f31a3e..e772cc81a577 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -24,19 +24,20 @@ Design: - src/fake_data/** Dependencies: - - changed-files: - # Match when only these files are changed (i.e. don't match PRs that happen to add or remove packages) - - any-glob-to-all-files: - - package.json - - renovate.json - - yarn.lock - - .yarn/** - - .yarnrc.yml - - .nvmrc - # Dependabot and Renovate branches always match (i.e. compatibility tweaks by members considered minor) - - head-branch: - - "^renovate/" - - "^dependabot/" + - any: + - changed-files: + # Match when only these files are changed (i.e. don't match PRs that happen to add or remove packages) + - any-glob-to-all-files: + - package.json + - renovate.json + - yarn.lock + - .yarn/** + - .yarnrc.yml + - .nvmrc + # Dependabot and Renovate branches always match (i.e. compatibility tweaks by members considered minor) + - head-branch: + - "^renovate/" + - "^dependabot/" GitHub Actions: - changed-files: From 5aa5ce8b5e3e3b742926c7aabcb4b8340c65b0d4 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Sun, 14 Jan 2024 12:23:42 -0800 Subject: [PATCH 131/361] Fix blank_before_percent (#19397) * Fix blank_before_percent * types n stuff --- src/common/entity/compute_state_display.ts | 2 +- src/common/translations/blank_before_percent.ts | 2 +- src/common/translations/blank_before_unit.ts | 2 +- src/components/ha-big-number.ts | 4 +++- src/components/ha-control-number-buttons.ts | 4 +++- .../climate/ha-state-control-climate-temperature.ts | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/common/entity/compute_state_display.ts b/src/common/entity/compute_state_display.ts index 70a41a589371..8410c284e77a 100644 --- a/src/common/entity/compute_state_display.ts +++ b/src/common/entity/compute_state_display.ts @@ -113,7 +113,7 @@ export const computeStateDisplayFromEntityAttributes = ( const unit = attributes.unit_of_measurement; if (unit) { - return `${value}${blankBeforeUnit(unit)}${unit}`; + return `${value}${blankBeforeUnit(unit, locale)}${unit}`; } return value; diff --git a/src/common/translations/blank_before_percent.ts b/src/common/translations/blank_before_percent.ts index 49fece6675b0..4c489c96c82f 100644 --- a/src/common/translations/blank_before_percent.ts +++ b/src/common/translations/blank_before_percent.ts @@ -4,7 +4,7 @@ import { FrontendLocaleData } from "../../data/translation"; export const blankBeforePercent = ( localeOptions: FrontendLocaleData ): string => { - switch (localeOptions?.language) { + switch (localeOptions.language) { case "cz": case "de": case "fi": diff --git a/src/common/translations/blank_before_unit.ts b/src/common/translations/blank_before_unit.ts index 34fe8ab2d562..32a430430a6e 100644 --- a/src/common/translations/blank_before_unit.ts +++ b/src/common/translations/blank_before_unit.ts @@ -3,7 +3,7 @@ import { blankBeforePercent } from "./blank_before_percent"; export const blankBeforeUnit = ( unit: string, - localeOptions?: FrontendLocaleData + localeOptions: FrontendLocaleData | undefined ): string => { if (unit === "°") { return ""; diff --git a/src/components/ha-big-number.ts b/src/components/ha-big-number.ts index 48abfe232709..f9e3d8e62d33 100644 --- a/src/components/ha-big-number.ts +++ b/src/components/ha-big-number.ts @@ -32,7 +32,9 @@ export class HaBigNumber extends LitElement { const temperatureDecimal = formatted.replace(integer, ""); const formattedValue = `${this.value}${ - this.unit ? `${blankBeforeUnit(this.unit)}${this.unit}` : "" + this.unit + ? `${blankBeforeUnit(this.unit, this.hass?.locale)}${this.unit}` + : "" }`; const unitBottom = this.unitPosition === "bottom"; diff --git a/src/components/ha-control-number-buttons.ts b/src/components/ha-control-number-buttons.ts index 1311b244b35c..61f76e708f9a 100644 --- a/src/components/ha-control-number-buttons.ts +++ b/src/components/ha-control-number-buttons.ts @@ -136,7 +136,9 @@ export class HaControlNumberButton extends LitElement { this.value != null ? formatNumber(this.value, this.locale, this.formatOptions) : ""; - const unit = this.unit ? `${blankBeforeUnit(this.unit)}${this.unit}` : ""; + const unit = this.unit + ? `${blankBeforeUnit(this.unit, this.locale)}${this.unit}` + : ""; return html`
diff --git a/src/state-control/climate/ha-state-control-climate-temperature.ts b/src/state-control/climate/ha-state-control-climate-temperature.ts index 0264af5ec7b3..756587160306 100644 --- a/src/state-control/climate/ha-state-control-climate-temperature.ts +++ b/src/state-control/climate/ha-state-control-climate-temperature.ts @@ -261,7 +261,7 @@ export class HaStateControlClimateTemperature extends LitElement { this.hass.locale, formatOptions ); - return html`${formatted}${blankBeforeUnit(unit)}${unit}`; + return html`${formatted}${blankBeforeUnit(unit, this.hass.locale)}${unit}`; } private _renderCurrent(temperature: number, style: "normal" | "big") { From 08fb3ced5f4b526cf7c13d08b3cebcea63d1d820 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 07:56:19 +0100 Subject: [PATCH 132/361] Bump actions/cache from 3.3.2 to 3.3.3 (#19400) --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 85f34c02887d..f19097a4fa88 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,7 +37,7 @@ jobs: - name: Build resources run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data gather-gallery-pages - name: Setup lint cache - uses: actions/cache@v3.3.2 + uses: actions/cache@v3.3.3 with: path: | node_modules/.cache/prettier From 6256192c0c74d0633a229fa5ab59bdd4602c2e94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 09:20:26 +0100 Subject: [PATCH 133/361] Bump actions/upload-artifact from 3.1.3 to 4.1.0 (#19401) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/nightly.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f19097a4fa88..76a9563f805c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -88,7 +88,7 @@ jobs: env: IS_TEST: "true" - name: Upload bundle stats - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.1.0 with: name: frontend-bundle-stats path: build/stats/*.json @@ -112,7 +112,7 @@ jobs: env: IS_TEST: "true" - name: Upload bundle stats - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.1.0 with: name: supervisor-bundle-stats path: build/stats/*.json diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 6ff98e862292..4502edab9e5c 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -57,14 +57,14 @@ jobs: run: tar -czvf translations.tar.gz translations - name: Upload build artifacts - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.1.0 with: name: wheels path: dist/home_assistant_frontend*.whl if-no-files-found: error - name: Upload translations - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.1.0 with: name: translations path: translations.tar.gz From 7e933673943497d7e5836d3c33c914dd1ef4f2e8 Mon Sep 17 00:00:00 2001 From: Yosi Levy <37745463+yosilevy@users.noreply.github.com> Date: Mon, 15 Jan 2024 14:55:11 +0200 Subject: [PATCH 134/361] RTL stack card fix (#19394) --- .../lovelace/cards/hui-horizontal-stack-card.ts | 9 ++++++++- .../config-elements/hui-stack-card-editor.ts | 14 ++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/panels/lovelace/cards/hui-horizontal-stack-card.ts b/src/panels/lovelace/cards/hui-horizontal-stack-card.ts index 72da14e3ea67..57adc6f581f1 100644 --- a/src/panels/lovelace/cards/hui-horizontal-stack-card.ts +++ b/src/panels/lovelace/cards/hui-horizontal-stack-card.ts @@ -29,19 +29,26 @@ export class HuiHorizontalStackCard extends HuiStackCard { display: flex; height: 100%; } + #root { + --stack-card-side-margin: 4px; + } #root > * { flex: 1 1 0; margin: var( --horizontal-stack-card-margin, - var(--stack-card-margin, 0 4px) + var(--stack-card-margin, 0 var(--stack-card-side-margin)) ); min-width: 0; } #root > *:first-child { margin-left: 0; + margin-inline-start: 0; + margin-inline-end: var(--stack-card-side-margin); } #root > *:last-child { margin-right: 0; + margin-inline-end: 0; + margin-inline-start: var(--stack-card-side-margin); } `, ]; diff --git a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts index b801108ff53c..2b190b9354c3 100644 --- a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts @@ -1,6 +1,4 @@ import { - mdiArrowLeft, - mdiArrowRight, mdiCodeBraces, mdiContentCopy, mdiContentCut, @@ -25,6 +23,8 @@ import { import { storage } from "../../../../common/decorators/storage"; import { HASSDomEvent, fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-icon-button"; +import "../../../../components/ha-icon-button-arrow-prev"; +import "../../../../components/ha-icon-button-arrow-next"; import type { LovelaceCardConfig } from "../../../../data/lovelace/config/card"; import type { LovelaceConfig } from "../../../../data/lovelace/config/types"; import { HomeAssistant } from "../../../../types"; @@ -131,25 +131,23 @@ export class HuiStackCardEditor .path=${isGuiMode ? mdiCodeBraces : mdiListBoxOutline} > - + > - + > Date: Mon, 15 Jan 2024 14:12:11 +0100 Subject: [PATCH 135/361] Update vaadinWebComponents monorepo to v24.3.3 (#19403) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 171 ++++++++++++++++++++++++++------------------------- 2 files changed, 88 insertions(+), 87 deletions(-) diff --git a/package.json b/package.json index cf5b5b429d61..02ece2fcfea6 100644 --- a/package.json +++ b/package.json @@ -89,8 +89,8 @@ "@polymer/paper-toast": "3.0.1", "@polymer/polymer": "3.5.1", "@thomasloven/round-slider": "0.6.0", - "@vaadin/combo-box": "24.3.2", - "@vaadin/vaadin-themable-mixin": "24.3.2", + "@vaadin/combo-box": "24.3.3", + "@vaadin/vaadin-themable-mixin": "24.3.3", "@vibrant/color": "3.2.1-alpha.1", "@vibrant/core": "3.2.1-alpha.1", "@vibrant/quantizer-mmcq": "3.2.1-alpha.1", diff --git a/yarn.lock b/yarn.lock index 4b2815b76fa3..7c879ce1bacb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4654,127 +4654,128 @@ __metadata: languageName: node linkType: hard -"@vaadin/a11y-base@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/a11y-base@npm:24.3.2" +"@vaadin/a11y-base@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/a11y-base@npm:24.3.3" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.2" + "@vaadin/component-base": "npm:~24.3.3" lit: "npm:^3.0.0" - checksum: 8ddff8610cdf74816bcd9f24e6d7985c869cc5691de0a5928bf794d36e7e655a9d8e51c88c4918f5784dc35331a09bccf1de3233ed263a0854fa4bafc171a21e + checksum: fca4baa66ed32b95a4318720b2a3a94ce1f01ceb13f71a176baab79b75396f6d19e8c368fca53c64dab33742b72824dcdf93180dc4a1db6950525631d1d79c76 languageName: node linkType: hard -"@vaadin/combo-box@npm:24.3.2": - version: 24.3.2 - resolution: "@vaadin/combo-box@npm:24.3.2" +"@vaadin/combo-box@npm:24.3.3": + version: 24.3.3 + resolution: "@vaadin/combo-box@npm:24.3.3" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.2" - "@vaadin/component-base": "npm:~24.3.2" - "@vaadin/field-base": "npm:~24.3.2" - "@vaadin/input-container": "npm:~24.3.2" - "@vaadin/item": "npm:~24.3.2" - "@vaadin/lit-renderer": "npm:~24.3.2" - "@vaadin/overlay": "npm:~24.3.2" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.2" - "@vaadin/vaadin-material-styles": "npm:~24.3.2" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.2" - checksum: 1b1a5b80977a782e74717030dc5007bb29668534b6a25dca592f2cc8d666479682c622501847bdf87e764fb688f5e23b0070e6089114e10aebdc7c1915c62f7b + "@vaadin/a11y-base": "npm:~24.3.3" + "@vaadin/component-base": "npm:~24.3.3" + "@vaadin/field-base": "npm:~24.3.3" + "@vaadin/input-container": "npm:~24.3.3" + "@vaadin/item": "npm:~24.3.3" + "@vaadin/lit-renderer": "npm:~24.3.3" + "@vaadin/overlay": "npm:~24.3.3" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.3" + "@vaadin/vaadin-material-styles": "npm:~24.3.3" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" + checksum: e7c4045585c0b08b5c3b6708f1c0a2664721126916926b0cfa05a6c0fa6e0ecac079616697ba08a21a9756ffdc83cb0db87cfb5892d3cfb8aecebc50c3f7c9e5 languageName: node linkType: hard -"@vaadin/component-base@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/component-base@npm:24.3.2" +"@vaadin/component-base@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/component-base@npm:24.3.3" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" "@vaadin/vaadin-development-mode-detector": "npm:^2.0.0" "@vaadin/vaadin-usage-statistics": "npm:^2.1.0" lit: "npm:^3.0.0" - checksum: b5fc7a7f8cb9ad26a1a4f4b554ac78f29c34ecaab74fd48516656d70347c7a3c9ae00a958b9a9a31f9861cf29bc640166567d0a8102b9dcf75e6ea08e184a102 + checksum: 57ab8b202d21cf71ce9db3762f1024321c997a48c4f7a1c79aa6cf8c108b862fb61a831c003c06f51b649e5a5cb311cf71ea8e366fc2897adf4d80818541773e languageName: node linkType: hard -"@vaadin/field-base@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/field-base@npm:24.3.2" +"@vaadin/field-base@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/field-base@npm:24.3.3" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.2" - "@vaadin/component-base": "npm:~24.3.2" + "@vaadin/a11y-base": "npm:~24.3.3" + "@vaadin/component-base": "npm:~24.3.3" lit: "npm:^3.0.0" - checksum: 1be21ff4e6eabaa203ae1ab8f2f55033d1830359782bac7e001721c22d5e7c404436644c3d7e2bc9e5af1f743949f37f874c99495f3d3e2df47a51aed2b5f046 + checksum: f19559702f0a85e27257963a2e9c176ad1a9bc83e86d3d2460fa9ba28c199bebf2bd1fde00009106cf8b854c1e6c530fc8aaf5a911a023781d45cbcc029f5963 languageName: node linkType: hard -"@vaadin/icon@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/icon@npm:24.3.2" +"@vaadin/icon@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/icon@npm:24.3.3" dependencies: + "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.2" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.2" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.2" + "@vaadin/component-base": "npm:~24.3.3" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.3" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" lit: "npm:^3.0.0" - checksum: 2a5f9eeed5aac093f38878f749c774ad20ecf2ca4105c606f6b1938a0f3e4181b79a8ac8c51f7b3d1990552cd6bcdc04984c1846b41f7ef4143fc96b2b276445 + checksum: f08d526100c8ddcb001e9b0c64be8dfb8ea42d93092617a089252e2c3162d6ade56df98fb8112992c8e8a24e84779fca2efe7e032c4676c7a59bfacd55b69943 languageName: node linkType: hard -"@vaadin/input-container@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/input-container@npm:24.3.2" +"@vaadin/input-container@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/input-container@npm:24.3.3" dependencies: "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.2" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.2" - "@vaadin/vaadin-material-styles": "npm:~24.3.2" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.2" + "@vaadin/component-base": "npm:~24.3.3" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.3" + "@vaadin/vaadin-material-styles": "npm:~24.3.3" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" lit: "npm:^3.0.0" - checksum: b43926c876259e189d1910696f539fbb90b17478fca101bd3216a471afaf16d765c8d5952bddafe8282fcfe9babe7dfc819f84ca2adb108eba4616a32858ffde + checksum: fae301ac2bd31e1304a0804b727292393a46ad090ee7a1dce6ddfa8d1aabd934607848b3cfc38d4d9f887ef8c1db228e6e63068085afdd45dec0831cca57fa2d languageName: node linkType: hard -"@vaadin/item@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/item@npm:24.3.2" +"@vaadin/item@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/item@npm:24.3.3" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.2" - "@vaadin/component-base": "npm:~24.3.2" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.2" - "@vaadin/vaadin-material-styles": "npm:~24.3.2" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.2" - checksum: b56cbe033a6fbf591edd26780658d5cc89338d79ced469812be0f6f0f462a571bc1550f835681d6a6981119dd958810312abe31c6641317e8be5dbcc3cfd1f01 + "@vaadin/a11y-base": "npm:~24.3.3" + "@vaadin/component-base": "npm:~24.3.3" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.3" + "@vaadin/vaadin-material-styles": "npm:~24.3.3" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" + checksum: 7a49488a543493bd9586ab85d20d8863c51c06b074581e8e7ab4aea3cfeabc32d0a8ca1352581df801726bf6ff07e5950d67ceb7a3f50cacb53185e95c4a6ad6 languageName: node linkType: hard -"@vaadin/lit-renderer@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/lit-renderer@npm:24.3.2" +"@vaadin/lit-renderer@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/lit-renderer@npm:24.3.3" dependencies: lit: "npm:^3.0.0" - checksum: 3736065a55f69c13f76d202c7a9a4f690f2c9e84a127e9558ff522b113698c5a6ea8bf8f4aefbf3d532bd5eb2798f427ab0e35459f270d3c458861fb1861c194 + checksum: 56c5f6d070989405a15fabae6b1e7cd452fd8b944169a40e3e1cf07ceb106fbc4cf2e07de4b8709f6ee8306d2abc48050f11140fc3f7e3ae9691ade4de57b305 languageName: node linkType: hard -"@vaadin/overlay@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/overlay@npm:24.3.2" +"@vaadin/overlay@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/overlay@npm:24.3.3" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.2" - "@vaadin/component-base": "npm:~24.3.2" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.2" - "@vaadin/vaadin-material-styles": "npm:~24.3.2" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.2" - checksum: e04aff31f8cf2475dfed3d7f29ab1c7e08d914c6c74fbd7abd92bdd89a2c9ace810436cb2b31840fa6e6a152f1b39596f4c6625611c9174d1fdff7a8c20acafa + "@vaadin/a11y-base": "npm:~24.3.3" + "@vaadin/component-base": "npm:~24.3.3" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.3" + "@vaadin/vaadin-material-styles": "npm:~24.3.3" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" + checksum: 3d21ae486b4d11850850cc6bed0269adcf31f1649be3d558aa3c65849ac2090dde01c948e2e6a5d4267db12675b263e07052f51117847587f2fe97fb543f0bbd languageName: node linkType: hard @@ -4785,36 +4786,36 @@ __metadata: languageName: node linkType: hard -"@vaadin/vaadin-lumo-styles@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/vaadin-lumo-styles@npm:24.3.2" +"@vaadin/vaadin-lumo-styles@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/vaadin-lumo-styles@npm:24.3.3" dependencies: "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.2" - "@vaadin/icon": "npm:~24.3.2" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.2" - checksum: e37abd1d54d5045815f91efe8ef845fd2e5417bf7a8f1aaff8d98adf34c0cf0ec25990d0cb62f869d04777b9e7f2b64437e8d83cec05121e482d60b4bba61ff1 + "@vaadin/component-base": "npm:~24.3.3" + "@vaadin/icon": "npm:~24.3.3" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" + checksum: f9ad5214e3fe54633345d9b580edd3f6a4dd5f630a89c4549f33f1c3edea50e245b5fa52b270e0b5f006d2b22eb7b30cd1306ff27d37006f0ac0f10c6965cedc languageName: node linkType: hard -"@vaadin/vaadin-material-styles@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/vaadin-material-styles@npm:24.3.2" +"@vaadin/vaadin-material-styles@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/vaadin-material-styles@npm:24.3.3" dependencies: "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.2" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.2" - checksum: 8de34251d755d0120d9b79be6c0fa481c928c3ad6044caae3b4f9217c404cadb032fa8c8ab4fcd0150f89e0f7a5ade4660964056e4470923353c2f234ca0673b + "@vaadin/component-base": "npm:~24.3.3" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" + checksum: 8e5fd5cb4b9826d750ce971cbf7808afdf57a215866cd62b397f7b967b2aeb250a31264e7d88ba6aa16c0d68fc273ad0dcf2ab71ab0342cd0cc40422887dee1a languageName: node linkType: hard -"@vaadin/vaadin-themable-mixin@npm:24.3.2, @vaadin/vaadin-themable-mixin@npm:~24.3.2": - version: 24.3.2 - resolution: "@vaadin/vaadin-themable-mixin@npm:24.3.2" +"@vaadin/vaadin-themable-mixin@npm:24.3.3, @vaadin/vaadin-themable-mixin@npm:~24.3.3": + version: 24.3.3 + resolution: "@vaadin/vaadin-themable-mixin@npm:24.3.3" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" lit: "npm:^3.0.0" - checksum: cb85790319b4f76eabf6dd9ff3455781773a3bfcd534fd2ab040c5a792e485bbbb60aa36f8f6c837c1d42ece069ea54e2cd67397053d0f64eacea009ddc5394b + checksum: 7a2cc59d2f77b559c50b9a7bd1b8447c49d01b68f11fa8d7fe539059dc9a1bfc56a091105ec668bdd72b769ded38253705556912853b72d3d168d146a761491d languageName: node linkType: hard @@ -9572,8 +9573,8 @@ __metadata: "@types/webspeechapi": "npm:0.0.29" "@typescript-eslint/eslint-plugin": "npm:6.18.1" "@typescript-eslint/parser": "npm:6.18.1" - "@vaadin/combo-box": "npm:24.3.2" - "@vaadin/vaadin-themable-mixin": "npm:24.3.2" + "@vaadin/combo-box": "npm:24.3.3" + "@vaadin/vaadin-themable-mixin": "npm:24.3.3" "@vibrant/color": "npm:3.2.1-alpha.1" "@vibrant/core": "npm:3.2.1-alpha.1" "@vibrant/quantizer-mmcq": "npm:3.2.1-alpha.1" From 62f6766e1b90bf15def3e5bf1c3ed6b4fb18cc64 Mon Sep 17 00:00:00 2001 From: Cody C <50791984+codyc1515@users.noreply.github.com> Date: Tue, 16 Jan 2024 03:31:37 +1300 Subject: [PATCH 136/361] Fix onboarding state exception following restore (#19389) Fixes #19388 --- src/data/onboarding.ts | 4 ++++ src/onboarding/ha-onboarding.ts | 2 +- src/onboarding/onboarding-restore-backup.ts | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/data/onboarding.ts b/src/data/onboarding.ts index 9e5c751adae7..170bbadee85d 100644 --- a/src/data/onboarding.ts +++ b/src/data/onboarding.ts @@ -84,5 +84,9 @@ export const fetchInstallationType = async (): Promise => { throw Error("unauthorized"); } + if (response.status === 404) { + throw Error("not_found"); + } + return response.json(); }; diff --git a/src/onboarding/ha-onboarding.ts b/src/onboarding/ha-onboarding.ts index 02981a76cb37..e1e9f6578e5e 100644 --- a/src/onboarding/ha-onboarding.ts +++ b/src/onboarding/ha-onboarding.ts @@ -286,7 +286,7 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) { try { const response = await (window.stepsPromise || fetchOnboardingOverview()); - if (response.status === 404) { + if (response.status === 401 || response.status === 404) { // We don't load the component when onboarding is done document.location.assign("/"); return; diff --git a/src/onboarding/onboarding-restore-backup.ts b/src/onboarding/onboarding-restore-backup.ts index 58fd1dcb97cb..a9a004ce6c4e 100644 --- a/src/onboarding/onboarding-restore-backup.ts +++ b/src/onboarding/onboarding-restore-backup.ts @@ -62,7 +62,10 @@ class OnboardingRestoreBackup extends LitElement { try { await fetchInstallationType(); } catch (err: any) { - if ((err as Error).message === "unauthorized") { + if ( + (err as Error).message === "unauthorized" || + (err as Error).message === "not_found" + ) { window.location.replace("/"); } } From 61eaa07b25efd1883a9a435f6f5e631c728ab2a8 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Mon, 15 Jan 2024 06:33:00 -0800 Subject: [PATCH 137/361] Honor display_precision over duration-type format (#19396) --- src/common/entity/compute_state_display.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/entity/compute_state_display.ts b/src/common/entity/compute_state_display.ts index 8410c284e77a..6d5e36d5c231 100644 --- a/src/common/entity/compute_state_display.ts +++ b/src/common/entity/compute_state_display.ts @@ -79,7 +79,8 @@ export const computeStateDisplayFromEntityAttributes = ( if ( attributes.device_class === "duration" && attributes.unit_of_measurement && - UNIT_TO_MILLISECOND_CONVERT[attributes.unit_of_measurement] + UNIT_TO_MILLISECOND_CONVERT[attributes.unit_of_measurement] && + entity?.display_precision === undefined ) { try { return formatDuration(state, attributes.unit_of_measurement); From 5a91f613cad263c2dd67570443832548bfd0186e Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Mon, 15 Jan 2024 06:34:19 -0800 Subject: [PATCH 138/361] Remove fire-dom-event from action struct (#19390) --- src/panels/lovelace/editor/structs/action-struct.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/panels/lovelace/editor/structs/action-struct.ts b/src/panels/lovelace/editor/structs/action-struct.ts index 591b9c0e8f39..d0229a990819 100644 --- a/src/panels/lovelace/editor/structs/action-struct.ts +++ b/src/panels/lovelace/editor/structs/action-struct.ts @@ -58,10 +58,6 @@ const actionConfigStructAssist = type({ start_listening: optional(boolean()), }); -const actionConfigStructCustom = type({ - action: literal("fire-dom-event"), -}); - export const actionConfigStructType = object({ action: enums([ "none", @@ -81,9 +77,6 @@ export const actionConfigStruct = dynamic((value) => { case "call-service": { return actionConfigStructService; } - case "fire-dom-event": { - return actionConfigStructCustom; - } case "navigate": { return actionConfigStructNavigate; } From 920df03cc18df2db3e7816e9aa29a84f103c4815 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 15 Jan 2024 09:34:46 -0500 Subject: [PATCH 139/361] Fix missing imports (1 of 2) (#19363) --- .../src/pages/components/ha-expansion-panel.ts | 1 + gallery/src/pages/date-time/date-time-numeric.ts | 15 ++++++++------- gallery/src/pages/date-time/date-time-seconds.ts | 15 ++++++++------- .../src/pages/date-time/date-time-short-year.ts | 15 ++++++++------- gallery/src/pages/date-time/date-time-short.ts | 15 ++++++++------- gallery/src/pages/date-time/date-time.ts | 15 ++++++++------- gallery/src/pages/date-time/time-seconds.ts | 16 +++++++++------- gallery/src/pages/date-time/time-weekday.ts | 16 +++++++++------- gallery/src/pages/date-time/time.ts | 15 ++++++++------- hassio/src/system/hassio-supervisor-log.ts | 3 ++- src/components/ha-control-number-buttons.ts | 1 + src/components/ha-icon-picker.ts | 5 +++-- src/components/ha-labeled-slider.ts | 3 ++- .../config/voice-assistants/cloud-google-pref.ts | 1 + .../assist/developer-tools-assist.ts | 6 ++++-- .../yaml_configuration/developer-yaml-config.ts | 1 + .../editor/select-view/hui-dialog-select-view.ts | 3 ++- .../lovelace/entity-rows/hui-valve-entity-row.ts | 2 +- src/state-summary/state-card-alert.ts | 1 + 19 files changed, 85 insertions(+), 64 deletions(-) diff --git a/gallery/src/pages/components/ha-expansion-panel.ts b/gallery/src/pages/components/ha-expansion-panel.ts index 781aa063bb62..e739ee7ab13d 100644 --- a/gallery/src/pages/components/ha-expansion-panel.ts +++ b/gallery/src/pages/components/ha-expansion-panel.ts @@ -3,6 +3,7 @@ import { css, html, LitElement, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; import "../../../../src/components/ha-card"; import "../../../../src/components/ha-expansion-panel"; +import "../../../../src/components/ha-icon-button"; import "../../../../src/components/ha-markdown"; import "../../components/demo-black-white-row"; import { LONG_TEXT } from "../../data/text"; diff --git a/gallery/src/pages/date-time/date-time-numeric.ts b/gallery/src/pages/date-time/date-time-numeric.ts index 608b3fc15252..a90f6a6131af 100644 --- a/gallery/src/pages/date-time/date-time-numeric.ts +++ b/gallery/src/pages/date-time/date-time-numeric.ts @@ -1,19 +1,20 @@ -import { html, css, LitElement } from "lit"; +import "@material/mwc-list/mwc-list"; +import { LitElement, css, html } from "lit"; import { customElement, state } from "lit/decorators"; +import { formatDateTimeNumeric } from "../../../../src/common/datetime/format_date_time"; import "../../../../src/components/ha-card"; import "../../../../src/components/ha-control-select"; -import { translationMetadata } from "../../../../src/resources/translations-metadata"; -import { formatDateTimeNumeric } from "../../../../src/common/datetime/format_date_time"; -import { timeOptions } from "../../data/date-options"; -import { demoConfig } from "../../../../src/fake_data/demo_config"; import { + DateFormat, + FirstWeekday, FrontendLocaleData, NumberFormat, TimeFormat, - DateFormat, - FirstWeekday, TimeZone, } from "../../../../src/data/translation"; +import { demoConfig } from "../../../../src/fake_data/demo_config"; +import { translationMetadata } from "../../../../src/resources/translations-metadata"; +import { timeOptions } from "../../data/date-options"; @customElement("demo-date-time-date-time-numeric") export class DemoDateTimeDateTimeNumeric extends LitElement { diff --git a/gallery/src/pages/date-time/date-time-seconds.ts b/gallery/src/pages/date-time/date-time-seconds.ts index 5f5b48f98980..cc1d5181846d 100644 --- a/gallery/src/pages/date-time/date-time-seconds.ts +++ b/gallery/src/pages/date-time/date-time-seconds.ts @@ -1,19 +1,20 @@ -import { html, css, LitElement } from "lit"; +import "@material/mwc-list/mwc-list"; +import { LitElement, css, html } from "lit"; import { customElement, state } from "lit/decorators"; +import { formatDateTimeWithSeconds } from "../../../../src/common/datetime/format_date_time"; import "../../../../src/components/ha-card"; import "../../../../src/components/ha-control-select"; -import { translationMetadata } from "../../../../src/resources/translations-metadata"; -import { formatDateTimeWithSeconds } from "../../../../src/common/datetime/format_date_time"; -import { timeOptions } from "../../data/date-options"; -import { demoConfig } from "../../../../src/fake_data/demo_config"; import { + DateFormat, + FirstWeekday, FrontendLocaleData, NumberFormat, TimeFormat, - DateFormat, - FirstWeekday, TimeZone, } from "../../../../src/data/translation"; +import { demoConfig } from "../../../../src/fake_data/demo_config"; +import { translationMetadata } from "../../../../src/resources/translations-metadata"; +import { timeOptions } from "../../data/date-options"; @customElement("demo-date-time-date-time-seconds") export class DemoDateTimeDateTimeSeconds extends LitElement { diff --git a/gallery/src/pages/date-time/date-time-short-year.ts b/gallery/src/pages/date-time/date-time-short-year.ts index f132f2a04770..9b6c8a380752 100644 --- a/gallery/src/pages/date-time/date-time-short-year.ts +++ b/gallery/src/pages/date-time/date-time-short-year.ts @@ -1,19 +1,20 @@ -import { html, css, LitElement } from "lit"; +import "@material/mwc-list/mwc-list"; +import { LitElement, css, html } from "lit"; import { customElement, state } from "lit/decorators"; +import { formatShortDateTimeWithYear } from "../../../../src/common/datetime/format_date_time"; import "../../../../src/components/ha-card"; import "../../../../src/components/ha-control-select"; -import { translationMetadata } from "../../../../src/resources/translations-metadata"; -import { formatShortDateTimeWithYear } from "../../../../src/common/datetime/format_date_time"; -import { timeOptions } from "../../data/date-options"; -import { demoConfig } from "../../../../src/fake_data/demo_config"; import { + DateFormat, + FirstWeekday, FrontendLocaleData, NumberFormat, TimeFormat, - DateFormat, - FirstWeekday, TimeZone, } from "../../../../src/data/translation"; +import { demoConfig } from "../../../../src/fake_data/demo_config"; +import { translationMetadata } from "../../../../src/resources/translations-metadata"; +import { timeOptions } from "../../data/date-options"; @customElement("demo-date-time-date-time-short-year") export class DemoDateTimeDateTimeShortYear extends LitElement { diff --git a/gallery/src/pages/date-time/date-time-short.ts b/gallery/src/pages/date-time/date-time-short.ts index 21f7eb1294bf..018e3a84e9c1 100644 --- a/gallery/src/pages/date-time/date-time-short.ts +++ b/gallery/src/pages/date-time/date-time-short.ts @@ -1,19 +1,20 @@ -import { html, css, LitElement } from "lit"; +import "@material/mwc-list/mwc-list"; +import { LitElement, css, html } from "lit"; import { customElement, state } from "lit/decorators"; +import { formatShortDateTime } from "../../../../src/common/datetime/format_date_time"; import "../../../../src/components/ha-card"; import "../../../../src/components/ha-control-select"; -import { translationMetadata } from "../../../../src/resources/translations-metadata"; -import { formatShortDateTime } from "../../../../src/common/datetime/format_date_time"; -import { timeOptions } from "../../data/date-options"; -import { demoConfig } from "../../../../src/fake_data/demo_config"; import { + DateFormat, + FirstWeekday, FrontendLocaleData, NumberFormat, TimeFormat, - DateFormat, - FirstWeekday, TimeZone, } from "../../../../src/data/translation"; +import { demoConfig } from "../../../../src/fake_data/demo_config"; +import { translationMetadata } from "../../../../src/resources/translations-metadata"; +import { timeOptions } from "../../data/date-options"; @customElement("demo-date-time-date-time-short") export class DemoDateTimeDateTimeShort extends LitElement { diff --git a/gallery/src/pages/date-time/date-time.ts b/gallery/src/pages/date-time/date-time.ts index 4bb4b758654c..3900deef4d3e 100644 --- a/gallery/src/pages/date-time/date-time.ts +++ b/gallery/src/pages/date-time/date-time.ts @@ -1,19 +1,20 @@ -import { html, css, LitElement } from "lit"; +import "@material/mwc-list/mwc-list"; +import { LitElement, css, html } from "lit"; import { customElement, state } from "lit/decorators"; +import { formatDateTime } from "../../../../src/common/datetime/format_date_time"; import "../../../../src/components/ha-card"; import "../../../../src/components/ha-control-select"; -import { translationMetadata } from "../../../../src/resources/translations-metadata"; -import { formatDateTime } from "../../../../src/common/datetime/format_date_time"; -import { timeOptions } from "../../data/date-options"; -import { demoConfig } from "../../../../src/fake_data/demo_config"; import { + DateFormat, + FirstWeekday, FrontendLocaleData, NumberFormat, TimeFormat, - DateFormat, - FirstWeekday, TimeZone, } from "../../../../src/data/translation"; +import { demoConfig } from "../../../../src/fake_data/demo_config"; +import { translationMetadata } from "../../../../src/resources/translations-metadata"; +import { timeOptions } from "../../data/date-options"; @customElement("demo-date-time-date-time") export class DemoDateTimeDateTime extends LitElement { diff --git a/gallery/src/pages/date-time/time-seconds.ts b/gallery/src/pages/date-time/time-seconds.ts index 761bc6ed58ef..be6c1ffa411a 100644 --- a/gallery/src/pages/date-time/time-seconds.ts +++ b/gallery/src/pages/date-time/time-seconds.ts @@ -1,18 +1,20 @@ -import { html, css, LitElement } from "lit"; +import "@material/mwc-list/mwc-list"; +import { LitElement, css, html } from "lit"; import { customElement, state } from "lit/decorators"; -import "../../../../src/components/ha-card"; -import { translationMetadata } from "../../../../src/resources/translations-metadata"; import { formatTimeWithSeconds } from "../../../../src/common/datetime/format_time"; -import { timeOptions } from "../../data/date-options"; -import { demoConfig } from "../../../../src/fake_data/demo_config"; +import "../../../../src/components/ha-card"; +import "../../../../src/components/ha-control-select"; import { + DateFormat, + FirstWeekday, FrontendLocaleData, NumberFormat, TimeFormat, - DateFormat, - FirstWeekday, TimeZone, } from "../../../../src/data/translation"; +import { demoConfig } from "../../../../src/fake_data/demo_config"; +import { translationMetadata } from "../../../../src/resources/translations-metadata"; +import { timeOptions } from "../../data/date-options"; @customElement("demo-date-time-time-seconds") export class DemoDateTimeTimeSeconds extends LitElement { diff --git a/gallery/src/pages/date-time/time-weekday.ts b/gallery/src/pages/date-time/time-weekday.ts index 8ed5c951f550..68b1a751869c 100644 --- a/gallery/src/pages/date-time/time-weekday.ts +++ b/gallery/src/pages/date-time/time-weekday.ts @@ -1,18 +1,20 @@ -import { html, css, LitElement } from "lit"; +import "@material/mwc-list/mwc-list"; +import { LitElement, css, html } from "lit"; import { customElement, state } from "lit/decorators"; -import "../../../../src/components/ha-card"; -import { translationMetadata } from "../../../../src/resources/translations-metadata"; import { formatTimeWeekday } from "../../../../src/common/datetime/format_time"; -import { timeOptions } from "../../data/date-options"; -import { demoConfig } from "../../../../src/fake_data/demo_config"; +import "../../../../src/components/ha-card"; +import "../../../../src/components/ha-control-select"; import { + DateFormat, + FirstWeekday, FrontendLocaleData, NumberFormat, TimeFormat, - DateFormat, - FirstWeekday, TimeZone, } from "../../../../src/data/translation"; +import { demoConfig } from "../../../../src/fake_data/demo_config"; +import { translationMetadata } from "../../../../src/resources/translations-metadata"; +import { timeOptions } from "../../data/date-options"; @customElement("demo-date-time-time-weekday") export class DemoDateTimeTimeWeekday extends LitElement { diff --git a/gallery/src/pages/date-time/time.ts b/gallery/src/pages/date-time/time.ts index df7b101653e5..a02ad389ffc7 100644 --- a/gallery/src/pages/date-time/time.ts +++ b/gallery/src/pages/date-time/time.ts @@ -1,19 +1,20 @@ -import { html, css, LitElement } from "lit"; +import "@material/mwc-list/mwc-list"; +import { LitElement, css, html } from "lit"; import { customElement, state } from "lit/decorators"; +import { formatTime } from "../../../../src/common/datetime/format_time"; import "../../../../src/components/ha-card"; import "../../../../src/components/ha-control-select"; -import { translationMetadata } from "../../../../src/resources/translations-metadata"; -import { formatTime } from "../../../../src/common/datetime/format_time"; -import { timeOptions } from "../../data/date-options"; -import { demoConfig } from "../../../../src/fake_data/demo_config"; import { + DateFormat, + FirstWeekday, FrontendLocaleData, NumberFormat, TimeFormat, - DateFormat, - FirstWeekday, TimeZone, } from "../../../../src/data/translation"; +import { demoConfig } from "../../../../src/fake_data/demo_config"; +import { translationMetadata } from "../../../../src/resources/translations-metadata"; +import { timeOptions } from "../../data/date-options"; @customElement("demo-date-time-time") export class DemoDateTimeTime extends LitElement { diff --git a/hassio/src/system/hassio-supervisor-log.ts b/hassio/src/system/hassio-supervisor-log.ts index a2e1d1d75e1e..6d426566161a 100644 --- a/hassio/src/system/hassio-supervisor-log.ts +++ b/hassio/src/system/hassio-supervisor-log.ts @@ -1,9 +1,10 @@ -import "../../../src/components/ha-ansi-to-html"; import "@material/mwc-button"; +import "@material/mwc-list/mwc-list-item"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators"; import "../../../src/components/buttons/ha-progress-button"; import "../../../src/components/ha-alert"; +import "../../../src/components/ha-ansi-to-html"; import "../../../src/components/ha-card"; import "../../../src/components/ha-select"; import { extractApiErrorMessage } from "../../../src/data/hassio/common"; diff --git a/src/components/ha-control-number-buttons.ts b/src/components/ha-control-number-buttons.ts index 61f76e708f9a..5bcb0687c3d0 100644 --- a/src/components/ha-control-number-buttons.ts +++ b/src/components/ha-control-number-buttons.ts @@ -15,6 +15,7 @@ import { conditionalClamp } from "../common/number/clamp"; import { formatNumber } from "../common/number/format_number"; import { blankBeforeUnit } from "../common/translations/blank_before_unit"; import { FrontendLocaleData } from "../data/translation"; +import "./ha-svg-icon"; const A11Y_KEY_CODES = new Set([ "ArrowRight", diff --git a/src/components/ha-icon-picker.ts b/src/components/ha-icon-picker.ts index 786618cc4005..9dfa60a8d48c 100644 --- a/src/components/ha-icon-picker.ts +++ b/src/components/ha-icon-picker.ts @@ -1,14 +1,15 @@ +import "@material/mwc-list/mwc-list-item"; import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit"; import { ComboBoxDataProviderCallback, ComboBoxDataProviderParams, } from "@vaadin/combo-box/vaadin-combo-box-light"; -import { css, html, LitElement, TemplateResult } from "lit"; +import { LitElement, TemplateResult, css, html } from "lit"; import { customElement, property } from "lit/decorators"; import memoizeOne from "memoize-one"; import { fireEvent } from "../common/dom/fire_event"; import { customIcons } from "../data/custom_icons"; -import { ValueChangedEvent, HomeAssistant } from "../types"; +import { HomeAssistant, ValueChangedEvent } from "../types"; import "./ha-combo-box"; import "./ha-icon"; diff --git a/src/components/ha-labeled-slider.ts b/src/components/ha-labeled-slider.ts index 1c507a0c668d..99805f3f8c3d 100644 --- a/src/components/ha-labeled-slider.ts +++ b/src/components/ha-labeled-slider.ts @@ -1,8 +1,9 @@ import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property } from "lit/decorators"; +import { fireEvent } from "../common/dom/fire_event"; import "./ha-icon"; +import "./ha-input-helper-text"; import "./ha-slider"; -import { fireEvent } from "../common/dom/fire_event"; @customElement("ha-labeled-slider") class HaLabeledSlider extends LitElement { diff --git a/src/panels/config/voice-assistants/cloud-google-pref.ts b/src/panels/config/voice-assistants/cloud-google-pref.ts index 027de5628590..3ddfce8833e3 100644 --- a/src/panels/config/voice-assistants/cloud-google-pref.ts +++ b/src/panels/config/voice-assistants/cloud-google-pref.ts @@ -8,6 +8,7 @@ import { isEmptyFilter } from "../../../common/entity/entity_filter"; import "../../../components/ha-alert"; import "../../../components/ha-card"; import "../../../components/ha-settings-row"; +import "../../../components/ha-switch"; import type { HaSwitch } from "../../../components/ha-switch"; import "../../../components/ha-textfield"; import type { HaTextField } from "../../../components/ha-textfield"; diff --git a/src/panels/developer-tools/assist/developer-tools-assist.ts b/src/panels/developer-tools/assist/developer-tools-assist.ts index de7e22c36b6b..141f950fb20e 100644 --- a/src/panels/developer-tools/assist/developer-tools-assist.ts +++ b/src/panels/developer-tools/assist/developer-tools-assist.ts @@ -2,7 +2,11 @@ import { mdiDownload } from "@mdi/js"; import { dump } from "js-yaml"; import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property, query, state } from "lit/decorators"; +import { storage } from "../../../common/decorators/storage"; +import { formatLanguageCode } from "../../../common/language/format_language"; +import "../../../components/ha-alert"; import "../../../components/ha-button"; +import "../../../components/ha-card"; import "../../../components/ha-code-editor"; import "../../../components/ha-language-picker"; import "../../../components/ha-textarea"; @@ -15,8 +19,6 @@ import { import { SubscribeMixin } from "../../../mixins/subscribe-mixin"; import { haStyle } from "../../../resources/styles"; import { HomeAssistant } from "../../../types"; -import { formatLanguageCode } from "../../../common/language/format_language"; -import { storage } from "../../../common/decorators/storage"; import { fileDownload } from "../../../util/file_download"; type SentenceParsingResult = { diff --git a/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts b/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts index 21d12a86f4e8..0ac4d768ff76 100644 --- a/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts +++ b/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts @@ -10,6 +10,7 @@ import { import { customElement, property, state } from "lit/decorators"; import { componentsWithService } from "../../../common/config/components_with_service"; import "../../../components/buttons/ha-call-service-button"; +import "../../../components/ha-alert"; import "../../../components/ha-card"; import "../../../components/ha-circular-progress"; import { CheckConfigResult, checkCoreConfig } from "../../../data/core"; diff --git a/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts b/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts index 5f3e073f3a4f..2524ef0ab995 100644 --- a/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts +++ b/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts @@ -1,3 +1,4 @@ +import "@material/mwc-button/mwc-button"; import "@material/mwc-list/mwc-list"; import "@material/mwc-list/mwc-list-item"; import "@material/mwc-list/mwc-radio-list-item"; @@ -5,10 +6,10 @@ import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { customElement, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; import { stopPropagation } from "../../../../common/dom/stop_propagation"; +import "../../../../components/ha-alert"; import { createCloseHeading } from "../../../../components/ha-dialog"; import "../../../../components/ha-icon"; import "../../../../components/ha-select"; -import "../../../../components/ha-alert"; import { fetchConfig, LovelaceConfig, diff --git a/src/panels/lovelace/entity-rows/hui-valve-entity-row.ts b/src/panels/lovelace/entity-rows/hui-valve-entity-row.ts index 16e770b30c4e..4e86a1d7c203 100644 --- a/src/panels/lovelace/entity-rows/hui-valve-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-valve-entity-row.ts @@ -1,6 +1,6 @@ import { LitElement, PropertyValues, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; -import "../../../components/ha-valve-controls"; +import "../../../components/entity/ha-entity-toggle"; import { isUnavailableState } from "../../../data/entity"; import { HomeAssistant } from "../../../types"; import { hasConfigOrEntityChanged } from "../common/has-changed"; diff --git a/src/state-summary/state-card-alert.ts b/src/state-summary/state-card-alert.ts index 2575bc02570e..e6ee8d3e05c3 100755 --- a/src/state-summary/state-card-alert.ts +++ b/src/state-summary/state-card-alert.ts @@ -3,6 +3,7 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { stateActive } from "../common/entity/state_active"; import { computeRTL } from "../common/util/compute_rtl"; +import "../components/entity/ha-entity-toggle"; import "../components/entity/state-info"; import { haStyle } from "../resources/styles"; import type { HomeAssistant } from "../types"; From 64b0b64468de223e23a02aaa540de85523e4addf Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 15 Jan 2024 09:36:26 -0500 Subject: [PATCH 140/361] Cache Typescript runs for faster checks (#19381) --- .github/workflows/ci.yaml | 1 + tsconfig.json | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 76a9563f805c..744fa052fcaa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,6 +42,7 @@ jobs: path: | node_modules/.cache/prettier node_modules/.cache/eslint + node_modules/.cache/typescript key: lint-${{ github.sha }} restore-keys: lint- - name: Run eslint diff --git a/tsconfig.json b/tsconfig.json index f54276cf0be9..f0bada47d90d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,6 +10,9 @@ "resolveJsonModule": true, // Babel handles transpiling and no need for declaration files "noEmit": true, + // Caching + "incremental": true, + "tsBuildInfoFile": "node_modules/.cache/typescript/.tsbuildinfo", // Type checking options "noUnusedLocals": true, "noUnusedParameters": true, From 894205eff78a62001cf84ecc5ef14b339229553c Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Mon, 15 Jan 2024 15:37:59 +0100 Subject: [PATCH 141/361] Display that entity is disabled in more info (#19378) * Display that entity is disabled in more info * Correct formatting --- src/dialogs/more-info/ha-more-info-info.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/dialogs/more-info/ha-more-info-info.ts b/src/dialogs/more-info/ha-more-info-info.ts index ca05ec75d2fd..99e8a9544817 100644 --- a/src/dialogs/more-info/ha-more-info-info.ts +++ b/src/dialogs/more-info/ha-more-info-info.ts @@ -45,9 +45,13 @@ export class MoreInfoInfo extends LitElement {
${!stateObj ? html` - ${this.hass.localize( - "ui.dialogs.entity_registry.editor.unavailable" - )} + ${this.entry?.disabled_by + ? this.hass.localize( + "ui.dialogs.entity_registry.editor.entity_disabled" + ) + : this.hass.localize( + "ui.dialogs.entity_registry.editor.unavailable" + )} ` : nothing} ${stateObj?.attributes.restored && entityRegObj From 7209ed055af85cd851515338e28eccff22407d13 Mon Sep 17 00:00:00 2001 From: AlexandrErohin Date: Mon, 15 Jan 2024 17:38:51 +0300 Subject: [PATCH 142/361] fix not showing base error bug (#19340) --- src/dialogs/config-flow/show-dialog-options-flow.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dialogs/config-flow/show-dialog-options-flow.ts b/src/dialogs/config-flow/show-dialog-options-flow.ts index eb9595ab50cc..05f3acc1b4f0 100644 --- a/src/dialogs/config-flow/show-dialog-options-flow.ts +++ b/src/dialogs/config-flow/show-dialog-options-flow.ts @@ -110,9 +110,11 @@ export const showOptionsFlowDialog = ( }, renderShowFormStepFieldError(hass, step, error) { - return hass.localize( - `component.${configEntry.domain}.options.error.${error}`, - step.description_placeholders + return ( + hass.localize( + `component.${configEntry.domain}.options.error.${error}`, + step.description_placeholders + ) || error ); }, From b8014412018ccf973d1212025ee209e9d9edae2e Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 15 Jan 2024 09:40:03 -0500 Subject: [PATCH 143/361] Fix property visibility mismatches (1 of 2) (#19376) --- gallery/src/ha-gallery.ts | 12 +++++----- .../addon-view/config/hassio-addon-config.ts | 4 ++-- src/auth/ha-auth-flow.ts | 2 +- src/components/ha-file-upload.ts | 8 +++---- .../config/dashboard/ha-config-updates.ts | 22 ++++++++----------- .../zha/zha-config-dashboard.ts | 4 ++-- .../zwave_js/zwave_js-node-config.ts | 3 +-- src/panels/config/users/ha-config-users.ts | 10 ++++----- .../lovelace/components/hui-action-editor.ts | 2 +- .../components/hui-entities-toggle.ts | 2 +- .../lovelace/components/hui-entity-editor.ts | 8 +++---- .../components/hui-input-list-editor.ts | 6 ++--- .../card-editor/hui-dialog-create-card.ts | 2 +- .../card-editor/hui-dialog-delete-card.ts | 2 +- .../hui-dialog-create-headerfooter.ts | 2 +- .../editor/hui-entities-card-row-editor.ts | 6 ++--- 16 files changed, 45 insertions(+), 50 deletions(-) diff --git a/gallery/src/ha-gallery.ts b/gallery/src/ha-gallery.ts index 31f2337a127b..eec45d2b525a 100644 --- a/gallery/src/ha-gallery.ts +++ b/gallery/src/ha-gallery.ts @@ -1,14 +1,14 @@ -import { mdiMenu } from "@mdi/js"; import "@material/mwc-drawer"; import "@material/mwc-top-app-bar-fixed"; -import { html, css, LitElement, PropertyValues } from "lit"; -import { customElement, property, query } from "lit/decorators"; +import { mdiMenu } from "@mdi/js"; +import { LitElement, PropertyValues, css, html } from "lit"; +import { customElement, query, state } from "lit/decorators"; +import { dynamicElement } from "../../src/common/dom/dynamic-element-directive"; +import { HaExpansionPanel } from "../../src/components/ha-expansion-panel"; import "../../src/components/ha-icon-button"; import "../../src/managers/notification-manager"; -import { HaExpansionPanel } from "../../src/components/ha-expansion-panel"; import { haStyle } from "../../src/resources/styles"; import { PAGES, SIDEBAR } from "../build/import-pages"; -import { dynamicElement } from "../../src/common/dom/dynamic-element-directive"; import "./components/page-description"; const GITHUB_DEMO_URL = @@ -24,7 +24,7 @@ const FAKE_HASS = { @customElement("ha-gallery") class HaGallery extends LitElement { - @property() private _page = + @state() private _page = document.location.hash.substring(1) || `${SIDEBAR[0].category}/${SIDEBAR[0].pages![0]}`; diff --git a/hassio/src/addon-view/config/hassio-addon-config.ts b/hassio/src/addon-view/config/hassio-addon-config.ts index 75ff632c15fd..9cd32b64f7eb 100644 --- a/hassio/src/addon-view/config/hassio-addon-config.ts +++ b/hassio/src/addon-view/config/hassio-addon-config.ts @@ -65,9 +65,9 @@ class HassioAddonConfig extends LitElement { @property({ attribute: false }) public supervisor!: Supervisor; - @property({ type: Boolean }) private _configHasChanged = false; + @state() private _configHasChanged = false; - @property({ type: Boolean }) private _valid = true; + @state() private _valid = true; @state() private _canShowSchema = false; diff --git a/src/auth/ha-auth-flow.ts b/src/auth/ha-auth-flow.ts index fb1d7d7c32f5..d8d18b4ef2b3 100644 --- a/src/auth/ha-auth-flow.ts +++ b/src/auth/ha-auth-flow.ts @@ -38,7 +38,7 @@ export class HaAuthFlow extends LitElement { @property({ attribute: false }) public step?: DataEntryFlowStep; - @property({ type: Boolean }) private initStoreToken = false; + @property({ type: Boolean }) public initStoreToken = false; @state() private _storeToken = false; diff --git a/src/components/ha-file-upload.ts b/src/components/ha-file-upload.ts index 29e8b07ed4b7..952c588ea241 100644 --- a/src/components/ha-file-upload.ts +++ b/src/components/ha-file-upload.ts @@ -33,16 +33,16 @@ export class HaFileUpload extends LitElement { @property() public value?: File | File[] | FileList | string; - @property({ type: Boolean }) private multiple = false; + @property({ type: Boolean }) public multiple = false; @property({ type: Boolean, reflect: true }) public disabled: boolean = false; - @property({ type: Boolean }) private uploading = false; + @property({ type: Boolean }) public uploading = false; - @property({ type: Number }) private progress?: number; + @property({ type: Number }) public progress?: number; @property({ type: Boolean, attribute: "auto-open-file-dialog" }) - private autoOpenFileDialog = false; + public autoOpenFileDialog = false; @state() private _drag = false; diff --git a/src/panels/config/dashboard/ha-config-updates.ts b/src/panels/config/dashboard/ha-config-updates.ts index e12e77609626..78b9aaa370fc 100644 --- a/src/panels/config/dashboard/ha-config-updates.ts +++ b/src/panels/config/dashboard/ha-config-updates.ts @@ -2,7 +2,7 @@ import "@material/mwc-button/mwc-button"; import "@material/mwc-list/mwc-list"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../../common/dom/fire_event"; @@ -30,37 +30,33 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) { @property({ type: Boolean }) public narrow!: boolean; - @property({ attribute: false }) - public updateEntities?: UpdateEntity[]; + @property({ attribute: false }) public updateEntities?: UpdateEntity[]; - @property({ attribute: false, type: Array }) - private devices?: DeviceRegistryEntry[]; + @property({ type: Number }) public total?: number; - @property({ attribute: false, type: Array }) - private entities?: EntityRegistryEntry[]; + @state() private _devices?: DeviceRegistryEntry[]; - @property({ type: Number }) - public total?: number; + @state() private _entities?: EntityRegistryEntry[]; public hassSubscribe(): UnsubscribeFunc[] { return [ subscribeDeviceRegistry(this.hass.connection, (entries) => { - this.devices = entries; + this._devices = entries; }), subscribeEntityRegistry(this.hass.connection!, (entities) => { - this.entities = entities.filter((entity) => entity.device_id !== null); + this._entities = entities.filter((entity) => entity.device_id !== null); }), ]; } private getDeviceEntry = memoizeOne( (deviceId: string): DeviceRegistryEntry | undefined => - this.devices?.find((device) => device.id === deviceId) + this._devices?.find((device) => device.id === deviceId) ); private getEntityEntry = memoizeOne( (entityId: string): EntityRegistryEntry | undefined => - this.entities?.find((entity) => entity.entity_id === entityId) + this._entities?.find((entity) => entity.entity_id === entityId) ); protected render() { diff --git a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts index 13b2f85c668a..55a08d07311b 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts @@ -78,9 +78,9 @@ class ZHAConfigDashboard extends LitElement { @property() public configEntryId?: string; - @property() private _configuration?: ZHAConfiguration; + @state() private _configuration?: ZHAConfiguration; - @property() private _networkSettings?: ZHANetworkSettings; + @state() private _networkSettings?: ZHANetworkSettings; @state() private _generatingBackup = false; diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts index df90deec4144..b131d8794ae7 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts @@ -79,8 +79,7 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) { @property() public deviceId!: string; - @property({ type: Array }) - private _deviceRegistryEntries?: DeviceRegistryEntry[]; + @state() private _deviceRegistryEntries?: DeviceRegistryEntry[]; @state() private _nodeMetadata?: ZwaveJSNodeMetadata; diff --git a/src/panels/config/users/ha-config-users.ts b/src/panels/config/users/ha-config-users.ts index f7408f517482..e65bcbe0e81b 100644 --- a/src/panels/config/users/ha-config-users.ts +++ b/src/panels/config/users/ha-config-users.ts @@ -1,6 +1,6 @@ import { mdiCheck, mdiPlus } from "@mdi/js"; -import { html, LitElement, PropertyValues } from "lit"; -import { customElement, property } from "lit/decorators"; +import { LitElement, PropertyValues, html } from "lit"; +import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { HASSDomEvent } from "../../../common/dom/fire_event"; import { LocalizeFunc } from "../../../common/translations/localize"; @@ -13,11 +13,11 @@ import "../../../components/ha-fab"; import "../../../components/ha-help-tooltip"; import "../../../components/ha-svg-icon"; import { + User, computeUserBadges, deleteUser, fetchUsers, updateUser, - User, } from "../../../data/user"; import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box"; import "../../../layouts/hass-tabs-subpage-data-table"; @@ -30,14 +30,14 @@ import { showUserDetailDialog } from "./show-dialog-user-detail"; export class HaConfigUsers extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ attribute: false }) public _users: User[] = []; - @property({ type: Boolean }) public isWide!: boolean; @property({ type: Boolean }) public narrow!: boolean; @property({ attribute: false }) public route!: Route; + @state() private _users: User[] = []; + private _columns = memoizeOne( (narrow: boolean, localize: LocalizeFunc): DataTableColumnContainer => { const columns: DataTableColumnContainer = { diff --git a/src/panels/lovelace/components/hui-action-editor.ts b/src/panels/lovelace/components/hui-action-editor.ts index a6999ee4cb8d..a578e24853fe 100644 --- a/src/panels/lovelace/components/hui-action-editor.ts +++ b/src/panels/lovelace/components/hui-action-editor.ts @@ -82,7 +82,7 @@ export class HuiActionEditor extends LitElement { @property() public tooltipText?: string; - @property() protected hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; @query("ha-select") private _select!: HaSelect; diff --git a/src/panels/lovelace/components/hui-entities-toggle.ts b/src/panels/lovelace/components/hui-entities-toggle.ts index 8c28f4b7be99..0dfadc7924dc 100644 --- a/src/panels/lovelace/components/hui-entities-toggle.ts +++ b/src/panels/lovelace/components/hui-entities-toggle.ts @@ -18,7 +18,7 @@ import { turnOnOffEntities } from "../common/entity/turn-on-off-entities"; class HuiEntitiesToggle extends LitElement { @property({ type: Array }) public entities?: string[]; - @property({ attribute: false }) protected hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; @state() private _toggleEntities?: string[]; diff --git a/src/panels/lovelace/components/hui-entity-editor.ts b/src/panels/lovelace/components/hui-entity-editor.ts index 0af08f1180f8..c69ad7066e52 100644 --- a/src/panels/lovelace/components/hui-entity-editor.ts +++ b/src/panels/lovelace/components/hui-entity-editor.ts @@ -15,13 +15,13 @@ import { EntityConfig } from "../entity-rows/types"; @customElement("hui-entity-editor") export class HuiEntityEditor extends LitElement { - @property({ attribute: false }) protected hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; - @property({ attribute: false }) protected entities?: EntityConfig[]; + @property({ attribute: false }) public entities?: EntityConfig[]; - @property() protected entityFilter?: HaEntityPickerEntityFilterFunc; + @property() public entityFilter?: HaEntityPickerEntityFilterFunc; - @property() protected label?: string; + @property() public label?: string; private _entityKeys = new WeakMap(); diff --git a/src/panels/lovelace/components/hui-input-list-editor.ts b/src/panels/lovelace/components/hui-input-list-editor.ts index 635eb8480059..0a189e5e38d9 100644 --- a/src/panels/lovelace/components/hui-input-list-editor.ts +++ b/src/panels/lovelace/components/hui-input-list-editor.ts @@ -9,11 +9,11 @@ import { EditorTarget } from "../editor/types"; @customElement("hui-input-list-editor") export class HuiInputListEditor extends LitElement { - @property() protected value?: string[]; + @property({ type: Array }) public value?: string[]; - @property() protected hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; - @property() protected inputLabel?: string; + @property() public inputLabel?: string; protected render() { if (!this.value) { diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts index e23cafa98531..1752a24174ba 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts @@ -37,7 +37,7 @@ export class HuiCreateDialogCard extends LitElement implements HassDialog { - @property({ attribute: false }) protected hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @state() private _params?: CreateCardDialogParams; diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts index ca730833d6ab..1483268554df 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts @@ -10,7 +10,7 @@ import type { DeleteCardDialogParams } from "./show-delete-card-dialog"; @customElement("hui-dialog-delete-card") export class HuiDialogDeleteCard extends LitElement { - @property() protected hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @state() private _params?: DeleteCardDialogParams; diff --git a/src/panels/lovelace/editor/header-footer-editor/hui-dialog-create-headerfooter.ts b/src/panels/lovelace/editor/header-footer-editor/hui-dialog-create-headerfooter.ts index f3d25a213030..8c13d58b65e1 100644 --- a/src/panels/lovelace/editor/header-footer-editor/hui-dialog-create-headerfooter.ts +++ b/src/panels/lovelace/editor/header-footer-editor/hui-dialog-create-headerfooter.ts @@ -16,7 +16,7 @@ export class HuiCreateDialogHeaderFooter extends LitElement implements HassDialog { - @property({ attribute: false }) protected hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @state() private _params?: CreateHeaderFooterDialogParams; diff --git a/src/panels/lovelace/editor/hui-entities-card-row-editor.ts b/src/panels/lovelace/editor/hui-entities-card-row-editor.ts index 58891055fc8c..d492ee8918f4 100644 --- a/src/panels/lovelace/editor/hui-entities-card-row-editor.ts +++ b/src/panels/lovelace/editor/hui-entities-card-row-editor.ts @@ -21,11 +21,11 @@ declare global { @customElement("hui-entities-card-row-editor") export class HuiEntitiesCardRowEditor extends LitElement { - @property({ attribute: false }) protected hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; - @property({ attribute: false }) protected entities?: LovelaceRowConfig[]; + @property({ attribute: false }) public entities?: LovelaceRowConfig[]; - @property() protected label?: string; + @property() public label?: string; private _entityKeys = new WeakMap(); From 2053cf23c2d6e97cfd82d5e576f2a0dad88ae865 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Mon, 15 Jan 2024 15:41:05 +0100 Subject: [PATCH 144/361] Replace some paper-items by list-item (#19314) * system log card * cloud login * cloud account * ha config voice assistants assistants * ha config person * ha-device-entities-card * cloud login * change --paper-item-icon-color into --state-icon-color * Apply code review * Revert "change --paper-item-icon-color into --state-icon-color" This reverts commit b91ef0017ea9a6faf67aac9448706efed4f2c025. * Remove unneeded mwc-lists --- .../config/cloud/account/cloud-account.ts | 19 +++--- src/panels/config/cloud/login/cloud-login.ts | 21 +++--- .../device-detail/ha-device-entities-card.ts | 44 ++++++------ src/panels/config/logs/system-log-card.ts | 34 +++++----- src/panels/config/person/ha-config-person.ts | 67 ++++++++++--------- .../ha-config-voice-assistants-assistants.ts | 2 - 6 files changed, 91 insertions(+), 96 deletions(-) diff --git a/src/panels/config/cloud/account/cloud-account.ts b/src/panels/config/cloud/account/cloud-account.ts index a1946add28e1..293576fa8f4e 100644 --- a/src/panels/config/cloud/account/cloud-account.ts +++ b/src/panels/config/cloud/account/cloud-account.ts @@ -1,6 +1,4 @@ import "@material/mwc-button"; -import "@material/mwc-list/mwc-list-item"; -import "@polymer/paper-item/paper-item-body"; import { css, html, LitElement, PropertyValues } from "lit"; import { customElement, property, state } from "lit/decorators"; import { formatDateTime } from "../../../../common/datetime/format_date_time"; @@ -10,6 +8,7 @@ import { debounce } from "../../../../common/util/debounce"; import "../../../../components/ha-alert"; import "../../../../components/ha-card"; import "../../../../components/ha-tip"; +import "../../../../components/ha-list-item"; import { cloudLogout, CloudStatusLoggedIn, @@ -65,12 +64,12 @@ export class CloudAccount extends SubscribeMixin(LitElement) { )} > ${this.cloudStatus.cloud === "connecting" && @@ -103,12 +102,10 @@ export class CloudAccount extends SubscribeMixin(LitElement) { : ""}
diff --git a/src/panels/config/cloud/login/cloud-login.ts b/src/panels/config/cloud/login/cloud-login.ts index 696b70fb0830..3b468707eb59 100644 --- a/src/panels/config/cloud/login/cloud-login.ts +++ b/src/panels/config/cloud/login/cloud-login.ts @@ -1,6 +1,5 @@ import "@material/mwc-button"; -import "@polymer/paper-item/paper-item"; -import "@polymer/paper-item/paper-item-body"; +import "@material/mwc-list/mwc-list"; import { css, html, LitElement, TemplateResult } from "lit"; import { customElement, property, query, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; @@ -9,6 +8,7 @@ import "../../../../components/buttons/ha-progress-button"; import "../../../../components/ha-alert"; import "../../../../components/ha-card"; import "../../../../components/ha-icon-next"; +import "../../../../components/ha-list-item"; import type { HaTextField } from "../../../../components/ha-textfield"; import "../../../../components/ha-textfield"; import { cloudLogin } from "../../../../data/cloud"; @@ -166,19 +166,19 @@ export class CloudLogin extends LitElement { - - + + ${this.hass.localize( "ui.panel.config.cloud.login.start_trial" )} -
+ ${this.hass.localize( "ui.panel.config.cloud.login.trial_info" )} -
- - - + + + +
@@ -293,9 +293,6 @@ export class CloudLogin extends LitElement { [slot="introduction"] a { color: var(--primary-color); } - paper-item { - cursor: pointer; - } ha-card { overflow: hidden; } diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts index 9de2c1e69aa3..cbd64a0d1f18 100644 --- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts +++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts @@ -1,6 +1,4 @@ -import "@polymer/paper-item/paper-icon-item"; -import "@polymer/paper-item/paper-item"; -import "@polymer/paper-item/paper-item-body"; +import "@material/mwc-list/mwc-list"; import { css, CSSResultGroup, @@ -17,6 +15,7 @@ import { stripPrefixFromEntityName } from "../../../../common/entity/strip_prefi import "../../../../components/entity/state-badge"; import "../../../../components/ha-card"; import "../../../../components/ha-icon"; +import "../../../../components/ha-list-item"; import { ExtEntityRegistryEntry, getExtendedEntityRegistryEntry, @@ -91,11 +90,13 @@ export class HaDeviceEntitiesCard extends LitElement { return html`
- ${shownEntities.map((entry) => - this.hass.states[entry.entity_id] - ? this._renderEntity(entry) - : this._renderEntry(entry) - )} + + ${shownEntities.map((entry) => + this.hass.states[entry.entity_id] + ? this._renderEntity(entry) + : this._renderEntry(entry) + )} +
${hiddenEntities.length ? !this.showHidden @@ -108,7 +109,9 @@ export class HaDeviceEntitiesCard extends LitElement { ` : html` - ${hiddenEntities.map((entry) => this._renderEntry(entry))} + + ${hiddenEntities.map((entry) => this._renderEntry(entry))} +
` - : filteredItems.map( - (item, idx) => html` - - -
${item.message[0]}
-
+ : html`${filteredItems.map( + (item, idx) => html` + + ${item.message[0]} + ${this._timestamp(item)} – ${html`(${this.hass.localize( @@ -149,11 +153,11 @@ export class SystemLogCard extends LitElement { ${item.count > 1 ? html` - ${this._multipleMessages(item)} ` : nothing} -
- - - ` - )} + + + ` + )}`}
- ${this._storageItems.map( - (entry) => html` - - - ${entry.name} - - ` - )} + + ${this._storageItems.map( + (entry) => html` + + + ${entry.name} + + ` + )} + ${this._storageItems.length === 0 ? html`
@@ -119,20 +126,23 @@ export class HaConfigPerson extends LitElement { ${this._configItems.length > 0 ? html` - ${this._configItems.map( - (entry) => html` - - - ${entry.name} - - ` - )} + + ${this._configItems.map( + (entry) => html` + + + ${entry.name} + + ` + )} + ` - : ""} + : nothing} Date: Mon, 15 Jan 2024 06:51:19 -0800 Subject: [PATCH 145/361] Custom device_classes for alert icons in Area Card (#19131) * Custom device_classes for alerts in Area Card * small refactor * drop more-info feature * Update src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts Co-authored-by: Bram Kragten * localization and css updates --------- Co-authored-by: Bram Kragten --- src/panels/lovelace/cards/hui-area-card.ts | 43 +++++---- .../config-elements/hui-area-card-editor.ts | 89 ++++++++++++++++++- src/translations/en.json | 1 + 3 files changed, 114 insertions(+), 19 deletions(-) diff --git a/src/panels/lovelace/cards/hui-area-card.ts b/src/panels/lovelace/cards/hui-area-card.ts index eb80dbd2f581..7fe1749099ac 100644 --- a/src/panels/lovelace/cards/hui-area-card.ts +++ b/src/panels/lovelace/cards/hui-area-card.ts @@ -26,6 +26,7 @@ import memoizeOne from "memoize-one"; import { STATES_OFF } from "../../../common/const"; import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element"; import { computeDomain } from "../../../common/entity/compute_domain"; +import { binarySensorIcon } from "../../../common/entity/binary_sensor_icon"; import { domainIcon } from "../../../common/entity/domain_icon"; import { navigate } from "../../../common/navigate"; import { formatNumber } from "../../../common/number/format_number"; @@ -67,7 +68,7 @@ const TOGGLE_DOMAINS = ["light", "switch", "fan"]; const OTHER_DOMAINS = ["camera"]; -const DEVICE_CLASSES = { +export const DEVICE_CLASSES = { sensor: ["temperature", "humidity"], binary_sensor: ["motion", "moisture"], }; @@ -113,6 +114,8 @@ export class HuiAreaCard @state() private _areas?: AreaRegistryEntry[]; + private _deviceClasses: { [key: string]: string[] } = DEVICE_CLASSES; + private _ratio: { w: number; h: number; @@ -123,6 +126,7 @@ export class HuiAreaCard areaId: string, devicesInArea: Set, registryEntities: EntityRegistryEntry[], + deviceClasses: { [key: string]: string[] }, states: HomeAssistant["states"] ) => { const entitiesInArea = registryEntities @@ -156,7 +160,7 @@ export class HuiAreaCard if ( (SENSOR_DOMAINS.includes(domain) || ALERT_DOMAINS.includes(domain)) && - !DEVICE_CLASSES[domain].includes( + !deviceClasses[domain].includes( stateObj.attributes.device_class || "" ) ) { @@ -173,11 +177,12 @@ export class HuiAreaCard } ); - private _isOn(domain: string, deviceClass?: string): boolean | undefined { + private _isOn(domain: string, deviceClass?: string): HassEntity | undefined { const entities = this._entitiesByDomain( this._config!.area, this._devicesInArea(this._config!.area, this._devices!), this._entities!, + this._deviceClasses, this.hass.states )[domain]; if (!entities) { @@ -189,7 +194,7 @@ export class HuiAreaCard (entity) => entity.attributes.device_class === deviceClass ) : entities - ).some( + ).find( (entity) => !isUnavailableState(entity.state) && !STATES_OFF.includes(entity.state) ); @@ -200,6 +205,7 @@ export class HuiAreaCard this._config!.area, this._devicesInArea(this._config!.area, this._devices!), this._entities!, + this._deviceClasses, this.hass.states )[domain].filter((entity) => deviceClass ? entity.attributes.device_class === deviceClass : true @@ -273,6 +279,11 @@ export class HuiAreaCard } this._config = config; + + this._deviceClasses = { ...DEVICE_CLASSES }; + if (config.alert_classes) { + this._deviceClasses.binary_sensor = config.alert_classes; + } } protected shouldUpdate(changedProps: PropertyValues): boolean { @@ -314,6 +325,7 @@ export class HuiAreaCard this._config.area, this._devicesInArea(this._config.area, this._devices), this._entities, + this._deviceClasses, this.hass.states ); @@ -355,6 +367,7 @@ export class HuiAreaCard this._config.area, this._devicesInArea(this._config.area, this._devices), this._entities, + this._deviceClasses, this.hass.states ); const area = this._area(this._config.area, this._areas); @@ -427,17 +440,16 @@ export class HuiAreaCard if (!(domain in entitiesByDomain)) { return ""; } - return DEVICE_CLASSES[domain].map((deviceClass) => - this._isOn(domain, deviceClass) - ? html` - ${DOMAIN_ICONS[domain][deviceClass] - ? html`` - : ""} - ` - : "" - ); + return this._deviceClasses[domain].map((deviceClass) => { + const entity = this._isOn(domain, deviceClass); + return entity + ? html`` + : nothing; + }); })}
@@ -562,6 +574,7 @@ export class HuiAreaCard background: var(--accent-color); color: var(--text-accent-color, var(--text-primary-color)); padding: 8px; + margin-right: 8px; border-radius: 50%; } diff --git a/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts index c28567945aa0..c49e9bf99ea2 100644 --- a/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts @@ -1,15 +1,29 @@ import { html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; -import { assert, assign, boolean, object, optional, string } from "superstruct"; +import { + assert, + array, + assign, + boolean, + object, + optional, + string, +} from "superstruct"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-form/ha-form"; -import { DEFAULT_ASPECT_RATIO } from "../../cards/hui-area-card"; +import { + DEFAULT_ASPECT_RATIO, + DEVICE_CLASSES, +} from "../../cards/hui-area-card"; import type { SchemaUnion } from "../../../../components/ha-form/types"; import type { HomeAssistant } from "../../../../types"; import type { AreaCardConfig } from "../../cards/types"; import type { LovelaceCardEditor } from "../../types"; import { baseLovelaceCardConfig } from "../structs/base-card-struct"; +import { computeDomain } from "../../../../common/entity/compute_domain"; +import { caseInsensitiveStringCompare } from "../../../../common/string/compare"; +import { SelectOption } from "../../../../data/selector"; const cardConfigStruct = assign( baseLovelaceCardConfig, @@ -20,8 +34,10 @@ const cardConfigStruct = assign( show_camera: optional(boolean()), camera_view: optional(string()), aspect_ratio: optional(string()), + alert_classes: optional(array(string())), }) ); + @customElement("hui-area-card-editor") export class HuiAreaCardEditor extends LitElement @@ -32,7 +48,7 @@ export class HuiAreaCardEditor @state() private _config?: AreaCardConfig; private _schema = memoizeOne( - (showCamera: boolean) => + (showCamera: boolean, binaryClasses: SelectOption[]) => [ { name: "area", selector: { area: {} } }, { name: "show_camera", required: false, selector: { boolean: {} } }, @@ -61,9 +77,60 @@ export class HuiAreaCardEditor }, ], }, + { + name: "alert_classes", + selector: { + select: { + reorder: true, + multiple: true, + custom_value: true, + options: binaryClasses, + }, + }, + }, ] as const ); + private _binaryClassesForArea = memoizeOne((area: string): string[] => { + const entities = Object.values(this.hass!.entities).filter( + (e) => + computeDomain(e.entity_id) === "binary_sensor" && + !e.entity_category && + !e.hidden && + (e.area_id === area || + (e.device_id && this.hass!.devices[e.device_id].area_id === area)) + ); + + const classes = entities + .map((e) => this.hass!.states[e.entity_id]?.attributes.device_class || "") + .filter((c) => c); + + return [...new Set(classes)]; + }); + + private _buildOptions = memoizeOne( + (possibleClasses: string[], currentClasses: string[]): SelectOption[] => { + const options = [...new Set([...possibleClasses, ...currentClasses])].map( + (deviceClass) => ({ + value: deviceClass, + label: + this.hass!.localize( + `component.binary_sensor.entity_component.${deviceClass}.name` + ) || deviceClass, + }) + ); + options.sort((a, b) => + caseInsensitiveStringCompare( + a.label, + b.label, + this.hass!.locale.language + ) + ); + + return options; + } + ); + public setConfig(config: AreaCardConfig): void { assert(config, cardConfigStruct); this._config = config; @@ -74,10 +141,20 @@ export class HuiAreaCardEditor return nothing; } - const schema = this._schema(this._config.show_camera || false); + const possibleClasses = this._binaryClassesForArea(this._config.area || ""); + const selectOptions = this._buildOptions( + possibleClasses, + this._config.alert_classes || DEVICE_CLASSES.binary_sensor + ); + + const schema = this._schema( + this._config.show_camera || false, + selectOptions + ); const data = { camera_view: "auto", + alert_classes: DEVICE_CLASSES.binary_sensor, ...this._config, }; @@ -124,6 +201,10 @@ export class HuiAreaCardEditor return this.hass!.localize( "ui.panel.lovelace.editor.card.generic.camera_view" ); + case "alert_classes": + return this.hass!.localize( + "ui.panel.lovelace.editor.card.area.alert_classes" + ); } return this.hass!.localize( `ui.panel.lovelace.editor.card.area.${schema.name}` diff --git a/src/translations/en.json b/src/translations/en.json index 0ef583607874..6ea99bc0ad44 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -5132,6 +5132,7 @@ }, "area": { "name": "Area", + "alert_classes": "Alert Classes", "description": "The Area card automatically displays entities of a specific area.", "show_camera": "Show camera feed instead of area picture" }, From 70fcea0c2b6ccbd8d89fc1fda7bbe4101441a434 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 15 Jan 2024 09:52:10 -0500 Subject: [PATCH 146/361] Disable attributes for hass, stateObj, selector, and route properties (#19362) * Disable attribute for hass properties * Disable attribute for stateObj properties * Disable attribute for selector properties * Disable attribute for route properties * Switch from Object type to no attribute for same properties --- gallery/src/components/demo-card.ts | 2 +- gallery/src/components/demo-cards.ts | 2 +- gallery/src/components/demo-more-info.ts | 2 +- gallery/src/components/demo-more-infos.ts | 2 +- gallery/src/pages/more-info/climate.ts | 2 +- gallery/src/pages/more-info/cover.ts | 2 +- gallery/src/pages/more-info/humidifier.ts | 2 +- gallery/src/pages/more-info/input-number.ts | 2 +- gallery/src/pages/more-info/input-text.ts | 2 +- gallery/src/pages/more-info/light.ts | 2 +- gallery/src/pages/more-info/lock.ts | 2 +- gallery/src/pages/more-info/media-player.ts | 2 +- gallery/src/pages/more-info/number.ts | 2 +- gallery/src/pages/more-info/scene.ts | 2 +- gallery/src/pages/more-info/timer.ts | 2 +- gallery/src/pages/more-info/update.ts | 2 +- gallery/src/pages/more-info/vacuum.ts | 2 +- gallery/src/pages/more-info/water-heater.ts | 2 +- hassio/src/backups/hassio-backups.ts | 2 +- src/components/entity/ha-entity-toggle.ts | 2 +- src/components/entity/state-badge.ts | 2 +- src/components/ha-attribute-value.ts | 2 +- src/components/ha-attributes.ts | 2 +- src/components/ha-button-related-filter-menu.ts | 2 +- src/components/ha-dialog-date-picker.ts | 2 +- src/components/ha-form/ha-form-string.ts | 2 +- src/components/ha-icon-picker.ts | 2 +- src/components/ha-navigation-picker.ts | 2 +- src/components/ha-selector/ha-selector-action.ts | 4 ++-- src/components/ha-selector/ha-selector-addon.ts | 4 ++-- src/components/ha-selector/ha-selector-area-filter.ts | 4 ++-- src/components/ha-selector/ha-selector-area.ts | 4 ++-- src/components/ha-selector/ha-selector-assist-pipeline.ts | 4 ++-- src/components/ha-selector/ha-selector-backup-location.ts | 4 ++-- src/components/ha-selector/ha-selector-boolean.ts | 2 +- src/components/ha-selector/ha-selector-color-temp.ts | 4 ++-- src/components/ha-selector/ha-selector-condition.ts | 4 ++-- src/components/ha-selector/ha-selector-constant.ts | 2 +- src/components/ha-selector/ha-selector-conversation-agent.ts | 4 ++-- src/components/ha-selector/ha-selector-country.ts | 4 ++-- src/components/ha-selector/ha-selector-date.ts | 4 ++-- src/components/ha-selector/ha-selector-device.ts | 4 ++-- src/components/ha-selector/ha-selector-entity.ts | 4 ++-- src/components/ha-selector/ha-selector-file.ts | 4 ++-- src/components/ha-selector/ha-selector-icon.ts | 4 ++-- src/components/ha-selector/ha-selector-language.ts | 4 ++-- src/components/ha-selector/ha-selector-navigation.ts | 4 ++-- src/components/ha-selector/ha-selector-number.ts | 4 ++-- src/components/ha-selector/ha-selector-object.ts | 2 +- src/components/ha-selector/ha-selector-state.ts | 4 ++-- src/components/ha-selector/ha-selector-statistic.ts | 4 ++-- src/components/ha-selector/ha-selector-stt.ts | 4 ++-- src/components/ha-selector/ha-selector-target.ts | 4 ++-- src/components/ha-selector/ha-selector-template.ts | 2 +- src/components/ha-selector/ha-selector-text.ts | 4 ++-- src/components/ha-selector/ha-selector-trigger.ts | 4 ++-- src/components/ha-selector/ha-selector-tts-voice.ts | 4 ++-- src/components/ha-selector/ha-selector-tts.ts | 4 ++-- src/components/ha-selector/ha-selector-ui-action.ts | 4 ++-- src/components/ha-selector/ha-selector-ui-color.ts | 4 ++-- src/components/ha-selector/ha-selector.ts | 4 ++-- src/components/ha-sidebar.ts | 2 +- src/components/media-player/ha-browse-media-tts.ts | 2 +- .../more-info/components/lights/ha-favorite-color-button.ts | 2 +- src/dialogs/more-info/controls/more-info-climate.ts | 2 +- src/dialogs/more-info/controls/more-info-counter.ts | 2 +- src/dialogs/more-info/controls/more-info-default.ts | 2 +- src/dialogs/more-info/controls/more-info-group.ts | 2 +- src/dialogs/more-info/controls/more-info-humidifier.ts | 2 +- src/dialogs/more-info/controls/more-info-lawn_mower.ts | 2 +- src/dialogs/more-info/controls/more-info-person.ts | 2 +- src/dialogs/more-info/controls/more-info-remote.ts | 2 +- src/dialogs/more-info/controls/more-info-script.ts | 2 +- src/dialogs/more-info/controls/more-info-sun.ts | 2 +- src/dialogs/more-info/controls/more-info-timer.ts | 2 +- src/dialogs/more-info/controls/more-info-vacuum.ts | 2 +- src/dialogs/more-info/controls/more-info-water_heater.ts | 2 +- src/dialogs/more-info/controls/more-info-weather.ts | 2 +- src/layouts/hass-router-page.ts | 2 +- src/layouts/hass-tabs-subpage-data-table.ts | 2 +- src/layouts/home-assistant-main.ts | 2 +- src/panels/calendar/ha-recurrence-rule-editor.ts | 2 +- .../ha-config-application-credentials.ts | 2 +- src/panels/config/areas/ha-config-areas-dashboard.ts | 2 +- src/panels/config/automation/blueprint-automation-editor.ts | 2 +- src/panels/config/automation/ha-automation-editor.ts | 2 +- src/panels/config/automation/ha-automation-picker.ts | 2 +- src/panels/config/cloud/ha-config-cloud.ts | 2 +- src/panels/config/devices/ha-config-devices-dashboard.ts | 2 +- src/panels/config/ha-panel-config.ts | 2 +- src/panels/config/helpers/ha-config-helpers.ts | 2 +- .../config/integrations/ha-config-integrations-dashboard.ts | 2 +- .../integrations/integration-panels/zha/zha-add-group-page.ts | 2 +- .../integration-panels/zha/zha-config-dashboard.ts | 4 ++-- .../integration-panels/zha/zha-device-endpoint-data-table.ts | 2 +- .../integrations/integration-panels/zha/zha-group-page.ts | 2 +- .../integration-panels/zha/zha-groups-dashboard.ts | 2 +- .../integration-panels/zwave_js/zwave_js-config-dashboard.ts | 4 ++-- .../integrations/integration-panels/zwave_js/zwave_js-logs.ts | 2 +- .../integration-panels/zwave_js/zwave_js-provisioned.ts | 2 +- .../lovelace/dashboards/ha-config-lovelace-dashboards.ts | 2 +- .../config/lovelace/resources/ha-config-lovelace-resources.ts | 2 +- src/panels/config/person/ha-config-person.ts | 2 +- src/panels/config/scene/ha-scene-dashboard.ts | 2 +- src/panels/config/scene/ha-scene-editor.ts | 2 +- src/panels/config/script/ha-script-picker.ts | 2 +- src/panels/config/tags/ha-config-tags.ts | 2 +- .../config/voice-assistants/expose/expose-assistant-icon.ts | 2 +- .../voice-assistants/ha-config-voice-assistants-assistants.ts | 2 +- .../voice-assistants/ha-config-voice-assistants-expose.ts | 2 +- src/panels/config/zone/ha-config-zone.ts | 2 +- src/panels/custom/ha-panel-custom.ts | 2 +- src/panels/developer-tools/ha-panel-developer-tools.ts | 2 +- .../developer-tools/template/developer-tools-template.ts | 2 +- src/panels/iframe/ha-panel-iframe.ts | 2 +- src/panels/logbook/ha-panel-logbook.ts | 2 +- src/panels/lovelace/cards/hui-iframe-card.ts | 2 +- src/panels/lovelace/components/hui-color-picker.ts | 2 +- src/panels/lovelace/entity-rows/hui-humidifier-entity-row.ts | 2 +- src/panels/lovelace/ha-panel-lovelace.ts | 2 +- src/panels/media-browser/ha-panel-media-browser.ts | 2 +- src/panels/my/ha-panel-my.ts | 2 +- src/panels/profile/dialog-ha-mfa-module-setup-flow.ts | 2 +- src/state-summary/state-card-button.ts | 2 +- src/state-summary/state-card-event.ts | 2 +- src/state-summary/state-card-input_button.ts | 2 +- src/state-summary/state-card-input_number.ts | 2 +- src/state-summary/state-card-input_select.ts | 2 +- src/state-summary/state-card-lawn_mower.ts | 2 +- src/state-summary/state-card-script.ts | 2 +- src/state-summary/state-card-select.ts | 2 +- src/state-summary/state-card-text.ts | 2 +- 132 files changed, 163 insertions(+), 163 deletions(-) diff --git a/gallery/src/components/demo-card.ts b/gallery/src/components/demo-card.ts index b0ae74afdcab..87ae240ac41c 100644 --- a/gallery/src/components/demo-card.ts +++ b/gallery/src/components/demo-card.ts @@ -11,7 +11,7 @@ export interface DemoCardConfig { @customElement("demo-card") class DemoCard extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public config!: DemoCardConfig; diff --git a/gallery/src/components/demo-cards.ts b/gallery/src/components/demo-cards.ts index 0bb36e33091c..8080b4a7fc47 100644 --- a/gallery/src/components/demo-cards.ts +++ b/gallery/src/components/demo-cards.ts @@ -12,7 +12,7 @@ import "../ha-demo-options"; class DemoCards extends LitElement { @property() public configs!: DemoCardConfig[]; - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @state() private _showConfig = false; diff --git a/gallery/src/components/demo-more-info.ts b/gallery/src/components/demo-more-info.ts index 5fb5fe502221..dd1b03781634 100644 --- a/gallery/src/components/demo-more-info.ts +++ b/gallery/src/components/demo-more-info.ts @@ -8,7 +8,7 @@ import { HomeAssistant } from "../../../src/types"; @customElement("demo-more-info") class DemoMoreInfo extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public entityId!: string; diff --git a/gallery/src/components/demo-more-infos.ts b/gallery/src/components/demo-more-infos.ts index 5d7d92862084..8a13665e433f 100644 --- a/gallery/src/components/demo-more-infos.ts +++ b/gallery/src/components/demo-more-infos.ts @@ -9,7 +9,7 @@ import { HomeAssistant } from "../../../src/types"; @customElement("demo-more-infos") class DemoMoreInfos extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public entities!: []; diff --git a/gallery/src/pages/more-info/climate.ts b/gallery/src/pages/more-info/climate.ts index f6216a55b1c4..6af0d9a48e40 100644 --- a/gallery/src/pages/more-info/climate.ts +++ b/gallery/src/pages/more-info/climate.ts @@ -92,7 +92,7 @@ const ENTITIES = [ @customElement("demo-more-info-climate") class DemoMoreInfoClimate extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/cover.ts b/gallery/src/pages/more-info/cover.ts index 65f9ba4a2562..6f1f0a4e97ff 100644 --- a/gallery/src/pages/more-info/cover.ts +++ b/gallery/src/pages/more-info/cover.ts @@ -141,7 +141,7 @@ const ENTITIES = [ @customElement("demo-more-info-cover") class DemoMoreInfoCover extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/humidifier.ts b/gallery/src/pages/more-info/humidifier.ts index 024b4dae7af9..c95b4433d2df 100644 --- a/gallery/src/pages/more-info/humidifier.ts +++ b/gallery/src/pages/more-info/humidifier.ts @@ -29,7 +29,7 @@ const ENTITIES = [ @customElement("demo-more-info-humidifier") class DemoMoreInfoHumidifier extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/input-number.ts b/gallery/src/pages/more-info/input-number.ts index e070b52e8b99..af8c1b5be635 100644 --- a/gallery/src/pages/more-info/input-number.ts +++ b/gallery/src/pages/more-info/input-number.ts @@ -32,7 +32,7 @@ const ENTITIES = [ @customElement("demo-more-info-input-number") class DemoMoreInfoInputNumber extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/input-text.ts b/gallery/src/pages/more-info/input-text.ts index ab2902a4fe9e..f82549004e2e 100644 --- a/gallery/src/pages/more-info/input-text.ts +++ b/gallery/src/pages/more-info/input-text.ts @@ -18,7 +18,7 @@ const ENTITIES = [ @customElement("demo-more-info-input-text") class DemoMoreInfoInputText extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/light.ts b/gallery/src/pages/more-info/light.ts index 336aeb8ca83c..47aa0bf5a86f 100644 --- a/gallery/src/pages/more-info/light.ts +++ b/gallery/src/pages/more-info/light.ts @@ -140,7 +140,7 @@ const ENTITIES = [ @customElement("demo-more-info-light") class DemoMoreInfoLight extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/lock.ts b/gallery/src/pages/more-info/lock.ts index 4fe7e465635f..03f0fb808713 100644 --- a/gallery/src/pages/more-info/lock.ts +++ b/gallery/src/pages/more-info/lock.ts @@ -21,7 +21,7 @@ const ENTITIES = [ @customElement("demo-more-info-lock") class DemoMoreInfoLock extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/media-player.ts b/gallery/src/pages/more-info/media-player.ts index f02cc2ec5a55..4df86741826d 100644 --- a/gallery/src/pages/more-info/media-player.ts +++ b/gallery/src/pages/more-info/media-player.ts @@ -13,7 +13,7 @@ const ENTITIES = createMediaPlayerEntities(); @customElement("demo-more-info-media-player") class DemoMoreInfoMediaPlayer extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/number.ts b/gallery/src/pages/more-info/number.ts index c38693596ad0..29766c8a03b6 100644 --- a/gallery/src/pages/more-info/number.ts +++ b/gallery/src/pages/more-info/number.ts @@ -50,7 +50,7 @@ const ENTITIES = [ @customElement("demo-more-info-number") class DemoMoreInfoNumber extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/scene.ts b/gallery/src/pages/more-info/scene.ts index aaa1385e6b41..2449c251fa43 100644 --- a/gallery/src/pages/more-info/scene.ts +++ b/gallery/src/pages/more-info/scene.ts @@ -21,7 +21,7 @@ const ENTITIES = [ @customElement("demo-more-info-scene") class DemoMoreInfoScene extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/timer.ts b/gallery/src/pages/more-info/timer.ts index 404b31df03d3..3dad8d48e7ea 100644 --- a/gallery/src/pages/more-info/timer.ts +++ b/gallery/src/pages/more-info/timer.ts @@ -18,7 +18,7 @@ const ENTITIES = [ @customElement("demo-more-info-timer") class DemoMoreInfoTimer extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/update.ts b/gallery/src/pages/more-info/update.ts index 43951d4c5e8a..1d9056e95ecd 100644 --- a/gallery/src/pages/more-info/update.ts +++ b/gallery/src/pages/more-info/update.ts @@ -146,7 +146,7 @@ const ENTITIES = [ @customElement("demo-more-info-update") class DemoMoreInfoUpdate extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/vacuum.ts b/gallery/src/pages/more-info/vacuum.ts index e1a62f0a2693..3282dd59d5a6 100644 --- a/gallery/src/pages/more-info/vacuum.ts +++ b/gallery/src/pages/more-info/vacuum.ts @@ -22,7 +22,7 @@ const ENTITIES = [ @customElement("demo-more-info-vacuum") class DemoMoreInfoVacuum extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/gallery/src/pages/more-info/water-heater.ts b/gallery/src/pages/more-info/water-heater.ts index 8210dcac5509..a6f7b6f335b0 100644 --- a/gallery/src/pages/more-info/water-heater.ts +++ b/gallery/src/pages/more-info/water-heater.ts @@ -42,7 +42,7 @@ const ENTITIES = [ @customElement("demo-more-info-water-heater") class DemoMoreInfoWaterHeater extends LitElement { - @property() public hass!: MockHomeAssistant; + @property({ attribute: false }) public hass!: MockHomeAssistant; @query("demo-more-infos") private _demoRoot!: HTMLElement; diff --git a/hassio/src/backups/hassio-backups.ts b/hassio/src/backups/hassio-backups.ts index 943e6e6c646b..f3ed9fad439d 100644 --- a/hassio/src/backups/hassio-backups.ts +++ b/hassio/src/backups/hassio-backups.ts @@ -59,7 +59,7 @@ export class HassioBackups extends LitElement { @property({ attribute: false }) public supervisor!: Supervisor; - @property({ type: Object }) public route!: Route; + @property({ attribute: false }) public route!: Route; @property({ type: Boolean }) public narrow!: boolean; diff --git a/src/components/entity/ha-entity-toggle.ts b/src/components/entity/ha-entity-toggle.ts index 21530a8a4cfc..5c4c07afc55a 100644 --- a/src/components/entity/ha-entity-toggle.ts +++ b/src/components/entity/ha-entity-toggle.ts @@ -29,7 +29,7 @@ export class HaEntityToggle extends LitElement { // hass is not a property so that we only re-render on stateObj changes public hass?: HomeAssistant; - @property() public stateObj?: HassEntity; + @property({ attribute: false }) public stateObj?: HassEntity; @property() public label?: string; diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts index 4ef0166fc970..f1f98337e92d 100644 --- a/src/components/entity/state-badge.ts +++ b/src/components/entity/state-badge.ts @@ -26,7 +26,7 @@ import "../ha-state-icon"; export class StateBadge extends LitElement { public hass?: HomeAssistant; - @property() public stateObj?: HassEntity; + @property({ attribute: false }) public stateObj?: HassEntity; @property() public overrideIcon?: string; diff --git a/src/components/ha-attribute-value.ts b/src/components/ha-attribute-value.ts index 3efe39e47b5c..387b2612b0e0 100644 --- a/src/components/ha-attribute-value.ts +++ b/src/components/ha-attribute-value.ts @@ -9,7 +9,7 @@ import { HomeAssistant } from "../types"; class HaAttributeValue extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: HassEntity; + @property({ attribute: false }) public stateObj?: HassEntity; @property() public attribute!: string; diff --git a/src/components/ha-attributes.ts b/src/components/ha-attributes.ts index d63b987a5683..326866a5e27d 100644 --- a/src/components/ha-attributes.ts +++ b/src/components/ha-attributes.ts @@ -19,7 +19,7 @@ import "./ha-expansion-panel"; class HaAttributes extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: HassEntity; + @property({ attribute: false }) public stateObj?: HassEntity; @property({ attribute: "extra-filters" }) public extraFilters?: string; diff --git a/src/components/ha-button-related-filter-menu.ts b/src/components/ha-button-related-filter-menu.ts index 0225f77cab99..77c7848baa49 100644 --- a/src/components/ha-button-related-filter-menu.ts +++ b/src/components/ha-button-related-filter-menu.ts @@ -33,7 +33,7 @@ interface FilterValue { @customElement("ha-button-related-filter-menu") export class HaRelatedFilterButtonMenu extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public corner: Corner = "BOTTOM_START"; diff --git a/src/components/ha-dialog-date-picker.ts b/src/components/ha-dialog-date-picker.ts index b71e063ae410..63d78f3155d8 100644 --- a/src/components/ha-dialog-date-picker.ts +++ b/src/components/ha-dialog-date-picker.ts @@ -12,7 +12,7 @@ import "./ha-dialog"; @customElement("ha-dialog-date-picker") export class HaDialogDatePicker extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public value?: string; diff --git a/src/components/ha-form/ha-form-string.ts b/src/components/ha-form/ha-form-string.ts index ca9b7b985821..ee433e3fa1d5 100644 --- a/src/components/ha-form/ha-form-string.ts +++ b/src/components/ha-form/ha-form-string.ts @@ -25,7 +25,7 @@ const MASKED_FIELDS = ["password", "secret", "token"]; @customElement("ha-form-string") export class HaFormString extends LitElement implements HaFormElement { - @property() public hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; @property() public schema!: HaFormStringSchema; diff --git a/src/components/ha-icon-picker.ts b/src/components/ha-icon-picker.ts index 9dfa60a8d48c..6a37c6d4c547 100644 --- a/src/components/ha-icon-picker.ts +++ b/src/components/ha-icon-picker.ts @@ -74,7 +74,7 @@ const rowRenderer: ComboBoxLitRenderer = (item) => @customElement("ha-icon-picker") export class HaIconPicker extends LitElement { - @property() public hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; @property() public value?: string; diff --git a/src/components/ha-navigation-picker.ts b/src/components/ha-navigation-picker.ts index 7758ec9882e9..8398d0c9aace 100644 --- a/src/components/ha-navigation-picker.ts +++ b/src/components/ha-navigation-picker.ts @@ -50,7 +50,7 @@ const createPanelNavigationItem = (hass: HomeAssistant, panel: PanelInfo) => ({ @customElement("ha-navigation-picker") export class HaNavigationPicker extends LitElement { - @property() public hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; @property() public label?: string; diff --git a/src/components/ha-selector/ha-selector-action.ts b/src/components/ha-selector/ha-selector-action.ts index b8a083a53612..5850c912f322 100644 --- a/src/components/ha-selector/ha-selector-action.ts +++ b/src/components/ha-selector/ha-selector-action.ts @@ -7,9 +7,9 @@ import { HomeAssistant } from "../../types"; @customElement("ha-selector-action") export class HaActionSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: ActionSelector; + @property({ attribute: false }) public selector!: ActionSelector; @property() public value?: Action; diff --git a/src/components/ha-selector/ha-selector-addon.ts b/src/components/ha-selector/ha-selector-addon.ts index 91aee42777a0..ef61da057539 100644 --- a/src/components/ha-selector/ha-selector-addon.ts +++ b/src/components/ha-selector/ha-selector-addon.ts @@ -6,9 +6,9 @@ import "../ha-addon-picker"; @customElement("ha-selector-addon") export class HaAddonSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: AddonSelector; + @property({ attribute: false }) public selector!: AddonSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-area-filter.ts b/src/components/ha-selector/ha-selector-area-filter.ts index 7efd243a8c01..460972b6390d 100644 --- a/src/components/ha-selector/ha-selector-area-filter.ts +++ b/src/components/ha-selector/ha-selector-area-filter.ts @@ -6,9 +6,9 @@ import "../ha-area-filter"; @customElement("ha-selector-area_filter") export class HaAreaFilterSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: AreaFilterSelector; + @property({ attribute: false }) public selector!: AreaFilterSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-area.ts b/src/components/ha-selector/ha-selector-area.ts index def6fa11a526..e74631423171 100644 --- a/src/components/ha-selector/ha-selector-area.ts +++ b/src/components/ha-selector/ha-selector-area.ts @@ -21,9 +21,9 @@ import "../ha-areas-picker"; @customElement("ha-selector-area") export class HaAreaSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: AreaSelector; + @property({ attribute: false }) public selector!: AreaSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-assist-pipeline.ts b/src/components/ha-selector/ha-selector-assist-pipeline.ts index 9a00519f0719..c84d037769bd 100644 --- a/src/components/ha-selector/ha-selector-assist-pipeline.ts +++ b/src/components/ha-selector/ha-selector-assist-pipeline.ts @@ -6,9 +6,9 @@ import "../ha-assist-pipeline-picker"; @customElement("ha-selector-assist_pipeline") export class HaAssistPipelineSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: AssistPipelineSelector; + @property({ attribute: false }) public selector!: AssistPipelineSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-backup-location.ts b/src/components/ha-selector/ha-selector-backup-location.ts index 0a98806b8362..1499c642fc35 100644 --- a/src/components/ha-selector/ha-selector-backup-location.ts +++ b/src/components/ha-selector/ha-selector-backup-location.ts @@ -6,9 +6,9 @@ import "../ha-mount-picker"; @customElement("ha-selector-backup_location") export class HaBackupLocationSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: BackupLocationSelector; + @property({ attribute: false }) public selector!: BackupLocationSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-boolean.ts b/src/components/ha-selector/ha-selector-boolean.ts index 0d94d6de7b22..a6e0584f072c 100644 --- a/src/components/ha-selector/ha-selector-boolean.ts +++ b/src/components/ha-selector/ha-selector-boolean.ts @@ -8,7 +8,7 @@ import "../ha-input-helper-text"; @customElement("ha-selector-boolean") export class HaBooleanSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) public value = false; diff --git a/src/components/ha-selector/ha-selector-color-temp.ts b/src/components/ha-selector/ha-selector-color-temp.ts index f9017ece31bb..ef59e7799694 100644 --- a/src/components/ha-selector/ha-selector-color-temp.ts +++ b/src/components/ha-selector/ha-selector-color-temp.ts @@ -15,9 +15,9 @@ import { @customElement("ha-selector-color_temp") export class HaColorTempSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: ColorTempSelector; + @property({ attribute: false }) public selector!: ColorTempSelector; @property() public value?: string; diff --git a/src/components/ha-selector/ha-selector-condition.ts b/src/components/ha-selector/ha-selector-condition.ts index 29fbaa49e6ee..17461bb973ea 100644 --- a/src/components/ha-selector/ha-selector-condition.ts +++ b/src/components/ha-selector/ha-selector-condition.ts @@ -7,9 +7,9 @@ import { HomeAssistant } from "../../types"; @customElement("ha-selector-condition") export class HaConditionSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: ConditionSelector; + @property({ attribute: false }) public selector!: ConditionSelector; @property() public value?: Condition; diff --git a/src/components/ha-selector/ha-selector-constant.ts b/src/components/ha-selector/ha-selector-constant.ts index 27fcc8f7f627..f05557832bfd 100644 --- a/src/components/ha-selector/ha-selector-constant.ts +++ b/src/components/ha-selector/ha-selector-constant.ts @@ -4,7 +4,7 @@ import { ConstantSelector } from "../../data/selector"; @customElement("ha-selector-constant") export class HaSelectorConstant extends LitElement { - @property() public selector!: ConstantSelector; + @property({ attribute: false }) public selector!: ConstantSelector; @property({ type: Boolean }) public disabled = false; diff --git a/src/components/ha-selector/ha-selector-conversation-agent.ts b/src/components/ha-selector/ha-selector-conversation-agent.ts index 14b85bfad023..8ff2d76f30d7 100644 --- a/src/components/ha-selector/ha-selector-conversation-agent.ts +++ b/src/components/ha-selector/ha-selector-conversation-agent.ts @@ -6,9 +6,9 @@ import "../ha-conversation-agent-picker"; @customElement("ha-selector-conversation_agent") export class HaConversationAgentSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: ConversationAgentSelector; + @property({ attribute: false }) public selector!: ConversationAgentSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-country.ts b/src/components/ha-selector/ha-selector-country.ts index 56e54a58756c..85ba84d06741 100644 --- a/src/components/ha-selector/ha-selector-country.ts +++ b/src/components/ha-selector/ha-selector-country.ts @@ -6,9 +6,9 @@ import "../ha-country-picker"; @customElement("ha-selector-country") export class HaCountrySelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: CountrySelector; + @property({ attribute: false }) public selector!: CountrySelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-date.ts b/src/components/ha-selector/ha-selector-date.ts index 8484e29a76ed..f1fa8b6bf13f 100644 --- a/src/components/ha-selector/ha-selector-date.ts +++ b/src/components/ha-selector/ha-selector-date.ts @@ -6,9 +6,9 @@ import "../ha-date-input"; @customElement("ha-selector-date") export class HaDateSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: DateSelector; + @property({ attribute: false }) public selector!: DateSelector; @property() public value?: string; diff --git a/src/components/ha-selector/ha-selector-device.ts b/src/components/ha-selector/ha-selector-device.ts index ab79b2c1d10c..b3ffebd4b667 100644 --- a/src/components/ha-selector/ha-selector-device.ts +++ b/src/components/ha-selector/ha-selector-device.ts @@ -21,9 +21,9 @@ import "../device/ha-devices-picker"; @customElement("ha-selector-device") export class HaDeviceSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: DeviceSelector; + @property({ attribute: false }) public selector!: DeviceSelector; @state() private _entitySources?: EntitySources; diff --git a/src/components/ha-selector/ha-selector-entity.ts b/src/components/ha-selector/ha-selector-entity.ts index 5e44ab217528..ff7b4da106e7 100644 --- a/src/components/ha-selector/ha-selector-entity.ts +++ b/src/components/ha-selector/ha-selector-entity.ts @@ -15,9 +15,9 @@ import "../entity/ha-entity-picker"; @customElement("ha-selector-entity") export class HaEntitySelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: EntitySelector; + @property({ attribute: false }) public selector!: EntitySelector; @state() private _entitySources?: EntitySources; diff --git a/src/components/ha-selector/ha-selector-file.ts b/src/components/ha-selector/ha-selector-file.ts index 2024d04b5401..3ae286581afa 100644 --- a/src/components/ha-selector/ha-selector-file.ts +++ b/src/components/ha-selector/ha-selector-file.ts @@ -10,9 +10,9 @@ import "../ha-file-upload"; @customElement("ha-selector-file") export class HaFileSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: FileSelector; + @property({ attribute: false }) public selector!: FileSelector; @property() public value?: string; diff --git a/src/components/ha-selector/ha-selector-icon.ts b/src/components/ha-selector/ha-selector-icon.ts index 1a5d10cf7273..7f491a93f259 100644 --- a/src/components/ha-selector/ha-selector-icon.ts +++ b/src/components/ha-selector/ha-selector-icon.ts @@ -9,9 +9,9 @@ import "../ha-icon-picker"; @customElement("ha-selector-icon") export class HaIconSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: IconSelector; + @property({ attribute: false }) public selector!: IconSelector; @property() public value?: string; diff --git a/src/components/ha-selector/ha-selector-language.ts b/src/components/ha-selector/ha-selector-language.ts index 79b6dc69f2b5..a4f9727fb88c 100644 --- a/src/components/ha-selector/ha-selector-language.ts +++ b/src/components/ha-selector/ha-selector-language.ts @@ -6,9 +6,9 @@ import "../ha-language-picker"; @customElement("ha-selector-language") export class HaLanguageSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: LanguageSelector; + @property({ attribute: false }) public selector!: LanguageSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-navigation.ts b/src/components/ha-selector/ha-selector-navigation.ts index e275c47d3aa3..a3f61fc68dd1 100644 --- a/src/components/ha-selector/ha-selector-navigation.ts +++ b/src/components/ha-selector/ha-selector-navigation.ts @@ -7,9 +7,9 @@ import "../ha-navigation-picker"; @customElement("ha-selector-navigation") export class HaNavigationSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: NavigationSelector; + @property({ attribute: false }) public selector!: NavigationSelector; @property() public value?: string; diff --git a/src/components/ha-selector/ha-selector-number.ts b/src/components/ha-selector/ha-selector-number.ts index 672e9f8a5270..ba6045249330 100644 --- a/src/components/ha-selector/ha-selector-number.ts +++ b/src/components/ha-selector/ha-selector-number.ts @@ -10,9 +10,9 @@ import "../ha-textfield"; @customElement("ha-selector-number") export class HaNumberSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: NumberSelector; + @property({ attribute: false }) public selector!: NumberSelector; @property({ type: Number }) public value?: number; diff --git a/src/components/ha-selector/ha-selector-object.ts b/src/components/ha-selector/ha-selector-object.ts index 42bc771de70b..55737e3ca2c2 100644 --- a/src/components/ha-selector/ha-selector-object.ts +++ b/src/components/ha-selector/ha-selector-object.ts @@ -8,7 +8,7 @@ import type { HaYamlEditor } from "../ha-yaml-editor"; @customElement("ha-selector-object") export class HaObjectSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-state.ts b/src/components/ha-selector/ha-selector-state.ts index 4b16c8e8b0b1..f42718b3c23f 100644 --- a/src/components/ha-selector/ha-selector-state.ts +++ b/src/components/ha-selector/ha-selector-state.ts @@ -7,9 +7,9 @@ import "../entity/ha-entity-state-picker"; @customElement("ha-selector-state") export class HaSelectorState extends SubscribeMixin(LitElement) { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: StateSelector; + @property({ attribute: false }) public selector!: StateSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-statistic.ts b/src/components/ha-selector/ha-selector-statistic.ts index 360075069ad4..078e75849e62 100644 --- a/src/components/ha-selector/ha-selector-statistic.ts +++ b/src/components/ha-selector/ha-selector-statistic.ts @@ -6,9 +6,9 @@ import "../entity/ha-statistics-picker"; @customElement("ha-selector-statistic") export class HaStatisticSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: StatisticSelector; + @property({ attribute: false }) public selector!: StatisticSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-stt.ts b/src/components/ha-selector/ha-selector-stt.ts index 75549077fdd2..03150da3da54 100644 --- a/src/components/ha-selector/ha-selector-stt.ts +++ b/src/components/ha-selector/ha-selector-stt.ts @@ -6,9 +6,9 @@ import "../ha-stt-picker"; @customElement("ha-selector-stt") export class HaSTTSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: STTSelector; + @property({ attribute: false }) public selector!: STTSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-target.ts b/src/components/ha-selector/ha-selector-target.ts index 9b649f094f0e..3270f8b4db7e 100644 --- a/src/components/ha-selector/ha-selector-target.ts +++ b/src/components/ha-selector/ha-selector-target.ts @@ -28,9 +28,9 @@ import "../ha-target-picker"; @customElement("ha-selector-target") export class HaTargetSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: TargetSelector; + @property({ attribute: false }) public selector!: TargetSelector; @property() public value?: HassServiceTarget; diff --git a/src/components/ha-selector/ha-selector-template.ts b/src/components/ha-selector/ha-selector-template.ts index 4a2f3ff31e00..ae83de5ee13f 100644 --- a/src/components/ha-selector/ha-selector-template.ts +++ b/src/components/ha-selector/ha-selector-template.ts @@ -7,7 +7,7 @@ import "../ha-input-helper-text"; @customElement("ha-selector-template") export class HaTemplateSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public value?: string; diff --git a/src/components/ha-selector/ha-selector-text.ts b/src/components/ha-selector/ha-selector-text.ts index 6d175017a48c..89d336c10274 100644 --- a/src/components/ha-selector/ha-selector-text.ts +++ b/src/components/ha-selector/ha-selector-text.ts @@ -12,7 +12,7 @@ import "../ha-textfield"; @customElement("ha-selector-text") export class HaTextSelector extends LitElement { - @property() public hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; @property() public value?: any; @@ -24,7 +24,7 @@ export class HaTextSelector extends LitElement { @property() public helper?: string; - @property() public selector!: StringSelector; + @property({ attribute: false }) public selector!: StringSelector; @property({ type: Boolean }) public disabled = false; diff --git a/src/components/ha-selector/ha-selector-trigger.ts b/src/components/ha-selector/ha-selector-trigger.ts index 1f9213aa918b..7a31fb8e7ada 100644 --- a/src/components/ha-selector/ha-selector-trigger.ts +++ b/src/components/ha-selector/ha-selector-trigger.ts @@ -7,9 +7,9 @@ import { HomeAssistant } from "../../types"; @customElement("ha-selector-trigger") export class HaTriggerSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: TriggerSelector; + @property({ attribute: false }) public selector!: TriggerSelector; @property() public value?: Trigger; diff --git a/src/components/ha-selector/ha-selector-tts-voice.ts b/src/components/ha-selector/ha-selector-tts-voice.ts index 6098ed7ebb34..e5a67c6ef4ed 100644 --- a/src/components/ha-selector/ha-selector-tts-voice.ts +++ b/src/components/ha-selector/ha-selector-tts-voice.ts @@ -6,9 +6,9 @@ import "../ha-tts-voice-picker"; @customElement("ha-selector-tts_voice") export class HaTTSVoiceSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: TTSVoiceSelector; + @property({ attribute: false }) public selector!: TTSVoiceSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-tts.ts b/src/components/ha-selector/ha-selector-tts.ts index fbf83fb1673f..9111047497a5 100644 --- a/src/components/ha-selector/ha-selector-tts.ts +++ b/src/components/ha-selector/ha-selector-tts.ts @@ -6,9 +6,9 @@ import "../ha-tts-picker"; @customElement("ha-selector-tts") export class HaTTSSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: TTSSelector; + @property({ attribute: false }) public selector!: TTSSelector; @property() public value?: any; diff --git a/src/components/ha-selector/ha-selector-ui-action.ts b/src/components/ha-selector/ha-selector-ui-action.ts index 34c71d280dfa..63fe5d5bc689 100644 --- a/src/components/ha-selector/ha-selector-ui-action.ts +++ b/src/components/ha-selector/ha-selector-ui-action.ts @@ -8,9 +8,9 @@ import { HomeAssistant } from "../../types"; @customElement("ha-selector-ui_action") export class HaSelectorUiAction extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: UiActionSelector; + @property({ attribute: false }) public selector!: UiActionSelector; @property() public value?: ActionConfig; diff --git a/src/components/ha-selector/ha-selector-ui-color.ts b/src/components/ha-selector/ha-selector-ui-color.ts index c88c083f8ef0..291977ace02a 100644 --- a/src/components/ha-selector/ha-selector-ui-color.ts +++ b/src/components/ha-selector/ha-selector-ui-color.ts @@ -7,9 +7,9 @@ import { HomeAssistant } from "../../types"; @customElement("ha-selector-ui_color") export class HaSelectorUiColor extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() public selector!: UiColorSelector; + @property({ attribute: false }) public selector!: UiColorSelector; @property() public value?: string; diff --git a/src/components/ha-selector/ha-selector.ts b/src/components/ha-selector/ha-selector.ts index 5f68124f89c5..bad10c521f75 100644 --- a/src/components/ha-selector/ha-selector.ts +++ b/src/components/ha-selector/ha-selector.ts @@ -59,11 +59,11 @@ const LEGACY_UI_SELECTORS = new Set(["ui-action", "ui-color"]); @customElement("ha-selector") export class HaSelector extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public name?: string; - @property() public selector!: Selector; + @property({ attribute: false }) public selector!: Selector; @property() public value?: any; diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts index 352f0130f98c..fef5cb1ed2ec 100644 --- a/src/components/ha-sidebar.ts +++ b/src/components/ha-sidebar.ts @@ -191,7 +191,7 @@ class HaSidebar extends SubscribeMixin(LitElement) { @property({ type: Boolean, reflect: true }) public narrow!: boolean; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @property({ type: Boolean }) public alwaysExpand = false; diff --git a/src/components/media-player/ha-browse-media-tts.ts b/src/components/media-player/ha-browse-media-tts.ts index cb10b053c421..d93ba0c9b48a 100644 --- a/src/components/media-player/ha-browse-media-tts.ts +++ b/src/components/media-player/ha-browse-media-tts.ts @@ -31,7 +31,7 @@ declare global { @customElement("ha-browse-media-tts") class BrowseMediaTTS extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public item!: MediaPlayerItem; diff --git a/src/dialogs/more-info/components/lights/ha-favorite-color-button.ts b/src/dialogs/more-info/components/lights/ha-favorite-color-button.ts index 12be00c662c4..1da77121e2aa 100644 --- a/src/dialogs/more-info/components/lights/ha-favorite-color-button.ts +++ b/src/dialogs/more-info/components/lights/ha-favorite-color-button.ts @@ -24,7 +24,7 @@ class MoreInfoViewLightColorPicker extends LitElement { @property({ type: Boolean, reflect: true }) disabled = false; - @property() stateObj?: LightEntity; + @property({ attribute: false }) public stateObj?: LightEntity; @property() color!: LightColor; diff --git a/src/dialogs/more-info/controls/more-info-climate.ts b/src/dialogs/more-info/controls/more-info-climate.ts index b40927062941..ad740ad588fe 100644 --- a/src/dialogs/more-info/controls/more-info-climate.ts +++ b/src/dialogs/more-info/controls/more-info-climate.ts @@ -38,7 +38,7 @@ type MainControl = "temperature" | "humidity"; class MoreInfoClimate extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: ClimateEntity; + @property({ attribute: false }) public stateObj?: ClimateEntity; @state() private _mainControl: MainControl = "temperature"; diff --git a/src/dialogs/more-info/controls/more-info-counter.ts b/src/dialogs/more-info/controls/more-info-counter.ts index c1132f8172f0..60e8c733e6a9 100644 --- a/src/dialogs/more-info/controls/more-info-counter.ts +++ b/src/dialogs/more-info/controls/more-info-counter.ts @@ -9,7 +9,7 @@ import { HomeAssistant } from "../../../types"; class MoreInfoCounter extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: HassEntity; + @property({ attribute: false }) public stateObj?: HassEntity; protected render() { if (!this.hass || !this.stateObj) { diff --git a/src/dialogs/more-info/controls/more-info-default.ts b/src/dialogs/more-info/controls/more-info-default.ts index a8e14bdecbfc..c7993fa47fa0 100644 --- a/src/dialogs/more-info/controls/more-info-default.ts +++ b/src/dialogs/more-info/controls/more-info-default.ts @@ -8,7 +8,7 @@ import { HomeAssistant } from "../../../types"; class MoreInfoDefault extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: HassEntity; + @property({ attribute: false }) public stateObj?: HassEntity; protected render() { if (!this.hass || !this.stateObj) { diff --git a/src/dialogs/more-info/controls/more-info-group.ts b/src/dialogs/more-info/controls/more-info-group.ts index dd634a992737..b6cfc47d2305 100644 --- a/src/dialogs/more-info/controls/more-info-group.ts +++ b/src/dialogs/more-info/controls/more-info-group.ts @@ -21,7 +21,7 @@ import { class MoreInfoGroup extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: GroupEntity; + @property({ attribute: false }) public stateObj?: GroupEntity; @state() private _groupDomainStateObj?: HassEntity; diff --git a/src/dialogs/more-info/controls/more-info-humidifier.ts b/src/dialogs/more-info/controls/more-info-humidifier.ts index 3799d557f9b3..367a9fe364af 100644 --- a/src/dialogs/more-info/controls/more-info-humidifier.ts +++ b/src/dialogs/more-info/controls/more-info-humidifier.ts @@ -26,7 +26,7 @@ import { moreInfoControlStyle } from "../components/more-info-control-style"; class MoreInfoHumidifier extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: HumidifierEntity; + @property({ attribute: false }) public stateObj?: HumidifierEntity; @state() public _mode?: string; diff --git a/src/dialogs/more-info/controls/more-info-lawn_mower.ts b/src/dialogs/more-info/controls/more-info-lawn_mower.ts index 05a92ce1ce9d..349f5e3b3a7d 100644 --- a/src/dialogs/more-info/controls/more-info-lawn_mower.ts +++ b/src/dialogs/more-info/controls/more-info-lawn_mower.ts @@ -54,7 +54,7 @@ const LAWN_MOWER_COMMANDS: LawnMowerCommand[] = [ class MoreInfoLawnMower extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: LawnMowerEntity; + @property({ attribute: false }) public stateObj?: LawnMowerEntity; protected render() { if (!this.hass || !this.stateObj) { diff --git a/src/dialogs/more-info/controls/more-info-person.ts b/src/dialogs/more-info/controls/more-info-person.ts index c5d21ad097f8..bba6427c8f53 100644 --- a/src/dialogs/more-info/controls/more-info-person.ts +++ b/src/dialogs/more-info/controls/more-info-person.ts @@ -13,7 +13,7 @@ import { HomeAssistant } from "../../../types"; class MoreInfoPerson extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: HassEntity; + @property({ attribute: false }) public stateObj?: HassEntity; private _entityArray = memoizeOne((entityId: string) => [entityId]); diff --git a/src/dialogs/more-info/controls/more-info-remote.ts b/src/dialogs/more-info/controls/more-info-remote.ts index 918ebd3a71df..072741fd2af1 100644 --- a/src/dialogs/more-info/controls/more-info-remote.ts +++ b/src/dialogs/more-info/controls/more-info-remote.ts @@ -14,7 +14,7 @@ const filterExtraAttributes = "activity_list,current_activity"; class MoreInfoRemote extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: RemoteEntity; + @property({ attribute: false }) public stateObj?: RemoteEntity; protected render() { if (!this.hass || !this.stateObj) { diff --git a/src/dialogs/more-info/controls/more-info-script.ts b/src/dialogs/more-info/controls/more-info-script.ts index 1d9ed6fb0c27..c53da01be120 100644 --- a/src/dialogs/more-info/controls/more-info-script.ts +++ b/src/dialogs/more-info/controls/more-info-script.ts @@ -8,7 +8,7 @@ import { HomeAssistant } from "../../../types"; class MoreInfoScript extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: HassEntity; + @property({ attribute: false }) public stateObj?: HassEntity; protected render() { if (!this.hass || !this.stateObj) { diff --git a/src/dialogs/more-info/controls/more-info-sun.ts b/src/dialogs/more-info/controls/more-info-sun.ts index 341da552689e..fb3da7108c9b 100644 --- a/src/dialogs/more-info/controls/more-info-sun.ts +++ b/src/dialogs/more-info/controls/more-info-sun.ts @@ -9,7 +9,7 @@ import { HomeAssistant } from "../../../types"; class MoreInfoSun extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: HassEntity; + @property({ attribute: false }) public stateObj?: HassEntity; protected render() { if (!this.hass || !this.stateObj) { diff --git a/src/dialogs/more-info/controls/more-info-timer.ts b/src/dialogs/more-info/controls/more-info-timer.ts index cba66d5ed769..5af7aca7b603 100644 --- a/src/dialogs/more-info/controls/more-info-timer.ts +++ b/src/dialogs/more-info/controls/more-info-timer.ts @@ -9,7 +9,7 @@ import { HomeAssistant } from "../../../types"; class MoreInfoTimer extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: TimerEntity; + @property({ attribute: false }) public stateObj?: TimerEntity; protected render() { if (!this.hass || !this.stateObj) { diff --git a/src/dialogs/more-info/controls/more-info-vacuum.ts b/src/dialogs/more-info/controls/more-info-vacuum.ts index 4076935d9ecf..c5b7e9768c34 100644 --- a/src/dialogs/more-info/controls/more-info-vacuum.ts +++ b/src/dialogs/more-info/controls/more-info-vacuum.ts @@ -100,7 +100,7 @@ const VACUUM_COMMANDS: VacuumCommand[] = [ class MoreInfoVacuum extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: VacuumEntity; + @property({ attribute: false }) public stateObj?: VacuumEntity; protected render() { if (!this.hass || !this.stateObj) { diff --git a/src/dialogs/more-info/controls/more-info-water_heater.ts b/src/dialogs/more-info/controls/more-info-water_heater.ts index 71e1ffc5f511..4a5f1d2f044e 100644 --- a/src/dialogs/more-info/controls/more-info-water_heater.ts +++ b/src/dialogs/more-info/controls/more-info-water_heater.ts @@ -21,7 +21,7 @@ import { moreInfoControlStyle } from "../components/more-info-control-style"; class MoreInfoWaterHeater extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: WaterHeaterEntity; + @property({ attribute: false }) public stateObj?: WaterHeaterEntity; protected render() { if (!this.stateObj) { diff --git a/src/dialogs/more-info/controls/more-info-weather.ts b/src/dialogs/more-info/controls/more-info-weather.ts index 2854d90110e9..cb2710819bd5 100644 --- a/src/dialogs/more-info/controls/more-info-weather.ts +++ b/src/dialogs/more-info/controls/more-info-weather.ts @@ -37,7 +37,7 @@ import { HomeAssistant } from "../../../types"; class MoreInfoWeather extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj?: WeatherEntity; + @property({ attribute: false }) public stateObj?: WeatherEntity; @state() private _forecastEvent?: ForecastEvent; diff --git a/src/layouts/hass-router-page.ts b/src/layouts/hass-router-page.ts index cf3aca4f7864..3751b94341b6 100644 --- a/src/layouts/hass-router-page.ts +++ b/src/layouts/hass-router-page.ts @@ -46,7 +46,7 @@ export interface RouterOptions { const LOADING_SCREEN_THRESHOLD = 400; // ms export class HassRouterPage extends ReactiveElement { - @property() public route?: Route; + @property({ attribute: false }) public route?: Route; protected routerOptions!: RouterOptions; diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index 7d3e90d623f1..b21c627ad8ca 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -130,7 +130,7 @@ export class HaTabsSubpageDataTable extends LitElement { */ @property({ type: Boolean }) public empty = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; /** * Array of tabs to show on the page. diff --git a/src/layouts/home-assistant-main.ts b/src/layouts/home-assistant-main.ts index 956c4c8eedd0..7661b5177733 100644 --- a/src/layouts/home-assistant-main.ts +++ b/src/layouts/home-assistant-main.ts @@ -38,7 +38,7 @@ interface EditSideBarEvent { export class HomeAssistantMain extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public route?: Route; + @property({ attribute: false }) public route?: Route; @property({ type: Boolean }) public narrow!: boolean; diff --git a/src/panels/calendar/ha-recurrence-rule-editor.ts b/src/panels/calendar/ha-recurrence-rule-editor.ts index 7a131e23d856..3d1dd412f37b 100644 --- a/src/panels/calendar/ha-recurrence-rule-editor.ts +++ b/src/panels/calendar/ha-recurrence-rule-editor.ts @@ -33,7 +33,7 @@ import { @customElement("ha-recurrence-rule-editor") export class RecurrenceRuleEditor extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) public disabled = false; diff --git a/src/panels/config/application_credentials/ha-config-application-credentials.ts b/src/panels/config/application_credentials/ha-config-application-credentials.ts index 6752532e2922..274d17883ad4 100644 --- a/src/panels/config/application_credentials/ha-config-application-credentials.ts +++ b/src/panels/config/application_credentials/ha-config-application-credentials.ts @@ -45,7 +45,7 @@ export class HaConfigApplicationCredentials extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() private _selected: string[] = []; diff --git a/src/panels/config/areas/ha-config-areas-dashboard.ts b/src/panels/config/areas/ha-config-areas-dashboard.ts index 62c3a047439c..0d294156b1d6 100644 --- a/src/panels/config/areas/ha-config-areas-dashboard.ts +++ b/src/panels/config/areas/ha-config-areas-dashboard.ts @@ -40,7 +40,7 @@ export class HaConfigAreasDashboard extends SubscribeMixin(LitElement) { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() private _areas!: AreaRegistryEntry[]; diff --git a/src/panels/config/automation/blueprint-automation-editor.ts b/src/panels/config/automation/blueprint-automation-editor.ts index 9f9e6c4e0824..c2eedf51361a 100644 --- a/src/panels/config/automation/blueprint-automation-editor.ts +++ b/src/panels/config/automation/blueprint-automation-editor.ts @@ -32,7 +32,7 @@ export class HaBlueprintAutomationEditor extends LitElement { @property() public config!: BlueprintAutomationConfig; - @property() public stateObj?: HassEntity; + @property({ attribute: false }) public stateObj?: HassEntity; @state() private _blueprints?: Blueprints; diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index a4f6f2ef3ed5..f179e971682d 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -93,7 +93,7 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() private _config?: AutomationConfig; diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index 7fe54ec1f818..5b37f52b6d7c 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -77,7 +77,7 @@ class HaAutomationPicker extends LitElement { @property({ type: Boolean }) public narrow!: boolean; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @property() public automations!: AutomationEntity[]; diff --git a/src/panels/config/cloud/ha-config-cloud.ts b/src/panels/config/cloud/ha-config-cloud.ts index 53d70fb7b973..fd02981c9159 100644 --- a/src/panels/config/cloud/ha-config-cloud.ts +++ b/src/panels/config/cloud/ha-config-cloud.ts @@ -20,7 +20,7 @@ class HaConfigCloud extends HassRouterPage { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @property() public cloudStatus!: CloudStatus; diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts index 400c0baf31a7..a3fbf080c539 100644 --- a/src/panels/config/devices/ha-config-devices-dashboard.ts +++ b/src/panels/config/devices/ha-config-devices-dashboard.ts @@ -74,7 +74,7 @@ export class HaConfigDeviceDashboard extends LitElement { @property() public manifests!: IntegrationManifest[]; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() private _searchParms = new URLSearchParams(window.location.search); diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts index d8a26d529689..e6aacf6fd5e6 100644 --- a/src/panels/config/ha-panel-config.ts +++ b/src/panels/config/ha-panel-config.ts @@ -362,7 +362,7 @@ class HaPanelConfig extends SubscribeMixin(HassRouterPage) { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; private _entitiesContext = new ContextProvider(this, { context: fullEntitiesContext, diff --git a/src/panels/config/helpers/ha-config-helpers.ts b/src/panels/config/helpers/ha-config-helpers.ts index f755092c7f4c..8163787d4eff 100644 --- a/src/panels/config/helpers/ha-config-helpers.ts +++ b/src/panels/config/helpers/ha-config-helpers.ts @@ -85,7 +85,7 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() private _stateItems: HassEntity[] = []; diff --git a/src/panels/config/integrations/ha-config-integrations-dashboard.ts b/src/panels/config/integrations/ha-config-integrations-dashboard.ts index ded9e80b9884..468a776756dd 100644 --- a/src/panels/config/integrations/ha-config-integrations-dashboard.ts +++ b/src/panels/config/integrations/ha-config-integrations-dashboard.ts @@ -98,7 +98,7 @@ class HaConfigIntegrationsDashboard extends SubscribeMixin(LitElement) { @property({ type: Boolean }) public showAdvanced = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @property({ attribute: false }) public configEntries?: ConfigEntryExtended[]; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts index 2b13eb3d0868..918e02022698 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts @@ -20,7 +20,7 @@ import type { ZHADeviceEndpointDataTable } from "./zha-device-endpoint-data-tabl @customElement("zha-add-group-page") export class ZHAAddGroupPage extends LitElement { - @property({ type: Object }) public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) public narrow!: boolean; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts index 55a08d07311b..73c797fcb13d 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts @@ -68,9 +68,9 @@ export const zhaTabs: PageNavigation[] = [ @customElement("zha-config-dashboard") class ZHAConfigDashboard extends LitElement { - @property({ type: Object }) public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Object }) public route!: Route; + @property({ attribute: false }) public route!: Route; @property({ type: Boolean }) public narrow!: boolean; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-endpoint-data-table.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-endpoint-data-table.ts index fbadb2ec0620..78a4871dd5ef 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-device-endpoint-data-table.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-device-endpoint-data-table.ts @@ -25,7 +25,7 @@ export interface DeviceEndpointRowData extends DataTableRowData { @customElement("zha-device-endpoint-data-table") export class ZHADeviceEndpointDataTable extends LitElement { - @property({ type: Object }) public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) public narrow = false; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts index f76583920656..7a694d7dad7e 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts @@ -33,7 +33,7 @@ import type { ZHADeviceEndpointDataTable } from "./zha-device-endpoint-data-tabl @customElement("zha-group-page") export class ZHAGroupPage extends LitElement { - @property({ type: Object }) public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Object }) public group?: ZHAGroup; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-groups-dashboard.ts b/src/panels/config/integrations/integration-panels/zha/zha-groups-dashboard.ts index 7a87fda59105..56834b7cacc8 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-groups-dashboard.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-groups-dashboard.ts @@ -34,7 +34,7 @@ export interface GroupRowData extends ZHAGroup { export class ZHAGroupsDashboard extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Object }) public route!: Route; + @property({ attribute: false }) public route!: Route; @property({ type: Boolean }) public narrow!: boolean; diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts index 4805c40a71c5..baf9f8343c44 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts @@ -57,9 +57,9 @@ import { configTabs } from "./zwave_js-config-router"; @customElement("zwave_js-config-dashboard") class ZWaveJSConfigDashboard extends SubscribeMixin(LitElement) { - @property({ type: Object }) public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Object }) public route!: Route; + @property({ attribute: false }) public route!: Route; @property({ type: Boolean }) public narrow!: boolean; diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts index 23deecbaf8ab..8d51bee76cd1 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts @@ -23,7 +23,7 @@ import { configTabs } from "./zwave_js-config-router"; class ZWaveJSLogs extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Object }) public route!: Route; + @property({ attribute: false }) public route!: Route; @property({ type: Boolean }) public narrow!: boolean; diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-provisioned.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-provisioned.ts index e19478cfed31..e050a91d70ae 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-provisioned.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-provisioned.ts @@ -18,7 +18,7 @@ import { configTabs } from "./zwave_js-config-router"; class ZWaveJSProvisioned extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Object }) public route!: Route; + @property({ attribute: false }) public route!: Route; @property({ type: Boolean }) public narrow!: boolean; diff --git a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts index 24a48a6c6821..ad04b2b36857 100644 --- a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts +++ b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts @@ -60,7 +60,7 @@ export class HaConfigLovelaceDashboards extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() private _dashboards: LovelaceDashboard[] = []; diff --git a/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts b/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts index 5dbab9dfed27..9574f14fce0c 100644 --- a/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts +++ b/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts @@ -45,7 +45,7 @@ export class HaConfigLovelaceRescources extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() private _resources: LovelaceResource[] = []; diff --git a/src/panels/config/person/ha-config-person.ts b/src/panels/config/person/ha-config-person.ts index 08ffbddfa5e0..27e065e54a72 100644 --- a/src/panels/config/person/ha-config-person.ts +++ b/src/panels/config/person/ha-config-person.ts @@ -39,7 +39,7 @@ export class HaConfigPerson extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() private _storageItems?: Person[]; diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts index e6bc9476f1ca..cb9861932c71 100644 --- a/src/panels/config/scene/ha-scene-dashboard.ts +++ b/src/panels/config/scene/ha-scene-dashboard.ts @@ -68,7 +68,7 @@ class HaSceneDashboard extends LitElement { @property({ type: Boolean }) public isWide = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @property() public scenes!: SceneEntity[]; diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts index 5814ac7fd650..8af1d5fba5a5 100644 --- a/src/panels/config/scene/ha-scene-editor.ts +++ b/src/panels/config/scene/ha-scene-editor.ts @@ -91,7 +91,7 @@ export class HaSceneEditor extends SubscribeMixin( @property({ type: Boolean }) public isWide = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @property() public sceneId: string | null = null; diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts index 82e369b9e0c4..f4e671eb91bc 100644 --- a/src/panels/config/script/ha-script-picker.ts +++ b/src/panels/config/script/ha-script-picker.ts @@ -74,7 +74,7 @@ class HaScriptPicker extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @property({ attribute: false }) public entityRegistry!: EntityRegistryEntry[]; diff --git a/src/panels/config/tags/ha-config-tags.ts b/src/panels/config/tags/ha-config-tags.ts index 493bdf402410..064c82179cef 100644 --- a/src/panels/config/tags/ha-config-tags.ts +++ b/src/panels/config/tags/ha-config-tags.ts @@ -48,7 +48,7 @@ export class HaConfigTags extends SubscribeMixin(LitElement) { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() private _tags: Tag[] = []; diff --git a/src/panels/config/voice-assistants/expose/expose-assistant-icon.ts b/src/panels/config/voice-assistants/expose/expose-assistant-icon.ts index 56a384528827..f40aeea9e9be 100644 --- a/src/panels/config/voice-assistants/expose/expose-assistant-icon.ts +++ b/src/panels/config/voice-assistants/expose/expose-assistant-icon.ts @@ -10,7 +10,7 @@ import "../../../../components/ha-svg-icon"; @customElement("voice-assistants-expose-assistant-icon") export class VoiceAssistantExposeAssistantIcon extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) public unsupported!: boolean; diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts index aee5e92afbfd..b1873d3b3cad 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts @@ -29,7 +29,7 @@ export class HaConfigVoiceAssistantsAssistants extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; protected render() { if (!this.hass) { diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts index bd5f1ec0370e..f86a0863f63f 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts @@ -64,7 +64,7 @@ import { showVoiceSettingsDialog } from "./show-dialog-voice-settings"; @customElement("ha-config-voice-assistants-expose") export class VoiceAssistantsExpose extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ attribute: false }) public cloudStatus?: CloudStatus; diff --git a/src/panels/config/zone/ha-config-zone.ts b/src/panels/config/zone/ha-config-zone.ts index 6869293fb8bf..bf56ed7ce525 100644 --- a/src/panels/config/zone/ha-config-zone.ts +++ b/src/panels/config/zone/ha-config-zone.ts @@ -56,7 +56,7 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() private _storageItems?: Zone[]; diff --git a/src/panels/custom/ha-panel-custom.ts b/src/panels/custom/ha-panel-custom.ts index 975c5cff76f2..04a4a406ba1c 100644 --- a/src/panels/custom/ha-panel-custom.ts +++ b/src/panels/custom/ha-panel-custom.ts @@ -25,7 +25,7 @@ export class HaPanelCustom extends ReactiveElement { @property({ type: Boolean }) public narrow = false; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @property() public panel!: CustomPanelInfo; diff --git a/src/panels/developer-tools/ha-panel-developer-tools.ts b/src/panels/developer-tools/ha-panel-developer-tools.ts index 12fe04725a33..97d5b43d88d6 100644 --- a/src/panels/developer-tools/ha-panel-developer-tools.ts +++ b/src/panels/developer-tools/ha-panel-developer-tools.ts @@ -17,7 +17,7 @@ import "./developer-tools-router"; class PanelDeveloperTools extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @property({ type: Boolean }) public narrow = false; diff --git a/src/panels/developer-tools/template/developer-tools-template.ts b/src/panels/developer-tools/template/developer-tools-template.ts index 0f6abb854ef3..7732ad776012 100644 --- a/src/panels/developer-tools/template/developer-tools-template.ts +++ b/src/panels/developer-tools/template/developer-tools-template.ts @@ -39,7 +39,7 @@ For loop example getting entity values in the weather domain: @customElement("developer-tools-template") class HaPanelDevTemplate extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) public narrow = false; diff --git a/src/panels/iframe/ha-panel-iframe.ts b/src/panels/iframe/ha-panel-iframe.ts index 98080afac4d7..013ec96d935e 100644 --- a/src/panels/iframe/ha-panel-iframe.ts +++ b/src/panels/iframe/ha-panel-iframe.ts @@ -7,7 +7,7 @@ import { HomeAssistant, PanelInfo } from "../../types"; @customElement("ha-panel-iframe") class HaPanelIframe extends LitElement { - @property() hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) narrow!: boolean; diff --git a/src/panels/logbook/ha-panel-logbook.ts b/src/panels/logbook/ha-panel-logbook.ts index 2d4b754f548e..567e28595a95 100644 --- a/src/panels/logbook/ha-panel-logbook.ts +++ b/src/panels/logbook/ha-panel-logbook.ts @@ -21,7 +21,7 @@ import "./ha-logbook"; @customElement("ha-panel-logbook") export class HaPanelLogbook extends LitElement { - @property() hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ reflect: true, type: Boolean }) narrow!: boolean; diff --git a/src/panels/lovelace/cards/hui-iframe-card.ts b/src/panels/lovelace/cards/hui-iframe-card.ts index f151501bcdeb..d81de3dd88f1 100644 --- a/src/panels/lovelace/cards/hui-iframe-card.ts +++ b/src/panels/lovelace/cards/hui-iframe-card.ts @@ -27,7 +27,7 @@ export class HuiIframeCard extends LitElement implements LovelaceCard { @property({ type: Boolean, reflect: true }) public isPanel = false; - @property() public hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; @state() protected _config?: IframeCardConfig; diff --git a/src/panels/lovelace/components/hui-color-picker.ts b/src/panels/lovelace/components/hui-color-picker.ts index 5928be7996dd..8417e9dbd5c4 100644 --- a/src/panels/lovelace/components/hui-color-picker.ts +++ b/src/panels/lovelace/components/hui-color-picker.ts @@ -17,7 +17,7 @@ export class HuiColorPicker extends LitElement { @property() public helper?: string; - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public value?: string; diff --git a/src/panels/lovelace/entity-rows/hui-humidifier-entity-row.ts b/src/panels/lovelace/entity-rows/hui-humidifier-entity-row.ts index 44637109455e..fcdc56bf54da 100644 --- a/src/panels/lovelace/entity-rows/hui-humidifier-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-humidifier-entity-row.ts @@ -18,7 +18,7 @@ import { EntityConfig, LovelaceRow } from "./types"; @customElement("hui-humidifier-entity-row") class HuiHumidifierEntityRow extends LitElement implements LovelaceRow { - @property() public hass?: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; @property() private _config?: EntityConfig; diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts index a767452e3e99..e0b5455bbc4a 100644 --- a/src/panels/lovelace/ha-panel-lovelace.ts +++ b/src/panels/lovelace/ha-panel-lovelace.ts @@ -58,7 +58,7 @@ export class LovelacePanel extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public route?: Route; + @property({ attribute: false }) public route?: Route; @property() private _panelState?: "loading" | "loaded" | "error" | "yaml-editor" = diff --git a/src/panels/media-browser/ha-panel-media-browser.ts b/src/panels/media-browser/ha-panel-media-browser.ts index 56bca1c6bf48..eb77c02eedb2 100644 --- a/src/panels/media-browser/ha-panel-media-browser.ts +++ b/src/panels/media-browser/ha-panel-media-browser.ts @@ -68,7 +68,7 @@ class PanelMediaBrowser extends LitElement { @property({ type: Boolean, reflect: true }) public narrow!: boolean; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() _currentItem?: MediaPlayerItem; diff --git a/src/panels/my/ha-panel-my.ts b/src/panels/my/ha-panel-my.ts index c525fa2dee4d..bac84192a213 100644 --- a/src/panels/my/ha-panel-my.ts +++ b/src/panels/my/ha-panel-my.ts @@ -300,7 +300,7 @@ export interface Redirect { class HaPanelMy extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public route!: Route; + @property({ attribute: false }) public route!: Route; @state() public _error?: string; diff --git a/src/panels/profile/dialog-ha-mfa-module-setup-flow.ts b/src/panels/profile/dialog-ha-mfa-module-setup-flow.ts index d218f03cdde7..c836b218763f 100644 --- a/src/panels/profile/dialog-ha-mfa-module-setup-flow.ts +++ b/src/panels/profile/dialog-ha-mfa-module-setup-flow.ts @@ -17,7 +17,7 @@ let instance = 0; @customElement("ha-mfa-module-setup-flow") class HaMfaModuleSetupFlow extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @state() private _dialogClosedCallback?: (params: { flowFinished: boolean; diff --git a/src/state-summary/state-card-button.ts b/src/state-summary/state-card-button.ts index 45b2d6a958e7..71944de9a428 100644 --- a/src/state-summary/state-card-button.ts +++ b/src/state-summary/state-card-button.ts @@ -12,7 +12,7 @@ import { HomeAssistant } from "../types"; class StateCardButton extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj!: HassEntity; + @property({ attribute: false }) public stateObj!: HassEntity; @property({ type: Boolean }) public inDialog = false; diff --git a/src/state-summary/state-card-event.ts b/src/state-summary/state-card-event.ts index e80985d95a73..b9e9a59e092e 100644 --- a/src/state-summary/state-card-event.ts +++ b/src/state-summary/state-card-event.ts @@ -10,7 +10,7 @@ import { HomeAssistant } from "../types"; class StateCardEvent extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj!: HassEntity; + @property({ attribute: false }) public stateObj!: HassEntity; @property({ type: Boolean }) public inDialog = false; diff --git a/src/state-summary/state-card-input_button.ts b/src/state-summary/state-card-input_button.ts index 2de153cb5405..1c130c9a5faf 100644 --- a/src/state-summary/state-card-input_button.ts +++ b/src/state-summary/state-card-input_button.ts @@ -12,7 +12,7 @@ import { HomeAssistant } from "../types"; class StateCardInputButton extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj!: HassEntity; + @property({ attribute: false }) public stateObj!: HassEntity; @property({ type: Boolean }) public inDialog = false; diff --git a/src/state-summary/state-card-input_number.ts b/src/state-summary/state-card-input_number.ts index a389da6bd265..c5b2e177ecfe 100644 --- a/src/state-summary/state-card-input_number.ts +++ b/src/state-summary/state-card-input_number.ts @@ -15,7 +15,7 @@ import { HomeAssistant } from "../types"; class StateCardInputNumber extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj!: HassEntity; + @property({ attribute: false }) public stateObj!: HassEntity; @property({ type: Boolean }) public inDialog = false; diff --git a/src/state-summary/state-card-input_select.ts b/src/state-summary/state-card-input_select.ts index bf276776c829..c82347b34395 100644 --- a/src/state-summary/state-card-input_select.ts +++ b/src/state-summary/state-card-input_select.ts @@ -21,7 +21,7 @@ import type { HaSelect } from "../components/ha-select"; class StateCardInputSelect extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj!: InputSelectEntity; + @property({ attribute: false }) public stateObj!: InputSelectEntity; @query("ha-select", true) private _haSelect!: HaSelect; diff --git a/src/state-summary/state-card-lawn_mower.ts b/src/state-summary/state-card-lawn_mower.ts index a9cb5a17b83f..1989970f3c65 100644 --- a/src/state-summary/state-card-lawn_mower.ts +++ b/src/state-summary/state-card-lawn_mower.ts @@ -10,7 +10,7 @@ import type { HomeAssistant } from "../types"; class StateCardLawnMower extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj!: HassEntity; + @property({ attribute: false }) public stateObj!: HassEntity; @property({ type: Boolean }) public inDialog = false; diff --git a/src/state-summary/state-card-script.ts b/src/state-summary/state-card-script.ts index 2a0f65af82d5..f8014684e783 100644 --- a/src/state-summary/state-card-script.ts +++ b/src/state-summary/state-card-script.ts @@ -13,7 +13,7 @@ import { HomeAssistant } from "../types"; class StateCardScript extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj!: HassEntity; + @property({ attribute: false }) public stateObj!: HassEntity; @property({ type: Boolean }) public inDialog = false; diff --git a/src/state-summary/state-card-select.ts b/src/state-summary/state-card-select.ts index 72f79d97a9f1..45b8d766e794 100644 --- a/src/state-summary/state-card-select.ts +++ b/src/state-summary/state-card-select.ts @@ -13,7 +13,7 @@ import type { HomeAssistant } from "../types"; class StateCardSelect extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj!: SelectEntity; + @property({ attribute: false }) public stateObj!: SelectEntity; protected render(): TemplateResult { return html` diff --git a/src/state-summary/state-card-text.ts b/src/state-summary/state-card-text.ts index 563d055d4c3d..f83315bdf5d5 100644 --- a/src/state-summary/state-card-text.ts +++ b/src/state-summary/state-card-text.ts @@ -12,7 +12,7 @@ import type { HomeAssistant } from "../types"; class StateCardText extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public stateObj!: TextEntity; + @property({ attribute: false }) public stateObj!: TextEntity; protected render(): TemplateResult { return html` From b881a2a88a34fdfd70622c9e725053f0635a1c5f Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 15 Jan 2024 09:52:48 -0500 Subject: [PATCH 147/361] Fix complex attribute and expressionless property bindings (#19348) --- src/components/ha-date-range-picker.ts | 4 ++-- .../zwave_js/dialog-zwave_js-hard-reset-controller.ts | 2 +- src/panels/config/network/supervisor-network.ts | 2 +- .../card-features/hui-target-temperature-card-feature.ts | 2 +- tsconfig.json | 2 -- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index 00f2f1a9fe29..8d01e23ecda9 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -247,8 +247,8 @@ export class HaDateRangePicker extends LitElement { ?auto-apply=${this.autoApply} time-picker=${this.timePicker} twentyfour-hours=${this._hour24format} - start-date=${this.startDate} - end-date=${this.endDate} + start-date=${this.startDate.toISOString()} + end-date=${this.endDate.toISOString()} ?ranges=${this.ranges !== false} opening-direction=${this.openingDirection || this._calcedOpeningDirection} diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-hard-reset-controller.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-hard-reset-controller.ts index b9dee78f21f9..2c3dd9d81dbf 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-hard-reset-controller.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-hard-reset-controller.ts @@ -64,7 +64,7 @@ class DialogZWaveJSHardResetController extends LitElement {

diff --git a/src/panels/config/network/supervisor-network.ts b/src/panels/config/network/supervisor-network.ts index 5a0e69f5c978..9f74c5d8e51e 100644 --- a/src/panels/config/network/supervisor-network.ts +++ b/src/panels/config/network/supervisor-network.ts @@ -220,7 +220,7 @@ export class HassioNetwork extends LitElement { .label=${this.hass.localize( "ui.panel.config.network.supervisor.wifi_password" )} - .version="wifi" + .version=${"wifi"} @change=${this._handleInputValueChangedWifi} > diff --git a/src/panels/lovelace/card-features/hui-target-temperature-card-feature.ts b/src/panels/lovelace/card-features/hui-target-temperature-card-feature.ts index e6863fc9c0eb..638eeab585c0 100644 --- a/src/panels/lovelace/card-features/hui-target-temperature-card-feature.ts +++ b/src/panels/lovelace/card-features/hui-target-temperature-card-feature.ts @@ -183,7 +183,7 @@ class HuiTargetTemperatureCardFeature Date: Mon, 15 Jan 2024 15:59:46 +0100 Subject: [PATCH 148/361] Wrap descriptions in automation list descriptions (#19367) * Wrapped automation descriptions * Fix * Fixes --------- Co-authored-by: Bram Kragten --- src/components/ha-list-item-new.ts | 29 +++++++++ src/components/ha-list-new.ts | 24 +++++++ .../add-automation-element-dialog.ts | 64 +++++++++---------- 3 files changed, 83 insertions(+), 34 deletions(-) create mode 100644 src/components/ha-list-item-new.ts create mode 100644 src/components/ha-list-new.ts diff --git a/src/components/ha-list-item-new.ts b/src/components/ha-list-item-new.ts new file mode 100644 index 000000000000..980c28479ae6 --- /dev/null +++ b/src/components/ha-list-item-new.ts @@ -0,0 +1,29 @@ +import { customElement } from "lit/decorators"; +import "element-internals-polyfill"; +import { MdListItem } from "@material/web/list/list-item"; +import { CSSResult, css } from "lit"; + +@customElement("ha-list-item-new") +export class HaListItemNew extends MdListItem { + static get styles(): CSSResult[] { + return [ + ...MdListItem.styles, + css` + :host { + --ha-icon-display: block; + --md-sys-color-primary: var(--primary-text-color); + --md-sys-color-secondary: var(--secondary-text-color); + --md-sys-color-surface: var(--card-background-color); + --md-sys-color-on-surface: var(--primary-text-color); + --md-sys-color-on-surface-variant: var(--secondary-text-color); + } + `, + ]; + } +} + +declare global { + interface HTMLElementTagNameMap { + "ha-list-item-new": HaListItemNew; + } +} diff --git a/src/components/ha-list-new.ts b/src/components/ha-list-new.ts new file mode 100644 index 000000000000..b88ef32e1a17 --- /dev/null +++ b/src/components/ha-list-new.ts @@ -0,0 +1,24 @@ +import { customElement } from "lit/decorators"; +import "element-internals-polyfill"; +import { MdList } from "@material/web/list/list"; +import { CSSResult, css } from "lit"; + +@customElement("ha-list-new") +export class HaListNew extends MdList { + static get styles(): CSSResult[] { + return [ + ...MdList.styles, + css` + :host { + --md-sys-color-surface: var(--card-background-color); + } + `, + ]; + } +} + +declare global { + interface HTMLElementTagNameMap { + "ha-list-new": HaListNew; + } +} diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index cf5874f80cd8..b449952b64be 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -16,7 +16,6 @@ import { styleMap } from "lit/directives/style-map"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../../common/dom/fire_event"; import { domainIconWithoutDefault } from "../../../common/entity/domain_icon"; -import { shouldHandleRequestSelectedEvent } from "../../../common/mwc/handle-request-selected-event"; import { stringCompare } from "../../../common/string/compare"; import { LocalizeFunc } from "../../../common/translations/localize"; import "../../../components/ha-dialog"; @@ -25,8 +24,8 @@ import "../../../components/ha-dialog-header"; import "../../../components/ha-icon-button"; import "../../../components/ha-icon-button-prev"; import "../../../components/ha-icon-next"; -import "../../../components/ha-list-item"; -import "../../../components/search-input"; +import "../../../components/ha-list-new"; +import "../../../components/ha-list-item-new"; import { ACTION_GROUPS, ACTION_ICONS, @@ -52,6 +51,8 @@ import { } from "./show-add-automation-element-dialog"; import { computeDomain } from "../../../common/entity/compute_domain"; import { deepEqual } from "../../../common/util/deep-equal"; +import "../../../components/search-input"; +import "@material/web/divider/divider"; const TYPES = { trigger: { groups: TRIGGER_GROUPS, icons: TRIGGER_ICONS }, @@ -433,7 +434,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { protected _opened(): void { // Store the width and height so that when we search, box doesn't jump const boundingRect = - this.shadowRoot!.querySelector("mwc-list")?.getBoundingClientRect(); + this.shadowRoot!.querySelector("ha-list-new")?.getBoundingClientRect(); this._width = boundingRect?.width; this._height = boundingRect?.height; } @@ -525,11 +526,8 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { )} >

- item.key === this._params!.clipboardItem)) - ? html` ${this.hass.localize( `ui.panel.config.automation.editor.${this._params.type}s.paste` @@ -557,49 +552,48 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { )} - -
  • ` + > + + ` : ""} ${repeat( items, (item) => item.key, (item) => html` - - ${item.name} - ${item.description} +
    ${item.name}
    +
    ${item.description}
    ${item.icon ? html`` : html``} ${item.group - ? html`` + ? html`` : html``} -     + ` )} -     + `; } @@ -619,9 +613,6 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { } private _selected(ev) { - if (!shouldHandleRequestSelectedEvent(ev)) { - return; - } this._dialog!.scrollToPos(0, 0); const item = ev.currentTarget; if (item.group) { @@ -654,9 +645,14 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { ha-icon-next { width: 24px; } - mwc-list { + ha-list-new { max-height: 468px; max-width: 100vw; + --md-list-item-leading-space: 24px; + --md-list-item-trailing-space: 24px; + } + ha-list-item-new img { + width: 24px; } search-input { display: block; From 6f8c366bad70b50465e0dabf87a15e5a50e75efe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:49:22 -0500 Subject: [PATCH 149/361] Update dependency prettier to v3.2.0 (#19411) * Update dependency prettier to v3.2.0 * Reformat --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Steve Repsher --- .../registries/dialog-hassio-registries.ts | 9 ++- .../dialog-hassio-repositories.ts | 9 ++- package.json | 2 +- src/components/user/ha-users-picker.ts | 66 +++++++++---------- .../core/ha-config-system-navigation.ts | 5 +- .../entity-registry-settings-editor.ts | 8 ++- .../config/helpers/forms/ha-counter-form.ts | 9 ++- .../helpers/forms/ha-input_boolean-form.ts | 9 ++- .../helpers/forms/ha-input_button-form.ts | 9 ++- .../helpers/forms/ha-input_datetime-form.ts | 9 ++- .../helpers/forms/ha-input_number-form.ts | 9 ++- .../helpers/forms/ha-input_select-form.ts | 9 ++- .../helpers/forms/ha-input_text-form.ts | 9 ++- .../config/helpers/forms/ha-schedule-form.ts | 9 ++- .../config/helpers/forms/ha-timer-form.ts | 9 ++- .../config/script/manual-script-editor.ts | 4 +- .../service/developer-tools-service.ts | 8 +-- .../card-editor/hui-dialog-edit-card.ts | 5 +- ...-climate-hvac-modes-card-feature-editor.ts | 4 +- .../hui-statistics-graph-card-editor.ts | 9 ++- ...ter-operation-modes-card-feature-editor.ts | 4 +- src/resources/css-variables.ts | 7 +- yarn.lock | 10 +-- 23 files changed, 110 insertions(+), 121 deletions(-) diff --git a/hassio/src/dialogs/registries/dialog-hassio-registries.ts b/hassio/src/dialogs/registries/dialog-hassio-registries.ts index d623ebf3b86e..e26753e5dcba 100644 --- a/hassio/src/dialogs/registries/dialog-hassio-registries.ts +++ b/hassio/src/dialogs/registries/dialog-hassio-registries.ts @@ -157,11 +157,10 @@ class HassioRegistriesDialog extends LitElement { } public focus(): void { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts index 5443d7ed44c1..1399e552dfee 100644 --- a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts +++ b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts @@ -209,11 +209,10 @@ class HassioRepositoriesDialog extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/package.json b/package.json index 02ece2fcfea6..92eafcd8cac9 100644 --- a/package.json +++ b/package.json @@ -224,7 +224,7 @@ "object-hash": "3.0.0", "open": "10.0.3", "pinst": "3.0.0", - "prettier": "3.1.1", + "prettier": "3.2.0", "rollup": "2.79.1", "rollup-plugin-string": "3.0.0", "rollup-plugin-terser": "7.0.2", diff --git a/src/components/user/ha-users-picker.ts b/src/components/user/ha-users-picker.ts index aeda071a886d..a78de5ed4cd6 100644 --- a/src/components/user/ha-users-picker.ts +++ b/src/components/user/ha-users-picker.ts @@ -40,40 +40,38 @@ class HaUsersPickerLight extends LitElement { const notSelectedUsers = this._notSelectedUsers(this.users, this.value); return html` - ${guard( - [notSelectedUsers], - () => - this.value?.map( - (user_id, idx) => html` -
    - - - > -
    - ` - ) + ${guard([notSelectedUsers], () => + this.value?.map( + (user_id, idx) => html` +
    + + + > +
    + ` + ) )} hw.board !== null) - ?.name; + this._boardName = hardwareInfo?.hardware.find( + (hw) => hw.board !== null + )?.name; } else if (isHassioLoaded) { const osData: HassioHassOSInfo = await fetchHassioHassOsInfo(this.hass); if (osData.board) { diff --git a/src/panels/config/entities/entity-registry-settings-editor.ts b/src/panels/config/entities/entity-registry-settings-editor.ts index 9e7213e41475..783528c53a14 100644 --- a/src/panels/config/entities/entity-registry-settings-editor.ts +++ b/src/panels/config/entities/entity-registry-settings-editor.ts @@ -917,9 +917,11 @@ export class EntityRegistrySettingsEditor extends LitElement { "ui.dialogs.entity_registry.editor.use_device_area" )} ${this.hass.devices[this.entry.device_id].area_id - ? `(${this.hass.areas[ - this.hass.devices[this.entry.device_id].area_id! - ]?.name})` + ? `(${ + this.hass.areas[ + this.hass.devices[this.entry.device_id].area_id! + ]?.name + })` : ""} - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_boolean-form.ts b/src/panels/config/helpers/forms/ha-input_boolean-form.ts index 8a2c1eeacd8c..65583023507f 100644 --- a/src/panels/config/helpers/forms/ha-input_boolean-form.ts +++ b/src/panels/config/helpers/forms/ha-input_boolean-form.ts @@ -31,11 +31,10 @@ class HaInputBooleanForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_button-form.ts b/src/panels/config/helpers/forms/ha-input_button-form.ts index 940931175704..e02fbf35e272 100644 --- a/src/panels/config/helpers/forms/ha-input_button-form.ts +++ b/src/panels/config/helpers/forms/ha-input_button-form.ts @@ -31,11 +31,10 @@ class HaInputButtonForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_datetime-form.ts b/src/panels/config/helpers/forms/ha-input_datetime-form.ts index dfb3dd65035d..6210bfcfe705 100644 --- a/src/panels/config/helpers/forms/ha-input_datetime-form.ts +++ b/src/panels/config/helpers/forms/ha-input_datetime-form.ts @@ -45,11 +45,10 @@ class HaInputDateTimeForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_number-form.ts b/src/panels/config/helpers/forms/ha-input_number-form.ts index b047708d240f..461c2b96df24 100644 --- a/src/panels/config/helpers/forms/ha-input_number-form.ts +++ b/src/panels/config/helpers/forms/ha-input_number-form.ts @@ -60,11 +60,10 @@ class HaInputNumberForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_select-form.ts b/src/panels/config/helpers/forms/ha-input_select-form.ts index 4f5ed4c27176..ef84db325e53 100644 --- a/src/panels/config/helpers/forms/ha-input_select-form.ts +++ b/src/panels/config/helpers/forms/ha-input_select-form.ts @@ -58,11 +58,10 @@ class HaInputSelectForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_text-form.ts b/src/panels/config/helpers/forms/ha-input_text-form.ts index 852b62d628c6..aa46c28f89d2 100644 --- a/src/panels/config/helpers/forms/ha-input_text-form.ts +++ b/src/panels/config/helpers/forms/ha-input_text-form.ts @@ -50,11 +50,10 @@ class HaInputTextForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-schedule-form.ts b/src/panels/config/helpers/forms/ha-schedule-form.ts index a4dd69bf4571..43fded379bb6 100644 --- a/src/panels/config/helpers/forms/ha-schedule-form.ts +++ b/src/panels/config/helpers/forms/ha-schedule-form.ts @@ -108,11 +108,10 @@ class HaScheduleForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-timer-form.ts b/src/panels/config/helpers/forms/ha-timer-form.ts index 34ff52ad87f2..069096a98b57 100644 --- a/src/panels/config/helpers/forms/ha-timer-form.ts +++ b/src/panels/config/helpers/forms/ha-timer-form.ts @@ -39,11 +39,10 @@ class HaTimerForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/script/manual-script-editor.ts b/src/panels/config/script/manual-script-editor.ts index a648ec8bbcbc..78f7c1c5cd6b 100644 --- a/src/panels/config/script/manual-script-editor.ts +++ b/src/panels/config/script/manual-script-editor.ts @@ -50,8 +50,8 @@ export class HaManualScriptEditor extends LitElement { protected updated(changedProps) { if (this._openFields && changedProps.has("config")) { this._openFields = false; - this._scriptFields?.updateComplete.then( - () => this._scriptFields?.focusLastField() + this._scriptFields?.updateComplete.then(() => + this._scriptFields?.focusLastField() ); } } diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts index 394ed6d9fa90..94e88b79bd9c 100644 --- a/src/panels/developer-tools/service/developer-tools-service.ts +++ b/src/panels/developer-tools/service/developer-tools-service.ts @@ -73,8 +73,8 @@ class HaPanelDevService extends LitElement { data: {}, }; if (this._yamlMode) { - this.updateComplete.then( - () => this._yamlEditor?.setValue(this._serviceData) + this.updateComplete.then(() => + this._yamlEditor?.setValue(this._serviceData) ); } } else if (!this._serviceData?.service) { @@ -86,8 +86,8 @@ class HaPanelDevService extends LitElement { data: {}, }; if (this._yamlMode) { - this.updateComplete.then( - () => this._yamlEditor?.setValue(this._serviceData) + this.updateComplete.then(() => + this._yamlEditor?.setValue(this._serviceData) ); } } diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts index 2ab16a785301..dace73f087fe 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts @@ -152,8 +152,9 @@ export class HuiDialogEditCard if (this._cardConfig && this._cardConfig.type) { let cardName: string | undefined; if (isCustomType(this._cardConfig.type)) { - cardName = getCustomCardEntry(stripCustomPrefix(this._cardConfig.type)) - ?.name; + cardName = getCustomCardEntry( + stripCustomPrefix(this._cardConfig.type) + )?.name; // Trim names that end in " Card" so as not to redundantly duplicate it if (cardName?.toLowerCase().endsWith(" card")) { cardName = cardName.substring(0, cardName.length - 5); diff --git a/src/panels/lovelace/editor/config-elements/hui-climate-hvac-modes-card-feature-editor.ts b/src/panels/lovelace/editor/config-elements/hui-climate-hvac-modes-card-feature-editor.ts index 7f01de610271..228a43740d22 100644 --- a/src/panels/lovelace/editor/config-elements/hui-climate-hvac-modes-card-feature-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-climate-hvac-modes-card-feature-editor.ts @@ -58,8 +58,8 @@ export class HuiClimateHvacModesCardFeatureEditor select: { multiple: true, mode: "list", - options: HVAC_MODES.filter( - (mode) => stateObj?.attributes.hvac_modes?.includes(mode) + options: HVAC_MODES.filter((mode) => + stateObj?.attributes.hvac_modes?.includes(mode) ).map((mode) => ({ value: mode, label: stateObj ? formatEntityState(stateObj, mode) : mode, diff --git a/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts index 71f77a86bf7f..fb236112f177 100644 --- a/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts @@ -252,11 +252,10 @@ export class HuiStatisticsGraphCardEditor ); const configured_stat_types = this._config!.stat_types ? ensureArray(this._config.stat_types) - : stat_types.filter( - (stat_type) => - this._metaDatas?.some((metaData) => - statisticsMetaHasType(metaData, stat_type) - ) + : stat_types.filter((stat_type) => + this._metaDatas?.some((metaData) => + statisticsMetaHasType(metaData, stat_type) + ) ); const data = { chart_type: "line", diff --git a/src/panels/lovelace/editor/config-elements/hui-water-heater-operation-modes-card-feature-editor.ts b/src/panels/lovelace/editor/config-elements/hui-water-heater-operation-modes-card-feature-editor.ts index a1f95b8a5220..6e1a5f43ab1b 100644 --- a/src/panels/lovelace/editor/config-elements/hui-water-heater-operation-modes-card-feature-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-water-heater-operation-modes-card-feature-editor.ts @@ -38,8 +38,8 @@ export class HuiWaterHeaterOperationModesCardFeatureEditor select: { multiple: true, mode: "list", - options: OPERATION_MODES.filter( - (mode) => stateObj?.attributes.operation_list?.includes(mode) + options: OPERATION_MODES.filter((mode) => + stateObj?.attributes.operation_list?.includes(mode) ).map((mode) => ({ value: mode, label: stateObj ? formatEntityState(stateObj, mode) : mode, diff --git a/src/resources/css-variables.ts b/src/resources/css-variables.ts index fe74704f9a93..b9760de4e31d 100644 --- a/src/resources/css-variables.ts +++ b/src/resources/css-variables.ts @@ -4,10 +4,9 @@ export function computeCssVariable( if (Array.isArray(props)) { return props .reverse() - .reduce( - (str, variable) => `var(${variable}${str ? `, ${str}` : ""})`, - undefined - ); + .reduce< + string | undefined + >((str, variable) => `var(${variable}${str ? `, ${str}` : ""})`, undefined); } return `var(${props})`; } diff --git a/yarn.lock b/yarn.lock index 7c879ce1bacb..c2b67f0850f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9644,7 +9644,7 @@ __metadata: object-hash: "npm:3.0.0" open: "npm:10.0.3" pinst: "npm:3.0.0" - prettier: "npm:3.1.1" + prettier: "npm:3.2.0" proxy-polyfill: "npm:0.3.2" punycode: "npm:2.3.1" qr-scanner: "npm:1.4.2" @@ -13100,12 +13100,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.1.1": - version: 3.1.1 - resolution: "prettier@npm:3.1.1" +"prettier@npm:3.2.0": + version: 3.2.0 + resolution: "prettier@npm:3.2.0" bin: prettier: bin/prettier.cjs - checksum: 26a249f321b97d26c04483f1bf2eeb22e082a76f4222a2c922bebdc60111691aad4ec3979610e83942e0b956058ec361d9e9c81c185172264eb6db9aa678082b + checksum: eb2eb63038ca9aaf86bda7dc49b879a278bc8344d28236fef08a8f185e8ce721a40155acc4a494e8f91ecbcdd9a132fd326516f791c61cbfa9037c1f74d6d029 languageName: node linkType: hard From 65d4d44f063132c160ec486d1ed8c45c8690558d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:52:48 -0500 Subject: [PATCH 150/361] Update dependency @codemirror/autocomplete to v6.12.0 (#19412) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 92eafcd8cac9..fa8642cff5b7 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "dependencies": { "@babel/runtime": "7.23.8", "@braintree/sanitize-url": "7.0.0", - "@codemirror/autocomplete": "6.11.1", + "@codemirror/autocomplete": "6.12.0", "@codemirror/commands": "6.3.3", "@codemirror/language": "6.10.0", "@codemirror/legacy-modes": "6.3.3", diff --git a/yarn.lock b/yarn.lock index c2b67f0850f8..d0818249c47a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1456,9 +1456,9 @@ __metadata: languageName: node linkType: hard -"@codemirror/autocomplete@npm:6.11.1": - version: 6.11.1 - resolution: "@codemirror/autocomplete@npm:6.11.1" +"@codemirror/autocomplete@npm:6.12.0": + version: 6.12.0 + resolution: "@codemirror/autocomplete@npm:6.12.0" dependencies: "@codemirror/language": "npm:^6.0.0" "@codemirror/state": "npm:^6.0.0" @@ -1469,7 +1469,7 @@ __metadata: "@codemirror/state": ^6.0.0 "@codemirror/view": ^6.0.0 "@lezer/common": ^1.0.0 - checksum: 5281bec2b77d2cf916f8774e324afb862646050eab929f33780a2a67b9957d02d9abceec5f47b1b5163fedc4d07a62f1ec13fa0e2ad4b022fb75f010362e8f0e + checksum: d01fa7e5b965285e7c26116c716c2f85d8fc4810f69abb9432dd97d60bf3a05cac547fe9dc6eaf8c7723a8621c017ff41a0b5df0e635c5a7cc37b041c7676ce8 languageName: node linkType: hard @@ -9482,7 +9482,7 @@ __metadata: "@babel/runtime": "npm:7.23.8" "@braintree/sanitize-url": "npm:7.0.0" "@bundle-stats/plugin-webpack-filter": "npm:4.8.4" - "@codemirror/autocomplete": "npm:6.11.1" + "@codemirror/autocomplete": "npm:6.12.0" "@codemirror/commands": "npm:6.3.3" "@codemirror/language": "npm:6.10.0" "@codemirror/legacy-modes": "npm:6.3.3" From 0ba8babd87e0b9239eb4eafc75ceec61e2f8230b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 22:00:08 +0000 Subject: [PATCH 151/361] Update dependency prettier to v3.2.1 (#19415) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index fa8642cff5b7..b8b5ae014e21 100644 --- a/package.json +++ b/package.json @@ -224,7 +224,7 @@ "object-hash": "3.0.0", "open": "10.0.3", "pinst": "3.0.0", - "prettier": "3.2.0", + "prettier": "3.2.1", "rollup": "2.79.1", "rollup-plugin-string": "3.0.0", "rollup-plugin-terser": "7.0.2", diff --git a/yarn.lock b/yarn.lock index d0818249c47a..fdaf77a8ab2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9644,7 +9644,7 @@ __metadata: object-hash: "npm:3.0.0" open: "npm:10.0.3" pinst: "npm:3.0.0" - prettier: "npm:3.2.0" + prettier: "npm:3.2.1" proxy-polyfill: "npm:0.3.2" punycode: "npm:2.3.1" qr-scanner: "npm:1.4.2" @@ -13100,12 +13100,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.2.0": - version: 3.2.0 - resolution: "prettier@npm:3.2.0" +"prettier@npm:3.2.1": + version: 3.2.1 + resolution: "prettier@npm:3.2.1" bin: prettier: bin/prettier.cjs - checksum: eb2eb63038ca9aaf86bda7dc49b879a278bc8344d28236fef08a8f185e8ce721a40155acc4a494e8f91ecbcdd9a132fd326516f791c61cbfa9037c1f74d6d029 + checksum: a26d26a74ba5cbf23a9741074ceef4f53a08ced03c42449dc9615ecd08ada9d19d5247ad2b0dfb15b2c8e57ec9f516074627b85b9f03270b08c184c64e7d8f64 languageName: node linkType: hard From 1f2683dd561385d1e924a52d644f80042b5d5bf6 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 16 Jan 2024 10:44:28 +0100 Subject: [PATCH 152/361] Restrict adding todo list and calendars to admin users (#19408) --- src/panels/calendar/ha-panel-calendar.ts | 19 +++++++++++----- src/panels/todo/ha-panel-todo.ts | 29 ++++++++++++++++-------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/panels/calendar/ha-panel-calendar.ts b/src/panels/calendar/ha-panel-calendar.ts index 4e60d13eea26..0e4547fc0709 100644 --- a/src/panels/calendar/ha-panel-calendar.ts +++ b/src/panels/calendar/ha-panel-calendar.ts @@ -147,11 +147,18 @@ class PanelCalendar extends LitElement { > ${calendarItems} -
  • - - - ${this.hass.localize("ui.components.calendar.create_calendar")} - + ${this.hass.user?.is_admin + ? html`
  • + + + ${this.hass.localize( + "ui.components.calendar.create_calendar" + )} + ` + : nothing} ` : html`
    ${this.hass.localize("ui.components.calendar.my_calendars")} @@ -162,7 +169,7 @@ class PanelCalendar extends LitElement { .label=${this.hass.localize("ui.common.refresh")} @click=${this._handleRefresh} > - ${showPane + ${showPane && this.hass.user?.is_admin ? html`${calendarItems} ${listItems} -
  • - - - ${this.hass.localize("ui.panel.todo.create_list")} - + ${this.hass.user?.is_admin + ? html`
  • + + + ${this.hass.localize("ui.panel.todo.create_list")} + ` + : nothing} ` : this.hass.localize("panel.todo")}
    ${listItems} - - - ${this.hass.localize("ui.panel.todo.create_list")} - + ${showPane && this.hass.user?.is_admin + ? html` + + ${this.hass.localize("ui.panel.todo.create_list")} + ` + : nothing} Date: Tue, 16 Jan 2024 09:01:34 -0500 Subject: [PATCH 153/361] Fix missing imports (2 of 2) (#19417) --- src/components/ha-combo-box.ts | 1 + src/components/ha-multi-textfield.ts | 1 + src/components/ha-navigation-picker.ts | 1 + src/components/ha-qr-code.ts | 1 + src/components/ha-service-picker.ts | 3 ++- src/dialogs/area-filter/area-filter-dialog.ts | 1 + .../previews/entity-preview-row.ts | 2 ++ src/onboarding/onboarding-analytics.ts | 1 + src/onboarding/onboarding-location.ts | 15 ++++++++------ src/onboarding/onboarding-welcome-link.ts | 1 + .../areas/dialog-area-registry-detail.ts | 5 +++-- .../types/ha-automation-condition-trigger.ts | 5 +++-- .../config/devices/ha-config-device-page.ts | 20 ++++++++++--------- .../config/helpers/forms/ha-timer-form.ts | 2 ++ .../integration-panels/zha/zha-group-page.ts | 10 ++++++---- .../config/repairs/dialog-repairs-issue.ts | 1 + .../conditions/ha-card-condition-editor.ts | 1 + .../conditions/types/ha-card-condition-and.ts | 1 + .../conditions/types/ha-card-condition-or.ts | 1 + tsconfig.json | 1 + 20 files changed, 50 insertions(+), 24 deletions(-) diff --git a/src/components/ha-combo-box.ts b/src/components/ha-combo-box.ts index ce6d54f41565..fa241e69d8d7 100644 --- a/src/components/ha-combo-box.ts +++ b/src/components/ha-combo-box.ts @@ -145,6 +145,7 @@ export class HaComboBox extends LitElement { protected render(): TemplateResult { return html` + Date: Tue, 16 Jan 2024 14:02:06 +0000 Subject: [PATCH 154/361] Fix incorrect padding on bottom of empty list (#19414) --- src/panels/lovelace/cards/hui-todo-list-card.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/lovelace/cards/hui-todo-list-card.ts b/src/panels/lovelace/cards/hui-todo-list-card.ts index d9ddfe99c426..4d286c7fd3e7 100644 --- a/src/panels/lovelace/cards/hui-todo-list-card.ts +++ b/src/panels/lovelace/cards/hui-todo-list-card.ts @@ -637,6 +637,7 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { .empty { padding: 16px 32px; + display: inline-block; } .item { From df2514d79f7e8b4f60cc47e54049833ddca7bde8 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Tue, 16 Jan 2024 15:02:27 +0100 Subject: [PATCH 155/361] Use new mdi oscillating icon (#19410) --- src/data/climate.ts | 8 ++++---- src/data/icons/haOscillating.ts | 2 -- src/data/icons/haOscillatingOff.ts | 2 -- src/dialogs/more-info/controls/more-info-climate.ts | 7 +++++-- src/dialogs/more-info/controls/more-info-fan.ts | 10 +++++----- 5 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 src/data/icons/haOscillating.ts delete mode 100644 src/data/icons/haOscillatingOff.ts diff --git a/src/data/climate.ts b/src/data/climate.ts index b3b7087a3bfa..2e4a38b6fa61 100644 --- a/src/data/climate.ts +++ b/src/data/climate.ts @@ -2,6 +2,8 @@ import { mdiAccountArrowRight, mdiArrowAll, mdiArrowLeftRight, + mdiArrowOscillating, + mdiArrowOscillatingOff, mdiArrowUpDown, mdiBed, mdiCircleMedium, @@ -31,8 +33,6 @@ import { HassEntityAttributeBase, HassEntityBase, } from "home-assistant-js-websocket"; -import { haOscillatingOff } from "./icons/haOscillatingOff"; -import { haOscillating } from "./icons/haOscillating"; export const HVAC_MODES = [ "auto", @@ -203,8 +203,8 @@ type ClimateBuiltInSwingMode = export const CLIMATE_SWING_MODE_ICONS: Record = { - on: haOscillating, - off: haOscillatingOff, + on: mdiArrowOscillating, + off: mdiArrowOscillatingOff, vertical: mdiArrowUpDown, horizontal: mdiArrowLeftRight, both: mdiArrowAll, diff --git a/src/data/icons/haOscillating.ts b/src/data/icons/haOscillating.ts deleted file mode 100644 index a3afdb3b3ca3..000000000000 --- a/src/data/icons/haOscillating.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const haOscillating = - "M12,6C7.963,6 6,9.715 6,12L9,12L5,16L1,12L4,12C4,9.17 5.897,4 12.004,4C18.112,4 20.004,9.17 20.004,12L23.004,12L19.004,16L15.004,12L18.004,12C18.004,9.715 16.037,6 12,6Z"; diff --git a/src/data/icons/haOscillatingOff.ts b/src/data/icons/haOscillatingOff.ts deleted file mode 100644 index 285f6c5c39d2..000000000000 --- a/src/data/icons/haOscillatingOff.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const haOscillatingOff = - "M 2.9003906,0.8203125 1.6289062,2.0917969 6.0566406,6.5195312 C 4.5643882,8.2344127 4,10.461887 4,12 H 1 l 4,4 4,-4 H 6 C 6,10.82424 6.5229215,9.2725296 7.578125,8.0410156 L 19.730469,20.193359 21.003906,18.921875 8.9394531,6.8574219 7.3964844,5.3164062 Z M 12.003906,4 C 10.899236,4 9.9346562,4.1709695 9.0917969,4.4648438 L 10.755859,6.1289062 C 11.146838,6.0472549 11.559859,6 12,6 c 4.036992,0 6.003906,3.7150046 6.003906,6 h -1.376953 l 3.189453,3.1875 3.1875,-3.1875 h -3 c 0,-2.8299944 -1.892012,-8 -8,-8 z"; diff --git a/src/dialogs/more-info/controls/more-info-climate.ts b/src/dialogs/more-info/controls/more-info-climate.ts index ad740ad588fe..8daa9ba24156 100644 --- a/src/dialogs/more-info/controls/more-info-climate.ts +++ b/src/dialogs/more-info/controls/more-info-climate.ts @@ -1,5 +1,6 @@ import "@material/mwc-list/mwc-list-item"; import { + mdiArrowOscillating, mdiFan, mdiThermometer, mdiThermostat, @@ -26,7 +27,6 @@ import { computeSwingModeIcon, } from "../../../data/climate"; import { UNAVAILABLE } from "../../../data/entity"; -import { haOscillating } from "../../../data/icons/haOscillating"; import "../../../state-control/climate/ha-state-control-climate-humidity"; import "../../../state-control/climate/ha-state-control-climate-temperature"; import { HomeAssistant } from "../../../types"; @@ -260,7 +260,10 @@ class MoreInfoClimate extends LitElement { @selected=${this._handleSwingmodeChanged} @closed=${stopPropagation} > - + ${stateObj.attributes.swing_modes!.map( (mode) => html` diff --git a/src/dialogs/more-info/controls/more-info-fan.ts b/src/dialogs/more-info/controls/more-info-fan.ts index 7d6f9f129e50..b5f39cb05b74 100644 --- a/src/dialogs/more-info/controls/more-info-fan.ts +++ b/src/dialogs/more-info/controls/more-info-fan.ts @@ -1,4 +1,6 @@ import { + mdiArrowOscillating, + mdiArrowOscillatingOff, mdiFan, mdiFanOff, mdiPower, @@ -23,8 +25,6 @@ import { computeFanSpeedStateDisplay, } from "../../../data/fan"; import { forwardHaptic } from "../../../data/haptics"; -import { haOscillating } from "../../../data/icons/haOscillating"; -import { haOscillatingOff } from "../../../data/icons/haOscillatingOff"; import "../../../state-control/fan/ha-state-control-fan-speed"; import "../../../state-control/ha-state-control-toggle"; import type { HomeAssistant } from "../../../types"; @@ -260,12 +260,12 @@ class MoreInfoFan extends LitElement { > ${this.hass.formatEntityAttributeValue( this.stateObj, @@ -276,7 +276,7 @@ class MoreInfoFan extends LitElement { ${this.hass.formatEntityAttributeValue( this.stateObj, From 490ed86e86d651423019a63340b96b24686d1f90 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Tue, 16 Jan 2024 15:04:18 +0100 Subject: [PATCH 156/361] Add per domain style for tile card image (#19419) --- src/components/tile/ha-tile-image.ts | 13 +++++++++++-- src/panels/lovelace/cards/hui-tile-card.ts | 11 +++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/components/tile/ha-tile-image.ts b/src/components/tile/ha-tile-image.ts index 7ecb5af008aa..fc29eb57d0c5 100644 --- a/src/components/tile/ha-tile-image.ts +++ b/src/components/tile/ha-tile-image.ts @@ -1,16 +1,19 @@ -import { CSSResultGroup, html, css, LitElement, nothing } from "lit"; +import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; +export type TileImageStyle = "square" | "rounded-square" | "circle"; @customElement("ha-tile-image") export class HaTileImage extends LitElement { @property() public imageUrl?: string; @property() public imageAlt?: string; + @property() public imageStyle: TileImageStyle = "circle"; + protected render() { return html` -
    +
    ${this.imageUrl ? html`${ifDefined(this.imageAlt)}` : nothing} @@ -31,6 +34,12 @@ export class HaTileImage extends LitElement { justify-content: center; overflow: hidden; } + .image.rounded-square { + border-radius: 8%; + } + .image.square { + border-radius: 0; + } .image img { width: 100%; height: 100%; diff --git a/src/panels/lovelace/cards/hui-tile-card.ts b/src/panels/lovelace/cards/hui-tile-card.ts index b3470aeed569..70d3d13063a3 100644 --- a/src/panels/lovelace/cards/hui-tile-card.ts +++ b/src/panels/lovelace/cards/hui-tile-card.ts @@ -33,22 +33,23 @@ import "../../../components/ha-card"; import "../../../components/tile/ha-tile-badge"; import "../../../components/tile/ha-tile-icon"; import "../../../components/tile/ha-tile-image"; +import type { TileImageStyle } from "../../../components/tile/ha-tile-image"; import "../../../components/tile/ha-tile-info"; import { cameraUrlWithWidthHeight } from "../../../data/camera"; import { isUnavailableState } from "../../../data/entity"; import type { ActionHandlerEvent } from "../../../data/lovelace/action_handler"; import { SENSOR_DEVICE_CLASS_TIMESTAMP } from "../../../data/sensor"; +import { UpdateEntity, computeUpdateStateDisplay } from "../../../data/update"; import { HomeAssistant } from "../../../types"; +import "../card-features/hui-card-features"; import { actionHandler } from "../common/directives/action-handler-directive"; import { findEntities } from "../common/find-entities"; import { handleAction } from "../common/handle-action"; import { hasAction } from "../common/has-action"; import "../components/hui-timestamp-display"; -import "../card-features/hui-card-features"; import type { LovelaceCard, LovelaceCardEditor } from "../types"; import { computeTileBadge } from "./tile/badges/tile-badge"; import type { ThermostatCardConfig, TileCardConfig } from "./types"; -import { UpdateEntity, computeUpdateStateDisplay } from "../../../data/update"; const TIMESTAMP_STATE_DOMAINS = ["button", "input_button", "scene"]; @@ -61,6 +62,11 @@ export const getEntityDefaultTileIconAction = (entityId: string) => { return supportsIconAction ? "toggle" : "more-info"; }; +const DOMAIN_IMAGE_STYLE: Record = { + update: "square", + media_player: "rounded-square", +}; + @customElement("hui-tile-card") export class HuiTileCard extends LitElement implements LovelaceCard { public static async getConfigElement(): Promise { @@ -413,6 +419,7 @@ export class HuiTileCard extends LitElement implements LovelaceCard { ${imageUrl ? html` From a06c9d0cc67945638aed47894eb21e625bd5c1bf Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:39:35 -0800 Subject: [PATCH 157/361] Localize show_password in auth form (#19300) * Localize show_password in auth form * changes from review --- src/auth/ha-auth-flow.ts | 1 + src/auth/ha-auth-form.ts | 14 +++++++++++++- src/components/ha-form/ha-form-string.ts | 16 +++++++++------- src/components/ha-form/ha-form.ts | 8 +++++++- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/auth/ha-auth-flow.ts b/src/auth/ha-auth-flow.ts index d8d18b4ef2b3..30b0e2176a17 100644 --- a/src/auth/ha-auth-flow.ts +++ b/src/auth/ha-auth-flow.ts @@ -222,6 +222,7 @@ export class HaAuthFlow extends LitElement { ${this._computeStepDescription(step)} { + return { + localize: this.localize, + localizeBaseKey, + }; + } + protected fieldElementName(type: string): string { if (type === "string") { return `ha-auth-form-${type}`; diff --git a/src/components/ha-form/ha-form-string.ts b/src/components/ha-form/ha-form-string.ts index ee433e3fa1d5..83b4c69f39bb 100644 --- a/src/components/ha-form/ha-form-string.ts +++ b/src/components/ha-form/ha-form-string.ts @@ -19,13 +19,15 @@ import type { HaFormStringData, HaFormStringSchema, } from "./types"; -import { HomeAssistant } from "../../types"; +import { LocalizeFunc, LocalizeKeys } from "../../common/translations/localize"; const MASKED_FIELDS = ["password", "secret", "token"]; @customElement("ha-form-string") export class HaFormString extends LitElement implements HaFormElement { - @property({ attribute: false }) public hass?: HomeAssistant; + @property({ attribute: false }) public localize?: LocalizeFunc; + + @property() public localizeBaseKey = "ui.components.selectors.text"; @property() public schema!: HaFormStringSchema; @@ -81,11 +83,11 @@ export class HaFormString extends LitElement implements HaFormElement { return html` diff --git a/src/components/ha-form/ha-form.ts b/src/components/ha-form/ha-form.ts index 9fcc82aff660..f4eed03d9ad9 100644 --- a/src/components/ha-form/ha-form.ts +++ b/src/components/ha-form/ha-form.ts @@ -39,7 +39,7 @@ const getWarning = (obj, item) => (obj && item.name ? obj[item.name] : null); @customElement("ha-form") export class HaForm extends LitElement implements HaFormElement { - @property({ attribute: false }) public hass!: HomeAssistant; + @property({ attribute: false }) public hass?: HomeAssistant; @property({ attribute: false }) public data!: HaFormDataContainer; @@ -64,6 +64,10 @@ export class HaForm extends LitElement implements HaFormElement { @property() public localizeValue?: (key: string) => string; + protected getFormProperties(): Record { + return {}; + } + public async focus() { await this.updateComplete; const root = this.renderRoot.querySelector(".root"); @@ -143,9 +147,11 @@ export class HaForm extends LitElement implements HaFormElement { helper: this._computeHelper(item), disabled: this.disabled || item.disabled || false, hass: this.hass, + localize: this.hass?.localize, computeLabel: this.computeLabel, computeHelper: this.computeHelper, context: this._generateContext(item), + ...this.getFormProperties(), })} `; })} From 22625a805d843da6900decfe6bb3923c3f46e6be Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:40:27 -0800 Subject: [PATCH 158/361] Don't show duplicates in statistics picker (#19422) * Filter duplicates from ha-statistics-picker * use repeat --- src/components/entity/ha-statistic-picker.ts | 10 +++++++--- src/components/entity/ha-statistics-picker.ts | 7 ++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/components/entity/ha-statistic-picker.ts b/src/components/entity/ha-statistic-picker.ts index b2227ee7af74..d86c3bf0533d 100644 --- a/src/components/entity/ha-statistic-picker.ts +++ b/src/components/entity/ha-statistic-picker.ts @@ -129,7 +129,8 @@ export class HaStatisticPicker extends LitElement { includeUnitClass?: string | string[], includeDeviceClass?: string | string[], entitiesOnly?: boolean, - excludeStatistics?: string[] + excludeStatistics?: string[], + value?: string ): StatisticItem[] => { if (!statisticIds.length) { return [ @@ -176,6 +177,7 @@ export class HaStatisticPicker extends LitElement { statisticIds.forEach((meta) => { if ( excludeStatistics && + meta.statistic_id !== value && excludeStatistics.includes(meta.statistic_id) ) { return; @@ -258,7 +260,8 @@ export class HaStatisticPicker extends LitElement { this.includeUnitClass, this.includeDeviceClass, this.entitiesOnly, - this.excludeStatistics + this.excludeStatistics, + this.value ); } else { this.updateComplete.then(() => { @@ -268,7 +271,8 @@ export class HaStatisticPicker extends LitElement { this.includeUnitClass, this.includeDeviceClass, this.entitiesOnly, - this.excludeStatistics + this.excludeStatistics, + this.value ); }); } diff --git a/src/components/entity/ha-statistics-picker.ts b/src/components/entity/ha-statistics-picker.ts index 7079e5a6d521..115335094f91 100644 --- a/src/components/entity/ha-statistics-picker.ts +++ b/src/components/entity/ha-statistics-picker.ts @@ -1,5 +1,6 @@ import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { customElement, property } from "lit/decorators"; +import { repeat } from "lit/directives/repeat"; import { fireEvent } from "../../common/dom/fire_event"; import type { ValueChangedEvent, HomeAssistant } from "../../types"; import "./ha-statistic-picker"; @@ -81,7 +82,9 @@ class HaStatisticsPicker extends LitElement { : this.statisticTypes; return html` - ${this._currentStatistics.map( + ${repeat( + this._currentStatistics, + (statisticId) => statisticId, (statisticId) => html`
    @@ -110,6 +114,7 @@ class HaStatisticsPicker extends LitElement { .statisticTypes=${this.statisticTypes} .statisticIds=${this.statisticIds} .label=${this.pickStatisticLabel} + .excludeStatistics=${this.value} .allowCustomEntity=${this.allowCustomEntity} @value-changed=${this._addStatistic} > From 38b01e9335f04516554df788966804c20dfaec9b Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 16 Jan 2024 21:29:08 -0500 Subject: [PATCH 159/361] Add a download button to history panel --- src/panels/history/ha-panel-history.ts | 40 +++++++++++++++++++++++++- src/translations/en.json | 3 +- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/panels/history/ha-panel-history.ts b/src/panels/history/ha-panel-history.ts index 75a2b99265ee..67b481b71b16 100644 --- a/src/panels/history/ha-panel-history.ts +++ b/src/panels/history/ha-panel-history.ts @@ -1,4 +1,4 @@ -import { mdiFilterRemove, mdiRefresh } from "@mdi/js"; +import { mdiDownload, mdiFilterRemove, mdiRefresh } from "@mdi/js"; import { differenceInHours } from "date-fns/esm"; import { HassServiceTarget, @@ -53,6 +53,7 @@ import { getSensorNumericDeviceClasses } from "../../data/sensor"; import { SubscribeMixin } from "../../mixins/subscribe-mixin"; import { haStyle } from "../../resources/styles"; import { HomeAssistant } from "../../types"; +import { fileDownload } from "../../util/file_download"; class HaPanelHistory extends SubscribeMixin(LitElement) { @property({ attribute: false }) hass!: HomeAssistant; @@ -172,6 +173,13 @@ class HaPanelHistory extends SubscribeMixin(LitElement) { .path=${mdiRefresh} .label=${this.hass.localize("ui.common.refresh")} > +
    @@ -630,6 +638,36 @@ class HaPanelHistory extends SubscribeMixin(LitElement) { navigate(`/history?${createSearchParam(params)}`, { replace: true }); } + private _downloadHistory() { + const csv: string[] = ["entity_id,state,last_changed\n"]; + const formatDate = (number) => new Date(number).toISOString(); + + for (const line of this._mungedStateHistory!.line) { + for (const entity of line.data) { + const entityId = entity.entity_id; + for (const data of [entity.states, entity.statistics]) { + if (!data) { + continue; + } + for (const s of data) { + csv.push(`${entityId},${s.state},${formatDate(s.last_changed)}\n`); + } + } + } + } + for (const timeline of this._mungedStateHistory!.timeline) { + const entityId = timeline.entity_id; + for (const s of timeline.data) { + csv.push(`${entityId},${s.state},${formatDate(s.last_changed)}\n`); + } + } + const blob = new Blob(csv, { + type: "text/csv", + }); + const url = window.URL.createObjectURL(blob); + fileDownload(url, "history.csv"); + } + static get styles() { return [ haStyle, diff --git a/src/translations/en.json b/src/translations/en.json index 6ea99bc0ad44..08e3980d548e 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -6412,7 +6412,8 @@ "history": { "start_search": "Start by selecting an area, device or entity above", "add_all": "Add all entities", - "remove_all": "Remove all selections" + "remove_all": "Remove all selections", + "download_data": "Download data" } }, "tips": { From 432600702207b50d5a644ec472a8d753fcf6f306 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 04:41:16 +0000 Subject: [PATCH 160/361] Update dependency prettier to v3.2.2 (#19431) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b8b5ae014e21..edf1ea8eb4d0 100644 --- a/package.json +++ b/package.json @@ -224,7 +224,7 @@ "object-hash": "3.0.0", "open": "10.0.3", "pinst": "3.0.0", - "prettier": "3.2.1", + "prettier": "3.2.2", "rollup": "2.79.1", "rollup-plugin-string": "3.0.0", "rollup-plugin-terser": "7.0.2", diff --git a/yarn.lock b/yarn.lock index fdaf77a8ab2a..f94b97539f44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9644,7 +9644,7 @@ __metadata: object-hash: "npm:3.0.0" open: "npm:10.0.3" pinst: "npm:3.0.0" - prettier: "npm:3.2.1" + prettier: "npm:3.2.2" proxy-polyfill: "npm:0.3.2" punycode: "npm:2.3.1" qr-scanner: "npm:1.4.2" @@ -13100,12 +13100,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.2.1": - version: 3.2.1 - resolution: "prettier@npm:3.2.1" +"prettier@npm:3.2.2": + version: 3.2.2 + resolution: "prettier@npm:3.2.2" bin: prettier: bin/prettier.cjs - checksum: a26d26a74ba5cbf23a9741074ceef4f53a08ced03c42449dc9615ecd08ada9d19d5247ad2b0dfb15b2c8e57ec9f516074627b85b9f03270b08c184c64e7d8f64 + checksum: ab9470ff6cfd19f28bc424f22e58f2fc4a488d148b9384f6c3739235017c8350cae82b3697392c23d9b098b9d8dfaa1cc9ff4ef25fd45f54c97b95f9cc7a1f7d languageName: node linkType: hard From c65fadbd8ae71ae5774860fc72de7dc89465cebb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 23:47:21 -0500 Subject: [PATCH 161/361] Update dependency sortablejs to v1.15.2 (#19426) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index edf1ea8eb4d0..62de53757f26 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "qrcode": "1.5.3", "roboto-fontface": "0.10.0", "rrule": "2.8.1", - "sortablejs": "1.15.1", + "sortablejs": "1.15.2", "stacktrace-js": "2.0.2", "superstruct": "1.0.3", "tinykeys": "2.1.0", diff --git a/yarn.lock b/yarn.lock index f94b97539f44..4c1239e49ad0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9657,7 +9657,7 @@ __metadata: rrule: "npm:2.8.1" serve-handler: "npm:6.1.5" sinon: "npm:17.0.1" - sortablejs: "npm:1.15.1" + sortablejs: "npm:1.15.2" source-map-url: "npm:0.4.1" stacktrace-js: "npm:2.0.2" superstruct: "npm:1.0.3" @@ -14338,10 +14338,10 @@ __metadata: languageName: node linkType: hard -"sortablejs@npm:1.15.1": - version: 1.15.1 - resolution: "sortablejs@npm:1.15.1" - checksum: c4ccbc60e7936321eee0e07448e04b1f4481fed727ed1ace86866f49f9929e3acda2b7b825894e7ece5b8bc41f3c135eb4d00d09a287de1ee896d8256a0a84df +"sortablejs@npm:1.15.2": + version: 1.15.2 + resolution: "sortablejs@npm:1.15.2" + checksum: d149dd04bb05904ea20ca477d97cdfbbbd46edf7ede8c80958f2ad881dd6d7b1633cce31665992b341e0ea01fc7ef9d7571ccb7eb995baf01f9418b44e935eac languageName: node linkType: hard From d85c729fa5318b2d053f92f064e9662edddb94a3 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 17 Jan 2024 05:47:45 -0500 Subject: [PATCH 162/361] Add a download button to history panel (#19428) From d1478567f0b441820ab3bd34c9e78a11a5743b11 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 17 Jan 2024 06:43:25 -0500 Subject: [PATCH 163/361] Add title to grid card editor (#19429) * Add title to grid card editor * Update src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts Co-authored-by: Bram Kragten --------- Co-authored-by: Bram Kragten --- .../lovelace/editor/config-elements/hui-grid-card-editor.ts | 4 ++++ src/translations/en.json | 1 + 2 files changed, 5 insertions(+) diff --git a/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts index b683e8e13e3b..6105a3fa167e 100644 --- a/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts @@ -33,6 +33,10 @@ const SCHEMA = [ type: "grid", name: "", schema: [ + { + name: "title", + selector: { text: {} }, + }, { name: "columns", default: DEFAULT_COLUMNS, diff --git a/src/translations/en.json b/src/translations/en.json index 08e3980d548e..c7254e73c9e2 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -5224,6 +5224,7 @@ "grid": { "name": "Grid", "description": "The Grid card allows you to show multiple cards in a grid.", + "title": "Title", "columns": "Columns", "square": "Render cards as squares" }, From 58c4bf081bb307443ae7a49a976bc97dca1cc796 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Wed, 17 Jan 2024 06:45:21 -0500 Subject: [PATCH 164/361] Fix boolean and nullable attribute bindings (#19432) --- .../src/pages/components/ha-control-button.ts | 2 +- .../src/pages/components/ha-control-select.ts | 4 ++-- .../src/pages/components/ha-control-switch.ts | 8 ++++---- src/components/data-table/ha-data-table.ts | 2 +- src/components/ha-control-number-buttons.ts | 12 ++++++------ src/components/ha-date-range-picker.ts | 18 ++++++++++-------- .../add-automation-element-dialog.ts | 2 +- .../header-footer/hui-picture-header-footer.ts | 2 +- tsconfig.json | 2 -- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/gallery/src/pages/components/ha-control-button.ts b/gallery/src/pages/components/ha-control-button.ts index 0c3ad180be17..908ca808d44b 100644 --- a/gallery/src/pages/components/ha-control-button.ts +++ b/gallery/src/pages/components/ha-control-button.ts @@ -59,7 +59,7 @@ export class DemoHaBarButton extends LitElement { diff --git a/gallery/src/pages/components/ha-control-select.ts b/gallery/src/pages/components/ha-control-select.ts index 2f9eda75644b..e0d1e0e3456f 100644 --- a/gallery/src/pages/components/ha-control-select.ts +++ b/gallery/src/pages/components/ha-control-select.ts @@ -135,7 +135,7 @@ export class DemoHaControlSelect extends LitElement { class=${ifDefined(config.class)} @value-changed=${this.handleValueChanged} aria-labelledby=${id} - disabled=${ifDefined(config.disabled)} + ?disabled=${config.disabled} >
    @@ -156,7 +156,7 @@ export class DemoHaControlSelect extends LitElement { class=${ifDefined(config.class)} @value-changed=${this.handleValueChanged} aria-labelledby=${id} - disabled=${ifDefined(config.disabled)} + ?disabled=${config.disabled} > `; diff --git a/gallery/src/pages/components/ha-control-switch.ts b/gallery/src/pages/components/ha-control-switch.ts index 8311e2a0a570..128a23773f56 100644 --- a/gallery/src/pages/components/ha-control-switch.ts +++ b/gallery/src/pages/components/ha-control-switch.ts @@ -63,8 +63,8 @@ export class DemoHaControlSwitch extends LitElement { .pathOn=${mdiLightbulb} .pathOff=${mdiLightbulbOff} aria-labelledby=${id} - disabled=${ifDefined(config.disabled)} - reversed=${ifDefined(config.reversed)} + ?disabled=${config.disabled} + ?reversed=${config.reversed} >
    @@ -86,8 +86,8 @@ export class DemoHaControlSwitch extends LitElement { aria-label=${label} .pathOn=${mdiGarageOpen} .pathOff=${mdiGarage} - disabled=${ifDefined(config.disabled)} - reversed=${ifDefined(config.reversed)} + ?disabled=${config.disabled} + ?reversed=${config.reversed} > `; diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts index 10293fc761ab..44c49ea1090e 100644 --- a/src/components/data-table/ha-data-table.ts +++ b/src/components/data-table/ha-data-table.ts @@ -300,7 +300,7 @@ export class HaDataTable extends LitElement { }; return html`
    - +
    `; diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index 8d01e23ecda9..1532409130b4 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -8,24 +8,25 @@ import { addMonths, addYears, endOfDay, - endOfWeek, endOfMonth, + endOfWeek, endOfYear, startOfDay, - startOfWeek, startOfMonth, + startOfWeek, startOfYear, } from "date-fns"; import { - css, CSSResultGroup, - html, LitElement, - nothing, PropertyValues, TemplateResult, + css, + html, + nothing, } from "lit"; import { customElement, property, state } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; import { calcDate } from "../common/datetime/calc_date"; import { firstWeekdayIndex } from "../common/datetime/first_weekday"; import { formatDate } from "../common/datetime/format_date"; @@ -34,9 +35,9 @@ import { useAmPm } from "../common/datetime/use_am_pm"; import { computeRTLDirection } from "../common/util/compute_rtl"; import { HomeAssistant } from "../types"; import "./date-range-picker"; +import "./ha-icon-button"; import "./ha-svg-icon"; import "./ha-textfield"; -import "./ha-icon-button"; export interface DateRangePickerRanges { [key: string]: [Date, Date]; @@ -250,8 +251,9 @@ export class HaDateRangePicker extends LitElement { start-date=${this.startDate.toISOString()} end-date=${this.endDate.toISOString()} ?ranges=${this.ranges !== false} - opening-direction=${this.openingDirection || - this._calcedOpeningDirection} + opening-direction=${ifDefined( + this.openingDirection || this._calcedOpeningDirection + )} first-day=${firstWeekdayIndex(this.hass.locale)} language=${this.hass.locale.language} > diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index b449952b64be..f67a3a359650 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -580,7 +580,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog { : html``} diff --git a/src/panels/lovelace/header-footer/hui-picture-header-footer.ts b/src/panels/lovelace/header-footer/hui-picture-header-footer.ts index f2a9f9d0ae0d..2e84a7ba03c3 100644 --- a/src/panels/lovelace/header-footer/hui-picture-header-footer.ts +++ b/src/panels/lovelace/header-footer/hui-picture-header-footer.ts @@ -68,7 +68,7 @@ export class HuiPictureHeaderFooter return html` ${this._config!.alt_text} Date: Wed, 17 Jan 2024 04:22:08 -0800 Subject: [PATCH 165/361] Custom device_classes for Area Card sensors (#19421) * Custom device_classes for Area Card sensors * no sensor DOMAIN_ICONS --- src/panels/lovelace/cards/hui-area-card.ts | 47 ++++--- .../config-elements/hui-area-card-editor.ts | 130 +++++++++++++----- src/translations/en.json | 1 + 3 files changed, 122 insertions(+), 56 deletions(-) diff --git a/src/panels/lovelace/cards/hui-area-card.ts b/src/panels/lovelace/cards/hui-area-card.ts index 7fe1749099ac..eff790b5fe82 100644 --- a/src/panels/lovelace/cards/hui-area-card.ts +++ b/src/panels/lovelace/cards/hui-area-card.ts @@ -3,11 +3,9 @@ import { mdiLightbulbMultiple, mdiLightbulbMultipleOff, mdiRun, - mdiThermometer, mdiToggleSwitch, mdiToggleSwitchOff, mdiWaterAlert, - mdiWaterPercent, } from "@mdi/js"; import type { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket"; import { @@ -23,13 +21,16 @@ import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { styleMap } from "lit/directives/style-map"; import memoizeOne from "memoize-one"; -import { STATES_OFF } from "../../../common/const"; +import { STATES_OFF, FIXED_DEVICE_CLASS_ICONS } from "../../../common/const"; import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element"; import { computeDomain } from "../../../common/entity/compute_domain"; import { binarySensorIcon } from "../../../common/entity/binary_sensor_icon"; import { domainIcon } from "../../../common/entity/domain_icon"; import { navigate } from "../../../common/navigate"; -import { formatNumber } from "../../../common/number/format_number"; +import { + formatNumber, + isNumericState, +} from "../../../common/number/format_number"; import { subscribeOne } from "../../../common/util/subscribe-one"; import parseAspectRatio from "../../../common/util/parse-aspect-ratio"; import "../../../components/entity/state-badge"; @@ -57,6 +58,7 @@ import "../components/hui-image"; import "../components/hui-warning"; import { LovelaceCard, LovelaceCardEditor } from "../types"; import { AreaCardConfig } from "./types"; +import { blankBeforeUnit } from "../../../common/translations/blank_before_unit"; export const DEFAULT_ASPECT_RATIO = "16:9"; @@ -77,10 +79,6 @@ const DOMAIN_ICONS = { light: { on: mdiLightbulbMultiple, off: mdiLightbulbMultipleOff }, switch: { on: mdiToggleSwitch, off: mdiToggleSwitchOff }, fan: { on: domainIcon("fan"), off: domainIcon("fan") }, - sensor: { - temperature: mdiThermometer, - humidity: mdiWaterPercent, - }, binary_sensor: { motion: mdiRun, moisture: mdiWaterAlert, @@ -215,10 +213,7 @@ export class HuiAreaCard } let uom; const values = entities.filter((entity) => { - if ( - !entity.attributes.unit_of_measurement || - isNaN(Number(entity.state)) - ) { + if (!isNumericState(entity) || isNaN(Number(entity.state))) { return false; } if (!uom) { @@ -236,7 +231,7 @@ export class HuiAreaCard ); return `${formatNumber(sum / values.length, this.hass!.locale, { maximumFractionDigits: 1, - })} ${uom}`; + })}${uom ? blankBeforeUnit(uom, this.hass!.locale) : ""}${uom || ""}`; } private _area = memoizeOne( @@ -281,6 +276,9 @@ export class HuiAreaCard this._config = config; this._deviceClasses = { ...DEVICE_CLASSES }; + if (config.sensor_classes) { + this._deviceClasses.sensor = config.sensor_classes; + } if (config.alert_classes) { this._deviceClasses.binary_sensor = config.alert_classes; } @@ -385,20 +383,19 @@ export class HuiAreaCard if (!(domain in entitiesByDomain)) { return; } - DEVICE_CLASSES[domain].forEach((deviceClass) => { + this._deviceClasses[domain].forEach((deviceClass) => { if ( entitiesByDomain[domain].some( (entity) => entity.attributes.device_class === deviceClass ) ) { - sensors.push(html` - ${DOMAIN_ICONS[domain][deviceClass] - ? html`` - : ""} - ${this._average(domain, deviceClass)} - `); + const icon = FIXED_DEVICE_CLASS_ICONS[deviceClass]; + sensors.push( + html`
    + ${icon ? html`` : ""} + ${this._average(domain, deviceClass)} +
    ` + ); } }); }); @@ -566,6 +563,12 @@ export class HuiAreaCard margin-top: 8px; } + .sensor { + white-space: nowrap; + float: left; + margin-right: 4px; + } + .alerts { padding: 16px; } diff --git a/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts index c49e9bf99ea2..f46f279b4580 100644 --- a/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts @@ -24,6 +24,7 @@ import { baseLovelaceCardConfig } from "../structs/base-card-struct"; import { computeDomain } from "../../../../common/entity/compute_domain"; import { caseInsensitiveStringCompare } from "../../../../common/string/compare"; import { SelectOption } from "../../../../data/selector"; +import { getSensorNumericDeviceClasses } from "../../../../data/sensor"; const cardConfigStruct = assign( baseLovelaceCardConfig, @@ -35,6 +36,7 @@ const cardConfigStruct = assign( camera_view: optional(string()), aspect_ratio: optional(string()), alert_classes: optional(array(string())), + sensor_classes: optional(array(string())), }) ); @@ -47,8 +49,14 @@ export class HuiAreaCardEditor @state() private _config?: AreaCardConfig; + @state() private _numericDeviceClasses?: string[]; + private _schema = memoizeOne( - (showCamera: boolean, binaryClasses: SelectOption[]) => + ( + showCamera: boolean, + binaryClasses: SelectOption[], + sensorClasses: SelectOption[] + ) => [ { name: "area", selector: { area: {} } }, { name: "show_camera", required: false, selector: { boolean: {} } }, @@ -88,13 +96,37 @@ export class HuiAreaCardEditor }, }, }, + { + name: "sensor_classes", + selector: { + select: { + reorder: true, + multiple: true, + custom_value: true, + options: sensorClasses, + }, + }, + }, ] as const ); - private _binaryClassesForArea = memoizeOne((area: string): string[] => { + private _binaryClassesForArea = memoizeOne((area: string): string[] => + this._classesForArea(area, "binary_sensor") + ); + + private _sensorClassesForArea = memoizeOne( + (area: string, numericDeviceClasses?: string[]): string[] => + this._classesForArea(area, "sensor", numericDeviceClasses) + ); + + private _classesForArea( + area: string, + domain: "sensor" | "binary_sensor", + numericDeviceClasses?: string[] | undefined + ): string[] { const entities = Object.values(this.hass!.entities).filter( (e) => - computeDomain(e.entity_id) === "binary_sensor" && + computeDomain(e.entity_id) === domain && !e.entity_category && !e.hidden && (e.area_id === area || @@ -103,58 +135,92 @@ export class HuiAreaCardEditor const classes = entities .map((e) => this.hass!.states[e.entity_id]?.attributes.device_class || "") - .filter((c) => c); + .filter( + (c) => + c && + (domain !== "sensor" || + !numericDeviceClasses || + numericDeviceClasses.includes(c)) + ); return [...new Set(classes)]; - }); - - private _buildOptions = memoizeOne( - (possibleClasses: string[], currentClasses: string[]): SelectOption[] => { - const options = [...new Set([...possibleClasses, ...currentClasses])].map( - (deviceClass) => ({ - value: deviceClass, - label: - this.hass!.localize( - `component.binary_sensor.entity_component.${deviceClass}.name` - ) || deviceClass, - }) - ); - options.sort((a, b) => - caseInsensitiveStringCompare( - a.label, - b.label, - this.hass!.locale.language - ) - ); + } - return options; - } + private _buildBinaryOptions = memoizeOne( + (possibleClasses: string[], currentClasses: string[]): SelectOption[] => + this._buildOptions("binary_sensor", possibleClasses, currentClasses) ); + private _buildSensorOptions = memoizeOne( + (possibleClasses: string[], currentClasses: string[]): SelectOption[] => + this._buildOptions("sensor", possibleClasses, currentClasses) + ); + + private _buildOptions( + domain: "sensor" | "binary_sensor", + possibleClasses: string[], + currentClasses: string[] + ): SelectOption[] { + const options = [...new Set([...possibleClasses, ...currentClasses])].map( + (deviceClass) => ({ + value: deviceClass, + label: + this.hass!.localize( + `component.${domain}.entity_component.${deviceClass}.name` + ) || deviceClass, + }) + ); + options.sort((a, b) => + caseInsensitiveStringCompare(a.label, b.label, this.hass!.locale.language) + ); + + return options; + } + public setConfig(config: AreaCardConfig): void { assert(config, cardConfigStruct); this._config = config; } + protected async updated() { + if (this.hass && !this._numericDeviceClasses) { + const { numeric_device_classes: sensorNumericDeviceClasses } = + await getSensorNumericDeviceClasses(this.hass); + this._numericDeviceClasses = sensorNumericDeviceClasses; + } + } + protected render() { if (!this.hass || !this._config) { return nothing; } - const possibleClasses = this._binaryClassesForArea(this._config.area || ""); - const selectOptions = this._buildOptions( - possibleClasses, + const possibleBinaryClasses = this._binaryClassesForArea( + this._config.area || "" + ); + const possibleSensorClasses = this._sensorClassesForArea( + this._config.area || "", + this._numericDeviceClasses + ); + const binarySelectOptions = this._buildBinaryOptions( + possibleBinaryClasses, this._config.alert_classes || DEVICE_CLASSES.binary_sensor ); + const sensorSelectOptions = this._buildSensorOptions( + possibleSensorClasses, + this._config.sensor_classes || DEVICE_CLASSES.sensor + ); const schema = this._schema( this._config.show_camera || false, - selectOptions + binarySelectOptions, + sensorSelectOptions ); const data = { camera_view: "auto", alert_classes: DEVICE_CLASSES.binary_sensor, + sensor_classes: DEVICE_CLASSES.sensor, ...this._config, }; @@ -201,10 +267,6 @@ export class HuiAreaCardEditor return this.hass!.localize( "ui.panel.lovelace.editor.card.generic.camera_view" ); - case "alert_classes": - return this.hass!.localize( - "ui.panel.lovelace.editor.card.area.alert_classes" - ); } return this.hass!.localize( `ui.panel.lovelace.editor.card.area.${schema.name}` diff --git a/src/translations/en.json b/src/translations/en.json index c7254e73c9e2..df0409ca76a5 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -5133,6 +5133,7 @@ "area": { "name": "Area", "alert_classes": "Alert Classes", + "sensor_classes": "Sensor Classes", "description": "The Area card automatically displays entities of a specific area.", "show_camera": "Show camera feed instead of area picture" }, From 83c5408f8f0d1552105ee351e323a13fd2e1714c Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:40:58 -0800 Subject: [PATCH 166/361] Minor form localizations (#19434) * Minor form localizations * missing imports --- src/auth/ha-auth-form-string.ts | 2 +- src/components/ha-form/ha-form-float.ts | 7 ++++++- src/components/ha-form/ha-form-integer.ts | 7 ++++++- src/components/ha-form/ha-form-string.ts | 4 +++- src/translations/en.json | 1 + 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/auth/ha-auth-form-string.ts b/src/auth/ha-auth-form-string.ts index a586f8cf4ed0..da47353aa628 100644 --- a/src/auth/ha-auth-form-string.ts +++ b/src/auth/ha-auth-form-string.ts @@ -59,7 +59,7 @@ export class HaAuthFormString extends HaFormString { html`
    ` : this.schema.description?.suffix } - .validationMessage=${this.schema.required ? "Required" : undefined} + .validationMessage=${this.schema.required ? this.localize?.("ui.panel.page-authorize.form.error_required") : undefined} @input=${this._valueChanged} @change=${this._valueChanged} > diff --git a/src/components/ha-form/ha-form-float.ts b/src/components/ha-form/ha-form-float.ts index 2ed59db42801..cfee72ebe19c 100644 --- a/src/components/ha-form/ha-form-float.ts +++ b/src/components/ha-form/ha-form-float.ts @@ -4,9 +4,12 @@ import { fireEvent } from "../../common/dom/fire_event"; import type { HaTextField } from "../ha-textfield"; import "../ha-textfield"; import { HaFormElement, HaFormFloatData, HaFormFloatSchema } from "./types"; +import { LocalizeFunc } from "../../common/translations/localize"; @customElement("ha-form-float") export class HaFormFloat extends LitElement implements HaFormElement { + @property({ attribute: false }) public localize?: LocalizeFunc; + @property({ attribute: false }) public schema!: HaFormFloatSchema; @property({ attribute: false }) public data!: HaFormFloatData; @@ -38,7 +41,9 @@ export class HaFormFloat extends LitElement implements HaFormElement { .required=${this.schema.required} .autoValidate=${this.schema.required} .suffix=${this.schema.description?.suffix} - .validationMessage=${this.schema.required ? "Required" : undefined} + .validationMessage=${this.schema.required + ? this.localize?.("ui.common.error_required") + : undefined} @input=${this._valueChanged} > `; diff --git a/src/components/ha-form/ha-form-integer.ts b/src/components/ha-form/ha-form-integer.ts index 1b311769dbc4..2ce103b6bdd9 100644 --- a/src/components/ha-form/ha-form-integer.ts +++ b/src/components/ha-form/ha-form-integer.ts @@ -12,9 +12,12 @@ import { HaCheckbox } from "../ha-checkbox"; import "../ha-slider"; import { HaTextField } from "../ha-textfield"; import { HaFormElement, HaFormIntegerData, HaFormIntegerSchema } from "./types"; +import { LocalizeFunc } from "../../common/translations/localize"; @customElement("ha-form-integer") export class HaFormInteger extends LitElement implements HaFormElement { + @property({ attribute: false }) public localize?: LocalizeFunc; + @property({ attribute: false }) public schema!: HaFormIntegerSchema; @property({ attribute: false }) public data?: HaFormIntegerData; @@ -85,7 +88,9 @@ export class HaFormInteger extends LitElement implements HaFormElement { .required=${this.schema.required} .autoValidate=${this.schema.required} .suffix=${this.schema.description?.suffix} - .validationMessage=${this.schema.required ? "Required" : undefined} + .validationMessage=${this.schema.required + ? this.localize?.("ui.common.error_required") + : undefined} @input=${this._valueChanged} > `; diff --git a/src/components/ha-form/ha-form-string.ts b/src/components/ha-form/ha-form-string.ts index 83b4c69f39bb..a0a1757b801d 100644 --- a/src/components/ha-form/ha-form-string.ts +++ b/src/components/ha-form/ha-form-string.ts @@ -70,7 +70,9 @@ export class HaFormString extends LitElement implements HaFormElement { ? // reserve some space for the icon. html`
    ` : this.schema.description?.suffix} - .validationMessage=${this.schema.required ? "Required" : undefined} + .validationMessage=${this.schema.required + ? this.localize?.("ui.common.error_required") + : undefined} @input=${this._valueChanged} @change=${this._valueChanged} > diff --git a/src/translations/en.json b/src/translations/en.json index df0409ca76a5..acd757020cef 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -5894,6 +5894,7 @@ "previous": "Previous", "start_over": "Start over", "error": "Error: {error}", + "error_required": "[%key:ui::common::error_required%]", "hide_password": "Hide password", "show_password": "Show password", "providers": { From 8f43caee2e73dde3165b52a13a90b64424caa9db Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 17:57:31 -0500 Subject: [PATCH 167/361] Update dependency @types/luxon to v3.4.1 (#19438) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 62de53757f26..27d46263b1e7 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "@types/js-yaml": "4.0.9", "@types/leaflet": "1.9.8", "@types/leaflet-draw": "1.0.11", - "@types/luxon": "3.4.0", + "@types/luxon": "3.4.1", "@types/mocha": "10.0.6", "@types/qrcode": "1.5.5", "@types/serve-handler": "6.1.4", diff --git a/yarn.lock b/yarn.lock index 4c1239e49ad0..f5b253c30386 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4270,10 +4270,10 @@ __metadata: languageName: node linkType: hard -"@types/luxon@npm:3.4.0": - version: 3.4.0 - resolution: "@types/luxon@npm:3.4.0" - checksum: cafe745e81765e71230a42520caf77d69556e22d50a464dcebd3b7da3989ab9c137de54dbfef60639ea4274326a57b762120c0088d3fb093c25f1ca752146c64 +"@types/luxon@npm:3.4.1": + version: 3.4.1 + resolution: "@types/luxon@npm:3.4.1" + checksum: dc133d28dee98fd7944e81fbde8df4fcdd7b602139259b5566b556a09da296a6c57e02899b0068470465d5b3798f551edafe0a6c8fb89fcd327d799ff7d37c92 languageName: node linkType: hard @@ -9563,7 +9563,7 @@ __metadata: "@types/js-yaml": "npm:4.0.9" "@types/leaflet": "npm:1.9.8" "@types/leaflet-draw": "npm:1.0.11" - "@types/luxon": "npm:3.4.0" + "@types/luxon": "npm:3.4.1" "@types/mocha": "npm:10.0.6" "@types/qrcode": "npm:1.5.5" "@types/serve-handler": "npm:6.1.4" From 4046534fa8f3309842ac06637968cdb71e50b661 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Wed, 17 Jan 2024 17:58:32 -0500 Subject: [PATCH 168/361] Compress static HTML/XML (#19437) --- build-scripts/gulp/compress.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-scripts/gulp/compress.js b/build-scripts/gulp/compress.js index b811c23bea6a..aa1567b72111 100644 --- a/build-scripts/gulp/compress.js +++ b/build-scripts/gulp/compress.js @@ -8,7 +8,10 @@ const zopfliOptions = { threshold: 150 }; const compressDist = (rootDir) => gulp - .src([`${rootDir}/**/*.{js,json,css,svg}`]) + .src([ + `${rootDir}/**/*.{js,json,css,svg,xml}`, + `${rootDir}/{authorize,onboarding}.html`, + ]) .pipe(zopfli(zopfliOptions)) .pipe(gulp.dest(rootDir)); From 7398c6ab3e658cbdde14d53291e557ca1e7868c9 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 18 Jan 2024 14:26:17 +0100 Subject: [PATCH 169/361] Automation nested drag and drop (#19338) * Add nested drag and drop for actions * Add nested drag and drop for triggers, conditions and options * Update src/panels/config/automation/action/types/ha-automation-action-choose.ts Co-authored-by: Bram Kragten * Move object at the root level * Add support for choose option * Fix undefined container (e.g else action) * Add common nested array move function * Move item at root level for manual automation * Fix array move * Don't fallback on body * migrate blueprint and script * Add drag and drop to service control * Use context for reorder mode * Rename reorder mode functions * Fix hide menu props * Fix drag and drop for choose action --------- Co-authored-by: Bram Kragten --- src/common/util/array-move.ts | 53 +++++++++++ .../ha-selector/ha-selector-action.ts | 3 +- .../ha-selector/ha-selector-condition.ts | 3 +- .../ha-selector/ha-selector-trigger.ts | 3 +- src/components/ha-service-control.ts | 68 +++++++++++++- src/components/ha-sortable.ts | 38 ++++++-- src/data/selector.ts | 11 +-- .../action/ha-automation-action-row.ts | 30 +++++-- .../automation/action/ha-automation-action.ts | 85 +++++++++--------- .../types/ha-automation-action-choose.ts | 61 +++++++++---- .../action/types/ha-automation-action-if.ts | 15 ++-- .../types/ha-automation-action-parallel.ts | 9 +- .../types/ha-automation-action-repeat.ts | 40 +++++---- .../ha-automation-action-wait_for_trigger.ts | 7 +- .../automation/blueprint-automation-editor.ts | 89 ++++++++++++++++-- .../ha-automation-condition-editor.ts | 6 +- .../condition/ha-automation-condition-row.ts | 31 +++++-- .../condition/ha-automation-condition.ts | 84 ++++++++--------- .../types/ha-automation-condition-logical.ts | 7 +- .../automation/manual-automation-editor.ts | 64 ++++++++++++- .../trigger/ha-automation-trigger-row.ts | 38 +++++++- .../trigger/ha-automation-trigger.ts | 82 ++++++++--------- .../config/script/blueprint-script-editor.ts | 90 +++++++++++++++++-- .../config/script/manual-script-editor.ts | 57 +++++++++++- src/state/reorder-mode-mixin.ts | 40 +++++++++ src/translations/en.json | 1 + src/types.ts | 2 + 27 files changed, 770 insertions(+), 247 deletions(-) create mode 100644 src/common/util/array-move.ts create mode 100644 src/state/reorder-mode-mixin.ts diff --git a/src/common/util/array-move.ts b/src/common/util/array-move.ts new file mode 100644 index 000000000000..36a152a01917 --- /dev/null +++ b/src/common/util/array-move.ts @@ -0,0 +1,53 @@ +import { ItemPath } from "../../types"; + +function findNestedItem( + obj: any, + path: ItemPath, + createNonExistingPath?: boolean +): any { + return path.reduce((ac, p, index, array) => { + if (ac === undefined) return undefined; + if (!ac[p] && createNonExistingPath) { + const nextP = array[index + 1]; + // Create object or array depending on next path + if (nextP === undefined || typeof nextP === "number") { + ac[p] = []; + } else { + ac[p] = {}; + } + } + return ac[p]; + }, obj); +} + +export function nestedArrayMove( + obj: T | T[], + oldIndex: number, + newIndex: number, + oldPath?: ItemPath, + newPath?: ItemPath +): T | T[] { + const newObj = Array.isArray(obj) ? [...obj] : { ...obj }; + const from = oldPath ? findNestedItem(newObj, oldPath) : newObj; + const to = newPath ? findNestedItem(newObj, newPath, true) : newObj; + + if (!Array.isArray(from) || !Array.isArray(to)) { + return obj; + } + + const item = from.splice(oldIndex, 1)[0]; + to.splice(newIndex, 0, item); + + return newObj; +} + +export function arrayMove( + array: T[], + oldIndex: number, + newIndex: number +): T[] { + const newArray = [...array]; + const [item] = newArray.splice(oldIndex, 1); + newArray.splice(newIndex, 0, item); + return newArray; +} diff --git a/src/components/ha-selector/ha-selector-action.ts b/src/components/ha-selector/ha-selector-action.ts index 5850c912f322..c1edf4d2662d 100644 --- a/src/components/ha-selector/ha-selector-action.ts +++ b/src/components/ha-selector/ha-selector-action.ts @@ -24,8 +24,7 @@ export class HaActionSelector extends LitElement { .disabled=${this.disabled} .actions=${this.value || []} .hass=${this.hass} - .nested=${this.selector.action?.nested} - .reOrderMode=${this.selector.action?.reorder_mode} + .path=${this.selector.action?.path} > `; } diff --git a/src/components/ha-selector/ha-selector-condition.ts b/src/components/ha-selector/ha-selector-condition.ts index 17461bb973ea..649986deef52 100644 --- a/src/components/ha-selector/ha-selector-condition.ts +++ b/src/components/ha-selector/ha-selector-condition.ts @@ -24,8 +24,7 @@ export class HaConditionSelector extends LitElement { .disabled=${this.disabled} .conditions=${this.value || []} .hass=${this.hass} - .nested=${this.selector.condition?.nested} - .reOrderMode=${this.selector.condition?.reorder_mode} + .path=${this.selector.condition?.path} > `; } diff --git a/src/components/ha-selector/ha-selector-trigger.ts b/src/components/ha-selector/ha-selector-trigger.ts index 7a31fb8e7ada..541aac3b4495 100644 --- a/src/components/ha-selector/ha-selector-trigger.ts +++ b/src/components/ha-selector/ha-selector-trigger.ts @@ -24,8 +24,7 @@ export class HaTriggerSelector extends LitElement { .disabled=${this.disabled} .triggers=${this.value || []} .hass=${this.hass} - .nested=${this.selector.trigger?.nested} - .reOrderMode=${this.selector.trigger?.reorder_mode} + .path=${this.selector.trigger?.path} > `; } diff --git a/src/components/ha-service-control.ts b/src/components/ha-service-control.ts index 119418355c64..d3c1d0ab1703 100644 --- a/src/components/ha-service-control.ts +++ b/src/components/ha-service-control.ts @@ -40,6 +40,8 @@ import "./ha-service-picker"; import "./ha-settings-row"; import "./ha-yaml-editor"; import type { HaYamlEditor } from "./ha-yaml-editor"; +import { nestedArrayMove } from "../common/util/array-move"; +import { ReorderModeMixin } from "../state/reorder-mode-mixin"; const attributeFilter = (values: any[], attribute: any) => { if (typeof attribute === "object") { @@ -75,7 +77,7 @@ interface ExtHassService extends Omit { } @customElement("ha-service-control") -export class HaServiceControl extends LitElement { +export class HaServiceControl extends ReorderModeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; @property({ attribute: false }) public value?: { @@ -439,6 +441,7 @@ export class HaServiceControl extends LitElement { allow-custom-entity >` : ""} + ${this._renderReorderModeAlert()} ${shouldRenderServiceDataYaml ? html`` : filteredFields?.map((dataField) => { + const selector = dataField?.selector ?? { text: undefined }; + const type = Object.keys(selector)[0]; + const enhancedSelector = [ + "action", + "condition", + "trigger", + ].includes(type) + ? { + [type]: { + ...selector[type], + path: [dataField.key], + }, + } + : selector; + const showOptional = showOptionalToggle(dataField); + return dataField.selector && (!dataField.advanced || this.showAdvanced || @@ -488,7 +507,7 @@ export class HaServiceControl extends LitElement { (!this._value?.data || this._value.data[dataField.key] === undefined))} .hass=${this.hass} - .selector=${dataField.selector} + .selector=${enhancedSelector} .key=${dataField.key} @value-changed=${this._serviceDataChanged} .value=${this._value?.data @@ -496,12 +515,41 @@ export class HaServiceControl extends LitElement { : undefined} .placeholder=${dataField.default} .localizeValue=${this._localizeValueCallback} + @item-moved=${this._itemMoved} > ` : ""; })}`; } + private _renderReorderModeAlert() { + if (!this._reorderMode.active) { + return nothing; + } + return html` + + ${this.hass.localize( + "ui.panel.config.automation.editor.re_order_mode.description_all" + )} + + ${this.hass.localize( + "ui.panel.config.automation.editor.re_order_mode.exit" + )} + + + `; + } + + private async _exitReOrderMode() { + this._reorderMode.exit(); + } + private _localizeValueCallback = (key: string) => { if (!this._value?.service) { return ""; @@ -697,6 +745,22 @@ export class HaServiceControl extends LitElement { }); } + private _itemMoved(ev) { + ev.stopPropagation(); + const { oldIndex, newIndex, oldPath, newPath } = ev.detail; + + const data = this.value?.data ?? {}; + + const newData = nestedArrayMove(data, oldIndex, newIndex, oldPath, newPath); + + fireEvent(this, "value-changed", { + value: { + ...this.value, + data: newData, + }, + }); + } + private _dataChanged(ev: CustomEvent) { ev.stopPropagation(); if (!ev.detail.isValid) { diff --git a/src/components/ha-sortable.ts b/src/components/ha-sortable.ts index aed068a83af7..32c9cffe711f 100644 --- a/src/components/ha-sortable.ts +++ b/src/components/ha-sortable.ts @@ -4,12 +4,15 @@ import { customElement, property } from "lit/decorators"; import type { SortableEvent } from "sortablejs"; import { fireEvent } from "../common/dom/fire_event"; import type { SortableInstance } from "../resources/sortable"; +import { ItemPath } from "../types"; declare global { interface HASSDomEvents { "item-moved": { oldIndex: number; newIndex: number; + oldPath?: ItemPath; + newPath?: ItemPath; }; } } @@ -21,6 +24,9 @@ export class HaSortable extends LitElement { @property({ type: Boolean }) public disabled = false; + @property({ type: Boolean }) + public path?: ItemPath; + @property({ type: Boolean, attribute: "no-style" }) public noStyle: boolean = false; @@ -30,6 +36,9 @@ export class HaSortable extends LitElement { @property({ type: String, attribute: "handle-selector" }) public handleSelector?: string; + @property({ type: String, attribute: "group" }) + public group?: string; + protected updated(changedProperties: PropertyValues) { if (changedProperties.has("disabled")) { if (this.disabled) { @@ -100,6 +109,7 @@ export class HaSortable extends LitElement { const options: SortableInstance.Options = { animation: 150, + swapThreshold: 0.75, onChoose: this._handleChoose, onEnd: this._handleEnd, }; @@ -110,27 +120,41 @@ export class HaSortable extends LitElement { if (this.handleSelector) { options.handle = this.handleSelector; } + if (this.draggableSelector) { + options.draggable = this.draggableSelector; + } + if (this.group) { + options.group = this.group; + } + this._sortable = new Sortable(container, options); } - private _handleEnd = (evt: SortableEvent) => { + private _handleEnd = async (evt: SortableEvent) => { // put back in original location if ((evt.item as any).placeholder) { (evt.item as any).placeholder.replaceWith(evt.item); delete (evt.item as any).placeholder; } - // if item was not moved, ignore + + const oldIndex = evt.oldIndex; + const oldPath = (evt.from.parentElement as HaSortable).path; + const newIndex = evt.newIndex; + const newPath = (evt.to.parentElement as HaSortable).path; + if ( - evt.oldIndex === undefined || - evt.newIndex === undefined || - evt.oldIndex === evt.newIndex + oldIndex === undefined || + newIndex === undefined || + (oldIndex === newIndex && oldPath?.join(".") === newPath?.join(".")) ) { return; } fireEvent(this, "item-moved", { - oldIndex: evt.oldIndex!, - newIndex: evt.newIndex!, + oldIndex, + newIndex, + oldPath, + newPath, }); }; diff --git a/src/data/selector.ts b/src/data/selector.ts index cddf581020dc..3362e638ff17 100644 --- a/src/data/selector.ts +++ b/src/data/selector.ts @@ -3,7 +3,7 @@ import { ensureArray } from "../common/array/ensure-array"; import { computeStateDomain } from "../common/entity/compute_state_domain"; import { supportsFeature } from "../common/entity/supports-feature"; import { UiAction } from "../panels/lovelace/components/hui-action-editor"; -import { HomeAssistant } from "../types"; +import { HomeAssistant, ItemPath } from "../types"; import { DeviceRegistryEntry, getDeviceIntegrationLookup, @@ -59,8 +59,7 @@ export type Selector = export interface ActionSelector { action: { - reorder_mode?: boolean; - nested?: boolean; + path?: ItemPath; } | null; } @@ -113,8 +112,7 @@ export interface ColorTempSelector { export interface ConditionSelector { condition: { - reorder_mode?: boolean; - nested?: boolean; + path?: ItemPath; } | null; } @@ -392,8 +390,7 @@ export interface TimeSelector { export interface TriggerSelector { trigger: { - reorder_mode?: boolean; - nested?: boolean; + path?: ItemPath; } | null; } diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts index 0e58c0e8b2b5..75c68f616ccb 100644 --- a/src/panels/config/automation/action/ha-automation-action-row.ts +++ b/src/panels/config/automation/action/ha-automation-action-row.ts @@ -57,7 +57,11 @@ import { showPromptDialog, } from "../../../../dialogs/generic/show-dialog-box"; import { haStyle } from "../../../../resources/styles"; -import type { HomeAssistant } from "../../../../types"; +import { + ReorderMode, + reorderModeContext, +} from "../../../../state/reorder-mode-mixin"; +import type { HomeAssistant, ItemPath } from "../../../../types"; import { showToast } from "../../../../util/toast"; import "./types/ha-automation-action-activate_scene"; import "./types/ha-automation-action-choose"; @@ -129,7 +133,7 @@ export default class HaAutomationActionRow extends LitElement { @property({ type: Boolean }) public hideMenu = false; - @property({ type: Boolean }) public reOrderMode = false; + @property() public path?: ItemPath; @storage({ key: "automationClipboard", @@ -143,6 +147,10 @@ export default class HaAutomationActionRow extends LitElement { @consume({ context: fullEntitiesContext, subscribe: true }) _entityReg!: EntityRegistryEntry[]; + @state() + @consume({ context: reorderModeContext, subscribe: true }) + private _reorderMode?: ReorderMode; + @state() private _warnings?: string[]; @state() private _uiModeAvailable = true; @@ -176,9 +184,13 @@ export default class HaAutomationActionRow extends LitElement { } protected render() { + if (!this.action) return nothing; + const type = getType(this.action); const yamlMode = this._yamlMode; + const noReorderModeAvailable = this._reorderMode === undefined; + return html` ${this.action.enabled === false @@ -247,7 +259,12 @@ export default class HaAutomationActionRow extends LitElement { .path=${mdiRenameBox} > - + ${this.hass.localize( "ui.panel.config.automation.editor.actions.re_order" )} @@ -405,8 +422,8 @@ export default class HaAutomationActionRow extends LitElement { hass: this.hass, action: this.action, narrow: this.narrow, - reOrderMode: this.reOrderMode, disabled: this.disabled, + path: this.path, })}
    `} @@ -435,7 +452,7 @@ export default class HaAutomationActionRow extends LitElement { await this._renameAction(); break; case 2: - fireEvent(this, "re-order"); + this._reorderMode?.enter(); break; case 3: fireEvent(this, "duplicate"); @@ -640,6 +657,9 @@ export default class HaAutomationActionRow extends LitElement { mwc-list-item[disabled] { --mdc-theme-text-primary-on-background: var(--disabled-text-color); } + mwc-list-item.hidden { + display: none; + } .warning ul { margin: 4px 0; } diff --git a/src/panels/config/automation/action/ha-automation-action.ts b/src/panels/config/automation/action/ha-automation-action.ts index ba1208930788..6a9dec5eccc1 100644 --- a/src/panels/config/automation/action/ha-automation-action.ts +++ b/src/panels/config/automation/action/ha-automation-action.ts @@ -1,17 +1,23 @@ +import { consume } from "@lit-labs/context"; import { mdiArrowDown, mdiArrowUp, mdiDrag, mdiPlus } from "@mdi/js"; import deepClone from "deep-clone-simple"; import { CSSResultGroup, LitElement, PropertyValues, css, html } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { repeat } from "lit/directives/repeat"; import { storage } from "../../../../common/decorators/storage"; import { fireEvent } from "../../../../common/dom/fire_event"; +import { nestedArrayMove } from "../../../../common/util/array-move"; import "../../../../components/ha-button"; -import "../../../../components/ha-svg-icon"; import "../../../../components/ha-sortable"; +import "../../../../components/ha-svg-icon"; import { getService, isService } from "../../../../data/action"; import type { AutomationClipboard } from "../../../../data/automation"; import { Action } from "../../../../data/script"; -import { HomeAssistant } from "../../../../types"; +import { + ReorderMode, + reorderModeContext, +} from "../../../../state/reorder-mode-mixin"; +import { HomeAssistant, ItemPath } from "../../../../types"; import { PASTE_VALUE, showAddAutomationElementDialog, @@ -27,11 +33,13 @@ export default class HaAutomationAction extends LitElement { @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) public nested = false; + @property() public path?: ItemPath; @property() public actions!: Action[]; - @property({ type: Boolean }) public reOrderMode = false; + @state() + @consume({ context: reorderModeContext, subscribe: true }) + private _reorderMode?: ReorderMode; @storage({ key: "automationClipboard", @@ -45,31 +53,18 @@ export default class HaAutomationAction extends LitElement { private _actionKeys = new WeakMap(); + private get nested() { + return this.path !== undefined; + } + protected render() { return html` - ${this.reOrderMode && !this.nested - ? html` - - ${this.hass.localize( - "ui.panel.config.automation.editor.re_order_mode.description_actions" - )} - - ${this.hass.localize( - "ui.panel.config.automation.editor.re_order_mode.exit" - )} - - - ` - : null}
    ${repeat( @@ -77,18 +72,17 @@ export default class HaAutomationAction extends LitElement { (action) => this._getKey(action), (action, idx) => html` - ${this.reOrderMode + ${this._reorderMode?.active ? html` ev.preventDefault(); @@ -47,9 +52,9 @@ export class HaChooseAction extends LitElement implements ActionElement { @property({ type: Boolean }) public disabled = false; - @property() public action!: ChooseAction; + @property({ attribute: false }) public path?: ItemPath; - @property({ type: Boolean }) public reOrderMode = false; + @property() public action!: ChooseAction; @state() private _showDefault = false; @@ -59,6 +64,10 @@ export class HaChooseAction extends LitElement implements ActionElement { @consume({ context: fullEntitiesContext, subscribe: true }) _entityReg!: EntityRegistryEntry[]; + @state() + @consume({ context: reorderModeContext, subscribe: true }) + private _reorderMode?: ReorderMode; + private _expandLast = false; public static get defaultConfig() { @@ -95,11 +104,14 @@ export class HaChooseAction extends LitElement implements ActionElement { protected render() { const action = this.action; + const noReorderModeAvailable = this._reorderMode === undefined; + return html`
    ${repeat( @@ -123,7 +135,7 @@ export class HaChooseAction extends LitElement implements ActionElement { ? "" : this._getDescription(option))} - ${this.reOrderMode + ${this._reorderMode?.active ? html` ${this.hass.localize( "ui.panel.config.automation.editor.actions.re_order" @@ -224,11 +240,15 @@ export class HaChooseAction extends LitElement implements ActionElement { )}: ( option.conditions )} - .reOrderMode=${this.reOrderMode} .disabled=${this.disabled} .hass=${this.hass} .idx=${idx} @@ -240,9 +260,13 @@ export class HaChooseAction extends LitElement implements ActionElement { )}: [ { @@ -60,20 +63,22 @@ export class HaRepeatAction extends LitElement implements ActionElement { name: "count", required: true, selector: template - ? ({ template: {} } as const) - : ({ number: { mode: "box", min: 1 } } as const), + ? { template: {} } + : { number: { mode: "box", min: 1 } }, }, - ] as const) + ] as const satisfies readonly HaFormSchema[]) : []), ...(type === "until" || type === "while" ? ([ { name: type, selector: { - condition: { nested: true, reorder_mode: reOrderMode }, + condition: { + path: [...(path ?? []), "repeat", type], + }, }, }, - ] as const) + ] as const satisfies readonly HaFormSchema[]) : []), ...(type === "for_each" ? ([ @@ -82,13 +87,17 @@ export class HaRepeatAction extends LitElement implements ActionElement { required: true, selector: { object: {} }, }, - ] as const) + ] as const satisfies readonly HaFormSchema[]) : []), { name: "sequence", - selector: { action: { nested: true, reorder_mode: reOrderMode } }, + selector: { + action: { + path: [...(path ?? []), "repeat", "sequence"], + }, + }, }, - ] as const + ] as const satisfies readonly HaFormSchema[] ); protected render() { @@ -97,11 +106,12 @@ export class HaRepeatAction extends LitElement implements ActionElement { const schema = this._schema( this.hass.localize, type ?? "count", - this.reOrderMode, "count" in action && typeof action.count === "string" ? isTemplate(action.count) - : false + : false, + this.path ); + const data = { ...action, type }; return html` `; diff --git a/src/panels/config/automation/blueprint-automation-editor.ts b/src/panels/config/automation/blueprint-automation-editor.ts index c2eedf51361a..06bf39733434 100644 --- a/src/panels/config/automation/blueprint-automation-editor.ts +++ b/src/panels/config/automation/blueprint-automation-editor.ts @@ -1,15 +1,16 @@ import "@material/mwc-button/mwc-button"; import { HassEntity } from "home-assistant-js-websocket"; -import { css, CSSResultGroup, html, LitElement } from "lit"; +import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; +import { nestedArrayMove } from "../../../common/util/array-move"; +import "../../../components/ha-alert"; import "../../../components/ha-blueprint-picker"; import "../../../components/ha-card"; import "../../../components/ha-circular-progress"; import "../../../components/ha-markdown"; import "../../../components/ha-selector/ha-selector"; import "../../../components/ha-settings-row"; -import "../../../components/ha-alert"; import { BlueprintAutomationConfig } from "../../../data/automation"; import { BlueprintOrError, @@ -17,11 +18,12 @@ import { fetchBlueprints, } from "../../../data/blueprint"; import { haStyle } from "../../../resources/styles"; +import { ReorderModeMixin } from "../../../state/reorder-mode-mixin"; import { HomeAssistant } from "../../../types"; import "../ha-config-section"; @customElement("blueprint-automation-editor") -export class HaBlueprintAutomationEditor extends LitElement { +export class HaBlueprintAutomationEditor extends ReorderModeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) public isWide = false; @@ -76,6 +78,7 @@ export class HaBlueprintAutomationEditor extends LitElement { ${this.config.description ? html`

    ${this.config.description}

    ` : ""} + ${this._renderReorderModeAlert()} - html` + ([key, value]) => { + const selector = value?.selector ?? { text: undefined }; + const type = Object.keys(selector)[0]; + const enhancedSelector = [ + "action", + "condition", + "trigger", + ].includes(type) + ? { + [type]: { + ...selector[type], + path: [key], + }, + } + : selector; + + return html` ${value?.name || key} ${html``} - ` + `; + } ) : html`

    ${this.hass.localize( @@ -153,6 +173,34 @@ export class HaBlueprintAutomationEditor extends LitElement { `; } + private _renderReorderModeAlert() { + if (!this._reorderMode.active) { + return nothing; + } + return html` + + ${this.hass.localize( + "ui.panel.config.automation.editor.re_order_mode.description_all" + )} + + ${this.hass.localize( + "ui.panel.config.automation.editor.re_order_mode.exit" + )} + + + `; + } + + private async _exitReOrderMode() { + this._reorderMode.exit(); + } + private async _getBlueprints() { this._blueprints = await fetchBlueprints(this.hass, "automation"); } @@ -197,6 +245,29 @@ export class HaBlueprintAutomationEditor extends LitElement { }); } + private _itemMoved(ev) { + ev.stopPropagation(); + const { oldIndex, newIndex, oldPath, newPath } = ev.detail; + + const input = nestedArrayMove( + this.config.use_blueprint.input, + oldIndex, + newIndex, + oldPath, + newPath + ); + + fireEvent(this, "value-changed", { + value: { + ...this.config, + use_blueprint: { + ...this.config.use_blueprint, + input, + }, + }, + }); + } + private async _enable(): Promise { if (!this.hass || !this.stateObj) { return; @@ -259,6 +330,10 @@ export class HaBlueprintAutomationEditor extends LitElement { margin-bottom: 16px; display: block; } + ha-alert.re-order { + border-radius: var(--ha-card-border-radius, 12px); + overflow: hidden; + } `, ]; } diff --git a/src/panels/config/automation/condition/ha-automation-condition-editor.ts b/src/panels/config/automation/condition/ha-automation-condition-editor.ts index 81b4eec95b74..3a838f03a046 100644 --- a/src/panels/config/automation/condition/ha-automation-condition-editor.ts +++ b/src/panels/config/automation/condition/ha-automation-condition-editor.ts @@ -7,7 +7,7 @@ import "../../../../components/ha-yaml-editor"; import type { Condition } from "../../../../data/automation"; import { expandConditionWithShorthand } from "../../../../data/automation"; import { haStyle } from "../../../../resources/styles"; -import type { HomeAssistant } from "../../../../types"; +import type { HomeAssistant, ItemPath } from "../../../../types"; import "./types/ha-automation-condition-and"; import "./types/ha-automation-condition-device"; import "./types/ha-automation-condition-not"; @@ -30,7 +30,7 @@ export default class HaAutomationConditionEditor extends LitElement { @property({ type: Boolean }) public yamlMode = false; - @property({ type: Boolean }) public reOrderMode = false; + @property() public path?: ItemPath; private _processedCondition = memoizeOne((condition) => expandConditionWithShorthand(condition) @@ -67,8 +67,8 @@ export default class HaAutomationConditionEditor extends LitElement { { hass: this.hass, condition: condition, - reOrderMode: this.reOrderMode, disabled: this.disabled, + path: this.path, } )}

    diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts index 1b51a9d278c1..a1a07c640f85 100644 --- a/src/panels/config/automation/condition/ha-automation-condition-row.ts +++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts @@ -39,8 +39,12 @@ import { showPromptDialog, } from "../../../../dialogs/generic/show-dialog-box"; import { haStyle } from "../../../../resources/styles"; -import { HomeAssistant } from "../../../../types"; +import { HomeAssistant, ItemPath } from "../../../../types"; import "./ha-automation-condition-editor"; +import { + ReorderMode, + reorderModeContext, +} from "../../../../state/reorder-mode-mixin"; export interface ConditionElement extends LitElement { condition: Condition; @@ -81,10 +85,10 @@ export default class HaAutomationConditionRow extends LitElement { @property({ type: Boolean }) public hideMenu = false; - @property({ type: Boolean }) public reOrderMode = false; - @property({ type: Boolean }) public disabled = false; + @property() public path?: ItemPath; + @storage({ key: "automationClipboard", state: false, @@ -105,10 +109,17 @@ export default class HaAutomationConditionRow extends LitElement { @consume({ context: fullEntitiesContext, subscribe: true }) _entityReg!: EntityRegistryEntry[]; + @state() + @consume({ context: reorderModeContext, subscribe: true }) + private _reorderMode?: ReorderMode; + protected render() { if (!this.condition) { return nothing; } + + const noReorderModeAvailable = this._reorderMode === undefined; + return html` ${this.condition.enabled === false @@ -163,7 +174,12 @@ export default class HaAutomationConditionRow extends LitElement { > - + ${this.hass.localize( "ui.panel.config.automation.editor.conditions.re_order" )} @@ -297,7 +313,7 @@ export default class HaAutomationConditionRow extends LitElement { .disabled=${this.disabled} .hass=${this.hass} .condition=${this.condition} - .reOrderMode=${this.reOrderMode} + .path=${this.path} >
    @@ -344,7 +360,7 @@ export default class HaAutomationConditionRow extends LitElement { await this._renameCondition(); break; case 2: - fireEvent(this, "re-order"); + this._reorderMode?.enter(); break; case 3: fireEvent(this, "duplicate"); @@ -547,6 +563,9 @@ export default class HaAutomationConditionRow extends LitElement { mwc-list-item[disabled] { --mdc-theme-text-primary-on-background: var(--disabled-text-color); } + mwc-list-item.hidden { + display: none; + } .testing { position: absolute; top: 0px; diff --git a/src/panels/config/automation/condition/ha-automation-condition.ts b/src/panels/config/automation/condition/ha-automation-condition.ts index c240c2ae6cbc..e40906ceccfa 100644 --- a/src/panels/config/automation/condition/ha-automation-condition.ts +++ b/src/panels/config/automation/condition/ha-automation-condition.ts @@ -1,3 +1,4 @@ +import { consume } from "@lit-labs/context"; import { mdiArrowDown, mdiArrowUp, mdiDrag, mdiPlus } from "@mdi/js"; import deepClone from "deep-clone-simple"; import { @@ -8,10 +9,11 @@ import { html, nothing, } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { repeat } from "lit/directives/repeat"; import { storage } from "../../../../common/decorators/storage"; import { fireEvent } from "../../../../common/dom/fire_event"; +import { nestedArrayMove } from "../../../../common/util/array-move"; import "../../../../components/ha-button"; import "../../../../components/ha-button-menu"; import "../../../../components/ha-sortable"; @@ -20,7 +22,11 @@ import type { AutomationClipboard, Condition, } from "../../../../data/automation"; -import type { HomeAssistant } from "../../../../types"; +import { + ReorderMode, + reorderModeContext, +} from "../../../../state/reorder-mode-mixin"; +import type { HomeAssistant, ItemPath } from "../../../../types"; import { PASTE_VALUE, showAddAutomationElementDialog, @@ -36,9 +42,11 @@ export default class HaAutomationCondition extends LitElement { @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) public nested = false; + @property() public path?: ItemPath; - @property({ type: Boolean }) public reOrderMode = false; + @state() + @consume({ context: reorderModeContext, subscribe: true }) + private _reorderMode?: ReorderMode; @storage({ key: "automationClipboard", @@ -89,35 +97,21 @@ export default class HaAutomationCondition extends LitElement { } } + private get nested() { + return this.path !== undefined; + } + protected render() { if (!Array.isArray(this.conditions)) { return nothing; } return html` - ${this.reOrderMode && !this.nested - ? html` - - ${this.hass.localize( - "ui.panel.config.automation.editor.re_order_mode.description_conditions" - )} - - ${this.hass.localize( - "ui.panel.config.automation.editor.re_order_mode.exit" - )} - - - ` - : null} -
    ${repeat( @@ -125,19 +119,18 @@ export default class HaAutomationCondition extends LitElement { (condition) => this._getKey(condition), (cond, idx) => html` - ${this.reOrderMode + ${this._reorderMode?.active ? html` `; } diff --git a/src/panels/config/automation/manual-automation-editor.ts b/src/panels/config/automation/manual-automation-editor.ts index 9be779d27587..e8391ef9b4a5 100644 --- a/src/panels/config/automation/manual-automation-editor.ts +++ b/src/panels/config/automation/manual-automation-editor.ts @@ -5,6 +5,7 @@ import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { customElement, property } from "lit/decorators"; import { ensureArray } from "../../../common/array/ensure-array"; import { fireEvent } from "../../../common/dom/fire_event"; +import { nestedArrayMove } from "../../../common/util/array-move"; import "../../../components/ha-card"; import "../../../components/ha-icon-button"; import "../../../components/ha-markdown"; @@ -15,6 +16,7 @@ import { } from "../../../data/automation"; import { Action } from "../../../data/script"; import { haStyle } from "../../../resources/styles"; +import { ReorderModeMixin } from "../../../state/reorder-mode-mixin"; import type { HomeAssistant } from "../../../types"; import { documentationUrl } from "../../../util/documentation-url"; import "./action/ha-automation-action"; @@ -22,7 +24,7 @@ import "./condition/ha-automation-condition"; import "./trigger/ha-automation-trigger"; @customElement("manual-automation-editor") -export class HaManualAutomationEditor extends LitElement { +export class HaManualAutomationEditor extends ReorderModeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) public isWide!: boolean; @@ -44,7 +46,7 @@ export class HaManualAutomationEditor extends LitElement { ${this.hass.localize("ui.panel.config.automation.editor.migrate")} ` - : ""} + : nothing} ${this.stateObj?.state === "off" ? html` @@ -92,12 +94,15 @@ export class HaManualAutomationEditor extends LitElement { )}

    ` : nothing} + ${this._renderReorderModeAlert("triggers")} @@ -132,12 +137,15 @@ export class HaManualAutomationEditor extends LitElement { )}

    ` : nothing} + ${this._renderReorderModeAlert("conditions")} @@ -170,12 +178,15 @@ export class HaManualAutomationEditor extends LitElement { )}

    ` : nothing} + ${this._renderReorderModeAlert("actions")} + ${this.hass.localize( + `ui.panel.config.automation.editor.re_order_mode.description_${type}` + )} + + ${this.hass.localize( + "ui.panel.config.automation.editor.re_order_mode.exit" + )} + +     + `; + } + + private async _exitReOrderMode() { + this._reorderMode.exit(); + } + private _triggerChanged(ev: CustomEvent): void { ev.stopPropagation(); fireEvent(this, "value-changed", { @@ -207,6 +246,21 @@ export class HaManualAutomationEditor extends LitElement { }); } + private _itemMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex, oldPath, newPath } = ev.detail; + const updatedConfig = nestedArrayMove( + this.config, + oldIndex, + newIndex, + oldPath, + newPath + ); + fireEvent(this, "value-changed", { + value: updatedConfig, + }); + } + private async _enable(): Promise { if (!this.hass || !this.stateObj) { return; @@ -258,6 +312,12 @@ export class HaManualAutomationEditor extends LitElement { font-weight: normal; line-height: 0; } + ha-alert.re-order { + display: block; + margin-bottom: 16px; + border-radius: var(--ha-card-border-radius, 12px); + overflow: hidden; + } `, ]; } diff --git a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts index 5a4acb43c6c4..81bcd5a78672 100644 --- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts +++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts @@ -15,7 +15,14 @@ import { mdiStopCircleOutline, } from "@mdi/js"; import type { UnsubscribeFunc } from "home-assistant-js-websocket"; -import { CSSResultGroup, LitElement, PropertyValues, css, html } from "lit"; +import { + CSSResultGroup, + LitElement, + PropertyValues, + css, + html, + nothing, +} from "lit"; import { customElement, property, query, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { storage } from "../../../../common/decorators/storage"; @@ -44,7 +51,7 @@ import { showPromptDialog, } from "../../../../dialogs/generic/show-dialog-box"; import { haStyle } from "../../../../resources/styles"; -import type { HomeAssistant } from "../../../../types"; +import type { HomeAssistant, ItemPath } from "../../../../types"; import "./types/ha-automation-trigger-calendar"; import "./types/ha-automation-trigger-device"; import "./types/ha-automation-trigger-event"; @@ -62,6 +69,10 @@ import "./types/ha-automation-trigger-time"; import "./types/ha-automation-trigger-time_pattern"; import "./types/ha-automation-trigger-webhook"; import "./types/ha-automation-trigger-zone"; +import { + ReorderMode, + reorderModeContext, +} from "../../../../state/reorder-mode-mixin"; export interface TriggerElement extends LitElement { trigger: Trigger; @@ -101,6 +112,8 @@ export default class HaAutomationTriggerRow extends LitElement { @property({ type: Boolean }) public disabled = false; + @property() public path?: ItemPath; + @state() private _warnings?: string[]; @state() private _yamlMode = false; @@ -125,9 +138,17 @@ export default class HaAutomationTriggerRow extends LitElement { @consume({ context: fullEntitiesContext, subscribe: true }) _entityReg!: EntityRegistryEntry[]; + @state() + @consume({ context: reorderModeContext, subscribe: true }) + private _reorderMode?: ReorderMode; + private _triggerUnsub?: Promise; protected render() { + if (!this.trigger) return nothing; + + const noReorderModeAvailable = this._reorderMode === undefined; + const supported = customElements.get(`ha-automation-trigger-${this.trigger.platform}`) !== undefined; @@ -181,7 +202,12 @@ export default class HaAutomationTriggerRow extends LitElement { > - + ${this.hass.localize( "ui.panel.config.automation.editor.triggers.re_order" )} @@ -357,6 +383,7 @@ export default class HaAutomationTriggerRow extends LitElement { hass: this.hass, trigger: this.trigger, disabled: this.disabled, + path: this.path, } )}
    @@ -470,7 +497,7 @@ export default class HaAutomationTriggerRow extends LitElement { await this._renameTrigger(); break; case 1: - fireEvent(this, "re-order"); + this._reorderMode?.enter(); break; case 2: this._requestShowId = true; @@ -702,6 +729,9 @@ export default class HaAutomationTriggerRow extends LitElement { mwc-list-item[disabled] { --mdc-theme-text-primary-on-background: var(--disabled-text-color); } + mwc-list-item.hidden { + display: none; + } ha-textfield { display: block; margin-bottom: 24px; diff --git a/src/panels/config/automation/trigger/ha-automation-trigger.ts b/src/panels/config/automation/trigger/ha-automation-trigger.ts index 167a9ab2531a..b4a0119e212e 100644 --- a/src/panels/config/automation/trigger/ha-automation-trigger.ts +++ b/src/panels/config/automation/trigger/ha-automation-trigger.ts @@ -1,16 +1,22 @@ +import { consume } from "@lit-labs/context"; import { mdiArrowDown, mdiArrowUp, mdiDrag, mdiPlus } from "@mdi/js"; import deepClone from "deep-clone-simple"; import { CSSResultGroup, LitElement, PropertyValues, css, html } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { repeat } from "lit/directives/repeat"; import { storage } from "../../../../common/decorators/storage"; import { fireEvent } from "../../../../common/dom/fire_event"; +import { nestedArrayMove } from "../../../../common/util/array-move"; import "../../../../components/ha-button"; import "../../../../components/ha-button-menu"; import "../../../../components/ha-sortable"; import "../../../../components/ha-svg-icon"; import { AutomationClipboard, Trigger } from "../../../../data/automation"; -import { HomeAssistant } from "../../../../types"; +import { + ReorderMode, + reorderModeContext, +} from "../../../../state/reorder-mode-mixin"; +import { HomeAssistant, ItemPath } from "../../../../types"; import { PASTE_VALUE, showAddAutomationElementDialog, @@ -26,9 +32,11 @@ export default class HaAutomationTrigger extends LitElement { @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) public nested = false; + @property() public path?: ItemPath; - @property({ type: Boolean }) public reOrderMode = false; + @state() + @consume({ context: reorderModeContext, subscribe: true }) + private _reorderMode?: ReorderMode; @storage({ key: "automationClipboard", @@ -42,31 +50,18 @@ export default class HaAutomationTrigger extends LitElement { private _triggerKeys = new WeakMap(); + private get nested() { + return this.path !== undefined; + } + protected render() { return html` - ${this.reOrderMode && !this.nested - ? html` - - ${this.hass.localize( - "ui.panel.config.automation.editor.re_order_mode.description_triggers" - )} - - ${this.hass.localize( - "ui.panel.config.automation.editor.re_order_mode.exit" - )} - - - ` - : null}
    ${repeat( @@ -74,16 +69,16 @@ export default class HaAutomationTrigger extends LitElement { (trigger) => this._getKey(trigger), (trg, idx) => html` - ${this.reOrderMode + ${this._reorderMode?.active ? html` ` : ""} + ${this._renderReorderModeAlert()} `}
    - ${this.config.use_blueprint.path ? blueprint && "error" in blueprint ? html`

    @@ -98,8 +100,23 @@ export class HaBlueprintScriptEditor extends LitElement { ${blueprint?.metadata?.input && Object.keys(blueprint.metadata.input).length ? Object.entries(blueprint.metadata.input).map( - ([key, value]) => - html` + ([key, value]) => { + const selector = value?.selector ?? { text: undefined }; + const type = Object.keys(selector)[0]; + const enhancedSelector = [ + "action", + "condition", + "trigger", + ].includes(type) + ? { + [type]: { + ...selector[type], + path: [key], + }, + } + : selector; + + return html` ${value?.name || key} ${html``} - ` + `; + } ) : html`

    ${this.hass.localize( @@ -132,6 +151,34 @@ export class HaBlueprintScriptEditor extends LitElement { `; } + private _renderReorderModeAlert() { + if (!this._reorderMode.active) { + return nothing; + } + return html` + + ${this.hass.localize( + "ui.panel.config.automation.editor.re_order_mode.description_all" + )} + + ${this.hass.localize( + "ui.panel.config.automation.editor.re_order_mode.exit" + )} + + + `; + } + + private async _exitReOrderMode() { + this._reorderMode.exit(); + } + private async _getBlueprints() { this._blueprints = await fetchBlueprints(this.hass, "script"); } @@ -176,6 +223,29 @@ export class HaBlueprintScriptEditor extends LitElement { }); } + private _itemMoved(ev) { + ev.stopPropagation(); + const { oldIndex, newIndex, oldPath, newPath } = ev.detail; + + const input = nestedArrayMove( + this.config.use_blueprint.input, + oldIndex, + newIndex, + oldPath, + newPath + ); + + fireEvent(this, "value-changed", { + value: { + ...this.config, + use_blueprint: { + ...this.config.use_blueprint, + input, + }, + }, + }); + } + private _duplicate() { fireEvent(this, "duplicate"); } @@ -229,6 +299,10 @@ export class HaBlueprintScriptEditor extends LitElement { margin-bottom: 16px; display: block; } + ha-alert.re-order { + border-radius: var(--ha-card-border-radius, 12px); + overflow: hidden; + } `, ]; } diff --git a/src/panels/config/script/manual-script-editor.ts b/src/panels/config/script/manual-script-editor.ts index 78f7c1c5cd6b..1b6f615b63d9 100644 --- a/src/panels/config/script/manual-script-editor.ts +++ b/src/panels/config/script/manual-script-editor.ts @@ -3,10 +3,12 @@ import { mdiHelpCircle } from "@mdi/js"; import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property, query } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; +import { nestedArrayMove } from "../../../common/util/array-move"; import "../../../components/ha-card"; import "../../../components/ha-icon-button"; import { Action, Fields, ScriptConfig } from "../../../data/script"; import { haStyle } from "../../../resources/styles"; +import { ReorderModeMixin } from "../../../state/reorder-mode-mixin"; import type { HomeAssistant } from "../../../types"; import { documentationUrl } from "../../../util/documentation-url"; import "../automation/action/ha-automation-action"; @@ -14,7 +16,7 @@ import "./ha-script-fields"; import type HaScriptFields from "./ha-script-fields"; @customElement("manual-script-editor") -export class HaManualScriptEditor extends LitElement { +export class HaManualScriptEditor extends ReorderModeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; @property({ type: Boolean }) public isWide!: boolean; @@ -118,11 +120,15 @@ export class HaManualScriptEditor extends LitElement {

    + ${this._renderReorderModeAlert()} + + ${this.hass.localize( + "ui.panel.config.automation.editor.re_order_mode.description_all" + )} + + ${this.hass.localize( + "ui.panel.config.automation.editor.re_order_mode.exit" + )} + + + `; + } + + private async _exitReOrderMode() { + this._reorderMode.exit(); + } + private _fieldsChanged(ev: CustomEvent): void { ev.stopPropagation(); fireEvent(this, "value-changed", { @@ -144,6 +178,21 @@ export class HaManualScriptEditor extends LitElement { }); } + private _itemMoved(ev: CustomEvent): void { + ev.stopPropagation(); + const { oldIndex, newIndex, oldPath, newPath } = ev.detail; + const updatedConfig = nestedArrayMove( + this.config, + oldIndex, + newIndex, + oldPath, + newPath + ); + fireEvent(this, "value-changed", { + value: updatedConfig, + }); + } + private _duplicate() { fireEvent(this, "duplicate"); } @@ -179,6 +228,12 @@ export class HaManualScriptEditor extends LitElement { .header a { color: var(--secondary-text-color); } + ha-alert.re-order { + display: block; + margin-bottom: 16px; + border-radius: var(--ha-card-border-radius, 12px); + overflow: hidden; + } `, ]; } diff --git a/src/state/reorder-mode-mixin.ts b/src/state/reorder-mode-mixin.ts new file mode 100644 index 000000000000..42c13bdb6ed8 --- /dev/null +++ b/src/state/reorder-mode-mixin.ts @@ -0,0 +1,40 @@ +import { ContextProvider, createContext } from "@lit-labs/context"; +import { LitElement } from "lit"; +import { Constructor } from "../types"; + +export type ReorderMode = { + active: boolean; + enter: () => void; + exit: () => void; +}; +export const reorderModeContext = createContext("reorder-mode"); + +export const ReorderModeMixin = >( + superClass: T +) => + class extends superClass { + private _reorderModeProvider = new ContextProvider(this, { + context: reorderModeContext, + initialValue: { + active: false, + enter: () => { + this._reorderModeProvider.setValue({ + ...this._reorderModeProvider.value, + active: true, + }); + this.requestUpdate("_reorderMode"); + }, + exit: () => { + this._reorderModeProvider.setValue({ + ...this._reorderModeProvider.value, + active: false, + }); + this.requestUpdate("_reorderMode"); + }, + }, + }); + + get _reorderMode() { + return this._reorderModeProvider.value; + } + }; diff --git a/src/translations/en.json b/src/translations/en.json index acd757020cef..3f17573f9c45 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2444,6 +2444,7 @@ "description_triggers": "You are in re-order mode, you can re-order your triggers.", "description_conditions": "You are in re-order mode, you can re-order your conditions.", "description_actions": "You are in re-order mode, you can re-order your actions.", + "description_all": "You are in re-order mode, you can re-order your triggers, conditions and actions.", "exit": "Exit" }, "description": { diff --git a/src/types.ts b/src/types.ts index 7238b5db6d71..cb0e1931f910 100644 --- a/src/types.ts +++ b/src/types.ts @@ -294,3 +294,5 @@ export type AsyncReturnType any> = T extends ( : never; export type Entries = [keyof T, T[keyof T]][]; + +export type ItemPath = (number | string)[]; From 9bad3c810155cd07cf88f212cbffa245588aa511 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Thu, 18 Jan 2024 08:30:59 -0500 Subject: [PATCH 170/361] Lint for unknown tags and turn off unknow attribute check (#19439) --- src/panels/lovelace/cards/hui-light-card.ts | 1 + tsconfig.json | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts index f7112c8fc129..a0d383753565 100644 --- a/src/panels/lovelace/cards/hui-light-card.ts +++ b/src/panels/lovelace/cards/hui-light-card.ts @@ -114,6 +114,7 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
    + Date: Thu, 18 Jan 2024 14:31:44 +0100 Subject: [PATCH 171/361] Avoid thermostat card interaction on scroll on touch devices (#19423) * Avoid thermostat card interaction on scroll on touch devices * Fix background interaction on safari * Fix interaction in Safari * Make listeners private --- src/components/ha-control-circular-slider.ts | 381 ++++++++++-------- .../directives/action-handler-directive.ts | 7 +- .../state-control-circular-slider-style.ts | 4 + src/util/is_touch.ts | 5 + 4 files changed, 227 insertions(+), 170 deletions(-) create mode 100644 src/util/is_touch.ts diff --git a/src/components/ha-control-circular-slider.ts b/src/components/ha-control-circular-slider.ts index 2bdb3dc40169..eb475aacb542 100644 --- a/src/components/ha-control-circular-slider.ts +++ b/src/components/ha-control-circular-slider.ts @@ -16,12 +16,19 @@ import { nothing, svg, } from "lit"; -import { customElement, property, query, state } from "lit/decorators"; +import { + customElement, + property, + query, + queryAll, + state, +} from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { ifDefined } from "lit/directives/if-defined"; import { fireEvent } from "../common/dom/fire_event"; import { clamp } from "../common/number/clamp"; import { svgArc } from "../resources/svg-arc"; +import { isTouch } from "../util/is_touch"; const MAX_ANGLE = 270; const ROTATE_ANGLE = 360 - MAX_ANGLE / 2 - 90; @@ -153,11 +160,6 @@ export class HaControlCircularSlider extends LitElement { return Math.min(Math.max(value, min), max); } - protected firstUpdated(changedProps: PropertyValues): void { - super.firstUpdated(changedProps); - this._setupListeners(); - } - protected updated(changedProps: PropertyValues): void { super.updated(changedProps); if (!this._activeSlider) { @@ -171,6 +173,19 @@ export class HaControlCircularSlider extends LitElement { this._localHigh = this.high; } } + + if ( + (changedProps.has("_localValue") && + changedProps.get("_localValue") == null) || + (changedProps.has("_localLow") && + changedProps.get("_localLow") == null) || + (changedProps.has("_localHigh") && + changedProps.get("_localHigh") == null) || + changedProps.has("preventInteractionOnScroll") + ) { + this._destroyListeners(); + this._setupListeners(); + } } connectedCallback(): void { @@ -182,7 +197,7 @@ export class HaControlCircularSlider extends LitElement { super.disconnectedCallback(); } - private _mc?: HammerManager; + private _managers: HammerManager[] = []; private _getPercentageFromEvent = (e: HammerInput) => { const bound = this._slider.getBoundingClientRect(); @@ -201,8 +216,8 @@ export class HaControlCircularSlider extends LitElement { @query("#slider") private _slider; - @query("#interaction") - private _interaction; + @queryAll("[data-interaction]") + private _interactions?: HTMLElement[]; private _findActiveSlider(value: number): ActiveSlider { if (!this.dual) return "value"; @@ -245,135 +260,148 @@ export class HaControlCircularSlider extends LitElement { return undefined; } - _setupListeners() { - if (this._interaction && !this._mc) { - this._mc = new Manager(this._interaction, { - inputClass: TouchMouseInput, - }); + private _setupListeners() { + if (this._interactions && this._managers.length === 0) { + this._interactions.forEach((interaction) => { + const mc = new Manager(interaction, { + inputClass: TouchMouseInput, + }); - const pressToActivate = - this.preventInteractionOnScroll && "ontouchstart" in window; - - // If press to activate is true, a 60ms press is required to activate the slider - this._mc.add( - new Press({ - enable: pressToActivate, - pointers: 1, - time: 60, - }) - ); - - const panRecognizer = new Pan({ - direction: DIRECTION_ALL, - enable: !pressToActivate, - threshold: 0, - }); + this._managers.push(mc); - this._mc.add(panRecognizer); - - this._mc.add(new Tap({ event: "singletap" })); - - this._mc.on("press", (e) => { - e.srcEvent.stopPropagation(); - e.srcEvent.preventDefault(); - if (this.disabled || this.readonly) return; - const percentage = this._getPercentageFromEvent(e); - const raw = this._percentageToValue(percentage); - this._activeSlider = this._findActiveSlider(raw); - const bounded = this._boundedValue(raw); - this._setActiveValue(bounded); - const stepped = this._steppedValue(bounded); - if (this._activeSlider) { - fireEvent(this, `${this._activeSlider}-changing`, { value: stepped }); - } - panRecognizer.set({ enable: true }); - }); + const pressToActivate = this.preventInteractionOnScroll && isTouch; - this._mc.on("pressup", (e) => { - e.srcEvent.stopPropagation(); - e.srcEvent.preventDefault(); - const percentage = this._getPercentageFromEvent(e); - const raw = this._percentageToValue(percentage); - const bounded = this._boundedValue(raw); - const stepped = this._steppedValue(bounded); - this._setActiveValue(stepped); - if (this._activeSlider) { - fireEvent(this, `${this._activeSlider}-changing`, { - value: undefined, - }); - fireEvent(this, `${this._activeSlider}-changed`, { value: stepped }); - } - this._activeSlider = undefined; - }); + // If press to activate is true, a 50ms press is required to activate the slider + mc.add( + new Press({ + enable: pressToActivate, + pointers: 1, + time: 50, + }) + ); - this._mc.on("pan", (e) => { - e.srcEvent.stopPropagation(); - e.srcEvent.preventDefault(); - }); - this._mc.on("panstart", (e) => { - if (this.disabled || this.readonly) return; - const percentage = this._getPercentageFromEvent(e); - const raw = this._percentageToValue(percentage); - this._activeSlider = this._findActiveSlider(raw); - this._lastSlider = this._activeSlider; - this.shadowRoot?.getElementById("#slider")?.focus(); - }); - this._mc.on("pancancel", () => { - if (this.disabled || this.readonly) return; - this._activeSlider = undefined; - if (pressToActivate) { - panRecognizer.set({ enable: false }); - } - }); - this._mc.on("panmove", (e) => { - if (this.disabled || this.readonly) return; - const percentage = this._getPercentageFromEvent(e); - const raw = this._percentageToValue(percentage); - const bounded = this._boundedValue(raw); - this._setActiveValue(bounded); - const stepped = this._steppedValue(bounded); - if (this._activeSlider) { - fireEvent(this, `${this._activeSlider}-changing`, { value: stepped }); - } - }); - this._mc.on("panend", (e) => { - if (this.disabled || this.readonly) return; - const percentage = this._getPercentageFromEvent(e); - const raw = this._percentageToValue(percentage); - const bounded = this._boundedValue(raw); - const stepped = this._steppedValue(bounded); - this._setActiveValue(stepped); - if (this._activeSlider) { - fireEvent(this, `${this._activeSlider}-changing`, { - value: undefined, - }); - fireEvent(this, `${this._activeSlider}-changed`, { value: stepped }); - } - this._activeSlider = undefined; - if (pressToActivate) { - panRecognizer.set({ enable: false }); - } - }); - this._mc.on("singletap", (e) => { - if (this.disabled || this.readonly) return; - const percentage = this._getPercentageFromEvent(e); - const raw = this._percentageToValue(percentage); - this._activeSlider = this._findActiveSlider(raw); - const bounded = this._boundedValue(raw); - const stepped = this._steppedValue(bounded); - this._setActiveValue(stepped); - if (this._activeSlider) { - fireEvent(this, `${this._activeSlider}-changing`, { - value: undefined, - }); - fireEvent(this, `${this._activeSlider}-changed`, { value: stepped }); - } - this._lastSlider = this._activeSlider; - this.shadowRoot?.getElementById("#slider")?.focus(); - this._activeSlider = undefined; - if (pressToActivate) { - panRecognizer.set({ enable: false }); - } + const panRecognizer = new Pan({ + direction: DIRECTION_ALL, + enable: !pressToActivate, + threshold: 0, + }); + + mc.add(panRecognizer); + + mc.add(new Tap({ event: "singletap" })); + + mc.on("press", (e) => { + e.srcEvent.stopPropagation(); + e.srcEvent.preventDefault(); + if (this.disabled || this.readonly) return; + const percentage = this._getPercentageFromEvent(e); + const raw = this._percentageToValue(percentage); + this._activeSlider = this._findActiveSlider(raw); + const bounded = this._boundedValue(raw); + this._setActiveValue(bounded); + const stepped = this._steppedValue(bounded); + if (this._activeSlider) { + fireEvent(this, `${this._activeSlider}-changing`, { + value: stepped, + }); + } + panRecognizer.set({ enable: true }); + }); + + mc.on("pressup", (e) => { + e.srcEvent.stopPropagation(); + e.srcEvent.preventDefault(); + const percentage = this._getPercentageFromEvent(e); + const raw = this._percentageToValue(percentage); + const bounded = this._boundedValue(raw); + const stepped = this._steppedValue(bounded); + this._setActiveValue(stepped); + if (this._activeSlider) { + fireEvent(this, `${this._activeSlider}-changing`, { + value: undefined, + }); + fireEvent(this, `${this._activeSlider}-changed`, { + value: stepped, + }); + } + this._activeSlider = undefined; + }); + + mc.on("pan", (e) => { + e.srcEvent.stopPropagation(); + e.srcEvent.preventDefault(); + }); + mc.on("panstart", (e) => { + if (this.disabled || this.readonly) return; + const percentage = this._getPercentageFromEvent(e); + const raw = this._percentageToValue(percentage); + this._activeSlider = this._findActiveSlider(raw); + this._lastSlider = this._activeSlider; + this.shadowRoot?.getElementById("#slider")?.focus(); + }); + mc.on("pancancel", () => { + if (this.disabled || this.readonly) return; + this._activeSlider = undefined; + if (pressToActivate) { + panRecognizer.set({ enable: false }); + } + }); + mc.on("panmove", (e) => { + if (this.disabled || this.readonly) return; + const percentage = this._getPercentageFromEvent(e); + const raw = this._percentageToValue(percentage); + const bounded = this._boundedValue(raw); + this._setActiveValue(bounded); + const stepped = this._steppedValue(bounded); + if (this._activeSlider) { + fireEvent(this, `${this._activeSlider}-changing`, { + value: stepped, + }); + } + }); + mc.on("panend", (e) => { + if (this.disabled || this.readonly) return; + const percentage = this._getPercentageFromEvent(e); + const raw = this._percentageToValue(percentage); + const bounded = this._boundedValue(raw); + const stepped = this._steppedValue(bounded); + this._setActiveValue(stepped); + if (this._activeSlider) { + fireEvent(this, `${this._activeSlider}-changing`, { + value: undefined, + }); + fireEvent(this, `${this._activeSlider}-changed`, { + value: stepped, + }); + } + this._activeSlider = undefined; + if (pressToActivate) { + panRecognizer.set({ enable: false }); + } + }); + mc.on("singletap", (e) => { + if (this.disabled || this.readonly) return; + const percentage = this._getPercentageFromEvent(e); + const raw = this._percentageToValue(percentage); + this._activeSlider = this._findActiveSlider(raw); + const bounded = this._boundedValue(raw); + const stepped = this._steppedValue(bounded); + this._setActiveValue(stepped); + if (this._activeSlider) { + fireEvent(this, `${this._activeSlider}-changing`, { + value: undefined, + }); + fireEvent(this, `${this._activeSlider}-changed`, { + value: stepped, + }); + } + this._lastSlider = this._activeSlider; + this.shadowRoot?.getElementById("#slider")?.focus(); + this._activeSlider = undefined; + if (pressToActivate) { + panRecognizer.set({ enable: false }); + } + }); }); } } @@ -447,10 +475,10 @@ export class HaControlCircularSlider extends LitElement { this._activeSlider = undefined; } - destroyListeners() { - if (this._mc) { - this._mc.destroy(); - this._mc = undefined; + private _destroyListeners() { + if (this._managers.length > 0) { + this._managers.forEach((manager) => manager.destroy()); + this._managers = []; } } @@ -486,6 +514,9 @@ export class HaControlCircularSlider extends LitElement { r: RADIUS, }); + const angle = + value != null ? this._valueToPercentage(value) * MAX_ANGLE : undefined; + const limit = mode === "end" ? this.max : this.min; const current = this.current ?? limit; @@ -527,6 +558,9 @@ export class HaControlCircularSlider extends LitElement { ? this._strokeCircleDashArc(this.current) : undefined; + const onlyDotInteraction = + (this.preventInteractionOnScroll && isTouch) || false; + return svg` + + - - - - - - ${currentStroke - ? svg` + + + ${currentStroke + ? svg` ` - : nothing} - ${lowValue != null || this.mode === "full" - ? this.renderArc( - this.dual ? "low" : "value", - lowValue, - (!this.dual && this.mode) || "start" - ) - : nothing} - ${this.dual && highValue != null - ? this.renderArc("high", highValue, "end") - : nothing} - + : nothing} + ${lowValue != null || this.mode === "full" + ? this.renderArc( + this.dual ? "low" : "value", + lowValue, + (!this.dual && this.mode) || "start" + ) + : nothing} + ${this.dual && highValue != null + ? this.renderArc("high", highValue, "end") + : nothing} `; @@ -684,26 +729,34 @@ export class HaControlCircularSlider extends LitElement { svg { width: 100%; display: block; + pointer-events: none; + } + g { + fill: none; } #slider { outline: none; } - #interaction { - display: flex; + path[data-interaction] { fill: none; + cursor: pointer; + pointer-events: auto; stroke: transparent; stroke-linecap: round; stroke-width: calc( 24px + 2 * var(--control-circular-slider-interaction-margin) ); - cursor: pointer; } - #display { - pointer-events: none; + circle[data-interaction] { + r: calc(12px + var(--control-circular-slider-interaction-margin)); + fill: transparent; + cursor: pointer; + pointer-events: auto; } - :host([disabled]) #interaction, - :host([readonly]) #interaction { + :host([disabled]) [data-interaction], + :host([readonly]) [data-interaction] { cursor: initial; + pointer-events: none; } .background { diff --git a/src/panels/lovelace/common/directives/action-handler-directive.ts b/src/panels/lovelace/common/directives/action-handler-directive.ts index 199cfafc9b90..13367270460e 100644 --- a/src/panels/lovelace/common/directives/action-handler-directive.ts +++ b/src/panels/lovelace/common/directives/action-handler-directive.ts @@ -14,12 +14,7 @@ import { ActionHandlerDetail, ActionHandlerOptions, } from "../../../../data/lovelace/action_handler"; - -const isTouch = - "ontouchstart" in window || - navigator.maxTouchPoints > 0 || - // @ts-ignore - navigator.msMaxTouchPoints > 0; +import { isTouch } from "../../../../util/is_touch"; interface ActionHandlerType extends HTMLElement { holdTime: number; diff --git a/src/state-control/state-control-circular-slider-style.ts b/src/state-control/state-control-circular-slider-style.ts index b5d4d5281a03..14b9b6e9ffa2 100644 --- a/src/state-control/state-control-circular-slider-style.ts +++ b/src/state-control/state-control-circular-slider-style.ts @@ -65,6 +65,10 @@ export const stateControlCircularSliderStyle = css` flex-direction: row; align-items: center; justify-content: center; + pointer-events: none; + } + .buttons > * { + pointer-events: auto; } .primary-state { font-size: 36px; diff --git a/src/util/is_touch.ts b/src/util/is_touch.ts new file mode 100644 index 000000000000..d5a0ad1235fa --- /dev/null +++ b/src/util/is_touch.ts @@ -0,0 +1,5 @@ +export const isTouch = + "ontouchstart" in window || + navigator.maxTouchPoints > 0 || + // @ts-ignore + navigator.msMaxTouchPoints > 0; From 6234f7b7d2a289e5f6a2b3fa1a8eea78571eef26 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Thu, 18 Jan 2024 10:39:33 -0500 Subject: [PATCH 172/361] Initialize boolean properties (#19445) --- hassio/src/addon-store/hassio-addon-store.ts | 2 +- hassio/src/addon-view/hassio-addon-dashboard.ts | 2 +- hassio/src/addon-view/info/hassio-addon-info-tab.ts | 2 +- hassio/src/addon-view/info/hassio-addon-info.ts | 2 +- hassio/src/backups/hassio-backups.ts | 4 ++-- hassio/src/dashboard/hassio-addons.ts | 2 +- hassio/src/dashboard/hassio-dashboard.ts | 2 +- hassio/src/hassio-main.ts | 2 +- hassio/src/hassio-panel-router.ts | 2 +- hassio/src/hassio-panel.ts | 2 +- hassio/src/hassio-router.ts | 2 +- hassio/src/system/hassio-system.ts | 2 +- hassio/src/update-available/update-available-card.ts | 2 +- hassio/src/update-available/update-available-dashboard.ts | 2 +- src/components/device/ha-device-picker.ts | 4 ++-- src/components/device/ha-devices-picker.ts | 4 ++-- src/components/entity/ha-entities-picker.ts | 4 ++-- src/components/entity/ha-entity-picker.ts | 4 ++-- src/components/entity/ha-statistic-picker.ts | 2 +- src/components/entity/state-badge.ts | 2 +- src/components/ha-area-picker.ts | 4 ++-- src/components/ha-areas-picker.ts | 4 ++-- src/components/ha-date-input.ts | 2 +- src/components/ha-gauge.ts | 2 +- src/components/ha-navigation-list.ts | 2 +- src/components/ha-select.ts | 4 ++-- src/components/ha-service-control.ts | 4 ++-- src/components/ha-settings-row.ts | 2 +- src/components/ha-sidebar.ts | 2 +- src/components/ha-textfield.ts | 6 +++--- src/components/map/ha-locations-editor.ts | 2 +- src/components/map/ha-map.ts | 4 ++-- src/components/trace/ha-trace-logbook.ts | 2 +- src/components/trace/ha-trace-path-details.ts | 2 +- src/components/trace/hat-graph-branch.ts | 2 +- src/layouts/home-assistant-main.ts | 2 +- src/onboarding/integration-badge.ts | 2 +- src/onboarding/onboarding-welcome-links.ts | 2 +- src/onboarding/onboarding-welcome.ts | 2 +- src/panels/config/areas/ha-config-area-page.ts | 6 +++--- src/panels/config/automation/ha-automation-picker.ts | 4 ++-- src/panels/config/automation/ha-automation-trace.ts | 4 ++-- src/panels/config/automation/manual-automation-editor.ts | 4 ++-- src/panels/config/backup/ha-config-backup.ts | 4 ++-- src/panels/config/blueprint/ha-blueprint-overview.ts | 4 ++-- src/panels/config/cloud/account/cloud-webhooks.ts | 2 +- src/panels/config/core/ha-config-section-analytics.ts | 2 +- src/panels/config/core/ha-config-section-general.ts | 2 +- src/panels/config/core/ha-config-section-updates.ts | 2 +- src/panels/config/core/ha-config-system-navigation.ts | 4 ++-- src/panels/config/dashboard/ha-config-navigation.ts | 2 +- src/panels/config/dashboard/ha-config-updates.ts | 2 +- src/panels/config/devices/ha-config-device-page.ts | 6 +++--- src/panels/config/energy/ha-config-energy.ts | 6 +++--- src/panels/config/entities/ha-config-entities.ts | 4 ++-- src/panels/config/hardware/ha-config-hardware.ts | 2 +- src/panels/config/info/ha-config-info.ts | 6 +++--- .../config/integrations/ha-config-integration-page.ts | 6 +++--- .../config/integrations/ha-config-integrations-dashboard.ts | 2 +- src/panels/config/integrations/ha-config-integrations.ts | 2 +- .../integration-panels/matter/matter-config-dashboard.ts | 2 +- .../integration-panels/mqtt/mqtt-config-panel.ts | 2 +- .../integration-panels/thread/thread-config-panel.ts | 2 +- .../integration-panels/zha/zha-add-devices-page.ts | 2 +- .../integration-panels/zha/zha-add-group-page.ts | 2 +- .../integration-panels/zha/zha-config-dashboard.ts | 4 ++-- .../integrations/integration-panels/zha/zha-device-card.ts | 2 +- .../integration-panels/zha/zha-device-neighbors.ts | 2 +- .../zha/zha-device-pairing-status-card.ts | 2 +- .../integrations/integration-panels/zha/zha-group-page.ts | 4 ++-- .../integration-panels/zha/zha-groups-dashboard.ts | 4 ++-- .../zha/zha-network-visualization-page.ts | 4 ++-- .../zwave_js/zwave_js-config-dashboard.ts | 4 ++-- .../integration-panels/zwave_js/zwave_js-logs.ts | 2 +- .../integration-panels/zwave_js/zwave_js-node-config.ts | 4 ++-- .../integration-panels/zwave_js/zwave_js-provisioned.ts | 2 +- src/panels/config/logs/ha-config-logs.ts | 4 ++-- src/panels/config/network/ha-config-section-network.ts | 2 +- src/panels/config/network/supervisor-hostname.ts | 2 +- src/panels/config/repairs/ha-config-repairs-dashboard.ts | 2 +- src/panels/config/repairs/ha-config-repairs.ts | 2 +- src/panels/config/script/blueprint-script-editor.ts | 2 +- src/panels/config/script/ha-script-editor.ts | 2 +- src/panels/config/script/ha-script-trace.ts | 4 ++-- src/panels/config/script/manual-script-editor.ts | 4 ++-- src/panels/config/storage/ha-config-section-storage.ts | 2 +- src/panels/config/users/ha-config-users.ts | 4 ++-- .../assist/ha-config-voice-assistants-assist-devices.ts | 2 +- src/panels/config/voice-assistants/debug/assist-debug.ts | 2 +- .../config/voice-assistants/debug/assist-pipeline-debug.ts | 2 +- .../voice-assistants/debug/assist-pipeline-run-debug.ts | 2 +- .../config/voice-assistants/expose/expose-assistant-icon.ts | 4 ++-- .../voice-assistants/ha-config-voice-assistants-expose.ts | 4 ++-- src/panels/developer-tools/assist/developer-tools-assist.ts | 2 +- src/panels/developer-tools/debug/developer-tools-debug.ts | 2 +- src/panels/developer-tools/event/developer-tools-event.ts | 2 +- .../developer-tools/service/developer-tools-service.ts | 2 +- .../statistics/developer-tools-statistics.ts | 2 +- .../yaml_configuration/developer-yaml-config.ts | 6 +++--- src/panels/energy/ha-panel-energy.ts | 2 +- src/panels/iframe/ha-panel-iframe.ts | 2 +- src/panels/lovelace/cards/hui-markdown-card.ts | 2 +- src/panels/lovelace/components/hui-marquee.ts | 2 +- .../lovelace/editor/card-editor/hui-entity-picker-table.ts | 2 +- .../lovelace/editor/unused-entities/hui-unused-entities.ts | 2 +- src/panels/lovelace/editor/view-editor/hui-view-editor.ts | 2 +- src/panels/lovelace/views/hui-masonry-view.ts | 2 +- src/panels/lovelace/views/hui-view.ts | 2 +- src/panels/map/ha-panel-map.ts | 2 +- src/panels/profile/ha-panel-profile.ts | 2 +- src/panels/profile/ha-pick-theme-row.ts | 2 +- src/panels/todo/ha-panel-todo.ts | 2 +- 112 files changed, 155 insertions(+), 155 deletions(-) diff --git a/hassio/src/addon-store/hassio-addon-store.ts b/hassio/src/addon-store/hassio-addon-store.ts index 695f41df6db2..b3ef1e2c6e11 100644 --- a/hassio/src/addon-store/hassio-addon-store.ts +++ b/hassio/src/addon-store/hassio-addon-store.ts @@ -56,7 +56,7 @@ export class HassioAddonStore extends LitElement { @property({ attribute: false }) public supervisor!: Supervisor; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/hassio/src/addon-view/hassio-addon-dashboard.ts b/hassio/src/addon-view/hassio-addon-dashboard.ts index 4bb888290fac..02c9f29a7f22 100644 --- a/hassio/src/addon-view/hassio-addon-dashboard.ts +++ b/hassio/src/addon-view/hassio-addon-dashboard.ts @@ -51,7 +51,7 @@ class HassioAddonDashboard extends LitElement { | HassioAddonDetails | StoreAddonDetails; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _error?: string; diff --git a/hassio/src/addon-view/info/hassio-addon-info-tab.ts b/hassio/src/addon-view/info/hassio-addon-info-tab.ts index 85bd0f9e5075..fa8333d9f733 100644 --- a/hassio/src/addon-view/info/hassio-addon-info-tab.ts +++ b/hassio/src/addon-view/info/hassio-addon-info-tab.ts @@ -10,7 +10,7 @@ import "./hassio-addon-info"; @customElement("hassio-addon-info-tab") class HassioAddonInfoDashboard extends LitElement { - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/hassio/src/addon-view/info/hassio-addon-info.ts b/hassio/src/addon-view/info/hassio-addon-info.ts index ae59d0af6ba1..11d257f722f3 100644 --- a/hassio/src/addon-view/info/hassio-addon-info.ts +++ b/hassio/src/addon-view/info/hassio-addon-info.ts @@ -99,7 +99,7 @@ const RATING_ICON = { @customElement("hassio-addon-info") class HassioAddonInfo extends LitElement { - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/hassio/src/backups/hassio-backups.ts b/hassio/src/backups/hassio-backups.ts index f3ed9fad439d..7d0819fc83de 100644 --- a/hassio/src/backups/hassio-backups.ts +++ b/hassio/src/backups/hassio-backups.ts @@ -61,9 +61,9 @@ export class HassioBackups extends LitElement { @property({ attribute: false }) public route!: Route; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; - @property({ type: Boolean }) public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; @state() private _selectedBackups: string[] = []; diff --git a/hassio/src/dashboard/hassio-addons.ts b/hassio/src/dashboard/hassio-addons.ts index daeb867ef66d..eb9c1f00c18d 100644 --- a/hassio/src/dashboard/hassio-addons.ts +++ b/hassio/src/dashboard/hassio-addons.ts @@ -20,7 +20,7 @@ class HassioAddons extends LitElement { @property({ attribute: false }) public supervisor!: Supervisor; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _filter?: string; diff --git a/hassio/src/dashboard/hassio-dashboard.ts b/hassio/src/dashboard/hassio-dashboard.ts index a38c37b8a822..e678a4299285 100644 --- a/hassio/src/dashboard/hassio-dashboard.ts +++ b/hassio/src/dashboard/hassio-dashboard.ts @@ -21,7 +21,7 @@ class HassioDashboard extends LitElement { @property({ attribute: false }) public supervisor!: Supervisor; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/hassio/src/hassio-main.ts b/hassio/src/hassio-main.ts index e9769e807cbf..04f2dbf3c05b 100644 --- a/hassio/src/hassio-main.ts +++ b/hassio/src/hassio-main.ts @@ -21,7 +21,7 @@ export class HassioMain extends SupervisorBaseElement { @property({ attribute: false }) public panel!: HassioPanelInfo; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected firstUpdated(changedProps: PropertyValues) { super.firstUpdated(changedProps); diff --git a/hassio/src/hassio-panel-router.ts b/hassio/src/hassio-panel-router.ts index 201f3a6c711c..310f191e61e8 100644 --- a/hassio/src/hassio-panel-router.ts +++ b/hassio/src/hassio-panel-router.ts @@ -16,7 +16,7 @@ class HassioPanelRouter extends HassRouterPage { @property({ attribute: false }) public route!: Route; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected routerOptions: RouterOptions = { beforeRender: (page: string) => diff --git a/hassio/src/hassio-panel.ts b/hassio/src/hassio-panel.ts index c2d3295759be..36f570fdb3be 100644 --- a/hassio/src/hassio-panel.ts +++ b/hassio/src/hassio-panel.ts @@ -14,7 +14,7 @@ class HassioPanel extends LitElement { @property({ attribute: false }) public supervisor!: Supervisor; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/hassio/src/hassio-router.ts b/hassio/src/hassio-router.ts index b100fccdbf8f..a56f8088d550 100644 --- a/hassio/src/hassio-router.ts +++ b/hassio/src/hassio-router.ts @@ -18,7 +18,7 @@ class HassioRouter extends HassRouterPage { @property({ attribute: false }) public panel!: HassioPanelInfo; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected routerOptions: RouterOptions = { // Hass.io has a page with tabs, so we route all non-matching routes to it. diff --git a/hassio/src/system/hassio-system.ts b/hassio/src/system/hassio-system.ts index bbf3d727580e..88fdd3e2a397 100644 --- a/hassio/src/system/hassio-system.ts +++ b/hassio/src/system/hassio-system.ts @@ -18,7 +18,7 @@ class HassioSystem extends LitElement { @property({ attribute: false }) public supervisor!: Supervisor; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/hassio/src/update-available/update-available-card.ts b/hassio/src/update-available/update-available-card.ts index b91fe19f81ee..d2c22ac0e107 100644 --- a/hassio/src/update-available/update-available-card.ts +++ b/hassio/src/update-available/update-available-card.ts @@ -94,7 +94,7 @@ class UpdateAvailableCard extends LitElement { @property({ attribute: false }) public route!: Route; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public addonSlug?: string; diff --git a/hassio/src/update-available/update-available-dashboard.ts b/hassio/src/update-available/update-available-dashboard.ts index 9e1598527c8e..9ebb25a4cd9b 100644 --- a/hassio/src/update-available/update-available-dashboard.ts +++ b/hassio/src/update-available/update-available-dashboard.ts @@ -11,7 +11,7 @@ class UpdateAvailableDashboard extends LitElement { @property({ attribute: false }) public supervisor!: Supervisor; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/src/components/device/ha-device-picker.ts b/src/components/device/ha-device-picker.ts index 35e16fd4eae6..ed6d49e37d63 100644 --- a/src/components/device/ha-device-picker.ts +++ b/src/components/device/ha-device-picker.ts @@ -88,9 +88,9 @@ export class HaDevicePicker extends LitElement { @property() public entityFilter?: HaDevicePickerEntityFilterFunc; - @property({ type: Boolean }) public disabled?: boolean; + @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) public required?: boolean; + @property({ type: Boolean }) public required = false; @state() private _opened?: boolean; diff --git a/src/components/device/ha-devices-picker.ts b/src/components/device/ha-devices-picker.ts index 5a78c2c18e20..f53af31bcd63 100644 --- a/src/components/device/ha-devices-picker.ts +++ b/src/components/device/ha-devices-picker.ts @@ -16,9 +16,9 @@ class HaDevicesPicker extends LitElement { @property() public helper?: string; - @property({ type: Boolean }) public disabled?: boolean; + @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) public required?: boolean; + @property({ type: Boolean }) public required = false; /** * Show entities from specific domains. diff --git a/src/components/entity/ha-entities-picker.ts b/src/components/entity/ha-entities-picker.ts index 21aebdfd2c7d..72ea3ee8ccbc 100644 --- a/src/components/entity/ha-entities-picker.ts +++ b/src/components/entity/ha-entities-picker.ts @@ -14,9 +14,9 @@ class HaEntitiesPickerLight extends LitElement { @property({ type: Array }) public value?: string[]; - @property({ type: Boolean }) public disabled?: boolean; + @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) public required?: boolean; + @property({ type: Boolean }) public required = false; @property() public helper?: string; diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts index 115e0795aa83..ac2f1f9a177e 100644 --- a/src/components/entity/ha-entity-picker.ts +++ b/src/components/entity/ha-entity-picker.ts @@ -41,9 +41,9 @@ export class HaEntityPicker extends LitElement { @property({ type: Boolean }) public autofocus = false; - @property({ type: Boolean }) public disabled?: boolean; + @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) public required?: boolean; + @property({ type: Boolean }) public required = false; @property({ type: Boolean, attribute: "allow-custom-entity" }) public allowCustomEntity; diff --git a/src/components/entity/ha-statistic-picker.ts b/src/components/entity/ha-statistic-picker.ts index d86c3bf0533d..f3eabb2b3281 100644 --- a/src/components/entity/ha-statistic-picker.ts +++ b/src/components/entity/ha-statistic-picker.ts @@ -44,7 +44,7 @@ export class HaStatisticPicker extends LitElement { @property({ type: Array }) public statisticIds?: StatisticsMetaData[]; - @property({ type: Boolean }) public disabled?: boolean; + @property({ type: Boolean }) public disabled = false; /** * Show only statistics natively stored with these units of measurements. diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts index f1f98337e92d..82ee231b4a59 100644 --- a/src/components/entity/state-badge.ts +++ b/src/components/entity/state-badge.ts @@ -32,7 +32,7 @@ export class StateBadge extends LitElement { @property() public overrideImage?: string; - @property({ type: Boolean }) public stateColor?: boolean; + @property({ type: Boolean }) public stateColor = false; @property() public color?: string; diff --git a/src/components/ha-area-picker.ts b/src/components/ha-area-picker.ts index 423de3df7a88..8e84cb77fcdb 100644 --- a/src/components/ha-area-picker.ts +++ b/src/components/ha-area-picker.ts @@ -92,9 +92,9 @@ export class HaAreaPicker extends LitElement { @property() public entityFilter?: (entity: HassEntity) => boolean; - @property({ type: Boolean }) public disabled?: boolean; + @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) public required?: boolean; + @property({ type: Boolean }) public required = false; @state() private _opened?: boolean; diff --git a/src/components/ha-areas-picker.ts b/src/components/ha-areas-picker.ts index eff9622a0a01..1d648ee5fd3c 100644 --- a/src/components/ha-areas-picker.ts +++ b/src/components/ha-areas-picker.ts @@ -56,9 +56,9 @@ export class HaAreasPicker extends SubscribeMixin(LitElement) { @property({ attribute: "pick-area-label" }) public pickAreaLabel?: string; - @property({ type: Boolean }) public disabled?: boolean; + @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) public required?: boolean; + @property({ type: Boolean }) public required = false; protected render() { if (!this.hass) { diff --git a/src/components/ha-date-input.ts b/src/components/ha-date-input.ts index d4d9922639d9..80237bd3aa23 100644 --- a/src/components/ha-date-input.ts +++ b/src/components/ha-date-input.ts @@ -50,7 +50,7 @@ export class HaDateInput extends LitElement { @property() public helper?: string; - @property({ type: Boolean }) public canClear?: boolean; + @property({ type: Boolean }) public canClear = false; render() { return html`; diff --git a/src/components/map/ha-map.ts b/src/components/map/ha-map.ts index c90053c9b835..88025662a62e 100644 --- a/src/components/map/ha-map.ts +++ b/src/components/map/ha-map.ts @@ -58,9 +58,9 @@ export class HaMap extends ReactiveElement { @property({ type: Boolean }) public interactiveZones = false; - @property({ type: Boolean }) public fitZones?: boolean; + @property({ type: Boolean }) public fitZones = false; - @property({ type: Boolean }) public darkMode?: boolean; + @property({ type: Boolean }) public darkMode = false; @property({ type: Number }) public zoom = 14; diff --git a/src/components/trace/ha-trace-logbook.ts b/src/components/trace/ha-trace-logbook.ts index 7b0118b3cf48..391c004a62d2 100644 --- a/src/components/trace/ha-trace-logbook.ts +++ b/src/components/trace/ha-trace-logbook.ts @@ -10,7 +10,7 @@ import { TraceExtended } from "../../data/trace"; export class HaTraceLogbook extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean, reflect: true }) public narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @property({ attribute: false }) public trace!: TraceExtended; diff --git a/src/components/trace/ha-trace-path-details.ts b/src/components/trace/ha-trace-path-details.ts index 514377e61f4f..9be129def828 100644 --- a/src/components/trace/ha-trace-path-details.ts +++ b/src/components/trace/ha-trace-path-details.ts @@ -35,7 +35,7 @@ const TRACE_PATH_TABS = [ export class HaTracePathDetails extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean, reflect: true }) public narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @property({ attribute: false }) public trace!: TraceExtended; diff --git a/src/components/trace/hat-graph-branch.ts b/src/components/trace/hat-graph-branch.ts index 470ea6f6fec7..a1d8a94e7063 100644 --- a/src/components/trace/hat-graph-branch.ts +++ b/src/components/trace/hat-graph-branch.ts @@ -19,7 +19,7 @@ interface BranchConfig { export class HatGraphBranch extends LitElement { @property({ reflect: true, type: Boolean }) disabled?: boolean; - @property({ type: Boolean }) selected?: boolean; + @property({ type: Boolean }) selected = false; @property({ type: Boolean }) start = false; diff --git a/src/layouts/home-assistant-main.ts b/src/layouts/home-assistant-main.ts index 7661b5177733..d6e7b3c82648 100644 --- a/src/layouts/home-assistant-main.ts +++ b/src/layouts/home-assistant-main.ts @@ -40,7 +40,7 @@ export class HomeAssistantMain extends LitElement { @property({ attribute: false }) public route?: Route; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _sidebarEditMode = false; diff --git a/src/onboarding/integration-badge.ts b/src/onboarding/integration-badge.ts index be4b7ec8ef6f..e42b1b22e657 100644 --- a/src/onboarding/integration-badge.ts +++ b/src/onboarding/integration-badge.ts @@ -9,7 +9,7 @@ class IntegrationBadge extends LitElement { @property() public title!: string; - @property({ type: Boolean }) public darkOptimizedIcon?: boolean; + @property({ type: Boolean }) public darkOptimizedIcon = false; @property({ type: Boolean, reflect: true }) public clickable = false; diff --git a/src/onboarding/onboarding-welcome-links.ts b/src/onboarding/onboarding-welcome-links.ts index 8be837287967..97dd2ab13c41 100644 --- a/src/onboarding/onboarding-welcome-links.ts +++ b/src/onboarding/onboarding-welcome-links.ts @@ -21,7 +21,7 @@ class OnboardingWelcomeLinks extends LitElement { @property() public localize!: LocalizeFunc; - @property({ type: Boolean }) public mobileApp!: boolean; + @property({ type: Boolean }) public mobileApp = false; protected render(): TemplateResult { return html` = {}; diff --git a/src/panels/config/voice-assistants/debug/assist-debug.ts b/src/panels/config/voice-assistants/debug/assist-debug.ts index 623401231e31..9495bc5ffa39 100644 --- a/src/panels/config/voice-assistants/debug/assist-debug.ts +++ b/src/panels/config/voice-assistants/debug/assist-debug.ts @@ -8,7 +8,7 @@ import "./assist-pipeline-run-debug"; export class AssistDebug extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/src/panels/config/voice-assistants/debug/assist-pipeline-debug.ts b/src/panels/config/voice-assistants/debug/assist-pipeline-debug.ts index e4b7092ee5aa..929d718255da 100644 --- a/src/panels/config/voice-assistants/debug/assist-pipeline-debug.ts +++ b/src/panels/config/voice-assistants/debug/assist-pipeline-debug.ts @@ -23,7 +23,7 @@ import "./assist-render-pipeline-events"; export class AssistPipelineDebug extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts b/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts index f7df3507fa4e..0450419477c4 100644 --- a/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts +++ b/src/panels/config/voice-assistants/debug/assist-pipeline-run-debug.ts @@ -28,7 +28,7 @@ import "./assist-render-pipeline-run"; export class AssistPipelineRunDebug extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _pipelineRuns: PipelineRun[] = []; diff --git a/src/panels/config/voice-assistants/expose/expose-assistant-icon.ts b/src/panels/config/voice-assistants/expose/expose-assistant-icon.ts index f40aeea9e9be..bb45b1e6d0f2 100644 --- a/src/panels/config/voice-assistants/expose/expose-assistant-icon.ts +++ b/src/panels/config/voice-assistants/expose/expose-assistant-icon.ts @@ -12,9 +12,9 @@ import "../../../../components/ha-svg-icon"; export class VoiceAssistantExposeAssistantIcon extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public unsupported!: boolean; + @property({ type: Boolean }) public unsupported = false; - @property({ type: Boolean }) public manual?: boolean; + @property({ type: Boolean }) public manual = false; @property() public assistant?: | "conversation" diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts index f86a0863f63f..95dae6024124 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts @@ -68,9 +68,9 @@ export class VoiceAssistantsExpose extends LitElement { @property({ attribute: false }) public cloudStatus?: CloudStatus; - @property({ type: Boolean }) public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/src/panels/developer-tools/assist/developer-tools-assist.ts b/src/panels/developer-tools/assist/developer-tools-assist.ts index 141f950fb20e..5d050d4ceb32 100644 --- a/src/panels/developer-tools/assist/developer-tools-assist.ts +++ b/src/panels/developer-tools/assist/developer-tools-assist.ts @@ -31,7 +31,7 @@ type SentenceParsingResult = { class HaPanelDevAssist extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() supportedLanguages?: string[]; diff --git a/src/panels/developer-tools/debug/developer-tools-debug.ts b/src/panels/developer-tools/debug/developer-tools-debug.ts index 3d06c4d065db..33ebe8ae6f0c 100644 --- a/src/panels/developer-tools/debug/developer-tools-debug.ts +++ b/src/panels/developer-tools/debug/developer-tools-debug.ts @@ -10,7 +10,7 @@ import "./ha-debug-connection-row"; class HaPanelDevDebug extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; protected render() { return html` diff --git a/src/panels/developer-tools/event/developer-tools-event.ts b/src/panels/developer-tools/event/developer-tools-event.ts index d2ac42a2fd1c..cd29d3176d4d 100644 --- a/src/panels/developer-tools/event/developer-tools-event.ts +++ b/src/panels/developer-tools/event/developer-tools-event.ts @@ -15,7 +15,7 @@ import { fireEvent } from "../../../common/dom/fire_event"; class HaPanelDevEvent extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _eventType: string = ""; diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts index 94e88b79bd9c..c90f09805141 100644 --- a/src/panels/developer-tools/service/developer-tools-service.ts +++ b/src/panels/developer-tools/service/developer-tools-service.ts @@ -34,7 +34,7 @@ import { documentationUrl } from "../../../util/documentation-url"; class HaPanelDevService extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _uiAvailable = true; diff --git a/src/panels/developer-tools/statistics/developer-tools-statistics.ts b/src/panels/developer-tools/statistics/developer-tools-statistics.ts index 25339a91e27c..f85744ec45e5 100644 --- a/src/panels/developer-tools/statistics/developer-tools-statistics.ts +++ b/src/panels/developer-tools/statistics/developer-tools-statistics.ts @@ -51,7 +51,7 @@ type DisplayedStatisticData = StatisticData & { class HaPanelDevStatistics extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _data: StatisticData[] = [] as StatisticsMetaData[]; diff --git a/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts b/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts index 0ac4d768ff76..d35bfa5e8c89 100644 --- a/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts +++ b/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts @@ -28,13 +28,13 @@ type ReloadableDomain = Exclude< export class DeveloperYamlConfig extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public isWide!: boolean; + @property({ type: Boolean }) public isWide = false; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ attribute: false }) public route!: Route; - @property({ type: Boolean }) public showAdvanced!: boolean; + @property({ type: Boolean }) public showAdvanced = false; @state() private _validating = false; diff --git a/src/panels/energy/ha-panel-energy.ts b/src/panels/energy/ha-panel-energy.ts index 26cdc9428405..798a96768c0b 100644 --- a/src/panels/energy/ha-panel-energy.ts +++ b/src/panels/energy/ha-panel-energy.ts @@ -34,7 +34,7 @@ const ENERGY_LOVELACE_CONFIG: LovelaceConfig = { class PanelEnergy extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean, reflect: true }) public narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @state() private _viewIndex = 0; diff --git a/src/panels/iframe/ha-panel-iframe.ts b/src/panels/iframe/ha-panel-iframe.ts index 013ec96d935e..ba6b45105606 100644 --- a/src/panels/iframe/ha-panel-iframe.ts +++ b/src/panels/iframe/ha-panel-iframe.ts @@ -9,7 +9,7 @@ import { HomeAssistant, PanelInfo } from "../../types"; class HaPanelIframe extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property() panel!: PanelInfo<{ url: string }>; diff --git a/src/panels/lovelace/cards/hui-markdown-card.ts b/src/panels/lovelace/cards/hui-markdown-card.ts index f32bd7b228df..a6d75a00fa9b 100644 --- a/src/panels/lovelace/cards/hui-markdown-card.ts +++ b/src/panels/lovelace/cards/hui-markdown-card.ts @@ -38,7 +38,7 @@ export class HuiMarkdownCard extends LitElement implements LovelaceCard { @property({ attribute: false }) public hass?: HomeAssistant; - @property({ type: Boolean }) public editMode?: boolean; + @property({ type: Boolean }) public editMode = false; @state() private _config?: MarkdownCardConfig; diff --git a/src/panels/lovelace/components/hui-marquee.ts b/src/panels/lovelace/components/hui-marquee.ts index 1fb09284e883..67e0fe5e9215 100644 --- a/src/panels/lovelace/components/hui-marquee.ts +++ b/src/panels/lovelace/components/hui-marquee.ts @@ -12,7 +12,7 @@ import { customElement, property } from "lit/decorators"; class HuiMarquee extends LitElement { @property() public text?: string; - @property({ type: Boolean }) public active?: boolean; + @property({ type: Boolean }) public active = false; @property({ reflect: true, type: Boolean, attribute: "animating" }) private _animating = false; diff --git a/src/panels/lovelace/editor/card-editor/hui-entity-picker-table.ts b/src/panels/lovelace/editor/card-editor/hui-entity-picker-table.ts index 6c2525dcb117..997a4ec22dac 100644 --- a/src/panels/lovelace/editor/card-editor/hui-entity-picker-table.ts +++ b/src/panels/lovelace/editor/card-editor/hui-entity-picker-table.ts @@ -18,7 +18,7 @@ import type { HomeAssistant } from "../../../../types"; export class HuiEntityPickerTable extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow?: boolean; + @property({ type: Boolean }) public narrow = false; @property({ type: Boolean, attribute: "no-label-float" }) public noLabelFloat? = false; diff --git a/src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts b/src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts index e633861493cb..7745be4b80e1 100644 --- a/src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts +++ b/src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts @@ -29,7 +29,7 @@ export class HuiUnusedEntities extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow?: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _unusedEntities: string[] = []; diff --git a/src/panels/lovelace/editor/view-editor/hui-view-editor.ts b/src/panels/lovelace/editor/view-editor/hui-view-editor.ts index 29aa461de2d1..b693848a8d2a 100644 --- a/src/panels/lovelace/editor/view-editor/hui-view-editor.ts +++ b/src/panels/lovelace/editor/view-editor/hui-view-editor.ts @@ -26,7 +26,7 @@ declare global { export class HuiViewEditor extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public isNew!: boolean; + @property({ type: Boolean }) public isNew = false; @state() private _config!: LovelaceViewConfig; diff --git a/src/panels/lovelace/views/hui-masonry-view.ts b/src/panels/lovelace/views/hui-masonry-view.ts index 58ebdbd21607..16f3d60882f6 100644 --- a/src/panels/lovelace/views/hui-masonry-view.ts +++ b/src/panels/lovelace/views/hui-masonry-view.ts @@ -44,7 +44,7 @@ export class MasonryView extends LitElement implements LovelaceViewElement { @property({ attribute: false }) public lovelace?: Lovelace; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ type: Number }) public index?: number; diff --git a/src/panels/lovelace/views/hui-view.ts b/src/panels/lovelace/views/hui-view.ts index 96c5dab6017f..1d78c5e7a827 100644 --- a/src/panels/lovelace/views/hui-view.ts +++ b/src/panels/lovelace/views/hui-view.ts @@ -47,7 +47,7 @@ export class HUIView extends ReactiveElement { @property({ attribute: false }) public lovelace!: Lovelace; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @property({ type: Number }) public index!: number; diff --git a/src/panels/map/ha-panel-map.ts b/src/panels/map/ha-panel-map.ts index e190bd7e2960..b7698ca18608 100644 --- a/src/panels/map/ha-panel-map.ts +++ b/src/panels/map/ha-panel-map.ts @@ -14,7 +14,7 @@ import { HomeAssistant } from "../../types"; class HaPanelMap extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; private _entities: string[] = []; diff --git a/src/panels/profile/ha-panel-profile.ts b/src/panels/profile/ha-panel-profile.ts index 9e82e842df5f..932163a92812 100644 --- a/src/panels/profile/ha-panel-profile.ts +++ b/src/panels/profile/ha-panel-profile.ts @@ -38,7 +38,7 @@ import "./ha-set-vibrate-row"; class HaPanelProfile extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() private _refreshTokens?: RefreshToken[]; diff --git a/src/panels/profile/ha-pick-theme-row.ts b/src/panels/profile/ha-pick-theme-row.ts index dc1eee70155f..5f955a16dd01 100644 --- a/src/panels/profile/ha-pick-theme-row.ts +++ b/src/panels/profile/ha-pick-theme-row.ts @@ -30,7 +30,7 @@ const HOME_ASSISTANT_THEME = "default"; export class HaPickThemeRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean }) public narrow!: boolean; + @property({ type: Boolean }) public narrow = false; @state() _themeNames: string[] = []; diff --git a/src/panels/todo/ha-panel-todo.ts b/src/panels/todo/ha-panel-todo.ts index ff111118894f..448798a18772 100644 --- a/src/panels/todo/ha-panel-todo.ts +++ b/src/panels/todo/ha-panel-todo.ts @@ -59,7 +59,7 @@ import { supportsFeature } from "../../common/entity/supports-feature"; class PanelTodo extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean, reflect: true }) public narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @property({ type: Boolean, reflect: true }) public mobile = false; From ca68eaab38b7b9b7d3f8985315defbb49b1275a6 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 18 Jan 2024 17:05:25 +0100 Subject: [PATCH 173/361] Update cast idle logo (#19443) --- cast/public/images/nabu-loves-hass.png | Bin 0 -> 9994 bytes cast/src/receiver/layout/hc-launch-screen.ts | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 cast/public/images/nabu-loves-hass.png diff --git a/cast/public/images/nabu-loves-hass.png b/cast/public/images/nabu-loves-hass.png new file mode 100644 index 0000000000000000000000000000000000000000..b30f616d55e3ec581916eeb120692495210775a5 GIT binary patch literal 9994 zcmeHtS6owB)bB}%f}#QsP`+6Vm?|UGeoU`{@Yp?QO=GzYLXmk#Yfqy&v&N-qXh<`8l57spp$%Y^q$jrp(a!C68pv$A{lNmHR zt@fPxKdZ5N`5#3!SG^Et)wB;P%1l}v@3UI4lS6Hf>U-+k=%&XHQ%T^j;1it{^wZ_9 z_irc|rjj(O&*#TD1;4xVB6GJxoRJsf>NozKC26_m^2b6cXEF%puR^Dj-(uQy+9!FQ zT=%@Z#;D9;^|!C2qvHmv1C=1?`)J5C41yev!T2DX1ONN+|Dg_26G*(!RJGDqF?*k_ z#kRTn(y}F^Q^Q}Do6u%bb@SvQof1};72ZGlN{i26wJl~l?uX~c8w!+O`N_2SZ!D(0 ziej(X`^4+BtqT_Y=mW(!3Xh@mi1fvtDv1S#r|u}NWL~{SrA{~gzzcV{;IK0Han|+a zcUd95@q@9S++X>g_-R60m-jTwO#5YlvU;C7Mo2uJvKz*yN{UWdYt`IXaMz-2qz)!) zPO=Tq-Cp=2#ZY&cF9SoM7H(x4-GU3s@W-e02dW{6B3)19ziu0f)Ec$@u-mE8&krv6 z=1R#(#j~-hkFVrM-#B`*w#nbWwjPub>v6;qf_GQH5BJxn+;7F^F|u8)?!53;aix{osg#1UyO7-}=Ja7GOtdF=?AHY(y8_J2@U+-4}Nso`RM1oFm z2=oD6%SL#G5DvMhL1&zv)`^=6AlRqz+fU2@>QCei&4SA*ixUBa<3fB{?)>|w$}$^i z^R858Oi!whujb^YGD)%`IF*!lz?YXXLs9bE2N#?w$ZV!Ho^Rh4H1=icRb|>(dVga> z3WUJq>U{d0(1mX8J#SZ@cD$<~0Q;2@>AWAl+XKQ6-CA($VK6P4Km2wVu6fwy?C?I3 z(}GfS9UM5Ok0`~1?Kfs5oGc@|21X{3X@21ffsM3A^uzVKyY)bNn%C>X>{O-^dcq%d zv{#l)l&(}u=>tmCN}F$;G;hDq!4ItAqnVc-+A_4f1`&Qle}O&89jPZ^EIT&o4I)hXcMG~l4p!N8Wcyy_J1_(AiPz{MldQz zjggn{8|9HH>Q(5WH*(!CfYaTBc=l^|4eN)YbV6(xP> z7y&|5&xKFJrgmppTs{L9mtVv{m}^yz7akntLuP-qGZ#P>WSKI6DPRCoPG zDxeABzWn!*ohR{=S6lu+)DGzG?&5(05&_xUHLDQhq5#35qjDf2U0X~7{EdKcWwsb- zV-f^%oT$w<7+*kQ;z4)n{WF)1!Lu8r2aYQ`XEeCX>mAiSok+a6Gr)+78NCtHgYwB1 z?M6k+7k6)SPgTx6l~>}wr*bI=R57D#?zRWs%0T$GQvgp$m3I<)D=%Xp2OwTRhVMY@ zM|W_tXMlL1IEgoV#kG9X!W(?MMNJTQRnh0oC0- zals*BE-5q0>WYd!^c--hcL3VYxV9F58<>L1Q&SuMx!PcWinLrQW(}%Km=R@$i@A=E&ua@?gwv1Pv<1>&2p>o?t@Ho6G{d&_% z*Ug>Gg5hy%fn(B zgrLnmW|XcV&W|_h*OXWDGp%)PqMCi8Yn%42iUco(-XSNK}a7*&F?!V`vj)c1U}XcHPr<(t!>^Ri^1>9UxYi$1Q@mJ?Ir zBm0DYT8u1e0?9hVYrpybF2~ji>+*K*#jSR^X{VXc(DzMmJ*H^VAE-x33*+l#Ij?s; zcx8BQSvsM%xE(t_F25Dz8#uky=6kfy1nLr}T33sy?IDl9|5n;J9&7AZvMS>(0}nG| zTOQbDx}`_K>W+~)D!=WLIjm!oFES7^89iPrg&tdm(`rE)l(Wqz9M-g~gnr%{@%`ea zyH*u@x%1(%}k!+O{`RT@E1!*EMHbre0uMK5EDm#s$PJ5s5R#Hi)1Y zCQ)saNfgBEABLu5Ct_)5@6l>qsM_!z3xSJw`Q{LGts7Q!twZoIbEs=a)UTWRqx^c+ z;h!c7doAz$4Nh`#+DOzAQJx0qO#Y!G58W#J;8#kxu3k8Ee0ojZvuyD46+}6KNqnFE zXMr4ai{xGttiCYXb6Dj^`SD|Lr!#CzM?bD?QbM@WHaG3+r}Q&Y;r z{<}=##Uq@VEF2G+9FBx3B3aRdo( z-g&_e`s;PoixpC=@m(L*uc4W)`(4Jz?j|9hW>yZu= zVSxRMX!2kB|FY*pPQ0$#@1{Fa6eRmpR|tCvvkxmQTRiRsQx~&jdp9N4hqnf)3Xk}j z3yk`v%?~H-#kD%4qbBDc85&q30Eg8-9Qb?T?yp}L{uaRwM9&Xb1Nw=LsH?h_i3l0> z(Ype_%@9A#*p|6}EclfV>3&OTBz`mWZ&itcWT~q|Cc~!SFgr(mPb117LDvtbiAd60 zjKX__jo->}USF2rN~GY7`1njiNr!eEfaDsfuA4O9W!&mS5_afh;v2)PkrQ%w3XOFP%*G$6PQQM`H!zp+&c+N8!`+@~ z;&!MFx^u*b@iA6E@%pP(!N)cqQjv76Gwi`+b^Lukm?6eh}nXl|0f~K-?F%w9%>)ue6ya$n-`8B-#+q}EPJtr!v zLO}Qd2twTjMhkn>51b%oe)yjip(C8vkI1Qlczzj3EW66>DrsFic`TK%GBB|g`|1xK z&bpF2HaQN(9*Yc}UPZ|#e@;ey&X=wZ(^lldEMbLeO1!%m=}Oh+Q?aBaQ-7#zn{yAx zHryV0dF@{YRf2f5Jmm2vy1s1Um4N+c*EZ&Dng#V?0ZO#sZNczA>i;d@8~v4YiBfXcx94t4Gw{oiBJKDmL?IaJ^O zTa{A#z>52+<=KgU^jemd*kJq~o)T}jsjLvHFe1?BQ@08!9REMtJrtInzD2=GXLvJK z|8wN$Cv&)aNwaiD@58w9Jde1^=}RpuRp2`MVSL0$*4De!T^IrCbG_99@o?AXW?TF(E3k3jCuqsFb5Z*+4uG~ViZ6lg|A7EoVg-d}R5HCO~Lct@$scL=_@6D(K={xpeFI6AJdPWI{u00lz(%}%s zxTlyAlWy%BZrpX)N!tU?$bBo)06>$btk0_|+-)E^X0@kkFYw?14Nm0unLIyJVcf>84mxQ(QJ9MMf%N% zzDJ|^u;i*5lrz#!&3Lhu&Qlwu`-kB;lht=k(ID{BU)R?A;N|I)CWxWe!LTEo z>{B^J#SK4VE+1E85?HgC%$C_H$A%q3+9Z1qs7d=Jn50sr<& zq#-viqDlID%T5_a_Zmo4Md7d6JDtVdwPls?(`HbN;hRivw}o5*da^vqpp039^-lkL z``h>itD!;q9_6O)dSUwnuj>+x9q#dm9ly>kbXF1QJ#gl|`bHE%Z~feQAW^ebRnAaq zmuYUGZsp1!6T1_{%-cKnf|f1hq^L`mUKT4mUbQA+5QJ@sdWaDk@#3faCcs((mJZboodfOIz<7|=f z!|#Gvv*jPG@x_782M0v68A3mEq4Vz#IFW-((&Yg-M4e(X#d@GU6!(ex3sFuQ-djV3 z!Akf70j_|AUVWu~Z$5zrOw~}M1x0YK$qe^pY<#3K!fJZZ-gMvo!*wwYKX~1m#Udez zduW`#Z5Z3KHfY@4)p7XtfYRc?XHR+10NE4O(C;rq3YCH6dc2!{85uc5EVG?KHC3R?o>3m^_I8vyOZDdqeWa zI-i#}bU1bV$=|T4BlO_loHg(ZsIen<}$rzEmUgu5Qoc2PLt3lV+1hfyL3^7QyWUHsW&qS}5 z;b-xlJ!A!TbD2}oUvlD}$3Y=c@bp_W|M#q&Ks^klN}>a~8L_{E`Fv6B@?)2cui z6tHR+U!}I2_p|{6wMn>&{kCLFww29NREh>$zvWm-%+R*R%ZTOS0+TIKzmB+6I|j_c zI}*tS#m_(yYh2n`VphJe;u(1&hhY$ug^l#FTHL(q&hi?P1wQj-Q#LJVFE-$Ej%@K0 zr-n8T?6Nt#(?6qkkB=>+=@f6Bn8|}{62`8YD9RSw!uIE3A=|y!)$_A*#Tu}m5;qM| zm_3lF1-tW7L0rQRgj+Lx^2csSgxg-Ijl^>{{8w~_PI>bqp`##aa?A*1puN^!)XA*b zg02|Is~nr9q|XaI1`nmImJQ9@Vf@R6Y3=JjZk~afXQYwd98U?>3#lA+PP#7`WvzCv zb4#5$)ec$eH}u?w4RLZ}ZS2jbn_m-<;fEmi`F^S?IFt`zJ~nISeHo}#UHp^@)Gi+6 zA);BEXyzd^emjs?o^>0#4JD~_j8=Hfh9q{GF7A2o$`XYYZ67tr9k{dNkzF|gOSw*3 zg^+<(ilK)nN|#QA6t3DNI)JWtU%4v=X9B^`UtOXCS-O+5+E{NK{mV8?=ac%2SvDsj z;-}usP5#m*b+bsd{c%C}hMn_43xDNm!74p zQ6o>QaIn=A8>VhZzM~Eh;m6&>dW0OHyH{NAOA1-(Qo|? z4%{5d9IUw0iDxj%F3vo$;IxGpc!YVovp*jrWJIvj z#3uC{UFKS+>nbLe(jwMQqy0axU+mYG{8cHy2%NdT{7pqKMNukq@XKI@L9i@JAFYSl z>V8-i6ydI-Yth8K5zd)Ja?xa&&_RuQ;%~9USa72E*Z-D(7Z-FlbB*Mocnv8PmEP^K@Ey{ zf!MgNGn$A*^$$altLwZI2eHD|df~?mH`qLAY*yis2oY6eR(hK@eBQ6YAb+>j-0V)8 zW9Y_rdj9S`SbwuD2N)s+Ocz;xGuLCBNvwkQ46jkUrH_fbkRGRT^_ZiDuOEbAehFB+ z=Qdm&=!&L?^|XnqHiYYq8{qwd6)LWJ^Y9~ap_mWC#>3z0?@WX|>n2B&ghvnDwqtBz zaO?ekH&nyBlEp%PnG!vYP!5N%YSZbxFEVuMIJK@~3lqIM^}o#tWu>gDksS5N>Nvi8 z%?bRK^A=+6N6et|mhM<-MKH?}Od;uDt$aaRc_J@v=9)6flIXq!5=`CqOV_f!MMGzk zHQQ}24sOl%pJ9JEG*_TpR|7PiGkPm8Mh_4|?+ll)aB-rxRU93`&)`8!{6gEM2A(`H6 z+NH1qETO&db?va5CGl$G_(A?93}MLO;bnh6Aee7=>o5B0^v^dl<c*c2$dVmPd#^O9LPC^*-__}LzeR7$8TLD-9!Bx7#KKL^%X z9*};H6K(Iyo3EroYw4RT_g|NLup+%{TR&2Sh`DZT`E`PyErb?LB>7naj6PBJ|LEQ{1>*I`-g z?%Rj;b*@Q8*+p_x-og27($M79E5s4s0J-(H{vM0?&YcQ8emPt+_o06(z-qJQx{TTG ztWDyPAfeCPEK#Q%1ifhlRlrndUAIEZ)hi<<0+L_t+a=n+<-|>*1teLQYuW!-%`YM* zJYd;BvS>}K&&;YDouiph@^A@bYx3>;GGW=JiSjNXN&ZC<62N*1LLz9GM|RsE(2wUJ()TD;^ShFb=Ij&aP9VE`?&8N zXLI7nA~!jMlv=D7CPu2jRqP}iBE|J=F}Q;fTl9ob&b!{0zNYbn(B)s(x?Q|a6){;g zL<+6nBP-rVzR0EO+16^mc$@o>X(!~RjHpVZm-xZnj_1le)+ho&UK?~=NE=+F53-hX z>1TAfN67JEk>~rKj1@3^s>n20qATota~`feQ3{@2jDDx|UJ&#p=qKdpNon0@6+`4i zYF%WOAu*V(Kv8KLY)v%aNvT}kEn}u9bREV;Yh`5>pZQUMqOPd@?;kO*8T1L_z$_TL zi3eEweV7$*Xwwv?e3v;}J_4%*;gkTvNe7y$DAEsl`MEoni!vyuhNKnQX!3%R6z)j@ zh?;#9ubF7O<=@95sx@Mnvk%J=!(hq_O%*9hudm7ticW)OZ*AmQHgh)K4lxY;B#1EB zg@!t;QS0Z|MJhF0{q~I%p{@wwcH8stsEVNsY$MkScB@MyF=w+h2YCIi%26sT1UiGc zlO_zNCc4k(r7lR^ROXO>N%=SD^lf$YF}d*`-9FV%e?KBe-nIn2C##I& z&|qw>K|0zj^2EcQh!d0zP|CzO-u|%Q2|A1;^d6Kq%O8wJAPC2tttsC&Op><;5f5ny zV>f%=LIX}N7%iV2JW$gk@~P6Jka#&BmXdpczxvf~^?`QdmL}BkD`Gfm_d^v>8oGVZ z+l!7H!YsN^3tc(!X)}EO-RMZs-U9xHW(-h>=-glz&uXvJBJHUDX(ji{EW;2ayZdD# z?52p|n+~gK*hcEB2D+xg@JtmEx%|Fah$p3A$(iUr@13KZ$p$CaVtpih0zH z28I@arg=QYj@!cDtx7=X^8NwdM4jp&eQqn-h`?sJq3x2n*{+?sG0%?dDFzL zB@;zW%xPer6KFllQ@ozb1TU|kiJN(=kOmhaR%S&92qYCSFsaU6gQduWl%7neb;az# z>GU4eM|yM1;4{O!9+4MjOn_hn=i~Z_hFBM$Hr*2Bf8}rA9s@YN#~XAQ6Z~VCUnd}U z?-D?r#idTAvFn*=Obr-(6|qhUv|=8(*#j}x zj6wh7Zvaw3WbtPIUM>$#|Ll6s)@)SxiWa#Yl=zjC2R@+4Sf!#`wA|K>X02o&uI4z} zju>22AFzEe80IO2l2(sFrll7!kimSJlGaLJVtiJA7(nN-Pory~;UcGcRt%ai*)I-$ z$wu*u3P5m^=vAVzd z*2a>1d?u263?#7><_-^$7%jt zT8-zVG+vOl2j(&i)P%$*)gvP(?o1n1U;Vf8K<@1)*L`aN-S}oV<@j*)M2?5peaL0y zeK$FB=37uPbGE{Y*Np%&r?-a$9&+*1kn-*IjCcgNVlxC9r`2wO^e^-Z{SU#tlelmkK>N+8U2l%5w>(jaW z*1!V1j2Iepa=8+%bPvB?m3E!9{z7=+mK3OwF4#g=Cq3?@^CKpH)iOtAOk@-;b0wUF zd+*>W0k0ZYs3nwNNE4aIcA%l70C=-1QD7^+JIE(7biKc4-c|dg&}Ug&Nt`f<2XXH0 zICX4mEZ_AD2)ApuHI}%y=Gw>QJ({FT(Ub+{*S>uesDeuMG9{KHI3=J8V91l03l=vG6?#D`M z&t8q^=?BqaAKft2e{`)G?k5dSTAsFoZ*Pu~`F`{LOvTl&3>!^zfsPxp#XT{by@EL2 zj(fxFu@w(cagWbrZ&zu4OM3=fWWG`P%d_&qg5poDAwlfT{rCDx{Kn}LT|h(*!(t|2_dEjq0@{9PhNZ z62?23X(s4h3QAkpi_ZYRDCn;*Sg#%}asTl8?vkA4zDzJ#miFePF+cJ>)TkN>P@-57 z<~1XJjlWXID^YvM{0Fw&=03N=q8se`sZ7s~v*KiqL`~qV-SmN<4<}+q(bV5+;j20) z9wra{6`>v4=cav%NEbNAD4A!wGBmP!Bs#Dm>@h=j%hoV+GJfL}b}hJqvq58L(YDr( zxxaN3s~6qDeQ8{|dl!Vffspy%kN?%d|Fa)(3 Home Assistant logo on left, Nabu Casa logo on right, and red heart in center
    ${this.hass ? "Connected" : "Not Connected"} From 6a95177b32a8dbae53e9f25e21a7fee56bf556ae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 14:56:50 -0500 Subject: [PATCH 174/361] Update typescript-eslint monorepo to v6.19.0 (#19447) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 27d46263b1e7..863ec1e76fea 100644 --- a/package.json +++ b/package.json @@ -183,8 +183,8 @@ "@types/tar": "6.1.10", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", - "@typescript-eslint/eslint-plugin": "6.18.1", - "@typescript-eslint/parser": "6.18.1", + "@typescript-eslint/eslint-plugin": "6.19.0", + "@typescript-eslint/parser": "6.19.0", "@web/dev-server": "0.1.38", "@web/dev-server-rollup": "0.4.1", "babel-loader": "9.1.3", diff --git a/yarn.lock b/yarn.lock index f5b253c30386..f454ac75df42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4524,15 +4524,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.18.1": - version: 6.18.1 - resolution: "@typescript-eslint/eslint-plugin@npm:6.18.1" +"@typescript-eslint/eslint-plugin@npm:6.19.0": + version: 6.19.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.19.0" dependencies: "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:6.18.1" - "@typescript-eslint/type-utils": "npm:6.18.1" - "@typescript-eslint/utils": "npm:6.18.1" - "@typescript-eslint/visitor-keys": "npm:6.18.1" + "@typescript-eslint/scope-manager": "npm:6.19.0" + "@typescript-eslint/type-utils": "npm:6.19.0" + "@typescript-eslint/utils": "npm:6.19.0" + "@typescript-eslint/visitor-keys": "npm:6.19.0" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" ignore: "npm:^5.2.4" @@ -4545,44 +4545,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 451abba1f784539ba38cbe40af26c461facd848e90cbf0c440a98ca2a770ff74a794bafe1df7240e52a97e7cd72bade97d5de751dffbac269643460ad65e3b19 + checksum: 5ed8483d792c4bc6ed697159c84a47ba5c35cd124949883813f2053b972537de3900a7ae26d4d6f370194f2cc7929baa2d09268e0b90118f20ed961cf6c176b9 languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.18.1": - version: 6.18.1 - resolution: "@typescript-eslint/parser@npm:6.18.1" +"@typescript-eslint/parser@npm:6.19.0": + version: 6.19.0 + resolution: "@typescript-eslint/parser@npm:6.19.0" dependencies: - "@typescript-eslint/scope-manager": "npm:6.18.1" - "@typescript-eslint/types": "npm:6.18.1" - "@typescript-eslint/typescript-estree": "npm:6.18.1" - "@typescript-eslint/visitor-keys": "npm:6.18.1" + "@typescript-eslint/scope-manager": "npm:6.19.0" + "@typescript-eslint/types": "npm:6.19.0" + "@typescript-eslint/typescript-estree": "npm:6.19.0" + "@typescript-eslint/visitor-keys": "npm:6.19.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: b853d39dcf886668f9aa9ea12094e722d35be20855dc7f01c80ee847bf4f7e27aa74693c3a33d4d813705214bda28be1d6c7ca29e590233f894f556203171d29 + checksum: 0c6280a69127cf521b3403be9877775eecda2b2e4e44a67874b0d9cf82ed95a7971dac2db633e55ec22f8026da2681137110b2924313421a22b7c03eba8cda67 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.18.1": - version: 6.18.1 - resolution: "@typescript-eslint/scope-manager@npm:6.18.1" +"@typescript-eslint/scope-manager@npm:6.19.0": + version: 6.19.0 + resolution: "@typescript-eslint/scope-manager@npm:6.19.0" dependencies: - "@typescript-eslint/types": "npm:6.18.1" - "@typescript-eslint/visitor-keys": "npm:6.18.1" - checksum: ab75663cda67a2c95267f240f2e062a0aafab0df6d625043a134c8e1d61e193c0d3cfa49c802bd554b3fd80f4b7df5ea3f86ef2eb6994ba8b5e0790cc9868c84 + "@typescript-eslint/types": "npm:6.19.0" + "@typescript-eslint/visitor-keys": "npm:6.19.0" + checksum: d36c51c05e14c51ce13181120eeea46d1edd59ed1ff16dc4ec1f5532a975b5faec5c10a373aaa90545f82a12330c6cba18ecedc734e18288f5874855c48ba808 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.18.1": - version: 6.18.1 - resolution: "@typescript-eslint/type-utils@npm:6.18.1" +"@typescript-eslint/type-utils@npm:6.19.0": + version: 6.19.0 + resolution: "@typescript-eslint/type-utils@npm:6.19.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:6.18.1" - "@typescript-eslint/utils": "npm:6.18.1" + "@typescript-eslint/typescript-estree": "npm:6.19.0" + "@typescript-eslint/utils": "npm:6.19.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.0.1" peerDependencies: @@ -4590,23 +4590,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: f775011c35aef10b11e7cffde698fca8b06b313785cd44422c60a40b6643d85a38cbd9a3cbdef011d963680d65383c40988d983e9dfd01258ae50a2f37f6d293 + checksum: f1f20ac28c03dd18546050b63ec0b0fd8c67780265ccb9ef566f16441c3de5deb2607a6046fefdebe8a43ac11fecdf0b009f8e5f70a3d15916d855be74b0f3bb languageName: node linkType: hard -"@typescript-eslint/types@npm:6.18.1": - version: 6.18.1 - resolution: "@typescript-eslint/types@npm:6.18.1" - checksum: e304620953257a5af3b323697845d3fb41ffbb7944df2f84559675ef8ad71cc33011be30149efd8d34c5dedcbe92c6abee67cb1b95cb3dd56f15b9393b3435a6 +"@typescript-eslint/types@npm:6.19.0": + version: 6.19.0 + resolution: "@typescript-eslint/types@npm:6.19.0" + checksum: 396ad2ad9f2d759dd87bc880a1ffc9d11fda04db8af9402abb4e8eccd58c01fa2d26e38b186526d0b457012f7c912e7afdab2a3798a73aa0ae34abaf50d617ae languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.18.1": - version: 6.18.1 - resolution: "@typescript-eslint/typescript-estree@npm:6.18.1" +"@typescript-eslint/typescript-estree@npm:6.19.0": + version: 6.19.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.19.0" dependencies: - "@typescript-eslint/types": "npm:6.18.1" - "@typescript-eslint/visitor-keys": "npm:6.18.1" + "@typescript-eslint/types": "npm:6.19.0" + "@typescript-eslint/visitor-keys": "npm:6.19.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -4616,34 +4616,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 33307bc87c3270f84f149545da79a15afaafacc5671e42f4aa827947f09c35ed114705f108ffa59d6ab175f8b838aa08cf10f9efe5b7793aca0792f879bbc7ca + checksum: 06e24bb145a302299a6cf86b36652bd4d7080c4e88517ebc24bdc137c57425a68db256ba628ce16b568bfec8020ae2a748ccee93e304efeded329cb3292b17bf languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.18.1": - version: 6.18.1 - resolution: "@typescript-eslint/utils@npm:6.18.1" +"@typescript-eslint/utils@npm:6.19.0": + version: 6.19.0 + resolution: "@typescript-eslint/utils@npm:6.19.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" "@types/json-schema": "npm:^7.0.12" "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:6.18.1" - "@typescript-eslint/types": "npm:6.18.1" - "@typescript-eslint/typescript-estree": "npm:6.18.1" + "@typescript-eslint/scope-manager": "npm:6.19.0" + "@typescript-eslint/types": "npm:6.19.0" + "@typescript-eslint/typescript-estree": "npm:6.19.0" semver: "npm:^7.5.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 967728f062ec7ef434b9d05af6b45ae59e0f8f314e4aa7cefc8e2c30a277cf269b7913f3e9f8d26a86c3faf8b2c9385ba1221cfcd856e9b228421fc6508b41bc + checksum: 4080c36331204ffef9f218e29f43da767f17551fa4d3877c3d3b49194f7c7382dd9ae2124e7b5ebd47d5556946bb6ad195b47d7d215553efabacdebf81b9e74d languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.18.1": - version: 6.18.1 - resolution: "@typescript-eslint/visitor-keys@npm:6.18.1" +"@typescript-eslint/visitor-keys@npm:6.19.0": + version: 6.19.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.19.0" dependencies: - "@typescript-eslint/types": "npm:6.18.1" + "@typescript-eslint/types": "npm:6.19.0" eslint-visitor-keys: "npm:^3.4.1" - checksum: 2d6c5ffa52e89caec0b4958d7079fb4ca9f17c19b5f5d5b8446b4eef0079fd59cd9959f469cc13c4e7d72ef4c47849e561fe323f3cebafa01bc916d43082e57b + checksum: 8d51c0b8d94c5df044fde958f62741cef55be97c6a3a16c47e4df9af7b2ff13aa1ee03ca5240777481dca53f3b7a9b00b329e50aff5e3ad829d96bc5f63ca2c3 languageName: node linkType: hard @@ -9571,8 +9571,8 @@ __metadata: "@types/tar": "npm:6.1.10" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" - "@typescript-eslint/eslint-plugin": "npm:6.18.1" - "@typescript-eslint/parser": "npm:6.18.1" + "@typescript-eslint/eslint-plugin": "npm:6.19.0" + "@typescript-eslint/parser": "npm:6.19.0" "@vaadin/combo-box": "npm:24.3.3" "@vaadin/vaadin-themable-mixin": "npm:24.3.3" "@vibrant/color": "npm:3.2.1-alpha.1" From 99a365fb499e2201855380a81a34ffef96e02ea4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 00:45:56 -0500 Subject: [PATCH 175/361] Lock file maintenance (#19451) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 286 +++++++++++++++++++++++++----------------------------- 1 file changed, 134 insertions(+), 152 deletions(-) diff --git a/yarn.lock b/yarn.lock index f454ac75df42..84c68fc0123e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -175,6 +175,21 @@ __metadata: languageName: node linkType: hard +"@babel/helper-define-polyfill-provider@npm:^0.5.0": + version: 0.5.0 + resolution: "@babel/helper-define-polyfill-provider@npm:0.5.0" + dependencies: + "@babel/helper-compilation-targets": "npm:^7.22.6" + "@babel/helper-plugin-utils": "npm:^7.22.5" + debug: "npm:^4.1.1" + lodash.debounce: "npm:^4.0.8" + resolve: "npm:^1.14.2" + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: f849e816ec4b182a3e8fa8e09ff016f88bb95259cd6b2190b815c48f83c3d3b68e973a8ec72acc5086bfe93705cbd46ec089c06476421d858597780e42235a03 + languageName: node + linkType: hard + "@babel/helper-environment-visitor@npm:^7.22.20": version: 7.22.20 resolution: "@babel/helper-environment-visitor@npm:7.22.20" @@ -1816,13 +1831,13 @@ __metadata: linkType: hard "@humanwhocodes/config-array@npm:^0.11.13": - version: 0.11.13 - resolution: "@humanwhocodes/config-array@npm:0.11.13" + version: 0.11.14 + resolution: "@humanwhocodes/config-array@npm:0.11.14" dependencies: - "@humanwhocodes/object-schema": "npm:^2.0.1" - debug: "npm:^4.1.1" + "@humanwhocodes/object-schema": "npm:^2.0.2" + debug: "npm:^4.3.1" minimatch: "npm:^3.0.5" - checksum: 9f655e1df7efa5a86822cd149ca5cef57240bb8ffd728f0c07cc682cc0a15c6bdce68425fbfd58f9b3e8b16f79b3fd8cb1e96b10c434c9a76f20b2a89f213272 + checksum: 3ffb24ecdfab64014a230e127118d50a1a04d11080cbb748bc21629393d100850496456bbcb4e8c438957fe0934430d731042f1264d6a167b62d32fc2863580a languageName: node linkType: hard @@ -1833,10 +1848,10 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^2.0.1": - version: 2.0.1 - resolution: "@humanwhocodes/object-schema@npm:2.0.1" - checksum: dbddfd0465aecf92ed845ec30d06dba3f7bb2496d544b33b53dac7abc40370c0e46b8787b268d24a366730d5eeb5336ac88967232072a183905ee4abf7df4dab +"@humanwhocodes/object-schema@npm:^2.0.2": + version: 2.0.2 + resolution: "@humanwhocodes/object-schema@npm:2.0.2" + checksum: ef915e3e2f34652f3d383b28a9a99cfea476fa991482370889ab14aac8ecd2b38d47cc21932526c6d949da0daf4a4a6bf629d30f41b0caca25e146819cbfa70e languageName: node linkType: hard @@ -2040,12 +2055,12 @@ __metadata: linkType: hard "@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.9": - version: 0.3.20 - resolution: "@jridgewell/trace-mapping@npm:0.3.20" + version: 0.3.21 + resolution: "@jridgewell/trace-mapping@npm:0.3.21" dependencies: "@jridgewell/resolve-uri": "npm:^3.1.0" "@jridgewell/sourcemap-codec": "npm:^1.4.14" - checksum: 683117e4e6707ef50c725d6d0ec4234687ff751f36fa46c2b3068931eb6a86b49af374d3030200777666579a992b7470d1bd1c591e9bf64d764dda5295f33093 + checksum: 925dda0620887e5a24f11b5a3a106f4e8b1a66155b49be6ceee61432174df33a17c243d8a89b2cd79ccebd281d817878759236a2fc42c47325ae9f73dfbfb90d languageName: node linkType: hard @@ -2073,9 +2088,9 @@ __metadata: linkType: hard "@lezer/common@npm:^1.0.0, @lezer/common@npm:^1.1.0": - version: 1.1.2 - resolution: "@lezer/common@npm:1.1.2" - checksum: 2fb13b87c6cd1a33924908e3eb3bf08d9be9a624b32ca28d8dd369bacc7347f1765628353a8cb0d713d81a3fdc4d7939d5b0323764ecd2b926f0ca5255fe89ec + version: 1.2.1 + resolution: "@lezer/common@npm:1.2.1" + checksum: b362ed2e97664e4b36b3dbff49b52d1bfc5accc0152b577fefd46e585d012ff685d1fd336d75d80066e01c0505b1135d4cf69be5e330b5bfec2e2650c437bcae languageName: node linkType: hard @@ -3877,15 +3892,6 @@ __metadata: languageName: node linkType: hard -"@sinonjs/fake-timers@npm:^10.0.2": - version: 10.3.0 - resolution: "@sinonjs/fake-timers@npm:10.3.0" - dependencies: - "@sinonjs/commons": "npm:^3.0.0" - checksum: 78155c7bd866a85df85e22028e046b8d46cf3e840f72260954f5e3ed5bd97d66c595524305a6841ffb3f681a08f6e5cef572a2cce5442a8a232dc29fb409b83e - languageName: node - linkType: hard - "@sinonjs/fake-timers@npm:^11.2.2": version: 11.2.2 resolution: "@sinonjs/fake-timers@npm:11.2.2" @@ -3906,7 +3912,7 @@ __metadata: languageName: node linkType: hard -"@sinonjs/text-encoding@npm:^0.7.1": +"@sinonjs/text-encoding@npm:^0.7.2": version: 0.7.2 resolution: "@sinonjs/text-encoding@npm:0.7.2" checksum: ec713fb44888c852d84ca54f6abf9c14d036c11a5d5bfab7825b8b9d2b22127dbe53412c68f4dbb0c05ea5ed61c64679bd2845c177d81462db41e0d3d7eca499 @@ -3978,12 +3984,12 @@ __metadata: linkType: hard "@types/chrome@npm:*": - version: 0.0.254 - resolution: "@types/chrome@npm:0.0.254" + version: 0.0.258 + resolution: "@types/chrome@npm:0.0.258" dependencies: "@types/filesystem": "npm:*" "@types/har-format": "npm:*" - checksum: 61f29e116cb915ccfee266f43f9235743dee7bd9ce9c736acd35dc209d5be6ca4afc4cf064b45407f5e03ac46d8180e94f2b2c32fb3cd28b21fcd1071a25e2d7 + checksum: 301f60ba009832f8eff232159234a4b73db2d7925eae1b67a1a4687da80d56022430bc722e8c4effc0a12c1868c0bb380e981ef8b6ba744bbe52bf47591a8198 languageName: node linkType: hard @@ -4059,12 +4065,12 @@ __metadata: linkType: hard "@types/eslint@npm:*": - version: 8.56.0 - resolution: "@types/eslint@npm:8.56.0" + version: 8.56.2 + resolution: "@types/eslint@npm:8.56.2" dependencies: "@types/estree": "npm:*" "@types/json-schema": "npm:*" - checksum: 0405403788b9b8b3dbce59b668cdf5f7dc3b3fe5f82a4bf335cd7c936b95df83d892bd70af69f0d4f463125b45d15084dc5c0eeda9982d80ddbd988aa6758b63 + checksum: 9e4805e770ea90a561e1f69e5edce28b8f66e92e290705100e853c7c252cf87bef654168d0d47fc60c0effbe4517dd7a8d2fa6d3f04c7f831367d568009fd368 languageName: node linkType: hard @@ -4221,8 +4227,8 @@ __metadata: linkType: hard "@types/koa@npm:*, @types/koa@npm:^2.11.6": - version: 2.13.12 - resolution: "@types/koa@npm:2.13.12" + version: 2.14.0 + resolution: "@types/koa@npm:2.14.0" dependencies: "@types/accepts": "npm:*" "@types/content-disposition": "npm:*" @@ -4232,7 +4238,7 @@ __metadata: "@types/keygrip": "npm:*" "@types/koa-compose": "npm:*" "@types/node": "npm:*" - checksum: d148fb02aa25cb239d5179211cd66f19275e7fc2563532dd2bc347163332f771dea224b7555209530abf6777afa5b5c7a2d650e752fb1126ce362fbdde4ec214 + checksum: 00bd0dd9f2366eabbd05a9af1c83e10679b4241e69b75927c7653826508c03e9b19b2c03499c5ff6496acbb192f5c0a860b4e95308462e945e2fb79636cbf3cf languageName: node linkType: hard @@ -4306,20 +4312,20 @@ __metadata: linkType: hard "@types/node-forge@npm:^1.3.0": - version: 1.3.10 - resolution: "@types/node-forge@npm:1.3.10" + version: 1.3.11 + resolution: "@types/node-forge@npm:1.3.11" dependencies: "@types/node": "npm:*" - checksum: 111520ac4db33bba4e46fcb75e9c29234ca78e2ece32fc929e7382798cdb7985e01da7e8f70c32769f42996e8d06f347d34d90308951cf2d004f418135ac7735 + checksum: 670c9b377c48189186ec415e3c8ed371f141ecc1a79ab71b213b20816adeffecba44dae4f8406cc0d09e6349a4db14eb8c5893f643d8e00fa19fc035cf49dee0 languageName: node linkType: hard "@types/node@npm:*": - version: 20.10.5 - resolution: "@types/node@npm:20.10.5" + version: 20.11.5 + resolution: "@types/node@npm:20.11.5" dependencies: undici-types: "npm:~5.26.4" - checksum: 4a378428d2c9f692b19801a5a3d20dc4c0ad5d4a3d103350f8b401af439941a9aa5efeadc8eb9db13c66c620318bc7f336abfc8934f82fd32c4a689d85068c6f + checksum: 9f31c471047d7b3e240ce7b77ff29b0d15e83be7e3feafb3d0b0d0931122b438b1eefa302a5a2e1e9849914ff3fd76aafbd8ccb372efb1331ba048da63bce6f8 languageName: node linkType: hard @@ -5315,11 +5321,11 @@ __metadata: linkType: hard "acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": - version: 8.11.2 - resolution: "acorn@npm:8.11.2" + version: 8.11.3 + resolution: "acorn@npm:8.11.3" bin: acorn: bin/acorn - checksum: ff559b891382ad4cd34cc3c493511d0a7075a51f5f9f02a03440e92be3705679367238338566c5fbd3521ecadd565d29301bc8e16cb48379206bffbff3d72500 + checksum: b688e7e3c64d9bfb17b596e1b35e4da9d50553713b3b3630cf5690f2b023a84eac90c56851e6912b483fe60e8b4ea28b254c07e92f17ef83d72d78745a8352dd languageName: node linkType: hard @@ -5705,13 +5711,6 @@ __metadata: languageName: node linkType: hard -"array-flatten@npm:^2.1.2": - version: 2.1.2 - resolution: "array-flatten@npm:2.1.2" - checksum: e8988aac1fbfcdaae343d08c9a06a6fddd2c6141721eeeea45c3cf523bf4431d29a46602929455ed548c7a3e0769928cdc630405427297e7081bd118fdec9262 - languageName: node - linkType: hard - "array-includes@npm:^3.1.7": version: 3.1.7 resolution: "array-includes@npm:3.1.7" @@ -5963,15 +5962,15 @@ __metadata: linkType: hard "babel-plugin-polyfill-corejs2@npm:^0.4.7": - version: 0.4.7 - resolution: "babel-plugin-polyfill-corejs2@npm:0.4.7" + version: 0.4.8 + resolution: "babel-plugin-polyfill-corejs2@npm:0.4.8" dependencies: "@babel/compat-data": "npm:^7.22.6" - "@babel/helper-define-polyfill-provider": "npm:^0.4.4" + "@babel/helper-define-polyfill-provider": "npm:^0.5.0" semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 3b61cdb275592f61b29d582ee8c738a13d9897c5dd201cddb0610b381f3ae139ebc988ac96f72978fc143c3d50c15d46618df865822e282c8e76c236e7378b63 + checksum: 6b5a79bdc1c43edf857fd3a82966b3c7ff4a90eee00ca8d663e0a98304d6e285a05759d64a4dbc16e04a2a5ea1f248673d8bf789711be5e694e368f19884887c languageName: node linkType: hard @@ -5988,13 +5987,13 @@ __metadata: linkType: hard "babel-plugin-polyfill-regenerator@npm:^0.5.4": - version: 0.5.4 - resolution: "babel-plugin-polyfill-regenerator@npm:0.5.4" + version: 0.5.5 + resolution: "babel-plugin-polyfill-regenerator@npm:0.5.5" dependencies: - "@babel/helper-define-polyfill-provider": "npm:^0.4.4" + "@babel/helper-define-polyfill-provider": "npm:^0.5.0" peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 461b735c6c0eca3c7b4434d14bfa98c2ab80f00e2bdc1c69eb46d1d300092a9786d76bbd3ee55e26d2d1a2380c14592d8d638e271dfd2a2b78a9eacffa3645d1 + checksum: 3a9b4828673b23cd648dcfb571eadcd9d3fadfca0361d0a7c6feeb5a30474e92faaa49f067a6e1c05e49b6a09812879992028ff3ef3446229ff132d6e1de7eb6 languageName: node linkType: hard @@ -6137,14 +6136,12 @@ __metadata: linkType: hard "bonjour-service@npm:^1.0.11": - version: 1.1.1 - resolution: "bonjour-service@npm:1.1.1" + version: 1.2.1 + resolution: "bonjour-service@npm:1.2.1" dependencies: - array-flatten: "npm:^2.1.2" - dns-equal: "npm:^1.0.0" fast-deep-equal: "npm:^3.1.3" multicast-dns: "npm:^7.2.5" - checksum: 60a14328dff846a66ae5cddbba4f2e2845a4b3cf62f64d93b57808e08e5e1a8e8c4454e37e0e289741706b359a343444ba132957bf53be9e8f5eaebdebb06306 + checksum: 8350d135ab8dd998a829136984d7f74bfc0667b162ab99ac98bae54d72ff7a6003c6fb7911739dfba7c56a113bd6ab06a4d4fe6719b18e66592c345663e7d923 languageName: node linkType: hard @@ -6291,8 +6288,8 @@ __metadata: linkType: hard "cacache@npm:^18.0.0": - version: 18.0.1 - resolution: "cacache@npm:18.0.1" + version: 18.0.2 + resolution: "cacache@npm:18.0.2" dependencies: "@npmcli/fs": "npm:^3.1.0" fs-minipass: "npm:^3.0.0" @@ -6306,7 +6303,7 @@ __metadata: ssri: "npm:^10.0.0" tar: "npm:^6.1.11" unique-filename: "npm:^3.0.0" - checksum: aecafd368fbfb2fc0cda1f2f831fe5a1d8161d2121317c92ac089bcd985085e8a588e810b4471e69946f91c6d2661849400e963231563c519aa1e3dac2cf6187 + checksum: 5ca58464f785d4d64ac2019fcad95451c8c89bea25949f63acd8987fcc3493eaef1beccc0fa39e673506d879d3fc1ab420760f8a14f8ddf46ea2d121805a5e96 languageName: node linkType: hard @@ -6387,9 +6384,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001565": - version: 1.0.30001571 - resolution: "caniuse-lite@npm:1.0.30001571" - checksum: 04f53b9a74776c9214476314613af95c62c43a9ddbc2ae555e176e896cc312110f9b74683f278fd07b8b83ab8ef6bee87b88f466df6ae560461a117fbd678b69 + version: 1.0.30001579 + resolution: "caniuse-lite@npm:1.0.30001579" + checksum: 2cd0c02e5d66b09888743ad2b624dbde697ace5c76b55bfd6065ea033f6abea8ac3f5d3c9299c042f91b396e2141b49bc61f5e17086dc9ba3a866cc6790134c0 languageName: node linkType: hard @@ -6950,13 +6947,13 @@ __metadata: languageName: node linkType: hard -"cookies@npm:~0.8.0": - version: 0.8.0 - resolution: "cookies@npm:0.8.0" +"cookies@npm:~0.9.0": + version: 0.9.1 + resolution: "cookies@npm:0.9.1" dependencies: depd: "npm:~2.0.0" keygrip: "npm:~1.1.0" - checksum: 5da4d72ba81c2740511751ac8ea9506e10e2366b9ad3360333581e4667fd8d063d02c5be0bef16177de3e366b8128ed2b72921e2952c79cbca084d177e529bba + checksum: 4816461a38d907b20f3fb7a2bc4741fe580e7a195f3e248ef7025cb3be56a07638a0f4e72553a5f535554ca30172c8a3245c63ac72c9737cec034e9a47773392 languageName: node linkType: hard @@ -6978,11 +6975,11 @@ __metadata: linkType: hard "core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1": - version: 3.34.0 - resolution: "core-js-compat@npm:3.34.0" + version: 3.35.0 + resolution: "core-js-compat@npm:3.35.0" dependencies: browserslist: "npm:^4.22.2" - checksum: e29571cc524b4966e331b5876567f13c2b82ed48ac9b02784f3156b29ee1cd82fe3e60052d78b017c429eb61969fd238c22684bb29180908d335266179a29155 + checksum: aa21ad2f0c946be7a8ecef92233bc003a38fa27e43a925fcd9b79e32ae49b879e0f5c23459ffc310df38ee547389b8e5e43a6a8be0b2369b9b9ebf3d04ae69b9 languageName: node linkType: hard @@ -7402,13 +7399,6 @@ __metadata: languageName: node linkType: hard -"dns-equal@npm:^1.0.0": - version: 1.0.0 - resolution: "dns-equal@npm:1.0.0" - checksum: c4f55af6f13536de39ebcfa15f504a5678d4fc2cf37b76fd41e73aa46dbd1fa596c9468c0c929aeb248ec443cb217fde949942c513312acf93c76cf783276617 - languageName: node - linkType: hard - "dns-packet@npm:^5.2.2": version: 5.6.1 resolution: "dns-packet@npm:5.6.1" @@ -7512,9 +7502,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.601": - version: 1.4.616 - resolution: "electron-to-chromium@npm:1.4.616" - checksum: 7793eda8ebfb66621300339fe830bc2b1658530b9e295a7aa37ef7fc1ca7defab4070cf407977f9112d784004a8e2efdcceb793d7e0a81096a7eb06c844db0ba + version: 1.4.638 + resolution: "electron-to-chromium@npm:1.4.638" + checksum: 52e9d99e84756e403efc53d44b2747a6082df6e33d2a035b9bff9d72006ae5f02c2f4c59ef91345626e90c8c6f5ad3d2dda4a7d32a7194427f18861443882d93 languageName: node linkType: hard @@ -8679,12 +8669,12 @@ __metadata: linkType: hard "follow-redirects@npm:^1.0.0": - version: 1.15.4 - resolution: "follow-redirects@npm:1.15.4" + version: 1.15.5 + resolution: "follow-redirects@npm:1.15.5" peerDependenciesMeta: debug: optional: true - checksum: 2e8f5f259a6b02dfa8dc199e08431848a7c3beed32eb4c19945966164a52c89f07b86c3afcc32ebe4279cf0a960520e45a63013d6350309c5ec90133c5d9351a + checksum: d467f13c1c6aa734599b8b369cd7a625b20081af358f6204ff515f6f4116eb440de9c4e0c49f10798eeb0df26c95dd05d5e0d9ddc5786ab1a8a8abefe92929b4 languageName: node linkType: hard @@ -9373,7 +9363,7 @@ __metadata: languageName: node linkType: hard -"has-property-descriptors@npm:^1.0.0": +"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.1": version: 1.0.1 resolution: "has-property-descriptors@npm:1.0.1" dependencies: @@ -10683,13 +10673,6 @@ __metadata: languageName: node linkType: hard -"isarray@npm:0.0.1": - version: 0.0.1 - resolution: "isarray@npm:0.0.1" - checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4 - languageName: node - linkType: hard - "isarray@npm:1.0.0, isarray@npm:~1.0.0": version: 1.0.0 resolution: "isarray@npm:1.0.0" @@ -10941,10 +10924,10 @@ __metadata: languageName: node linkType: hard -"just-extend@npm:^4.0.2": - version: 4.2.1 - resolution: "just-extend@npm:4.2.1" - checksum: 375389c0847d56300873fa622fbc5c5e208933e372bbedb39c82f583299cdad4fe9c4773bc35fcd9c42cd85744f07474ca4163aa0f9125dd5be37bc09075eb49 +"just-extend@npm:^6.2.0": + version: 6.2.0 + resolution: "just-extend@npm:6.2.0" + checksum: 1f487b074b9e5773befdd44dc5d1b446f01f24f7d4f1f255d51c0ef7f686e8eb5f95d983b792b9ca5c8b10cd7e60a924d64103725759eddbd7f18bcb22743f92 languageName: node linkType: hard @@ -11053,14 +11036,14 @@ __metadata: linkType: hard "koa@npm:^2.13.0": - version: 2.14.2 - resolution: "koa@npm:2.14.2" + version: 2.15.0 + resolution: "koa@npm:2.15.0" dependencies: accepts: "npm:^1.3.5" cache-content-type: "npm:^1.0.0" content-disposition: "npm:~0.5.2" content-type: "npm:^1.0.4" - cookies: "npm:~0.8.0" + cookies: "npm:~0.9.0" debug: "npm:^4.3.2" delegates: "npm:^1.0.0" depd: "npm:^2.0.0" @@ -11079,7 +11062,7 @@ __metadata: statuses: "npm:^1.5.0" type-is: "npm:^1.6.16" vary: "npm:^1.1.2" - checksum: be3592ad2ed61068aaf19f4957de07602c4141cb33e049727d2453010d90cb9f4756c87103c9b44e24cf31f061116f4479b0a4ce7638c96fd64652f559ad5b7b + checksum: 8063140a80f274f5075880cb4b19bdc7e7ce34a590fc4a7b6ae9c6876f93cfe099276769767419da5d74c1a74ead63437ecc90e9bc23edce9236656743d27350 languageName: node linkType: hard @@ -11487,11 +11470,11 @@ __metadata: linkType: hard "loupe@npm:^3.0.0": - version: 3.0.2 - resolution: "loupe@npm:3.0.2" + version: 3.1.0 + resolution: "loupe@npm:3.1.0" dependencies: get-func-name: "npm:^2.0.1" - checksum: 256467bf10afaca4a5dd79b32e36fcd042bc2a247232e940c62bcc07cb114c2d7a549218eb103598e7cdb8bd32c6601fe230d80e03b8d49782973d4da11c08ed + checksum: 48d1ad60a51f084430a7b9a3772434e0140e2d8a9ed422f13a632511452a29762695876ff97431c06eea4e248d42674a0f69b8e545d97f63fa6115adc7983b94 languageName: node linkType: hard @@ -12113,15 +12096,15 @@ __metadata: linkType: hard "nise@npm:^5.1.5": - version: 5.1.5 - resolution: "nise@npm:5.1.5" + version: 5.1.7 + resolution: "nise@npm:5.1.7" dependencies: - "@sinonjs/commons": "npm:^2.0.0" - "@sinonjs/fake-timers": "npm:^10.0.2" - "@sinonjs/text-encoding": "npm:^0.7.1" - just-extend: "npm:^4.0.2" - path-to-regexp: "npm:^1.7.0" - checksum: c6afe82b919a2c1985916d5bb3a738a7b2cfb017a6ab9479ec1ede62343051b40da88a1321517bb5d912c13e08b8d9ce9cdef9583edeb44d640af7273c35ebf2 + "@sinonjs/commons": "npm:^3.0.0" + "@sinonjs/fake-timers": "npm:^11.2.2" + "@sinonjs/text-encoding": "npm:^0.7.2" + just-extend: "npm:^6.2.0" + path-to-regexp: "npm:^6.2.1" + checksum: 4754e3ae52654f66e947d44d0dd40ae823e594c201474ad7c5115acb2188c839c9b8617504327051857aea8042befac946e82918e1e53b99350cb275140332d0 languageName: node linkType: hard @@ -12886,12 +12869,10 @@ __metadata: languageName: node linkType: hard -"path-to-regexp@npm:^1.7.0": - version: 1.8.0 - resolution: "path-to-regexp@npm:1.8.0" - dependencies: - isarray: "npm:0.0.1" - checksum: 45a01690f72919163cf89714e31a285937b14ad54c53734c826363fcf7beba9d9d0f2de802b4986b1264374562d6a3398a2e5289753a764e3a256494f1e52add +"path-to-regexp@npm:^6.2.1": + version: 6.2.1 + resolution: "path-to-regexp@npm:6.2.1" + checksum: 1e266be712d1a08086ee77beab12a1804842ec635dfed44f9ee1ba960a0e01cec8063fb8c92561115cdc0ce73158cdc7766e353ffa039340b4a85b370084c4d4 languageName: node linkType: hard @@ -13076,13 +13057,13 @@ __metadata: linkType: hard "postcss@npm:^8.4.14": - version: 8.4.32 - resolution: "postcss@npm:8.4.32" + version: 8.4.33 + resolution: "postcss@npm:8.4.33" dependencies: nanoid: "npm:^3.3.7" picocolors: "npm:^1.0.0" source-map-js: "npm:^1.0.2" - checksum: 28084864122f29148e1f632261c408444f5ead0e0b9ea9bd9729d0468818ebe73fe5dc0075acd50c1365dbe639b46a79cba27d355ec857723a24bc9af0f18525 + checksum: e22a4594c255f26117f38419fb494d7ecab0f596cd409f7aadc8a6173abf180ed7ea970cd13fd366ab12b5840be901d2a09b25197700c2ebcb5a8077326bf519 languageName: node linkType: hard @@ -13867,14 +13848,14 @@ __metadata: linkType: hard "safe-array-concat@npm:^1.0.1": - version: 1.0.1 - resolution: "safe-array-concat@npm:1.0.1" + version: 1.1.0 + resolution: "safe-array-concat@npm:1.1.0" dependencies: - call-bind: "npm:^1.0.2" - get-intrinsic: "npm:^1.2.1" + call-bind: "npm:^1.0.5" + get-intrinsic: "npm:^1.2.2" has-symbols: "npm:^1.0.3" isarray: "npm:^2.0.5" - checksum: 44f073d85ca12458138e6eff103ac63cec619c8261b6579bd2fa3ae7b6516cf153f02596d68e40c5bbe322a29c930017800efff652734ddcb8c0f33b2a71f89c + checksum: 41ac35ce46c44e2e8637b1805b0697d5269507779e3082b7afb92c01605fd73ab813bbc799510c56e300cfc941b1447fd98a338205db52db7fd1322ab32d7c9f languageName: node linkType: hard @@ -13893,13 +13874,13 @@ __metadata: linkType: hard "safe-regex-test@npm:^1.0.0": - version: 1.0.0 - resolution: "safe-regex-test@npm:1.0.0" + version: 1.0.2 + resolution: "safe-regex-test@npm:1.0.2" dependencies: - call-bind: "npm:^1.0.2" - get-intrinsic: "npm:^1.1.3" + call-bind: "npm:^1.0.5" + get-intrinsic: "npm:^1.2.2" is-regex: "npm:^1.1.4" - checksum: c7248dfa07891aa634c8b9c55da696e246f8589ca50e7fd14b22b154a106e83209ddf061baf2fa45ebfbd485b094dc7297325acfc50724de6afe7138451b42a9 + checksum: 0e6a472caa8f44a502c7842ea19749de42c2eb1b41cb00456061dc3746cf3468e907522f56e97a15f3b41d88f660bd3d4f9bdec064a39895f7babae0f7aafc6a languageName: node linkType: hard @@ -14044,11 +14025,11 @@ __metadata: linkType: hard "serialize-javascript@npm:^6.0.1": - version: 6.0.1 - resolution: "serialize-javascript@npm:6.0.1" + version: 6.0.2 + resolution: "serialize-javascript@npm:6.0.2" dependencies: randombytes: "npm:^2.1.0" - checksum: f756b1ff34b655b2183c64dd6683d28d4d9b9a80284b264cac9fd421c73890491eafd6c5c2bbe93f1f21bf78b572037c5a18d24b044c317ee1c9dc44d22db94c + checksum: 445a420a6fa2eaee4b70cbd884d538e259ab278200a2ededd73253ada17d5d48e91fb1f4cd224a236ab62ea7ba0a70c6af29fc93b4f3d3078bf7da1c031fde58 languageName: node linkType: hard @@ -14103,14 +14084,15 @@ __metadata: linkType: hard "set-function-length@npm:^1.1.1": - version: 1.1.1 - resolution: "set-function-length@npm:1.1.1" + version: 1.2.0 + resolution: "set-function-length@npm:1.2.0" dependencies: define-data-property: "npm:^1.1.1" - get-intrinsic: "npm:^1.2.1" + function-bind: "npm:^1.1.2" + get-intrinsic: "npm:^1.2.2" gopd: "npm:^1.0.1" - has-property-descriptors: "npm:^1.0.0" - checksum: 745ed1d7dc69a6185e0820082fe73838ab3dfd01e75cce83a41e4c1d68bbf34bc5fb38f32ded542ae0b557536b5d2781594499b5dcd19e7db138e06292a76c7b + has-property-descriptors: "npm:^1.0.1" + checksum: 6d609cd060c488d7d2178a5d4c3689f8a6afa26fa4c48ff4a0516664ff9b84c1c0898915777f5628092dab55c4fcead205525e2edd15c659423bf86f790fdcae languageName: node linkType: hard @@ -14609,9 +14591,9 @@ __metadata: linkType: hard "stream-shift@npm:^1.0.0": - version: 1.0.1 - resolution: "stream-shift@npm:1.0.1" - checksum: 59b82b44b29ec3699b5519a49b3cedcc6db58c72fb40c04e005525dfdcab1c75c4e0c180b923c380f204bed78211b9bad8faecc7b93dece4d004c3f6ec75737b + version: 1.0.3 + resolution: "stream-shift@npm:1.0.3" + checksum: a24c0a3f66a8f9024bd1d579a533a53be283b4475d4e6b4b3211b964031447bdf6532dd1f3c2b0ad66752554391b7c62bd7ca4559193381f766534e723d50242 languageName: node linkType: hard @@ -15000,8 +14982,8 @@ __metadata: linkType: hard "terser@npm:^5.0.0, terser@npm:^5.15.1, terser@npm:^5.26.0": - version: 5.26.0 - resolution: "terser@npm:5.26.0" + version: 5.27.0 + resolution: "terser@npm:5.27.0" dependencies: "@jridgewell/source-map": "npm:^0.3.3" acorn: "npm:^8.8.2" @@ -15009,7 +14991,7 @@ __metadata: source-map-support: "npm:~0.5.20" bin: terser: bin/terser - checksum: 0282c5c065cbfa1e725d5609b99579252bc20b83cd1d75e8ab8b46d5da2c9d0fcfc453a12624f2d2d4c1240bfa0017a90fcf1e3b88258e5842fca1b0b82be8d8 + checksum: 9b2c5cb00747dea5994034ca064fb3cc7efc1be6b79a35247662d51ab43bdbe9cbf002bbf29170b5f3bd068c811d0212e22d94acd2cf0d8562687b96f1bffc9f languageName: node linkType: hard @@ -16667,8 +16649,8 @@ __metadata: linkType: hard "ws@npm:^8.13.0": - version: 8.15.1 - resolution: "ws@npm:8.15.1" + version: 8.16.0 + resolution: "ws@npm:8.16.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -16677,7 +16659,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 746a3102d43e8df7b09f5814bec858f12d10185a7abd655537f3291b687d440bb80fc9d1e082f8dee42d4d74307f78a96810e18a2c8e13053b003c6608c1c648 + checksum: 7c511c59e979bd37b63c3aea4a8e4d4163204f00bd5633c053b05ed67835481995f61a523b0ad2b603566f9a89b34cb4965cb9fab9649fbfebd8f740cea57f17 languageName: node linkType: hard From fcc9a801030d01b5f0a289b3e5468b787bfda9ac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 01:08:10 -0500 Subject: [PATCH 176/361] Update formatjs monorepo (#19453) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 16 +++--- yarn.lock | 160 +++++++++++++++++++++++++-------------------------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/package.json b/package.json index 863ec1e76fea..f079d220ad19 100644 --- a/package.json +++ b/package.json @@ -35,14 +35,14 @@ "@codemirror/state": "6.4.0", "@codemirror/view": "6.23.0", "@egjs/hammerjs": "2.0.17", - "@formatjs/intl-datetimeformat": "6.12.0", - "@formatjs/intl-displaynames": "6.6.4", + "@formatjs/intl-datetimeformat": "6.12.1", + "@formatjs/intl-displaynames": "6.6.5", "@formatjs/intl-getcanonicallocales": "2.3.0", - "@formatjs/intl-listformat": "7.5.3", - "@formatjs/intl-locale": "3.4.3", - "@formatjs/intl-numberformat": "8.9.0", - "@formatjs/intl-pluralrules": "5.2.10", - "@formatjs/intl-relativetimeformat": "11.2.10", + "@formatjs/intl-listformat": "7.5.4", + "@formatjs/intl-locale": "3.4.4", + "@formatjs/intl-numberformat": "8.9.1", + "@formatjs/intl-pluralrules": "5.2.11", + "@formatjs/intl-relativetimeformat": "11.2.11", "@fullcalendar/core": "6.1.10", "@fullcalendar/daygrid": "6.1.10", "@fullcalendar/interaction": "6.1.10", @@ -112,7 +112,7 @@ "hls.js": "1.5.1", "home-assistant-js-websocket": "9.1.0", "idb-keyval": "6.2.1", - "intl-messageformat": "10.5.8", + "intl-messageformat": "10.5.9", "js-yaml": "4.1.0", "leaflet": "1.9.4", "leaflet-draw": "1.0.4", diff --git a/yarn.lock b/yarn.lock index 84c68fc0123e..789a0b3c0d54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1619,13 +1619,13 @@ __metadata: languageName: node linkType: hard -"@formatjs/ecma402-abstract@npm:1.18.0": - version: 1.18.0 - resolution: "@formatjs/ecma402-abstract@npm:1.18.0" +"@formatjs/ecma402-abstract@npm:1.18.1": + version: 1.18.1 + resolution: "@formatjs/ecma402-abstract@npm:1.18.1" dependencies: - "@formatjs/intl-localematcher": "npm:0.5.2" + "@formatjs/intl-localematcher": "npm:0.5.3" tslib: "npm:^2.4.0" - checksum: 97968f3b6e3c7f6791c8431889b9e7c4e8ac3ea9a7b1dec1be9ec2aba80d27ef5ff11573dd5440022c16e5944f034027921b3cb10e8713f26da61d10a916df1e + checksum: 9d6e70c1c20ecd9b6c62be625daf78e9ed466d0c7ecc86238b45a4782dd5941855c7bb645f9eaa163fdf96c6265744a0c9d5132663aa0bc905dfaeb33f03aeb9 languageName: node linkType: hard @@ -1638,55 +1638,55 @@ __metadata: languageName: node linkType: hard -"@formatjs/icu-messageformat-parser@npm:2.7.3": - version: 2.7.3 - resolution: "@formatjs/icu-messageformat-parser@npm:2.7.3" +"@formatjs/icu-messageformat-parser@npm:2.7.4": + version: 2.7.4 + resolution: "@formatjs/icu-messageformat-parser@npm:2.7.4" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.0" - "@formatjs/icu-skeleton-parser": "npm:1.7.0" + "@formatjs/ecma402-abstract": "npm:1.18.1" + "@formatjs/icu-skeleton-parser": "npm:1.7.1" tslib: "npm:^2.4.0" - checksum: dda2002a09855e06db2b1238c29ec01730af650af4899e9cd1e00dd6356f5bb797b7e11604adf077ba5648b25eb776a842a324d532d4e6ed354a4c88aa28cd49 + checksum: 4b5eada3a5491d165eab7d65da79714f56e23e8bb29627370bc7dff3e8e594a5d91acb350458b5767ec0aa2645775338d989876d3f5eb9d8a79c1fe10326289a languageName: node linkType: hard -"@formatjs/icu-skeleton-parser@npm:1.7.0": - version: 1.7.0 - resolution: "@formatjs/icu-skeleton-parser@npm:1.7.0" +"@formatjs/icu-skeleton-parser@npm:1.7.1": + version: 1.7.1 + resolution: "@formatjs/icu-skeleton-parser@npm:1.7.1" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.0" + "@formatjs/ecma402-abstract": "npm:1.18.1" tslib: "npm:^2.4.0" - checksum: 5477f408034516aed862c0b5b72042be13850da31e09f8d56d88b0a88e1abbebbb7d23f352ad2ac7e697496b4a33ae076a0abb76e5908cb6bc35feb3b6bf0c78 + checksum: caa4870f03d80a59bcf8c51c1aa8f7b7d0d22928ce608243afe42db3d6a9bfe3faf65d91638fb8fbafa224ab04ddc970e16d83f0d0ed14ccc5b457820e5a0062 languageName: node linkType: hard -"@formatjs/intl-datetimeformat@npm:6.12.0": - version: 6.12.0 - resolution: "@formatjs/intl-datetimeformat@npm:6.12.0" +"@formatjs/intl-datetimeformat@npm:6.12.1": + version: 6.12.1 + resolution: "@formatjs/intl-datetimeformat@npm:6.12.1" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.0" - "@formatjs/intl-localematcher": "npm:0.5.2" + "@formatjs/ecma402-abstract": "npm:1.18.1" + "@formatjs/intl-localematcher": "npm:0.5.3" tslib: "npm:^2.4.0" - checksum: 083e6fef76115ac45c96d52fb0fac973fa80514e77fb819a08685fabd671c168c3361b82792fd5684ad8c696d9fb8e42bf7a78e7f8764c6ddc53a960c72bc614 + checksum: 359da9933364ab8df438c1e991eda41057a52086b630fe1aeaa10e11ac556433abf5fb13446409c57fbb077f31e159a94f3e1bf01cfdfdc350ae06e497238c4d languageName: node linkType: hard -"@formatjs/intl-displaynames@npm:6.6.4": - version: 6.6.4 - resolution: "@formatjs/intl-displaynames@npm:6.6.4" +"@formatjs/intl-displaynames@npm:6.6.5": + version: 6.6.5 + resolution: "@formatjs/intl-displaynames@npm:6.6.5" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.0" - "@formatjs/intl-localematcher": "npm:0.5.2" + "@formatjs/ecma402-abstract": "npm:1.18.1" + "@formatjs/intl-localematcher": "npm:0.5.3" tslib: "npm:^2.4.0" - checksum: e563a97e4789b3bd05e8507701e2300fdde85e0625ce316e2c7bbcfaf0eee9a49f0afec0b786e4488a671d7a304b894bd0c3a837d79a1d6695592da0544ec3f0 + checksum: 84bb3718799f807c04a70b06e38c408324ba60468c4bf26cafab2b9e82f406b289cf0bf692a1408b34c0f17738e3d0186042bb02749531f9c0b3923dee346825 languageName: node linkType: hard -"@formatjs/intl-enumerator@npm:1.4.3": - version: 1.4.3 - resolution: "@formatjs/intl-enumerator@npm:1.4.3" +"@formatjs/intl-enumerator@npm:1.4.4": + version: 1.4.4 + resolution: "@formatjs/intl-enumerator@npm:1.4.4" dependencies: tslib: "npm:^2.4.0" - checksum: b9913cc51594701d1677ff4146f96fcc9b954d5400a09d6dbd252352fd3f08891a37bbaf93e6067983745f06a4e33a444ae4e955aacceaab7545bd7f09dab47b + checksum: 4114d221afe649e4272eb3413c9222c63d52d9fbd1594511cc4c52a00be5fb41250908817a8d6b99c6cf6d469dc4c6798a96e132740046e706c9bf244eaf6827 languageName: node linkType: hard @@ -1699,68 +1699,68 @@ __metadata: languageName: node linkType: hard -"@formatjs/intl-listformat@npm:7.5.3": - version: 7.5.3 - resolution: "@formatjs/intl-listformat@npm:7.5.3" +"@formatjs/intl-listformat@npm:7.5.4": + version: 7.5.4 + resolution: "@formatjs/intl-listformat@npm:7.5.4" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.0" - "@formatjs/intl-localematcher": "npm:0.5.2" + "@formatjs/ecma402-abstract": "npm:1.18.1" + "@formatjs/intl-localematcher": "npm:0.5.3" tslib: "npm:^2.4.0" - checksum: e62b9994fafba44470a9c0e71a4528ab3ac45133271d0b5e96d337b928288587726f671ef1d50a485d431d9abb264628dddb1ee964714ede0093a3732f8654e8 + checksum: c60737da5a3021d7a2579586e75e200bc16942fce634c9dd98abb737c90b8df6737cf377446ede1971d414f23cc27e0ca4252fd551f7280a6b713858341fa47b languageName: node linkType: hard -"@formatjs/intl-locale@npm:3.4.3": - version: 3.4.3 - resolution: "@formatjs/intl-locale@npm:3.4.3" +"@formatjs/intl-locale@npm:3.4.4": + version: 3.4.4 + resolution: "@formatjs/intl-locale@npm:3.4.4" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.0" - "@formatjs/intl-enumerator": "npm:1.4.3" + "@formatjs/ecma402-abstract": "npm:1.18.1" + "@formatjs/intl-enumerator": "npm:1.4.4" "@formatjs/intl-getcanonicallocales": "npm:2.3.0" tslib: "npm:^2.4.0" - checksum: ec739918a0dffe2ca38846148d9c2fe94a529560aedc71724f526dc367bc63cec47295deebf1dd8955012dfc4d40458948a0c87f345180c9e1f270005d0992bc + checksum: c3fe007f745660acc40e9fc30a7b64e40e1c84e81b39dafa85ac01efa1a37ef079ec0825562aa90b7719e48ce0e4275a25f5858fd4c9da15b89766b6d07ca499 languageName: node linkType: hard -"@formatjs/intl-localematcher@npm:0.5.2": - version: 0.5.2 - resolution: "@formatjs/intl-localematcher@npm:0.5.2" +"@formatjs/intl-localematcher@npm:0.5.3": + version: 0.5.3 + resolution: "@formatjs/intl-localematcher@npm:0.5.3" dependencies: tslib: "npm:^2.4.0" - checksum: 89db79ae89d6050b62d0a0f9e9c8ad4f8973eac37656f1d075ac76b6c372007f7e32791ae666fc061f7f5d89ea84ea42cfaa74dad39df4b1cf9878053e18b5d4 + checksum: 6e715600f6f8e27727eece5bd9dd993d9ccfaee92a0aa776327c20ac717cd4490f6658fac1cbe0b3b8ffa849485655f1fea22f5ab4ae24c7134fbe2375be3c1d languageName: node linkType: hard -"@formatjs/intl-numberformat@npm:8.9.0": - version: 8.9.0 - resolution: "@formatjs/intl-numberformat@npm:8.9.0" +"@formatjs/intl-numberformat@npm:8.9.1": + version: 8.9.1 + resolution: "@formatjs/intl-numberformat@npm:8.9.1" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.0" - "@formatjs/intl-localematcher": "npm:0.5.2" + "@formatjs/ecma402-abstract": "npm:1.18.1" + "@formatjs/intl-localematcher": "npm:0.5.3" tslib: "npm:^2.4.0" - checksum: e06179b08ab10b902db6e531e7fc5c1de7d5d7df00de0677310b3fa68cb20bea750021224aa1f0db8fbd60460c58473f04958fe52b166aad4d7a5e3a4c8071e4 + checksum: dd5ed4c86c8beff01e70c3d85f86d9932fbf182fe1f1a4273a2cac2d99f52d66cd024d93676c87fe8f88b01b41d3a08e547b531e5c79d81cc98eae821e210881 languageName: node linkType: hard -"@formatjs/intl-pluralrules@npm:5.2.10": - version: 5.2.10 - resolution: "@formatjs/intl-pluralrules@npm:5.2.10" +"@formatjs/intl-pluralrules@npm:5.2.11": + version: 5.2.11 + resolution: "@formatjs/intl-pluralrules@npm:5.2.11" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.0" - "@formatjs/intl-localematcher": "npm:0.5.2" + "@formatjs/ecma402-abstract": "npm:1.18.1" + "@formatjs/intl-localematcher": "npm:0.5.3" tslib: "npm:^2.4.0" - checksum: 69315ea80d237c701f56e9541b7d08931046e5e8965c6b57e47b8f1c7632011175c6081700c1bc09dff7d3baae8ef45cf164009f56076d4115788ec6b3589193 + checksum: 277a0586190a2b34bb51ad9995a67d9eff36b5b4977781e2b2911bcb14b8766af415b6cf9dbb552bc6df253831e19f65525138d3c0a24346403a9d7ade21a8be languageName: node linkType: hard -"@formatjs/intl-relativetimeformat@npm:11.2.10": - version: 11.2.10 - resolution: "@formatjs/intl-relativetimeformat@npm:11.2.10" +"@formatjs/intl-relativetimeformat@npm:11.2.11": + version: 11.2.11 + resolution: "@formatjs/intl-relativetimeformat@npm:11.2.11" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.0" - "@formatjs/intl-localematcher": "npm:0.5.2" + "@formatjs/ecma402-abstract": "npm:1.18.1" + "@formatjs/intl-localematcher": "npm:0.5.3" tslib: "npm:^2.4.0" - checksum: f79fc60f9f6aa7a468af2a3d6bd62d360b9956a124f28359ef9f716890470cf7c5888463bda9aba22dfca8c3d079cca2df1569af1a50093c477f6f29f94e63ed + checksum: 38bd0dc5e381b7ca0ca7c77dab901283b3c4e8736397a9c0c7b32d8a2e00d2ccade71a927a3272b89ddbe9ccbad4776dd489934b2b7c6a44c704cd47645e44b6 languageName: node linkType: hard @@ -9480,14 +9480,14 @@ __metadata: "@codemirror/state": "npm:6.4.0" "@codemirror/view": "npm:6.23.0" "@egjs/hammerjs": "npm:2.0.17" - "@formatjs/intl-datetimeformat": "npm:6.12.0" - "@formatjs/intl-displaynames": "npm:6.6.4" + "@formatjs/intl-datetimeformat": "npm:6.12.1" + "@formatjs/intl-displaynames": "npm:6.6.5" "@formatjs/intl-getcanonicallocales": "npm:2.3.0" - "@formatjs/intl-listformat": "npm:7.5.3" - "@formatjs/intl-locale": "npm:3.4.3" - "@formatjs/intl-numberformat": "npm:8.9.0" - "@formatjs/intl-pluralrules": "npm:5.2.10" - "@formatjs/intl-relativetimeformat": "npm:11.2.10" + "@formatjs/intl-listformat": "npm:7.5.4" + "@formatjs/intl-locale": "npm:3.4.4" + "@formatjs/intl-numberformat": "npm:8.9.1" + "@formatjs/intl-pluralrules": "npm:5.2.11" + "@formatjs/intl-relativetimeformat": "npm:11.2.11" "@fullcalendar/core": "npm:6.1.10" "@fullcalendar/daygrid": "npm:6.1.10" "@fullcalendar/interaction": "npm:6.1.10" @@ -9615,7 +9615,7 @@ __metadata: husky: "npm:8.0.3" idb-keyval: "npm:6.2.1" instant-mocha: "npm:1.5.2" - intl-messageformat: "npm:10.5.8" + intl-messageformat: "npm:10.5.9" js-yaml: "npm:4.1.0" jszip: "npm:3.10.1" leaflet: "npm:1.9.4" @@ -10081,15 +10081,15 @@ __metadata: languageName: node linkType: hard -"intl-messageformat@npm:10.5.8": - version: 10.5.8 - resolution: "intl-messageformat@npm:10.5.8" +"intl-messageformat@npm:10.5.9": + version: 10.5.9 + resolution: "intl-messageformat@npm:10.5.9" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.0" + "@formatjs/ecma402-abstract": "npm:1.18.1" "@formatjs/fast-memoize": "npm:2.2.0" - "@formatjs/icu-messageformat-parser": "npm:2.7.3" + "@formatjs/icu-messageformat-parser": "npm:2.7.4" tslib: "npm:^2.4.0" - checksum: b2c420600d0b04929b6d401cab0669ec4815d63c3096d1a4a260d5851924dcd4c218771fc3adefc7fdfcc7418bb9353c344451fb98c72559be0a271eea602496 + checksum: bbbca5dce5f2239530254dad9d7317dcb71c17023040331bb7b963ac3000c600404f8e70a3dd7e049b009f9e9ae407e0d14df888452a2f7572fd012a0390b237 languageName: node linkType: hard From 24bfa4919a2b4a25a664a7c186614af7540191e5 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Fri, 19 Jan 2024 03:39:41 -0500 Subject: [PATCH 177/361] Fix property visibility mismatches (2 of 2) (#19448) --- gallery/src/components/demo-more-infos.ts | 8 +-- .../backup/dialog-hassio-backup-location.ts | 3 +- .../entity/ha-entity-attribute-picker.ts | 18 +++--- .../entity/ha-entity-state-picker.ts | 18 +++--- src/components/entity/state-badge.ts | 14 ++--- src/components/ha-date-range-picker.ts | 6 +- .../media-player/ha-media-player-browse.ts | 55 +++++++++---------- .../config/automation/ha-automation-picker.ts | 2 +- .../dialog-cloud-certificate.ts | 5 +- .../config/entities/ha-config-entities.ts | 13 ++++- .../integrations/ha-config-integrations.ts | 3 +- .../zha/zha-groups-dashboard.ts | 4 +- src/panels/config/scene/ha-scene-dashboard.ts | 2 +- .../lovelace/badges/hui-state-label-badge.ts | 6 +- .../lovelace/cards/hui-calendar-card.ts | 2 +- src/panels/lovelace/cards/hui-picture-card.ts | 4 +- src/panels/lovelace/cards/hui-stack-card.ts | 2 +- .../cards/hui-weather-forecast-card.ts | 8 +-- .../components/hui-conditional-base.ts | 6 +- src/panels/lovelace/components/hui-marquee.ts | 14 ++--- .../view-editor/hui-view-visibility-editor.ts | 2 +- .../entity-rows/hui-humidifier-entity-row.ts | 4 +- src/panels/lovelace/ha-panel-lovelace.ts | 5 +- .../header-footer/hui-graph-header-footer.ts | 6 +- .../hui-picture-header-footer.ts | 4 +- .../hui-dialog-web-browser-play-media.ts | 5 +- tsconfig.json | 2 +- 27 files changed, 113 insertions(+), 108 deletions(-) diff --git a/gallery/src/components/demo-more-infos.ts b/gallery/src/components/demo-more-infos.ts index 8a13665e433f..072dca265816 100644 --- a/gallery/src/components/demo-more-infos.ts +++ b/gallery/src/components/demo-more-infos.ts @@ -1,11 +1,11 @@ import { LitElement, css, html } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { applyThemesOnElement } from "../../../src/common/dom/apply_themes_on_element"; import "../../../src/components/ha-formfield"; import "../../../src/components/ha-switch"; -import "./demo-more-info"; -import "../ha-demo-options"; import { HomeAssistant } from "../../../src/types"; +import "../ha-demo-options"; +import "./demo-more-info"; @customElement("demo-more-infos") class DemoMoreInfos extends LitElement { @@ -13,7 +13,7 @@ class DemoMoreInfos extends LitElement { @property() public entities!: []; - @property({ attribute: false }) _showConfig: boolean = false; + @state() private _showConfig = false; render() { return html` diff --git a/hassio/src/dialogs/backup/dialog-hassio-backup-location.ts b/hassio/src/dialogs/backup/dialog-hassio-backup-location.ts index 18292149bd72..c5bdde32e5c8 100644 --- a/hassio/src/dialogs/backup/dialog-hassio-backup-location.ts +++ b/hassio/src/dialogs/backup/dialog-hassio-backup-location.ts @@ -27,8 +27,7 @@ const SCHEMA = memoizeOne( class HassioBackupLocationDialog extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ attribute: false }) - public _dialogParams?: HassioBackupLocationDialogParams; + @state() private _dialogParams?: HassioBackupLocationDialogParams; @state() private _data?: { default_backup_mount: string | null }; diff --git a/src/components/entity/ha-entity-attribute-picker.ts b/src/components/entity/ha-entity-attribute-picker.ts index 4e5995a6bf72..e746999d2115 100644 --- a/src/components/entity/ha-entity-attribute-picker.ts +++ b/src/components/entity/ha-entity-attribute-picker.ts @@ -1,8 +1,8 @@ import { HassEntity } from "home-assistant-js-websocket"; -import { html, LitElement, PropertyValues, nothing } from "lit"; -import { customElement, property, query } from "lit/decorators"; +import { LitElement, PropertyValues, html, nothing } from "lit"; +import { customElement, property, query, state } from "lit/decorators"; import { computeAttributeNameDisplay } from "../../common/entity/compute_attribute_display"; -import { ValueChangedEvent, HomeAssistant } from "../../types"; +import { HomeAssistant, ValueChangedEvent } from "../../types"; import "../ha-combo-box"; import type { HaComboBox } from "../ha-combo-box"; @@ -37,7 +37,7 @@ class HaEntityAttributePicker extends LitElement { @property() public helper?: string; - @property({ type: Boolean }) private _opened = false; + @state() private _opened = false; @query("ha-combo-box", true) private _comboBox!: HaComboBox; @@ -47,15 +47,17 @@ class HaEntityAttributePicker extends LitElement { protected updated(changedProps: PropertyValues) { if (changedProps.has("_opened") && this._opened) { - const state = this.entityId ? this.hass.states[this.entityId] : undefined; - (this._comboBox as any).items = state - ? Object.keys(state.attributes) + const entityState = this.entityId + ? this.hass.states[this.entityId] + : undefined; + (this._comboBox as any).items = entityState + ? Object.keys(entityState.attributes) .filter((key) => !this.hideAttributes?.includes(key)) .map((key) => ({ value: key, label: computeAttributeNameDisplay( this.hass.localize, - state, + entityState, this.hass.entities, key ), diff --git a/src/components/entity/ha-entity-state-picker.ts b/src/components/entity/ha-entity-state-picker.ts index b14cbeaa2f44..0c918845735d 100644 --- a/src/components/entity/ha-entity-state-picker.ts +++ b/src/components/entity/ha-entity-state-picker.ts @@ -1,6 +1,6 @@ import { HassEntity } from "home-assistant-js-websocket"; import { LitElement, PropertyValues, html, nothing } from "lit"; -import { customElement, property, query } from "lit/decorators"; +import { customElement, property, query, state } from "lit/decorators"; import { fireEvent } from "../../common/dom/fire_event"; import { getStates } from "../../common/entity/get_states"; import { HomeAssistant, ValueChangedEvent } from "../../types"; @@ -17,7 +17,7 @@ class HaEntityStatePicker extends LitElement { @property() public attribute?: string; - @property() public extraOptions?: any[]; + @property({ attribute: false }) public extraOptions?: any[]; @property({ type: Boolean }) public autofocus = false; @@ -34,7 +34,7 @@ class HaEntityStatePicker extends LitElement { @property() public helper?: string; - @property({ type: Boolean }) private _opened = false; + @state() private _opened = false; @query("ha-combo-box", true) private _comboBox!: HaComboBox; @@ -49,16 +49,18 @@ class HaEntityStatePicker extends LitElement { changedProps.has("attribute") || changedProps.has("extraOptions") ) { - const state = this.entityId ? this.hass.states[this.entityId] : undefined; + const stateObj = this.entityId + ? this.hass.states[this.entityId] + : undefined; (this._comboBox as any).items = [ ...(this.extraOptions ?? []), - ...(this.entityId && state - ? getStates(state, this.attribute).map((key) => ({ + ...(this.entityId && stateObj + ? getStates(stateObj, this.attribute).map((key) => ({ value: key, label: !this.attribute - ? this.hass.formatEntityState(state, key) + ? this.hass.formatEntityState(stateObj, key) : this.hass.formatEntityAttributeValue( - state, + stateObj, this.attribute, key ), diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts index 82ee231b4a59..ecf012ebca98 100644 --- a/src/components/entity/state-badge.ts +++ b/src/components/entity/state-badge.ts @@ -36,8 +36,8 @@ export class StateBadge extends LitElement { @property() public color?: string; - @property({ type: Boolean, reflect: true, attribute: "icon" }) - private _showIcon = true; + // @todo Consider reworking to eliminate need for attribute since it is manipulated internally + @property({ type: Boolean, reflect: true }) public icon = true; @state() private _iconStyle: { [name: string]: string | undefined } = {}; @@ -83,7 +83,7 @@ export class StateBadge extends LitElement {
    `; } - if (!this._showIcon) { + if (!this.icon) { return nothing; } @@ -98,7 +98,7 @@ export class StateBadge extends LitElement { >`; } - public willUpdate(changedProps: PropertyValues) { + public willUpdate(changedProps: PropertyValues) { super.willUpdate(changedProps); if ( !changedProps.has("stateObj") && @@ -114,7 +114,7 @@ export class StateBadge extends LitElement { const iconStyle: { [name: string]: string } = {}; let backgroundImage = ""; - this._showIcon = true; + this.icon = true; if (stateObj && this.overrideImage === undefined) { // hide icon if we have entity picture @@ -134,7 +134,7 @@ export class StateBadge extends LitElement { imageUrl = cameraUrlWithWidthHeight(imageUrl, 80, 80); } backgroundImage = `url(${imageUrl})`; - this._showIcon = false; + this.icon = false; if (domain === "update") { this.style.borderRadius = "0"; } else if (domain === "media_player") { @@ -180,7 +180,7 @@ export class StateBadge extends LitElement { imageUrl = this.hass.hassUrl(imageUrl); } backgroundImage = `url(${imageUrl})`; - this._showIcon = false; + this.icon = false; } this._iconStyle = iconStyle; diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index 1532409130b4..dc9ef2f6aa2f 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -61,11 +61,11 @@ export class HaDateRangePicker extends LitElement { @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) private _hour24format = false; + @property({ type: Boolean }) public minimal = false; - @property({ type: String }) private _rtlDirection = "ltr"; + @state() private _hour24format = false; - @property({ type: Boolean }) private minimal = false; + @state() private _rtlDirection = "ltr"; @property({ type: Boolean }) public extendedPresets = false; diff --git a/src/components/media-player/ha-media-player-browse.ts b/src/components/media-player/ha-media-player-browse.ts index b3347dc8b183..6737ea613ba2 100644 --- a/src/components/media-player/ha-media-player-browse.ts +++ b/src/components/media-player/ha-media-player-browse.ts @@ -92,14 +92,13 @@ export class HaMediaPlayerBrowse extends LitElement { @property({ type: Boolean }) public dialog = false; - @property() public navigateIds!: MediaPlayerItemId[]; + @property({ attribute: false }) public navigateIds: MediaPlayerItemId[] = []; - @property({ type: Boolean, attribute: "narrow", reflect: true }) - // @ts-ignore - private _narrow = false; + // @todo Consider reworking to eliminate need for attribute since it is manipulated internally + @property({ type: Boolean, reflect: true }) public narrow = false; - @property({ type: Boolean, attribute: "scroll", reflect: true }) - private _scrolled = false; + // @todo Consider reworking to eliminate need for attribute since it is manipulated internally + @property({ type: Boolean, reflect: true }) public scrolled = false; @state() private _error?: { message: string; code: string }; @@ -178,7 +177,7 @@ export class HaMediaPlayerBrowse extends LitElement { // We're navigating. Reset the shizzle. this._content?.scrollTo(0, 0); - this._scrolled = false; + this.scrolled = false; const oldCurrentItem = this._currentItem; const oldParentItem = this._parentItem; this._currentItem = undefined; @@ -373,7 +372,7 @@ export class HaMediaPlayerBrowse extends LitElement { "" )}" > - ${this._narrow && currentItem?.can_play + ${this.narrow && currentItem?.can_play ? html` ${currentItem.can_play && - (!currentItem.thumbnail || !this._narrow) + (!currentItem.thumbnail || !this.narrow) ? html` { @@ -868,10 +867,10 @@ export class HaMediaPlayerBrowse extends LitElement { @eventOptions({ passive: true }) private _scroll(ev: Event): void { const content = ev.currentTarget as HTMLDivElement; - if (!this._scrolled && content.scrollTop > this._headerOffsetHeight) { - this._scrolled = true; - } else if (this._scrolled && content.scrollTop < this._headerOffsetHeight) { - this._scrolled = false; + if (!this.scrolled && content.scrollTop > this._headerOffsetHeight) { + this.scrolled = true; + } else if (this.scrolled && content.scrollTop < this._headerOffsetHeight) { + this.scrolled = false; } } @@ -1266,58 +1265,58 @@ export class HaMediaPlayerBrowse extends LitElement { } /* ============= Scroll ============= */ - :host([scroll]) .breadcrumb .subtitle { + :host([scrolled]) .breadcrumb .subtitle { height: 0; margin: 0; } - :host([scroll]) .breadcrumb .title { + :host([scrolled]) .breadcrumb .title { -webkit-line-clamp: 1; } - :host(:not([narrow])[scroll]) .header:not(.no-img) ha-icon-button { + :host(:not([narrow])[scrolled]) .header:not(.no-img) ha-icon-button { align-self: center; } - :host([scroll]) .header-info mwc-button, + :host([scrolled]) .header-info mwc-button, .no-img .header-info mwc-button { padding-right: 4px; } - :host([scroll][narrow]) .no-img .header-info mwc-button { + :host([scrolled][narrow]) .no-img .header-info mwc-button { padding-right: 16px; } - :host([scroll]) .header-info { + :host([scrolled]) .header-info { flex-direction: row; } - :host([scroll]) .header-info mwc-button { + :host([scrolled]) .header-info mwc-button { align-self: center; margin-top: 0; margin-bottom: 0; padding-bottom: 0; } - :host([scroll][narrow]) .no-img .header-info { + :host([scrolled][narrow]) .no-img .header-info { flex-direction: row-reverse; } - :host([scroll][narrow]) .header-info { + :host([scrolled][narrow]) .header-info { padding: 20px 24px 10px 24px; align-items: center; } - :host([scroll]) .header-content { + :host([scrolled]) .header-content { align-items: flex-end; flex-direction: row; } - :host([scroll]) .header-content .img { + :host([scrolled]) .header-content .img { height: 75px; width: 75px; } - :host([scroll]) .breadcrumb { + :host([scrolled]) .breadcrumb { padding-top: 0; align-self: center; } - :host([scroll][narrow]) .header-content .img { + :host([scrolled][narrow]) .header-content .img { height: 100px; width: 100px; padding-bottom: initial; margin-bottom: 0; } - :host([scroll]) ha-fab { + :host([scrolled]) ha-fab { bottom: 0px; right: -24px; --mdc-fab-box-shadow: none; diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index 421db708271e..6e5d41f3a05e 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -81,7 +81,7 @@ class HaAutomationPicker extends LitElement { @property() public automations!: AutomationEntity[]; - @property() private _activeFilters?: string[]; + @state() private _activeFilters?: string[]; @state() private _searchParms = new URLSearchParams(window.location.search); diff --git a/src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts b/src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts index 15e2baafb88f..91ee82e24142 100644 --- a/src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts +++ b/src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts @@ -1,6 +1,6 @@ import "@material/mwc-button"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, state } from "lit/decorators"; import { formatDateTime } from "../../../../common/datetime/format_date_time"; import { fireEvent } from "../../../../common/dom/fire_event"; import { createCloseHeading } from "../../../../components/ha-dialog"; @@ -12,8 +12,7 @@ import type { CloudCertificateParams as CloudCertificateDialogParams } from "./s class DialogCloudCertificate extends LitElement { public hass!: HomeAssistant; - @property() - private _params?: CloudCertificateDialogParams; + @state() private _params?: CloudCertificateDialogParams; public showDialog(params: CloudCertificateDialogParams) { this._params = params; diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts index a78f295b6a9e..b5598dbe4ec1 100644 --- a/src/panels/config/entities/ha-config-entities.ts +++ b/src/panels/config/entities/ha-config-entities.ts @@ -13,7 +13,14 @@ import { mdiUndo, } from "@mdi/js"; import { HassEntity } from "home-assistant-js-websocket"; -import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; +import { + CSSResultGroup, + LitElement, + PropertyValues, + css, + html, + nothing, +} from "lit"; import { customElement, property, query, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { ifDefined } from "lit/directives/if-defined"; @@ -91,7 +98,7 @@ export class HaConfigEntities extends LitElement { @state() private _stateEntities: StateEntity[] = []; - @property() public _entries?: ConfigEntry[]; + @state() private _entries?: ConfigEntry[]; @state() @consume({ context: fullEntitiesContext, subscribe: true }) @@ -681,7 +688,7 @@ export class HaConfigEntities extends LitElement { `; } - public willUpdate(changedProps): void { + public willUpdate(changedProps: PropertyValues): void { super.willUpdate(changedProps); const oldHass = changedProps.get("hass"); let changed = false; diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts index f8edf4763d9c..5ce9459e0a38 100644 --- a/src/panels/config/integrations/ha-config-integrations.ts +++ b/src/panels/config/integrations/ha-config-integrations.ts @@ -72,8 +72,7 @@ class HaConfigIntegrations extends SubscribeMixin(HassRouterPage) { @state() private _configEntries?: ConfigEntryExtended[]; - @property() - private _configEntriesInProgress?: DataEntryFlowProgressExtended[]; + @state() private _configEntriesInProgress?: DataEntryFlowProgressExtended[]; private _loadTranslationsPromise?: Promise; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-groups-dashboard.ts b/src/panels/config/integrations/integration-panels/zha/zha-groups-dashboard.ts index 9093913d9ca6..d21ae02aea39 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-groups-dashboard.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-groups-dashboard.ts @@ -8,7 +8,7 @@ import { PropertyValues, TemplateResult, } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { HASSDomEvent } from "../../../../../common/dom/fire_event"; import { navigate } from "../../../../../common/navigate"; @@ -40,7 +40,7 @@ export class ZHAGroupsDashboard extends LitElement { @property({ type: Boolean }) public isWide = false; - @property() public _groups: ZHAGroup[] = []; + @state() private _groups: ZHAGroup[] = []; private _firstUpdatedCalled = false; diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts index cb9861932c71..5f29a0839865 100644 --- a/src/panels/config/scene/ha-scene-dashboard.ts +++ b/src/panels/config/scene/ha-scene-dashboard.ts @@ -72,7 +72,7 @@ class HaSceneDashboard extends LitElement { @property() public scenes!: SceneEntity[]; - @property() private _activeFilters?: string[]; + @state() private _activeFilters?: string[]; @state() private _filteredScenes?: string[] | null; diff --git a/src/panels/lovelace/badges/hui-state-label-badge.ts b/src/panels/lovelace/badges/hui-state-label-badge.ts index cc9a769c80c2..92b06a1736a8 100644 --- a/src/panels/lovelace/badges/hui-state-label-badge.ts +++ b/src/panels/lovelace/badges/hui-state-label-badge.ts @@ -1,20 +1,20 @@ import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; import "../../../components/entity/ha-state-label-badge"; +import { ActionHandlerEvent } from "../../../data/lovelace/action_handler"; import { HomeAssistant } from "../../../types"; import { actionHandler } from "../common/directives/action-handler-directive"; import { handleAction } from "../common/handle-action"; import { hasAction } from "../common/has-action"; import { LovelaceBadge } from "../types"; import { StateLabelBadgeConfig } from "./types"; -import { ActionHandlerEvent } from "../../../data/lovelace/action_handler"; @customElement("hui-state-label-badge") export class HuiStateLabelBadge extends LitElement implements LovelaceBadge { @property({ attribute: false }) public hass?: HomeAssistant; - @property() protected _config?: StateLabelBadgeConfig; + @state() protected _config?: StateLabelBadgeConfig; public setConfig(config: StateLabelBadgeConfig): void { this._config = config; diff --git a/src/panels/lovelace/cards/hui-calendar-card.ts b/src/panels/lovelace/cards/hui-calendar-card.ts index 363324470590..047118828ad1 100644 --- a/src/panels/lovelace/cards/hui-calendar-card.ts +++ b/src/panels/lovelace/cards/hui-calendar-card.ts @@ -59,7 +59,7 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard { @property({ attribute: false }) public hass?: HomeAssistant; - @property({ attribute: false }) public _events: CalendarEvent[] = []; + @state() private _events: CalendarEvent[] = []; @state() private _config?: CalendarCardConfig; diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts index 46b0484478b6..be5902ba84ae 100644 --- a/src/panels/lovelace/cards/hui-picture-card.ts +++ b/src/panels/lovelace/cards/hui-picture-card.ts @@ -6,7 +6,7 @@ import { nothing, PropertyValues, } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { ifDefined } from "lit/directives/if-defined"; import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element"; @@ -38,7 +38,7 @@ export class HuiPictureCard extends LitElement implements LovelaceCard { @property({ attribute: false }) public hass?: HomeAssistant; - @property() protected _config?: PictureCardConfig; + @state() private _config?: PictureCardConfig; public getCardSize(): number { return 5; diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts index 604797c21915..49ea00828af5 100644 --- a/src/panels/lovelace/cards/hui-stack-card.ts +++ b/src/panels/lovelace/cards/hui-stack-card.ts @@ -30,7 +30,7 @@ export abstract class HuiStackCard @property({ type: Boolean }) public editMode = false; - @property() protected _cards?: LovelaceCard[]; + @state() protected _cards?: LovelaceCard[]; @state() protected _config?: T; diff --git a/src/panels/lovelace/cards/hui-weather-forecast-card.ts b/src/panels/lovelace/cards/hui-weather-forecast-card.ts index 6a8e6e7dd5ce..fcfc7b620565 100644 --- a/src/panels/lovelace/cards/hui-weather-forecast-card.ts +++ b/src/panels/lovelace/cards/hui-weather-forecast-card.ts @@ -75,8 +75,8 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard { @state() private _subscribed?: Promise<() => void>; - @property({ type: Boolean, reflect: true, attribute: "veryverynarrow" }) - private _veryVeryNarrow = false; + // @todo Consider reworking to eliminate need for attribute since it is manipulated internally + @property({ type: Boolean, reflect: true }) public veryVeryNarrow = false; private _resizeObserver?: ResizeObserver; @@ -227,7 +227,7 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard { ); const forecast = this._config?.show_forecast !== false && forecastData?.forecast?.length - ? forecastData.forecast.slice(0, this._veryVeryNarrow ? 3 : 5) + ? forecastData.forecast.slice(0, this.veryVeryNarrow ? 3 : 5) : undefined; const weather = !forecast || this._config?.show_current !== false; @@ -452,7 +452,7 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard { } else { this.removeAttribute("verynarrow"); } - this._veryVeryNarrow = card.offsetWidth < 245; + this.veryVeryNarrow = card.offsetWidth < 245; } private _showValue(item?: any): boolean { diff --git a/src/panels/lovelace/components/hui-conditional-base.ts b/src/panels/lovelace/components/hui-conditional-base.ts index a66a4a2e3a31..df8f268a2682 100644 --- a/src/panels/lovelace/components/hui-conditional-base.ts +++ b/src/panels/lovelace/components/hui-conditional-base.ts @@ -1,5 +1,5 @@ import { PropertyValues, ReactiveElement } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { listenMediaQuery } from "../../../common/dom/media_query"; import { deepEqual } from "../../../common/util/deep-equal"; import { HomeAssistant } from "../../../types"; @@ -33,10 +33,10 @@ export class HuiConditionalBase extends ReactiveElement { @property({ type: Boolean }) public editMode = false; - @property() protected _config?: ConditionalCardConfig | ConditionalRowConfig; - @property({ type: Boolean, reflect: true }) public hidden = false; + @state() protected _config?: ConditionalCardConfig | ConditionalRowConfig; + protected _element?: LovelaceCard | LovelaceRow; private _mediaQueriesListeners: Array<() => void> = []; diff --git a/src/panels/lovelace/components/hui-marquee.ts b/src/panels/lovelace/components/hui-marquee.ts index 67e0fe5e9215..9756d6d82328 100644 --- a/src/panels/lovelace/components/hui-marquee.ts +++ b/src/panels/lovelace/components/hui-marquee.ts @@ -14,8 +14,8 @@ class HuiMarquee extends LitElement { @property({ type: Boolean }) public active = false; - @property({ reflect: true, type: Boolean, attribute: "animating" }) - private _animating = false; + // @todo Consider reworking to eliminate need for attribute since it is manipulated internally + @property({ reflect: true, type: Boolean }) public animating = false; protected firstUpdated(changedProps) { super.firstUpdated(changedProps); @@ -33,8 +33,8 @@ class HuiMarquee extends LitElement { protected updated(changedProperties: PropertyValues): void { super.updated(changedProperties); - if (changedProperties.has("text") && this._animating) { - this._animating = false; + if (changedProperties.has("text") && this.animating) { + this.animating = false; } if ( @@ -42,7 +42,7 @@ class HuiMarquee extends LitElement { this.active && this.offsetWidth < this.scrollWidth ) { - this._animating = true; + this.animating = true; } } @@ -54,14 +54,14 @@ class HuiMarquee extends LitElement { return html`
    ${this.text} - ${this._animating ? html` ${this.text} ` : ""} + ${this.animating ? html` ${this.text} ` : ""}
    `; } private _onIteration() { if (!this.active) { - this._animating = false; + this.animating = false; } } diff --git a/src/panels/lovelace/editor/view-editor/hui-view-visibility-editor.ts b/src/panels/lovelace/editor/view-editor/hui-view-visibility-editor.ts index c599b15bab1c..af0920eba863 100644 --- a/src/panels/lovelace/editor/view-editor/hui-view-visibility-editor.ts +++ b/src/panels/lovelace/editor/view-editor/hui-view-visibility-editor.ts @@ -38,7 +38,7 @@ export class HuiViewVisibilityEditor extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public _config!: LovelaceViewConfig; + @state() private _config!: LovelaceViewConfig; @state() private _users!: User[]; diff --git a/src/panels/lovelace/entity-rows/hui-humidifier-entity-row.ts b/src/panels/lovelace/entity-rows/hui-humidifier-entity-row.ts index fcdc56bf54da..427e2addd199 100644 --- a/src/panels/lovelace/entity-rows/hui-humidifier-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-humidifier-entity-row.ts @@ -6,7 +6,7 @@ import { html, nothing, } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import "../../../components/entity/ha-entity-toggle"; import "../../../components/ha-humidifier-state"; import { HumidifierEntity } from "../../../data/humidifier"; @@ -20,7 +20,7 @@ import { EntityConfig, LovelaceRow } from "./types"; class HuiHumidifierEntityRow extends LitElement implements LovelaceRow { @property({ attribute: false }) public hass?: HomeAssistant; - @property() private _config?: EntityConfig; + @state() private _config?: EntityConfig; public setConfig(config: EntityConfig): void { if (!config || !config.entity) { diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts index e0b5455bbc4a..81e6aa793234 100644 --- a/src/panels/lovelace/ha-panel-lovelace.ts +++ b/src/panels/lovelace/ha-panel-lovelace.ts @@ -60,8 +60,7 @@ export class LovelacePanel extends LitElement { @property({ attribute: false }) public route?: Route; - @property() - private _panelState?: "loading" | "loaded" | "error" | "yaml-editor" = + @state() private _panelState: "loading" | "loaded" | "error" | "yaml-editor" = "loading"; @state() private _errorMsg?: string; @@ -114,7 +113,7 @@ export class LovelacePanel extends LitElement { } protected render(): TemplateResult | void { - const panelState = this._panelState!; + const panelState = this._panelState; if (panelState === "loaded") { return html` diff --git a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts index 27701acfe41f..ac466673bc24 100644 --- a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts +++ b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts @@ -1,10 +1,10 @@ import { HassEntity } from "home-assistant-js-websocket"; import { - css, CSSResultGroup, - html, LitElement, PropertyValues, + css, + html, nothing, } from "lit"; import { customElement, property, state } from "lit/decorators"; @@ -62,7 +62,7 @@ export class HuiGraphHeaderFooter @property() public type!: "header" | "footer"; - @property() protected _config?: GraphHeaderFooterConfig; + @state() protected _config?: GraphHeaderFooterConfig; @state() private _coordinates?: number[][]; diff --git a/src/panels/lovelace/header-footer/hui-picture-header-footer.ts b/src/panels/lovelace/header-footer/hui-picture-header-footer.ts index 2e84a7ba03c3..f43c560921de 100644 --- a/src/panels/lovelace/header-footer/hui-picture-header-footer.ts +++ b/src/panels/lovelace/header-footer/hui-picture-header-footer.ts @@ -6,7 +6,7 @@ import { html, nothing, } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { ifDefined } from "lit/directives/if-defined"; import "../../../components/ha-card"; @@ -36,7 +36,7 @@ export class HuiPictureHeaderFooter @property() public type!: "header" | "footer"; - @property() protected _config?: PictureHeaderFooterConfig; + @state() protected _config?: PictureHeaderFooterConfig; public getCardSize(): number { return 3; diff --git a/src/panels/media-browser/hui-dialog-web-browser-play-media.ts b/src/panels/media-browser/hui-dialog-web-browser-play-media.ts index ac10b2f91f5e..1a7bf5e2fe68 100644 --- a/src/panels/media-browser/hui-dialog-web-browser-play-media.ts +++ b/src/panels/media-browser/hui-dialog-web-browser-play-media.ts @@ -1,5 +1,5 @@ import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../common/dom/fire_event"; import { createCloseHeading } from "../../components/ha-dialog"; import "../../components/ha-hls-player"; @@ -11,8 +11,7 @@ import { WebBrowserPlayMediaDialogParams } from "./show-media-player-dialog"; export class HuiDialogWebBrowserPlayMedia extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ attribute: false }) - private _params?: WebBrowserPlayMediaDialogParams; + @state() private _params?: WebBrowserPlayMediaDialogParams; public showDialog(params: WebBrowserPlayMediaDialogParams): void { this._params = params; diff --git a/tsconfig.json b/tsconfig.json index 0971df352a84..53cdd2dd9326 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -41,7 +41,7 @@ "no-incompatible-type-binding": "warning", // LitElement "no-incompatible-property-type": "warning", - "no-property-visibility-mismatch": "warning", + "no-property-visibility-mismatch": "error", // CSS "no-invalid-css": "off" // warning does not work }, From b969144f5083f21fc5e56e394c6c2e149901063b Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Fri, 19 Jan 2024 03:43:00 -0500 Subject: [PATCH 178/361] Initialize more boolean properties (#19452) --- src/components/ha-area-picker.ts | 2 +- src/components/ha-areas-picker.ts | 2 +- src/components/ha-attribute-value.ts | 3 +- src/components/ha-combo-box.ts | 3 +- src/components/ha-control-circular-slider.ts | 67 +++++++------------ src/components/ha-control-select-menu.ts | 4 +- src/components/ha-control-switch.ts | 12 ++-- src/components/ha-multi-textfield.ts | 2 +- src/components/ha-service-control.ts | 2 +- src/components/trace/hat-graph-branch.ts | 2 +- src/components/trace/hat-graph-node.ts | 4 +- src/components/trace/hat-graph-spacer.ts | 2 +- src/onboarding/onboarding-welcome-link.ts | 2 +- src/panels/calendar/ha-panel-calendar.ts | 3 +- .../automation/blueprint-automation-editor.ts | 2 +- .../core/ha-config-system-navigation.ts | 3 +- .../config/dashboard/ha-config-dashboard.ts | 3 +- .../config/script/blueprint-script-editor.ts | 2 +- src/panels/history/ha-panel-history.ts | 2 +- src/panels/logbook/ha-panel-logbook.ts | 2 +- .../conditions/ha-card-conditions-editor.ts | 2 +- .../media-browser/ha-bar-media-player.ts | 3 +- .../media-browser/ha-panel-media-browser.ts | 3 +- .../ha-state-control-climate-humidity.ts | 4 +- .../ha-state-control-climate-temperature.ts | 6 +- .../ha-state-control-humidifier-humidity.ts | 6 +- ...-state-control-water_heater-temperature.ts | 4 +- 27 files changed, 61 insertions(+), 91 deletions(-) diff --git a/src/components/ha-area-picker.ts b/src/components/ha-area-picker.ts index 8e84cb77fcdb..fd68a8eb4b16 100644 --- a/src/components/ha-area-picker.ts +++ b/src/components/ha-area-picker.ts @@ -54,7 +54,7 @@ export class HaAreaPicker extends LitElement { @property() public placeholder?: string; @property({ type: Boolean, attribute: "no-add" }) - public noAdd?: boolean; + public noAdd = false; /** * Show only areas with entities from specific domains. diff --git a/src/components/ha-areas-picker.ts b/src/components/ha-areas-picker.ts index 1d648ee5fd3c..0d36f8e3fe51 100644 --- a/src/components/ha-areas-picker.ts +++ b/src/components/ha-areas-picker.ts @@ -20,7 +20,7 @@ export class HaAreasPicker extends SubscribeMixin(LitElement) { @property() public placeholder?: string; @property({ type: Boolean, attribute: "no-add" }) - public noAdd?: boolean; + public noAdd = false; /** * Show only areas with entities from specific domains. diff --git a/src/components/ha-attribute-value.ts b/src/components/ha-attribute-value.ts index 387b2612b0e0..a56bd7d399d1 100644 --- a/src/components/ha-attribute-value.ts +++ b/src/components/ha-attribute-value.ts @@ -13,8 +13,7 @@ class HaAttributeValue extends LitElement { @property() public attribute!: string; - @property({ type: Boolean, attribute: "hide-unit" }) - public hideUnit?: boolean; + @property({ type: Boolean, attribute: "hide-unit" }) public hideUnit = false; protected render() { if (!this.stateObj) { diff --git a/src/components/ha-combo-box.ts b/src/components/ha-combo-box.ts index fa241e69d8d7..5dd9d2a21105 100644 --- a/src/components/ha-combo-box.ts +++ b/src/components/ha-combo-box.ts @@ -101,8 +101,7 @@ export class HaComboBox extends LitElement { @property({ type: Boolean }) public required = false; - @property({ type: Boolean, reflect: true, attribute: "opened" }) - public opened?: boolean; + @property({ type: Boolean, reflect: true }) public opened = false; @query("vaadin-combo-box-light", true) private _comboBox!: ComboBoxLight; diff --git a/src/components/ha-control-circular-slider.ts b/src/components/ha-control-circular-slider.ts index eb475aacb542..9ba2a3d8b7fe 100644 --- a/src/components/ha-control-circular-slider.ts +++ b/src/components/ha-control-circular-slider.ts @@ -71,68 +71,49 @@ export type ControlCircularSliderMode = "start" | "end" | "full"; @customElement("ha-control-circular-slider") export class HaControlCircularSlider extends LitElement { - @property({ type: Boolean, reflect: true }) - public disabled = false; + @property({ type: Boolean, reflect: true }) public disabled = false; - @property({ type: Boolean, reflect: true }) - public readonly = false; + @property({ type: Boolean, reflect: true }) public readonly = false; - @property({ type: Boolean }) - public dual?: boolean; + @property({ type: Boolean }) public dual = false; - @property({ type: String }) - public mode?: ControlCircularSliderMode; + @property({ type: String }) public mode?: ControlCircularSliderMode; - @property({ type: Boolean }) - public inactive?: boolean; + @property({ type: Boolean }) public inactive = false; - @property({ type: String }) - public label?: string; + @property({ type: String }) public label?: string; - @property({ type: String, attribute: "low-label" }) - public lowLabel?: string; + @property({ type: String, attribute: "low-label" }) public lowLabel?: string; @property({ type: String, attribute: "high-label" }) public highLabel?: string; - @property({ type: Number }) - public value?: number; + @property({ type: Number }) public value?: number; - @property({ type: Number }) - public low?: number; + @property({ type: Number }) public low?: number; - @property({ type: Number }) - public high?: number; + @property({ type: Number }) public high?: number; - @property({ type: Number }) - public current?: number; + @property({ type: Number }) public current?: number; - @property({ type: Number }) - public step = 1; + @property({ type: Number }) public step = 1; - @property({ type: Number }) - public min = 0; + @property({ type: Number }) public min = 0; - @property({ type: Number }) - public max = 100; + @property({ type: Number }) public max = 100; @property({ type: Boolean, attribute: "prevent-interaction-on-scroll" }) - public preventInteractionOnScroll?: boolean; + public preventInteractionOnScroll = false; - @state() - public _localValue?: number = this.value; + @state() public _localValue?: number = this.value; - @state() - public _localLow?: number = this.low; + @state() public _localLow?: number = this.low; - @state() - public _localHigh?: number = this.high; + @state() public _localHigh?: number = this.high; - @state() - public _activeSlider?: ActiveSlider; + @state() public _activeSlider?: ActiveSlider; - @state() - public _lastSlider?: ActiveSlider; + @state() public _lastSlider?: ActiveSlider; private _valueToPercentage(value: number) { return ( @@ -618,11 +599,11 @@ export class HaControlCircularSlider extends LitElement { targetCircle ? svg` - ; diff --git a/src/components/ha-control-switch.ts b/src/components/ha-control-switch.ts index ef2968b69a47..2626b2ea2003 100644 --- a/src/components/ha-control-switch.ts +++ b/src/components/ha-control-switch.ts @@ -19,17 +19,13 @@ import "./ha-svg-icon"; @customElement("ha-control-switch") export class HaControlSwitch extends LitElement { - @property({ type: Boolean, reflect: true }) - public disabled = false; + @property({ type: Boolean, reflect: true }) public disabled = false; - @property({ type: Boolean }) - public vertical = false; + @property({ type: Boolean }) public vertical = false; - @property({ type: Boolean }) - public reversed = false; + @property({ type: Boolean }) public reversed = false; - @property({ type: Boolean, reflect: true }) - public checked?: boolean; + @property({ type: Boolean, reflect: true }) public checked = false; // SVG icon path (if you need a non SVG icon instead, use the provided on icon slot to pass an in) @property({ type: String }) pathOn?: string; diff --git a/src/components/ha-multi-textfield.ts b/src/components/ha-multi-textfield.ts index 471a3e7bcb06..e4305b377dbf 100644 --- a/src/components/ha-multi-textfield.ts +++ b/src/components/ha-multi-textfield.ts @@ -32,7 +32,7 @@ class HaMultiTextField extends LitElement { @property() public removeLabel?: string; @property({ attribute: "item-index", type: Boolean }) - public itemIndex?: boolean; + public itemIndex = false; protected render() { return html` diff --git a/src/components/ha-service-control.ts b/src/components/ha-service-control.ts index dde29966e9fd..12b5c8bd5a0a 100644 --- a/src/components/ha-service-control.ts +++ b/src/components/ha-service-control.ts @@ -88,7 +88,7 @@ export class HaServiceControl extends ReorderModeMixin(LitElement) { @property({ type: Boolean }) public disabled = false; - @property({ reflect: true, type: Boolean }) public narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @property({ type: Boolean }) public showAdvanced = false; diff --git a/src/components/trace/hat-graph-branch.ts b/src/components/trace/hat-graph-branch.ts index a1d8a94e7063..373cfb58d5da 100644 --- a/src/components/trace/hat-graph-branch.ts +++ b/src/components/trace/hat-graph-branch.ts @@ -17,7 +17,7 @@ interface BranchConfig { */ @customElement("hat-graph-branch") export class HatGraphBranch extends LitElement { - @property({ reflect: true, type: Boolean }) disabled?: boolean; + @property({ type: Boolean, reflect: true }) disabled = false; @property({ type: Boolean }) selected = false; diff --git a/src/components/trace/hat-graph-node.ts b/src/components/trace/hat-graph-node.ts index c55b03e20e29..931f0a6524cb 100644 --- a/src/components/trace/hat-graph-node.ts +++ b/src/components/trace/hat-graph-node.ts @@ -17,11 +17,11 @@ import { NODE_SIZE, SPACING } from "./hat-graph-const"; export class HatGraphNode extends LitElement { @property() iconPath?: string; - @property({ reflect: true, type: Boolean }) disabled?: boolean; + @property({ type: Boolean, reflect: true }) public disabled = false; @property({ reflect: true, type: Boolean }) notEnabled = false; - @property({ reflect: true, type: Boolean }) graphStart?: boolean; + @property({ reflect: true, type: Boolean }) graphStart = false; @property({ type: Boolean, attribute: "nofocus" }) noFocus = false; diff --git a/src/components/trace/hat-graph-spacer.ts b/src/components/trace/hat-graph-spacer.ts index 37c79a18bbfc..32a91622e82a 100644 --- a/src/components/trace/hat-graph-spacer.ts +++ b/src/components/trace/hat-graph-spacer.ts @@ -8,7 +8,7 @@ import { SPACING, NODE_SIZE } from "./hat-graph-const"; */ @customElement("hat-graph-spacer") export class HatGraphSpacer extends LitElement { - @property({ reflect: true, type: Boolean }) disabled?: boolean; + @property({ reflect: true, type: Boolean }) public disabled = false; render() { return html` diff --git a/src/onboarding/onboarding-welcome-link.ts b/src/onboarding/onboarding-welcome-link.ts index 54810e5ed11d..d1d7972f1502 100644 --- a/src/onboarding/onboarding-welcome-link.ts +++ b/src/onboarding/onboarding-welcome-link.ts @@ -18,7 +18,7 @@ class OnboardingWelcomeLink extends LitElement { @property() public iconPath!: string; - @property({ attribute: true, type: Boolean }) public noninteractive?: boolean; + @property({ type: Boolean }) public noninteractive = false; @queryAsync("mwc-ripple") private _ripple!: Promise; diff --git a/src/panels/calendar/ha-panel-calendar.ts b/src/panels/calendar/ha-panel-calendar.ts index 0e4547fc0709..1c37d7beddfb 100644 --- a/src/panels/calendar/ha-panel-calendar.ts +++ b/src/panels/calendar/ha-panel-calendar.ts @@ -42,8 +42,7 @@ import "./ha-full-calendar"; class PanelCalendar extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean, reflect: true }) - public narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @property({ type: Boolean, reflect: true }) public mobile = false; diff --git a/src/panels/config/automation/blueprint-automation-editor.ts b/src/panels/config/automation/blueprint-automation-editor.ts index 06bf39733434..635e5ada3ec2 100644 --- a/src/panels/config/automation/blueprint-automation-editor.ts +++ b/src/panels/config/automation/blueprint-automation-editor.ts @@ -30,7 +30,7 @@ export class HaBlueprintAutomationEditor extends ReorderModeMixin(LitElement) { @property({ type: Boolean }) public disabled = false; - @property({ reflect: true, type: Boolean }) public narrow!: boolean; + @property({ reflect: true, type: Boolean }) public narrow = false; @property() public config!: BlueprintAutomationConfig; diff --git a/src/panels/config/core/ha-config-system-navigation.ts b/src/panels/config/core/ha-config-system-navigation.ts index db1cdf6227e4..9f46770667b9 100644 --- a/src/panels/config/core/ha-config-system-navigation.ts +++ b/src/panels/config/core/ha-config-system-navigation.ts @@ -29,8 +29,7 @@ import { configSections } from "../ha-panel-config"; class HaConfigSystemNavigation extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean, reflect: true }) - public narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @property({ type: Boolean }) public isWide = false; diff --git a/src/panels/config/dashboard/ha-config-dashboard.ts b/src/panels/config/dashboard/ha-config-dashboard.ts index f1f1e5ba7e05..8bcb950c9ced 100644 --- a/src/panels/config/dashboard/ha-config-dashboard.ts +++ b/src/panels/config/dashboard/ha-config-dashboard.ts @@ -114,8 +114,7 @@ const randomTip = (hass: HomeAssistant, narrow: boolean) => { class HaConfigDashboard extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean, reflect: true }) - public narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @property({ type: Boolean }) public isWide = false; diff --git a/src/panels/config/script/blueprint-script-editor.ts b/src/panels/config/script/blueprint-script-editor.ts index 4c3a8c17dc26..a2dfd7f40d94 100644 --- a/src/panels/config/script/blueprint-script-editor.ts +++ b/src/panels/config/script/blueprint-script-editor.ts @@ -26,7 +26,7 @@ export class HaBlueprintScriptEditor extends ReorderModeMixin(LitElement) { @property({ type: Boolean }) public isWide = false; - @property({ reflect: true, type: Boolean }) public narrow!: boolean; + @property({ reflect: true, type: Boolean }) public narrow = false; @property({ type: Boolean }) public disabled = false; diff --git a/src/panels/history/ha-panel-history.ts b/src/panels/history/ha-panel-history.ts index 67b481b71b16..fbed2990a971 100644 --- a/src/panels/history/ha-panel-history.ts +++ b/src/panels/history/ha-panel-history.ts @@ -58,7 +58,7 @@ import { fileDownload } from "../../util/file_download"; class HaPanelHistory extends SubscribeMixin(LitElement) { @property({ attribute: false }) hass!: HomeAssistant; - @property({ reflect: true, type: Boolean }) narrow!: boolean; + @property({ reflect: true, type: Boolean }) public narrow = false; @property({ reflect: true, type: Boolean }) rtl = false; diff --git a/src/panels/logbook/ha-panel-logbook.ts b/src/panels/logbook/ha-panel-logbook.ts index 567e28595a95..cd9b6ed16efb 100644 --- a/src/panels/logbook/ha-panel-logbook.ts +++ b/src/panels/logbook/ha-panel-logbook.ts @@ -23,7 +23,7 @@ import "./ha-logbook"; export class HaPanelLogbook extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ reflect: true, type: Boolean }) narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @state() _time: { range: [Date, Date] }; diff --git a/src/panels/lovelace/editor/conditions/ha-card-conditions-editor.ts b/src/panels/lovelace/editor/conditions/ha-card-conditions-editor.ts index b0f5eaf851f5..125d715bb9d3 100644 --- a/src/panels/lovelace/editor/conditions/ha-card-conditions-editor.ts +++ b/src/panels/lovelace/editor/conditions/ha-card-conditions-editor.ts @@ -46,7 +46,7 @@ export class HaCardConditionsEditor extends LitElement { | LegacyCondition )[]; - @property({ attribute: true, type: Boolean }) public nested?: boolean; + @property({ type: Boolean }) public nested = false; private _focusLastConditionOnChange = false; diff --git a/src/panels/media-browser/ha-bar-media-player.ts b/src/panels/media-browser/ha-bar-media-player.ts index ee8f238f24bf..f9cbb286893a 100644 --- a/src/panels/media-browser/ha-bar-media-player.ts +++ b/src/panels/media-browser/ha-bar-media-player.ts @@ -70,8 +70,7 @@ export class BarMediaPlayer extends SubscribeMixin(LitElement) { @property({ attribute: false }) public entityId!: string; - @property({ type: Boolean, reflect: true }) - public narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @query("mwc-linear-progress") private _progressBar?: LinearProgress; diff --git a/src/panels/media-browser/ha-panel-media-browser.ts b/src/panels/media-browser/ha-panel-media-browser.ts index eb77c02eedb2..8713bed2a4c7 100644 --- a/src/panels/media-browser/ha-panel-media-browser.ts +++ b/src/panels/media-browser/ha-panel-media-browser.ts @@ -65,8 +65,7 @@ const createMediaPanelUrl = (entityId: string, items: MediaPlayerItemId[]) => { class PanelMediaBrowser extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ type: Boolean, reflect: true }) - public narrow!: boolean; + @property({ type: Boolean, reflect: true }) public narrow = false; @property({ attribute: false }) public route!: Route; diff --git a/src/state-control/climate/ha-state-control-climate-humidity.ts b/src/state-control/climate/ha-state-control-climate-humidity.ts index 9918db1044c5..e8830eea591f 100644 --- a/src/state-control/climate/ha-state-control-climate-humidity.ts +++ b/src/state-control/climate/ha-state-control-climate-humidity.ts @@ -27,10 +27,10 @@ export class HaStateControlClimateHumidity extends LitElement { @property({ attribute: false }) public stateObj!: ClimateEntity; @property({ attribute: "show-current", type: Boolean }) - public showCurrent?: boolean; + public showCurrent = false; @property({ type: Boolean, attribute: "prevent-interaction-on-scroll" }) - public preventInteractionOnScroll?: boolean; + public preventInteractionOnScroll = false; @state() private _targetHumidity?: number; diff --git a/src/state-control/climate/ha-state-control-climate-temperature.ts b/src/state-control/climate/ha-state-control-climate-temperature.ts index 756587160306..e449704b1c7d 100644 --- a/src/state-control/climate/ha-state-control-climate-temperature.ts +++ b/src/state-control/climate/ha-state-control-climate-temperature.ts @@ -55,13 +55,13 @@ export class HaStateControlClimateTemperature extends LitElement { @property({ attribute: false }) public stateObj!: ClimateEntity; @property({ attribute: "show-secondary", type: Boolean }) - public showSecondary?: boolean; + public showSecondary = false; @property({ attribute: "use-current-as-primary", type: Boolean }) - public showCurrentAsPrimary?: boolean; + public showCurrentAsPrimary = false; @property({ type: Boolean, attribute: "prevent-interaction-on-scroll" }) - public preventInteractionOnScroll?: boolean; + public preventInteractionOnScroll = false; @state() private _targetTemperature: Partial> = {}; diff --git a/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts b/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts index 459e8d611730..351fc92c191b 100644 --- a/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts +++ b/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts @@ -30,13 +30,13 @@ export class HaStateControlHumidifierHumidity extends LitElement { @property({ attribute: false }) public stateObj!: HumidifierEntity; @property({ attribute: "show-secondary", type: Boolean }) - public showSecondary?: boolean; + public showSecondary = false; @property({ attribute: "use-current-as-primary", type: Boolean }) - public showCurrentAsPrimary?: boolean; + public showCurrentAsPrimary = false; @property({ type: Boolean, attribute: "prevent-interaction-on-scroll" }) - public preventInteractionOnScroll?: boolean; + public preventInteractionOnScroll = false; @state() private _targetHumidity?: number; diff --git a/src/state-control/water_heater/ha-state-control-water_heater-temperature.ts b/src/state-control/water_heater/ha-state-control-water_heater-temperature.ts index 4e5249961865..53a41cd1fedd 100644 --- a/src/state-control/water_heater/ha-state-control-water_heater-temperature.ts +++ b/src/state-control/water_heater/ha-state-control-water_heater-temperature.ts @@ -30,10 +30,10 @@ export class HaStateControlWaterHeaterTemperature extends LitElement { @property({ attribute: false }) public stateObj!: WaterHeaterEntity; @property({ attribute: "show-current", type: Boolean }) - public showCurrent?: boolean; + public showCurrent = false; @property({ type: Boolean, attribute: "prevent-interaction-on-scroll" }) - public preventInteractionOnScroll?: boolean; + public preventInteractionOnScroll = false; @state() private _targetTemperature?: number; From 081636b3e7cef8f4714e38ff716b094220711ab4 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 19 Jan 2024 14:55:02 +0100 Subject: [PATCH 179/361] Add support for icon translations (#19406) * Add support for icon translations * Use slot for icons * Update more-info-climate.ts * Review and fixes * Update entity-registry-settings-editor.ts --- gallery/src/pages/misc/entity-state.ts | 1 + src/common/entity/attribute_icon_path.ts | 35 +++++ src/common/entity/state_icon_path.ts | 2 +- src/components/entity/ha-entity-picker.ts | 27 ++-- src/components/entity/ha-state-label-badge.ts | 3 +- src/components/entity/ha-statistic-picker.ts | 1 + src/components/entity/state-badge.ts | 9 +- src/components/entity/state-info.ts | 1 + src/components/ha-attribute-icon.ts | 68 +++++++++ src/components/ha-control-select-menu.ts | 4 +- src/components/ha-related-items.ts | 15 +- .../ha-selector/ha-selector-icon.ts | 7 +- src/components/ha-state-icon.ts | 36 ++++- src/components/ha-target-picker.ts | 3 +- src/data/context.ts | 2 + src/data/icons.ts | 133 ++++++++++++++++++ .../more-info/controls/more-info-climate.ts | 101 +++++++++---- src/layouts/home-assistant.ts | 4 +- src/panels/calendar/ha-panel-calendar.ts | 6 +- .../config/automation/ha-automation-picker.ts | 3 +- .../config/dashboard/ha-config-updates.ts | 1 + .../device-detail/ha-device-entities-card.ts | 1 - .../components/ha-energy-device-settings.ts | 5 +- .../entity-registry-settings-editor.ts | 5 +- .../config/entities/ha-config-entities.ts | 3 +- .../config/helpers/ha-config-helpers.ts | 5 +- .../integration-panels/zha/zha-device-card.ts | 1 + src/panels/config/scene/ha-scene-dashboard.ts | 5 +- src/panels/config/scene/ha-scene-editor.ts | 2 + src/panels/config/script/ha-script-picker.ts | 3 +- .../voice-assistants/dialog-expose-entity.ts | 3 +- .../ha-config-voice-assistants-expose.ts | 3 +- src/panels/lovelace/cards/hui-area-card.ts | 2 - src/panels/lovelace/cards/hui-button-card.ts | 3 +- src/panels/lovelace/cards/hui-entity-card.ts | 3 +- src/panels/lovelace/cards/hui-light-card.ts | 3 +- .../lovelace/cards/hui-media-control-card.ts | 6 +- .../lovelace/cards/hui-picture-entity-card.ts | 1 + .../lovelace/cards/hui-picture-glance-card.ts | 3 +- .../lovelace/cards/hui-statistic-card.ts | 3 +- .../cards/hui-weather-forecast-card.ts | 3 +- src/panels/lovelace/components/hui-image.ts | 10 +- .../hui-entities-card-editor.ts | 1 - .../elements/hui-state-icon-element.ts | 1 + .../entity-rows/hui-weather-entity-row.ts | 4 +- .../lovelace/special-rows/hui-button-row.ts | 6 +- src/panels/todo/ha-panel-todo.ts | 6 +- src/state-summary/state-card-input_select.ts | 2 +- src/state-summary/state-card-select.ts | 2 +- src/state-summary/state-card-text.ts | 2 +- src/state/context-mixin.ts | 7 + 51 files changed, 479 insertions(+), 87 deletions(-) create mode 100644 src/common/entity/attribute_icon_path.ts create mode 100644 src/components/ha-attribute-icon.ts create mode 100644 src/data/icons.ts diff --git a/gallery/src/pages/misc/entity-state.ts b/gallery/src/pages/misc/entity-state.ts index 1ab1d7df159f..857e432a2818 100644 --- a/gallery/src/pages/misc/entity-state.ts +++ b/gallery/src/pages/misc/entity-state.ts @@ -344,6 +344,7 @@ export class DemoEntityState extends LitElement { title: "Icon", template: (entry) => html` diff --git a/src/common/entity/attribute_icon_path.ts b/src/common/entity/attribute_icon_path.ts new file mode 100644 index 000000000000..aa4280388764 --- /dev/null +++ b/src/common/entity/attribute_icon_path.ts @@ -0,0 +1,35 @@ +/** Return an icon representing a attribute. */ +import { HassEntity } from "home-assistant-js-websocket"; +import { + computeFanModeIcon, + computeHvacModeIcon, + computePresetModeIcon, + computeSwingModeIcon, +} from "../../data/climate"; +import { computeDomain } from "./compute_domain"; + +const iconGenerators: Record string>> = { + climate: { + fan_mode: computeFanModeIcon, + hvac_mode: computeHvacModeIcon, + preset_mode: computePresetModeIcon, + swing_mode: computeSwingModeIcon, + }, +}; + +export const attributeIconPath = ( + state: HassEntity | undefined, + attribute: string, + attributeValue?: string +) => { + if (!state) { + return undefined; + } + const domain = computeDomain(state.entity_id); + if (iconGenerators[domain]?.[attribute]) { + return iconGenerators[domain]?.[attribute]( + attributeValue || state.attributes[attribute] + ); + } + return undefined; +}; diff --git a/src/common/entity/state_icon_path.ts b/src/common/entity/state_icon_path.ts index 24d842caf6cf..ac8e2c47ad46 100644 --- a/src/common/entity/state_icon_path.ts +++ b/src/common/entity/state_icon_path.ts @@ -4,7 +4,7 @@ import { DEFAULT_DOMAIN_ICON } from "../const"; import { computeDomain } from "./compute_domain"; import { domainIcon } from "./domain_icon"; -export const stateIconPath = (state?: HassEntity) => { +export const stateIconPath = (state: HassEntity | undefined) => { if (!state) { return DEFAULT_DOMAIN_ICON; } diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts index ac2f1f9a177e..f6bad8a96569 100644 --- a/src/components/entity/ha-entity-picker.ts +++ b/src/components/entity/ha-entity-picker.ts @@ -25,16 +25,6 @@ interface HassEntityWithCachedName extends HassEntity, ScorableTextItem { export type HaEntityPickerEntityFilterFunc = (entity: HassEntity) => boolean; -// eslint-disable-next-line lit/prefer-static-styles -const rowRenderer: ComboBoxLitRenderer = (item) => - html` - ${item.state - ? html`` - : ""} - ${item.friendly_name} - ${item.entity_id} - `; - @customElement("ha-entity-picker") export class HaEntityPicker extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -127,6 +117,21 @@ export class HaEntityPicker extends LitElement { private _states: HassEntityWithCachedName[] = []; + private _rowRenderer: ComboBoxLitRenderer = ( + item + ) => + html` + ${item.state + ? html`` + : ""} + ${item.friendly_name} + ${item.entity_id} + `; + private _getStates = memoizeOne( ( _opened: boolean, @@ -326,7 +331,7 @@ export class HaEntityPicker extends LitElement { .helper=${this.helper} .allowCustomValue=${this.allowCustomEntity} .filteredItems=${this._states} - .renderer=${rowRenderer} + .renderer=${this._rowRenderer} .required=${this.required} .disabled=${this.disabled} @opened-changed=${this._openedChanged} diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts index 9460c68147f5..4fe1a4d60c37 100644 --- a/src/components/entity/ha-state-label-badge.ts +++ b/src/components/entity/ha-state-label-badge.ts @@ -140,7 +140,8 @@ export class HaStateLabelBadge extends LitElement { ${!image && showIcon ? html`` : ""} ${value && !image && !showIcon diff --git a/src/components/entity/ha-statistic-picker.ts b/src/components/entity/ha-statistic-picker.ts index f3eabb2b3281..a592937d3734 100644 --- a/src/components/entity/ha-statistic-picker.ts +++ b/src/components/entity/ha-statistic-picker.ts @@ -105,6 +105,7 @@ export class HaStatisticPicker extends LitElement { ? html`` : ""} ${item.name} diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts index ecf012ebca98..75d077ed51f7 100644 --- a/src/components/entity/state-badge.ts +++ b/src/components/entity/state-badge.ts @@ -1,11 +1,11 @@ import { mdiAlert } from "@mdi/js"; import type { HassEntity } from "home-assistant-js-websocket"; import { - css, CSSResultGroup, - html, LitElement, PropertyValues, + css, + html, nothing, } from "lit"; import { property, state } from "lit/decorators"; @@ -14,8 +14,8 @@ import { styleMap } from "lit/directives/style-map"; import { computeDomain } from "../../common/entity/compute_domain"; import { computeStateDomain } from "../../common/entity/compute_state_domain"; import { - stateColorCss, stateColorBrightness, + stateColorCss, } from "../../common/entity/state_color"; import { iconColorCSS } from "../../common/style/icon_color_css"; import { cameraUrlWithWidthHeight } from "../../data/camera"; @@ -90,11 +90,12 @@ export class StateBadge extends LitElement { const domain = stateObj ? computeStateDomain(stateObj) : undefined; return html``; } diff --git a/src/components/entity/state-info.ts b/src/components/entity/state-info.ts index 5e1564ff4b45..db631e4496f3 100644 --- a/src/components/entity/state-info.ts +++ b/src/components/entity/state-info.ts @@ -29,6 +29,7 @@ class StateInfo extends LitElement { const name = computeStateName(this.stateObj); return html``; + } + + if (!this.stateObj || !this.attribute) { + return nothing; + } + + if (!this.hass) { + return this._renderFallback(); + } + + const icon = attributeIcon( + this.hass, + this.stateObj, + this.attribute, + this.attributeValue + ).then((icn) => { + if (icn) { + return html``; + } + return this._renderFallback(); + }); + + return html`${until(icon)}`; + } + + private _renderFallback() { + return html` + + `; + } +} + +declare global { + interface HTMLElementTagNameMap { + "ha-attribute-icon": HaAttributeIcon; + } +} diff --git a/src/components/ha-control-select-menu.ts b/src/components/ha-control-select-menu.ts index d3d00b4688c2..c26d1cee5b2b 100644 --- a/src/components/ha-control-select-menu.ts +++ b/src/components/ha-control-select-menu.ts @@ -126,9 +126,9 @@ export class HaControlSelectMenu extends SelectBase { return html`
    - ${icon && "path" in icon + ${icon && icon.localName === "ha-svg-icon" && "path" in icon ? html`` - : icon && "icon" in icon + : icon && icon.localName === "ha-icon" && "icon" in icon ? html`` : html``}
    diff --git a/src/components/ha-related-items.ts b/src/components/ha-related-items.ts index b843cd2ba9f1..be59a28b8835 100644 --- a/src/components/ha-related-items.ts +++ b/src/components/ha-related-items.ts @@ -246,7 +246,8 @@ export class HaRelatedItems extends LitElement { graphic="icon" > ${entity.attributes.friendly_name || entity.entity_id} @@ -270,7 +271,8 @@ export class HaRelatedItems extends LitElement { graphic="icon" > ${group.attributes.friendly_name || group.entity_id} @@ -294,7 +296,8 @@ export class HaRelatedItems extends LitElement { graphic="icon" > ${scene.attributes.friendly_name || scene.entity_id} @@ -349,7 +352,8 @@ export class HaRelatedItems extends LitElement { graphic="icon" > ${automation.attributes.friendly_name || @@ -403,7 +407,8 @@ export class HaRelatedItems extends LitElement { graphic="icon" > ${script.attributes.friendly_name || script.entity_id} diff --git a/src/components/ha-selector/ha-selector-icon.ts b/src/components/ha-selector/ha-selector-icon.ts index 7f491a93f259..148bd08dfd46 100644 --- a/src/components/ha-selector/ha-selector-icon.ts +++ b/src/components/ha-selector/ha-selector-icon.ts @@ -1,8 +1,10 @@ import { html, LitElement } from "lit"; import { customElement, property } from "lit/decorators"; +import { until } from "lit/directives/until"; import { fireEvent } from "../../common/dom/fire_event"; import { computeDomain } from "../../common/entity/compute_domain"; import { domainIcon } from "../../common/entity/domain_icon"; +import { entityIcon } from "../../data/icons"; import { IconSelector } from "../../data/selector"; import { HomeAssistant } from "../../types"; import "../ha-icon-picker"; @@ -33,7 +35,10 @@ export class HaIconSelector extends LitElement { const stateObj = iconEntity ? this.hass.states[iconEntity] : undefined; const placeholder = - this.selector.icon?.placeholder || stateObj?.attributes.icon; + this.selector.icon?.placeholder || + stateObj?.attributes.icon || + (stateObj && until(entityIcon(this.hass, stateObj))); + const fallbackPath = !placeholder && stateObj ? domainIcon(computeDomain(iconEntity!), stateObj) diff --git a/src/components/ha-state-icon.ts b/src/components/ha-state-icon.ts index eace7706bc31..5ec0a4a95a06 100644 --- a/src/components/ha-state-icon.ts +++ b/src/components/ha-state-icon.ts @@ -1,25 +1,49 @@ import { HassEntity } from "home-assistant-js-websocket"; -import { html, LitElement, TemplateResult } from "lit"; +import { html, LitElement, nothing } from "lit"; import { customElement, property } from "lit/decorators"; +import { until } from "lit/directives/until"; import { stateIconPath } from "../common/entity/state_icon_path"; +import { entityIcon } from "../data/icons"; +import { HomeAssistant } from "../types"; import "./ha-icon"; import "./ha-svg-icon"; @customElement("ha-state-icon") export class HaStateIcon extends LitElement { - @property({ attribute: false }) public state?: HassEntity; + @property({ attribute: false }) public hass?: HomeAssistant; + + @property({ attribute: false }) public stateObj?: HassEntity; @property() public icon?: string; - protected render(): TemplateResult { - if (this.icon || this.state?.attributes.icon) { + protected render() { + if (this.icon || this.stateObj?.attributes.icon) { return html``; } - return html``; + if (!this.stateObj) { + return nothing; + } + if (!this.hass) { + return this._renderFallback(); + } + const icon = entityIcon(this.hass, this.stateObj).then((icn) => { + if (icn) { + return html``; + } + return this._renderFallback(); + }); + return html`${until(icon)}`; + } + + private _renderFallback() { + return html``; } } + declare global { interface HTMLElementTagNameMap { "ha-state-icon": HaStateIcon; diff --git a/src/components/ha-target-picker.ts b/src/components/ha-target-picker.ts index 549fa0232002..e6a274ed1936 100644 --- a/src/components/ha-target-picker.ts +++ b/src/components/ha-target-picker.ts @@ -224,7 +224,8 @@ export class HaTargetPicker extends LitElement { ${entityState ? html`` : ""} diff --git a/src/data/context.ts b/src/data/context.ts index 7fbff9fd06a6..b5d914522c0d 100644 --- a/src/data/context.ts +++ b/src/data/context.ts @@ -3,6 +3,8 @@ import { HassConfig } from "home-assistant-js-websocket"; import { HomeAssistant } from "../types"; import { EntityRegistryEntry } from "./entity_registry"; +export const connectionContext = + createContext("connection"); export const statesContext = createContext("states"); export const entitiesContext = createContext("entities"); diff --git a/src/data/icons.ts b/src/data/icons.ts new file mode 100644 index 000000000000..dfa090207eb5 --- /dev/null +++ b/src/data/icons.ts @@ -0,0 +1,133 @@ +import { HassEntity } from "home-assistant-js-websocket"; +import { computeStateDomain } from "../common/entity/compute_state_domain"; +import { HomeAssistant } from "../types"; + +const resources: Record = { + entity: {}, + entity_component: undefined, +}; + +interface IconResources { + resources: Record>; +} + +interface PlatformIcons { + [domain: string]: { + [translation_key: string]: { + state: Record; + state_attributes: Record }>; + default: string; + }; + }; +} + +interface ComponentIcons { + [device_class: string]: { + state: Record; + state_attributes: Record }>; + default: string; + }; +} + +export type IconCategory = "entity" | "entity_component"; + +export const getHassIcons = async ( + hass: HomeAssistant, + category: IconCategory, + integration?: string +): Promise => + hass.callWS<{ resources: Record }>({ + type: "frontend/get_icons", + category, + integration, + }); + +export const getPlatformIcons = async ( + hass: HomeAssistant, + integration: string, + force = false +): Promise => { + if (!force && integration && integration in resources.entity) { + return resources.entity[integration]; + } + const result = getHassIcons(hass, "entity", integration); + resources.entity[integration] = result.then( + (res) => res?.resources[integration] + ); + return resources.entity[integration]; +}; + +export const getComponentIcons = async ( + hass: HomeAssistant, + domain: string, + force = false +): Promise => { + if (!force && resources.entity_component) { + return resources.entity_component.then((res) => res[domain]); + } + resources.entity_component = getHassIcons(hass, "entity_component").then( + (result) => result.resources + ); + return resources.entity_component.then((res) => res[domain]); +}; + +export const entityIcon = async (hass: HomeAssistant, state: HassEntity) => { + let icon: string | undefined; + const domain = computeStateDomain(state); + const entity = hass.entities?.[state.entity_id]; + if (entity?.translation_key && entity.platform) { + const platformIcons = await getPlatformIcons(hass, entity.platform); + if (platformIcons) { + icon = + platformIcons[domain]?.[entity.translation_key]?.state?.[state.state] || + platformIcons[domain]?.[entity.translation_key]?.default; + } + } + if (!icon) { + const entityComponentIcons = await getComponentIcons(hass, domain); + if (entityComponentIcons) { + icon = + entityComponentIcons[state.attributes.device_class || "_"]?.state?.[ + state.state + ] || + entityComponentIcons._?.state?.[state.state] || + entityComponentIcons[state.attributes.device_class || "_"]?.default || + entityComponentIcons._?.default; + } + } + return icon; +}; + +export const attributeIcon = async ( + hass: HomeAssistant, + state: HassEntity, + attribute: string, + attributeValue?: string +) => { + let icon: string | undefined; + const domain = computeStateDomain(state); + const entity = hass.entities?.[state.entity_id]; + if (entity?.translation_key && entity.platform) { + const platformIcons = await getPlatformIcons(hass, entity.platform); + if (platformIcons) { + icon = + platformIcons[domain]?.[entity.translation_key]?.state_attributes?.[ + attribute + ]?.state?.[attributeValue || state.attributes[attribute]]; + } + } + if (!icon) { + const entityComponentIcons = await getComponentIcons(hass, domain); + if (entityComponentIcons) { + icon = + entityComponentIcons[state.attributes.device_class || "_"] + .state_attributes?.[attribute]?.state?.[ + attributeValue || state.attributes[attribute] + ] || + entityComponentIcons._.state_attributes?.[attribute]?.state?.[ + attributeValue || state.attributes[attribute] + ]; + } + } + return icon; +}; diff --git a/src/dialogs/more-info/controls/more-info-climate.ts b/src/dialogs/more-info/controls/more-info-climate.ts index 8daa9ba24156..496953f07d71 100644 --- a/src/dialogs/more-info/controls/more-info-climate.ts +++ b/src/dialogs/more-info/controls/more-info-climate.ts @@ -17,16 +17,13 @@ import "../../../components/ha-icon-button-toggle"; import "../../../components/ha-list-item"; import "../../../components/ha-select"; import "../../../components/ha-switch"; +import "../../../components/ha-attribute-icon"; import { ClimateEntity, ClimateEntityFeature, compareClimateHvacModes, - computeFanModeIcon, - computeHvacModeIcon, - computePresetModeIcon, - computeSwingModeIcon, } from "../../../data/climate"; -import { UNAVAILABLE } from "../../../data/entity"; +import { UNAVAILABLE, isUnavailableState } from "../../../data/entity"; import "../../../state-control/climate/ha-state-control-climate-humidity"; import "../../../state-control/climate/ha-state-control-climate-temperature"; import { HomeAssistant } from "../../../types"; @@ -164,17 +161,31 @@ class MoreInfoClimate extends LitElement { @selected=${this._handleOperationModeChanged} @closed=${stopPropagation} > - + ${!isUnavailableState(this.stateObj.state) + ? html`` + : html``} ${stateObj.attributes.hvac_modes .concat() .sort(compareClimateHvacModes) .map( (mode) => html` - + .hass=${this.hass} + .stateObj=${stateObj} + attribute="hvac_mode" + .attributeValue=${mode} + > ${this.hass.formatEntityState(stateObj, mode)} ` @@ -194,14 +205,30 @@ class MoreInfoClimate extends LitElement { @selected=${this._handlePresetmodeChanged} @closed=${stopPropagation} > - + ${stateObj.attributes.preset_mode + ? html`` + : html` + + `} ${stateObj.attributes.preset_modes!.map( (mode) => html` - + .hass=${this.hass} + .stateObj=${stateObj} + attribute="preset_mode" + .attributeValue=${mode} + > ${this.hass.formatEntityAttributeValue( stateObj, "preset_mode", @@ -227,14 +254,27 @@ class MoreInfoClimate extends LitElement { @selected=${this._handleFanModeChanged} @closed=${stopPropagation} > - + ${stateObj.attributes.fan_mode + ? html`` + : html` + + `} ${stateObj.attributes.fan_modes!.map( (mode) => html` - + .hass=${this.hass} + .stateObj=${stateObj} + attribute="fan_mode" + .attributeValue=${mode} + > ${this.hass.formatEntityAttributeValue( stateObj, "fan_mode", @@ -260,17 +300,30 @@ class MoreInfoClimate extends LitElement { @selected=${this._handleSwingmodeChanged} @closed=${stopPropagation} > - + ${stateObj.attributes.swing_mode + ? html`` + : html` + + `} ${stateObj.attributes.swing_modes!.map( (mode) => html` - + .hass=${this.hass} + .stateObj=${stateObj} + attribute="swing_mode" + .attributeValue=${mode} + > ${this.hass.formatEntityAttributeValue( stateObj, "swing_mode", diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts index f9781eef5db5..6bac52581f7e 100644 --- a/src/layouts/home-assistant.ts +++ b/src/layouts/home-assistant.ts @@ -3,16 +3,16 @@ import { customElement, state } from "lit/decorators"; import { isNavigationClick } from "../common/dom/is-navigation-click"; import { navigate } from "../common/navigate"; import { getStorageDefaultPanelUrlPath } from "../data/panel"; +import { WindowWithPreloads } from "../data/preloads"; import { getRecorderInfo, RecorderInfo } from "../data/recorder"; import "../resources/custom-card-support"; import { HassElement } from "../state/hass-element"; import QuickBarMixin from "../state/quick-bar-mixin"; import { HomeAssistant, Route } from "../types"; -import { WindowWithPreloads } from "../data/preloads"; import { storeState } from "../util/ha-pref-storage"; import { - renderLaunchScreenInfoBox, removeLaunchScreen, + renderLaunchScreenInfoBox, } from "../util/launch-screen"; import { registerServiceWorker, diff --git a/src/panels/calendar/ha-panel-calendar.ts b/src/panels/calendar/ha-panel-calendar.ts index 1c37d7beddfb..2b9dfa8c3df9 100644 --- a/src/panels/calendar/ha-panel-calendar.ts +++ b/src/panels/calendar/ha-panel-calendar.ts @@ -112,7 +112,11 @@ class PanelCalendar extends LitElement { .value=${selCal.entity_id} .selected=${!this._deSelectedCalendars.includes(selCal.entity_id)} > - + ${selCal.name} ` diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index 6e5d41f3a05e..588c07a109ef 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -123,7 +123,8 @@ class HaAutomationPicker extends LitElement { type: "icon", template: (automation) => html` - + ${getStatisticLabel( this.hass, diff --git a/src/panels/config/entities/entity-registry-settings-editor.ts b/src/panels/config/entities/entity-registry-settings-editor.ts index 783528c53a14..2da5ef250b51 100644 --- a/src/panels/config/entities/entity-registry-settings-editor.ts +++ b/src/panels/config/entities/entity-registry-settings-editor.ts @@ -11,6 +11,7 @@ import { PropertyValues, } from "lit"; import { customElement, property, state } from "lit/decorators"; +import { until } from "lit/directives/until"; import memoizeOne from "memoize-one"; import { isComponentLoaded } from "../../../common/config/is_component_loaded"; import { fireEvent } from "../../../common/dom/fire_event"; @@ -65,6 +66,7 @@ import { subscribeEntityRegistry, updateEntityRegistryEntry, } from "../../../data/entity_registry"; +import { entityIcon } from "../../../data/icons"; import { domainToName } from "../../../data/integration"; import { getNumberDeviceClassConvertibleUnits } from "../../../data/number"; import { @@ -379,7 +381,8 @@ export class EntityRegistrySettingsEditor extends LitElement { "ui.dialogs.entity_registry.editor.icon" )} .placeholder=${this.entry.original_icon || - stateObj?.attributes.icon} + stateObj?.attributes.icon || + (stateObj && until(entityIcon(this.hass, stateObj)))} .fallbackPath=${!this._icon && !stateObj?.attributes.icon && stateObj diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts index b5598dbe4ec1..51c658ffc476 100644 --- a/src/panels/config/entities/ha-config-entities.ts +++ b/src/panels/config/entities/ha-config-entities.ts @@ -212,7 +212,8 @@ export class HaConfigEntities extends LitElement { `, }, diff --git a/src/panels/config/helpers/ha-config-helpers.ts b/src/panels/config/helpers/ha-config-helpers.ts index 8163787d4eff..8a0607770a13 100644 --- a/src/panels/config/helpers/ha-config-helpers.ts +++ b/src/panels/config/helpers/ha-config-helpers.ts @@ -129,7 +129,10 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) { type: "icon", template: (helper) => helper.entity - ? html`` + ? html`` : html` diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts index 5f29a0839865..27e21501db94 100644 --- a/src/panels/config/scene/ha-scene-dashboard.ts +++ b/src/panels/config/scene/ha-scene-dashboard.ts @@ -104,7 +104,10 @@ class HaSceneDashboard extends LitElement { ), type: "icon", template: (scene) => html` - + `, }, name: { diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts index 8af1d5fba5a5..b8c2ab466ecd 100644 --- a/src/panels/config/scene/ha-scene-editor.ts +++ b/src/panels/config/scene/ha-scene-editor.ts @@ -349,6 +349,7 @@ export class HaSceneEditor extends SubscribeMixin( @click=${this._showMoreInfo} > @@ -416,6 +417,7 @@ export class HaSceneEditor extends SubscribeMixin( @click=${this._showMoreInfo} > diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts index f4e671eb91bc..0b51320a8a60 100644 --- a/src/panels/config/script/ha-script-picker.ts +++ b/src/panels/config/script/ha-script-picker.ts @@ -119,7 +119,8 @@ class HaScriptPicker extends LitElement { type: "icon", template: (script) => html` ${computeStateName(entityState)} ${entityState.entity_id} diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts index 95dae6024124..dbec9e952050 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts @@ -137,7 +137,8 @@ export class VoiceAssistantsExpose extends LitElement { template: (entry) => html` `, }, diff --git a/src/panels/lovelace/cards/hui-area-card.ts b/src/panels/lovelace/cards/hui-area-card.ts index eff790b5fe82..5a455a9f6c24 100644 --- a/src/panels/lovelace/cards/hui-area-card.ts +++ b/src/panels/lovelace/cards/hui-area-card.ts @@ -33,10 +33,8 @@ import { } from "../../../common/number/format_number"; import { subscribeOne } from "../../../common/util/subscribe-one"; import parseAspectRatio from "../../../common/util/parse-aspect-ratio"; -import "../../../components/entity/state-badge"; import "../../../components/ha-card"; import "../../../components/ha-icon-button"; -import "../../../components/ha-state-icon"; import "../../../components/ha-svg-icon"; import { AreaRegistryEntry, diff --git a/src/panels/lovelace/cards/hui-button-card.ts b/src/panels/lovelace/cards/hui-button-card.ts index 9491dd07e373..4337a77b35ac 100644 --- a/src/panels/lovelace/cards/hui-button-card.ts +++ b/src/panels/lovelace/cards/hui-button-card.ts @@ -214,7 +214,8 @@ export class HuiButtonCard extends LitElement implements LovelaceCard { )} data-state=${ifDefined(stateObj?.state)} .icon=${this._config.icon} - .state=${stateObj} + .hass=${this.hass} + .stateObj=${stateObj} style=${styleMap({ color: colored ? this._computeColor(stateObj) : undefined, filter: colored ? stateColorBrightness(stateObj) : undefined, diff --git a/src/panels/lovelace/cards/hui-entity-card.ts b/src/panels/lovelace/cards/hui-entity-card.ts index 2c8b9bc6791c..024bb033ce86 100644 --- a/src/panels/lovelace/cards/hui-entity-card.ts +++ b/src/panels/lovelace/cards/hui-entity-card.ts @@ -139,7 +139,8 @@ export class HuiEntityCard extends LitElement implements LovelaceCard {
    diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index 8127e215f41b..7d5a1d8cc358 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -234,7 +234,11 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { >
    - +
    ${this._config!.name || computeStateName(this.hass!.states[this._config!.entity])} diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts index db2068cb822e..efded2eb6d0d 100644 --- a/src/panels/lovelace/cards/hui-picture-entity-card.ts +++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts @@ -181,6 +181,7 @@ class HuiPictureEntityCard extends LitElement implements LovelaceCard { hui-image { cursor: pointer; + height: 100%; } .footer { diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts index e8f6fed98e8e..b1479a1db31a 100644 --- a/src/panels/lovelace/cards/hui-picture-glance-card.ts +++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts @@ -278,7 +278,8 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard { > diff --git a/src/panels/lovelace/cards/hui-statistic-card.ts b/src/panels/lovelace/cards/hui-statistic-card.ts index edbd7c3fe147..7128cf921f1e 100644 --- a/src/panels/lovelace/cards/hui-statistic-card.ts +++ b/src/panels/lovelace/cards/hui-statistic-card.ts @@ -144,7 +144,8 @@ export class HuiStatisticCard extends LitElement implements LovelaceCard {
    diff --git a/src/panels/lovelace/cards/hui-weather-forecast-card.ts b/src/panels/lovelace/cards/hui-weather-forecast-card.ts index fcfc7b620565..781f02bd42fd 100644 --- a/src/panels/lovelace/cards/hui-weather-forecast-card.ts +++ b/src/panels/lovelace/cards/hui-weather-forecast-card.ts @@ -256,7 +256,8 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard { html` `}
    diff --git a/src/panels/lovelace/components/hui-image.ts b/src/panels/lovelace/components/hui-image.ts index b46899a8644a..cbfe01012064 100644 --- a/src/panels/lovelace/components/hui-image.ts +++ b/src/panels/lovelace/components/hui-image.ts @@ -400,12 +400,14 @@ export class HuiImage extends LitElement { .container { transition: filter 0.2s linear; + height: 100%; } img { display: block; - height: auto; + height: 100%; width: 100%; + object-fit: cover; } .progress-container { @@ -428,6 +430,12 @@ export class HuiImage extends LitElement { background-size: contain; background-repeat: no-repeat; } + .fill img { + object-fit: fill; + } + .contain img { + object-fit: contain; + } .ratio img, .ratio div { diff --git a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts index abcb66211468..8e6eb4bbecc2 100644 --- a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts @@ -19,7 +19,6 @@ import { import { fireEvent, HASSDomEvent } from "../../../../common/dom/fire_event"; import { customType } from "../../../../common/structs/is-custom-type"; import { computeRTLDirection } from "../../../../common/util/compute_rtl"; -import "../../../../components/entity/state-badge"; import "../../../../components/ha-card"; import "../../../../components/ha-formfield"; import "../../../../components/ha-icon"; diff --git a/src/panels/lovelace/elements/hui-state-icon-element.ts b/src/panels/lovelace/elements/hui-state-icon-element.ts index 0e90e2d4fd50..1f211004792d 100644 --- a/src/panels/lovelace/elements/hui-state-icon-element.ts +++ b/src/panels/lovelace/elements/hui-state-icon-element.ts @@ -59,6 +59,7 @@ export class HuiStateIconElement extends LitElement implements LovelaceElement { return html` `}
    diff --git a/src/panels/lovelace/special-rows/hui-button-row.ts b/src/panels/lovelace/special-rows/hui-button-row.ts index f74d44460449..6c92cd0b0178 100644 --- a/src/panels/lovelace/special-rows/hui-button-row.ts +++ b/src/panels/lovelace/special-rows/hui-button-row.ts @@ -53,7 +53,11 @@ export class HuiButtonRow extends LitElement implements LovelaceRow { this._config.name ?? (stateObj ? computeStateName(stateObj) : ""); return html` - +
    ${name}
    diff --git a/src/panels/todo/ha-panel-todo.ts b/src/panels/todo/ha-panel-todo.ts index 448798a18772..03a3e2b1fdb6 100644 --- a/src/panels/todo/ha-panel-todo.ts +++ b/src/panels/todo/ha-panel-todo.ts @@ -167,7 +167,11 @@ class PanelTodo extends LitElement { .entityId=${list.entity_id} .activated=${list.entity_id === this._entityId} > - ${list.name} ` ); diff --git a/src/state-summary/state-card-input_select.ts b/src/state-summary/state-card-input_select.ts index c82347b34395..5b2cf1237040 100644 --- a/src/state-summary/state-card-input_select.ts +++ b/src/state-summary/state-card-input_select.ts @@ -40,7 +40,7 @@ class StateCardInputSelect extends LitElement { protected render(): TemplateResult { return html` - + + + >( string, ContextProvider | undefined > = { + connection: new ContextProvider(this, { + context: connectionContext, + initialValue: this.hass + ? this.hass.connection + : this._pendingHass.connection, + }), states: new ContextProvider(this, { context: statesContext, initialValue: this.hass ? this.hass.states : this._pendingHass.states, From 619675318cf3529ea9e79e7b5e1e2ef2bc833d19 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Fri, 19 Jan 2024 15:28:46 +0100 Subject: [PATCH 180/361] Remove wrong usage of aria-hidden (#19454) --- src/panels/config/automation/action/ha-automation-action-row.ts | 1 - .../automation/action/types/ha-automation-action-choose.ts | 1 - .../config/automation/condition/ha-automation-condition-row.ts | 1 - .../config/automation/trigger/ha-automation-trigger-row.ts | 1 - 4 files changed, 4 deletions(-) diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts index 75c68f616ccb..a6c8fd61ddd3 100644 --- a/src/panels/config/automation/action/ha-automation-action-row.ts +++ b/src/panels/config/automation/action/ha-automation-action-row.ts @@ -263,7 +263,6 @@ export default class HaAutomationActionRow extends LitElement { graphic="icon" .disabled=${this.disabled} class=${classMap({ hidden: noReorderModeAvailable })} - ?aria-hidden=${noReorderModeAvailable} > ${this.hass.localize( "ui.panel.config.automation.editor.actions.re_order" diff --git a/src/panels/config/automation/action/types/ha-automation-action-choose.ts b/src/panels/config/automation/action/types/ha-automation-action-choose.ts index 9d270e94d054..2272d5104c51 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-choose.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-choose.ts @@ -193,7 +193,6 @@ export class HaChooseAction extends LitElement implements ActionElement { class=${classMap({ hidden: noReorderModeAvailable, })} - ?aria-hidden=${noReorderModeAvailable} > ${this.hass.localize( "ui.panel.config.automation.editor.actions.re_order" diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts index a1a07c640f85..da7782c813cf 100644 --- a/src/panels/config/automation/condition/ha-automation-condition-row.ts +++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts @@ -178,7 +178,6 @@ export default class HaAutomationConditionRow extends LitElement { graphic="icon" .disabled=${this.disabled} class=${classMap({ hidden: noReorderModeAvailable })} - ?aria-hidden=${noReorderModeAvailable} > ${this.hass.localize( "ui.panel.config.automation.editor.conditions.re_order" diff --git a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts index 81bcd5a78672..164226c2a53d 100644 --- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts +++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts @@ -206,7 +206,6 @@ export default class HaAutomationTriggerRow extends LitElement { graphic="icon" .disabled=${this.disabled} class=${classMap({ hidden: noReorderModeAvailable })} - ?aria-hidden=${noReorderModeAvailable} > ${this.hass.localize( "ui.panel.config.automation.editor.triggers.re_order" From 809df848ef7504f9f1b79514cc00f349c296c483 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 19 Jan 2024 15:42:20 +0100 Subject: [PATCH 181/361] Use entity registry icon directly (#19466) --- src/components/ha-state-icon.ts | 10 ++++++---- src/data/entity_registry.ts | 2 ++ src/data/icons.ts | 3 +++ src/state/connection-mixin.ts | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/ha-state-icon.ts b/src/components/ha-state-icon.ts index 5ec0a4a95a06..062da216375d 100644 --- a/src/components/ha-state-icon.ts +++ b/src/components/ha-state-icon.ts @@ -17,10 +17,12 @@ export class HaStateIcon extends LitElement { @property() public icon?: string; protected render() { - if (this.icon || this.stateObj?.attributes.icon) { - return html``; + const overrideIcon = + this.icon || + (this.stateObj && this.hass?.entities[this.stateObj.entity_id]?.icon) || + this.stateObj?.attributes.icon; + if (overrideIcon) { + return html``; } if (!this.stateObj) { return nothing; diff --git a/src/data/entity_registry.ts b/src/data/entity_registry.ts index 61da5aba2a73..791f95ac8ba2 100644 --- a/src/data/entity_registry.ts +++ b/src/data/entity_registry.ts @@ -15,6 +15,7 @@ type entityCategory = "config" | "diagnostic"; export interface EntityRegistryDisplayEntry { entity_id: string; name?: string; + icon?: string; device_id?: string; area_id?: string; hidden?: boolean; @@ -31,6 +32,7 @@ export interface EntityRegistryDisplayEntryResponse { ai?: string; ec?: number; en?: string; + ic?: string; pl?: string; tk?: string; hb?: boolean; diff --git a/src/data/icons.ts b/src/data/icons.ts index dfa090207eb5..544ce8f25d5a 100644 --- a/src/data/icons.ts +++ b/src/data/icons.ts @@ -75,6 +75,9 @@ export const entityIcon = async (hass: HomeAssistant, state: HassEntity) => { let icon: string | undefined; const domain = computeStateDomain(state); const entity = hass.entities?.[state.entity_id]; + if (entity?.icon) { + return entity.icon; + } if (entity?.translation_key && entity.platform) { const platformIcons = await getPlatformIcons(hass, entity.platform); if (platformIcons) { diff --git a/src/state/connection-mixin.ts b/src/state/connection-mixin.ts index fe61742a7ad1..8179aa3dc2a8 100644 --- a/src/state/connection-mixin.ts +++ b/src/state/connection-mixin.ts @@ -239,6 +239,7 @@ export const connectionMixin = >( ? entityReg.entity_categories[entity.ec] : undefined, name: entity.en, + icon: entity.ic, hidden: entity.hb, display_precision: entity.dp, }; From 51059e99a55337293a74f47d2f0faef5ed2a1a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Fri, 19 Jan 2024 17:10:46 +0100 Subject: [PATCH 182/361] Add support for new GitHub alerts (#19470) --- gallery/src/pages/lovelace/markdown-card.ts | 19 +++++++----- src/components/ha-markdown-element.ts | 34 +++++++++++++++------ 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/gallery/src/pages/lovelace/markdown-card.ts b/gallery/src/pages/lovelace/markdown-card.ts index 700283b6b86b..576e6189c76b 100644 --- a/gallery/src/pages/lovelace/markdown-card.ts +++ b/gallery/src/pages/lovelace/markdown-card.ts @@ -65,15 +65,20 @@ const CONFIGS = [ >> ...by using additional greater-than signs right next to each other... > > > ...or with spaces between arrows. - > **Warning** Hey there - > This is a warning with a title + > [!NOTE] + > This is a GitHub note alert - > **Note** - > This is a note + > [!TIP] + > This is a GitHub tip alert - > **Note** - > This is a multiline note - > Lorem ipsum... + > [!IMPORTANT] + > This is a GitHub important alert + + > [!WARNING] + > This is a GitHub warning alert + + > [!CAUTION] + > This is a GitHub caution alert ## Lists diff --git a/src/components/ha-markdown-element.ts b/src/components/ha-markdown-element.ts index 0e806b7c7dcf..e282378ada7d 100644 --- a/src/components/ha-markdown-element.ts +++ b/src/components/ha-markdown-element.ts @@ -3,7 +3,14 @@ import { customElement, property } from "lit/decorators"; import { fireEvent } from "../common/dom/fire_event"; import { renderMarkdown } from "../resources/render-markdown"; -const _blockQuoteToAlert = { Note: "info", Warning: "warning" }; +const _legacyGitHubBlockQuoteToAlert = { Note: "info", Warning: "warning" }; +const _gitHubBlockQuoteToAlert = { + "[!NOTE]": "info", + "[!TIP]": "success", + "[!IMPORTANT]": "info", + "[!WARNING]": "warning", + "[!CAUTION]": "error", +}; @customElement("ha-markdown-element") class HaMarkdownElement extends ReactiveElement { @@ -71,18 +78,25 @@ class HaMarkdownElement extends ReactiveElement { // Map GitHub blockquote elements to our ha-alert element const firstElementChild = node.firstElementChild; const quoteTitleElement = firstElementChild?.firstElementChild; - const quoteType = + const blockQuoteType = + firstElementChild?.firstChild?.textContent && + _gitHubBlockQuoteToAlert[firstElementChild.firstChild.textContent]; + const legacyBlockQuoteType = + !blockQuoteType && quoteTitleElement?.textContent && - _blockQuoteToAlert[quoteTitleElement.textContent]; + _legacyGitHubBlockQuoteToAlert[quoteTitleElement.textContent]; - // GitHub is strict on how these are defined, we need to make sure we know what we have before starting to replace it - if (quoteTitleElement?.nodeName === "STRONG" && quoteType) { + if ( + blockQuoteType || + (quoteTitleElement?.nodeName === "STRONG" && legacyBlockQuoteType) + ) { const alertNote = document.createElement("ha-alert"); - alertNote.alertType = quoteType; - alertNote.title = - (firstElementChild!.childNodes[1].nodeName === "#text" && - firstElementChild!.childNodes[1].textContent?.trimStart()) || - ""; + alertNote.alertType = blockQuoteType || legacyBlockQuoteType; + alertNote.title = blockQuoteType + ? "" + : (firstElementChild!.childNodes[1].nodeName === "#text" && + firstElementChild!.childNodes[1].textContent?.trimStart()) || + ""; const childNodes = Array.from(firstElementChild!.childNodes); for (const child of childNodes.slice( From 77dd2a87d962b257e34c79f7c9968bddab9c418c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 17:58:51 +0100 Subject: [PATCH 183/361] Update formatjs monorepo (#19471) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 16 +++--- yarn.lock | 160 +++++++++++++++++++++++++-------------------------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/package.json b/package.json index f079d220ad19..8ead92888281 100644 --- a/package.json +++ b/package.json @@ -35,14 +35,14 @@ "@codemirror/state": "6.4.0", "@codemirror/view": "6.23.0", "@egjs/hammerjs": "2.0.17", - "@formatjs/intl-datetimeformat": "6.12.1", - "@formatjs/intl-displaynames": "6.6.5", + "@formatjs/intl-datetimeformat": "6.12.2", + "@formatjs/intl-displaynames": "6.6.6", "@formatjs/intl-getcanonicallocales": "2.3.0", - "@formatjs/intl-listformat": "7.5.4", - "@formatjs/intl-locale": "3.4.4", - "@formatjs/intl-numberformat": "8.9.1", - "@formatjs/intl-pluralrules": "5.2.11", - "@formatjs/intl-relativetimeformat": "11.2.11", + "@formatjs/intl-listformat": "7.5.5", + "@formatjs/intl-locale": "3.4.5", + "@formatjs/intl-numberformat": "8.9.2", + "@formatjs/intl-pluralrules": "5.2.12", + "@formatjs/intl-relativetimeformat": "11.2.12", "@fullcalendar/core": "6.1.10", "@fullcalendar/daygrid": "6.1.10", "@fullcalendar/interaction": "6.1.10", @@ -112,7 +112,7 @@ "hls.js": "1.5.1", "home-assistant-js-websocket": "9.1.0", "idb-keyval": "6.2.1", - "intl-messageformat": "10.5.9", + "intl-messageformat": "10.5.10", "js-yaml": "4.1.0", "leaflet": "1.9.4", "leaflet-draw": "1.0.4", diff --git a/yarn.lock b/yarn.lock index 789a0b3c0d54..9192d23858f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1619,13 +1619,13 @@ __metadata: languageName: node linkType: hard -"@formatjs/ecma402-abstract@npm:1.18.1": - version: 1.18.1 - resolution: "@formatjs/ecma402-abstract@npm:1.18.1" +"@formatjs/ecma402-abstract@npm:1.18.2": + version: 1.18.2 + resolution: "@formatjs/ecma402-abstract@npm:1.18.2" dependencies: - "@formatjs/intl-localematcher": "npm:0.5.3" + "@formatjs/intl-localematcher": "npm:0.5.4" tslib: "npm:^2.4.0" - checksum: 9d6e70c1c20ecd9b6c62be625daf78e9ed466d0c7ecc86238b45a4782dd5941855c7bb645f9eaa163fdf96c6265744a0c9d5132663aa0bc905dfaeb33f03aeb9 + checksum: e761653887e4446188daa023f4cb7245790ed65eb56cef4821225467e63f271f1addff386cfcbb4eb73eb67704b1f3a2b35ea4082fcadd4d05cfa0b3be3d5577 languageName: node linkType: hard @@ -1638,55 +1638,55 @@ __metadata: languageName: node linkType: hard -"@formatjs/icu-messageformat-parser@npm:2.7.4": - version: 2.7.4 - resolution: "@formatjs/icu-messageformat-parser@npm:2.7.4" +"@formatjs/icu-messageformat-parser@npm:2.7.5": + version: 2.7.5 + resolution: "@formatjs/icu-messageformat-parser@npm:2.7.5" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.1" - "@formatjs/icu-skeleton-parser": "npm:1.7.1" + "@formatjs/ecma402-abstract": "npm:1.18.2" + "@formatjs/icu-skeleton-parser": "npm:1.7.2" tslib: "npm:^2.4.0" - checksum: 4b5eada3a5491d165eab7d65da79714f56e23e8bb29627370bc7dff3e8e594a5d91acb350458b5767ec0aa2645775338d989876d3f5eb9d8a79c1fe10326289a + checksum: b8b2b5e01cf5091ca61278ff0e6945b2fd7b10a5ac5c2b3b35b73c44675a75c482f29e3fadbe5662ecbfe630fff4fa4f540d0c7ae50c0173b00a72b965a43d6c languageName: node linkType: hard -"@formatjs/icu-skeleton-parser@npm:1.7.1": - version: 1.7.1 - resolution: "@formatjs/icu-skeleton-parser@npm:1.7.1" +"@formatjs/icu-skeleton-parser@npm:1.7.2": + version: 1.7.2 + resolution: "@formatjs/icu-skeleton-parser@npm:1.7.2" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.1" + "@formatjs/ecma402-abstract": "npm:1.18.2" tslib: "npm:^2.4.0" - checksum: caa4870f03d80a59bcf8c51c1aa8f7b7d0d22928ce608243afe42db3d6a9bfe3faf65d91638fb8fbafa224ab04ddc970e16d83f0d0ed14ccc5b457820e5a0062 + checksum: 321b2ab5fc87277e31b9be654ed283ca5b7fdd5865d606052bc2ae3ffb6caf53ae158c90cb0d54e5f374fdba32e2ad91e2a462feff108cc7931a1765e5ab6096 languageName: node linkType: hard -"@formatjs/intl-datetimeformat@npm:6.12.1": - version: 6.12.1 - resolution: "@formatjs/intl-datetimeformat@npm:6.12.1" +"@formatjs/intl-datetimeformat@npm:6.12.2": + version: 6.12.2 + resolution: "@formatjs/intl-datetimeformat@npm:6.12.2" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.1" - "@formatjs/intl-localematcher": "npm:0.5.3" + "@formatjs/ecma402-abstract": "npm:1.18.2" + "@formatjs/intl-localematcher": "npm:0.5.4" tslib: "npm:^2.4.0" - checksum: 359da9933364ab8df438c1e991eda41057a52086b630fe1aeaa10e11ac556433abf5fb13446409c57fbb077f31e159a94f3e1bf01cfdfdc350ae06e497238c4d + checksum: 26acd2c7e98f65c66ffa5755d6da4f8d0f71f62d855d2ace793263832ed0a0eceb61660ecbc875caf5075f7ba968f81d5474aca8e1b8ab2985cd3741fc615b48 languageName: node linkType: hard -"@formatjs/intl-displaynames@npm:6.6.5": - version: 6.6.5 - resolution: "@formatjs/intl-displaynames@npm:6.6.5" +"@formatjs/intl-displaynames@npm:6.6.6": + version: 6.6.6 + resolution: "@formatjs/intl-displaynames@npm:6.6.6" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.1" - "@formatjs/intl-localematcher": "npm:0.5.3" + "@formatjs/ecma402-abstract": "npm:1.18.2" + "@formatjs/intl-localematcher": "npm:0.5.4" tslib: "npm:^2.4.0" - checksum: 84bb3718799f807c04a70b06e38c408324ba60468c4bf26cafab2b9e82f406b289cf0bf692a1408b34c0f17738e3d0186042bb02749531f9c0b3923dee346825 + checksum: b3c4ed7e7e432d20c76740f55b20f838a25cd8015a2d29051e30baeecac068491c4b0ae4e7cf18ec8e3d4f7e71df8dc56c8b0a33848fff8bcd6826a2a26093ea languageName: node linkType: hard -"@formatjs/intl-enumerator@npm:1.4.4": - version: 1.4.4 - resolution: "@formatjs/intl-enumerator@npm:1.4.4" +"@formatjs/intl-enumerator@npm:1.4.5": + version: 1.4.5 + resolution: "@formatjs/intl-enumerator@npm:1.4.5" dependencies: tslib: "npm:^2.4.0" - checksum: 4114d221afe649e4272eb3413c9222c63d52d9fbd1594511cc4c52a00be5fb41250908817a8d6b99c6cf6d469dc4c6798a96e132740046e706c9bf244eaf6827 + checksum: 011d20cda70d30163934ee3e39704043a5716cad9b01a598ed14cb53e45c620a931c75c083aadf290dc345e9eafd06a77601d4462d7ab040f20032667b5e8abd languageName: node linkType: hard @@ -1699,68 +1699,68 @@ __metadata: languageName: node linkType: hard -"@formatjs/intl-listformat@npm:7.5.4": - version: 7.5.4 - resolution: "@formatjs/intl-listformat@npm:7.5.4" +"@formatjs/intl-listformat@npm:7.5.5": + version: 7.5.5 + resolution: "@formatjs/intl-listformat@npm:7.5.5" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.1" - "@formatjs/intl-localematcher": "npm:0.5.3" + "@formatjs/ecma402-abstract": "npm:1.18.2" + "@formatjs/intl-localematcher": "npm:0.5.4" tslib: "npm:^2.4.0" - checksum: c60737da5a3021d7a2579586e75e200bc16942fce634c9dd98abb737c90b8df6737cf377446ede1971d414f23cc27e0ca4252fd551f7280a6b713858341fa47b + checksum: 78907a10213a887c1943112b84b7c84a18401f036ebc5eb9baef30401cee1361beeba194237c4a4a7aa2bff4eba50c0e4bf3d7577d2ae99edc8c6afe6a5f363d languageName: node linkType: hard -"@formatjs/intl-locale@npm:3.4.4": - version: 3.4.4 - resolution: "@formatjs/intl-locale@npm:3.4.4" +"@formatjs/intl-locale@npm:3.4.5": + version: 3.4.5 + resolution: "@formatjs/intl-locale@npm:3.4.5" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.1" - "@formatjs/intl-enumerator": "npm:1.4.4" + "@formatjs/ecma402-abstract": "npm:1.18.2" + "@formatjs/intl-enumerator": "npm:1.4.5" "@formatjs/intl-getcanonicallocales": "npm:2.3.0" tslib: "npm:^2.4.0" - checksum: c3fe007f745660acc40e9fc30a7b64e40e1c84e81b39dafa85ac01efa1a37ef079ec0825562aa90b7719e48ce0e4275a25f5858fd4c9da15b89766b6d07ca499 + checksum: 3dc24bdeb01495d4f79e93b1fcf8fc22a6b8ebf40f7c3a6d586ab68783349d70ad06e0e0270ea29b88d797a52945d17e2104a8f67515fcc7388049d0239ee583 languageName: node linkType: hard -"@formatjs/intl-localematcher@npm:0.5.3": - version: 0.5.3 - resolution: "@formatjs/intl-localematcher@npm:0.5.3" +"@formatjs/intl-localematcher@npm:0.5.4": + version: 0.5.4 + resolution: "@formatjs/intl-localematcher@npm:0.5.4" dependencies: tslib: "npm:^2.4.0" - checksum: 6e715600f6f8e27727eece5bd9dd993d9ccfaee92a0aa776327c20ac717cd4490f6658fac1cbe0b3b8ffa849485655f1fea22f5ab4ae24c7134fbe2375be3c1d + checksum: 780cb29b42e1ea87f2eb5db268577fcdc53da52d9f096871f3a1bb78603b4ba81d208ea0b0b9bc21548797c941ce435321f62d2522795b83b740f90b0ceb5778 languageName: node linkType: hard -"@formatjs/intl-numberformat@npm:8.9.1": - version: 8.9.1 - resolution: "@formatjs/intl-numberformat@npm:8.9.1" +"@formatjs/intl-numberformat@npm:8.9.2": + version: 8.9.2 + resolution: "@formatjs/intl-numberformat@npm:8.9.2" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.1" - "@formatjs/intl-localematcher": "npm:0.5.3" + "@formatjs/ecma402-abstract": "npm:1.18.2" + "@formatjs/intl-localematcher": "npm:0.5.4" tslib: "npm:^2.4.0" - checksum: dd5ed4c86c8beff01e70c3d85f86d9932fbf182fe1f1a4273a2cac2d99f52d66cd024d93676c87fe8f88b01b41d3a08e547b531e5c79d81cc98eae821e210881 + checksum: db69cf03a8d381817ff255c6093194f1195ab359ebad5a9a221ff6f89073add9a9ce776127ea0bb3b01e6b8941dd304178eb2747167d44d2c9213dab2bc186ab languageName: node linkType: hard -"@formatjs/intl-pluralrules@npm:5.2.11": - version: 5.2.11 - resolution: "@formatjs/intl-pluralrules@npm:5.2.11" +"@formatjs/intl-pluralrules@npm:5.2.12": + version: 5.2.12 + resolution: "@formatjs/intl-pluralrules@npm:5.2.12" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.1" - "@formatjs/intl-localematcher": "npm:0.5.3" + "@formatjs/ecma402-abstract": "npm:1.18.2" + "@formatjs/intl-localematcher": "npm:0.5.4" tslib: "npm:^2.4.0" - checksum: 277a0586190a2b34bb51ad9995a67d9eff36b5b4977781e2b2911bcb14b8766af415b6cf9dbb552bc6df253831e19f65525138d3c0a24346403a9d7ade21a8be + checksum: 09f29358257bbb7c2c758517723c182b6ba2bd09190e04e6316a786ba9b5347e5204bc96daedaa2acc916ebb8ead4aa367788780ab10f54207a7636fefe67894 languageName: node linkType: hard -"@formatjs/intl-relativetimeformat@npm:11.2.11": - version: 11.2.11 - resolution: "@formatjs/intl-relativetimeformat@npm:11.2.11" +"@formatjs/intl-relativetimeformat@npm:11.2.12": + version: 11.2.12 + resolution: "@formatjs/intl-relativetimeformat@npm:11.2.12" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.1" - "@formatjs/intl-localematcher": "npm:0.5.3" + "@formatjs/ecma402-abstract": "npm:1.18.2" + "@formatjs/intl-localematcher": "npm:0.5.4" tslib: "npm:^2.4.0" - checksum: 38bd0dc5e381b7ca0ca7c77dab901283b3c4e8736397a9c0c7b32d8a2e00d2ccade71a927a3272b89ddbe9ccbad4776dd489934b2b7c6a44c704cd47645e44b6 + checksum: b45a41570c0cf1d2c30e0fd5346b967fd618c9557e506a9d281b400bd3b1ba2c58a814b244f2d3e9796b24ca35f0621b3bd1b83e44422655f3fb27e188b4abdd languageName: node linkType: hard @@ -9480,14 +9480,14 @@ __metadata: "@codemirror/state": "npm:6.4.0" "@codemirror/view": "npm:6.23.0" "@egjs/hammerjs": "npm:2.0.17" - "@formatjs/intl-datetimeformat": "npm:6.12.1" - "@formatjs/intl-displaynames": "npm:6.6.5" + "@formatjs/intl-datetimeformat": "npm:6.12.2" + "@formatjs/intl-displaynames": "npm:6.6.6" "@formatjs/intl-getcanonicallocales": "npm:2.3.0" - "@formatjs/intl-listformat": "npm:7.5.4" - "@formatjs/intl-locale": "npm:3.4.4" - "@formatjs/intl-numberformat": "npm:8.9.1" - "@formatjs/intl-pluralrules": "npm:5.2.11" - "@formatjs/intl-relativetimeformat": "npm:11.2.11" + "@formatjs/intl-listformat": "npm:7.5.5" + "@formatjs/intl-locale": "npm:3.4.5" + "@formatjs/intl-numberformat": "npm:8.9.2" + "@formatjs/intl-pluralrules": "npm:5.2.12" + "@formatjs/intl-relativetimeformat": "npm:11.2.12" "@fullcalendar/core": "npm:6.1.10" "@fullcalendar/daygrid": "npm:6.1.10" "@fullcalendar/interaction": "npm:6.1.10" @@ -9615,7 +9615,7 @@ __metadata: husky: "npm:8.0.3" idb-keyval: "npm:6.2.1" instant-mocha: "npm:1.5.2" - intl-messageformat: "npm:10.5.9" + intl-messageformat: "npm:10.5.10" js-yaml: "npm:4.1.0" jszip: "npm:3.10.1" leaflet: "npm:1.9.4" @@ -10081,15 +10081,15 @@ __metadata: languageName: node linkType: hard -"intl-messageformat@npm:10.5.9": - version: 10.5.9 - resolution: "intl-messageformat@npm:10.5.9" +"intl-messageformat@npm:10.5.10": + version: 10.5.10 + resolution: "intl-messageformat@npm:10.5.10" dependencies: - "@formatjs/ecma402-abstract": "npm:1.18.1" + "@formatjs/ecma402-abstract": "npm:1.18.2" "@formatjs/fast-memoize": "npm:2.2.0" - "@formatjs/icu-messageformat-parser": "npm:2.7.4" + "@formatjs/icu-messageformat-parser": "npm:2.7.5" tslib: "npm:^2.4.0" - checksum: bbbca5dce5f2239530254dad9d7317dcb71c17023040331bb7b963ac3000c600404f8e70a3dd7e049b009f9e9ae407e0d14df888452a2f7572fd012a0390b237 + checksum: 6c413b28d1249282179dc7954ef034738cfb806f4991fad165219e0ef127f570b19f43fdcc91885b92d48778555b2545b27898f088ce95a8dda40f56005c310b languageName: node linkType: hard From 646c02d855e9f20daa870f0c343ca762ff3a9a2f Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 19 Jan 2024 20:55:16 +0100 Subject: [PATCH 184/361] Implement more attribute icons (#19469) --- lint-staged.config.js | 2 +- src/common/entity/attribute_icon_path.ts | 11 +++++++ src/components/ha-control-select.ts | 9 +++--- .../more-info/controls/more-info-fan.ts | 25 +++++++++++++-- .../controls/more-info-humidifier.ts | 24 +++++++++++--- .../more-info/controls/more-info-light.ts | 23 ++++++++++++-- .../hui-climate-fan-modes-card-feature.ts | 28 +++++++++++------ .../hui-climate-hvac-modes-card-feature.ts | 31 +++++++++++++------ .../hui-climate-preset-modes-card-feature.ts | 30 ++++++++++++------ .../hui-humidifier-modes-card-feature.ts | 30 +++++++++++++----- 10 files changed, 164 insertions(+), 49 deletions(-) diff --git a/lint-staged.config.js b/lint-staged.config.js index 5359a96eee05..a1bd97c88d95 100644 --- a/lint-staged.config.js +++ b/lint-staged.config.js @@ -2,7 +2,7 @@ export default { "*.?(c|m){js,ts}": [ "eslint --cache --cache-strategy=content --cache-location=node_modules/.cache/eslint/.eslintcache --fix", "prettier --cache --write", - "lit-analyzer", + "lit-analyzer --quiet", ], "*.{json,css,md,markdown,html,y?aml}": "prettier --cache --write", "translations/*/*.json": (files) => diff --git a/src/common/entity/attribute_icon_path.ts b/src/common/entity/attribute_icon_path.ts index aa4280388764..f3855a5232d8 100644 --- a/src/common/entity/attribute_icon_path.ts +++ b/src/common/entity/attribute_icon_path.ts @@ -1,4 +1,5 @@ /** Return an icon representing a attribute. */ +import { mdiCircleMedium, mdiCreation } from "@mdi/js"; import { HassEntity } from "home-assistant-js-websocket"; import { computeFanModeIcon, @@ -6,6 +7,7 @@ import { computePresetModeIcon, computeSwingModeIcon, } from "../../data/climate"; +import { computeHumidiferModeIcon } from "../../data/humidifier"; import { computeDomain } from "./compute_domain"; const iconGenerators: Record string>> = { @@ -15,6 +17,15 @@ const iconGenerators: Record string>> = { preset_mode: computePresetModeIcon, swing_mode: computeSwingModeIcon, }, + humidifier: { + mode: computeHumidiferModeIcon, + }, + light: { + effect: () => mdiCreation, + }, + fan: { + preset_mode: () => mdiCircleMedium, + }, }; export const attributeIconPath = ( diff --git a/src/components/ha-control-select.ts b/src/components/ha-control-select.ts index 91c740d0e539..4cacb34fd21f 100644 --- a/src/components/ha-control-select.ts +++ b/src/components/ha-control-select.ts @@ -5,6 +5,7 @@ import { LitElement, nothing, PropertyValues, + TemplateResult, } from "lit"; import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; @@ -17,7 +18,7 @@ import "./ha-svg-icon"; export type ControlSelectOption = { value: string; label?: string; - icon?: string; + icon?: TemplateResult; path?: string; }; @@ -25,7 +26,7 @@ export type ControlSelectOption = { export class HaControlSelect extends LitElement { @property({ type: Boolean, reflect: true }) disabled = false; - @property() public options?: ControlSelectOption[]; + @property({ attribute: false }) public options?: ControlSelectOption[]; @property() public value?: string; @@ -183,9 +184,7 @@ export class HaControlSelect extends LitElement {
    ${option.path ? html`` - : option.icon - ? html` ` - : nothing} + : option.icon || nothing} ${option.label && !this.hideLabel ? html`${option.label}` : nothing} diff --git a/src/dialogs/more-info/controls/more-info-fan.ts b/src/dialogs/more-info/controls/more-info-fan.ts index b5f39cb05b74..31eac2ca5d7c 100644 --- a/src/dialogs/more-info/controls/more-info-fan.ts +++ b/src/dialogs/more-info/controls/more-info-fan.ts @@ -14,6 +14,7 @@ import { stopPropagation } from "../../../common/dom/stop_propagation"; import { stateActive } from "../../../common/entity/state_active"; import { supportsFeature } from "../../../common/entity/supports-feature"; import "../../../components/ha-control-select-menu"; +import "../../../components/ha-attribute-icon"; import "../../../components/ha-list-item"; import "../../../components/ha-outlined-icon-button"; import { UNAVAILABLE } from "../../../data/entity"; @@ -187,10 +188,30 @@ class MoreInfoFan extends LitElement { @selected=${this._handlePresetMode} @closed=${stopPropagation} > - + ${this.stateObj.attributes.preset_mode + ? html`` + : html` + + `} ${this.stateObj.attributes.preset_modes?.map( (mode) => html` - + + ${this.hass.formatEntityAttributeValue( this.stateObj!, "preset_mode", diff --git a/src/dialogs/more-info/controls/more-info-humidifier.ts b/src/dialogs/more-info/controls/more-info-humidifier.ts index 367a9fe364af..d9ae9ca08cda 100644 --- a/src/dialogs/more-info/controls/more-info-humidifier.ts +++ b/src/dialogs/more-info/controls/more-info-humidifier.ts @@ -12,11 +12,11 @@ import { stopPropagation } from "../../../common/dom/stop_propagation"; import { supportsFeature } from "../../../common/entity/supports-feature"; import "../../../components/ha-control-select-menu"; import "../../../components/ha-list-item"; +import "../../../components/ha-attribute-icon"; import { UNAVAILABLE } from "../../../data/entity"; import { HumidifierEntity, HumidifierEntityFeature, - computeHumidiferModeIcon, } from "../../../data/humidifier"; import "../../../state-control/humidifier/ha-state-control-humidifier-humidity"; import { HomeAssistant } from "../../../types"; @@ -109,14 +109,28 @@ class MoreInfoHumidifier extends LitElement { @selected=${this._handleModeChanged} @closed=${stopPropagation} > - + ${stateObj.attributes.mode + ? html`` + : html``} ${stateObj.attributes.available_modes!.map( (mode) => html` - + .hass=${this.hass} + .stateObj=${stateObj} + attribute="mode" + .attributeValue=${mode} + > ${this.hass.formatEntityAttributeValue( stateObj!, "mode", diff --git a/src/dialogs/more-info/controls/more-info-light.ts b/src/dialogs/more-info/controls/more-info-light.ts index 663c88dfbb5a..6054f0b695cf 100644 --- a/src/dialogs/more-info/controls/more-info-light.ts +++ b/src/dialogs/more-info/controls/more-info-light.ts @@ -19,6 +19,7 @@ import { customElement, property, state } from "lit/decorators"; import { stopPropagation } from "../../../common/dom/stop_propagation"; import { supportsFeature } from "../../../common/entity/supports-feature"; import "../../../components/ha-attributes"; +import "../../../components/ha-attribute-icon"; import "../../../components/ha-control-select-menu"; import "../../../components/ha-icon-button-group"; import "../../../components/ha-icon-button-toggle"; @@ -271,10 +272,28 @@ class MoreInfoLight extends LitElement { @selected=${this._handleEffect} @closed=${stopPropagation} > - + ${this.stateObj.attributes.effect + ? html`` + : html``} ${this.stateObj.attributes.effect_list?.map( (mode) => html` - + + ${this.hass.formatEntityAttributeValue( this.stateObj!, "effect", diff --git a/src/panels/lovelace/card-features/hui-climate-fan-modes-card-feature.ts b/src/panels/lovelace/card-features/hui-climate-fan-modes-card-feature.ts index bfdf039b94f6..78de1e6a4dcc 100644 --- a/src/panels/lovelace/card-features/hui-climate-fan-modes-card-feature.ts +++ b/src/panels/lovelace/card-features/hui-climate-fan-modes-card-feature.ts @@ -5,15 +5,12 @@ import { customElement, property, query, state } from "lit/decorators"; import { stopPropagation } from "../../../common/dom/stop_propagation"; import { computeDomain } from "../../../common/entity/compute_domain"; import { supportsFeature } from "../../../common/entity/supports-feature"; +import "../../../components/ha-attribute-icon"; import "../../../components/ha-control-select"; import type { ControlSelectOption } from "../../../components/ha-control-select"; import "../../../components/ha-control-select-menu"; import type { HaControlSelectMenu } from "../../../components/ha-control-select-menu"; -import { - ClimateEntity, - ClimateEntityFeature, - computeFanModeIcon, -} from "../../../data/climate"; +import { ClimateEntity, ClimateEntityFeature } from "../../../data/climate"; import { UNAVAILABLE } from "../../../data/entity"; import { HomeAssistant } from "../../../types"; import { LovelaceCardFeature, LovelaceCardFeatureEditor } from "../types"; @@ -136,7 +133,13 @@ class HuiClimateFanModesCardFeature "fan_mode", mode ), - path: computeFanModeIcon(mode), + icon: html``, })); if (this._config.style === "icons") { @@ -171,12 +174,19 @@ class HuiClimateFanModesCardFeature @selected=${this._valueChanged} @closed=${stopPropagation} > - + ${this._currentFanMode + ? html`` + : html` `} ${options.map( (option) => html` - - ${option.label} + ${option.icon}${option.label} ` )} diff --git a/src/panels/lovelace/card-features/hui-climate-hvac-modes-card-feature.ts b/src/panels/lovelace/card-features/hui-climate-hvac-modes-card-feature.ts index 4477359e1d77..d01d6e43df93 100644 --- a/src/panels/lovelace/card-features/hui-climate-hvac-modes-card-feature.ts +++ b/src/panels/lovelace/card-features/hui-climate-hvac-modes-card-feature.ts @@ -6,14 +6,14 @@ import { styleMap } from "lit/directives/style-map"; import { stopPropagation } from "../../../common/dom/stop_propagation"; import { computeDomain } from "../../../common/entity/compute_domain"; import { stateColorCss } from "../../../common/entity/state_color"; +import "../../../components/ha-attribute-icon"; import "../../../components/ha-control-select"; -import "../../../components/ha-control-select-menu"; import type { ControlSelectOption } from "../../../components/ha-control-select"; +import "../../../components/ha-control-select-menu"; import type { HaControlSelectMenu } from "../../../components/ha-control-select-menu"; import { ClimateEntity, compareClimateHvacModes, - computeHvacModeIcon, HvacMode, } from "../../../data/climate"; import { UNAVAILABLE } from "../../../data/entity"; @@ -130,7 +130,13 @@ class HuiClimateHvacModesCardFeature .map((mode) => ({ value: mode, label: this.hass!.formatEntityState(this.stateObj!, mode), - path: computeHvacModeIcon(mode), + icon: html``, })); if (this._config.style === "dropdown") { @@ -147,15 +153,22 @@ class HuiClimateHvacModesCardFeature @selected=${this._valueChanged} @closed=${stopPropagation} > - + ${this._currentHvacMode + ? html`` + : html``} ${options.map( (option) => html` - - ${option.label} + ${option.icon}${option.label} ` )} diff --git a/src/panels/lovelace/card-features/hui-climate-preset-modes-card-feature.ts b/src/panels/lovelace/card-features/hui-climate-preset-modes-card-feature.ts index 2067a17739c4..410f8ce942a0 100644 --- a/src/panels/lovelace/card-features/hui-climate-preset-modes-card-feature.ts +++ b/src/panels/lovelace/card-features/hui-climate-preset-modes-card-feature.ts @@ -5,15 +5,12 @@ import { customElement, property, query, state } from "lit/decorators"; import { stopPropagation } from "../../../common/dom/stop_propagation"; import { computeDomain } from "../../../common/entity/compute_domain"; import { supportsFeature } from "../../../common/entity/supports-feature"; +import "../../../components/ha-attribute-icon"; import "../../../components/ha-control-select"; import type { ControlSelectOption } from "../../../components/ha-control-select"; import "../../../components/ha-control-select-menu"; import type { HaControlSelectMenu } from "../../../components/ha-control-select-menu"; -import { - ClimateEntity, - ClimateEntityFeature, - computePresetModeIcon, -} from "../../../data/climate"; +import { ClimateEntity, ClimateEntityFeature } from "../../../data/climate"; import { UNAVAILABLE } from "../../../data/entity"; import { HomeAssistant } from "../../../types"; import { LovelaceCardFeature, LovelaceCardFeatureEditor } from "../types"; @@ -138,7 +135,13 @@ class HuiClimatePresetModesCardFeature "preset_mode", mode ), - path: computePresetModeIcon(mode), + icon: html``, })); if (this._config.style === "icons") { @@ -176,12 +179,21 @@ class HuiClimatePresetModesCardFeature @selected=${this._valueChanged} @closed=${stopPropagation} > - + ${this._currentPresetMode + ? html`` + : html` + + `} ${options.map( (option) => html` - - ${option.label} + ${option.icon}${option.label} ` )} diff --git a/src/panels/lovelace/card-features/hui-humidifier-modes-card-feature.ts b/src/panels/lovelace/card-features/hui-humidifier-modes-card-feature.ts index a3e4c845aa01..94a366712ad2 100644 --- a/src/panels/lovelace/card-features/hui-humidifier-modes-card-feature.ts +++ b/src/panels/lovelace/card-features/hui-humidifier-modes-card-feature.ts @@ -5,16 +5,16 @@ import { customElement, property, query, state } from "lit/decorators"; import { stopPropagation } from "../../../common/dom/stop_propagation"; import { computeDomain } from "../../../common/entity/compute_domain"; import { supportsFeature } from "../../../common/entity/supports-feature"; +import "../../../components/ha-attribute-icon"; import "../../../components/ha-control-select"; import type { ControlSelectOption } from "../../../components/ha-control-select"; import "../../../components/ha-control-select-menu"; import type { HaControlSelectMenu } from "../../../components/ha-control-select-menu"; +import { UNAVAILABLE } from "../../../data/entity"; import { - HumidifierEntityFeature, HumidifierEntity, - computeHumidiferModeIcon, + HumidifierEntityFeature, } from "../../../data/humidifier"; -import { UNAVAILABLE } from "../../../data/entity"; import { HomeAssistant } from "../../../types"; import { LovelaceCardFeature, LovelaceCardFeatureEditor } from "../types"; import { HumidifierModesCardFeatureConfig } from "./types"; @@ -136,7 +136,13 @@ class HuiHumidifierModesCardFeature "mode", mode ), - path: computeHumidiferModeIcon(mode), + icon: html``, })); if (this._config.style === "icons") { @@ -168,12 +174,22 @@ class HuiHumidifierModesCardFeature @selected=${this._valueChanged} @closed=${stopPropagation} > - + ${this._currentMode + ? html`` + : html``} ${options.map( (option) => html` - - ${option.label} + ${option.icon}${option.label} ` )} From 319cf64977060dba5a92ec387c0abebe002d12fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Fri, 19 Jan 2024 21:05:11 +0100 Subject: [PATCH 185/361] Do not "load" forever if null is returned for release notes (#19478) --- src/dialogs/more-info/controls/more-info-update.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dialogs/more-info/controls/more-info-update.ts b/src/dialogs/more-info/controls/more-info-update.ts index 00367bdd37b2..56dc50dee953 100644 --- a/src/dialogs/more-info/controls/more-info-update.ts +++ b/src/dialogs/more-info/controls/more-info-update.ts @@ -99,7 +99,7 @@ class MoreInfoUpdate extends LitElement { : ""} ${supportsFeature(this.stateObj!, UpdateEntityFeature.RELEASE_NOTES) && !this._error - ? !this._releaseNotes + ? this._releaseNotes === undefined ? html`
    ` From 45398f84cb65079873b1431588ed73177c0a963c Mon Sep 17 00:00:00 2001 From: Cody C <50791984+codyc1515@users.noreply.github.com> Date: Sat, 20 Jan 2024 09:06:29 +1300 Subject: [PATCH 186/361] Update hassio-addon-dashboard.ts to fix back button issue (#19477) --- hassio/src/addon-view/hassio-addon-dashboard.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hassio/src/addon-view/hassio-addon-dashboard.ts b/hassio/src/addon-view/hassio-addon-dashboard.ts index 02c9f29a7f22..6c6ec8f12bba 100644 --- a/hassio/src/addon-view/hassio-addon-dashboard.ts +++ b/hassio/src/addon-view/hassio-addon-dashboard.ts @@ -250,7 +250,9 @@ class HassioAddonDashboard extends LitElement { } if (path === "uninstall") { - window.history.back(); + if (this.isConnected) { + navigate(this._backPath); + } } else if (path === "install") { this.addon = await fetchHassioAddonInfo(this.hass, this.addon!.slug); } else { From dcb3accdb86f534277c16fd6d1c063f0a79c52dd Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Fri, 19 Jan 2024 15:16:15 -0500 Subject: [PATCH 187/361] Fix incompatible object/array property types (1 of 3) (#19450) --- gallery/src/components/demo-card.ts | 2 +- .../device/ha-device-automation-picker.ts | 2 +- src/components/ha-file-upload.ts | 4 ++-- src/components/ha-selector/ha-selector-action.ts | 2 +- src/components/ha-selector/ha-selector-condition.ts | 2 +- src/components/ha-selector/ha-selector-location.ts | 2 +- src/components/ha-selector/ha-selector-target.ts | 2 +- src/components/ha-selector/ha-selector-trigger.ts | 2 +- src/components/ha-selector/ha-selector-ui-action.ts | 2 +- .../automation/action/ha-automation-action-row.ts | 4 ++-- .../automation/action/ha-automation-action.ts | 4 ++-- .../action/types/ha-automation-action-repeat.ts | 2 +- .../automation/blueprint-automation-editor.ts | 4 ++-- .../condition/ha-automation-condition-editor.ts | 2 +- .../condition/ha-automation-condition-row.ts | 4 ++-- .../automation/condition/ha-automation-condition.ts | 4 ++-- .../automation/trigger/ha-automation-trigger-row.ts | 2 +- .../automation/trigger/ha-automation-trigger.ts | 4 ++-- .../trigger/types/ha-automation-trigger-event.ts | 2 +- ...ha-automation-trigger-persistent_notification.ts | 3 ++- .../trigger/types/ha-automation-trigger-tag.ts | 2 +- .../trigger/types/ha-automation-trigger-webhook.ts | 2 +- .../trigger/types/ha-automation-trigger-zone.ts | 2 +- .../config/cloud/account/cloud-remote-pref.ts | 2 +- src/panels/config/cloud/account/cloud-tts-pref.ts | 2 +- src/panels/config/cloud/ha-config-cloud.ts | 2 +- src/panels/config/dashboard/ha-config-dashboard.ts | 2 +- .../devices/device-detail/ha-device-info-card.ts | 2 +- .../integration-elements/zha/ha-device-info-zha.ts | 2 +- .../zha/zha-cluster-attributes.ts | 4 ++-- .../integration-panels/zha/zha-cluster-commands.ts | 4 ++-- .../integration-panels/zha/zha-device-binding.ts | 2 +- .../integration-panels/zha/zha-device-card.ts | 2 +- .../integration-panels/zha/zha-device-neighbors.ts | 2 +- .../zha/zha-device-pairing-status-card.ts | 2 +- .../integration-panels/zha/zha-device-signature.ts | 2 +- .../integration-panels/zha/zha-group-binding.ts | 2 +- .../integration-panels/zha/zha-manage-clusters.ts | 2 +- src/panels/config/voice-assistants/assist-pref.ts | 13 ++++++------- .../config/voice-assistants/cloud-alexa-pref.ts | 2 +- src/panels/lovelace/components/hui-action-editor.ts | 6 +++--- src/panels/lovelace/components/hui-card-options.ts | 2 +- .../lovelace/components/hui-generic-entity-row.ts | 2 +- .../lovelace/editor/card-editor/hui-card-preview.ts | 2 +- .../editor/lovelace-editor/hui-lovelace-editor.ts | 2 +- 45 files changed, 62 insertions(+), 62 deletions(-) diff --git a/gallery/src/components/demo-card.ts b/gallery/src/components/demo-card.ts index 87ae240ac41c..3e24d1897e25 100644 --- a/gallery/src/components/demo-card.ts +++ b/gallery/src/components/demo-card.ts @@ -13,7 +13,7 @@ export interface DemoCardConfig { class DemoCard extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public config!: DemoCardConfig; + @property({ attribute: false }) public config!: DemoCardConfig; @property({ type: Boolean }) public showConfig = false; diff --git a/src/components/device/ha-device-automation-picker.ts b/src/components/device/ha-device-automation-picker.ts index 87257aba4fdd..c430e20134df 100644 --- a/src/components/device/ha-device-automation-picker.ts +++ b/src/components/device/ha-device-automation-picker.ts @@ -25,7 +25,7 @@ export abstract class HaDeviceAutomationPicker< @property() public deviceId?: string; - @property() public value?: T; + @property({ type: Object }) public value?: T; @state() private _automations: T[] = []; diff --git a/src/components/ha-file-upload.ts b/src/components/ha-file-upload.ts index 952c588ea241..f4077934ce32 100644 --- a/src/components/ha-file-upload.ts +++ b/src/components/ha-file-upload.ts @@ -31,11 +31,11 @@ export class HaFileUpload extends LitElement { @property() public supports?: string; - @property() public value?: File | File[] | FileList | string; + @property({ type: Object }) public value?: File | File[] | FileList | string; @property({ type: Boolean }) public multiple = false; - @property({ type: Boolean, reflect: true }) public disabled: boolean = false; + @property({ type: Boolean, reflect: true }) public disabled = false; @property({ type: Boolean }) public uploading = false; diff --git a/src/components/ha-selector/ha-selector-action.ts b/src/components/ha-selector/ha-selector-action.ts index c1edf4d2662d..2e203a62da4b 100644 --- a/src/components/ha-selector/ha-selector-action.ts +++ b/src/components/ha-selector/ha-selector-action.ts @@ -11,7 +11,7 @@ export class HaActionSelector extends LitElement { @property({ attribute: false }) public selector!: ActionSelector; - @property() public value?: Action; + @property({ attribute: false }) public value?: Action; @property() public label?: string; diff --git a/src/components/ha-selector/ha-selector-condition.ts b/src/components/ha-selector/ha-selector-condition.ts index 649986deef52..756d43b1e4e3 100644 --- a/src/components/ha-selector/ha-selector-condition.ts +++ b/src/components/ha-selector/ha-selector-condition.ts @@ -11,7 +11,7 @@ export class HaConditionSelector extends LitElement { @property({ attribute: false }) public selector!: ConditionSelector; - @property() public value?: Condition; + @property({ attribute: false }) public value?: Condition; @property() public label?: string; diff --git a/src/components/ha-selector/ha-selector-location.ts b/src/components/ha-selector/ha-selector-location.ts index bf08b181e4e0..a2ae29dd9880 100644 --- a/src/components/ha-selector/ha-selector-location.ts +++ b/src/components/ha-selector/ha-selector-location.ts @@ -16,7 +16,7 @@ export class HaLocationSelector extends LitElement { @property({ attribute: false }) public selector!: LocationSelector; - @property() public value?: LocationSelectorValue; + @property({ type: Object }) public value?: LocationSelectorValue; @property() public label?: string; diff --git a/src/components/ha-selector/ha-selector-target.ts b/src/components/ha-selector/ha-selector-target.ts index 3270f8b4db7e..fafc97b62beb 100644 --- a/src/components/ha-selector/ha-selector-target.ts +++ b/src/components/ha-selector/ha-selector-target.ts @@ -32,7 +32,7 @@ export class HaTargetSelector extends LitElement { @property({ attribute: false }) public selector!: TargetSelector; - @property() public value?: HassServiceTarget; + @property({ type: Object }) public value?: HassServiceTarget; @property() public label?: string; diff --git a/src/components/ha-selector/ha-selector-trigger.ts b/src/components/ha-selector/ha-selector-trigger.ts index 541aac3b4495..567a81c4d364 100644 --- a/src/components/ha-selector/ha-selector-trigger.ts +++ b/src/components/ha-selector/ha-selector-trigger.ts @@ -11,7 +11,7 @@ export class HaTriggerSelector extends LitElement { @property({ attribute: false }) public selector!: TriggerSelector; - @property() public value?: Trigger; + @property({ attribute: false }) public value?: Trigger; @property() public label?: string; diff --git a/src/components/ha-selector/ha-selector-ui-action.ts b/src/components/ha-selector/ha-selector-ui-action.ts index 63fe5d5bc689..b20cb6ed17d7 100644 --- a/src/components/ha-selector/ha-selector-ui-action.ts +++ b/src/components/ha-selector/ha-selector-ui-action.ts @@ -12,7 +12,7 @@ export class HaSelectorUiAction extends LitElement { @property({ attribute: false }) public selector!: UiActionSelector; - @property() public value?: ActionConfig; + @property({ attribute: false }) public value?: ActionConfig; @property() public label?: string; diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts index a6c8fd61ddd3..64c469a0db4c 100644 --- a/src/panels/config/automation/action/ha-automation-action-row.ts +++ b/src/panels/config/automation/action/ha-automation-action-row.ts @@ -125,7 +125,7 @@ const preventDefault = (ev) => ev.preventDefault(); export default class HaAutomationActionRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public action!: Action; + @property({ attribute: false }) public action!: Action; @property({ type: Boolean }) public narrow = false; @@ -133,7 +133,7 @@ export default class HaAutomationActionRow extends LitElement { @property({ type: Boolean }) public hideMenu = false; - @property() public path?: ItemPath; + @property({ type: Array }) public path?: ItemPath; @storage({ key: "automationClipboard", diff --git a/src/panels/config/automation/action/ha-automation-action.ts b/src/panels/config/automation/action/ha-automation-action.ts index 6a9dec5eccc1..04284e1b9179 100644 --- a/src/panels/config/automation/action/ha-automation-action.ts +++ b/src/panels/config/automation/action/ha-automation-action.ts @@ -33,9 +33,9 @@ export default class HaAutomationAction extends LitElement { @property({ type: Boolean }) public disabled = false; - @property() public path?: ItemPath; + @property({ type: Array }) public path?: ItemPath; - @property() public actions!: Action[]; + @property({ attribute: false }) public actions!: Action[]; @state() @consume({ context: reorderModeContext, subscribe: true }) diff --git a/src/panels/config/automation/action/types/ha-automation-action-repeat.ts b/src/panels/config/automation/action/types/ha-automation-action-repeat.ts index 2d4bf8847060..2b1cf924a93b 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-repeat.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-repeat.ts @@ -29,7 +29,7 @@ export class HaRepeatAction extends LitElement implements ActionElement { @property({ attribute: false }) public action!: RepeatAction; - @property() public path?: ItemPath; + @property({ type: Array }) public path?: ItemPath; public static get defaultConfig() { return { repeat: { count: 2, sequence: [] } }; diff --git a/src/panels/config/automation/blueprint-automation-editor.ts b/src/panels/config/automation/blueprint-automation-editor.ts index 635e5ada3ec2..3295b6422296 100644 --- a/src/panels/config/automation/blueprint-automation-editor.ts +++ b/src/panels/config/automation/blueprint-automation-editor.ts @@ -30,9 +30,9 @@ export class HaBlueprintAutomationEditor extends ReorderModeMixin(LitElement) { @property({ type: Boolean }) public disabled = false; - @property({ reflect: true, type: Boolean }) public narrow = false; + @property({ type: Boolean, reflect: true }) public narrow = false; - @property() public config!: BlueprintAutomationConfig; + @property({ attribute: false }) public config!: BlueprintAutomationConfig; @property({ attribute: false }) public stateObj?: HassEntity; diff --git a/src/panels/config/automation/condition/ha-automation-condition-editor.ts b/src/panels/config/automation/condition/ha-automation-condition-editor.ts index 3a838f03a046..f39092d9400b 100644 --- a/src/panels/config/automation/condition/ha-automation-condition-editor.ts +++ b/src/panels/config/automation/condition/ha-automation-condition-editor.ts @@ -30,7 +30,7 @@ export default class HaAutomationConditionEditor extends LitElement { @property({ type: Boolean }) public yamlMode = false; - @property() public path?: ItemPath; + @property({ type: Array }) public path?: ItemPath; private _processedCondition = memoizeOne((condition) => expandConditionWithShorthand(condition) diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts index da7782c813cf..72734de5663e 100644 --- a/src/panels/config/automation/condition/ha-automation-condition-row.ts +++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts @@ -81,13 +81,13 @@ export const handleChangeEvent = ( export default class HaAutomationConditionRow extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public condition!: Condition; + @property({ attribute: false }) public condition!: Condition; @property({ type: Boolean }) public hideMenu = false; @property({ type: Boolean }) public disabled = false; - @property() public path?: ItemPath; + @property({ type: Array }) public path?: ItemPath; @storage({ key: "automationClipboard", diff --git a/src/panels/config/automation/condition/ha-automation-condition.ts b/src/panels/config/automation/condition/ha-automation-condition.ts index e40906ceccfa..3b8571ff6973 100644 --- a/src/panels/config/automation/condition/ha-automation-condition.ts +++ b/src/panels/config/automation/condition/ha-automation-condition.ts @@ -38,11 +38,11 @@ import type HaAutomationConditionRow from "./ha-automation-condition-row"; export default class HaAutomationCondition extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public conditions!: Condition[]; + @property({ attribute: false }) public conditions!: Condition[]; @property({ type: Boolean }) public disabled = false; - @property() public path?: ItemPath; + @property({ type: Array }) public path?: ItemPath; @state() @consume({ context: reorderModeContext, subscribe: true }) diff --git a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts index 164226c2a53d..aea9540dc0ce 100644 --- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts +++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts @@ -112,7 +112,7 @@ export default class HaAutomationTriggerRow extends LitElement { @property({ type: Boolean }) public disabled = false; - @property() public path?: ItemPath; + @property({ type: Array }) public path?: ItemPath; @state() private _warnings?: string[]; diff --git a/src/panels/config/automation/trigger/ha-automation-trigger.ts b/src/panels/config/automation/trigger/ha-automation-trigger.ts index b4a0119e212e..4aa7845f6dad 100644 --- a/src/panels/config/automation/trigger/ha-automation-trigger.ts +++ b/src/panels/config/automation/trigger/ha-automation-trigger.ts @@ -28,11 +28,11 @@ import type HaAutomationTriggerRow from "./ha-automation-trigger-row"; export default class HaAutomationTrigger extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public triggers!: Trigger[]; + @property({ attribute: false }) public triggers!: Trigger[]; @property({ type: Boolean }) public disabled = false; - @property() public path?: ItemPath; + @property({ type: Array }) public path?: ItemPath; @state() @consume({ context: reorderModeContext, subscribe: true }) diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-event.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-event.ts index 3d997e81a456..5904efdba579 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-event.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-event.ts @@ -15,7 +15,7 @@ import { export class HaEventTrigger extends LitElement implements TriggerElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public trigger!: EventTrigger; + @property({ attribute: false }) public trigger!: EventTrigger; @property({ type: Boolean }) public disabled = false; diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-persistent_notification.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-persistent_notification.ts index 0e942c18603e..ee3a1743d4eb 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-persistent_notification.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-persistent_notification.ts @@ -23,7 +23,8 @@ export class HaPersistentNotificationTrigger { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public trigger!: PersistentNotificationTrigger; + @property({ attribute: false }) + public trigger!: PersistentNotificationTrigger; @property({ type: Boolean }) public disabled = false; diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-tag.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-tag.ts index be5a8c7fee9d..7857ea17b5fe 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-tag.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-tag.ts @@ -13,7 +13,7 @@ import { TriggerElement } from "../ha-automation-trigger-row"; export class HaTagTrigger extends LitElement implements TriggerElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public trigger!: TagTrigger; + @property({ attribute: false }) public trigger!: TagTrigger; @property({ type: Boolean }) public disabled = false; diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-webhook.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-webhook.ts index 300b7215c8b5..e090209a222c 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-webhook.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-webhook.ts @@ -27,7 +27,7 @@ const DEFAULT_WEBHOOK_ID = ""; export class HaWebhookTrigger extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public trigger!: WebhookTrigger; + @property({ attribute: false }) public trigger!: WebhookTrigger; @property({ type: Boolean }) public disabled = false; diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-zone.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-zone.ts index 3b9942efc564..7ddf87ccdff9 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-zone.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-zone.ts @@ -19,7 +19,7 @@ const includeDomains = ["zone"]; export class HaZoneTrigger extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public trigger!: ZoneTrigger; + @property({ attribute: false }) public trigger!: ZoneTrigger; @property({ type: Boolean }) public disabled = false; diff --git a/src/panels/config/cloud/account/cloud-remote-pref.ts b/src/panels/config/cloud/account/cloud-remote-pref.ts index b77159d8e6c7..54b093e949b9 100644 --- a/src/panels/config/cloud/account/cloud-remote-pref.ts +++ b/src/panels/config/cloud/account/cloud-remote-pref.ts @@ -22,7 +22,7 @@ import { showCloudCertificateDialog } from "../dialog-cloud-certificate/show-dia export class CloudRemotePref extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public cloudStatus?: CloudStatusLoggedIn; + @property({ attribute: false }) public cloudStatus?: CloudStatusLoggedIn; protected render() { if (!this.cloudStatus) { diff --git a/src/panels/config/cloud/account/cloud-tts-pref.ts b/src/panels/config/cloud/account/cloud-tts-pref.ts index ce9cc85dab34..3107ff622a01 100644 --- a/src/panels/config/cloud/account/cloud-tts-pref.ts +++ b/src/panels/config/cloud/account/cloud-tts-pref.ts @@ -24,7 +24,7 @@ import { showTryTtsDialog } from "./show-dialog-cloud-tts-try"; export class CloudTTSPref extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public cloudStatus?: CloudStatusLoggedIn; + @property({ attribute: false }) public cloudStatus?: CloudStatusLoggedIn; @state() private savingPreferences = false; diff --git a/src/panels/config/cloud/ha-config-cloud.ts b/src/panels/config/cloud/ha-config-cloud.ts index fd02981c9159..08b4c303c366 100644 --- a/src/panels/config/cloud/ha-config-cloud.ts +++ b/src/panels/config/cloud/ha-config-cloud.ts @@ -22,7 +22,7 @@ class HaConfigCloud extends HassRouterPage { @property({ attribute: false }) public route!: Route; - @property() public cloudStatus!: CloudStatus; + @property({ attribute: false }) public cloudStatus!: CloudStatus; protected routerOptions: RouterOptions = { defaultPage: "login", diff --git a/src/panels/config/dashboard/ha-config-dashboard.ts b/src/panels/config/dashboard/ha-config-dashboard.ts index 8bcb950c9ced..918b8c888e2a 100644 --- a/src/panels/config/dashboard/ha-config-dashboard.ts +++ b/src/panels/config/dashboard/ha-config-dashboard.ts @@ -118,7 +118,7 @@ class HaConfigDashboard extends SubscribeMixin(LitElement) { @property({ type: Boolean }) public isWide = false; - @property() public cloudStatus?: CloudStatus; + @property({ attribute: false }) public cloudStatus?: CloudStatus; @property({ type: Boolean }) public showAdvanced = false; diff --git a/src/panels/config/devices/device-detail/ha-device-info-card.ts b/src/panels/config/devices/device-detail/ha-device-info-card.ts index 0ec966058607..0af9a8bdc607 100644 --- a/src/panels/config/devices/device-detail/ha-device-info-card.ts +++ b/src/panels/config/devices/device-detail/ha-device-info-card.ts @@ -13,7 +13,7 @@ import { HomeAssistant } from "../../../../types"; export class HaDeviceCard extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public device!: DeviceRegistryEntry; + @property({ attribute: false }) public device!: DeviceRegistryEntry; @property({ type: Boolean }) public narrow = false; diff --git a/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-info-zha.ts b/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-info-zha.ts index da52b4dd2467..07fe9643a850 100644 --- a/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-info-zha.ts +++ b/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-info-zha.ts @@ -18,7 +18,7 @@ import { formatAsPaddedHex } from "../../../../integrations/integration-panels/z export class HaDeviceInfoZha extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public device!: DeviceRegistryEntry; + @property({ attribute: false }) public device!: DeviceRegistryEntry; @state() private _zhaDevice?: ZHADevice; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts b/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts index b0575c42f9c7..cc052ac842f8 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts @@ -33,9 +33,9 @@ import { ItemSelectedEvent, SetAttributeServiceData } from "./types"; export class ZHAClusterAttributes extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public device?: ZHADevice; + @property({ attribute: false }) public device?: ZHADevice; - @property() public selectedCluster?: Cluster; + @property({ type: Object }) public selectedCluster?: Cluster; @state() private _attributes: Attribute[] | undefined; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts b/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts index 66e59c382d1c..f699db763408 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts @@ -30,9 +30,9 @@ export class ZHAClusterCommands extends LitElement { @property({ type: Boolean }) public isWide = false; - @property() public device?: ZHADevice; + @property({ attribute: false }) public device?: ZHADevice; - @property() public selectedCluster?: Cluster; + @property({ type: Object }) public selectedCluster?: Cluster; @state() private _commands: Command[] | undefined; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts index 993aaad79e00..e21f6ec62504 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts @@ -21,7 +21,7 @@ import { ItemSelectedEvent } from "./types"; export class ZHADeviceBindingControl extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public device?: ZHADevice; + @property({ attribute: false }) public device?: ZHADevice; @state() private _bindTargetIndex = -1; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts index 46657ffc63f8..695a9bd9dca9 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts @@ -29,7 +29,7 @@ import { getIeeeTail } from "./functions"; class ZHADeviceCard extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public device?: ZHADevice; + @property({ attribute: false }) public device?: ZHADevice; @property({ type: Boolean }) public narrow = false; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-neighbors.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-neighbors.ts index 28ab989c31b8..64bec7d1bcd2 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-device-neighbors.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-device-neighbors.ts @@ -26,7 +26,7 @@ class ZHADeviceNeighbors extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public device: ZHADevice | undefined; + @property({ attribute: false }) public device?: ZHADevice; @state() private _devices: Map | undefined; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-pairing-status-card.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-pairing-status-card.ts index e39ae9280855..1c249d950709 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-device-pairing-status-card.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-device-pairing-status-card.ts @@ -18,7 +18,7 @@ import "./zha-device-card"; class ZHADevicePairingStatusCard extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public device?: ZHADevice; + @property({ attribute: false }) public device?: ZHADevice; @property({ type: Boolean }) public narrow = false; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-signature.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-signature.ts index 5d83434184ca..cd1675bed929 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-device-signature.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-device-signature.ts @@ -8,7 +8,7 @@ import { HomeAssistant } from "../../../../../types"; class ZHADeviceZigbeeInfo extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public device: ZHADevice | undefined; + @property({ attribute: false }) public device?: ZHADevice; @state() private _signature: any; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts b/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts index d96b27c9ad99..641d43b240a4 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts @@ -31,7 +31,7 @@ import "@material/mwc-list/mwc-list-item"; export class ZHAGroupBindingControl extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public device?: ZHADevice; + @property({ attribute: false }) public device?: ZHADevice; @state() private _bindTargetIndex = -1; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts b/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts index cdc2deb0cd90..0efd3f83c19b 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts @@ -42,7 +42,7 @@ export class ZHAManageClusters extends LitElement { @property({ type: Boolean }) public isWide = false; - @property() public device?: ZHADevice; + @property({ attribute: false }) public device?: ZHADevice; @state() private _selectedClusterIndex = -1; diff --git a/src/panels/config/voice-assistants/assist-pref.ts b/src/panels/config/voice-assistants/assist-pref.ts index fa1350936fb8..6ed2899cc947 100644 --- a/src/panels/config/voice-assistants/assist-pref.ts +++ b/src/panels/config/voice-assistants/assist-pref.ts @@ -1,7 +1,7 @@ import "@material/mwc-list/mwc-list"; import { mdiHelpCircle, mdiPlus, mdiStar } from "@mdi/js"; -import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit"; -import { property, state } from "lit/decorators"; +import { CSSResultGroup, LitElement, PropertyValues, css, html } from "lit"; +import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { formatLanguageCode } from "../../../common/language/format_language"; import "../../../components/ha-alert"; @@ -26,9 +26,10 @@ import { ExposeEntitySettings } from "../../../data/expose"; import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box"; import type { HomeAssistant } from "../../../types"; import { brandsUrl } from "../../../util/brands-url"; -import { showVoiceAssistantPipelineDetailDialog } from "./show-dialog-voice-assistant-pipeline-detail"; import { documentationUrl } from "../../../util/documentation-url"; +import { showVoiceAssistantPipelineDetailDialog } from "./show-dialog-voice-assistant-pipeline-detail"; +@customElement("assist-pref") export class AssistPref extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -37,14 +38,14 @@ export class AssistPref extends LitElement { ExposeEntitySettings >; + @property({ attribute: false }) public cloudStatus?: CloudStatus; + @state() private _pipelines: AssistPipeline[] = []; @state() private _preferred: string | null = null; @state() private _devices: AssistDevice[] = []; - @property() public cloudStatus?: CloudStatus; - protected firstUpdated(changedProps: PropertyValues) { super.firstUpdated(changedProps); @@ -277,5 +278,3 @@ declare global { "assist-pref": AssistPref; } } - -customElements.define("assist-pref", AssistPref); diff --git a/src/panels/config/voice-assistants/cloud-alexa-pref.ts b/src/panels/config/voice-assistants/cloud-alexa-pref.ts index 4286f241f3e8..3418293be1a4 100644 --- a/src/panels/config/voice-assistants/cloud-alexa-pref.ts +++ b/src/panels/config/voice-assistants/cloud-alexa-pref.ts @@ -27,7 +27,7 @@ export class CloudAlexaPref extends LitElement { ExposeEntitySettings >; - @property() public cloudStatus?: CloudStatusLoggedIn; + @property({ attribute: false }) public cloudStatus?: CloudStatusLoggedIn; @state() private _exposeNew?: boolean; diff --git a/src/panels/lovelace/components/hui-action-editor.ts b/src/panels/lovelace/components/hui-action-editor.ts index a578e24853fe..92fa589987a4 100644 --- a/src/panels/lovelace/components/hui-action-editor.ts +++ b/src/panels/lovelace/components/hui-action-editor.ts @@ -72,13 +72,13 @@ const ASSIST_SCHEMA = [ @customElement("hui-action-editor") export class HuiActionEditor extends LitElement { - @property() public config?: ActionConfig; + @property({ attribute: false }) public config?: ActionConfig; @property() public label?: string; - @property() public actions?: UiAction[]; + @property({ attribute: false }) public actions?: UiAction[]; - @property() public defaultAction?: UiAction; + @property({ attribute: false }) public defaultAction?: UiAction; @property() public tooltipText?: string; diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts index 8236d900e38b..7f59aaf3e921 100644 --- a/src/panels/lovelace/components/hui-card-options.ts +++ b/src/panels/lovelace/components/hui-card-options.ts @@ -54,7 +54,7 @@ export class HuiCardOptions extends LitElement { @property({ attribute: false }) public lovelace?: Lovelace; - @property() public path?: [number, number]; + @property({ type: Array }) public path?: [number, number]; @queryAssignedNodes() private _assignedNodes?: NodeListOf; diff --git a/src/panels/lovelace/components/hui-generic-entity-row.ts b/src/panels/lovelace/components/hui-generic-entity-row.ts index d426fde1fd35..eb745db37273 100644 --- a/src/panels/lovelace/components/hui-generic-entity-row.ts +++ b/src/panels/lovelace/components/hui-generic-entity-row.ts @@ -28,7 +28,7 @@ import { createEntityNotFoundWarning } from "./hui-warning"; export class HuiGenericEntityRow extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public config?: EntitiesCardEntityConfig; + @property({ attribute: false }) public config?: EntitiesCardEntityConfig; @property() public secondaryText?: string; diff --git a/src/panels/lovelace/editor/card-editor/hui-card-preview.ts b/src/panels/lovelace/editor/card-editor/hui-card-preview.ts index 5512b1cfbcd7..a1c95829009f 100644 --- a/src/panels/lovelace/editor/card-editor/hui-card-preview.ts +++ b/src/panels/lovelace/editor/card-editor/hui-card-preview.ts @@ -10,7 +10,7 @@ import { LovelaceCard } from "../../types"; export class HuiCardPreview extends ReactiveElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public config?: LovelaceCardConfig; + @property({ attribute: false }) public config?: LovelaceCardConfig; private _element?: LovelaceCard; diff --git a/src/panels/lovelace/editor/lovelace-editor/hui-lovelace-editor.ts b/src/panels/lovelace/editor/lovelace-editor/hui-lovelace-editor.ts index e3805d93f586..b735db367c9f 100644 --- a/src/panels/lovelace/editor/lovelace-editor/hui-lovelace-editor.ts +++ b/src/panels/lovelace/editor/lovelace-editor/hui-lovelace-editor.ts @@ -18,7 +18,7 @@ declare global { export class HuiLovelaceEditor extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public config?: LovelaceConfig; + @property({ attribute: false }) public config?: LovelaceConfig; get _title(): string { if (!this.config) { From a8b48b46193e9d99933a3a224e1eb8e3bdc756f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jan 2024 06:09:59 +0000 Subject: [PATCH 188/361] Update dependency prettier to v3.2.4 (#19483) * Update dependency prettier to v3.2.4 * Reformat --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Steve Repsher --- .devcontainer/devcontainer.json | 18 +++++++++--------- package.json | 2 +- tsconfig.json | 12 ++++++------ yarn.lock | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d4af4fbebabf..ca5bb5e97d06 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,12 +2,12 @@ "name": "Home Assistant Frontend", "build": { "dockerfile": "Dockerfile", - "context": ".." + "context": "..", }, "appPort": "8124:8123", "postStartCommand": "script/bootstrap", "containerEnv": { - "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}" + "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}", }, "customizations": { "vscode": { @@ -16,7 +16,7 @@ "esbenp.prettier-vscode", "runem.lit-plugin", "github.vscode-pull-request-github", - "eamodio.gitlens" + "eamodio.gitlens", ], "settings": { "files.eol": "\n", @@ -27,17 +27,17 @@ "editor.renderWhitespace": "boundary", "editor.rulers": [80], "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "esbenp.prettier-vscode", }, "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "esbenp.prettier-vscode", }, "files.trimTrailingWhitespace": true, "terminal.integrated.shell.linux": "/usr/bin/zsh", "gitlens.showWelcomeOnInstall": false, "gitlens.showWhatsNewAfterUpgrades": false, - "workbench.startupEditor": "none" - } - } - } + "workbench.startupEditor": "none", + }, + }, + }, } diff --git a/package.json b/package.json index 8ead92888281..039b7750e0ab 100644 --- a/package.json +++ b/package.json @@ -224,7 +224,7 @@ "object-hash": "3.0.0", "open": "10.0.3", "pinst": "3.0.0", - "prettier": "3.2.2", + "prettier": "3.2.4", "rollup": "2.79.1", "rollup-plugin-string": "3.0.0", "rollup-plugin-terser": "7.0.2", diff --git a/tsconfig.json b/tsconfig.json index 53cdd2dd9326..0c67e5a2b2e7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -43,13 +43,13 @@ "no-incompatible-property-type": "warning", "no-property-visibility-mismatch": "error", // CSS - "no-invalid-css": "off" // warning does not work + "no-invalid-css": "off", // warning does not work }, "globalTags": ["google-cast-launcher"], "customHtmlData": [ - "./node_modules/@lrnwebcomponents/simple-tooltip/custom-elements.json" - ] - } - ] - } + "./node_modules/@lrnwebcomponents/simple-tooltip/custom-elements.json", + ], + }, + ], + }, } diff --git a/yarn.lock b/yarn.lock index 9192d23858f4..f1e65b21dc16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9634,7 +9634,7 @@ __metadata: object-hash: "npm:3.0.0" open: "npm:10.0.3" pinst: "npm:3.0.0" - prettier: "npm:3.2.2" + prettier: "npm:3.2.4" proxy-polyfill: "npm:0.3.2" punycode: "npm:2.3.1" qr-scanner: "npm:1.4.2" @@ -13081,12 +13081,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.2.2": - version: 3.2.2 - resolution: "prettier@npm:3.2.2" +"prettier@npm:3.2.4": + version: 3.2.4 + resolution: "prettier@npm:3.2.4" bin: prettier: bin/prettier.cjs - checksum: ab9470ff6cfd19f28bc424f22e58f2fc4a488d148b9384f6c3739235017c8350cae82b3697392c23d9b098b9d8dfaa1cc9ff4ef25fd45f54c97b95f9cc7a1f7d + checksum: e2b735d0552501b3a7ac8bd3ba3b6de2920bb35bd4cd02d08cb9057ebe3e96d83b9a7e4b903d987b7530a50223b12c74d107c154337236ae2c68156ba1e65cd2 languageName: node linkType: hard From 55a5739e77ca8989eeda7ae3cdb384e24d21beae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jan 2024 15:26:07 -0500 Subject: [PATCH 189/361] Update dependency @babel/helper-define-polyfill-provider to v0.5.0 (#19496) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 039b7750e0ab..8c7d0e78a096 100644 --- a/package.json +++ b/package.json @@ -150,7 +150,7 @@ }, "devDependencies": { "@babel/core": "7.23.7", - "@babel/helper-define-polyfill-provider": "0.4.4", + "@babel/helper-define-polyfill-provider": "0.5.0", "@babel/plugin-proposal-decorators": "7.23.7", "@babel/plugin-transform-runtime": "7.23.7", "@babel/preset-env": "7.23.8", diff --git a/yarn.lock b/yarn.lock index f1e65b21dc16..d9323887f27c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -160,9 +160,9 @@ __metadata: languageName: node linkType: hard -"@babel/helper-define-polyfill-provider@npm:0.4.4, @babel/helper-define-polyfill-provider@npm:^0.4.4": - version: 0.4.4 - resolution: "@babel/helper-define-polyfill-provider@npm:0.4.4" +"@babel/helper-define-polyfill-provider@npm:0.5.0, @babel/helper-define-polyfill-provider@npm:^0.5.0": + version: 0.5.0 + resolution: "@babel/helper-define-polyfill-provider@npm:0.5.0" dependencies: "@babel/helper-compilation-targets": "npm:^7.22.6" "@babel/helper-plugin-utils": "npm:^7.22.5" @@ -171,13 +171,13 @@ __metadata: resolve: "npm:^1.14.2" peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 16c312e40ecf2ead81f3ab7275387079071012d2363022c04cf16d56fe0d781185f3a517b928f4556c716ae45e0567b817b636d5cd2fee8fb2ce2b18a04c5bcd + checksum: f849e816ec4b182a3e8fa8e09ff016f88bb95259cd6b2190b815c48f83c3d3b68e973a8ec72acc5086bfe93705cbd46ec089c06476421d858597780e42235a03 languageName: node linkType: hard -"@babel/helper-define-polyfill-provider@npm:^0.5.0": - version: 0.5.0 - resolution: "@babel/helper-define-polyfill-provider@npm:0.5.0" +"@babel/helper-define-polyfill-provider@npm:^0.4.4": + version: 0.4.4 + resolution: "@babel/helper-define-polyfill-provider@npm:0.4.4" dependencies: "@babel/helper-compilation-targets": "npm:^7.22.6" "@babel/helper-plugin-utils": "npm:^7.22.5" @@ -186,7 +186,7 @@ __metadata: resolve: "npm:^1.14.2" peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: f849e816ec4b182a3e8fa8e09ff016f88bb95259cd6b2190b815c48f83c3d3b68e973a8ec72acc5086bfe93705cbd46ec089c06476421d858597780e42235a03 + checksum: 16c312e40ecf2ead81f3ab7275387079071012d2363022c04cf16d56fe0d781185f3a517b928f4556c716ae45e0567b817b636d5cd2fee8fb2ce2b18a04c5bcd languageName: node linkType: hard @@ -9464,7 +9464,7 @@ __metadata: resolution: "home-assistant-frontend@workspace:." dependencies: "@babel/core": "npm:7.23.7" - "@babel/helper-define-polyfill-provider": "npm:0.4.4" + "@babel/helper-define-polyfill-provider": "npm:0.5.0" "@babel/plugin-proposal-decorators": "npm:7.23.7" "@babel/plugin-transform-runtime": "npm:7.23.7" "@babel/preset-env": "npm:7.23.8" From 69139b35e130715a1af6a54d9160b114b89bf3db Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 21 Jan 2024 23:07:40 +0100 Subject: [PATCH 190/361] Clean up updater remains (#19501) --- src/common/const.ts | 2 -- src/components/entity/ha-state-label-badge.ts | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/common/const.ts b/src/common/const.ts index 2e7d2f7c77d7..b770cf1d447b 100644 --- a/src/common/const.ts +++ b/src/common/const.ts @@ -18,7 +18,6 @@ import { mdiChatSleep, mdiClipboardList, mdiClock, - mdiCloudUpload, mdiCog, mdiCommentAlert, mdiCounter, @@ -127,7 +126,6 @@ export const FIXED_DOMAIN_ICONS = { time: mdiClock, timer: mdiTimerOutline, tts: mdiSpeakerMessage, - updater: mdiCloudUpload, vacuum: mdiRobotVacuum, wake_word: mdiChatSleep, weather: mdiWeatherPartlyCloudy, diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts index 4fe1a4d60c37..48854167a510 100644 --- a/src/components/entity/ha-state-label-badge.ts +++ b/src/components/entity/ha-state-label-badge.ts @@ -174,7 +174,6 @@ export class HaStateLabelBadge extends LitElement { case "scene": case "sun": case "timer": - case "updater": return null; // @ts-expect-error we don't break and go to default case "sensor": @@ -208,7 +207,6 @@ export class HaStateLabelBadge extends LitElement { case "alarm_control_panel": case "binary_sensor": case "device_tracker": - case "updater": case "person": case "scene": case "sun": @@ -285,8 +283,7 @@ export class HaStateLabelBadge extends LitElement { --ha-label-badge-label-text-transform: none; } - ha-label-badge.binary_sensor, - ha-label-badge.updater { + ha-label-badge.binary_sensor { --ha-label-badge-color: var(--label-badge-blue); } From 3a99a7de78a2e62281d827e94d9ccfac13047377 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 08:59:58 +0100 Subject: [PATCH 191/361] Bump actions/upload-artifact from 4.1.0 to 4.2.0 (#19503) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/nightly.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 744fa052fcaa..95ed7776d7f9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -89,7 +89,7 @@ jobs: env: IS_TEST: "true" - name: Upload bundle stats - uses: actions/upload-artifact@v4.1.0 + uses: actions/upload-artifact@v4.2.0 with: name: frontend-bundle-stats path: build/stats/*.json @@ -113,7 +113,7 @@ jobs: env: IS_TEST: "true" - name: Upload bundle stats - uses: actions/upload-artifact@v4.1.0 + uses: actions/upload-artifact@v4.2.0 with: name: supervisor-bundle-stats path: build/stats/*.json diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 4502edab9e5c..0fdf8f79a123 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -57,14 +57,14 @@ jobs: run: tar -czvf translations.tar.gz translations - name: Upload build artifacts - uses: actions/upload-artifact@v4.1.0 + uses: actions/upload-artifact@v4.2.0 with: name: wheels path: dist/home_assistant_frontend*.whl if-no-files-found: error - name: Upload translations - uses: actions/upload-artifact@v4.1.0 + uses: actions/upload-artifact@v4.2.0 with: name: translations path: translations.tar.gz From 10ad0010cf00e2b10117b61e2bfa3847f81d520d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 09:04:58 +0100 Subject: [PATCH 192/361] Bump actions/cache from 3.3.3 to 4.0.0 (#19502) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 95ed7776d7f9..31e4297c68e8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,7 +37,7 @@ jobs: - name: Build resources run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data gather-gallery-pages - name: Setup lint cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.0 with: path: | node_modules/.cache/prettier From bf4b76864dd22ce7954785c082ff80139c20b6e7 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 22 Jan 2024 13:58:35 +0100 Subject: [PATCH 193/361] Adjust check focus behaviour for todo list (#19472) * Adjust check focus behaviour for todo list * improve aria --- .../lovelace/cards/hui-todo-list-card.ts | 202 +++++++++--------- 1 file changed, 105 insertions(+), 97 deletions(-) diff --git a/src/panels/lovelace/cards/hui-todo-list-card.ts b/src/panels/lovelace/cards/hui-todo-list-card.ts index 4d286c7fd3e7..56b9cbadabed 100644 --- a/src/panels/lovelace/cards/hui-todo-list-card.ts +++ b/src/panels/lovelace/cards/hui-todo-list-card.ts @@ -224,95 +224,98 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { ` : nothing}
    - ${uncheckedItems.length - ? html`
    - - ${this.hass!.localize( - "ui.panel.lovelace.cards.todo-list.unchecked_items" - )} - - ${this.todoListSupportsFeature( - TodoListEntityFeature.MOVE_TODO_ITEM - ) - ? html` - - - ${this.hass!.localize( - this._reordering - ? "ui.panel.lovelace.cards.todo-list.exit_reorder_items" - : "ui.panel.lovelace.cards.todo-list.reorder_items" - )} - - - - ` - : nothing} -
    - - + + + ${uncheckedItems.length + ? html` +
    +

    + ${this.hass!.localize( + "ui.panel.lovelace.cards.todo-list.unchecked_items" + )} +

    + ${this.todoListSupportsFeature( + TodoListEntityFeature.MOVE_TODO_ITEM + ) + ? html` + + + ${this.hass!.localize( + this._reordering + ? "ui.panel.lovelace.cards.todo-list.exit_reorder_items" + : "ui.panel.lovelace.cards.todo-list.reorder_items" + )} + + + + ` + : nothing} +
    ${this._renderItems(uncheckedItems, unavailable)} -     -     ` - : html`

    - ${this.hass.localize( - "ui.panel.lovelace.cards.todo-list.no_unchecked_items" - )} -

    `} - ${checkedItems.length - ? html` -
    -
    - - ${this.hass!.localize( - "ui.panel.lovelace.cards.todo-list.checked_items" + ` + : html`

    + ${this.hass.localize( + "ui.panel.lovelace.cards.todo-list.no_unchecked_items" )} - - ${this.todoListSupportsFeature( - TodoListEntityFeature.DELETE_TODO_ITEM - ) - ? html` - - +

    `} + ${checkedItems.length + ? html` +
    +
    +
    +

    ${this.hass!.localize( - "ui.panel.lovelace.cards.todo-list.clear_items" + "ui.panel.lovelace.cards.todo-list.checked_items" )} - - - - ` - : nothing} -

    - - ${this._renderItems(checkedItems, unavailable)} - - ` - : ""} + + ${this.todoListSupportsFeature( + TodoListEntityFeature.DELETE_TODO_ITEM + ) + ? html` + + + ${this.hass!.localize( + "ui.panel.lovelace.cards.todo-list.clear_items" + )} + + + + ` + : nothing} +
    +
    + ${this._renderItems(checkedItems, unavailable)} + ` + : ""} +     +     `; } @@ -344,6 +347,7 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { left .hasMeta=${showReorder || showDelete} class="editRow ${classMap({ + draggable: item.status === TodoItemStatus.NeedsAction, completed: item.status === TodoItemStatus.Completed, multiline: Boolean(item.description || item.due), })}" @@ -471,6 +475,12 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { } private async _completeItem(ev): Promise { + let focusedIndex: number | undefined; + let list: List | undefined; + if (ev.type === "keydown") { + list = this.renderRoot.querySelector("mwc-list")!; + focusedIndex = list.getFocusedItemIndex(); + } const item = this._getItem(ev.currentTarget.itemId); if (!item) { return; @@ -483,17 +493,11 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { ? TodoItemStatus.Completed : TodoItemStatus.NeedsAction, }); - await this.updateComplete; - const newList: List = this.shadowRoot!.querySelector( - item.status === TodoItemStatus.NeedsAction ? "#checked" : "#unchecked" - )!; - await newList.updateComplete; - const items = - item.status === TodoItemStatus.NeedsAction - ? this._getCheckedItems(this._items) - : this._getUncheckedItems(this._items); - const index = items.findIndex((itm) => itm.uid === item.uid); - newList.focusItemAtIndex(index); + if (focusedIndex !== undefined && list) { + await this.updateComplete; + await list.updateComplete; + list.focusItemAtIndex(focusedIndex); + } } private async _clearCompletedItems(): Promise { @@ -562,6 +566,9 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { } private async _moveItem(oldIndex: number, newIndex: number) { + // correct index for header + oldIndex -= 1; + newIndex -= 1; const uncheckedItems = this._getUncheckedItems(this._items); const item = uncheckedItems[oldIndex]; let prevItem: TodoItem | undefined; @@ -630,8 +637,9 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard { direction: var(--direction); } - .header span { + .header h2 { color: var(--primary-text-color); + font-size: inherit; font-weight: 500; } From fffed0f5e13fb42ddb25805bb2d315a1dba77345 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 08:21:23 -0500 Subject: [PATCH 194/361] Update vaadinWebComponents monorepo to v24.3.4 (#19506) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 170 +++++++++++++++++++++++++-------------------------- 2 files changed, 87 insertions(+), 87 deletions(-) diff --git a/package.json b/package.json index 8c7d0e78a096..dd772f74e0f2 100644 --- a/package.json +++ b/package.json @@ -89,8 +89,8 @@ "@polymer/paper-toast": "3.0.1", "@polymer/polymer": "3.5.1", "@thomasloven/round-slider": "0.6.0", - "@vaadin/combo-box": "24.3.3", - "@vaadin/vaadin-themable-mixin": "24.3.3", + "@vaadin/combo-box": "24.3.4", + "@vaadin/vaadin-themable-mixin": "24.3.4", "@vibrant/color": "3.2.1-alpha.1", "@vibrant/core": "3.2.1-alpha.1", "@vibrant/quantizer-mmcq": "3.2.1-alpha.1", diff --git a/yarn.lock b/yarn.lock index d9323887f27c..b44ea0d1f164 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4660,128 +4660,128 @@ __metadata: languageName: node linkType: hard -"@vaadin/a11y-base@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/a11y-base@npm:24.3.3" +"@vaadin/a11y-base@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/a11y-base@npm:24.3.4" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.3" + "@vaadin/component-base": "npm:~24.3.4" lit: "npm:^3.0.0" - checksum: fca4baa66ed32b95a4318720b2a3a94ce1f01ceb13f71a176baab79b75396f6d19e8c368fca53c64dab33742b72824dcdf93180dc4a1db6950525631d1d79c76 + checksum: ef74bdd1e20f6cb131f613ffabf3099170c9713fcc3d7bd54c5471dfa3c355adba84befff585981420bb4525943b30830bff8b3c32db864edd80f720dd8ca723 languageName: node linkType: hard -"@vaadin/combo-box@npm:24.3.3": - version: 24.3.3 - resolution: "@vaadin/combo-box@npm:24.3.3" +"@vaadin/combo-box@npm:24.3.4": + version: 24.3.4 + resolution: "@vaadin/combo-box@npm:24.3.4" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.3" - "@vaadin/component-base": "npm:~24.3.3" - "@vaadin/field-base": "npm:~24.3.3" - "@vaadin/input-container": "npm:~24.3.3" - "@vaadin/item": "npm:~24.3.3" - "@vaadin/lit-renderer": "npm:~24.3.3" - "@vaadin/overlay": "npm:~24.3.3" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.3" - "@vaadin/vaadin-material-styles": "npm:~24.3.3" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" - checksum: e7c4045585c0b08b5c3b6708f1c0a2664721126916926b0cfa05a6c0fa6e0ecac079616697ba08a21a9756ffdc83cb0db87cfb5892d3cfb8aecebc50c3f7c9e5 + "@vaadin/a11y-base": "npm:~24.3.4" + "@vaadin/component-base": "npm:~24.3.4" + "@vaadin/field-base": "npm:~24.3.4" + "@vaadin/input-container": "npm:~24.3.4" + "@vaadin/item": "npm:~24.3.4" + "@vaadin/lit-renderer": "npm:~24.3.4" + "@vaadin/overlay": "npm:~24.3.4" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.4" + "@vaadin/vaadin-material-styles": "npm:~24.3.4" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.4" + checksum: a2d08d8d64a8b88a00f4436e5df1ddba402fd8b909bcfe3647eed1b1caba9b6edc93743fbdd56b73f0b7a5e71a7ab32e38a6912e266637453b11ecb34d3cf5f8 languageName: node linkType: hard -"@vaadin/component-base@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/component-base@npm:24.3.3" +"@vaadin/component-base@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/component-base@npm:24.3.4" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" "@vaadin/vaadin-development-mode-detector": "npm:^2.0.0" "@vaadin/vaadin-usage-statistics": "npm:^2.1.0" lit: "npm:^3.0.0" - checksum: 57ab8b202d21cf71ce9db3762f1024321c997a48c4f7a1c79aa6cf8c108b862fb61a831c003c06f51b649e5a5cb311cf71ea8e366fc2897adf4d80818541773e + checksum: 4411977be1e394fc03d84f026fc093393c8f511df588560b43fae4f8b360222473723a6d56b6a65cde90b1d9fba29f3e9640fa0e2a4816f1701c4a5a43a86fe3 languageName: node linkType: hard -"@vaadin/field-base@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/field-base@npm:24.3.3" +"@vaadin/field-base@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/field-base@npm:24.3.4" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.3" - "@vaadin/component-base": "npm:~24.3.3" + "@vaadin/a11y-base": "npm:~24.3.4" + "@vaadin/component-base": "npm:~24.3.4" lit: "npm:^3.0.0" - checksum: f19559702f0a85e27257963a2e9c176ad1a9bc83e86d3d2460fa9ba28c199bebf2bd1fde00009106cf8b854c1e6c530fc8aaf5a911a023781d45cbcc029f5963 + checksum: fda6584bb7f343665070f6db1c4c9a705e82e97d0c9e482b5dc615a07677f3bdcc7d10a182e6f8a97b16d3c698a165538feb69b3a9d317e1d6a86912a8db3179 languageName: node linkType: hard -"@vaadin/icon@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/icon@npm:24.3.3" +"@vaadin/icon@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/icon@npm:24.3.4" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.3" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.3" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" + "@vaadin/component-base": "npm:~24.3.4" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.4" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.4" lit: "npm:^3.0.0" - checksum: f08d526100c8ddcb001e9b0c64be8dfb8ea42d93092617a089252e2c3162d6ade56df98fb8112992c8e8a24e84779fca2efe7e032c4676c7a59bfacd55b69943 + checksum: cb09713d42381a8a437c7485d2c71a84b91f0489e062c41abe5ae4aab9a40d0bedbb78020a8e1e847d71467a0011b2fd91944cd2eb8993d18efc98efb7dd0de1 languageName: node linkType: hard -"@vaadin/input-container@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/input-container@npm:24.3.3" +"@vaadin/input-container@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/input-container@npm:24.3.4" dependencies: "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.3" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.3" - "@vaadin/vaadin-material-styles": "npm:~24.3.3" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" + "@vaadin/component-base": "npm:~24.3.4" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.4" + "@vaadin/vaadin-material-styles": "npm:~24.3.4" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.4" lit: "npm:^3.0.0" - checksum: fae301ac2bd31e1304a0804b727292393a46ad090ee7a1dce6ddfa8d1aabd934607848b3cfc38d4d9f887ef8c1db228e6e63068085afdd45dec0831cca57fa2d + checksum: a38155c598328f8d6ad9d41d8b36e3eef65ddb2f73cea09cd114284570b10f1564c7414f6dea4c6cc811f01f114dae8853e3188b883ea909bc23024bb7ada83c languageName: node linkType: hard -"@vaadin/item@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/item@npm:24.3.3" +"@vaadin/item@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/item@npm:24.3.4" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.3" - "@vaadin/component-base": "npm:~24.3.3" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.3" - "@vaadin/vaadin-material-styles": "npm:~24.3.3" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" - checksum: 7a49488a543493bd9586ab85d20d8863c51c06b074581e8e7ab4aea3cfeabc32d0a8ca1352581df801726bf6ff07e5950d67ceb7a3f50cacb53185e95c4a6ad6 + "@vaadin/a11y-base": "npm:~24.3.4" + "@vaadin/component-base": "npm:~24.3.4" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.4" + "@vaadin/vaadin-material-styles": "npm:~24.3.4" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.4" + checksum: 9d4f1e57305febd387e476955a56c27bd55c524da60105532b39263644d2b246d578e9bf1d41d90a114919684121520007c9a881cc876ffcb79f80fcaf107374 languageName: node linkType: hard -"@vaadin/lit-renderer@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/lit-renderer@npm:24.3.3" +"@vaadin/lit-renderer@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/lit-renderer@npm:24.3.4" dependencies: lit: "npm:^3.0.0" - checksum: 56c5f6d070989405a15fabae6b1e7cd452fd8b944169a40e3e1cf07ceb106fbc4cf2e07de4b8709f6ee8306d2abc48050f11140fc3f7e3ae9691ade4de57b305 + checksum: 31283f1e8a12661fb75cae7d73cabd4a29eeaa310ae998b206b3a8f5ef0203d7d8235c75f39d848b8c9122e0b0b03bb8c889dd2f39be89d7edc84af7769a3ae2 languageName: node linkType: hard -"@vaadin/overlay@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/overlay@npm:24.3.3" +"@vaadin/overlay@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/overlay@npm:24.3.4" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.3" - "@vaadin/component-base": "npm:~24.3.3" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.3" - "@vaadin/vaadin-material-styles": "npm:~24.3.3" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" - checksum: 3d21ae486b4d11850850cc6bed0269adcf31f1649be3d558aa3c65849ac2090dde01c948e2e6a5d4267db12675b263e07052f51117847587f2fe97fb543f0bbd + "@vaadin/a11y-base": "npm:~24.3.4" + "@vaadin/component-base": "npm:~24.3.4" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.4" + "@vaadin/vaadin-material-styles": "npm:~24.3.4" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.4" + checksum: 357a446e162deb377cac3c5b4004651f7e2a882e209cc8180ebd32ba560e974a3bbfb7294dc36092ba8f8ad6946b7b8f3f2ba5afbe120d9e7630871d0cdd03f8 languageName: node linkType: hard @@ -4792,36 +4792,36 @@ __metadata: languageName: node linkType: hard -"@vaadin/vaadin-lumo-styles@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/vaadin-lumo-styles@npm:24.3.3" +"@vaadin/vaadin-lumo-styles@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/vaadin-lumo-styles@npm:24.3.4" dependencies: "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.3" - "@vaadin/icon": "npm:~24.3.3" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" - checksum: f9ad5214e3fe54633345d9b580edd3f6a4dd5f630a89c4549f33f1c3edea50e245b5fa52b270e0b5f006d2b22eb7b30cd1306ff27d37006f0ac0f10c6965cedc + "@vaadin/component-base": "npm:~24.3.4" + "@vaadin/icon": "npm:~24.3.4" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.4" + checksum: c04ae63de4d5ed01f8ee4a2786a47dc8cbf9b238fd2199115ac6cd63bbc110ed6c7bd3d50eb0a1d7fa2036343f63c5b475f0376b2c4c081be111a7c1b356290c languageName: node linkType: hard -"@vaadin/vaadin-material-styles@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/vaadin-material-styles@npm:24.3.3" +"@vaadin/vaadin-material-styles@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/vaadin-material-styles@npm:24.3.4" dependencies: "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.3" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.3" - checksum: 8e5fd5cb4b9826d750ce971cbf7808afdf57a215866cd62b397f7b967b2aeb250a31264e7d88ba6aa16c0d68fc273ad0dcf2ab71ab0342cd0cc40422887dee1a + "@vaadin/component-base": "npm:~24.3.4" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.4" + checksum: 60f3bd1598705e822428cde7698af93bd9b025f9229af2a489005e210dc7b1a3a9bcd9f960da9b44174c03dbdb2d16a5f43062b78ab3f34acc6a8d09d9c03919 languageName: node linkType: hard -"@vaadin/vaadin-themable-mixin@npm:24.3.3, @vaadin/vaadin-themable-mixin@npm:~24.3.3": - version: 24.3.3 - resolution: "@vaadin/vaadin-themable-mixin@npm:24.3.3" +"@vaadin/vaadin-themable-mixin@npm:24.3.4, @vaadin/vaadin-themable-mixin@npm:~24.3.4": + version: 24.3.4 + resolution: "@vaadin/vaadin-themable-mixin@npm:24.3.4" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" lit: "npm:^3.0.0" - checksum: 7a2cc59d2f77b559c50b9a7bd1b8447c49d01b68f11fa8d7fe539059dc9a1bfc56a091105ec668bdd72b769ded38253705556912853b72d3d168d146a761491d + checksum: ad932481d1f80759e583c58926d0f8e1cf67b29f6cd2ddfe6f16af16848f6f15f91eb266c093746ddfc2b562e855972742df40ff065855a536f872738e1320e4 languageName: node linkType: hard @@ -9563,8 +9563,8 @@ __metadata: "@types/webspeechapi": "npm:0.0.29" "@typescript-eslint/eslint-plugin": "npm:6.19.0" "@typescript-eslint/parser": "npm:6.19.0" - "@vaadin/combo-box": "npm:24.3.3" - "@vaadin/vaadin-themable-mixin": "npm:24.3.3" + "@vaadin/combo-box": "npm:24.3.4" + "@vaadin/vaadin-themable-mixin": "npm:24.3.4" "@vibrant/color": "npm:3.2.1-alpha.1" "@vibrant/core": "npm:3.2.1-alpha.1" "@vibrant/quantizer-mmcq": "npm:3.2.1-alpha.1" From 5c72c38c0d466e67c36fd23bdf8b794bf4f8d9b0 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Mon, 22 Jan 2024 06:57:06 -0800 Subject: [PATCH 195/361] Revert "Add a button to delete all refresh tokens" (#19480) --- src/panels/profile/ha-refresh-tokens-card.ts | 31 -------------------- src/translations/en.json | 2 -- 2 files changed, 33 deletions(-) diff --git a/src/panels/profile/ha-refresh-tokens-card.ts b/src/panels/profile/ha-refresh-tokens-card.ts index 3523acc417e2..6217936dcb46 100644 --- a/src/panels/profile/ha-refresh-tokens-card.ts +++ b/src/panels/profile/ha-refresh-tokens-card.ts @@ -9,7 +9,6 @@ import "../../components/ha-card"; import "../../components/ha-settings-row"; import "../../components/ha-icon-button"; import { RefreshToken } from "../../data/refresh_token"; -import { deleteAllRefreshTokens } from "../../data/auth"; import { showAlertDialog, showConfirmationDialog, @@ -109,13 +108,6 @@ class HaRefreshTokens extends LitElement { ) : ""}
    -
    - - ${this.hass.localize( - "ui.panel.profile.refresh_tokens.delete_all_tokens" - )} - -
    `; } @@ -147,29 +139,6 @@ class HaRefreshTokens extends LitElement { } } - private async _deleteAllTokens(): Promise { - if ( - !(await showConfirmationDialog(this, { - text: this.hass.localize( - "ui.panel.profile.refresh_tokens.confirm_delete_all" - ), - destructive: true, - })) - ) { - return; - } - try { - await deleteAllRefreshTokens(this.hass); - } catch (err: any) { - await showAlertDialog(this, { - title: this.hass.localize( - "ui.panel.profile.refresh_tokens.delete_failed" - ), - text: err.message, - }); - } - } - static get styles(): CSSResultGroup { return [ haStyle, diff --git a/src/translations/en.json b/src/translations/en.json index 3f17573f9c45..1142a89d2371 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -5843,8 +5843,6 @@ "last_used": "Last used {date} from {location}", "not_used": "Has never been used", "confirm_delete": "Are you sure you want to delete the refresh token for {name}?", - "delete_all_tokens": "Delete all tokens", - "confirm_delete_all": "Are you sure you want to delete all refresh tokens? You will be logged out as part of this operation.", "delete_failed": "Failed to delete the refresh token.", "current_token_tooltip": "Unable to delete current refresh token" }, From 28a8863f4575e5d3f0c312763eef0c9b9bb923ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Mon, 22 Jan 2024 16:03:07 +0100 Subject: [PATCH 196/361] Allow for lists inside GitHub alerts when redered in markdown (#19505) * Allow for lists inside GitHub alerts when redered in markdown * simplify --- gallery/src/pages/lovelace/markdown-card.ts | 3 +++ src/components/ha-markdown-element.ts | 17 ++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gallery/src/pages/lovelace/markdown-card.ts b/gallery/src/pages/lovelace/markdown-card.ts index 576e6189c76b..aa47310b52bf 100644 --- a/gallery/src/pages/lovelace/markdown-card.ts +++ b/gallery/src/pages/lovelace/markdown-card.ts @@ -80,6 +80,9 @@ const CONFIGS = [ > [!CAUTION] > This is a GitHub caution alert + > [!TIP] + > - This is a list entry in GitHub tip alert + ## Lists Unordered diff --git a/src/components/ha-markdown-element.ts b/src/components/ha-markdown-element.ts index e282378ada7d..cd4e90c0c98a 100644 --- a/src/components/ha-markdown-element.ts +++ b/src/components/ha-markdown-element.ts @@ -98,13 +98,16 @@ class HaMarkdownElement extends ReactiveElement { firstElementChild!.childNodes[1].textContent?.trimStart()) || ""; - const childNodes = Array.from(firstElementChild!.childNodes); - for (const child of childNodes.slice( - childNodes.findIndex( - // There is always a line break between the title and the content, we want to skip that - (childNode) => childNode instanceof HTMLBRElement - ) + 1 - )) { + const childNodes = Array.from(node.childNodes) + .map((child) => Array.from(child.childNodes)) + .reduce((acc, val) => acc.concat(val), []) + .filter( + (childNode) => + childNode.textContent && + !(childNode.textContent in _gitHubBlockQuoteToAlert) && + !(childNode.textContent in _legacyGitHubBlockQuoteToAlert) + ); + for (const child of childNodes) { alertNote.appendChild(child); } node.firstElementChild!.replaceWith(alertNote); From 349344161a8c93bdf5fa6ea74a8bea69b5421e3f Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 22 Jan 2024 10:04:58 -0500 Subject: [PATCH 197/361] Fix incompatible object/array property types (2 of 3) (#19482) --- cast/src/launcher/layout/hc-cast.ts | 6 +++--- cast/src/launcher/layout/hc-layout.ts | 8 ++++---- gallery/src/components/demo-cards.ts | 2 +- gallery/src/components/demo-more-infos.ts | 2 +- .../components/supervisor-backup-content.ts | 2 +- src/auth/ha-auth-flow.ts | 2 +- src/auth/ha-pick-auth-provider.ts | 4 ++-- src/components/device/ha-device-picker.ts | 6 ++++-- src/components/device/ha-devices-picker.ts | 10 ++++++---- src/components/entity/ha-entities-picker.ts | 3 ++- src/components/entity/ha-entity-picker.ts | 3 ++- src/components/ha-aliases-editor.ts | 2 +- src/components/ha-area-picker.ts | 6 ++++-- src/components/ha-areas-picker.ts | 8 +++++--- src/components/ha-attribute-icon.ts | 2 +- src/components/ha-blueprint-picker.ts | 2 +- src/components/ha-combo-box.ts | 2 +- src/components/ha-country-picker.ts | 2 +- src/components/ha-date-range-picker.ts | 6 +++--- src/components/ha-form/ha-form-string.ts | 2 +- src/components/ha-gauge.ts | 4 ++-- src/components/ha-language-picker.ts | 2 +- src/components/ha-qr-scanner.ts | 2 +- src/components/ha-target-picker.ts | 6 ++++-- .../media-player/ha-browse-media-tts.ts | 2 +- .../media-player/ha-media-manage-button.ts | 2 +- .../media-player/ha-media-upload-button.ts | 2 +- src/layouts/hass-subpage.ts | 2 +- src/mixins/lit-localize-lite-mixin.ts | 2 +- src/onboarding/onboarding-analytics.ts | 2 +- src/onboarding/onboarding-core-config.ts | 2 +- src/onboarding/onboarding-create-user.ts | 2 +- src/onboarding/onboarding-integrations.ts | 2 +- src/onboarding/onboarding-location.ts | 2 +- src/onboarding/onboarding-welcome-links.ts | 2 +- src/onboarding/onboarding-welcome.ts | 2 +- .../mqtt/mqtt-discovery-payload.ts | 2 +- .../integration-elements/mqtt/mqtt-messages.ts | 2 +- .../components/ha-energy-validation-result.ts | 6 ++---- .../zha/zha-clusters-data-table.ts | 2 +- src/panels/config/scene/ha-config-scene.ts | 2 +- src/panels/config/scene/ha-scene-dashboard.ts | 2 +- src/panels/config/scene/ha-scene-editor.ts | 2 +- src/panels/config/script/ha-config-script.ts | 2 +- .../config/script/ha-script-field-row.ts | 4 ++-- src/panels/config/script/ha-script-fields.ts | 2 +- src/panels/config/script/ha-script-picker.ts | 2 +- src/panels/config/tags/tag-image.ts | 2 +- src/panels/custom/ha-panel-custom.ts | 2 +- .../developer-tools/event/events-list.ts | 2 +- src/panels/iframe/ha-panel-iframe.ts | 2 +- src/panels/logbook/ha-logbook.ts | 18 +++++++----------- .../lovelace/components/hui-buttons-base.ts | 3 ++- .../lovelace/components/hui-entity-editor.ts | 3 ++- .../components/hui-timestamp-display.ts | 2 +- src/panels/lovelace/ha-panel-lovelace.ts | 2 +- src/panels/lovelace/hui-editor.ts | 2 +- src/panels/profile/ha-advanced-mode-row.ts | 2 +- 58 files changed, 97 insertions(+), 89 deletions(-) diff --git a/cast/src/launcher/layout/hc-cast.ts b/cast/src/launcher/layout/hc-cast.ts index bc61a5cfd7a9..b95be048fc8a 100644 --- a/cast/src/launcher/layout/hc-cast.ts +++ b/cast/src/launcher/layout/hc-cast.ts @@ -31,11 +31,11 @@ import "./hc-layout"; @customElement("hc-cast") class HcCast extends LitElement { - @property() public auth!: Auth; + @property({ attribute: false }) public auth!: Auth; - @property() public connection!: Connection; + @property({ attribute: false }) public connection!: Connection; - @property() public castManager!: CastManager; + @property({ attribute: false }) public castManager!: CastManager; @state() private askWrite = false; diff --git a/cast/src/launcher/layout/hc-layout.ts b/cast/src/launcher/layout/hc-layout.ts index 69d788fe2134..31b336cb513e 100644 --- a/cast/src/launcher/layout/hc-layout.ts +++ b/cast/src/launcher/layout/hc-layout.ts @@ -10,13 +10,13 @@ import "../../../../src/components/ha-card"; @customElement("hc-layout") class HcLayout extends LitElement { - @property() public subtitle?: string | undefined; + @property() public subtitle?: string; - @property() public auth?: Auth; + @property({ attribute: false }) public auth?: Auth; - @property() public connection?: Connection; + @property({ attribute: false }) public connection?: Connection; - @property() public user?: HassUser; + @property({ attribute: false }) public user?: HassUser; protected render(): TemplateResult { return html` diff --git a/gallery/src/components/demo-cards.ts b/gallery/src/components/demo-cards.ts index 8080b4a7fc47..c2e117ceeb5d 100644 --- a/gallery/src/components/demo-cards.ts +++ b/gallery/src/components/demo-cards.ts @@ -10,7 +10,7 @@ import "../ha-demo-options"; @customElement("demo-cards") class DemoCards extends LitElement { - @property() public configs!: DemoCardConfig[]; + @property({ attribute: false }) public configs!: DemoCardConfig[]; @property({ attribute: false }) public hass!: HomeAssistant; diff --git a/gallery/src/components/demo-more-infos.ts b/gallery/src/components/demo-more-infos.ts index 072dca265816..af7703050c0c 100644 --- a/gallery/src/components/demo-more-infos.ts +++ b/gallery/src/components/demo-more-infos.ts @@ -11,7 +11,7 @@ import "./demo-more-info"; class DemoMoreInfos extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public entities!: []; + @property({ type: Array }) public entities!: string[]; @state() private _showConfig = false; diff --git a/hassio/src/components/supervisor-backup-content.ts b/hassio/src/components/supervisor-backup-content.ts index ff67b511c023..0c76daba83d9 100644 --- a/hassio/src/components/supervisor-backup-content.ts +++ b/hassio/src/components/supervisor-backup-content.ts @@ -72,7 +72,7 @@ const _computeAddons = (addons): AddonCheckboxItem[] => export class SupervisorBackupContent extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public localize?: LocalizeFunc; + @property({ attribute: false }) public localize?: LocalizeFunc; @property({ attribute: false }) public supervisor?: Supervisor; diff --git a/src/auth/ha-auth-flow.ts b/src/auth/ha-auth-flow.ts index 30b0e2176a17..66a93c021c3b 100644 --- a/src/auth/ha-auth-flow.ts +++ b/src/auth/ha-auth-flow.ts @@ -34,7 +34,7 @@ export class HaAuthFlow extends LitElement { @property() public oauth2State?: string; - @property() public localize!: LocalizeFunc; + @property({ attribute: false }) public localize!: LocalizeFunc; @property({ attribute: false }) public step?: DataEntryFlowStep; diff --git a/src/auth/ha-pick-auth-provider.ts b/src/auth/ha-pick-auth-provider.ts index e26030146cf9..a814788b0a30 100644 --- a/src/auth/ha-pick-auth-provider.ts +++ b/src/auth/ha-pick-auth-provider.ts @@ -18,9 +18,9 @@ declare global { @customElement("ha-pick-auth-provider") export class HaPickAuthProvider extends LitElement { - @property() public authProviders: AuthProvider[] = []; + @property({ attribute: false }) public authProviders: AuthProvider[] = []; - @property() public localize!: LocalizeFunc; + @property({ attribute: false }) public localize!: LocalizeFunc; protected render() { return html` diff --git a/src/components/device/ha-device-picker.ts b/src/components/device/ha-device-picker.ts index ed6d49e37d63..cfcd2e2d7092 100644 --- a/src/components/device/ha-device-picker.ts +++ b/src/components/device/ha-device-picker.ts @@ -84,9 +84,11 @@ export class HaDevicePicker extends LitElement { @property({ type: Array, attribute: "exclude-devices" }) public excludeDevices?: string[]; - @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc; + @property({ attribute: false }) + public deviceFilter?: HaDevicePickerDeviceFilterFunc; - @property() public entityFilter?: HaDevicePickerEntityFilterFunc; + @property({ attribute: false }) + public entityFilter?: HaDevicePickerEntityFilterFunc; @property({ type: Boolean }) public disabled = false; diff --git a/src/components/device/ha-devices-picker.ts b/src/components/device/ha-devices-picker.ts index f53af31bcd63..1133d0f5e3db 100644 --- a/src/components/device/ha-devices-picker.ts +++ b/src/components/device/ha-devices-picker.ts @@ -12,7 +12,7 @@ import type { class HaDevicesPicker extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public value?: string[]; + @property({ type: Array }) public value?: string[]; @property() public helper?: string; @@ -36,17 +36,19 @@ class HaDevicesPicker extends LitElement { @property({ type: Array, attribute: "exclude-domains" }) public excludeDomains?: string[]; - @property({ attribute: "picked-device-label" }) @property({ type: Array, attribute: "include-device-classes" }) public includeDeviceClasses?: string[]; + @property({ attribute: "picked-device-label" }) public pickedDeviceLabel?: string; @property({ attribute: "pick-device-label" }) public pickDeviceLabel?: string; - @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc; + @property({ attribute: false }) + public deviceFilter?: HaDevicePickerDeviceFilterFunc; - @property() public entityFilter?: HaDevicePickerEntityFilterFunc; + @property({ attribute: false }) + public entityFilter?: HaDevicePickerEntityFilterFunc; protected render() { if (!this.hass) { diff --git a/src/components/entity/ha-entities-picker.ts b/src/components/entity/ha-entities-picker.ts index 72ea3ee8ccbc..b121e34ee434 100644 --- a/src/components/entity/ha-entities-picker.ts +++ b/src/components/entity/ha-entities-picker.ts @@ -73,7 +73,8 @@ class HaEntitiesPickerLight extends LitElement { @property({ attribute: "pick-entity-label" }) public pickEntityLabel?: string; - @property() public entityFilter?: HaEntityPickerEntityFilterFunc; + @property({ attribute: false }) + public entityFilter?: HaEntityPickerEntityFilterFunc; protected render() { if (!this.hass) { diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts index f6bad8a96569..1ae47cb99a87 100644 --- a/src/components/entity/ha-entity-picker.ts +++ b/src/components/entity/ha-entity-picker.ts @@ -92,7 +92,8 @@ export class HaEntityPicker extends LitElement { @property({ type: Array, attribute: "exclude-entities" }) public excludeEntities?: string[]; - @property() public entityFilter?: HaEntityPickerEntityFilterFunc; + @property({ attribute: false }) + public entityFilter?: HaEntityPickerEntityFilterFunc; @property({ type: Boolean }) public hideClearIcon = false; diff --git a/src/components/ha-aliases-editor.ts b/src/components/ha-aliases-editor.ts index e466b6012379..8f45409ba789 100644 --- a/src/components/ha-aliases-editor.ts +++ b/src/components/ha-aliases-editor.ts @@ -8,7 +8,7 @@ import "./ha-multi-textfield"; class AliasesEditor extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public aliases!: string[]; + @property({ type: Array }) public aliases!: string[]; @property({ type: Boolean }) public disabled = false; diff --git a/src/components/ha-area-picker.ts b/src/components/ha-area-picker.ts index fd68a8eb4b16..e3b237e8e714 100644 --- a/src/components/ha-area-picker.ts +++ b/src/components/ha-area-picker.ts @@ -88,9 +88,11 @@ export class HaAreaPicker extends LitElement { @property({ type: Array, attribute: "exclude-areas" }) public excludeAreas?: string[]; - @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc; + @property({ attribute: false }) + public deviceFilter?: HaDevicePickerDeviceFilterFunc; - @property() public entityFilter?: (entity: HassEntity) => boolean; + @property({ attribute: false }) + public entityFilter?: (entity: HassEntity) => boolean; @property({ type: Boolean }) public disabled = false; diff --git a/src/components/ha-areas-picker.ts b/src/components/ha-areas-picker.ts index 0d36f8e3fe51..12defd8611d5 100644 --- a/src/components/ha-areas-picker.ts +++ b/src/components/ha-areas-picker.ts @@ -13,7 +13,7 @@ export class HaAreasPicker extends SubscribeMixin(LitElement) { @property() public label?: string; - @property() public value?: string[]; + @property({ type: Array }) public value?: string[]; @property() public helper?: string; @@ -46,9 +46,11 @@ export class HaAreasPicker extends SubscribeMixin(LitElement) { @property({ type: Array, attribute: "include-device-classes" }) public includeDeviceClasses?: string[]; - @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc; + @property({ attribute: false }) + public deviceFilter?: HaDevicePickerDeviceFilterFunc; - @property() public entityFilter?: (entity: HassEntity) => boolean; + @property({ attribute: false }) + public entityFilter?: (entity: HassEntity) => boolean; @property({ attribute: "picked-area-label" }) public pickedAreaLabel?: string; diff --git a/src/components/ha-attribute-icon.ts b/src/components/ha-attribute-icon.ts index 6b2df9b436a4..682befceda76 100644 --- a/src/components/ha-attribute-icon.ts +++ b/src/components/ha-attribute-icon.ts @@ -10,7 +10,7 @@ import { attributeIconPath } from "../common/entity/attribute_icon_path"; @customElement("ha-attribute-icon") export class HaAttributeIcon extends LitElement { - @property() public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property({ attribute: false }) public stateObj?: HassEntity; diff --git a/src/components/ha-blueprint-picker.ts b/src/components/ha-blueprint-picker.ts index 214f9599c35b..7ddbd3c0c8ea 100644 --- a/src/components/ha-blueprint-picker.ts +++ b/src/components/ha-blueprint-picker.ts @@ -24,7 +24,7 @@ class HaBluePrintPicker extends LitElement { @property() public domain: BlueprintDomain = "automation"; - @property() public blueprints?: Blueprints; + @property({ attribute: false }) public blueprints?: Blueprints; @property({ type: Boolean }) public disabled = false; diff --git a/src/components/ha-combo-box.ts b/src/components/ha-combo-box.ts index 5dd9d2a21105..01b33c9a0634 100644 --- a/src/components/ha-combo-box.ts +++ b/src/components/ha-combo-box.ts @@ -95,7 +95,7 @@ export class HaComboBox extends LitElement { @property({ attribute: "item-id-path" }) public itemIdPath?: string; - @property() public renderer?: ComboBoxLitRenderer; + @property({ attribute: false }) public renderer?: ComboBoxLitRenderer; @property({ type: Boolean }) public disabled = false; diff --git a/src/components/ha-country-picker.ts b/src/components/ha-country-picker.ts index fea293a2b43a..55b7768c4058 100644 --- a/src/components/ha-country-picker.ts +++ b/src/components/ha-country-picker.ts @@ -269,7 +269,7 @@ export class HaCountryPicker extends LitElement { @property() public label?: string; - @property() public countries?: string[]; + @property({ type: Array }) public countries?: string[]; @property() public helper?: string; diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index dc9ef2f6aa2f..6984dc13fc61 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -47,11 +47,11 @@ export interface DateRangePickerRanges { export class HaDateRangePicker extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public startDate!: Date; + @property({ attribute: false }) public startDate!: Date; - @property() public endDate!: Date; + @property({ attribute: false }) public endDate!: Date; - @property() public ranges?: DateRangePickerRanges | false; + @property({ attribute: false }) public ranges?: DateRangePickerRanges | false; @state() private _ranges?: DateRangePickerRanges; diff --git a/src/components/ha-form/ha-form-string.ts b/src/components/ha-form/ha-form-string.ts index a0a1757b801d..dc9c4305e211 100644 --- a/src/components/ha-form/ha-form-string.ts +++ b/src/components/ha-form/ha-form-string.ts @@ -29,7 +29,7 @@ export class HaFormString extends LitElement implements HaFormElement { @property() public localizeBaseKey = "ui.components.selectors.text"; - @property() public schema!: HaFormStringSchema; + @property({ attribute: false }) public schema!: HaFormStringSchema; @property() public data!: HaFormStringData; diff --git a/src/components/ha-gauge.ts b/src/components/ha-gauge.ts index 1b2f665d0d26..9ec23558ffec 100644 --- a/src/components/ha-gauge.ts +++ b/src/components/ha-gauge.ts @@ -31,11 +31,11 @@ export class HaGauge extends LitElement { @property({ type: String }) public valueText?: string; - @property() public locale!: FrontendLocaleData; + @property({ attribute: false }) public locale!: FrontendLocaleData; @property({ type: Boolean }) public needle = false; - @property() public levels?: LevelDefinition[]; + @property({ type: Array }) public levels?: LevelDefinition[]; @property() public label = ""; diff --git a/src/components/ha-language-picker.ts b/src/components/ha-language-picker.ts index dcf0f7312d1d..c8a1e9d15b62 100644 --- a/src/components/ha-language-picker.ts +++ b/src/components/ha-language-picker.ts @@ -19,7 +19,7 @@ export class HaLanguagePicker extends LitElement { @property() public label?: string; - @property() public languages?: string[]; + @property({ type: Array }) public languages?: string[]; @property({ attribute: false }) public hass?: HomeAssistant; diff --git a/src/components/ha-qr-scanner.ts b/src/components/ha-qr-scanner.ts index fe3bc8f0f6fb..b26aae20d6ca 100644 --- a/src/components/ha-qr-scanner.ts +++ b/src/components/ha-qr-scanner.ts @@ -14,7 +14,7 @@ import type { HaTextField } from "./ha-textfield"; @customElement("ha-qr-scanner") class HaQrScanner extends LitElement { - @property() localize!: LocalizeFunc; + @property({ attribute: false }) public localize!: LocalizeFunc; @state() private _cameras?: QrScanner.Camera[]; diff --git a/src/components/ha-target-picker.ts b/src/components/ha-target-picker.ts index e6a274ed1936..1604c42ce1ce 100644 --- a/src/components/ha-target-picker.ts +++ b/src/components/ha-target-picker.ts @@ -62,9 +62,11 @@ export class HaTargetPicker extends LitElement { @property({ type: Array, attribute: "include-device-classes" }) public includeDeviceClasses?: string[]; - @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc; + @property({ attribute: false }) + public deviceFilter?: HaDevicePickerDeviceFilterFunc; - @property() public entityFilter?: HaEntityPickerEntityFilterFunc; + @property({ attribute: false }) + public entityFilter?: HaEntityPickerEntityFilterFunc; @property({ type: Boolean, reflect: true }) public disabled = false; diff --git a/src/components/media-player/ha-browse-media-tts.ts b/src/components/media-player/ha-browse-media-tts.ts index d93ba0c9b48a..52a43d04d073 100644 --- a/src/components/media-player/ha-browse-media-tts.ts +++ b/src/components/media-player/ha-browse-media-tts.ts @@ -33,7 +33,7 @@ declare global { class BrowseMediaTTS extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public item!: MediaPlayerItem; + @property({ attribute: false }) public item!: MediaPlayerItem; @property() public action!: MediaPlayerBrowseAction; diff --git a/src/components/media-player/ha-media-manage-button.ts b/src/components/media-player/ha-media-manage-button.ts index e777aa95dc0a..90a85482dfa4 100644 --- a/src/components/media-player/ha-media-manage-button.ts +++ b/src/components/media-player/ha-media-manage-button.ts @@ -19,7 +19,7 @@ declare global { class MediaManageButton extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() currentItem?: MediaPlayerItem; + @property({ attribute: false }) currentItem?: MediaPlayerItem; @state() _uploading = 0; diff --git a/src/components/media-player/ha-media-upload-button.ts b/src/components/media-player/ha-media-upload-button.ts index 92e7531dffe9..97a92ea17122 100644 --- a/src/components/media-player/ha-media-upload-button.ts +++ b/src/components/media-player/ha-media-upload-button.ts @@ -24,7 +24,7 @@ declare global { class MediaUploadButton extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() currentItem?: MediaPlayerItem; + @property({ attribute: false }) currentItem?: MediaPlayerItem; @state() _uploading = 0; diff --git a/src/layouts/hass-subpage.ts b/src/layouts/hass-subpage.ts index 18483e218262..9eb3549630a3 100644 --- a/src/layouts/hass-subpage.ts +++ b/src/layouts/hass-subpage.ts @@ -25,7 +25,7 @@ class HassSubpage extends LitElement { @property({ type: String, attribute: "back-path" }) public backPath?: string; - @property() public backCallback?: () => void; + @property({ attribute: false }) public backCallback?: () => void; @property({ type: Boolean, reflect: true }) public narrow = false; diff --git a/src/mixins/lit-localize-lite-mixin.ts b/src/mixins/lit-localize-lite-mixin.ts index 2259a23dfff9..7d4823d73365 100644 --- a/src/mixins/lit-localize-lite-mixin.ts +++ b/src/mixins/lit-localize-lite-mixin.ts @@ -13,7 +13,7 @@ export const litLocalizeLiteMixin = >( ) => { class LitLocalizeLiteClass extends superClass { // Initialized to empty will prevent undefined errors if called before connected to DOM. - @property() public localize: LocalizeFunc = empty; + @property({ attribute: false }) public localize: LocalizeFunc = empty; // Use browser language setup before login. @property() public language?: string = getLocalLanguage(); diff --git a/src/onboarding/onboarding-analytics.ts b/src/onboarding/onboarding-analytics.ts index 359fb0b031f8..4cce93b6d276 100644 --- a/src/onboarding/onboarding-analytics.ts +++ b/src/onboarding/onboarding-analytics.ts @@ -16,7 +16,7 @@ import { onBoardingStyles } from "./styles"; class OnboardingAnalytics extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public localize!: LocalizeFunc; + @property({ attribute: false }) public localize!: LocalizeFunc; @state() private _error?: string; diff --git a/src/onboarding/onboarding-core-config.ts b/src/onboarding/onboarding-core-config.ts index 73debff9cb40..a45b989c2020 100644 --- a/src/onboarding/onboarding-core-config.ts +++ b/src/onboarding/onboarding-core-config.ts @@ -26,7 +26,7 @@ import "./onboarding-location"; class OnboardingCoreConfig extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public onboardingLocalize!: LocalizeFunc; + @property({ attribute: false }) public onboardingLocalize!: LocalizeFunc; @state() private _working = false; diff --git a/src/onboarding/onboarding-create-user.ts b/src/onboarding/onboarding-create-user.ts index e8d50bfcc7cb..615d28930c0a 100644 --- a/src/onboarding/onboarding-create-user.ts +++ b/src/onboarding/onboarding-create-user.ts @@ -43,7 +43,7 @@ const CREATE_USER_SCHEMA: HaFormSchema[] = [ @customElement("onboarding-create-user") class OnboardingCreateUser extends LitElement { - @property() public localize!: LocalizeFunc; + @property({ attribute: false }) public localize!: LocalizeFunc; @property() public language!: string; diff --git a/src/onboarding/onboarding-integrations.ts b/src/onboarding/onboarding-integrations.ts index 337896b43a23..12156a6ea849 100644 --- a/src/onboarding/onboarding-integrations.ts +++ b/src/onboarding/onboarding-integrations.ts @@ -36,7 +36,7 @@ const HIDDEN_DOMAINS = new Set([ class OnboardingIntegrations extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public onboardingLocalize!: LocalizeFunc; + @property({ attribute: false }) public onboardingLocalize!: LocalizeFunc; @state() private _entries: ConfigEntry[] = []; diff --git a/src/onboarding/onboarding-location.ts b/src/onboarding/onboarding-location.ts index 77c87186d15d..e452e8a7ad29 100644 --- a/src/onboarding/onboarding-location.ts +++ b/src/onboarding/onboarding-location.ts @@ -48,7 +48,7 @@ const LOCATION_MARKER_ID = "location"; class OnboardingLocation extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public onboardingLocalize!: LocalizeFunc; + @property({ attribute: false }) public onboardingLocalize!: LocalizeFunc; @state() private _working = false; diff --git a/src/onboarding/onboarding-welcome-links.ts b/src/onboarding/onboarding-welcome-links.ts index 97dd2ab13c41..9c342e508370 100644 --- a/src/onboarding/onboarding-welcome-links.ts +++ b/src/onboarding/onboarding-welcome-links.ts @@ -19,7 +19,7 @@ import "./onboarding-welcome-link"; class OnboardingWelcomeLinks extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public localize!: LocalizeFunc; + @property({ attribute: false }) public localize!: LocalizeFunc; @property({ type: Boolean }) public mobileApp = false; diff --git a/src/onboarding/onboarding-welcome.ts b/src/onboarding/onboarding-welcome.ts index 02985f6ce86f..7b3888a0f0be 100644 --- a/src/onboarding/onboarding-welcome.ts +++ b/src/onboarding/onboarding-welcome.ts @@ -17,7 +17,7 @@ import "../components/ha-button"; class OnboardingWelcome extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public localize!: LocalizeFunc; + @property({ attribute: false }) public localize!: LocalizeFunc; @property({ type: Boolean }) public supervisor = false; diff --git a/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-discovery-payload.ts b/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-discovery-payload.ts index f61c1995f3cc..ef9b3b74d253 100644 --- a/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-discovery-payload.ts +++ b/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-discovery-payload.ts @@ -5,7 +5,7 @@ import { classMap } from "lit/directives/class-map"; @customElement("mqtt-discovery-payload") class MQTTDiscoveryPayload extends LitElement { - @property() public payload!: Record; + @property({ attribute: false }) public payload!: Record; @property({ type: Boolean }) public showAsYaml = false; diff --git a/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-messages.ts b/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-messages.ts index 31386b94021d..10297c5a4631 100644 --- a/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-messages.ts +++ b/src/panels/config/devices/device-detail/integration-elements/mqtt/mqtt-messages.ts @@ -10,7 +10,7 @@ import { HomeAssistant } from "../../../../../../types"; class MQTTMessages extends LitElement { public hass!: HomeAssistant; - @property() public messages!: MQTTMessage[]; + @property({ attribute: false }) public messages!: MQTTMessage[]; @property() public direction!: string; diff --git a/src/panels/config/energy/components/ha-energy-validation-result.ts b/src/panels/config/energy/components/ha-energy-validation-result.ts index ba91b416e837..2a0817345a75 100644 --- a/src/panels/config/energy/components/ha-energy-validation-result.ts +++ b/src/panels/config/energy/components/ha-energy-validation-result.ts @@ -6,11 +6,9 @@ import { HomeAssistant } from "../../../../types"; @customElement("ha-energy-validation-result") class EnergyValidationMessage extends LitElement { - @property({ attribute: false }) - public hass!: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; - @property() - public issues!: EnergyValidationIssue[]; + @property({ attribute: false }) public issues!: EnergyValidationIssue[]; public render() { if (this.issues.length === 0) { diff --git a/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts b/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts index 1ceb7b2cb02d..60b8f82fafb1 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts @@ -22,7 +22,7 @@ export class ZHAClustersDataTable extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public clusters: Cluster[] = []; + @property({ attribute: false }) public clusters: Cluster[] = []; @query("ha-data-table", true) private _dataTable!: HaDataTable; diff --git a/src/panels/config/scene/ha-config-scene.ts b/src/panels/config/scene/ha-config-scene.ts index 59a88b92c24a..965e1a6bbc19 100644 --- a/src/panels/config/scene/ha-config-scene.ts +++ b/src/panels/config/scene/ha-config-scene.ts @@ -30,7 +30,7 @@ class HaConfigScene extends HassRouterPage { @property({ type: Boolean }) public showAdvanced = false; - @property() public scenes: SceneEntity[] = []; + @property({ attribute: false }) public scenes: SceneEntity[] = []; protected routerOptions: RouterOptions = { defaultPage: "dashboard", diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts index 27e21501db94..f620c2235ec5 100644 --- a/src/panels/config/scene/ha-scene-dashboard.ts +++ b/src/panels/config/scene/ha-scene-dashboard.ts @@ -70,7 +70,7 @@ class HaSceneDashboard extends LitElement { @property({ attribute: false }) public route!: Route; - @property() public scenes!: SceneEntity[]; + @property({ attribute: false }) public scenes!: SceneEntity[]; @state() private _activeFilters?: string[]; diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts index b8c2ab466ecd..53ce39942a21 100644 --- a/src/panels/config/scene/ha-scene-editor.ts +++ b/src/panels/config/scene/ha-scene-editor.ts @@ -95,7 +95,7 @@ export class HaSceneEditor extends SubscribeMixin( @property() public sceneId: string | null = null; - @property() public scenes!: SceneEntity[]; + @property({ attribute: false }) public scenes!: SceneEntity[]; @property({ type: Boolean }) public showAdvanced = false; diff --git a/src/panels/config/script/ha-config-script.ts b/src/panels/config/script/ha-config-script.ts index 3e96240f7a37..56aaade1c1c9 100644 --- a/src/panels/config/script/ha-config-script.ts +++ b/src/panels/config/script/ha-config-script.ts @@ -33,7 +33,7 @@ class HaConfigScript extends HassRouterPage { @property({ type: Boolean }) public showAdvanced = false; - @property() public scripts: ScriptEntity[] = []; + @property({ attribute: false }) public scripts: ScriptEntity[] = []; @state() @consume({ context: fullEntitiesContext, subscribe: true }) diff --git a/src/panels/config/script/ha-script-field-row.ts b/src/panels/config/script/ha-script-field-row.ts index 8e57629789f8..38a0c4e33cc6 100644 --- a/src/panels/config/script/ha-script-field-row.ts +++ b/src/panels/config/script/ha-script-field-row.ts @@ -27,9 +27,9 @@ export default class HaScriptFieldRow extends LitElement { @property() public key!: string; - @property() public excludeKeys: string[] = []; + @property({ type: Array }) public excludeKeys: string[] = []; - @property() public field!: Field; + @property({ attribute: false }) public field!: Field; @property({ type: Boolean }) public disabled = false; diff --git a/src/panels/config/script/ha-script-fields.ts b/src/panels/config/script/ha-script-fields.ts index 3a80df82c9c2..8fb319db396f 100644 --- a/src/panels/config/script/ha-script-fields.ts +++ b/src/panels/config/script/ha-script-fields.ts @@ -24,7 +24,7 @@ export default class HaScriptFields extends LitElement { @property({ type: Boolean }) public disabled = false; - @property() public fields!: Fields; + @property({ attribute: false }) public fields!: Fields; private _focusLastActionOnChange = false; diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts index 0b51320a8a60..aa46a532a872 100644 --- a/src/panels/config/script/ha-script-picker.ts +++ b/src/panels/config/script/ha-script-picker.ts @@ -68,7 +68,7 @@ type ScriptItem = ScriptEntity & { class HaScriptPicker extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public scripts!: ScriptEntity[]; + @property({ attribute: false }) public scripts!: ScriptEntity[]; @property({ type: Boolean }) public isWide = false; diff --git a/src/panels/config/tags/tag-image.ts b/src/panels/config/tags/tag-image.ts index 3079bb61d82e..17c3b636edb3 100644 --- a/src/panels/config/tags/tag-image.ts +++ b/src/panels/config/tags/tag-image.ts @@ -6,7 +6,7 @@ import { TagRowData } from "./ha-config-tags"; @customElement("tag-image") export class HaTagImage extends LitElement { - @property() public tag?: TagRowData; + @property({ attribute: false }) public tag?: TagRowData; private _timeout?: number; diff --git a/src/panels/custom/ha-panel-custom.ts b/src/panels/custom/ha-panel-custom.ts index 04a4a406ba1c..6d048e924763 100644 --- a/src/panels/custom/ha-panel-custom.ts +++ b/src/panels/custom/ha-panel-custom.ts @@ -27,7 +27,7 @@ export class HaPanelCustom extends ReactiveElement { @property({ attribute: false }) public route!: Route; - @property() public panel!: CustomPanelInfo; + @property({ attribute: false }) public panel!: CustomPanelInfo; private _setProperties?: (props: Record) => void | undefined; diff --git a/src/panels/developer-tools/event/events-list.ts b/src/panels/developer-tools/event/events-list.ts index 7007ca6eab44..a509651f2d34 100644 --- a/src/panels/developer-tools/event/events-list.ts +++ b/src/panels/developer-tools/event/events-list.ts @@ -13,7 +13,7 @@ interface EventListenerCount { class EventsList extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public events: EventListenerCount[] = []; + @property({ attribute: false }) public events: EventListenerCount[] = []; protected render(): TemplateResult { return html` diff --git a/src/panels/iframe/ha-panel-iframe.ts b/src/panels/iframe/ha-panel-iframe.ts index ba6b45105606..72b7e96d10ab 100644 --- a/src/panels/iframe/ha-panel-iframe.ts +++ b/src/panels/iframe/ha-panel-iframe.ts @@ -11,7 +11,7 @@ class HaPanelIframe extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() panel!: PanelInfo<{ url: string }>; + @property({ attribute: false }) panel!: PanelInfo<{ url: string }>; render() { if ( diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts index 984a6a694bd0..ea25e307b3d4 100644 --- a/src/panels/logbook/ha-logbook.ts +++ b/src/panels/logbook/ha-logbook.ts @@ -41,28 +41,24 @@ const idsChanged = (oldIds?: string[], newIds?: string[]) => { export class HaLogbook extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public time!: + @property({ attribute: false }) public time!: | { range: [Date, Date] } | { // Seconds recent: number; }; - @property() public entityIds?: string[]; + @property({ attribute: false }) public entityIds?: string[]; - @property() public deviceIds?: string[]; + @property({ attribute: false }) public deviceIds?: string[]; - @property({ type: Boolean, attribute: "narrow" }) - public narrow = false; + @property({ type: Boolean }) public narrow = false; - @property({ type: Boolean, attribute: "virtualize", reflect: true }) - public virtualize = false; + @property({ type: Boolean, reflect: true }) public virtualize = false; - @property({ type: Boolean, attribute: "no-icon" }) - public noIcon = false; + @property({ type: Boolean, attribute: "no-icon" }) public noIcon = false; - @property({ type: Boolean, attribute: "no-name" }) - public noName = false; + @property({ type: Boolean, attribute: "no-name" }) public noName = false; @property({ type: Boolean, attribute: "show-indicator" }) public showIndicator = false; diff --git a/src/panels/lovelace/components/hui-buttons-base.ts b/src/panels/lovelace/components/hui-buttons-base.ts index 0edeb4c2f217..7030d2c6cc62 100644 --- a/src/panels/lovelace/components/hui-buttons-base.ts +++ b/src/panels/lovelace/components/hui-buttons-base.ts @@ -17,7 +17,8 @@ import { haStyleScrollbar } from "../../../resources/styles"; export class HuiButtonsBase extends LitElement { @state() public hass!: HomeAssistant; - @property() public configEntities?: EntitiesCardEntityConfig[]; + @property({ attribute: false }) + public configEntities?: EntitiesCardEntityConfig[]; protected render(): TemplateResult { return html` diff --git a/src/panels/lovelace/components/hui-entity-editor.ts b/src/panels/lovelace/components/hui-entity-editor.ts index c69ad7066e52..77f22a85c097 100644 --- a/src/panels/lovelace/components/hui-entity-editor.ts +++ b/src/panels/lovelace/components/hui-entity-editor.ts @@ -19,7 +19,8 @@ export class HuiEntityEditor extends LitElement { @property({ attribute: false }) public entities?: EntityConfig[]; - @property() public entityFilter?: HaEntityPickerEntityFilterFunc; + @property({ attribute: false }) + public entityFilter?: HaEntityPickerEntityFilterFunc; @property() public label?: string; diff --git a/src/panels/lovelace/components/hui-timestamp-display.ts b/src/panels/lovelace/components/hui-timestamp-display.ts index c3871ca099cf..c0b99d2c4554 100644 --- a/src/panels/lovelace/components/hui-timestamp-display.ts +++ b/src/panels/lovelace/components/hui-timestamp-display.ts @@ -27,7 +27,7 @@ const INTERVAL_FORMAT = ["relative", "total"]; class HuiTimestampDisplay extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public ts?: Date; + @property({ attribute: false }) public ts?: Date; @property() public format?: TimestampRenderingFormat; diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts index 81e6aa793234..4319c94d5bde 100644 --- a/src/panels/lovelace/ha-panel-lovelace.ts +++ b/src/panels/lovelace/ha-panel-lovelace.ts @@ -52,7 +52,7 @@ let resourcesLoaded = false; @customElement("ha-panel-lovelace") export class LovelacePanel extends LitElement { - @property() public panel?: PanelInfo; + @property({ attribute: false }) public panel?: PanelInfo; @property({ attribute: false }) public hass?: HomeAssistant; diff --git a/src/panels/lovelace/hui-editor.ts b/src/panels/lovelace/hui-editor.ts index 8748cb195f89..cf5983d87504 100644 --- a/src/panels/lovelace/hui-editor.ts +++ b/src/panels/lovelace/hui-editor.ts @@ -49,7 +49,7 @@ class LovelaceFullConfigEditor extends LitElement { @property({ attribute: false }) public lovelace?: Lovelace; - @property() public closeEditor?: () => void; + @property({ attribute: false }) public closeEditor?: () => void; @state() private _saving?: boolean; diff --git a/src/panels/profile/ha-advanced-mode-row.ts b/src/panels/profile/ha-advanced-mode-row.ts index 3eed30ceed52..1877e0412141 100644 --- a/src/panels/profile/ha-advanced-mode-row.ts +++ b/src/panels/profile/ha-advanced-mode-row.ts @@ -15,7 +15,7 @@ class AdvancedModeRow extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public coreUserData?: CoreFrontendUserData; + @property({ attribute: false }) public coreUserData?: CoreFrontendUserData; protected render(): TemplateResult { return html` From 634122657c89cdc9a9594e7636ef0af15f44e6c4 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 22 Jan 2024 12:03:42 -0500 Subject: [PATCH 198/361] Fix incompatible object/array property types (3 of 3) (#19510) --- .../chart/state-history-chart-line.ts | 2 +- .../chart/state-history-chart-timeline.ts | 2 +- src/components/chart/state-history-charts.ts | 5 ++-- src/components/chart/statistics-chart.ts | 2 +- src/components/ha-form/ha-form-boolean.ts | 4 ++-- src/components/ha-form/ha-form-expandable.ts | 6 +++-- src/components/ha-form/ha-form-grid.ts | 6 +++-- .../ha-form/ha-form-multi_select.ts | 4 ++-- src/components/ha-form/ha-form-select.ts | 2 +- src/components/ha-form/ha-form.ts | 24 +++++++++++++------ src/components/ha-hs-color-picker.ts | 2 +- .../ha-selector/ha-selector-constant.ts | 3 ++- .../ha-selector/ha-selector-icon.ts | 2 +- .../ha-selector/ha-selector-select.ts | 3 ++- .../ha-selector/ha-selector-state.ts | 2 +- src/components/ha-selector/ha-selector.ts | 5 ++-- src/components/ha-sortable.ts | 2 +- src/components/trace/ha-trace-path-details.ts | 5 ++-- src/components/user/ha-user-picker.ts | 2 +- src/components/user/ha-users-picker.ts | 2 +- .../previews/flow-preview-group.ts | 2 +- .../previews/flow-preview-template.ts | 2 +- .../lights/ha-favorite-color-button.ts | 2 +- .../configurator-notification-item.ts | 3 ++- .../notifications/notification-item.ts | 3 ++- .../persistent-notification-item.ts | 2 +- src/layouts/hass-tabs-subpage-data-table.ts | 4 ++-- src/layouts/hass-tabs-subpage.ts | 2 +- .../calendar/ha-recurrence-rule-editor.ts | 2 +- .../ha-automation-action-activate_scene.ts | 2 +- .../types/ha-automation-action-choose.ts | 2 +- .../types/ha-automation-action-condition.ts | 2 +- .../types/ha-automation-action-event.ts | 2 +- .../action/types/ha-automation-action-stop.ts | 2 +- .../config/automation/ha-automation-editor.ts | 2 +- .../config/automation/ha-automation-picker.ts | 2 +- .../config/automation/ha-config-automation.ts | 2 +- .../config/blueprint/ha-config-blueprint.ts | 3 ++- .../device-detail/ha-device-entities-card.ts | 2 +- .../devices/ha-config-devices-dashboard.ts | 4 ++-- .../settings/entity-settings-helper-tab.ts | 2 +- .../entity-registry-settings-editor.ts | 2 +- .../integrations/ha-config-flow-card.ts | 4 ++-- .../ha-config-integration-page.ts | 2 +- .../ha-disabled-config-entry-card.ts | 4 ++-- .../ha-ignored-config-entry-card.ts | 4 ++-- .../ha-integration-action-card.ts | 2 +- .../integrations/ha-integration-card.ts | 2 +- .../assist-pipeline-detail-config.ts | 4 ++-- .../assist-pipeline-detail-conversation.ts | 2 +- .../assist-pipeline-detail-stt.ts | 2 +- .../assist-pipeline-detail-tts.ts | 2 +- .../assist-pipeline-detail-wakeword.ts | 2 +- .../debug/assist-render-pipeline-events.ts | 2 +- .../debug/assist-render-pipeline-run.ts | 2 +- tsconfig.json | 1 - 56 files changed, 95 insertions(+), 76 deletions(-) diff --git a/src/components/chart/state-history-chart-line.ts b/src/components/chart/state-history-chart-line.ts index e712762470cd..7652fbabc78a 100644 --- a/src/components/chart/state-history-chart-line.ts +++ b/src/components/chart/state-history-chart-line.ts @@ -27,7 +27,7 @@ export class StateHistoryChartLine extends LitElement { @property({ attribute: false }) public data: LineChartEntity[] = []; - @property() public names?: Record; + @property({ attribute: false }) public names?: Record; @property() public unit?: string; diff --git a/src/components/chart/state-history-chart-timeline.ts b/src/components/chart/state-history-chart-timeline.ts index 4ed3eff474d3..79b51be40ed3 100644 --- a/src/components/chart/state-history-chart-timeline.ts +++ b/src/components/chart/state-history-chart-timeline.ts @@ -25,7 +25,7 @@ export class StateHistoryChartTimeline extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public names?: Record; + @property({ attribute: false }) public names?: Record; @property() public unit?: string; diff --git a/src/components/chart/state-history-charts.ts b/src/components/chart/state-history-charts.ts index dd68187f3007..7ecbfdd26a1c 100644 --- a/src/components/chart/state-history-charts.ts +++ b/src/components/chart/state-history-charts.ts @@ -54,10 +54,9 @@ export class StateHistoryCharts extends LitElement { @property({ type: Boolean }) public narrow = false; - @property() public names?: Record; + @property({ attribute: false }) public names?: Record; - @property({ type: Boolean, attribute: "virtualize", reflect: true }) - public virtualize = false; + @property({ type: Boolean, reflect: true }) public virtualize = false; @property({ attribute: false }) public endTime?: Date; diff --git a/src/components/chart/statistics-chart.ts b/src/components/chart/statistics-chart.ts index a0fc6ca53ba5..0e2fa2a9f50a 100644 --- a/src/components/chart/statistics-chart.ts +++ b/src/components/chart/statistics-chart.ts @@ -54,7 +54,7 @@ export class StatisticsChart extends LitElement { StatisticsMetaData >; - @property() public names?: Record; + @property({ attribute: false }) public names?: Record; @property() public unit?: string; diff --git a/src/components/ha-form/ha-form-boolean.ts b/src/components/ha-form/ha-form-boolean.ts index 1e62d3fd1359..171739e844ca 100644 --- a/src/components/ha-form/ha-form-boolean.ts +++ b/src/components/ha-form/ha-form-boolean.ts @@ -12,9 +12,9 @@ import "../ha-checkbox"; @customElement("ha-form-boolean") export class HaFormBoolean extends LitElement implements HaFormElement { - @property() public schema!: HaFormBooleanSchema; + @property({ attribute: false }) public schema!: HaFormBooleanSchema; - @property() public data!: HaFormBooleanData; + @property({ attribute: false }) public data!: HaFormBooleanData; @property() public label!: string; diff --git a/src/components/ha-form/ha-form-expandable.ts b/src/components/ha-form/ha-form-expandable.ts index 79ed2162dde6..f8e88c43aa63 100644 --- a/src/components/ha-form/ha-form-expandable.ts +++ b/src/components/ha-form/ha-form-expandable.ts @@ -19,12 +19,14 @@ export class HaFormExpendable extends LitElement implements HaFormElement { @property({ type: Boolean }) public disabled = false; - @property() public computeLabel?: ( + @property({ attribute: false }) public computeLabel?: ( schema: HaFormSchema, data?: HaFormDataContainer ) => string; - @property() public computeHelper?: (schema: HaFormSchema) => string; + @property({ attribute: false }) public computeHelper?: ( + schema: HaFormSchema + ) => string; protected render() { return html` diff --git a/src/components/ha-form/ha-form-grid.ts b/src/components/ha-form/ha-form-grid.ts index a3fbcb079a27..27c602531234 100644 --- a/src/components/ha-form/ha-form-grid.ts +++ b/src/components/ha-form/ha-form-grid.ts @@ -26,12 +26,14 @@ export class HaFormGrid extends LitElement implements HaFormElement { @property({ type: Boolean }) public disabled = false; - @property() public computeLabel?: ( + @property({ attribute: false }) public computeLabel?: ( schema: HaFormSchema, data?: HaFormDataContainer ) => string; - @property() public computeHelper?: (schema: HaFormSchema) => string; + @property({ attribute: false }) public computeHelper?: ( + schema: HaFormSchema + ) => string; public async focus() { await this.updateComplete; diff --git a/src/components/ha-form/ha-form-multi_select.ts b/src/components/ha-form/ha-form-multi_select.ts index 66c7d60ca6c0..3a76d87f77f8 100644 --- a/src/components/ha-form/ha-form-multi_select.ts +++ b/src/components/ha-form/ha-form-multi_select.ts @@ -35,9 +35,9 @@ const SHOW_ALL_ENTRIES_LIMIT = 6; @customElement("ha-form-multi_select") export class HaFormMultiSelect extends LitElement implements HaFormElement { - @property() public schema!: HaFormMultiSelectSchema; + @property({ attribute: false }) public schema!: HaFormMultiSelectSchema; - @property() public data!: HaFormMultiSelectData; + @property({ attribute: false }) public data!: HaFormMultiSelectData; @property() public label!: string; diff --git a/src/components/ha-form/ha-form-select.ts b/src/components/ha-form/ha-form-select.ts index 86a5db98a65e..83a2c7525a8b 100644 --- a/src/components/ha-form/ha-form-select.ts +++ b/src/components/ha-form/ha-form-select.ts @@ -17,7 +17,7 @@ export class HaFormSelect extends LitElement implements HaFormElement { @property({ attribute: false }) public schema!: HaFormSelectSchema; - @property() public data!: HaFormSelectData; + @property({ attribute: false }) public data!: HaFormSelectData; @property() public label?: string; diff --git a/src/components/ha-form/ha-form.ts b/src/components/ha-form/ha-form.ts index f4eed03d9ad9..6cd8dfeb8107 100644 --- a/src/components/ha-form/ha-form.ts +++ b/src/components/ha-form/ha-form.ts @@ -45,24 +45,34 @@ export class HaForm extends LitElement implements HaFormElement { @property({ attribute: false }) public schema!: readonly HaFormSchema[]; - @property() public error?: Record; + @property({ attribute: false }) public error?: Record; - @property() public warning?: Record; + @property({ attribute: false }) public warning?: Record; @property({ type: Boolean }) public disabled = false; - @property() public computeError?: (schema: any, error) => string; + @property({ attribute: false }) public computeError?: ( + schema: any, + error + ) => string; - @property() public computeWarning?: (schema: any, warning) => string; + @property({ attribute: false }) public computeWarning?: ( + schema: any, + warning + ) => string; - @property() public computeLabel?: ( + @property({ attribute: false }) public computeLabel?: ( schema: any, data: HaFormDataContainer ) => string; - @property() public computeHelper?: (schema: any) => string | undefined; + @property({ attribute: false }) public computeHelper?: ( + schema: any + ) => string | undefined; - @property() public localizeValue?: (key: string) => string; + @property({ attribute: false }) public localizeValue?: ( + key: string + ) => string; protected getFormProperties(): Record { return {}; diff --git a/src/components/ha-hs-color-picker.ts b/src/components/ha-hs-color-picker.ts index f492be2d7cdc..b332e0fd636b 100644 --- a/src/components/ha-hs-color-picker.ts +++ b/src/components/ha-hs-color-picker.ts @@ -115,7 +115,7 @@ class HaHsColorPicker extends LitElement { @property({ type: Number, attribute: false }) public renderSize?: number; - @property({ type: Number }) + @property({ type: Array }) public value?: [number, number]; @property({ type: Number }) diff --git a/src/components/ha-selector/ha-selector-constant.ts b/src/components/ha-selector/ha-selector-constant.ts index f05557832bfd..9ea7f1ec2e50 100644 --- a/src/components/ha-selector/ha-selector-constant.ts +++ b/src/components/ha-selector/ha-selector-constant.ts @@ -8,7 +8,8 @@ export class HaSelectorConstant extends LitElement { @property({ type: Boolean }) public disabled = false; - @property() public localizeValue?: (key: string) => string; + @property({ attribute: false }) + public localizeValue?: (key: string) => string; protected render() { if (this.disabled) { diff --git a/src/components/ha-selector/ha-selector-icon.ts b/src/components/ha-selector/ha-selector-icon.ts index 148bd08dfd46..c922f99a5d2e 100644 --- a/src/components/ha-selector/ha-selector-icon.ts +++ b/src/components/ha-selector/ha-selector-icon.ts @@ -25,7 +25,7 @@ export class HaIconSelector extends LitElement { @property({ type: Boolean }) public required = true; - @property() public context?: { + @property({ attribute: false }) public context?: { icon_entity?: string; }; diff --git a/src/components/ha-selector/ha-selector-select.ts b/src/components/ha-selector/ha-selector-select.ts index 0f1301d28680..069dd157d424 100644 --- a/src/components/ha-selector/ha-selector-select.ts +++ b/src/components/ha-selector/ha-selector-select.ts @@ -32,7 +32,8 @@ export class HaSelectSelector extends LitElement { @property() public helper?: string; - @property() public localizeValue?: (key: string) => string; + @property({ attribute: false }) + public localizeValue?: (key: string) => string; @property({ type: Boolean }) public disabled = false; diff --git a/src/components/ha-selector/ha-selector-state.ts b/src/components/ha-selector/ha-selector-state.ts index f42718b3c23f..e79259dcd68d 100644 --- a/src/components/ha-selector/ha-selector-state.ts +++ b/src/components/ha-selector/ha-selector-state.ts @@ -21,7 +21,7 @@ export class HaSelectorState extends SubscribeMixin(LitElement) { @property({ type: Boolean }) public required = true; - @property() public context?: { + @property({ attribute: false }) public context?: { filter_attribute?: string; filter_entity?: string; }; diff --git a/src/components/ha-selector/ha-selector.ts b/src/components/ha-selector/ha-selector.ts index bad10c521f75..66696fbf8338 100644 --- a/src/components/ha-selector/ha-selector.ts +++ b/src/components/ha-selector/ha-selector.ts @@ -71,7 +71,8 @@ export class HaSelector extends LitElement { @property() public helper?: string; - @property() public localizeValue?: (key: string) => string; + @property({ attribute: false }) + public localizeValue?: (key: string) => string; @property() public placeholder?: any; @@ -79,7 +80,7 @@ export class HaSelector extends LitElement { @property({ type: Boolean }) public required = true; - @property() public context?: Record; + @property({ attribute: false }) public context?: Record; public async focus() { await this.updateComplete; diff --git a/src/components/ha-sortable.ts b/src/components/ha-sortable.ts index 32c9cffe711f..248a0171f8ae 100644 --- a/src/components/ha-sortable.ts +++ b/src/components/ha-sortable.ts @@ -24,7 +24,7 @@ export class HaSortable extends LitElement { @property({ type: Boolean }) public disabled = false; - @property({ type: Boolean }) + @property({ type: Array }) public path?: ItemPath; @property({ type: Boolean, attribute: "no-style" }) diff --git a/src/components/trace/ha-trace-path-details.ts b/src/components/trace/ha-trace-path-details.ts index 9be129def828..cb71dd98a305 100644 --- a/src/components/trace/ha-trace-path-details.ts +++ b/src/components/trace/ha-trace-path-details.ts @@ -43,9 +43,10 @@ export class HaTracePathDetails extends LitElement { @property({ attribute: false }) public selected!: NodeInfo; - @property() public renderedNodes: Record = {}; + @property({ attribute: false }) + public renderedNodes: Record = {}; - @property() public trackedNodes!: Record; + @property({ attribute: false }) public trackedNodes!: Record; @state() private _view: (typeof TRACE_PATH_TABS)[number] = "step_config"; diff --git a/src/components/user/ha-user-picker.ts b/src/components/user/ha-user-picker.ts index 50ec6b4611c4..3f89ecc10fdb 100644 --- a/src/components/user/ha-user-picker.ts +++ b/src/components/user/ha-user-picker.ts @@ -19,7 +19,7 @@ class HaUserPicker extends LitElement { @property() public value = ""; - @property() public users?: User[]; + @property({ attribute: false }) public users?: User[]; @property({ type: Boolean }) public disabled = false; diff --git a/src/components/user/ha-users-picker.ts b/src/components/user/ha-users-picker.ts index a78de5ed4cd6..1962e7c4ce42 100644 --- a/src/components/user/ha-users-picker.ts +++ b/src/components/user/ha-users-picker.ts @@ -13,7 +13,7 @@ import "./ha-user-picker"; class HaUsersPickerLight extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public value?: string[]; + @property({ attribute: false }) public value?: string[]; @property({ attribute: "picked-user-label" }) public pickedUserLabel?: string; diff --git a/src/dialogs/config-flow/previews/flow-preview-group.ts b/src/dialogs/config-flow/previews/flow-preview-group.ts index 11d48cd09f9b..5afc93a038e1 100644 --- a/src/dialogs/config-flow/previews/flow-preview-group.ts +++ b/src/dialogs/config-flow/previews/flow-preview-group.ts @@ -19,7 +19,7 @@ class FlowPreviewGroup extends LitElement { @property() public flowId!: string; - @property() public stepData!: Record; + @property({ attribute: false }) public stepData!: Record; @state() private _preview?: HassEntity; diff --git a/src/dialogs/config-flow/previews/flow-preview-template.ts b/src/dialogs/config-flow/previews/flow-preview-template.ts index 19e7c6c998dd..e2f49feb43a8 100644 --- a/src/dialogs/config-flow/previews/flow-preview-template.ts +++ b/src/dialogs/config-flow/previews/flow-preview-template.ts @@ -24,7 +24,7 @@ class FlowPreviewTemplate extends LitElement { @property() public flowId!: string; - @property() public stepData!: Record; + @property({ attribute: false }) public stepData!: Record; @state() private _preview?: HassEntity; diff --git a/src/dialogs/more-info/components/lights/ha-favorite-color-button.ts b/src/dialogs/more-info/components/lights/ha-favorite-color-button.ts index 1da77121e2aa..f631a52beb90 100644 --- a/src/dialogs/more-info/components/lights/ha-favorite-color-button.ts +++ b/src/dialogs/more-info/components/lights/ha-favorite-color-button.ts @@ -26,7 +26,7 @@ class MoreInfoViewLightColorPicker extends LitElement { @property({ attribute: false }) public stateObj?: LightEntity; - @property() color!: LightColor; + @property({ attribute: false }) color!: LightColor; @query("ha-outlined-icon-button", true) private _button?: HaOutlinedIconButton; diff --git a/src/dialogs/notifications/configurator-notification-item.ts b/src/dialogs/notifications/configurator-notification-item.ts index ae69269952d1..0d87c6fd5fe4 100644 --- a/src/dialogs/notifications/configurator-notification-item.ts +++ b/src/dialogs/notifications/configurator-notification-item.ts @@ -11,7 +11,8 @@ import "./notification-item-template"; export class HuiConfiguratorNotificationItem extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public notification?: PersitentNotificationEntity; + @property({ attribute: false }) + public notification?: PersitentNotificationEntity; protected render() { if (!this.hass || !this.notification) { diff --git a/src/dialogs/notifications/notification-item.ts b/src/dialogs/notifications/notification-item.ts index 908e19251458..ca92227e1fab 100644 --- a/src/dialogs/notifications/notification-item.ts +++ b/src/dialogs/notifications/notification-item.ts @@ -10,7 +10,8 @@ import "./persistent-notification-item"; export class HuiNotificationItem extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public notification?: HassEntity | PersistentNotification; + @property({ attribute: false }) + public notification?: HassEntity | PersistentNotification; protected shouldUpdate(changedProps: PropertyValues): boolean { if (!this.hass || !this.notification || changedProps.has("notification")) { diff --git a/src/dialogs/notifications/persistent-notification-item.ts b/src/dialogs/notifications/persistent-notification-item.ts index 40ce7e6b2fe7..16a615296511 100644 --- a/src/dialogs/notifications/persistent-notification-item.ts +++ b/src/dialogs/notifications/persistent-notification-item.ts @@ -13,7 +13,7 @@ import "./notification-item-template"; export class HuiPersistentNotificationItem extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; - @property() public notification?: PersistentNotification; + @property({ attribute: false }) public notification?: PersistentNotification; protected render() { if (!this.hass || !this.notification) { diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index b21c627ad8ca..275cfe82f12f 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -116,7 +116,7 @@ export class HaTabsSubpageDataTable extends LitElement { * Function to call when the back button is pressed. * @type {() => void} */ - @property() public backCallback?: () => void; + @property({ attribute: false }) public backCallback?: () => void; /** * String to show when there are no records in the data table. @@ -136,7 +136,7 @@ export class HaTabsSubpageDataTable extends LitElement { * Array of tabs to show on the page. * @type {Array} */ - @property() public tabs: PageNavigation[] = []; + @property({ attribute: false }) public tabs: PageNavigation[] = []; /** * Force hides the filter menu. diff --git a/src/layouts/hass-tabs-subpage.ts b/src/layouts/hass-tabs-subpage.ts index ac650afdd406..05438d121642 100644 --- a/src/layouts/hass-tabs-subpage.ts +++ b/src/layouts/hass-tabs-subpage.ts @@ -45,7 +45,7 @@ class HassTabsSubpage extends LitElement { @property({ type: String, attribute: "back-path" }) public backPath?: string; - @property() public backCallback?: () => void; + @property({ attribute: false }) public backCallback?: () => void; @property({ type: Boolean, attribute: "main-page" }) public mainPage = false; diff --git a/src/panels/calendar/ha-recurrence-rule-editor.ts b/src/panels/calendar/ha-recurrence-rule-editor.ts index 3d1dd412f37b..5a1727b43131 100644 --- a/src/panels/calendar/ha-recurrence-rule-editor.ts +++ b/src/panels/calendar/ha-recurrence-rule-editor.ts @@ -39,7 +39,7 @@ export class RecurrenceRuleEditor extends LitElement { @property() public value = ""; - @property() public dtstart?: Date; + @property({ attribute: false }) public dtstart?: Date; @property({ type: Boolean }) public allDay = false; diff --git a/src/panels/config/automation/action/types/ha-automation-action-activate_scene.ts b/src/panels/config/automation/action/types/ha-automation-action-activate_scene.ts index 5e61ca20341a..d8664f2c35b3 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-activate_scene.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-activate_scene.ts @@ -14,7 +14,7 @@ export class HaSceneAction extends LitElement implements ActionElement { @property({ type: Boolean }) public disabled = false; - @property() public action!: SceneAction; + @property({ attribute: false }) public action!: SceneAction; public static get defaultConfig(): SceneAction { return { diff --git a/src/panels/config/automation/action/types/ha-automation-action-choose.ts b/src/panels/config/automation/action/types/ha-automation-action-choose.ts index 2272d5104c51..ed24485d606f 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-choose.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-choose.ts @@ -54,7 +54,7 @@ export class HaChooseAction extends LitElement implements ActionElement { @property({ attribute: false }) public path?: ItemPath; - @property() public action!: ChooseAction; + @property({ attribute: false }) public action!: ChooseAction; @state() private _showDefault = false; diff --git a/src/panels/config/automation/action/types/ha-automation-action-condition.ts b/src/panels/config/automation/action/types/ha-automation-action-condition.ts index d62176812d8b..3b098e9a8611 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-condition.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-condition.ts @@ -18,7 +18,7 @@ export class HaConditionAction extends LitElement implements ActionElement { @property({ type: Boolean }) public disabled = false; - @property() public action!: Condition; + @property({ attribute: false }) public action!: Condition; public static get defaultConfig() { return { condition: "state" }; diff --git a/src/panels/config/automation/action/types/ha-automation-action-event.ts b/src/panels/config/automation/action/types/ha-automation-action-event.ts index c2aebdd02206..15ed85aea434 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-event.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-event.ts @@ -16,7 +16,7 @@ export class HaEventAction extends LitElement implements ActionElement { @property({ type: Boolean }) public disabled = false; - @property() public action!: EventAction; + @property({ attribute: false }) public action!: EventAction; @query("ha-yaml-editor", true) private _yamlEditor?: HaYamlEditor; diff --git a/src/panels/config/automation/action/types/ha-automation-action-stop.ts b/src/panels/config/automation/action/types/ha-automation-action-stop.ts index 6ca7177e4f1f..c98a5e2cffb4 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-stop.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-stop.ts @@ -10,7 +10,7 @@ import { ActionElement } from "../ha-automation-action-row"; export class HaStopAction extends LitElement implements ActionElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public action!: StopAction; + @property({ attribute: false }) public action!: StopAction; @property({ type: Boolean }) public disabled = false; diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index f179e971682d..c4658284130b 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -87,7 +87,7 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) { @property() public entityId: string | null = null; - @property() public automations!: AutomationEntity[]; + @property({ attribute: false }) public automations!: AutomationEntity[]; @property({ type: Boolean }) public isWide = false; diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index 588c07a109ef..3bb5802c7dd3 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -79,7 +79,7 @@ class HaAutomationPicker extends LitElement { @property({ attribute: false }) public route!: Route; - @property() public automations!: AutomationEntity[]; + @property({ attribute: false }) public automations!: AutomationEntity[]; @state() private _activeFilters?: string[]; diff --git a/src/panels/config/automation/ha-config-automation.ts b/src/panels/config/automation/ha-config-automation.ts index ef1182e98205..bd07c0fa1792 100644 --- a/src/panels/config/automation/ha-config-automation.ts +++ b/src/panels/config/automation/ha-config-automation.ts @@ -30,7 +30,7 @@ class HaConfigAutomation extends HassRouterPage { @property({ type: Boolean }) public showAdvanced = false; - @property() public automations: AutomationEntity[] = []; + @property({ attribute: false }) public automations: AutomationEntity[] = []; private _debouncedUpdateAutomations = debounce((pageEl) => { const newAutomations = this._getAutomations(this.hass.states); diff --git a/src/panels/config/blueprint/ha-config-blueprint.ts b/src/panels/config/blueprint/ha-config-blueprint.ts index 1e6bbeed95b3..4a371a2cf0d9 100644 --- a/src/panels/config/blueprint/ha-config-blueprint.ts +++ b/src/panels/config/blueprint/ha-config-blueprint.ts @@ -25,7 +25,8 @@ class HaConfigBlueprint extends HassRouterPage { @property({ type: Boolean }) public showAdvanced = false; - @property() public blueprints: Record = {}; + @property({ attribute: false }) + public blueprints: Record = {}; protected routerOptions: RouterOptions = { defaultPage: "dashboard", diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts index 636216483c54..2dd3dacae0ae 100644 --- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts +++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts @@ -36,7 +36,7 @@ export class HaDeviceEntitiesCard extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public entities!: EntityRegistryStateEntry[]; + @property({ attribute: false }) public entities!: EntityRegistryStateEntry[]; @property({ type: Boolean }) public showHidden = false; diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts index a3fbf080c539..1f8dbabd97d4 100644 --- a/src/panels/config/devices/ha-config-devices-dashboard.ts +++ b/src/panels/config/devices/ha-config-devices-dashboard.ts @@ -66,13 +66,13 @@ export class HaConfigDeviceDashboard extends LitElement { @property({ type: Boolean }) public isWide = false; - @property() public entries!: ConfigEntry[]; + @property({ attribute: false }) public entries!: ConfigEntry[]; @state() @consume({ context: fullEntitiesContext, subscribe: true }) entities!: EntityRegistryEntry[]; - @property() public manifests!: IntegrationManifest[]; + @property({ attribute: false }) public manifests!: IntegrationManifest[]; @property({ attribute: false }) public route!: Route; diff --git a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts index dbe61afa3d6a..52a617c2716b 100644 --- a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts +++ b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts @@ -36,7 +36,7 @@ import type { EntityRegistrySettingsEditor } from "../../entity-registry-setting export class EntitySettingsHelperTab extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public entry!: ExtEntityRegistryEntry; + @property({ attribute: false }) public entry!: ExtEntityRegistryEntry; @state() private _error?: string; diff --git a/src/panels/config/entities/entity-registry-settings-editor.ts b/src/panels/config/entities/entity-registry-settings-editor.ts index 2da5ef250b51..e7da87719272 100644 --- a/src/panels/config/entities/entity-registry-settings-editor.ts +++ b/src/panels/config/entities/entity-registry-settings-editor.ts @@ -141,7 +141,7 @@ export class EntityRegistrySettingsEditor extends LitElement { @property({ type: Boolean }) public disabled = false; - @property() public helperConfigEntry?: ConfigEntry; + @property({ attribute: false }) public helperConfigEntry?: ConfigEntry; @state() private _name!: string; diff --git a/src/panels/config/integrations/ha-config-flow-card.ts b/src/panels/config/integrations/ha-config-flow-card.ts index ad7df5b414b8..3cfa297a0ef1 100644 --- a/src/panels/config/integrations/ha-config-flow-card.ts +++ b/src/panels/config/integrations/ha-config-flow-card.ts @@ -24,9 +24,9 @@ import "../../../components/ha-list-item"; export class HaConfigFlowCard extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public flow!: DataEntryFlowProgressExtended; + @property({ attribute: false }) public flow!: DataEntryFlowProgressExtended; - @property() public manifest?: IntegrationManifest; + @property({ attribute: false }) public manifest?: IntegrationManifest; protected render(): TemplateResult { const attention = ATTENTION_SOURCES.includes(this.flow.context.source); diff --git a/src/panels/config/integrations/ha-config-integration-page.ts b/src/panels/config/integrations/ha-config-integration-page.ts index cca54614807e..a58597c114ba 100644 --- a/src/panels/config/integrations/ha-config-integration-page.ts +++ b/src/panels/config/integrations/ha-config-integration-page.ts @@ -116,7 +116,7 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) { @property({ type: Boolean }) public showAdvanced = false; - @property() public configEntries?: ConfigEntry[]; + @property({ attribute: false }) public configEntries?: ConfigEntry[]; @property({ attribute: false }) public configEntriesInProgress: DataEntryFlowProgressExtended[] = []; diff --git a/src/panels/config/integrations/ha-disabled-config-entry-card.ts b/src/panels/config/integrations/ha-disabled-config-entry-card.ts index f6003515aead..e18baf434183 100644 --- a/src/panels/config/integrations/ha-disabled-config-entry-card.ts +++ b/src/panels/config/integrations/ha-disabled-config-entry-card.ts @@ -16,9 +16,9 @@ import "./ha-integration-action-card"; export class HaDisabledConfigEntryCard extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public entry!: ConfigEntryExtended; + @property({ attribute: false }) public entry!: ConfigEntryExtended; - @property() public manifest?: IntegrationManifest; + @property({ attribute: false }) public manifest?: IntegrationManifest; protected render(): TemplateResult { return html` diff --git a/src/panels/config/integrations/ha-ignored-config-entry-card.ts b/src/panels/config/integrations/ha-ignored-config-entry-card.ts index f00d481d3794..919032207306 100644 --- a/src/panels/config/integrations/ha-ignored-config-entry-card.ts +++ b/src/panels/config/integrations/ha-ignored-config-entry-card.ts @@ -13,9 +13,9 @@ import "../../../components/ha-button"; export class HaIgnoredConfigEntryCard extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public entry!: ConfigEntryExtended; + @property({ attribute: false }) public entry!: ConfigEntryExtended; - @property() public manifest?: IntegrationManifest; + @property({ attribute: false }) public manifest?: IntegrationManifest; protected render(): TemplateResult { return html` diff --git a/src/panels/config/integrations/ha-integration-action-card.ts b/src/panels/config/integrations/ha-integration-action-card.ts index f1a758d759bf..ab715f0e848d 100644 --- a/src/panels/config/integrations/ha-integration-action-card.ts +++ b/src/panels/config/integrations/ha-integration-action-card.ts @@ -22,7 +22,7 @@ export class HaIntegrationActionCard extends LitElement { @property() public label!: string; - @property() public manifest?: IntegrationManifest; + @property({ attribute: false }) public manifest?: IntegrationManifest; protected render(): TemplateResult { return html` diff --git a/src/panels/config/integrations/ha-integration-card.ts b/src/panels/config/integrations/ha-integration-card.ts index 4fdafdba2c2b..143ea3bfe14c 100644 --- a/src/panels/config/integrations/ha-integration-card.ts +++ b/src/panels/config/integrations/ha-integration-card.ts @@ -52,7 +52,7 @@ export class HaIntegrationCard extends LitElement { @property({ type: Boolean }) public supportsDiagnostics = false; - @property() public logInfo?: IntegrationLogInfo; + @property({ attribute: false }) public logInfo?: IntegrationLogInfo; @queryAsync("mwc-ripple") private _ripple!: Promise; diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts index 856af04c392c..2791d89f1334 100644 --- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts +++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts @@ -10,9 +10,9 @@ import "../../../../components/ha-form/ha-form"; export class AssistPipelineDetailConfig extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public data?: Partial; + @property({ attribute: false }) public data?: Partial; - @property() public supportedLanguages?: string[]; + @property({ type: Array }) public supportedLanguages?: string[]; public async focus() { await this.updateComplete; diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts index c4f40ad904b8..cd2b6441dd76 100644 --- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts +++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts @@ -11,7 +11,7 @@ import { fireEvent } from "../../../../common/dom/fire_event"; export class AssistPipelineDetailConversation extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public data?: Partial; + @property({ attribute: false }) public data?: Partial; @state() private _supportedLanguages?: "*" | string[]; diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts index 37cbe01d032a..46d411dc6fd5 100644 --- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts +++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts @@ -10,7 +10,7 @@ import "../../../../components/ha-form/ha-form"; export class AssistPipelineDetailSTT extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public data?: Partial; + @property({ attribute: false }) public data?: Partial; @state() private _supportedLanguages?: string[]; diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts index 4850a70caf5f..a99abb48dc0d 100644 --- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts +++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts @@ -12,7 +12,7 @@ import { HomeAssistant } from "../../../../types"; export class AssistPipelineDetailTTS extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public data?: Partial; + @property({ attribute: false }) public data?: Partial; @state() private _supportedLanguages?: string[]; diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-wakeword.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-wakeword.ts index 77e167c45608..7180bb295078 100644 --- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-wakeword.ts +++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-wakeword.ts @@ -20,7 +20,7 @@ import { fireEvent } from "../../../../common/dom/fire_event"; export class AssistPipelineDetailWakeWord extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public data?: Partial; + @property({ attribute: false }) public data?: Partial; @state() private _wakeWords?: WakeWord[]; diff --git a/src/panels/config/voice-assistants/debug/assist-render-pipeline-events.ts b/src/panels/config/voice-assistants/debug/assist-render-pipeline-events.ts index 0d9cc6d79c6e..90fe7b449aae 100644 --- a/src/panels/config/voice-assistants/debug/assist-render-pipeline-events.ts +++ b/src/panels/config/voice-assistants/debug/assist-render-pipeline-events.ts @@ -13,7 +13,7 @@ import "./assist-render-pipeline-run"; export class AssistPipelineEvents extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public events!: PipelineRunEvent[]; + @property({ attribute: false }) public events!: PipelineRunEvent[]; private _processEvents = memoizeOne( (events: PipelineRunEvent[]): PipelineRun | undefined => { diff --git a/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts b/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts index ae455152beb0..15c64cc56111 100644 --- a/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts +++ b/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts @@ -138,7 +138,7 @@ const dataMinusKeysRender = ( export class AssistPipelineDebug extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property() public pipelineRun!: PipelineRun; + @property({ attribute: false }) public pipelineRun!: PipelineRun; protected render(): TemplateResult { const lastRunStage: string = this.pipelineRun diff --git a/tsconfig.json b/tsconfig.json index 0c67e5a2b2e7..72918ea5ad68 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -40,7 +40,6 @@ // Binding types "no-incompatible-type-binding": "warning", // LitElement - "no-incompatible-property-type": "warning", "no-property-visibility-mismatch": "error", // CSS "no-invalid-css": "off", // warning does not work From 545d140dcfdf98bcaafec6af348b21169a6ea068 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Mon, 22 Jan 2024 09:12:25 -0800 Subject: [PATCH 199/361] Various leaflet map bugfixes (#19475) * Various leaflet map bugfixes * move pan to updated --- .../ha-selector/ha-selector-location.ts | 10 +++++-- src/components/map/ha-locations-editor.ts | 30 +++++++++++++++++++ src/onboarding/onboarding-location.ts | 6 ++-- src/panels/config/zone/dialog-zone-detail.ts | 6 ++-- 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/src/components/ha-selector/ha-selector-location.ts b/src/components/ha-selector/ha-selector-location.ts index a2ae29dd9880..96d9d6629802 100644 --- a/src/components/ha-selector/ha-selector-location.ts +++ b/src/components/ha-selector/ha-selector-location.ts @@ -51,8 +51,14 @@ export class HaLocationSelector extends LitElement { return [ { id: "location", - latitude: value?.latitude || this.hass.config.latitude, - longitude: value?.longitude || this.hass.config.longitude, + latitude: + !value || isNaN(value.latitude) + ? this.hass.config.latitude + : value.latitude, + longitude: + !value || isNaN(value.longitude) + ? this.hass.config.longitude + : value.longitude, radius: selector.location?.radius ? value?.radius || 1000 : undefined, radius_color: zoneRadiusColor, icon: diff --git a/src/components/map/ha-locations-editor.ts b/src/components/map/ha-locations-editor.ts index fc81e9f68600..10702cbf55b4 100644 --- a/src/components/map/ha-locations-editor.ts +++ b/src/components/map/ha-locations-editor.ts @@ -168,6 +168,36 @@ export class HaLocationsEditor extends LitElement { } } + public updated(changedProps: PropertyValues): void { + // Still loading. + if (!this.Leaflet) { + return; + } + + if (changedProps.has("locations")) { + const oldLocations = changedProps.get("locations"); + const movedLocations = this.locations?.filter( + (loc, idx) => + !oldLocations[idx] || + ((loc.latitude !== oldLocations[idx].latitude || + loc.longitude !== oldLocations[idx].longitude) && + this.map.leafletMap?.getBounds().contains({ + lat: oldLocations[idx].latitude, + lng: oldLocations[idx].longitude, + }) && + !this.map.leafletMap + ?.getBounds() + .contains({ lat: loc.latitude, lng: loc.longitude })) + ); + if (movedLocations?.length === 1) { + this.map.leafletMap?.panTo({ + lat: movedLocations[0].latitude, + lng: movedLocations[0].longitude, + }); + } + } + } + private _updateLocation(ev: DragEndEvent) { const marker = ev.target; const latlng: LatLng = marker.getLatLng(); diff --git a/src/onboarding/onboarding-location.ts b/src/onboarding/onboarding-location.ts index e452e8a7ad29..1d031b81f3e7 100644 --- a/src/onboarding/onboarding-location.ts +++ b/src/onboarding/onboarding-location.ts @@ -295,8 +295,10 @@ class OnboardingLocation extends LitElement { if (ev.detail.id === LOCATION_MARKER_ID) { return; } - this._highlightedMarker = ev.detail.id; - const place = this._places!.find((plc) => plc.place_id === ev.detail.id)!; + this._highlightedMarker = Number(ev.detail.id); + const place = this._places!.find( + (plc) => plc.place_id === Number(ev.detail.id) + )!; this._location = [Number(place.lat), Number(place.lon)]; this._country = place.address.country_code.toUpperCase(); } diff --git a/src/panels/config/zone/dialog-zone-detail.ts b/src/panels/config/zone/dialog-zone-detail.ts index 4b655ea3d1a5..37432c6b8f89 100644 --- a/src/panels/config/zone/dialog-zone-detail.ts +++ b/src/panels/config/zone/dialog-zone-detail.ts @@ -152,13 +152,13 @@ class DialogZoneDetail extends LitElement { { name: "latitude", required: true, - selector: { text: {} }, + selector: { number: {} }, }, { name: "longitude", required: true, - selector: { text: {} }, + selector: { number: {} }, }, ], }, @@ -183,7 +183,7 @@ class DialogZoneDetail extends LitElement { private _valueChanged(ev: CustomEvent) { this._error = undefined; - const value = ev.detail.value; + const value = { ...ev.detail.value }; if ( value.location.latitude !== this._data!.latitude || value.location.longitude !== this._data!.longitude || From 9354ed927bcc4dd66ab93284dddc5da4a51e1773 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Mon, 22 Jan 2024 18:17:20 +0100 Subject: [PATCH 200/361] Localize sun condition in automation editor (#19473) Sun condition --- src/data/automation_i18n.ts | 76 ++++++++++++++----------------------- src/translations/en.json | 19 +++++++--- 2 files changed, 42 insertions(+), 53 deletions(-) diff --git a/src/data/automation_i18n.ts b/src/data/automation_i18n.ts index d7f186a0dc3b..e01c04de148e 100644 --- a/src/data/automation_i18n.ts +++ b/src/data/automation_i18n.ts @@ -1016,60 +1016,40 @@ const tryDescribeCondition = ( } // Sun condition - if ( - condition.condition === "sun" && - ("before" in condition || "after" in condition) - ) { - let base = "Confirm"; - - if (!condition.after && !condition.before) { - base += " sun"; - return base; - } - - base += " sun"; - - if (condition.after) { - let after_duration = ""; - - if (condition.after_offset) { - if (typeof condition.after_offset === "number") { - after_duration = ` offset by ${secondsToDuration( - condition.after_offset - )!}`; - } else if (typeof condition.after_offset === "string") { - after_duration = ` offset by ${condition.after_offset}`; - } else { - after_duration = ` offset by ${JSON.stringify( - condition.after_offset - )}`; - } + if (condition.condition === "sun" && (condition.before || condition.after)) { + let afterDuration = ""; + if (condition.after && condition.after_offset) { + if (typeof condition.after_offset === "number") { + afterDuration = secondsToDuration(condition.after_offset)!; + } else if (typeof condition.after_offset === "string") { + afterDuration = condition.after_offset; + } else { + afterDuration = JSON.stringify(condition.after_offset); } - - base += ` after ${condition.after}${after_duration}`; } - if (condition.before) { - let before_duration = ""; - - if (condition.before_offset) { - if (typeof condition.before_offset === "number") { - before_duration = ` offset by ${secondsToDuration( - condition.before_offset - )!}`; - } else if (typeof condition.before_offset === "string") { - before_duration = ` offset by ${condition.before_offset}`; - } else { - before_duration = ` offset by ${JSON.stringify( - condition.before_offset - )}`; - } + let beforeDuration = ""; + if (condition.before && condition.before_offset) { + if (typeof condition.before_offset === "number") { + beforeDuration = secondsToDuration(condition.before_offset)!; + } else if (typeof condition.before_offset === "string") { + beforeDuration = condition.before_offset; + } else { + beforeDuration = JSON.stringify(condition.before_offset); } - - base += ` before ${condition.before}${before_duration}`; } - return base; + return hass.localize( + `${conditionsTranslationBaseKey}.sun.description.full`, + { + afterChoice: condition.after ?? "other", + afterOffsetChoice: afterDuration !== "" ? "offset" : "other", + afterOffset: afterDuration, + beforeChoice: condition.before ?? "other", + beforeOffsetChoice: beforeDuration !== "" ? "offset" : "other", + beforeOffset: beforeDuration, + } + ); } // Zone condition diff --git a/src/translations/en.json b/src/translations/en.json index 1142a89d2371..0bb3f0844d19 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2508,7 +2508,9 @@ "label": "Time and location", "description": "When someone enters or leaves a zone, or at a specific time." }, - "other": { "label": "Other triggers" } + "other": { + "label": "Other triggers" + } }, "type": { "calendar": { @@ -2748,7 +2750,9 @@ "label": "Time and location", "description": "If someone is in a zone or if the current time is before or after a specified time." }, - "other": { "label": "Other conditions" }, + "other": { + "label": "Other conditions" + }, "building_blocks": { "label": "Building blocks", "description": "Build more complex conditions." @@ -2828,7 +2832,8 @@ "sunrise": "Sunrise", "sunset": "Sunset", "description": { - "picker": "If the sun is above or below the horizon." + "picker": "If the sun is above or below the horizon.", + "full": "Confirm sun{afterChoice, select, \n sunrise { after sunrise}\n sunset { after sunset}\n other {}\n}{afterOffsetChoice, select, \n offset { offset by {afterOffset}}\n other {}\n}{beforeChoice, select, \n sunrise { before sunrise}\n sunset { before sunset}\n other {}\n}{beforeOffsetChoice, select, \n offset { offset by {beforeOffset}}\n other {}\n}" } }, "template": { @@ -2912,8 +2917,12 @@ "type_select": "Action type", "continue_on_error": "Continue on error", "groups": { - "helpers": { "label": "Helpers" }, - "other": { "label": "Other actions" }, + "helpers": { + "label": "Helpers" + }, + "other": { + "label": "Other actions" + }, "building_blocks": { "label": "Building blocks", "description": "Build more complex sequences of actions." From f6af73b222415816572d51334659bd36dbc4dd79 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Mon, 22 Jan 2024 12:53:04 -0500 Subject: [PATCH 201/361] Allow expanding a history graph card (#19481) * Allow expanding a history graph card * Update styling --- .../lovelace/cards/hui-history-graph-card.ts | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/hui-history-graph-card.ts b/src/panels/lovelace/cards/hui-history-graph-card.ts index b79da32bb661..03c39cd2b2a8 100644 --- a/src/panels/lovelace/cards/hui-history-graph-card.ts +++ b/src/panels/lovelace/cards/hui-history-graph-card.ts @@ -6,12 +6,14 @@ import { html, nothing, } from "lit"; +import { mdiChevronRight } from "@mdi/js"; import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { isComponentLoaded } from "../../../common/config/is_component_loaded"; import "../../../components/chart/state-history-charts"; import "../../../components/ha-alert"; import "../../../components/ha-card"; +import "../../../components/ha-icon-button"; import { HistoryResult, computeHistory, @@ -23,6 +25,7 @@ import { hasConfigOrEntitiesChanged } from "../common/has-changed"; import { processConfigEntities } from "../common/process-config-entities"; import { LovelaceCard } from "../types"; import { HistoryGraphCardConfig } from "./types"; +import { createSearchParam } from "../../../common/url/search-params"; export const DEFAULT_HOURS_TO_SHOW = 24; @@ -192,9 +195,25 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { if (!this.hass || !this._config) { return nothing; } + const now = new Date(); + now.setHours(now.getHours() - this._hoursToShow); + const configUrl = `/history?${createSearchParam({ + entity_id: this._entityIds.join(","), + start_date: now.toISOString(), + })}`; return html` - + + ${this._config.title + ? html` +

    + ${this._config.title} + +

    + ` + : nothing}
    Date: Mon, 22 Jan 2024 20:10:08 +0100 Subject: [PATCH 202/361] Add stateValue parameter to ha-state-icon (#19508) * Add state value option to entityIcon * Migrate lock, valve and cover more info to icon translations * Migrate tile card * Remove domain icon from area card * Use attribute --- src/components/ha-state-icon.ts | 14 +++-- src/components/tile/ha-tile-badge.ts | 13 +--- src/components/tile/ha-tile-icon.ts | 15 ++--- src/data/icons.ts | 25 ++++---- .../controls/more-info-alarm_control_panel.ts | 7 +-- .../more-info/controls/more-info-lock.ts | 9 +-- src/panels/lovelace/cards/hui-area-card.ts | 17 ++--- src/panels/lovelace/cards/hui-tile-card.ts | 63 ++++++++----------- .../cards/tile/badges/tile-badge-climate.ts | 32 +++++++--- .../tile/badges/tile-badge-humidifier.ts | 28 ++++++--- .../cards/tile/badges/tile-badge-person.ts | 45 +++++++++---- .../lovelace/cards/tile/badges/tile-badge.ts | 45 ++++++------- .../cover/ha-state-control-cover-toggle.ts | 32 +++++++--- .../lock/ha-state-control-lock-toggle.ts | 42 ++++++------- .../valve/ha-state-control-valve-toggle.ts | 32 +++++++--- 15 files changed, 241 insertions(+), 178 deletions(-) diff --git a/src/components/ha-state-icon.ts b/src/components/ha-state-icon.ts index 062da216375d..2589dc318f81 100644 --- a/src/components/ha-state-icon.ts +++ b/src/components/ha-state-icon.ts @@ -14,6 +14,8 @@ export class HaStateIcon extends LitElement { @property({ attribute: false }) public stateObj?: HassEntity; + @property({ attribute: false }) public stateValue?: string; + @property() public icon?: string; protected render() { @@ -30,12 +32,14 @@ export class HaStateIcon extends LitElement { if (!this.hass) { return this._renderFallback(); } - const icon = entityIcon(this.hass, this.stateObj).then((icn) => { - if (icn) { - return html``; + const icon = entityIcon(this.hass, this.stateObj, this.stateValue).then( + (icn) => { + if (icn) { + return html``; + } + return this._renderFallback(); } - return this._renderFallback(); - }); + ); return html`${until(icon)}`; } diff --git a/src/components/tile/ha-tile-badge.ts b/src/components/tile/ha-tile-badge.ts index dea713e069f2..33aa85fce4d0 100644 --- a/src/components/tile/ha-tile-badge.ts +++ b/src/components/tile/ha-tile-badge.ts @@ -1,19 +1,13 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; -import { customElement, property } from "lit/decorators"; +import { customElement } from "lit/decorators"; import "../ha-icon"; @customElement("ha-tile-badge") export class HaTileBadge extends LitElement { - @property() public iconPath?: string; - - @property() public icon?: string; - protected render(): TemplateResult { return html`
    - ${this.icon - ? html`` - : html``} +
    `; } @@ -36,8 +30,7 @@ export class HaTileBadge extends LitElement { background-color: var(--tile-badge-background-color); transition: background-color 280ms ease-in-out; } - .badge ha-icon, - .badge ha-svg-icon { + .badge ::slotted(*) { color: var(--tile-badge-icon-color); } `; diff --git a/src/components/tile/ha-tile-icon.ts b/src/components/tile/ha-tile-icon.ts index 5bf889575f53..f5ebe8863c52 100644 --- a/src/components/tile/ha-tile-icon.ts +++ b/src/components/tile/ha-tile-icon.ts @@ -1,20 +1,14 @@ -import { CSSResultGroup, html, css, LitElement, TemplateResult } from "lit"; -import { customElement, property } from "lit/decorators"; +import { CSSResultGroup, LitElement, TemplateResult, css, html } from "lit"; +import { customElement } from "lit/decorators"; import "../ha-icon"; import "../ha-svg-icon"; @customElement("ha-tile-icon") export class HaTileIcon extends LitElement { - @property() public iconPath?: string; - - @property() public icon?: string; - protected render(): TemplateResult { return html`
    - ${this.icon - ? html`` - : html``} +
    `; } @@ -47,8 +41,7 @@ export class HaTileIcon extends LitElement { transition: color 180ms ease-in-out; overflow: hidden; } - .shape ha-icon, - .shape ha-svg-icon { + .shape ::slotted(*) { display: flex; color: var(--tile-icon-color); transition: color 180ms ease-in-out; diff --git a/src/data/icons.ts b/src/data/icons.ts index 544ce8f25d5a..009723d67fa8 100644 --- a/src/data/icons.ts +++ b/src/data/icons.ts @@ -71,10 +71,15 @@ export const getComponentIcons = async ( return resources.entity_component.then((res) => res[domain]); }; -export const entityIcon = async (hass: HomeAssistant, state: HassEntity) => { +export const entityIcon = async ( + hass: HomeAssistant, + state: HassEntity, + stateValue?: string +) => { let icon: string | undefined; const domain = computeStateDomain(state); const entity = hass.entities?.[state.entity_id]; + const value = stateValue ?? state.state; if (entity?.icon) { return entity.icon; } @@ -82,18 +87,19 @@ export const entityIcon = async (hass: HomeAssistant, state: HassEntity) => { const platformIcons = await getPlatformIcons(hass, entity.platform); if (platformIcons) { icon = - platformIcons[domain]?.[entity.translation_key]?.state?.[state.state] || + platformIcons[domain]?.[entity.translation_key]?.state?.[value] || platformIcons[domain]?.[entity.translation_key]?.default; } } if (!icon) { const entityComponentIcons = await getComponentIcons(hass, domain); + if (entityComponentIcons) { icon = entityComponentIcons[state.attributes.device_class || "_"]?.state?.[ - state.state + value ] || - entityComponentIcons._?.state?.[state.state] || + entityComponentIcons._?.state?.[value] || entityComponentIcons[state.attributes.device_class || "_"]?.default || entityComponentIcons._?.default; } @@ -110,13 +116,14 @@ export const attributeIcon = async ( let icon: string | undefined; const domain = computeStateDomain(state); const entity = hass.entities?.[state.entity_id]; + const value = attributeValue ?? state.attributes[attribute]; if (entity?.translation_key && entity.platform) { const platformIcons = await getPlatformIcons(hass, entity.platform); if (platformIcons) { icon = platformIcons[domain]?.[entity.translation_key]?.state_attributes?.[ attribute - ]?.state?.[attributeValue || state.attributes[attribute]]; + ]?.state?.[value]; } } if (!icon) { @@ -124,12 +131,8 @@ export const attributeIcon = async ( if (entityComponentIcons) { icon = entityComponentIcons[state.attributes.device_class || "_"] - .state_attributes?.[attribute]?.state?.[ - attributeValue || state.attributes[attribute] - ] || - entityComponentIcons._.state_attributes?.[attribute]?.state?.[ - attributeValue || state.attributes[attribute] - ]; + .state_attributes?.[attribute]?.state?.[value] || + entityComponentIcons._.state_attributes?.[attribute]?.state?.[value]; } } return icon; diff --git a/src/dialogs/more-info/controls/more-info-alarm_control_panel.ts b/src/dialogs/more-info/controls/more-info-alarm_control_panel.ts index 53cd1ac08ef5..bfc39a2ddc49 100644 --- a/src/dialogs/more-info/controls/more-info-alarm_control_panel.ts +++ b/src/dialogs/more-info/controls/more-info-alarm_control_panel.ts @@ -2,9 +2,9 @@ import { mdiShieldOff } from "@mdi/js"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { customElement, property } from "lit/decorators"; import { styleMap } from "lit/directives/style-map"; -import { domainIcon } from "../../../common/entity/domain_icon"; import { stateColorCss } from "../../../common/entity/state_color"; import "../../../components/ha-outlined-button"; +import "../../../components/ha-state-icon"; import { AlarmControlPanelEntity } from "../../../data/alarm_control_panel"; import "../../../state-control/alarm_control_panel/ha-state-control-alarm_control_panel-modes"; import type { HomeAssistant } from "../../../types"; @@ -59,9 +59,8 @@ class MoreInfoAlarmControlPanel extends LitElement {
    - + +
    ${this.hass.localize("ui.card.alarm_control_panel.disarm")} diff --git a/src/dialogs/more-info/controls/more-info-lock.ts b/src/dialogs/more-info/controls/more-info-lock.ts index fb5815cc5208..9af77fd128bf 100644 --- a/src/dialogs/more-info/controls/more-info-lock.ts +++ b/src/dialogs/more-info/controls/more-info-lock.ts @@ -2,11 +2,11 @@ import { mdiDoorOpen, mdiLock, mdiLockOff } from "@mdi/js"; import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property } from "lit/decorators"; import { styleMap } from "lit/directives/style-map"; -import { domainIcon } from "../../../common/entity/domain_icon"; import { stateColorCss } from "../../../common/entity/state_color"; import { supportsFeature } from "../../../common/entity/supports-feature"; import "../../../components/ha-attributes"; import "../../../components/ha-outlined-icon-button"; +import "../../../components/ha-state-icon"; import { UNAVAILABLE } from "../../../data/entity"; import { LockEntity, @@ -62,9 +62,10 @@ class MoreInfoLock extends LitElement {
    - +
    ` diff --git a/src/panels/lovelace/cards/hui-area-card.ts b/src/panels/lovelace/cards/hui-area-card.ts index 5a455a9f6c24..3ceb943ebeec 100644 --- a/src/panels/lovelace/cards/hui-area-card.ts +++ b/src/panels/lovelace/cards/hui-area-card.ts @@ -1,5 +1,7 @@ import "@material/mwc-ripple"; import { + mdiFan, + mdiFanOff, mdiLightbulbMultiple, mdiLightbulbMultipleOff, mdiRun, @@ -9,30 +11,30 @@ import { } from "@mdi/js"; import type { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket"; import { - css, CSSResultGroup, - html, LitElement, PropertyValues, TemplateResult, + css, + html, nothing, } from "lit"; import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { styleMap } from "lit/directives/style-map"; import memoizeOne from "memoize-one"; -import { STATES_OFF, FIXED_DEVICE_CLASS_ICONS } from "../../../common/const"; +import { FIXED_DEVICE_CLASS_ICONS, STATES_OFF } from "../../../common/const"; import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element"; -import { computeDomain } from "../../../common/entity/compute_domain"; import { binarySensorIcon } from "../../../common/entity/binary_sensor_icon"; -import { domainIcon } from "../../../common/entity/domain_icon"; +import { computeDomain } from "../../../common/entity/compute_domain"; import { navigate } from "../../../common/navigate"; import { formatNumber, isNumericState, } from "../../../common/number/format_number"; -import { subscribeOne } from "../../../common/util/subscribe-one"; +import { blankBeforeUnit } from "../../../common/translations/blank_before_unit"; import parseAspectRatio from "../../../common/util/parse-aspect-ratio"; +import { subscribeOne } from "../../../common/util/subscribe-one"; import "../../../components/ha-card"; import "../../../components/ha-icon-button"; import "../../../components/ha-svg-icon"; @@ -56,7 +58,6 @@ import "../components/hui-image"; import "../components/hui-warning"; import { LovelaceCard, LovelaceCardEditor } from "../types"; import { AreaCardConfig } from "./types"; -import { blankBeforeUnit } from "../../../common/translations/blank_before_unit"; export const DEFAULT_ASPECT_RATIO = "16:9"; @@ -76,7 +77,7 @@ export const DEVICE_CLASSES = { const DOMAIN_ICONS = { light: { on: mdiLightbulbMultiple, off: mdiLightbulbMultipleOff }, switch: { on: mdiToggleSwitch, off: mdiToggleSwitchOff }, - fan: { on: domainIcon("fan"), off: domainIcon("fan") }, + fan: { on: mdiFan, off: mdiFanOff }, binary_sensor: { motion: mdiRun, moisture: mdiWaterAlert, diff --git a/src/panels/lovelace/cards/hui-tile-card.ts b/src/panels/lovelace/cards/hui-tile-card.ts index 70d3d13063a3..e400e147ce55 100644 --- a/src/panels/lovelace/cards/hui-tile-card.ts +++ b/src/panels/lovelace/cards/hui-tile-card.ts @@ -28,8 +28,9 @@ import { DOMAINS_TOGGLE } from "../../../common/const"; import { computeDomain } from "../../../common/entity/compute_domain"; import { stateActive } from "../../../common/entity/state_active"; import { stateColorCss } from "../../../common/entity/state_color"; -import { stateIconPath } from "../../../common/entity/state_icon_path"; import "../../../components/ha-card"; +import "../../../components/ha-state-icon"; +import "../../../components/ha-svg-icon"; import "../../../components/tile/ha-tile-badge"; import "../../../components/tile/ha-tile-icon"; import "../../../components/tile/ha-tile-image"; @@ -48,7 +49,7 @@ import { handleAction } from "../common/handle-action"; import { hasAction } from "../common/has-action"; import "../components/hui-timestamp-display"; import type { LovelaceCard, LovelaceCardEditor } from "../types"; -import { computeTileBadge } from "./tile/badges/tile-badge"; +import { renderTileBadge } from "./tile/badges/tile-badge"; import type { ThermostatCardConfig, TileCardConfig } from "./types"; const TIMESTAMP_STATE_DOMAINS = ["button", "input_button", "scene"]; @@ -341,17 +342,14 @@ export class HuiTileCard extends LitElement implements LovelaceCard {
    - - + + + + + +
    @@ -360,9 +358,6 @@ export class HuiTileCard extends LitElement implements LovelaceCard { `; } - const icon = this._config.icon || stateObj.attributes.icon; - const iconPath = stateIconPath(stateObj); - const name = this._config.name || stateObj.attributes.friendly_name; const localizedState = this._config.hide_state @@ -382,7 +377,6 @@ export class HuiTileCard extends LitElement implements LovelaceCard { const imageUrl = this._config.show_entity_picture ? this._getImageUrl(stateObj) : undefined; - const badge = computeTileBadge(stateObj, this.hass); return html` @@ -420,7 +414,6 @@ export class HuiTileCard extends LitElement implements LovelaceCard { ? html` ` @@ -428,27 +421,18 @@ export class HuiTileCard extends LitElement implements LovelaceCard { + > + + `} - ${badge - ? html` - - ` - : nothing} + ${renderTileBadge(stateObj, this.hass)}
    @@ -516,7 +500,7 @@ export class HuiTileCard extends LitElement implements LovelaceCard { margin-inline-start: initial; margin-inline-end: initial; } - .vertical .info { + .vertical ha-tile-info { width: 100%; } .icon-container { @@ -528,14 +512,15 @@ export class HuiTileCard extends LitElement implements LovelaceCard { direction: var(--direction); transition: transform 180ms ease-in-out; } - .icon-container .icon { + .icon-container ha-tile-icon, + .icon-container ha-tile-image { --tile-icon-color: var(--tile-color); user-select: none; -ms-user-select: none; -webkit-user-select: none; -moz-user-select: none; } - .icon-container .badge { + .icon-container ha-tile-badge { position: absolute; top: -3px; right: -3px; @@ -544,7 +529,7 @@ export class HuiTileCard extends LitElement implements LovelaceCard { .icon-container[role="button"]:active { transform: scale(1.2); } - .info { + ha-tile-info { position: relative; padding: 12px; flex: 1; @@ -564,6 +549,10 @@ export class HuiTileCard extends LitElement implements LovelaceCard { animation: pulse 1s infinite; } + ha-tile-badge.not-found { + --tile-badge-background-color: var(--red-color); + } + @keyframes pulse { 0% { opacity: 1; diff --git a/src/panels/lovelace/cards/tile/badges/tile-badge-climate.ts b/src/panels/lovelace/cards/tile/badges/tile-badge-climate.ts index a00d773e5674..ed75266f7475 100644 --- a/src/panels/lovelace/cards/tile/badges/tile-badge-climate.ts +++ b/src/panels/lovelace/cards/tile/badges/tile-badge-climate.ts @@ -1,20 +1,36 @@ +import { html, nothing } from "lit"; +import { styleMap } from "lit/directives/style-map"; import { stateColorCss } from "../../../../../common/entity/state_color"; +import "../../../../../components/ha-attribute-icon"; +import "../../../../../components/tile/ha-tile-badge"; import { - CLIMATE_HVAC_ACTION_ICONS, CLIMATE_HVAC_ACTION_TO_MODE, ClimateEntity, } from "../../../../../data/climate"; -import { ComputeBadgeFunction } from "./tile-badge"; +import { RenderBadgeFunction } from "./tile-badge"; -export const computeClimateBadge: ComputeBadgeFunction = (stateObj) => { +export const renderClimateBadge: RenderBadgeFunction = (stateObj, hass) => { const hvacAction = (stateObj as ClimateEntity).attributes.hvac_action; if (!hvacAction || hvacAction === "off") { - return undefined; + return nothing; } - return { - iconPath: CLIMATE_HVAC_ACTION_ICONS[hvacAction], - color: stateColorCss(stateObj, CLIMATE_HVAC_ACTION_TO_MODE[hvacAction]), - }; + return html` + + + + + `; }; diff --git a/src/panels/lovelace/cards/tile/badges/tile-badge-humidifier.ts b/src/panels/lovelace/cards/tile/badges/tile-badge-humidifier.ts index 709f4e7c68d5..4ca246c02c9d 100644 --- a/src/panels/lovelace/cards/tile/badges/tile-badge-humidifier.ts +++ b/src/panels/lovelace/cards/tile/badges/tile-badge-humidifier.ts @@ -1,20 +1,32 @@ +import { html, nothing } from "lit"; +import { styleMap } from "lit/directives/style-map"; import { stateColorCss } from "../../../../../common/entity/state_color"; +import "../../../../../components/ha-attribute-icon"; +import "../../../../../components/tile/ha-tile-badge"; import { - HUMIDIFIER_ACTION_ICONS, HUMIDIFIER_ACTION_MODE, HumidifierEntity, } from "../../../../../data/humidifier"; -import { ComputeBadgeFunction } from "./tile-badge"; +import { RenderBadgeFunction } from "./tile-badge"; -export const computeHumidifierBadge: ComputeBadgeFunction = (stateObj) => { +export const renderHumidifierBadge: RenderBadgeFunction = (stateObj, hass) => { const hvacAction = (stateObj as HumidifierEntity).attributes.action; if (!hvacAction || hvacAction === "off") { - return undefined; + return nothing; } - return { - iconPath: HUMIDIFIER_ACTION_ICONS[hvacAction], - color: stateColorCss(stateObj, HUMIDIFIER_ACTION_MODE[hvacAction]), - }; + return html` + + + + + `; }; diff --git a/src/panels/lovelace/cards/tile/badges/tile-badge-person.ts b/src/panels/lovelace/cards/tile/badges/tile-badge-person.ts index 6d58f5af81ce..4c0fd8be80b7 100644 --- a/src/panels/lovelace/cards/tile/badges/tile-badge-person.ts +++ b/src/panels/lovelace/cards/tile/badges/tile-badge-person.ts @@ -1,8 +1,13 @@ import { mdiHome, mdiHomeExportOutline } from "@mdi/js"; import { HassEntity } from "home-assistant-js-websocket"; +import { html } from "lit"; +import { styleMap } from "lit/directives/style-map"; import { stateColorCss } from "../../../../../common/entity/state_color"; +import "../../../../../components/ha-icon"; +import "../../../../../components/ha-svg-icon"; +import "../../../../../components/tile/ha-tile-badge"; import { HomeAssistant } from "../../../../../types"; -import { ComputeBadgeFunction } from "./tile-badge"; +import { RenderBadgeFunction } from "./tile-badge"; function getZone(entity: HassEntity, hass: HomeAssistant) { const state = entity.state; @@ -15,17 +20,33 @@ function getZone(entity: HassEntity, hass: HomeAssistant) { return zones.find((z) => state === z.attributes.friendly_name); } -function personBadgeIcon(entity: HassEntity) { - const state = entity.state; - return state === "not_home" ? mdiHomeExportOutline : mdiHome; -} - -export const computePersonBadge: ComputeBadgeFunction = (stateObj, hass) => { +export const renderPersonBadge: RenderBadgeFunction = (stateObj, hass) => { const zone = getZone(stateObj, hass); - return { - iconPath: personBadgeIcon(stateObj), - icon: zone?.attributes.icon, - color: stateColorCss(stateObj), - }; + const zoneIcon = zone?.attributes.icon; + + if (zoneIcon) { + return html` + + + + `; + } + + const defaultIcon = + stateObj.state === "not_home" ? mdiHomeExportOutline : mdiHome; + + return html` + + + + `; }; diff --git a/src/panels/lovelace/cards/tile/badges/tile-badge.ts b/src/panels/lovelace/cards/tile/badges/tile-badge.ts index 5281f3591de3..e6bdc8fb0c38 100644 --- a/src/panels/lovelace/cards/tile/badges/tile-badge.ts +++ b/src/panels/lovelace/cards/tile/badges/tile-badge.ts @@ -1,43 +1,46 @@ import { mdiExclamationThick } from "@mdi/js"; import { HassEntity } from "home-assistant-js-websocket"; +import { TemplateResult, html, nothing } from "lit"; +import { styleMap } from "lit/directives/style-map"; import { computeDomain } from "../../../../../common/entity/compute_domain"; import { UNAVAILABLE, UNKNOWN } from "../../../../../data/entity"; import { HomeAssistant } from "../../../../../types"; -import { computeClimateBadge } from "./tile-badge-climate"; -import { computePersonBadge } from "./tile-badge-person"; -import { computeHumidifierBadge } from "./tile-badge-humidifier"; +import { renderClimateBadge } from "./tile-badge-climate"; +import { renderHumidifierBadge } from "./tile-badge-humidifier"; +import { renderPersonBadge } from "./tile-badge-person"; +import "../../../../../components/tile/ha-tile-badge"; +import "../../../../../components/ha-svg-icon"; -export type TileBadge = { - color?: string; - icon?: string; - iconPath?: string; -}; - -export type ComputeBadgeFunction = ( +export type RenderBadgeFunction = ( stateObj: HassEntity, hass: HomeAssistant -) => TileBadge | undefined; +) => TemplateResult | typeof nothing; -export const computeTileBadge: ComputeBadgeFunction = (stateObj, hass) => { +export const renderTileBadge: RenderBadgeFunction = (stateObj, hass) => { if (stateObj.state === UNKNOWN) { - return undefined; + return nothing; } if (stateObj.state === UNAVAILABLE) { - return { - color: "var(--orange-color)", - iconPath: mdiExclamationThick, - }; + return html` + + + + `; } const domain = computeDomain(stateObj.entity_id); switch (domain) { case "person": case "device_tracker": - return computePersonBadge(stateObj, hass); + return renderPersonBadge(stateObj, hass); case "climate": - return computeClimateBadge(stateObj, hass); + return renderClimateBadge(stateObj, hass); case "humidifier": - return computeHumidifierBadge(stateObj, hass); + return renderHumidifierBadge(stateObj, hass); default: - return undefined; + return nothing; } }; diff --git a/src/state-control/cover/ha-state-control-cover-toggle.ts b/src/state-control/cover/ha-state-control-cover-toggle.ts index dc26ffe24cce..b47a7b62a190 100644 --- a/src/state-control/cover/ha-state-control-cover-toggle.ts +++ b/src/state-control/cover/ha-state-control-cover-toggle.ts @@ -3,10 +3,10 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { styleMap } from "lit/directives/style-map"; -import { domainIcon } from "../../common/entity/domain_icon"; import { stateColorCss } from "../../common/entity/state_color"; import "../../components/ha-control-button"; import "../../components/ha-control-switch"; +import "../../components/ha-state-icon"; import { UNAVAILABLE, UNKNOWN } from "../../data/entity"; import { forwardHaptic } from "../../data/haptics"; import { HomeAssistant } from "../../types"; @@ -77,9 +77,11 @@ export class HaStateControlCoverToggle extends LitElement { "--color": onColor, })} > - + - +
    `; @@ -102,8 +106,6 @@ export class HaStateControlCoverToggle extends LitElement { return html` + + `; } diff --git a/src/state-control/lock/ha-state-control-lock-toggle.ts b/src/state-control/lock/ha-state-control-lock-toggle.ts index 2914e17587cb..06e975ee59f1 100644 --- a/src/state-control/lock/ha-state-control-lock-toggle.ts +++ b/src/state-control/lock/ha-state-control-lock-toggle.ts @@ -9,10 +9,10 @@ import { import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { styleMap } from "lit/directives/style-map"; -import { domainIcon } from "../../common/entity/domain_icon"; import { stateColorCss } from "../../common/entity/state_color"; import "../../components/ha-control-button"; import "../../components/ha-control-switch"; +import "../../components/ha-state-icon"; import { UNAVAILABLE, UNKNOWN } from "../../data/entity"; import { forwardHaptic } from "../../data/haptics"; import { callProtectedLockService, LockEntity } from "../../data/lock"; @@ -81,18 +81,6 @@ export class HaStateControlLockToggle extends LitElement { const color = stateColorCss(this.stateObj); - const onIcon = domainIcon( - "lock", - this.stateObj, - locking ? "locking" : "locked" - ); - - const offIcon = domainIcon( - "lock", - this.stateObj, - unlocking ? "unlocking" : "unlocked" - ); - if (this.stateObj.state === UNKNOWN) { return html`
    @@ -100,13 +88,21 @@ export class HaStateControlLockToggle extends LitElement { .label=${this.hass.localize("ui.card.lock.lock")} @click=${this._turnOn} > - + - +
    `; @@ -127,16 +123,20 @@ export class HaStateControlLockToggle extends LitElement { })} .disabled=${this.stateObj.state === UNAVAILABLE} > - - + + > `; } diff --git a/src/state-control/valve/ha-state-control-valve-toggle.ts b/src/state-control/valve/ha-state-control-valve-toggle.ts index 2eb0dbd93477..b543b539d8f5 100644 --- a/src/state-control/valve/ha-state-control-valve-toggle.ts +++ b/src/state-control/valve/ha-state-control-valve-toggle.ts @@ -3,10 +3,10 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { styleMap } from "lit/directives/style-map"; -import { domainIcon } from "../../common/entity/domain_icon"; import { stateColorCss } from "../../common/entity/state_color"; import "../../components/ha-control-button"; import "../../components/ha-control-switch"; +import "../../components/ha-state-icon"; import { UNAVAILABLE, UNKNOWN } from "../../data/entity"; import { forwardHaptic } from "../../data/haptics"; import { HomeAssistant } from "../../types"; @@ -77,9 +77,11 @@ export class HaStateControlValveToggle extends LitElement { "--color": onColor, })} > - + - +
    `; @@ -102,8 +106,6 @@ export class HaStateControlValveToggle extends LitElement { return html` + + `; } From 98e3dbceb57c054172773cfecf727bea8d58c516 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 20:15:44 +0100 Subject: [PATCH 203/361] Update dependency @bundle-stats/plugin-webpack-filter to v4.9.1 (#19513) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index dd772f74e0f2..9ecc2f9e8185 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,7 @@ "@babel/plugin-transform-runtime": "7.23.7", "@babel/preset-env": "7.23.8", "@babel/preset-typescript": "7.23.3", - "@bundle-stats/plugin-webpack-filter": "4.8.4", + "@bundle-stats/plugin-webpack-filter": "4.9.1", "@koa/cors": "5.0.0", "@lokalise/node-api": "12.1.0", "@octokit/auth-oauth-device": "6.0.1", diff --git a/yarn.lock b/yarn.lock index b44ea0d1f164..7972cc3ce8a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1462,12 +1462,12 @@ __metadata: languageName: node linkType: hard -"@bundle-stats/plugin-webpack-filter@npm:4.8.4": - version: 4.8.4 - resolution: "@bundle-stats/plugin-webpack-filter@npm:4.8.4" +"@bundle-stats/plugin-webpack-filter@npm:4.9.1": + version: 4.9.1 + resolution: "@bundle-stats/plugin-webpack-filter@npm:4.9.1" peerDependencies: core-js: ^3.0.0 - checksum: 7a33a19094fb32579ca215cfee7c536a7e524558e6a17bee0376377691b4957bd1346531dfe3b01e8daf364acef75e1926f3d1aed76d986be79ba374157782fb + checksum: ec3fba8e5d9a49a2500bdf75468c743b48d78ab8b0199e3ceda1bc59d57de3f9b7ad48ca04846cd7f1f64e33d3646fd605c7f56e242798d06e76d18997489365 languageName: node linkType: hard @@ -9471,7 +9471,7 @@ __metadata: "@babel/preset-typescript": "npm:7.23.3" "@babel/runtime": "npm:7.23.8" "@braintree/sanitize-url": "npm:7.0.0" - "@bundle-stats/plugin-webpack-filter": "npm:4.8.4" + "@bundle-stats/plugin-webpack-filter": "npm:4.9.1" "@codemirror/autocomplete": "npm:6.12.0" "@codemirror/commands": "npm:6.3.3" "@codemirror/language": "npm:6.10.0" From d335dd4b8389d1355735919e65c16ea2c274d467 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 19:43:05 -0500 Subject: [PATCH 204/361] Update dependency @types/luxon to v3.4.2 (#19514) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9ecc2f9e8185..f941eb0ffa7e 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "@types/js-yaml": "4.0.9", "@types/leaflet": "1.9.8", "@types/leaflet-draw": "1.0.11", - "@types/luxon": "3.4.1", + "@types/luxon": "3.4.2", "@types/mocha": "10.0.6", "@types/qrcode": "1.5.5", "@types/serve-handler": "6.1.4", diff --git a/yarn.lock b/yarn.lock index 7972cc3ce8a9..798dc1ac3b21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4276,10 +4276,10 @@ __metadata: languageName: node linkType: hard -"@types/luxon@npm:3.4.1": - version: 3.4.1 - resolution: "@types/luxon@npm:3.4.1" - checksum: dc133d28dee98fd7944e81fbde8df4fcdd7b602139259b5566b556a09da296a6c57e02899b0068470465d5b3798f551edafe0a6c8fb89fcd327d799ff7d37c92 +"@types/luxon@npm:3.4.2": + version: 3.4.2 + resolution: "@types/luxon@npm:3.4.2" + checksum: fd89566e3026559f2bc4ddcc1e70a2c16161905ed50be9473ec0cfbbbe919165041408c4f6e06c4bcf095445535052e2c099087c76b1b38e368127e618fc968d languageName: node linkType: hard @@ -9553,7 +9553,7 @@ __metadata: "@types/js-yaml": "npm:4.0.9" "@types/leaflet": "npm:1.9.8" "@types/leaflet-draw": "npm:1.0.11" - "@types/luxon": "npm:3.4.1" + "@types/luxon": "npm:3.4.2" "@types/mocha": "npm:10.0.6" "@types/qrcode": "npm:1.5.5" "@types/serve-handler": "npm:6.1.4" From 88f67230fca2c203ead0daeb1ef57be0548ccb6e Mon Sep 17 00:00:00 2001 From: G Johansson Date: Tue, 23 Jan 2024 12:04:23 +0100 Subject: [PATCH 205/361] Preview for time_date helper (#19476) --- src/data/time_date.ts | 21 +++++ .../previews/flow-preview-time_date.ts | 94 +++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 src/data/time_date.ts create mode 100644 src/dialogs/config-flow/previews/flow-preview-time_date.ts diff --git a/src/data/time_date.ts b/src/data/time_date.ts new file mode 100644 index 000000000000..5f572cb658b3 --- /dev/null +++ b/src/data/time_date.ts @@ -0,0 +1,21 @@ +import { UnsubscribeFunc } from "home-assistant-js-websocket"; +import { HomeAssistant } from "../types"; + +export interface TimeDatePreview { + state: string; + attributes: Record; +} + +export const subscribePreviewTimeDate = ( + hass: HomeAssistant, + flow_id: string, + flow_type: "config_flow" | "options_flow", + user_input: Record, + callback: (preview: TimeDatePreview) => void +): Promise => + hass.connection.subscribeMessage(callback, { + type: "time_date/start_preview", + flow_id, + flow_type, + user_input, + }); diff --git a/src/dialogs/config-flow/previews/flow-preview-time_date.ts b/src/dialogs/config-flow/previews/flow-preview-time_date.ts new file mode 100644 index 000000000000..fd4676ec439c --- /dev/null +++ b/src/dialogs/config-flow/previews/flow-preview-time_date.ts @@ -0,0 +1,94 @@ +import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket"; +import { LitElement, html } from "lit"; +import { customElement, property, state } from "lit/decorators"; +import { FlowType } from "../../../data/data_entry_flow"; +import { + TimeDatePreview, + subscribePreviewTimeDate, +} from "../../../data/time_date"; +import { HomeAssistant } from "../../../types"; +import "./entity-preview-row"; +import { debounce } from "../../../common/util/debounce"; + +@customElement("flow-preview-time_date") +class FlowPreviewTimeDate extends LitElement { + @property({ attribute: false }) public hass!: HomeAssistant; + + @property() public flowType!: FlowType; + + public handler!: string; + + @property() public stepId!: string; + + @property() public flowId!: string; + + @property() public stepData!: Record; + + @state() private _preview?: HassEntity; + + private _unsub?: Promise; + + disconnectedCallback(): void { + super.disconnectedCallback(); + if (this._unsub) { + this._unsub.then((unsub) => unsub()); + this._unsub = undefined; + } + } + + willUpdate(changedProps) { + if (changedProps.has("stepData")) { + this._debouncedSubscribePreview(); + } + } + + protected render() { + return html``; + } + + private _setPreview = (preview: TimeDatePreview) => { + const now = new Date().toISOString(); + this._preview = { + entity_id: `${this.stepId}.___flow_preview___`, + last_changed: now, + last_updated: now, + context: { id: "", parent_id: null, user_id: null }, + ...preview, + }; + }; + + private _debouncedSubscribePreview = debounce(() => { + this._subscribePreview(); + }, 250); + + private async _subscribePreview() { + if (this._unsub) { + (await this._unsub)(); + this._unsub = undefined; + } + if (this.flowType === "repair_flow") { + return; + } + try { + this._unsub = subscribePreviewTimeDate( + this.hass, + this.flowId, + this.flowType, + this.stepData, + this._setPreview + ); + await this._unsub; + } catch (err) { + this._preview = undefined; + } + } +} + +declare global { + interface HTMLElementTagNameMap { + "flow-preview-time_date": FlowPreviewTimeDate; + } +} From cc4cfe1b5c63e1b5b83951e1431a6c6b940b6892 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 23 Jan 2024 13:16:49 +0100 Subject: [PATCH 206/361] Add `set_conversation_response` action (#19512) --- src/components/trace/hat-script-graph.ts | 112 +----------------- src/data/action.ts | 3 + src/data/script.ts | 8 ++ src/data/script_i18n.ts | 9 ++ .../action/ha-automation-action-row.ts | 1 + ...mation-action-set_conversation_response.ts | 54 +++++++++ src/translations/en.json | 7 ++ 7 files changed, 85 insertions(+), 109 deletions(-) create mode 100644 src/panels/config/automation/action/types/ha-automation-action-set_conversation_response.ts diff --git a/src/components/trace/hat-script-graph.ts b/src/components/trace/hat-script-graph.ts index 40afe60a6276..6dcfa4b5ee8d 100644 --- a/src/components/trace/hat-script-graph.ts +++ b/src/components/trace/hat-script-graph.ts @@ -13,14 +13,9 @@ import { mdiClose, mdiCodeBraces, mdiCodeBrackets, - mdiDevices, - mdiGestureDoubleTap, - mdiHandBackRight, - mdiPalette, mdiRefresh, mdiRoomService, mdiShuffleDisabled, - mdiTimerOutline, } from "@mdi/js"; import { css, html, LitElement, PropertyValues } from "lit"; import { customElement, property } from "lit/decorators"; @@ -30,17 +25,14 @@ import { Condition, Trigger } from "../../data/automation"; import { Action, ChooseAction, - DelayAction, - DeviceAction, - EventAction, IfAction, ManualScriptConfig, ParallelAction, RepeatAction, - SceneAction, ServiceAction, WaitAction, WaitForTriggerAction, + getActionType, } from "../../data/script"; import { ChooseActionTraceStep, @@ -53,6 +45,7 @@ import "./hat-graph-branch"; import { BRANCH_HEIGHT, NODE_SIZE, SPACING } from "./hat-graph-const"; import "./hat-graph-node"; import "./hat-graph-spacer"; +import { ACTION_ICONS } from "../../data/action"; export interface NodeInfo { path: string; @@ -115,17 +108,12 @@ export class HatScriptGraph extends LitElement { and: this.render_condition_node, or: this.render_condition_node, not: this.render_condition_node, - delay: this.render_delay_node, - event: this.render_event_node, - scene: this.render_scene_node, service: this.render_service_node, wait_template: this.render_wait_node, wait_for_trigger: this.render_wait_node, repeat: this.render_repeat_node, choose: this.render_choose_node, - device_id: this.render_device_node, if: this.render_if_node, - stop: this.render_stop_node, parallel: this.render_parallel_node, other: this.render_other_node, }; @@ -371,63 +359,6 @@ export class HatScriptGraph extends LitElement { `; } - private render_delay_node( - node: DelayAction, - path: string, - graphStart = false, - disabled = false - ) { - return html` - - `; - } - - private render_device_node( - node: DeviceAction, - path: string, - graphStart = false, - disabled = false - ) { - return html` - - `; - } - - private render_event_node( - node: EventAction, - path: string, - graphStart = false, - disabled = false - ) { - return html` - - `; - } - private render_repeat_node( node: RepeatAction, path: string, @@ -475,25 +406,6 @@ export class HatScriptGraph extends LitElement { `; } - private render_scene_node( - node: SceneAction, - path: string, - graphStart = false, - disabled = false - ) { - return html` - - `; - } - private render_service_node( node: ServiceAction, path: string, @@ -580,24 +492,6 @@ export class HatScriptGraph extends LitElement { `; } - private render_stop_node( - node: Action, - path: string, - graphStart = false, - disabled = false - ) { - return html` - - `; - } - private render_other_node( node: Action, path: string, @@ -607,7 +501,7 @@ export class HatScriptGraph extends LitElement { return html` ([ @@ -68,6 +70,7 @@ export const ACTION_GROUPS: AutomationElementGroup = { members: { event: {}, service: {}, + set_conversation_response: {}, }, }, } as const; diff --git a/src/data/script.ts b/src/data/script.ts index 08910dc88fcb..0f585cf1e003 100644 --- a/src/data/script.ts +++ b/src/data/script.ts @@ -248,6 +248,10 @@ export interface ParallelAction extends BaseAction { parallel: ManualScriptConfig | Action | (ManualScriptConfig | Action)[]; } +export interface SetConversationResponseAction extends BaseAction { + set_conversation_response: string; +} + interface UnknownAction extends BaseAction { [key: string]: unknown; } @@ -292,6 +296,7 @@ export interface ActionTypes { play_media: PlayMediaAction; stop: StopAction; parallel: ParallelAction; + set_conversation_response: SetConversationResponseAction; unknown: UnknownAction; } @@ -383,6 +388,9 @@ export const getActionType = (action: Action): ActionType => { if ("parallel" in action) { return "parallel"; } + if ("set_conversation_response" in action) { + return "set_conversation_response"; + } if ("service" in action) { if ("metadata" in action) { if (is(action, activateSceneActionStruct)) { diff --git a/src/data/script_i18n.ts b/src/data/script_i18n.ts index 40c823bc862f..22d5e3c0a7bf 100644 --- a/src/data/script_i18n.ts +++ b/src/data/script_i18n.ts @@ -27,6 +27,7 @@ import { PlayMediaAction, RepeatAction, SceneAction, + SetConversationResponseAction, StopAction, VariablesAction, WaitForTriggerAction, @@ -443,5 +444,13 @@ const tryDescribeAction = ( ); } + if (actionType === "set_conversation_response") { + const config = action as SetConversationResponseAction; + return hass.localize( + `${actionTranslationBaseKey}.set_conversation_response.description.full`, + { response: config.set_conversation_response } + ); + } + return actionType; }; diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts index 64c469a0db4c..69e811b0ba4d 100644 --- a/src/panels/config/automation/action/ha-automation-action-row.ts +++ b/src/panels/config/automation/action/ha-automation-action-row.ts @@ -77,6 +77,7 @@ import "./types/ha-automation-action-service"; import "./types/ha-automation-action-stop"; import "./types/ha-automation-action-wait_for_trigger"; import "./types/ha-automation-action-wait_template"; +import "./types/ha-automation-action-set_conversation_response"; export const getType = (action: Action | undefined) => { if (!action) { diff --git a/src/panels/config/automation/action/types/ha-automation-action-set_conversation_response.ts b/src/panels/config/automation/action/types/ha-automation-action-set_conversation_response.ts new file mode 100644 index 000000000000..b4c9b9c51ded --- /dev/null +++ b/src/panels/config/automation/action/types/ha-automation-action-set_conversation_response.ts @@ -0,0 +1,54 @@ +import { html, LitElement } from "lit"; +import { customElement, property } from "lit/decorators"; +import "../../../../../components/ha-form/ha-form"; +import type { SetConversationResponseAction } from "../../../../../data/script"; +import type { HomeAssistant } from "../../../../../types"; +import type { ActionElement } from "../ha-automation-action-row"; + +const SCHEMA = [ + { + name: "set_conversation_response", + selector: { + template: {}, + }, + }, +] as const; + +@customElement("ha-automation-action-set_conversation_response") +export class HaSetConversationResponseAction + extends LitElement + implements ActionElement +{ + @property({ attribute: false }) public hass!: HomeAssistant; + + @property({ attribute: false }) public action!: SetConversationResponseAction; + + @property({ type: Boolean }) public disabled = false; + + public static get defaultConfig() { + return { set_conversation_response: "" }; + } + + protected render() { + return html` + + `; + } + + private _computeLabelCallback = (): string => + this.hass.localize( + "ui.panel.config.automation.editor.actions.type.set_conversation_response.label" + ); +} + +declare global { + interface HTMLElementTagNameMap { + "ha-automation-action-set_conversation_response": HaSetConversationResponseAction; + } +} diff --git a/src/translations/en.json b/src/translations/en.json index 0bb3f0844d19..c55dd8963365 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -3117,6 +3117,13 @@ "full": "Test {condition}" } }, + "set_conversation_response": { + "label": "Set conversation response", + "description": { + "picker": "Set response of conversation when automation was triggered by conversation trigger.", + "full": "Set response of conversation to {response}" + } + }, "unknown": { "label": "Unknown" } From 807d08d8eb8b1ab51d7b1dcc57f870da3545bb6e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 21:11:52 -0500 Subject: [PATCH 207/361] Update dependency core-js to v3.35.1 (#19519) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f941eb0ffa7e..bb79acc2a583 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "app-datepicker": "5.1.1", "chart.js": "4.4.1", "comlink": "4.4.1", - "core-js": "3.35.0", + "core-js": "3.35.1", "cropperjs": "1.6.1", "date-fns": "2.30.0", "date-fns-tz": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 798dc1ac3b21..863091057102 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6983,10 +6983,10 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.35.0": - version: 3.35.0 - resolution: "core-js@npm:3.35.0" - checksum: 0815fce6bcc91d79d4b28885975453b0faa4d17fc2230635102b4f3832cd621035e4032aa3307e1dbe0ee14d5e34bcb64b507fd89bd8f567aedaf29538522e6a +"core-js@npm:3.35.1": + version: 3.35.1 + resolution: "core-js@npm:3.35.1" + checksum: 5d31f22eb05cf66bd1a2088a04b7106faa5d0b91c1ffa5d72c5203e4974c31bd7e11969297f540a806c00c74c23991eaad5639592df8b5dbe4412fff3c075cd5 languageName: node linkType: hard @@ -9579,7 +9579,7 @@ __metadata: chai: "npm:5.0.0" chart.js: "npm:4.4.1" comlink: "npm:4.4.1" - core-js: "npm:3.35.0" + core-js: "npm:3.35.1" cropperjs: "npm:1.6.1" date-fns: "npm:2.30.0" date-fns-tz: "npm:2.0.0" From beb3454f8d2012d69ed3ce91672e617c9bb9cacc Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Wed, 24 Jan 2024 18:16:59 +0100 Subject: [PATCH 208/361] Hide fallback when dragging items in sidebar (#19521) --- src/components/ha-sortable.ts | 3 +-- src/resources/sortable.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/ha-sortable.ts b/src/components/ha-sortable.ts index 248a0171f8ae..b188620c87d0 100644 --- a/src/components/ha-sortable.ts +++ b/src/components/ha-sortable.ts @@ -77,8 +77,7 @@ export class HaSortable extends LitElement { return html`