aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJason <jason.daurus@gmail.com>2016-06-25 00:53:56 +0800
committerJason <jason.daurus@gmail.com>2016-06-25 00:53:56 +0800
commit8da623c60389bffc76dd3c1b6d8055dd19f97607 (patch)
treeb4011e288fc79a495638bbdb0cf8f84a396bdf73 /web
parent571c817f2176008c460c736580c0b35385808a2e (diff)
downloadmitmproxy-8da623c60389bffc76dd3c1b6d8055dd19f97607.tar.gz
mitmproxy-8da623c60389bffc76dd3c1b6d8055dd19f97607.tar.bz2
mitmproxy-8da623c60389bffc76dd3c1b6d8055dd19f97607.zip
[web] fix selectFlows
Diffstat (limited to 'web')
-rw-r--r--web/src/js/components/Header/FlowMenu.jsx2
-rw-r--r--web/src/js/components/MainView.jsx4
-rw-r--r--web/src/js/ducks/settings.js6
-rwxr-xr-xweb/src/js/ducks/views/main.js4
4 files changed, 9 insertions, 7 deletions
diff --git a/web/src/js/components/Header/FlowMenu.jsx b/web/src/js/components/Header/FlowMenu.jsx
index 689cea5c..1fa7037f 100644
--- a/web/src/js/components/Header/FlowMenu.jsx
+++ b/web/src/js/components/Header/FlowMenu.jsx
@@ -29,6 +29,6 @@ function FlowMenu({ flow }) {
export default connect(
state => ({
- flow: state.flows.list.data[state.flows.views.main.selected[0]],
+ flow: state.flows.list.byId[state.flows.views.main.selected[0]],
})
)(FlowMenu)
diff --git a/web/src/js/components/MainView.jsx b/web/src/js/components/MainView.jsx
index b3fe73ec..847223d2 100644
--- a/web/src/js/components/MainView.jsx
+++ b/web/src/js/components/MainView.jsx
@@ -6,7 +6,7 @@ import { Key } from '../utils.js'
import Splitter from './common/Splitter'
import FlowTable from './FlowTable'
import FlowView from './FlowView'
-import { selectFlow, updateFilter, updateHighlight } from '../ducks/views/main'
+import { select as selectFlow, updateFilter, updateHighlight } from '../ducks/views/main'
class MainView extends Component {
@@ -185,7 +185,7 @@ export default connect(
flows: state.flows.views.main.view.data,
filter: state.flows.views.main.filter,
highlight: state.flows.views.main.highlight,
- selectedFlow: state.flows.list.data[state.flows.views.main.selected[0]]
+ selectedFlow: state.flows.list.byId[state.flows.views.main.selected[0]]
}),
{
selectFlow,
diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js
index c5f0a90b..7101aa1e 100644
--- a/web/src/js/ducks/settings.js
+++ b/web/src/js/ducks/settings.js
@@ -4,10 +4,10 @@ import * as msgQueueActions from './msgQueue'
export const MSG_TYPE = 'UPDATE_SETTINGS'
export const DATA_URL = '/settings'
-export const RECEIVE = 'RECEIVE'
-export const UPDATE = 'UPDATE'
+export const RECEIVE = 'RECEIVE'
+export const UPDATE = 'UPDATE'
export const REQUEST_UPDATE = 'REQUEST_UPDATE'
-export const UNKNOWN_CMD = 'SETTINGS_UNKNOWN_CMD'
+export const UNKNOWN_CMD = 'SETTINGS_UNKNOWN_CMD'
const defaultState = {
settings: {},
diff --git a/web/src/js/ducks/views/main.js b/web/src/js/ducks/views/main.js
index 74dc2606..264c0c4c 100755
--- a/web/src/js/ducks/views/main.js
+++ b/web/src/js/ducks/views/main.js
@@ -164,7 +164,9 @@ export function updateSorter(column, desc) {
* @public
*/
export function select(id) {
- return { type: SELECT, currentSelection: getState().flows.views.main.selected[0], id }
+ return (dispatch, getState) => {
+ dispatch({ type: SELECT, currentSelection: getState().flows.views.main.selected[0], id })
+ }
}
/**