[SearchSource] Deserialize query string options for serverside ES Query

elastic · Feb 2, 2021 · a716765 · a716765
1 parent ad67ee5
commit a716765
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/plugins/data/common/es_query/es_query/decorate_query.test.ts b/src/plugins/data/common/es_query/es_query/decorate_query.test.ts
@@ -22,6 +22,13 @@ describe('Query decorator', () => {
     expect(decoratedQuery).toEqual({ query_string: { query: '*', analyze_wildcard: true } });
   });
 
+  test('should merge in serialized query string options', () => {
+    const queryStringOptions = '{ "analyze_wildcard": true }';
+    const decoratedQuery = decorateQuery({ query_string: { query: '*' } }, queryStringOptions);
+
+    expect(decoratedQuery).toEqual({ query_string: { query: '*', analyze_wildcard: true } });
+  });
+
   test('should add a default of a time_zone parameter if one is provided', () => {
     const decoratedQuery = decorateQuery(
       { query_string: { query: '*' } },

diff --git a/src/plugins/data/common/es_query/es_query/decorate_query.ts b/src/plugins/data/common/es_query/es_query/decorate_query.ts
@@ -20,10 +20,16 @@ import { DslQuery, isEsQueryString } from './es_query_dsl';
 
 export function decorateQuery(
   query: DslQuery,
-  queryStringOptions: Record<string, any>,
+  queryStringOptions: Record<string, any> | string,
   dateFormatTZ?: string
 ) {
   if (isEsQueryString(query)) {
+    // NOTE queryStringOptions comes from UI Settings and, in server context, is a serialized string
+    // https://github.com/elastic/kibana/issues/89902
+    if (typeof queryStringOptions === 'string') {
+      queryStringOptions = JSON.parse(queryStringOptions);
+    }
+
     extend(query.query_string, queryStringOptions);
     if (dateFormatTZ) {
       defaults(query.query_string, {