Dashboard load failure handling. Closes #70

elastic · Apr 29, 2014 · 6af0ecd · 6af0ecd
1 parent 971668f
commit 6af0ecd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/kibana/apps/dashboard/index.js b/src/kibana/apps/dashboard/index.js
@@ -35,8 +35,16 @@ define(function (require) {
   .when('/dashboard/:id', {
     templateUrl: 'kibana/apps/dashboard/index.html',
     resolve: {
-      dash: function (savedDashboards, $route) {
-        return savedDashboards.get($route.current.params.id);
+      dash: function (savedDashboards, Notifier, $route, $location, courier) {
+        return savedDashboards.get($route.current.params.id).catch(function (e) {
+          if (e instanceof courier.errors.SavedObjectNotFound) {
+            new Notifier({location: 'Dashboard'}).error(e.message);
+            $location.path('/dashboard');
+            return false;
+          } else {
+            throw e;
+          }
+        });
       }
     }
   });

diff --git a/src/kibana/components/courier/errors.js b/src/kibana/components/courier/errors.js
@@ -127,5 +127,17 @@ define(function (require) {
         errors.FieldNotFoundInCache);
     };
     inherits(errors.FieldNotFoundInCache, CourierError);
+
+    /**
+     * A saved object was not found
+     * @param {String} field - the fields which contains the conflict
+     */
+    errors.SavedObjectNotFound = function SavedObjectNotFound(type) {
+      CourierError.call(this,
+        'Could not locate that ' + type,
+        errors.SavedObjectNotFound);
+    };
+    inherits(errors.SavedObjectNotFound, CourierError);
+
   });
 });
diff --git a/src/kibana/components/saved_object/saved_object.js b/src/kibana/components/saved_object/saved_object.js
@@ -103,7 +103,7 @@ define(function (require) {
           // fetch the object from ES
           return docSource.fetch()
           .then(function applyESResp(resp) {
-            if (!resp.found) throw new Error('Unable to find that ' + type + '.');
+            if (!resp.found) throw new courier.errors.SavedObjectNotFound(type);
 
             var meta = resp._source.kibanaSavedObjectMeta || {};
             delete resp._source.kibanaSavedObjectMeta;