Merge pull request #28 from openedx/bw/separate_assessments

feat: separate assessments

Author: Ben Warzeski

package-lock.json

@@ -2,7 +2,9 @@ import { BrowserRouter as Router, Switch, 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';
@@ -13,8 +15,14 @@ const RouterRoot = () => {
   return (
     <Router>
       <Switch>
-        <Route path={routes.assessment}>
-          <AssessmentView />
+        <Route path={routes.peerAssessment}>
+          <PeerAssessmentView />
+        </Route>
+        <Route path={routes.selfAssessment}>
+          <SelfAssessmentView />
+        </Route>
+        <Route path={routes.studentTraining}>
+          <StudentTrainingView />
         </Route>
         <Route path={routes.submission}>
           <SubmissionView />

src/App.jsx

@@ -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));
@@ -111,7 +112,7 @@ describe('lms api hooks', () => {
     });
     describe('assessment', () => {
       beforeEach(() => {
-        mockUseRouteMatch(routes.assessment);
+        mockUseRouteMatch(routes.peerAssessment);
         mockUseQueryForPageData(fakeData.pageData.shapes.peerAssessment, true);
         out = testUsePageData();
       });

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

@@ -25,7 +25,7 @@ export const useORAConfig = (): types.QueryData<types.ORAConfig> => {
 
 export const usePageData = (): types.QueryData<types.PageData> => {
   const route = useRouteMatch();
-  const isAssessment = route.path === routes.assessment;
+  const isAssessment = route.path === routes.peerAssessment;
   const returnData = isAssessment
     ? fakeData.pageData.shapes.peerAssessment
     : fakeData.pageData.shapes.emptySubmission;

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

@@ -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: '/*',
 };