From a04d19ff89686cfea60d32272001a1482c3e5549 Mon Sep 17 00:00:00 2001
From: Ben Warzeski <bwarzeski@edx.org>
Date: Fri, 7 Oct 2022 14:48:59 -0400
Subject: [PATCH] Bw/test fixes (#37)

---
 .../CourseCardActions/ViewCourseButton.jsx    |  3 +-
 .../ViewCourseButton.test.jsx                 |  7 -----
 src/data/redux/app/reducer.js                 | 14 ++++++---
 src/data/redux/app/reducer.test.js            | 31 ++++++++++++++++---
 src/data/redux/app/selectors/currentList.js   |  6 ++--
 .../redux/app/selectors/currentList.test.js   | 22 ++++++++++---
 src/data/redux/thunkActions/app.js            | 14 +++++----
 src/data/services/lms/fakeData/courses.js     |  2 +-
 8 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.jsx b/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.jsx
index fa5a75b..ef71610 100644
--- a/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.jsx
+++ b/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.jsx
@@ -11,11 +11,10 @@ export const ViewCourseButton = ({ cardId }) => {
   const { homeUrl } = hooks.useCardCourseRunData(cardId);
   const { hasAccess } = hooks.useCardEnrollmentData(cardId);
   const { isEntitlement, isExpired } = hooks.useCardEntitlementData(cardId);
-  const { isMasquerading } = hooks.useMasqueradeData();
   const { formatMessage } = useIntl();
   return (
     <Button
-      disabled={isMasquerading || !hasAccess || (isEntitlement && isExpired)}
+      disabled={!hasAccess || (isEntitlement && isExpired)}
       as="a"
       href={homeUrl}
     >
diff --git a/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.test.jsx b/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.test.jsx
index 88510a8..507b113 100644
--- a/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.test.jsx
@@ -9,7 +9,6 @@ jest.mock('data/redux', () => ({
     useCardCourseRunData: jest.fn(),
     useCardEnrollmentData: jest.fn(),
     useCardEntitlementData: jest.fn(),
-    useMasqueradeData: jest.fn(),
   },
 }));
 
@@ -23,11 +22,9 @@ describe('ViewCourseButton', () => {
     hasAccess = false,
     isEntitlement = false,
     isExpired = false,
-    isMasquerading = false,
   }) => {
     hooks.useCardEnrollmentData.mockReturnValueOnce({ hasAccess });
     hooks.useCardEntitlementData.mockReturnValueOnce({ isEntitlement, isExpired });
-    hooks.useMasqueradeData.mockReturnValueOnce({ isMasquerading });
     return shallow(<ViewCourseButton {...props} />);
   };
   describe('snapshot', () => {
@@ -45,10 +42,6 @@ describe('ViewCourseButton', () => {
     });
   });
   describe('behavior', () => {
-    it('disabled button when masquerading', () => {
-      const wrapper = createWrapper({ isMasquerading: true });
-      expect(wrapper.prop('disabled')).toEqual(true);
-    });
     it('disabled button without access', () => {
       const wrapper = createWrapper({ hasAccess: false, isEntitlement: false, isExpired: false });
       expect(wrapper.prop('disabled')).toEqual(true);
diff --git a/src/data/redux/app/reducer.js b/src/data/redux/app/reducer.js
index 32e21b3..9d96ae8 100644
--- a/src/data/redux/app/reducer.js
+++ b/src/data/redux/app/reducer.js
@@ -4,7 +4,6 @@ import { StrictDict } from 'utils';
 
 const initialState = {
   pageNumber: 1,
-  enrollments: [],
   courseData: {},
   entitlement: [],
   emailConfirmation: {},
@@ -17,6 +16,8 @@ const initialState = {
 
 export const cardId = (val) => `card-${val}`;
 
+export const today = Date.now();
+
 // eslint-disable-next-line no-unused-vars
 const app = createSlice({
   name: 'app',
@@ -25,10 +26,13 @@ const app = createSlice({
     loadCourses: (state, { payload: { courses } }) => ({
       ...state,
       courseData: courses.reduce(
-        (obj, curr, index) => ({
-          ...obj,
-          [cardId(index)]: { ...curr, cardId: cardId(index) },
-        }),
+        (obj, curr, index) => {
+          const out = { ...curr, cardId: cardId(index) };
+          if (out.enrollment.lastEnrolled === null) {
+            out.enrollment.lastEnrolled = today;
+          }
+          return { ...obj, [cardId(index)]: out };
+        },
         {},
       ),
     }),
diff --git a/src/data/redux/app/reducer.test.js b/src/data/redux/app/reducer.test.js
index d0643fd..00a98c1 100644
--- a/src/data/redux/app/reducer.test.js
+++ b/src/data/redux/app/reducer.test.js
@@ -1,9 +1,16 @@
 import {
-  cardId, initialState, reducer, actions,
+  cardId,
+  initialState,
+  reducer,
+  actions,
+  today,
 } from './reducer';
 
 describe('app reducer', () => {
   describe('reducers', () => {
+    beforeEach(() => {
+      jest.useFakeTimers();
+    });
     it('returns initial state', () => {
       expect(reducer(undefined, {})).toEqual(initialState);
     });
@@ -30,16 +37,19 @@ describe('app reducer', () => {
             courseRun: { cardId: courseIds[0] },
             course: 1,
             some: 'data',
+            enrollment: { lastEnrolled: 'test-last-enrolled' },
           },
           {
             courseRun: { cardId: courseIds[1] },
             course: 2,
             some: 'other data',
+            enrollment: { lastEnrolled: 'test-last-enrolled' },
           },
           {
             courseRun: { cardId: courseIds[2] },
             course: 3,
             some: 'still different data',
+            enrollment: { lastEnrolled: 'test-last-enrolled' },
           },
         ];
         const entitlementData = [
@@ -47,11 +57,13 @@ describe('app reducer', () => {
             courseRun: { cardId: entitlementIds[0] },
             course: 4,
             some: 'STILL different data',
+            enrollment: { lastEnrolled: null },
           },
           {
             courseRun: { cardId: entitlementIds[1] },
             course: 5,
             some: 'still DIFFERENT data',
+            enrollment: { lastEnrolled: null },
           },
         ];
         let out;
@@ -64,9 +76,20 @@ describe('app reducer', () => {
           expect(out.courseData).toEqual({
             [cardId(0)]: { ...enrollmentData[0], cardId: cardId(0) },
             [cardId(1)]: { ...enrollmentData[1], cardId: cardId(1) },
-            [cardId(2)]: { ...enrollmentData[2], cardId: cardId(2) },
-            [cardId(3)]: { ...entitlementData[0], cardId: cardId(3) },
-            [cardId(4)]: { ...entitlementData[1], cardId: cardId(4) },
+            [cardId(2)]: {
+              ...enrollmentData[2],
+              cardId: cardId(2),
+            },
+            [cardId(3)]: {
+              ...entitlementData[0],
+              cardId: cardId(3),
+              enrollment: { lastEnrolled: today },
+            },
+            [cardId(4)]: {
+              ...entitlementData[1],
+              cardId: cardId(4),
+              enrollment: { lastEnrolled: today },
+            },
           });
         });
       });
diff --git a/src/data/redux/app/selectors/currentList.js b/src/data/redux/app/selectors/currentList.js
index b5fbbfd..3c9bd50 100644
--- a/src/data/redux/app/selectors/currentList.js
+++ b/src/data/redux/app/selectors/currentList.js
@@ -4,10 +4,10 @@ import { FilterKeys, SortKeys } from 'data/constants/app';
 import simpleSelectors from './simpleSelectors';
 import * as module from './currentList';
 
-export const sortFn = (transform) => (v1, v2) => {
+export const sortFn = (transform, { reverse }) => (v1, v2) => {
   const [a, b] = [v1, v2].map(transform);
   if (a === b) { return 0; }
-  return (a > b) ? 1 : -1;
+  return ((a > b) ? 1 : -1) * (reverse ? -1 : 1);
 };
 
 export const courseFilters = StrictDict({
@@ -32,7 +32,7 @@ export const currentList = (allCourses, {
   filters,
 }) => allCourses
   .filter(module.courseFilterFn(filters))
-  .sort(module.sortFn(transforms[sortBy]));
+  .sort(module.sortFn(transforms[sortBy], { reverse: sortBy === SortKeys.enrolled }));
 
 export const visibleList = (state, {
   sortBy,
diff --git a/src/data/redux/app/selectors/currentList.test.js b/src/data/redux/app/selectors/currentList.test.js
index 9db1461..49d5c21 100644
--- a/src/data/redux/app/selectors/currentList.test.js
+++ b/src/data/redux/app/selectors/currentList.test.js
@@ -30,9 +30,12 @@ describe('courseList selector module', () => {
     describe('sortFn', () => {
       it('performs comparison sort after running both values through transform', () => {
         const transform = ({ val }) => val;
-        expect(sortFn(transform)({ val: 2 }, { val: 1 })).toEqual(1);
-        expect(sortFn(transform)({ val: 1 }, { val: 1 })).toEqual(0);
-        expect(sortFn(transform)({ val: 1 }, { val: 2 })).toEqual(-1);
+        expect(sortFn(transform, { reverse: false })({ val: 2 }, { val: 1 })).toEqual(1);
+        expect(sortFn(transform, { reverse: false })({ val: 1 }, { val: 1 })).toEqual(0);
+        expect(sortFn(transform, { reverse: false })({ val: 1 }, { val: 2 })).toEqual(-1);
+        expect(sortFn(transform, { reverse: true })({ val: 2 }, { val: 1 })).toEqual(-1);
+        expect(sortFn(transform, { reverse: true })({ val: 1 }, { val: 1 })).toEqual(0);
+        expect(sortFn(transform, { reverse: true })({ val: 1 }, { val: 2 })).toEqual(1);
       });
     });
     describe('courseFilters', () => {
@@ -115,13 +118,22 @@ describe('courseList selector module', () => {
           v2,
           v3,
         } = testCourses;
-        const sortBy = SortKeys.enrolled;
+        let sortBy = SortKeys.enrolled;
         const testFilters = [1, 2, 3];
         expect(currentList(
           [empty, v2, v1, empty, empty, v3, empty],
           { sortBy, filters: testFilters },
         )).toEqual([v1, v2, v3]);
-        expect(sortSpy).toHaveBeenCalledWith(transforms[sortBy]);
+        expect(sortSpy).toHaveBeenCalledWith(transforms[sortBy], { reverse: true });
+        expect(filterSpy).toHaveBeenCalledWith(testFilters);
+
+        sortSpy.mockClear();
+        sortBy = SortKeys.title;
+        expect(currentList(
+          [empty, v2, v1, empty, empty, v3, empty],
+          { sortBy, filters: testFilters },
+        )).toEqual([v1, v2, v3]);
+        expect(sortSpy).toHaveBeenCalledWith(transforms[sortBy], { reverse: false });
         expect(filterSpy).toHaveBeenCalledWith(testFilters);
         sortSpy.mockRestore();
         filterSpy.mockRestore();
diff --git a/src/data/redux/thunkActions/app.js b/src/data/redux/thunkActions/app.js
index 8425a52..69e84fc 100644
--- a/src/data/redux/thunkActions/app.js
+++ b/src/data/redux/thunkActions/app.js
@@ -69,12 +69,14 @@ export const leaveEntitlementSession = (cardId) => (dispatch, getState) => {
 
 export const unenrollFromCourse = (cardId, reason) => (dispatch, getState) => {
   const { courseId } = selectors.app.courseCard.courseRun(getState(), cardId);
-  handleEvent(eventNames.unenrollReason, {
-    category: 'user-engagement',
-    displayName: 'v1',
-    label: reason,
-    course_id: courseId,
-  });
+  if (reason) {
+    handleEvent(eventNames.unenrollReason, {
+      category: 'user-engagement',
+      displayName: 'v1',
+      label: reason,
+      course_id: courseId,
+    });
+  }
   dispatch(requests.unenrollFromCourse({
     courseId,
     onSuccess: () => dispatch(module.refreshList()),
diff --git a/src/data/services/lms/fakeData/courses.js b/src/data/services/lms/fakeData/courses.js
index dedebf0..6729128 100644
--- a/src/data/services/lms/fakeData/courses.js
+++ b/src/data/services/lms/fakeData/courses.js
@@ -622,7 +622,7 @@ export const compileCourseRunData = (data, index) => {
   const courseNumber = genCourseNumber(index);
   const providerIndex = index % 3;
   const lastEnrolledDate = new Date();
-  lastEnrolledDate.setDate(lastEnrolledDate.getDate() + index);
+  lastEnrolledDate.setDate(lastEnrolledDate.getDate() - index);
   const lastEnrolled = lastEnrolledDate.toISOString();
   const iteratedData = [
     {