aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/ducks/eventLog.js
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-26 01:45:45 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-26 01:45:45 -0700
commit3eb2d04aac114ca4b3adf2211b8c0f8d98c9798c (patch)
tree9d0351c1588d030d9ea11245555eccaf128c2e9b /web/src/js/ducks/eventLog.js
parent1c240d919a4f856bc356515d4a146b29365cd1d5 (diff)
downloadmitmproxy-3eb2d04aac114ca4b3adf2211b8c0f8d98c9798c.tar.gz
mitmproxy-3eb2d04aac114ca4b3adf2211b8c0f8d98c9798c.tar.bz2
mitmproxy-3eb2d04aac114ca4b3adf2211b8c0f8d98c9798c.zip
minor fixes
Diffstat (limited to 'web/src/js/ducks/eventLog.js')
-rw-r--r--web/src/js/ducks/eventLog.js15
1 files changed, 5 insertions, 10 deletions
diff --git a/web/src/js/ducks/eventLog.js b/web/src/js/ducks/eventLog.js
index 50b24cd6..52eec1cd 100644
--- a/web/src/js/ducks/eventLog.js
+++ b/web/src/js/ducks/eventLog.js
@@ -17,8 +17,8 @@ const defaultState = {
logId: 0,
visible: false,
filters: { debug: false, info: true, web: true },
- list: undefined,
- view: undefined,
+ list: reduceList(undefined, {}),
+ view: reduceView(undefined, {}),
}
export default function reduce(state = defaultState, action) {
@@ -40,7 +40,7 @@ export default function reduce(state = defaultState, action) {
case ADD:
const item = {
- id: `log-${state.logId}`,
+ id: state.logId,
message: action.message,
level: action.level,
}
@@ -52,19 +52,14 @@ export default function reduce(state = defaultState, action) {
}
case RECEIVE:
- const list = reduceList(state.list, listActions.receive(action.list))
return {
...state,
- list,
+ list: reduceList(state.list, listActions.receive(action.list)),
view: reduceView(state.view, viewActions.receive(list, log => state.filters[log.level])),
}
default:
- return {
- ...state,
- list: reduceList(state.list, action),
- view: reduceView(state.view, action),
- }
+ return state
}
}