Merge branch 'fix-design-discussion-comment-bug' into 'master'

Fix inability to add comments to a discussion in Design Management

See merge request gitlab-org/gitlab!21229

ee/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue

@@ -71,7 +71,13 @@ export default {
         data: { createNote },
       },
     ) {
-      updateStoreAfterAddDiscussionComment(store, createNote, getDesignQuery, this.designVariables);
+      updateStoreAfterAddDiscussionComment(
+        store,
+        createNote,
+        getDesignQuery,
+        this.designVariables,
+        this.discussion.id,
+      );
     },
     onDone() {
       this.discussionComment = '';

ee/app/assets/javascripts/design_management/utils/cache_update.js

@@ -45,14 +45,14 @@ const addNewVersionToStore = (store, query, version) => {
   });
 };
 
-const addDiscussionCommentToStore = (store, createNote, query, queryVariables) => {
+const addDiscussionCommentToStore = (store, createNote, query, queryVariables, discussionId) => {
   const data = store.readQuery({
     query,
     variables: queryVariables,
   });
 
   const design = extractDesign(data);
-  const currentDiscussion = extractCurrentDiscussion(design.discussions, this.discussion.id);
+  const currentDiscussion = extractCurrentDiscussion(design.discussions, discussionId);
   currentDiscussion.node.notes.edges = [
     ...currentDiscussion.node.notes.edges,
     {
@@ -186,11 +186,17 @@ export const updateStoreAfterDesignsDelete = (store, data, query, designs) => {
   }
 };
 
-export const updateStoreAfterAddDiscussionComment = (store, data, query, queryVariables) => {
+export const updateStoreAfterAddDiscussionComment = (
+  store,
+  data,
+  query,
+  queryVariables,
+  discussionId,
+) => {
   if (data.errors) {
     onError(data, ADD_DISCUSSION_COMMENT_ERROR);
   } else {
-    addDiscussionCommentToStore(store, data, query, queryVariables);
+    addDiscussionCommentToStore(store, data, query, queryVariables, discussionId);
   }
 };
 

ee/changelogs/unreleased/fix-design-discussion-comment-bug.yml

+---
+title: Fix inability to add comments to a discussion in Design Management
+merge_request: 21229
+author:
+type: fixed