Some fixes

.gitlab-ci.yml

@@ -108,7 +108,7 @@ test_frontend:
     - HEADLESS_TESTS=True pytest --ds=grady.settings.test functional_tests
   artifacts:
     paths:
-      - .screenshots
+      - .screenshots/
     expire_in: 30 days
 
 test_frontend_unit:

core/serializers/feedback.py

@@ -124,7 +124,7 @@ class FeedbackSerializer(DynamicFieldsModelSerializer):
         feedback_lines = validated_data.pop('feedback_lines', [])
         labels = validated_data.pop('labels', [])
         user = self.context['request'].user
-        final_by_reviewer = validated_data.pop('is_final', False) and \
+        final_by_reviewer = validated_data.get('is_final', False) and \
             user.role == UserAccount.REVIEWER
         feedback = Feedback.objects.create(of_submission=submission,
                                            final_by_reviewer=final_by_reviewer,

frontend/src/api.ts

@@ -154,7 +154,7 @@ export async function createAssignment (
 
 export async function submitFeedbackForAssignment ({ feedback, assignment }:
   { feedback: Partial<CreateUpdateFeedback>, assignment: Assignment}): Promise<CreateUpdateFeedback> {
-  return (await ax.post(`/api/assignment/${assignment.pk}/finish`, feedback)).data
+  return (await ax.post(`/api/assignment/${assignment.pk}/finish/`, feedback)).data
 }
 
 export async function submitUpdatedFeedback ({ feedback }:

frontend/src/components/submission_notes/SubmissionCorrection.vue

@@ -141,10 +141,11 @@ export default {
       this.loading = true
       SubmissionNotes.submitFeedback({
         isFinal: isFinal
-      }).then(feedback => {
+      }).then(_ => {
         SubmissionNotes.RESET_UPDATED_FEEDBACK()
-        SubmissionNotes.SET_ORIG_FEEDBACK(feedback)
         this.$emit('feedbackCreated')
+        this.$emit('feedbackChanged')
+        SubmissionNotes.RESET_MARKED_COMMENTS_FOR_DELETE()
       }).catch(err => {
         // ignore trivial errors as those are handled
         // by an interceptor
@@ -157,8 +158,6 @@ export default {
           duration: -1
         })
       }).finally(() => {
-        this.$emit('feedbackChanged')
-        SubmissionNotes.RESET_MARKED_COMMENTS_FOR_DELETE()
         this.loading = false
       })
     },

frontend/src/store/modules/submission-notes.ts

@@ -199,7 +199,7 @@ Promise<AxiosResponse<void>[]> {
   const assignment = Subscriptions.state.currentAssignment
   if (assignment) {
     await api.submitFeedbackForAssignment({ feedback , assignment})
-  } else if (state.origFeedback) {
+  } else if (state.hasOrigFeedback) {
     feedback.pk = state.origFeedback.pk
     await api.submitUpdatedFeedback(<{ feedback: CreateUpdateFeedback }>{ feedback })
   } else {