Fix grok and dissect behavior

elastic · Sep 5, 2024 · c4cee0f · c4cee0f
1 parent 866a6c9
commit c4cee0f
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 6 deletions.
diff --git a/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts b/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts
@@ -270,10 +270,23 @@ describe('autocomplete', () => {
       `dissect keywordField ${constantPattern} |`,
     ];
     for (const subExpression of subExpressions) {
-      testSuggestions(`from a | ${subExpression} grok /`, getFieldNamesByType(ESQL_STRING_TYPES));
+      testSuggestions(
+        `from a | ${subExpression} grok /`,
+        getFieldNamesByType(ESQL_STRING_TYPES).map((name) => `${name} `)
+      );
       testSuggestions(`from a | ${subExpression} grok keywordField /`, [constantPattern], ' ');
       testSuggestions(`from a | ${subExpression} grok keywordField ${constantPattern} /`, ['| ']);
     }
+
+    testSuggestions(
+      'from a | grok /',
+      getFieldNamesByType(ESQL_STRING_TYPES).map((name) => `${name} `)
+    );
+    testSuggestions(
+      'from a | grok key/',
+      getFieldNamesByType(ESQL_STRING_TYPES).map((name) => `${name} `)
+    );
+    testSuggestions('from a | grok keywordField/', []);
   });
 
   describe('dissect', () => {
@@ -285,10 +298,9 @@ describe('autocomplete', () => {
       `dissect keywordField ${constantPattern} append_separator = ":" |`,
     ];
     for (const subExpression of subExpressions) {
-      // Unskip once https://github.com/elastic/kibana/issues/190070 is fixed
-      testSuggestions.skip(
+      testSuggestions(
         `from a | ${subExpression} dissect /`,
-        getFieldNamesByType(ESQL_STRING_TYPES)
+        getFieldNamesByType(ESQL_STRING_TYPES).map((name) => `${name} `)
       );
       testSuggestions(`from a | ${subExpression} dissect keywordField /`, [constantPattern], ' ');
       testSuggestions(
@@ -305,6 +317,16 @@ describe('autocomplete', () => {
         ['| ']
       );
     }
+
+    testSuggestions(
+      'from a | dissect /',
+      getFieldNamesByType(ESQL_STRING_TYPES).map((name) => `${name} `)
+    );
+    testSuggestions(
+      'from a | dissect key/',
+      getFieldNamesByType(ESQL_STRING_TYPES).map((name) => `${name} `)
+    );
+    testSuggestions('from a | dissect keywordField/', []);
   });
 
   describe('sort', () => {
@@ -567,7 +589,10 @@ describe('autocomplete', () => {
     ]);
 
     // DISSECT field
-    testSuggestions('FROM index1 | DISSECT b/', getFieldNamesByType(ESQL_STRING_TYPES));
+    testSuggestions(
+      'FROM index1 | DISSECT b/',
+      getFieldNamesByType(ESQL_STRING_TYPES).map((name) => `${name} `)
+    );
 
     // DROP (first field)
     testSuggestions('FROM index1 | DROP f/', getFieldNamesByType('any'));
@@ -599,7 +624,11 @@ describe('autocomplete', () => {
     ]);
 
     // GROK field
-    testSuggestions('FROM index1 | GROK f/', getFieldNamesByType(ESQL_STRING_TYPES), undefined);
+    testSuggestions(
+      'FROM index1 | GROK f/',
+      getFieldNamesByType(ESQL_STRING_TYPES).map((field) => `${field} `),
+      undefined
+    );
 
     // KEEP (first field)
     testSuggestions('FROM index1 | KEEP f/', getFieldNamesByType('any'));

diff --git a/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts b/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts
@@ -715,6 +715,9 @@ async function getExpressionSuggestionsByType(
           // check if lastWord is an existing field
           const column = getColumnByName(lastWord, references);
           if (column) {
+            if (['grok', 'dissect'].includes(command.name)) {
+              return [];
+            }
             // now we know that the user has already entered a column,
             // so suggest comma and pipe
             // const NON_ALPHANUMERIC_REGEXP = /[^a-zA-Z\d]/g;
@@ -734,6 +737,7 @@ async function getExpressionSuggestionsByType(
             suggestions.push(
               ...fieldSuggestions.map((suggestion) => ({
                 ...suggestion,
+                text: suggestion.text + (['grok', 'dissect'].includes(command.name) ? ' ' : ''),
                 command: TRIGGER_SUGGESTION_COMMAND,
                 rangeToReplace,
               }))
@@ -744,6 +748,7 @@ async function getExpressionSuggestionsByType(
           suggestions.push(
             ...fieldSuggestions.map((suggestion) => ({
               ...suggestion,
+              text: suggestion.text + (['grok', 'dissect'].includes(command.name) ? ' ' : ''),
               command: TRIGGER_SUGGESTION_COMMAND,
             }))
           );