Skip to content

Commit 8cd79cc

Browse files
committed
1 parent 42bd60d commit 8cd79cc

File tree

4 files changed

+23
-6
lines changed

4 files changed

+23
-6
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
"redux": "^3.5.2",
8080
"redux-devtools": "^3.3.1",
8181
"redux-devtools-instrument": "^1.3.2",
82-
"remotedev-app": "^0.8.0-beta-4",
82+
"remotedev-app": "^0.8.0-beta-8",
83+
"remotedev-slider": "^1.0.1",
8384
"remotedev-utils": "0.0.1"
8485
}
8586
}

src/app/containers/App.js

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React, { Component, PropTypes } from 'react';
22
import { bindActionCreators } from 'redux';
33
import { 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';
56
import { getActiveInstance } from 'remotedev-app/lib/reducers/instances';
67
import styles from 'remotedev-app/lib/styles';
78
import 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 {
109115
App.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

135144
function mapDispatchToProps(dispatch) {
136-
return { liftedDispatch: bindActionCreators(liftedDispatch, dispatch) };
145+
return {
146+
liftedDispatch: bindActionCreators(liftedDispatch, dispatch),
147+
getReport: bindActionCreators(getReport, dispatch)
148+
};
137149
}
138150

139151
export default connect(mapStateToProps, mapDispatchToProps)(App);

src/app/reducers/panel/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ import instances from 'remotedev-app/lib/reducers/instances';
33
import monitor from 'remotedev-app/lib/reducers/monitor';
44
import notification from 'remotedev-app/lib/reducers/notification';
55
import test from 'remotedev-app/lib/reducers/test';
6+
import reports from 'remotedev-app/lib/reducers/reports';
67

78
const rootReducer = combineReducers({
89
instances,
910
monitor,
1011
test,
12+
reports,
1113
notification
1214
});
1315

src/app/reducers/window/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ import { combineReducers } from 'redux';
22
import instances from './instances';
33
import monitor from 'remotedev-app/lib/reducers/monitor';
44
import notification from 'remotedev-app/lib/reducers/notification';
5+
import reports from 'remotedev-app/lib/reducers/reports';
56
import test from 'remotedev-app/lib/reducers/test';
67

78
const rootReducer = combineReducers({
89
instances,
910
monitor,
1011
test,
12+
reports,
1113
notification
1214
});
1315

0 commit comments

Comments
 (0)