From c69585db98709e39a67154752bd6c3aaf7a5ec09 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Mon, 30 Sep 2019 02:49:11 -0500
Subject: [PATCH] add state_filter to picture cards (#3791)

---
 .../cards/hui-picture-elements-card.ts        | 15 ++++++-----
 .../lovelace/cards/hui-picture-entity-card.ts | 27 ++++++++++---------
 .../lovelace/cards/hui-picture-glance-card.ts | 21 ++++++++-------
 src/panels/lovelace/cards/types.ts            |  3 +++
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-picture-elements-card.ts b/src/panels/lovelace/cards/hui-picture-elements-card.ts
index 6d6a07e501..c135ce9265 100644
--- a/src/panels/lovelace/cards/hui-picture-elements-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-elements-card.ts
@@ -58,13 +58,14 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
       <ha-card .header="${this._config.title}">
         <div id="root">
           <hui-image
-            .hass="${this._hass}"
-            .image="${this._config.image}"
-            .stateImage="${this._config.state_image}"
-            .cameraImage="${this._config.camera_image}"
-            .cameraView="${this._config.camera_view}"
-            .entity="${this._config.entity}"
-            .aspectRatio="${this._config.aspect_ratio}"
+            .hass=${this._hass}
+            .image=${this._config.image}
+            .stateImage=${this._config.state_image}
+            .stateFilter=${this._config.state_filter}
+            .cameraImage=${this._config.camera_image}
+            .cameraView=${this._config.camera_view}
+            .entity=${this._config.entity}
+            .aspectRatio=${this._config.aspect_ratio}
           ></hui-image>
           ${this._config.elements.map(
             (elementConfig: LovelaceElementConfig) => {
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
index e789f8c823..69ebefe75c 100644
--- a/src/panels/lovelace/cards/hui-picture-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -114,21 +114,22 @@ class HuiPictureEntityCard extends LitElement implements LovelaceCard {
     return html`
       <ha-card>
         <hui-image
-          .hass="${this.hass}"
-          .image="${this._config.image}"
-          .stateImage="${this._config.state_image}"
-          .cameraImage="${computeDomain(this._config.entity) === "camera"
+          .hass=${this.hass}
+          .image=${this._config.image}
+          .stateImage=${this._config.state_image}
+          .stateFilter=${this._config.state_filter}
+          .cameraImage=${computeDomain(this._config.entity) === "camera"
             ? this._config.entity
-            : this._config.camera_image}"
-          .cameraView="${this._config.camera_view}"
-          .entity="${this._config.entity}"
-          .aspectRatio="${this._config.aspect_ratio}"
-          @ha-click="${this._handleTap}"
-          @ha-hold="${this._handleHold}"
-          .longPress="${longPress()}"
-          class="${classMap({
+            : this._config.camera_image}
+          .cameraView=${this._config.camera_view}
+          .entity=${this._config.entity}
+          .aspectRatio=${this._config.aspect_ratio}
+          @ha-click=${this._handleTap}
+          @ha-hold=${this._handleHold}
+          .longPress=${longPress()}
+          class=${classMap({
             clickable: stateObj.state !== UNAVAILABLE,
-          })}"
+          })}
         ></hui-image>
         ${footer}
       </ha-card>
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index be67eca759..c1777219c8 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -136,16 +136,17 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
                 this._config.camera_image
             ),
           })}"
-          @ha-click="${this._handleTap}"
-          @ha-hold="${this._handleHold}"
-          .longPress="${longPress()}"
-          .hass="${this.hass}"
-          .image="${this._config.image}"
-          .stateImage="${this._config.state_image}"
-          .cameraImage="${this._config.camera_image}"
-          .cameraView="${this._config.camera_view}"
-          .entity="${this._config.entity}"
-          .aspectRatio="${this._config.aspect_ratio}"
+          @ha-click=${this._handleTap}
+          @ha-hold=${this._handleHold}
+          .longPress=${longPress()}
+          .hass=${this.hass}
+          .image=${this._config.image}
+          .stateImage=${this._config.state_image}
+          .stateFilter=${this._config.state_filter}
+          .cameraImage=${this._config.camera_image}
+          .cameraView=${this._config.camera_view}
+          .entity=${this._config.entity}
+          .aspectRatio=${this._config.aspect_ratio}
         ></hui-image>
         <div class="box">
           ${this._config.title
diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts
index 9b050b431c..fd02a0710e 100644
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -144,6 +144,7 @@ export interface PictureElementsCardConfig extends LovelaceCardConfig {
   camera_image?: string;
   camera_view?: HuiImage["cameraView"];
   state_image?: {};
+  state_filter: string[];
   aspect_ratio?: string;
   entity?: string;
   elements: LovelaceElementConfig[];
@@ -156,6 +157,7 @@ export interface PictureEntityCardConfig extends LovelaceCardConfig {
   camera_image?: string;
   camera_view?: HuiImage["cameraView"];
   state_image?: {};
+  state_filter: string[];
   aspect_ratio?: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
@@ -170,6 +172,7 @@ export interface PictureGlanceCardConfig extends LovelaceCardConfig {
   camera_image?: string;
   camera_view?: HuiImage["cameraView"];
   state_image?: {};
+  state_filter: string[];
   aspect_ratio?: string;
   entity?: string;
   tap_action?: ActionConfig;