[8.6] [Lens] Fix formula validation issue with non-default locale (#1…

…49806) (#149972) # Backport This will backport the following commits from `main` to `8.6`: - [[Lens] Fix formula validation issue with non-default locale (#149806)](#149806)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  --------- Co-authored-by: Marco Liberati <[email protected]> Co-authored-by: Stratoula Kalafateli <[email protected]>
elastic · Feb 1, 2023 · 9702dad · 9702dad
1 parent 110fd24
commit 9702dad
Show file tree

Hide file tree

Showing 8 changed files with 1,019 additions and 18 deletions.
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/formula/util.ts b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/formula/util.ts
@@ -107,7 +107,7 @@ export function getOperationParams(
   }, {});
 }
 
-function getTypeI18n(type: string) {
+export function getTypeI18n(type: string) {
   if (type === 'number') {
     return i18n.translate('xpack.lens.formula.number', { defaultMessage: 'number' });
   }

diff --git a/...k/plugins/lens/public/datasources/form_based/operations/definitions/formula/validation.ts b/...k/plugins/lens/public/datasources/form_based/operations/definitions/formula/validation.ts
@@ -16,6 +16,7 @@ import {
   findMathNodes,
   findVariables,
   getOperationParams,
+  getTypeI18n,
   getValueOrName,
   groupArgsByType,
   isMathNode,
@@ -114,6 +115,8 @@ export interface ErrorWrapper {
   severity?: 'error' | 'warning';
 }
 
+const DEFAULT_RETURN_TYPE = getTypeI18n('number');
+
 function getNodeLocation(node: TinymathFunction): TinymathLocation[] {
   return [node.location].filter(nonNullable);
 }
@@ -124,11 +127,11 @@ function getArgumentType(arg: TinymathAST, operations: Record<string, GenericOpe
   }
   if (arg.type === 'function') {
     if (tinymathFunctions[arg.name]) {
-      return tinymathFunctions[arg.name].outputType ?? 'number';
+      return tinymathFunctions[arg.name].outputType ?? DEFAULT_RETURN_TYPE;
     }
     // Assume it's a number for now
     if (operations[arg.name]) {
-      return 'number';
+      return DEFAULT_RETURN_TYPE;
     }
   }
   // leave for now other argument types
@@ -659,7 +662,6 @@ function validateNameArguments(
   return errors;
 }
 
-const DEFAULT_RETURN_TYPE = 'number';
 function checkTopNodeReturnType(ast: TinymathAST): ErrorWrapper[] {
   if (
     isObject(ast) &&
@@ -1123,7 +1125,7 @@ export function validateMathNodes(
           values: {
             operation: node.name,
             name: positionalArguments[wrongTypeArgumentIndex].name,
-            type: getArgumentType(arg, operations) || 'number',
+            type: getArgumentType(arg, operations) || DEFAULT_RETURN_TYPE,
             expectedType: positionalArguments[wrongTypeArgumentIndex].type || '',
           },
           locations: getNodeLocation(node),

diff --git a/x-pack/test/localization/tests/index.ts b/x-pack/test/localization/tests/index.ts
@@ -10,5 +10,6 @@ import type { FtrProviderContext } from '../ftr_provider_context';
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Sanity checks', () => {
     loadTestFile(require.resolve('./login_page'));
+    loadTestFile(require.resolve('./lens'));
   });
 }
diff --git a/x-pack/test/localization/tests/lens/formula.ts b/x-pack/test/localization/tests/lens/formula.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['visualize', 'lens']);
+  const elasticChart = getService('elasticChart');
+
+  describe('lens formula tests', () => {
+    it('should allow creation of a lens chart via formula', async () => {
+      await PageObjects.visualize.navigateToNewVisualization();
+      await PageObjects.visualize.clickVisType('lens');
+      await elasticChart.setNewChartUiDebugFlag(true);
+      await PageObjects.lens.goToTimeRange();
+
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+        operation: 'formula',
+        formula: `count() + average(bytes)`,
+      });
+
+      expect(await PageObjects.lens.getErrorCount()).to.eql(0);
+      const data = await PageObjects.lens.getCurrentChartDebugState('xyVisChart');
+      expect(data).to.be.ok();
+    });
+  });
+}
diff --git a/x-pack/test/localization/tests/lens/index.ts b/x-pack/test/localization/tests/lens/index.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EsArchiver } from '@kbn/es-archiver';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects, loadTestFile }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['timePicker']);
+  const browser = getService('browser');
+  const config = getService('config');
+  const log = getService('log');
+  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
+  let remoteEsArchiver;
+
+  describe('lens app', () => {
+    const esArchive = 'x-pack/test/functional/es_archives/logstash_functional';
+    const localIndexPatternString = 'logstash-*';
+    const remoteIndexPatternString = 'ftr-remote:logstash-*';
+    const localFixtures = {
+      lensBasic: 'x-pack/test/functional/fixtures/kbn_archiver/lens/lens_basic.json',
+      lensDefault: 'x-pack/test/functional/fixtures/kbn_archiver/lens/default',
+    };
+
+    const remoteFixtures = {
+      lensBasic: 'x-pack/test/functional/fixtures/kbn_archiver/lens/ccs/lens_basic.json',
+      lensDefault: 'x-pack/test/functional/fixtures/kbn_archiver/lens/ccs/default',
+    };
+    let esNode: EsArchiver;
+    let fixtureDirs: {
+      lensBasic: string;
+      lensDefault: string;
+    };
+    let indexPatternString: string;
+    before(async () => {
+      log.debug('Starting lens before method');
+      await browser.setWindowSize(1280, 1200);
+      await kibanaServer.savedObjects.cleanStandardList();
+      try {
+        config.get('esTestCluster.ccs');
+        remoteEsArchiver = getService('remoteEsArchiver' as 'esArchiver');
+        esNode = remoteEsArchiver;
+        fixtureDirs = remoteFixtures;
+        indexPatternString = remoteIndexPatternString;
+      } catch (error) {
+        esNode = esArchiver;
+        fixtureDirs = localFixtures;
+        indexPatternString = localIndexPatternString;
+      }
+
+      await esNode.load(esArchive);
+      // changing the timepicker default here saves us from having to set it in Discover (~8s)
+      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
+      await kibanaServer.uiSettings.update({
+        defaultIndex: indexPatternString,
+        'dateFormat:tz': 'UTC',
+      });
+      await kibanaServer.importExport.load(fixtureDirs.lensBasic);
+      await kibanaServer.importExport.load(fixtureDirs.lensDefault);
+    });
+
+    after(async () => {
+      await esArchiver.unload(esArchive);
+      await PageObjects.timePicker.resetDefaultAbsoluteRangeViaUiSettings();
+      await kibanaServer.importExport.unload(fixtureDirs.lensBasic);
+      await kibanaServer.importExport.unload(fixtureDirs.lensDefault);
+      await kibanaServer.savedObjects.cleanStandardList();
+    });
+
+    loadTestFile(require.resolve('./smokescreen'));
+    loadTestFile(require.resolve('./formula'));
+  });
+}