Fix empty formula case

elastic · Jun 14, 2021 · 22f61e9 · 22f61e9
1 parent 517be0e
commit 22f61e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/kbn-tinymath/src/index.js b/packages/kbn-tinymath/src/index.js
@@ -7,6 +7,7 @@
  */
 
 const { get } = require('lodash');
+const memoizeOne = require('memoize-one');
 // eslint-disable-next-line import/no-unresolved
 const { parse: parseFn } = require('../grammar');
 const { functions: includedFunctions } = require('./functions');
@@ -23,7 +24,7 @@ function parse(input, options) {
   }
 
   try {
-    return parseFn(input, options);
+    return memoizeOne(parseFn)(input, options);
   } catch (e) {
     throw new Error(`Failed to parse expression. ${e.message}`);
   }

diff --git a/...ck/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx b/...ck/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx
@@ -100,11 +100,11 @@ export const formulaOperation: OperationDefinition<
     return [
       {
         type: 'function',
-        function: 'mathColumn',
+        function: currentColumn.references.length ? 'mathColumn' : 'mapColumn',
         arguments: {
           id: [columnId],
           name: [label || defaultLabel],
-          expression: [currentColumn.references.length ? `"${currentColumn.references[0]}"` : ``],
+          expression: [currentColumn.references.length ? `"${currentColumn.references[0]}"` : ''],
         },
       },
     ];