From bf75e1457363739f9ea4329da71c03e48a0bb8af Mon Sep 17 00:00:00 2001 From: Clemens Date: Tue, 14 Jun 2016 11:20:48 +0200 Subject: added flowMenu --- web/src/js/components/MainView.jsx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'web/src/js/components/MainView.jsx') diff --git a/web/src/js/components/MainView.jsx b/web/src/js/components/MainView.jsx index dbea76e5..24013ca8 100644 --- a/web/src/js/components/MainView.jsx +++ b/web/src/js/components/MainView.jsx @@ -9,6 +9,7 @@ import { Splitter } from './common.js' import FlowTable from './FlowTable' import FlowView from './flowview/index.js' import { selectFlow, setFilter, setHighlight } from '../ducks/flows' +import { setDefaultMenu, setFlowMenu } from '../ducks/view' class MainView extends Component { @@ -39,8 +40,10 @@ class MainView extends Component { */ selectFlow(flow) { if (flow) { + this.props.setFlowMenu() this.props.updateLocation(`/flows/${flow.id}/${this.props.routeParams.detailTab || 'request'}`) } else { + this.props.setDefaultMenu() this.props.updateLocation('/flows') } } @@ -192,6 +195,8 @@ export default connect( }), dispatch => bindActionCreators({ selectFlow, + setDefaultMenu, + setFlowMenu, setFilter, setHighlight, }, dispatch), -- cgit v1.2.3 From 003096b4cc4e268642eb842dbe94cd4439db1908 Mon Sep 17 00:00:00 2001 From: Clemens Date: Tue, 14 Jun 2016 22:17:34 +0200 Subject: code review --- web/src/js/components/MainView.jsx | 6 ------ 1 file changed, 6 deletions(-) (limited to 'web/src/js/components/MainView.jsx') diff --git a/web/src/js/components/MainView.jsx b/web/src/js/components/MainView.jsx index 24013ca8..eb15af8a 100644 --- a/web/src/js/components/MainView.jsx +++ b/web/src/js/components/MainView.jsx @@ -1,7 +1,6 @@ import React, { Component, PropTypes } from 'react' import { connect } from 'react-redux' import { bindActionCreators } from 'redux' - import { FlowActions } from '../actions.js' import { Query } from '../actions.js' import { Key } from '../utils.js' @@ -9,7 +8,6 @@ import { Splitter } from './common.js' import FlowTable from './FlowTable' import FlowView from './flowview/index.js' import { selectFlow, setFilter, setHighlight } from '../ducks/flows' -import { setDefaultMenu, setFlowMenu } from '../ducks/view' class MainView extends Component { @@ -40,10 +38,8 @@ class MainView extends Component { */ selectFlow(flow) { if (flow) { - this.props.setFlowMenu() this.props.updateLocation(`/flows/${flow.id}/${this.props.routeParams.detailTab || 'request'}`) } else { - this.props.setDefaultMenu() this.props.updateLocation('/flows') } } @@ -195,8 +191,6 @@ export default connect( }), dispatch => bindActionCreators({ selectFlow, - setDefaultMenu, - setFlowMenu, setFilter, setHighlight, }, dispatch), -- cgit v1.2.3