Remove hacs-progress-dialog

src/components/dialogs/hacs-dialog-base.ts

@@ -31,7 +31,6 @@ export class HacsDialogBase extends LitElement {
       changedProperties.has("active") ||
       changedProperties.has("params") ||
       changedProperties.has("_error") ||
-      changedProperties.has("_progress") ||
       changedProperties.has("_repository") ||
       changedProperties.has("_releaseNotes") ||
       changedProperties.has("_updating")

src/components/dialogs/hacs-download-dialog.ts

@@ -162,10 +162,10 @@ export class HacsDonwloadDialog extends LitElement {
                 ${this._error.message}
               </ha-alert>`
             : nothing}
+          ${this._installing
+            ? html`<mwc-linear-progress indeterminate></mwc-linear-progress>`
+            : nothing}
         </div>
-        ${this._installing
-          ? html`<mwc-linear-progress indeterminate></mwc-linear-progress>`
-          : nothing}
         <mwc-button slot="secondaryAction" @click=${this.closeDialog} dialogInitialFocus>
           ${this._dialogParams.hacs.localize("common.cancel")}
         </mwc-button>
@@ -262,6 +262,10 @@ export class HacsDonwloadDialog extends LitElement {
           white-space: pre-line;
           user-select: all;
         }
+        mwc-linear-progress {
+          margin-bottom: -8px;
+          margin-top: 4px;
+        }
       `,
     ];
   }

src/components/dialogs/hacs-event-dialog.ts

@@ -5,7 +5,6 @@ import { HacsDialogBase } from "./hacs-dialog-base";
 const DIALOG = {
   "custom-repositories": () => import("./hacs-custom-repositories-dialog"),
   generic: () => import("./hacs-generic-dialog"),
-  progress: () => import("./hacs-progress-dialog"),
 };
 
 @customElement("hacs-event-dialog")

src/components/dialogs/hacs-form-dialog.ts

@@ -1,3 +1,5 @@
+import "@material/mwc-button/mwc-button";
+import "@material/mwc-linear-progress/mwc-linear-progress";
 import { CSSResultGroup, LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../homeassistant-frontend/src/components/ha-dialog";
@@ -44,24 +46,34 @@ class HacsFromDialog extends LitElement {
           : this._dialogParams.title}
         @closed=${this.closeDialog}
       >
-        ${this._dialogParams.description || nothing}
-        <ha-form
-          .hass=${this.hass}
-          .data=${this._dialogParams.data || {}}
-          .schema=${this._dialogParams.schema || []}
-          .error=${this._errors}
-          .computeLabel=${this._computeLabel}
-          .computeHelper=${this._computeHelper}
-          .computeError=${this._computeError}
-          @value-changed=${this._valueChanged}
-          dialogInitialFocus
-        ></ha-form>
+        <div>
+          ${this._dialogParams.description || nothing}
+          ${this._dialogParams.schema && this._dialogParams.saveAction
+            ? html`<ha-form
+                .hass=${this.hass}
+                .data=${this._dialogParams.data || {}}
+                .schema=${this._dialogParams.schema || []}
+                .error=${this._errors}
+                .computeLabel=${this._computeLabel}
+                .computeHelper=${this._computeHelper}
+                .computeError=${this._computeError}
+                @value-changed=${this._valueChanged}
+                dialogInitialFocus
+              ></ha-form>`
+            : nothing}
+          ${this._waiting
+            ? html`<mwc-linear-progress indeterminate></mwc-linear-progress>`
+            : nothing}
+        </div>
         ${this._dialogParams.saveAction
           ? html`<mwc-button slot="secondaryAction" @click=${this.closeDialog} dialogInitialFocus>
                 ${this._dialogParams.hacs.localize("common.cancel")}
               </mwc-button>
               <mwc-button
-                .disabled=${this._waiting || !this._dialogParams.data}
+                class="${this._dialogParams.destructive ? "destructive" : ""}"
+                .disabled=${this._waiting ||
+                (this._dialogParams.schema?.some((entry) => entry.required) &&
+                  !this._dialogParams.data)}
                 slot="primaryAction"
                 @click=${this._saveClicked}
               >
@@ -113,6 +125,13 @@ class HacsFromDialog extends LitElement {
       .root > *:not([own-margin]):not(:last-child) {
         margin-bottom: 24px;
       }
+      .destructive {
+        --mdc-theme-primary: var(--hcv-color-error);
+      }
+      mwc-linear-progress {
+        margin-bottom: -8px;
+        margin-top: 4px;
+      }
     `;
   }
 }

src/components/dialogs/show-hacs-form-dialog.ts

@@ -12,7 +12,8 @@ export interface HacsFormDialogParams {
   schema?: readonly HaFormSchema[];
   data?: HaFormDataContainer;
   saveLabel?: string;
-  description?: HTMLTemplateResult;
+  destructive?: boolean;
+  description?: HTMLTemplateResult | string;
   computeLabelCallback?: (schema: any, data: HaFormDataContainer) => string;
   computeHelper?: (schema: any) => string | undefined;
   computeError?: (schema: any, error) => string;

src/components/hacs-repository-owerflow-menu.ts

@@ -20,6 +20,7 @@ import { repositoryUninstall, repositoryUpdate } from "../data/websocket";
 import type { HacsExperimentalPanel } from "../panels/hacs-experimental-panel";
 import type { HacsRepositoryPanel } from "../panels/hacs-repository-panel";
 import { showHacsDownloadDialog } from "./dialogs/show-hacs-download-dialog";
+import { showHacsFormDialog } from "./dialogs/show-hacs-form-dialog";
 
 export const repositoryMenuItems = memoizeOne(
   (element: HacsRepositoryPanel | HacsExperimentalPanel, repository: RepositoryBase) => [
@@ -120,23 +121,18 @@ export const repositoryMenuItems = memoizeOne(
                   }
                 }
               }
-              element.dispatchEvent(
-                new CustomEvent("hacs-dialog", {
-                  detail: {
-                    type: "progress",
-                    title: element.hacs.localize("dialog.remove.title"),
-                    confirmText: element.hacs.localize("dialog.remove.title"),
-                    content: element.hacs.localize("dialog.remove.message", {
-                      name: repository.name,
-                    }),
-                    confirm: async () => {
-                      await _repositoryRemove(element, repository);
-                    },
-                  },
-                  bubbles: true,
-                  composed: true,
-                })
-              );
+              showHacsFormDialog(element, {
+                hacs: element.hacs,
+                title: element.hacs.localize("dialog.remove.title"),
+                saveLabel: element.hacs.localize("dialog.remove.title"),
+                description: element.hacs.localize("dialog.remove.message", {
+                  name: repository.name,
+                }),
+                saveAction: async () => {
+                  await _repositoryRemove(element, repository);
+                },
+                destructive: true,
+              });
             },
             warning: true,
           },