|
@@ -16,7 +16,7 @@ import { RawTimeRange, DataQuery } from 'app/types/series';
|
|
|
import store from 'app/core/store';
|
|
import store from 'app/core/store';
|
|
|
import {
|
|
import {
|
|
|
DEFAULT_RANGE,
|
|
DEFAULT_RANGE,
|
|
|
- calculcateResultsFromQueryTransactions,
|
|
|
|
|
|
|
+ calculateResultsFromQueryTransactions,
|
|
|
ensureQueries,
|
|
ensureQueries,
|
|
|
getIntervals,
|
|
getIntervals,
|
|
|
generateKey,
|
|
generateKey,
|
|
@@ -432,7 +432,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
|
|
|
|
|
|
|
|
// Toggle off needs discarding of table queries
|
|
// Toggle off needs discarding of table queries
|
|
|
const nextQueryTransactions = state.queryTransactions.filter(qt => qt.resultType !== 'Table');
|
|
const nextQueryTransactions = state.queryTransactions.filter(qt => qt.resultType !== 'Table');
|
|
|
- const results = calculcateResultsFromQueryTransactions(
|
|
|
|
|
|
|
+ const results = calculateResultsFromQueryTransactions(
|
|
|
nextQueryTransactions,
|
|
nextQueryTransactions,
|
|
|
state.datasource,
|
|
state.datasource,
|
|
|
state.graphInterval
|
|
state.graphInterval
|
|
@@ -519,7 +519,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
|
|
|
|
|
|
|
|
// Discard transactions related to row query
|
|
// Discard transactions related to row query
|
|
|
const nextQueryTransactions = queryTransactions.filter(qt => qt.rowIndex !== index);
|
|
const nextQueryTransactions = queryTransactions.filter(qt => qt.rowIndex !== index);
|
|
|
- const results = calculcateResultsFromQueryTransactions(
|
|
|
|
|
|
|
+ const results = calculateResultsFromQueryTransactions(
|
|
|
nextQueryTransactions,
|
|
nextQueryTransactions,
|
|
|
state.datasource,
|
|
state.datasource,
|
|
|
state.graphInterval
|
|
state.graphInterval
|
|
@@ -634,7 +634,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
|
|
|
// Append new transaction
|
|
// Append new transaction
|
|
|
const nextQueryTransactions = [...remainingTransactions, transaction];
|
|
const nextQueryTransactions = [...remainingTransactions, transaction];
|
|
|
|
|
|
|
|
- const results = calculcateResultsFromQueryTransactions(
|
|
|
|
|
|
|
+ const results = calculateResultsFromQueryTransactions(
|
|
|
nextQueryTransactions,
|
|
nextQueryTransactions,
|
|
|
state.datasource,
|
|
state.datasource,
|
|
|
state.graphInterval
|
|
state.graphInterval
|
|
@@ -692,7 +692,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
|
|
|
return qt;
|
|
return qt;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- const results = calculcateResultsFromQueryTransactions(
|
|
|
|
|
|
|
+ const results = calculateResultsFromQueryTransactions(
|
|
|
nextQueryTransactions,
|
|
nextQueryTransactions,
|
|
|
state.datasource,
|
|
state.datasource,
|
|
|
state.graphInterval
|
|
state.graphInterval
|