4 files changed, 15 insertions, 77 deletions

diff --git a/web/src/js/components/FlowTable/FlowTableHead.jsx b/web/src/js/components/FlowTable/FlowTableHead.jsx
index 50242737..b201285f 100644
--- a/web/src/js/components/FlowTable/FlowTableHead.jsx
+++ b/web/src/js/components/FlowTable/FlowTableHead.jsx
@@ -3,15 +3,15 @@ import { connect } from 'react-redux'
 import classnames from 'classnames'
 import columns from './FlowColumns'
 
-import { updateSort } from '../../ducks/flowView'
+import { setSort } from '../../ducks/flows'
 
 FlowTableHead.propTypes = {
-    updateSort: PropTypes.func.isRequired,
+    setSort: PropTypes.func.isRequired,
     sortDesc: React.PropTypes.bool.isRequired,
     sortColumn: React.PropTypes.string,
 }
 
-function FlowTableHead({ sortColumn, sortDesc, updateSort }) {
+function FlowTableHead({ sortColumn, sortDesc, setSort }) {
     const sortType = sortDesc ? 'sort-desc' : 'sort-asc'
 
     return (
@@ -19,7 +19,7 @@ function FlowTableHead({ sortColumn, sortDesc, updateSort }) {
             {columns.map(Column => (
                 <th className={classnames(Column.headerClass, sortColumn === Column.name && sortType)}
                     key={Column.name}
-                    onClick={() => updateSort(Column.name, Column.name !== sortColumn ? false : !sortDesc)}>
+                    onClick={() => setSort(Column.name, Column.name !== sortColumn ? false : !sortDesc)}>
                     {Column.headerName}
                 </th>
             ))}
@@ -29,10 +29,10 @@ function FlowTableHead({ sortColumn, sortDesc, updateSort }) {
 
 export default connect(
     state => ({
-        sortDesc: state.flowView.sort.desc,
-        sortColumn: state.flowView.sort.column,
+        sortDesc: state.flows.sort.desc,
+        sortColumn: state.flows.sort.column,
     }),
     {
-        updateSort
+        setSort
     }
 )(FlowTableHead)
diff --git a/web/src/js/components/Header/MainMenu.jsx b/web/src/js/components/Header/MainMenu.jsx
index 7236d31f..5ab3fa9d 100644
--- a/web/src/js/components/Header/MainMenu.jsx
+++ b/web/src/js/components/Header/MainMenu.jsx
@@ -2,7 +2,7 @@ import React, { Component, PropTypes } from 'react'
 import { connect } from 'react-redux'
 import FilterInput from './FilterInput'
 import { update as updateSettings } from '../../ducks/settings'
-import { updateFilter, updateHighlight } from '../../ducks/flowView'
+import { setFilter, setHighlight } from '../../ducks/flows'
 
 MainMenu.title = "Start"
 
@@ -31,20 +31,20 @@ const InterceptInput = connect(
 
 const FlowFilterInput = connect(
     state => ({
-        value: state.flowView.filter || '',
+        value: state.flows.filter || '',
         placeholder: 'Search',
         type: 'search',
         color: 'black'
     }),
-    { onChange: updateFilter }
+    { onChange: setFilter }
 )(FilterInput);
 
 const HighlightInput = connect(
     state => ({
-        value: state.flowView.highlight || '',
+        value: state.flows.highlight || '',
         placeholder: 'Highlight',
         type: 'tag',
         color: 'hsl(48, 100%, 50%)'
     }),
-    { onChange: updateHighlight }
+    { onChange: setHighlight }
 )(FilterInput);
diff --git a/web/src/js/components/MainView.jsx b/web/src/js/components/MainView.jsx
index 8be6f21c..5c9a2d30 100644
--- a/web/src/js/components/MainView.jsx
+++ b/web/src/js/components/MainView.jsx
@@ -4,7 +4,6 @@ import Splitter from './common/Splitter'
 import FlowTable from './FlowTable'
 import FlowView from './FlowView'
 import * as flowsActions from '../ducks/flows'
-import { updateFilter, updateHighlight } from '../ducks/flowView'
 
 class MainView extends Component {
 
@@ -41,16 +40,14 @@ class MainView extends Component {
 
 export default connect(
     state => ({
-        flows: state.flowView.data,
-        filter: state.flowView.filter,
-        highlight: state.flowView.highlight,
+        flows: state.flows.view,
+        filter: state.flows.filter,
+        highlight: state.flows.highlight,
         selectedFlow: state.flows.byId[state.flows.selected[0]],
         tab: state.ui.flow.tab,
     }),
     {
         selectFlow: flowsActions.select,
-        updateFilter,
-        updateHighlight,
         updateFlow: flowsActions.update,
     }
 )(MainView)
diff --git a/web/src/js/components/ProxyApp.jsx b/web/src/js/components/ProxyApp.jsx
index d76816e5..18976de0 100644
--- a/web/src/js/components/ProxyApp.jsx
+++ b/web/src/js/components/ProxyApp.jsx
@@ -1,13 +1,7 @@
 import React, { Component, PropTypes } from 'react'
 import { connect } from 'react-redux'
-import { createHashHistory, useQueries } from 'history'
 
-import { init as appInit, destruct as appDestruct } from '../ducks/app'
 import { onKeyDown } from '../ducks/ui/keyboard'
-import { updateFilter, updateHighlight } from '../ducks/flowView'
-import { selectTab } from '../ducks/ui/flow'
-import { select as selectFlow } from '../ducks/flows'
-import { Query } from '../actions'
 import MainView from './MainView'
 import Header from './Header'
 import EventLog from './EventLog'
@@ -15,57 +9,14 @@ import Footer from './Footer'
 
 class ProxyAppMain extends Component {
 
-    flushToStore(location) {
-        const components = location.pathname.split('/').filter(v => v)
-        const query = location.query || {}
-
-        if (components.length > 2) {
-            this.props.selectFlow(components[1])
-            this.props.selectTab(components[2])
-        } else {
-            this.props.selectFlow(null)
-            this.props.selectTab(null)
-        }
-
-        this.props.updateFilter(query[Query.SEARCH])
-        this.props.updateHighlight(query[Query.HIGHLIGHT])
-    }
-
-    flushToHistory(props) {
-        const query = { ...query }
-
-        if (props.filter) {
-            query[Query.SEARCH] = props.filter
-        }
-
-        if (props.highlight) {
-            query[Query.HIGHLIGHT] = props.highlight
-        }
-
-        if (props.selectedFlowId) {
-            this.history.push({ pathname: `/flows/${props.selectedFlowId}/${props.tab}`, query })
-        } else {
-            this.history.push({ pathname: '/flows', query })
-        }
-    }
-
     componentWillMount() {
-        this.props.appInit()
-        this.history = useQueries(createHashHistory)()
-        this.unlisten = this.history.listen(location => this.flushToStore(location))
         window.addEventListener('keydown', this.props.onKeyDown);
     }
 
     componentWillUnmount() {
-        this.props.appDestruct()
-        this.unlisten()
         window.removeEventListener('keydown', this.props.onKeyDown);
     }
 
-    componentWillReceiveProps(nextProps) {
-        this.flushToHistory(nextProps)
-    }
-
     render() {
         const { showEventLog, location, filter, highlight } = this.props
         return (
@@ -84,18 +35,8 @@ class ProxyAppMain extends Component {
 export default connect(
     state => ({
         showEventLog: state.eventLog.visible,
-        filter: state.flowView.filter,
-        highlight: state.flowView.highlight,
-        tab: state.ui.flow.tab,
-        selectedFlowId: state.flows.selected[0]
     }),
     {
-        appInit,
-        appDestruct,
         onKeyDown,
-        updateFilter,
-        updateHighlight,
-        selectTab,
-        selectFlow
     }
 )(ProxyAppMain)