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

fix dateMath import in grafana-ui (#21546)

Browse Source
This commit is contained in:
Alexander Zobnin 2020-01-16 19:16:51 +03:00 committed by GitHub
parent 451e9beaf0
commit 0cfcc85dec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/grafana-ui/src/components/TimePicker/TimePickerContent/TimeRangeForm.tsx
View File

@ -1,10 +1,9 @@
import React, { FormEvent, useState, useCallback } from 'react';
import { TIME_FORMAT, TimeZone, isDateTime, TimeRange, DateTime } from '@grafana/data';
import { TIME_FORMAT, TimeZone, isDateTime, TimeRange, DateTime, dateMath } from '@grafana/data';
import { stringToDateTimeType, isValidTimeString } from '../time';
import { mapStringsToTimeRange } from './mapper';
import { TimePickerCalendar } from './TimePickerCalendar';
import Forms from '../../Forms';
import { isMathString } from '@grafana/data/src/datetime/datemath';
interface Props {
isFullscreen: boolean;
@ -116,7 +115,7 @@ function valueAsString(value: DateTime | string): string {
}
function isValid(value: string, roundup?: boolean, timeZone?: TimeZone): boolean {
if (isMathString(value)) {
if (dateMath.isMathString(value)) {
return isValidTimeString(value);
}