Merge branch 'ph/diffFileDiscussionsRepeated' into 'master'

Fixes a bug where drafts on files would get rendered in the wrong place

See merge request !123360



Merged-by: Kushal Pandya <kushal@gitlab.com>
Approved-by: Kushal Pandya <kushal@gitlab.com>
Co-authored-by: Phil Hughes <me@iamphill.com>

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

@@ -71,7 +71,7 @@ export const draftsForLine = (state, getters) => (diffFileSha, line, side = null
   const showDraftsForThisSide = showDraftOnSide(line, side);
 
   if (showDraftsForThisSide && draftsForFile?.[key]) {
-    return draftsForFile[key];
+    return draftsForFile[key].filter((d) => d.position.position_type === 'text');
   }
   return [];
 };

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

@@ -465,18 +465,18 @@ export default {
         </gl-alert>
         <div v-if="showFileDiscussions" class="gl-border-b" data-testid="file-discussions">
           <div class="diff-file-discussions-wrapper">
-            <diff-file-drafts
-              :file-hash="file.file_hash"
-              :show-pin="false"
-              :position-type="$options.FILE_DIFF_POSITION_TYPE"
-              class="diff-file-discussions"
-            />
             <diff-discussions
               v-if="fileDiscussions.length"
               class="diff-file-discussions"
               data-testid="diff-file-discussions"
               :discussions="fileDiscussions"
             />
+            <diff-file-drafts
+              :file-hash="file.file_hash"
+              :show-pin="false"
+              :position-type="$options.FILE_DIFF_POSITION_TYPE"
+              class="diff-file-discussions"
+            />
             <note-form
               v-if="file.hasCommentForm"
               :save-button-title="__('Comment')"