From 341058b421539895c8b1d293366aae519d76933d Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Fri, 19 Feb 2021 09:28:37 +0000
Subject: [PATCH] [Discover] Always request unmapped fields in a single doc
 view and a context view (#91825) (#91934)

* [Discover] Always request unmapped fields in a single doc view

* Updating unit test

* Request unmapped fields in context view
---
 .../public/application/angular/context/api/anchor.js         | 2 +-
 .../public/application/angular/context/api/anchor.test.js    | 2 +-
 .../public/application/angular/context/api/context.ts        | 2 +-
 .../application/components/doc/use_es_doc_search.test.tsx    | 5 ++++-
 .../public/application/components/doc/use_es_doc_search.ts   | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/plugins/discover/public/application/angular/context/api/anchor.js b/src/plugins/discover/public/application/angular/context/api/anchor.js
index f1074be2ebcf25..83b611cb0d6488 100644
--- a/src/plugins/discover/public/application/angular/context/api/anchor.js
+++ b/src/plugins/discover/public/application/angular/context/api/anchor.js
@@ -32,7 +32,7 @@ export function fetchAnchorProvider(indexPatterns, searchSource, useNewFieldsApi
       .setField('sort', sort);
     if (useNewFieldsApi) {
       searchSource.removeField('fieldsFromSource');
-      searchSource.setField('fields', ['*']);
+      searchSource.setField('fields', [{ field: '*', include_unmapped: 'true' }]);
     }
     const response = await searchSource.fetch();
 
diff --git a/src/plugins/discover/public/application/angular/context/api/anchor.test.js b/src/plugins/discover/public/application/angular/context/api/anchor.test.js
index 5b077f7443c27e..12b9b4ab285567 100644
--- a/src/plugins/discover/public/application/angular/context/api/anchor.test.js
+++ b/src/plugins/discover/public/application/angular/context/api/anchor.test.js
@@ -154,7 +154,7 @@ describe('context app', function () {
         const removeFieldsSpy = searchSourceStub.removeField.withArgs('fieldsFromSource');
         expect(setFieldsSpy.calledOnce).toBe(true);
         expect(removeFieldsSpy.calledOnce).toBe(true);
-        expect(setFieldsSpy.firstCall.args[1]).toEqual(['*']);
+        expect(setFieldsSpy.firstCall.args[1]).toEqual([{ field: '*', include_unmapped: 'true' }]);
       });
     });
   });
diff --git a/src/plugins/discover/public/application/angular/context/api/context.ts b/src/plugins/discover/public/application/angular/context/api/context.ts
index 5e52aa4019196b..d57b54ca1ea1e9 100644
--- a/src/plugins/discover/public/application/angular/context/api/context.ts
+++ b/src/plugins/discover/public/application/angular/context/api/context.ts
@@ -114,7 +114,7 @@ function fetchContextProvider(indexPatterns: IndexPatternsContract, useNewFields
     const searchSource = await data.search.searchSource.create();
     if (useNewFieldsApi) {
       searchSource.removeField('fieldsFromSource');
-      searchSource.setField('fields', ['*']);
+      searchSource.setField('fields', [{ field: '*', include_unmapped: 'true' }]);
     }
     return searchSource
       .setParent(undefined)
diff --git a/src/plugins/discover/public/application/components/doc/use_es_doc_search.test.tsx b/src/plugins/discover/public/application/components/doc/use_es_doc_search.test.tsx
index ef2619070a6d8e..dc0b6416a7f576 100644
--- a/src/plugins/discover/public/application/components/doc/use_es_doc_search.test.tsx
+++ b/src/plugins/discover/public/application/components/doc/use_es_doc_search.test.tsx
@@ -67,7 +67,10 @@ describe('Test of <Doc /> helper / hook', () => {
         "_source": false,
         "docvalue_fields": Array [],
         "fields": Array [
-          "*",
+          Object {
+            "field": "*",
+            "include_unmapped": "true",
+          },
         ],
         "query": Object {
           "ids": Object {
diff --git a/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts b/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts
index 295b2ab3831194..703a1e557e801a 100644
--- a/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts
+++ b/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts
@@ -39,7 +39,7 @@ export function buildSearchBody(
     },
     stored_fields: computedFields.storedFields,
     _source: !useNewFieldsApi,
-    fields: useNewFieldsApi ? ['*'] : undefined,
+    fields: useNewFieldsApi ? [{ field: '*', include_unmapped: 'true' }] : undefined,
     script_fields: computedFields.scriptFields,
     docvalue_fields: computedFields.docvalueFields,
   };