fix time scaling bugs (#86444) (#86643)

This commit is contained in:
Joe Reuter 2020-12-21 17:51:24 +01:00 committed by GitHub
parent 884246e421
commit a4e99754a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 0 deletions

View file

@ -530,6 +530,9 @@ describe('IndexPattern Data Source', () => {
"outputColumnId": Array [
"col1",
],
"outputColumnName": Array [
"Count of records",
],
"targetUnit": Array [
"h",
],

View file

@ -25,4 +25,20 @@ describe('suffix formatter', () => {
expect(convertMock).toHaveBeenCalledWith(12345);
expect(formatFactory).toHaveBeenCalledWith({ id: 'nestedFormatter', params: nestedParams });
});
it('should not add suffix to empty strings', () => {
const convertMock = jest.fn((x) => '');
const formatFactory = jest.fn(() => ({ convert: convertMock }));
const SuffixFormatter = getSuffixFormatter((formatFactory as unknown) as FormatFactory);
const nestedParams = { abc: 123 };
const formatterInstance = new SuffixFormatter({
unit: 'h',
id: 'nestedFormatter',
params: nestedParams,
});
const result = formatterInstance.convert(12345);
expect(result).toEqual('');
});
});

View file

@ -49,6 +49,11 @@ export function getSuffixFormatter(formatFactory: FormatFactory) {
val
);
// do not add suffixes to empty strings
if (formattedValue === '') {
return '';
}
if (suffix) {
return `${formattedValue}${suffix}`;
}

View file

@ -121,6 +121,7 @@ function getExpressionForLayer(
dateColumnId: [firstDateHistogramColumn![0]],
inputColumnId: [id],
outputColumnId: [id],
outputColumnName: [col.label],
targetUnit: [col.timeScale!],
},
};