From 1cdb5c00b7b132d4931767abd231c02bc293cf1d Mon Sep 17 00:00:00 2001 From: Uladzislau Lasitsa Date: Wed, 4 May 2022 15:32:22 +0300 Subject: [PATCH] Add tests --- .../common/expression_functions/validate.ts | 3 ++- .../expression_xy/common/i18n/index.tsx | 2 +- .../expression_xy/public/helpers/interval.test.ts | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/validate.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/validate.ts index a545adcf3c53df..8516eae59a3c38 100644 --- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/validate.ts +++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/validate.ts @@ -40,7 +40,8 @@ const errors = { }), isInvalidIntervalError: () => i18n.translate('expressionXY.reusable.function.xyVis.errors.isInvalidIntervalError', { - defaultMessage: 'Provided x-axis interval is invalid', + defaultMessage: + 'Provided x-axis interval is invalid. The interval should includes quantity and unit name like 1d, 24h, 1w.', }), }; diff --git a/src/plugins/chart_expressions/expression_xy/common/i18n/index.tsx b/src/plugins/chart_expressions/expression_xy/common/i18n/index.tsx index 1af0e88c460eb6..309d5a795fcb03 100644 --- a/src/plugins/chart_expressions/expression_xy/common/i18n/index.tsx +++ b/src/plugins/chart_expressions/expression_xy/common/i18n/index.tsx @@ -114,7 +114,7 @@ export const strings = { defaultMessage: 'Specifies the aria label of the xy chart', }), getXAxisIntervalHelp: () => - i18n.translate('expressionXY.xyVis.ariaLabel.help', { + i18n.translate('expressionXY.xyVis.xAxisInterval.help', { defaultMessage: 'Specifies the interval for x-axis', }), getDataLayerFnHelp: () => diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/interval.test.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/interval.test.ts index 6721c293dbe57d..d353da58052743 100644 --- a/src/plugins/chart_expressions/expression_xy/public/helpers/interval.test.ts +++ b/src/plugins/chart_expressions/expression_xy/public/helpers/interval.test.ts @@ -86,4 +86,18 @@ describe('calculateMinInterval', () => { const result = await calculateMinInterval(xyProps); expect(result).toEqual(undefined); }); + + it('should return specified interval if user provided it as `xAxisInterval`', async () => { + layer.table.columns[2].meta.source = 'esaggs'; + layer.table.columns[2].meta.sourceParams = { + type: 'date_histogram', + params: { + used_interval: '5m', + }, + }; + xyProps.args.layers[0] = layer; + xyProps.args.xAxisInterval = '1h'; + const result = await calculateMinInterval(xyProps); + expect(result).toEqual(60 * 60 * 1000); + }); });