2018-03-27 19:54:05 +05:30
|
|
|
<script>
|
2018-11-08 19:23:39 +05:30
|
|
|
import { mapState, mapActions } from 'vuex';
|
2018-05-09 12:01:36 +05:30
|
|
|
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
|
2018-11-08 19:23:39 +05:30
|
|
|
import DiffFileHeader from '~/diffs/components/diff_file_header.vue';
|
2018-12-13 13:39:08 +05:30
|
|
|
import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue';
|
|
|
|
import ImageDiffOverlay from '~/diffs/components/image_diff_overlay.vue';
|
|
|
|
import { GlSkeletonLoading } from '@gitlab-org/gitlab-ui';
|
|
|
|
import { trimFirstCharOfLineContent, getDiffMode } from '~/diffs/store/utils';
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2018-05-09 12:01:36 +05:30
|
|
|
export default {
|
|
|
|
components: {
|
|
|
|
DiffFileHeader,
|
2018-12-13 13:39:08 +05:30
|
|
|
GlSkeletonLoading,
|
|
|
|
DiffViewer,
|
|
|
|
ImageDiffOverlay,
|
2018-05-09 12:01:36 +05:30
|
|
|
},
|
|
|
|
props: {
|
|
|
|
discussion: {
|
|
|
|
type: Object,
|
|
|
|
required: true,
|
2018-03-27 19:54:05 +05:30
|
|
|
},
|
2018-05-09 12:01:36 +05:30
|
|
|
},
|
2018-11-08 19:23:39 +05:30
|
|
|
data() {
|
|
|
|
return {
|
|
|
|
error: false,
|
|
|
|
};
|
|
|
|
},
|
2018-05-09 12:01:36 +05:30
|
|
|
computed: {
|
2018-11-08 19:23:39 +05:30
|
|
|
...mapState({
|
|
|
|
noteableData: state => state.notes.noteableData,
|
2018-12-13 13:39:08 +05:30
|
|
|
projectPath: state => state.diffs.projectPath,
|
2018-11-08 19:23:39 +05:30
|
|
|
}),
|
2018-12-13 13:39:08 +05:30
|
|
|
diffMode() {
|
|
|
|
return getDiffMode(this.diffFile);
|
|
|
|
},
|
2018-11-08 19:23:39 +05:30
|
|
|
hasTruncatedDiffLines() {
|
|
|
|
return this.discussion.truncatedDiffLines && this.discussion.truncatedDiffLines.length !== 0;
|
|
|
|
},
|
|
|
|
isDiscussionsExpanded() {
|
|
|
|
return true; // TODO: @fatihacet - Fix this.
|
|
|
|
},
|
|
|
|
isCollapsed() {
|
|
|
|
return this.diffFile.collapsed || false;
|
|
|
|
},
|
2018-05-09 12:01:36 +05:30
|
|
|
isImageDiff() {
|
|
|
|
return !this.diffFile.text;
|
2018-03-27 19:54:05 +05:30
|
|
|
},
|
2018-05-09 12:01:36 +05:30
|
|
|
diffFileClass() {
|
|
|
|
const { text } = this.diffFile;
|
|
|
|
return text ? 'text-file' : 'js-image-file';
|
2018-03-27 19:54:05 +05:30
|
|
|
},
|
2018-05-09 12:01:36 +05:30
|
|
|
diffFile() {
|
2018-11-08 19:23:39 +05:30
|
|
|
return convertObjectPropsToCamelCase(this.discussion.diffFile, { deep: true });
|
2018-03-27 19:54:05 +05:30
|
|
|
},
|
2018-05-09 12:01:36 +05:30
|
|
|
imageDiffHtml() {
|
|
|
|
return this.discussion.imageDiffHtml;
|
|
|
|
},
|
2018-11-08 19:23:39 +05:30
|
|
|
userColorScheme() {
|
|
|
|
return window.gon.user_color_scheme;
|
|
|
|
},
|
|
|
|
normalizedDiffLines() {
|
|
|
|
if (this.discussion.truncatedDiffLines) {
|
|
|
|
return this.discussion.truncatedDiffLines.map(line =>
|
|
|
|
trimFirstCharOfLineContent(convertObjectPropsToCamelCase(line)),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
return [];
|
|
|
|
},
|
2018-05-09 12:01:36 +05:30
|
|
|
},
|
|
|
|
mounted() {
|
2018-12-13 13:39:08 +05:30
|
|
|
if (!this.hasTruncatedDiffLines) {
|
2018-11-08 19:23:39 +05:30
|
|
|
this.fetchDiff();
|
2018-05-09 12:01:36 +05:30
|
|
|
}
|
|
|
|
},
|
|
|
|
methods: {
|
2018-11-08 19:23:39 +05:30
|
|
|
...mapActions(['fetchDiscussionDiffLines']),
|
2018-05-09 12:01:36 +05:30
|
|
|
rowTag(html) {
|
|
|
|
return html.outerHTML ? 'tr' : 'template';
|
|
|
|
},
|
2018-11-08 19:23:39 +05:30
|
|
|
fetchDiff() {
|
|
|
|
this.error = false;
|
|
|
|
this.fetchDiscussionDiffLines(this.discussion)
|
|
|
|
.then(this.highlight)
|
|
|
|
.catch(() => {
|
|
|
|
this.error = true;
|
|
|
|
});
|
|
|
|
},
|
2018-05-09 12:01:36 +05:30
|
|
|
},
|
|
|
|
};
|
2018-03-27 19:54:05 +05:30
|
|
|
</script>
|
|
|
|
|
|
|
|
<template>
|
|
|
|
<div
|
|
|
|
ref="fileHolder"
|
|
|
|
:class="diffFileClass"
|
2018-11-08 19:23:39 +05:30
|
|
|
class="diff-file file-holder"
|
2018-03-27 19:54:05 +05:30
|
|
|
>
|
2018-11-08 19:23:39 +05:30
|
|
|
<diff-file-header
|
2018-12-13 13:39:08 +05:30
|
|
|
:discussion-path="discussion.discussionPath"
|
2018-11-08 19:23:39 +05:30
|
|
|
:diff-file="diffFile"
|
|
|
|
:can-current-user-fork="false"
|
|
|
|
:discussions-expanded="isDiscussionsExpanded"
|
|
|
|
:expanded="!isCollapsed"
|
|
|
|
/>
|
2018-03-27 19:54:05 +05:30
|
|
|
<div
|
|
|
|
v-if="diffFile.text"
|
2018-11-08 19:23:39 +05:30
|
|
|
:class="userColorScheme"
|
|
|
|
class="diff-content code"
|
2018-03-27 19:54:05 +05:30
|
|
|
>
|
|
|
|
<table>
|
2018-11-08 19:23:39 +05:30
|
|
|
<tr
|
|
|
|
v-for="line in normalizedDiffLines"
|
|
|
|
:key="line.lineCode"
|
|
|
|
class="line_holder"
|
|
|
|
>
|
|
|
|
<td class="diff-line-num old_line">{{ line.oldLine }}</td>
|
|
|
|
<td class="diff-line-num new_line">{{ line.newLine }}</td>
|
|
|
|
<td
|
|
|
|
:class="line.type"
|
|
|
|
class="line_content"
|
|
|
|
v-html="line.richText"
|
|
|
|
>
|
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
<tr
|
|
|
|
v-if="!hasTruncatedDiffLines"
|
|
|
|
class="line_holder line-holder-placeholder"
|
|
|
|
>
|
|
|
|
<td class="old_line diff-line-num"></td>
|
|
|
|
<td class="new_line diff-line-num"></td>
|
|
|
|
<td
|
|
|
|
v-if="error"
|
|
|
|
class="js-error-lazy-load-diff diff-loading-error-block"
|
|
|
|
>
|
|
|
|
Unable to load the diff
|
|
|
|
<button
|
|
|
|
class="btn-link btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button"
|
|
|
|
@click="fetchDiff"
|
|
|
|
>
|
|
|
|
Try again
|
|
|
|
</button>
|
|
|
|
</td>
|
|
|
|
<td
|
|
|
|
v-else
|
|
|
|
class="line_content js-success-lazy-load"
|
|
|
|
>
|
|
|
|
<span></span>
|
2018-12-13 13:39:08 +05:30
|
|
|
<gl-skeleton-loading />
|
2018-11-08 19:23:39 +05:30
|
|
|
<span></span>
|
|
|
|
</td>
|
|
|
|
</tr>
|
2018-03-27 19:54:05 +05:30
|
|
|
<tr class="notes_holder">
|
|
|
|
<td
|
2018-11-20 20:47:30 +05:30
|
|
|
class="notes_content"
|
|
|
|
colspan="3"
|
|
|
|
>
|
2018-03-27 19:54:05 +05:30
|
|
|
<slot></slot>
|
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
</table>
|
|
|
|
</div>
|
|
|
|
<div
|
|
|
|
v-else
|
|
|
|
>
|
2018-12-13 13:39:08 +05:30
|
|
|
<diff-viewer
|
|
|
|
:diff-mode="diffMode"
|
|
|
|
:new-path="diffFile.newPath"
|
|
|
|
:new-sha="diffFile.diffRefs.headSha"
|
|
|
|
:old-path="diffFile.oldPath"
|
|
|
|
:old-sha="diffFile.diffRefs.baseSha"
|
|
|
|
:file-hash="diffFile.fileHash"
|
|
|
|
:project-path="projectPath"
|
|
|
|
>
|
|
|
|
<image-diff-overlay
|
|
|
|
slot="image-overlay"
|
|
|
|
:discussions="discussion"
|
|
|
|
:file-hash="diffFile.fileHash"
|
|
|
|
:show-comment-icon="true"
|
|
|
|
:should-toggle-discussion="false"
|
|
|
|
badge-class="image-comment-badge"
|
|
|
|
/>
|
|
|
|
</diff-viewer>
|
2018-03-27 19:54:05 +05:30
|
|
|
<slot></slot>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</template>
|