Merge branch 'master' of https://github.com/edx/frontend-app-ora-grading

 into mashal-m/node-18-upgrade

README.rst

@@ -16,7 +16,7 @@ clicking "Grade Available Responses" from the ORA or link in the instructor
 dashboard.
 
 The ORA Staff Grader depends on the `lms/djangoapps/ora_staff_grader
-<https://github.com/openedx/edx-platform/tree/master/lms/djangoapps/ora_staff_grader>`
+<https://github.com/openedx/edx-platform/tree/master/lms/djangoapps/ora_staff_grader>`_
 app in ``edx-platform``.
 
 Getting Started
@@ -58,13 +58,13 @@ Next, enable the ORA Grading micro-frontend in `edx-platform`
 
 #. Enable the ORA Grading feature in Django Admin.
 
-    #. Go to Django Admin (`{lms-root}/admin`)
+   #. Go to Django Admin (`{lms-root}/admin`)
 
-    #. Navigate to ``django-waffle`` > ``Flags`` and click ``add/enable a new
-       flag``.
+   #. Navigate to ``django-waffle`` > ``Flags`` and click ``add/enable a new
+      flag``.
 
-    #. Add a new flag called ``openresponseassessment.enhanced_staff_grader``
-       and enable it.
+   #. Add a new flag called ``openresponseassessment.enhanced_staff_grader``
+      and enable it.
 
 From there, visit an Open Response Assessment with a Staff Graded Step and
 click the "View and grade responses" button to begin grading in the ORA Staff

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.slice(1);
+export const locationId = window.location.pathname.replace(getConfig().PUBLIC_PATH, '');

src/data/constants/app.test.js

@@ -4,7 +4,7 @@ import * as constants from './app';
 jest.unmock('./app');
 
 jest.mock('@edx/frontend-platform', () => {
-  const PUBLIC_PATH = 'test-public-path';
+  const PUBLIC_PATH = '/test-public-path/';
   return {
     getConfig: () => ({ PUBLIC_PATH }),
     PUBLIC_PATH,
@@ -17,8 +17,8 @@ describe('app constants', () => {
   });
   test('locationId returns trimmed pathname', () => {
     const old = window.location;
-    window.location = { pathName: '/somePath.jpg' };
-    expect(constants.locationId).toEqual(window.location.pathname.slice(1));
+    window.location = { pathName: `${platform.PUBLIC_PATH}somePath.jpg` };
+    expect(constants.locationId).toEqual(window.location.pathname.replace(platform.PUBLIC_PATH, ''));
     window.location = old;
   });
 });