QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 08:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle "ambiguous durations" (#5785)

Browse Source 
* WIP

* Update interface

* Fix truncate

* Improve unit tests

* Improve code

* Use moment.js to parse ISO durations

* Fix typo and React props
This commit is contained in:
Beto Dealmeida
2018-09-10 10:28:17 -07:00
committed by Maxime Beauchemin
parent 6c9be9d67b
commit f740974bf7
7 changed files with 160 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
superset/assets/spec/javascripts/modules/time_spec.js
View File

@@ -1,6 +1,32 @@
import { it, describe } from 'mocha';
import { expect } from 'chai';
import { getPlaySliderParams } from '../../../src/modules/time';
import moment from 'moment';
import { getPlaySliderParams, truncate } from '../../../src/modules/time';
describe('truncate', () => {
it('truncates timestamps', () => {
const timestamp = moment('2018-03-03T03:03:03.333');
const isoDurations = [
// basic units
[moment.duration('PT1S'), moment('2018-03-03T03:03:03')],
[moment.duration('PT1M'), moment('2018-03-03T03:03:00')],
[moment.duration('PT1H'), moment('2018-03-03T03:00:00')],
[moment.duration('P1D'), moment('2018-03-03T00:00:00')],
[moment.duration('P1M'), moment('2018-03-01T00:00:00')],
[moment.duration('P1Y'), moment('2018-01-01T00:00:00')],
// durations that are multiples
[moment.duration('PT2H'), moment('2018-03-03T02:00:00')],
[moment.duration('P2D'), moment('2018-03-03T00:00:00')],
];
let result;
isoDurations.forEach(([step, expected]) => {
result = truncate(timestamp, step);
expect(result.format()).to.equal(expected.format());
});
});
});
describe('getPlaySliderParams', () => {
it('is a function', () => {
@@ -9,49 +35,49 @@ describe('getPlaySliderParams', () => {
it('handles durations', () => {
const timestamps = [
new Date('2018-01-01'),
new Date('2018-01-02'),
new Date('2018-01-03'),
new Date('2018-01-04'),
new Date('2018-01-05'),
new Date('2018-01-06'),
new Date('2018-01-07'),
new Date('2018-01-08'),
new Date('2018-01-09'),
new Date('2018-01-10'),
].map(d => d.getTime());
const { start, end, step, values, disabled } = getPlaySliderParams(timestamps, 'P2D');
expect(new Date(start)).to.eql(new Date('2018-01-01'));
expect(new Date(end)).to.eql(new Date('2018-01-11'));
expect(step).to.equal(2 * 24 * 60 * 60 * 1000);
expect(values.map(v => new Date(v))).to.eql([
new Date('2018-01-01'),
new Date('2018-01-03'),
moment('2018-01-01T00:00:00'),
moment('2018-01-02T00:00:00'),
moment('2018-01-03T00:00:00'),
moment('2018-01-04T00:00:00'),
moment('2018-01-05T00:00:00'),
moment('2018-01-06T00:00:00'),
moment('2018-01-07T00:00:00'),
moment('2018-01-08T00:00:00'),
moment('2018-01-09T00:00:00'),
moment('2018-01-10T00:00:00'),
].map(d => parseInt(d.format('x'), 10));
const { start, end, getStep, values, disabled } = getPlaySliderParams(timestamps, 'P2D');
expect(moment(start).format()).to.equal(moment('2018-01-01T00:00:00').format());
expect(moment(end).format()).to.equal(moment('2018-01-11T00:00:00').format());
expect(getStep(start)).to.equal(2 * 24 * 60 * 60 * 1000);
expect(values.map(v => moment(v).format())).to.eql([
moment('2018-01-01T00:00:00').format(),
moment('2018-01-03T00:00:00').format(),
]);
expect(disabled).to.equal(false);
});
it('handles intervals', () => {
const timestamps = [
new Date('2018-01-01'),
new Date('2018-01-02'),
new Date('2018-01-03'),
new Date('2018-01-04'),
new Date('2018-01-05'),
new Date('2018-01-06'),
new Date('2018-01-07'),
new Date('2018-01-08'),
new Date('2018-01-09'),
new Date('2018-01-10'),
].map(d => d.getTime());
moment('2018-01-01T00:00:00'),
moment('2018-01-02T00:00:00'),
moment('2018-01-03T00:00:00'),
moment('2018-01-04T00:00:00'),
moment('2018-01-05T00:00:00'),
moment('2018-01-06T00:00:00'),
moment('2018-01-07T00:00:00'),
moment('2018-01-08T00:00:00'),
moment('2018-01-09T00:00:00'),
moment('2018-01-10T00:00:00'),
].map(d => parseInt(d.format('x'), 10));
// 1970-01-03 was a Saturday
const { start, end, step, values, disabled } = getPlaySliderParams(timestamps, 'P1W/1970-01-03T00:00:00Z');
expect(new Date(start)).to.eql(new Date('2017-12-30')); // Saturday
expect(new Date(end)).to.eql(new Date('2018-01-13')); // Saturday
expect(step).to.equal(7 * 24 * 60 * 60 * 1000);
expect(values.map(v => new Date(v))).to.eql([
new Date('2017-12-30'),
new Date('2018-01-06'),
const { start, end, getStep, values, disabled } = getPlaySliderParams(timestamps, 'P1W/1970-01-03T00:00:00Z');
expect(moment(start).format()).to.equal(moment('2017-12-30T00:00:00Z').format()); // Saturday
expect(moment(end).format()).to.equal(moment('2018-01-13T00:00:00Z').format()); // Saturday
expect(getStep(start)).to.equal(7 * 24 * 60 * 60 * 1000);
expect(values.map(v => moment(v).format())).to.eql([
moment('2017-12-30T00:00:00Z').format(),
moment('2018-01-06T00:00:00Z').format(),
]);
expect(disabled).to.equal(false);
});