Added permission for view terminated profile and adjusted app context to respect it

Author: mkimberlin

server/src/main/java/com/objectcomputing/checkins/services/permissions/Permission.java

@@ -17,6 +17,7 @@ public enum Permission {
   CAN_ADMINISTER_FEEDBACK_ANSWER("Administer feedback answers", "Feedback"),
   CAN_ADMINISTER_FEEDBACK_TEMPLATES("Administer feedback templates", "Feedback"),
   CAN_SEND_EMAIL("Send email", "Feedback"),
+  CAN_VIEW_TERMINATED_MEMBERS("Can view the profiles of terminated members", "User Management"),
   CAN_EDIT_ALL_ORGANIZATION_MEMBERS("Edit all member profiles", "User Management"),
   CAN_DELETE_ORGANIZATION_MEMBERS("Delete organization members", "User Management"),
   CAN_CREATE_ORGANIZATION_MEMBERS("Create organization members", "User Management"),

web-ui/src/context/AppContext.jsx

@@ -23,7 +23,7 @@ import {
 } from '../api/member';
 import {
   selectCanViewCheckinsPermission,
-  selectCanEditAllOrganizationMembers,
+  selectCanViewTerminatedMembers,
 } from './selectors';
 import { getAllRoles, getAllUserRoles } from '../api/roles';
 import { getMemberSkills } from '../api/memberskill';
@@ -191,7 +191,7 @@ const AppContextProvider = props => {
     if (csrf && userProfile && !memberProfiles) {
       dispatch({ type: UPDATE_PEOPLE_LOADING, payload: true });
       getMemberProfiles();
-      if (selectCanEditAllOrganizationMembers(state)) {
+      if (selectCanViewTerminatedMembers(state)) {
         getTerminatedMembers();
       }
     }

web-ui/src/context/selectors.js

@@ -242,6 +242,14 @@ export const selectCanEditAllOrganizationMembers = hasPermission(
   'CAN_EDIT_ALL_ORGANIZATION_MEMBERS',
 );
 
+export const selectCanViewTerminatedMembers = createSelector(
+    selectCanEditAllOrganizationMembers,
+    hasPermission(
+        'CAN_VIEW_TERMINATED_MEMBERS'
+    ),
+    (canEdit, canView) => canEdit || canView
+);
+
 export const selectIsPDL = createSelector(
   selectUserProfile,
   userProfile =>

web-ui/src/context/selectors.test.js

@@ -21,7 +21,9 @@ import {
   selectSubordinates,
   selectIsSubordinateOfCurrentUser,
   selectHasReportPermission,
-  selectActiveOrInactiveProfile
+  selectActiveOrInactiveProfile,
+  selectCanEditAllOrganizationMembers,
+  selectCanViewTerminatedMembers,
 } from './selectors';
 
 describe('Selectors', () => {
@@ -1527,6 +1529,85 @@ describe('Selectors', () => {
     expect(selectHasReportPermission(testState)).toBe(false);
   });
 
+  it("selectCanEditAllOrganizationMembers should return false when user does not have 'CAN_EDIT_ALL_ORGANIZATION_MEMBERS' permission", () => {
+    const testState = {
+      userProfile: {
+        firstName: 'Huey',
+        lastName: 'Emmerich',
+        role: 'MEMBER',
+        permissions: [
+          { permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
+          { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+        ]
+      }
+    };
+
+    expect(selectCanEditAllOrganizationMembers(testState)).toBe(false);
+  });
+
+  it("selectCanEditAllOrganizationMembers should return true when user has 'CAN_EDIT_ALL_ORGANIZATION_MEMBERS' permission", () => {
+    const testState = {
+      userProfile: {
+        firstName: 'Huey',
+        lastName: 'Emmerich',
+        role: 'MEMBER',
+        permissions: [
+          { permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
+          { permission: 'CAN_EDIT_ALL_ORGANIZATION_MEMBERS' },
+          { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+        ]
+      }
+    };
+
+    expect(selectCanEditAllOrganizationMembers(testState)).toBe(true);
+  });
+
+  it("selectCanViewTerminatedMembers should return false when user does not have 'CAN_EDIT_ALL_ORGANIZATION_MEMBERS' or 'CAN_VIEW_TERMINATED_MEMBERS' permission", () => {
+    const testState = {
+      userProfile: {
+        firstName: 'Huey',
+        lastName: 'Emmerich',
+        role: 'MEMBER',
+        permissions: [
+          { permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
+          { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+        ]
+      }
+    };
+
+    expect(selectCanViewTerminatedMembers(testState)).toBe(false);
+  });
+
+  it("selectCanViewTerminatedMembers should return true when user has 'CAN_EDIT_ALL_ORGANIZATION_MEMBERS' or 'CAN_VIEW_TERMINATED_MEMBERS' permissions", () => {
+    const testState = {
+      userProfile: {
+        firstName: 'Huey',
+        lastName: 'Emmerich',
+        role: 'MEMBER',
+        permissions: [
+          { permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
+          { permission: 'CAN_EDIT_ALL_ORGANIZATION_MEMBERS' },
+          { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+        ]
+      }
+    };
+    const otherTestState = {
+      userProfile: {
+        firstName: 'Huey',
+        lastName: 'Emmerich',
+        role: 'MEMBER',
+        permissions: [
+          { permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
+          { permission: 'CAN_VIEW_TERMINATED_MEMBERS' },
+          { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+        ]
+      }
+    };
+
+    expect(selectCanViewTerminatedMembers(testState)).toBe(true);
+    expect(selectCanViewTerminatedMembers(otherTestState)).toBe(true);
+  });
+
   it('selectActiveOrInactiveProfile should a profile if active or inactive', () => {
     const activeTestMember = {
       id: 1,