fix: Merge branch 'master' into jodybaileyy/add-query-logic-to-CPR-container

.env

@@ -2,6 +2,7 @@ NODE_ENV='production'
 NODE_PATH=./src
 BASE_URL=''
 LMS_BASE_URL=''
+ECOMMERCE_BASE_URL=''
 LOGIN_URL=''
 LOGOUT_URL=''
 CSRF_TOKEN_API_PATH=''

.env.development

@@ -2,6 +2,7 @@ NODE_ENV='development'
 PORT=1996
 BASE_URL='localhost:1996'
 LMS_BASE_URL='http://localhost:18000'
+ECOMMERCE_BASE_URL='http://localhost:18130'
 LOGIN_URL='http://localhost:18000/login'
 LOGOUT_URL='http://localhost:18000/logout'
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg

.env.test

@@ -2,6 +2,7 @@ NODE_ENV='test'
 PORT=1996
 BASE_URL='localhost:1996'
 LMS_BASE_URL='http://localhost:18000'
+ECOMMERCE_BASE_URL='http://localhost:18130'
 LOGIN_URL='http://localhost:18000/login'
 LOGOUT_URL='http://localhost:18000/logout'
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg

.github/workflows/ci.yml

@@ -11,17 +11,17 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        node: [16]
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
 
     - name: Setup Nodejs
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node }}
+        node-version: ${{ env.NODE_VER }}
 
     - name: Install dependencies
       run: npm ci

.github/workflows/lockfileversion-check.yml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   version-check:
-    uses: edx/.github/.github/workflows/lockfileversion-check.yml@master
+    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master

.github/workflows/npm-publish.yml

@@ -10,14 +10,17 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
+      - name: Setup Nodejs Env
+        run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: ${{ env.NODE_VER }}
 
       - name: Install dependencies
         run: npm ci

.nvmrc

@@ -0,0 +1 @@
+18.15

package.json

@@ -77,7 +77,7 @@
     "whatwg-fetch": "^3.6.2"
   },
   "devDependencies": {
-    "@edx/frontend-build": "11.0.1",
+    "@edx/frontend-build": "12.8.27",
     "@edx/reactifex": "^2.1.1",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.1.0",
@@ -91,6 +91,6 @@
     "react-dev-utils": "^11.0.4",
     "react-test-renderer": "^16.14.0",
     "redux-mock-store": "^1.5.4",
-    "semantic-release": "^17.4.5"
+    "semantic-release": "^20.1.3"
   }
 }

src/config/index.js

@@ -1,6 +1,7 @@
 const configuration = {
   // BASE_URL: process.env.BASE_URL,
   LMS_BASE_URL: process.env.LMS_BASE_URL,
+  ECOMMERCE_BASE_URL: process.env.ECOMMERCE_BASE_URL,
   // LOGIN_URL: process.env.LOGIN_URL,
   // LOGOUT_URL: process.env.LOGOUT_URL,
   // CSRF_TOKEN_API_PATH: process.env.CSRF_TOKEN_API_PATH,

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

@@ -36,11 +36,9 @@ export const CourseBanner = ({ cardId }) => {
           <Banner>
             {formatMessage(messages.auditAccessExpired)}
             {'  '}
-            {
-              <Hyperlink isInline destination="">
-                {formatMessage(messages.findAnotherCourse)}
-              </Hyperlink>
-            }
+            <Hyperlink isInline destination="">
+              {formatMessage(messages.findAnotherCourse)}
+            </Hyperlink>
           </Banner>
         ))}
 

src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/hooks.js

@@ -14,7 +14,10 @@ export const useCreditRequestData = (cardId) => {
   const createCreditApiRequest = apiHooks.useCreateCreditRequest(cardId);
   const createCreditRequest = (e) => {
     e.preventDefault();
-    createCreditApiRequest().then(setRequestData);
+    createCreditApiRequest()
+      .then((request) => {
+        setRequestData(request.data);
+      });
   };
   return { requestData, createCreditRequest };
 };

src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/hooks.test.js

@@ -11,7 +11,7 @@ jest.mock('hooks', () => ({
 const state = new MockUseState(hooks);
 
 const cardId = 'test-card-id';
-const requestData = { test: 'request data' };
+const requestData = { data: 'request data' };
 const creditRequest = jest.fn().mockReturnValue(Promise.resolve(requestData));
 apiHooks.useCreateCreditRequest.mockReturnValue(creditRequest);
 const event = { preventDefault: jest.fn() };
@@ -48,7 +48,7 @@ describe('Credit Banner view hooks', () => {
         it('calls api.createCreditRequest and sets requestData with the response', async () => {
           await out.createCreditRequest(event);
           expect(creditRequest).toHaveBeenCalledWith();
-          expect(state.setState.creditRequestData).toHaveBeenCalledWith(requestData);
+          expect(state.setState.creditRequestData).toHaveBeenCalledWith(requestData.data);
         });
       });
     });

src/containers/CourseCard/components/RelatedProgramsBadge/hooks.test.js

@@ -17,9 +17,8 @@ const cardId = 'test-card-id';
 const state = new MockUseState(hooks);
 const numPrograms = 27;
 
-const { formatMessage } = useIntl();
-
 describe('RelatedProgramsBadge hooks', () => {
+  const { formatMessage } = useIntl();
   let out;
   describe('state values', () => {
     state.testGetter(state.keys.isOpen);

src/containers/MasqueradeBar/hooks.test.js

@@ -31,7 +31,7 @@ describe('MasqueradeBar hooks', () => {
     isMasqueradingPending: false,
     masqueradeErrorStatus: null,
   };
-  const createHook = (masqueradeData = {}, user) => {
+  const createHook = (masqueradeData = {}, user = undefined) => {
     reduxHooks.useMasqueradeData.mockReturnValueOnce({
       ...defaultMasqueradeData,
       ...masqueradeData,

src/containers/SelectSessionModal/hooks.test.js

@@ -61,8 +61,6 @@ const entitlementData = {
   uuid,
 };
 
-const { formatMessage } = useIntl();
-
 const testValue = 'test-value';
 
 const courseId = 'test-course-id';
@@ -125,6 +123,7 @@ describe('SelectSessionModal hooks', () => {
     });
 
     describe('output', () => {
+      const { formatMessage } = useIntl();
       describe('selectedSession', () => {
         it('defaults to current courseId if enrolled', () => {
           expect(out.selectedSession).toEqual(courseId);

src/data/redux/hooks/app.js

@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 import { useSelector, useDispatch } from 'react-redux';
 
 import * as redux from 'data/redux';

src/data/redux/requests/selectors.test.js

@@ -28,9 +28,7 @@ const genRequests = (request) => ({
   requests: { [requestKey]: request },
 });
 const select = (selector, request) => (
-  mockUseSelector(
-    selector(requestKey), genRequests(request),
-  )
+  mockUseSelector(selector(requestKey), genRequests(request))
 );
 describe('requests selectors unit tests', () => {
   test('requestStatus returns data associated with given key', () => {
@@ -38,8 +36,10 @@ describe('requests selectors unit tests', () => {
   });
   const testStatusSelector = (selector, matchingRequest) => {
     expect(mockUseSelector(selector(requestKey), testState)).toEqual(false);
-    expect(mockUseSelector(selector(requestKey),
-      { requests: { [requestKey]: matchingRequest } })).toEqual(true);
+    expect(mockUseSelector(
+      selector(requestKey),
+      { requests: { [requestKey]: matchingRequest } },
+    )).toEqual(true);
   };
   test('isInactive returns true iff the given request is inactive', () => {
     testStatusSelector(selectors.isInactive, inactiveRequest);

src/data/services/lms/api.test.js

@@ -86,8 +86,10 @@ describe('lms api methods', () => {
         expect(
           api.updateEmailSettings({ courseId, enable: true }),
         ).toEqual(
-          utils.post(urls.updateEmailSettings,
-            { [apiKeys.courseId]: courseId, ...enableEmailsAction }),
+          utils.post(
+            urls.updateEmailSettings,
+            { [apiKeys.courseId]: courseId, ...enableEmailsAction },
+          ),
         );
       });
     });
@@ -97,8 +99,10 @@ describe('lms api methods', () => {
       expect(
         api.unenrollFromCourse({ courseId }),
       ).toEqual(
-        utils.post(urls.courseUnenroll,
-          { [apiKeys.courseId]: courseId, ...unenrollmentAction }),
+        utils.post(
+          urls.courseUnenroll,
+          { [apiKeys.courseId]: courseId, ...unenrollmentAction },
+        ),
       );
     });
   });

src/data/services/lms/urls.js

@@ -2,7 +2,7 @@ import { StrictDict } from 'utils';
 import { configuration } from 'config';
 
 const baseUrl = `${configuration.LMS_BASE_URL}`;
-export const ecommerceUrl = `${configuration.ECOMMERCE_PUBLIC_URL_ROOT}`;
+export const ecommerceUrl = `${configuration.ECOMMERCE_BASE_URL}`;
 
 export const api = `${baseUrl}/api`;
 

src/tracking/trackers/course.test.js

@@ -56,8 +56,10 @@ describe('course trackers', () => {
     describe('upgradeButtonClickedUpsell', () => {
       it('creates an event tracker for upgradeButtonClickedUpsell eventwith upsellOptions', () => {
         expect(trackers.upgradeButtonClickedUpsell(courseId)).toEqual(
-          createEventTracker(eventNames.upgradeButtonClickedUpsell,
-            { ...trackers.upsellOptions, courseId }),
+          createEventTracker(
+            eventNames.upgradeButtonClickedUpsell,
+            { ...trackers.upsellOptions, courseId },
+          ),
         );
       });
     });

src/tracking/trackers/findCourses.test.js

@@ -22,7 +22,8 @@ describe('find courses trackers', () => {
     findCoursesClicked(url);
     expect(createEventTracker).toHaveBeenCalledWith(eventNames.findCoursesClicked, defaultProps);
     expect(createLinkTracker).toHaveBeenCalledWith(
-      createEventTracker(eventNames.findCoursesClicked, defaultProps), url,
+      createEventTracker(eventNames.findCoursesClicked, defaultProps),
+      url,
     );
   });