Remove unneeded close dialog calls

src/components/ha-related-items.ts

@@ -164,7 +164,6 @@ export class HaRelatedItems extends LitElement {
                 return html`
                   <a
                     href=${`/config/integrations/integration/${entry.domain}#config_entry=${entry.entry_id}`}
-                    @click=${this._navigateAwayClose}
                   >
                     <ha-list-item hasMeta graphic="icon">
                       <img
@@ -191,7 +190,6 @@ export class HaRelatedItems extends LitElement {
                   (integration) =>
                     html`<a
                       href=${`/config/integrations/integration/${integration}`}
-                      @click=${this._navigateAwayClose}
                     >
                       <ha-list-item hasMeta graphic="icon">
                         <img
@@ -223,10 +221,7 @@ export class HaRelatedItems extends LitElement {
                 return nothing;
               }
               return html`
-                <a
-                  href="/config/devices/device/${relatedDeviceId}"
-                  @click=${this._navigateAwayClose}
-                >
+                <a href="/config/devices/device/${relatedDeviceId}">
                   <ha-list-item hasMeta graphic="icon">
                     <ha-svg-icon
                       .path=${mdiDevices}
@@ -251,10 +246,7 @@ export class HaRelatedItems extends LitElement {
                   return nothing;
                 }
                 return html`
-                  <a
-                    href="/config/areas/area/${relatedAreaId}"
-                    @click=${this._navigateAwayClose}
-                  >
+                  <a href="/config/areas/area/${relatedAreaId}">
                     <ha-list-item
                       hasMeta
                       .graphic=${area.picture ? "avatar" : "icon"}
@@ -364,10 +356,7 @@ export class HaRelatedItems extends LitElement {
                 const blueprintMeta = this._blueprints
                   ? this._blueprints.automation[path]
                   : undefined;
-                return html`<a
-                  href="/config/blueprint/dashboard"
-                  @click=${this._navigateAwayClose}
-                >
+                return html`<a href="/config/blueprint/dashboard">
                   <ha-list-item hasMeta graphic="icon">
                     <ha-svg-icon
                       .path=${mdiPaletteSwatch}
@@ -421,10 +410,7 @@ export class HaRelatedItems extends LitElement {
                 const blueprintMeta = this._blueprints
                   ? this._blueprints.script[path]
                   : undefined;
-                return html`<a
-                  href="/config/blueprint/dashboard"
-                  @click=${this._navigateAwayClose}
-                >
+                return html`<a href="/config/blueprint/dashboard">
                   <ha-list-item hasMeta graphic="icon">
                     <ha-svg-icon
                       .path=${mdiPaletteSwatch}
@@ -468,14 +454,6 @@ export class HaRelatedItems extends LitElement {
     `;
   }
 
-  private async _navigateAwayClose() {
-    // allow new page to open before closing dialog
-    await new Promise((resolve) => {
-      setTimeout(resolve, 0);
-    });
-    fireEvent(this, "close-dialog");
-  }
-
   private async _findRelated() {
     this._related = await findRelated(this.hass, this.itemType, this.itemId);
     if (this._related.config_entry) {

src/dialogs/more-info/ha-more-info-history.ts

@@ -3,7 +3,6 @@ import type { PropertyValues } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
-import { fireEvent } from "../../common/dom/fire_event";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { createSearchParam } from "../../common/url/search-params";
 import type { ChartResizeOptions } from "../../components/chart/ha-chart-base";
@@ -77,7 +76,7 @@ export class MoreInfoHistory extends LitElement {
             </div>
             ${__DEMO__
               ? nothing
-              : html`<a href=${this._showMoreHref} @click=${this._close}
+              : html`<a href=${this._showMoreHref}
                   >${this.hass.localize(
                     "ui.dialogs.more_info_control.show_more"
                   )}</a
@@ -244,10 +243,6 @@ export class MoreInfoHistory extends LitElement {
     this._setRedrawTimer();
   }
 
-  private _close(): void {
-    setTimeout(() => fireEvent(this, "close-dialog"), 500);
-  }
-
   static styles = css`
     .header {
       display: flex;

src/dialogs/more-info/ha-more-info-logbook.ts

@@ -4,7 +4,6 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
-import { fireEvent } from "../../common/dom/fire_event";
 import { createSearchParam } from "../../common/url/search-params";
 import "../../panels/logbook/ha-logbook";
 import type { HomeAssistant } from "../../types";
@@ -36,7 +35,7 @@ export class MoreInfoLogbook extends LitElement {
         <div class="title">
           ${this.hass.localize("ui.dialogs.more_info_control.logbook")}
         </div>
-        <a href=${this._showMoreHref} @click=${this._close}
+        <a href=${this._showMoreHref}
           >${this.hass.localize("ui.dialogs.more_info_control.show_more")}</a
         >
       </div>
@@ -67,10 +66,6 @@ export class MoreInfoLogbook extends LitElement {
     }
   }
 
-  private _close(): void {
-    setTimeout(() => fireEvent(this, "close-dialog"), 500);
-  }
-
   static get styles() {
     return [
       css`

src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts

@@ -142,7 +142,7 @@ export class HaVoiceCommandDialog extends LitElement {
               ${this.hass.user?.is_admin
                 ? html`<li divider role="separator"></li>
                     <a href="/config/voice-assistants/assistants"
-                      ><ha-list-item @click=${this.closeDialog}
+                      ><ha-list-item
                         >${this.hass.localize(
                           "ui.dialogs.voice_command.manage_assistants"
                         )}</ha-list-item

src/panels/config/integrations/ha-domain-integrations.ts

@@ -237,7 +237,6 @@ class HaDomainIntegrations extends LitElement {
       ["cloud", "google_assistant", "alexa"].includes(domain) &&
       isComponentLoaded(this.hass, "cloud")
     ) {
-      fireEvent(this, "close-dialog");
       navigate("/config/cloud");
       return;
     }

src/panels/config/person/dialog-person-detail.ts

@@ -33,6 +33,7 @@ import { documentationUrl } from "../../../util/documentation-url";
 import { showAddUserDialog } from "../users/show-dialog-add-user";
 import { showAdminChangePasswordDialog } from "../users/show-dialog-admin-change-password";
 import type { PersonDetailDialogParams } from "./show-dialog-person-detail";
+import { fireEvent } from "../../../common/dom/fire_event";
 
 const includeDomains = ["device_tracker"];
 
@@ -101,6 +102,20 @@ class DialogPersonDetail extends LitElement {
     await this.updateComplete;
   }
 
+  public closeDialog() {
+    // If we do not have a person ID yet (= person creation dialog was just cancelled), but
+    // we already created a user ID for it, delete it now to not have it "free floating".
+    if (!this._personExists && this._userId) {
+      const callback = this._params?.refreshUsers;
+      deleteUser(this.hass, this._userId).then(() => {
+        callback?.();
+      });
+      this._userId = undefined;
+    }
+    this._params = undefined;
+    fireEvent(this, "dialog-closed", { dialog: this.localName });
+  }
+
   protected render() {
     if (!this._params) {
       return nothing;
@@ -109,7 +124,7 @@ class DialogPersonDetail extends LitElement {
     return html`
       <ha-dialog
         open
-        @closed=${this._close}
+        @closed=${this.closeDialog}
         scrimClickAction
         escapeKeyAction
         .heading=${createCloseHeading(
@@ -163,7 +178,7 @@ class DialogPersonDetail extends LitElement {
             </ha-settings-row>
 
             ${this._renderUserFields()}
-            ${this._deviceTrackersAvailable(this.hass)
+            ${!this._deviceTrackersAvailable(this.hass)
               ? html`
                   <p>
                     ${this.hass.localize(
@@ -205,10 +220,7 @@ class DialogPersonDetail extends LitElement {
                       >
                     </li>
                     <li>
-                      <a
-                        @click=${this._closeDialog}
-                        href="/config/integrations"
-                      >
+                      <a @click=${this.closeDialog} href="/config/integrations">
                         ${this.hass!.localize(
                           "ui.panel.config.person.detail.link_integrations_page"
                         )}</a
@@ -329,10 +341,6 @@ class DialogPersonDetail extends LitElement {
     `;
   }
 
-  private _closeDialog() {
-    this._params = undefined;
-  }
-
   private _nameChanged(ev) {
     this._error = undefined;
     this._name = ev.target.value;
@@ -496,7 +504,7 @@ class DialogPersonDetail extends LitElement {
         await this._params!.createEntry(values);
         this._personExists = true;
       }
-      this._params = undefined;
+      this.closeDialog();
     } catch (err: any) {
       this._error = err ? err.message : "Unknown error";
     } finally {
@@ -511,25 +519,13 @@ class DialogPersonDetail extends LitElement {
         if (this._params!.entry!.user_id) {
           deleteUser(this.hass, this._params!.entry!.user_id);
         }
-        this._params = undefined;
+        this.closeDialog();
       }
     } finally {
       this._submitting = false;
     }
   }
 
-  private _close(): void {
-    // If we do not have a person ID yet (= person creation dialog was just cancelled), but
-    // we already created a user ID for it, delete it now to not have it "free floating".
-    if (!this._personExists && this._userId) {
-      deleteUser(this.hass, this._userId);
-      this._params?.refreshUsers();
-      this._userId = undefined;
-    }
-
-    this._params = undefined;
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyleDialog,

src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts

@@ -181,11 +181,7 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
                   ${this.hass.localize(
                     "ui.panel.config.voice_assistants.assistants.pipeline.detail.no_cloud_message"
                   )}
-                  <a
-                    href="/config/cloud"
-                    slot="action"
-                    @click=${this.closeDialog}
-                  >
+                  <a href="/config/cloud" slot="action">
                     <ha-button>
                       ${this.hass.localize(
                         "ui.panel.config.voice_assistants.assistants.pipeline.detail.no_cloud_action"