From 3e0c998e74765d747f1842131132e7843683a5db Mon Sep 17 00:00:00 2001
From: Jan-Philipp Benecke <jan-philipp@bnck.me>
Date: Tue, 29 Oct 2024 08:38:13 +0100
Subject: [PATCH] Show loading spinner when waiting for backups (re)load
 (#22485)

---
 hassio/src/backups/hassio-backups.ts | 28 +++++++++++++++++-----------
 src/translations/en.json             |  1 +
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/hassio/src/backups/hassio-backups.ts b/hassio/src/backups/hassio-backups.ts
index 095bd922f4..3512dd8bd8 100644
--- a/hassio/src/backups/hassio-backups.ts
+++ b/hassio/src/backups/hassio-backups.ts
@@ -48,6 +48,7 @@ import { showHassioBackupDialog } from "../dialogs/backup/show-dialog-hassio-bac
 import { showHassioCreateBackupDialog } from "../dialogs/backup/show-dialog-hassio-create-backup";
 import { supervisorTabs } from "../hassio-tabs";
 import { hassioStyle } from "../resources/hassio-style";
+import "../../../src/layouts/hass-loading-screen";
 
 type BackupItem = HassioBackup & {
   secondary: string;
@@ -69,6 +70,8 @@ export class HassioBackups extends LitElement {
 
   @state() private _backups?: HassioBackup[] = [];
 
+  @state() private _isLoading = false;
+
   @query("hass-tabs-subpage-data-table", true)
   private _dataTable!: HaTabsSubpageDataTable;
 
@@ -77,15 +80,10 @@ export class HassioBackups extends LitElement {
   public connectedCallback(): void {
     super.connectedCallback();
     if (this.hass && this._firstUpdatedCalled) {
-      this.refreshData();
+      this.fetchBackups();
     }
   }
 
-  public async refreshData() {
-    await reloadHassioBackups(this.hass);
-    await this.fetchBackups();
-  }
-
   private _computeBackupContent = (backup: HassioBackup): string => {
     if (backup.type === "full") {
       return this.supervisor.localize("backup.full_backup");
@@ -115,7 +113,7 @@ export class HassioBackups extends LitElement {
   protected firstUpdated(changedProperties: PropertyValues): void {
     super.firstUpdated(changedProperties);
     if (this.hass && this.isConnected) {
-      this.refreshData();
+      this.fetchBackups();
     }
     this._firstUpdatedCalled = true;
   }
@@ -175,6 +173,13 @@ export class HassioBackups extends LitElement {
     if (!this.supervisor) {
       return nothing;
     }
+
+    if (this._isLoading) {
+      return html`<hass-loading-screen
+        .message=${this.supervisor.localize("backup.loading_backups")}
+      ></hass-loading-screen>`;
+    }
+
     return html`
       <hass-tabs-subpage-data-table
         .tabs=${atLeastVersion(this.hass.config.version, 2022, 5)
@@ -281,7 +286,7 @@ export class HassioBackups extends LitElement {
   private _handleAction(ev: CustomEvent<ActionDetail>) {
     switch (ev.detail.index) {
       case 0:
-        this.refreshData();
+        this.fetchBackups();
         break;
       case 1:
         showHassioBackupLocationDialog(this, { supervisor: this.supervisor });
@@ -306,13 +311,15 @@ export class HassioBackups extends LitElement {
           supervisor: this.supervisor,
           onDelete: () => this.fetchBackups(),
         }),
-      reloadBackup: () => this.refreshData(),
+      reloadBackup: () => this.fetchBackups(),
     });
   }
 
   private async fetchBackups() {
+    this._isLoading = true;
     await reloadHassioBackups(this.hass);
     this._backups = await fetchHassioBackups(this.hass);
+    this._isLoading = false;
   }
 
   private async _deleteSelected() {
@@ -339,8 +346,7 @@ export class HassioBackups extends LitElement {
       });
       return;
     }
-    await reloadHassioBackups(this.hass);
-    this._backups = await fetchHassioBackups(this.hass);
+    await this.fetchBackups();
     this._dataTable.clearSelection();
   }
 
diff --git a/src/translations/en.json b/src/translations/en.json
index 58bf26d769..3e9fcb66a2 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -7671,6 +7671,7 @@
     },
     "backup": {
       "search": "[%key:ui::panel::config::backup::picker::search%]",
+      "loading_backups": "Loading backups. This can take a few seconds.",
       "no_backups": "You don't have any backups yet.",
       "create_blocked_not_running": "Creating a backup is not possible right now because the system is in \"{state}\" state.",
       "restore_blocked_not_running": "Restoring a backup is not possible right now because the system is in \"{state}\" state.",