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

Packages: Fix path import from grafana/data (#18667)

Browse Source
This commit is contained in:
Dominik Prokop 2019-08-21 22:19:11 +02:00 committed by Ryan McKinley
parent 68f7413566
commit 6c34936aee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/grafana-ui/src/components/TimePicker/TimePicker.tsx
View File

@ -14,7 +14,7 @@ import { rawToTimeRange } from './time';
// Types // Types
import { TimeRange, TimeOption, TimeZone, TIME_FORMAT, SelectableValue } from '@grafana/data'; import { TimeRange, TimeOption, TimeZone, TIME_FORMAT, SelectableValue } from '@grafana/data';
import { isMathString } from '@grafana/data/src/utils/datemath'; import { dateMath } from '@grafana/data';
export interface Props { export interface Props {
value: TimeRange; value: TimeRange;
@ -129,8 +129,8 @@ export class TimePicker extends PureComponent<Props, State> {
const adjustedTime = (time: DateTime) => (isUTC ? time.utc() : time.local()) || null; const adjustedTime = (time: DateTime) => (isUTC ? time.utc() : time.local()) || null;
const adjustedTimeRange = { const adjustedTimeRange = {
to: isMathString(value.raw.to) ? value.raw.to : adjustedTime(value.to), to: dateMath.isMathString(value.raw.to) ? value.raw.to : adjustedTime(value.to),
from: isMathString(value.raw.from) ? value.raw.from : adjustedTime(value.from), from: dateMath.isMathString(value.raw.from) ? value.raw.from : adjustedTime(value.from),
}; };
const rangeString = rangeUtil.describeTimeRange(adjustedTimeRange); const rangeString = rangeUtil.describeTimeRange(adjustedTimeRange);