From 6e7366bf690f500f9cfa4f81aefd002c822dc9ed Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 3 Jan 2024 10:37:30 +0100
Subject: [PATCH] Calculate used domains on open of action dialog (#19255)

---
 .../automation/add-automation-element-dialog.ts     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts
index 06a77884f1c6..f8be65baf183 100644
--- a/src/panels/config/automation/add-automation-element-dialog.ts
+++ b/src/panels/config/automation/add-automation-element-dialog.ts
@@ -122,6 +122,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
     if (this._params?.type === "action") {
       this.hass.loadBackendTranslation("services");
       this._fetchManifests();
+      this._calculateUsedDomains();
     }
     this._fullScreen = matchMedia(
       "all and (max-width: 450px), all and (max-height: 500px)"
@@ -425,6 +426,13 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
     this._manifests = manifests;
   }
 
+  private _calculateUsedDomains() {
+    const domains = new Set(Object.keys(this.hass.states).map(computeDomain));
+    if (!deepEqual(domains, this._domains)) {
+      this._domains = domains;
+    }
+  }
+
   protected _opened(): void {
     // Store the width and height so that when we search, box doesn't jump
     const boundingRect =
@@ -439,10 +447,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
       changedProperties.has("hass") &&
       changedProperties.get("hass")?.states !== this.hass.states
     ) {
-      const domains = new Set(Object.keys(this.hass.states).map(computeDomain));
-      if (!deepEqual(domains, this._domains)) {
-        this._domains = domains;
-      }
+      this._calculateUsedDomains();
     }
   }