From 72dcf70db20ef5d09004b1be1355612500a32592 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 23 Nov 2016 00:12:45 +0100 Subject: mitmweb: fix event display --- web/src/js/components/EventLog.jsx | 2 +- web/src/js/ducks/eventLog.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'web/src') 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/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", -- cgit v1.2.3 From dc75605e463f064fce07a1a7bf23b16f66742cbb Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 23 Nov 2016 01:26:47 +0100 Subject: minor fixes --- web/src/js/components/ContentView/ContentViewOptions.jsx | 8 ++++---- web/src/js/components/ContentView/ContentViews.jsx | 4 +--- web/src/js/components/ContentView/ViewSelector.jsx | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'web/src') 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 (
    - + {!readonly && }   {contentViewDescription}
@@ -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 (
+ {ViewImage.matches(message) && } 
                     {lines.map((line, i) =>
                         

@@ -77,9 +78,6 @@ class ViewServer extends Component {
                         

                     )}
- {ViewImage.matches(message) && - - }
) } 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 = View: {activeView} + let inner = View: {activeView} return ( -- cgit v1.2.3 From 45332006a3da246679e6043b4abee06cd3ba0636 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 23 Nov 2016 22:35:07 +0100 Subject: mitmweb: 100% app test coverage, numerous fixes --- web/src/js/components/Footer.jsx | 6 +++--- web/src/js/components/Header/OptionMenu.jsx | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'web/src') 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 (
{mode && mode != "regular" && ( @@ -40,8 +40,8 @@ function Footer({ settings }) { {stickycookie && ( stickycookie: {stickycookie} )} - {stream && ( - stream: {formatSize(stream)} + {stream_large_bodies && ( + stream: {formatSize(stream_large_bodies)} )}
) 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 })} /> - updateSettings({ stream: !settings.stream ? txt : null })} + onToggleChanged={txt => updateSettings({ stream_large_bodies: !settings.stream_large_bodies ? txt : null })} />
-- cgit v1.2.3