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

Merge pull request #14406 from grafana/davkal/fix-14390

Browse Source 
Explore: Fix timepicker inputs for absolute dates
This commit is contained in:
David 2018-12-09 11:45:17 +01:00 committed by GitHub
commit e5c547c504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/app/features/explore/TimePicker.tsx
View File

@ -15,11 +15,14 @@ export const DEFAULT_RANGE = {
* Return a human-editable string of either relative (inludes "now") or absolute local time (in the shape of DATE_FORMAT). * Return a human-editable string of either relative (inludes "now") or absolute local time (in the shape of DATE_FORMAT).
* @param value Epoch or relative time * @param value Epoch or relative time
*/ */
export function parseTime(value: string | moment.Moment, isUtc = false): string | moment.Moment { export function parseTime(value: string | moment.Moment, isUtc = false, ensureString = false): string | moment.Moment {
if (moment.isMoment(value)) { if (moment.isMoment(value)) {
if (ensureString) {
return value.format(DATE_FORMAT);
}
return value; return value;
} }
if (value.indexOf('now') !== -1) { if ((value as string).indexOf('now') !== -1) {
return value; return value;
} }
let time: any = value; let time: any = value;
@ -50,6 +53,16 @@ interface TimePickerState {
toRaw: string; toRaw: string;
} }
/**
* TimePicker with dropdown menu for relative dates.
*
* Initialize with a range that is either based on relative time strings,
* or on Moment objects.
* Internally the component needs to keep a string representation in `fromRaw`
* and `toRaw` for the controlled inputs.
* When a time is picked, `onChangeTime` is called with the new range that
* is again based on relative time strings or Moment objects.
*/
export default class TimePicker extends PureComponent<TimePickerProps, TimePickerState> { export default class TimePicker extends PureComponent<TimePickerProps, TimePickerState> {
dropdownEl: any; dropdownEl: any;
@ -75,9 +88,9 @@ export default class TimePicker extends PureComponent<TimePickerProps, TimePicke
const from = props.range ? props.range.from : DEFAULT_RANGE.from; const from = props.range ? props.range.from : DEFAULT_RANGE.from;
const to = props.range ? props.range.to : DEFAULT_RANGE.to; const to = props.range ? props.range.to : DEFAULT_RANGE.to;
// Ensure internal format // Ensure internal string format
const fromRaw = parseTime(from, props.isUtc); const fromRaw = parseTime(from, props.isUtc, true);
const toRaw = parseTime(to, props.isUtc); const toRaw = parseTime(to, props.isUtc, true);
const range = { const range = {
from: fromRaw, from: fromRaw,
to: toRaw, to: toRaw,