debian-mirror-gitlab/app/assets/javascripts/diffs/components/parallel_diff_view.vue

143 lines
4.4 KiB
Vue
Raw Normal View History

2018-11-08 19:23:39 +05:30
<script>
2020-07-28 23:09:34 +05:30
import { mapGetters, mapState } from 'vuex';
2020-06-23 00:09:42 +05:30
import draftCommentsMixin from '~/diffs/mixins/draft_comments';
2021-01-29 00:20:46 +05:30
import DraftNote from '~/batch_comments/components/draft_note.vue';
2018-11-08 19:23:39 +05:30
import parallelDiffTableRow from './parallel_diff_table_row.vue';
2021-01-29 00:20:46 +05:30
import DiffCommentCell from './diff_comment_cell.vue';
import DiffExpansionCell from './diff_expansion_cell.vue';
2020-07-28 23:09:34 +05:30
import { getCommentedLines } from '~/notes/components/multiline_comment_utils';
2018-11-08 19:23:39 +05:30
export default {
components: {
2021-01-29 00:20:46 +05:30
DiffExpansionCell,
2018-11-08 19:23:39 +05:30
parallelDiffTableRow,
2021-01-29 00:20:46 +05:30
DiffCommentCell,
DraftNote,
2018-11-08 19:23:39 +05:30
},
2019-07-07 11:18:12 +05:30
mixins: [draftCommentsMixin],
2018-11-08 19:23:39 +05:30
props: {
diffFile: {
type: Object,
required: true,
},
diffLines: {
type: Array,
required: true,
},
2019-02-15 15:39:39 +05:30
helpPagePath: {
type: String,
required: false,
default: '',
},
2018-11-08 19:23:39 +05:30
},
computed: {
2019-02-15 15:39:39 +05:30
...mapGetters('diffs', ['commitId']),
2020-07-28 23:09:34 +05:30
...mapState({
selectedCommentPosition: ({ notes }) => notes.selectedCommentPosition,
selectedCommentPositionHover: ({ notes }) => notes.selectedCommentPositionHover,
}),
2018-11-08 19:23:39 +05:30
diffLinesLength() {
2018-11-20 20:47:30 +05:30
return this.diffLines.length;
2018-11-08 19:23:39 +05:30
},
2020-07-28 23:09:34 +05:30
commentedLines() {
return getCommentedLines(
this.selectedCommentPosition || this.selectedCommentPositionHover,
this.diffLines,
);
},
2018-11-08 19:23:39 +05:30
},
2019-02-15 15:39:39 +05:30
userColorScheme: window.gon.user_color_scheme,
2018-11-08 19:23:39 +05:30
};
</script>
<template>
2019-07-07 11:18:12 +05:30
<table
2019-02-15 15:39:39 +05:30
:class="$options.userColorScheme"
2018-11-08 19:23:39 +05:30
:data-commit-id="commitId"
class="code diff-wrap-lines js-syntax-highlight text-file"
>
2019-12-21 20:55:43 +05:30
<colgroup>
2021-03-08 18:12:59 +05:30
<col style="width: 50px" />
<col style="width: 8px" />
2019-12-21 20:55:43 +05:30
<col />
2021-03-08 18:12:59 +05:30
<col style="width: 50px" />
<col style="width: 8px" />
2019-12-21 20:55:43 +05:30
<col />
</colgroup>
2019-07-07 11:18:12 +05:30
<tbody>
<template v-for="(line, index) in diffLines">
2021-01-29 00:20:46 +05:30
<tr
v-if="line.isMatchLineLeft || line.isMatchLineRight"
2019-10-12 21:52:04 +05:30
:key="`expand-${index}`"
2021-01-29 00:20:46 +05:30
class="line_expansion match"
>
<td colspan="6" class="text-center gl-font-regular">
<diff-expansion-cell
:file-hash="diffFile.file_hash"
:context-lines-path="diffFile.context_lines_path"
:line="line.left"
:is-top="index === 0"
:is-bottom="index + 1 === diffLinesLength"
/>
</td>
</tr>
2019-07-07 11:18:12 +05:30
<parallel-diff-table-row
:key="line.line_code"
:file-hash="diffFile.file_hash"
2020-04-08 14:13:33 +05:30
:file-path="diffFile.file_path"
2019-07-07 11:18:12 +05:30
:line="line"
:is-bottom="index + 1 === diffLinesLength"
2020-07-28 23:09:34 +05:30
:is-commented="index >= commentedLines.startLine && index <= commentedLines.endLine"
2019-07-07 11:18:12 +05:30
/>
2021-01-29 00:20:46 +05:30
<tr
v-if="line.renderCommentRow"
2019-07-07 11:18:12 +05:30
:key="`dcr-${line.line_code || index}`"
2021-01-29 00:20:46 +05:30
:class="line.commentRowClasses"
class="notes_holder"
>
<td class="notes-content parallel old" colspan="3">
<diff-comment-cell
v-if="line.left"
:line="line.left"
:diff-file-hash="diffFile.file_hash"
:help-page-path="helpPagePath"
:has-draft="line.left.hasDraft"
line-position="left"
/>
</td>
<td class="notes-content parallel new" colspan="3">
<diff-comment-cell
v-if="line.right"
:line="line.right"
:diff-file-hash="diffFile.file_hash"
:line-index="index"
:help-page-path="helpPagePath"
:has-draft="line.right.hasDraft"
line-position="right"
/>
</td>
</tr>
<tr
2019-07-07 11:18:12 +05:30
v-if="shouldRenderParallelDraftRow(diffFile.file_hash, line)"
:key="`drafts-${index}`"
2021-01-29 00:20:46 +05:30
:class="line.draftRowClasses"
class="notes_holder"
>
<td class="notes_line old"></td>
<td class="notes-content parallel old" colspan="2">
<div v-if="line.left && line.left.lineDraft.isDraft" class="content">
<draft-note :draft="line.left.lineDraft" :line="line.left" />
</div>
</td>
<td class="notes_line new"></td>
<td class="notes-content parallel new" colspan="2">
<div v-if="line.right && line.right.lineDraft.isDraft" class="content">
<draft-note :draft="line.right.lineDraft" :line="line.right" />
</div>
</td>
</tr>
2019-07-07 11:18:12 +05:30
</template>
</tbody>
</table>
2018-11-08 19:23:39 +05:30
</template>