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

wip

Browse Source
This commit is contained in:
Dominik Prokop
2019-01-31 19:38:49 +01:00
parent 6c1f8a9cfe
commit f9bab9585a
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/core/utils/explore.test.ts
View File

@@ -13,6 +13,11 @@ const DEFAULT_EXPLORE_STATE: ExploreUrlState = {
datasource: null, datasource: null,
queries: [], queries: [],
range: DEFAULT_RANGE, range: DEFAULT_RANGE,
ui: {
showingGraph: true,
showingTable: true,
showingLogs: true,
}
}; };
describe('state functions', () => { describe('state functions', () => {
@@ -69,9 +74,11 @@ describe('state functions', () => {
to: 'now', to: 'now',
}, },
}; };
expect(serializeStateToUrlParam(state)).toBe( expect(serializeStateToUrlParam(state)).toBe(
'{"datasource":"foo","queries":[{"expr":"metric{test=\\"a/b\\"}"},' + '{"datasource":"foo","queries":[{"expr":"metric{test=\\"a/b\\"}"},' +
'{"expr":"super{foo=\\"x/z\\"}"}],"range":{"from":"now-5h","to":"now"}}' '{"expr":"super{foo=\\"x/z\\"}"}],"range":{"from":"now-5h","to":"now"},' +
'"ui":{"showingGraph":true,"showingTable":true,"showingLogs":true}}'
); );
}); });

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

@@ -20,6 +20,7 @@ import {
ResultType, ResultType,
QueryIntervals, QueryIntervals,
QueryOptions, QueryOptions,
ExploreUrlUIState,
} from 'app/types/explore'; } from 'app/types/explore';
export const DEFAULT_RANGE = { export const DEFAULT_RANGE = {
@@ -27,6 +28,12 @@ export const DEFAULT_RANGE = {
to: 'now', to: 'now',
}; };
export const DEFAULT_UI_STATE = {
showingTable: true,
showingGraph: true,
showingLogs: true,
};
const MAX_HISTORY_ITEMS = 100; const MAX_HISTORY_ITEMS = 100;
export const LAST_USED_DATASOURCE_KEY = 'grafana.explore.datasource'; export const LAST_USED_DATASOURCE_KEY = 'grafana.explore.datasource';
@@ -151,6 +158,7 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
if (initial) { if (initial) {
try { try {
const parsed = JSON.parse(decodeURI(initial)); const parsed = JSON.parse(decodeURI(initial));
// debugger
if (Array.isArray(parsed)) { if (Array.isArray(parsed)) {
if (parsed.length <= 3) { if (parsed.length <= 3) {
throw new Error('Error parsing compact URL state for Explore.'); throw new Error('Error parsing compact URL state for Explore.');
@@ -161,19 +169,24 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
}; };
const datasource = parsed[2]; const datasource = parsed[2];
const queries = parsed.slice(3); const queries = parsed.slice(3);
return { datasource, queries, range }; return { datasource, queries, range, ui: DEFAULT_UI_STATE };
} }
return parsed; return parsed;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
} }
return { datasource: null, queries: [], range: DEFAULT_RANGE }; return { datasource: null, queries: [], range: DEFAULT_RANGE, ui: DEFAULT_UI_STATE };
} }
const serializeUIState = (state: ExploreUrlUIState) => {
return Object.keys(state).map((key) => ({ [key]: state[key] }));
};
export function serializeStateToUrlParam(urlState: ExploreUrlState, compact?: boolean): string { export function serializeStateToUrlParam(urlState: ExploreUrlState, compact?: boolean): string {
if (compact) { if (compact) {
return JSON.stringify([urlState.range.from, urlState.range.to, urlState.datasource, ...urlState.queries]); return JSON.stringify([urlState.range.from, urlState.range.to, urlState.datasource, ...urlState.queries, ...serializeUIState(urlState.ui)]);
} }
return JSON.stringify(urlState); return JSON.stringify(urlState);
} }

7
public/app/types/explore.ts
View File

@@ -231,10 +231,17 @@ export interface ExploreItemState {
tableResult?: TableModel; tableResult?: TableModel;
} }
export interface ExploreUrlUIState {
showingTable: boolean;
showingGraph: boolean;
showingLogs: boolean;
}
export interface ExploreUrlState { export interface ExploreUrlState {
datasource: string; datasource: string;
queries: any[]; // Should be a DataQuery, but we're going to strip refIds, so typing makes less sense queries: any[]; // Should be a DataQuery, but we're going to strip refIds, so typing makes less sense
range: RawTimeRange; range: RawTimeRange;
ui: ExploreUrlUIState;
} }
export interface HistoryItem<TQuery extends DataQuery = DataQuery> { export interface HistoryItem<TQuery extends DataQuery = DataQuery> {