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

fix: Initial url update in Explore should replace existing url history #17030 (#17061)

Browse Source
This commit is contained in:
Johannes Schill 2019-05-16 11:02:21 +02:00 committed by David
parent e6001f57a2
commit b11eeadbd9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/features/explore/state/actions.ts
View File

@ -119,7 +119,7 @@ export function addQueryRow(exploreId: ExploreId, index: number): ThunkResult<vo
/**
* Loads a new datasource identified by the given name.
*/
export function changeDatasource(exploreId: ExploreId, datasource: string): ThunkResult<void> {
export function changeDatasource(exploreId: ExploreId, datasource: string, replaceUrl = false): ThunkResult<void> {
return async (dispatch, getState) => {
let newDataSourceInstance: DataSourceApi = null;
@ -137,8 +137,7 @@ export function changeDatasource(exploreId: ExploreId, datasource: string): Thun
dispatch(updateDatasourceInstanceAction({ exploreId, datasourceInstance: newDataSourceInstance }));
await dispatch(loadDatasource(exploreId, newDataSourceInstance));
dispatch(runQueries(exploreId));
dispatch(runQueries(exploreId, false, replaceUrl));
};
}
@ -244,7 +243,7 @@ export function loadExploreDatasourcesAndSetDatasource(
dispatch(loadExploreDatasources({ exploreId, exploreDatasources }));
if (exploreDatasources.length >= 1) {
dispatch(changeDatasource(exploreId, datasourceName));
dispatch(changeDatasource(exploreId, datasourceName, true));
} else {
dispatch(loadDatasourceMissingAction({ exploreId }));
}
@ -513,7 +512,7 @@ export function processQueryResults(
/**
* Main action to run queries and dispatches sub-actions based on which result viewers are active
*/
export function runQueries(exploreId: ExploreId, ignoreUIState = false): ThunkResult<void> {
export function runQueries(exploreId: ExploreId, ignoreUIState = false, replaceUrl = false): ThunkResult<void> {
return (dispatch, getState) => {
const {
datasourceInstance,
@ -533,7 +532,7 @@ export function runQueries(exploreId: ExploreId, ignoreUIState = false): ThunkRe
if (!hasNonEmptyQuery(queries)) {
dispatch(clearQueriesAction({ exploreId }));
dispatch(stateSave()); // Remember to saves to state and update location
dispatch(stateSave(replaceUrl)); // Remember to save to state and update location
return;
}
@ -567,7 +566,7 @@ export function runQueries(exploreId: ExploreId, ignoreUIState = false): ThunkRe
dispatch(runQueriesForType(exploreId, 'Logs', { interval, format: 'logs' }));
}
dispatch(stateSave());
dispatch(stateSave(replaceUrl));
};
}
@ -691,7 +690,7 @@ const toRawTimeRange = (range: TimeRange): RawTimeRange => {
* Saves Explore state to URL using the `left` and `right` parameters.
* If split view is not active, `right` will not be set.
*/
export function stateSave(): ThunkResult<void> {
export function stateSave(replaceUrl = false): ThunkResult<void> {
return (dispatch, getState) => {
const { left, right, split } = getState().explore;
const urlStates: { [index: string]: string } = {};
@ -723,7 +722,7 @@ export function stateSave(): ThunkResult<void> {
urlStates.right = serializeStateToUrlParam(rightUrlState, true);
}
dispatch(updateLocation({ query: urlStates }));
dispatch(updateLocation({ query: urlStates, replace: replaceUrl }));
};
}