AA-124: Show course end alert (#135)

This is a parity-with-LMS change, to bring their warning about
the course ending within a couple weeks to the MFE.
This commit is contained in:
Michael Terry
2020-08-03 09:53:40 -04:00
committed by GitHub
parent 7ad501d73b
commit e4d6d37c4e
7 changed files with 161 additions and 11 deletions

View File

@@ -0,0 +1,98 @@
import React from 'react';
import PropTypes from 'prop-types';
import {
FormattedDate,
FormattedMessage,
FormattedRelative,
FormattedTime,
} from '@edx/frontend-platform/i18n';
import { Alert, ALERT_TYPES } from '../../generic/user-messages';
const DAY_MS = 24 * 60 * 60 * 1000; // in ms
function CourseEndAlert({ payload }) {
const {
delta,
description,
endDate,
userTimezone,
} = payload;
const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
const timeRemaining = (
<FormattedRelative
key="timeRemaining"
value={endDate}
{...timezoneFormatArgs}
/>
);
let msg;
if (delta < DAY_MS) {
const courseEndTime = (
<FormattedTime
key="courseEndTime"
day="numeric"
month="short"
year="numeric"
hour12={false}
timeZoneName="short"
value={endDate}
{...timezoneFormatArgs}
/>
);
msg = (
<FormattedMessage
id="learning.outline.alert.end.short"
defaultMessage="This course is ending {timeRemaining} at {courseEndTime}."
description="Used when the time remaining is less than a day away."
values={{
courseEndTime,
timeRemaining,
}}
/>
);
} else {
const courseEndDate = (
<FormattedDate
key="courseEndDate"
day="numeric"
month="short"
year="numeric"
value={endDate}
{...timezoneFormatArgs}
/>
);
msg = (
<FormattedMessage
id="learning.outline.alert.end.long"
defaultMessage="This course is ending {timeRemaining} on {courseEndDate}."
description="Used when the time remaining is more than a day away."
values={{
courseEndDate,
timeRemaining,
}}
/>
);
}
return (
<Alert type={ALERT_TYPES.INFO}>
<strong>{msg}</strong><br />
{description}
</Alert>
);
}
CourseEndAlert.propTypes = {
payload: PropTypes.shape({
delta: PropTypes.number,
description: PropTypes.string,
endDate: PropTypes.string,
userTimezone: PropTypes.string,
}).isRequired,
};
export default CourseEndAlert;

View File

@@ -0,0 +1,41 @@
/* eslint-disable import/prefer-default-export */
import React from 'react';
import { useAlert } from '../../generic/user-messages';
import { useModel } from '../../generic/model-store';
const CourseEndAlert = React.lazy(() => import('./CourseEndAlert'));
// period of time (in ms) before end of course during which we alert
const WARNING_PERIOD_MS = 14 * 24 * 60 * 60 * 1000; // 14 days
export function useCourseEndAlert(courseId) {
const {
isEnrolled,
} = useModel('courses', courseId);
const {
datesWidget: {
courseDateBlocks,
userTimezone,
},
} = useModel('outline', courseId);
const endBlock = courseDateBlocks.find(b => b.dateType === 'course-end-date');
const endDate = endBlock ? new Date(endBlock.date) : null;
const delta = endBlock ? endDate - new Date() : 0;
const isVisible = isEnrolled && endBlock && delta > 0 && delta < WARNING_PERIOD_MS;
useAlert(isVisible, {
code: 'clientCourseEndAlert',
payload: {
delta,
description: endBlock && endBlock.description,
endDate: endBlock && endBlock.date,
userTimezone,
},
topic: 'outline-course-alerts',
});
return {
clientCourseEndAlert: CourseEndAlert,
};
}

View File

@@ -0,0 +1 @@
export { useCourseEndAlert as default } from './hooks';

View File

@@ -26,7 +26,7 @@ export function useEnrollmentAlert(courseId) {
topic: 'outline',
});
return EnrollmentAlert;
return { clientEnrollmentAlert: EnrollmentAlert };
}
export function useEnrollClickHandler(courseId, successText) {

View File

@@ -1,8 +1,10 @@
/* eslint-disable import/prefer-default-export */
import { useContext } from 'react';
import React, { useContext } from 'react';
import { AppContext } from '@edx/frontend-platform/react';
import { ALERT_TYPES, useAlert } from '../../generic/user-messages';
const LogistrationAlert = React.lazy(() => import('./LogistrationAlert'));
export function useLogistrationAlert() {
const { authenticatedUser } = useContext(AppContext);
const isVisible = authenticatedUser === null;
@@ -13,4 +15,6 @@ export function useLogistrationAlert() {
dismissible: false,
type: ALERT_TYPES.ERROR,
});
return { clientLogistrationAlert: LogistrationAlert };
}

View File

@@ -1,2 +1 @@
export { default } from './LogistrationAlert';
export { useLogistrationAlert } from './hooks';
export { useLogistrationAlert as default } from './hooks';

View File

@@ -10,13 +10,12 @@ import CourseHandouts from './widgets/CourseHandouts';
import CourseTools from './widgets/CourseTools';
import messages from './messages';
import Section from './Section';
import useCourseEndAlert from '../../alerts/course-end-alert';
import useEnrollmentAlert from '../../alerts/enrollment-alert';
import { useLogistrationAlert } from '../../alerts/logistration-alert';
import useLogistrationAlert from '../../alerts/logistration-alert';
import { useModel } from '../../generic/model-store';
import WelcomeMessage from './widgets/WelcomeMessage';
const LogistrationAlert = React.lazy(() => import('../../alerts/logistration-alert'));
function OutlineTab({ intl }) {
const {
courseId,
@@ -39,8 +38,9 @@ function OutlineTab({ intl }) {
},
} = useModel('outline', courseId);
const clientEnrollmentAlert = useEnrollmentAlert(courseId);
useLogistrationAlert();
const courseEndAlert = useCourseEndAlert(courseId);
const enrollmentAlert = useEnrollmentAlert(courseId);
const logistrationAlert = useLogistrationAlert();
const rootCourseId = Object.keys(courses)[0];
const { sectionIds } = courses[rootCourseId];
@@ -51,8 +51,8 @@ function OutlineTab({ intl }) {
topic="outline"
className="mb-3"
customAlerts={{
clientEnrollmentAlert,
clientLogistrationAlert: LogistrationAlert,
...enrollmentAlert,
...logistrationAlert,
}}
/>
<div className="d-flex justify-content-between mb-3">
@@ -62,6 +62,13 @@ function OutlineTab({ intl }) {
<div className="row">
<div className="col col-8">
<WelcomeMessage courseId={courseId} />
<AlertList
topic="outline-course-alerts"
className="mb-3"
customAlerts={{
...courseEndAlert,
}}
/>
{sectionIds.map((sectionId) => (
<Section
key={sectionId}