Fix KQL value suggestions for nested fields (elastic#54820)

* Revert "Flag nested fields as non-aggregatable (elastic#51774)" This reverts commit c7046a0 * Filter out nested fields at the agg param level * Forbid nested fields in TSVB * Revert "Forbid nested fields in TSVB" This reverts commit afcaa34 Co-authored-by: Tim Roes <mail@timroes.de> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
timroes · Jan 18, 2020 · da296d9 · da296d9
1 parent 666eda0
commit da296d9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/src/legacy/ui/public/agg_types/param_types/field.ts b/src/legacy/ui/public/agg_types/param_types/field.ts
@@ -115,7 +115,10 @@ export class FieldParamType extends BaseParamType {
     const filteredFields = fields.filter((field: Field) => {
       const { onlyAggregatable, scriptable, filterFieldTypes } = this;
 
-      if ((onlyAggregatable && !field.aggregatable) || (!scriptable && field.scripted)) {
+      if (
+        (onlyAggregatable && (!field.aggregatable || field.subType?.nested)) ||
+        (!scriptable && field.scripted)
+      ) {
         return false;
       }
 

diff --git a/...ins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js b/...ins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
@@ -143,13 +143,6 @@ describe('index_patterns/field_capabilities/field_caps_response', () => {
         expect(child).toHaveProperty('subType', { nested: { path: 'nested_object_parent' } });
       });
 
-      it('returns nested sub-fields as non-aggregatable', () => {
-        const fields = readFieldCapsResponse(esResponse);
-        // Normally a keyword field would be aggregatable, but the fact that it is nested overrides that
-        const child = fields.find(f => f.name === 'nested_object_parent.child.keyword');
-        expect(child).toHaveProperty('aggregatable', false);
-      });
-
       it('handles fields that are both nested and multi', () => {
         const fields = readFieldCapsResponse(esResponse);
         const child = fields.find(f => f.name === 'nested_object_parent.child.keyword');

diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -182,14 +182,6 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie
 
       if (Object.keys(subType).length > 0) {
         field.subType = subType;
-
-        // We don't support aggregating on nested fields, trying to do so in the UI will return
-        // blank results. For now we will stop showing nested fields as an option for aggregation.
-        // Once we add support for nested fields this condition should be removed and old index
-        // patterns should be migrated.
-        if (field.subType.nested) {
-          field.aggregatable = false;
-        }
       }
     }
   });

diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
@@ -72,7 +72,7 @@ export default function({ getService }) {
               readFromDocValues: true,
             },
             {
-              aggregatable: false,
+              aggregatable: true,
               esTypes: ['keyword'],
               name: 'nestedField.child',
               readFromDocValues: true,
@@ -154,7 +154,7 @@ export default function({ getService }) {
               readFromDocValues: true,
             },
             {
-              aggregatable: false,
+              aggregatable: true,
               esTypes: ['keyword'],
               name: 'nestedField.child',
               readFromDocValues: true,