Fetching on client-side when deferred

modules/components/AsyncConnect.js

@@ -63,22 +63,26 @@ export default class AsyncConnect extends Component {
     const store = this.context.store;
     const loadResult = loadAsyncConnect({ ...props, store });
 
-    // TODO: think of a better solution to a problem?
-    this.loadDataCounter++;
-    this.props.beginGlobalLoad();
-    return (loadDataCounterOriginal => loadResult.then(() => {
-      // We need to change propsToShow only if loadAsyncData that called this promise
-      // is the last invocation of loadAsyncData method. Otherwise we can face a situation
-      // when user is changing route several times and we finally show him route that has
-      // loaded props last time and not the last called route
-      if (this.loadDataCounter === loadDataCounterOriginal && this.mounted !== false) {
-        this.setState({ propsToShow: props });
-      }
-
-      // TODO: investigate race conditions
-      // do we need to call this if it's not last invocation?
-      this.props.endGlobalLoad();
-    }))(this.loadDataCounter);
+    if (loadResult) {
+      // TODO: think of a better solution to a problem?
+      this.loadDataCounter++;
+      this.props.beginGlobalLoad();
+      return (loadDataCounterOriginal => loadResult.then(() => {
+        // We need to change propsToShow only if loadAsyncData that called this promise
+        // is the last invocation of loadAsyncData method. Otherwise we can face a situation
+        // when user is changing route several times and we finally show him route that has
+        // loaded props last time and not the last called route
+        if (this.loadDataCounter === loadDataCounterOriginal && this.mounted !== false) {
+          this.setState({ propsToShow: props });
+        }
+
+        // TODO: investigate race conditions
+        // do we need to call this if it's not last invocation?
+        this.props.endGlobalLoad();
+      }))(this.loadDataCounter);
+    } else {
+      this.setState({propsToShow: props});
+    }
   }
 
   render() {

modules/helpers/utils.js

@@ -103,15 +103,15 @@ export function loadAsyncConnect({ components, filter = () => true, ...rest }) {
       return itemsResults;
     }, []);
 
-    return Promise.all(results)
+    return results.length ? Promise.all(results)
       .then(finalResults => finalResults.reduce((finalResult, result, idx) => {
         const { key } = asyncItems[idx];
         if (key) {
           finalResult[key] = result;
         }
 
         return finalResult;
-      }, {}));
+      }, {})) : null;
   });
 }