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: Remove ui params from url (#27753)

Browse Source 
* Remove ui from url

* Update tests

* Update changeDedupStrategy

* Add test coverage
This commit is contained in:
Ivana Huckova
2020-10-01 12:18:21 +02:00
committed by GitHub
parent bd9add72de
commit 2f5a60f561
18 changed files with 72 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,9 +41,6 @@ export const DEFAULT_RANGE = {
};
export const DEFAULT_UI_STATE = {
showingTable: true,
showingGraph: true,
showingLogs: true,
dedupStrategy: LogsDedupStrategy.none,
};
@@ -189,13 +186,6 @@ enum ParseUrlStateIndex {
SegmentsStart = 3,
}
enum ParseUiStateIndex {
Graph = 0,
Logs = 1,
Table = 2,
Strategy = 3,
}
export const safeParseJson = (text?: string): any | undefined => {
if (!text) {
return;
@@ -228,7 +218,6 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
datasource: null,
queries: [],
range: DEFAULT_RANGE,
ui: DEFAULT_UI_STATE,
mode: null,
originPanelId: null,
};
@@ -254,18 +243,8 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
const parsedSegments = parsed.slice(ParseUrlStateIndex.SegmentsStart);
const queries = parsedSegments.filter(segment => !isSegment(segment, 'ui', 'originPanelId'));
const uiState = parsedSegments.filter(segment => isSegment(segment, 'ui'))[0];
const ui = uiState
? {
showingGraph: uiState.ui[ParseUiStateIndex.Graph],
showingLogs: uiState.ui[ParseUiStateIndex.Logs],
showingTable: uiState.ui[ParseUiStateIndex.Table],
dedupStrategy: uiState.ui[ParseUiStateIndex.Strategy],
}
: DEFAULT_UI_STATE;
const originPanelId = parsedSegments.filter(segment => isSegment(segment, 'originPanelId'))[0];
return { datasource, queries, range, ui, originPanelId };
return { datasource, queries, range, originPanelId };
}
export function generateKey(index = 0): string {