From 28b08265b2f286e197ba2893d1b78e690bfe9011 Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Mon, 2 Oct 2017 18:45:25 +0300
Subject: [PATCH] If dataload has errors on server side, return empty store

---
 server/dataLoader.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/server/dataLoader.js b/server/dataLoader.js
index 6b609812..ae4ce083 100644
--- a/server/dataLoader.js
+++ b/server/dataLoader.js
@@ -18,7 +18,17 @@ exports.loadData = function(requestUrl, sdk) {
     []
   );
 
-  return Promise.all(dataLoadingCalls).then(() => {
-    return store.getState();
-  });
+  return Promise.all(dataLoadingCalls)
+    .then(() => {
+      return store.getState();
+    })
+    .catch(e => {
+      // TODO: log error to Sentry
+      console.error(e);
+
+      // Call to loadData failed, let client handle the data loading errors.
+      // (It might be recoverable error like lost connection.)
+      // Return "empty" store.
+      return store.getState();
+    });
 };