Merge branch 'master' into bilalqamar95/react-upgrade-to-v17

openedx · Jun 14, 2023 · 9f3d870 · 9f3d870
2 parents 1a76afc + a07d6f9
commit 9f3d870
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 70 deletions.
diff --git a/src/config/index.js b/src/config/index.js
diff --git a/src/containers/ListView/ListViewBreadcrumb.jsx b/src/containers/ListView/ListViewBreadcrumb.jsx
@@ -22,7 +22,7 @@ export const ListViewBreadcrumb = ({ courseId, oraName }) => (
     </Hyperlink>
     <p className="py-4">
       <span className="h3">{oraName}</span>
-      <Hyperlink className="align-middle" destination={urls.ora(courseId, locationId)}>
+      <Hyperlink className="align-middle" destination={urls.ora(courseId, locationId())}>
         <Icon src={Launch} className="d-inline-block" />
       </Hyperlink>
     </p>

diff --git a/src/containers/ListView/ListViewBreadcrumb.test.jsx b/src/containers/ListView/ListViewBreadcrumb.test.jsx
@@ -50,7 +50,7 @@ describe('ListViewBreadcrumb component', () => {
     test('ora destination', () => {
       expect(
         el.find(Hyperlink).at(1).props().destination,
-      ).toEqual(urls.ora(props.courseId, constants.locationId));
+      ).toEqual(urls.ora(props.courseId, constants.locationId()));
     });
   });
   describe('mapStateToProps', () => {

diff --git a/src/data/constants/app.js b/src/data/constants/app.js
@@ -1,4 +1,4 @@
 import { getConfig } from '@edx/frontend-platform';
 
-export const routePath = `${getConfig().PUBLIC_PATH}:courseId`;
-export const locationId = window.location.pathname.replace(getConfig().PUBLIC_PATH, '');
+export const routePath = () => `${getConfig().PUBLIC_PATH}:courseId`;
+export const locationId = () => window.location.pathname.replace(getConfig().PUBLIC_PATH, '');
diff --git a/src/data/constants/app.test.js b/src/data/constants/app.test.js
@@ -13,12 +13,12 @@ jest.mock('@edx/frontend-platform', () => {
 
 describe('app constants', () => {
   test('route path draws from public path and adds courseId', () => {
-    expect(constants.routePath).toEqual(`${platform.PUBLIC_PATH}:courseId`);
+    expect(constants.routePath()).toEqual(`${platform.PUBLIC_PATH}:courseId`);
   });
   test('locationId returns trimmed pathname', () => {
     const old = window.location;
     window.location = { pathName: `${platform.PUBLIC_PATH}somePath.jpg` };
-    expect(constants.locationId).toEqual(window.location.pathname.replace(platform.PUBLIC_PATH, ''));
+    expect(constants.locationId()).toEqual(window.location.pathname.replace(platform.PUBLIC_PATH, ''));
     window.location = old;
   });
 });
diff --git a/src/data/redux/grading/selectors/validation.js b/src/data/redux/grading/selectors/validation.js
@@ -32,7 +32,7 @@ validation.criteria = createSelector(
       criterion.feedback === feedbackRequirement.required
       && gradingData.criteria[index].feedback === ''
     ),
-    selectedOption: gradingData.criteria[index].selectedOption !== '',
+    selectedOption: rubricConfig.criteria[index].options.length === 0 || gradingData.criteria[index].selectedOption !== '',
   })),
 );
 

diff --git a/src/data/redux/grading/selectors/validation.test.js b/src/data/redux/grading/selectors/validation.test.js
@@ -64,8 +64,8 @@ describe('validation grading selectors unit tests', () => {
       expect(preSelectors).toEqual([selected.gradingData, appSelectors.rubric.config]);
     });
     describe('returned object', () => {
-      const feedbackOptional = { feedback: feedbackRequirement.optional };
-      const feedbackRequired = { feedback: feedbackRequirement.required };
+      const feedbackOptional = { feedback: feedbackRequirement.optional, options: [1] };
+      const feedbackRequired = { feedback: feedbackRequirement.required, options: [1] };
       describe('feedback', () => {
         const validFeedback = { feedback: 'Fair' };
         const emptyFeedback = { feedback: '' };
@@ -85,6 +85,14 @@ describe('validation grading selectors unit tests', () => {
           );
           expect(output.map(({ selectedOption }) => selectedOption)).toEqual([true, false]);
         });
+        it('returns true criteria options are empty', () => {
+          const emptyOptionsFeedback = { ...feedbackOptional, options: [] };
+          const output = cb(
+            { criteria: [{ selectedOption: '' }, { selectedOption: 'Invalid' }] },
+            { criteria: [emptyOptionsFeedback, emptyOptionsFeedback] },
+          );
+          expect(output.map(({ selectedOption }) => selectedOption)).toEqual([true, true]);
+        });
       });
     });
   });

diff --git a/src/data/redux/thunkActions/app.js b/src/data/redux/thunkActions/app.js
@@ -15,7 +15,7 @@ import * as module from './app';
  */
 export const initialize = () => (dispatch) => {
   dispatch(initializeApp({
-    locationId,
+    locationId: locationId(),
     onSuccess: (response) => {
       dispatch(actions.app.loadIsEnabled(response.isEnabled));
       dispatch(actions.app.loadOraMetadata(response.oraMetadata));

diff --git a/src/data/redux/thunkActions/app.test.js b/src/data/redux/thunkActions/app.test.js
@@ -25,7 +25,7 @@ describe('app thunkActions', () => {
       [[dispatchedAction]] = dispatch.mock.calls;
     });
     it('dispatches initializeApp with locationId and onSuccess', () => {
-      expect(dispatchedAction.initializeApp.locationId).toEqual(locationId);
+      expect(dispatchedAction.initializeApp.locationId).toEqual(locationId());
       expect(typeof dispatchedAction.initializeApp.onSuccess).toEqual('function');
     });
     describe('on success', () => {

diff --git a/src/data/redux/thunkActions/download.js b/src/data/redux/thunkActions/download.js
@@ -48,7 +48,7 @@ export const zipFiles = async (files, blobs, username) => {
   }
 
   const zipFile = await zipWriter.close();
-  const zipName = `${username}-${locationId}.zip`;
+  const zipName = `${username}-${locationId()}.zip`;
   FileSaver.saveAs(zipFile, zipName);
 };
 

diff --git a/src/data/services/lms/api.js b/src/data/services/lms/api.js
@@ -32,8 +32,8 @@ import {
  * }
  */
 const initializeApp = () => get(
-  stringifyUrl(urls.oraInitializeUrl, {
-    [paramKeys.oraLocation]: locationId,
+  stringifyUrl(urls.oraInitializeUrl(), {
+    [paramKeys.oraLocation]: locationId(),
   }),
 ).then(response => response.data);
 
@@ -48,8 +48,8 @@ const initializeApp = () => get(
  * }
  */
 const fetchSubmission = (submissionUUID) => get(
-  stringifyUrl(urls.fetchSubmissionUrl, {
-    [paramKeys.oraLocation]: locationId,
+  stringifyUrl(urls.fetchSubmissionUrl(), {
+    [paramKeys.oraLocation]: locationId(),
     [paramKeys.submissionUUID]: submissionUUID,
   }),
 ).then(response => response.data);
@@ -61,8 +61,8 @@ const fetchSubmission = (submissionUUID) => get(
  * }
  */
 const fetchSubmissionFiles = (submissionUUID) => get(
-  stringifyUrl(urls.fetchSubmissionFilesUrl, {
-    [paramKeys.oraLocation]: locationId,
+  stringifyUrl(urls.fetchSubmissionFilesUrl(), {
+    [paramKeys.oraLocation]: locationId(),
     [paramKeys.submissionUUID]: submissionUUID,
   }),
 ).then(response => response.data);
@@ -78,8 +78,8 @@ const fetchSubmissionFiles = (submissionUUID) => get(
  *   }
  */
 const fetchSubmissionStatus = (submissionUUID) => get(
-  stringifyUrl(urls.fetchSubmissionStatusUrl, {
-    [paramKeys.oraLocation]: locationId,
+  stringifyUrl(urls.fetchSubmissionStatusUrl(), {
+    [paramKeys.oraLocation]: locationId(),
     [paramKeys.submissionUUID]: submissionUUID,
   }),
 ).then(response => response.data);
@@ -89,8 +89,8 @@ const fetchSubmissionStatus = (submissionUUID) => get(
  * @param {string} submissionUUID
  */
 const lockSubmission = (submissionUUID) => post(
-  stringifyUrl(urls.fetchSubmissionLockUrl, {
-    [paramKeys.oraLocation]: locationId,
+  stringifyUrl(urls.fetchSubmissionLockUrl(), {
+    [paramKeys.oraLocation]: locationId(),
     [paramKeys.submissionUUID]: submissionUUID,
   }),
 ).then(response => response.data);
@@ -100,8 +100,8 @@ const lockSubmission = (submissionUUID) => post(
  * @param {string} submissionUUID
  */
 const unlockSubmission = (submissionUUID) => client().delete(
-  stringifyUrl(urls.fetchSubmissionLockUrl, {
-    [paramKeys.oraLocation]: locationId,
+  stringifyUrl(urls.fetchSubmissionLockUrl(), {
+    [paramKeys.oraLocation]: locationId(),
     [paramKeys.submissionUUID]: submissionUUID,
   }),
 ).then(response => response.data);
@@ -112,8 +112,8 @@ const unlockSubmission = (submissionUUID) => client().delete(
  */
 const batchUnlockSubmissions = (submissionUUIDs) => post(
   stringifyUrl(
-    urls.batchUnlockSubmissionsUrl,
-    { [paramKeys.oraLocation]: locationId },
+    urls.batchUnlockSubmissionsUrl(),
+    { [paramKeys.oraLocation]: locationId() },
   ),
   { submissionUUIDs },
 ).then(response => response.data);
@@ -123,8 +123,8 @@ const batchUnlockSubmissions = (submissionUUIDs) => post(
  * @param {object} gradeData - full grading submission data
  */
 const updateGrade = (submissionUUID, gradeData) => post(
-  stringifyUrl(urls.updateSubmissionGradeUrl, {
-    [paramKeys.oraLocation]: locationId,
+  stringifyUrl(urls.updateSubmissionGradeUrl(), {
+    [paramKeys.oraLocation]: locationId(),
     [paramKeys.submissionUUID]: submissionUUID,
   }),
   gradeData,

diff --git a/src/data/services/lms/api.test.js b/src/data/services/lms/api.test.js
@@ -13,7 +13,7 @@ jest.mock('./utils', () => ({
 }));
 
 jest.mock('data/constants/app', () => ({
-  locationId: 'test-location-id',
+  locationId: () => 'test-location-id',
 }));
 
 const gradeData = 'test-grade-data';
@@ -37,10 +37,10 @@ const testAPI = ({
     ...otherExpected
   },
 }) => {
-  it(`returns ${method}(${urlKey}) with correct args and reoslves with response data`, () => (
+  it(`returns ${method}(${urlKey}) with correct args and resolves with response data`, () => (
     promise.then((data) => {
       expect(data[method]).toEqual({
-        url: stringifyUrl(urls[urlKey], urlParams),
+        url: stringifyUrl(urls[urlKey](), urlParams),
         ...otherExpected,
       });
     })
@@ -54,7 +54,7 @@ describe('lms service api methods', () => {
       method: methodKeys.get,
       expected: {
         urlKey: urlKeys.oraInitializeUrl,
-        urlParams: { [paramKeys.oraLocation]: locationId },
+        urlParams: { [paramKeys.oraLocation]: locationId() },
       },
     });
   });
@@ -65,7 +65,7 @@ describe('lms service api methods', () => {
       expected: {
         urlKey: urlKeys.fetchSubmissionUrl,
         urlParams: {
-          [paramKeys.oraLocation]: locationId,
+          [paramKeys.oraLocation]: locationId(),
           [paramKeys.submissionUUID]: submissionUUID,
         },
       },
@@ -78,7 +78,7 @@ describe('lms service api methods', () => {
       expected: {
         urlKey: urlKeys.fetchSubmissionFilesUrl,
         urlParams: {
-          [paramKeys.oraLocation]: locationId,
+          [paramKeys.oraLocation]: locationId(),
           [paramKeys.submissionUUID]: submissionUUID,
         },
       },
@@ -91,7 +91,7 @@ describe('lms service api methods', () => {
       expected: {
         urlKey: urlKeys.fetchSubmissionStatusUrl,
         urlParams: {
-          [paramKeys.oraLocation]: locationId,
+          [paramKeys.oraLocation]: locationId(),
           [paramKeys.submissionUUID]: submissionUUID,
         },
       },
@@ -104,7 +104,7 @@ describe('lms service api methods', () => {
       expected: {
         urlKey: urlKeys.fetchSubmissionLockUrl,
         urlParams: {
-          [paramKeys.oraLocation]: locationId,
+          [paramKeys.oraLocation]: locationId(),
           [paramKeys.submissionUUID]: submissionUUID,
         },
       },
@@ -117,7 +117,7 @@ describe('lms service api methods', () => {
       expected: {
         urlKey: urlKeys.fetchSubmissionLockUrl,
         urlParams: {
-          [paramKeys.oraLocation]: locationId,
+          [paramKeys.oraLocation]: locationId(),
           [paramKeys.submissionUUID]: submissionUUID,
         },
       },
@@ -130,7 +130,7 @@ describe('lms service api methods', () => {
       expected: {
         urlKey: urlKeys.batchUnlockSubmissionsUrl,
         urlParams: {
-          [paramKeys.oraLocation]: locationId,
+          [paramKeys.oraLocation]: locationId(),
         },
         data: { submissionUUIDs },
       },
@@ -143,7 +143,7 @@ describe('lms service api methods', () => {
       expected: {
         urlKey: urlKeys.updateSubmissionGradeUrl,
         urlParams: {
-          [paramKeys.oraLocation]: locationId,
+          [paramKeys.oraLocation]: locationId(),
           [paramKeys.submissionUUID]: submissionUUID,
         },
         data: gradeData,

diff --git a/src/data/services/lms/urls.js b/src/data/services/lms/urls.js
@@ -1,20 +1,20 @@
 import { StrictDict } from 'utils';
-import { configuration } from 'config';
+import { getConfig } from '@edx/frontend-platform';
 
-const baseUrl = `${configuration.LMS_BASE_URL}`;
+const baseUrl = () => getConfig().LMS_BASE_URL;
 
-const api = `${baseUrl}/api/`;
-const baseEsgUrl = `${api}ora_staff_grader/`;
+const api = () => `${baseUrl()}/api/`;
+const baseEsgUrl = () => `${api()}ora_staff_grader/`;
 
-const oraInitializeUrl = `${baseEsgUrl}initialize`;
-const fetchSubmissionUrl = `${baseEsgUrl}submission`;
-const fetchSubmissionFilesUrl = `${baseEsgUrl}submission/files`;
-const fetchSubmissionStatusUrl = `${baseEsgUrl}submission/status`;
-const fetchSubmissionLockUrl = `${baseEsgUrl}submission/lock`;
-const batchUnlockSubmissionsUrl = `${baseEsgUrl}submission/batch/unlock`;
-const updateSubmissionGradeUrl = `${baseEsgUrl}submission/grade`;
+const oraInitializeUrl = () => `${baseEsgUrl()}initialize`;
+const fetchSubmissionUrl = () => `${baseEsgUrl()}submission`;
+const fetchSubmissionFilesUrl = () => `${baseEsgUrl()}submission/files`;
+const fetchSubmissionStatusUrl = () => `${baseEsgUrl()}submission/status`;
+const fetchSubmissionLockUrl = () => `${baseEsgUrl()}submission/lock`;
+const batchUnlockSubmissionsUrl = () => `${baseEsgUrl()}submission/batch/unlock`;
+const updateSubmissionGradeUrl = () => `${baseEsgUrl()}submission/grade`;
 
-const course = (courseId) => `${baseUrl}/courses/${courseId}`;
+const course = (courseId) => `${baseUrl()}/courses/${courseId}`;
 
 const openResponse = (courseId) => (
   `${course(courseId)}/instructor#view-open_response_assessment`

diff --git a/src/segment.js b/src/segment.js
@@ -1,6 +1,6 @@
 // The code in this file is from Segment's website:
 // https://segment.com/docs/sources/website/analytics.js/quickstart/
-import { configuration } from './config';
+import { getConfig } from '@edx/frontend-platform';
 
 (function () {
   // Create a queue, but don't obliterate an existing one!
@@ -81,5 +81,5 @@ import { configuration } from './config';
 
   // Load Analytics.js with your key, which will automatically
   // load the tools you've enabled for your account. Boosh!
-  analytics.load(configuration.SEGMENT_KEY);
+  analytics.load(getConfig().SEGMENT_KEY);
 }());
diff --git a/src/setupTest.js b/src/setupTest.js
@@ -113,7 +113,7 @@ jest.mock('@edx/paragon/icons', () => ({
 }));
 
 jest.mock('data/constants/app', () => ({
-  locationId: 'fake-location-id',
+  locationId: () => 'fake-location-id',
 }));
 
 jest.mock('hooks', () => ({