use value suggestion provider through utils

Signed-off-by: Paul Sebastian <[email protected]>

src/plugins/data/public/antlr/dql/code_completion.ts

@@ -14,6 +14,7 @@ import { IndexPattern, IndexPatternField } from '../../index_patterns';
 import { QuerySuggestionGetFnArgs } from '../../autocomplete';
 import { DQLParserVisitor } from './.generated/DQLParserVisitor';
 import { getUiService } from '../../services';
+import { IDataPluginServices } from '../..';
 
 const findCursorIndex = (
   tokenStream: TokenStream,
@@ -59,24 +60,13 @@ const findFieldSuggestions = (indexPattern: IndexPattern) => {
   return fieldSuggestions;
 };
 
-const getFieldSuggestedValues = async (
-  indexTitle: string,
-  fieldName: string,
-  currentValue: string,
-  http?: HttpSetup
-) => {
-  if (!http) return [];
-  return await http.fetch(`/api/opensearch-dashboards/suggestions/values/${indexTitle}`, {
-    method: 'POST',
-    body: JSON.stringify({ query: currentValue, field: fieldName, boolFilter: [] }),
-  });
-};
-
 const findValueSuggestions = async (
   index: IndexPattern,
   field: string,
   value: string,
-  http?: HttpSetup
+  services: IDataPluginServices,
+  boolFilter?: any,
+  signal?: AbortSignal
 ) => {
   // check to see if last field is within index and if it can suggest values, first check
   // if .keyword appended field exists because that has values
@@ -90,14 +80,15 @@ const findValueSuggestions = async (
       if (idxField.name === field) return idxField;
     });
 
-  if (matchedField?.type === 'boolean') {
-    return ['true', 'false'];
-  }
+  if (!matchedField) return;
 
-  if (!matchedField || !matchedField.aggregatable || matchedField.type !== 'string') return;
-
-  // ask api for suggestions
-  return await getFieldSuggestedValues(index.title, matchedField.name, value, http);
+  return await services?.data.autocomplete.getValueSuggestions({
+    indexPattern: index,
+    field: matchedField,
+    query: value,
+    boolFilter,
+    signal,
+  });
 };
 
 // visitor for parsing the current query
@@ -128,6 +119,8 @@ export const getSuggestions = async ({
   position,
   selectionEnd,
   services,
+  boolFilter,
+  signal,
 }: QuerySuggestionGetFnArgs) => {
   if (
     !services ||
@@ -138,8 +131,6 @@ export const getSuggestions = async ({
     return [];
   }
   try {
-    const http = services.http;
-
     const inputStream = CharStream.fromString(query);
     const lexer = new DQLLexer(inputStream);
     const tokenStream = new CommonTokenStream(lexer);
@@ -184,7 +175,14 @@ export const getSuggestions = async ({
     // find suggested values for the last found field (only for kvexpression rule)
     const { field: lastField = '', value: lastValue = '' } = visitor.visit(tree) ?? {};
     if (!!lastField && candidates.tokens.has(DQLParser.PHRASE)) {
-      const values = await findValueSuggestions(indexPattern, lastField, lastValue ?? '', http);
+      const values = await findValueSuggestions(
+        indexPattern,
+        lastField,
+        lastValue ?? '',
+        services,
+        boolFilter,
+        signal
+      );
       if (!!values) {
         completions.push(
           ...values?.map((val: any) => {