IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update raw range only if isMathString (#23122)

Browse Source
This commit is contained in:
Ivana Huckova 2020-03-27 10:04:43 +01:00 committed by GitHub
parent 16306ccacb
commit be157b8457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/grafana-ui/src/components/TimePicker/TimePickerContent/mapper.ts
View File

@ -40,25 +40,16 @@ export const mapStringsToTimeRange = (from: string, to: string, roundup?: boolea
const fromDate = stringToDateTimeType(from, roundup, timeZone); const fromDate = stringToDateTimeType(from, roundup, timeZone);
const toDate = stringToDateTimeType(to, roundup, timeZone); const toDate = stringToDateTimeType(to, roundup, timeZone);
if (dateMath.isMathString(from) || dateMath.isMathString(to)) { const timeRangeObject: any = {
return {
from: fromDate,
to: toDate,
raw: {
from,
to,
},
};
}
return {
from: fromDate, from: fromDate,
to: toDate, to: toDate,
raw: { raw: {
from: fromDate, from: dateMath.isMathString(from) ? from : fromDate,
to: toDate, to: dateMath.isMathString(to) ? to : toDate,
}, },
}; };
return timeRangeObject;
}; };
const stringToDateTime = (value: string | DateTime, roundUp?: boolean, timeZone?: TimeZone): DateTime => { const stringToDateTime = (value: string | DateTime, roundUp?: boolean, timeZone?: TimeZone): DateTime => {