Merge pull request #1031 from 18F/ms-add_fetch_error_handling

Add more import fetch error handling

Author: Marco Segreto

static_src/actions/org_actions.js

@@ -6,6 +6,7 @@
 
 import AppDispatcher from '../dispatcher.js';
 import cfApi from '../util/cf_api.js';
+import errorActions from './error_actions.js';
 import { orgActionTypes } from '../constants';
 import spaceActions from './space_actions';
 
@@ -26,7 +27,14 @@ const orgActions = {
       orgGuid
     });
 
-    return cfApi.fetchOrg(orgGuid).then(orgActions.receivedOrg);
+    return cfApi.fetchOrg(orgGuid)
+      .then(orgActions.receivedOrg)
+      .catch((err) =>
+        errorActions.importantDataFetchError(
+          err,
+          'organization data may be incomplete'
+        )
+      );
   },
 
   fetchAll() {
@@ -43,7 +51,13 @@ const orgActions = {
           )
         )
       )
-      .then(orgActions.receivedOrgs);
+      .then(orgActions.receivedOrgs)
+      .catch((err) =>
+        errorActions.importantDataFetchError(
+          err,
+          'unable to fetch organizations'
+        )
+      );
   },
 
   receivedOrg(org) {

static_src/actions/service_actions.js

@@ -28,7 +28,7 @@ const serviceActions = {
       )
       .then(serviceActions.receivedServices)
       .catch((err) =>
-        errorActions.importantDataFetchError(err, 'unable to fetch services')
+        errorActions.importantDataFetchError(err, 'unable to fetch marketplace')
       );
   },
 

static_src/actions/space_actions.js

@@ -6,6 +6,7 @@
 
 import AppDispatcher from '../dispatcher.js';
 import cfApi from '../util/cf_api';
+import errorActions from './error_actions.js';
 import { spaceActionTypes } from '../constants.js';
 import SpaceStore from '../stores/space_store';
 
@@ -16,17 +17,23 @@ export default {
       spaceGuid
     });
 
-    // TODO error action should also be specified here
-    return cfApi.fetchSpace(spaceGuid).then(this.receivedSpace);
+    return cfApi.fetchSpace(spaceGuid)
+      .then(this.receivedSpace)
+      .catch((err) =>
+        errorActions.importantDataFetchError(err, 'unable to fetch space')
+      );
   },
 
   fetchAll() {
     AppDispatcher.handleViewAction({
       type: spaceActionTypes.SPACES_FETCH
     });
 
-    // TODO error action should also be specified here
-    return cfApi.fetchSpaces().then(this.receivedSpaces);
+    return cfApi.fetchSpaces()
+      .then(this.receivedSpaces)
+      .catch((err) =>
+        errorActions.importantDataFetchError(err, 'space data may be incomplete')
+      );
   },
 
   fetchAllForOrg(orgGuid) {
@@ -35,10 +42,12 @@ export default {
       orgGuid
     });
 
-    // TODO error action should also be specified here
     return Promise.all(SpaceStore.getAll()
       .filter(space => space.organization_guid === orgGuid)
       .map(space => this.fetch(space.guid))
+    )
+    .catch((err) =>
+      errorActions.importantDataFetchError(err, 'space data may be incomplete')
     );
   },
 

static_src/components/app_container.jsx

@@ -31,12 +31,16 @@ function appReady(app) {
 }
 
 function stateSetter() {
+  let route;
   const currentAppGuid = AppStore.currentAppGuid;
   const app = AppStore.get(currentAppGuid);
   const space = SpaceStore.get(SpaceStore.currentSpaceGuid);
   const org = OrgStore.get(OrgStore.currentOrgGuid);
+
+  if (app) {
   // This depends on DomainStore
-  const route = RouteStore.getRouteURLForApp(app);
+    route = RouteStore.getRouteURLForApp(app);
+  }
 
   const quotaGuid = (space && space.space_quota_definition_guid) ||
     (org && org.quota_definition_guid) || null;