iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: leave null timestamp unformatted in view results table (#10313)

This commit is contained in:
Ville Brofeldt 2020-07-14 19:12:06 +03:00 committed by GitHub
parent 266238caab
commit 7eb00481de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
superset-frontend/spec/javascripts/utils/common_spec.jsx
View File

@ -72,12 +72,16 @@ describe('utils/common', () => {
});
it('changes formatting of temporal column', () => {
const originalData = [
{ __timestamp: 1594285437771, column1: 'lorem' },
{ __timestamp: 1594285441675, column1: 'ipsum' },
{ __timestamp: null, column1: 'lorem' },
{ __timestamp: 0, column1: 'ipsum' },
{ __timestamp: 1594285437771, column1: 'dolor' },
{ __timestamp: 1594285441675, column1: 'sit' },
];
const expectedData = [
{ __timestamp: '2020-07-09 09:03:57', column1: 'lorem' },
{ __timestamp: '2020-07-09 09:04:01', column1: 'ipsum' },
{ __timestamp: null, column1: 'lorem' },
{ __timestamp: '1970-01-01 00:00:00', column1: 'ipsum' },
{ __timestamp: '2020-07-09 09:03:57', column1: 'dolor' },
{ __timestamp: '2020-07-09 09:04:01', column1: 'sit' },
];
expect(applyFormattingToTabularData(originalData)).toEqual(expectedData);
});

8
superset-frontend/src/utils/common.js
View File

@ -128,7 +128,11 @@ export function applyFormattingToTabularData(data) {
}
return data.map(row => ({
...row,
// eslint-disable-next-line no-underscore-dangle
__timestamp: DATETIME_FORMATTER(new Date(row.__timestamp)),
/* eslint-disable no-underscore-dangle */
__timestamp:
row.__timestamp === 0 || row.__timestamp
? DATETIME_FORMATTER(new Date(row.__timestamp))
: row.__timestamp,
/* eslint-enable no-underscore-dangle */
}));
}