[Search Source] Do not pick scripted fields if * provided

elastic · Dec 7, 2020 · 305934e · 305934e
1 parent 446390d
commit 305934e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts
@@ -518,11 +518,13 @@ export class SearchSource {
       );
       const uniqFieldNames = [...new Set([...bodyFieldNames, ...fieldsFromSource])];
 
-      // filter down script_fields to only include items specified
-      body.script_fields = pick(
-        body.script_fields,
-        Object.keys(body.script_fields).filter((f) => uniqFieldNames.includes(f))
-      );
+      if (uniqFieldNames.indexOf('*') === -1) {
+        // filter down script_fields to only include items specified
+        body.script_fields = pick(
+          body.script_fields,
+          Object.keys(body.script_fields).filter((f) => uniqFieldNames.includes(f))
+        );
+      }
 
       // request the remaining fields from stored_fields just in case, since the
       // fields API does not handle stored fields