Replaced selectIsAdmin and checking for ADMIN role with permissions.

Author: ocielliottc

web-ui/src/components/admin/users/Users.jsx

@@ -19,6 +19,7 @@ import {
   selectNormalizedMembers,
   selectNormalizedMembersAdmin,
   selectHasCreateMembersPermission,
+  selectCanEditAllOrganizationMembers,
 } from '../../../context/selectors';
 import { useQueryParameters } from '../../../helpers/query-parameters';
 
@@ -67,7 +68,7 @@ const Users = () => {
   };
 
   const normalizedMembers =
-    includeTerminated && selectHasCreateMembersPermission(state)
+    includeTerminated && selectCanEditAllOrganizationMembers(state)
       ? selectNormalizedMembersAdmin(state, searchText)
       : selectNormalizedMembers(state, searchText);
 

web-ui/src/components/checkin/documents/CheckinDocs.jsx

@@ -8,8 +8,8 @@ import {
   selectCsrfToken,
   selectCurrentUser,
   selectIsPDL,
-  selectIsAdmin,
-  selectCheckin
+  selectCheckin,
+  selectCanAdministerCheckinDocuments,
 } from '../../../context/selectors';
 import DescriptionIcon from '@mui/icons-material/Description';
 import IconButton from '@mui/material/IconButton';
@@ -34,7 +34,7 @@ const UploadDocs = () => {
   const [files, setFiles] = useState([]);
   const [fileColors, setFileColors] = useState({});
 
-  const pdlorAdmin = selectIsPDL(state) || selectIsAdmin(state);
+  const pdlorAdmin = selectIsPDL(state) || selectCanAdministerCheckinDocuments(state);
   const canView = pdlorAdmin && currentUserId !== memberId;
 
   useEffect(() => {

web-ui/src/components/member-directory/AdminMemberCard.jsx

@@ -10,6 +10,7 @@ import {
   selectHasCreateMembersPermission,
   selectHasDeleteMembersPermission,
   selectHasImpersonateMembersPermission,
+  selectCanEditAllOrganizationMembers,
 } from '../../context/selectors';
 import { getAvatarURL, resolve } from '../../api/api.js';
 
@@ -86,7 +87,8 @@ const AdminMemberCard = ({ member, index }) => {
     // is due to the fact that users can edit their own profiles.  But, only
     // certain users can create new profiles.  So, we associate the edit feature
     // with profile creation.
-    if (selectHasCreateMembersPermission(state)) {
+    if (selectHasCreateMembersPermission(state) ||
+        selectCanEditAllOrganizationMembers(state)) {
       entries.push('Edit');
       actionFunctions.push(handleOpen);
     }
@@ -228,6 +230,7 @@ const AdminMemberCard = ({ member, index }) => {
         </CardContent>
         {(selectHasCreateMembersPermission(state) ||
           selectHasDeleteMembersPermission(state) ||
+          selectCanEditAllOrganizationMembers(state) ||
           selectHasImpersonateMembersPermission(state)) && (
           <CardActions>
             {options().length > 0 &&

web-ui/src/components/member-directory/MemberSummaryCard.jsx

@@ -3,7 +3,10 @@ import { styled } from '@mui/material/styles';
 import { Link } from 'react-router-dom';
 
 import { AppContext } from '../../context/AppContext';
-import { selectIsAdmin, selectProfileMap } from '../../context/selectors';
+import {
+  selectProfileMap,
+  selectCanEditAllOrganizationMembers,
+} from '../../context/selectors';
 import { getAvatarURL } from '../../api/api.js';
 
 import Avatar from '@mui/material/Avatar';
@@ -34,7 +37,7 @@ const StyledBox = styled(Box)(() => ({
 
 const MemberSummaryCard = ({ member }) => {
   const { state } = useContext(AppContext);
-  const isAdmin = selectIsAdmin(state);
+  const isAdmin = selectCanEditAllOrganizationMembers(state);
   const {
     location,
     name,

web-ui/src/components/menu/Menu.jsx

@@ -13,7 +13,6 @@ import {
   selectHasSkillsReportPermission,
   selectHasTeamSkillsReportPermission,
   selectHasViewPulseReportPermission,
-  selectIsAdmin,
   selectHasEarnedCertificationsPermission,
   selectHasMeritReportPermission,
   selectHasVolunteeringEventsPermission,
@@ -26,6 +25,7 @@ import {
   selectHasCreateMembersPermission,
   selectHasDeleteMembersPermission,
   selectHasImpersonateMembersPermission,
+  selectCanEditAllOrganizationMembers,
   selectHasUploadHoursPermission,
   selectHasPermissionAssignmentPermission,
 } from '../../context/selectors';
@@ -110,7 +110,6 @@ function Menu({ children }) {
   const csrf = selectCsrfToken(state);
   const { id, workEmail } =
     userProfile && userProfile.memberProfile ? userProfile.memberProfile : {};
-  const isAdmin = selectIsAdmin(state);
   const hasReportPermission = selectHasReportPermission(state);
   const canViewFeedbackAnswer = selectCanViewFeedbackAnswerPermission(state);
   const canViewFeedbackRequest = selectCanViewFeedbackRequestPermission(state);
@@ -144,6 +143,7 @@ function Menu({ children }) {
     ['/admin/roles', 'Roles', () => selectCanEditMemberRolesPermission(state)],
     ['/admin/users', 'Users', () => selectHasCreateMembersPermission(state) ||
                                     selectHasDeleteMembersPermission(state) ||
+                                    selectCanEditAllOrganizationMembers(state) ||
                                     selectHasImpersonateMembersPermission(state)
     ],
     ['/admin/email', 'Send Email', () => selectHasSendEmailPermission(state)],

web-ui/src/components/private-note/PrivateNote.jsx

@@ -10,12 +10,12 @@ import {
   selectCsrfToken,
   selectCurrentUser,
   selectIsPDL,
-  selectIsAdmin,
   selectCheckin,
   selectProfile,
   selectCanViewPrivateNotesPermission,
   selectCanCreatePrivateNotesPermission,
   selectCanUpdatePrivateNotesPermission,
+  selectCanAdministerCheckinDocuments,
 } from '../../context/selectors';
 import { UPDATE_TOAST } from '../../context/actions';
 import { debounce } from 'lodash/function';
@@ -42,7 +42,7 @@ const PrivateNote = () => {
   const currentCheckin = selectCheckin(state, checkinId);
   const currentMember = selectProfile(state, memberId);
   const pdlId = currentMember?.pdlId;
-  const isAdmin = selectIsAdmin(state);
+  const isAdmin = selectCanAdministerCheckinDocuments(state);
 
   const noteRef = useRef([]);
   const [note, setNote] = useState();

web-ui/src/components/reviews/TeamReviews.jsx

@@ -55,7 +55,6 @@ import {
 } from '../../context/actions';
 import { AppContext } from '../../context/AppContext';
 import {
-  selectIsAdmin,
   selectCsrfToken,
   selectCurrentMembers,
   selectCurrentUser,
@@ -70,6 +69,7 @@ import {
   selectHasCreateReviewAssignmentsPermission,
   selectHasDeleteReviewAssignmentsPermission,
   selectHasUpdateReviewAssignmentsPermission,
+  selectCanAdministerFeedbackRequests,
 } from '../../context/selectors';
 
 import MemberSelector from '../member_selector/MemberSelector';
@@ -126,7 +126,7 @@ const ReviewStatus = {
 const TeamReviews = ({ onBack, periodId }) => {
   const { state, dispatch } = useContext(AppContext);
   const location = useLocation();
-  const isAdmin = selectIsAdmin(state);
+  const isAdmin = selectCanAdministerFeedbackRequests(state);
   const [openMode, setOpenMode] = useState(false);
   const [approvalState, setApprovalState] = useState(false);
   const [assignments, setAssignments] = useState([]);

web-ui/src/components/routes/Routes.jsx

@@ -28,7 +28,6 @@ import MeritReportPage from '../../pages/MeritReportPage';
 import Users from '../admin/users/Users';
 import VolunteerReportPage from '../../pages/VolunteerReportPage';
 
-import { selectIsAdmin } from '../../context/selectors';
 import FeedbackRequestConfirmation from '../feedback_request_confirmation/FeedbackRequestConfirmation';
 import FeedbackRequestPage from '../../pages/FeedbackRequestPage';
 import ViewFeedbackPage from '../../pages/ViewFeedbackPage';

web-ui/src/context/AppContext.jsx

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

web-ui/src/context/selectors.js

@@ -206,6 +206,10 @@ export const selectCanUpdateCheckinsPermission = hasPermission(
   'CAN_UPDATE_CHECKINS'
 );
 
+export const selectCanUpdateAllCheckinsPermission = hasPermission(
+  'CAN_UPDATE_ALL_CHECKINS'
+);
+
 export const selectCanEditSkills = hasPermission(
   'CAN_EDIT_SKILLS'
 );
@@ -222,6 +226,18 @@ export const selectCanUpdatePrivateNotesPermission = hasPermission(
   'CAN_UPDATE_PRIVATE_NOTE'
 );
 
+export const selectCanAdministerCheckinDocuments = hasPermission(
+  'CAN_ADMINISTER_CHECKIN_DOCUMENTS'
+);
+
+export const selectCanAdministerFeedbackRequests = hasPermission(
+  'CAN_ADMINISTER_FEEDBACK_REQUEST'
+);
+
+export const selectCanEditAllOrganizationMembers = hasPermission(
+  'CAN_EDIT_ALL_ORGANIZATION_MEMBERS',
+);
+
 export const selectIsPDL = createSelector(
   selectUserProfile,
   userProfile =>