Merge pull request #390 from openedx/jkantor/conflictError

fix: error code expecting wrong data shape

Author: jansenk

src/data/redux/grading/reducer.js

@@ -182,11 +182,11 @@ const grading = createSlice({
 
       const gradeData = {
         ...state.gradeData,
-        ...(payload && { [submissionUUID]: payload.submissionStatus.gradeData }),
+        ...(payload && { [submissionUUID]: payload.gradeData }),
       };
 
-      const { gradeStatus } = payload ? payload.submissionStatus : state.current;
-      const lockStatus = payload ? payload.submissionStatus.lockStatus : lockStatuses.unlocked;
+      const { gradeStatus } = payload || state.current;
+      const lockStatus = payload ? payload.lockStatus : lockStatuses.unlocked;
 
       return {
         ...state,

src/data/redux/grading/reducer.test.js

@@ -250,7 +250,7 @@ describe('app reducer', () => {
       });
       describe('stopGrading', () => {
         let output;
-        const args = { submissionStatus: { gradeData: testData, lockStatus, gradeStatus } };
+        const args = { gradeData: testData, lockStatus, gradeStatus };
         describe('resulting state', () => {
           test('gradingData: deletes current data', () => {
             output = reducer(testState, actions.stopGrading());