From 448be6cc8c3d1ae962c49ba4cfc7300bfc9ad7be Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Thu, 30 Mar 2023 20:02:13 +0200
Subject: [PATCH 1/2] Suppress v-html eslint warning

---
 client/src/pages/studentSubmission.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/pages/studentSubmission.vue b/client/src/pages/studentSubmission.vue
index 9f32d7e1..e3e3a47a 100644
--- a/client/src/pages/studentSubmission.vue
+++ b/client/src/pages/studentSubmission.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- eslint-disable vue/no-v-html -->
   <div class="submission-page">
     <div class="submission-page__header submission-header">
       <h2>Aufgabe</h2>
@@ -6,7 +7,6 @@
     </div>
     <div class="submission-page__content submission-content">
       <h2>Ergebnis von {{ fullName }}</h2>
-      <!-- eslint-disable-next-line vue/no-v-html -->
       <p v-html="text" />
       <p
         class="article-content__document"

From 46574d637589fa301ee62867bdc6fb3cdf8dcaa5 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Thu, 6 Apr 2023 12:37:16 +0200
Subject: [PATCH 2/2] Fix cache update issue when duplicating or deleting
 content block

---
 client/src/components/ContentBlock.vue |  8 ++++++--
 client/src/graphql/cache.js            | 24 +++++++++++++++++-------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index 4b869f27..29a8b9e3 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -159,13 +159,14 @@ const { mutate: duplicateContentBlock } = useMutation(DUPLICATE_CONTENT_BLOCK_MU
     }
   ) => {
     const id = props.parent.id;
+    const contentBlockId = props.contentBlock.id;
     if (contentBlock) {
       const query = CHAPTER_QUERY;
       const variables = {
         id,
       };
       const { chapter }: any = store.readQuery({ query, variables });
-      const index = chapter.contentBlocks.findIndex((contentBlock: ContentBlock) => contentBlock.id === id);
+      const index = chapter.contentBlocks.findIndex((contentBlock: ContentBlock) => contentBlock.id === contentBlockId);
       const contentBlocks = insertAtIndex(chapter.contentBlocks, index, contentBlock);
       const data = {
         chapter: {
@@ -199,8 +200,11 @@ const { mutate: doDeleteContentBlock } = useMutation(DELETE_CONTENT_BLOCK_MUTATI
       };
       const { chapter }: any = store.readQuery({ query, variables });
       const index = chapter.contentBlocks.findIndex(
-        (contentBlock: ContentBlock) => contentBlock.id === props.parent.id
+        (contentBlock: ContentBlock) => contentBlock.id === props.contentBlock.id
       );
+      if (index < 0) {
+        throw Error('ContentBlock not found');
+      }
       const contentBlocks = removeAtIndex(chapter.contentBlocks, index);
       const data = {
         chapter: {
diff --git a/client/src/graphql/cache.js b/client/src/graphql/cache.js
index 2f6a6d17..6b0b3953 100644
--- a/client/src/graphql/cache.js
+++ b/client/src/graphql/cache.js
@@ -9,13 +9,13 @@ const helloEmailVar = makeVar('');
 
 const idToRefFactory =
   (__typename) =>
-  (_, { args, toReference }) => {
-    log.debug(`Referencing ${__typename} with ${args.id}`);
-    return toReference({
-      __typename,
-      id: args.id,
-    });
-  };
+    (_, { args, toReference }) => {
+      log.debug(`Referencing ${__typename} with ${args.id}`);
+      return toReference({
+        __typename,
+        id: args.id,
+      });
+    };
 
 const typePolicies = {
   ProjectNode: {
@@ -27,6 +27,16 @@ const typePolicies = {
   RoomNode: {
     keyFields: ['slug'],
   },
+  ChapterNode: {
+    fields: {
+      contentBlocks: {
+        merge(_existing, incoming) {
+          // always replace the whole array
+          return incoming;
+        },
+      },
+    },
+  },
   ModuleNode: {
     fields: {
       inEditMode: {