diff --git a/src/data/backup.ts b/src/data/backup.ts index 407e913f4b..689f46cc2b 100644 --- a/src/data/backup.ts +++ b/src/data/backup.ts @@ -5,7 +5,7 @@ export interface BackupAgent { } export interface BackupContent { - slug: string; + backup_id: string; date: string; name: string; protected: boolean; @@ -35,8 +35,8 @@ export type GenerateBackupParams = { password?: string; }; -export const getBackupDownloadUrl = (slug: string) => - `/api/backup/download/${slug}`; +export const getBackupDownloadUrl = (id: string) => + `/api/backup/download/${id}`; export const fetchBackupInfo = (hass: HomeAssistant): Promise => hass.callWS({ @@ -45,11 +45,11 @@ export const fetchBackupInfo = (hass: HomeAssistant): Promise => export const fetchBackupDetails = ( hass: HomeAssistant, - slug: string + id: string ): Promise => hass.callWS({ type: "backup/details", - slug, + backup_id: id, }); export const fetchBackupAgentsInfo = ( @@ -59,19 +59,16 @@ export const fetchBackupAgentsInfo = ( type: "backup/agents/info", }); -export const removeBackup = ( - hass: HomeAssistant, - slug: string -): Promise => +export const removeBackup = (hass: HomeAssistant, id: string): Promise => hass.callWS({ type: "backup/remove", - slug, + backup_id: id, }); export const generateBackup = ( hass: HomeAssistant, params: GenerateBackupParams -): Promise<{ slug: string }> => +): Promise<{ backup_id: string }> => hass.callWS({ type: "backup/generate", ...params, diff --git a/src/panels/config/backup/ha-config-backup-dashboard.ts b/src/panels/config/backup/ha-config-backup-dashboard.ts index d0fd1769d3..1df2b2bea8 100644 --- a/src/panels/config/backup/ha-config-backup-dashboard.ts +++ b/src/panels/config/backup/ha-config-backup-dashboard.ts @@ -107,7 +107,7 @@ class HaConfigBackupDashboard extends SubscribeMixin(LitElement) { .narrow=${this.narrow} back-path="/config/system" clickable - id="slug" + id="backup_id" .route=${this.route} @row-click=${this._showBackupDetails} .columns=${this._columns(this.hass.localize)} @@ -193,8 +193,8 @@ class HaConfigBackupDashboard extends SubscribeMixin(LitElement) { } private _showBackupDetails(ev: CustomEvent): void { - const slug = (ev.detail as RowClickedEvent).id; - navigate(`/config/backup/details/${slug}`); + const id = (ev.detail as RowClickedEvent).id; + navigate(`/config/backup/details/${id}`); } private _configureAutomaticBackup() { diff --git a/src/panels/config/backup/ha-config-backup-details.ts b/src/panels/config/backup/ha-config-backup-details.ts index f0b3a972aa..45414d0db9 100644 --- a/src/panels/config/backup/ha-config-backup-details.ts +++ b/src/panels/config/backup/ha-config-backup-details.ts @@ -9,7 +9,7 @@ import "../../../components/ha-circular-progress"; import "../../../components/ha-relative-time"; import "../../../components/ha-settings-row"; -import type { BackupAgentsInfo, BackupContent } from "../../../data/backup"; +import type { BackupContent } from "../../../data/backup"; import { fetchBackupDetails } from "../../../data/backup"; import type { HomeAssistant } from "../../../types"; @@ -17,11 +17,9 @@ import type { HomeAssistant } from "../../../types"; class HaConfigBackupDetails extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; - @property({ attribute: false }) public backupAgentsInfo?: BackupAgentsInfo; - @property({ type: Boolean }) public narrow = false; - @property({ attribute: "backup-slug" }) public backupSlug!: string; + @property({ attribute: "backup-id" }) public backupId!: string; @state() private _backup?: BackupContent | null; @@ -30,10 +28,10 @@ class HaConfigBackupDetails extends LitElement { protected firstUpdated(changedProps) { super.firstUpdated(changedProps); - if (this.backupSlug) { + if (this.backupId) { this._fetchBackup(); } else { - this._error = "Backup slug not defined"; + this._error = "Backup id not defined"; } } @@ -53,7 +51,7 @@ class HaConfigBackupDetails extends LitElement { html`${this._error}`} ${this._backup === null ? html` - Backup matching ${this.backupSlug} not found + Backup matching ${this.backupId} not found ` : !this._backup ? html`` @@ -91,7 +89,7 @@ class HaConfigBackupDetails extends LitElement { private async _fetchBackup() { try { - const response = await fetchBackupDetails(this.hass, this.backupSlug); + const response = await fetchBackupDetails(this.hass, this.backupId); this._backup = response.backup; } catch (err: any) { this._error = err?.message || "Could not fetch backup details"; diff --git a/src/panels/config/backup/ha-config-backup.ts b/src/panels/config/backup/ha-config-backup.ts index 0e2dd4d114..2034b65893 100644 --- a/src/panels/config/backup/ha-config-backup.ts +++ b/src/panels/config/backup/ha-config-backup.ts @@ -42,7 +42,7 @@ class HaConfigBackup extends HassRouterPage { (!changedProps || changedProps.has("route")) && this._currentPage === "details" ) { - pageEl.backupSlug = this.routeTail.path.substr(1); + pageEl.backupId = this.routeTail.path.substr(1); } } }