From c7843fe69a7ccbe08b61cee159e4c700f49e1b8a Mon Sep 17 00:00:00 2001
From: Suchit Sahoo <38322563+LDrago27@users.noreply.github.com>
Date: Tue, 3 Sep 2024 11:26:49 -0700
Subject: [PATCH] Discover Bug Fixes (#7948)

* Fixed SQL search for Wildcard IndexPattern

Signed-off-by: Suchit Sahoo <suchsah@amazon.com>

* Fix Discover intial pageload for non DQL language

Signed-off-by: Suchit Sahoo <suchsah@amazon.com>

---------

Signed-off-by: Suchit Sahoo <suchsah@amazon.com>
---
 .../query_string/query_string_manager.ts      | 32 +++++++++++++++----
 .../query_enhancements/server/utils/facet.ts  |  2 +-
 2 files changed, 26 insertions(+), 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
index 754b444435c0..b44628980ce0 100644
--- 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
index 287e8b6e86ec..8dee8b652d39 100644
--- 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;