Move EE differences for `app/assets/javascripts/diffs/components/parallel_diff_view.vue`
The file app/assets/javascripts/diffs/components/parallel_diff_view.vue
has differences between CE and EE.
Diferences
diff --git a/home/yorickpeterse/Projects/gitlab/gdk-ce/gitlab/app/assets/javascripts/diffs/components/parallel_diff_view.vue b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/app/assets/javascripts/diffs/components/parallel_diff_view.vue
index 1bf693380db..354e12746a8 100644
--- a/home/yorickpeterse/Projects/gitlab/gdk-ce/gitlab/app/assets/javascripts/diffs/components/parallel_diff_view.vue
+++ b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/app/assets/javascripts/diffs/components/parallel_diff_view.vue
@@ -3,10 +3,14 @@ import { mapGetters } from 'vuex';
import parallelDiffTableRow from './parallel_diff_table_row.vue';
import parallelDiffCommentRow from './parallel_diff_comment_row.vue';
+// eslint-disable-next-line import/order
+import ParallelDraftCommentRow from 'ee/batch_comments/components/parallel_draft_comment_row.vue';
+
export default {
components: {
parallelDiffTableRow,
parallelDiffCommentRow,
+ ParallelDraftCommentRow,
},
props: {
diffFile: {
@@ -25,6 +29,7 @@ export default {
},
computed: {
...mapGetters('diffs', ['commitId']),
+ ...mapGetters('batchComments', ['shouldRenderParallelDraftRow', 'draftForLine']),
diffLinesLength() {
return this.diffLines.length;
},
@@ -56,6 +61,12 @@ export default {
:line-index="index"
:help-page-path="helpPagePath"
/>
+ <parallel-draft-comment-row
+ v-if="shouldRenderParallelDraftRow(diffFile.file_hash, line)"
+ :key="`drafts-${index}`"
+ :line="line"
+ :diff-file-content-sha="diffFile.file_hash"
+ />
</template>
</tbody>
</table>
What needs to be done
- Load
ParallelDraftCommentRow
async with a check for EE - For the getters, this issue needs to be done first - https://gitlab.com/gitlab-org/gitlab-ee/issues/10008 this will guarantee these methods exist in CE and that we can have only the CE files.
Edited by Filipa Lacerda