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

Use either moment objects (for absolute times in the datepicker) or string (for relative time) (#33315)

Browse Source
This commit is contained in:
Piotr Jamróz 2021-04-27 09:55:22 +02:00 committed by GitHub
parent b3642eb18d
commit 3ee925610a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/explore/ExploreTimeControls.tsx
View File

@ -3,7 +3,7 @@ import React, { Component } from 'react';
// Types
import { ExploreId } from 'app/types';
import { TimeRange, TimeZone, RawTimeRange, dateTimeForTimeZone } from '@grafana/data';
import { TimeRange, TimeZone, RawTimeRange, dateTimeForTimeZone, dateMath } from '@grafana/data';
// State
@ -42,7 +42,13 @@ export class ExploreTimeControls extends Component<Props> {
onMoveBack = () => this.onMoveTimePicker(-1);
onChangeTimePicker = (timeRange: TimeRange) => {
this.props.onChangeTime(timeRange.raw);
const adjustedFrom = dateMath.isMathString(timeRange.raw.from) ? timeRange.raw.from : timeRange.from;
const adjustedTo = dateMath.isMathString(timeRange.raw.to) ? timeRange.raw.to : timeRange.to;
this.props.onChangeTime({
from: adjustedFrom,
to: adjustedTo,
});
};
onZoom = () => {