[Data] Pass field meta to value suggestions api (#96239) (#96922)

Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Shahzad <[email protected]>
elastic · Apr 13, 2021 · f422168 · f422168
1 parent cebb0ae
commit f422168
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts b/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts
@@ -59,7 +59,7 @@ export const setupValueSuggestionProvider = (
       return core.http
         .fetch(`/api/kibana/suggestions/values/${index}`, {
           method: 'POST',
-          body: JSON.stringify({ query, field: field.name, filters }),
+          body: JSON.stringify({ query, field: field.name, fieldMeta: field?.toSpec?.(), filters }),
           signal,
         })
         .then((r) => {

diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
@@ -36,14 +36,15 @@ export function registerValueSuggestionsRoute(
             field: schema.string(),
             query: schema.string(),
             filters: schema.maybe(schema.any()),
+            fieldMeta: schema.maybe(schema.any()),
           },
           { unknowns: 'allow' }
         ),
       },
     },
     async (context, request, response) => {
       const config = await config$.pipe(first()).toPromise();
-      const { field: fieldName, query, filters } = request.body;
+      const { field: fieldName, query, filters, fieldMeta } = request.body;
       const { index } = request.params;
       const { client } = context.core.elasticsearch.legacy;
       const signal = getRequestAbortedSignal(request.events.aborted$);
@@ -53,9 +54,14 @@ export function registerValueSuggestionsRoute(
         terminate_after: config.kibana.autocompleteTerminateAfter.asMilliseconds(),
       };
 
-      const indexPattern = await findIndexPatternById(context.core.savedObjects.client, index);
+      let field: IFieldType | undefined = fieldMeta;
+
+      if (!field?.name && !field?.type) {
+        const indexPattern = await findIndexPatternById(context.core.savedObjects.client, index);
+
+        field = indexPattern && getFieldByName(fieldName, indexPattern);
+      }
 
-      const field = indexPattern && getFieldByName(fieldName, indexPattern);
       const body = await getBody(autocompleteSearchOptions, field || fieldName, query, filters);
 
       const result = await client.callAsCurrentUser('search', { index, body }, { signal });