From ec6bbe2af09c3463c262a7f71f38ad5c3bafab19 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 29 Mar 2018 14:12:29 -0400
Subject: [PATCH] FIX: Show error if dashboard can't load

---
 .../javascripts/admin/controllers/admin-dashboard.js.es6   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
index d06b8dc06ea..6652002fb46 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
@@ -19,6 +19,7 @@ export default Ember.Controller.extend({
   versionCheck: null,
   dashboardFetchedAt: null,
   showVersionChecks: setting('version_checks'),
+  exceptionController: Ember.inject.controller('exception'),
 
   @computed('problems.length')
   foundProblems(problemsLength) {
@@ -39,10 +40,10 @@ export default Ember.Controller.extend({
 
   fetchDashboard() {
     if (!this.get('dashboardFetchedAt') || moment().subtract(30, 'minutes').toDate() > this.get('dashboardFetchedAt')) {
-      this.set('dashboardFetchedAt', new Date());
       this.set('loading', true);
       const versionChecks = this.siteSettings.version_checks;
       AdminDashboard.find().then(d => {
+        this.set('dashboardFetchedAt', new Date());
         if (versionChecks) {
           this.set('versionCheck', VersionCheck.create(d.version_check));
         }
@@ -56,6 +57,10 @@ export default Ember.Controller.extend({
         }
 
         ATTRIBUTES.forEach(a => this.set(a, d[a]));
+      }).catch(e => {
+        this.get('exceptionController').set('thrown', e.jqXHR);
+        this.replaceRoute('exception');
+      }).finally(() => {
         this.set('loading', false);
       });
     }