From dcb74ad2ee8d4912616cd44b80312f3d78937d47 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Tue, 21 Jan 2025 13:17:33 +0100 Subject: [PATCH 1/4] Fix backup data picker translations (#23826) --- .../backup/components/ha-backup-data-picker.ts | 16 +++++++++------- src/translations/en.json | 3 ++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/panels/config/backup/components/ha-backup-data-picker.ts b/src/panels/config/backup/components/ha-backup-data-picker.ts index 4b5cfa86df..b4e5fbdcfb 100644 --- a/src/panels/config/backup/components/ha-backup-data-picker.ts +++ b/src/panels/config/backup/components/ha-backup-data-picker.ts @@ -4,6 +4,7 @@ import { mdiFolder, mdiPlayBoxMultiple, mdiPuzzle, + mdiShieldCheck, } from "@mdi/js"; import type { CSSResultGroup, PropertyValues } from "lit"; import { css, html, LitElement, nothing } from "lit"; @@ -36,6 +37,7 @@ const ITEM_ICONS = { database: mdiChartBox, media: mdiPlayBoxMultiple, share: mdiFolder, + ssl: mdiShieldCheck, }; type SelectedItems = { @@ -104,6 +106,8 @@ export class HaBackupDataPicker extends LitElement { return this.hass.localize( "ui.panel.config.backup.data_picker.share_folder" ); + case "ssl": + return this.hass.localize("ui.panel.config.backup.data_picker.ssl"); case "addons/local": return this.hass.localize( "ui.panel.config.backup.data_picker.local_addons" @@ -167,15 +171,14 @@ export class HaBackupDataPicker extends LitElement { }) ); - private _itemChanged(ev: Event) { + private _homeassistantChanged(ev: Event) { const itemValues = this._parseValue(this.value); const checkbox = ev.currentTarget as HaCheckbox; - const section = (checkbox as any).section; if (checkbox.checked) { - itemValues[section].push(checkbox.id); + itemValues.homeassistant.push(checkbox.id); } else { - itemValues[section] = itemValues[section].filter( + itemValues.homeassistant = itemValues.homeassistant.filter( (id) => id !== checkbox.id ); } @@ -262,8 +265,7 @@ export class HaBackupDataPicker extends LitElement { .checked=${selectedItems.homeassistant.includes( item.id )} - .section=${"homeassistant"} - @change=${this._itemChanged} + @change=${this._homeassistantChanged} > ` @@ -279,7 +281,7 @@ export class HaBackupDataPicker extends LitElement { diff --git a/src/translations/en.json b/src/translations/en.json index d0742548db..8991ad874a 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2401,7 +2401,8 @@ "media": "Media", "share_folder": "Share folder", "local_addons": "Local add-ons folder", - "addons": "Add-ons" + "addons": "Add-ons", + "ssl": "SSL certificates" }, "schedule": { "use_automatic_backups": "Use automatic backups", From 7a7c204d74e55ff6b903783e32f337689e990e6c Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Wed, 22 Jan 2025 14:16:35 +0100 Subject: [PATCH 2/4] Fix delete button for state content in iOS (#23839) --- .../entity/ha-entity-state-content-picker.ts | 10 +++------- src/components/ha-selector/ha-selector-select.ts | 3 ++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/components/entity/ha-entity-state-content-picker.ts b/src/components/entity/ha-entity-state-content-picker.ts index b83f490167..2ccc606668 100644 --- a/src/components/entity/ha-entity-state-content-picker.ts +++ b/src/components/entity/ha-entity-state-content-picker.ts @@ -178,7 +178,7 @@ class HaEntityStatePicker extends LitElement { no-style @item-moved=${this._moveItem} .disabled=${this.disabled} - filter="button.trailing.action" + handle-selector="[data-handle]" > ${repeat( @@ -194,13 +194,9 @@ class HaEntityStatePicker extends LitElement { @remove=${this._removeItem} .label=${label} selected + data-handle > - - + ${label} `; diff --git a/src/components/ha-selector/ha-selector-select.ts b/src/components/ha-selector/ha-selector-select.ts index b32c02c6fd..bb5fb989ef 100644 --- a/src/components/ha-selector/ha-selector-select.ts +++ b/src/components/ha-selector/ha-selector-select.ts @@ -156,6 +156,7 @@ export class HaSelectSelector extends LitElement { no-style .disabled=${!this.selector.select.reorder} @item-moved=${this._itemMoved} + handle-selector="[data-handle]" > ${repeat( @@ -171,13 +172,13 @@ export class HaSelectSelector extends LitElement { @remove=${this._removeItem} .label=${label} selected + data-handle > ${this.selector.select?.reorder ? html` ` : nothing} From 77c17861711aa85f3c5bdbdb699af53cf8e7d2fb Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Wed, 22 Jan 2025 15:25:06 +0100 Subject: [PATCH 3/4] Fix delete button for state content in iOS and Android (#23847) --- src/components/entity/ha-entity-state-content-picker.ts | 3 +-- src/components/ha-selector/ha-selector-select.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/entity/ha-entity-state-content-picker.ts b/src/components/entity/ha-entity-state-content-picker.ts index 2ccc606668..2e1e25c988 100644 --- a/src/components/entity/ha-entity-state-content-picker.ts +++ b/src/components/entity/ha-entity-state-content-picker.ts @@ -178,7 +178,7 @@ class HaEntityStatePicker extends LitElement { no-style @item-moved=${this._moveItem} .disabled=${this.disabled} - handle-selector="[data-handle]" + handle-selector="button.primary.action" > ${repeat( @@ -194,7 +194,6 @@ class HaEntityStatePicker extends LitElement { @remove=${this._removeItem} .label=${label} selected - data-handle > ${label} diff --git a/src/components/ha-selector/ha-selector-select.ts b/src/components/ha-selector/ha-selector-select.ts index bb5fb989ef..7e0f9ed52d 100644 --- a/src/components/ha-selector/ha-selector-select.ts +++ b/src/components/ha-selector/ha-selector-select.ts @@ -156,7 +156,7 @@ export class HaSelectSelector extends LitElement { no-style .disabled=${!this.selector.select.reorder} @item-moved=${this._itemMoved} - handle-selector="[data-handle]" + handle-selector="button.primary.action" > ${repeat( @@ -172,7 +172,6 @@ export class HaSelectSelector extends LitElement { @remove=${this._removeItem} .label=${label} selected - data-handle > ${this.selector.select?.reorder ? html` From 243a2ce0e23aeb93830d2ad556d38da82f9123c2 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 23 Jan 2025 16:16:42 +0100 Subject: [PATCH 4/4] Bumped version to 20250109.2 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4a7e60bbf1..c4d13eb16a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20250109.1" +version = "20250109.2" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md"