Merge pull request #3790 from cloudfoundry-incubator/remove-dupe-reducer

Remove duplicate current-user reducer

Author: Nathan

src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-role-session.reducer.ts

@@ -1,19 +1,11 @@
-import { ChangeUserRole } from '../../../../cloud-foundry/src/actions/users.actions';
-import {
-  defaultUserOrgRoleState,
-} from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-org.reducer';
-import {
-  defaultUserSpaceRoleState,
-} from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-space.reducer';
-import {
-  ICfRolesState,
-  IOrgRoleState,
-  ISpaceRoleState,
-} from '../../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
-import { PermissionStrings } from '../../../../core/src/core/current-user-permissions.config';
-import { ICurrentUserRolesState } from '../../types/current-user-roles.types';
-import { APISuccessOrFailedAction } from '../../types/request.types';
-import { OrgUserRoleNames, SpaceUserRoleNames } from '../../../../cloud-foundry/src/store/types/user.types';
+import { PermissionStrings } from '../../../../../core/src/core/current-user-permissions.config';
+import { ICurrentUserRolesState } from '../../../../../store/src/types/current-user-roles.types';
+import { APISuccessOrFailedAction } from '../../../../../store/src/types/request.types';
+import { ChangeUserRole } from '../../../actions/users.actions';
+import { ICfRolesState, IOrgRoleState, ISpaceRoleState } from '../../types/cf-current-user-roles.types';
+import { OrgUserRoleNames, SpaceUserRoleNames } from '../../types/user.types';
+import { defaultUserOrgRoleState } from './current-user-roles-org.reducer';
+import { defaultUserSpaceRoleState } from './current-user-roles-space.reducer';
 
 export function updateAfterRoleChange(
   state: ICurrentUserRolesState,

src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles-changed.reducers.ts src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-changed.reducers.ts

@@ -1,6 +1,9 @@
+import {
+  addNewRoles,
+  removeOldRoles,
+} from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers';
 import { GetCurrentUserRelationsComplete } from '../../../actions/permissions.actions';
 import { IOrgsRoleState } from '../../types/cf-current-user-roles.types';
-import { addNewRoles, removeOldRoles } from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers';
 import { currentUserOrgRoleReducer } from './current-user-roles-org.reducer';
 
 export function currentUserOrgRolesReducer(state: IOrgsRoleState = {}, action: GetCurrentUserRelationsComplete) {

src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-orgs.reducer.ts

@@ -1,7 +1,7 @@
-import { UserRelationTypes } from '../../../actions/permissions.actions';
+import { ISpace } from '../../../../../core/src/core/cf-api.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { UserRelationTypes } from '../../../actions/permissions.actions';
 import { ISpaceRoleState } from '../../types/cf-current-user-roles.types';
-import { ISpace } from '../../../../../core/src/core/cf-api.types';
 
 export const defaultUserSpaceRoleState: ISpaceRoleState = {
   orgId: null,

src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-space.reducer.ts

@@ -1,6 +1,9 @@
+import {
+  addNewRoles,
+  removeOldRoles,
+} from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers';
 import { GetCurrentUserRelationsComplete } from '../../../actions/permissions.actions';
 import { ISpacesRoleState } from '../../types/cf-current-user-roles.types';
-import { addNewRoles, removeOldRoles } from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers';
 import { currentUserSpaceRoleReducer } from './current-user-roles-space.reducer';
 
 export function currentUserSpaceRolesReducer(state: ISpacesRoleState = {}, action: GetCurrentUserRelationsComplete) {

src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-spaces.reducer.ts

@@ -17,6 +17,9 @@ import { ADD_ROLE_SUCCESS, REMOVE_ROLE_SUCCESS } from '../../../../cloud-foundry
 import {
   currentUserBaseCFRolesReducer,
 } from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-base-cf-role.reducer';
+import {
+  updateAfterRoleChange,
+} from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-changed.reducers';
 import { SESSION_VERIFIED, VerifiedSession } from '../../actions/auth.actions';
 import {
   CONNECT_ENDPOINTS_SUCCESS,
@@ -32,7 +35,6 @@ import {
   currentUserRolesRequestStateReducer,
 } from './current-user-request-state.reducers';
 import { roleInfoFromSessionReducer, updateNewlyConnectedEndpoint } from './current-user-role-session.reducer';
-import { updateAfterRoleChange } from './current-user-roles-changed.reducers';
 import { addEndpoint, removeEndpointRoles, removeOrgRoles, removeSpaceRoles } from './current-user-roles-clear.reducers';
 
 const getDefaultState = () => ({