Merge pull request #1187 from 18F/js-fix-refresh-cases

you need to get the spaces first on the org page
cloud-gov · Aug 9, 2017 · c137686 · c137686
2 parents 30bb761 + 8e7ebe9
commit c137686
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/static_src/routes.js b/static_src/routes.js
@@ -62,14 +62,16 @@ export function org(orgGuid, next) {
   spaceActions.changeCurrentSpace();
   appActions.changeCurrentApp();
 
-  orgActions.toggleSpaceMenu(orgGuid);
-  orgActions.fetch(orgGuid);
-  cfApi.fetchSpaces().then(() => spaceActions.fetchAllForOrg(orgGuid));
-  userActions.changeCurrentlyViewedType('org_users');
-  userActions.fetchOrgUsers(orgGuid);
-  userActions.fetchOrgUserRoles(orgGuid);
-  routerActions.navigate(OrgContainer);
-  next();
+  spaceActions.fetchAll().then(() => {
+    orgActions.toggleSpaceMenu(orgGuid);
+    orgActions.fetch(orgGuid);
+    spaceActions.fetchAllForOrg(orgGuid);
+    userActions.changeCurrentlyViewedType('org_users');
+    userActions.fetchOrgUsers(orgGuid);
+    userActions.fetchOrgUserRoles(orgGuid);
+    routerActions.navigate(OrgContainer);
+    next();
+  });
 }
 
 export function space(orgGuid, spaceGuid, next) {