From c7882f392681fddf86da8dc4ba638cea3e5ab055 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 5 May 2025 13:48:29 -0400
Subject: [PATCH] Populate integration domain My link (#25322)

* Populate integration domain My link

* break out of loop

* Actually just return from function

* Consolidate code
---
 src/state/quick-bar-mixin.ts | 60 +++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/src/state/quick-bar-mixin.ts b/src/state/quick-bar-mixin.ts
index 6e931a9bd7..f0effc7f03 100644
--- a/src/state/quick-bar-mixin.ts
+++ b/src/state/quick-bar-mixin.ts
@@ -16,6 +16,7 @@ import { extractSearchParamsObject } from "../common/url/search-params";
 import { showVoiceCommandDialog } from "../dialogs/voice-command-dialog/show-ha-voice-command-dialog";
 import { canOverrideAlphanumericInput } from "../common/dom/can-override-input";
 import { showShortcutsDialog } from "../dialogs/shortcuts/show-shortcuts-dialog";
+import type { Redirects } from "../panels/my/ha-panel-my";
 
 declare global {
   interface HASSDomEvents {
@@ -143,49 +144,44 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
       e.preventDefault();
 
       const targetPath = mainWindow.location.pathname;
-      const isHassio = isComponentLoaded(this.hass, "hassio");
       const myParams = new URLSearchParams();
 
-      if (isHassio && targetPath.startsWith("/hassio")) {
+      let redirects: Redirects;
+
+      if (targetPath.startsWith("/hassio")) {
         const myPanelSupervisor = await import(
           "../../hassio/src/hassio-my-redirect"
         );
-        for (const [slug, redirect] of Object.entries(
-          myPanelSupervisor.REDIRECTS
-        )) {
-          if (targetPath.startsWith(redirect.redirect)) {
-            myParams.append("redirect", slug);
-            if (redirect.redirect === "/hassio/addon") {
-              myParams.append("addon", targetPath.split("/")[3]);
-            }
-            window.open(
-              `https://my.home-assistant.io/create-link/?${myParams.toString()}`,
-              "_blank"
-            );
-            return;
-          }
-        }
+        redirects = myPanelSupervisor.REDIRECTS;
+      } else {
+        const myPanel = await import("../panels/my/ha-panel-my");
+        redirects = myPanel.getMyRedirects();
       }
 
-      const myPanel = await import("../panels/my/ha-panel-my");
+      for (const [slug, redirect] of Object.entries(redirects)) {
+        if (!targetPath.startsWith(redirect.redirect)) {
+          continue;
+        }
+        myParams.append("redirect", slug);
 
-      for (const [slug, redirect] of Object.entries(myPanel.getMyRedirects())) {
-        if (targetPath.startsWith(redirect.redirect)) {
-          myParams.append("redirect", slug);
-          if (redirect.params) {
-            const params = extractSearchParamsObject();
-            for (const key of Object.keys(redirect.params)) {
-              if (key in params) {
-                myParams.append(key, params[key]);
-              }
+        if (redirect.params) {
+          const params = extractSearchParamsObject();
+          for (const key of Object.keys(redirect.params)) {
+            if (key in params) {
+              myParams.append(key, params[key]);
             }
           }
-          window.open(
-            `https://my.home-assistant.io/create-link/?${myParams.toString()}`,
-            "_blank"
-          );
-          return;
         }
+        if (redirect.redirect === "/config/integrations/integration") {
+          myParams.append("domain", targetPath.split("/")[4]);
+        } else if (redirect.redirect === "/hassio/addon") {
+          myParams.append("addon", targetPath.split("/")[3]);
+        }
+        window.open(
+          `https://my.home-assistant.io/create-link/?${myParams.toString()}`,
+          "_blank"
+        );
+        return;
       }
       showToast(this, {
         message: this.hass.localize(