diff --git a/server/src/main/java/com/objectcomputing/checkins/services/permissions/Permission.java b/server/src/main/java/com/objectcomputing/checkins/services/permissions/Permission.java index 137ca0ade5..5aeaeab802 100644 --- a/server/src/main/java/com/objectcomputing/checkins/services/permissions/Permission.java +++ b/server/src/main/java/com/objectcomputing/checkins/services/permissions/Permission.java @@ -47,7 +47,7 @@ public enum Permission { CAN_DELETE_REVIEW_PERIOD("Delete review period", "Review Period"), CAN_ADMINISTER_SETTINGS("Add or edit settings", "Settings"), CAN_VIEW_SETTINGS("View settings", "Settings"), - CAN_VIEW_ALL_PULSE_RESPONSES("View all pulse responses", "Pulse"); + CAN_VIEW_ALL_PULSE_RESPONSES("View pulse responses", "Reporting"); private final String description; private final String category; @@ -76,4 +76,3 @@ public static Permission fromName(String name) { throw new UnsupportedOperationException(String.format("Unknown permission: '%s'", name)); } } - diff --git a/web-ui/src/components/admin/permissions/Permissions.jsx b/web-ui/src/components/admin/permissions/Permissions.jsx index 198c461710..7148d85511 100644 --- a/web-ui/src/components/admin/permissions/Permissions.jsx +++ b/web-ui/src/components/admin/permissions/Permissions.jsx @@ -1,8 +1,7 @@ import { useMediaQuery } from '@mui/material'; -import React, { useState } from 'react'; +import React from 'react'; import DesktopTable from './DesktopTable'; import MobileTable from './MobileTable'; -import { allPermissions, roles } from './sample-data'; export default function Permissions() { const showDesktop = useMediaQuery('(min-width:650px)', { noSsr: true }); diff --git a/web-ui/src/components/menu/Menu.jsx b/web-ui/src/components/menu/Menu.jsx index 05585c99b6..dcd9415333 100644 --- a/web-ui/src/components/menu/Menu.jsx +++ b/web-ui/src/components/menu/Menu.jsx @@ -123,10 +123,9 @@ function Menu({ children }) { links.push(['/checkins-reports', 'Check-ins']); } - // TODO: Uncomment this check after PR #2429 is merged. - //if (selectHasViewPulseReportPermission(state)) { + if (selectHasViewPulseReportPermission(state)) { links.push(['/pulse-reports', 'Pulses']); - //} + } if (selectHasSkillsReportPermission(state)) { links.push(['/skills-reports', 'Skills']); diff --git a/web-ui/src/context/selectors.js b/web-ui/src/context/selectors.js index 3a5f01ff3a..0460f9f917 100644 --- a/web-ui/src/context/selectors.js +++ b/web-ui/src/context/selectors.js @@ -16,14 +16,13 @@ export const selectLoading = state => state.loading; export const selectReviewPeriods = state => state.reviewPeriods; export const selectPermissions = state => state.permissions; -const hasPermission = permissionName => createSelector( - selectUserProfile, - userProfile => - userProfile && +const hasPermission = permissionName => + createSelector( + selectUserProfile, + userProfile => + userProfile && userProfile.role && - userProfile.permissions.some(p => - p?.permission?.includes(permissionName) - ) + userProfile.permissions.some(p => p?.permission?.includes(permissionName)) ); export const selectTeamsLoading = createSelector(selectLoading, loading => { @@ -47,58 +46,75 @@ export const selectIsAdmin = createSelector( userProfile && userProfile.role && userProfile.role.includes('ADMIN') ); -export const selectHasPermissionAssignmentPermission = - hasPermission('CAN_ASSIGN_ROLE_PERMISSIONS'); +export const selectHasPermissionAssignmentPermission = hasPermission( + 'CAN_ASSIGN_ROLE_PERMISSIONS' +); export const selectHasReportPermission = hasPermission('REPORT'); -export const selectHasAnniversaryReportPermission = - hasPermission('CAN_VIEW_ANNIVERSARY_REPORT'); +export const selectHasAnniversaryReportPermission = hasPermission( + 'CAN_VIEW_ANNIVERSARY_REPORT' +); -export const selectHasBirthdayReportPermission = - hasPermission('CAN_VIEW_BIRTHDAY_REPORT'); +export const selectHasBirthdayReportPermission = hasPermission( + 'CAN_VIEW_BIRTHDAY_REPORT' +); -export const selectHasCheckinsReportPermission = - hasPermission('CAN_VIEW_CHECKINS_REPORT'); +export const selectHasCheckinsReportPermission = hasPermission( + 'CAN_VIEW_CHECKINS_REPORT' +); -export const selectHasProfileReportPermission = - hasPermission('CAN_VIEW_PROFILE_REPORT'); +export const selectHasProfileReportPermission = hasPermission( + 'CAN_VIEW_PROFILE_REPORT' +); -export const selectHasViewPulseReportPermission = - hasPermission('CAN_VIEW_ALL_PULSE_RESPONSES'); +export const selectHasViewPulseReportPermission = hasPermission( + 'CAN_VIEW_ALL_PULSE_RESPONSES' +); -export const selectHasSkillsReportPermission = - hasPermission('CAN_VIEW_SKILLS_REPORT'); +export const selectHasSkillsReportPermission = hasPermission( + 'CAN_VIEW_SKILLS_REPORT' +); -export const selectHasTeamSkillsReportPermission = - hasPermission('CAN_VIEW_SKILLS_REPORT'); +export const selectHasTeamSkillsReportPermission = hasPermission( + 'CAN_VIEW_SKILLS_REPORT' +); -export const selectHasCreateReviewAssignmentsPermission = - hasPermission('CAN_CREATE_REVIEW_ASSIGNMENTS'); +export const selectHasCreateReviewAssignmentsPermission = hasPermission( + 'CAN_CREATE_REVIEW_ASSIGNMENTS' +); -export const selectHasDeleteReviewAssignmentsPermission = - hasPermission('CAN_DELETE_REVIEW_ASSIGNMENTS'); +export const selectHasDeleteReviewAssignmentsPermission = hasPermission( + 'CAN_DELETE_REVIEW_ASSIGNMENTS' +); -export const selectHasUpdateReviewAssignmentsPermission = - hasPermission('CAN_UPDATE_REVIEW_ASSIGNMENTS'); +export const selectHasUpdateReviewAssignmentsPermission = hasPermission( + 'CAN_UPDATE_REVIEW_ASSIGNMENTS' +); -export const selectHasViewReviewAssignmentsPermission = - hasPermission('CAN_VIEW_REVIEW_ASSIGNMENTS'); +export const selectHasViewReviewAssignmentsPermission = hasPermission( + 'CAN_VIEW_REVIEW_ASSIGNMENTS' +); -export const selectHasCloseReviewPeriodPermission = - hasPermission('CAN_CLOSE_REVIEW_PERIOD'); +export const selectHasCloseReviewPeriodPermission = hasPermission( + 'CAN_CLOSE_REVIEW_PERIOD' +); -export const selectHasCreateReviewPeriodPermission = - hasPermission('CAN_CREATE_REVIEW_PERIOD'); +export const selectHasCreateReviewPeriodPermission = hasPermission( + 'CAN_CREATE_REVIEW_PERIOD' +); -export const selectHasDeleteReviewPeriodPermission = - hasPermission('CAN_DELETE_REVIEW_PERIOD'); +export const selectHasDeleteReviewPeriodPermission = hasPermission( + 'CAN_DELETE_REVIEW_PERIOD' +); -export const selectHasLaunchReviewPeriodPermission = - hasPermission('CAN_LAUNCH_REVIEW_PERIOD'); +export const selectHasLaunchReviewPeriodPermission = hasPermission( + 'CAN_LAUNCH_REVIEW_PERIOD' +); -export const selectHasUpdateReviewPeriodPermission = - hasPermission('CAN_UPDATE_REVIEW_PERIOD'); +export const selectHasUpdateReviewPeriodPermission = hasPermission( + 'CAN_UPDATE_REVIEW_PERIOD' +); export const selectIsPDL = createSelector( selectUserProfile, diff --git a/web-ui/src/pages/EditPermissionsPage.jsx b/web-ui/src/pages/EditPermissionsPage.jsx index ffd935558d..445ca20033 100644 --- a/web-ui/src/pages/EditPermissionsPage.jsx +++ b/web-ui/src/pages/EditPermissionsPage.jsx @@ -240,7 +240,7 @@ const EditPermissionsPage = () => { } }; - const deleteRolePermission = async (roleId, permissionId) => { + const handleDeleteRolePermission = async (roleId, permissionId) => { let newSchema = { roleId: roleId, permissionId: permissionId }; let res = await deleteRolePermission(newSchema, csrf); let data = !res.error ? 'Success' : null; @@ -268,7 +268,7 @@ const EditPermissionsPage = () => { if (!createFeedbackRequestPermissionsAdmin) { changeRolePermission(adminId, createFeedbackRequestPermissionsId); } else { - deleteRolePermission(adminId, createFeedbackRequestPermissionsId); + handleDeleteRolePermission(adminId, createFeedbackRequestPermissionsId); } setCreateFeedbackRequestPermissionsAdmin( !createFeedbackRequestPermissionsAdmin @@ -278,7 +278,7 @@ const EditPermissionsPage = () => { if (!createFeedbackRequestPermissionsPDL) { changeRolePermission(pdlId, createFeedbackRequestPermissionsId); } else { - deleteRolePermission(pdlId, createFeedbackRequestPermissionsId); + handleDeleteRolePermission(pdlId, createFeedbackRequestPermissionsId); } setCreateFeedbackRequestPermissionsPDL( !createFeedbackRequestPermissionsPDL @@ -289,7 +289,7 @@ const EditPermissionsPage = () => { if (!createFeedbackRequestPermissionsMember) { changeRolePermission(memberId, createFeedbackRequestPermissionsId); } else { - deleteRolePermission(memberId, createFeedbackRequestPermissionsId); + handleDeleteRolePermission(memberId, createFeedbackRequestPermissionsId); } setCreateFeedbackRequestPermissionsMember( !createFeedbackRequestPermissionsMember @@ -300,7 +300,7 @@ const EditPermissionsPage = () => { if (!deleteFeedbackRequestPermissionsAdmin) { changeRolePermission(adminId, deleteFeedbackRequestPermissionsId); } else { - deleteRolePermission(adminId, deleteFeedbackRequestPermissionsId); + handleDeleteRolePermission(adminId, deleteFeedbackRequestPermissionsId); } setDeleteFeedbackRequestPermissionsAdmin( !deleteFeedbackRequestPermissionsAdmin @@ -310,7 +310,7 @@ const EditPermissionsPage = () => { if (!deleteFeedbackRequestPermissionsPDL) { changeRolePermission(pdlId, deleteFeedbackRequestPermissionsId); } else { - deleteRolePermission(pdlId, deleteFeedbackRequestPermissionsId); + handleDeleteRolePermission(pdlId, deleteFeedbackRequestPermissionsId); } setDeleteFeedbackRequestPermissionsPDL( !deleteFeedbackRequestPermissionsPDL @@ -320,7 +320,7 @@ const EditPermissionsPage = () => { if (!deleteFeedbackRequestPermissionsMember) { changeRolePermission(memberId, deleteFeedbackRequestPermissionsId); } else { - deleteRolePermission(memberId, deleteFeedbackRequestPermissionsId); + handleDeleteRolePermission(memberId, deleteFeedbackRequestPermissionsId); } setDeleteFeedbackRequestPermissionsMember( !deleteFeedbackRequestPermissionsMember @@ -331,7 +331,7 @@ const EditPermissionsPage = () => { if (!viewFeedbackRequestPermissionsAdmin) { changeRolePermission(adminId, viewFeedbackRequestPermissionsId); } else { - deleteRolePermission(adminId, viewFeedbackRequestPermissionsId); + handleDeleteRolePermission(adminId, viewFeedbackRequestPermissionsId); } setViewFeedbackRequestPermissionsAdmin( !viewFeedbackRequestPermissionsAdmin @@ -341,7 +341,7 @@ const EditPermissionsPage = () => { if (!viewFeedbackRequestPermissionsPDL) { changeRolePermission(pdlId, viewFeedbackRequestPermissionsId); } else { - deleteRolePermission(pdlId, viewFeedbackRequestPermissionsId); + handleDeleteRolePermission(pdlId, viewFeedbackRequestPermissionsId); } setViewFeedbackRequestPermissionsPDL(!viewFeedbackRequestPermissionsPDL); }; @@ -350,7 +350,7 @@ const EditPermissionsPage = () => { if (!viewFeedbackRequestPermissionsMember) { changeRolePermission(memberId, viewFeedbackRequestPermissionsId); } else { - deleteRolePermission(memberId, viewFeedbackRequestPermissionsId); + handleDeleteRolePermission(memberId, viewFeedbackRequestPermissionsId); } setViewFeedbackRequestPermissionsMember( !viewFeedbackRequestPermissionsMember @@ -361,7 +361,7 @@ const EditPermissionsPage = () => { if (!viewFeedbackAnswerPermissionsAdmin) { changeRolePermission(adminId, viewFeedbackAnswerPermissionsId); } else { - deleteRolePermission(adminId, viewFeedbackAnswerPermissionsId); + handleDeleteRolePermission(adminId, viewFeedbackAnswerPermissionsId); } setViewFeedbackAnswerPermissionsAdmin(!viewFeedbackAnswerPermissionsAdmin); }; @@ -369,7 +369,7 @@ const EditPermissionsPage = () => { if (!viewFeedbackAnswerPermissionsPDL) { changeRolePermission(pdlId, viewFeedbackAnswerPermissionsId); } else { - deleteRolePermission(pdlId, viewFeedbackAnswerPermissionsId); + handleDeleteRolePermission(pdlId, viewFeedbackAnswerPermissionsId); } setViewFeedbackAnswerPermissionsPDL(!viewFeedbackAnswerPermissionsPDL); }; @@ -377,7 +377,7 @@ const EditPermissionsPage = () => { if (!viewFeedbackAnswerPermissionsMember) { changeRolePermission(memberId, viewFeedbackAnswerPermissionsId); } else { - deleteRolePermission(memberId, viewFeedbackAnswerPermissionsId); + handleDeleteRolePermission(memberId, viewFeedbackAnswerPermissionsId); } setViewFeedbackAnswerPermissionsMember( !viewFeedbackAnswerPermissionsMember @@ -388,7 +388,7 @@ const EditPermissionsPage = () => { if (!createOrgMembersPermissionsAdmin) { changeRolePermission(adminId, createOrgMembersPermissionsId); } else { - deleteRolePermission(adminId, createOrgMembersPermissionsId); + handleDeleteRolePermission(adminId, createOrgMembersPermissionsId); } setCreateOrgMembersPermissionsAdmin(!createOrgMembersPermissionsAdmin); }; @@ -396,7 +396,7 @@ const EditPermissionsPage = () => { if (!createOrgMembersPermissionsPDL) { changeRolePermission(pdlId, createOrgMembersPermissionsId); } else { - deleteRolePermission(pdlId, createOrgMembersPermissionsId); + handleDeleteRolePermission(pdlId, createOrgMembersPermissionsId); } setCreateOrgMembersPermissionsPDL(!createOrgMembersPermissionsPDL); }; @@ -404,7 +404,7 @@ const EditPermissionsPage = () => { if (!createOrgMembersPermissionsMember) { changeRolePermission(memberId, createOrgMembersPermissionsId); } else { - deleteRolePermission(memberId, createOrgMembersPermissionsId); + handleDeleteRolePermission(memberId, createOrgMembersPermissionsId); } setCreateOrgMembersPermissionsMember(!createOrgMembersPermissionsMember); }; @@ -413,7 +413,7 @@ const EditPermissionsPage = () => { if (!deleteOrgMembersPermissionsAdmin) { changeRolePermission(adminId, deleteOrgMembersPermissionsId); } else { - deleteRolePermission(adminId, deleteOrgMembersPermissionsId); + handleDeleteRolePermission(adminId, deleteOrgMembersPermissionsId); } setDeleteOrgMembersPermissionsAdmin(!deleteOrgMembersPermissionsAdmin); }; @@ -421,7 +421,7 @@ const EditPermissionsPage = () => { if (!deleteOrgMembersPermissionsPDL) { changeRolePermission(pdlId, deleteOrgMembersPermissionsId); } else { - deleteRolePermission(pdlId, deleteOrgMembersPermissionsId); + handleDeleteRolePermission(pdlId, deleteOrgMembersPermissionsId); } setDeleteOrgMembersPermissionsPDL(!deleteOrgMembersPermissionsPDL); }; @@ -429,7 +429,7 @@ const EditPermissionsPage = () => { if (!deleteOrgMembersPermissionsMember) { changeRolePermission(memberId, deleteOrgMembersPermissionsId); } else { - deleteRolePermission(memberId, deleteOrgMembersPermissionsId); + handleDeleteRolePermission(memberId, deleteOrgMembersPermissionsId); } setDeleteOrgMembersPermissionsMember(!deleteOrgMembersPermissionsMember); }; @@ -438,7 +438,7 @@ const EditPermissionsPage = () => { if (!viewRolePermissionsAdmin) { changeRolePermission(adminId, viewRolePermissionsId); } else { - deleteRolePermission(adminId, viewRolePermissionsId); + handleDeleteRolePermission(adminId, viewRolePermissionsId); } setViewRolePermissionsAdmin(!viewRolePermissionsAdmin); }; @@ -446,7 +446,7 @@ const EditPermissionsPage = () => { if (!viewRolePermissionsPDL) { changeRolePermission(pdlId, viewRolePermissionsId); } else { - deleteRolePermission(pdlId, viewRolePermissionsId); + handleDeleteRolePermission(pdlId, viewRolePermissionsId); } setViewRolePermissionsPDL(!viewRolePermissionsPDL); }; @@ -454,7 +454,7 @@ const EditPermissionsPage = () => { if (!viewRolePermissionsMember) { changeRolePermission(memberId, viewRolePermissionsId); } else { - deleteRolePermission(memberId, viewRolePermissionsId); + handleDeleteRolePermission(memberId, viewRolePermissionsId); } setViewRolePermissionsMember(!viewRolePermissionsMember); }; @@ -463,7 +463,7 @@ const EditPermissionsPage = () => { if (!assignRolePermissionsAdmin) { changeRolePermission(adminId, assignRolePermissionsId); } else { - deleteRolePermission(adminId, assignRolePermissionsId); + handleDeleteRolePermission(adminId, assignRolePermissionsId); } setAssignRolePermissionsAdmin(!assignRolePermissionsAdmin); }; @@ -471,7 +471,7 @@ const EditPermissionsPage = () => { if (!assignRolePermissionsPDL) { changeRolePermission(pdlId, assignRolePermissionsId); } else { - deleteRolePermission(pdlId, assignRolePermissionsId); + handleDeleteRolePermission(pdlId, assignRolePermissionsId); } setAssignRolePermissionsPDL(!assignRolePermissionsPDL); }; @@ -479,7 +479,7 @@ const EditPermissionsPage = () => { if (!assignRolePermissionsMember) { changeRolePermission(memberId, assignRolePermissionsId); } else { - deleteRolePermission(memberId, assignRolePermissionsId); + handleDeleteRolePermission(memberId, assignRolePermissionsId); } setAssignRolePermissionsMember(!assignRolePermissionsMember); }; @@ -488,7 +488,7 @@ const EditPermissionsPage = () => { if (!viewPermissionsAdmin) { changeRolePermission(adminId, viewPermissionsId); } else { - deleteRolePermission(adminId, viewPermissionsId); + handleDeleteRolePermission(adminId, viewPermissionsId); } setViewPermissionsAdmin(!viewPermissionsAdmin); }; @@ -496,7 +496,7 @@ const EditPermissionsPage = () => { if (!viewPermissionsPDL) { changeRolePermission(pdlId, viewPermissionsId); } else { - deleteRolePermission(pdlId, viewPermissionsId); + handleDeleteRolePermission(pdlId, viewPermissionsId); } setViewPermissionsPDL(!viewPermissionsPDL); }; @@ -504,7 +504,7 @@ const EditPermissionsPage = () => { if (!viewPermissionsMember) { changeRolePermission(memberId, viewPermissionsId); } else { - deleteRolePermission(memberId, viewPermissionsId); + handleDeleteRolePermission(memberId, viewPermissionsId); } setViewPermissionsMember(!viewPermissionsMember); }; @@ -513,7 +513,7 @@ const EditPermissionsPage = () => { if (!viewSkillsReportsAdmin) { changeRolePermission(adminId, viewSkillsReportsId); } else { - deleteRolePermission(adminId, viewSkillsReportsId); + handleDeleteRolePermission(adminId, viewSkillsReportsId); } setViewSkillsReportsAdmin(!viewSkillsReportsAdmin); }; @@ -521,7 +521,7 @@ const EditPermissionsPage = () => { if (!viewSkillsReportsPDL) { changeRolePermission(pdlId, viewSkillsReportsId); } else { - deleteRolePermission(pdlId, viewSkillsReportsId); + handleDeleteRolePermission(pdlId, viewSkillsReportsId); } setViewSkillsReportsPDL(!viewSkillsReportsPDL); }; @@ -529,7 +529,7 @@ const EditPermissionsPage = () => { if (!viewSkillsReportsMember) { changeRolePermission(memberId, viewSkillsReportsId); } else { - deleteRolePermission(memberId, viewSkillsReportsId); + handleDeleteRolePermission(memberId, viewSkillsReportsId); } setViewSkillsReportsMember(!viewSkillsReportsMember); }; @@ -538,7 +538,7 @@ const EditPermissionsPage = () => { if (!viewRetentionReportsAdmin) { changeRolePermission(adminId, viewRetentionReportsId); } else { - deleteRolePermission(adminId, viewRetentionReportsId); + handleDeleteRolePermission(adminId, viewRetentionReportsId); } setViewRetentionReportsAdmin(!viewRetentionReportsAdmin); }; @@ -546,7 +546,7 @@ const EditPermissionsPage = () => { if (!viewRetentionReportsPDL) { changeRolePermission(pdlId, viewRetentionReportsId); } else { - deleteRolePermission(pdlId, viewRetentionReportsId); + handleDeleteRolePermission(pdlId, viewRetentionReportsId); } setViewRetentionReportsPDL(!viewRetentionReportsPDL); }; @@ -554,7 +554,7 @@ const EditPermissionsPage = () => { if (!viewRetentionReportsMember) { changeRolePermission(memberId, viewRetentionReportsId); } else { - deleteRolePermission(memberId, viewRetentionReportsId); + handleDeleteRolePermission(memberId, viewRetentionReportsId); } setViewRetentionReportsMember(!viewRetentionReportsMember); }; @@ -563,7 +563,7 @@ const EditPermissionsPage = () => { if (!viewAnniversaryReportsAdmin) { changeRolePermission(adminId, viewAnniversaryReportsId); } else { - deleteRolePermission(adminId, viewAnniversaryReportsId); + handleDeleteRolePermission(adminId, viewAnniversaryReportsId); } setViewAnniversaryReportsAdmin(!viewAnniversaryReportsAdmin); }; @@ -571,7 +571,7 @@ const EditPermissionsPage = () => { if (!viewAnniversaryReportsPDL) { changeRolePermission(pdlId, viewAnniversaryReportsId); } else { - deleteRolePermission(pdlId, viewAnniversaryReportsId); + handleDeleteRolePermission(pdlId, viewAnniversaryReportsId); } setViewAnniversaryReportsPDL(!viewAnniversaryReportsPDL); }; @@ -579,7 +579,7 @@ const EditPermissionsPage = () => { if (!viewAnniversaryReportsMember) { changeRolePermission(memberId, viewAnniversaryReportsId); } else { - deleteRolePermission(memberId, viewAnniversaryReportsId); + handleDeleteRolePermission(memberId, viewAnniversaryReportsId); } setViewAnniversaryReportsMember(!viewAnniversaryReportsMember); }; @@ -588,7 +588,7 @@ const EditPermissionsPage = () => { if (!viewBirthdayReportsAdmin) { changeRolePermission(adminId, viewBirthdayReportsId); } else { - deleteRolePermission(adminId, viewBirthdayReportsId); + handleDeleteRolePermission(adminId, viewBirthdayReportsId); } setViewBirthdayReportsAdmin(!viewBirthdayReportsAdmin); }; @@ -596,7 +596,7 @@ const EditPermissionsPage = () => { if (!viewBirthdayReportsPDL) { changeRolePermission(pdlId, viewBirthdayReportsId); } else { - deleteRolePermission(pdlId, viewBirthdayReportsId); + handleDeleteRolePermission(pdlId, viewBirthdayReportsId); } setViewBirthdayReportsPDL(!viewBirthdayReportsPDL); }; @@ -604,7 +604,7 @@ const EditPermissionsPage = () => { if (!viewBirthdayReportsMember) { changeRolePermission(memberId, viewBirthdayReportsId); } else { - deleteRolePermission(memberId, viewBirthdayReportsId); + handleDeleteRolePermission(memberId, viewBirthdayReportsId); } setViewBirthdayReportsMember(!viewBirthdayReportsMember); }; @@ -613,7 +613,7 @@ const EditPermissionsPage = () => { if (!viewProfileReportsAdmin) { changeRolePermission(adminId, viewProfileReportsId); } else { - deleteRolePermission(adminId, viewProfileReportsId); + handleDeleteRolePermission(adminId, viewProfileReportsId); } setViewProfileReportsAdmin(!viewProfileReportsAdmin); }; @@ -621,7 +621,7 @@ const EditPermissionsPage = () => { if (!viewProfileReportsPDL) { changeRolePermission(pdlId, viewProfileReportsId); } else { - deleteRolePermission(pdlId, viewProfileReportsId); + handleDeleteRolePermission(pdlId, viewProfileReportsId); } setViewProfileReportsPDL(!viewProfileReportsPDL); }; @@ -629,7 +629,7 @@ const EditPermissionsPage = () => { if (!viewProfileReportsMember) { changeRolePermission(memberId, viewProfileReportsId); } else { - deleteRolePermission(memberId, viewProfileReportsId); + handleDeleteRolePermission(memberId, viewProfileReportsId); } setViewProfileReportsMember(!viewProfileReportsMember); }; @@ -638,7 +638,7 @@ const EditPermissionsPage = () => { if (!updateCheckinsAdmin) { changeRolePermission(adminId, updateCheckinsId); } else { - deleteRolePermission(adminId, updateCheckinsId); + handleDeleteRolePermission(adminId, updateCheckinsId); } setUpdateCheckinsAdmin(!updateCheckinsAdmin); }; @@ -646,7 +646,7 @@ const EditPermissionsPage = () => { if (!updateCheckinsPDL) { changeRolePermission(pdlId, updateCheckinsId); } else { - deleteRolePermission(pdlId, updateCheckinsId); + handleDeleteRolePermission(pdlId, updateCheckinsId); } setUpdateCheckinsPDL(!updateCheckinsPDL); }; @@ -654,7 +654,7 @@ const EditPermissionsPage = () => { if (!updateCheckinsMember) { changeRolePermission(memberId, updateCheckinsId); } else { - deleteRolePermission(memberId, updateCheckinsId); + handleDeleteRolePermission(memberId, updateCheckinsId); } setUpdateCheckinsMember(!updateCheckinsMember); }; @@ -663,7 +663,7 @@ const EditPermissionsPage = () => { if (!createCheckinsAdmin) { changeRolePermission(adminId, createCheckinsId); } else { - deleteRolePermission(adminId, createCheckinsId); + handleDeleteRolePermission(adminId, createCheckinsId); } setCreateCheckinsAdmin(!createCheckinsAdmin); }; @@ -671,7 +671,7 @@ const EditPermissionsPage = () => { if (!createCheckinsPDL) { changeRolePermission(pdlId, createCheckinsId); } else { - deleteRolePermission(pdlId, createCheckinsId); + handleDeleteRolePermission(pdlId, createCheckinsId); } setCreateCheckinsPDL(!createCheckinsPDL); }; @@ -679,7 +679,7 @@ const EditPermissionsPage = () => { if (!createCheckinsMember) { changeRolePermission(memberId, createCheckinsId); } else { - deleteRolePermission(memberId, createCheckinsId); + handleDeleteRolePermission(memberId, createCheckinsId); } setCreateCheckinsMember(!createCheckinsMember); }; @@ -688,7 +688,7 @@ const EditPermissionsPage = () => { if (!viewCheckinsAdmin) { changeRolePermission(adminId, viewCheckinsId); } else { - deleteRolePermission(adminId, viewCheckinsId); + handleDeleteRolePermission(adminId, viewCheckinsId); } setViewCheckinsAdmin(!viewCheckinsAdmin); }; @@ -696,7 +696,7 @@ const EditPermissionsPage = () => { if (!viewCheckinsPDL) { changeRolePermission(pdlId, viewCheckinsId); } else { - deleteRolePermission(pdlId, viewCheckinsId); + handleDeleteRolePermission(pdlId, viewCheckinsId); } setViewCheckinsPDL(!viewCheckinsPDL); }; @@ -704,7 +704,7 @@ const EditPermissionsPage = () => { if (!viewCheckinsMember) { changeRolePermission(memberId, viewCheckinsId); } else { - deleteRolePermission(memberId, viewCheckinsId); + handleDeleteRolePermission(memberId, viewCheckinsId); } setViewCheckinsMember(!viewCheckinsMember); }; diff --git a/web-ui/src/pages/PermissionsPage.jsx b/web-ui/src/pages/PermissionsPage.jsx index 726aa9d7b7..b817cfafbf 100644 --- a/web-ui/src/pages/PermissionsPage.jsx +++ b/web-ui/src/pages/PermissionsPage.jsx @@ -69,9 +69,6 @@ const EditPermissionsPage = () => { const hasPermission = selectHasPermissionAssignmentPermission(state); const [selectedRole, setSelectedRole] = useState(roles[0]); const [categoriesList, setCategoriesList] = useState([]); - //TODO: This is not yet getting the "Pulse" category of permissions, - // so they don't appear on this page. - console.log('PermissionsPage.jsx : categoriesList =', categoriesList); const [rolePermissionsList, setRolePermissionsList] = useState([]); const [rolePermissions, setRolePermissions] = useState([]); const [refresh, setRefresh] = useState(true); @@ -93,17 +90,15 @@ const EditPermissionsPage = () => { useEffect(() => { const getRolePermissions = async () => { - let res = await getRolePermissionsList(csrf); - let data = - res.payload && res.payload.data && !res.error ? res.payload.data : null; + const res = await getRolePermissionsList(csrf); + const data = res.payload?.data && !res.error ? res.payload.data : null; if (data) { setRolePermissionsList(data); } }; const getPermissions = async () => { - let res = await getPermissionsList(csrf); - let data = - res.payload && res.payload.data && !res.error ? res.payload.data : null; + const res = await getPermissionsList(csrf); + const data = res.payload?.data && !res.error ? res.payload.data : null; if (data) { setCategoriesList(groupPermissionsByCategory(data)); } diff --git a/web-ui/src/pages/PulseReportPage.jsx b/web-ui/src/pages/PulseReportPage.jsx index c983604adc..708cf0e7f1 100644 --- a/web-ui/src/pages/PulseReportPage.jsx +++ b/web-ui/src/pages/PulseReportPage.jsx @@ -89,7 +89,9 @@ const PulseReportPage = () => { const memberMap = selectProfileMap(state); // Mock the date if under test so the snapshot stays consistent - const today = process?.env?.VITEST_WORKER_ID ? new Date(2024, 5, 4) : new Date(); + const today = import.meta.env.VITEST_WORKER_ID + ? new Date(2024, 5, 4) + : new Date(); const initialDateFrom = new Date(today); initialDateFrom.setMonth(initialDateFrom.getMonth() - 3); const [dateFrom, setDateFrom] = useState(initialDateFrom);