Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev to Release notifications update perms #1081

Merged
merged 6 commits into from
Jun 5, 2023
Merged

Dev to Release notifications update perms #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ba9a56
update worflow notifications
dnhdruk Jun 5, 2023
062fa1a
update dar perms
dnhdruk Jun 5, 2023
87d14a6
Merge pull request #1079 from HDRUK/notifications_update_permissions
dnhdruk Jun 5, 2023
8dd939c
update chart version for send perms
dnhdruk Jun 5, 2023
fdc159c
Merge pull request #1080 from HDRUK/notifications_update_permissions
dnhdruk Jun 5, 2023
efc6bed
Merge branch 'release' into dev
dnhdruk Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v5.0.4
v5.0.5
28 changes: 14 additions & 14 deletions src/resources/datarequest/datarequest.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1844,7 +1844,7 @@ export default class DataRequestController extends Controller {

switch (type) {
case constants.notificationTypes.INPROGRESS:
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
custodianManagersIds = custodianManagers.map(user => user.id);
notificationTeam = accessRecord.publisherObj.team.notifications;
if (notificationTeam.length && notificationTeam[0].optIn) {
Expand Down Expand Up @@ -1884,7 +1884,7 @@ export default class DataRequestController extends Controller {
// 1. Create notifications
// Custodian manager and current step reviewer notifications
// Retrieve all custodian manager user Ids and active step reviewers
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
let activeStep = this.workflowService.getActiveWorkflowStep(workflow);
stepReviewers = this.workflowService.getStepReviewers(activeStep);
// Create custodian notification
Expand Down Expand Up @@ -1956,7 +1956,7 @@ export default class DataRequestController extends Controller {
// Custodian notification
if (_.has(accessRecord.datasets[0], 'publisher.team.users') && accessRecord.datasets[0].publisher.allowAccessRequestManagement) {
// Retrieve all custodian user Ids to generate notifications
custodianManagers = teamController.getTeamMembersByRole(accessRecord.datasets[0].publisher.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.datasets[0].publisher.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
// check if publisher.team has email notifications
custodianUserIds = custodianManagers.map(user => user.id);
await notificationBuilder.triggerNotificationMessage(
Expand All @@ -1976,7 +1976,7 @@ export default class DataRequestController extends Controller {
}
} else if (_.has(accessRecord, 'publisherObj') && accessRecord.publisherObj.allowAccessRequestManagement) {
// Retrieve all custodian user Ids to generate notifications
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
// check if publisher.team has email notifications
custodianUserIds = custodianManagers.map(user => user.id);
await notificationBuilder.triggerNotificationMessage(
Expand Down Expand Up @@ -2089,7 +2089,7 @@ export default class DataRequestController extends Controller {
// Custodian notification
if (_.has(accessRecord.datasets[0], 'publisher.team.users')) {
// Retrieve all custodian user Ids to generate notifications
custodianManagers = teamController.getTeamMembersByRole(accessRecord.datasets[0].publisher.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.datasets[0].publisher.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
custodianUserIds = custodianManagers.map(user => user.id);
await notificationBuilder.triggerNotificationMessage(
custodianUserIds,
Expand All @@ -2107,7 +2107,7 @@ export default class DataRequestController extends Controller {
}
} else if (_.has(accessRecord, 'publisherObj') && accessRecord.publisherObj.allowAccessRequestManagement) {
// Retrieve all custodian user Ids to generate notifications
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, constants.roleMemberTeam.CUST_DAR_MANAGER);

custodianUserIds = custodianManagers.map(user => user.id);
await notificationBuilder.triggerNotificationMessage(
Expand Down Expand Up @@ -2326,7 +2326,7 @@ export default class DataRequestController extends Controller {
break;
case constants.notificationTypes.FINALDECISIONREQUIRED:
// 1. Get managers for publisher
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
custodianManagersIds = custodianManagers.map(user => user.id);

// 2. Create manager notifications
Expand Down Expand Up @@ -2364,7 +2364,7 @@ export default class DataRequestController extends Controller {
);
break;
case constants.notificationTypes.DEADLINEWARNING:
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
custodianManagersIds = custodianManagers.map(user => user.id);
notificationTeam = accessRecord.publisherObj.team.notifications;
if (notificationTeam.length && notificationTeam[0].optIn) {
Expand Down Expand Up @@ -2407,7 +2407,7 @@ export default class DataRequestController extends Controller {
break;
case constants.notificationTypes.DEADLINEPASSED:
// 1. Get all managers
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
custodianManagersIds = custodianManagers.map(user => user.id);
// 2. Combine managers and reviewers remaining
let deadlinePassedUserIds = [...remainingReviewerUserIds, ...custodianManagersIds];
Expand Down Expand Up @@ -2454,7 +2454,7 @@ export default class DataRequestController extends Controller {
break;
case constants.notificationTypes.WORKFLOWASSIGNED:
// 1. Get managers for publisher
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team.toObject(), 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team.toObject(), constants.roleMemberTeam.CUST_DAR_MANAGER);
// 2. Get managerIds for notifications
custodianManagersIds = custodianManagers.map(user => user.id);
// 3. deconstruct and set options for notifications and email
Expand Down Expand Up @@ -2592,7 +2592,7 @@ export default class DataRequestController extends Controller {
// Custodian notification
if (_.has(accessRecord.datasets[0], 'publisher.team.users')) {
// Retrieve all custodian user Ids to generate notifications
custodianManagers = teamController.getTeamMembersByRole(accessRecord.datasets[0].publisher.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.datasets[0].publisher.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
custodianUserIds = custodianManagers.map(user => user.id);
await notificationBuilder.triggerNotificationMessage(
custodianUserIds,
Expand All @@ -2602,7 +2602,7 @@ export default class DataRequestController extends Controller {
);
} else if (_.has(accessRecord, 'publisherObj')) {
// Retrieve all custodian user Ids to generate notifications
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, 'All');
custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
custodianUserIds = custodianManagers.map(user => user.id);
await notificationBuilder.triggerNotificationMessage(
custodianUserIds,
Expand Down Expand Up @@ -2693,7 +2693,7 @@ export default class DataRequestController extends Controller {
break;
case constants.notificationTypes.MESSAGESENT:
if (userType === constants.userTypes.APPLICANT) {
const custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, 'All');
const custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
const custodianManagersIds = custodianManagers.map(user => user.id);

notificationTeam = accessRecord.publisherObj.team.notifications;
Expand Down Expand Up @@ -2728,7 +2728,7 @@ export default class DataRequestController extends Controller {
false
);
} else if (userType === constants.userTypes.CUSTODIAN) {
const custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, 'All');
const custodianManagers = teamController.getTeamMembersByRole(accessRecord.publisherObj.team, constants.roleMemberTeam.CUST_DAR_MANAGER);
const custodianManagersIds = custodianManagers.map(user => user.id);

notificationTeam = accessRecord.publisherObj.team.notifications;
Expand Down
2 changes: 1 addition & 1 deletion src/resources/workflow/workflow.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export default class WorkflowService {
// deconstruct context
let { publisherObj, workflow = {}, actioner = '' } = context;

custodianManagers = teamController.getTeamMembersByRole(publisherObj, 'All');
custodianManagers = teamController.getTeamMembersByRole(publisherObj, constants.roleMemberTeam.CUST_DAR_MANAGER);
if (has(publisherObj.notifications[0], 'optIn') && publisherObj.notifications[0].optIn) {
publisherObj.notifications[0].subscribedEmails.map(teamEmail => {
custodianManagers.push({ email: teamEmail });
Expand Down