From 650d579d059022b3097ec851c07a7af40c84eb19 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Fri, 30 Sep 2022 20:52:20 +0200
Subject: [PATCH] Link google assistant, alexa and cloud to cloud config
 (#13933)

---
 .../integrations/dialog-add-integration.ts    | 22 +++++++++++++------
 .../integrations/ha-domain-integrations.ts    | 18 ++++++++++++---
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/panels/config/integrations/dialog-add-integration.ts b/src/panels/config/integrations/dialog-add-integration.ts
index bd96196143..f023eee2ae 100644
--- a/src/panels/config/integrations/dialog-add-integration.ts
+++ b/src/panels/config/integrations/dialog-add-integration.ts
@@ -296,14 +296,13 @@ class AddIntegrationDialog extends LitElement {
       scrimClickAction
       escapeKeyAction
       hideActions
-      .heading=${this._pickedBrand
-        ? true
-        : createCloseHeading(
-            this.hass,
-            this.hass.localize("ui.panel.config.integrations.new")
-          )}
+      .heading=${createCloseHeading(
+        this.hass,
+        this.hass.localize("ui.panel.config.integrations.new")
+      )}
     >
-      ${this._pickedBrand
+      ${this._pickedBrand &&
+      (!this._integrations || this._pickedBrand in this._integrations)
         ? html`<div slot="heading">
               <ha-icon-button-prev
                 @click=${this._prevClicked}
@@ -533,6 +532,15 @@ class AddIntegrationDialog extends LitElement {
       return;
     }
 
+    if (
+      ["cloud", "google_assistant", "alexa"].includes(integration.domain) &&
+      isComponentLoaded(this.hass, "cloud")
+    ) {
+      this.closeDialog();
+      navigate("/config/cloud");
+      return;
+    }
+
     const manifest = await fetchIntegrationManifest(
       this.hass,
       integration.domain
diff --git a/src/panels/config/integrations/ha-domain-integrations.ts b/src/panels/config/integrations/ha-domain-integrations.ts
index c4b739206a..2c0690639e 100644
--- a/src/panels/config/integrations/ha-domain-integrations.ts
+++ b/src/panels/config/integrations/ha-domain-integrations.ts
@@ -1,7 +1,9 @@
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { protocolIntegrationPicked } from "../../../common/integrations/protocolIntegrationPicked";
+import { navigate } from "../../../common/navigate";
 import { caseInsensitiveStringCompare } from "../../../common/string/compare";
 import { localizeConfigFlowTitle } from "../../../data/config_flow";
 import { DataEntryFlowProgress } from "../../../data/data_entry_flow";
@@ -26,7 +28,7 @@ class HaDomainIntegrations extends LitElement {
 
   @property() public domain!: string;
 
-  @property({ attribute: false }) public integration!: Integration;
+  @property({ attribute: false }) public integration?: Integration;
 
   @property({ attribute: false })
   public flowsInProgress?: DataEntryFlowProgress[];
@@ -179,9 +181,19 @@ class HaDomainIntegrations extends LitElement {
 
   private async _integrationPicked(ev) {
     const domain = ev.currentTarget.domain;
+
     if (
-      (domain === this.domain && !this.integration.config_flow) ||
-      !this.integration.integrations?.[domain]?.config_flow
+      ["cloud", "google_assistant", "alexa"].includes(domain) &&
+      isComponentLoaded(this.hass, "cloud")
+    ) {
+      fireEvent(this, "close-dialog");
+      navigate("/config/cloud");
+      return;
+    }
+
+    if (
+      (domain === this.domain && !this.integration!.config_flow) ||
+      !this.integration!.integrations?.[domain]?.config_flow
     ) {
       const manifest = await fetchIntegrationManifest(this.hass, domain);
       showAlertDialog(this, {