From 6e3385640dd31aee545ae3b1630b037649e8f710 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 22 Oct 2019 22:58:17 +0200
Subject: [PATCH 1/2] Fix more integrations message

---
 .../config-flow/dialog-data-entry-flow.ts     |  1 +
 .../show-dialog-data-entry-flow.ts            |  1 +
 .../config-flow/step-flow-pick-handler.ts     | 36 ++++++++++++-------
 .../ha-config-entries-dashboard.ts            |  2 ++
 .../integrations/ha-config-integrations.ts    |  4 ++-
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/dialogs/config-flow/dialog-data-entry-flow.ts b/src/dialogs/config-flow/dialog-data-entry-flow.ts
index a85f3b11bd26..d51838a68257 100644
--- a/src/dialogs/config-flow/dialog-data-entry-flow.ts
+++ b/src/dialogs/config-flow/dialog-data-entry-flow.ts
@@ -141,6 +141,7 @@ class DataEntryFlowDialog extends LitElement {
                 .flowConfig=${this._params.flowConfig}
                 .hass=${this.hass}
                 .handlers=${this._handlers}
+                .showAdvanced=${this._params.showAdvanced}
               ></step-flow-pick-handler>
             `
           : this._step.type === "form"
diff --git a/src/dialogs/config-flow/show-dialog-data-entry-flow.ts b/src/dialogs/config-flow/show-dialog-data-entry-flow.ts
index a3609a733fbe..3d3483433510 100644
--- a/src/dialogs/config-flow/show-dialog-data-entry-flow.ts
+++ b/src/dialogs/config-flow/show-dialog-data-entry-flow.ts
@@ -75,6 +75,7 @@ export interface DataEntryFlowDialogParams {
   continueFlowId?: string;
   dialogClosedCallback?: (params: { flowFinished: boolean }) => void;
   flowConfig: FlowConfig;
+  showAdvanced?: boolean;
 }
 
 export const loadDataEntryFlowDialog = () =>
diff --git a/src/dialogs/config-flow/step-flow-pick-handler.ts b/src/dialogs/config-flow/step-flow-pick-handler.ts
index 6eaa5a5b012d..24a736b6686d 100644
--- a/src/dialogs/config-flow/step-flow-pick-handler.ts
+++ b/src/dialogs/config-flow/step-flow-pick-handler.ts
@@ -31,6 +31,7 @@ class StepFlowPickHandler extends LitElement {
 
   @property() public hass!: HomeAssistant;
   @property() public handlers!: string[];
+  @property() public showAdvanced?: boolean;
   @property() private filter?: string;
   private _width?: number;
 
@@ -79,18 +80,24 @@ class StepFlowPickHandler extends LitElement {
             `
         )}
       </div>
-      <p>
-        ${this.hass.localize(
-          "ui.panel.config.integrations.note_about_integrations"
-        )}<br />
-        ${this.hass.localize(
-          "ui.panel.config.integrations.note_about_website_reference"
-        )}<a href="https://www.home-assistant.io/integrations/"
-          >${this.hass.localize(
-            "ui.panel.config.integrations.home_assistant_website"
-          )}.</a
-        >
-      </p>
+      ${this.showAdvanced
+        ? html`
+            <p>
+              ${this.hass.localize(
+                "ui.panel.config.integrations.note_about_integrations"
+              )}<br />
+              ${this.hass.localize(
+                "ui.panel.config.integrations.note_about_website_reference"
+              )}<a
+                href="https://www.home-assistant.io/integrations/"
+                target="_blank"
+                >${this.hass.localize(
+                  "ui.panel.config.integrations.home_assistant_website"
+                )}.
+              </a>
+            </p>
+          `
+        : ""}
     `;
   }
 
@@ -133,6 +140,11 @@ class StepFlowPickHandler extends LitElement {
       }
       p {
         text-align: center;
+        padding: 16px;
+        margin: 0;
+      }
+      p > a {
+        color: var(--primary-color);
       }
     `;
   }
diff --git a/src/panels/config/integrations/ha-config-entries-dashboard.ts b/src/panels/config/integrations/ha-config-entries-dashboard.ts
index 03a420d37a71..4c31ee29661d 100644
--- a/src/panels/config/integrations/ha-config-entries-dashboard.ts
+++ b/src/panels/config/integrations/ha-config-entries-dashboard.ts
@@ -42,6 +42,7 @@ import { DataEntryFlowProgress } from "../../../data/data_entry_flow";
 @customElement("ha-config-entries-dashboard")
 export class HaConfigManagerDashboard extends LitElement {
   @property() public hass!: HomeAssistant;
+  @property() public showAdvanced!: boolean;
 
   @property() private configEntries!: ConfigEntry[];
 
@@ -164,6 +165,7 @@ export class HaConfigManagerDashboard extends LitElement {
   private _createFlow() {
     showConfigFlowDialog(this, {
       dialogClosedCallback: () => fireEvent(this, "hass-reload-entries"),
+      showAdvanced: this.showAdvanced,
     });
   }
 
diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts
index c471288ca471..8e97de6e37fc 100644
--- a/src/panels/config/integrations/ha-config-integrations.ts
+++ b/src/panels/config/integrations/ha-config-integrations.ts
@@ -39,6 +39,7 @@ declare global {
 class HaConfigIntegrations extends HassRouterPage {
   @property() public hass!: HomeAssistant;
   @property() public narrow!: boolean;
+  @property() public showAdvanced!: boolean;
 
   protected routerOptions: RouterOptions = {
     defaultPage: "dashboard",
@@ -99,6 +100,8 @@ class HaConfigIntegrations extends HassRouterPage {
 
     pageEl.entityRegistryEntries = this._entityRegistryEntries;
     pageEl.configEntries = this._configEntries;
+    pageEl.narrow = this.narrow;
+    pageEl.showAdvanced = this.showAdvanced;
 
     if (this._currentPage === "dashboard") {
       pageEl.configEntriesInProgress = this._configEntriesInProgress;
@@ -108,7 +111,6 @@ class HaConfigIntegrations extends HassRouterPage {
     pageEl.configEntryId = this.routeTail.path.substr(1);
     pageEl.deviceRegistryEntries = this._deviceRegistryEntries;
     pageEl.areas = this._areas;
-    pageEl.narrow = this.narrow;
   }
 
   private _loadData() {

From fab6473dd80449e46c1a3aaee50779c2e0fe0765 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 22 Oct 2019 23:03:33 +0200
Subject: [PATCH 2/2] Period outside link

---
 src/dialogs/config-flow/step-flow-pick-handler.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dialogs/config-flow/step-flow-pick-handler.ts b/src/dialogs/config-flow/step-flow-pick-handler.ts
index 24a736b6686d..ef410f75291c 100644
--- a/src/dialogs/config-flow/step-flow-pick-handler.ts
+++ b/src/dialogs/config-flow/step-flow-pick-handler.ts
@@ -93,8 +93,8 @@ class StepFlowPickHandler extends LitElement {
                 target="_blank"
                 >${this.hass.localize(
                   "ui.panel.config.integrations.home_assistant_website"
-                )}.
-              </a>
+                )}</a
+              >.
             </p>
           `
         : ""}