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

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

329 lines
10 KiB
Vue
Raw Normal View History

2021-01-29 00:20:46 +05:30
<script>
2021-03-08 18:12:59 +05:30
import { mapGetters, mapState, mapActions } from 'vuex';
2021-09-30 23:02:18 +05:30
import { IdState } from 'vendor/vue-virtual-scroller';
2022-08-13 15:12:31 +05:30
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
2021-01-29 00:20:46 +05:30
import DraftNote from '~/batch_comments/components/draft_note.vue';
2021-03-11 19:13:27 +05:30
import draftCommentsMixin from '~/diffs/mixins/draft_comments';
import { getCommentedLines } from '~/notes/components/multiline_comment_utils';
2021-09-30 23:02:18 +05:30
import { hide } from '~/tooltips';
2021-12-11 22:18:48 +05:30
import { pickDirection } from '../utils/diff_line';
2021-01-29 00:20:46 +05:30
import DiffCommentCell from './diff_comment_cell.vue';
2022-10-11 01:57:18 +05:30
import DiffLine from './diff_line.vue';
2021-01-29 00:20:46 +05:30
import DiffExpansionCell from './diff_expansion_cell.vue';
2021-03-11 19:13:27 +05:30
import DiffRow from './diff_row.vue';
2021-09-30 23:02:18 +05:30
import { isHighlighted } from './diff_row_utils';
2021-01-29 00:20:46 +05:30
export default {
components: {
DiffExpansionCell,
DiffRow,
2022-10-11 01:57:18 +05:30
DiffLine,
2021-01-29 00:20:46 +05:30
DiffCommentCell,
DraftNote,
},
2022-08-13 15:12:31 +05:30
mixins: [
draftCommentsMixin,
IdState({ idProp: (vm) => vm.diffFile.file_hash }),
glFeatureFlagsMixin(),
],
2021-01-29 00:20:46 +05:30
props: {
diffFile: {
type: Object,
required: true,
},
diffLines: {
type: Array,
required: true,
},
helpPagePath: {
type: String,
required: false,
default: '',
},
inline: {
type: Boolean,
required: false,
default: false,
},
},
2022-08-13 15:12:31 +05:30
data() {
return {
codeQualityExpandedLines: [],
};
},
2021-09-30 23:02:18 +05:30
idState() {
2021-03-08 18:12:59 +05:30
return {
dragStart: null,
updatedLineRange: null,
};
},
2021-01-29 00:20:46 +05:30
computed: {
2021-09-30 23:02:18 +05:30
...mapGetters('diffs', ['commitId', 'fileLineCoverage']),
2022-01-26 12:08:38 +05:30
...mapState('diffs', ['codequalityDiff', 'highlightedRow', 'coverageLoaded']),
2021-01-29 00:20:46 +05:30
...mapState({
selectedCommentPosition: ({ notes }) => notes.selectedCommentPosition,
selectedCommentPositionHover: ({ notes }) => notes.selectedCommentPositionHover,
}),
diffLinesLength() {
return this.diffLines.length;
},
commentedLines() {
return getCommentedLines(
this.selectedCommentPosition || this.selectedCommentPositionHover,
this.diffLines,
);
},
2021-09-04 01:27:46 +05:30
hasCodequalityChanges() {
2021-09-30 23:02:18 +05:30
return this.codequalityDiff?.files?.[this.diffFile.file_path]?.length > 0;
2021-09-04 01:27:46 +05:30
},
2021-01-29 00:20:46 +05:30
},
methods: {
2021-03-08 18:12:59 +05:30
...mapActions(['setSelectedCommentPosition']),
2021-09-30 23:02:18 +05:30
...mapActions('diffs', ['showCommentForm', 'setHighlightedRow', 'toggleLineDiscussions']),
2021-01-29 00:20:46 +05:30
showCommentLeft(line) {
2021-03-11 19:13:27 +05:30
return line.left && !line.right;
2021-01-29 00:20:46 +05:30
},
showCommentRight(line) {
2021-03-11 19:13:27 +05:30
return line.right && !line.left;
2021-01-29 00:20:46 +05:30
},
2021-09-30 23:02:18 +05:30
onStartDragging({ event = {}, line }) {
if (event.target?.parentNode) {
hide(event.target.parentNode);
}
this.idState.dragStart = line;
2021-03-08 18:12:59 +05:30
},
2022-08-13 15:12:31 +05:30
hideCodeQualityFindings(line) {
const index = this.codeQualityExpandedLines.indexOf(line);
if (index > -1) {
this.codeQualityExpandedLines.splice(index, 1);
}
},
toggleCodeQualityFindings(line) {
if (!this.codeQualityExpandedLines.includes(line)) {
this.codeQualityExpandedLines.push(line);
} else {
this.hideCodeQualityFindings(line);
}
},
2021-03-08 18:12:59 +05:30
onDragOver(line) {
2021-09-30 23:02:18 +05:30
if (line.chunk !== this.idState.dragStart.chunk) return;
2021-03-08 18:12:59 +05:30
2021-09-30 23:02:18 +05:30
let start = this.idState.dragStart;
2021-03-08 18:12:59 +05:30
let end = line;
2021-09-30 23:02:18 +05:30
if (this.idState.dragStart.index >= line.index) {
2021-03-08 18:12:59 +05:30
start = line;
2021-09-30 23:02:18 +05:30
end = this.idState.dragStart;
2021-03-08 18:12:59 +05:30
}
2021-09-30 23:02:18 +05:30
this.idState.updatedLineRange = { start, end };
2021-03-08 18:12:59 +05:30
2021-09-30 23:02:18 +05:30
this.setSelectedCommentPosition(this.idState.updatedLineRange);
2021-03-08 18:12:59 +05:30
},
onStopDragging() {
this.showCommentForm({
2021-09-30 23:02:18 +05:30
lineCode: this.idState.updatedLineRange?.end?.line_code,
2021-03-08 18:12:59 +05:30
fileHash: this.diffFile.file_hash,
});
2021-09-30 23:02:18 +05:30
this.idState.dragStart = null;
},
2021-12-11 22:18:48 +05:30
singleLineComment(code, line) {
const lineDir = pickDirection({ line, code });
this.idState.updatedLineRange = {
start: lineDir,
end: lineDir,
};
this.showCommentForm({ lineCode: lineDir.line_code, fileHash: this.diffFile.file_hash });
},
2021-09-30 23:02:18 +05:30
isHighlighted(line) {
return isHighlighted(
this.highlightedRow,
line.left?.line_code ? line.left : line.right,
false,
);
},
handleParallelLineMouseDown(e) {
const line = e.target.closest('.diff-td');
2022-08-13 15:12:31 +05:30
if (line) {
const table = line.closest('.diff-table');
table.classList.remove('left-side-selected', 'right-side-selected');
const [lineClass] = ['left-side', 'right-side'].filter((name) =>
line.classList.contains(name),
);
2021-09-30 23:02:18 +05:30
2022-08-13 15:12:31 +05:30
if (lineClass) {
table.classList.add(`${lineClass}-selected`);
}
2021-09-30 23:02:18 +05:30
}
2021-03-08 18:12:59 +05:30
},
2022-07-16 23:28:13 +05:30
getCountBetweenIndex(index) {
if (index === 0) {
return -1;
} else if (!this.diffLines[index + 1]) {
return -1;
}
return (
Number(this.diffLines[index + 1].left.new_line) -
Number(this.diffLines[index - 1].left.new_line)
);
},
2022-08-13 15:12:31 +05:30
getCodeQualityLine(line) {
2022-10-11 01:57:18 +05:30
return (line.left ?? line.right)?.codequality?.[0]?.line;
2022-08-13 15:12:31 +05:30
},
2022-11-25 23:54:43 +05:30
lineDrafts(line, side) {
return (line[side]?.lineDrafts || []).filter((entry) => entry.isDraft);
},
lineHasDrafts(line, side) {
return this.lineDrafts(line, side).length > 0;
},
2021-01-29 00:20:46 +05:30
},
userColorScheme: window.gon.user_color_scheme,
};
</script>
<template>
<div
2021-11-11 11:23:49 +05:30
:class="[
$options.userColorScheme,
{ 'inline-diff-view': inline, 'with-codequality': hasCodequalityChanges },
]"
2021-01-29 00:20:46 +05:30
:data-commit-id="commitId"
class="diff-grid diff-table code diff-wrap-lines js-syntax-highlight text-file"
2021-09-30 23:02:18 +05:30
@mousedown="handleParallelLineMouseDown"
2021-01-29 00:20:46 +05:30
>
<template v-for="(line, index) in diffLines">
2022-08-27 11:52:29 +05:30
<div
v-if="line.isMatchLineLeft || line.isMatchLineRight"
:key="`expand-${index}`"
class="diff-grid-row diff-tr line_holder match expansion"
>
2022-07-16 23:28:13 +05:30
<diff-expansion-cell
:file="diffFile"
:line="line.left"
:is-top="index === 0"
:is-bottom="index + 1 === diffLinesLength"
:inline="inline"
:line-count-between="getCountBetweenIndex(index)"
2022-08-27 11:52:29 +05:30
:class="{ parallel: !inline }"
class="diff-grid-left diff-grid-2-col left-side"
2022-07-16 23:28:13 +05:30
/>
2022-08-27 11:52:29 +05:30
<diff-expansion-cell
v-if="!inline"
:file="diffFile"
:line="line.left"
:is-top="index === 0"
:is-bottom="index + 1 === diffLinesLength"
:inline="inline"
:line-count-between="getCountBetweenIndex(index)"
:class="{ parallel: !inline }"
class="diff-grid-right diff-grid-2-col right-side"
/>
</div>
2021-01-29 00:20:46 +05:30
<diff-row
v-if="!line.isMatchLineLeft && !line.isMatchLineRight"
:key="line.line_code"
:file-hash="diffFile.file_hash"
:file-path="diffFile.file_path"
:line="line"
:is-bottom="index + 1 === diffLinesLength"
:is-commented="index >= commentedLines.startLine && index <= commentedLines.endLine"
:inline="inline"
2021-03-08 18:12:59 +05:30
:index="index"
2022-10-11 01:57:18 +05:30
:code-quality-expanded="codeQualityExpandedLines.includes(getCodeQualityLine(line))"
2021-09-30 23:02:18 +05:30
:is-highlighted="isHighlighted(line)"
:file-line-coverage="fileLineCoverage"
2022-01-26 12:08:38 +05:30
:coverage-loaded="coverageLoaded"
2021-12-11 22:18:48 +05:30
@showCommentForm="(code) => singleLineComment(code, line)"
2021-09-30 23:02:18 +05:30
@setHighlightedRow="setHighlightedRow"
2022-08-13 15:12:31 +05:30
@toggleCodeQualityFindings="toggleCodeQualityFindings"
2021-09-30 23:02:18 +05:30
@toggleLineDiscussions="
({ lineCode, expanded }) =>
toggleLineDiscussions({ lineCode, fileHash: diffFile.file_hash, expanded })
"
2021-03-08 18:12:59 +05:30
@enterdragging="onDragOver"
@startdragging="onStartDragging"
@stopdragging="onStopDragging"
2021-01-29 00:20:46 +05:30
/>
2022-10-11 01:57:18 +05:30
<diff-line
2022-08-13 15:12:31 +05:30
v-if="
glFeatures.refactorCodeQualityInlineFindings &&
codeQualityExpandedLines.includes(getCodeQualityLine(line))
"
:key="line.line_code"
2022-10-11 01:57:18 +05:30
:line="line"
2022-08-13 15:12:31 +05:30
@hideCodeQualityFindings="hideCodeQualityFindings"
/>
2021-01-29 00:20:46 +05:30
<div
v-if="line.renderCommentRow"
:key="`dcr-${line.line_code || index}`"
:class="line.commentRowClasses"
class="diff-grid-comments diff-tr notes_holder"
>
2021-03-11 19:13:27 +05:30
<div
v-if="line.left || !inline"
:class="{ parallel: !inline }"
class="diff-td notes-content old"
>
2021-01-29 00:20:46 +05:30
<diff-comment-cell
2021-03-11 19:13:27 +05:30
v-if="line.left && (line.left.renderDiscussion || line.left.hasCommentForm)"
2021-01-29 00:20:46 +05:30
:line="line.left"
2021-12-11 22:18:48 +05:30
:line-range="idState.updatedLineRange"
2021-01-29 00:20:46 +05:30
:diff-file-hash="diffFile.file_hash"
:help-page-path="helpPagePath"
line-position="left"
/>
</div>
2021-03-11 19:13:27 +05:30
<div
v-if="line.right || !inline"
:class="{ parallel: !inline }"
class="diff-td notes-content new"
>
2021-01-29 00:20:46 +05:30
<diff-comment-cell
2021-03-11 19:13:27 +05:30
v-if="line.right && (line.right.renderDiscussion || line.right.hasCommentForm)"
2021-01-29 00:20:46 +05:30
:line="line.right"
2021-12-11 22:18:48 +05:30
:line-range="idState.updatedLineRange"
2021-01-29 00:20:46 +05:30
:diff-file-hash="diffFile.file_hash"
:line-index="index"
:help-page-path="helpPagePath"
line-position="right"
/>
</div>
</div>
<div
v-if="shouldRenderParallelDraftRow(diffFile.file_hash, line)"
:key="`drafts-${index}`"
:class="line.draftRowClasses"
class="diff-grid-drafts diff-tr notes_holder"
>
<div
2022-11-25 23:54:43 +05:30
v-if="!inline || lineHasDrafts(line, 'left')"
2021-01-29 00:20:46 +05:30
class="diff-td notes-content parallel old"
>
2022-11-25 23:54:43 +05:30
<div v-for="draft in lineDrafts(line, 'left')" :key="draft.id" class="content">
2023-03-04 22:38:38 +05:30
<article class="note-wrapper">
<ul class="notes draft-notes">
<draft-note :draft="draft" :line="line.left" />
</ul>
</article>
2021-01-29 00:20:46 +05:30
</div>
</div>
<div
2022-11-25 23:54:43 +05:30
v-if="!inline || lineHasDrafts(line, 'right')"
2021-01-29 00:20:46 +05:30
class="diff-td notes-content parallel new"
>
2022-11-25 23:54:43 +05:30
<div v-for="draft in lineDrafts(line, 'right')" :key="draft.id" class="content">
2023-03-04 22:38:38 +05:30
<article class="note-wrapper">
<ul class="notes draft-notes">
<draft-note :draft="draft" :line="line.right" />
</ul>
</article>
2021-01-29 00:20:46 +05:30
</div>
</div>
</div>
</template>
</div>
</template>