From 7012d2cd200a7555f1ad3420bab746f7607a1cdf Mon Sep 17 00:00:00 2001
From: Jerad Meisner <jerad.meisner@gmail.com>
Date: Sun, 9 Sep 2018 20:26:13 -0700
Subject: [PATCH 1/3] Get persistent_notifications for lovelace from websocket.

---
 src/cards/ha-persistent_notification-card.js  |  5 +++-
 .../lovelace/common/compute-notifications.js  |  3 +-
 .../hui-configurator-notification-item.js     | 12 ++++----
 .../notifications/hui-notification-drawer.js  | 26 +++++++----------
 .../notifications/hui-notification-item.js    | 12 ++++----
 .../notifications/hui-notifications-button.js | 13 +++++----
 .../hui-persistent-notification-item.js       | 22 +++++++-------
 src/panels/lovelace/hui-root.js               | 29 +++++++++++++++++++
 8 files changed, 75 insertions(+), 47 deletions(-)

diff --git a/src/cards/ha-persistent_notification-card.js b/src/cards/ha-persistent_notification-card.js
index d80195ba0887..f6960927b793 100644
--- a/src/cards/ha-persistent_notification-card.js
+++ b/src/cards/ha-persistent_notification-card.js
@@ -8,6 +8,7 @@ import '../components/ha-markdown.js';
 
 import computeStateName from '../common/entity/compute_state_name.js';
 import LocalizeMixin from '../mixins/localize-mixin.js';
+import computeObjectId from '../common/entity/compute_object_id';
 
 /*
  * @appliesMixin LocalizeMixin
@@ -65,7 +66,9 @@ class HaPersistentNotificationCard extends LocalizeMixin(PolymerElement) {
 
   dismissTap(ev) {
     ev.preventDefault();
-    this.hass.callApi('DELETE', 'states/' + this.stateObj.entity_id);
+    this.hass.callService('persistent_notification', 'dismiss', {
+      notification_id: computeObjectId(this.stateObj.entity_id)
+    });
   }
 }
 customElements.define('ha-persistent_notification-card', HaPersistentNotificationCard);
diff --git a/src/panels/lovelace/common/compute-notifications.js b/src/panels/lovelace/common/compute-notifications.js
index 802805cebbeb..62006afe0721 100644
--- a/src/panels/lovelace/common/compute-notifications.js
+++ b/src/panels/lovelace/common/compute-notifications.js
@@ -1,8 +1,7 @@
 import computeDomain from '../../../common/entity/compute_domain.js';
 
 const NOTIFICATION_DOMAINS = [
-  'configurator',
-  'persistent_notification'
+  'configurator'
 ];
 
 export default function computeNotifications(states) {
diff --git a/src/panels/lovelace/components/notifications/hui-configurator-notification-item.js b/src/panels/lovelace/components/notifications/hui-configurator-notification-item.js
index 25c2612bf53f..593b70644980 100644
--- a/src/panels/lovelace/components/notifications/hui-configurator-notification-item.js
+++ b/src/panels/lovelace/components/notifications/hui-configurator-notification-item.js
@@ -19,13 +19,13 @@ export class HuiConfiguratorNotificationItem extends EventsMixin(LocalizeMixin(P
     <hui-notification-item-template>
       <span slot="header">[[localize('domain.configurator')]]</span>
       
-      <div>[[_getMessage(stateObj)]]</div> 
+      <div>[[_getMessage(notification)]]</div> 
       
       <paper-button 
         slot="actions" 
         class="primary" 
         on-click="_handleClick"
-      >[[_localizeState(stateObj.state)]]</paper-button>
+      >[[_localizeState(notification.state)]]</paper-button>
     </hui-notification-item-template>
     `;
   }
@@ -33,20 +33,20 @@ export class HuiConfiguratorNotificationItem extends EventsMixin(LocalizeMixin(P
   static get properties() {
     return {
       hass: Object,
-      stateObj: Object
+      notification: Object
     };
   }
 
   _handleClick() {
-    this.fire('hass-more-info', { entityId: this.stateObj.entity_id });
+    this.fire('hass-more-info', { entityId: this.notification.entity_id });
   }
 
   _localizeState(state) {
     return this.localize(`state.configurator.${state}`);
   }
 
-  _getMessage(stateObj) {
-    const friendlyName = stateObj.attributes.friendly_name;
+  _getMessage(notification) {
+    const friendlyName = notification.attributes.friendly_name;
     return this.localize('ui.notification_drawer.click_to_configure', 'entity', friendlyName);
   }
 }
diff --git a/src/panels/lovelace/components/notifications/hui-notification-drawer.js b/src/panels/lovelace/components/notifications/hui-notification-drawer.js
index d641b280bae2..3b4cff993f63 100644
--- a/src/panels/lovelace/components/notifications/hui-notification-drawer.js
+++ b/src/panels/lovelace/components/notifications/hui-notification-drawer.js
@@ -7,8 +7,6 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import './hui-notification-item.js';
 
-import computeNotifications from '../../common/compute-notifications.js';
-
 import EventsMixin from '../../../../mixins/events-mixin.js';
 import LocalizeMixin from '../../../../mixins/localize-mixin.js';
 
@@ -105,16 +103,16 @@ export class HuiNotificationDrawer extends EventsMixin(LocalizeMixin(PolymerElem
         <paper-icon-button icon="hass:chevron-right" on-click="_closeDrawer"></paper-icon-button>
       </app-toolbar>
       <div class="notifications">
-        <template is="dom-if" if="[[!_empty(_entities)]]">
-          <dom-repeat items="[[_entities]]">
+        <template is="dom-if" if="[[!_empty(notifications)]]">
+          <dom-repeat items="[[notifications]]">
             <template>
               <div class="notification">
-                <hui-notification-item hass="[[hass]]" state-obj="[[item]]"></hui-notification-item>
+                <hui-notification-item hass="[[hass]]" notification="[[item]]"></hui-notification-item>
               </div>
             </template>
           </dom-repeat>
         </template>
-        <template is="dom-if" if="[[_empty(_entities)]]">
+        <template is="dom-if" if="[[_empty(notifications)]]">
           <div class="empty">[[localize('ui.notification_drawer.empty')]]<div>
         </template>
       </div>
@@ -125,10 +123,6 @@ export class HuiNotificationDrawer extends EventsMixin(LocalizeMixin(PolymerElem
   static get properties() {
     return {
       hass: Object,
-      _entities: {
-        type: Array,
-        computed: '_getEntities(hass.states, hidden)'
-      },
       narrow: {
         type: Boolean,
         reflectToAttribute: true
@@ -142,21 +136,21 @@ export class HuiNotificationDrawer extends EventsMixin(LocalizeMixin(PolymerElem
         type: Boolean,
         value: true,
         reflectToAttribute: true
+      },
+      notifications: {
+        type: Array,
+        value: []
       }
     };
   }
 
-  _getEntities(states, hidden) {
-    return (states && !hidden) ? computeNotifications(states) : [];
-  }
-
   _closeDrawer(ev) {
     ev.stopPropagation();
     this.open = false;
   }
 
-  _empty(entities) {
-    return entities.length === 0;
+  _empty(notifications) {
+    return notifications.length === 0;
   }
 
   _openChanged(open) {
diff --git a/src/panels/lovelace/components/notifications/hui-notification-item.js b/src/panels/lovelace/components/notifications/hui-notification-item.js
index 9fcab424284e..d174cd0b9458 100644
--- a/src/panels/lovelace/components/notifications/hui-notification-item.js
+++ b/src/panels/lovelace/components/notifications/hui-notification-item.js
@@ -8,25 +8,27 @@ export class HuiNotificationItem extends PolymerElement {
   static get properties() {
     return {
       hass: Object,
-      stateObj: {
+      notification: {
         type: Object,
         observer: '_stateChanged'
       }
     };
   }
 
-  _stateChanged(stateObj) {
+  _stateChanged(notification) {
     if (this.lastChild) {
       this.removeChild(this.lastChild);
     }
 
-    if (!stateObj) return;
+    if (!notification) return;
 
-    const domain = computeDomain(stateObj.entity_id);
+    const domain = notification.entity_id
+      ? computeDomain(notification.entity_id)
+      : 'persistent_notification';
     const tag = `hui-${domain}-notification-item`;
     const el = document.createElement(tag);
     el.hass = this.hass;
-    el.stateObj = stateObj;
+    el.notification = notification;
     this.appendChild(el);
   }
 }
diff --git a/src/panels/lovelace/components/notifications/hui-notifications-button.js b/src/panels/lovelace/components/notifications/hui-notifications-button.js
index 5d9048cb64de..45e872ca577a 100644
--- a/src/panels/lovelace/components/notifications/hui-notifications-button.js
+++ b/src/panels/lovelace/components/notifications/hui-notifications-button.js
@@ -5,8 +5,6 @@ import '@polymer/app-layout/app-toolbar/app-toolbar.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import computeNotifications from '../../common/compute-notifications.js';
-
 import EventsMixin from '../../../../mixins/events-mixin.js';
 
 /*
@@ -36,16 +34,19 @@ export class HuiNotificationsButton extends EventsMixin(PolymerElement) {
       }
     </style>
     <paper-icon-button icon="hass:bell" on-click="_clicked"></paper-icon-button>
-    <span class="indicator" hidden$="[[!_hasNotifications(hass.states)]]"></span>
+    <span class="indicator" hidden$="[[!_hasNotifications(notifications)]]"></span>
     `;
   }
 
   static get properties() {
     return {
-      hass: Object,
       notificationsOpen: {
         type: Boolean,
         notify: true
+      },
+      notifications: {
+        type: Array,
+        value: []
       }
     };
   }
@@ -54,8 +55,8 @@ export class HuiNotificationsButton extends EventsMixin(PolymerElement) {
     this.notificationsOpen = true;
   }
 
-  _hasNotifications(states) {
-    return computeNotifications(states).length > 0;
+  _hasNotifications(notifications) {
+    return notifications.length > 0;
   }
 }
 customElements.define('hui-notifications-button', HuiNotificationsButton);
diff --git a/src/panels/lovelace/components/notifications/hui-persistent-notification-item.js b/src/panels/lovelace/components/notifications/hui-persistent-notification-item.js
index dfe511b9c39d..dcb4aeeb7b67 100644
--- a/src/panels/lovelace/components/notifications/hui-persistent-notification-item.js
+++ b/src/panels/lovelace/components/notifications/hui-persistent-notification-item.js
@@ -4,8 +4,6 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import computeStateName from '../../../../common/entity/compute_state_name.js';
-
 import '../../../../components/ha-markdown.js';
 import './hui-notification-item-template.js';
 
@@ -18,13 +16,13 @@ export class HuiPersistentNotificationItem extends LocalizeMixin(PolymerElement)
   static get template() {
     return html`
     <hui-notification-item-template>
-      <span slot="header">[[_computeTitle(stateObj)]]</span>
+      <span slot="header">[[_computeTitle(notification)]]</span>
       
-      <ha-markdown content="[[stateObj.attributes.message]]"></ha-markdown>
+      <ha-markdown content="[[notification.message]]"></ha-markdown>
       
-      <paper-button 
-        slot="actions" 
-        class="primary" 
+      <paper-button
+        slot="actions"
+        class="primary"
         on-click="_handleDismiss"
       >[[localize('ui.card.persistent_notification.dismiss')]]</paper-button>
     </hui-notification-item-template>
@@ -34,16 +32,18 @@ export class HuiPersistentNotificationItem extends LocalizeMixin(PolymerElement)
   static get properties() {
     return {
       hass: Object,
-      stateObj: Object
+      notification: Object
     };
   }
 
   _handleDismiss() {
-    this.hass.callApi('DELETE', `states/${this.stateObj.entity_id}`);
+    this.hass.callService('persistent_notification', 'dismiss', {
+      notification_id: this.notification.notification_id
+    });
   }
 
-  _computeTitle(stateObj) {
-    return (stateObj.attributes.title || computeStateName(stateObj));
+  _computeTitle(notification) {
+    return notification.title || notification.notification_id;
   }
 }
 customElements.define(
diff --git a/src/panels/lovelace/hui-root.js b/src/panels/lovelace/hui-root.js
index f4374f03445c..29071b6ae041 100644
--- a/src/panels/lovelace/hui-root.js
+++ b/src/panels/lovelace/hui-root.js
@@ -29,6 +29,7 @@ import './hui-view.js';
 import debounce from '../../common/util/debounce.js';
 
 import createCardElement from './common/create-card-element.js';
+import computeNotifications from './common/compute-notifications';
 
 // CSS and JS should only be imported once. Modules and HTML are safe.
 const CSS_CACHE = {};
@@ -76,6 +77,7 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
     <app-route route="[[route]]" pattern="/:view" data="{{routeData}}"></app-route>
     <hui-notification-drawer
       hass="[[hass]]"
+      notifications="[[notifications]]"
       open="{{notificationsOpen}}"
       narrow="[[narrow]]"
     ></hui-notification-drawer>
@@ -87,6 +89,7 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
           <hui-notifications-button
             hass="[[hass]]"
             notifications-open="{{notificationsOpen}}"
+            notifications="[[notifications]]"
           ></hui-notifications-button>
           <ha-start-voice-button hass="[[hass]]"></ha-start-voice-button>
           <paper-menu-button
@@ -156,6 +159,10 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
         value: false,
       },
 
+      notifications: {
+        type: Array
+      },
+
       routeData: Object,
     };
   }
@@ -165,6 +172,27 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
     this._debouncedConfigChanged = debounce(() => this._selectView(this._curView), 100);
   }
 
+  async connectedCallback() {
+    super.connectedCallback();
+    this._updateNotifications();
+    this._unsubNotifications = await this.hass.connection
+      .subscribeEvents(() => this._updateNotifications(), 'persistent_notifications_updated');
+  }
+
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    if (typeof this._unsubNotifications === 'function') {
+      this._unsubNotifications();
+    }
+  }
+
+  async _updateNotifications() {
+    if (!this.hass) return;
+    const persistentNotifications = await this.hass.callWS({ type: 'persistent_notification/get' });
+    const configurator = computeNotifications(this.hass.states);
+    this.notifications = persistentNotifications.concat(configurator);
+  }
+
   _routeChanged(route) {
     const views = this.config && this.config.views;
     if (route.path === '' && route.prefix === '/lovelace' && views) {
@@ -260,6 +288,7 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
   _hassChanged(hass) {
     if (!this.$.view.lastChild) return;
     this.$.view.lastChild.hass = hass;
+    this._updateNotifications();
   }
 
   _configChanged(config) {

From e7185bbfc6b0a8259600c5594cbc003efa0e4027 Mon Sep 17 00:00:00 2001
From: Jerad Meisner <jerad.meisner@gmail.com>
Date: Mon, 10 Sep 2018 18:26:57 -0700
Subject: [PATCH 2/3] Only fetch notifications on event.

---
 src/panels/lovelace/hui-root.js | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/panels/lovelace/hui-root.js b/src/panels/lovelace/hui-root.js
index 29071b6ae041..d245e5b13cf4 100644
--- a/src/panels/lovelace/hui-root.js
+++ b/src/panels/lovelace/hui-root.js
@@ -159,8 +159,14 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
         value: false,
       },
 
+      _persistentNotifications: {
+        type: Array,
+        value: []
+      },
+
       notifications: {
-        type: Array
+        type: Array,
+        computed: '_updateNotifications(hass.states, _persistentNotifications)'
       },
 
       routeData: Object,
@@ -174,9 +180,11 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
 
   async connectedCallback() {
     super.connectedCallback();
-    this._updateNotifications();
-    this._unsubNotifications = await this.hass.connection
-      .subscribeEvents(() => this._updateNotifications(), 'persistent_notifications_updated');
+    this._fetchPersistentNotifications();
+    this._unsubNotifications = await this.hass.connection.subscribeEvents(
+      () => this._fetchPersistentNotifications(),
+      'persistent_notifications_updated'
+    );
   }
 
   disconnectedCallback() {
@@ -186,11 +194,15 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
     }
   }
 
-  async _updateNotifications() {
-    if (!this.hass) return;
-    const persistentNotifications = await this.hass.callWS({ type: 'persistent_notification/get' });
-    const configurator = computeNotifications(this.hass.states);
-    this.notifications = persistentNotifications.concat(configurator);
+  async _fetchPersistentNotifications() {
+    this._persistentNotifications = await this.hass.callWS({ type: 'persistent_notification/get' });
+  }
+
+  _updateNotifications(states, persistent) {
+    if (!states) return persistent;
+
+    const configurator = computeNotifications(states);
+    return persistent.concat(configurator);
   }
 
   _routeChanged(route) {
@@ -288,7 +300,7 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
   _hassChanged(hass) {
     if (!this.$.view.lastChild) return;
     this.$.view.lastChild.hass = hass;
-    this._updateNotifications();
+    this._configuratorNotifications = computeNotifications(hass.states);
   }
 
   _configChanged(config) {

From 19de8af28eb047abcd17e5fd82c7a845b3b46dde Mon Sep 17 00:00:00 2001
From: Jerad Meisner <jerad.meisner@gmail.com>
Date: Tue, 11 Sep 2018 19:56:01 -0700
Subject: [PATCH 3/3] Use collection for notifications.

---
 src/data/ws-notifications.js                  | 20 +++++++++++++++++
 .../lovelace/common/compute-notifications.js  |  6 +----
 src/panels/lovelace/hui-root.js               | 22 +++++++------------
 3 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 src/data/ws-notifications.js

diff --git a/src/data/ws-notifications.js b/src/data/ws-notifications.js
new file mode 100644
index 000000000000..bbe42fef7218
--- /dev/null
+++ b/src/data/ws-notifications.js
@@ -0,0 +1,20 @@
+import { createCollection } from 'home-assistant-js-websocket';
+
+const fetchNotifications = conn => conn.sendMessagePromise({
+  type: 'persistent_notification/get'
+});
+
+const subscribeUpdates = (conn, store) =>
+  conn.subscribeEvents(
+    () => fetchNotifications(conn).then(ntf => store.setState(ntf, true)),
+    'persistent_notifications_updated'
+  );
+
+export const subscribeNotifications = (conn, onChange) =>
+  createCollection(
+    '_ntf',
+    fetchNotifications,
+    subscribeUpdates,
+    conn,
+    onChange
+  );
diff --git a/src/panels/lovelace/common/compute-notifications.js b/src/panels/lovelace/common/compute-notifications.js
index 62006afe0721..84a5eab5b4a1 100644
--- a/src/panels/lovelace/common/compute-notifications.js
+++ b/src/panels/lovelace/common/compute-notifications.js
@@ -1,11 +1,7 @@
 import computeDomain from '../../../common/entity/compute_domain.js';
 
-const NOTIFICATION_DOMAINS = [
-  'configurator'
-];
-
 export default function computeNotifications(states) {
   return Object.keys(states)
-    .filter(entityId => NOTIFICATION_DOMAINS.includes(computeDomain(entityId)))
+    .filter(entityId => computeDomain(entityId) === 'configurator')
     .map(entityId => states[entityId]);
 }
diff --git a/src/panels/lovelace/hui-root.js b/src/panels/lovelace/hui-root.js
index d245e5b13cf4..f0b3b592e997 100644
--- a/src/panels/lovelace/hui-root.js
+++ b/src/panels/lovelace/hui-root.js
@@ -22,6 +22,7 @@ import '../../layouts/ha-app-layout.js';
 import '../../components/ha-start-voice-button.js';
 import '../../components/ha-icon.js';
 import { loadModule, loadCSS, loadJS } from '../../common/dom/load_resource.js';
+import { subscribeNotifications } from '../../data/ws-notifications';
 import './components/notifications/hui-notification-drawer.js';
 import './components/notifications/hui-notifications-button.js';
 import './hui-unused-entities.js';
@@ -77,7 +78,7 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
     <app-route route="[[route]]" pattern="/:view" data="{{routeData}}"></app-route>
     <hui-notification-drawer
       hass="[[hass]]"
-      notifications="[[notifications]]"
+      notifications="[[_notifications]]"
       open="{{notificationsOpen}}"
       narrow="[[narrow]]"
     ></hui-notification-drawer>
@@ -89,7 +90,7 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
           <hui-notifications-button
             hass="[[hass]]"
             notifications-open="{{notificationsOpen}}"
-            notifications="[[notifications]]"
+            notifications="[[_notifications]]"
           ></hui-notifications-button>
           <ha-start-voice-button hass="[[hass]]"></ha-start-voice-button>
           <paper-menu-button
@@ -164,7 +165,7 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
         value: []
       },
 
-      notifications: {
+      _notifications: {
         type: Array,
         computed: '_updateNotifications(hass.states, _persistentNotifications)'
       },
@@ -178,13 +179,11 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
     this._debouncedConfigChanged = debounce(() => this._selectView(this._curView), 100);
   }
 
-  async connectedCallback() {
+  connectedCallback() {
     super.connectedCallback();
-    this._fetchPersistentNotifications();
-    this._unsubNotifications = await this.hass.connection.subscribeEvents(
-      () => this._fetchPersistentNotifications(),
-      'persistent_notifications_updated'
-    );
+    this._unsubNotifications = subscribeNotifications(this.hass.connection, (notifications) => {
+      this._persistentNotifications = notifications;
+    });
   }
 
   disconnectedCallback() {
@@ -194,10 +193,6 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
     }
   }
 
-  async _fetchPersistentNotifications() {
-    this._persistentNotifications = await this.hass.callWS({ type: 'persistent_notification/get' });
-  }
-
   _updateNotifications(states, persistent) {
     if (!states) return persistent;
 
@@ -300,7 +295,6 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
   _hassChanged(hass) {
     if (!this.$.view.lastChild) return;
     this.$.view.lastChild.hass = hass;
-    this._configuratorNotifications = computeNotifications(hass.states);
   }
 
   _configChanged(config) {