Merge pull request #928 from sars/deferred-props

Revert deferred props, updating to redux-async-connect 1.x.x

Author: quicksnap

package.json

@@ -108,7 +108,7 @@
     "react-router-bootstrap": "^0.20.1",
     "react-router-redux": "^3.0.0",
     "redux": "^3.0.4",
-    "redux-async-connect": "^0.1.13",
+    "redux-async-connect": "^1.0.0-rc2",
     "redux-form": "^3.0.12",
     "scroll-behavior": "^0.3.2",
     "serialize-javascript": "^1.1.2",

src/client.js

@@ -36,7 +36,7 @@ global.socket = initSocket();
 
 const component = (
   <Router render={(props) =>
-        <ReduxAsyncConnect {...props} helpers={{client}} />
+        <ReduxAsyncConnect {...props} helpers={{client}} filter={item => !item.deferred} />
       } history={history}>
     {getRoutes(store)}
   </Router>

src/containers/App/App.js

@@ -11,7 +11,22 @@ import { isLoaded as isAuthLoaded, load as loadAuth, logout } from 'redux/module
 import { InfoBar } from 'components';
 import { routeActions } from 'react-router-redux';
 import config from '../../config';
+import { asyncConnect } from 'redux-async-connect';
 
+@asyncConnect([{
+  promise: ({store: {dispatch, getState}}) => {
+    const promises = [];
+
+    if (!isInfoLoaded(getState())) {
+      promises.push(dispatch(loadInfo()));
+    }
+    if (!isAuthLoaded(getState())) {
+      promises.push(dispatch(loadAuth()));
+    }
+
+    return Promise.all(promises);
+  }
+}])
 @connect(
   state => ({user: state.auth.user}),
   {logout, pushState: routeActions.push})
@@ -37,20 +52,6 @@ export default class App extends Component {
     }
   }
 
-  static reduxAsyncConnect(params, store) {
-    const {dispatch, getState} = store;
-    const promises = [];
-
-    if (!isInfoLoaded(getState())) {
-      promises.push(dispatch(loadInfo()));
-    }
-    if (!isAuthLoaded(getState())) {
-      promises.push(dispatch(loadAuth()));
-    }
-
-    return Promise.all(promises);
-  }
-
   handleLogout = (event) => {
     event.preventDefault();
     this.props.logout();

src/containers/Widgets/Widgets.js

@@ -5,7 +5,16 @@ import * as widgetActions from 'redux/modules/widgets';
 import {isLoaded, load as loadWidgets} from 'redux/modules/widgets';
 import {initializeWithKey} from 'redux-form';
 import { WidgetForm } from 'components';
+import { asyncConnect } from 'redux-async-connect';
 
+@asyncConnect([{
+  deferred: true,
+  promise: ({store: {dispatch, getState}}) => {
+    if (!isLoaded(getState())) {
+      return dispatch(loadWidgets());
+    }
+  }
+}])
 @connect(
   state => ({
     widgets: state.widgets.data,
@@ -25,13 +34,6 @@ export default class Widgets extends Component {
     editStart: PropTypes.func.isRequired
   };
 
-  static reduxAsyncConnect(params, store) {
-    const {dispatch, getState} = store;
-    if (!isLoaded(getState())) {
-      return dispatch(loadWidgets());
-    }
-  }
-
   render() {
     const handleEdit = (widget) => {
       const {editStart} = this.props; // eslint-disable-line no-shadow

src/server.js

@@ -88,7 +88,7 @@ app.use((req, res) => {
       res.status(500);
       hydrateOnClient();
     } else if (renderProps) {
-      loadOnServer(renderProps, store, {client}).then(() => {
+      loadOnServer({...renderProps, store, helpers: {client}}).then(() => {
         const component = (
           <Provider store={store} key="provider">
             <ReduxAsyncConnect {...renderProps} />