From ac2d8549e5cf6efaac78de8acc0c4967e63adcf9 Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Mon, 6 Jun 2016 23:27:04 +0200
Subject: moved sort state to redux, missing apply sort

---
 web/src/js/components/mainview.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'web/src/js/components/mainview.js')

diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js
index 22895991..99cdeb3c 100644
--- a/web/src/js/components/mainview.js
+++ b/web/src/js/components/mainview.js
@@ -7,7 +7,7 @@ import {Splitter} from "./common.js"
 import FlowTable from "./flowtable.js";
 import FlowView from "./flowview/index.js";
 import {connect} from 'react-redux'
-import {selectFlow, setFilter, setHighlight} from "../ducks/flows";
+import {selectFlow, setFilter, setHighlight, setSort} from "../ducks/flows";
 
 
 var MainView = React.createClass({
@@ -161,7 +161,8 @@ var MainView = React.createClass({
             <div className="main-view">
                 <FlowTable ref="flowTable"
                     selectFlow={this.selectFlow}
-                    setSortKeyFun={this.setSortKeyFun}
+                    setSortKeyFun={(f) => console.log("asdf")}
+                    setSort={this.props.setSort}
                     selected={this.props.selectedFlow} />
                 {details}
             </div>
@@ -173,12 +174,14 @@ const MainViewContainer = connect(
     state => ({
         flows: state.flows.view,
         filter: state.flows.filter,
+        sort: state.flows.sort,
         highlight: state.flows.highlight,
         selectedFlow: state.flows.all.byId[state.flows.selected[0]]
     }),
     dispatch => ({
         selectFlow: flowId => dispatch(selectFlow(flowId)),
         setFilter: filter => dispatch(setFilter(filter)),
+        setSort: (sort) => dispatch(setSort(sort)),
         setHighlight: highlight => dispatch(setHighlight(highlight))
     }),
     undefined,
-- 
cgit v1.2.3


From ff2129773fba4cbcaca93f2c604a2fa72955868f Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Tue, 7 Jun 2016 00:17:09 +0200
Subject: start with sort, continue tomorrow

---
 web/src/js/components/mainview.js | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'web/src/js/components/mainview.js')

diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js
index 99cdeb3c..5237bddb 100644
--- a/web/src/js/components/mainview.js
+++ b/web/src/js/components/mainview.js
@@ -23,9 +23,6 @@ var MainView = React.createClass({
             this.props.setHighlight(nextProps.location.query[Query.HIGHLIGHT], false)
         }
     },
-    setSortKeyFun: function (sortKeyFun) {
-        // FIXME: Move to redux. This requires that sortKeyFun is not a function anymore.
-    },
     selectFlow: function (flow) {
         // TODO: This belongs into redux
         if (flow) {
@@ -161,7 +158,6 @@ var MainView = React.createClass({
             <div className="main-view">
                 <FlowTable ref="flowTable"
                     selectFlow={this.selectFlow}
-                    setSortKeyFun={(f) => console.log("asdf")}
                     setSort={this.props.setSort}
                     selected={this.props.selectedFlow} />
                 {details}
-- 
cgit v1.2.3


From 1aac283e2309339877907d2e08e79a06fbea1898 Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Tue, 7 Jun 2016 00:40:36 +0200
Subject: moved redux state injection closer to child

---
 web/src/js/components/mainview.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'web/src/js/components/mainview.js')

diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js
index 5237bddb..dae2856e 100644
--- a/web/src/js/components/mainview.js
+++ b/web/src/js/components/mainview.js
@@ -7,7 +7,7 @@ import {Splitter} from "./common.js"
 import FlowTable from "./flowtable.js";
 import FlowView from "./flowview/index.js";
 import {connect} from 'react-redux'
-import {selectFlow, setFilter, setHighlight, setSort} from "../ducks/flows";
+import {selectFlow, setFilter, setHighlight} from "../ducks/flows";
 
 
 var MainView = React.createClass({
@@ -158,7 +158,6 @@ var MainView = React.createClass({
             <div className="main-view">
                 <FlowTable ref="flowTable"
                     selectFlow={this.selectFlow}
-                    setSort={this.props.setSort}
                     selected={this.props.selectedFlow} />
                 {details}
             </div>
@@ -177,7 +176,6 @@ const MainViewContainer = connect(
     dispatch => ({
         selectFlow: flowId => dispatch(selectFlow(flowId)),
         setFilter: filter => dispatch(setFilter(filter)),
-        setSort: (sort) => dispatch(setSort(sort)),
         setHighlight: highlight => dispatch(setHighlight(highlight))
     }),
     undefined,
-- 
cgit v1.2.3


From ad84d650ded555213452e4a69c1dbea1bc771b3a Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Wed, 8 Jun 2016 10:29:33 +0200
Subject: sorting add pr review changes

---
 web/src/js/components/mainview.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'web/src/js/components/mainview.js')

diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js
index dae2856e..5915c9fc 100644
--- a/web/src/js/components/mainview.js
+++ b/web/src/js/components/mainview.js
@@ -169,7 +169,6 @@ const MainViewContainer = connect(
     state => ({
         flows: state.flows.view,
         filter: state.flows.filter,
-        sort: state.flows.sort,
         highlight: state.flows.highlight,
         selectedFlow: state.flows.all.byId[state.flows.selected[0]]
     }),
-- 
cgit v1.2.3