From 9c66d47afa3cc24d49fa9b2947d586d4a1f1efca Mon Sep 17 00:00:00 2001
From: Marius <ciotlos@gmail.com>
Date: Tue, 17 Jul 2018 09:43:20 +0300
Subject: [PATCH] Fixes picture-glance no longer compatible with entity-filter
 (#1448)

* fixes https://github.com/home-assistant/ui-schema/issues/101

* Updates based on feedback

* More updates from feedback

* Cleanup
---
 .../lovelace/cards/hui-picture-glance-card.js | 75 ++++++++-----------
 1 file changed, 30 insertions(+), 45 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.js b/src/panels/lovelace/cards/hui-picture-glance-card.js
index 9d3257a199..a4a27f33f3 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.js
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.js
@@ -10,6 +10,7 @@ import computeStateDisplay from '../../../common/entity/compute_state_display.js
 import computeStateName from '../../../common/entity/compute_state_name.js';
 import stateIcon from '../../../common/entity/state_icon.js';
 import toggleEntity from '../common/entity/toggle-entity.js';
+import processConfigEntities from '../common/process-config-entities';
 
 import EventsMixin from '../../../mixins/events-mixin.js';
 import LocalizeMixin from '../../../mixins/localize-mixin.js';
@@ -56,15 +57,12 @@ class HuiPictureGlanceCard extends NavigateMixin(LocalizeMixin(EventsMixin(Polym
         .box .title {
           font-weight: 500;
         }
-        paper-icon-button, iron-icon {
+        paper-icon-button {
           color: #A9A9A9;
         }
-        paper-icon-button.state-on, iron-icon.state-on {
+        paper-icon-button.state-on {
           color: white;
         }
-        iron-icon {
-          padding: 8px;
-        }
       </style>
 
       <ha-card>
@@ -81,24 +79,24 @@ class HuiPictureGlanceCard extends NavigateMixin(LocalizeMixin(EventsMixin(Polym
           <div class="title">[[_config.title]]</div>
           <div>
             <template is="dom-repeat" items="[[_entitiesDialog]]">
-              <template is="dom-if" if="[[_showEntity(item, hass.states)]]">
+              <template is="dom-if" if="[[_showEntity(item.entity, hass.states)]]">
                 <paper-icon-button
                   on-click="_openDialog"
-                  class$="[[_computeButtonClass(item, hass.states)]]"
-                  icon="[[_computeIcon(item, hass.states)]]"
-                  title="[[_computeTooltip(item, hass.states)]]"
+                  class$="[[_computeButtonClass(item.entity, hass.states)]]"
+                  icon="[[_computeIcon(item.entity, hass.states)]]"
+                  title="[[_computeTooltip(item.entity, hass.states)]]"
                 ></paper-icon-button>
               </template>
             </template>
           </div>
           <div>
             <template is="dom-repeat" items="[[_entitiesToggle]]">
-              <template is="dom-if" if="[[_showEntity(item, hass.states)]]">
+              <template is="dom-if" if="[[_showEntity(item.entity, hass.states)]]">
                 <paper-icon-button
                   on-click="_callService"
-                  class$="[[_computeButtonClass(item, hass.states)]]"
-                  icon="[[_computeIcon(item, hass.states)]]"
-                  title="[[_computeTooltip(item, hass.states)]]"
+                  class$="[[_computeButtonClass(item.entity, hass.states)]]"
+                  icon="[[_computeIcon(item.entity, hass.states)]]"
+                  title="[[_computeTooltip(item.entity, hass.states)]]"
                 ></paper-icon-button>
               </template>
             </template>
@@ -112,15 +110,8 @@ class HuiPictureGlanceCard extends NavigateMixin(LocalizeMixin(EventsMixin(Polym
     return {
       hass: Object,
       _config: Object,
-      _entitiesDialog: {
-        type: Array,
-        computed: '_computeEntitiesDialog(hass, _config, _entitiesToggle)',
-      },
-      _entitiesToggle: {
-        type: Array,
-        value: [],
-        computed: '_computeEntitiesToggle(hass, _config)',
-      },
+      _entitiesDialog: Array,
+      _entitiesToggle: Array
     };
   }
 
@@ -134,26 +125,22 @@ class HuiPictureGlanceCard extends NavigateMixin(LocalizeMixin(EventsMixin(Polym
       (config.state_image && !config.entity)) {
       throw new Error('Invalid card configuration');
     }
+    const entities = processConfigEntities(config.entities);
+    const dialog = [];
+    const toggle = [];
 
-    this._config = config;
-  }
-
-  _computeEntitiesDialog(hass, config, entitiesService) {
-    if (config.force_dialog) {
-      return config.entities;
-    }
-
-    return config.entities.filter(entity => !entitiesService.includes(entity) &&
-                                  (entity in hass.states));
-  }
-
-  _computeEntitiesToggle(hass, config) {
-    if (config.force_dialog) {
-      return [];
-    }
-
-    return config.entities.filter(entity =>
-      (entity in hass.states) && DOMAINS_TOGGLE.has(computeDomain(entity)));
+    entities.forEach((item) => {
+      if (config.force_dialog || !DOMAINS_TOGGLE.has(computeDomain(item.entity))) {
+        dialog.push(item);
+      } else {
+        toggle.push(item);
+      }
+    });
+    this.setProperties({
+      _config: config,
+      _entitiesDialog: dialog,
+      _entitiesToggle: toggle
+    });
   }
 
   _showEntity(entityId, states) {
@@ -177,12 +164,11 @@ class HuiPictureGlanceCard extends NavigateMixin(LocalizeMixin(EventsMixin(Polym
   }
 
   _openDialog(ev) {
-    this.fire('hass-more-info', { entityId: ev.model.item });
+    this.fire('hass-more-info', { entityId: ev.model.item.entity });
   }
 
   _callService(ev) {
-    const entityId = ev.model.item;
-    toggleEntity(this.hass, entityId);
+    toggleEntity(this.hass, ev.model.item.entity);
   }
 
   _handleImageClick() {
@@ -196,5 +182,4 @@ class HuiPictureGlanceCard extends NavigateMixin(LocalizeMixin(EventsMixin(Polym
     }
   }
 }
-
 customElements.define('hui-picture-glance-card', HuiPictureGlanceCard);