Moving from one governor page to another governor page now triggers s…

…etQueryParams. (Related issue: RickWong/react-transmit#17 )
g0v · Jun 4, 2015 · 0fbe335 · 0fbe335
1 parent ce0d5b1
commit 0fbe335
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/common/views/Governor.jsx b/common/views/Governor.jsx
@@ -104,11 +104,6 @@ Governor = Transmit.createContainer(Governor, {
   queries: {
     governors(queryParams) {
       debug("queryParams", queryParams);
-
-      if(!queryParams.name){
-        return Promise.resolve({isLoading: true});
-      }
-
       return findAll('Governor', {
         where: {
           name: queryParams.name
@@ -140,16 +135,27 @@ Governor = Transmit.createContainer(Governor, {
 
 // Setup React-transmit via props
 //
-var GovernorWrapper = React.createClass({
+var GovernorQuerySetter = React.createClass({
+  _makeQueryParams () {
+    return {
+      name: this.props.currentRoute.get('params').get('name')
+    }
+  },
+
   render() {
     return (
-      <Governor queryParams={{
-          name: this.props.currentRoute.get('params').get('name')
-        }} emptyView={<Loading />}
+      <Governor queryParams={this._makeQueryParams()} emptyView={<Loading />}
         {...this.props}
+        ref="governor"
       />
     );
+  },
+
+  componentDidUpdate(prevProps) {
+    if(prevProps.currentRoute !== this.props.currentRoute){
+      this.refs.governor.setQueryParams(this._makeQueryParams());
+    }
   }
 })
 
-module.exports = handleRoute(GovernorWrapper);
+module.exports = handleRoute(GovernorQuerySetter);
diff --git a/common/views/Promise.jsx b/common/views/Promise.jsx
@@ -186,16 +186,27 @@ PromiseDetail = Transmit.createContainer(PromiseDetail, {
 
 // Setup React-transmit via props
 //
-var PromiseDetailWrapper = React.createClass({
+var PromiseQuerySetter = React.createClass({
+  _makeQueryParams () {
+    return {
+      id: this.props.currentRoute.get('params').get('id')
+    }
+  },
+
   render () {
     return (
-      <PromiseDetail queryParams={{
-          id: this.props.currentRoute.get('params').get('id')
-        }} emptyView={<Loading />}
+      <PromiseDetail queryParams={this._makeQueryParams()}
+        emptyView={<Loading />} ref="promiseDetail"
         {...this.props}
       />
     );
+  },
+
+  componentDidUpdate(prevProps) {
+    if(prevProps.currentRoute !== this.props.currentRoute){
+      this.refs.promiseDetail.setQueryParams(this._makeQueryParams());
+    }
   }
 });
 
-module.exports = handleRoute(PromiseDetailWrapper);
+module.exports = handleRoute(PromiseQuerySetter);