2 files changed, 6 insertions, 12 deletions
diff --git a/web/src/js/components/FlowTable/FlowColumns.jsx b/web/src/js/components/FlowTable/FlowColumns.jsx
index 11c0796c..0ff80453 100644
--- a/web/src/js/components/FlowTable/FlowColumns.jsx
+++ b/web/src/js/components/FlowTable/FlowColumns.jsx
@@ -9,7 +9,6 @@ export function TLSColumn({ flow }) {
     )
 }
 
-TLSColumn.sortKeyFun = flow => flow.request.scheme
 TLSColumn.headerClass = 'col-tls'
 TLSColumn.headerName = ''
 
@@ -68,7 +67,6 @@ export function PathColumn({ flow }) {
     )
 }
 
-PathColumn.sortKeyFun = flow => RequestUtils.pretty_url(flow.request)
 PathColumn.headerClass = 'col-path'
 PathColumn.headerName = 'Path'
 
@@ -78,7 +76,6 @@ export function MethodColumn({ flow }) {
     )
 }
 
-MethodColumn.sortKeyFun = flow => flow.request.method
 MethodColumn.headerClass = 'col-method'
 MethodColumn.headerName = 'Method'
 
@@ -88,7 +85,6 @@ export function StatusColumn({ flow }) {
     )
 }
 
-StatusColumn.sortKeyFun = flow => flow.response && flow.response.status_code
 StatusColumn.headerClass = 'col-status'
 StatusColumn.headerName = 'Status'
 
@@ -98,7 +94,7 @@ export function SizeColumn({ flow }) {
     )
 }
 
-SizeColumn.sortKeyFun = flow => {
+SizeColumn.getTotalSize = flow => {
     let total = flow.request.contentLength
     if (flow.response) {
         total += flow.response.contentLength || 0
@@ -106,7 +102,6 @@ SizeColumn.sortKeyFun = flow => {
     return total
 }
 
-SizeColumn.getTotalSize = SizeColumn.sortKeyFun
 SizeColumn.headerClass = 'col-size'
 SizeColumn.headerName = 'Size'
 
@@ -122,7 +117,6 @@ export function TimeColumn({ flow }) {
     )
 }
 
-TimeColumn.sortKeyFun = flow => flow.response && flow.response.timestamp_end - flow.request.timestamp_start
 TimeColumn.headerClass = 'col-time'
 TimeColumn.headerName = 'Time'
 
diff --git a/web/src/js/components/FlowTable/FlowTableHead.jsx b/web/src/js/components/FlowTable/FlowTableHead.jsx
index 840f6a34..6deee808 100644
--- a/web/src/js/components/FlowTable/FlowTableHead.jsx
+++ b/web/src/js/components/FlowTable/FlowTableHead.jsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux'
 import classnames from 'classnames'
 import columns from './FlowColumns'
 
-import { setSort } from "../../ducks/flows"
+import { updateSorter } from '../../ducks/views/main'
 
 FlowTableHead.propTypes = {
     onSort: PropTypes.func.isRequired,
@@ -19,7 +19,7 @@ function FlowTableHead({ sortColumn, sortDesc, onSort }) {
             {columns.map(Column => (
                 <th className={classnames(Column.headerClass, sortColumn === Column.name && sortType)}
                     key={Column.name}
-                    onClick={() => onSort({ sortColumn: Column.name, sortDesc: Column.name !== sortColumn ? false : !sortDesc })}>
+                    onClick={() => onSort(Column.name, Column.name !== sortColumn ? false : !sortDesc)}>
                     {Column.headerName}
                 </th>
             ))}
@@ -29,10 +29,10 @@ function FlowTableHead({ sortColumn, sortDesc, onSort }) {
 
 export default connect(
     state => ({
-        sortDesc: state.flows.sort.sortDesc,
-        sortColumn: state.flows.sort.sortColumn,
+        sortDesc: state.flows.views.main.sorter.desc,
+        sortColumn: state.flows.views.main.sorter.column,
     }),
     {
-        onSort: setSort,
+        onSort: updateSorter,
     }
 )(FlowTableHead)