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

Explore: Parse initial dates

Browse Source 
- parse dates passed from URL
- keep everything local time for now
This commit is contained in:
David Kaltschmidt 2018-12-07 12:41:47 +01:00
parent 140205a783
commit a990b69baa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/explore/Explore.tsx
View File

@ -38,7 +38,7 @@ import Graph from './Graph';
import Logs from './Logs'; import Logs from './Logs';
import Table from './Table'; import Table from './Table';
import ErrorBoundary from './ErrorBoundary'; import ErrorBoundary from './ErrorBoundary';
import TimePicker from './TimePicker'; import TimePicker, { parseTime } from './TimePicker';
interface ExploreProps { interface ExploreProps {
datasourceSrv: DatasourceSrv; datasourceSrv: DatasourceSrv;
@ -115,7 +115,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
} else { } else {
const { datasource, queries, range } = props.urlState as ExploreUrlState; const { datasource, queries, range } = props.urlState as ExploreUrlState;
initialQueries = ensureQueries(queries); initialQueries = ensureQueries(queries);
const initialRange = range || { ...DEFAULT_RANGE }; const initialRange = { from: parseTime(range.from), to: parseTime(range.to) } || { ...DEFAULT_RANGE };
// Millies step for helper bar charts // Millies step for helper bar charts
const initialGraphInterval = 15 * 1000; const initialGraphInterval = 15 * 1000;
this.state = { this.state = {

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

@ -15,7 +15,7 @@ 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, isUtc = false): string { export function parseTime(value: string | moment.Moment, isUtc = false): string | moment.Moment {
if (moment.isMoment(value)) { if (moment.isMoment(value)) {
return value; return value;
} }