From 26df213715d59b661804ff0cb96d97c75a6f5c51 Mon Sep 17 00:00:00 2001 From: Suchit Sahoo Date: Fri, 30 Aug 2024 21:27:30 +0000 Subject: [PATCH 1/2] Fixed SQL search for Wildcard IndexPattern Signed-off-by: Suchit Sahoo --- src/plugins/query_enhancements/server/utils/facet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From a8cb53405860ba5b11f848f57ec12251b092eb5e Mon Sep 17 00:00:00 2001 From: Suchit Sahoo Date: Fri, 30 Aug 2024 21:28:17 +0000 Subject: [PATCH 2/2] Fix Discover intial pageload for non DQL language Signed-off-by: Suchit Sahoo --- .../query_string/query_string_manager.ts | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 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 {