Migrate profile dialog(s) to wa

src/panels/config/users/dialog-add-user.ts

@@ -1,17 +1,16 @@
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { fireEvent } from "../../../common/dom/fire_event";
 import "../../../components/ha-alert";
 import "../../../components/ha-button";
-import "../../../components/ha-dialog-footer";
+import "../../../components/ha-spinner";
+import { createCloseHeading } from "../../../components/ha-dialog";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-settings-row";
 import "../../../components/ha-switch";
 import type { HaSwitch } from "../../../components/ha-switch";
 import "../../../components/ha-textfield";
 import type { HaTextField } from "../../../components/ha-textfield";
-import "../../../components/ha-wa-dialog";
 import { createAuthForUser } from "../../../data/auth";
 import type { User } from "../../../data/user";
 import {
@@ -36,8 +35,6 @@ export class DialogAddUser extends LitElement {
 
   @state() private _params?: AddUserDialogParams;
 
-  @state() private _open = false;
-
   @state() private _name?: string;
 
   @state() private _username?: string;
@@ -69,8 +66,6 @@ export class DialogAddUser extends LitElement {
     } else {
       this._allowChangeName = true;
     }
-
-    this._open = true;
   }
 
   protected firstUpdated(changedProperties: PropertyValues) {
@@ -88,14 +83,15 @@ export class DialogAddUser extends LitElement {
     }
 
     return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${this.hass.localize(
-          "ui.panel.config.users.add_user.caption"
+      <ha-dialog
+        open
+        @closed=${this._close}
+        scrimClickAction
+        escapeKeyAction
+        .heading=${createCloseHeading(
+          this.hass,
+          this.hass.localize("ui.panel.config.users.add_user.caption")
         )}
-        width="medium"
-        @closed=${this._dialogClosed}
       >
         <div>
           ${this._error ? html` <div class="error">${this._error}</div> ` : ""}
@@ -113,7 +109,7 @@ export class DialogAddUser extends LitElement {
                 )}
                 @input=${this._handleValueChanged}
                 @blur=${this._maybePopulateUsername}
-                autofocus
+                dialogInitialFocus
               ></ha-textfield>`
             : ""}
           <ha-textfield
@@ -126,7 +122,7 @@ export class DialogAddUser extends LitElement {
             required
             @input=${this._handleValueChanged}
             .validationMessage=${this.hass.localize("ui.common.error_required")}
-            ?autofocus=${!this._allowChangeName}
+            dialogInitialFocus
           ></ha-textfield>
 
           <ha-password-field
@@ -195,37 +191,30 @@ export class DialogAddUser extends LitElement {
             : nothing}
         </div>
 
-        <ha-dialog-footer slot="footer">
-          <ha-button
-            slot="secondaryAction"
-            appearance="plain"
-            @click=${this._close}
-          >
-            ${this.hass!.localize("ui.common.cancel")}
-          </ha-button>
-          <ha-button
-            slot="primaryAction"
-            .disabled=${!this._name ||
-            !this._username ||
-            !this._password ||
-            this._password !== this._passwordConfirm}
-            @click=${this._createUser}
-            .loading=${this._loading}
-          >
-            ${this.hass.localize("ui.panel.config.users.add_user.create")}
-          </ha-button>
-        </ha-dialog-footer>
-      </ha-wa-dialog>
+        <ha-button
+          slot="primaryAction"
+          appearance="plain"
+          @click=${this._close}
+        >
+          ${this.hass!.localize("ui.common.cancel")}
+        </ha-button>
+        <ha-button
+          slot="primaryAction"
+          .disabled=${!this._name ||
+          !this._username ||
+          !this._password ||
+          this._password !== this._passwordConfirm}
+          @click=${this._createUser}
+          .loading=${this._loading}
+        >
+          ${this.hass.localize("ui.panel.config.users.add_user.create")}
+        </ha-button>
+      </ha-dialog>
     `;
   }
 
   private _close() {
-    this._open = false;
-  }
-
-  private _dialogClosed(): void {
     this._params = undefined;
-    fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
   private _maybePopulateUsername() {
@@ -308,7 +297,8 @@ export class DialogAddUser extends LitElement {
     return [
       haStyleDialog,
       css`
-        ha-wa-dialog {
+        ha-dialog {
+          --mdc-dialog-max-width: 500px;
           --dialog-z-index: 10;
         }
         .row {

src/panels/config/users/dialog-admin-change-password.ts

@@ -3,12 +3,11 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 
 import { fireEvent } from "../../../common/dom/fire_event";
-import "../../../components/ha-dialog-footer";
+import { createCloseHeading } from "../../../components/ha-dialog";
 import "../../../components/ha-form/ha-form";
 import type { SchemaUnion } from "../../../components/ha-form/types";
 import "../../../components/ha-textfield";
 import "../../../components/ha-button";
-import "../../../components/ha-wa-dialog";
 import { adminChangePassword } from "../../../data/auth";
 import { haStyleDialog } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
@@ -49,8 +48,6 @@ class DialogAdminChangePassword extends LitElement {
 
   @state() private _params?: AdminChangePasswordDialogParams;
 
-  @state() private _open = false;
-
   @state() private _userId?: string;
 
   @state() private _data?: FormData;
@@ -64,24 +61,13 @@ class DialogAdminChangePassword extends LitElement {
   public showDialog(params: AdminChangePasswordDialogParams): void {
     this._params = params;
     this._userId = params.userId;
-    this._data = undefined;
-    this._error = undefined;
-    this._submitting = false;
-    this._success = false;
-    this._open = true;
   }
 
   public closeDialog(): void {
-    this._open = false;
-  }
-
-  private _dialogClosed(): void {
     this._params = undefined;
-    this._userId = undefined;
     this._data = undefined;
     this._submitting = false;
     this._success = false;
-    this._error = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
@@ -118,13 +104,15 @@ class DialogAdminChangePassword extends LitElement {
     );
 
     return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${this.hass.localize(
-          "ui.panel.config.users.change_password.caption"
+      <ha-dialog
+        open
+        @closed=${this.closeDialog}
+        scrimClickAction
+        escapeKeyAction
+        .heading=${createCloseHeading(
+          this.hass,
+          this.hass.localize("ui.panel.config.users.change_password.caption")
         )}
-        @closed=${this._dialogClosed}
       >
         ${this._success
           ? html`
@@ -133,15 +121,12 @@ class DialogAdminChangePassword extends LitElement {
                   "ui.panel.config.users.change_password.password_changed"
                 )}
               </p>
-              <ha-dialog-footer slot="footer">
-                <ha-button slot="primaryAction" @click=${this.closeDialog}>
-                  ${this.hass.localize("ui.common.ok")}
-                </ha-button>
-              </ha-dialog-footer>
+              <ha-button slot="primaryAction" @click=${this.closeDialog}>
+                ${this.hass.localize("ui.common.ok")}
+              </ha-button>
             `
           : html`
               <ha-form
-                autofocus
                 .hass=${this.hass}
                 .data=${this._data}
                 .error=${this._error}
@@ -151,26 +136,24 @@ class DialogAdminChangePassword extends LitElement {
                 @value-changed=${this._valueChanged}
                 .disabled=${this._submitting}
               ></ha-form>
-              <ha-dialog-footer slot="footer">
-                <ha-button
-                  slot="secondaryAction"
-                  appearance="plain"
-                  @click=${this.closeDialog}
-                >
-                  ${this.hass.localize("ui.common.cancel")}
-                </ha-button>
-                <ha-button
-                  slot="primaryAction"
-                  @click=${this._changePassword}
-                  .disabled=${this._submitting || !canSubmit}
-                >
-                  ${this.hass.localize(
-                    "ui.panel.config.users.change_password.change"
-                  )}
-                </ha-button>
-              </ha-dialog-footer>
+              <ha-button
+                appearance="plain"
+                slot="primaryAction"
+                @click=${this.closeDialog}
+              >
+                ${this.hass.localize("ui.common.cancel")}
+              </ha-button>
+              <ha-button
+                slot="primaryAction"
+                @click=${this._changePassword}
+                .disabled=${this._submitting || !canSubmit}
+              >
+                ${this.hass.localize(
+                  "ui.panel.config.users.change_password.change"
+                )}
+              </ha-button>
             `}
-      </ha-wa-dialog>
+      </ha-dialog>
     `;
   }
 

src/panels/config/users/dialog-user-detail.ts

@@ -2,17 +2,15 @@ import { mdiPencil } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { fireEvent } from "../../../common/dom/fire_event";
 import "../../../components/ha-alert";
 import "../../../components/ha-button";
-import "../../../components/ha-dialog-footer";
+import { createCloseHeading } from "../../../components/ha-dialog";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-label";
 import "../../../components/ha-settings-row";
 import "../../../components/ha-svg-icon";
 import "../../../components/ha-switch";
 import "../../../components/ha-textfield";
-import "../../../components/ha-wa-dialog";
 import { adminChangeUsername } from "../../../data/auth";
 import {
   computeUserBadges,
@@ -44,8 +42,6 @@ class DialogUserDetail extends LitElement {
 
   @state() private _params?: UserDetailDialogParams;
 
-  @state() private _open = false;
-
   @state() private _submitting = false;
 
   public async showDialog(params: UserDetailDialogParams): Promise<void> {
@@ -55,7 +51,6 @@ class DialogUserDetail extends LitElement {
     this._isAdmin = params.entry.group_ids.includes(SYSTEM_GROUP_ID_ADMIN);
     this._localOnly = params.entry.local_only;
     this._isActive = params.entry.is_active;
-    this._open = true;
     await this.updateComplete;
   }
 
@@ -66,12 +61,12 @@ class DialogUserDetail extends LitElement {
     const user = this._params.entry;
     const badges = computeUserBadges(this.hass, user, true);
     return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${user.name}
-        width="medium"
-        @closed=${this._dialogClosed}
+      <ha-dialog
+        open
+        @closed=${this._close}
+        scrimClickAction
+        escapeKeyAction
+        .heading=${createCloseHeading(this.hass, user.name)}
       >
         <div>
           ${this._error
@@ -99,7 +94,7 @@ class DialogUserDetail extends LitElement {
             ${!user.system_generated
               ? html`
                   <ha-textfield
-                    autofocus
+                    dialogInitialFocus
                     .value=${this._name}
                     @input=${this._nameChanged}
                     .label=${this.hass!.localize(
@@ -224,36 +219,32 @@ class DialogUserDetail extends LitElement {
             : nothing}
         </div>
 
-        <ha-dialog-footer slot="footer">
-          <ha-button
-            slot="secondaryAction"
-            variant="danger"
-            appearance="plain"
-            @click=${this._deleteEntry}
-            .disabled=${this._submitting ||
-            user.system_generated ||
-            user.is_owner}
-          >
-            ${this.hass!.localize("ui.panel.config.users.editor.delete_user")}
-          </ha-button>
-          <ha-button
-            slot="secondaryAction"
-            appearance="plain"
-            @click=${this._close}
-          >
-            ${this.hass!.localize("ui.common.cancel")}
-          </ha-button>
-          <ha-button
-            slot="primaryAction"
-            @click=${this._updateEntry}
-            .disabled=${!this._name ||
-            this._submitting ||
-            user.system_generated}
-          >
-            ${this.hass!.localize("ui.common.save")}
-          </ha-button>
-        </ha-dialog-footer>
-      </ha-wa-dialog>
+        <ha-button
+          slot="secondaryAction"
+          variant="danger"
+          appearance="plain"
+          @click=${this._deleteEntry}
+          .disabled=${this._submitting ||
+          user.system_generated ||
+          user.is_owner}
+        >
+          ${this.hass!.localize("ui.panel.config.users.editor.delete_user")}
+        </ha-button>
+        <ha-button
+          slot="primaryAction"
+          appearance="plain"
+          @click=${this._close}
+        >
+          ${this.hass!.localize("ui.common.cancel")}
+        </ha-button>
+        <ha-button
+          slot="primaryAction"
+          @click=${this._updateEntry}
+          .disabled=${!this._name || this._submitting || user.system_generated}
+        >
+          ${this.hass!.localize("ui.common.save")}
+        </ha-button>
+      </ha-dialog>
     `;
   }
 
@@ -297,7 +288,7 @@ class DialogUserDetail extends LitElement {
     this._submitting = true;
     try {
       if (await this._params!.removeEntry()) {
-        this._close();
+        this._params = undefined;
       }
     } finally {
       this._submitting = false;
@@ -369,18 +360,16 @@ class DialogUserDetail extends LitElement {
   }
 
   private _close(): void {
-    this._open = false;
-  }
-
-  private _dialogClosed(): void {
     this._params = undefined;
-    fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
   static get styles(): CSSResultGroup {
     return [
       haStyleDialog,
       css`
+        ha-dialog {
+          --mdc-dialog-max-width: 500px;
+        }
         .form {
           padding-top: 16px;
         }

src/panels/profile/dialog-ha-mfa-module-setup-flow.ts

@@ -1,8 +1,10 @@
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
+import { ifDefined } from "lit/directives/if-defined";
 import { customElement, property, state } from "lit/decorators";
 import "../../components/ha-button";
-import "../../components/ha-dialog";
+import "../../components/ha-dialog-footer";
+import "../../components/ha-wa-dialog";
 import "../../components/ha-form/ha-form";
 import "../../components/ha-markdown";
 import "../../components/ha-spinner";
@@ -28,7 +30,7 @@ class HaMfaModuleSetupFlow extends LitElement {
 
   @state() private _loading = false;
 
-  @state() private _opened = false;
+  @state() private _open = false;
 
   @state() private _stepData: any = {};
 
@@ -39,7 +41,7 @@ class HaMfaModuleSetupFlow extends LitElement {
   public showDialog({ continueFlowId, mfaModuleId, dialogClosedCallback }) {
     this._instance = instance++;
     this._dialogClosedCallback = dialogClosedCallback;
-    this._opened = true;
+    this._open = true;
 
     const fetchStep = continueFlowId
       ? this.hass.callWS({
@@ -61,22 +63,29 @@ class HaMfaModuleSetupFlow extends LitElement {
   }
 
   public closeDialog() {
+    this._open = false;
+  }
+
+  private _dialogClosed() {
     // Closed dialog by clicking on the overlay
     if (this._step) {
       this._flowDone();
+      return;
     }
-    this._opened = false;
+
+    this._resetDialogState();
   }
 
   protected render() {
-    if (!this._opened) {
+    if (this._instance === undefined) {
       return nothing;
     }
     return html`
-      <ha-dialog
-        open
-        .heading=${this._computeStepTitle()}
-        @closed=${this.closeDialog}
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${this._computeStepTitle()}
+        @closed=${this._dialogClosed}
       >
         <div>
           ${this._errorMessage
@@ -115,6 +124,7 @@ class HaMfaModuleSetupFlow extends LitElement {
                           )}
                         ></ha-markdown>
                         <ha-form
+                          autofocus
                           .hass=${this.hass}
                           .data=${this._stepData}
                           .schema=${autocompleteLoginFields(
@@ -127,31 +137,33 @@ class HaMfaModuleSetupFlow extends LitElement {
                         ></ha-form>`
                     : ""}`}
         </div>
-        <ha-button
-          slot="primaryAction"
-          @click=${this.closeDialog}
-          appearance=${["abort", "create_entry"].includes(
-            this._step?.type || ""
-          )
-            ? "accent"
-            : "plain"}
-          >${this.hass.localize(
-            ["abort", "create_entry"].includes(this._step?.type || "")
-              ? "ui.panel.profile.mfa_setup.close"
-              : "ui.common.cancel"
-          )}</ha-button
-        >
-        ${this._step?.type === "form"
-          ? html`<ha-button
-              slot="primaryAction"
-              .disabled=${this._loading}
-              @click=${this._submitStep}
-              >${this.hass.localize(
-                "ui.panel.profile.mfa_setup.submit"
-              )}</ha-button
-            >`
-          : nothing}
-      </ha-dialog>
+        <ha-dialog-footer slot="footer">
+          <ha-button
+            slot=${this._step?.type === "form"
+              ? "secondaryAction"
+              : "primaryAction"}
+            appearance=${ifDefined(
+              this._step?.type === "form" ? "plain" : undefined
+            )}
+            @click=${this.closeDialog}
+            >${this.hass.localize(
+              ["abort", "create_entry"].includes(this._step?.type || "")
+                ? "ui.panel.profile.mfa_setup.close"
+                : "ui.common.cancel"
+            )}</ha-button
+          >
+          ${this._step?.type === "form"
+            ? html`<ha-button
+                slot="primaryAction"
+                .disabled=${this._loading}
+                @click=${this._submitStep}
+                >${this.hass.localize(
+                  "ui.panel.profile.mfa_setup.submit"
+                )}</ha-button
+              >`
+            : nothing}
+        </ha-dialog-footer>
+      </ha-wa-dialog>
     `;
   }
 
@@ -162,9 +174,6 @@ class HaMfaModuleSetupFlow extends LitElement {
         .error {
           color: red;
         }
-        ha-dialog {
-          max-width: 500px;
-        }
         ha-markdown {
           --markdown-svg-background-color: white;
           --markdown-svg-color: black;
@@ -251,12 +260,15 @@ class HaMfaModuleSetupFlow extends LitElement {
     this._dialogClosedCallback!({
       flowFinished,
     });
+    this._resetDialogState();
+  }
 
+  private _resetDialogState() {
     this._errorMessage = undefined;
     this._step = undefined;
     this._stepData = {};
     this._dialogClosedCallback = undefined;
-    this.closeDialog();
+    this._instance = undefined;
   }
 
   private _computeStepTitle() {

src/panels/profile/ha-long-lived-access-token-dialog.ts

@@ -3,10 +3,10 @@ import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import { createCloseHeading } from "../../components/ha-dialog";
 import "../../components/ha-textfield";
 import "../../components/ha-button";
 import "../../components/ha-icon-button";
+import "../../components/ha-wa-dialog";
 import { haStyleDialog } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
 import type { LongLivedAccessTokenDialogParams } from "./show-long-lived-access-token-dialog";
@@ -24,11 +24,18 @@ export class HaLongLivedAccessTokenDialog extends LitElement {
 
   @state() private _qrCode?: TemplateResult;
 
+  @state() private _open = false;
+
   public showDialog(params: LongLivedAccessTokenDialogParams): void {
     this._params = params;
+    this._open = true;
   }
 
   public closeDialog() {
+    this._open = false;
+  }
+
+  private _dialogClosed() {
     this._params = undefined;
     this._qrCode = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
@@ -40,15 +47,15 @@ export class HaLongLivedAccessTokenDialog extends LitElement {
     }
 
     return html`
-      <ha-dialog
-        open
-        hideActions
-        .heading=${createCloseHeading(this.hass, this._params.name)}
-        @closed=${this.closeDialog}
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${this._params.name}
+        @closed=${this._dialogClosed}
       >
         <div>
           <ha-textfield
-            dialogInitialFocus
+            autofocus
             .value=${this._params.token}
             .label=${this.hass.localize(
               "ui.panel.profile.long_lived_access_tokens.prompt_copy_token"
@@ -79,7 +86,7 @@ export class HaLongLivedAccessTokenDialog extends LitElement {
                 `}
           </div>
         </div>
-      </ha-dialog>
+      </ha-wa-dialog>
     `;
   }