Add error message when Space user exists on Org user removal.

static_src/actions/user_actions.js

@@ -60,6 +60,35 @@ const userActions = {
     });
   },
 
+  receivedOrgSpacesToExtractSpaceUsers(orgSpaces) {
+    const orgSpaceUsers = orgSpaces.map((orgSpace) => Promise.resolve(
+      cfApi.fetchSpaceUserRoles(orgSpace.guid)
+    ));
+    return Promise.all(orgSpaceUsers);
+  },
+
+  fetchUserAssociationsToOrgSpaces(userGuid, orgGuid) {
+    return Promise.resolve(cfApi.fetchAllOrgSpaces(orgGuid))
+      .then((orgSpaces) => userActions.receivedOrgSpacesToExtractSpaceUsers(orgSpaces));
+  },
+
+  deleteUserIfNoSpaceAssociation(userGuid, orgGuid) {
+    let usersSpaces;
+    userActions.fetchUserAssociationsToOrgSpaces(userGuid, orgGuid)
+      .then((spaceUsers) => {
+        usersSpaces = spaceUsers.filter(spaceUser => spaceUser.guid === userGuid);
+        if (usersSpaces.length > 0) {
+          const description = 'This user can\'t be removed because they still have a space ' +
+                          'role within the organization. Please remove all space ' +
+                          'associations before removing this user from the organization. ' +
+                          'To review how, click the "Managing Teammates" link below.';
+          userActions.createUserSpaceAssociationNotification(description);
+        } else {
+          userActions.deleteUser(userGuid, orgGuid);
+        }
+      });
+  },
+
   deleteUser(userGuid, orgGuid) {
     AppDispatcher.handleViewAction({
       type: userActionTypes.USER_DELETE,
@@ -198,12 +227,24 @@ const userActions = {
         inviting ${email}`));
   },
 
-  clearInviteNotifications() {
+  clearUserListNotifications() {
+    AppDispatcher.handleViewAction({
+      type: userActionTypes.USER_LIST_NOTICE_DISMISSED
+    });
+  },
+
+  createUserListNotification(noticeType, description) {
     AppDispatcher.handleViewAction({
-      type: userActionTypes.USER_INVITE_STATUS_DISMISSED
+      type: userActionTypes.USER_LIST_NOTICE_CREATED,
+      noticeType,
+      description
     });
   },
 
+  createUserSpaceAssociationNotification(notification) {
+    userActions.createUserListNotification('error', notification);
+  },
+
   createInviteNotification(verified, email) {
     let description;
     const noticeType = 'finish';
@@ -223,14 +264,10 @@ const userActions = {
       'be controlled below.';
     }
 
-    AppDispatcher.handleViewAction({
-      type: userActionTypes.USER_INVITE_STATUS_DISPLAYED,
-      noticeType,
-      description
-    });
+    userActions.createUserListNotification(noticeType, description);
   },
 
-  userInviteError(err, contextualMessage) {
+  userListNoticeError(err, contextualMessage) {
     AppDispatcher.handleServerAction({
       type: userActionTypes.USER_INVITE_ERROR,
       err,

static_src/components/users.jsx

@@ -55,8 +55,8 @@ function stateSetter() {
     loading: UserStore.loading,
     empty: !UserStore.loading && !users.length,
     users,
-    inviteNotices: UserStore._inviteNotification,
-    userInviteError: UserStore.getInviteError()
+    userListNotices: UserStore._userListNotification,
+    userListNoticeError: UserStore.getUserListNotificationError()
   };
 }
 
@@ -82,7 +82,7 @@ export default class Users extends React.Component {
 
   onNotificationDismiss(ev) {
     ev.preventDefault();
-    userActions.clearInviteNotifications();
+    userActions.clearUserListNotifications();
   }
 
   handleAddPermissions(roleKey, apiKey, userGuid) {
@@ -143,14 +143,14 @@ export default class Users extends React.Component {
     let notification;
     let userInvite;
 
-    if (this.state.inviteNotices.description) {
-      const notice = this.state.inviteNotices;
+    if (this.state.userListNotices.description) {
+      const notice = this.state.userListNotices;
       notification = (
         <Notification
           message={ notice.description }
           actions={ [] }
           onDismiss={ this.onNotificationDismiss }
-          status="finish"
+          status={ notice.noticeType }
         />
       );
     } else {
@@ -164,7 +164,7 @@ export default class Users extends React.Component {
           <UsersInvite
             inviteDisabled={ this.state.inviteDisabled }
             currentUserAccess={ this.state.currentUserAccess }
-            error={ this.state.userInviteError }
+            error={ this.state.userListNoticeError }
           />
         </div>
       );

static_src/constants.js

@@ -258,6 +258,8 @@ const userActionTypes = keymirror({
   USER_INVITE_TRIGGER: null,
   // Action to trigger when invite status is triggered for front end.
   USER_INVITE_STATUS_UPDATED: null,
+  // Action to trigger when user list notice is created.
+  USER_LIST_NOTICE_CREATED: null,
   // Action to trigger email sent to user with cloud.gov invite url.
   USER_ORG_ASSOCIATE: null,
   // Action to associate user to organization on the server.
@@ -266,10 +268,8 @@ const userActionTypes = keymirror({
   USER_ASSOCIATED_ORG_DISPLAYED: null,
   // Action when something goes wrong in user invite and email process.
   USER_INVITE_ERROR: null,
-  // Action to display an invite notification
-  USER_INVITE_STATUS_DISPLAYED: null,
-  // Action to dismiss an invite notification
-  USER_INVITE_STATUS_DISMISSED: null,
+  // Action to dismiss an user list notification.
+  USER_LIST_NOTICE_DISMISSED: null,
   // Action to delete a user from an org.
   USER_DELETE: null,
   // Action when a user was deleted from an org on the server.

static_src/stores/user_store.js

@@ -21,7 +21,7 @@ export class UserStore extends BaseStore {
     this._error = null;
     this._saving = false;
     this._inviteDisabled = false;
-    this._inviteNotification = {};
+    this._userListNotification = {};
     this._loading = {};
   }
 
@@ -64,7 +64,7 @@ export class UserStore extends BaseStore {
 
       case userActionTypes.USER_INVITE_TRIGGER: {
         this._inviteDisabled = true;
-        this._inviteError = null;
+        this._userListNotificationError = null;
         this.emitChange();
         break;
       }
@@ -153,14 +153,7 @@ export class UserStore extends BaseStore {
       }
 
       case userActionTypes.USER_DELETE: {
-        const orgPermissionsReq = cfApi.deleteOrgUserPermissions(
-          action.userGuid,
-          action.orgGuid,
-          'users');
-
-        orgPermissionsReq.then(() => {
-          cfApi.deleteUser(action.userGuid, action.orgGuid);
-        });
+        cfApi.deleteUser(action.userGuid, action.orgGuid);
 
         break;
       }
@@ -179,7 +172,7 @@ export class UserStore extends BaseStore {
       }
 
       case userActionTypes.USER_INVITE_ERROR: {
-        this._inviteError = Object.assign({}, action.err, {
+        this._userListNotificationError = Object.assign({}, action.err, {
           contextualMessage: action.contextualMessage
         });
         this._inviteDisabled = false;
@@ -197,18 +190,18 @@ export class UserStore extends BaseStore {
         break;
       }
 
-      case userActionTypes.USER_INVITE_STATUS_DISPLAYED: {
+      case userActionTypes.USER_LIST_NOTICE_CREATED: {
         this._inviteDisabled = false;
         const noticeType = action.noticeType;
         const description = action.description;
         const notice = Object.assign({}, { noticeType }, { description });
-        this._inviteNotification = notice;
+        this._userListNotification = notice;
         this.emitChange();
         break;
       }
 
-      case userActionTypes.USER_INVITE_STATUS_DISMISSED: {
-        this._inviteNotification = {};
+      case userActionTypes.USER_LIST_NOTICE_DISMISSED: {
+        this._userListNotification = {};
         this.emitChange();
         break;
       }
@@ -285,8 +278,8 @@ export class UserStore extends BaseStore {
       case errorActionTypes.CLEAR: {
         this._error = null;
         this._saving = false;
-        this._inviteNotification = {};
-        this._inviteError = null;
+        this._userListNotification = {};
+        this._userListNotificationError = null;
         this._loading = {};
         this.emitChange();
         break;
@@ -367,12 +360,12 @@ export class UserStore extends BaseStore {
     return this._currentUserIsAdmin;
   }
 
-  getInviteNotification() {
-    return this._inviteNotification;
+  getUserListNotification() {
+    return this._userListNotification;
   }
 
-  getInviteError() {
-    return this._inviteError;
+  getUserListNotificationError() {
+    return this._userListNotificationError;
   }
 
   get isSaving() {

static_src/test/unit/actions/user_actions.spec.js

@@ -129,12 +129,12 @@ describe('userActions', function() {
             orgGuid: expectedOrgGuid
           };
 
-      let spy = setupViewSpy(sandbox)
+      let spy = setupViewSpy(sandbox);
 
       userActions.deleteUser(expectedUserGuid, expectedOrgGuid);
 
       assertAction(spy, userActionTypes.USER_DELETE, expectedParams);
-    })
+    });
   });
 
   describe('deletedUser()', function() {
@@ -207,13 +207,13 @@ describe('userActions', function() {
     });
   });
 
-  describe('clearInviteNotifications()', function() {
+  describe('clearUserListNotifications()', function() {
     it('should dispatch a view event of type clear invite notification', function() {
       let spy = setupViewSpy(sandbox);
 
-      userActions.clearInviteNotifications();
+      userActions.clearUserListNotifications();
 
-      assertAction(spy, userActionTypes.USER_INVITE_STATUS_DISMISSED);
+      assertAction(spy, userActionTypes.USER_LIST_NOTICE_DISMISSED);
     });
   });
 
@@ -240,7 +240,7 @@ describe('userActions', function() {
       let spy = setupViewSpy(sandbox);
       sandbox.spy(userActions, 'receivedInviteStatus');
       userActions.createInviteNotification(false, email);
-      assertAction(spy, userActionTypes.USER_INVITE_STATUS_DISPLAYED, expected);
+      assertAction(spy, userActionTypes.USER_LIST_NOTICE_CREATED, expected);
       done();
     });
 
@@ -253,12 +253,12 @@ describe('userActions', function() {
       let spy = setupViewSpy(sandbox);
       sandbox.spy(userActions, 'receivedInviteStatus');
       userActions.createInviteNotification(true, email);
-      assertAction(spy, userActionTypes.USER_INVITE_STATUS_DISPLAYED, expected);
+      assertAction(spy, userActionTypes.USER_LIST_NOTICE_CREATED, expected);
       done();
     });
   });
 
-  describe('userInviteError()', function() {
+  describe('userListNoticeError()', function() {
     let err;
     let message;
 
@@ -267,7 +267,7 @@ describe('userActions', function() {
       message = 'something happened when invititing';
       sandbox.stub(AppDispatcher, 'handleServerAction');
 
-      userActions.userInviteError(err, message).then(done, done.fail);
+      userActions.userListNoticeError(err, message).then(done, done.fail);
     });
 
     it('should dispatch server action of type user error with error and optional message',