include "Inactive User: " prefix in member button on group management page to match what we do for permissions page

Author: cnathe

packages/components/src/internal/components/permissions/models.test.ts

@@ -29,6 +29,7 @@ import {
 } from '../../../test/data/constants';
 
 import { getRolesByUniqueName, processGetRolesResponse } from './actions';
+import { Member } from '../administration/models';
 import { Principal, SecurityAssignment, SecurityPolicy, SecurityRole } from './models';
 
 const GROUP = Principal.createFromSelectRow(
@@ -146,6 +147,23 @@ describe('SecurityAssignment model', () => {
         const userInactive = new SecurityAssignment({ userId: 1, type: undefined, displayName: 'DisplayName' });
         expect(SecurityAssignment.getDisplayName(userInactive)).toBe('Inactive User: 1');
     });
+
+    test('getDisplayNameForMember', () => {
+        const activeMember: Member = { id: 1, name: 'activeUser', type: 'u', userActive: true };
+        expect(SecurityAssignment.getDisplayNameForMember(activeMember)).toBe('activeUser');
+
+        const memberWithoutActiveFlag: Member = { id: 2, name: 'unknownUser', type: 'u' };
+        expect(SecurityAssignment.getDisplayNameForMember(memberWithoutActiveFlag)).toBe('unknownUser');
+
+        const inactiveMember: Member = { id: 3, name: 'inactiveUser', type: 'u', userActive: false };
+        expect(SecurityAssignment.getDisplayNameForMember(inactiveMember)).toBe('Inactive User: inactiveUser');
+
+        const groupMember: Member = { id: 4, name: 'someGroup', type: 'g', userActive: true };
+        expect(SecurityAssignment.getDisplayNameForMember(groupMember)).toBe('someGroup');
+
+        const groupMemberWithoutActiveFlag: Member = { id: 5, name: 'someGroup2', type: 'g' };
+        expect(SecurityAssignment.getDisplayNameForMember(groupMemberWithoutActiveFlag)).toBe('someGroup2');
+    });
 });
 
 describe('SecurityPolicy model', () => {

packages/components/src/internal/components/permissions/models.tsx

@@ -7,7 +7,7 @@ import { Record, List, Map } from 'immutable';
 import React from 'react';
 
 import { naturalSort } from '../../../public/sort';
-import { Groups, MemberType } from '../administration/models';
+import { Groups, Member, MemberType } from '../administration/models';
 
 export class Principal extends Record({
     userId: undefined,
@@ -150,6 +150,15 @@ export class SecurityAssignment extends Record({
 
         return assignment.displayName || assignment.userId.toString();
     }
+
+    static getDisplayNameForMember(member: Member): string {
+        // inactive users will return userActive false
+        if (member.userActive === false) {
+            return 'Inactive User: ' + member.name;
+        }
+
+        return member.name;
+    }
 }
 
 export class SecurityPolicy extends Record({