From e6b186026d048db6bc152cefa1dc0259d60c88bb Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 13 Nov 2021 11:47:56 +0100
Subject: [PATCH] Fix a couple of Apollo cache issues

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 .../Discussion/DiscussionComment.vue          |  6 +-
 js/src/views/Discussions/Discussion.vue       | 98 +++----------------
 2 files changed, 20 insertions(+), 84 deletions(-)

diff --git a/js/src/components/Discussion/DiscussionComment.vue b/js/src/components/Discussion/DiscussionComment.vue
index a5bfa10e..ff8a0f84 100644
--- a/js/src/components/Discussion/DiscussionComment.vue
+++ b/js/src/components/Discussion/DiscussionComment.vue
@@ -145,8 +145,10 @@ export default class DiscussionComment extends Vue {
   }
 
   updateComment(): void {
-    this.comment.text = this.updatedComment;
-    this.$emit("update-comment", this.comment);
+    this.$emit("update-comment", {
+      ...this.comment,
+      text: this.updatedComment,
+    });
     this.toggleEditMode();
   }
 }
diff --git a/js/src/views/Discussions/Discussion.vue b/js/src/views/Discussions/Discussion.vue
index bbcdf984..b61457dc 100644
--- a/js/src/views/Discussions/Discussion.vue
+++ b/js/src/views/Discussions/Discussion.vue
@@ -154,7 +154,7 @@ import { GraphQLError } from "graphql";
 import { DELETE_COMMENT, UPDATE_COMMENT } from "@/graphql/comment";
 import RouteName from "../../router/name";
 import { IComment } from "../../types/comment.model";
-import { ApolloCache, FetchResult } from "@apollo/client/core";
+import { ApolloCache, FetchResult, gql, Reference } from "@apollo/client/core";
 import { mixins } from "vue-class-component";
 import GroupMixin from "@/mixins/group";
 
@@ -310,49 +310,23 @@ export default class Discussion extends mixins(GroupMixin) {
       variables: {
         commentId: comment.id,
       },
-      update: (
-        store: ApolloCache<{ deleteComment: IComment }>,
-        { data }: FetchResult
-      ) => {
-        if (!data || !data.deleteComment) return;
-        const discussionData = store.readQuery<{
-          discussion: IDiscussion;
-        }>({
-          query: GET_DISCUSSION,
-          variables: {
-            slug: this.slug,
-            page: this.page,
-          },
-        });
-        if (!discussionData) return;
-        const { discussion: discussionCached } = discussionData;
-        const index = discussionCached.comments.elements.findIndex(
-          ({ id }) => id === data.deleteComment.id
-        );
-        let discussionUpdated = discussionCached;
-        if (index > -1) {
-          const updatedComment = {
-            ...discussionCached.comments.elements[index],
+      update: (store: ApolloCache<{ deleteComment: IComment }>) => {
+        store.writeFragment({
+          id: store.identify(comment as unknown as Reference),
+          fragment: gql`
+            fragment CommentDeleted on Comment {
+              deletedAt
+              actor {
+                id
+              }
+              text
+            }
+          `,
+          data: {
             deletedAt: new Date(),
+            text: "",
             actor: null,
-            updatedComment: {
-              text: "",
-            },
-          };
-          const elements = [...discussionCached.comments.elements];
-          elements.splice(index, 1, updatedComment);
-          discussionUpdated = {
-            ...discussionCached,
-            comments: {
-              total: discussionCached.comments.total,
-              elements,
-            },
-          };
-        }
-        store.writeQuery({
-          query: GET_DISCUSSION,
-          variables: { slug: this.slug, page: this.page },
-          data: { discussion: discussionUpdated },
+          },
         });
       },
     });
@@ -369,20 +343,6 @@ export default class Discussion extends mixins(GroupMixin) {
           page: this.page,
           limit: this.COMMENTS_PER_PAGE,
         },
-        updateQuery: (previousResult, { fetchMoreResult }) => {
-          return {
-            discussion: {
-              ...previousResult.discussion,
-              comments: {
-                ...fetchMoreResult.discussion.comments,
-                elements: [
-                  ...previousResult.discussion.comments.elements,
-                  ...fetchMoreResult.discussion.comments.elements,
-                ],
-              },
-            },
-          };
-        },
       });
       this.hasMoreComments = !this.discussion.comments.elements
         .map(({ id }) => id)
@@ -399,32 +359,6 @@ export default class Discussion extends mixins(GroupMixin) {
         discussionId: this.discussion.id,
         title: this.newTitle,
       },
-      update: (
-        store: ApolloCache<{ updateDiscussion: IDiscussion }>,
-        { data }: FetchResult<{ updateDiscussion: IDiscussion }>
-      ) => {
-        const discussionData = store.readQuery<{
-          discussion: IDiscussion;
-        }>({
-          query: GET_DISCUSSION,
-          variables: {
-            slug: this.slug,
-            page: this.page,
-          },
-        });
-        if (discussionData && data?.updateDiscussion) {
-          store.writeQuery({
-            query: GET_DISCUSSION,
-            variables: { slug: this.slug, page: this.page },
-            data: {
-              discussion: {
-                ...discussionData.discussion,
-                title: data?.updateDiscussion.title,
-              },
-            },
-          });
-        }
-      },
     });
     this.editTitleMode = false;
   }