jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-20 07:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix restore progress check logic (#23568)

Browse Source
This commit is contained in:
Bram Kragten 2025-01-03 15:02:59 +01:00 committed by GitHub
parent cfbcb74ac2
commit 71e10d5d8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/panels/config/backup/dialogs/dialog-restore-backup.ts
View File

@ -23,7 +23,10 @@ import type { HassDialog } from "../../../../dialogs/make-dialog-manager";
import { haStyle, haStyleDialog } from "../../../../resources/styles"; import { haStyle, haStyleDialog } from "../../../../resources/styles";
import type { HomeAssistant } from "../../../../types"; import type { HomeAssistant } from "../../../../types";
import type { RestoreBackupDialogParams } from "./show-dialog-restore-backup"; import type { RestoreBackupDialogParams } from "./show-dialog-restore-backup";
import type { RestoreBackupStage } from "../../../../data/backup_manager"; import type {
RestoreBackupStage,
RestoreBackupState,
} from "../../../../data/backup_manager";
import { subscribeBackupEvents } from "../../../../data/backup_manager"; import { subscribeBackupEvents } from "../../../../data/backup_manager";
type FormData = { type FormData = {
@ -54,6 +57,8 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
@state() private _error?: string; @state() private _error?: string;
@state() private _state?: RestoreBackupState;
@state() private _stage?: RestoreBackupStage | null; @state() private _stage?: RestoreBackupStage | null;
@state() private _unsub?: Promise<UnsubscribeFunc>; @state() private _unsub?: Promise<UnsubscribeFunc>;
@ -64,6 +69,10 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
this._params = params; this._params = params;
this._formData = INITIAL_DATA; this._formData = INITIAL_DATA;
this._userPassword = undefined;
this._error = undefined;
this._state = undefined;
this._stage = undefined;
if (this._params.backup.protected) { if (this._params.backup.protected) {
this._backupEncryptionKey = await this._fetchEncryptionKey(); this._backupEncryptionKey = await this._fetchEncryptionKey();
if (!this._backupEncryptionKey) { if (!this._backupEncryptionKey) {
@ -86,6 +95,7 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
this._backupEncryptionKey = undefined; this._backupEncryptionKey = undefined;
this._userPassword = undefined; this._userPassword = undefined;
this._error = undefined; this._error = undefined;
this._state = undefined;
this._stage = undefined; this._stage = undefined;
this._step = undefined; this._step = undefined;
this._unsubscribe(); this._unsubscribe();
@ -188,7 +198,6 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
this._unsubscribe(); this._unsubscribe();
try { try {
this._step = "progress"; this._step = "progress";
window.addEventListener("connection-status", this._connectionStatus);
this._subscribeBackupEvents(); this._subscribeBackupEvents();
await this._doRestoreBackup( await this._doRestoreBackup(
this._userPassword || this._backupEncryptionKey this._userPassword || this._backupEncryptionKey
@ -204,20 +213,15 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
} }
} }
private _connectionStatus = (ev) => {
if (ev.detail === "connected") {
this.closeDialog();
}
};
private _subscribeBackupEvents() { private _subscribeBackupEvents() {
this._unsub = subscribeBackupEvents(this.hass!, (event) => { this._unsub = subscribeBackupEvents(this.hass!, (event) => {
if (!this._error && event.manager_state === "idle") { if (event.manager_state === "idle" && this._state === "in_progress") {
this.closeDialog(); this.closeDialog();
} }
if (event.manager_state !== "restore_backup") { if (event.manager_state !== "restore_backup") {
return; return;
} }
this._state = event.state;
if (event.state === "completed") { if (event.state === "completed") {
this.closeDialog(); this.closeDialog();
} }
@ -231,7 +235,6 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
} }
private _unsubscribe() { private _unsubscribe() {
window.removeEventListener("connection-status", this._connectionStatus);
if (this._unsub) { if (this._unsub) {
const prom = this._unsub.then((unsub) => unsub()); const prom = this._unsub.then((unsub) => unsub());
this._unsub = undefined; this._unsub = undefined;