Handles situations where the vislib is passed a data object with no data

src/kibana/components/errors.js

@@ -214,5 +214,15 @@ define(function (require) {
   };
   inherits(errors.NotEnoughData, KbnError);
 
+  /**
+   * error thrown when no results are returned from an elasticsearch query
+   */
+  errors.NoResults = function NoResults() {
+    KbnError.call(this,
+    'No results found',
+    errors.NoResults);
+  };
+  inherits(errors.NoResults, KbnError);
+
   return errors;
 });

src/kibana/components/vislib/lib/data.js

@@ -71,6 +71,8 @@ define(function (require) {
           type = 'series';
         } else if (obj.slices) {
           type = 'slices';
+        } else if (obj.geoJSON) {
+          type = 'goeJSON';
         }
       });
 

src/kibana/components/vislib/lib/handler/handler.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return function HandlerBaseClass(d3, Private) {
     var _ = require('lodash');
+    var errors = require('errors');
 
     var Data = Private(require('components/vislib/lib/data'));
     var Layout = Private(require('components/vislib/lib/layout/layout'));
@@ -20,6 +21,7 @@ define(function (require) {
       }
 
       this.data = opts.data || new Data(vis.data, vis._attr);
+
       this.vis = vis;
       this.el = vis.el;
       this.ChartClass = vis.ChartClass;
@@ -49,6 +51,21 @@ define(function (require) {
       ], Boolean);
     }
 
+    /**
+     * Validates whether data is actually present in the data object
+     * used to render the Vis. Throws a no results error if data is not
+     * present.
+     *
+     * @private
+     */
+    Handler.prototype._validateData = function () {
+      var dataType = this.data.type;
+
+      if (!dataType) {
+        throw new errors.NoResults();
+      }
+    };
+
     /**
      * Renders the constructors that create the visualization,
      * including the chart constructor
@@ -60,6 +77,7 @@ define(function (require) {
       var self = this;
       var charts = this.charts = [];
 
+      this._validateData();
       this.renderArray.forEach(function (property) {
         if (typeof property.render === 'function') {
           property.render();
@@ -153,13 +171,25 @@ define(function (require) {
     Handler.prototype.error = function (message) {
       this.removeAll(this.el);
 
-      return d3.select(this.el)
+      var div = d3.select(this.el)
       .append('div')
       // class name needs `chart` in it for the polling checkSize function
       // to continuously call render on resize
-      .attr('class', 'visualize-error chart error')
-      .append('h4')
-      .text(message);
+      .attr('class', 'visualize-error chart error');
+
+      if (message === 'No results found') {
+        div.append('div')
+        .attr('class', 'text-center visualize-error visualize-chart ng-scope')
+        .append('div').attr('class', 'item top')
+        .append('div').attr('class', 'item')
+        .append('h2').html('<i class="fa fa-meh-o"></i>')
+        .append('h4').text(message);
+
+        div.append('div').attr('class', 'item bottom');
+        return div;
+      }
+
+      return div.append('h4').text(message);
     };
 
     /**

src/kibana/components/vislib/vis.js

@@ -80,7 +80,8 @@ define(function (require) {
         // Because we have to wait for the DOM element to initialize, we do not
         // want to throw an error when the DOM `el` is zero
         if (error instanceof errors.ContainerTooSmall ||
-          error instanceof errors.NotEnoughData) {
+          error instanceof errors.NotEnoughData ||
+          error instanceof errors.NoResults) {
           this.handler.error(error.message);
         } else {
           throw error;