IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 04:04:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Explore: Fix running of log queries with shift-enter shortcut (#36600)

Browse Source 
* Re-run query if we are running query fromo query row

* Fix imports in tests

* Change solution

* Dispatch clear cache
This commit is contained in:
Ivana Huckova 2021-07-12 11:54:17 -04:00 committed by GitHub
parent b1d576c5da
commit 528fe90536
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/explore/ExploreToolbar.tsx
View File

@ -19,7 +19,7 @@ import { ExploreTimeControls } from './ExploreTimeControls';
import { LiveTailButton } from './LiveTailButton'; import { LiveTailButton } from './LiveTailButton';
import { RunButton } from './RunButton'; import { RunButton } from './RunButton';
import { LiveTailControls } from './useLiveTailControls'; import { LiveTailControls } from './useLiveTailControls';
import { cancelQueries, clearQueries, runQueries, clearCache } from './state/query'; import { cancelQueries, clearQueries, runQueries } from './state/query';
import ReturnToDashboardButton from './ReturnToDashboardButton'; import ReturnToDashboardButton from './ReturnToDashboardButton';
import { isSplit } from './state/selectors'; import { isSplit } from './state/selectors';
@ -40,12 +40,10 @@ export class UnConnectedExploreToolbar extends PureComponent<Props> {
}; };
onRunQuery = (loading = false) => { onRunQuery = (loading = false) => {
const { clearCache, runQueries, cancelQueries, exploreId } = this.props; const { runQueries, cancelQueries, exploreId } = this.props;
if (loading) { if (loading) {
return cancelQueries(exploreId); return cancelQueries(exploreId);
} else { } else {
// We want to give user a chance tu re-run the query even if it is saved in cache
clearCache(exploreId);
return runQueries(exploreId); return runQueries(exploreId);
} }
}; };
@ -249,7 +247,6 @@ const mapDispatchToProps = {
split: splitOpen, split: splitOpen,
syncTimes, syncTimes,
onChangeTimeZone: updateTimeZoneForSession, onChangeTimeZone: updateTimeZoneForSession,
clearCache,
}; };
const connector = connect(mapStateToProps, mapDispatchToProps); const connector = connect(mapStateToProps, mapDispatchToProps);

11
public/app/features/explore/state/query.ts
View File

@ -304,10 +304,19 @@ export function modifyQueries(
/** /**
* Main action to run queries and dispatches sub-actions based on which result viewers are active * Main action to run queries and dispatches sub-actions based on which result viewers are active
*/ */
export const runQueries = (exploreId: ExploreId, options?: { replaceUrl?: boolean }): ThunkResult<void> => { export const runQueries = (
exploreId: ExploreId,
options?: { replaceUrl?: boolean; preserveCache?: boolean }
): ThunkResult<void> => {
return (dispatch, getState) => { return (dispatch, getState) => {
dispatch(updateTime({ exploreId })); dispatch(updateTime({ exploreId }));
// We always want to clear cache unless we explicitly pass preserveCache parameter
const preserveCache = options?.preserveCache === true;
if (!preserveCache) {
dispatch(clearCache(exploreId));
}
const richHistory = getState().explore.richHistory; const richHistory = getState().explore.richHistory;
const exploreItemState = getState().explore[exploreId]!; const exploreItemState = getState().explore[exploreId]!;
const { const {

8
public/app/features/explore/state/time.ts
View File

@ -47,12 +47,14 @@ export const updateTimeRange = (options: {
const { syncedTimes } = getState().explore; const { syncedTimes } = getState().explore;
if (syncedTimes) { if (syncedTimes) {
dispatch(updateTime({ ...options, exploreId: ExploreId.left })); dispatch(updateTime({ ...options, exploreId: ExploreId.left }));
dispatch(runQueries(ExploreId.left)); // When running query by updating time range, we want to preserve cache.
// Cached results are currently used in Logs pagination.
dispatch(runQueries(ExploreId.left, { preserveCache: true }));
dispatch(updateTime({ ...options, exploreId: ExploreId.right })); dispatch(updateTime({ ...options, exploreId: ExploreId.right }));
dispatch(runQueries(ExploreId.right)); dispatch(runQueries(ExploreId.right, { preserveCache: true }));
} else { } else {
dispatch(updateTime({ ...options })); dispatch(updateTime({ ...options }));
dispatch(runQueries(options.exploreId)); dispatch(runQueries(options.exploreId, { preserveCache: true }));
} }
}; };
}; };