aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-06-07 11:02:46 +0200
committerClemens <cle1000.cb@gmail.com>2016-06-07 11:07:25 +0200
commitfa3ad2382bd13a76b38e1567d82636d349708371 (patch)
tree951d44e67637647c4a8e7a34c75b3e834a75156b /web/src/js/components
parent1aac283e2309339877907d2e08e79a06fbea1898 (diff)
downloadmitmproxy-fa3ad2382bd13a76b38e1567d82636d349708371.tar.gz
mitmproxy-fa3ad2382bd13a76b38e1567d82636d349708371.tar.bz2
mitmproxy-fa3ad2382bd13a76b38e1567d82636d349708371.zip
sorting done, ready to review
Diffstat (limited to 'web/src/js/components')
-rw-r--r--web/src/js/components/flowtable.js30
1 files changed, 2 insertions, 28 deletions
diff --git a/web/src/js/components/flowtable.js b/web/src/js/components/flowtable.js
index 23469827..5a0793ba 100644
--- a/web/src/js/components/flowtable.js
+++ b/web/src/js/components/flowtable.js
@@ -2,7 +2,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";
import shallowEqual from "shallowequal";
import AutoScroll from "./helpers/AutoScroll";
@@ -48,30 +47,6 @@ const FlowRowContainer = connect(
)(FlowRow)
function FlowTableHead({setSort, columns, sort}) {
-
- //const hasSort = Column.sortKeyFun;
-
- // let sortDesc = this.props.sort.sortDesc;
- //
- // if (Column === this.props.sort.sortColumn) {
- // sortDesc = !sortDesc;
- // this.props.setSort(sortColumn, sortDesc);
- // } else {
- // this.props.setSort({sortColumn: hasSort && Column, sortDesc: false});
- // }
- //
- // let sortKeyFun = Column.sortKeyFun;
- // if (sortDesc) {
- // sortKeyFun = hasSort && function () {
- // const k = Column.sortKeyFun.apply(this, arguments);
- // if (_.isString(k)) {
- // return reverseString("" + k);
- // }
- // return -k;
- // };
- // }
- //this.props.setSortKeyFun(sortKeyFun);
-
const sortColumn = sort.sortColumn;
const sortType = sort.sortDesc ? "sort-desc" : "sort-asc";
@@ -99,7 +74,7 @@ const FlowTableHeadContainer = connect(
sort: state.flows.sort
}),
dispatch => ({
- loc: (sort) => dispatch(setSort(sort)),
+ setSort: (sort) => dispatch(setSort(sort)),
})
)(FlowTableHead)
@@ -219,8 +194,7 @@ const parseFilter = _.memoize(Filt.parse)
const FlowTableContainer = connect(
state => ({
- // first idea to sort here, but i think thats not good enough ( and not working yet)...
- flows: state.flows.view.sort((a,b) => state.flows.sort.sortColumn ? a.response.status_code > b.response.status_code : 0),
+ flows: state.flows.view
})
)(FlowTable)