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

fix: Use default custom time range time without timezone (#29669)

This commit is contained in:
Kamil Gabryjelski 2024-07-23 16:23:40 +02:00 committed by GitHub
parent 453e6deb97
commit cd713a239e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
superset-frontend/packages/superset-ui-core/src/time-comparison/customTimeRangeDecode.ts
View File

@ -39,14 +39,14 @@ export const ISO8601_AND_CONSTANT = RegExp(
); );
const DATETIME_CONSTANT = ['now', 'today']; const DATETIME_CONSTANT = ['now', 'today'];
const SEVEN_DAYS_AGO = new Date(); const SEVEN_DAYS_AGO = new Date();
SEVEN_DAYS_AGO.setUTCHours(0, 0, 0, 0); SEVEN_DAYS_AGO.setHours(0, 0, 0, 0);
const MIDNIGHT = new Date(); const MIDNIGHT = new Date();
MIDNIGHT.setUTCHours(0, 0, 0, 0); MIDNIGHT.setHours(0, 0, 0, 0);
const defaultCustomRange: CustomRangeType = { const defaultCustomRange: CustomRangeType = {
sinceDatetime: SEVEN_DAYS_AGO.setUTCDate( sinceDatetime: SEVEN_DAYS_AGO.setDate(
SEVEN_DAYS_AGO.getUTCDate() - 7, SEVEN_DAYS_AGO.getDate() - 7,
).toString(), ).toString(),
sinceMode: 'relative', sinceMode: 'relative',
sinceGrain: 'day', sinceGrain: 'day',

16
superset-frontend/packages/superset-ui-core/test/time-comparison/customTimeRangeDecode.test.ts
View File

@ -151,14 +151,14 @@ describe('customTimeRangeDecode', () => {
it('7) default', () => { it('7) default', () => {
const SEVEN_DAYS_AGO = new Date(); const SEVEN_DAYS_AGO = new Date();
const MIDNIGHT = new Date(); const MIDNIGHT = new Date();
SEVEN_DAYS_AGO.setUTCHours(0, 0, 0, 0); SEVEN_DAYS_AGO.setHours(0, 0, 0, 0);
MIDNIGHT.setUTCHours(0, 0, 0, 0); MIDNIGHT.setHours(0, 0, 0, 0);
expect( expect(
customTimeRangeDecode('now : DATEADD(DATETIME("TODAY"), -7, day)'), customTimeRangeDecode('now : DATEADD(DATETIME("TODAY"), -7, day)'),
).toEqual({ ).toEqual({
customRange: { customRange: {
sinceDatetime: SEVEN_DAYS_AGO.setUTCDate( sinceDatetime: SEVEN_DAYS_AGO.setDate(
SEVEN_DAYS_AGO.getUTCDate() - 7, SEVEN_DAYS_AGO.getDate() - 7,
).toString(), ).toString(),
sinceMode: 'relative', sinceMode: 'relative',
sinceGrain: 'day', sinceGrain: 'day',
@ -176,18 +176,18 @@ describe('customTimeRangeDecode', () => {
it('8) relative : relative return default', () => { it('8) relative : relative return default', () => {
const SEVEN_DAYS_AGO = new Date(); const SEVEN_DAYS_AGO = new Date();
SEVEN_DAYS_AGO.setUTCHours(0, 0, 0, 0); SEVEN_DAYS_AGO.setHours(0, 0, 0, 0);
const MIDNIGHT = new Date(); const MIDNIGHT = new Date();
MIDNIGHT.setUTCHours(0, 0, 0, 0); MIDNIGHT.setHours(0, 0, 0, 0);
expect( expect(
customTimeRangeDecode( customTimeRangeDecode(
'DATEADD(DATETIME("2021-01-26T00:00:00"), -55, day) : DATEADD(DATETIME("2021-01-27T00:00:00"), 7, day)', 'DATEADD(DATETIME("2021-01-26T00:00:00"), -55, day) : DATEADD(DATETIME("2021-01-27T00:00:00"), 7, day)',
), ),
).toEqual({ ).toEqual({
customRange: { customRange: {
sinceDatetime: SEVEN_DAYS_AGO.setUTCDate( sinceDatetime: SEVEN_DAYS_AGO.setDate(
SEVEN_DAYS_AGO.getUTCDate() - 7, SEVEN_DAYS_AGO.getDate() - 7,
).toString(), ).toString(),
sinceMode: 'relative', sinceMode: 'relative',
sinceGrain: 'day', sinceGrain: 'day',