Impl parser-safe query modifications, fixes #56

Author: ddelemeny

src/datasource.ts

@@ -50,6 +50,7 @@ import { ReactNode } from 'react';
 import { fieldTypeMap } from 'utils';
 import { addAddHocFilter } from 'modifyQuery';
 import { LogContextProvider, LogRowContextOptions } from './LogContext/LogContextProvider';
+import { LuceneQuery } from 'utils/lucene';
 
 export const REF_ID_STARTER_LOG_VOLUME = 'log-volume-';
 
@@ -244,24 +245,18 @@ export class QuickwitDataSource
       return query;
     }
 
-    let expression = query.query ?? '';
+    let lquery = LuceneQuery.parse(query.query ?? '')
     switch (action.type) {
       case 'ADD_FILTER': {
-        if (expression.length > 0) {
-          expression += ' AND ';
-        }
-        expression += `${action.options.key}:"${action.options.value}"`;
+        lquery = lquery.addFilter(action.options.key, action.options.value)
         break;
       }
       case 'ADD_FILTER_OUT': {
-        if (expression.length > 0) {
-          expression += ' AND ';
-        }
-        expression += `-${action.options.key}:"${action.options.value}"`;
+        lquery = lquery.addFilter(action.options.key, action.options.value, '-')
         break;
       }
     }
-    return { ...query, query: expression };
+    return { ...query, query: lquery.toString() };
   }
 
   getDataQueryRequest(queryDef: TermsQuery, range: TimeRange) {

src/utils/lucene.ts

@@ -142,11 +142,15 @@ function removeNodeFromTree(ast: AST, node: NodeTerm): AST {
 /**
  * Merge a query with a filter.
  */
-export function concatenate(query: string, filter: string, condition = 'AND'): string {
+export function concatenate(query: string, filter: string, operator?: 'AND'|'OR'): string {
   if (!filter) {
     return query;
   }
-  return query.trim() === '' ? filter : `${query} ${condition} ${filter}`;
+  if (query.trim() === '' ) {
+    return filter;
+  }
+
+  return operator ? `${query} ${operator} ${filter}` : `${query} ${filter}`
 }
 
 export class LuceneQuery {
@@ -185,14 +189,17 @@ export class LuceneQuery {
     return this.findFilter(key, value, modifier) !== null;
   }
 
-  addFilter(key: string, value: string, modifier: ModifierType = ''){
+  addFilter(key: string, value: string, modifier: ModifierType = '', parens=true){
     if (this.hasFilter(key, value, modifier)) {
       return this;
     }
 
     key = escapeFilter(key);
     value = escapeFilterValue(value);
-    const filter = `${modifier}${key}:"${value}"`;
+    let filter = `${modifier}${key}:"${value}"`;
+    if (parens) {
+      filter = `(${filter})`
+    }
 
     return LuceneQuery.parse(concatenate(this.toString(), filter));
   }