Merge remote-tracking branch 'dej611/lens/formula-field-message' into…

… lens/formula-editor
wylieconlon · Jun 4, 2021 · 5bf9c14 · 5bf9c14
2 parents 1d16ef9 + 5cd99fe
commit 5bf9c14
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/...ugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx b/...ugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx
@@ -1045,6 +1045,19 @@ invalid: "
       ).toEqual(['Use only one of kql= or lucene=, not both']);
     });
 
+    it("returns a clear error when there's a missing field for a function", () => {
+      for (const fn of ['average', 'terms', 'max', 'sum']) {
+        expect(
+          formulaOperation.getErrorMessage!(
+            getNewLayerWithFormula(`${fn}()`),
+            'col1',
+            indexPattern,
+            operationDefinitionMap
+          )
+        ).toEqual([`The first argument for ${fn} should be a field name. Found no field`]);
+      }
+    });
+
     it('returns no error if a math operation is passed to fullReference operations', () => {
       const formulas = [
         'derivative(7+1)',

diff --git a/.../plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts b/.../plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts
@@ -535,7 +535,11 @@ function runFullASTValidation(
                   values: {
                     operation: node.name,
                     type: 'field',
-                    argument: getValueOrName(firstArg),
+                    argument:
+                      getValueOrName(firstArg) ||
+                      i18n.translate('xpack.lens.indexPattern.formulaNoFieldForOperation', {
+                        defaultMessage: 'no field',
+                      }),
                   },
                   locations: node.location ? [node.location] : [],
                 })