Migrate config-cloud dialog(s) to wa

src/panels/config/cloud/account/dialog-cloud-tts-try.ts

@@ -8,7 +8,7 @@ import { computeStateDomain } from "../../../../common/entity/compute_state_doma
 import { computeStateName } from "../../../../common/entity/compute_state_name";
 import { supportsFeature } from "../../../../common/entity/supports-feature";
 import "../../../../components/ha-button";
-import { createCloseHeading } from "../../../../components/ha-dialog";
+import "../../../../components/ha-dialog-footer";
 import "../../../../components/ha-select";
 import type {
   HaSelectOption,
@@ -16,6 +16,7 @@ import type {
 } from "../../../../components/ha-select";
 import "../../../../components/ha-textarea";
 import type { HaTextArea } from "../../../../components/ha-textarea";
+import "../../../../components/ha-wa-dialog";
 import { showAutomationEditor } from "../../../../data/automation";
 import { MediaPlayerEntityFeature } from "../../../../data/media-player";
 import { convertTextToSpeech } from "../../../../data/tts";
@@ -30,6 +31,8 @@ export class DialogTryTts extends LitElement {
 
   @state() private _loadingExample = false;
 
+  @state() private _open = false;
+
   @state() private _params?: TryTtsDialogParams;
 
   @query("#message") private _messageInput?: HaTextArea;
@@ -50,9 +53,14 @@ export class DialogTryTts extends LitElement {
 
   public showDialog(params: TryTtsDialogParams) {
     this._params = params;
+    this._open = true;
   }
 
   public closeDialog() {
+    this._open = false;
+  }
+
+  private _dialogClosed() {
     this._params = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
@@ -82,20 +90,20 @@ export class DialogTryTts extends LitElement {
     });
 
     return html`
-      <ha-dialog
-        open
-        @closed=${this.closeDialog}
-        scrimClickAction
-        escapeKeyAction
-        .heading=${createCloseHeading(
-          this.hass,
-          this.hass.localize("ui.panel.config.cloud.account.tts.dialog.header")
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${this.hass.localize(
+          "ui.panel.config.cloud.account.tts.dialog.header"
         )}
+        width="medium"
+        @closed=${this._dialogClosed}
       >
         <div>
           <ha-textarea
             autogrow
             id="message"
+            autofocus
             .label=${this.hass.localize(
               "ui.panel.config.cloud.account.tts.dialog.message"
             )}
@@ -118,26 +126,33 @@ export class DialogTryTts extends LitElement {
           >
           </ha-select>
         </div>
-        <ha-button
-          slot="primaryAction"
-          @click=${this._playExample}
-          .disabled=${this._loadingExample}
-        >
-          <ha-svg-icon slot="start" .path=${mdiPlayCircleOutline}></ha-svg-icon>
-          ${this.hass.localize("ui.panel.config.cloud.account.tts.dialog.play")}
-        </ha-button>
-        <ha-button
-          appearance="plain"
-          slot="secondaryAction"
-          .disabled=${target === "browser"}
-          @click=${this._createAutomation}
-        >
-          <ha-svg-icon slot="start" .path=${mdiRobot}></ha-svg-icon>
-          ${this.hass.localize(
-            "ui.panel.config.cloud.account.tts.dialog.create_automation"
-          )}
-        </ha-button>
-      </ha-dialog>
+        <ha-dialog-footer slot="footer">
+          <ha-button
+            appearance="plain"
+            slot="secondaryAction"
+            .disabled=${target === "browser"}
+            @click=${this._createAutomation}
+          >
+            <ha-svg-icon slot="start" .path=${mdiRobot}></ha-svg-icon>
+            ${this.hass.localize(
+              "ui.panel.config.cloud.account.tts.dialog.create_automation"
+            )}
+          </ha-button>
+          <ha-button
+            slot="primaryAction"
+            @click=${this._playExample}
+            .disabled=${this._loadingExample}
+          >
+            <ha-svg-icon
+              slot="start"
+              .path=${mdiPlayCircleOutline}
+            ></ha-svg-icon>
+            ${this.hass.localize(
+              "ui.panel.config.cloud.account.tts.dialog.play"
+            )}
+          </ha-button>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
     `;
   }
 
@@ -223,9 +238,6 @@ export class DialogTryTts extends LitElement {
     return [
       haStyleDialog,
       css`
-        ha-dialog {
-          --mdc-dialog-max-width: 500px;
-        }
         ha-textarea,
         ha-select {
           display: block;

src/panels/config/cloud/dialog-cloud-already-connected/dialog-cloud-already-connected.ts

@@ -6,8 +6,9 @@ import { formatDateTime } from "../../../../common/datetime/format_date_time";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-alert";
 import "../../../../components/ha-button";
-import { createCloseHeading } from "../../../../components/ha-dialog";
+import "../../../../components/ha-dialog-footer";
 import "../../../../components/ha-icon-button";
+import "../../../../components/ha-wa-dialog";
 import { haStyleDialog } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
 import { obfuscateUrl } from "../../../../util/url";
@@ -19,13 +20,21 @@ class DialogCloudAlreadyConnected extends LitElement {
 
   @state() private _params?: CloudAlreadyConnectedDialogParams;
 
+  @state() private _open = false;
+
   @state() private _obfuscateIp = true;
 
   public showDialog(params: CloudAlreadyConnectedDialogParams) {
     this._params = params;
+    this._open = true;
   }
 
   public closeDialog() {
+    this._open = false;
+  }
+
+  private _dialogClosed() {
+    this._open = false;
     this._params?.closeDialog?.();
     this._params = undefined;
     this._obfuscateIp = true;
@@ -39,15 +48,14 @@ class DialogCloudAlreadyConnected extends LitElement {
     const { details } = this._params;
 
     return html`
-      <ha-dialog
-        open
-        @closed=${this.closeDialog}
-        .heading=${createCloseHeading(
-          this.hass,
-          this.hass.localize(
-            "ui.panel.config.cloud.dialog_already_connected.heading"
-          )
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${this.hass.localize(
+          "ui.panel.config.cloud.dialog_already_connected.heading"
         )}
+        @closed=${this._dialogClosed}
+        width="medium"
       >
         <div class="intro">
           <span>
@@ -131,19 +139,21 @@ class DialogCloudAlreadyConnected extends LitElement {
           )}
         </ha-alert>
 
-        <ha-button
-          appearance="plain"
-          @click=${this.closeDialog}
-          slot="secondaryAction"
-        >
-          ${this.hass!.localize("ui.common.cancel")}
-        </ha-button>
-        <ha-button @click=${this._logInHere} slot="primaryAction">
-          ${this.hass!.localize(
-            "ui.panel.config.cloud.dialog_already_connected.login_here"
-          )}
-        </ha-button>
-      </ha-dialog>
+        <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._logInHere}>
+            ${this.hass!.localize(
+              "ui.panel.config.cloud.dialog_already_connected.login_here"
+            )}
+          </ha-button>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
     `;
   }
 
@@ -160,9 +170,6 @@ class DialogCloudAlreadyConnected extends LitElement {
     return [
       haStyleDialog,
       css`
-        ha-dialog {
-          --mdc-dialog-max-width: 535px;
-        }
         .intro b {
           display: block;
           margin-top: 16px;

src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts

@@ -3,10 +3,11 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, state } from "lit/decorators";
 import { formatDateTime } from "../../../../common/datetime/format_date_time";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { createCloseHeading } from "../../../../components/ha-dialog";
+import "../../../../components/ha-dialog-footer";
 import { haStyleDialog } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
 import "../../../../components/ha-button";
+import "../../../../components/ha-wa-dialog";
 import type { CloudCertificateParams as CloudCertificateDialogParams } from "./show-dialog-cloud-certificate";
 
 @customElement("dialog-cloud-certificate")
@@ -15,11 +16,19 @@ class DialogCloudCertificate extends LitElement {
 
   @state() private _params?: CloudCertificateDialogParams;
 
+  @state() private _open = false;
+
   public showDialog(params: CloudCertificateDialogParams) {
     this._params = params;
+    this._open = true;
   }
 
   public closeDialog() {
+    this._open = false;
+  }
+
+  private _dialogClosed() {
+    this._open = false;
     this._params = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
@@ -31,16 +40,14 @@ class DialogCloudCertificate extends LitElement {
     const { certificateInfo } = this._params;
 
     return html`
-      <ha-dialog
-        open
-        hideActions
-        @closed=${this.closeDialog}
-        .heading=${createCloseHeading(
-          this.hass,
-          this.hass.localize(
-            "ui.panel.config.cloud.dialog_certificate.certificate_information"
-          )
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${this.hass.localize(
+          "ui.panel.config.cloud.dialog_certificate.certificate_information"
         )}
+        @closed=${this._dialogClosed}
+        width="medium"
       >
         <div>
           <p>
@@ -74,12 +81,14 @@ class DialogCloudCertificate extends LitElement {
           </ul>
         </div>
 
-        <ha-button @click=${this.closeDialog} slot="primaryAction">
-          ${this.hass!.localize(
-            "ui.panel.config.cloud.dialog_certificate.close"
-          )}
-        </ha-button>
-      </ha-dialog>
+        <ha-dialog-footer slot="footer">
+          <ha-button slot="primaryAction" @click=${this.closeDialog}>
+            ${this.hass!.localize(
+              "ui.panel.config.cloud.dialog_certificate.close"
+            )}
+          </ha-button>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
     `;
   }
 
@@ -87,9 +96,6 @@ class DialogCloudCertificate extends LitElement {
     return [
       haStyleDialog,
       css`
-        ha-dialog {
-          --mdc-dialog-max-width: 535px;
-        }
         .break-word {
           overflow-wrap: break-word;
         }

src/panels/config/cloud/dialog-manage-cloudhook/dialog-manage-cloudhook.ts

@@ -3,7 +3,7 @@ import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { createCloseHeading } from "../../../../components/ha-dialog";
+import "../../../../components/ha-dialog-footer";
 import { showConfirmationDialog } from "../../../../dialogs/generic/show-dialog-box";
 import { haStyle, haStyleDialog } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
@@ -12,6 +12,7 @@ import type { WebhookDialogParams } from "./show-dialog-manage-cloudhook";
 
 import "../../../../components/ha-button";
 import "../../../../components/ha-copy-textfield";
+import "../../../../components/ha-wa-dialog";
 
 @customElement("dialog-manage-cloudhook")
 export class DialogManageCloudhook extends LitElement {
@@ -19,11 +20,19 @@ export class DialogManageCloudhook extends LitElement {
 
   @state() private _params?: WebhookDialogParams;
 
+  @state() private _open = false;
+
   public showDialog(params: WebhookDialogParams) {
     this._params = params;
+    this._open = true;
   }
 
   public closeDialog() {
+    this._open = false;
+  }
+
+  private _dialogClosed() {
+    this._open = false;
     this._params = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
@@ -41,17 +50,15 @@ export class DialogManageCloudhook extends LitElement {
           )
         : documentationUrl(this.hass!, `/integrations/${webhook.domain}/`);
     return html`
-      <ha-dialog
-        open
-        hideActions
-        @closed=${this.closeDialog}
-        .heading=${createCloseHeading(
-          this.hass!,
-          this.hass!.localize(
-            "ui.panel.config.cloud.dialog_cloudhook.webhook_for",
-            { name: webhook.name }
-          )
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${this.hass!.localize(
+          "ui.panel.config.cloud.dialog_cloudhook.webhook_for",
+          { name: webhook.name }
         )}
+        @closed=${this._dialogClosed}
+        width="large"
       >
         <div>
           <p>
@@ -87,21 +94,25 @@ export class DialogManageCloudhook extends LitElement {
           ></ha-copy-textfield>
         </div>
 
-        <ha-button
-          href=${docsUrl}
-          target="_blank"
-          rel="noreferrer"
-          slot="secondaryAction"
-          appearance="plain"
-        >
-          ${this.hass!.localize(
-            "ui.panel.config.cloud.dialog_cloudhook.view_documentation"
-          )}
-        </ha-button>
-        <ha-button @click=${this.closeDialog} slot="primaryAction">
-          ${this.hass!.localize("ui.panel.config.cloud.dialog_cloudhook.close")}
-        </ha-button>
-      </ha-dialog>
+        <ha-dialog-footer slot="footer">
+          <ha-button
+            slot="secondaryAction"
+            href=${docsUrl}
+            target="_blank"
+            rel="noreferrer"
+            appearance="plain"
+          >
+            ${this.hass!.localize(
+              "ui.panel.config.cloud.dialog_cloudhook.view_documentation"
+            )}
+          </ha-button>
+          <ha-button slot="primaryAction" @click=${this.closeDialog}>
+            ${this.hass!.localize(
+              "ui.panel.config.cloud.dialog_cloudhook.close"
+            )}
+          </ha-button>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
     `;
   }
 
@@ -129,9 +140,6 @@ export class DialogManageCloudhook extends LitElement {
       haStyle,
       haStyleDialog,
       css`
-        ha-dialog {
-          width: 650px;
-        }
         button.link {
           color: var(--primary-color);
           text-decoration: none;

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

@@ -1,10 +1,8 @@
 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-footer";
-import "../../components/ha-wa-dialog";
+import "../../components/ha-dialog";
 import "../../components/ha-form/ha-form";
 import "../../components/ha-markdown";
 import "../../components/ha-spinner";
@@ -30,7 +28,7 @@ class HaMfaModuleSetupFlow extends LitElement {
 
   @state() private _loading = false;
 
-  @state() private _open = false;
+  @state() private _opened = false;
 
   @state() private _stepData: any = {};
 
@@ -41,7 +39,7 @@ class HaMfaModuleSetupFlow extends LitElement {
   public showDialog({ continueFlowId, mfaModuleId, dialogClosedCallback }) {
     this._instance = instance++;
     this._dialogClosedCallback = dialogClosedCallback;
-    this._open = true;
+    this._opened = true;
 
     const fetchStep = continueFlowId
       ? this.hass.callWS({
@@ -63,29 +61,22 @@ 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._resetDialogState();
+    this._opened = false;
   }
 
   protected render() {
-    if (this._instance === undefined) {
+    if (!this._opened) {
       return nothing;
     }
     return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${this._computeStepTitle()}
-        @closed=${this._dialogClosed}
+      <ha-dialog
+        open
+        .heading=${this._computeStepTitle()}
+        @closed=${this.closeDialog}
       >
         <div>
           ${this._errorMessage
@@ -124,7 +115,6 @@ class HaMfaModuleSetupFlow extends LitElement {
                           )}
                         ></ha-markdown>
                         <ha-form
-                          autofocus
                           .hass=${this.hass}
                           .data=${this._stepData}
                           .schema=${autocompleteLoginFields(
@@ -137,33 +127,31 @@ class HaMfaModuleSetupFlow extends LitElement {
                         ></ha-form>`
                     : ""}`}
         </div>
-        <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>
+        <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>
     `;
   }
 
@@ -174,6 +162,9 @@ class HaMfaModuleSetupFlow extends LitElement {
         .error {
           color: red;
         }
+        ha-dialog {
+          max-width: 500px;
+        }
         ha-markdown {
           --markdown-svg-background-color: white;
           --markdown-svg-color: black;
@@ -260,15 +251,12 @@ class HaMfaModuleSetupFlow extends LitElement {
     this._dialogClosedCallback!({
       flowFinished,
     });
-    this._resetDialogState();
-  }
 
-  private _resetDialogState() {
     this._errorMessage = undefined;
     this._step = undefined;
     this._stepData = {};
     this._dialogClosedCallback = undefined;
-    this._instance = undefined;
+    this.closeDialog();
   }
 
   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,18 +24,11 @@ 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 });
@@ -47,15 +40,15 @@ export class HaLongLivedAccessTokenDialog extends LitElement {
     }
 
     return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${this._params.name}
-        @closed=${this._dialogClosed}
+      <ha-dialog
+        open
+        hideActions
+        .heading=${createCloseHeading(this.hass, this._params.name)}
+        @closed=${this.closeDialog}
       >
         <div>
           <ha-textfield
-            autofocus
+            dialogInitialFocus
             .value=${this._params.token}
             .label=${this.hass.localize(
               "ui.panel.profile.long_lived_access_tokens.prompt_copy_token"
@@ -86,7 +79,7 @@ export class HaLongLivedAccessTokenDialog extends LitElement {
                 `}
           </div>
         </div>
-      </ha-wa-dialog>
+      </ha-dialog>
     `;
   }