Merge branch '12632-fix-multiple-discussions' into 'master'

Starting a new discussion only on line without Draft note created on it

Closes #12632

See merge request gitlab-org/gitlab-ee!14569

app/assets/javascripts/diffs/components/inline_diff_comment_row.vue

@@ -24,6 +24,11 @@ export default {
       required: false,
       default: '',
     },
+    hasDraft: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   computed: {
     className() {
@@ -55,6 +60,7 @@ export default {
           :help-page-path="helpPagePath"
         />
         <diff-discussion-reply
+          v-if="!hasDraft"
           :has-form="line.hasForm"
           :render-reply-placeholder="Boolean(line.discussions.length)"
           @showNewDiscussionForm="

app/assets/javascripts/diffs/components/inline_diff_view.vue

@@ -57,6 +57,7 @@ export default {
           :diff-file-hash="diffFile.file_hash"
           :line="line"
           :help-page-path="helpPagePath"
+          :has-draft="shouldRenderDraftRow(diffFile.file_hash, line) || false"
         />
         <inline-draft-comment-row
           v-if="shouldRenderDraftRow(diffFile.file_hash, line)"

app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue

@@ -28,6 +28,16 @@ export default {
       required: false,
       default: '',
     },
+    hasDraftLeft: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    hasDraftRight: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   computed: {
     hasExpandedDiscussionOnLeft() {
@@ -121,6 +131,7 @@ export default {
         />
       </div>
       <diff-discussion-reply
+        v-if="!hasDraftLeft"
         :has-form="showLeftSideCommentForm"
         :render-reply-placeholder="shouldRenderReplyPlaceholderOnLeft"
         @showNewDiscussionForm="showNewDiscussionForm"
@@ -145,6 +156,7 @@ export default {
         />
       </div>
       <diff-discussion-reply
+        v-if="!hasDraftRight"
         :has-form="showRightSideCommentForm"
         :render-reply-placeholder="shouldRenderReplyPlaceholderOnRight"
         @showNewDiscussionForm="showNewDiscussionForm"

app/assets/javascripts/diffs/components/parallel_diff_view.vue

@@ -58,6 +58,8 @@ export default {
           :diff-file-hash="diffFile.file_hash"
           :line-index="index"
           :help-page-path="helpPagePath"
+          :has-draft-left="hasParallelDraftLeft(diffFile.file_hash, line) || false"
+          :has-draft-right="hasParallelDraftRight(diffFile.file_hash, line) || false"
         />
         <parallel-draft-comment-row
           v-if="shouldRenderParallelDraftRow(diffFile.file_hash, line)"

ee/app/assets/javascripts/batch_comments/stores/modules/batch_comments/getters.js

@@ -41,6 +41,20 @@ export const shouldRenderParallelDraftRow = (state, getters) => (diffFileSha, li
   return draftsForFile ? Boolean(draftsForFile[lkey] || draftsForFile[rkey]) : false;
 };
 
+export const hasParallelDraftLeft = (state, getters) => (diffFileSha, line) => {
+  const draftsForFile = getters.draftsPerFileHashAndLine[diffFileSha];
+  const lkey = parallelLineKey(line, 'left');
+
+  return draftsForFile ? Boolean(draftsForFile[lkey]) : false;
+};
+
+export const hasParallelDraftRight = (state, getters) => (diffFileSha, line) => {
+  const draftsForFile = getters.draftsPerFileHashAndLine[diffFileSha];
+  const rkey = parallelLineKey(line, 'left');
+
+  return draftsForFile ? Boolean(draftsForFile[rkey]) : false;
+};
+
 export const shouldRenderDraftRowInDiscussion = (state, getters) => discussionId =>
   typeof getters.draftsPerDiscussionId[discussionId] !== 'undefined';
 

ee/app/assets/javascripts/diffs/mixins/draft_comments.js

@@ -7,6 +7,8 @@ export default {
       'shouldRenderParallelDraftRow',
       'draftForLine',
       'draftsForFile',
+      'hasParallelDraftLeft',
+      'hasParallelDraftRight',
     ]),
     imageDiscussions() {
       return this.diffFile.discussions.concat(this.draftsForFile(this.diffFile.file_hash));

ee/changelogs/unreleased/12632-fix-multiple-discussions.yml

+---
+title: Starting a new discussion only on line without Draft note created on it
+merge_request: 14569
+author:
+type: fixed