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: Add typings for queryTransaction.request (#18847)

Browse Source
This commit is contained in:
Andrej Ocenas
2019-09-03 22:04:33 +02:00
committed by GitHub
parent 0cbbb43222
commit e0e3a4db54
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ import {
updateHistory,
} from 'app/core/utils/explore';
// Types
import { ThunkResult, ExploreUrlState } from 'app/types';
import { ThunkResult, ExploreUrlState, ExploreItemState } from 'app/types';
import { DataSourceApi, DataQuery, DataSourceSelectItem, QueryFixAction, PanelData } from '@grafana/ui';
import {
@@ -31,7 +31,7 @@ import {
isDateTime,
dateTimeForTimeZone,
} from '@grafana/data';
import { ExploreId, ExploreUIState, QueryTransaction, ExploreMode } from 'app/types/explore';
import { ExploreId, ExploreUIState, ExploreMode } from 'app/types/explore';
import {
updateDatasourceInstanceAction,
changeQueryAction,
@@ -466,7 +466,7 @@ export function runQueries(exploreId: ExploreId): ThunkResult<void> {
dispatch(queryStartAction({ exploreId }));
queryState
.execute(datasourceInstance, transaction.options)
.execute(datasourceInstance, transaction.request)
.then((response: PanelData) => {
if (!response.error) {
// Side-effect: Saving history in localstorage
@@ -493,7 +493,7 @@ export function runQueries(exploreId: ExploreId): ThunkResult<void> {
dispatch(
queryEndedAction({
exploreId,
response: { error, legacy: [], series: [], request: transaction.options, state: LoadingState.Error },
response: { error, legacy: [], series: [], request: transaction.request, state: LoadingState.Error },
})
);
});
@@ -649,12 +649,9 @@ export function splitOpen(): ThunkResult<void> {
const leftState = getState().explore[ExploreId.left];
const queryState = getState().location.query[ExploreId.left] as string;
const urlState = parseUrlState(queryState);
const queryTransactions: QueryTransaction[] = [];
const itemState = {
const itemState: ExploreItemState = {
...leftState,
queryTransactions,
queries: leftState.queries.slice(),
exploreId: ExploreId.right,
urlState,
};
dispatch(splitOpenAction({ itemState }));