IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with explore changeTime redux action not being hooked up, fixes #15115

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-01-29 14:58:57 +01:00
parent 0216f087b7
commit d53a430c82
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/explore/GraphContainer.tsx
View File

@ -1,17 +1,16 @@
import React, { PureComponent } from 'react';
import { hot } from 'react-hot-loader';
import { connect } from 'react-redux';
import { RawTimeRange, TimeRange } from '@grafana/ui';
import { TimeRange, RawTimeRange } from '@grafana/ui';
import { ExploreId, ExploreItemState } from 'app/types/explore';
import { StoreState } from 'app/types';
import { toggleGraph } from './state/actions';
import { toggleGraph, changeTime } from './state/actions';
import Graph from './Graph';
import Panel from './Panel';
interface GraphContainerProps {
onChangeTime: (range: TimeRange) => void;
exploreId: ExploreId;
graphResult?: any[];
loading: boolean;
@ -20,6 +19,7 @@ interface GraphContainerProps {
showingTable: boolean;
split: boolean;
toggleGraph: typeof toggleGraph;
changeTime: typeof changeTime;
}
export class GraphContainer extends PureComponent<GraphContainerProps> {
@ -27,8 +27,12 @@ export class GraphContainer extends PureComponent<GraphContainerProps> {
this.props.toggleGraph(this.props.exploreId);
};
onChangeTime = (timeRange: TimeRange) => {
this.props.changeTime(this.props.exploreId, timeRange);
};
render() {
const { exploreId, graphResult, loading, onChangeTime, showingGraph, showingTable, range, split } = this.props;
const { exploreId, graphResult, loading, showingGraph, showingTable, range, split } = this.props;
const graphHeight = showingGraph && showingTable ? '200px' : '400px';
if (!graphResult) {
@ -41,7 +45,7 @@ export class GraphContainer extends PureComponent<GraphContainerProps> {
data={graphResult}
height={graphHeight}
id={`explore-graph-${exploreId}`}
onChangeTime={onChangeTime}
onChangeTime={this.onChangeTime}
range={range}
split={split}
/>
@ -61,6 +65,7 @@ function mapStateToProps(state: StoreState, { exploreId }) {
const mapDispatchToProps = {
toggleGraph,
changeTime,
};
export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(GraphContainer));