From 60c9fdc20458008b67a150574e2d29fb0706b59b Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Fri, 19 Feb 2021 18:49:03 +0000
Subject: [PATCH] [Search Source] Do not request unmapped fields if source
 filters are provided (#91921) (#92014)

---
 .../data/common/search/search_source/search_source.test.ts | 5 +----
 .../data/common/search/search_source/search_source.ts      | 7 +------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/plugins/data/common/search/search_source/search_source.test.ts b/src/plugins/data/common/search/search_source/search_source.test.ts
index 030e620bea34b4..fd97a3d3381a99 100644
--- a/src/plugins/data/common/search/search_source/search_source.test.ts
+++ b/src/plugins/data/common/search/search_source/search_source.test.ts
@@ -418,10 +418,7 @@ describe('SearchSource', () => {
         searchSource.setField('fields', [{ field: '*', include_unmapped: 'true' }]);
 
         const request = await searchSource.getSearchRequestBody();
-        expect(request.fields).toEqual([
-          { field: 'field1', include_unmapped: 'true' },
-          { field: 'field2', include_unmapped: 'true' },
-        ]);
+        expect(request.fields).toEqual([{ field: 'field1' }, { field: 'field2' }]);
       });
 
       test('returns all scripted fields when one fields entry is *', async () => {
diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts
index 066c20e2dc2702..de225bfbc3ea32 100644
--- a/src/plugins/data/common/search/search_source/search_source.ts
+++ b/src/plugins/data/common/search/search_source/search_source.ts
@@ -500,12 +500,7 @@ export class SearchSource {
     // we need to get the list of fields from an index pattern
     return fields
       .filter((fld: IndexPatternField) => filterSourceFields(fld.name))
-      .map((fld: IndexPatternField) => ({
-        field: fld.name,
-        ...((wildcardField as Record<string, string>)?.include_unmapped && {
-          include_unmapped: (wildcardField as Record<string, string>).include_unmapped,
-        }),
-      }));
+      .map((fld: IndexPatternField) => ({ field: fld.name }));
   }
 
   private getFieldFromDocValueFieldsOrIndexPattern(