Commit d2873c49 authored by Phil Hughes's avatar Phil Hughes

Fix EE differences in parallel_diff_view.vue

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10007
parent 1711e104
<script> <script>
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import draftCommentsMixin from 'ee_else_ce/diffs/mixins/draft_comments';
import parallelDiffTableRow from './parallel_diff_table_row.vue'; import parallelDiffTableRow from './parallel_diff_table_row.vue';
import parallelDiffCommentRow from './parallel_diff_comment_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 { export default {
components: { components: {
parallelDiffTableRow, parallelDiffTableRow,
parallelDiffCommentRow, parallelDiffCommentRow,
ParallelDraftCommentRow, ParallelDraftCommentRow: () =>
import('ee_component/batch_comments/components/parallel_draft_comment_row.vue'),
}, },
mixins: [draftCommentsMixin],
props: { props: {
diffFile: { diffFile: {
type: Object, type: Object,
...@@ -29,7 +29,6 @@ export default { ...@@ -29,7 +29,6 @@ export default {
}, },
computed: { computed: {
...mapGetters('diffs', ['commitId']), ...mapGetters('diffs', ['commitId']),
...mapGetters('batchComments', ['shouldRenderParallelDraftRow', 'draftForLine']),
diffLinesLength() { diffLinesLength() {
return this.diffLines.length; return this.diffLines.length;
}, },
......
export default { export default {
computed: { computed: {
shouldRenderDraftRow: () => () => false, shouldRenderDraftRow: () => () => false,
shouldRenderParallelDraftRow: () => () => false,
draftForLine: () => () => ({}), draftForLine: () => () => ({}),
}, },
}; };
...@@ -2,6 +2,10 @@ import { mapGetters } from 'vuex'; ...@@ -2,6 +2,10 @@ import { mapGetters } from 'vuex';
export default { export default {
computed: { computed: {
...mapGetters('batchComments', ['shouldRenderDraftRow', 'draftForLine']), ...mapGetters('batchComments', [
'shouldRenderDraftRow',
'shouldRenderParallelDraftRow',
'draftForLine',
]),
}, },
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment