From 47cfc3d27cae246cb34b39d52c051986a1490283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Thu, 9 Mar 2023 11:32:52 +0100 Subject: [PATCH] Move deleting backups to WS (#15773) --- .../dialogs/backup/dialog-hassio-backup.ts | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/hassio/src/dialogs/backup/dialog-hassio-backup.ts b/hassio/src/dialogs/backup/dialog-hassio-backup.ts index 389bf5dd46..9ff96727a5 100644 --- a/hassio/src/dialogs/backup/dialog-hassio-backup.ts +++ b/hassio/src/dialogs/backup/dialog-hassio-backup.ts @@ -16,6 +16,7 @@ import { getSignedPath } from "../../../../src/data/auth"; import { fetchHassioBackupInfo, HassioBackupDetail, + removeBackup, } from "../../../../src/data/hassio/backup"; import { extractApiErrorMessage } from "../../../../src/data/hassio/common"; import { @@ -286,24 +287,15 @@ class HassioBackupDialog return; } - this.hass!.callApi( - atLeastVersion(this.hass!.config.version, 2021, 9) ? "DELETE" : "POST", - `hassio/${ - atLeastVersion(this.hass!.config.version, 2021, 9) - ? `backups/${this._backup!.slug}` - : `snapshots/${this._backup!.slug}/remove` - }` - ).then( - () => { - if (this._dialogParams!.onDelete) { - this._dialogParams!.onDelete(); - } - this.closeDialog(); - }, - (error) => { - this._error = error.body.message; + try { + await removeBackup(this.hass!, this._backup!.slug); + if (this._dialogParams!.onDelete) { + this._dialogParams!.onDelete(); } - ); + this.closeDialog(); + } catch (err: any) { + this._error = err.body.message; + } } private async _downloadClicked() {