cloudfoundry · KlapTrap · Jul 6, 2018 · Jul 4, 2018 · Jul 6, 2018 · Jul 6, 2018
diff --git a/src/frontend/app/shared/data-services/cf-user.service.ts b/src/frontend/app/shared/data-services/cf-user.service.ts
@@ -42,7 +42,7 @@ import { ActiveRouteCfOrgSpace } from './../../features/cloud-foundry/cf-page.ty
 export class CfUserService {
   private allUsers$: Observable<PaginationObservables<APIResource<CfUser>>>;
 
-  public static createPaginationAction(endpointGuid: string, isAdmin: boolean): PaginatedAction {
+  public static createPaginationAction(endpointGuid: string, isAdmin: boolean): GetAllUsersAsAdmin | GetAllUsersAsNonAdmin {
     return isAdmin ? new GetAllUsersAsAdmin(endpointGuid) : new GetAllUsersAsNonAdmin(endpointGuid);
   }
 
@@ -113,10 +113,10 @@ export class CfUserService {
       this.parseOrgRole(user, orgGuids, [org], res);
     } else {
       // Discover user's roles for each org via each of the 4 org role types
-      this.parseOrgRole(user, orgGuids, user.organizations, res);
-      this.parseOrgRole(user, orgGuids, user.audited_organizations, res);
-      this.parseOrgRole(user, orgGuids, user.billing_managed_organizations, res);
-      this.parseOrgRole(user, orgGuids, user.managed_organizations, res);
+      this.parseOrgRole(user, orgGuids, user.organizations || [], res);
+      this.parseOrgRole(user, orgGuids, user.audited_organizations || [], res);
+      this.parseOrgRole(user, orgGuids, user.billing_managed_organizations || [], res);
+      this.parseOrgRole(user, orgGuids, user.managed_organizations || [], res);
     }
     return res;
   }
@@ -152,9 +152,9 @@ export class CfUserService {
       this.parseSpaceRole(user, spaceGuids, spaces, res);
     } else {
       // User might have unique spaces in any of the space role collections, so loop through each
-      this.parseSpaceRole(user, spaceGuids, user.spaces, res);
-      this.parseSpaceRole(user, spaceGuids, user.audited_spaces, res);
-      this.parseSpaceRole(user, spaceGuids, user.managed_spaces, res);
+      this.parseSpaceRole(user, spaceGuids, user.spaces || [], res);
+      this.parseSpaceRole(user, spaceGuids, user.audited_spaces || [], res);
+      this.parseSpaceRole(user, spaceGuids, user.managed_spaces || [], res);
     }
     return res;
   }

diff --git a/src/frontend/app/store/actions/organization.actions.ts b/src/frontend/app/store/actions/organization.actions.ts
@@ -191,4 +191,5 @@ export class GetAllOrgUsers extends CFStartAction implements PaginatedAction, En
     'order-direction-field': 'username',
   };
   flattenPagination = true;
+  skipValidation = false;
 }
diff --git a/src/frontend/app/store/actions/space.actions.ts b/src/frontend/app/store/actions/space.actions.ts
@@ -221,13 +221,13 @@ export class GetAllSpaceUsers extends GetAllOrgUsers {
     this.options.url = `spaces/${guid}/user_roles`;
   }
   actions = getActions('Spaces', 'List all user roles');
-  initialParams = {
-    page: 1,
-    'results-per-page': 100,
-    'order-direction': 'desc',
-    'order-direction-field': 'username',
-  };
-  flattenPagination = true;
+  // initialParams = {
+  //   page: 1,
+  //   'results-per-page': 100,
+  //   'order-direction': 'desc',
+  //   'order-direction-field': 'username',
+  // };
+  // flattenPagination = true;
 }
 
 

diff --git a/src/frontend/app/store/actions/users.actions.ts b/src/frontend/app/store/actions/users.actions.ts
@@ -53,10 +53,11 @@ const createGetAllUsersInitialParams = () => ({
   'order-direction-field': 'username',
 });
 
-export class GetAllUsersAsNonAdmin implements PaginatedAction {
+export class GetAllUsersAsNonAdmin implements PaginatedAction, EntityInlineParentAction {
   type = GET_CF_USERS_BY_ORG;
   paginationKey: string;
   actions: string[] = [];
+  entity = [entityFactory(cfUserSchemaKey)];
   entityKey = cfUserSchemaKey;
   constructor(
     public cfGuid: string,

diff --git a/src/frontend/app/store/effects/request.effects.ts b/src/frontend/app/store/effects/request.effects.ts
@@ -81,7 +81,10 @@ export class RequestEffect {
         withLatestFrom(this.store.select(getPaginationState)),
         first(),
         map(([allEntities, allPagination]) => {
-          return validateEntityRelations({
+          return apiAction.skipValidation ? {
+            started: false,
+            completed: Promise.resolve([])
+          } : validateEntityRelations({
             cfGuid: validateAction.action.endpointGuid,
             store: this.store,
             allEntities,

diff --git a/src/frontend/app/store/effects/users.effects.ts b/src/frontend/app/store/effects/users.effects.ts
@@ -93,6 +93,9 @@ export class UsersEffects {
         action.includeRelations,
         action.populateMissing
       );
+      // We're not interested if each set of users associated with an org is valid. Leave that up to whoever dispatched the action
+      // to validate.
+      getUsersAction.skipValidation = true;
       // Create a way to monitor fetch users success
       const monitor = createPaginationCompleteWatcher(this.store, getUsersAction);
       this.store.dispatch(getUsersAction);

diff --git a/src/frontend/app/store/types/pagination.types.ts b/src/frontend/app/store/types/pagination.types.ts
@@ -63,6 +63,7 @@ export interface PaginatedAction extends PaginationAction, IRequestAction {
     },
     method?: RequestMethod | string | null
   };
+  skipValidation?: boolean;
 }
 
 export interface PaginationEntityTypeState {

diff --git a/src/frontend/app/store/types/request.types.ts b/src/frontend/app/store/types/request.types.ts
@@ -101,6 +101,7 @@ export class UpdateCfAction extends RequestUpdateAction implements IUpdateReques
 export interface ICFAction extends IRequestAction {
   options: RequestOptions;
   actions: string[];
+  skipValidation?: boolean;
 }
 
 export class APISuccessOrFailedAction<T = any> implements Action {
-Original file line number
+Diff line change
@@ Expand Up @@
         },
         method?: RequestMethod | string | null
       };
+      skipValidation?: boolean;
     }
     export interface PaginationEntityTypeState {
@@ Expand Down @@