Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

web interleave old store and redux flow state

Browse Source
This commit is contained in:
Maximilian Hils 2016-06-04 00:58:13 -07:00
parent c0d08be7a6
commit e880f532ad
4 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mitmproxy/web/static/app.js
View File

@ -1479,6 +1479,8 @@ var _reactDom = require("react-dom");
var _reactDom2 = _interopRequireDefault(_reactDom);
var _reactRedux = require("react-redux");
var _classnames = require("classnames");
var _classnames2 = _interopRequireDefault(_classnames);
@ -1541,6 +1543,14 @@ function FlowRow(props) {
);
}
var FlowRowContainer = (0, _reactRedux.connect)(function (state, ownProps) {
return {
flow: state.flows.all.byId[ownProps.flowId]
};
}, function (dispatch) {
return {};
})(FlowRow);
var FlowTableHead = function (_React$Component) {
_inherits(FlowTableHead, _React$Component);
@ -1724,9 +1734,9 @@ var FlowTable = function (_React$Component2) {
null,
_react2.default.createElement("tr", { style: { height: vScroll.paddingTop } }),
flows.map(function (flow) {
return _react2.default.createElement(FlowRow, {
return _react2.default.createElement(FlowRowContainer, {
flowId: flow.id,
key: flow.id,
flow: flow,
columns: _flowtableColumns2.default,
selected: flow === _this4.props.selected,
highlighted: highlight && highlight[flow.id],
@ -1754,7 +1764,7 @@ FlowTable.defaultProps = {
};
exports.default = (0, _AutoScroll2.default)(FlowTable);
},{"../utils.js":33,"./flowtable-columns.js":7,"./helpers/AutoScroll":16,"./helpers/VirtualScroll":17,"classnames":"classnames","lodash":"lodash","react":"react","react-dom":"react-dom","shallowequal":"shallowequal"}],9:[function(require,module,exports){
},{"../utils.js":33,"./flowtable-columns.js":7,"./helpers/AutoScroll":16,"./helpers/VirtualScroll":17,"classnames":"classnames","lodash":"lodash","react":"react","react-dom":"react-dom","react-redux":"react-redux","shallowequal":"shallowequal"}],9:[function(require,module,exports){
"use strict";
Object.defineProperty(exports, "__esModule", {
@ -4406,9 +4416,13 @@ function Connection(url, dispatch) {
var ws = new WebSocket(url);
ws.onopen = function () {
dispatch(webSocketActions.connected());
dispatch(flowActions.fetchFlows());
dispatch(eventLogActions.fetchLogEntries());
dispatch(flowActions.fetchFlows())
// workaround to make sure that our state is already available.
.then(function () {
console.log("flows are loaded now");
_actions.ConnectionActions.open();
});
dispatch(eventLogActions.fetchLogEntries());
};
ws.onmessage = function (m) {
var message = JSON.parse(m.data);
@ -4830,7 +4844,7 @@ function makeList(actionType, fetchURL) {
dispatch(requestList());
(0, _utils.fetchApi)(fetchURL).then(function (response) {
return (0, _utils.fetchApi)(fetchURL).then(function (response) {
return response.json().then(function (json) {
dispatch(receiveList(json.data));
});

13
web/src/js/components/flowtable.js
View File

@ -1,5 +1,6 @@
import React from "react";
import ReactDOM from "react-dom";
import {connect} from 'react-redux'
import classNames from "classnames";
import {reverseString} from "../utils.js";
import _ from "lodash";
@ -36,6 +37,14 @@ function FlowRow(props) {
);
}
const FlowRowContainer = connect(
(state, ownProps) => ({
flow: state.flows.all.byId[ownProps.flowId]
}),
dispatch => ({
})
)(FlowRow);
class FlowTableHead extends React.Component {
static propTypes = {
@ -196,9 +205,9 @@ class FlowTable extends React.Component {
<tbody>
<tr style={{ height: vScroll.paddingTop }}></tr>
{flows.map(flow => (
<FlowRow
<FlowRowContainer
flowId={flow.id}
key={flow.id}
flow={flow}
columns={flowtable_columns}
selected={flow === this.props.selected}
highlighted={highlight && highlight[flow.id]}

6
web/src/js/connection.js
View File

@ -13,8 +13,12 @@ export default function Connection(url, dispatch) {
ws.onopen = function () {
dispatch(webSocketActions.connected())
dispatch(flowActions.fetchFlows())
dispatch(eventLogActions.fetchLogEntries())
// workaround to make sure that our state is already available.
.then(() => {
console.log("flows are loaded now")
ConnectionActions.open()
})
dispatch(eventLogActions.fetchLogEntries())
};
ws.onmessage = function (m) {
var message = JSON.parse(m.data);

2
web/src/js/ducks/utils/list.js
View File

@ -152,7 +152,7 @@ export default function makeList(actionType, fetchURL) {
dispatch(requestList())
fetchApi(fetchURL).then(response => {
return fetchApi(fetchURL).then(response => {
return response.json().then(json => {
dispatch(receiveList(json.data))
})