Don't prevent filterable rows from being filterable (elastic#11628)

* Don't prevent filterable rows just because they don't have a field * Don't allow filtering on unfilterable fields * Move isFilterable to aggConfig
lukasolson · May 9, 2017 · f25f118 · f25f118
1 parent ab5133b
commit f25f118
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/ui/public/directives/rows.js b/src/ui/public/directives/rows.js
@@ -40,10 +40,10 @@ module.directive('kbnRows', function ($compile, $rootScope, getAppState, Private
         let $cellContent;
 
         if (contents instanceof AggConfigResult) {
+          const field = contents.aggConfig.getField();
           const isCellContentFilterable =
-            contents.type === 'bucket'
-            && contents.aggConfig.getField()
-            && contents.aggConfig.getField().filterable;
+            contents.aggConfig.isFilterable()
+            && (!field || field.filterable);
 
           if (isCellContentFilterable) {
             $cell = createFilterableCell(contents);

diff --git a/src/ui/public/vis/agg_config.js b/src/ui/public/vis/agg_config.js
@@ -169,8 +169,12 @@ export function VisAggConfigProvider(Private, fieldTypeFilter) {
     return this.type.params.write(this);
   };
 
+  AggConfig.prototype.isFilterable = function () {
+    return _.isFunction(this.type.createFilter);
+  };
+
   AggConfig.prototype.createFilter = function (key) {
-    if (!_.isFunction(this.type.createFilter)) {
+    if (!this.isFilterable()) {
       throw new TypeError('The "' + this.type.title + '" aggregation does not support filtering.');
     }