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

Minor post review changes

Browse Source
This commit is contained in:
Dominik Prokop
2019-02-01 15:27:02 +01:00
parent 3c358e406e
commit 1a0b21b8d1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/core/utils/explore.ts
View File

@@ -157,6 +157,8 @@ const isMetricSegment = (segment: { [key: string]: string }) => segment.hasOwnPr
const isUISegment = (segment: { [key: string]: string }) => segment.hasOwnProperty('ui');
export function parseUrlState(initial: string | undefined): ExploreUrlState {
let uiState = DEFAULT_UI_STATE;
if (initial) {
try {
const parsed = JSON.parse(decodeURI(initial));
@@ -169,8 +171,7 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
to: parsed[1],
};
const datasource = parsed[2];
let queries = [],
ui;
let queries = [];
parsed.slice(3).forEach(segment => {
if (isMetricSegment(segment)) {
@@ -178,7 +179,7 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
}
if (isUISegment(segment)) {
ui = {
uiState = {
showingGraph: segment.ui[0],
showingLogs: segment.ui[1],
showingTable: segment.ui[2],
@@ -186,14 +187,14 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
}
});
return { datasource, queries, range, ui };
return { datasource, queries, range, ui: uiState };
}
return parsed;
} catch (e) {
console.error(e);
}
}
return { datasource: null, queries: [], range: DEFAULT_RANGE, ui: DEFAULT_UI_STATE };
return { datasource: null, queries: [], range: DEFAULT_RANGE, ui: uiState };
}
export function serializeStateToUrlParam(urlState: ExploreUrlState, compact?: boolean): string {