From 47b5d2e037049b7121535109530409efbb577726 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Thu, 5 Nov 2020 09:59:53 +0100
Subject: [PATCH] Fix student submission feedback bug

---
 .../graphql/gql/mutations/updateFeedbackWithText.gql   | 10 ++++++++++
 client/src/pages/studentSubmission.vue                 |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 client/src/graphql/gql/mutations/updateFeedbackWithText.gql

diff --git a/client/src/graphql/gql/mutations/updateFeedbackWithText.gql b/client/src/graphql/gql/mutations/updateFeedbackWithText.gql
new file mode 100644
index 00000000..64d0f0bc
--- /dev/null
+++ b/client/src/graphql/gql/mutations/updateFeedbackWithText.gql
@@ -0,0 +1,10 @@
+mutation UpdateSubmissionFeedback($input: UpdateSubmissionFeedbackInput!) {
+  updateSubmissionFeedback(input: $input){
+    successful
+		updatedSubmissionFeedback {
+      id
+      final
+      text
+    }
+  }
+}
diff --git a/client/src/pages/studentSubmission.vue b/client/src/pages/studentSubmission.vue
index 1c6a31e3..0143fd78 100644
--- a/client/src/pages/studentSubmission.vue
+++ b/client/src/pages/studentSubmission.vue
@@ -52,6 +52,7 @@
   import StudentSubmissionDocument from '@/components/StudentSubmissionDocument';
   import STUDENT_SUBMISSIONS_QUERY from '@/graphql/gql/studentSubmissionQuery.gql';
   import UPDATE_FEEDBACK_MUTATION from '@/graphql/gql/mutations/updateFeedback.gql';
+  import UPDATE_FEEDBACK_WITH_TEXT_MUTATION from '@/graphql/gql/mutations/updateFeedbackWithText.gql';
   import SubmissionForm from '@/components/content-blocks/assignment/SubmissionForm';
 
   export default {
@@ -153,7 +154,7 @@
       },
       turnIn() {
         this.$apollo.mutate({
-          mutation: UPDATE_FEEDBACK_MUTATION,
+          mutation: UPDATE_FEEDBACK_WITH_TEXT_MUTATION,
           variables: {
             input: {
               submissionFeedback: {
@@ -194,10 +195,11 @@
             };
             const data = store.readQuery({query, variables});
 
-            data.studentSubmission.submissionFeedback = Object.assign(data.studentSubmission.submissionFeedback, {
+            data.studentSubmission.submissionFeedback = Object.assign({}, data.studentSubmission.submissionFeedback, {
               id: updatedSubmissionFeedback.id,
               final: updatedSubmissionFeedback.final
             });
+
             store.writeQuery({query, variables, data});
           }
         } catch (e) {