Allow to change encryption for each backup location

src/data/backup.ts

@@ -57,6 +57,7 @@ export interface BackupConfig {
     time?: string | null;
     days: BackupDay[];
   };
+  agents: BackupAgentsConfig;
 }
 
 export interface BackupMutableConfig {
@@ -78,20 +79,30 @@ export interface BackupMutableConfig {
     time?: string | null;
     days?: BackupDay[] | null;
   };
+  agents?: BackupAgentsConfig;
+}
+
+export type BackupAgentsConfig = Record<string, BackupAgentConfig>;
+
+export interface BackupAgentConfig {
+  protected: boolean;
 }
 
 export interface BackupAgent {
   agent_id: string;
   name: string;
 }
 
+export interface BackupContentAgent {
+  size: number;
+  protected: boolean;
+}
+
 export interface BackupContent {
   backup_id: string;
   date: string;
   name: string;
-  protected: boolean;
-  size: number;
-  agent_ids?: string[];
+  agents: Record<string, BackupContentAgent>;
   failed_agent_ids?: string[];
   with_automatic_settings: boolean;
 }
@@ -305,6 +316,9 @@ export const computeBackupAgentName = (
   return showName ? `${domainName}: ${name}` : domainName;
 };
 
+export const computeBackupSize = (backup: BackupContent) =>
+  Math.max(...Object.values(backup.agents).map((agent) => agent.size));
+
 export const compareAgents = (a: string, b: string) => {
   const isLocalA = isLocalAgent(a);
   const isLocalB = isLocalAgent(b);

src/panels/config/backup/components/config/ha-backup-config-agents.ts

@@ -1,14 +1,18 @@
-import { mdiHarddisk, mdiNas } from "@mdi/js";
+import { mdiCog, mdiHarddisk, mdiNas } from "@mdi/js";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { computeDomain } from "../../../../../common/entity/compute_domain";
+import "../../../../../components/ha-icon-button";
 import "../../../../../components/ha-md-list";
 import "../../../../../components/ha-md-list-item";
 import "../../../../../components/ha-svg-icon";
 import "../../../../../components/ha-switch";
-import type { BackupAgent } from "../../../../../data/backup";
+import type {
+  BackupAgent,
+  BackupAgentsConfig,
+} from "../../../../../data/backup";
 import {
   CLOUD_AGENT,
   computeBackupAgentName,
@@ -18,6 +22,7 @@ import {
 import type { CloudStatus } from "../../../../../data/cloud";
 import type { HomeAssistant } from "../../../../../types";
 import { brandsUrl } from "../../../../../util/brands-url";
+import { navigate } from "../../../../../common/navigate";
 
 const DEFAULT_AGENTS = [];
 
@@ -29,6 +34,11 @@ class HaBackupConfigAgents extends LitElement {
 
   @property({ attribute: false }) public agents: BackupAgent[] = [];
 
+  @property({ attribute: false }) public agentsConfig?: BackupAgentsConfig;
+
+  @property({ type: Boolean, attribute: "show-settings" }) public showSettings =
+    false;
+
   @state() private value?: string[];
 
   private _availableAgents = memoizeOne(
@@ -53,6 +63,21 @@ class HaBackupConfigAgents extends LitElement {
         "ui.panel.config.backup.agents.cloud_agent_description"
       );
     }
+
+    const encryptionTurnedOff =
+      this.agentsConfig?.[agentId]?.protected === false;
+
+    if (encryptionTurnedOff) {
+      return html`
+        <span class="dot warning"></span>
+        <span>
+          ${this.hass.localize(
+            "ui.panel.config.backup.agents.encryption_turned_off"
+          )}
+        </span>
+      `;
+    }
+
     if (isNetworkMountAgent(agentId)) {
       return this.hass.localize(
         "ui.panel.config.backup.agents.network_mount_agent_description"
@@ -80,6 +105,7 @@ class HaBackupConfigAgents extends LitElement {
                   agentId === CLOUD_AGENT &&
                   this.cloudStatus.logged_in &&
                   !this.cloudStatus.active_subscription;
+
                 return html`
                   <ha-md-list-item>
                     ${isLocalAgent(agentId)
@@ -112,6 +138,16 @@ class HaBackupConfigAgents extends LitElement {
                     ${description
                       ? html`<div slot="supporting-text">${description}</div>`
                       : nothing}
+                    ${this.showSettings
+                      ? html`
+                          <ha-icon-button
+                            id=${agentId}
+                            slot="end"
+                            path=${mdiCog}
+                            @click=${this._showAgentSettings}
+                          ></ha-icon-button>
+                        `
+                      : nothing}
                     <ha-switch
                       slot="end"
                       id=${agentId}
@@ -133,6 +169,11 @@ class HaBackupConfigAgents extends LitElement {
     `;
   }
 
+  private _showAgentSettings(ev): void {
+    const agentId = ev.currentTarget.id;
+    navigate(`/config/backup/location/${agentId}`);
+  }
+
   private _agentToggled(ev) {
     ev.stopPropagation();
     const value = ev.currentTarget.checked;
@@ -180,6 +221,25 @@ class HaBackupConfigAgents extends LitElement {
       --mdc-icon-size: 48px;
       color: var(--primary-text-color);
     }
+    ha-md-list-item [slot="supporting-text"] {
+      display: flex;
+      align-items: center;
+      flex-direction: row;
+      gap: 8px;
+      line-height: normal;
+    }
+    .dot {
+      display: block;
+      position: relative;
+      width: 8px;
+      height: 8px;
+      background-color: var(--disabled-color);
+      border-radius: 50%;
+      flex: none;
+    }
+    .dot.warning {
+      background-color: var(--warning-color);
+    }
   `;
 }
 

src/panels/config/backup/components/overview/ha-backup-overview-backups.ts

@@ -8,7 +8,10 @@ import "../../../../../components/ha-card";
 import "../../../../../components/ha-icon-next";
 import "../../../../../components/ha-md-list";
 import "../../../../../components/ha-md-list-item";
-import type { BackupContent } from "../../../../../data/backup";
+import {
+  computeBackupSize,
+  type BackupContent,
+} from "../../../../../data/backup";
 import { haStyle } from "../../../../../resources/styles";
 import type { HomeAssistant } from "../../../../../types";
 import { bytesToString } from "../../../../../util/bytes-to-string";
@@ -22,7 +25,7 @@ const computeBackupStats = (backups: BackupContent[]): BackupStats =>
   backups.reduce(
     (stats, backup) => {
       stats.count++;
-      stats.size += backup.size;
+      stats.size += computeBackupSize(backup);
       return stats;
     },
     { count: 0, size: 0 }

src/panels/config/backup/components/overview/ha-backup-overview-summary.ts

@@ -179,7 +179,8 @@ class HaBackupOverviewBackups extends LitElement {
                                 now,
                                 true
                               ),
-                              count: lastUploadedBackup.agent_ids?.length ?? 0,
+                              count: Object.keys(lastUploadedBackup.agents)
+                                .length,
                             }
                           )
                         : nextBackupDescription}
@@ -265,7 +266,8 @@ class HaBackupOverviewBackups extends LitElement {
                               now,
                               true
                             ),
-                            count: lastUploadedBackup.agent_ids?.length ?? 0,
+                            count: Object.keys(lastUploadedBackup.agents)
+                              .length,
                           }
                         )
                       : nextBackupDescription}
@@ -286,7 +288,7 @@ class HaBackupOverviewBackups extends LitElement {
           now,
           true
         ),
-        count: lastBackup.agent_ids?.length ?? 0,
+        count: Object.keys(lastBackup.agents).length,
       }
     );
 

src/panels/config/backup/dialogs/dialog-backup-onboarding.ts

@@ -72,6 +72,7 @@ const RECOMMENDED_CONFIG: BackupConfig = {
     time: null,
     days: [],
   },
+  agents: {},
   last_attempted_automatic_backup: null,
   last_completed_automatic_backup: null,
   next_automatic_backup: null,

src/panels/config/backup/dialogs/dialog-restore-backup.ts

@@ -78,7 +78,12 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
     this._error = undefined;
     this._state = undefined;
     this._stage = undefined;
-    if (this._params.backup.protected) {
+
+    const agentIds = Object.keys(this._params.backup.agents);
+    const preferedAgent = getPreferredAgentForDownload(agentIds);
+    const isProtected = this._params.backup.agents[preferedAgent]?.protected;
+
+    if (isProtected) {
       this._backupEncryptionKey = await this._fetchEncryptionKey();
       if (!this._backupEncryptionKey) {
         this._step = STEPS[1];
@@ -322,9 +327,8 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
       return;
     }
 
-    const preferedAgent = getPreferredAgentForDownload(
-      this._params.backup.agent_ids!
-    );
+    const agentIds = Object.keys(this._params.backup.agents);
+    const preferedAgent = getPreferredAgentForDownload(agentIds);
 
     const { addons, database_included, homeassistant_included, folders } =
       this._params.selectedData;

src/panels/config/backup/ha-config-backup-backups.ts

@@ -39,7 +39,9 @@ import type {
   BackupContent,
 } from "../../../data/backup";
 import {
+  compareAgents,
   computeBackupAgentName,
+  computeBackupSize,
   deleteBackup,
   generateBackup,
   generateBackupWithAutomaticSettings,
@@ -68,6 +70,8 @@ import { downloadBackup } from "./helper/download_backup";
 
 interface BackupRow extends DataTableRowData, BackupContent {
   formatted_type: string;
+  size: number;
+  agent_ids: string[];
 }
 
 type BackupType = "automatic" | "manual";
@@ -291,6 +295,8 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
         const type = backup.with_automatic_settings ? "automatic" : "manual";
         return {
           ...backup,
+          size: computeBackupSize(backup),
+          agent_ids: Object.keys(backup.agents).sort(compareAgents),
           formatted_type: localize(`ui.panel.config.backup.type.${type}`),
         };
       });