Skip to content

Commit d3b4a7f

Browse files
authored
feat: remove upgrade refs course banner (#585)
1 parent 9e63777 commit d3b4a7f

File tree

4 files changed

+6
-96
lines changed

4 files changed

+6
-96
lines changed

src/containers/CourseCard/components/CourseCardBanners/CourseBanner.jsx

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export const CourseBanner = ({ cardId }) => {
1212
const {
1313
isVerified,
1414
isAuditAccessExpired,
15-
canUpgrade,
1615
coursewareAccess = {},
1716
} = reduxHooks.useCardEnrollmentData(cardId);
1817
const courseRun = reduxHooks.useCardCourseRunData(cardId);
@@ -26,31 +25,15 @@ export const CourseBanner = ({ cardId }) => {
2625
return (
2726
<>
2827
{isAuditAccessExpired
29-
&& (canUpgrade ? (
30-
<Banner>
31-
{formatMessage(messages.auditAccessExpired)}
32-
{' '}
33-
{formatMessage(messages.upgradeToAccess)}
34-
</Banner>
35-
) : (
28+
&& (
3629
<Banner>
3730
{formatMessage(messages.auditAccessExpired)}
3831
{' '}
3932
<Hyperlink isInline destination="">
4033
{formatMessage(messages.findAnotherCourse)}
4134
</Hyperlink>
4235
</Banner>
43-
))}
44-
45-
{courseRun.isActive && !canUpgrade && (
46-
<Banner>
47-
{formatMessage(messages.upgradeDeadlinePassed)}
48-
{' '}
49-
<Hyperlink isInline destination={courseRun.marketingUrl || ''}>
50-
{formatMessage(messages.exploreCourseDetails)}
51-
</Hyperlink>
52-
</Banner>
53-
)}
36+
)}
5437

5538
{(!isStaff && isTooEarly && courseRun.startDate) && (
5639
<Banner>
@@ -59,6 +42,7 @@ export const CourseBanner = ({ cardId }) => {
5942
})}
6043
</Banner>
6144
)}
45+
6246
{(!isStaff && hasUnmetPrerequisites) && (
6347
<Banner>{formatMessage(messages.prerequisitesNotMet)}</Banner>
6448
)}

src/containers/CourseCard/components/CourseCardBanners/CourseBanner.test.jsx

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ let el;
2525

2626
const enrollmentData = {
2727
isVerified: false,
28-
canUpgrade: false,
2928
isAuditAccessExpired: false,
3029
coursewareAccess: {
3130
hasUnmetPrerequisites: false,
@@ -65,51 +64,18 @@ describe('CourseBanner', () => {
6564
render({ enrollment: { isVerified: true } });
6665
expect(el.isEmptyRender()).toEqual(true);
6766
});
68-
describe('audit access expired, can upgrade', () => {
69-
beforeEach(() => {
70-
render({ enrollment: { isAuditAccessExpired: true, canUpgrade: true } });
71-
});
72-
test('snapshot: (auditAccessExpired, upgradeToAccess)', () => {
73-
expect(el.snapshot).toMatchSnapshot();
74-
});
75-
test('messages: (auditAccessExpired, upgradeToAccess)', () => {
76-
expect(el.instance.children[0].children[0].el).toContain(messages.auditAccessExpired.defaultMessage);
77-
expect(el.instance.children[0].children[2].el).toContain(messages.upgradeToAccess.defaultMessage);
78-
});
79-
});
80-
describe('audit access expired, cannot upgrade', () => {
67+
describe('audit access expired', () => {
8168
beforeEach(() => {
8269
render({ enrollment: { isAuditAccessExpired: true } });
8370
});
8471
test('snapshot: (auditAccessExpired, findAnotherCourse hyperlink)', () => {
8572
expect(el.snapshot).toMatchSnapshot();
8673
});
87-
test('messages: (auditAccessExpired, upgradeToAccess)', () => {
74+
test('messages: auditAccessExpired', () => {
8875
expect(el.instance.children[0].children[0].el).toContain(messages.auditAccessExpired.defaultMessage);
8976
expect(el.instance.findByType(Hyperlink)[0].children[0].el).toEqual(messages.findAnotherCourse.defaultMessage);
9077
});
9178
});
92-
describe('course run active and cannot upgrade', () => {
93-
beforeEach(() => {
94-
render({ courseRun: { isActive: true } });
95-
});
96-
test('snapshot: (upgradseDeadlinePassed, exploreCourseDetails hyperlink)', () => {
97-
expect(el.snapshot).toMatchSnapshot();
98-
});
99-
test('messages: (upgradseDeadlinePassed, exploreCourseDetails hyperlink)', () => {
100-
expect(el.instance.children[0].children[0].el).toContain(messages.upgradeDeadlinePassed.defaultMessage);
101-
const link = el.instance.findByType(Hyperlink);
102-
expect(link[0].children[0].el).toEqual(messages.exploreCourseDetails.defaultMessage);
103-
expect(link[0].props.destination).toEqual(courseRunData.marketingUrl);
104-
});
105-
});
106-
test('no display if audit access not expired and (course is not active or can upgrade)', () => {
107-
render();
108-
// isEmptyRender() isn't true because the minimal is <Fragment />
109-
expect(el.instance.children).toEqual([]);
110-
render({ enrollment: { canUpgrade: true }, courseRun: { isActive: true } });
111-
expect(el.instance.children).toEqual([]);
112-
});
11379
describe('unmet prerequisites', () => {
11480
beforeEach(() => {
11581
render({ enrollment: { coursewareAccess: { hasUnmetPrerequisites: true } } });

src/containers/CourseCard/components/CourseCardBanners/__snapshots__/CourseBanner.test.jsx.snap

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`CourseBanner audit access expired, can upgrade snapshot: (auditAccessExpired, upgradeToAccess) 1`] = `
4-
<Fragment>
5-
<Banner>
6-
Your audit access to this course has expired.
7-
8-
Upgrade now to access your course again.
9-
</Banner>
10-
</Fragment>
11-
`;
12-
13-
exports[`CourseBanner audit access expired, cannot upgrade snapshot: (auditAccessExpired, findAnotherCourse hyperlink) 1`] = `
3+
exports[`CourseBanner audit access expired snapshot: (auditAccessExpired, findAnotherCourse hyperlink) 1`] = `
144
<Fragment>
155
<Banner>
166
Your audit access to this course has expired.
@@ -25,21 +15,6 @@ exports[`CourseBanner audit access expired, cannot upgrade snapshot: (auditAcces
2515
</Fragment>
2616
`;
2717

28-
exports[`CourseBanner course run active and cannot upgrade snapshot: (upgradseDeadlinePassed, exploreCourseDetails hyperlink) 1`] = `
29-
<Fragment>
30-
<Banner>
31-
Your upgrade deadline for this course has passed. To upgrade, enroll in a session that is farther in the future.
32-
33-
<Hyperlink
34-
destination="marketing-url"
35-
isInline={true}
36-
>
37-
Explore course details.
38-
</Hyperlink>
39-
</Banner>
40-
</Fragment>
41-
`;
42-
4318
exports[`CourseBanner snapshot: stacking banners 1`] = `<Fragment />`;
4419

4520
exports[`CourseBanner staff snapshot: isStaff 1`] = `<Fragment />`;

src/containers/CourseCard/components/CourseCardBanners/messages.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,11 @@ const messages = defineMessages({
66
description: 'Audit access expiration banner message',
77
defaultMessage: 'Your audit access to this course has expired.',
88
},
9-
upgradeToAccess: {
10-
id: 'learner-dash.courseCard.banners.upgradeToAccess',
11-
description: 'Upgrade prompt for audit-expired learners that can still upgrade',
12-
defaultMessage: 'Upgrade now to access your course again.',
13-
},
149
findAnotherCourse: {
1510
id: 'learner-dash.courseCard.banners.findAnotherCourse',
1611
description: 'Action prompt taking learners to course exploration',
1712
defaultMessage: 'Find another course',
1813
},
19-
upgradeDeadlinePassed: {
20-
id: 'learner-dash.courseCard.banners.upgradeDeadlinePassed',
21-
description: 'Audit upgrade deadline passed banner message',
22-
defaultMessage: 'Your upgrade deadline for this course has passed. To upgrade, enroll in a session that is farther in the future.',
23-
},
24-
exploreCourseDetails: {
25-
id: 'learner-dash.courseCard.banners.exploreCourseDetails',
26-
description: 'Action prompt taking learners to course details page',
27-
defaultMessage: 'Explore course details.',
28-
},
2914
certRestricted: {
3015
id: 'learner-dash.courseCard.banners.certificateRestricted',
3116
description: 'Restricted certificate warning message',

0 commit comments

Comments
 (0)