From 0e8be25a608f111e45c882b9ea3a792a8a6819c2 Mon Sep 17 00:00:00 2001 From: Wendelin <12148533+wendevlin@users.noreply.github.com> Date: Wed, 19 Mar 2025 17:28:44 +0100 Subject: [PATCH] Rename last_non_idle_event to last_action_event (#24691) --- src/data/backup.ts | 2 +- src/data/backup_onboarding.ts | 2 +- src/onboarding/onboarding-restore-backup.ts | 10 +++++----- .../restore-backup/onboarding-restore-backup-status.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/data/backup.ts b/src/data/backup.ts index 2f2fdc9d72..ecdc679728 100644 --- a/src/data/backup.ts +++ b/src/data/backup.ts @@ -136,7 +136,7 @@ export interface BackupInfo { agent_errors: Record; last_attempted_automatic_backup: string | null; last_completed_automatic_backup: string | null; - last_non_idle_event: ManagerStateEvent | null; + last_action_event: ManagerStateEvent | null; next_automatic_backup: string | null; next_automatic_backup_additional: boolean; state: BackupManagerState; diff --git a/src/data/backup_onboarding.ts b/src/data/backup_onboarding.ts index 80c37126bb..3609c03761 100644 --- a/src/data/backup_onboarding.ts +++ b/src/data/backup_onboarding.ts @@ -8,7 +8,7 @@ import type { export interface BackupOnboardingInfo { state: BackupManagerState; - last_non_idle_event?: { + last_action_event?: { manager_state: BackupManagerState; stage: RestoreBackupStage | null; state: RestoreBackupState; diff --git a/src/onboarding/onboarding-restore-backup.ts b/src/onboarding/onboarding-restore-backup.ts index afb5c1402f..2aa26148a8 100644 --- a/src/onboarding/onboarding-restore-backup.ts +++ b/src/onboarding/onboarding-restore-backup.ts @@ -91,7 +91,7 @@ class OnboardingRestoreBackup extends LitElement { .supervisor=${this.supervisor} .error=${this._failed ? this.localize( - `ui.panel.page-onboarding.restore.${this._backupInfo?.last_non_idle_event?.reason === "password_incorrect" ? "failed_wrong_password_description" : "failed_description"}` + `ui.panel.page-onboarding.restore.${this._backupInfo?.last_action_event?.reason === "password_incorrect" ? "failed_wrong_password_description" : "failed_description"}` ) : this._error} @restore-started=${this._restoreStarted} @@ -157,14 +157,14 @@ class OnboardingRestoreBackup extends LitElement { } const { - last_non_idle_event: lastNonIdleEvent, + last_action_event: lastActionEvent, state: currentState, backups, } = onboardingInfo; this._backupInfo = { state: currentState, - last_non_idle_event: lastNonIdleEvent, + last_action_event: lastActionEvent, }; if (this.mode === "cloud") { @@ -192,8 +192,8 @@ class OnboardingRestoreBackup extends LitElement { } const failedRestore = - lastNonIdleEvent?.manager_state === "restore_backup" && - lastNonIdleEvent?.state === "failed"; + lastActionEvent?.manager_state === "restore_backup" && + lastActionEvent?.state === "failed"; if (failedRestore) { this._failed = true; diff --git a/src/onboarding/restore-backup/onboarding-restore-backup-status.ts b/src/onboarding/restore-backup/onboarding-restore-backup-status.ts index d7e197b67a..2a7f8c8e0c 100644 --- a/src/onboarding/restore-backup/onboarding-restore-backup-status.ts +++ b/src/onboarding/restore-backup/onboarding-restore-backup-status.ts @@ -42,11 +42,11 @@ class OnboardingRestoreBackupStatus extends LitElement { "ui.panel.page-onboarding.restore.failed_status_description" )} - ${this.backupInfo.last_non_idle_event?.reason + ${this.backupInfo.last_action_event?.reason ? html`

Error:

- ${this.backupInfo.last_non_idle_event?.reason} + ${this.backupInfo.last_action_event?.reason}
` : nothing}