minor fixes

2 files changed, 15 insertions, 42 deletions

diff --git a/web/src/js/components/FlowView/Messages.jsx b/web/src/js/components/FlowView/Messages.jsx
index f866776f..9295f97c 100644
--- a/web/src/js/components/FlowView/Messages.jsx
+++ b/web/src/js/components/FlowView/Messages.jsx
@@ -10,21 +10,21 @@ import Headers from './Headers'
 class RequestLine extends Component {
 
     render() {
-        const { flow, onUpdate } = this.props
+        const { flow, updateFlow } = this.props
 
         return (
             <div className="first-line request-line">
                 <ValueEditor
                     ref="method"
                     content={flow.request.method}
-                    onDone={method => onUpdate({ request: { method } })}
+                    onDone={method => updateFlow({ request: { method } })}
                     inline
                 />
                 &nbsp;
                 <ValueEditor
                     ref="url"
                     content={RequestUtils.pretty_url(flow.request)}
-                    onDone={url => onUpdate({ request: Object.assign({ path: '' }, parseUrl(url)) })}
+                    onDone={url => updateFlow({ request: Object.assign({ path: '' }, parseUrl(url)) })}
                     isValid={url => !!parseUrl(url).host}
                     inline
                 />
@@ -32,7 +32,7 @@ class RequestLine extends Component {
                 <ValueEditor
                     ref="httpVersion"
                     content={flow.request.http_version}
-                    onDone={ver => onUpdate({ request: { http_version: parseHttpVersion(ver) } })}
+                    onDone={ver => updateFlow({ request: { http_version: parseHttpVersion(ver) } })}
                     isValid={isValidHttpVersion}
                     inline
                 />
@@ -44,14 +44,14 @@ class RequestLine extends Component {
 class ResponseLine extends Component {
 
     render() {
-        const { flow, onUpdate } = this.props
+        const { flow, updateFlow } = this.props
 
         return (
             <div className="first-line response-line">
                 <ValueEditor
                     ref="httpVersion"
                     content={flow.response.http_version}
-                    onDone={nextVer => onUpdate({ response: { http_version: parseHttpVersion(nextVer) } })}
+                    onDone={nextVer => updateFlow({ response: { http_version: parseHttpVersion(nextVer) } })}
                     isValid={isValidHttpVersion}
                     inline
                 />
@@ -59,7 +59,7 @@ class ResponseLine extends Component {
                 <ValueEditor
                     ref="code"
                     content={flow.response.status_code + ''}
-                    onDone={code => onUpdate({ response: { code: parseInt(code) } })}
+                    onDone={code => updateFlow({ response: { code: parseInt(code) } })}
                     isValid={code => /^\d+$/.test(code)}
                     inline
                 />
@@ -67,7 +67,7 @@ class ResponseLine extends Component {
                 <ValueEditor
                     ref="msg"
                     content={flow.response.reason}
-                    onDone={msg => onUpdate({ response: { msg } })}
+                    onDone={msg => updateFlow({ response: { msg } })}
                     inline
                 />
             </div>
@@ -78,15 +78,15 @@ class ResponseLine extends Component {
 export class Request extends Component {
 
     render() {
-        const { flow, onUpdate } = this.props
+        const { flow, updateFlow } = this.props
 
         return (
             <section className="request">
-                <RequestLine ref="requestLine" flow={flow} onUpdate={onUpdate} />
+                <RequestLine ref="requestLine" flow={flow} updateFlow={updateFlow} />
                 <Headers
                     ref="headers"
                     message={flow.request}
-                    onChange={headers => onUpdate({ request: { headers } })}
+                    onChange={headers => updateFlow({ request: { headers } })}
                 />
                 <hr/>
                 <ContentView flow={flow} message={flow.request}/>
@@ -117,15 +117,15 @@ export class Request extends Component {
 export class Response extends Component {
 
     render() {
-        const { flow, onUpdate } = this.props
+        const { flow, updateFlow } = this.props
 
         return (
             <section className="response">
-                <ResponseLine ref="responseLine" flow={flow} onUpdate={onUpdate} />
+                <ResponseLine ref="responseLine" flow={flow} updateFlow={updateFlow} />
                 <Headers
                     ref="headers"
                     message={flow.response}
-                    onChange={headers => onUpdate({ response: { headers } })}
+                    onChange={headers => updateFlow({ response: { headers } })}
                 />
                 <hr/>
                 <ContentView flow={flow} message={flow.response}/>
diff --git a/web/src/js/components/FlowView/Nav.jsx b/web/src/js/components/FlowView/Nav.jsx
index b9e15d92..37c073ce 100644
--- a/web/src/js/components/FlowView/Nav.jsx
+++ b/web/src/js/components/FlowView/Nav.jsx
@@ -1,7 +1,6 @@
 import React, { PropTypes } from 'react'
 import { connect } from 'react-redux'
 import classnames from 'classnames'
-import * as flowsActions from '../../ducks/flows'
 
 NavAction.propTypes = {
     icon: PropTypes.string.isRequired,
@@ -24,18 +23,12 @@ function NavAction({ icon, title, onClick }) {
 }
 
 Nav.propTypes = {
-    flow: PropTypes.object.isRequired,
     active: PropTypes.string.isRequired,
     tabs: PropTypes.array.isRequired,
     onSelectTab: PropTypes.func.isRequired,
-    onRemove: PropTypes.func.isRequired,
-    onDuplicate: PropTypes.func.isRequired,
-    onReplay: PropTypes.func.isRequired,
-    onAccept: PropTypes.func.isRequired,
-    onRevert: PropTypes.func.isRequired,
 }
 
-function Nav({ flow, active, tabs, onSelectTab, onRemove, onDuplicate, onReplay, onAccept, onRevert }) {
+export default function Nav({ active, tabs, onSelectTab }) {
     return (
         <nav className="nav-tabs nav-tabs-sm">
             {tabs.map(tab => (
@@ -49,26 +42,6 @@ function Nav({ flow, active, tabs, onSelectTab, onRemove, onDuplicate, onReplay,
                     {_.capitalize(tab)}
                 </a>
             ))}
-            <NavAction title="[d]elete flow" icon="fa-trash" onClick={() => onRemove(flow)} />
-            <NavAction title="[D]uplicate flow" icon="fa-copy" onClick={() => onDuplicate(flow)} />
-            <NavAction disabled title="[r]eplay flow" icon="fa-repeat" onClick={() => onReplay(flow)} />
-            {flow.intercepted && (
-                <NavAction title="[a]ccept intercepted flow" icon="fa-play" onClick={() => onAccept(flow)} />
-            )}
-            {flow.modified && (
-                <NavAction title="revert changes to flow [V]" icon="fa-history" onClick={() => onRevert(flow)} />
-            )}
         </nav>
     )
 }
-
-export default connect(
-    null,
-    {
-        onRemove: flowsActions.remove,
-        onDuplicate: flowsActions.duplicate,
-        onReplay: flowsActions.replay,
-        onAccept: flowsActions.accept,
-        onRevert: flowsActions.revert,
-    }
-)(Nav)