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

static_src/actions/user_actions.js

@@ -198,12 +198,24 @@ const userActions = {
         inviting ${email}`));
   },
 
-  clearInviteNotifications() {
+  clearUserListNotifications() {
     AppDispatcher.handleViewAction({
-      type: userActionTypes.USER_INVITE_STATUS_DISMISSED
+      type: userActionTypes.USER_LIST_NOTICE_DISMISSED
     });
   },
 
+  createUserListNotification(noticeType, description) {
+    AppDispatcher.handleViewAction({
+      type: userActionTypes.USER_LIST_NOTICE_CREATED,
+      noticeType,
+      description
+    });
+  },
+
+  createUserSpaceAssociationNotification(notification) {
+    userActions.createUserListNotification('error', notification);
+  },
+
   createInviteNotification(verified, email) {
     let description;
     const noticeType = 'finish';
@@ -223,14 +235,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,
+  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;
       }
@@ -179,7 +179,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 +197,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 +285,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 +367,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

@@ -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',

static_src/test/unit/stores/user_store.spec.js

@@ -732,43 +732,43 @@ describe('UserStore', function () {
     });
   });
 
-  describe('on USER_INVITE_STATUS_DISPLAYED', function() {
+  describe('on USER_LIST_NOTICE_CREATED', function() {
     let notice;
 
     beforeEach(function() {
       notice = { noticeType: "finish", description: "An email invite was sent to undefined. Their account has been associated to this space, and their space roles can be controlled below." };
-      UserStore._inviteNotification = notice;
+      UserStore._userListNotification = notice;
       sandbox.spy(UserStore, 'emitChange');
 
       userActions.createInviteNotification();
     });
 
     it('should create notification for user invite', function() {
-      expect(UserStore.getInviteNotification()).toBeDefined();
-      expect(UserStore.getInviteNotification().description).toEqual(notice.description);
-      expect(UserStore.getInviteNotification().noticeType).toEqual(notice.noticeType);
+      expect(UserStore.getUserListNotification()).toBeDefined();
+      expect(UserStore.getUserListNotification().description).toEqual(notice.description);
+      expect(UserStore.getUserListNotification().noticeType).toEqual(notice.noticeType);
     });
 
     it('should emit a change event', function() {
       expect(UserStore.emitChange).toHaveBeenCalledOnce();
     });
   });
 
-  describe('on USER_INVITE_STATUS_DISMISSED', function() {
+  describe('on USER_LIST_NOTICE_DISMISSED', function() {
     let notice;
 
     beforeEach(function() {
       notice = { noticeType: "finish", description: "message" };
-      UserStore._inviteNotification = notice;
+      UserStore._userListNotification = notice;
       sandbox.spy(UserStore, 'emitChange');
 
-      userActions.clearInviteNotifications();
+      userActions.createUserListNotification();
     });
 
     it('should clear notification for user invite', function() {
-      expect(UserStore.getInviteNotification()).toBeDefined();
-      expect(UserStore.getInviteNotification().description).not.toEqual(notice.description);
-      expect(UserStore.getInviteNotification().noticeType).not.toEqual(notice.noticeType);
+      expect(UserStore.getUserListNotification()).toBeDefined();
+      expect(UserStore.getUserListNotification().description).not.toEqual(notice.description);
+      expect(UserStore.getUserListNotification().noticeType).not.toEqual(notice.noticeType);
     });
 
     it('should emit a change event', function() {
@@ -781,27 +781,27 @@ describe('UserStore', function () {
     let message;
 
     beforeEach(function() {
-      UserStore._inviteError = null;
+      UserStore._userListNotificationError = null;
       message = 'Inviting user did not work';
       error = { status: 500, message: 'CF said this' };
       sandbox.spy(UserStore, 'emitChange');
 
-      userActions.userInviteError(error, message);
+      userActions.userListNoticeError(error, message);
     });
 
     it('should add a error message to the user invite error field', function() {
-      expect(UserStore.getInviteError()).toBeDefined();
-      expect(UserStore.getInviteError().contextualMessage).toEqual(message);
-      expect(UserStore.getInviteError().message).toEqual(error.message);
+      expect(UserStore.getUserListNotificationError()).toBeDefined();
+      expect(UserStore.getUserListNotificationError().contextualMessage).toEqual(message);
+      expect(UserStore.getUserListNotificationError().message).toEqual(error.message);
     });
 
     it('should emit a change event', function() {
       expect(UserStore.emitChange).toHaveBeenCalledOnce();
     });
   });
 
-  describe('getInviteNotification()', function () {
-    describe('user with _inviteNotification', function () {
+  describe('getUserListNotification()', function () {
+    describe('user with _userListNotification', function () {
       let user, space, org, actual, notice;
 
       beforeEach(function () {
@@ -819,9 +819,9 @@ describe('UserStore', function () {
         UserStore.push(user);
       });
 
-      it('returns notice when _inviteNotification has content', function () {
-        UserStore._inviteNotification = notice;
-        actual = UserStore.getInviteNotification()
+      it('returns notice when _userListNotification has content', function () {
+        UserStore._userListNotification = notice;
+        actual = UserStore.getUserListNotification()
         expect(actual).toBe(notice);
       });
 
@@ -831,10 +831,10 @@ describe('UserStore', function () {
   describe('on CLEAR', () => {
     beforeEach(function() {
       const notice = { noticeType: "finish", description: "message" };
-      UserStore._inviteNotification = notice;
+      UserStore._userListNotification = notice;
       UserStore._error = 'something';
       UserStore._saving = true;
-      UserStore._inviteError = 'invite error';
+      UserStore._userListNotificationError = 'invite error';
       UserStore._loading = {currentUser: true};
       sandbox.spy(UserStore, 'emitChange');
       AppDispatcher.handleViewAction({
@@ -843,10 +843,10 @@ describe('UserStore', function () {
 
     });
     it('resets all of the notifications and errors', () => {
-      expect(UserStore._inviteNotification).toEqual({});
+      expect(UserStore._userListNotification).toEqual({});
       expect(UserStore._error).toBe(null);
       expect(UserStore._saving).toEqual(false);
-      expect(UserStore._inviteError).toBe(null);
+      expect(UserStore._userListNotificationError).toBe(null);
       expect(UserStore._loading).toEqual({});
     });
   });

static_src/util/cf_api.js

@@ -403,7 +403,22 @@ export default {
   deleteOrgUserPermissions(userGuid, orgGuid, apiKey) {
     return http.delete(`${APIV}/organizations/${orgGuid}/${apiKey}/${userGuid}`)
       .then((res) => res.response
-    );
+    ).catch(res => {
+      const err = parseError(res);
+      const errorConditions = (res &&
+                               res.response &&
+                               res.response.status === 400 &&
+                               res.response.data.error_code === 'CF-AssociationNotEmpty'
+                              );
+      if (errorConditions) {
+        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.';
+        userActions.createUserSpaceAssociationNotification(description);
+        return Promise.reject(err);
+      }
+      return Promise.reject(err);
+    });
   },
 
   putOrgUserPermissions(userGuid, orgGuid, permissions) {