[Enhancement] Update auto-complete-api-with-mds (#8713)

* Update auto-complete-api-with-mds Signed-off-by: sumukhswamy <[email protected]> * Update auto-complete-api-with-mds Signed-off-by: sumukhswamy <[email protected]> * added changelog Signed-off-by: sumukhswamy <[email protected]> --------- Signed-off-by: sumukhswamy <[email protected]> (cherry picked from commit c105d94) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Oct 28, 2024 · 54676cb · 54676cb
1 parent a887cec
commit 54676cb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/changelogs/fragments/8713.yml b/changelogs/fragments/8713.yml
@@ -0,0 +1,2 @@
+fix:
+-[Enhancement] Update auto-complete-api-with-mds ([#8713](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8713))
diff --git a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts b/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts
@@ -53,10 +53,17 @@ export const getEmptyValueSuggestions = (() => Promise.resolve([])) as ValueSugg
 
 export const setupValueSuggestionProvider = (core: CoreSetup): ValueSuggestionsGetFn => {
   const requestSuggestions = memoize(
-    (index: string, field: IFieldType, query: string, boolFilter: any = [], signal?: AbortSignal) =>
+    (
+      index: string,
+      field: IFieldType,
+      query: string,
+      boolFilter: any = [],
+      signal?: AbortSignal,
+      dataSourceId?: string
+    ) =>
       core.http.fetch(`/api/opensearch-dashboards/suggestions/values/${index}`, {
         method: 'POST',
-        body: JSON.stringify({ query, field: field.name, boolFilter }),
+        body: JSON.stringify({ query, field: field.name, boolFilter, dataSourceId }),
         signal,
       }),
     resolver
@@ -79,7 +86,13 @@ export const setupValueSuggestionProvider = (core: CoreSetup): ValueSuggestionsG
     } else if (!shouldSuggestValues || !field.aggregatable || field.type !== 'string') {
       return [];
     }
-
-    return await requestSuggestions(title, field, query, boolFilter, signal);
+    return await requestSuggestions(
+      title,
+      field,
+      query,
+      boolFilter,
+      signal,
+      indexPattern.dataSourceRef?.id
+    );
   };
 };
diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
@@ -57,14 +57,15 @@ export function registerValueSuggestionsRoute(
             field: schema.string(),
             query: schema.string(),
             boolFilter: schema.maybe(schema.any()),
+            dataSourceId: schema.maybe(schema.string({ defaultValue: '' })),
           },
           { unknowns: 'allow' }
         ),
       },
     },
     async (context, request, response) => {
       const config = await config$.pipe(first()).toPromise();
-      const { field: fieldName, query, boolFilter } = request.body;
+      const { field: fieldName, query, boolFilter, dataSourceId } = request.body;
       const { index } = request.params;
       const { client } = context.core.opensearch.legacy;
       const signal = getRequestAbortedSignal(request.events.aborted$);
@@ -80,8 +81,15 @@ export function registerValueSuggestionsRoute(
       const body = await getBody(autocompleteSearchOptions, field || fieldName, query, boolFilter);
 
       try {
-        const result = await client.callAsCurrentUser('search', { index, body }, { signal });
-
+        let result;
+        if (dataSourceId) {
+          const dataSourceClient = await context.dataSource.opensearch.legacy.getClient(
+            dataSourceId
+          );
+          result = await dataSourceClient.callAPI('search', { index, body }, { signal });
+        } else {
+          result = await client.callAsCurrentUser('search', { index, body }, { signal });
+        }
         const buckets: any[] =
           get(result, 'aggregations.suggestions.buckets') ||
           get(result, 'aggregations.nestedSuggestions.suggestions.buckets');