2018-11-08 19:23:39 +05:30
|
|
|
<script>
|
|
|
|
import { mapState, mapGetters } from 'vuex';
|
|
|
|
import parallelDiffTableRow from './parallel_diff_table_row.vue';
|
|
|
|
import parallelDiffCommentRow from './parallel_diff_comment_row.vue';
|
|
|
|
import { EMPTY_CELL_TYPE } from '../constants';
|
|
|
|
import { trimFirstCharOfLineContent } from '../store/utils';
|
|
|
|
|
|
|
|
export default {
|
|
|
|
components: {
|
|
|
|
parallelDiffTableRow,
|
|
|
|
parallelDiffCommentRow,
|
|
|
|
},
|
|
|
|
props: {
|
|
|
|
diffFile: {
|
|
|
|
type: Object,
|
|
|
|
required: true,
|
|
|
|
},
|
|
|
|
diffLines: {
|
|
|
|
type: Array,
|
|
|
|
required: true,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
computed: {
|
2018-11-18 11:00:15 +05:30
|
|
|
...mapGetters('diffs', [
|
|
|
|
'commitId',
|
|
|
|
'singleDiscussionByLineCode',
|
|
|
|
'shouldRenderParallelCommentRow',
|
|
|
|
]),
|
2018-11-08 19:23:39 +05:30
|
|
|
...mapState({
|
|
|
|
diffLineCommentForms: state => state.diffs.diffLineCommentForms,
|
|
|
|
}),
|
|
|
|
parallelDiffLines() {
|
|
|
|
return this.diffLines.map(line => {
|
|
|
|
const parallelLine = Object.assign({}, line);
|
|
|
|
|
|
|
|
if (line.left) {
|
|
|
|
parallelLine.left = trimFirstCharOfLineContent(line.left);
|
|
|
|
} else {
|
|
|
|
parallelLine.left = { type: EMPTY_CELL_TYPE };
|
|
|
|
}
|
|
|
|
|
|
|
|
if (line.right) {
|
|
|
|
parallelLine.right = trimFirstCharOfLineContent(line.right);
|
|
|
|
} else {
|
|
|
|
parallelLine.right = { type: EMPTY_CELL_TYPE };
|
|
|
|
}
|
|
|
|
|
|
|
|
return parallelLine;
|
|
|
|
});
|
|
|
|
},
|
|
|
|
diffLinesLength() {
|
|
|
|
return this.parallelDiffLines.length;
|
|
|
|
},
|
|
|
|
userColorScheme() {
|
|
|
|
return window.gon.user_color_scheme;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
2018-11-18 11:00:15 +05:30
|
|
|
discussionsByLine(line, leftOrRight) {
|
|
|
|
return line[leftOrRight] && line[leftOrRight].lineCode !== undefined ?
|
|
|
|
this.singleDiscussionByLineCode(line[leftOrRight].lineCode) : [];
|
2018-11-08 19:23:39 +05:30
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
</script>
|
|
|
|
|
|
|
|
<template>
|
|
|
|
<div
|
|
|
|
:class="userColorScheme"
|
|
|
|
:data-commit-id="commitId"
|
|
|
|
class="code diff-wrap-lines js-syntax-highlight text-file"
|
|
|
|
>
|
|
|
|
<table>
|
|
|
|
<tbody>
|
|
|
|
<template
|
|
|
|
v-for="(line, index) in parallelDiffLines"
|
|
|
|
>
|
|
|
|
<parallel-diff-table-row
|
|
|
|
:file-hash="diffFile.fileHash"
|
|
|
|
:context-lines-path="diffFile.contextLinesPath"
|
|
|
|
:line="line"
|
|
|
|
:is-bottom="index + 1 === diffLinesLength"
|
|
|
|
:key="index"
|
2018-11-18 11:00:15 +05:30
|
|
|
:left-discussions="discussionsByLine(line, 'left')"
|
|
|
|
:right-discussions="discussionsByLine(line, 'right')"
|
2018-11-08 19:23:39 +05:30
|
|
|
/>
|
|
|
|
<parallel-diff-comment-row
|
2018-11-18 11:00:15 +05:30
|
|
|
v-if="shouldRenderParallelCommentRow(line)"
|
2018-11-08 19:23:39 +05:30
|
|
|
:key="`dcr-${index}`"
|
|
|
|
:line="line"
|
|
|
|
:diff-file-hash="diffFile.fileHash"
|
|
|
|
:line-index="index"
|
2018-11-18 11:00:15 +05:30
|
|
|
:left-discussions="discussionsByLine(line, 'left')"
|
|
|
|
:right-discussions="discussionsByLine(line, 'right')"
|
2018-11-08 19:23:39 +05:30
|
|
|
/>
|
|
|
|
</template>
|
|
|
|
</tbody>
|
|
|
|
</table>
|
|
|
|
</div>
|
|
|
|
</template>
|