From d7dd11ba7f941235f1fe6b7c2881d6c23d62b646 Mon Sep 17 00:00:00 2001
From: Bram Kragten
Date: Thu, 1 May 2025 20:06:42 +0300
Subject: [PATCH 10/36] Improve error handling in automation i18n (#25266)
---
.../entity/ha-entity-attribute-picker.ts | 16 +-
src/data/automation_i18n.ts | 167 ++++++++++--------
2 files changed, 103 insertions(+), 80 deletions(-)
diff --git a/src/components/entity/ha-entity-attribute-picker.ts b/src/components/entity/ha-entity-attribute-picker.ts
index 2468f6fe71..7e08060e33 100644
--- a/src/components/entity/ha-entity-attribute-picker.ts
+++ b/src/components/entity/ha-entity-attribute-picker.ts
@@ -73,16 +73,20 @@ class HaEntityAttributePicker extends LitElement {
return nothing;
}
+ const stateObj = this.hass.states[this.entityId!] as HassEntity | undefined;
+
return html`
@@ -988,12 +1003,14 @@ const tryDescribeCondition = (
);
const attribute = condition.attribute
- ? computeAttributeNameDisplay(
- hass.localize,
- stateObj,
- hass.entities,
- condition.attribute
- )
+ ? stateObj
+ ? computeAttributeNameDisplay(
+ hass.localize,
+ stateObj,
+ hass.entities,
+ condition.attribute
+ )
+ : condition.attribute
: undefined;
if (condition.above !== undefined && condition.below !== undefined) {
@@ -1187,7 +1204,9 @@ const tryDescribeCondition = (
if (localized) {
return localized;
}
- const stateObj = hass.states[config.entity_id as string];
+ const stateObj = hass.states[config.entity_id as string] as
+ | HassEntity
+ | undefined;
return `${stateObj ? computeStateName(stateObj) : config.entity_id} ${
config.type
}`;
From 5d89563aa581d243a96d96f3d1b5d17cb922e068 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen
Date: Thu, 1 May 2025 08:57:56 -0400
Subject: [PATCH 11/36] Import missing components on init page (#25269)
---
src/layouts/ha-init-page.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/layouts/ha-init-page.ts b/src/layouts/ha-init-page.ts
index 84cd396569..af33535a32 100644
--- a/src/layouts/ha-init-page.ts
+++ b/src/layouts/ha-init-page.ts
@@ -1,6 +1,8 @@
import type { PropertyValues } from "lit";
import { css, html, LitElement } from "lit";
import { property, state } from "lit/decorators";
+import "@material/mwc-button";
+import "../components/ha-spinner";
class HaInitPage extends LitElement {
@property({ type: Boolean }) public error = false;
From fae619085c6e51ea640496f601662d2fb57084d3 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston"
Date: Fri, 2 May 2025 05:46:36 -0500
Subject: [PATCH 12/36] Add my links for the Bluetooth monitors (#25270)
The plan is to link these in the Bluetooth docs for help debugging
---
src/panels/my/ha-panel-my.ts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/panels/my/ha-panel-my.ts b/src/panels/my/ha-panel-my.ts
index 110e540fbb..cd78c52e55 100644
--- a/src/panels/my/ha-panel-my.ts
+++ b/src/panels/my/ha-panel-my.ts
@@ -110,6 +110,14 @@ export const getMyRedirects = (): Redirects => ({
component: "bluetooth",
redirect: "/config/bluetooth",
},
+ bluetooth_advertisement_monitor: {
+ component: "bluetooth",
+ redirect: "/config/bluetooth/advertisement-monitor",
+ },
+ bluetooth_connection_monitor: {
+ component: "bluetooth",
+ redirect: "/config/bluetooth/connection-monitor",
+ },
config_dhcp: {
component: "dhcp",
redirect: "/config/dhcp",
From 32acef8fad77a65c9684dd7b8571a8eb62b3fa1c Mon Sep 17 00:00:00 2001
From: Jan-Philipp Benecke
Date: Fri, 2 May 2025 12:16:04 +0200
Subject: [PATCH 13/36] Add save shortcut to shortcuts dialog (#25271)
---
src/dialogs/shortcuts/dialog-shortcuts.ts | 9 +++++++--
src/translations/en.json | 7 ++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/dialogs/shortcuts/dialog-shortcuts.ts b/src/dialogs/shortcuts/dialog-shortcuts.ts
index 99a3710ba6..dbd85839ae 100644
--- a/src/dialogs/shortcuts/dialog-shortcuts.ts
+++ b/src/dialogs/shortcuts/dialog-shortcuts.ts
@@ -69,12 +69,17 @@ const _SHORTCUTS: Section[] = [
],
},
{
- key: "ui.dialogs.shortcuts.automations.title",
+ key: "ui.dialogs.shortcuts.automation_script.title",
items: [
{
type: "shortcut",
shortcut: [{ key: "ui.dialogs.shortcuts.shortcuts.ctrl_cmd" }, "V"],
- key: "ui.dialogs.shortcuts.automations.paste",
+ key: "ui.dialogs.shortcuts.automation_script.paste",
+ },
+ {
+ type: "shortcut",
+ shortcut: [{ key: "ui.dialogs.shortcuts.shortcuts.ctrl_cmd" }, "S"],
+ key: "ui.dialogs.shortcuts.automation_script.save",
},
],
},
diff --git a/src/translations/en.json b/src/translations/en.json
index c47cd875ad..af02f16e77 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1938,9 +1938,10 @@
"title": "Assist",
"open_assist": "open Assist dialog"
},
- "automations": {
- "title": "Automations",
- "paste": "to paste automation YAML from clipboard to automation editor"
+ "automation_script": {
+ "title": "Automations / Scripts",
+ "paste": "to paste automation/script YAML from clipboard to editor",
+ "save": "to save automation/script"
},
"charts": {
"title": "Charts",
From 358e450e60981efe7110dcb73184f5cc444aff30 Mon Sep 17 00:00:00 2001
From: karwosts <32912880+karwosts@users.noreply.github.com>
Date: Fri, 2 May 2025 06:19:12 -0700
Subject: [PATCH 14/36] Fix disabled language picker (#25278)
---
src/components/ha-language-picker.ts | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/ha-language-picker.ts b/src/components/ha-language-picker.ts
index f771871756..9940b75184 100644
--- a/src/components/ha-language-picker.ts
+++ b/src/components/ha-language-picker.ts
@@ -102,7 +102,7 @@ export class HaLanguagePicker extends LitElement {
localeChanged
) {
this._select.layoutOptions();
- if (this._select.value !== this.value) {
+ if (!this.disabled && this._select.value !== this.value) {
fireEvent(this, "value-changed", { value: this._select.value });
}
if (!this.value) {
@@ -141,7 +141,10 @@ export class HaLanguagePicker extends LitElement {
);
const value =
- this.value ?? (this.required ? languageOptions[0]?.value : this.value);
+ this.value ??
+ (this.required && !this.disabled
+ ? languageOptions[0]?.value
+ : this.value);
return html`
Date: Fri, 2 May 2025 17:47:20 +0300
Subject: [PATCH 15/36] Fix alignment of ha-labeled-slider (#25279)
---
src/components/ha-labeled-slider.ts | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/ha-labeled-slider.ts b/src/components/ha-labeled-slider.ts
index 8a54a14496..483d5aefd6 100644
--- a/src/components/ha-labeled-slider.ts
+++ b/src/components/ha-labeled-slider.ts
@@ -30,8 +30,9 @@ class HaLabeledSlider extends LitElement {
@property({ type: Number }) public value?: number;
protected render() {
+ const title = this._getTitle();
return html`
-
From 44485c0de43bb7e0ab3744120aa73213723d1fe4 Mon Sep 17 00:00:00 2001
From: Paul Bottein ${this._getTitle()}
+ ${title ? html`${title}
` : nothing}
- ${localize( - "ui.panel.config.integrations.config_flow.created_config", - { name: this.step.title } - )} -
` - : html` -
- ${devices.map(
- (device) => html`
-
- `}
+ `
+ : html`
+
-
- `
+ ${devices.length === 0 &&
+ ["options_flow", "repair_flow"].includes(this.flowConfig.flowType)
+ ? nothing
+ : devices.length === 0
+ ? html`
- ${this.step.result?.domain
- ? html`
`
- : nothing}
-
-
- ${device.model || device.manufacturer}
- ${device.model
- ? html`
- ${device.manufacturer}
- `
- : nothing}
-
- + ${localize( + "ui.panel.config.integrations.config_flow.created_config", + { name: this.step.title } )} -
+ ${devices.map(
+ (device) => html`
+
+ `}
+
+ `
+ )}
+
+ ${this.step.result?.domain
+ ? html``
+ : nothing}
+
+
+ ${device.model || device.manufacturer}
+ ${device.model
+ ? html`
+ ${device.manufacturer}
+ `
+ : nothing}
+
+
-
-
- - ${this.hass.localize("ui.panel.config.network.discovery.dhcp_info")} -
-
-
-
- - ${this.hass.localize("ui.panel.config.network.discovery.ssdp_info")} -
-
-
-
- - ${this.hass.localize( - "ui.panel.config.network.discovery.zeroconf_info" - )} -
-
+ ${this.hass.localize(
+ `ui.panel.config.network.discovery.${domain}`
+ )}
+
+
+ ${this.hass.localize(
+ `ui.panel.config.network.discovery.${domain}_info`
+ )}
+
+