Merge branch 'mitmweb-eventlog'

7 files changed, 15 insertions, 19 deletions

diff --git a/web/src/js/components/ContentView/ContentViewOptions.jsx b/web/src/js/components/ContentView/ContentViewOptions.jsx
index fed3a088..6bc66db2 100644
--- a/web/src/js/components/ContentView/ContentViewOptions.jsx
+++ b/web/src/js/components/ContentView/ContentViewOptions.jsx
@@ -9,15 +9,14 @@ ContentViewOptions.propTypes = {
     message: React.PropTypes.object.isRequired,
 }
 
-function ContentViewOptions(props) {
-    const { flow, message, uploadContent, readonly, contentViewDescription } = props
+function ContentViewOptions({ flow, message, uploadContent, readonly, contentViewDescription }) {
     return (
         <div className="view-options">
             <ViewSelector message={message}/>
             &nbsp;
             <DownloadContentButton flow={flow} message={message}/>
             &nbsp;
-            <UploadContentButton uploadContent={uploadContent}/>
+            {!readonly && <UploadContentButton uploadContent={uploadContent}/> }
             &nbsp;
             <span>{contentViewDescription}</span>
         </div>
@@ -26,6 +25,7 @@ function ContentViewOptions(props) {
 
 export default connect(
     state => ({
-        contentViewDescription: state.ui.flow.viewDescription
+        contentViewDescription: state.ui.flow.viewDescription,
+        readonly: !state.ui.flow.modifiedFlow,
     })
 )(ContentViewOptions)
diff --git a/web/src/js/components/ContentView/ContentViews.jsx b/web/src/js/components/ContentView/ContentViews.jsx
index 32a07564..db239195 100644
--- a/web/src/js/components/ContentView/ContentViews.jsx
+++ b/web/src/js/components/ContentView/ContentViews.jsx
@@ -63,6 +63,7 @@ class ViewServer extends Component {
         let lines = this.props.showFullContent ? this.data.lines : this.data.lines.slice(0, maxLines)
         return (
             <div>
+                {ViewImage.matches(message) && <ViewImage {...this.props} />}
                 <pre>
                     {lines.map((line, i) =>
                         <div key={`line${i}`}>
@@ -77,9 +78,6 @@ class ViewServer extends Component {
                         </div>
                     )}
                 </pre>
-                {ViewImage.matches(message) &&
-                <ViewImage {...this.props} />
-                }
             </div>
         )
     }
diff --git a/web/src/js/components/ContentView/ViewSelector.jsx b/web/src/js/components/ContentView/ViewSelector.jsx
index ab433ea3..fcdc3ee3 100644
--- a/web/src/js/components/ContentView/ViewSelector.jsx
+++ b/web/src/js/components/ContentView/ViewSelector.jsx
@@ -14,7 +14,7 @@ ViewSelector.propTypes = {
 
 function ViewSelector ({contentViews, activeView, isEdit, setContentView}){
     let edit = ContentViews.Edit.displayName
-    let inner = <span> <b>View:</b> {activeView}<span className="caret"></span> </span>
+    let inner = <span> <b>View:</b> {activeView} <span className="caret"></span> </span>
 
     return (
         <Dropdown dropup className="pull-left" btnClass="btn btn-default btn-xs" text={inner}>
diff --git a/web/src/js/components/EventLog.jsx b/web/src/js/components/EventLog.jsx
index 636e3e9a..1a449511 100644
--- a/web/src/js/components/EventLog.jsx
+++ b/web/src/js/components/EventLog.jsx
@@ -70,7 +70,7 @@ class EventLog extends Component {
 export default connect(
     state => ({
         filters: state.eventLog.filters,
-        events: state.eventLog.view.data,
+        events: state.eventLog.view,
     }),
     {
         close: toggleVisibility,
diff --git a/web/src/js/components/Footer.jsx b/web/src/js/components/Footer.jsx
index 96e7b7db..1ae4ee73 100644
--- a/web/src/js/components/Footer.jsx
+++ b/web/src/js/components/Footer.jsx
@@ -7,7 +7,7 @@ Footer.propTypes = {
 }
 
 function Footer({ settings }) {
-    let {mode, intercept, showhost, no_upstream_cert, rawtcp, http2, anticache, anticomp, stickyauth, stickycookie, stream} = settings;
+    let {mode, intercept, showhost, no_upstream_cert, rawtcp, http2, anticache, anticomp, stickyauth, stickycookie, stream_large_bodies} = settings;
     return (
         <footer>
             {mode && mode != "regular" && (
@@ -40,8 +40,8 @@ function Footer({ settings }) {
             {stickycookie && (
                 <span className="label label-success">stickycookie: {stickycookie}</span>
             )}
-            {stream && (
-                <span className="label label-success">stream: {formatSize(stream)}</span>
+            {stream_large_bodies && (
+                <span className="label label-success">stream: {formatSize(stream_large_bodies)}</span>
             )}
         </footer>
     )
diff --git a/web/src/js/components/Header/OptionMenu.jsx b/web/src/js/components/Header/OptionMenu.jsx
index a11062f2..186a9c6a 100644
--- a/web/src/js/components/Header/OptionMenu.jsx
+++ b/web/src/js/components/Header/OptionMenu.jsx
@@ -49,11 +49,11 @@ function OptionMenu({ settings, updateSettings }) {
                     txt={settings.stickycookie}
                     onToggleChanged={txt => updateSettings({ stickycookie: !settings.stickycookie ? txt : null })}
                 />
-                <ToggleInputButton name="stream" placeholder="stream..."
-                    checked={!!settings.stream}
-                    txt={settings.stream}
+                <ToggleInputButton name="stream_large_bodies" placeholder="stream..."
+                    checked={!!settings.stream_large_bodies}
+                    txt={settings.stream_large_bodies}
                     inputType="number"
-                    onToggleChanged={txt => updateSettings({ stream: !settings.stream ? txt : null })}
+                    onToggleChanged={txt => updateSettings({ stream_large_bodies: !settings.stream_large_bodies ? txt : null })}
                 />
             </div>
             <div className="clearfix"/>
diff --git a/web/src/js/ducks/eventLog.js b/web/src/js/ducks/eventLog.js
index 776e4b08..73eaf2e8 100644
--- a/web/src/js/ducks/eventLog.js
+++ b/web/src/js/ducks/eventLog.js
@@ -49,14 +49,12 @@ export function toggleVisibility() {
     return { type: TOGGLE_VISIBILITY }
 }
 
-let logId = 1  // client-side log ids are odd
 export function add(message, level = 'web') {
     let data = {
-        id: logId,
+        id: Math.random().toString(),
         message,
         level,
     }
-    logId += 2
     return {
         type: ADD,
         cmd: "add",