Merge pull request #404 from conveyal/dev

v1.1.1

client/service-alerts-view/index.js

@@ -1,32 +1,20 @@
-var moment = require('moment')
-
 var AlertRow = require('./row')
 var view = require('../view')
 
 /**
  * Expose `View`
  */
 
-var View = module.exports = view(require('./template.html'), function (view, model) {
-  model.on('change serviceAlerts', (alerts) => {
-    alerts = (alerts || []).filter(function (alert) {
-      var today = moment()
-      var fromDate = moment.utc(alert.fromDate)
-      var toDate = moment.utc(alert.toDate)
-      return !fromDate.isAfter(today, 'days') && !toDate.isBefore(today, 'days')
-    })
-    view.emit('change alerts', alerts)
-  })
-})
+var View = module.exports = view(require('./template.html'))
 
 View.prototype.hasAlerts = function () {
-  return this.model.alerts && this.model.alerts.length > 0
+  return this.model.serviceAlerts && this.model.serviceAlerts.length > 0
 }
 
 /**
  * Set the routes view
  */
 
-View.prototype['alerts-view'] = function () {
+View.prototype['serviceAlerts-view'] = function () {
   return AlertRow
 }

client/service-alerts-view/template.html

@@ -1,3 +1,3 @@
 <div class="ServiceAlerts" data-visible="hasAlerts">
-  <div data-each="alerts"></div>
+  <div data-each="serviceAlerts"></div>
 </div>

client/session/index.js

@@ -1,3 +1,5 @@
+var moment = require('moment')
+
 var analytics = require('../analytics')
 var store = require('../browser-store')
 var Commuter = require('../commuter')
@@ -167,6 +169,14 @@ session.load = function (ctx, next) {
         if (err) {
           console.log('error loading service alerts', err)
         }
+
+        const today = moment()
+        alerts = (alerts || []).filter(function (alert) {
+          const fromDate = moment.utc(alert.fromDate)
+          const toDate = moment.utc(alert.toDate)
+          return !fromDate.isAfter(today, 'days') && !toDate.isBefore(today, 'days')
+        })
+
         session.serviceAlerts(alerts)
       })