fix: test data api updates

muselesscreator · muselesscreator · commit b9bf0b2f2e32 · 2023-10-10T15:53:04.000Z
diff --git a/src/data/services/lms/fakeData/dataStates.js b/src/data/services/lms/fakeData/dataStates.js
@@ -1,11 +1,11 @@
 import { StrictDict } from '@edx/react-unit-test-utils';
-import oraConfig from './oraConfig';
+import { routeSteps } from 'data/services/lms/constants';
 import pageData from './pageData';
 
 export const viewKeys = StrictDict({
   xblock: 'xblock',
   submission: 'submission',
-  training: 'student_training',
+  studentTraining: 'student_training',
   self: 'self_assessment',
   peer: 'peer_assessment',
   myGrades: 'my_grades',
@@ -14,7 +14,7 @@ export const viewKeys = StrictDict({
 export const progressKeys = StrictDict({
   unsaved: 'unsaved',
   saved: 'saved',
-  training: 'training',
+  studentTraining: 'studentTraining',
   self: 'self',
   peer: 'peer',
   peerWaiting: 'peerWaiting',
@@ -25,7 +25,7 @@ export const progressKeys = StrictDict({
 export const progressStates = {
   unsaved: pageData.progressStates.submission,
   saved: pageData.progressStates.submission,
-  training: pageData.progressStates.training(0),
+  studentTraining: pageData.progressStates.training({ numCompleted: 0 }),
   self: pageData.progressStates.self,
   peer: pageData.progressStates.peer(),
   peerWaiting: pageData.progressStates.peer({ numCompleted: 1, isWaiting: true }),
@@ -37,7 +37,7 @@ export const submissionStatesByView = {
   [viewKeys.xblock]: null,
   [viewKeys.submission]: pageData.submissionStates.individualSubmission,
   [viewKeys.self]: pageData.submissionStates.individualSubmission,
-  [viewKeys.training]: pageData.submissionStates.individualSubmission,
+  [viewKeys.studentTraining]: pageData.submissionStates.individualSubmission,
   [viewKeys.peer]: pageData.submissionStates.individualSubmission,
   [viewKeys.myGrades]: pageData.submissionStates.individualSubmission,
 };
@@ -46,15 +46,21 @@ export const assessmentStatesByView = {
   [viewKeys.xblock]: null,
   [viewKeys.submission]: null,
   [viewKeys.self]: null,
-  [viewKeys.training]: null,
+  [viewKeys.studentTraining]: null,
   [viewKeys.peer]: null,
   [viewKeys.myGrades]: {
     effectiveAssessmentType: 'staff',
     ...pageData.assessmentStates.graded,
   },
 };
 
-export const loadState = ({ view, progressKey }) => {
+export const loadState = (opts) => {
+  const { view } = opts;
+  let progressKey = opts.progressKey || routeSteps[view];
+  if (progressKey === routeSteps.submission) {
+    progressKey = progressKeys.unsaved;
+  }
+
   const state = {
     progress: progressStates[progressKey],
     submission: submissionStatesByView[view],
@@ -63,5 +69,10 @@ export const loadState = ({ view, progressKey }) => {
   if (view === viewKeys.submission && progressKey === progressKeys.unsaved) {
     state.submission = pageData.submissionStates.emptySubmission;
   }
+  console.log({
+    progressKey,
+    view,
+    state,
+  });
   return state;
 };
diff --git a/src/data/services/lms/fakeData/oraConfig.js b/src/data/services/lms/fakeData/oraConfig.js
@@ -73,17 +73,17 @@ const rubricConfig = {
   ],
 };
 
-const assessmentSteps = {
-  order: ['practice', 'self', 'peer', 'staff'],
+export const assessmentSteps = {
+  order: ['studentTraining', 'self', 'peer', 'staff'],
   settings: {
     peer: {
       start_time: '2023-04-14T20:00:00Z',
       end_time: '2023-04-14T20:00:00Z',
       required: true,
       // Additional fields per step
       data: {
-        min_number_to_grade: 0,
-        min_number_to_be_graded_by: 0,
+        min_number_to_grade: 2,
+        min_number_to_be_graded_by: 3,
         enable_flexible_grading: true,
       },
     },
@@ -100,7 +100,16 @@ const assessmentSteps = {
       data: {
         examples: [
           {
-            response: 'response',
+            response: 'response 1',
+            criteria: [
+              {
+                name: 'criterion name',
+                feedback: 'feedback',
+              },
+            ],
+          },
+          {
+            response: 'response 2',
             criteria: [
               {
                 name: 'criterion name',
diff --git a/src/data/services/lms/fakeData/pageData/progress.js b/src/data/services/lms/fakeData/pageData/progress.js
@@ -1,49 +1,104 @@
+import { assessmentSteps } from '../oraConfig';
 /* eslint-disable camelcase */
 
 // Progress
 export const createProgressData = ({
   active_step_name = null,
   has_received_final_grade = false,
-  active_step_info = {},
+  step_info = {},
 }) => ({
   active_step_name,
   has_received_final_grade,
-  active_step_info,
+  step_info,
+});
+
+export const closedStates = {
+  open: { isClosed: false },
+  notAvailable: { isClosed: true, closedReason: 'notAvailable' },
+  closed: { isClosed: true, closedReason: 'pastDue' },
+};
+
+export const genPeerStepInfo = ({
+  closedState,
+  numCompleted = 0,
+  isWaiting = false,
+  numReceived = 0,
+}) => ({
+  ...closedState,
+  number_of_assessments_completed: numCompleted,
+  is_waiting_for_submissions: isWaiting,
+  number_of_received_assessments: numReceived,
+});
+
+export const genTrainingStepInfo = ({ closedState, numCompleted }) => ({
+  ...closedState,
+  number_of_assessments_completed: numCompleted,
+  expected_rubric_selections: [
+    { name: 'Criterion 1 name', selection: 'Option 4 name' },
+    { name: 'Criterion 2 name', selection: 'Option 3 name' },
+    { name: 'Criterion 3 name', selection: 'Option 2 name' },
+    { name: 'Criterion 4 name', selection: 'Option 1 name' },
+  ],
+});
+
+const finishedTrainingStepInfo = genTrainingStepInfo({
+  closedState: closedStates.open,
+  numCompleted: assessmentSteps.settings.training.data.examples.length,
+});
+
+const finishedPeerStepInfo = genPeerStepInfo({
+  closedState: closedStates.open,
+  numCompleted: assessmentSteps.settings.peer.data.min_number_to_grade,
+  isWaiting: false,
+  numReceived: assessmentSteps.settings.peer.data.min_number_to_be_graded_by,
 });
 
 export default {
   submission: createProgressData({}),
-  training: (numCompleted) => createProgressData({
-    active_step_name: 'training',
-    active_step_info: {
-      number_of_assessments_completed: numCompleted,
-      expected_rubric_selections: [
-        { name: 'Criterion 1 name', selection: 'Option 4 name' },
-        { name: 'Criterion 2 name', selection: 'Option 3 name' },
-        { name: 'Criterion 3 name', selection: 'Option 2 name' },
-        { name: 'Criterion 4 name', selection: 'Option 1 name' },
-      ],
+  training: ({
+    closedState = closedStates.open,
+    numCompleted,
+  }) => createProgressData({
+    active_step_name: 'studentTraining',
+    step_info: {
+      studentTraining: genTrainingStepInfo({ closedState, numCompleted }),
+      self: null,
+      peer: null,
+    },
+  }),
+  self: createProgressData({
+    active_step_name: 'self',
+    step_info: {
+      studentTraining: finishedTrainingStepInfo,
+      self: closedStates.open,
+      peer: null,
     },
   }),
   peer: ({
+    closedState = closedStates.open,
     numCompleted = 0,
     isWaiting = false,
     numReceived = 0,
   } = {}) => createProgressData({
     active_step_name: 'peer',
-    active_step_info: {
-      number_of_assessments_completed: numCompleted,
-      is_waiting_for_submissions: isWaiting,
-      number_of_received_assessments: numReceived,
+    step_info: {
+      studentTraining: finishedTrainingStepInfo,
+      self: closedStates.open,
+      peer: genPeerStepInfo({
+        closedState,
+        numCompleted,
+        isWaiting,
+        numReceived,
+      }),
     },
   }),
-  self: createProgressData({
-    active_step_name: 'self',
-    active_step_info: {},
-  }),
   staff: createProgressData({
     active_step_name: 'staff',
-    active_step_info: {},
+    step_info: {
+      training: finishedTrainingStepInfo,
+      self: closedStates.open,
+      peer: finishedPeerStepInfo,
+    },
   }),
   graded: createProgressData({
     active_step_name: null,
@@ -52,5 +107,10 @@ export default {
       peer: { earned: 5, possible: 25 },
       staff: { earned: 8, possible: 10 },
     },
+    step_info: {
+      training: finishedTrainingStepInfo,
+      self: closedStates.open,
+      peer: finishedPeerStepInfo,
+    },
   }),
 };
diff --git a/src/data/services/lms/fakeData/pageData/submission.js b/src/data/services/lms/fakeData/pageData/submission.js
@@ -1,5 +1,6 @@
 /* eslint-disable camelcase */
 import { StrictDict } from '@edx/react-unit-test-utils';
+import { closedStates } from './progress';
 
 /// Submission
 export const createFiles = (numFiles) => Array.from(Array(numFiles)).map((_, i) => ({
@@ -26,9 +27,11 @@ export const createTeamInfo = ({
 
 export const createSubmissionStatus = ({
   has_submitted = true,
-  has_cancelled = true,
-  has_recieved_grade = true,
+  has_cancelled = false,
+  has_recieved_grade = false,
+  closedState = closedStates.open,
 } = {}) => ({
+  ...closedState,
   has_submitted,
   has_cancelled,
   has_recieved_grade,
@@ -52,8 +55,6 @@ export const createSubmission = ({
   ...submissionStatus,
 });
 
-// Rubric
-
 export default StrictDict({
   emptySubmission: createSubmission({
     teamInfo: {},
