[data.search.aggs] Remove use_field_mapping from top hits agg (#71168)

elastic · Jul 14, 2020 · 7b026bb · 7b026bb
1 parent 50f8db7
commit 7b026bb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/plugins/data/public/search/aggs/metrics/top_hit.test.ts b/src/plugins/data/public/search/aggs/metrics/top_hit.test.ts
@@ -111,9 +111,7 @@ describe('Top hit metric', () => {
   it('requests both source and docvalues_fields for non-text aggregatable fields', () => {
     init({ fieldName: 'bytes', readFromDocValues: true });
     expect(aggDsl.top_hits._source).toBe('bytes');
-    expect(aggDsl.top_hits.docvalue_fields).toEqual([
-      { field: 'bytes', format: 'use_field_mapping' },
-    ]);
+    expect(aggDsl.top_hits.docvalue_fields).toEqual([{ field: 'bytes' }]);
   });
 
   it('requests both source and docvalues_fields for date aggregatable fields', () => {

diff --git a/src/plugins/data/public/search/aggs/metrics/top_hit.ts b/src/plugins/data/public/search/aggs/metrics/top_hit.ts
@@ -88,12 +88,15 @@ export const getTopHitMetricAgg = () => {
             };
           } else {
             if (field.readFromDocValues) {
-              // always format date fields as date_time to avoid
-              // displaying unformatted dates like epoch_millis
-              // or other not-accepted momentjs formats
-              const format =
-                field.type === KBN_FIELD_TYPES.DATE ? 'date_time' : 'use_field_mapping';
-              output.params.docvalue_fields = [{ field: field.name, format }];
+              output.params.docvalue_fields = [
+                {
+                  field: field.name,
+                  // always format date fields as date_time to avoid
+                  // displaying unformatted dates like epoch_millis
+                  // or other not-accepted momentjs formats
+                  ...(field.type === KBN_FIELD_TYPES.DATE && { format: 'date_time' }),
+                },
+              ];
             }
             output.params._source = field.name === '_source' ? true : field.name;
           }

diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
@@ -246,9 +246,7 @@ export default function ({ getService, getPageObjects }) {
         await inspector.close();
       });
 
-      // Preventing ES Promotion for master (8.0)
-      // https://github.com/elastic/kibana/issues/64734
-      it.skip('does not scale top hit agg', async () => {
+      it('does not scale top hit agg', async () => {
         const expectedTableData = [
           ['2015-09-20 00:00', '6', '9.035KB'],
           ['2015-09-20 01:00', '9', '5.854KB'],