Compare commits

...

6 Commits

Author SHA1 Message Date
julianajlk
a1b9c503a4 fix: Update link name 2022-03-09 11:46:09 -05:00
julianajlk
f8be015a61 fix: Replace course details URL with search URL in gated content 2022-03-08 20:13:32 -05:00
julianajlk
ab115f45a5 test: Add test for event tracking in gated content 2022-03-07 14:50:09 -05:00
julianajlk
2ad3ed7b4b feat: Add event tracking for past expiration course details click in gated content 2022-03-07 14:49:41 -05:00
julianajlk
ab2554bbf7 test: Add test for past expiration messaging in gated content 2022-03-07 14:49:32 -05:00
julianajlk
c1eb54d1ab feat: Add past expiration messaging for gated content 2022-03-07 12:05:48 -05:00
5 changed files with 96 additions and 20 deletions

View File

@@ -1,9 +1,12 @@
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { getConfig } from '@edx/frontend-platform';
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { Alert, breakpoints, useWindowSize } from '@edx/paragon';
import {
Alert, Hyperlink, breakpoints, useWindowSize,
} from '@edx/paragon';
import { Locked } from '@edx/paragon/icons';
import messages from './messages';
import certificateLocked from '../../../../generic/assets/edX_locked_certificate.png';
@@ -23,6 +26,7 @@ function LockPaywall({
}) {
const course = useModel('coursewareMeta', courseId);
const {
accessExpiration,
offer,
org,
verifiedMode,
@@ -39,6 +43,9 @@ function LockPaywall({
&& !notificationTrayVisible;
const shouldWrapTextOnButton = useWindowSize().width > breakpoints.extraSmall.minWidth;
const accessExpirationDate = accessExpiration ? new Date(accessExpiration.expirationDate) : null;
const pastExpirationDeadline = accessExpiration ? new Date(Date.now()) > accessExpirationDate : false;
if (!verifiedMode) {
return null;
}
@@ -58,6 +65,16 @@ function LockPaywall({
});
};
const logClickPastExpiration = () => {
sendTrackEvent('edx.bi.ecommerce.gated_content.past_expiration.link_clicked', {
...eventProperties,
linkCategory: 'gated_content',
linkName: 'search_courses',
linkType: 'link',
pageName: 'in_course',
});
};
return (
<Alert variant="light" aria-live="off" icon={Locked} className="lock-paywall-container">
<div className="row">
@@ -65,12 +82,18 @@ function LockPaywall({
<h4 aria-level="3">
<span>{intl.formatMessage(messages['learn.lockPaywall.title'])}</span>
</h4>
{pastExpirationDeadline ? (
<div className="mb-2 upgrade-intro">
{intl.formatMessage(messages['learn.lockPaywall.content.pastExpiration'])}
<Hyperlink destination={`${getConfig().MARKETING_SITE_BASE_URL}/search?tab=course`} onClick={logClickPastExpiration} target="_blank">{intl.formatMessage(messages['learn.lockPaywall.exploreAll'])}</Hyperlink>
</div>
) : (
<div className="mb-2 upgrade-intro">
{intl.formatMessage(messages['learn.lockPaywall.content'])}
</div>
)}
<div className="mb-2 upgrade-intro">
{intl.formatMessage(messages['learn.lockPaywall.content'])}
</div>
<div className={classNames('d-flex flex-row', { 'flex-wrap': notificationTrayVisible || shouldDisplayBulletPointsBelowCertificate })}>
<div className={classNames('d-inline-flex flex-row', { 'flex-wrap': notificationTrayVisible || shouldDisplayBulletPointsBelowCertificate })}>
<div style={{ float: 'left' }} className="mr-3 mb-2">
<img
alt={intl.formatMessage(messages['learn.lockPaywall.example.alt'])}
@@ -94,20 +117,24 @@ function LockPaywall({
</div>
</div>
<div
className={
classNames('d-md-flex align-items-md-center text-right', {
'col-md-5 mx-md-0': notificationTrayVisible, 'col-md-4 mx-md-3 justify-content-center': !notificationTrayVisible && !shouldDisplayGatedContentTwoColumnsHalf, 'col-md-11 justify-content-end': shouldDisplayGatedContentOneColumn && !shouldDisplayGatedContentTwoColumns, 'col-md-6 justify-content-center': shouldDisplayGatedContentTwoColumnsHalf,
})
}
>
<UpgradeButton
offer={offer}
onClick={logClick}
verifiedMode={verifiedMode}
style={{ whiteSpace: shouldWrapTextOnButton ? 'nowrap' : null }}
/>
</div>
{pastExpirationDeadline
? null
: (
<div
className={
classNames('d-md-flex align-items-md-center text-right', {
'col-md-5 mx-md-0': notificationTrayVisible, 'col-md-4 mx-md-3 justify-content-center': !notificationTrayVisible && !shouldDisplayGatedContentTwoColumnsHalf, 'col-md-11 justify-content-end': shouldDisplayGatedContentOneColumn && !shouldDisplayGatedContentTwoColumns, 'col-md-6 justify-content-center': shouldDisplayGatedContentTwoColumnsHalf,
})
}
>
<UpgradeButton
offer={offer}
onClick={logClick}
verifiedMode={verifiedMode}
style={{ whiteSpace: shouldWrapTextOnButton ? 'nowrap' : null }}
/>
</div>
)}
</div>
</Alert>
);

View File

@@ -1,5 +1,6 @@
.alert-content.lock-paywall-container {
display: inline-flex;
width: 100%;
}
.lock-paywall-container svg {

View File

@@ -80,4 +80,39 @@ describe('Lock Paywall', () => {
expect(container).toBeEmptyDOMElement();
});
it('displays past expiration message if expiration date has expired', async () => {
const courseMetadata = Factory.build('courseMetadata', {
access_expiration: {
expiration_date: '1995-02-22T05:00:00Z',
},
});
const testStore = await initializeTestStore({ courseMetadata }, false);
render(<LockPaywall {...mockData} courseId={courseMetadata.id} />, { store: testStore });
expect(screen.getByText('The upgrade deadline for this course passed. To upgrade, enroll in the next available session.')).toBeInTheDocument();
expect(screen.getByText('Explore all courses'));
});
it('sends analytics event onClick of past expiration course details link', async () => {
sendTrackEvent.mockClear();
const courseMetadata = Factory.build('courseMetadata', {
access_expiration: {
expiration_date: '1995-02-22T05:00:00Z',
},
});
const testStore = await initializeTestStore({ courseMetadata }, false);
render(<LockPaywall {...mockData} courseId={courseMetadata.id} />, { store: testStore });
const courseDetailsLink = await screen.getByText('Explore all courses');
fireEvent.click(courseDetailsLink);
expect(sendTrackEvent).toHaveBeenCalledTimes(1);
expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.gated_content.past_expiration.link_clicked', {
org_key: 'edX',
courserun_key: mockData.courseId,
linkCategory: 'gated_content',
linkName: 'search_courses',
linkType: 'link',
pageName: 'in_course',
});
});
});

View File

@@ -11,6 +11,16 @@ const messages = defineMessages({
defaultMessage: 'Upgrade to gain access to locked features like this one and get the most out of your course.',
description: 'Message shown to indicate that a piece of content is unavailable to audit track users.',
},
'learn.lockPaywall.content.pastExpiration': {
id: 'learn.lockPaywall.content.pastExpiration',
defaultMessage: 'The upgrade deadline for this course passed. To upgrade, enroll in the next available session. ',
description: 'Message shown to indicate that a piece of content is unavailable to audit track users in a course where the expiration deadline has passed.',
},
'learn.lockPaywall.exploreAll': {
id: 'learn.lockPaywall.exploreAll',
defaultMessage: 'Explore all courses',
description: 'Link to the search page if past access expiration date',
},
'learn.lockPaywall.example.alt': {
id: 'learn.lockPaywall.example.alt',
defaultMessage: 'Example Certificate',

View File

@@ -6,6 +6,9 @@ Factory.define('courseMetadata')
.extend(courseMetadataBase)
.option('host', '')
.attrs({
access_expiration: {
expiration_date: '2032-02-22T05:00:00Z',
},
content_type_gating_enabled: false,
course_expired_message: null,
course_goals: {