Add ignore_unmapped to geo filters to prevent exception (#11461)

elastic · May 10, 2017 · 72443cd · 72443cd
1 parent 72dd928
commit 72443cd
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js
@@ -27,14 +27,8 @@ describe('Filter Bar Directive', function () {
         },
         geo_bounding_box: {
           point: { // field name
-            top_left: {
-              lat: 5,
-              lon: 10
-            },
-            bottom_right: {
-              lat: 15,
-              lon: 20
-            }
+            top_left: { lat: 5, lon: 10 },
+            bottom_right: { lat: 15, lon: 20 }
           }
         }
       };
@@ -57,5 +51,28 @@ describe('Filter Bar Directive', function () {
       $rootScope.$apply();
     });
 
+    it('should return the key and value even when using ignore_unmapped', function (done) {
+      const filter = {
+        meta: {
+          index: 'logstash-*'
+        },
+        geo_bounding_box: {
+          ignore_unmapped: true,
+          point: { // field name
+            top_left: { lat: 5, lon: 10 },
+            bottom_right: { lat: 15, lon: 20 }
+          }
+        }
+      };
+      mapGeoBoundingBox(filter).then(function (result) {
+        expect(result).to.have.property('key', 'point');
+        expect(result).to.have.property('value');
+        // remove html entities and non-alphanumerics to get the gist of the value
+        expect(result.value.replace(/&[a-z]+?;/g, '').replace(/[^a-z0-9]/g, '')).to.be('lat5lon10tolat15lon20');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
   });
 });
diff --git a/src/ui/public/filter_bar/lib/map_geo_bounding_box.js b/src/ui/public/filter_bar/lib/map_geo_bounding_box.js
@@ -10,7 +10,8 @@ export default function mapGeoBoundBoxProvider(Promise, courier) {
       return courier
       .indexPatterns
       .get(filter.meta.index).then(function (indexPattern) {
-        key = _.keys(filter.geo_bounding_box)[0];
+        key = _.keys(filter.geo_bounding_box)
+          .filter(key => key !== 'ignore_unmapped')[0];
         field = indexPattern.fields.byName[key];
         topLeft = field.format.convert(filter.geo_bounding_box[field.name].top_left);
         bottomRight = field.format.convert(filter.geo_bounding_box[field.name].bottom_right);

diff --git a/src/ui/public/vis_maps/maps_renderbot.js b/src/ui/public/vis_maps/maps_renderbot.js
@@ -227,7 +227,7 @@ module.exports = function MapsRenderbotFactory(Private, $injector, tilemapSettin
     const indexPatternName = agg.vis.indexPattern.id;
     const field = agg.fieldName();
     const filter = {};
-    filter[filterName] = {};
+    filter[filterName] = { ignore_unmapped: true };
     filter[filterName][field] = filterData;
 
     const putFilter = Private(FilterBarPushFilterProvider)(getAppState());
@@ -237,5 +237,3 @@ module.exports = function MapsRenderbotFactory(Private, $injector, tilemapSettin
 
   return MapsRenderbot;
 };
-
-