Extend SearchSource with fieldsApi handling

elastic · Sep 10, 2020 · 9c5160f · 9c5160f
1 parent 9ed5a95
commit 9c5160f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/...pment/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md b/...pment/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-QueryStringInput: React.FC<Pick<Props, "query" | "prepend" | "size" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>
+React.FC<Pick<Props, "query" | "prepend" | "size" | "className" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>
 ```
diff --git a/...ent/plugins/data/public/kibana-plugin-plugins-data-public.searchsourcefields.md b/...ent/plugins/data/public/kibana-plugin-plugins-data-public.searchsourcefields.md
@@ -16,6 +16,7 @@ export interface SearchSourceFields
 |  --- | --- | --- |
 |  [aggs](./kibana-plugin-plugins-data-public.searchsourcefields.aggs.md) | <code>any</code> |  |
 |  [fields](./kibana-plugin-plugins-data-public.searchsourcefields.fields.md) | <code>NameList</code> |  |
+|  [fieldsApi](./kibana-plugin-plugins-data-public.searchsourcefields.fieldsapi.md) | <code>NameList</code> |  |
 |  [filter](./kibana-plugin-plugins-data-public.searchsourcefields.filter.md) | <code>Filter[] &#124; Filter &#124; (() =&gt; Filter[] &#124; Filter &#124; undefined)</code> |  |
 |  [from](./kibana-plugin-plugins-data-public.searchsourcefields.from.md) | <code>number</code> |  |
 |  [highlight](./kibana-plugin-plugins-data-public.searchsourcefields.highlight.md) | <code>any</code> |  |

diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
@@ -1771,6 +1771,8 @@ export interface SearchSourceFields {
     // (undocumented)
     fields?: NameList;
     // (undocumented)
+    fieldsApi?: NameList;
+    // (undocumented)
     filter?: Filter[] | Filter | (() => Filter[] | Filter | undefined);
     // (undocumented)
     from?: number;

diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
@@ -381,6 +381,8 @@ export class SearchSource {
       case 'fields':
         const fields = uniq((data[key] || []).concat(val));
         return addToRoot(key, fields);
+      case 'fieldsApi':
+        return key && data[key] == null && addToBody('fields', val);
       case 'index':
       case 'type':
       case 'highlightAll':
@@ -465,7 +467,7 @@ export class SearchSource {
 
       // request the remaining fields from both stored_fields and _source
       const remainingFields = difference(fields, keys(body.script_fields));
-      body.fields = remainingFields;
+      body.stored_fields = remainingFields;
       setWith(body, '_source.includes', remainingFields, (nsValue) =>
         isObject(nsValue) ? {} : nsValue
       );

diff --git a/src/plugins/data/public/search/search_source/types.ts b/src/plugins/data/public/search/search_source/types.ts
@@ -47,6 +47,7 @@ export interface SearchSourceFields {
   source?: NameList;
   version?: boolean;
   fields?: NameList;
+  fieldsApi?: NameList;
   index?: IndexPattern;
   searchAfter?: EsQuerySearchAfter;
   timeout?: string;

diff --git a/src/plugins/discover/public/application/angular/discover.js b/src/plugins/discover/public/application/angular/discover.js
@@ -948,18 +948,13 @@ function discoverController($element, $route, $scope, $timeout, $window, Promise
 
   $scope.updateDataSource = () => {
     const { indexPattern, searchSource } = $scope;
-    const indexPatternFields = indexPattern.getComputedFields();
-    const columns = $scope.state.columns.filter((name) => {
-      return !indexPatternFields.docvalueFields.find((docVal) => docVal.field === name);
-    });
-    const fields = [
-      ...columns,
-      ...indexPatternFields.docvalueFields,
-      ...Object.keys(indexPatternFields.scriptFields),
-    ];
+    const { docvalueFields } = indexPattern.getComputedFields();
+    const columns = $scope.state.columns.filter(
+      (name) => !docvalueFields.find((docVal) => docVal.field === name)
+    );
     searchSource
       .setField('index', $scope.indexPattern)
-      .setField('fields', fields)
+      .setField('fieldsApi', columns)
       .setField('source', true)
       .setField('size', $scope.opts.sampleSize)
       .setField(