Merge pull request #1489 from mitmproxy/web_refactor

Web refactor

2 files changed, 12 insertions, 3 deletions

diff --git a/web/src/js/ducks/flows.js b/web/src/js/ducks/flows.js
index f96653a9..404db0d1 100644
--- a/web/src/js/ducks/flows.js
+++ b/web/src/js/ducks/flows.js
@@ -1,5 +1,6 @@
 import { fetchApi } from '../utils'
 import reduceList, * as listActions from './utils/list'
+import { selectRelative } from './flowView'
 
 import * as msgQueueActions from './msgQueue'
 import * as websocketActions from './websocket'
@@ -210,5 +211,14 @@ export function updateFlow(item) {
  * @private
  */
 export function removeFlow(id) {
-    return { type: REMOVE, id }
+    return (dispatch, getState) => {
+        let currentIndex = getState().flowView.indexOf[getState().flows.selected[0]]
+        let maxIndex = getState().flowView.data.length - 1
+        let deleteLastEntry = maxIndex == 0
+        if (deleteLastEntry)
+            dispatch(select())
+        else
+            dispatch(selectRelative(currentIndex == maxIndex ? -1 : 1) )
+        dispatch({ type: REMOVE, id })
+    }
 }
diff --git a/web/src/js/ducks/ui/flow.js b/web/src/js/ducks/ui/flow.js
index 0360321c..4a6d64cd 100644
--- a/web/src/js/ducks/ui/flow.js
+++ b/web/src/js/ducks/ui/flow.js
@@ -149,6 +149,5 @@ export function setContent(content){
 }
 
 export function stopEdit(flow, modifiedFlow) {
-    let diff = getDiff(flow, modifiedFlow)
-    return flowsActions.update(flow, diff)
+    return flowsActions.update(flow, getDiff(flow, modifiedFlow))
 }