feat: dismiss alert modal and cancelled assignments #900
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,33 @@ | ||
| import { ASSIGNMENT_TYPES, ASSIGNMENT_ACTION_TYPES } from '../../enterprise-user-subsidy/enterprise-offers/data/constants'; | ||
| import { | ||
| LEARNER_ACKNOWLEDGED_ASSIGNMENT_CANCELLATION_ALERT, | ||
| LEARNER_ACKNOWLEDGED_ASSIGNMENT_EXPIRATION_ALERT, | ||
| } from '../main-content/course-enrollments/data/constants'; | ||
|
|
||
| export function getIsActiveExpiredAssignment(assignments) { | ||
| const lastExpiredAlertDismissedTime = global.localStorage.getItem(LEARNER_ACKNOWLEDGED_ASSIGNMENT_EXPIRATION_ALERT); | ||
|
|
||
| const activeExpiredAssignments = assignments.filter((assignment) => ( | ||
| assignment?.actions.some((action) => ( | ||
| action.actionType === ASSIGNMENT_ACTION_TYPES.AUTOMATIC_CANCELLATION_NOTIFICATION | ||
|
There was a problem hiding this comment. Note: the cron job that runs to automatically cancel assignments will result in the assignment(s) being marked as I believe at this point, the handing of expired assignments is for the edge case where a learner is viewing an assignment in the UI that hasn't yet been canceled by the cron job. That said, I think the logic here may need to be based on the determined enrollment deadline as depicted by [idea] Refactor export const isAssignmentExpired = (assignment) => {
// Assignment is not in an allocated state, so it cannot be expired.
if (!assignment) {
return false;
}
const currentDate = dayjs();
const allocationDate = dayjs(assignment.created);
const enrollmentEndDate = dayjs(assignment.contentMetadata.enrollByDate);
const subsidyExpirationDate = dayjs(assignment.subsidyExpirationDate);
const isExpired = (
currentDate.diff(allocationDate, 'day') > 90
|| currentDate.isAfter(enrollmentEndDate)
|| currentDate.isAfter(subsidyExpirationDate)
);
const earliestAssignmentExpiryDate = [
dayjs(allocationDate).add(90, 'day'),
enrollmentEndDate,
subsidyExpirationDate,
].sort()[0]?.toDate();
return {
isExpired,
enrollByDeadline: earliestAssignmentExpiryDate,
};
};export function getHasActiveExpiredAssignment(assignments) {
const lastExpiredAlertDismissedTime = global.localStorage.getItem(LEARNER_ACKNOWLEDGED_ASSIGNMENT_EXPIRATION_ALERT);
const activeExpiredAssignments = assignments.filter((assignment) => {
const {
isExpired,
enrollByDeadline,
} = isAssignmentExpired(assignment);
if (!isExpired) {
return false;
}
return dayjs(enrollByDeadline).isAfter(new Date(lastExpiredAlertDismissedTime));
});
return activeExpiredAssignments.length > 0;
}There was a problem hiding this comment. This is a good idea for now, but really we should introduce an |
||
| && new Date(action.completedAt) > new Date(lastExpiredAlertDismissedTime) | ||
| )) | ||
| )); | ||
| return activeExpiredAssignments.length > 0; | ||
| } | ||
|
|
||
| export function getIsActiveCancelledAssignment(assignments) { | ||
|
There was a problem hiding this comment. nit: |
||
| const lastCancelledAlertDismissedTime = global.localStorage.getItem( | ||
| LEARNER_ACKNOWLEDGED_ASSIGNMENT_CANCELLATION_ALERT, | ||
| ); | ||
| const activeCancelledAssignments = assignments.filter((assignment) => ( | ||
| assignment?.actions.some((action) => ( | ||
| action.actionType === ASSIGNMENT_ACTION_TYPES.CANCELLED_NOTIFICATION | ||
| && new Date(action.completedAt) > new Date(lastCancelledAlertDismissedTime) | ||
| )) | ||
| )); | ||
| return activeCancelledAssignments.length > 0; | ||
| } | ||
|
|
||
| /** | ||
| * Takes a flattened array of assignments and returns an object containing: | ||
|
|
@@ -17,7 +46,7 @@ | |
| */ | ||
| export default function getActiveAssignments(assignments = []) { | ||
| const activeAssignments = assignments.filter((assignment) => [ | ||
| ASSIGNMENT_TYPES.ALLOCATED, | ||
| ].includes(assignment.state)); | ||
|
Comment on lines
47
to
50
There was a problem hiding this comment. @adamstankiewicz any concerns with changing this definition of There was a problem hiding this comment. @iloveagent57 @katrinan029 Yes, by removing I might recommend modifying // Renamed `getActiveAssignments` to `getAssignmentsByState`
export function getAssignmentsByState(assignments = []) {
const allAssignments = [];
const allocatedAssignments = [];
const canceledAssignments = [];
const acceptedAssignments = [];
assignments.forEach((assignment) => {
allAssignments.push(assignment);
if (assignment.state === ASSIGNMENT_TYPES.ALLOCATED) {
allocatedAssignments.push(assignment);
}
if (assignment.state === ASSIGNMENT_TYPES.CANCELLED) {
canceledAssignments.push(assignment);
}
if (assignment.state === ASSIGNMENT_TYPES.ACCEPTED) {
acceptedAssignments.push(assignment);
}
});
const hasAssignments = allAssignments.length > 0;
const hasAllocatedAssignments = allocatedAssignments.length > 0;
const hasCanceledAssignments = canceledAssignments.length > 0;
const hasAcceptedAssignments = acceptedAssignments.length > 0;
return {
assignments,
hasAssignments,
allocatedAssignments,
hasAllocatedAssignments,
canceledAssignments,
hasCanceledAssignments,
acceptedAssignments,
hasAcceptedAssignments,
};Note: This function should really only be called within |
||
| const hasAssignments = assignments.length > 0; | ||
| const hasActiveAssignments = activeAssignments.length > 0; | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit:
getHasActiveExpiredAssignmentsas we're working with plural assignments here?