Discover Bug Fixes (opensearch-project#7948)

* Fixed SQL search for Wildcard IndexPattern Signed-off-by: Suchit Sahoo <[email protected]> * Fix Discover intial pageload for non DQL language Signed-off-by: Suchit Sahoo <[email protected]> --------- Signed-off-by: Suchit Sahoo <[email protected]>
danieldong51 · Sep 3, 2024 · c7843fe · c7843fe
1 parent 6cab0de
commit c7843fe
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/plugins/data/public/query/query_string/query_string_manager.ts b/src/plugins/data/public/query/query_string/query_string_manager.ts
@@ -60,14 +60,32 @@ export class QueryStringManager {
   }
 
   public getDefaultQuery() {
-    return {
-      query: this.getDefaultQueryString(),
-      language: this.getDefaultLanguage(),
-      ...(this.uiSettings &&
-        this.uiSettings.get(UI_SETTINGS.QUERY_ENHANCEMENTS_ENABLED) && {
-          dataset: this.datasetService?.getDefault(),
-        }),
+    const defaultLanguageId = this.getDefaultLanguage();
+    const defaultQuery = this.getDefaultQueryString();
+    const defaultDataset = this.datasetService?.getDefault();
+
+    const query = {
+      query: defaultQuery,
+      language: defaultLanguageId,
     };
+
+    if (
+      this.uiSettings &&
+      this.uiSettings.get(UI_SETTINGS.QUERY_ENHANCEMENTS_ENABLED) &&
+      defaultDataset &&
+      this.languageService
+    ) {
+      const language = this.languageService.getLanguage(defaultLanguageId);
+      const newQuery = { ...query, dataset: defaultDataset };
+      const newQueryString = language?.getQueryString(newQuery) || '';
+
+      return {
+        ...newQuery,
+        query: newQueryString,
+      };
+    }
+
+    return query;
   }
 
   public formatQuery(query: Query | string | undefined): Query {

diff --git a/src/plugins/query_enhancements/server/utils/facet.ts b/src/plugins/query_enhancements/server/utils/facet.ts
@@ -40,7 +40,7 @@ export class Facet {
       const query: Query = request.body.query;
       const { format, df } = request.body;
       const params = {
-        body: { ...query },
+        body: { query: query.query },
         ...(format !== 'jdbc' && { format }),
       };
       const clientId = query.dataset?.dataSource?.id ?? df?.meta?.queryConfig?.dataSourceId;