Merge branch 'master' of https://github.com/openedx/frontend-app-ora into Ali-Abbas/react-router-upgrade

Author: Syed-Ali-Abbas-Zaidi

src/App.jsx

@@ -2,7 +2,9 @@ import { Routes, Route } from 'react-router-dom';
 import { ErrorPage } from '@edx/frontend-platform/react';
 import { useIntl } from '@edx/frontend-platform/i18n';
 
-import AssessmentView from 'views/AssessmentView';
+import PeerAssessmentView from 'views/PeerAssessmentView';
+import SelfAssessmentView from 'views/SelfAssessmentView';
+import StudentTrainingView from 'views/StudentTrainingView';
 import SubmissionView from 'views/SubmissionView';
 import messages from './messages';
 import routes from './routes';
@@ -12,7 +14,9 @@ const RouterRoot = () => {
 
   return (
     <Routes>
-      <Route path={routes.assessment} element={<AssessmentView />} />
+      <Route path={routes.peerAssessment} element={<PeerAssessmentView />} />
+      <Route path={routes.selfAssessment} element={<SelfAssessmentView />} />
+      <Route path={routes.studentTraining} element={<StudentTrainingView />} />
       <Route path={routes.submission} element={<SubmissionView />} />
       <Route path={routes.root} element={<ErrorPage message={formatMessage(messages.error404Message)} />} />
     </Routes>

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

@@ -35,6 +35,7 @@ describe('lms api hooks', () => {
     });
 
     const mockUseQueryForORA = (hasData) => {
+      console.log({ useQuery });
       when(useQuery)
         .calledWith(expect.objectContaining({ queryKey: [queryKeys.oraConfig] }))
         .mockImplementationOnce(mockUseQuery(hasData));
@@ -118,8 +119,8 @@ describe('lms api hooks', () => {
     });
     describe('assessment', () => {
       beforeEach(() => {
-        mockMatchPath(routes.assessment);
-        mockUseLocation(routes.assessment);
+        mockMatchPath(routes.peerAssessment);
+        mockUseLocation(routes.peerAssessment);
         mockUseQueryForPageData(fakeData.pageData.shapes.peerAssessment, true);
         out = testUsePageData();
       });

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

@@ -25,8 +25,8 @@ export const useORAConfig = (): types.QueryData<types.ORAConfig> => {
 
 export const usePageData = (): types.QueryData<types.PageData> => {
   const location = useLocation();
-  const route = matchPath({ path: routes.assessment }, location.pathname);
-  const isAssessment = !!route && route.pattern.path === routes.assessment;
+  const route = matchPath({ path: routes.peerAssessment }, location.pathname);
+  const isAssessment = !!route && route.pattern.path === routes.peerAssessment;
   const returnData = isAssessment
     ? fakeData.pageData.shapes.peerAssessment
     : fakeData.pageData.shapes.emptySubmission;

src/data/services/lms/hooks/api.test.ts

@@ -1,5 +1,7 @@
 export default {
-  assessment: '/assessment/:id',
+  peerAssessment: '/peer_assessment/:id',
+  selfAssessment: '/self_assessment/:id',
+  studentTraining: '/student_training/:id',
   submission: '/submission/:id',
   root: '/*',
 };