Merge branch 'develop' into bugfix-2654/managers-cannot-approve-assignments

Author: ocielliottc

web-ui/src/components/feedback_template_selector/FeedbackTemplateSelector.jsx

@@ -96,7 +96,8 @@ const FeedbackTemplateSelector = ({ query, changeQuery }) => {
         creatorId: currentUserId,
         active: true,
         isAdHoc: true,
-        isPublic: false
+        isPublic: false,
+        isReview: false,
       };
 
       const newTemplateQuestion = {
@@ -187,6 +188,7 @@ const FeedbackTemplateSelector = ({ query, changeQuery }) => {
         description={template.description}
         isAdHoc={template.isAdHoc}
         isPublic={template.isPublic}
+        isReview={template.isReview}
         isSelected={query === template.id}
         questions={template.questions}
         expanded={preview.open}

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

@@ -13,7 +13,11 @@ import {
   selectHasSkillsReportPermission,
   selectHasTeamSkillsReportPermission,
   selectHasViewPulseReportPermission,
-  selectIsAdmin
+  selectIsAdmin,
+  selectHasEarnedCertificationsPermission,
+  selectHasMeritReportPermission,
+  selectHasVolunteeringEventsPermission,
+  selectHasVolunteeringRelationshipsPermission,
 } from '../../context/selectors';
 import { UPDATE_TOAST } from '../../context/actions';
 
@@ -136,7 +140,9 @@ function Menu({ children }) {
       links.push(['/birthday-reports', 'Birthdays']);
     }
 
-    links.push(['/certification-reports', 'Certifications']);
+    if (selectHasEarnedCertificationsPermission(state)) {
+      links.push(['/certification-reports', 'Certifications']);
+    }
 
     if (selectHasCheckinsReportPermission(state)) {
       links.push(['/checkins-reports', 'Check-ins']);
@@ -154,8 +160,14 @@ function Menu({ children }) {
       links.push(['/team-skills-reports', 'Team Skills']);
     }
 
-    links.push(['/merit-reports', 'Merit Report']);
-    links.push(['/volunteer-reports', 'Volunteering']);
+    if (selectHasMeritReportPermission(state)) {
+      links.push(['/merit-reports', 'Merit Report']);
+    }
+
+    if (selectHasVolunteeringEventsPermission(state) ||
+        selectHasVolunteeringRelationshipsPermission(state)) {
+      links.push(['/volunteer-reports', 'Volunteering']);
+    }
 
     return links;
   };

web-ui/src/components/personnel/Personnel.jsx

@@ -7,7 +7,8 @@ import { UPDATE_CHECKINS } from '../../context/actions';
 import {
   selectCurrentUserId,
   selectMostRecentCheckin,
-  selectCsrfToken
+  selectCsrfToken,
+  selectCanViewCheckinsPermission,
 } from '../../context/selectors';
 import Card from '@mui/material/Card';
 import CardHeader from '@mui/material/CardHeader';
@@ -53,7 +54,7 @@ const Personnel = () => {
   // Get checkins per personnel
   useEffect(() => {
     async function updateCheckins() {
-      if (personnel) {
+      if (personnel && selectCanViewCheckinsPermission(state)) {
         for (const person of personnel) {
           let res = await getCheckinByMemberId(person.id, csrf);
           let data =

web-ui/src/components/volunteer/VolunteerTables.jsx

@@ -4,7 +4,6 @@ import { Box, Tab, Tabs, Typography, Card, CardHeader, CardContent, Avatar } fro
 
 import {
   selectHasVolunteeringEventsPermission,
-  selectHasVolunteeringOrganizationsPermission,
   selectHasVolunteeringRelationshipsPermission,
   noPermission,
 } from '../../context/selectors';
@@ -58,7 +57,6 @@ const VolunteerReportPage = ({ onlyMe = false }) => {
   let tabContent = 0;
 
   return (selectHasVolunteeringEventsPermission(state) ||
-          selectHasVolunteeringOrganizationsPermission(state) ||
           selectHasVolunteeringRelationshipsPermission(state)) ? (
     <Card className="volunteer-activities-card">
       <CardContent className="volunteer-tables">

web-ui/src/context/AppContext.jsx

@@ -21,6 +21,9 @@ import {
   getAllMembers,
   getAllTerminatedMembers
 } from '../api/member';
+import {
+  selectCanViewCheckinsPermission,
+} from './selectors';
 import { getAllRoles, getAllUserRoles } from '../api/roles';
 import { getMemberSkills } from '../api/memberskill';
 import { BASE_API_URL } from '../api/api';
@@ -188,7 +191,7 @@ const AppContextProvider = props => {
         csrf
       ) {
         getAllCheckinsForAdmin(dispatch, csrf);
-      } else if (id && csrf) {
+      } else if (id && csrf && selectCanViewCheckinsPermission(state)) {
         getCheckins(id, pdlId, dispatch, csrf);
       }
     }

web-ui/src/context/selectors.js

@@ -186,6 +186,10 @@ export const selectHasSendEmailPermission = hasPermission(
   'CAN_SEND_EMAIL'
 );
 
+export const selectCanViewCheckinsPermission = hasPermission(
+  'CAN_VIEW_CHECKINS'
+);
+
 export const selectIsPDL = createSelector(
   selectUserProfile,
   userProfile =>

web-ui/src/pages/CheckinsPage.jsx

@@ -12,7 +12,8 @@ import {
   selectCsrfToken,
   selectCheckin,
   selectProfile,
-  selectCheckinsForMember
+  selectCheckinsForMember,
+  selectCanViewCheckinsPermission,
 } from '../context/selectors';
 import { getCheckins, createNewCheckin } from '../context/thunks';
 import { UPDATE_CHECKIN, UPDATE_TOAST } from '../context/actions';
@@ -72,7 +73,7 @@ const CheckinsPage = () => {
   const [tooltipIsOpen, setTooltipIsOpen] = useState(false);
 
   useEffect(() => {
-    if (selectedProfile) {
+    if (selectedProfile && selectCanViewCheckinsPermission(state)) {
       getCheckins(memberId, selectedProfile.pdlId, dispatch, csrf);
     }
   }, [memberId, selectedProfile, csrf, dispatch]);