Skip to content

UI - blank expiration in workflow member review should not override individual expiration #3164

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

Merged
havetisyan merged 1 commit into from
Dec 23, 2025
Merged

UI - blank expiration in workflow member review should not override individual expiration #3164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions ui/src/__tests__/server/handlers/api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ describe('Fetchr Server API Test', () => {
'user.test2',
requestTime:
'2020-04-10T04:59:33.325Z',
reviewReminder:
'2020-07-15T19:01:00.000Z',
},
],
},
Expand All @@ -263,6 +265,8 @@ describe('Fetchr Server API Test', () => {
'user.test2',
requestTime:
'2020-04-10T06:04:29.337Z',
reviewReminder:
'2020-07-15T19:02:00.000Z',
},
],
},
Expand All @@ -278,6 +282,8 @@ describe('Fetchr Server API Test', () => {
'user.test2',
requestTime:
'2020-04-10T05:11:32.667Z',
reviewReminder:
'2020-07-15T19:03:00.000Z',
},
],
},
Expand Down Expand Up @@ -920,6 +926,7 @@ describe('Fetchr Server API Test', () => {
category: 'role',
requestPrincipal: 'user.test2',
requestTime: '2020-04-10T04:59:33.325Z',
reviewReminder: '2020-07-15T19:01:00.000Z',
expiryDate: '2020-07-17T19:00:00.000Z',
memberNameFull: null,
requestPrincipalFull: null,
Expand All @@ -933,6 +940,7 @@ describe('Fetchr Server API Test', () => {
auditRef: '',
requestPrincipal: 'user.test2',
requestTime: '2020-04-10T06:04:29.337Z',
reviewReminder: '2020-07-15T19:02:00.000Z',
expiryDate: null,
memberNameFull: null,
requestPrincipalFull: null,
Expand All @@ -945,6 +953,7 @@ describe('Fetchr Server API Test', () => {
userComment: 'ee',
auditRef: '',
requestPrincipal: 'user.test2',
reviewReminder: '2020-07-15T19:03:00.000Z',
requestTime: '2020-04-10T05:11:32.667Z',
expiryDate: null,
memberNameFull: null,
Expand Down Expand Up @@ -979,6 +988,7 @@ describe('Fetchr Server API Test', () => {
category: 'role',
requestPrincipal: 'user.test2',
requestTime: '2020-04-10T04:59:33.325Z',
reviewReminder: '2020-07-15T19:01:00.000Z',
expiryDate: '2020-07-17T19:00:00.000Z',
memberNameFull: null,
requestPrincipalFull: null,
Expand All @@ -992,6 +1002,7 @@ describe('Fetchr Server API Test', () => {
auditRef: '',
requestPrincipal: 'user.test2',
requestTime: '2020-04-10T06:04:29.337Z',
reviewReminder: '2020-07-15T19:02:00.000Z',
expiryDate: null,
memberNameFull: null,
requestPrincipalFull: null,
Expand All @@ -1005,6 +1016,7 @@ describe('Fetchr Server API Test', () => {
auditRef: '',
requestPrincipal: 'user.test2',
requestTime: '2020-04-10T05:11:32.667Z',
reviewReminder: '2020-07-15T19:03:00.000Z',
expiryDate: null,
memberNameFull: null,
requestPrincipalFull: null,
Expand Down
10 changes: 10 additions & 0 deletions ui/src/__tests__/server/utils/apiUtils.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ describe('apiUtils test', () => {
auditRef: 'test',
requestTime: '2022-02-15T19:03:52.620Z',
requestPrincipal: humanUser.id,
reviewReminder:
'2022-02-16T18:14:12.999Z',
pendingState: 'DELETE',
},
],
},
Expand All @@ -58,6 +61,9 @@ describe('apiUtils test', () => {
auditRef: 'testing1',
requestPrincipal: humanUser.id,
requestTime: '2022-02-15T18:14:12.999Z',
reviewReminder:
'2022-02-17T18:14:12.999Z',
pendingState: 'ADD',
},
],
},
Expand All @@ -80,6 +86,8 @@ describe('apiUtils test', () => {
requestPrincipal: humanUser.id,
requestPrincipalFull: null,
requestTime: '2022-02-15T18:14:12.999Z',
reviewReminder: '2022-02-17T18:14:12.999Z',
pendingState: 'ADD',
roleName: 'testrole1',
userComment: 'testing1',
},
Expand All @@ -93,6 +101,8 @@ describe('apiUtils test', () => {
requestPrincipal: humanUser.id,
requestPrincipalFull: null,
requestTime: '2022-02-15T19:03:52.620Z',
reviewReminder: '2022-02-16T18:14:12.999Z',
pendingState: 'DELETE',
roleName: 'testgroup',
userComment: 'test',
},
Expand Down
16 changes: 13 additions & 3 deletions ui/src/components/pending-approval/PendingApprovalTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ class PendingApprovalTable extends React.Component {
checkedList: [],
selectAllAuditMissing: false,
selectAllDateExpiry: '',
selectAllReviewReminder: '',
selectAllDateReviewReminder: '',
error: '',
});
}
Expand Down Expand Up @@ -256,11 +256,21 @@ class PendingApprovalTable extends React.Component {
return;
}
this.state.checkedList.forEach((key) => {
// Preserve individual expiration/reviewReminder if top-level fields are blank
// If top-level fields are set, use them (allows bulk override)
const expiration =
this.state.selectAllDateExpiry ||
this.state.pendingMap[key].expiryDate ||
'';
const reviewReminder =
this.state.selectAllDateReviewReminder ||
this.state.pendingMap[key].reviewReminder ||
'';
let membership = {
memberName: this.state.pendingMap[key].memberName,
approved,
expiration: this.state.selectAllDateExpiry,
reviewReminder: this.state.selectAllDateReviewReminder,
expiration: expiration,
reviewReminder: reviewReminder,
pendingState: this.state.pendingMap[key].pendingState,
};
this.props
Expand Down
4 changes: 4 additions & 0 deletions ui/src/server/utils/apiUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module.exports.getPendingDomainMemberData = (values) => {
member.memberRoles.forEach((role) => {
const roleName = role.roleName;
const expiryDate = role.expiration || null;
const reviewReminder = role.reviewReminder || null;
const userComment = role.auditRef || null;
const key = domainName + memberName + roleName;
pendingMap[key] = {
Expand All @@ -42,6 +43,7 @@ module.exports.getPendingDomainMemberData = (values) => {
),
requestTime: role.requestTime,
expiryDate: expiryDate,
reviewReminder: reviewReminder,
pendingState: role.pendingState,
};
});
Expand All @@ -54,6 +56,7 @@ module.exports.getPendingDomainMemberData = (values) => {
member.memberGroups.forEach((group) => {
const groupName = group.groupName;
const expiryDate = group.expiration || null;
const reviewReminder = group.reviewReminder || null;
const userComment = group.auditRef || null;
const key = domainName + memberName + groupName;
pendingMap[key] = {
Expand All @@ -70,6 +73,7 @@ module.exports.getPendingDomainMemberData = (values) => {
),
requestTime: group.requestTime,
expiryDate: expiryDate,
reviewReminder: reviewReminder,
pendingState: group.pendingState,
};
});
Expand Down
Loading