Fix comment not being submitted (#325)

* Rename GradingEditor prop (comments -> comment)

* Rename dispatch prop argument (comments -> comment)

* Remove grade from action

* Remove "grade" prop usage in mock backend saga

* Fix wrong id being passed to grading editor

Author: remo5000

src/actions/session.ts

@@ -75,7 +75,6 @@ export const submitAssessment: ActionCreator<actionTypes.IAction> = (id: number)
 export const submitGrading: ActionCreator<actionTypes.IAction> = (
   submissionId: number,
   questionId: number,
-  grade: number,
   comment: string,
   adjustment: number = 0
 ) => ({

src/components/academy/grading/GradingEditor.tsx

@@ -15,14 +15,14 @@ export type DispatchProps = {
   handleGradingSave: (
     submissionId: number,
     questionId: number,
-    comments: string,
+    comment: string,
     adjustment: number | undefined
   ) => void
 }
 
 export type OwnProps = {
   adjustment: number
-  comments: string
+  comment: string
   initialGrade: number
   maximumGrade: number
   questionId: number
@@ -49,7 +49,7 @@ class GradingEditor extends React.Component<GradingEditorProps, State> {
     super(props)
     this.state = {
       mdeState: {
-        markdown: props.comments
+        markdown: props.comment
       },
       adjustmentInput: props.adjustment.toString()
     }
@@ -185,7 +185,7 @@ class GradingEditor extends React.Component<GradingEditorProps, State> {
   private hasUnsavedChanges = () => {
     const adjustmentInput = stringParamToInt(this.state.adjustmentInput || undefined)
     return (
-      this.props.comments !== this.state.mdeState.markdown ||
+      this.props.comment !== this.state.mdeState.markdown ||
       this.props.adjustment !== adjustmentInput
     )
   }

src/components/academy/grading/GradingWorkspace.tsx

@@ -185,10 +185,10 @@ class GradingWorkspace extends React.Component<GradingWorkspaceProps> {
         body: (
           <GradingEditor
             adjustment={props.grading![questionId].grade.adjustment}
-            comments={props.grading![questionId].grade.comment}
+            comment={props.grading![questionId].grade.comment}
             initialGrade={props.grading![questionId].grade.grade}
             maximumGrade={props.grading![questionId].maximumGrade}
-            questionId={questionId}
+            questionId={props.grading![questionId].question.id}
             submissionId={props.submissionId}
           />
         )

src/mocks/backend.ts

@@ -85,7 +85,6 @@ export function* mockBackendSaga(): SagaIterator {
     const {
       submissionId,
       questionId,
-      grade,
       comment,
       adjustment
     } = (action as actionTypes.IAction).payload
@@ -98,7 +97,7 @@ export function* mockBackendSaga(): SagaIterator {
         gradingQuestion.grade = {
           adjustment,
           comment,
-          grade
+          grade: gradingQuestion.grade.grade
         }
       }
       return gradingQuestion