diff --git a/public/app/features/explore/Graph.tsx b/public/app/features/explore/Graph.tsx index 1a65bd2397c..7d665fd2520 100644 --- a/public/app/features/explore/Graph.tsx +++ b/public/app/features/explore/Graph.tsx @@ -79,7 +79,7 @@ interface GraphProps { split?: boolean; userOptions?: any; onChangeTime?: (range: AbsoluteTimeRange) => void; - onToggleSeries?: (alias: string, hiddenSeries: Set) => void; + onToggleSeries?: (alias: string, hiddenSeries: string[]) => void; } interface GraphState { @@ -218,8 +218,8 @@ export class Graph extends PureComponent { const exclusive = event.ctrlKey || event.metaKey || event.shiftKey; this.setState((state, props) => { - const { data } = props; - let nextHiddenSeries = []; + const { data, onToggleSeries } = props; + let nextHiddenSeries: string[] = []; if (exclusive) { // Toggling series with key makes the series itself to toggle if (state.hiddenSeries.indexOf(label) > -1) { @@ -238,6 +238,10 @@ export class Graph extends PureComponent { } } + if (onToggleSeries) { + onToggleSeries(label, nextHiddenSeries); + } + return { hiddenSeries: nextHiddenSeries, }; diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx index 1632bc68405..e2a9539be97 100644 --- a/public/app/features/explore/Logs.tsx +++ b/public/app/features/explore/Logs.tsx @@ -68,7 +68,7 @@ interface Props { onStartScanning?: () => void; onStopScanning?: () => void; onDedupStrategyChange: (dedupStrategy: LogsDedupStrategy) => void; - onToggleLogLevel: (hiddenLogLevels: Set) => void; + onToggleLogLevel: (hiddenLogLevels: LogLevel[]) => void; getRowContext?: (row: LogRowModel, options?: any) => Promise; } @@ -135,8 +135,8 @@ export default class Logs extends PureComponent { }); }; - onToggleLogLevel = (rawLevel: string, hiddenRawLevels: Set) => { - const hiddenLogLevels: Set = new Set(Array.from(hiddenRawLevels).map(level => LogLevel[level])); + onToggleLogLevel = (rawLevel: string, hiddenRawLevels: string[]) => { + const hiddenLogLevels: LogLevel[] = hiddenRawLevels.map(level => LogLevel[level]); this.props.onToggleLogLevel(hiddenLogLevels); }; diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx index a5ef33a6945..4b5c00798d4 100644 --- a/public/app/features/explore/LogsContainer.tsx +++ b/public/app/features/explore/LogsContainer.tsx @@ -68,7 +68,7 @@ export class LogsContainer extends Component { this.props.changeDedupStrategy(this.props.exploreId, dedupStrategy); }; - hangleToggleLogLevel = (hiddenLogLevels: Set) => { + handleToggleLogLevel = (hiddenLogLevels: LogLevel[]) => { const { exploreId } = this.props; this.props.toggleLogLevelAction({ exploreId, @@ -93,6 +93,7 @@ export class LogsContainer extends Component { nextProps.loading !== this.props.loading || nextProps.dedupStrategy !== this.props.dedupStrategy || nextProps.logsHighlighterExpressions !== this.props.logsHighlighterExpressions || + nextProps.hiddenLogLevels !== this.props.hiddenLogLevels || nextProps.scanning !== this.props.scanning || nextProps.isLive !== this.props.isLive ); @@ -139,7 +140,7 @@ export class LogsContainer extends Component { onStartScanning={onStartScanning} onStopScanning={onStopScanning} onDedupStrategyChange={this.handleDedupStrategyChange} - onToggleLogLevel={this.hangleToggleLogLevel} + onToggleLogLevel={this.handleToggleLogLevel} absoluteRange={absoluteRange} timeZone={timeZone} scanning={scanning} diff --git a/public/app/features/explore/state/actionTypes.ts b/public/app/features/explore/state/actionTypes.ts index cc230bc2d4f..4d9d7c9ad27 100644 --- a/public/app/features/explore/state/actionTypes.ts +++ b/public/app/features/explore/state/actionTypes.ts @@ -201,7 +201,7 @@ export interface UpdateDatasourceInstancePayload { export interface ToggleLogLevelPayload { exploreId: ExploreId; - hiddenLogLevels: Set; + hiddenLogLevels: LogLevel[]; } export interface QueriesImportedPayload {