From 350752490c1bc1b9fdfe3b04839b8543a9c52877 Mon Sep 17 00:00:00 2001 From: MrBartusek Date: Fri, 18 Jun 2021 01:11:45 +0200 Subject: [PATCH] Confirm repository uninstall (#478) --- src/components/dialogs/hacs-event-dialog.ts | 1 + .../dialogs/hacs-progress-dialog.ts | 61 +++++++++++++++++++ src/components/hacs-repository-card.ts | 17 +++++- src/localize/languages/en.json | 4 ++ 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 src/components/dialogs/hacs-progress-dialog.ts diff --git a/src/components/dialogs/hacs-event-dialog.ts b/src/components/dialogs/hacs-event-dialog.ts index 90074372..8f410ee2 100644 --- a/src/components/dialogs/hacs-event-dialog.ts +++ b/src/components/dialogs/hacs-event-dialog.ts @@ -12,6 +12,7 @@ const DIALOG = { removed: () => import("./hacs-removed-dialog"), update: () => import("./hacs-update-dialog"), "repository-info": () => import("./hacs-repository-info-dialog"), + progress: () => import("./hacs-progress-dialog") }; @customElement("hacs-event-dialog") diff --git a/src/components/dialogs/hacs-progress-dialog.ts b/src/components/dialogs/hacs-progress-dialog.ts new file mode 100644 index 00000000..84a1b72f --- /dev/null +++ b/src/components/dialogs/hacs-progress-dialog.ts @@ -0,0 +1,61 @@ +import { html, TemplateResult, PropertyValues } from "lit"; +import { customElement, property } from "lit/decorators"; +import "./hacs-dialog"; +import { HacsDialogBase } from "./hacs-dialog-base"; + +@customElement("hacs-progress-dialog") +export class HacsProgressDialog extends HacsDialogBase { + @property() public title?: string; + @property() public content?: string; + @property() public confirmText?: string; + @property() public confirm: () => Promise; + @property({ type: Boolean }) private _inProgress: boolean = false; + + shouldUpdate(changedProperties: PropertyValues) { + return ( + changedProperties.has("active") || + changedProperties.has("title") || + changedProperties.has("content") || + changedProperties.has("confirmText") || + changedProperties.has("confirm") || + changedProperties.has("_inProgress") + ); + } + + protected render(): TemplateResult | void { + if (!this.active) return html``; + return html` + +
+ ${this.content || ""} +
+ + ${this.hacs.localize("common.cancel")} + + + ${this._inProgress + ? html`` + : this.confirmText || this.hacs.localize("confirm.yes")} + +
+ `; + } + + private async _confirmed() { + this._inProgress = true; + await this.confirm() + this._inProgress = false; + this._close() + } + + private _close() { + this.active = false; + this.dispatchEvent( + new Event("hacs-dialog-closed", { + bubbles: true, + composed: true, + }) + ); + } +} diff --git a/src/components/hacs-repository-card.ts b/src/components/hacs-repository-card.ts index 9a4591ad..6942b15a 100644 --- a/src/components/hacs-repository-card.ts +++ b/src/components/hacs-repository-card.ts @@ -188,7 +188,7 @@ export class HacsRepositoryCard extends LitElement { >${this.hacs.localize("repository_card.report")} - ${this.hacs.localize("common.uninstall")}` : ""} @@ -247,6 +247,21 @@ export class HacsRepositoryCard extends LitElement { ); } + private async _uninstallRepositoryDialog() { + this.dispatchEvent( + new CustomEvent("hacs-dialog", { + detail: { + type: "progress", + title: this.hacs.localize("dialog.uninstall.title"), + confirmText: this.hacs.localize("dialog.uninstall.title"), + content: this.hacs.localize("dialog.uninstall.message").replace("{name}", this.repository.name), + confirm: async () => { await this._uninstallRepository() } + }, + bubbles: true, + composed: true, + }) + ); + } private async _uninstallRepository() { if (this.repository.category === "plugin" && this.hacs.status?.lovelace_mode !== "yaml") { const resources = await fetchResources(this.hass); diff --git a/src/localize/languages/en.json b/src/localize/languages/en.json index fa4e98e5..83009e83 100644 --- a/src/localize/languages/en.json +++ b/src/localize/languages/en.json @@ -266,6 +266,10 @@ "reload": { "description": "You need to reload your browser for the updated resources to be used.", "confirm": "Do you want to do that now?" + }, + "uninstall": { + "title": "Uninstall", + "message": "Do you really want to uninstall {name}?" } }, "entry": {