424 lines
13 KiB
Vue
424 lines
13 KiB
Vue
<script>
|
|
import _ from 'underscore';
|
|
import { mapActions, mapGetters } from 'vuex';
|
|
import { GlTooltipDirective } from '@gitlab/ui';
|
|
import { truncateSha } from '~/lib/utils/text_utility';
|
|
import { s__, __, sprintf } from '~/locale';
|
|
import { clearDraft, getDiscussionReplyKey } from '~/lib/utils/autosave';
|
|
import icon from '~/vue_shared/components/icon.vue';
|
|
import diffLineNoteFormMixin from 'ee_else_ce/notes/mixins/diff_line_note_form';
|
|
import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
|
|
import Flash from '../../flash';
|
|
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
|
|
import noteHeader from './note_header.vue';
|
|
import noteSignedOutWidget from './note_signed_out_widget.vue';
|
|
import noteEditedText from './note_edited_text.vue';
|
|
import noteForm from './note_form.vue';
|
|
import diffWithNote from './diff_with_note.vue';
|
|
import noteable from '../mixins/noteable';
|
|
import resolvable from '../mixins/resolvable';
|
|
import discussionNavigation from '../mixins/discussion_navigation';
|
|
import eventHub from '../event_hub';
|
|
import DiscussionNotes from './discussion_notes.vue';
|
|
import DiscussionActions from './discussion_actions.vue';
|
|
|
|
export default {
|
|
name: 'NoteableDiscussion',
|
|
components: {
|
|
icon,
|
|
userAvatarLink,
|
|
noteHeader,
|
|
noteSignedOutWidget,
|
|
noteEditedText,
|
|
noteForm,
|
|
DraftNote: () => import('ee_component/batch_comments/components/draft_note.vue'),
|
|
TimelineEntryItem,
|
|
DiscussionNotes,
|
|
DiscussionActions,
|
|
},
|
|
directives: {
|
|
GlTooltip: GlTooltipDirective,
|
|
},
|
|
mixins: [noteable, resolvable, discussionNavigation, diffLineNoteFormMixin],
|
|
props: {
|
|
discussion: {
|
|
type: Object,
|
|
required: true,
|
|
},
|
|
line: {
|
|
type: Object,
|
|
required: false,
|
|
default: null,
|
|
},
|
|
renderDiffFile: {
|
|
type: Boolean,
|
|
required: false,
|
|
default: true,
|
|
},
|
|
alwaysExpanded: {
|
|
type: Boolean,
|
|
required: false,
|
|
default: false,
|
|
},
|
|
discussionsByDiffOrder: {
|
|
type: Boolean,
|
|
required: false,
|
|
default: false,
|
|
},
|
|
helpPagePath: {
|
|
type: String,
|
|
required: false,
|
|
default: '',
|
|
},
|
|
},
|
|
data() {
|
|
return {
|
|
isReplying: false,
|
|
isResolving: false,
|
|
resolveAsThread: true,
|
|
};
|
|
},
|
|
computed: {
|
|
...mapGetters([
|
|
'convertedDisscussionIds',
|
|
'getNoteableData',
|
|
'userCanReply',
|
|
'nextUnresolvedDiscussionId',
|
|
'unresolvedDiscussionsCount',
|
|
'hasUnresolvedDiscussions',
|
|
'showJumpToNextDiscussion',
|
|
'getUserData',
|
|
]),
|
|
currentUser() {
|
|
return this.getUserData;
|
|
},
|
|
author() {
|
|
return this.firstNote.author;
|
|
},
|
|
autosaveKey() {
|
|
return getDiscussionReplyKey(this.firstNote.noteable_type, this.discussion.id);
|
|
},
|
|
newNotePath() {
|
|
return this.getNoteableData.create_note_path;
|
|
},
|
|
firstNote() {
|
|
return this.discussion.notes.slice(0, 1)[0];
|
|
},
|
|
lastUpdatedBy() {
|
|
const { notes } = this.discussion;
|
|
|
|
if (notes.length > 1) {
|
|
return notes[notes.length - 1].author;
|
|
}
|
|
|
|
return null;
|
|
},
|
|
lastUpdatedAt() {
|
|
const { notes } = this.discussion;
|
|
|
|
if (notes.length > 1) {
|
|
return notes[notes.length - 1].created_at;
|
|
}
|
|
|
|
return null;
|
|
},
|
|
resolvedText() {
|
|
return this.discussion.resolved_by_push ? __('Automatically resolved') : __('Resolved');
|
|
},
|
|
shouldShowJumpToNextDiscussion() {
|
|
return this.showJumpToNextDiscussion(this.discussionsByDiffOrder ? 'diff' : 'discussion');
|
|
},
|
|
shouldRenderDiffs() {
|
|
return this.discussion.diff_discussion && this.renderDiffFile;
|
|
},
|
|
shouldGroupReplies() {
|
|
return !this.shouldRenderDiffs;
|
|
},
|
|
wrapperComponent() {
|
|
return this.shouldRenderDiffs ? diffWithNote : 'div';
|
|
},
|
|
wrapperComponentProps() {
|
|
if (this.shouldRenderDiffs) {
|
|
return { discussion: this.discussion };
|
|
}
|
|
|
|
return {};
|
|
},
|
|
isExpanded() {
|
|
return this.discussion.expanded || this.alwaysExpanded;
|
|
},
|
|
shouldHideDiscussionBody() {
|
|
return this.shouldRenderDiffs && !this.isExpanded;
|
|
},
|
|
actionText() {
|
|
const linkStart = `<a href="${_.escape(this.discussion.discussion_path)}">`;
|
|
const linkEnd = '</a>';
|
|
|
|
let { commit_id: commitId } = this.discussion;
|
|
if (commitId) {
|
|
commitId = `<span class="commit-sha">${truncateSha(commitId)}</span>`;
|
|
}
|
|
|
|
const {
|
|
for_commit: isForCommit,
|
|
diff_discussion: isDiffDiscussion,
|
|
active: isActive,
|
|
} = this.discussion;
|
|
|
|
let text = s__('MergeRequests|started a thread');
|
|
if (isForCommit) {
|
|
text = s__('MergeRequests|started a thread on commit %{linkStart}%{commitId}%{linkEnd}');
|
|
} else if (isDiffDiscussion && commitId) {
|
|
text = isActive
|
|
? s__('MergeRequests|started a thread on commit %{linkStart}%{commitId}%{linkEnd}')
|
|
: s__(
|
|
'MergeRequests|started a thread on an outdated change in commit %{linkStart}%{commitId}%{linkEnd}',
|
|
);
|
|
} else if (isDiffDiscussion) {
|
|
text = isActive
|
|
? s__('MergeRequests|started a thread on %{linkStart}the diff%{linkEnd}')
|
|
: s__(
|
|
'MergeRequests|started a thread on %{linkStart}an old version of the diff%{linkEnd}',
|
|
);
|
|
}
|
|
|
|
return sprintf(text, { commitId, linkStart, linkEnd }, false);
|
|
},
|
|
diffLine() {
|
|
if (this.line) {
|
|
return this.line;
|
|
}
|
|
|
|
if (this.discussion.diff_discussion && this.discussion.truncated_diff_lines) {
|
|
return this.discussion.truncated_diff_lines.slice(-1)[0];
|
|
}
|
|
|
|
return null;
|
|
},
|
|
resolveWithIssuePath() {
|
|
return !this.discussionResolved ? this.discussion.resolve_with_issue_path : '';
|
|
},
|
|
},
|
|
created() {
|
|
eventHub.$on('startReplying', this.onStartReplying);
|
|
},
|
|
beforeDestroy() {
|
|
eventHub.$off('startReplying', this.onStartReplying);
|
|
},
|
|
methods: {
|
|
...mapActions([
|
|
'saveNote',
|
|
'toggleDiscussion',
|
|
'removePlaceholderNotes',
|
|
'toggleResolveNote',
|
|
'expandDiscussion',
|
|
'removeConvertedDiscussion',
|
|
]),
|
|
truncateSha,
|
|
toggleDiscussionHandler() {
|
|
this.toggleDiscussion({ discussionId: this.discussion.id });
|
|
},
|
|
showReplyForm() {
|
|
this.isReplying = true;
|
|
},
|
|
cancelReplyForm(shouldConfirm, isDirty) {
|
|
if (shouldConfirm && isDirty) {
|
|
const msg = s__('Notes|Are you sure you want to cancel creating this comment?');
|
|
|
|
// eslint-disable-next-line no-alert
|
|
if (!window.confirm(msg)) {
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (this.convertedDisscussionIds.includes(this.discussion.id)) {
|
|
this.removeConvertedDiscussion(this.discussion.id);
|
|
}
|
|
|
|
this.isReplying = false;
|
|
clearDraft(this.autosaveKey);
|
|
},
|
|
saveReply(noteText, form, callback) {
|
|
if (!noteText) {
|
|
this.cancelReplyForm();
|
|
callback();
|
|
return;
|
|
}
|
|
const postData = {
|
|
in_reply_to_discussion_id: this.discussion.reply_id,
|
|
target_type: this.getNoteableData.targetType,
|
|
note: { note: noteText },
|
|
};
|
|
|
|
if (this.convertedDisscussionIds.includes(this.discussion.id)) {
|
|
postData.return_discussion = true;
|
|
}
|
|
|
|
if (this.discussion.for_commit) {
|
|
postData.note_project_id = this.discussion.project_id;
|
|
}
|
|
|
|
const replyData = {
|
|
endpoint: this.newNotePath,
|
|
flashContainer: this.$el,
|
|
data: postData,
|
|
};
|
|
|
|
this.isReplying = false;
|
|
this.saveNote(replyData)
|
|
.then(() => {
|
|
clearDraft(this.autosaveKey);
|
|
callback();
|
|
})
|
|
.catch(err => {
|
|
this.removePlaceholderNotes();
|
|
this.isReplying = true;
|
|
this.$nextTick(() => {
|
|
const msg = __(
|
|
'Your comment could not be submitted! Please check your network connection and try again.',
|
|
);
|
|
Flash(msg, 'alert', this.$el);
|
|
this.$refs.noteForm.note = noteText;
|
|
callback(err);
|
|
});
|
|
});
|
|
},
|
|
jumpToNextDiscussion() {
|
|
const nextId = this.nextUnresolvedDiscussionId(
|
|
this.discussion.id,
|
|
this.discussionsByDiffOrder,
|
|
);
|
|
|
|
this.jumpToDiscussion(nextId);
|
|
},
|
|
deleteNoteHandler(note) {
|
|
this.$emit('noteDeleted', this.discussion, note);
|
|
},
|
|
onStartReplying(discussionId) {
|
|
if (this.discussion.id === discussionId) {
|
|
this.showReplyForm();
|
|
}
|
|
},
|
|
},
|
|
};
|
|
</script>
|
|
|
|
<template>
|
|
<timeline-entry-item class="note note-discussion">
|
|
<div class="timeline-content">
|
|
<div :data-discussion-id="discussion.id" class="discussion js-discussion-container">
|
|
<div v-if="shouldRenderDiffs" class="discussion-header note-wrapper">
|
|
<div v-once class="timeline-icon align-self-start flex-shrink-0">
|
|
<user-avatar-link
|
|
v-if="author"
|
|
:link-href="author.path"
|
|
:img-src="author.avatar_url"
|
|
:img-alt="author.name"
|
|
:img-size="40"
|
|
/>
|
|
</div>
|
|
<div class="timeline-content w-100">
|
|
<note-header
|
|
:author="author"
|
|
:created-at="firstNote.created_at"
|
|
:note-id="firstNote.id"
|
|
:include-toggle="true"
|
|
:expanded="discussion.expanded"
|
|
@toggleHandler="toggleDiscussionHandler"
|
|
>
|
|
<span v-html="actionText"></span>
|
|
</note-header>
|
|
<note-edited-text
|
|
v-if="discussion.resolved"
|
|
:edited-at="discussion.resolved_at"
|
|
:edited-by="discussion.resolved_by"
|
|
:action-text="resolvedText"
|
|
class-name="discussion-headline-light js-discussion-headline"
|
|
/>
|
|
<note-edited-text
|
|
v-else-if="lastUpdatedAt"
|
|
:edited-at="lastUpdatedAt"
|
|
:edited-by="lastUpdatedBy"
|
|
action-text="Last updated"
|
|
class-name="discussion-headline-light js-discussion-headline"
|
|
/>
|
|
</div>
|
|
</div>
|
|
<div v-if="!shouldHideDiscussionBody" class="discussion-body">
|
|
<component
|
|
:is="wrapperComponent"
|
|
v-bind="wrapperComponentProps"
|
|
class="card discussion-wrapper"
|
|
>
|
|
<discussion-notes
|
|
:discussion="discussion"
|
|
:diff-line="diffLine"
|
|
:help-page-path="helpPagePath"
|
|
:is-expanded="isExpanded"
|
|
:line="line"
|
|
:should-group-replies="shouldGroupReplies"
|
|
@startReplying="showReplyForm"
|
|
@deleteNote="deleteNoteHandler"
|
|
>
|
|
<slot slot="avatar-badge" name="avatar-badge"></slot>
|
|
<template #footer="{ showReplies }">
|
|
<draft-note
|
|
v-if="showDraft(discussion.reply_id)"
|
|
:key="`draft_${discussion.id}`"
|
|
:draft="draftForDiscussion(discussion.reply_id)"
|
|
/>
|
|
<div
|
|
v-else-if="showReplies"
|
|
:class="{ 'is-replying': isReplying }"
|
|
class="discussion-reply-holder clearfix"
|
|
>
|
|
<user-avatar-link
|
|
v-if="!isReplying && userCanReply"
|
|
:link-href="currentUser.path"
|
|
:img-src="currentUser.avatar_url"
|
|
:img-alt="currentUser.name"
|
|
:img-size="40"
|
|
class="d-none d-sm-block"
|
|
/>
|
|
<discussion-actions
|
|
v-if="!isReplying && userCanReply"
|
|
:discussion="discussion"
|
|
:is-resolving="isResolving"
|
|
:resolve-button-title="resolveButtonTitle"
|
|
:resolve-with-issue-path="resolveWithIssuePath"
|
|
:should-show-jump-to-next-discussion="shouldShowJumpToNextDiscussion"
|
|
@showReplyForm="showReplyForm"
|
|
@resolve="resolveHandler"
|
|
@jumpToNextDiscussion="jumpToNextDiscussion"
|
|
/>
|
|
<div v-if="isReplying" class="avatar-note-form-holder">
|
|
<user-avatar-link
|
|
v-if="currentUser"
|
|
:link-href="currentUser.path"
|
|
:img-src="currentUser.avatar_url"
|
|
:img-alt="currentUser.name"
|
|
:img-size="40"
|
|
class="d-none d-sm-block"
|
|
/>
|
|
<note-form
|
|
ref="noteForm"
|
|
:discussion="discussion"
|
|
:is-editing="false"
|
|
:line="diffLine"
|
|
save-button-title="Comment"
|
|
:autosave-key="autosaveKey"
|
|
@handleFormUpdateAddToReview="addReplyToReview"
|
|
@handleFormUpdate="saveReply"
|
|
@cancelForm="cancelReplyForm"
|
|
/>
|
|
</div>
|
|
<note-signed-out-widget v-if="!userCanReply" />
|
|
</div>
|
|
</template>
|
|
</discussion-notes>
|
|
</component>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</timeline-entry-item>
|
|
</template>
|