11import React , { Component , PropTypes } from 'react' ;
22import { bindActionCreators } from 'redux' ;
33import { connect } from 'react-redux' ;
4- import { liftedDispatch } from 'remotedev-app/lib/actions' ;
4+ import SliderMonitor from 'remotedev-slider' ;
5+ import { liftedDispatch , getReport } from 'remotedev-app/lib/actions' ;
56import { getActiveInstance } from 'remotedev-app/lib/reducers/instances' ;
67import styles from 'remotedev-app/lib/styles' ;
78import enhance from 'remotedev-app/lib/hoc' ;
@@ -49,13 +50,18 @@ class App extends Component {
4950 testComponent = { isRedux && TestGenerator }
5051 />
5152 < Notification />
52- { sliderIsOpen && < div style = { styles . sliderMonitor } >
53- < DevTools
53+ { sliderIsOpen && options . connectionId &&
54+ < SliderMonitor
5455 monitor = "SliderMonitor"
5556 liftedState = { liftedState }
5657 dispatch = { this . props . liftedDispatch }
58+ getReport = { this . props . getReport }
59+ reports = { this . props . reports }
60+ showActions = { monitor === 'ChartMonitor' }
61+ style = { { padding : '15px 5px' } }
62+ fillColor = "rgb(120, 144, 156)"
5763 />
58- </ div > }
64+ }
5965 { dispatcherIsOpen && options . connectionId &&
6066 < Dispatcher options = { options } />
6167 }
@@ -109,11 +115,13 @@ class App extends Component {
109115App . propTypes = {
110116 bgStore : PropTypes . object ,
111117 liftedDispatch : PropTypes . func . isRequired ,
118+ getReport : PropTypes . func . isRequired ,
112119 selected : PropTypes . string ,
113120 liftedState : PropTypes . object . isRequired ,
114121 options : PropTypes . object . isRequired ,
115122 monitor : PropTypes . string ,
116123 position : PropTypes . string ,
124+ reports : PropTypes . array . isRequired ,
117125 dispatcherIsOpen : PropTypes . bool ,
118126 sliderIsOpen : PropTypes . bool
119127} ;
@@ -128,12 +136,16 @@ function mapStateToProps(state) {
128136 monitor : state . monitor . selected ,
129137 dispatcherIsOpen : state . monitor . dispatcherIsOpen ,
130138 sliderIsOpen : state . monitor . sliderIsOpen ,
139+ reports : state . reports . data ,
131140 shouldSync : state . instances . sync
132141 } ;
133142}
134143
135144function mapDispatchToProps ( dispatch ) {
136- return { liftedDispatch : bindActionCreators ( liftedDispatch , dispatch ) } ;
145+ return {
146+ liftedDispatch : bindActionCreators ( liftedDispatch , dispatch ) ,
147+ getReport : bindActionCreators ( getReport , dispatch )
148+ } ;
137149}
138150
139151export default connect ( mapStateToProps , mapDispatchToProps ) ( App ) ;
0 commit comments