From fd95ab55180d259eb291610d382857b03dae7d86 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 23 Dec 2024 12:59:05 +0100 Subject: [PATCH 01/10] Revert "Bump softprops/action-gh-release from 2.1.0 to 2.2.0" (#23393) Revert "Bump softprops/action-gh-release from 2.1.0 to 2.2.0 (#23300)" This reverts commit 65458538a70d1e239a998ca3d522714200d757ea. --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 253159226c..4f9f0cea59 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -55,7 +55,7 @@ jobs: script/release - name: Upload release assets - uses: softprops/action-gh-release@v2.2.0 + uses: softprops/action-gh-release@v2.1.0 with: files: | dist/*.whl @@ -107,7 +107,7 @@ jobs: - name: Tar folder run: tar -czf landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz -C landing-page/dist . - name: Upload release asset - uses: softprops/action-gh-release@v2.2.0 + uses: softprops/action-gh-release@v2.1.0 with: files: landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz @@ -136,6 +136,6 @@ jobs: - name: Tar folder run: tar -czf hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz -C hassio/build . - name: Upload release asset - uses: softprops/action-gh-release@v2.2.0 + uses: softprops/action-gh-release@v2.1.0 with: files: hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz From 061b6af81217bf749209f9f88b011f11cd233fc0 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 23 Dec 2024 14:23:51 +0100 Subject: [PATCH 02/10] Fix search bar styling (#23396) --- src/components/ha-outlined-field.ts | 8 -------- src/components/ha-outlined-text-field.ts | 5 +++-- .../integrations/ha-config-integrations-dashboard.ts | 7 ++++--- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/components/ha-outlined-field.ts b/src/components/ha-outlined-field.ts index 88050e7734..694c9e538c 100644 --- a/src/components/ha-outlined-field.ts +++ b/src/components/ha-outlined-field.ts @@ -22,14 +22,6 @@ export class HaOutlinedField extends MdOutlinedField { border-end-start-radius: var(--_container-shape-end-start); border-end-end-radius: var(--_container-shape-end-end); } - .with-start .start { - margin-inline-end: var(--ha-outlined-field-start-margin, 4px); - margin-inline-start: initial; - } - .with-end .end { - margin-inline-start: var(--ha-outlined-field-end-margin, 4px); - margin-inline-end: initial; - } `, ]; } diff --git a/src/components/ha-outlined-text-field.ts b/src/components/ha-outlined-text-field.ts index 757478d0b3..026bce0b25 100644 --- a/src/components/ha-outlined-text-field.ts +++ b/src/components/ha-outlined-text-field.ts @@ -28,8 +28,9 @@ export class HaOutlinedTextField extends MdOutlinedTextField { --md-outlined-field-container-shape-end-end: 10px; --md-outlined-field-container-shape-end-start: 10px; --md-outlined-field-focus-outline-width: 1px; - --ha-outlined-field-start-margin: -4px; - --ha-outlined-field-end-margin: -4px; + --md-outlined-field-with-leading-content-leading-space: 8px; + --md-outlined-field-with-trailing-content-trailing-space: 8px; + --md-outlined-field-content-space: 8px; --mdc-icon-size: var(--md-input-chip-icon-size, 18px); } .input { diff --git a/src/panels/config/integrations/ha-config-integrations-dashboard.ts b/src/panels/config/integrations/ha-config-integrations-dashboard.ts index 3b7c36db92..ffd3a9471f 100644 --- a/src/panels/config/integrations/ha-config-integrations-dashboard.ts +++ b/src/panels/config/integrations/ha-config-integrations-dashboard.ts @@ -436,9 +436,8 @@ class HaConfigIntegrationsDashboard extends SubscribeMixin(LitElement) { > ${this.narrow ? html` -
+
Date: Mon, 23 Dec 2024 14:25:14 +0100 Subject: [PATCH 03/10] Replace "Add" button with "Create" in Create floor / area dialogs (#23395) --- src/panels/config/areas/dialog-area-registry-detail.ts | 2 +- src/panels/config/areas/dialog-floor-registry-detail.ts | 2 +- src/translations/en.json | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts index 59dcedc6f2..ed4051ba98 100644 --- a/src/panels/config/areas/dialog-area-registry-detail.ts +++ b/src/panels/config/areas/dialog-area-registry-detail.ts @@ -173,7 +173,7 @@ class DialogAreaDetail extends LitElement { > ${entry ? this.hass.localize("ui.common.save") - : this.hass.localize("ui.common.add")} + : this.hass.localize("ui.common.create")} `; diff --git a/src/panels/config/areas/dialog-floor-registry-detail.ts b/src/panels/config/areas/dialog-floor-registry-detail.ts index 8b4bf29db4..6929c9ba75 100644 --- a/src/panels/config/areas/dialog-floor-registry-detail.ts +++ b/src/panels/config/areas/dialog-floor-registry-detail.ts @@ -237,7 +237,7 @@ class DialogFloorDetail extends LitElement { > ${entry ? this.hass.localize("ui.common.save") - : this.hass.localize("ui.common.add")} + : this.hass.localize("ui.common.create")} `; diff --git a/src/translations/en.json b/src/translations/en.json index 23a4d33023..660c03b30e 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -348,6 +348,7 @@ "move": "Move", "save": "Save", "add": "Add", + "create": "Create", "edit": "Edit", "submit": "Submit", "rename": "Rename", @@ -2159,7 +2160,7 @@ "edit_floor": "Edit floor", "delete_floor": "Delete floor", "confirm_delete": "Delete floor?", - "confirm_delete_text": "Removing the floor will unassign all areas from it." + "confirm_delete_text": "Deleting the floor will unassign all areas from it." } }, "editor": { From 76cb9ce807b828df21e06e7c7835d192ede7b1ad Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 23 Dec 2024 15:04:19 +0100 Subject: [PATCH 04/10] Change sidebar header color (#23401) --- src/components/ha-sidebar.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts index 01e84f32ca..0420fcc74a 100644 --- a/src/components/ha-sidebar.ts +++ b/src/components/ha-sidebar.ts @@ -871,7 +871,7 @@ class HaSidebar extends SubscribeMixin(LitElement) { border-bottom: 1px solid var(--divider-color); background-color: var( --sidebar-menu-button-background-color, - var(--primary-background-color) + inherit ); font-size: 20px; align-items: center; From 5fb384ad31cd1db3e4b5f6395a70969e8ee4fd1a Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 23 Dec 2024 15:06:36 +0100 Subject: [PATCH 05/10] Backup status banner improvement (#23400) * Improve overdue backups and don't consider backup with failed agents as success * Improve margin and loader * Improve margin * Show agent name if only one off site location is configured --- .../components/ha-backup-summary-card.ts | 5 +- .../components/ha-backup-summary-status.ts | 84 ---------- .../overview/ha-backup-overview-backups.ts | 4 + .../overview/ha-backup-overview-settings.ts | 18 ++- .../overview/ha-backup-overview-summary.ts | 147 ++++++++++++------ .../backup/ha-config-backup-overview.ts | 37 ++--- .../backup/ha-config-backup-settings.ts | 6 + 7 files changed, 141 insertions(+), 160 deletions(-) delete mode 100644 src/panels/config/backup/components/ha-backup-summary-status.ts diff --git a/src/panels/config/backup/components/ha-backup-summary-card.ts b/src/panels/config/backup/components/ha-backup-summary-card.ts index fb894266a7..c03a6733ea 100644 --- a/src/panels/config/backup/components/ha-backup-summary-card.ts +++ b/src/panels/config/backup/components/ha-backup-summary-card.ts @@ -75,6 +75,7 @@ class HaBackupSummaryCard extends LitElement { row-gap: 8px; align-items: center; padding: 16px; + padding-bottom: 8px; width: 100%; box-sizing: border-box; } @@ -145,10 +146,6 @@ class HaBackupSummaryCard extends LitElement { } @media all and (max-width: 550px) { - .summary { - flex-wrap: wrap; - padding: 8px; - } .action { width: 100%; display: flex; diff --git a/src/panels/config/backup/components/ha-backup-summary-status.ts b/src/panels/config/backup/components/ha-backup-summary-status.ts deleted file mode 100644 index 9a5efdd3ba..0000000000 --- a/src/panels/config/backup/components/ha-backup-summary-status.ts +++ /dev/null @@ -1,84 +0,0 @@ -import { differenceInDays } from "date-fns"; -import { html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators"; -import memoizeOne from "memoize-one"; -import { formatShortDateTime } from "../../../../common/datetime/format_date_time"; -import type { BackupContent } from "../../../../data/backup"; -import type { ManagerStateEvent } from "../../../../data/backup_manager"; -import type { HomeAssistant } from "../../../../types"; -import "./ha-backup-summary-card"; - -@customElement("ha-backup-summary-status") -export class HaBackupSummaryProgress extends LitElement { - @property({ attribute: false }) public hass!: HomeAssistant; - - @property({ attribute: false }) public manager!: ManagerStateEvent; - - @property({ attribute: false }) public backups!: BackupContent[]; - - @property({ type: Boolean, attribute: "has-action" }) - public hasAction = false; - - private _lastBackup = memoizeOne((backups: BackupContent[]) => { - const sortedBackups = backups - // eslint-disable-next-line arrow-body-style - .filter((backup) => { - // TODO : only show backups with default flag - return backup.with_automatic_settings; - }) - .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()); - - return sortedBackups[0] as BackupContent | undefined; - }); - - protected render() { - const lastBackup = this._lastBackup(this.backups); - - if (!lastBackup) { - return html` - - - - `; - } - - const lastBackupDate = new Date(lastBackup.date); - const numberOfDays = differenceInDays(new Date(), lastBackupDate); - - // TODO : Improve time format - const description = `Last successful backup ${formatShortDateTime(lastBackupDate, this.hass.locale, this.hass.config)} and synced to ${lastBackup.agent_ids?.length} locations`; - if (numberOfDays > 8) { - return html` - - - - `; - } - return html` - - - - `; - } -} - -declare global { - interface HTMLElementTagNameMap { - "ha-backup-summary-status": HaBackupSummaryProgress; - } -} diff --git a/src/panels/config/backup/components/overview/ha-backup-overview-backups.ts b/src/panels/config/backup/components/overview/ha-backup-overview-backups.ts index 5c44183678..a667e1a4bc 100644 --- a/src/panels/config/backup/components/overview/ha-backup-overview-backups.ts +++ b/src/panels/config/backup/components/overview/ha-backup-overview-backups.ts @@ -109,9 +109,13 @@ class HaBackupOverviewBackups extends LitElement { display: flex; justify-content: flex-end; } + .card-header { + padding-bottom: 8px; + } .card-content { padding-left: 0; padding-right: 0; + padding-bottom: 0; } `, ]; diff --git a/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts b/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts index dc3679f1ba..95ad7f1979 100644 --- a/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts +++ b/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts @@ -10,7 +10,11 @@ import "../../../../../components/ha-md-list"; import "../../../../../components/ha-md-list-item"; import "../../../../../components/ha-svg-icon"; import type { BackupConfig } from "../../../../../data/backup"; -import { BackupScheduleState, isLocalAgent } from "../../../../../data/backup"; +import { + BackupScheduleState, + computeBackupAgentName, + isLocalAgent, +} from "../../../../../data/backup"; import { haStyle } from "../../../../../resources/styles"; import type { HomeAssistant } from "../../../../../types"; @@ -88,6 +92,14 @@ class HaBackupBackupsSummary extends LitElement { ); if (offsiteLocations.length) { + if (offsiteLocations.length === 1) { + const name = computeBackupAgentName( + this.hass.localize, + offsiteLocations[0], + offsiteLocations + ); + return `Upload to ${name}`; + } return `Upload to ${offsiteLocations.length} off-site locations`; } if (hasLocal) { @@ -184,9 +196,13 @@ class HaBackupBackupsSummary extends LitElement { display: flex; justify-content: flex-end; } + .card-header { + padding-bottom: 8px; + } .card-content { padding-left: 0; padding-right: 0; + padding-bottom: 0; } `, ]; diff --git a/src/panels/config/backup/components/overview/ha-backup-overview-summary.ts b/src/panels/config/backup/components/overview/ha-backup-overview-summary.ts index 5882675bf7..cf09d19114 100644 --- a/src/panels/config/backup/components/overview/ha-backup-overview-summary.ts +++ b/src/panels/config/backup/components/overview/ha-backup-overview-summary.ts @@ -1,5 +1,5 @@ import { mdiBackupRestore, mdiCalendar } from "@mdi/js"; -import { differenceInDays, setHours, setMinutes } from "date-fns"; +import { addHours, differenceInDays, setHours, setMinutes } from "date-fns"; import type { CSSResultGroup } from "lit"; import { css, html, LitElement } from "lit"; import { customElement, property } from "lit/decorators"; @@ -17,6 +17,8 @@ import { haStyle } from "../../../../../resources/styles"; import type { HomeAssistant } from "../../../../../types"; import "../ha-backup-summary-card"; +const OVERDUE_MARGIN_HOURS = 3; + @customElement("ha-backup-overview-summary") class HaBackupOverviewBackups extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -25,9 +27,14 @@ class HaBackupOverviewBackups extends LitElement { @property({ attribute: false }) public config!: BackupConfig; + @property({ type: Boolean }) public fetching = false; + private _lastBackup = memoizeOne((backups: BackupContent[]) => { const sortedBackups = backups - .filter((backup) => backup.with_automatic_settings) + .filter( + (backup) => + backup.with_automatic_settings && !backup.failed_agent_ids?.length + ) .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()); return sortedBackups[0] as BackupContent | undefined; @@ -60,6 +67,23 @@ class HaBackupOverviewBackups extends LitElement { } protected render() { + if (this.fetching) { + return html` + + + + + + + + + + + + + `; + } + const lastBackup = this._lastBackup(this.backups); if (!lastBackup) { @@ -75,10 +99,9 @@ class HaBackupOverviewBackups extends LitElement { const lastBackupDate = new Date(lastBackup.date); - const numberOfDays = differenceInDays(new Date(), lastBackupDate); const now = new Date(); - const lastBackupDescription = `Last successful backup ${relativeTime(lastBackupDate, this.hass.locale, now, true)} and synced to ${lastBackup.agent_ids?.length} locations.`; + const lastBackupDescription = `Last successful backup ${relativeTime(lastBackupDate, this.hass.locale, now, true)} and stored to ${lastBackup.agent_ids?.length} locations.`; const nextBackupDescription = this._nextBackupDescription( this.config.schedule.state ); @@ -94,51 +117,62 @@ class HaBackupOverviewBackups extends LitElement { heading=${`Last automatic backup failed`} status="error" > -
    -
  • + + - ${lastAttemptDescription} -
    • -
  • + ${lastAttemptDescription} + + - ${lastBackupDescription} -
    • -
+ ${lastBackupDescription} + + `; } - if (numberOfDays > 0) { + const numberOfDays = differenceInDays( + // Subtract a few hours to avoid showing as overdue if it's just a few hours (e.g. daylight saving) + addHours(now, -OVERDUE_MARGIN_HOURS), + lastBackupDate + ); + + const isOverdue = + (numberOfDays >= 1 && + this.config.schedule.state === BackupScheduleState.DAILY) || + numberOfDays >= 7; + + if (isOverdue) { return html` -
    -
  • + + - ${lastBackupDescription} -
    • -
  • + ${lastBackupDescription} + + - ${nextBackupDescription} -
    • -
+ ${nextBackupDescription} + + `; } return html` -
    -
  • + + - ${lastBackupDescription} -
    • -
  • + ${lastBackupDescription} + + - ${nextBackupDescription} -
    • -
+ ${nextBackupDescription} + + `; } @@ -156,25 +190,6 @@ class HaBackupOverviewBackups extends LitElement { p { margin: 0; } - .list { - display: flex; - flex-direction: column; - gap: 16px; - padding: 8px 24px 24px 24px; - margin: 0; - } - .item { - display: flex; - flex-direction: row; - gap: 16px; - align-items: center; - color: var(--secondary-text-color); - font-size: 14px; - font-style: normal; - font-weight: 400; - line-height: 20px; - letter-spacing: 0.25px; - } ha-svg-icon { flex: none; } @@ -183,6 +198,42 @@ class HaBackupOverviewBackups extends LitElement { justify-content: flex-end; border-top: none; } + ha-md-list { + background: none; + } + ha-md-list-item { + --md-list-item-top-space: 8px; + --md-list-item-bottom-space: 8px; + --md-list-item-one-line-container-height: 40x; + } + span.skeleton { + position: relative; + display: block; + width: 160px; + animation-fill-mode: forwards; + animation-iteration-count: infinite; + animation-name: loading; + animation-timing-function: linear; + animation-duration: 1.2s; + border-radius: 4px; + height: 20px; + background: linear-gradient( + to right, + rgb(247, 249, 250) 8%, + rgb(235, 238, 240) 18%, + rgb(247, 249, 250) 33% + ) + 0% 0% / 936px 104px; + } + + @keyframes loading { + 0% { + background-position: -468px 0; + } + 100% { + background-position: 468px 0; + } + } `, ]; } diff --git a/src/panels/config/backup/ha-config-backup-overview.ts b/src/panels/config/backup/ha-config-backup-overview.ts index b7621ab9f7..40614715a6 100644 --- a/src/panels/config/backup/ha-config-backup-overview.ts +++ b/src/panels/config/backup/ha-config-backup-overview.ts @@ -27,7 +27,6 @@ import "../../../layouts/hass-tabs-subpage-data-table"; import { haStyle } from "../../../resources/styles"; import type { HomeAssistant, Route } from "../../../types"; import "./components/ha-backup-summary-card"; -import "./components/ha-backup-summary-status"; import "./components/overview/ha-backup-overview-backups"; import "./components/overview/ha-backup-overview-onboarding"; import "./components/overview/ha-backup-overview-progress"; @@ -182,31 +181,23 @@ class HaConfigBackupOverview extends LitElement { > ` - : this.fetching + : this._needsOnboarding ? html` - - + ` - : this._needsOnboarding - ? html` - - - ` - : html` - - - `} + : html` + + + `} Date: Mon, 23 Dec 2024 15:06:50 +0100 Subject: [PATCH 06/10] Replace "State" with "Status" for consistency with Entity picker (#23399) The Filters pane for entities contains a "Status" section which gives several options to narrow down the list of entities, including "Disabled". For devices, however, the matching selector is currently labelled "State", although it has "Disabled" as the only choice. This conflicts with the device / entity state definition in HA and is inconsistent, getting worse in translations. --- 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 660c03b30e..b4264f7fb9 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -4359,7 +4359,7 @@ "error_delete": "Error deleting device", "picker": { "search": "Search {number} devices", - "state": "State", + "state": "Status", "bulk_actions": { "move_area": "Move to area", "no_area": "No area", From 97e6313890d45632a5b1b2c684763ec438e5fc78 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 23 Dec 2024 15:08:00 +0100 Subject: [PATCH 07/10] Min height list items backups detail smaller (#23398) --- src/panels/config/backup/ha-config-backup-details.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/config/backup/ha-config-backup-details.ts b/src/panels/config/backup/ha-config-backup-details.ts index 9cb06c1e5c..1bdc57110e 100644 --- a/src/panels/config/backup/ha-config-backup-details.ts +++ b/src/panels/config/backup/ha-config-backup-details.ts @@ -368,6 +368,7 @@ class HaConfigBackupDetails extends LitElement { ha-md-list-item { --md-list-item-leading-space: 0; --md-list-item-trailing-space: 0; + --md-list-item-two-line-container-height: 64px; } ha-md-list-item img { width: 48px; From 6757cda7f05980eae2f678b007607518a1cb633c Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 23 Dec 2024 15:26:18 +0100 Subject: [PATCH 08/10] Text changes backups (#23397) * Text changes backups * Update dialog-change-backup-encryption-key.ts * Update ha-backup-config-agents.ts * Update header margin --------- Co-authored-by: Paul Bottein --- .../config/ha-backup-config-agents.ts | 2 +- .../config/ha-backup-config-data.ts | 4 ++-- .../overview/ha-backup-overview-onboarding.ts | 17 +++++++------- .../dialogs/dialog-backup-onboarding.ts | 23 +++++++++++-------- .../dialog-change-backup-encryption-key.ts | 11 +++++---- .../config/backup/ha-config-backup-details.ts | 14 +++++++---- .../backup/ha-config-backup-settings.ts | 8 +++---- 7 files changed, 44 insertions(+), 35 deletions(-) diff --git a/src/panels/config/backup/components/config/ha-backup-config-agents.ts b/src/panels/config/backup/components/config/ha-backup-config-agents.ts index 925b4f8f2d..2d0504a908 100644 --- a/src/panels/config/backup/components/config/ha-backup-config-agents.ts +++ b/src/panels/config/backup/components/config/ha-backup-config-agents.ts @@ -51,7 +51,7 @@ class HaBackupConfigAgents extends LitElement { private _description(agentId: string) { if (agentId === CLOUD_AGENT) { - return "It stores one backup. The oldest backups are deleted."; + return "Note: It stores only one backup, regardless of your settings."; } if (isNetworkMountAgent(agentId)) { return "Network storage"; diff --git a/src/panels/config/backup/components/config/ha-backup-config-data.ts b/src/panels/config/backup/components/config/ha-backup-config-data.ts index b925cfd93a..bae085447a 100644 --- a/src/panels/config/backup/components/config/ha-backup-config-data.ts +++ b/src/panels/config/backup/components/config/ha-backup-config-data.ts @@ -195,7 +195,7 @@ class HaBackupConfigData extends LitElement { > Media - For example, camera recordings. + This can include large filesize camera recordings. Share folder - Folder that is often used for advanced or older + Folder that is often used by add-ons for advanced or older configurations.
- Set up automatic backups + Set up backups

- Backups are essential to a reliable smart home. They protect your - setup against failures and allows you to quickly have a working - system again. It is recommended to create a daily backup and keep - backups of the last 3 days on two different locations. And one of - them is off-site. + Backups are essential for a reliable smart home. They help protect + the work you've put into setting up your smart home, and if the + worst happens, you can get back up and running quickly. It is + recommended that you create a backup every day. You should keep + three backups in at least two different locations, one of which + should be off-site.

- - Set up automatic backups - + Set up backups
`; diff --git a/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts b/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts index b70ed88102..2a8ff15bf4 100644 --- a/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts +++ b/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts @@ -287,13 +287,14 @@ class DialogBackupOnboarding extends LitElement implements HassDialog { src="/static/images/voice-assistant/hi.png" alt="Casita Home Assistant logo" /> -

Set up your automatic backups

+

Set up backups

- Backups are essential to a reliable smart home. They protect your - setup against failures and allows you to quickly have a working - system again. It is recommended to create a daily backup and keep - backups of the last 3 days on two different locations. And one of - them is off-site. + Backups are essential for a reliable smart home. They help protect + the work you've put into setting up your smart home, and if the + worst happens, you can get back up and running quickly. It is + recommended that you create a backup every day. You should keep + three backups in at least two different locations, one of which + should be off-site.

`; @@ -327,21 +328,23 @@ class DialogBackupOnboarding extends LitElement implements HassDialog { case "setup": return html`

- It is recommended to create a daily backup and keep backups of the - last 3 days on two different locations. And one of them is off-site. + It is recommended that you create a backup every day. You should + keep three backups in at least two different locations, one of which + should be off-site. Once you make your selection, your first backup + will begin.

Recommended settings - Set the proven settings of daily backup. + Backup everything daily, keeping three days of backups Custom settings - Select your own automation, data and locations + Select when, where, and what to backup diff --git a/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts b/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts index ac8ae0bae6..1020083e3a 100644 --- a/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts +++ b/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts @@ -152,7 +152,7 @@ class DialogChangeBackupEncryptionKey extends LitElement implements HassDialog { Download old emergency kit - We recommend to save this encryption key somewhere secure. + We recommend saving this encryption key file somewhere secure. @@ -164,9 +164,10 @@ class DialogChangeBackupEncryptionKey extends LitElement implements HassDialog { case "new": return html`

- All next backups will use the new encryption key. We recommend to - save this key somewhere secure. As you can only restore your data - with the backup encryption key. + Keep this encryption key in a safe place, as you will need it to + access your backup, allowing it to be restored. Either record the + characters below or download them as an emergency kit file. + Encryption keeps your backups private and secure.

${this._newEncryptionKey}

@@ -179,7 +180,7 @@ class DialogChangeBackupEncryptionKey extends LitElement implements HassDialog { Download new emergency kit - We recommend to save this encryption key somewhere secure. + We recommend saving this encryption key file somewhere secure. diff --git a/src/panels/config/backup/ha-config-backup-details.ts b/src/panels/config/backup/ha-config-backup-details.ts index 1bdc57110e..248913fe5e 100644 --- a/src/panels/config/backup/ha-config-backup-details.ts +++ b/src/panels/config/backup/ha-config-backup-details.ts @@ -125,7 +125,8 @@ class HaConfigBackupDetails extends LitElement { : !this._backup ? html`` : html` - + +
Backup
@@ -145,7 +146,8 @@ class HaConfigBackupDetails extends LitElement {
- + +
Select what to restore
 - + +
Locations
${this._agents.map((agent) => { @@ -355,7 +358,7 @@ class HaConfigBackupDetails extends LitElement { margin-bottom: 24px; } .card-content { - padding: 0 20px 8px 20px; + padding: 0 20px; } .card-actions { display: flex; @@ -411,6 +414,9 @@ class HaConfigBackupDetails extends LitElement { .dot.error { background-color: var(--error-color); } + .card-header { + padding-bottom: 8px; + } `; } diff --git a/src/panels/config/backup/ha-config-backup-settings.ts b/src/panels/config/backup/ha-config-backup-settings.ts index 08a03ad889..ad894e6414 100644 --- a/src/panels/config/backup/ha-config-backup-settings.ts +++ b/src/panels/config/backup/ha-config-backup-settings.ts @@ -140,10 +140,10 @@ class HaConfigBackupSettings extends LitElement {
Encryption key

- All your backups are encrypted to keep your data private and - secure. You need this key to restore a backup. It's important - that you don't lose this key, as no one else can restore your - data. + Keep this encryption key in a safe place, as you will need it to + access your backup, allowing it to be restored. Either record + the characters below or download them as an emergency kit file. + Encryption keeps your backups private and secure.

Date: Mon, 23 Dec 2024 15:26:30 +0100 Subject: [PATCH 09/10] Bumped version to 20241223.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a8fa10b8c7..a8d343ca8c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20241223.0" +version = "20241223.1" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 331385794c422a9a5f4fbf5505e0fbc90bf27675 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:30:17 +0100 Subject: [PATCH 10/10] View background settings: Change radio buttons to dropdowns (#23403) --- .../lovelace/editor/view-editor/hui-view-background-editor.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/panels/lovelace/editor/view-editor/hui-view-background-editor.ts b/src/panels/lovelace/editor/view-editor/hui-view-background-editor.ts index 794e78e5a5..58481f5164 100644 --- a/src/panels/lovelace/editor/view-editor/hui-view-background-editor.ts +++ b/src/panels/lovelace/editor/view-editor/hui-view-background-editor.ts @@ -59,6 +59,7 @@ export class HuiViewBackgroundEditor extends LitElement { translation_key: "ui.panel.lovelace.editor.edit_view.background.size", options: ["auto", "cover", "contain"], + mode: "dropdown", }, }, }, @@ -79,6 +80,7 @@ export class HuiViewBackgroundEditor extends LitElement { "bottom center", "bottom right", ], + mode: "dropdown", }, }, }, @@ -89,6 +91,7 @@ export class HuiViewBackgroundEditor extends LitElement { translation_key: "ui.panel.lovelace.editor.edit_view.background.repeat", options: ["repeat", "no-repeat"], + mode: "dropdown", }, }, },