From d3b4a7fc84babe7b433a6c87239a72f4e2b1f461 Mon Sep 17 00:00:00 2001 From: Maxwell Frank <92897870+MaxFrank13@users.noreply.github.com> Date: Wed, 26 Mar 2025 09:48:14 -0400 Subject: [PATCH] feat: remove upgrade refs course banner (#585) --- .../CourseCardBanners/CourseBanner.jsx | 22 ++--------- .../CourseCardBanners/CourseBanner.test.jsx | 38 +------------------ .../__snapshots__/CourseBanner.test.jsx.snap | 27 +------------ .../components/CourseCardBanners/messages.js | 15 -------- 4 files changed, 6 insertions(+), 96 deletions(-) diff --git a/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.jsx b/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.jsx index 14f88a2..db26b1c 100644 --- a/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.jsx +++ b/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.jsx @@ -12,7 +12,6 @@ export const CourseBanner = ({ cardId }) => { const { isVerified, isAuditAccessExpired, - canUpgrade, coursewareAccess = {}, } = reduxHooks.useCardEnrollmentData(cardId); const courseRun = reduxHooks.useCardCourseRunData(cardId); @@ -26,13 +25,7 @@ export const CourseBanner = ({ cardId }) => { return ( <> {isAuditAccessExpired - && (canUpgrade ? ( - - {formatMessage(messages.auditAccessExpired)} - {' '} - {formatMessage(messages.upgradeToAccess)} - - ) : ( + && ( {formatMessage(messages.auditAccessExpired)} {' '} @@ -40,17 +33,7 @@ export const CourseBanner = ({ cardId }) => { {formatMessage(messages.findAnotherCourse)} - ))} - - {courseRun.isActive && !canUpgrade && ( - - {formatMessage(messages.upgradeDeadlinePassed)} - {' '} - - {formatMessage(messages.exploreCourseDetails)} - - - )} + )} {(!isStaff && isTooEarly && courseRun.startDate) && ( @@ -59,6 +42,7 @@ export const CourseBanner = ({ cardId }) => { })} )} + {(!isStaff && hasUnmetPrerequisites) && ( {formatMessage(messages.prerequisitesNotMet)} )} diff --git a/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.test.jsx b/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.test.jsx index a6e0a62..b7c47e1 100644 --- a/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.test.jsx +++ b/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.test.jsx @@ -25,7 +25,6 @@ let el; const enrollmentData = { isVerified: false, - canUpgrade: false, isAuditAccessExpired: false, coursewareAccess: { hasUnmetPrerequisites: false, @@ -65,51 +64,18 @@ describe('CourseBanner', () => { render({ enrollment: { isVerified: true } }); expect(el.isEmptyRender()).toEqual(true); }); - describe('audit access expired, can upgrade', () => { - beforeEach(() => { - render({ enrollment: { isAuditAccessExpired: true, canUpgrade: true } }); - }); - test('snapshot: (auditAccessExpired, upgradeToAccess)', () => { - expect(el.snapshot).toMatchSnapshot(); - }); - test('messages: (auditAccessExpired, upgradeToAccess)', () => { - expect(el.instance.children[0].children[0].el).toContain(messages.auditAccessExpired.defaultMessage); - expect(el.instance.children[0].children[2].el).toContain(messages.upgradeToAccess.defaultMessage); - }); - }); - describe('audit access expired, cannot upgrade', () => { + describe('audit access expired', () => { beforeEach(() => { render({ enrollment: { isAuditAccessExpired: true } }); }); test('snapshot: (auditAccessExpired, findAnotherCourse hyperlink)', () => { expect(el.snapshot).toMatchSnapshot(); }); - test('messages: (auditAccessExpired, upgradeToAccess)', () => { + test('messages: auditAccessExpired', () => { expect(el.instance.children[0].children[0].el).toContain(messages.auditAccessExpired.defaultMessage); expect(el.instance.findByType(Hyperlink)[0].children[0].el).toEqual(messages.findAnotherCourse.defaultMessage); }); }); - describe('course run active and cannot upgrade', () => { - beforeEach(() => { - render({ courseRun: { isActive: true } }); - }); - test('snapshot: (upgradseDeadlinePassed, exploreCourseDetails hyperlink)', () => { - expect(el.snapshot).toMatchSnapshot(); - }); - test('messages: (upgradseDeadlinePassed, exploreCourseDetails hyperlink)', () => { - expect(el.instance.children[0].children[0].el).toContain(messages.upgradeDeadlinePassed.defaultMessage); - const link = el.instance.findByType(Hyperlink); - expect(link[0].children[0].el).toEqual(messages.exploreCourseDetails.defaultMessage); - expect(link[0].props.destination).toEqual(courseRunData.marketingUrl); - }); - }); - test('no display if audit access not expired and (course is not active or can upgrade)', () => { - render(); - // isEmptyRender() isn't true because the minimal is - expect(el.instance.children).toEqual([]); - render({ enrollment: { canUpgrade: true }, courseRun: { isActive: true } }); - expect(el.instance.children).toEqual([]); - }); describe('unmet prerequisites', () => { beforeEach(() => { render({ enrollment: { coursewareAccess: { hasUnmetPrerequisites: true } } }); diff --git a/src/containers/CourseCard/components/CourseCardBanners/__snapshots__/CourseBanner.test.jsx.snap b/src/containers/CourseCard/components/CourseCardBanners/__snapshots__/CourseBanner.test.jsx.snap index 4b8d43c..61c5ad4 100644 --- a/src/containers/CourseCard/components/CourseCardBanners/__snapshots__/CourseBanner.test.jsx.snap +++ b/src/containers/CourseCard/components/CourseCardBanners/__snapshots__/CourseBanner.test.jsx.snap @@ -1,16 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`CourseBanner audit access expired, can upgrade snapshot: (auditAccessExpired, upgradeToAccess) 1`] = ` - - - Your audit access to this course has expired. - - Upgrade now to access your course again. - - -`; - -exports[`CourseBanner audit access expired, cannot upgrade snapshot: (auditAccessExpired, findAnotherCourse hyperlink) 1`] = ` +exports[`CourseBanner audit access expired snapshot: (auditAccessExpired, findAnotherCourse hyperlink) 1`] = ` Your audit access to this course has expired. @@ -25,21 +15,6 @@ exports[`CourseBanner audit access expired, cannot upgrade snapshot: (auditAcces `; -exports[`CourseBanner course run active and cannot upgrade snapshot: (upgradseDeadlinePassed, exploreCourseDetails hyperlink) 1`] = ` - - - Your upgrade deadline for this course has passed. To upgrade, enroll in a session that is farther in the future. - - - Explore course details. - - - -`; - exports[`CourseBanner snapshot: stacking banners 1`] = ``; exports[`CourseBanner staff snapshot: isStaff 1`] = ``; diff --git a/src/containers/CourseCard/components/CourseCardBanners/messages.js b/src/containers/CourseCard/components/CourseCardBanners/messages.js index afd87c3..a68c48e 100644 --- a/src/containers/CourseCard/components/CourseCardBanners/messages.js +++ b/src/containers/CourseCard/components/CourseCardBanners/messages.js @@ -6,26 +6,11 @@ const messages = defineMessages({ description: 'Audit access expiration banner message', defaultMessage: 'Your audit access to this course has expired.', }, - upgradeToAccess: { - id: 'learner-dash.courseCard.banners.upgradeToAccess', - description: 'Upgrade prompt for audit-expired learners that can still upgrade', - defaultMessage: 'Upgrade now to access your course again.', - }, findAnotherCourse: { id: 'learner-dash.courseCard.banners.findAnotherCourse', description: 'Action prompt taking learners to course exploration', defaultMessage: 'Find another course', }, - upgradeDeadlinePassed: { - id: 'learner-dash.courseCard.banners.upgradeDeadlinePassed', - description: 'Audit upgrade deadline passed banner message', - defaultMessage: 'Your upgrade deadline for this course has passed. To upgrade, enroll in a session that is farther in the future.', - }, - exploreCourseDetails: { - id: 'learner-dash.courseCard.banners.exploreCourseDetails', - description: 'Action prompt taking learners to course details page', - defaultMessage: 'Explore course details.', - }, certRestricted: { id: 'learner-dash.courseCard.banners.certificateRestricted', description: 'Restricted certificate warning message',