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

Handle no cloud subscription better in backups (#23523)

Browse Source
This commit is contained in:
Bram Kragten 2024-12-31 22:39:50 +01:00
parent a5de6ff3af
commit a7ef498d75
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/panels/config/backup/components/config/ha-backup-config-agents.ts
View File

@ -51,6 +51,9 @@ class HaBackupConfigAgents extends LitElement {
private _description(agentId: string) { private _description(agentId: string) {
if (agentId === CLOUD_AGENT) { if (agentId === CLOUD_AGENT) {
if (this.cloudStatus.logged_in && !this.cloudStatus.active_subscription) {
return "You currently do not have an active Home Assistant Cloud subscription.";
}
return "Note: It stores only one backup with a maximum size of 5 GB, regardless of your settings."; return "Note: It stores only one backup with a maximum size of 5 GB, regardless of your settings.";
} }
if (isNetworkMountAgent(agentId)) { if (isNetworkMountAgent(agentId)) {
@ -72,6 +75,10 @@ class HaBackupConfigAgents extends LitElement {
this._agentIds this._agentIds
); );
const description = this._description(agentId); const description = this._description(agentId);
const noCloudSubscription =
agentId === CLOUD_AGENT &&
this.cloudStatus.logged_in &&
!this.cloudStatus.active_subscription;
return html` return html`
<ha-md-list-item> <ha-md-list-item>
${isLocalAgent(agentId) ${isLocalAgent(agentId)
@ -107,7 +114,9 @@ class HaBackupConfigAgents extends LitElement {
<ha-switch <ha-switch
slot="end" slot="end"
id=${agentId} id=${agentId}
.checked=${this._value.includes(agentId)} .checked=${!noCloudSubscription &&
this._value.includes(agentId)}
.disabled=${noCloudSubscription}
@change=${this._agentToggled} @change=${this._agentToggled}
></ha-switch> ></ha-switch>
</ha-md-list-item> </ha-md-list-item>
@ -133,7 +142,11 @@ class HaBackupConfigAgents extends LitElement {
// Ensure we don't have duplicates, agents exist in the list and cloud is logged in // Ensure we don't have duplicates, agents exist in the list and cloud is logged in
this.value = [...new Set(this.value)] this.value = [...new Set(this.value)]
.filter((agent) => this._agentIds.some((id) => id === agent)) .filter((agent) => this._agentIds.some((id) => id === agent))
.filter((id) => id !== CLOUD_AGENT || this.cloudStatus.logged_in); .filter(
(id) =>
id !== CLOUD_AGENT ||
(this.cloudStatus.logged_in && this.cloudStatus.active_subscription)
);
fireEvent(this, "value-changed", { value: this.value }); fireEvent(this, "value-changed", { value: this.value });
} }

5
src/panels/config/backup/dialogs/dialog-generate-backup.ts
View File

@ -100,7 +100,10 @@ class DialogGenerateBackup extends LitElement implements HassDialog {
this._agentIds = agents this._agentIds = agents
.map((agent) => agent.agent_id) .map((agent) => agent.agent_id)
.filter( .filter(
(id) => id !== CLOUD_AGENT || this._params?.cloudStatus?.logged_in (id) =>
id !== CLOUD_AGENT ||
(this._params?.cloudStatus?.logged_in &&
this._params?.cloudStatus?.active_subscription)
) )
.sort(compareAgents); .sort(compareAgents);
} }

1
src/panels/config/backup/dialogs/dialog-upload-backup.ts
View File

@ -20,7 +20,6 @@ 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 { showAlertDialog } from "../../../lovelace/custom-card-helpers"; import { showAlertDialog } from "../../../lovelace/custom-card-helpers";
import "../components/ha-backup-agents-picker";
import type { UploadBackupDialogParams } from "./show-dialog-upload-backup"; import type { UploadBackupDialogParams } from "./show-dialog-upload-backup";
const SUPPORTED_FORMAT = "application/x-tar"; const SUPPORTED_FORMAT = "application/x-tar";