[Visualize] Duplicated query filters in es request

Closes: #59630
elastic · Mar 13, 2020 · 18e5c56 · 18e5c56
1 parent d5c0928
commit 18e5c56
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts b/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts
@@ -75,9 +75,10 @@ export const kibanaContextFunction: ExpressionFunctionKibanaContext = {
   },
 
   async fn(input, args, { getSavedObject }) {
-    const queryArg = args.q ? JSON.parse(args.q) : [];
-    let queries = Array.isArray(queryArg) ? queryArg : [queryArg];
-    let filters = args.filters ? JSON.parse(args.filters) : [];
+    const queryArg = args.q ? JSON.parse(args.q) : input?.query || [];
+    const timeRange = args.timeRange ? JSON.parse(args.timeRange) : input?.timeRange;
+    const filters = args.filters ? JSON.parse(args.filters) : input?.filters || [];
+    const queries = Array.isArray(queryArg) ? queryArg : [queryArg];
 
     if (args.savedSearchId) {
       if (typeof getSavedObject !== 'function') {
@@ -90,28 +91,15 @@ export const kibanaContextFunction: ExpressionFunctionKibanaContext = {
       const obj = await getSavedObject('search', args.savedSearchId);
       const search = obj.attributes.kibanaSavedObjectMeta as { searchSourceJSON: string };
       const data = JSON.parse(search.searchSourceJSON) as { query: string; filter: any[] };
-      queries = queries.concat(data.query);
-      filters = filters.concat(data.filter);
-    }
-
-    if (input && input.query) {
-      queries = queries.concat(input.query);
-    }
 
-    if (input && input.filters) {
-      filters = filters.concat(input.filters).filter((f: any) => !f.meta.disabled);
+      queries.push(...data.query);
+      filters.push(...data.filter);
     }
 
-    const timeRange = args.timeRange
-      ? JSON.parse(args.timeRange)
-      : input
-      ? input.timeRange
-      : undefined;
-
     return {
       type: 'kibana_context',
       query: queries,
-      filters,
+      filters: filters.filter((f: any) => !f.meta?.disabled),
       timeRange,
     };
   },