Controls vis - safely handle case where value can not be extracted fr…

…om Kibana filter (#22885) (#22900) * handle case where value can not be extracted from Kibana filter * review feedback
elastic · Sep 10, 2018 · cf95d1d · cf95d1d
1 parent c74da9c
commit cf95d1d
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/src/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js b/src/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js
@@ -61,10 +61,17 @@ export class PhraseFilterManager extends FilterManager {
       return;
     }
 
-    return kbnFilters
+    const values = kbnFilters
       .map((kbnFilter) => {
         return this._getValueFromFilter(kbnFilter);
       })
+      .filter(value => value != null);
+
+    if (values.length === 0) {
+      return;
+    }
+
+    return values
       .reduce((accumulator, currentValue) => {
         return accumulator.concat(currentValue);
       }, [])

diff --git a/...ore_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.js b/...ore_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.js
@@ -154,6 +154,22 @@ describe('PhraseFilterManager', function () {
       ]);
       expect(filterManager.getValueFromFilterBar()).to.eql([{ value: 'ios', label: 'ios' }, { value: 'win xp', label: 'win xp' }]);
     });
+
+    test('should return undefined when filter value can not be extracted from Kibana filter', function () {
+      filterManager.setMockFilters([
+        {
+          query: {
+            match: {
+              myFieldWhichIsNotField1: {
+                query: 'ios',
+                type: 'phrase'
+              }
+            }
+          }
+        }
+      ]);
+      expect(filterManager.getValueFromFilterBar()).to.eql(undefined);
+    });
   });
 
 });
diff --git a/src/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js b/src/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js
@@ -69,14 +69,17 @@ export class RangeFilterManager extends FilterManager {
       return;
     }
 
-    let range = null;
+    let range;
     if (_.has(kbnFilters[0], 'script')) {
       range = _.get(kbnFilters[0], 'script.script.params');
     } else {
       range = _.get(kbnFilters[0], ['range', this.fieldName]);
     }
 
-    return fromRange(range);
+    if (!range) {
+      return;
+    }
 
+    return fromRange(range);
   }
 }
diff --git a/...core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.js b/...core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.js
@@ -91,6 +91,20 @@ describe('RangeFilterManager', function () {
       expect(value).to.have.property('max');
       expect(value.max).to.be(3);
     });
+
+    test('should return undefined when filter value can not be extracted from Kibana filter', function () {
+      filterManager.setMockFilters([
+        {
+          range: {
+            myFieldWhichIsNotField1: {
+              gte: 1,
+              lte: 3
+            }
+          }
+        }
+      ]);
+      expect(filterManager.getValueFromFilterBar()).to.eql(undefined);
+    });
   });
 
 });