From 3bca32c6d552cbbefb28165a2f4a8aad8f34cb83 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 15 Sep 2020 08:42:09 +0200
Subject: [PATCH] Disable cloud expose controls when yaml filter (#6990)

---
 src/components/ha-button-menu.ts              |  28 ++--
 src/panels/config/cloud/alexa/cloud-alexa.ts  | 125 +++++++++---------
 .../cloud-google-assistant.ts                 | 125 +++++++++---------
 3 files changed, 144 insertions(+), 134 deletions(-)

diff --git a/src/components/ha-button-menu.ts b/src/components/ha-button-menu.ts
index e325925d57..7adc266a56 100644
--- a/src/components/ha-button-menu.ts
+++ b/src/components/ha-button-menu.ts
@@ -1,17 +1,16 @@
-import {
-  customElement,
-  html,
-  TemplateResult,
-  LitElement,
-  CSSResult,
-  css,
-  query,
-  property,
-} from "lit-element";
 import "@material/mwc-button";
 import "@material/mwc-menu";
-import type { Menu, Corner } from "@material/mwc-menu";
-
+import type { Corner, Menu } from "@material/mwc-menu";
+import {
+  css,
+  CSSResult,
+  customElement,
+  html,
+  LitElement,
+  property,
+  query,
+  TemplateResult,
+} from "lit-element";
 import "./ha-icon-button";
 
 @customElement("ha-button-menu")
@@ -22,6 +21,8 @@ export class HaButtonMenu extends LitElement {
 
   @property({ type: Boolean }) public activatable = false;
 
+  @property({ type: Boolean }) public disabled = false;
+
   @query("mwc-menu") private _menu?: Menu;
 
   public get items() {
@@ -48,6 +49,9 @@ export class HaButtonMenu extends LitElement {
   }
 
   private _handleClick(): void {
+    if (this.disabled) {
+      return;
+    }
     this._menu!.anchor = this;
     this._menu!.show();
   }
diff --git a/src/panels/config/cloud/alexa/cloud-alexa.ts b/src/panels/config/cloud/alexa/cloud-alexa.ts
index 948d542680..9fb80369d9 100644
--- a/src/panels/config/cloud/alexa/cloud-alexa.ts
+++ b/src/panels/config/cloud/alexa/cloud-alexa.ts
@@ -124,6 +124,26 @@ class CloudAlexa extends LitElement {
         ? exposedCards
         : notExposedCards;
 
+      const iconButton = html`<mwc-icon-button
+        slot="trigger"
+        class=${classMap({
+          exposed: isExposed!,
+          "not-exposed": !isExposed,
+        })}
+        .disabled=${!emptyFilter}
+        .title=${this.hass!.localize("ui.panel.config.cloud.google.expose")}
+      >
+        <ha-svg-icon
+          .path=${config.should_expose !== null
+            ? isExposed
+              ? mdiCheckboxMarked
+              : mdiCloseBox
+            : isDomainExposed
+            ? mdiCheckboxMultipleMarked
+            : mdiCloseBoxMultiple}
+        ></ha-svg-icon>
+      </mwc-icon-button>`;
+
       target.push(html`
         <ha-card>
           <div class="card-content">
@@ -139,67 +159,50 @@ class CloudAlexa extends LitElement {
                   .map((ifc) => ifc.replace(/(Alexa.|Controller)/g, ""))
                   .join(", ")}
               </state-info>
-              <ha-button-menu
-                corner="BOTTOM_START"
-                .entityId=${stateObj.entity_id}
-                @action=${this._exposeChanged}
-              >
-                <mwc-icon-button
-                  slot="trigger"
-                  class=${classMap({
-                    exposed: isExposed!,
-                    "not-exposed": !isExposed,
-                  })}
-                  .title=${this.hass!.localize(
-                    "ui.panel.config.cloud.alexa.expose"
-                  )}
-                >
-                  <ha-svg-icon
-                    .path=${config.should_expose !== null
-                      ? isExposed
-                        ? mdiCheckboxMarked
-                        : mdiCloseBox
-                      : isDomainExposed
-                      ? mdiCheckboxMultipleMarked
-                      : mdiCloseBoxMultiple}
-                  ></ha-svg-icon>
-                </mwc-icon-button>
-                <mwc-list-item hasMeta>
-                  ${this.hass!.localize(
-                    "ui.panel.config.cloud.alexa.expose_entity"
-                  )}
-                  <ha-svg-icon
-                    class="exposed"
-                    slot="meta"
-                    .path=${mdiCheckboxMarked}
-                  ></ha-svg-icon>
-                </mwc-list-item>
-                <mwc-list-item hasMeta>
-                  ${this.hass!.localize(
-                    "ui.panel.config.cloud.alexa.dont_expose_entity"
-                  )}
-                  <ha-svg-icon
-                    class="not-exposed"
-                    slot="meta"
-                    .path=${mdiCloseBox}
-                  ></ha-svg-icon>
-                </mwc-list-item>
-                <mwc-list-item hasMeta>
-                  ${this.hass!.localize(
-                    "ui.panel.config.cloud.alexa.follow_domain"
-                  )}
-                  <ha-svg-icon
-                    class=${classMap({
-                      exposed: isDomainExposed,
-                      "not-exposed": !isDomainExposed,
-                    })}
-                    slot="meta"
-                    .path=${isDomainExposed
-                      ? mdiCheckboxMultipleMarked
-                      : mdiCloseBoxMultiple}
-                  ></ha-svg-icon>
-                </mwc-list-item>
-              </ha-button-menu>
+              ${!emptyFilter
+                ? html`${iconButton}`
+                : html`<ha-button-menu
+                    corner="BOTTOM_START"
+                    .entityId=${stateObj.entity_id}
+                    @action=${this._exposeChanged}
+                  >
+                    ${iconButton}
+                    <mwc-list-item hasMeta>
+                      ${this.hass!.localize(
+                        "ui.panel.config.cloud.google.expose_entity"
+                      )}
+                      <ha-svg-icon
+                        class="exposed"
+                        slot="meta"
+                        .path=${mdiCheckboxMarked}
+                      ></ha-svg-icon>
+                    </mwc-list-item>
+                    <mwc-list-item hasMeta>
+                      ${this.hass!.localize(
+                        "ui.panel.config.cloud.google.dont_expose_entity"
+                      )}
+                      <ha-svg-icon
+                        class="not-exposed"
+                        slot="meta"
+                        .path=${mdiCloseBox}
+                      ></ha-svg-icon>
+                    </mwc-list-item>
+                    <mwc-list-item hasMeta>
+                      ${this.hass!.localize(
+                        "ui.panel.config.cloud.google.follow_domain"
+                      )}
+                      <ha-svg-icon
+                        class=${classMap({
+                          exposed: isDomainExposed,
+                          "not-exposed": !isDomainExposed,
+                        })}
+                        slot="meta"
+                        .path=${isDomainExposed
+                          ? mdiCheckboxMultipleMarked
+                          : mdiCloseBoxMultiple}
+                      ></ha-svg-icon>
+                    </mwc-list-item>
+                  </ha-button-menu>`}
             </div>
           </div>
         </ha-card>
diff --git a/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts b/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts
index 49b56ea32c..40067a0eaf 100644
--- a/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts
+++ b/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts
@@ -130,6 +130,26 @@ class CloudGoogleAssistant extends LitElement {
         ? exposedCards
         : notExposedCards;
 
+      const iconButton = html`<mwc-icon-button
+        slot="trigger"
+        class=${classMap({
+          exposed: isExposed!,
+          "not-exposed": !isExposed,
+        })}
+        .disabled=${!emptyFilter}
+        .title=${this.hass!.localize("ui.panel.config.cloud.google.expose")}
+      >
+        <ha-svg-icon
+          .path=${config.should_expose !== null
+            ? isExposed
+              ? mdiCheckboxMarked
+              : mdiCloseBox
+            : isDomainExposed
+            ? mdiCheckboxMultipleMarked
+            : mdiCloseBoxMultiple}
+        ></ha-svg-icon>
+      </mwc-icon-button>`;
+
       target.push(html`
         <ha-card>
           <div class="card-content">
@@ -144,67 +164,50 @@ class CloudGoogleAssistant extends LitElement {
                   .map((trait) => trait.substr(trait.lastIndexOf(".") + 1))
                   .join(", ")}
               </state-info>
-              <ha-button-menu
-                corner="BOTTOM_START"
-                .entityId=${stateObj.entity_id}
-                @action=${this._exposeChanged}
-              >
-                <mwc-icon-button
-                  slot="trigger"
-                  class=${classMap({
-                    exposed: isExposed!,
-                    "not-exposed": !isExposed,
-                  })}
-                  .title=${this.hass!.localize(
-                    "ui.panel.config.cloud.google.expose"
-                  )}
-                >
-                  <ha-svg-icon
-                    .path=${config.should_expose !== null
-                      ? isExposed
-                        ? mdiCheckboxMarked
-                        : mdiCloseBox
-                      : isDomainExposed
-                      ? mdiCheckboxMultipleMarked
-                      : mdiCloseBoxMultiple}
-                  ></ha-svg-icon>
-                </mwc-icon-button>
-                <mwc-list-item hasMeta>
-                  ${this.hass!.localize(
-                    "ui.panel.config.cloud.google.expose_entity"
-                  )}
-                  <ha-svg-icon
-                    class="exposed"
-                    slot="meta"
-                    .path=${mdiCheckboxMarked}
-                  ></ha-svg-icon>
-                </mwc-list-item>
-                <mwc-list-item hasMeta>
-                  ${this.hass!.localize(
-                    "ui.panel.config.cloud.google.dont_expose_entity"
-                  )}
-                  <ha-svg-icon
-                    class="not-exposed"
-                    slot="meta"
-                    .path=${mdiCloseBox}
-                  ></ha-svg-icon>
-                </mwc-list-item>
-                <mwc-list-item hasMeta>
-                  ${this.hass!.localize(
-                    "ui.panel.config.cloud.google.follow_domain"
-                  )}
-                  <ha-svg-icon
-                    class=${classMap({
-                      exposed: isDomainExposed,
-                      "not-exposed": !isDomainExposed,
-                    })}
-                    slot="meta"
-                    .path=${isDomainExposed
-                      ? mdiCheckboxMultipleMarked
-                      : mdiCloseBoxMultiple}
-                  ></ha-svg-icon>
-                </mwc-list-item>
-              </ha-button-menu>
+              ${!emptyFilter
+                ? html`${iconButton}`
+                : html`<ha-button-menu
+                    corner="BOTTOM_START"
+                    .entityId=${stateObj.entity_id}
+                    @action=${this._exposeChanged}
+                  >
+                    ${iconButton}
+                    <mwc-list-item hasMeta>
+                      ${this.hass!.localize(
+                        "ui.panel.config.cloud.google.expose_entity"
+                      )}
+                      <ha-svg-icon
+                        class="exposed"
+                        slot="meta"
+                        .path=${mdiCheckboxMarked}
+                      ></ha-svg-icon>
+                    </mwc-list-item>
+                    <mwc-list-item hasMeta>
+                      ${this.hass!.localize(
+                        "ui.panel.config.cloud.google.dont_expose_entity"
+                      )}
+                      <ha-svg-icon
+                        class="not-exposed"
+                        slot="meta"
+                        .path=${mdiCloseBox}
+                      ></ha-svg-icon>
+                    </mwc-list-item>
+                    <mwc-list-item hasMeta>
+                      ${this.hass!.localize(
+                        "ui.panel.config.cloud.google.follow_domain"
+                      )}
+                      <ha-svg-icon
+                        class=${classMap({
+                          exposed: isDomainExposed,
+                          "not-exposed": !isDomainExposed,
+                        })}
+                        slot="meta"
+                        .path=${isDomainExposed
+                          ? mdiCheckboxMultipleMarked
+                          : mdiCloseBoxMultiple}
+                      ></ha-svg-icon>
+                    </mwc-list-item>
+                  </ha-button-menu>`}
             </div>
             ${entity.might_2fa
               ? html`