aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-11-09 13:01:25 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-11-09 13:01:25 +0100
commit77f05178ad23a8bb1f2cc43e1cdcf0593acd43d2 (patch)
tree8a13e6257146dc6a535dca220f7cb374cbd91a73 /web
parenta0ddedff6f2e6420ab44a7763132e80a8b8075d5 (diff)
downloadmitmproxy-77f05178ad23a8bb1f2cc43e1cdcf0593acd43d2.tar.gz
mitmproxy-77f05178ad23a8bb1f2cc43e1cdcf0593acd43d2.tar.bz2
mitmproxy-77f05178ad23a8bb1f2cc43e1cdcf0593acd43d2.zip
mitmweb: minor fixes
Diffstat (limited to 'web')
-rw-r--r--web/src/js/backends/websocket.js7
-rw-r--r--web/src/js/ducks/flows.js6
-rw-r--r--web/src/js/ducks/utils/store.js16
-rw-r--r--web/src/js/urlState.js12
4 files changed, 34 insertions, 7 deletions
diff --git a/web/src/js/backends/websocket.js b/web/src/js/backends/websocket.js
index 40dde0d7..44b260c9 100644
--- a/web/src/js/backends/websocket.js
+++ b/web/src/js/backends/websocket.js
@@ -1,6 +1,11 @@
+/**
+ * The WebSocket backend is responsible for updating our knowledge of flows and events
+ * from the REST API and live updates delivered via a WebSocket connection.
+ * An alternative backend may use the REST API only to host static instances.
+ */
import { fetchApi } from "../utils"
-export const CMD_RESET = 'reset'
+const CMD_RESET = 'reset'
export default class WebsocketBackend {
constructor(store) {
diff --git a/web/src/js/ducks/flows.js b/web/src/js/ducks/flows.js
index 3375e4bd..d3717533 100644
--- a/web/src/js/ducks/flows.js
+++ b/web/src/js/ducks/flows.js
@@ -1,6 +1,5 @@
import { fetchApi } from "../utils"
-import reduceStore from "./utils/store"
-import * as storeActions from "./utils/store"
+import reduceStore, * as storeActions from "./utils/store"
import Filt from "../filt/filt"
import { RequestUtils } from "../flow/utils"
@@ -30,7 +29,8 @@ export default function reduce(state = defaultState, action) {
case UPDATE:
case REMOVE:
case RECEIVE:
- // FIXME: Implement select switch for remove
+ // FIXME: Update state.selected on REMOVE:
+ // The selected flow may have been removed, we need to select the next one in the view.
let storeAction = storeActions[action.cmd](
action.data,
makeFilter(state.filter),
diff --git a/web/src/js/ducks/utils/store.js b/web/src/js/ducks/utils/store.js
index 3252d697..9ea4f02e 100644
--- a/web/src/js/ducks/utils/store.js
+++ b/web/src/js/ducks/utils/store.js
@@ -13,6 +13,22 @@ const defaultState = {
viewIndex: {},
}
+/**
+ * The store reducer can be used as a mixin to another reducer that always returns a
+ * new { byId, list, listIndex, view, viewIndex } object. The reducer using the store
+ * usually has to map its action to the matching store action and then call the mixin with that.
+ *
+ * Example Usage:
+ *
+ * import reduceStore, * as storeActions from "./utils/store"
+ *
+ * case EVENTLOG_ADD:
+ * return {
+ * ...state,
+ * ...reduceStore(state, storeActions.add(action.data))
+ * }
+ *
+ */
export default function reduce(state = defaultState, action) {
let { byId, list, listIndex, view, viewIndex } = state
diff --git a/web/src/js/urlState.js b/web/src/js/urlState.js
index 77b39393..ca9187b2 100644
--- a/web/src/js/urlState.js
+++ b/web/src/js/urlState.js
@@ -1,3 +1,10 @@
+/**
+ * Instead of dealing with react-router's ever-changing APIs,
+ * we use a simple url state manager where we only
+ *
+ * - read the initial URL state on page load
+ * - push updates to the URL later on.
+ */
import { select, setFilter, setHighlight } from "./ducks/flows"
import { selectTab } from "./ducks/ui/flow"
import { toggleVisibility } from "./ducks/eventLog"
@@ -65,9 +72,8 @@ function updateUrlFromStore(store) {
if (queryStr) {
url += "?" + queryStr
}
- if (window.location.hash !== url) {
- // FIXME: replace state
- window.location.hash = url
+ if (window.location.hash.substr(1) !== url) {
+ history.replaceState(undefined, "", `/#${url}`)
}
}