fix(wql): add whitespace before closing grouping operator ) when usin…

…g the suggestions
wazuh · Aug 9, 2023 · 9e121ad · 9e121ad
1 parent d15889a
commit 9e121ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/plugins/main/public/components/search-bar/query-language/wql.test.tsx b/plugins/main/public/components/search-bar/query-language/wql.test.tsx
@@ -303,7 +303,7 @@ describe('Query language - WQL', () => {
     ${'(field=value or field2>'}       | ${{ type: { iconType: 'kqlOperand', color: 'tint1' }, label: '~' }}            | ${'(field=value or field2~'}
     ${'(field=value or field2>'}       | ${{ type: { iconType: 'kqlValue', color: 'tint0' }, label: 'value2' }}         | ${'(field=value or field2>value2'}
     ${'(field=value or field2>value2'} | ${{ type: { iconType: 'kqlValue', color: 'tint0' }, label: 'value3' }}         | ${'(field=value or field2>value3'}
-    ${'(field=value or field2>value2'} | ${{ type: { iconType: 'tokenDenseVector', color: 'tint3' }, label: ')' }}      | ${'(field=value or field2>value2)'}
+    ${'(field=value or field2>value2'} | ${{ type: { iconType: 'tokenDenseVector', color: 'tint3' }, label: ')' }}      | ${'(field=value or field2>value2 )'}
   `(
     'click suggestion - WQL $WQL => $changedInput',
     async ({ WQL: currentInput, clikedSuggestion, changedInput }) => {

diff --git a/plugins/main/public/components/search-bar/query-language/wql.tsx b/plugins/main/public/components/search-bar/query-language/wql.tsx
@@ -1094,10 +1094,15 @@ export const WQL = {
                   : item.label;
             } else {
               // add a whitespace for conjunction <whitespace><conjunction>
+              // add a whitespace for grouping operator <whitespace>)
               !/\s$/.test(input) &&
                 (item.type.iconType ===
                   suggestionMappingLanguageTokenType.conjunction.iconType ||
-                  lastToken?.type === 'conjunction') &&
+                  lastToken?.type === 'conjunction' ||
+                  (item.type.iconType ===
+                    suggestionMappingLanguageTokenType.operator_group
+                      .iconType &&
+                    item.label === ')')) &&
                 tokens.push({
                   type: 'whitespace',
                   value: ' ',