Improve backup screen and navigation (#22827)

* Add location page

* Start dashboard

* Move list to dashboard

* Add mocked config page

* Fix hardcoded boolean

* Add summary card

* Use new format for BackupAgent

* Use new API

* Rename to ha-backup-summary-card

* Use new api

src/components/ha-circular-progress.ts

@@ -8,7 +8,7 @@ export class HaCircularProgress extends MdCircularProgress {
   @property({ attribute: "aria-label", type: String }) public ariaLabel =
     "Loading";
 
-  @property() public size: "tiny" | "small" | "medium" | "large" = "medium";
+  @property() public size?: "tiny" | "small" | "medium" | "large";
 
   protected updated(changedProps: PropertyValues) {
     super.updated(changedProps);
@@ -21,7 +21,6 @@ export class HaCircularProgress extends MdCircularProgress {
         case "small":
           this.style.setProperty("--md-circular-progress-size", "28px");
           break;
-        // medium is default size
         case "medium":
           this.style.setProperty("--md-circular-progress-size", "48px");
           break;

src/data/backup.ts

@@ -1,40 +1,44 @@
 import type { HomeAssistant } from "../types";
 
-interface BackupSyncAgent {
+export interface BackupAgent {
-  id: string;
+  agent_id: string;
 }
 
-interface BaseBackupContent {
+export interface BackupContent {
   slug: string;
   date: string;
   name: string;
+  protected: boolean;
   size: number;
   agents?: string[];
 }
 
-export interface BackupContent extends BaseBackupContent {
+export interface BackupInfo {
-  path?: string;
-}
-
-export interface BackupSyncedContent extends BaseBackupContent {
-  id: string;
-  agent_id: string;
-}
-
-export interface BackupData {
-  backing_up: boolean;
   backups: BackupContent[];
+  backing_up: boolean;
+}
+
+export interface BackupDetails {
+  backup: BackupContent;
 }
 
 export interface BackupAgentsInfo {
-  agents: BackupSyncAgent[];
+  agents: BackupAgent[];
-  syncing: boolean;
 }
 
+export type GenerateBackupParams = {
+  agent_ids: string[];
+  database_included?: boolean;
+  folders_included?: string[];
+  addons_included?: string[];
+  name?: string;
+  password?: string;
+};
+
 export const getBackupDownloadUrl = (slug: string) =>
   `/api/backup/download/${slug}`;
 
-export const fetchBackupInfo = (hass: HomeAssistant): Promise<BackupData> =>
+export const fetchBackupInfo = (hass: HomeAssistant): Promise<BackupInfo> =>
   hass.callWS({
     type: "backup/info",
   });
@@ -42,7 +46,7 @@ export const fetchBackupInfo = (hass: HomeAssistant): Promise<BackupData> =>
 export const fetchBackupDetails = (
   hass: HomeAssistant,
   slug: string
-): Promise<{ backup: BackupContent }> =>
+): Promise<BackupDetails> =>
   hass.callWS({
     type: "backup/details",
     slug,
@@ -55,13 +59,6 @@ export const fetchBackupAgentsInfo = (
     type: "backup/agents/info",
   });
 
-export const fetchBackupAgentsSynced = (
-  hass: HomeAssistant
-): Promise<BackupSyncedContent[]> =>
-  hass.callWS({
-    type: "backup/agents/synced",
-  });
-
 export const removeBackup = (
   hass: HomeAssistant,
   slug: string
@@ -71,9 +68,13 @@ export const removeBackup = (
     slug,
   });
 
-export const generateBackup = (hass: HomeAssistant): Promise<BackupContent> =>
+export const generateBackup = (
+  hass: HomeAssistant,
+  params: GenerateBackupParams
+): Promise<{ slug: string }> =>
   hass.callWS({
     type: "backup/generate",
+    ...params,
   });
 
 export const uploadBackup = async (

src/dialogs/backup/dialog-backup-upload.ts

@@ -6,6 +6,7 @@ import { fireEvent } from "../../common/dom/fire_event";
 import "../../components/ha-alert";
 import "../../components/ha-file-upload";
 import "../../components/ha-header-bar";
+import "../../components/ha-dialog";
 import "../../components/ha-icon-button";
 import { uploadBackup } from "../../data/backup";
 import { haStyleDialog } from "../../resources/styles";

src/layouts/hass-tabs-subpage-data-table.ts

@@ -456,6 +456,7 @@ export class HaTabsSubpageDataTable extends LitElement {
                 ${!this.narrow
                   ? html`
                       <div slot="header">
+                        <slot name="top_header"></slot>
                         <slot name="header">
                           <div class="table-header">
                             ${this.hasFilters && !this.showFilters

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

@@ -0,0 +1,149 @@
+import {
+  mdiAlertCircleCheckOutline,
+  mdiAlertOutline,
+  mdiCheck,
+  mdiInformationOutline,
+  mdiSync,
+} from "@mdi/js";
+import { css, html, LitElement, nothing } from "lit";
+import { customElement, property } from "lit/decorators";
+import "../../../../components/ha-button";
+import "../../../../components/ha-card";
+import "../../../../components/ha-circular-progress";
+import "../../../../components/ha-icon";
+
+type SummaryStatus = "success" | "error" | "info" | "warning" | "loading";
+
+const ICONS: Record<SummaryStatus, string> = {
+  success: mdiCheck,
+  error: mdiAlertCircleCheckOutline,
+  warning: mdiAlertOutline,
+  info: mdiInformationOutline,
+  loading: mdiSync,
+};
+
+@customElement("ha-backup-summary-card")
+class HaBackupSummaryCard extends LitElement {
+  @property()
+  public title!: string;
+
+  @property()
+  public description!: string;
+
+  @property({ type: Boolean, attribute: "has-action" })
+  public hasAction = false;
+
+  @property()
+  private status: SummaryStatus = "info";
+
+  render() {
+    return html`
+      <ha-card outlined>
+        <div class="summary">
+          ${this.status === "loading"
+            ? html`<ha-circular-progress indeterminate></ha-circular-progress>`
+            : html`
+                <div class="icon ${this.status}">
+                  <ha-svg-icon .path=${ICONS[this.status]}></ha-svg-icon>
+                </div>
+              `}
+
+          <div class="content">
+            <p class="title">${this.title}</p>
+            <p class="description">${this.description}</p>
+          </div>
+          ${this.hasAction
+            ? html`
+                <div class="action">
+                  <slot name="action"></slot>
+                </div>
+              `
+            : nothing}
+        </div>
+      </ha-card>
+    `;
+  }
+
+  static styles = css`
+    .summary {
+      display: flex;
+      flex-direction: row;
+      gap: 16px;
+      align-items: center;
+      padding: 20px;
+      width: 100%;
+      box-sizing: border-box;
+    }
+    .icon {
+      position: relative;
+      border-radius: 20px;
+      width: 40px;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      overflow: hidden;
+      --icon-color: var(--primary-color);
+    }
+    .icon.success {
+      --icon-color: var(--success-color);
+    }
+    .icon.warning {
+      --icon-color: var(--warning-color);
+    }
+    .icon.error {
+      --icon-color: var(--error-color);
+    }
+    .icon::before {
+      display: block;
+      content: "";
+      position: absolute;
+      inset: 0;
+      background-color: var(--icon-color, var(--primary-color));
+      opacity: 0.2;
+    }
+    .icon ha-svg-icon {
+      color: var(--icon-color, var(--primary-color));
+      width: 24px;
+      height: 24px;
+    }
+    ha-circular-progress {
+      --md-circular-progress-size: 40px;
+    }
+    .content {
+      display: flex;
+      flex-direction: column;
+      flex: 1;
+      min-width: 0;
+    }
+    .title {
+      font-size: 22px;
+      font-style: normal;
+      font-weight: 400;
+      line-height: 28px;
+      color: var(--primary-text-color);
+      margin: 0;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
+    .description {
+      font-size: 14px;
+      font-style: normal;
+      font-weight: 400;
+      line-height: 20px;
+      letter-spacing: 0.25px;
+      color: var(--secondary-text-color);
+      margin: 0;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-backup-summary-card": HaBackupSummaryCard;
+  }
+}

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

@@ -0,0 +1,132 @@
+import type { TemplateResult } from "lit";
+import { css, html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators";
+import "../../../components/ha-card";
+import "../../../components/ha-settings-row";
+import "../../../components/ha-switch";
+import "../../../components/ha-select";
+import "../../../components/ha-button";
+import "../../../components/ha-list-item";
+import "../../../layouts/hass-subpage";
+import type { HomeAssistant } from "../../../types";
+
+@customElement("ha-config-backup-automatic-config")
+class HaConfigBackupAutomaticConfig extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ type: Boolean }) public narrow = false;
+
+  protected render(): TemplateResult {
+    return html`
+      <hass-subpage
+        back-path="/config/backup"
+        .hass=${this.hass}
+        .narrow=${this.narrow}
+        .header=${"Automatic backups"}
+      >
+        <div class="content">
+          <ha-card>
+            <div class="card-header">Automation</div>
+            <div class="card-content">
+              <ha-settings-row>
+                <span slot="heading">Schedule</span>
+                <span slot="description">
+                  How often you want to create a backup.
+                </span>
+                <ha-select naturalMenuWidth>
+                  <ha-list-item>Daily at 02:00</ha-list-item>
+                </ha-select>
+              </ha-settings-row>
+              <ha-settings-row>
+                <span slot="heading">Maximum copies</span>
+                <span slot="description">
+                  The number of backups that are saved
+                </span>
+                <ha-select naturalMenuWidth>
+                  <ha-list-item>Latest 3 copies</ha-list-item>
+                </ha-select>
+              </ha-settings-row>
+              <ha-settings-row>
+                <span slot="heading">Locations</span>
+                <span slot="description">
+                  What locations you want to automatically backup to.
+                </span>
+                <ha-button> Configure </ha-button>
+              </ha-settings-row>
+              <ha-settings-row>
+                <span slot="heading">Password</span>
+                <span slot="description">
+                  Automatic backups are protected with this password
+                </span>
+                <ha-switch></ha-switch>
+              </ha-settings-row>
+              <ha-settings-row>
+                <span slot="heading">Custom backup name</span>
+                <span slot="description">
+                  By default it will use the date and description (2024-07-05
+                  Automatic backup).
+                </span>
+                <ha-switch></ha-switch>
+              </ha-settings-row>
+            </div>
+          </ha-card>
+          <ha-card>
+            <div class="card-header">Backup data</div>
+            <div class="card-content">
+              <ha-settings-row>
+                <span slot="heading">
+                  Home Assistant settings is always included
+                </span>
+                <span slot="description">
+                  With these settings you are able to restore your system.
+                </span>
+                <ha-button>Learn more</ha-button>
+              </ha-settings-row>
+              <ha-settings-row>
+                <span slot="heading">History</span>
+                <span slot="description">
+                  For example of your energy dashboard.
+                </span>
+                <ha-switch></ha-switch>
+              </ha-settings-row>
+              <ha-settings-row>
+                <span slot="heading">Media</span>
+                <span slot="description">For example camera recordings.</span>
+                <ha-switch></ha-switch>
+              </ha-settings-row>
+              <ha-settings-row>
+                <span slot="heading">Add-ons</span>
+                <span slot="description">
+                  Select what add-ons you want to backup.
+                </span>
+                <ha-select naturalMenuWidth>
+                  <ha-list-item>All, including new (4)</ha-list-item>
+                </ha-select>
+              </ha-settings-row>
+            </div>
+          </ha-card>
+        </div>
+      </hass-subpage>
+    `;
+  }
+
+  static styles = css`
+    .content {
+      padding: 28px 20px 0;
+      max-width: 690px;
+      margin: 0 auto;
+      gap: 24px;
+      display: flex;
+      flex-direction: column;
+    }
+    .card-content {
+      padding: 0;
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-config-backup-automatic-config": HaConfigBackupAutomaticConfig;
+  }
+}

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

@@ -1,19 +1,35 @@
-import "@material/mwc-list/mwc-list";
+import { mdiPlus } from "@mdi/js";
-import type { TemplateResult } from "lit";
+import type { PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import memoizeOne from "memoize-one";
+import { relativeTime } from "../../../common/datetime/relative_time";
+import { navigate } from "../../../common/navigate";
+import type { LocalizeFunc } from "../../../common/translations/localize";
+import type {
+  DataTableColumnContainer,
+  RowClickedEvent,
+} from "../../../components/data-table/ha-data-table";
 import "../../../components/ha-button";
 import "../../../components/ha-card";
+import "../../../components/ha-fab";
 import "../../../components/ha-icon";
 import "../../../components/ha-icon-next";
-import "../../../components/ha-list-item";
+import "../../../components/ha-svg-icon";
-import "../../../layouts/hass-subpage";
+import {
-
+  fetchBackupInfo,
-import { navigate } from "../../../common/navigate";
+  generateBackup,
-import { fetchBackupAgentsInfo } from "../../../data/backup";
+  type BackupContent,
+} from "../../../data/backup";
+import "../../../layouts/hass-tabs-subpage-data-table";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
-import type { HomeAssistant } from "../../../types";
+import type { HomeAssistant, Route } from "../../../types";
 import { brandsUrl } from "../../../util/brands-url";
+import {
+  showAlertDialog,
+  showConfirmationDialog,
+} from "../../lovelace/custom-card-helpers";
+import "./components/ha-backup-summary-card";
 
 @customElement("ha-config-backup-dashboard")
 class HaConfigBackupDashboard extends SubscribeMixin(LitElement) {
@@ -21,151 +37,194 @@ class HaConfigBackupDashboard extends SubscribeMixin(LitElement) {
 
   @property({ type: Boolean }) public narrow = false;
 
-  @state() private _agents: { id: string }[] = [];
+  @property({ attribute: false }) public route!: Route;
 
-  protected firstUpdated(changedProps) {
+  @state() private _backingUp = false;
-    super.firstUpdated(changedProps);
+
-    this._fetchAgents();
+  @state() private _backups: BackupContent[] = [];
-  }
+
+  private _columns = memoizeOne(
+    (localize: LocalizeFunc): DataTableColumnContainer<BackupContent> => ({
+      name: {
+        title: localize("ui.panel.config.backup.name"),
+        main: true,
+        sortable: true,
+        filterable: true,
+        flex: 2,
+        template: (backup) => backup.name,
+      },
+      size: {
+        title: localize("ui.panel.config.backup.size"),
+        filterable: true,
+        sortable: true,
+        template: (backup) => Math.ceil(backup.size * 10) / 10 + " MB",
+      },
+      date: {
+        title: localize("ui.panel.config.backup.created"),
+        direction: "desc",
+        filterable: true,
+        sortable: true,
+        template: (backup) =>
+          relativeTime(new Date(backup.date), this.hass.locale),
+      },
+      locations: {
+        title: "Locations",
+        template: (backup) =>
+          html`${(backup.agents || []).map((agent) => {
+            const [domain, name] = agent.split(".");
+            return html`
+              <img
+                title=${name}
+                .src=${brandsUrl({
+                  domain,
+                  type: "icon",
+                  useFallback: true,
+                  darkOptimized: this.hass.themes?.darkMode,
+                })}
+                height="24"
+                crossorigin="anonymous"
+                referrerpolicy="no-referrer"
+                alt=${name}
+                slot="graphic"
+              />
+            `;
+          })}`,
+      },
+    })
+  );
 
   protected render(): TemplateResult {
     return html`
-      <hass-subpage
+      <hass-tabs-subpage-data-table
-        back-path="/config/system"
+        hasFab
+        .tabs=${[
+          {
+            translationKey: "ui.panel.config.backup.caption",
+            path: `/config/backup/list`,
+          },
+        ]}
         .hass=${this.hass}
         .narrow=${this.narrow}
-        .header=${this.hass.localize("ui.panel.config.backup.caption")}
+        back-path="/config/system"
+        clickable
+        id="slug"
+        .route=${this.route}
+        @row-click=${this._showBackupDetails}
+        .columns=${this._columns(this.hass.localize)}
+        .data=${this._backups ?? []}
+        .noDataText=${this.hass.localize("ui.panel.config.backup.no_backups")}
+        .searchLabel=${this.hass.localize(
+          "ui.panel.config.backup.picker.search"
+        )}
       >
-        <div class="content">
+        <div slot="top_header" class="header">
-          <div class="backup-status">
+          <ha-backup-summary-card
-            <ha-card outlined>
+            title="Automatically backed up"
-              <div class="card-content">
+            description="Your configuration has been backed up."
-                <div class="backup-status-contents">
+            has-action
-                  <div class="status-icon">
+            .status=${this._backingUp ? "loading" : "success"}
-                    <ha-icon icon="mdi:check-circle"></ha-icon>
+          >
-                  </div>
+            <ha-button slot="action" @click=${this._configureAutomaticBackup}>
-                  <span>
+              Configure
-                    <div class="status-header">Backed up</div>
+            </ha-button>
-                    <div class="status-text">
+          </ha-backup-summary-card>
-                      Your configuration has been backed up.
+          <ha-backup-summary-card
-                    </div>
+            title="3 automatic backup locations"
-                  </span>
+            description="One is off-site"
-                </div>
+            has-action
-                <ha-button
+            .status=${"success"}
-                  @click=${this._showBackupList}
+          >
-                  class="show-all-backups"
+            <ha-button slot="action" @click=${this._configureBackupLocations}>
-                >
+              Configure
-                  Show all backups
+            </ha-button>
-                </ha-button>
+          </ha-backup-summary-card>
-              </div>
-            </ha-card>
-          </div>
-          <div class="backup-agents">
-            <ha-card outlined>
-              <div class="card-content">
-                <div class="status-header">Locations</div>
-                <div class="status-text">
-                  To keep your data safe it is recommended your backups is at
-                  least on two different locations and one of them is off-site.
-                </div>
-                ${this._agents.length > 0
-                  ? html`<mwc-list>
-                      ${this._agents.map((agent) => {
-                        const [domain, name] = agent.id.split(".");
-                        return html` <ha-list-item
-                          graphic="medium"
-                          hasMeta
-                          .agent=${agent.id}
-                          @click=${this._showAgentSyncs}
-                        >
-                          <img
-                            .src=${brandsUrl({
-                              domain,
-                              type: "icon",
-                              useFallback: true,
-                              darkOptimized: this.hass.themes?.darkMode,
-                            })}
-                            crossorigin="anonymous"
-                            referrerpolicy="no-referrer"
-                            alt="cloud"
-                            slot="graphic"
-                          />
-                          <span>
-                            ${this.hass.localize(`component.${domain}.title`) ||
-                            domain}:
-                            ${name}
-                          </span>
-                          <ha-icon-next slot="meta"></ha-icon-next>
-                        </ha-list-item>`;
-                      })}
-                    </mwc-list>`
-                  : html`<p>No sync agents configured</p>`}
-              </div>
-            </ha-card>
-          </div>
         </div>
-      </hass-subpage>
+        <ha-fab
+          slot="fab"
+          ?disabled=${this._backingUp}
+          .label=${this.hass.localize("ui.panel.config.backup.create_backup")}
+          extended
+          @click=${this._generateBackup}
+        >
+          <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
+        </ha-fab>
+      </hass-tabs-subpage-data-table>
     `;
   }
 
-  private async _fetchAgents() {
+  protected firstUpdated(changedProps: PropertyValues) {
-    const resp = await fetchBackupAgentsInfo(this.hass);
+    super.firstUpdated(changedProps);
-    this._agents = resp.agents;
+    this._fetchBackupInfo();
   }
 
-  private _showBackupList(): void {
+  private async _fetchBackupInfo() {
-    navigate("/config/backup/list");
+    const info = await fetchBackupInfo(this.hass);
+    this._backups = info.backups;
+    this._backingUp = info.backing_up;
   }
 
-  private _showAgentSyncs(event: Event): void {
+  private async _generateBackup(): Promise<void> {
-    const agent = (event.currentTarget as any).agent;
+    const confirm = await showConfirmationDialog(this, {
-    navigate(`/config/backup/list?agent=${agent}`);
+      title: this.hass.localize("ui.panel.config.backup.create.title"),
+      text: this.hass.localize("ui.panel.config.backup.create.description"),
+      confirmText: this.hass.localize("ui.panel.config.backup.create.confirm"),
+    });
+    if (!confirm) {
+      return;
+    }
+
+    try {
+      await generateBackup(this.hass, {
+        agent_ids: ["backup.local"],
+      });
+    } catch (err) {
+      showAlertDialog(this, { text: (err as Error).message });
+    }
+
+    await this._fetchBackupInfo();
+
+    // Todo subscribe for status updates instead of polling
+    const interval = setInterval(async () => {
+      await this._fetchBackupInfo();
+      if (!this._backingUp) {
+        clearInterval(interval);
+      }
+    }, 2000);
+  }
+
+  private _showBackupDetails(ev: CustomEvent): void {
+    const slug = (ev.detail as RowClickedEvent).id;
+    navigate(`/config/backup/details/${slug}`);
+  }
+
+  private _configureAutomaticBackup() {
+    navigate("/config/backup/automatic-config");
+  }
+
+  private _configureBackupLocations() {
+    navigate("/config/backup/locations");
   }
 
   static styles = css`
-    .content {
+    .header {
-      padding: 28px 20px 0;
+      padding: 16px 16px 0 16px;
-      max-width: 690px;
-      margin: 0 auto;
-      gap: 24px;
-      display: grid;
-    }
-
-    .backup-status .card-content {
       display: flex;
       flex-direction: row;
-      justify-content: space-between;
+      gap: 16px;
+      background-color: var(--primary-background-color);
+    }
+    @media (max-width: 1000px) {
+      .header {
+        flex-direction: column;
+      }
+    }
+    .header > * {
+      flex: 1;
+      min-width: 0;
     }
 
-    .backup-status-contents {
+    ha-fab[disabled] {
-      display: flex;
+      --mdc-theme-secondary: var(--disabled-text-color) !important;
-      flex-direction: row;
-    }
-
-    .status-icon {
-      color: var(--success-color);
-      height: 100%;
-      align-content: center;
-    }
-
-    .status-icon ha-icon {
-      --mdc-icon-size: 40px;
-      padding: 8px 16px 8px 8px;
-    }
-
-    .status-header {
-      font-size: 22px;
-      line-height: 28px;
-    }
-
-    .status-text {
-      font-size: 14px;
-      line-height: 20px;
-      color: var(--secondary-text-color);
-    }
-
-    ha-button.show-all-backups {
-      align-items: center;
     }
   `;
 }

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

@@ -43,7 +43,7 @@ class HaConfigBackupDetails extends LitElement {
     }
     return html`
       <hass-subpage
-        back-path="/config/backup/list"
+        back-path="/config/backup"
         .hass=${this.hass}
         .narrow=${this.narrow}
         .header=${this._backup?.name || "Backup"}

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

@@ -1,240 +0,0 @@
-import { mdiPlus } from "@mdi/js";
-import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
-import { LitElement, css, html } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoize from "memoize-one";
-import { relativeTime } from "../../../common/datetime/relative_time";
-import { navigate } from "../../../common/navigate";
-import type { LocalizeFunc } from "../../../common/translations/localize";
-import type {
-  DataTableColumnContainer,
-  RowClickedEvent,
-} from "../../../components/data-table/ha-data-table";
-import "../../../components/ha-circular-progress";
-import "../../../components/ha-fab";
-import "../../../components/ha-icon";
-import "../../../components/ha-svg-icon";
-import type { BackupContent, BackupData } from "../../../data/backup";
-import {
-  fetchBackupAgentsSynced,
-  fetchBackupInfo,
-  generateBackup,
-} from "../../../data/backup";
-import {
-  showAlertDialog,
-  showConfirmationDialog,
-} from "../../../dialogs/generic/show-dialog-box";
-import "../../../layouts/hass-loading-screen";
-import "../../../layouts/hass-tabs-subpage-data-table";
-import type { HomeAssistant, Route } from "../../../types";
-import { brandsUrl } from "../../../util/brands-url";
-
-const localAgent = "backup.local";
-
-@customElement("ha-config-backup-list")
-class HaConfigBackup extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ type: Boolean }) public isWide = false;
-
-  @property({ type: Boolean }) public narrow = false;
-
-  @property({ attribute: false }) public route!: Route;
-
-  @state() private _backupData?: BackupData;
-
-  private _columns = memoize(
-    (
-      narrow,
-      _language,
-      localize: LocalizeFunc
-    ): DataTableColumnContainer<BackupContent> => ({
-      name: {
-        title: localize("ui.panel.config.backup.name"),
-        main: true,
-        sortable: true,
-        filterable: true,
-        flex: 2,
-        template: (backup) =>
-          narrow || !backup.path
-            ? backup.name
-            : html`${backup.name}
-                <div class="secondary">${backup.path}</div>`,
-      },
-      path: {
-        title: localize("ui.panel.config.backup.path"),
-        hidden: !narrow,
-        template: (backup) => backup.path || "-",
-      },
-      size: {
-        title: localize("ui.panel.config.backup.size"),
-        filterable: true,
-        sortable: true,
-        template: (backup) => Math.ceil(backup.size * 10) / 10 + " MB",
-      },
-      date: {
-        title: localize("ui.panel.config.backup.created"),
-        direction: "desc",
-        filterable: true,
-        sortable: true,
-        template: (backup) =>
-          relativeTime(new Date(backup.date), this.hass.locale),
-      },
-      locations: {
-        title: "Locations",
-        template: (backup) =>
-          html`${[
-            ...(backup.path ? [localAgent] : []),
-            ...(backup.agents || []).sort(),
-          ].map((agent) => {
-            const [domain, name] = agent.split(".");
-            return html`<img
-              title=${name}
-              .src=${brandsUrl({
-                domain,
-                type: "icon",
-                useFallback: true,
-                darkOptimized: this.hass.themes?.darkMode,
-              })}
-              height="24"
-              crossorigin="anonymous"
-              referrerpolicy="no-referrer"
-              alt=${name}
-              slot="graphic"
-            />`;
-          })}`,
-      },
-    })
-  );
-
-  private _getItems = memoize((backupItems: BackupContent[]) =>
-    backupItems.map((backup) => ({
-      name: backup.name,
-      slug: backup.slug,
-      date: backup.date,
-      size: backup.size,
-      path: backup.path,
-      agents: backup.agents,
-    }))
-  );
-
-  protected render(): TemplateResult {
-    if (!this.hass || this._backupData === undefined) {
-      return html`<hass-loading-screen></hass-loading-screen>`;
-    }
-
-    return html`
-      <hass-tabs-subpage-data-table
-        hasFab
-        .tabs=${[
-          {
-            translationKey: "ui.panel.config.backup.caption",
-            path: `/config/backup/list`,
-          },
-        ]}
-        .hass=${this.hass}
-        .narrow=${this.narrow}
-        back-path="/config/backup/dashboard"
-        clickable
-        id="slug"
-        .route=${this.route}
-        @row-click=${this._showBackupDetails}
-        .columns=${this._columns(
-          this.narrow,
-          this.hass.language,
-          this.hass.localize
-        )}
-        .data=${this._getItems(this._backupData.backups)}
-        .noDataText=${this.hass.localize("ui.panel.config.backup.no_backups")}
-        .searchLabel=${this.hass.localize(
-          "ui.panel.config.backup.picker.search"
-        )}
-      >
-        <ha-fab
-          slot="fab"
-          ?disabled=${this._backupData.backing_up}
-          .label=${this._backupData.backing_up
-            ? this.hass.localize("ui.panel.config.backup.creating_backup")
-            : this.hass.localize("ui.panel.config.backup.create_backup")}
-          extended
-          @click=${this._generateBackup}
-        >
-          ${this._backupData.backing_up
-            ? html`<ha-circular-progress
-                slot="icon"
-                indeterminate
-              ></ha-circular-progress>`
-            : html`<ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>`}
-        </ha-fab>
-      </hass-tabs-subpage-data-table>
-    `;
-  }
-
-  protected firstUpdated(changedProps: PropertyValues) {
-    super.firstUpdated(changedProps);
-    this._getBackups();
-  }
-
-  private async _getBackups(): Promise<void> {
-    const backupData: Record<string, BackupContent> = {};
-    const [local, synced] = await Promise.all([
-      fetchBackupInfo(this.hass),
-      fetchBackupAgentsSynced(this.hass),
-    ]);
-
-    for (const backup of local.backups) {
-      backupData[backup.slug] = backup;
-    }
-    for (const agent of synced) {
-      if (!(agent.slug in backupData)) {
-        backupData[agent.slug] = { ...agent, agents: [agent.agent_id] };
-      } else if (!("agents" in backupData[agent.slug])) {
-        backupData[agent.slug].agents = [agent.agent_id];
-      } else {
-        backupData[agent.slug].agents!.push(agent.agent_id);
-      }
-    }
-    this._backupData = {
-      backing_up: local.backing_up,
-      backups: Object.values(backupData),
-    };
-  }
-
-  private async _generateBackup(): Promise<void> {
-    const confirm = await showConfirmationDialog(this, {
-      title: this.hass.localize("ui.panel.config.backup.create.title"),
-      text: this.hass.localize("ui.panel.config.backup.create.description"),
-      confirmText: this.hass.localize("ui.panel.config.backup.create.confirm"),
-    });
-    if (!confirm) {
-      return;
-    }
-
-    generateBackup(this.hass)
-      .then(() => this._getBackups())
-      .catch((err) => showAlertDialog(this, { text: (err as Error).message }));
-
-    await this._getBackups();
-  }
-
-  private _showBackupDetails(ev: CustomEvent): void {
-    const slug = (ev.detail as RowClickedEvent).id;
-    navigate(`/config/backup/details/${slug}`);
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      css`
-        ha-fab[disabled] {
-          --mdc-theme-secondary: var(--disabled-text-color) !important;
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-config-backup-list": HaConfigBackup;
-  }
-}

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

@@ -0,0 +1,136 @@
+import type { TemplateResult } from "lit";
+import { css, html, LitElement } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import "../../../components/ha-card";
+import "../../../components/ha-icon-next";
+import "../../../components/ha-md-list";
+import "../../../components/ha-md-list-item";
+import type { BackupAgent } from "../../../data/backup";
+import { fetchBackupAgentsInfo } from "../../../data/backup";
+import "../../../layouts/hass-subpage";
+import type { HomeAssistant } from "../../../types";
+import { brandsUrl } from "../../../util/brands-url";
+
+@customElement("ha-config-backup-locations")
+class HaConfigBackupLocations extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ type: Boolean }) public narrow = false;
+
+  @state() private _agents: BackupAgent[] = [];
+
+  protected firstUpdated(changedProps) {
+    super.firstUpdated(changedProps);
+    this._fetchAgents();
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      <hass-subpage
+        back-path="/config/backup"
+        .hass=${this.hass}
+        .narrow=${this.narrow}
+        .header=${this.hass.localize("ui.panel.config.backup.caption")}
+      >
+        <div class="content">
+          <div class="header">
+            <h2 class="title">Locations</h2>
+            <p class="description">
+              To keep your data safe it is recommended your backups is at least
+              on two different locations and one of them is off-site.
+            </p>
+          </div>
+          <ha-card class="agents">
+            <div class="card-content">
+              ${this._agents.length > 0
+                ? html`
+                    <ha-md-list>
+                      ${this._agents.map((agent) => {
+                        const [domain, name] = agent.agent_id.split(".");
+                        const domainName =
+                          this.hass.localize(`component.${domain}.title`) ||
+                          domain;
+                        return html`
+                          <ha-md-list-item
+                            type="link"
+                            href="/config/backup/locations/${agent.agent_id}"
+                          >
+                            <img
+                              .src=${brandsUrl({
+                                domain,
+                                type: "icon",
+                                useFallback: true,
+                                darkOptimized: this.hass.themes?.darkMode,
+                              })}
+                              crossorigin="anonymous"
+                              referrerpolicy="no-referrer"
+                              alt=""
+                              slot="start"
+                            />
+                            <div slot="headline">${domainName}: ${name}</div>
+                            <ha-icon-next slot="end"></ha-icon-next>
+                          </ha-md-list-item>
+                        `;
+                      })}
+                    </ha-md-list>
+                  `
+                : html`<p>No sync agents configured</p>`}
+            </div>
+          </ha-card>
+        </div>
+      </hass-subpage>
+    `;
+  }
+
+  private async _fetchAgents() {
+    const data = await fetchBackupAgentsInfo(this.hass);
+    this._agents = data.agents;
+  }
+
+  static styles = css`
+    .content {
+      padding: 28px 20px 0;
+      max-width: 690px;
+      margin: 0 auto;
+      gap: 24px;
+      display: flex;
+      flex-direction: column;
+    }
+
+    .header .title {
+      font-size: 22px;
+      font-style: normal;
+      font-weight: 400;
+      line-height: 28px;
+      color: var(--primary-text-color);
+      margin: 0;
+      margin-bottom: 8px;
+    }
+
+    .header .description {
+      font-size: 14px;
+      font-style: normal;
+      font-weight: 400;
+      line-height: 20px;
+      letter-spacing: 0.25px;
+      color: var(--secondary-text-color);
+      margin: 0;
+    }
+
+    .agents ha-md-list {
+      background: none;
+    }
+    .agents ha-md-list-item img {
+      width: 48px;
+    }
+    .card-content {
+      padding: 0;
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-config-backup-locations": HaConfigBackupLocations;
+  }
+}

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

@@ -12,10 +12,6 @@ class HaConfigBackup extends HassRouterPage {
 
   @property({ type: Boolean }) public narrow = false;
 
-  @property({ type: Boolean }) public isWide = false;
-
-  @property({ type: Boolean }) public showAdvanced = false;
-
   protected routerOptions: RouterOptions = {
     defaultPage: "dashboard",
     routes: {
@@ -23,23 +19,24 @@ class HaConfigBackup extends HassRouterPage {
         tag: "ha-config-backup-dashboard",
         cache: true,
       },
-      list: {
-        tag: "ha-config-backup-list",
-        load: () => import("./ha-config-backup-list"),
-      },
       details: {
         tag: "ha-config-backup-details",
         load: () => import("./ha-config-backup-details"),
       },
+      locations: {
+        tag: "ha-config-backup-locations",
+        load: () => import("./ha-config-backup-locations"),
+      },
+      "automatic-config": {
+        tag: "ha-config-backup-automatic-config",
+        load: () => import("./ha-config-backup-automatic-config"),
+      },
     },
   };
 
   protected updatePageEl(pageEl, changedProps: PropertyValues) {
     pageEl.hass = this.hass;
-    pageEl.narrow = this.narrow;
-    pageEl.isWide = this.isWide;
     pageEl.route = this.routeTail;
-    pageEl.showAdvanced = this.showAdvanced;
 
     if (
       (!changedProps || changedProps.has("route")) &&