feat!: remove UpgradeButton (#536)

MaxFrank13 · web-flow · commit 777d3aa45c1a · 2025-01-13T13:50:50.000-05:00
diff --git a/src/containers/CourseCard/components/CourseCardActions/BeginCourseButton.test.jsx b/src/containers/CourseCard/components/CourseCardActions/BeginCourseButton.test.jsx
@@ -27,7 +27,7 @@ reduxHooks.useCardCourseRunData.mockReturnValue({ homeUrl });
 const execEdPath = (cardId) => `exec-ed-tracking-path=${cardId}`;
 reduxHooks.useCardExecEdTrackingParam.mockImplementation(execEdPath);
 reduxHooks.useTrackCourseEvent.mockImplementation(
-  (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
+  (eventName, cardId, url) => ({ trackCourseEvent: { eventName, cardId, url } }),
 );
 
 describe('BeginCourseButton', () => {
diff --git a/src/containers/CourseCard/components/CourseCardActions/ResumeButton.test.jsx b/src/containers/CourseCard/components/CourseCardActions/ResumeButton.test.jsx
@@ -26,7 +26,7 @@ reduxHooks.useCardCourseRunData.mockReturnValue({ resumeUrl });
 const execEdPath = (cardId) => `exec-ed-tracking-path=${cardId}`;
 reduxHooks.useCardExecEdTrackingParam.mockImplementation(execEdPath);
 reduxHooks.useTrackCourseEvent.mockImplementation(
-  (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
+  (eventName, cardId, url) => ({ trackCourseEvent: { eventName, cardId, url } }),
 );
 
 let wrapper;
diff --git a/src/containers/CourseCard/components/CourseCardActions/UpgradeButton.test.jsx b/src/containers/CourseCard/components/CourseCardActions/UpgradeButton.test.jsx
diff --git a/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.test.jsx b/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.test.jsx
@@ -15,7 +15,7 @@ jest.mock('hooks', () => ({
   reduxHooks: {
     useCardCourseRunData: jest.fn(() => ({ homeUrl: 'homeUrl' })),
     useTrackCourseEvent: jest.fn(
-      (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
+      (eventName, cardId, url) => ({ trackCourseEvent: { eventName, cardId, url } }),
     ),
   },
 }));
diff --git a/src/containers/CourseCard/components/CourseCardActions/__snapshots__/BeginCourseButton.test.jsx.snap b/src/containers/CourseCard/components/CourseCardActions/__snapshots__/BeginCourseButton.test.jsx.snap
@@ -10,7 +10,7 @@ exports[`BeginCourseButton snapshot disabled snapshot 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "upgradeUrl": "home-urlexec-ed-tracking-path=cardId",
+        "url": "home-urlexec-ed-tracking-path=cardId",
       },
     }
   }
@@ -29,7 +29,7 @@ exports[`BeginCourseButton snapshot enabled snapshot 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "upgradeUrl": "home-urlexec-ed-tracking-path=cardId",
+        "url": "home-urlexec-ed-tracking-path=cardId",
       },
     }
   }
diff --git a/src/containers/CourseCard/components/CourseCardActions/__snapshots__/ResumeButton.test.jsx.snap b/src/containers/CourseCard/components/CourseCardActions/__snapshots__/ResumeButton.test.jsx.snap
@@ -10,7 +10,7 @@ exports[`ResumeButton snapshot disabled snapshot 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "upgradeUrl": "resume-urlexec-ed-tracking-path=cardId",
+        "url": "resume-urlexec-ed-tracking-path=cardId",
       },
     }
   }
@@ -29,7 +29,7 @@ exports[`ResumeButton snapshot enabled snapshot 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "upgradeUrl": "resume-urlexec-ed-tracking-path=cardId",
+        "url": "resume-urlexec-ed-tracking-path=cardId",
       },
     }
   }
diff --git a/src/containers/CourseCard/components/CourseCardActions/__snapshots__/UpgradeButton.test.jsx.snap b/src/containers/CourseCard/components/CourseCardActions/__snapshots__/UpgradeButton.test.jsx.snap
diff --git a/src/containers/CourseCard/components/CourseCardActions/__snapshots__/ViewCourseButton.test.jsx.snap b/src/containers/CourseCard/components/CourseCardActions/__snapshots__/ViewCourseButton.test.jsx.snap
@@ -10,7 +10,7 @@ exports[`ViewCourseButton learner can view course 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "upgradeUrl": "homeUrl",
+        "url": "homeUrl",
       },
     }
   }
@@ -29,7 +29,7 @@ exports[`ViewCourseButton learner cannot view course 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "upgradeUrl": "homeUrl",
+        "url": "homeUrl",
       },
     }
   }
diff --git a/src/containers/CourseCard/components/CourseCardActions/messages.js b/src/containers/CourseCard/components/CourseCardActions/messages.js
@@ -1,11 +1,6 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';
 
 const messages = defineMessages({
-  upgrade: {
-    id: 'learner-dash.courseCard.actions.upgrade',
-    description: 'Course card upgrade button text',
-    defaultMessage: 'Upgrade',
-  },
   beginCourse: {
     id: 'learner-dash.courseCard.actions.beginCourse',
     description: 'Course card begin-course button text',
diff --git a/src/containers/CourseCard/components/CourseCardImage.test.jsx b/src/containers/CourseCard/components/CourseCardImage.test.jsx
@@ -18,8 +18,8 @@ jest.mock('hooks', () => ({
     useCardCourseData: jest.fn(() => ({ bannerImgSrc: 'banner-img-src' })),
     useCardCourseRunData: jest.fn(() => ({ homeUrl })),
     useCardEnrollmentData: jest.fn(() => ({ isVerified: true })),
-    useTrackCourseEvent: jest.fn((eventName, cardId, upgradeUrl) => ({
-      trackCourseEvent: { eventName, cardId, upgradeUrl },
+    useTrackCourseEvent: jest.fn((eventName, cardId, url) => ({
+      trackCourseEvent: { eventName, cardId, url },
     })),
   },
 }));
diff --git a/src/containers/CourseCard/components/CourseCardTitle.test.jsx b/src/containers/CourseCard/components/CourseCardTitle.test.jsx
@@ -17,8 +17,8 @@ jest.mock('hooks', () => ({
   reduxHooks: {
     useCardCourseData: jest.fn(() => ({ courseName: 'course-name' })),
     useCardCourseRunData: jest.fn(() => ({ homeUrl })),
-    useTrackCourseEvent: jest.fn((eventName, cardId, upgradeUrl) => ({
-      trackCourseEvent: { eventName, cardId, upgradeUrl },
+    useTrackCourseEvent: jest.fn((eventName, cardId, url) => ({
+      trackCourseEvent: { eventName, cardId, url },
     })),
   },
 }));
diff --git a/src/containers/CourseCard/components/__snapshots__/CourseCardImage.test.jsx.snap b/src/containers/CourseCard/components/__snapshots__/CourseCardImage.test.jsx.snap
@@ -9,7 +9,7 @@ exports[`CourseCardImage snapshot renders clickable link course Image 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.courseImageClicked],
-        "upgradeUrl": "home-url",
+        "url": "home-url",
       },
     }
   }
diff --git a/src/containers/CourseCard/components/__snapshots__/CourseCardTitle.test.jsx.snap b/src/containers/CourseCard/components/__snapshots__/CourseCardTitle.test.jsx.snap
@@ -11,7 +11,7 @@ exports[`CourseCardTitle snapshot renders clickable link course title 1`] = `
         "trackCourseEvent": {
           "cardId": "cardId",
           "eventName": [MockFunction segment.courseTitleClicked],
-          "upgradeUrl": "home-url",
+          "url": "home-url",
         },
       }
     }
diff --git a/src/containers/CourseCard/components/hooks.js b/src/containers/CourseCard/components/hooks.js
@@ -3,27 +3,25 @@ import { reduxHooks } from 'hooks';
 export const useActionDisabledState = (cardId) => {
   const { isMasquerading } = reduxHooks.useMasqueradeData();
   const {
-    canUpgrade, hasAccess, isAudit, isAuditAccessExpired,
+    hasAccess, isAudit, isAuditAccessExpired,
   } = reduxHooks.useCardEnrollmentData(cardId);
   const {
     isEntitlement, isFulfilled, canChange, hasSessions,
   } = reduxHooks.useCardEntitlementData(cardId);
 
-  const { resumeUrl, homeUrl, upgradeUrl } = reduxHooks.useCardCourseRunData(cardId);
+  const { resumeUrl, homeUrl } = reduxHooks.useCardCourseRunData(cardId);
 
   const disableBeginCourse = !homeUrl || (isMasquerading || !hasAccess || (isAudit && isAuditAccessExpired));
   const disableResumeCourse = !resumeUrl || (isMasquerading || !hasAccess || (isAudit && isAuditAccessExpired));
   const disableViewCourse = !hasAccess || (isAudit && isAuditAccessExpired);
   const disableSelectSession = !isEntitlement || isMasquerading || !hasAccess || (!canChange || !hasSessions);
-  const disableUpgradeCourse = !upgradeUrl || (isMasquerading && !canUpgrade);
 
   const disableCourseTitle = (isEntitlement && !isFulfilled) || disableViewCourse;
 
   return {
     disableBeginCourse,
     disableResumeCourse,
     disableViewCourse,
-    disableUpgradeCourse,
     disableSelectSession,
     disableCourseTitle,
   };
diff --git a/src/containers/CourseCard/components/hooks.test.js b/src/containers/CourseCard/components/hooks.test.js
@@ -16,7 +16,6 @@ const cardId = 'my-test-course-number';
 describe('useActionDisabledState', () => {
   const defaultData = {
     isMasquerading: false,
-    canUpgrade: false,
     isEntitlement: false,
     isFulfilled: false,
     canChange: false,
@@ -26,12 +25,10 @@ describe('useActionDisabledState', () => {
     isAuditAccessExpired: false,
     resumeUrl: 'resume.url',
     homeUrl: 'home.url',
-    upgradeUrl: 'upgrade.url',
   };
   const mockHooksData = (args) => {
     const {
       isMasquerading,
-      canUpgrade,
       isEntitlement,
       isFulfilled,
       canChange,
@@ -41,11 +38,9 @@ describe('useActionDisabledState', () => {
       isAuditAccessExpired,
       resumeUrl,
       homeUrl,
-      upgradeUrl,
     } = { ...defaultData, ...args };
     reduxHooks.useMasqueradeData.mockReturnValueOnce({ isMasquerading });
     reduxHooks.useCardEnrollmentData.mockReturnValueOnce({
-      canUpgrade,
       hasAccess,
       isAudit,
       isAuditAccessExpired,
@@ -59,7 +54,6 @@ describe('useActionDisabledState', () => {
     reduxHooks.useCardCourseRunData.mockReturnValueOnce({
       resumeUrl,
       homeUrl,
-      upgradeUrl,
     });
   };
 
@@ -121,21 +115,6 @@ describe('useActionDisabledState', () => {
       testDisabled({ hasAccess: true }, false);
     });
   });
-  describe('disableUpgradeCourse', () => {
-    const testDisabled = (data, expected) => {
-      mockHooksData(data);
-      expect(runHook().disableUpgradeCourse).toBe(expected);
-    };
-    it('disable when upgradeUrl is invalid', () => {
-      testDisabled({ upgradeUrl: null }, true);
-    });
-    it('disable when isMasquerading is true and canUpgrade is false', () => {
-      testDisabled({ isMasquerading: true, canUpgrade: false }, true);
-    });
-    it('enable when all conditions are met', () => {
-      testDisabled({ canUpgrade: true }, false);
-    });
-  });
   describe('disableSelectSession', () => {
     const testDisabled = (data, expected) => {
       mockHooksData(data);
diff --git a/src/data/redux/app/selectors/courseCard.js b/src/data/redux/app/selectors/courseCard.js
@@ -52,7 +52,6 @@ export const courseCard = StrictDict({
 
       homeUrl: courseRun.homeUrl,
       marketingUrl: courseRun.marketingUrl,
-      upgradeUrl: courseRun.upgradeUrl,
 
       progressUrl: baseAppUrl(courseRun.progressUrl),
       resumeUrl: baseAppUrl(courseRun.resumeUrl), // resume will route this to learning mfe.
diff --git a/src/data/redux/app/selectors/courseCard.test.js b/src/data/redux/app/selectors/courseCard.test.js
@@ -156,7 +156,6 @@ describe('courseCard selectors module', () => {
 
           homeUrl: 'test-home-url',
           marketingUrl: 'test-marketing-url',
-          upgradeUrl: 'test-upgrade-url',
 
           progressUrl: 'test-progress-url',
           resumeUrl: 'test-resume-url',
@@ -181,10 +180,9 @@ describe('courseCard selectors module', () => {
       it('passes minPassingGrade floored from float to a percentage value', () => {
         expect(selected.minPassingGrade).toEqual(93);
       });
-      it('passes [homeUrl, marketingUrl, upgradeUrl]', () => {
+      it('passes [homeUrl, marketingUrl]', () => {
         expect(selected.homeUrl).toEqual(testData.homeUrl);
         expect(selected.marketingUrl).toEqual(testData.marketingUrl);
-        expect(selected.upgradeUrl).toEqual(testData.upgradeUrl);
       });
       it('passes [progressUrl, unenrollUrl, resumeUrl], converted to baseAppUrl', () => {
         expect(selected.progressUrl).toEqual(baseAppUrl(testData.progressUrl));
diff --git a/src/data/services/lms/api.js b/src/data/services/lms/api.js
@@ -50,12 +50,6 @@ export const logEvent = ({ eventName, data, courseId }) => post(urls.event(), {
   event: JSON.stringify(data),
 });
 
-export const logUpgrade = ({ courseId }) => module.logEvent({
-  eventName: eventNames.upgradeButtonClickedEnrollment,
-  courseId,
-  data: { location: 'learner-dashboard' },
-});
-
 export const logShare = ({ courseId, site }) => module.logEvent({
   eventName: eventNames.shareClicked,
   courseId,
@@ -78,7 +72,6 @@ export default {
   updateEntitlementEnrollment,
   deleteEntitlementEnrollment,
   logEvent,
-  logUpgrade,
   logShare,
   createCreditRequest,
 };
diff --git a/src/data/services/lms/api.test.js b/src/data/services/lms/api.test.js
@@ -130,13 +130,6 @@ describe('lms api methods', () => {
       beforeEach(() => {
         jest.spyOn(api, moduleKeys.logEvent).mockImplementation(logEvent);
       });
-      test('logUpgrade sends enrollment upgrade click event with learner dashboard location', () => {
-        expect(api.logUpgrade({ courseId })).toEqual(logEvent({
-          eventName: eventNames.upgradeButtonClickedEnrollment,
-          courseId,
-          data: { location: 'learner-dashboard' },
-        }));
-      });
       test('logShare sends share clicke vent with course id, side and location', () => {
         const site = 'test-site';
         expect(api.logShare({ courseId, site })).toEqual(logEvent({
diff --git a/src/data/services/lms/fakeData/courses.js b/src/data/services/lms/fakeData/courses.js
@@ -779,9 +779,6 @@ export const compileCourseRunData = ({ courseName, ...data }, index) => {
     courseProvider: getOption(providerOptions, index),
     programs: getOption(programsOptions, index),
   };
-  if (out.enrollment.canUpgrade) {
-    out.courseRun.upgradeUrl = 'test-upgrade-url';
-  }
   return out;
 };
 
diff --git a/src/plugin-slots/CourseCardActionSlot/index.jsx b/src/plugin-slots/CourseCardActionSlot/index.jsx
diff --git a/src/tracking/constants.js b/src/tracking/constants.js
diff --git a/src/tracking/trackers/course.js b/src/tracking/trackers/course.js
diff --git a/src/tracking/trackers/course.test.js b/src/tracking/trackers/course.test.js

Original file line number	Diff line number	Diff line change
@@ -10,7 +10,7 @@ exports[`BeginCourseButton snapshot disabled snapshot 1`] = `
`10`	`10`	`"trackCourseEvent": {`
`11`	`11`	`"cardId": "cardId",`
`12`	`12`	`"eventName": [MockFunction segment.enterCourseClicked],`
`13`		`- "upgradeUrl": "home-urlexec-ed-tracking-path=cardId",`
	`13`	`+ "url": "home-urlexec-ed-tracking-path=cardId",`
`14`	`14`	`},`
`15`	`15`	`}`
`16`	`16`	`}`
@@ -29,7 +29,7 @@ exports[`BeginCourseButton snapshot enabled snapshot 1`] = `
`29`	`29`	`"trackCourseEvent": {`
`30`	`30`	`"cardId": "cardId",`
`31`	`31`	`"eventName": [MockFunction segment.enterCourseClicked],`
`32`		`- "upgradeUrl": "home-urlexec-ed-tracking-path=cardId",`
	`32`	`+ "url": "home-urlexec-ed-tracking-path=cardId",`
`33`	`33`	`},`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
@@ -10,7 +10,7 @@ exports[`ResumeButton snapshot disabled snapshot 1`] = `
`10`	`10`	`"trackCourseEvent": {`
`11`	`11`	`"cardId": "cardId",`
`12`	`12`	`"eventName": [MockFunction segment.enterCourseClicked],`
`13`		`- "upgradeUrl": "resume-urlexec-ed-tracking-path=cardId",`
	`13`	`+ "url": "resume-urlexec-ed-tracking-path=cardId",`
`14`	`14`	`},`
`15`	`15`	`}`
`16`	`16`	`}`
@@ -29,7 +29,7 @@ exports[`ResumeButton snapshot enabled snapshot 1`] = `
`29`	`29`	`"trackCourseEvent": {`
`30`	`30`	`"cardId": "cardId",`
`31`	`31`	`"eventName": [MockFunction segment.enterCourseClicked],`
`32`		`- "upgradeUrl": "resume-urlexec-ed-tracking-path=cardId",`
	`32`	`+ "url": "resume-urlexec-ed-tracking-path=cardId",`
`33`	`33`	`},`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
@@ -10,7 +10,7 @@ exports[`ViewCourseButton learner can view course 1`] = `
`10`	`10`	`"trackCourseEvent": {`
`11`	`11`	`"cardId": "cardId",`
`12`	`12`	`"eventName": [MockFunction segment.enterCourseClicked],`
`13`		`- "upgradeUrl": "homeUrl",`
	`13`	`+ "url": "homeUrl",`
`14`	`14`	`},`
`15`	`15`	`}`
`16`	`16`	`}`
@@ -29,7 +29,7 @@ exports[`ViewCourseButton learner cannot view course 1`] = `
`29`	`29`	`"trackCourseEvent": {`
`30`	`30`	`"cardId": "cardId",`
`31`	`31`	`"eventName": [MockFunction segment.enterCourseClicked],`
`32`		`- "upgradeUrl": "homeUrl",`
	`32`	`+ "url": "homeUrl",`
`33`	`33`	`},`
`34`	`34`	`}`
`35`	`35`	`}`