Merge branch 'issue-discussions-refactor' into 'master'
Issue discussions Vue refactor See merge request !12069
This commit is contained in:
Jacob Schatz
commit
8100274518
|
|
@ -2,17 +2,17 @@
|
|||
import AccessorUtilities from './lib/utils/accessor';
|
||||
|
||||
window.Autosave = (function() {
|
||||
function Autosave(field, key) {
|
||||
function Autosave(field, key, resource) {
|
||||
this.field = field;
|
||||
this.isLocalStorageAvailable = AccessorUtilities.isLocalStorageAccessSafe();
|
||||
|
||||
this.resource = resource;
|
||||
if (key.join != null) {
|
||||
key = key.join("/");
|
||||
key = key.join('/');
|
||||
}
|
||||
this.key = "autosave/" + key;
|
||||
this.field.data("autosave", this);
|
||||
this.key = 'autosave/' + key;
|
||||
this.field.data('autosave', this);
|
||||
this.restore();
|
||||
this.field.on("input", (function(_this) {
|
||||
this.field.on('input', (function(_this) {
|
||||
return function() {
|
||||
return _this.save();
|
||||
};
|
||||
|
|
@ -29,7 +29,17 @@ window.Autosave = (function() {
|
|||
if ((text != null ? text.length : void 0) > 0) {
|
||||
this.field.val(text);
|
||||
}
|
||||
return this.field.trigger("input");
|
||||
if (!this.resource && this.resource !== 'issue') {
|
||||
this.field.trigger('input');
|
||||
} else {
|
||||
// v-model does not update with jQuery trigger
|
||||
// https://github.com/vuejs/vue/issues/2804#issuecomment-216968137
|
||||
const event = new Event('change', { bubbles: true, cancelable: false });
|
||||
const field = this.field.get(0);
|
||||
if (field) {
|
||||
field.dispatchEvent(event);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Autosave.prototype.save = function() {
|
||||
|
|
|
|||
|
|
@ -109,6 +109,7 @@ class AwardsHandler {
|
|||
}
|
||||
|
||||
$thumbsBtn.toggleClass('disabled', $userAuthored);
|
||||
$thumbsBtn.prop('disabled', $userAuthored);
|
||||
}
|
||||
|
||||
// Create the emoji menu with the first category of emojis.
|
||||
|
|
@ -234,14 +235,33 @@ class AwardsHandler {
|
|||
}
|
||||
|
||||
addAward(votesBlock, awardUrl, emoji, checkMutuality, callback) {
|
||||
const isMainAwardsBlock = votesBlock.closest('.js-issue-note-awards').length;
|
||||
|
||||
if (gl.utils.isInIssuePage() && !isMainAwardsBlock) {
|
||||
const id = votesBlock.attr('id').replace('note_', '');
|
||||
|
||||
$('.emoji-menu').removeClass('is-visible');
|
||||
$('.js-add-award.is-active').removeClass('is-active');
|
||||
const toggleAwardEvent = new CustomEvent('toggleAward', {
|
||||
detail: {
|
||||
awardName: emoji,
|
||||
noteId: id,
|
||||
},
|
||||
});
|
||||
|
||||
document.querySelector('.js-vue-notes-event').dispatchEvent(toggleAwardEvent);
|
||||
}
|
||||
|
||||
const normalizedEmoji = this.emoji.normalizeEmojiName(emoji);
|
||||
const $emojiButton = this.findEmojiIcon(votesBlock, normalizedEmoji).parent();
|
||||
|
||||
this.postEmoji($emojiButton, awardUrl, normalizedEmoji, () => {
|
||||
this.addAwardToEmojiBar(votesBlock, normalizedEmoji, checkMutuality);
|
||||
return typeof callback === 'function' ? callback() : undefined;
|
||||
});
|
||||
|
||||
$('.emoji-menu').removeClass('is-visible');
|
||||
$('.js-add-award.is-active').removeClass('is-active');
|
||||
return $('.js-add-award.is-active').removeClass('is-active');
|
||||
}
|
||||
|
||||
addAwardToEmojiBar(votesBlock, emoji, checkForMutuality) {
|
||||
|
|
@ -268,6 +288,14 @@ class AwardsHandler {
|
|||
}
|
||||
|
||||
getVotesBlock() {
|
||||
if (gl.utils.isInIssuePage()) {
|
||||
const $el = $('.js-add-award.is-active').closest('.note.timeline-entry');
|
||||
|
||||
if ($el.length) {
|
||||
return $el;
|
||||
}
|
||||
}
|
||||
|
||||
const currentBlock = $('.js-awards-block.current');
|
||||
let resultantVotesBlock = currentBlock;
|
||||
if (currentBlock.length === 0) {
|
||||
|
|
|
|||
|
|
@ -44,7 +44,10 @@ $(document).on('keydown.quick_submit', '.js-quick-submit', (e) => {
|
|||
|
||||
if (!$submitButton.attr('disabled')) {
|
||||
$submitButton.trigger('click', [e]);
|
||||
$submitButton.disable();
|
||||
|
||||
if (!gl.utils.isInIssuePage()) {
|
||||
$submitButton.disable();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ import initChangesDropdown from './init_changes_dropdown';
|
|||
path = page.split(':');
|
||||
shortcut_handler = null;
|
||||
|
||||
$('.js-gfm-input').each((i, el) => {
|
||||
$('.js-gfm-input:not(.js-vue-textarea)').each((i, el) => {
|
||||
const gfm = new GfmAutoComplete(gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources);
|
||||
const enableGFM = gl.utils.convertPermissionToBoolean(el.dataset.supportsAutocomplete);
|
||||
gfm.setup($(el), {
|
||||
|
|
@ -172,7 +172,6 @@ import initChangesDropdown from './init_changes_dropdown';
|
|||
shortcut_handler = new ShortcutsIssuable();
|
||||
new ZenMode();
|
||||
initIssuableSidebar();
|
||||
initNotes();
|
||||
break;
|
||||
case 'dashboard:milestones:index':
|
||||
new ProjectSelect();
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ window.DropzoneInput = (function() {
|
|||
// removeAllFiles(true) stops uploading files (if any)
|
||||
// and remove them from dropzone files queue.
|
||||
$cancelButton.on('click', (e) => {
|
||||
const target = e.target.closest('form').querySelector('.div-dropzone');
|
||||
const target = e.target.closest('.js-main-target-form').querySelector('.div-dropzone');
|
||||
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
|
@ -140,7 +140,7 @@ window.DropzoneInput = (function() {
|
|||
// and add that files to the dropzone files queue again.
|
||||
// addFile() adds file to dropzone files queue and upload it.
|
||||
$retryLink.on('click', (e) => {
|
||||
const dropzoneInstance = Dropzone.forElement(e.target.closest('form').querySelector('.div-dropzone'));
|
||||
const dropzoneInstance = Dropzone.forElement(e.target.closest('.js-main-target-form').querySelector('.div-dropzone'));
|
||||
const failedFiles = dropzoneInstance.files;
|
||||
|
||||
e.preventDefault();
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class Issue {
|
|||
initIssueBtnEventListeners() {
|
||||
const issueFailMessage = 'Unable to update this issue at this time.';
|
||||
|
||||
return $(document).on('click', 'a.btn-close, a.btn-reopen', (e) => {
|
||||
return $(document).on('click', '.js-issuable-actions a.btn-close, .js-issuable-actions a.btn-reopen', (e) => {
|
||||
var $button, shouldSubmit, url;
|
||||
e.preventDefault();
|
||||
e.stopImmediatePropagation();
|
||||
|
|
@ -66,12 +66,11 @@ class Issue {
|
|||
const projectIssuesCounter = $('.issue_counter');
|
||||
|
||||
if ('id' in data) {
|
||||
$(document).trigger('issuable:change');
|
||||
|
||||
const isClosed = $button.hasClass('btn-close');
|
||||
isClosedBadge.toggleClass('hidden', !isClosed);
|
||||
isOpenBadge.toggleClass('hidden', isClosed);
|
||||
|
||||
$(document).trigger('issuable:change', isClosed);
|
||||
this.toggleCloseReopenButton(isClosed);
|
||||
|
||||
let numProjectIssues = Number(projectIssuesCounter.text().replace(/[^\d]/, ''));
|
||||
|
|
@ -121,7 +120,7 @@ class Issue {
|
|||
static submitNoteForm(form) {
|
||||
var noteText;
|
||||
noteText = form.find("textarea.js-note-text").val();
|
||||
if (noteText.trim().length > 0) {
|
||||
if (noteText && noteText.trim().length > 0) {
|
||||
return form.submit();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,11 +80,11 @@ export default {
|
|||
type: Boolean,
|
||||
required: true,
|
||||
},
|
||||
markdownPreviewUrl: {
|
||||
markdownPreviewPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
markdownDocs: {
|
||||
markdownDocsPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
|
|
@ -96,7 +96,7 @@ export default {
|
|||
type: String,
|
||||
required: true,
|
||||
},
|
||||
projectsAutocompleteUrl: {
|
||||
projectsAutocompletePath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
|
|
@ -242,11 +242,11 @@ export default {
|
|||
:can-move="canMove"
|
||||
:can-destroy="canDestroy"
|
||||
:issuable-templates="issuableTemplates"
|
||||
:markdown-docs="markdownDocs"
|
||||
:markdown-preview-url="markdownPreviewUrl"
|
||||
:markdown-docs-path="markdownDocsPath"
|
||||
:markdown-preview-path="markdownPreviewPath"
|
||||
:project-path="projectPath"
|
||||
:project-namespace="projectNamespace"
|
||||
:projects-autocomplete-url="projectsAutocompleteUrl"
|
||||
:projects-autocomplete-path="projectsAutocompletePath"
|
||||
/>
|
||||
<div v-else>
|
||||
<title-component
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
markdownPreviewUrl: {
|
||||
markdownPreviewPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
markdownDocs: {
|
||||
markdownDocsPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
|
|
@ -36,8 +36,8 @@
|
|||
Description
|
||||
</label>
|
||||
<markdown-field
|
||||
:markdown-preview-url="markdownPreviewUrl"
|
||||
:markdown-docs="markdownDocs">
|
||||
:markdown-preview-path="markdownPreviewPath"
|
||||
:markdown-docs-path="markdownDocsPath">
|
||||
<textarea
|
||||
id="issue-description"
|
||||
class="note-textarea js-gfm-input js-autosize markdown-area"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
projectsAutocompleteUrl: {
|
||||
projectsAutocompletePath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
$moveDropdown.select2({
|
||||
ajax: {
|
||||
url: this.projectsAutocompleteUrl,
|
||||
url: this.projectsAutocompletePath,
|
||||
quietMillis: 125,
|
||||
data(term, page, context) {
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@
|
|||
required: false,
|
||||
default: () => [],
|
||||
},
|
||||
markdownPreviewUrl: {
|
||||
markdownPreviewPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
markdownDocs: {
|
||||
markdownDocsPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
type: String,
|
||||
required: true,
|
||||
},
|
||||
projectsAutocompleteUrl: {
|
||||
projectsAutocompletePath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
|
|
@ -89,14 +89,14 @@
|
|||
</div>
|
||||
<description-field
|
||||
:form-state="formState"
|
||||
:markdown-preview-url="markdownPreviewUrl"
|
||||
:markdown-docs="markdownDocs" />
|
||||
:markdown-preview-path="markdownPreviewPath"
|
||||
:markdown-docs-path="markdownDocsPath" />
|
||||
<confidential-checkbox
|
||||
:form-state="formState" />
|
||||
<project-move
|
||||
v-if="canMove"
|
||||
:form-state="formState"
|
||||
:projects-autocomplete-url="projectsAutocompleteUrl" />
|
||||
:projects-autocomplete-path="projectsAutocompletePath" />
|
||||
<edit-actions
|
||||
:form-state="formState"
|
||||
:can-destroy="canDestroy" />
|
||||
|
|
|
|||
|
|
@ -37,11 +37,11 @@ document.addEventListener('DOMContentLoaded', () => {
|
|||
initialDescriptionText: this.initialDescriptionText,
|
||||
issuableTemplates: this.issuableTemplates,
|
||||
isConfidential: this.isConfidential,
|
||||
markdownPreviewUrl: this.markdownPreviewUrl,
|
||||
markdownDocs: this.markdownDocs,
|
||||
markdownPreviewPath: this.markdownPreviewPath,
|
||||
markdownDocsPath: this.markdownDocsPath,
|
||||
projectPath: this.projectPath,
|
||||
projectNamespace: this.projectNamespace,
|
||||
projectsAutocompleteUrl: this.projectsAutocompleteUrl,
|
||||
projectsAutocompletePath: this.projectsAutocompletePath,
|
||||
updatedAt: this.updatedAt,
|
||||
updatedByName: this.updatedByName,
|
||||
updatedByPath: this.updatedByPath,
|
||||
|
|
|
|||
|
|
@ -27,6 +27,13 @@
|
|||
}
|
||||
};
|
||||
|
||||
w.gl.utils.isInIssuePage = () => {
|
||||
const page = gl.utils.getPagePath(1);
|
||||
const action = gl.utils.getPagePath(2);
|
||||
|
||||
return page === 'issues' && action === 'show';
|
||||
};
|
||||
|
||||
w.gl.utils.ajaxGet = function(url) {
|
||||
return $.ajax({
|
||||
type: "GET",
|
||||
|
|
@ -167,11 +174,12 @@
|
|||
};
|
||||
|
||||
gl.utils.scrollToElement = function($el) {
|
||||
var top = $el.offset().top;
|
||||
gl.mrTabsHeight = gl.mrTabsHeight || $('.merge-request-tabs').height();
|
||||
const top = $el.offset().top;
|
||||
const mrTabsHeight = $('.merge-request-tabs').height() || 0;
|
||||
const headerHeight = $('.navbar-gitlab').height() || 0;
|
||||
|
||||
return $('body, html').animate({
|
||||
scrollTop: top - (gl.mrTabsHeight)
|
||||
scrollTop: top - mrTabsHeight - headerHeight,
|
||||
}, 200);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,347 @@
|
|||
<script>
|
||||
/* global Flash, Autosave */
|
||||
import { mapActions, mapGetters } from 'vuex';
|
||||
import _ from 'underscore';
|
||||
import '../../autosave';
|
||||
import TaskList from '../../task_list';
|
||||
import * as constants from '../constants';
|
||||
import eventHub from '../event_hub';
|
||||
import confidentialIssue from '../../vue_shared/components/issue/confidential_issue_warning.vue';
|
||||
import issueNoteSignedOutWidget from './issue_note_signed_out_widget.vue';
|
||||
import markdownField from '../../vue_shared/components/markdown/field.vue';
|
||||
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
|
||||
|
||||
export default {
|
||||
name: 'issueCommentForm',
|
||||
data() {
|
||||
return {
|
||||
note: '',
|
||||
noteType: constants.COMMENT,
|
||||
// Can't use mapGetters,
|
||||
// this needs to be in the data object because it belongs to the state
|
||||
issueState: this.$store.getters.getIssueData.state,
|
||||
isSubmitting: false,
|
||||
isSubmitButtonDisabled: true,
|
||||
};
|
||||
},
|
||||
components: {
|
||||
confidentialIssue,
|
||||
issueNoteSignedOutWidget,
|
||||
markdownField,
|
||||
userAvatarLink,
|
||||
},
|
||||
watch: {
|
||||
note(newNote) {
|
||||
this.setIsSubmitButtonDisabled(newNote, this.isSubmitting);
|
||||
},
|
||||
isSubmitting(newValue) {
|
||||
this.setIsSubmitButtonDisabled(this.note, newValue);
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'getCurrentUserLastNote',
|
||||
'getUserData',
|
||||
'getIssueData',
|
||||
'getNotesData',
|
||||
]),
|
||||
isLoggedIn() {
|
||||
return this.getUserData.id;
|
||||
},
|
||||
commentButtonTitle() {
|
||||
return this.noteType === constants.COMMENT ? 'Comment' : 'Start discussion';
|
||||
},
|
||||
isIssueOpen() {
|
||||
return this.issueState === constants.OPENED || this.issueState === constants.REOPENED;
|
||||
},
|
||||
issueActionButtonTitle() {
|
||||
if (this.note.length) {
|
||||
const actionText = this.isIssueOpen ? 'close' : 'reopen';
|
||||
|
||||
return this.noteType === constants.COMMENT ? `Comment & ${actionText} issue` : `Start discussion & ${actionText} issue`;
|
||||
}
|
||||
|
||||
return this.isIssueOpen ? 'Close issue' : 'Reopen issue';
|
||||
},
|
||||
actionButtonClassNames() {
|
||||
return {
|
||||
'btn-reopen': !this.isIssueOpen,
|
||||
'btn-close': this.isIssueOpen,
|
||||
'js-note-target-close': this.isIssueOpen,
|
||||
'js-note-target-reopen': !this.isIssueOpen,
|
||||
};
|
||||
},
|
||||
markdownDocsPath() {
|
||||
return this.getNotesData.markdownDocsPath;
|
||||
},
|
||||
quickActionsDocsPath() {
|
||||
return this.getNotesData.quickActionsDocsPath;
|
||||
},
|
||||
markdownPreviewPath() {
|
||||
return this.getIssueData.preview_note_path;
|
||||
},
|
||||
author() {
|
||||
return this.getUserData;
|
||||
},
|
||||
canUpdateIssue() {
|
||||
return this.getIssueData.current_user.can_update;
|
||||
},
|
||||
endpoint() {
|
||||
return this.getIssueData.create_note_path;
|
||||
},
|
||||
isConfidentialIssue() {
|
||||
return this.getIssueData.confidential;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
...mapActions([
|
||||
'saveNote',
|
||||
'removePlaceholderNotes',
|
||||
]),
|
||||
setIsSubmitButtonDisabled(note, isSubmitting) {
|
||||
if (!_.isEmpty(note) && !isSubmitting) {
|
||||
this.isSubmitButtonDisabled = false;
|
||||
} else {
|
||||
this.isSubmitButtonDisabled = true;
|
||||
}
|
||||
},
|
||||
handleSave(withIssueAction) {
|
||||
if (this.note.length) {
|
||||
const noteData = {
|
||||
endpoint: this.endpoint,
|
||||
flashContainer: this.$el,
|
||||
data: {
|
||||
note: {
|
||||
noteable_type: constants.NOTEABLE_TYPE,
|
||||
noteable_id: this.getIssueData.id,
|
||||
note: this.note,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
if (this.noteType === constants.DISCUSSION) {
|
||||
noteData.data.note.type = constants.DISCUSSION_NOTE;
|
||||
}
|
||||
this.isSubmitting = true;
|
||||
this.note = ''; // Empty textarea while being requested. Repopulate in catch
|
||||
|
||||
this.saveNote(noteData)
|
||||
.then((res) => {
|
||||
this.isSubmitting = false;
|
||||
if (res.errors) {
|
||||
if (res.errors.commands_only) {
|
||||
this.discard();
|
||||
} else {
|
||||
Flash(
|
||||
'Something went wrong while adding your comment. Please try again.',
|
||||
'alert',
|
||||
$(this.$refs.commentForm),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
this.discard();
|
||||
}
|
||||
|
||||
if (withIssueAction) {
|
||||
this.toggleIssueState();
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.isSubmitting = false;
|
||||
this.discard(false);
|
||||
const msg = 'Your comment could not be submitted! Please check your network connection and try again.';
|
||||
Flash(msg, 'alert', $(this.$el));
|
||||
this.note = noteData.data.note.note; // Restore textarea content.
|
||||
this.removePlaceholderNotes();
|
||||
});
|
||||
} else {
|
||||
this.toggleIssueState();
|
||||
}
|
||||
},
|
||||
toggleIssueState() {
|
||||
this.issueState = this.isIssueOpen ? constants.CLOSED : constants.REOPENED;
|
||||
|
||||
// This is out of scope for the Notes Vue component.
|
||||
// It was the shortest path to update the issue state and relevant places.
|
||||
const btnClass = this.isIssueOpen ? 'btn-reopen' : 'btn-close';
|
||||
$(`.js-btn-issue-action.${btnClass}:visible`).trigger('click');
|
||||
},
|
||||
discard(shouldClear = true) {
|
||||
// `blur` is needed to clear slash commands autocomplete cache if event fired.
|
||||
// `focus` is needed to remain cursor in the textarea.
|
||||
this.$refs.textarea.blur();
|
||||
this.$refs.textarea.focus();
|
||||
|
||||
if (shouldClear) {
|
||||
this.note = '';
|
||||
}
|
||||
|
||||
// reset autostave
|
||||
this.autosave.reset();
|
||||
},
|
||||
setNoteType(type) {
|
||||
this.noteType = type;
|
||||
},
|
||||
editCurrentUserLastNote() {
|
||||
if (this.note === '') {
|
||||
const lastNote = this.getCurrentUserLastNote;
|
||||
|
||||
if (lastNote) {
|
||||
eventHub.$emit('enterEditMode', {
|
||||
noteId: lastNote.id,
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
initAutoSave() {
|
||||
if (this.isLoggedIn) {
|
||||
this.autosave = new Autosave($(this.$refs.textarea), ['Note', 'Issue', this.getIssueData.id], 'issue');
|
||||
}
|
||||
},
|
||||
initTaskList() {
|
||||
return new TaskList({
|
||||
dataType: 'note',
|
||||
fieldName: 'note',
|
||||
selector: '.notes',
|
||||
});
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
// jQuery is needed here because it is a custom event being dispatched with jQuery.
|
||||
$(document).on('issuable:change', (e, isClosed) => {
|
||||
this.issueState = isClosed ? constants.CLOSED : constants.REOPENED;
|
||||
});
|
||||
|
||||
this.initAutoSave();
|
||||
this.initTaskList();
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div>
|
||||
<issue-note-signed-out-widget v-if="!isLoggedIn" />
|
||||
<ul
|
||||
v-else
|
||||
class="notes notes-form timeline">
|
||||
<li class="timeline-entry">
|
||||
<div class="timeline-entry-inner">
|
||||
<div class="flash-container error-alert timeline-content"></div>
|
||||
<div class="timeline-icon hidden-xs hidden-sm">
|
||||
<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 timeline-content-form">
|
||||
<form
|
||||
ref="commentForm"
|
||||
class="new-note js-quick-submit common-note-form gfm-form js-main-target-form">
|
||||
<confidentialIssue v-if="isConfidentialIssue" />
|
||||
<div class="error-alert"></div>
|
||||
<markdown-field
|
||||
:markdown-preview-path="markdownPreviewPath"
|
||||
:markdown-docs-path="markdownDocsPath"
|
||||
:quick-actions-docs-path="quickActionsDocsPath"
|
||||
:add-spacing-classes="false"
|
||||
:is-confidential-issue="isConfidentialIssue">
|
||||
<textarea
|
||||
id="note-body"
|
||||
name="note[note]"
|
||||
class="note-textarea js-vue-comment-form js-gfm-input js-autosize markdown-area js-vue-textarea"
|
||||
data-supports-quick-actions="true"
|
||||
aria-label="Description"
|
||||
v-model="note"
|
||||
ref="textarea"
|
||||
slot="textarea"
|
||||
placeholder="Write a comment or drag your files here..."
|
||||
@keydown.up="editCurrentUserLastNote()"
|
||||
@keydown.meta.enter="handleSave()">
|
||||
</textarea>
|
||||
</markdown-field>
|
||||
<div class="note-form-actions">
|
||||
<div class="pull-left btn-group append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown">
|
||||
<button
|
||||
@click.prevent="handleSave()"
|
||||
:disabled="isSubmitButtonDisabled"
|
||||
class="btn btn-create comment-btn js-comment-button js-comment-submit-button"
|
||||
type="submit">
|
||||
{{commentButtonTitle}}
|
||||
</button>
|
||||
<button
|
||||
:disabled="isSubmitButtonDisabled"
|
||||
name="button"
|
||||
type="button"
|
||||
class="btn comment-btn note-type-toggle js-note-new-discussion dropdown-toggle"
|
||||
data-toggle="dropdown"
|
||||
aria-label="Open comment type dropdown">
|
||||
<i
|
||||
aria-hidden="true"
|
||||
class="fa fa-caret-down toggle-icon">
|
||||
</i>
|
||||
</button>
|
||||
|
||||
<ul class="note-type-dropdown dropdown-open-top dropdown-menu">
|
||||
<li :class="{ 'droplab-item-selected': noteType === 'comment' }">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-transparent"
|
||||
@click.prevent="setNoteType('comment')">
|
||||
<i
|
||||
aria-hidden="true"
|
||||
class="fa fa-check icon">
|
||||
</i>
|
||||
<div class="description">
|
||||
<strong>Comment</strong>
|
||||
<p>
|
||||
Add a general comment to this issue.
|
||||
</p>
|
||||
</div>
|
||||
</button>
|
||||
</li>
|
||||
<li class="divider droplab-item-ignore"></li>
|
||||
<li :class="{ 'droplab-item-selected': noteType === 'discussion' }">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-transparent"
|
||||
@click.prevent="setNoteType('discussion')">
|
||||
<i
|
||||
aria-hidden="true"
|
||||
class="fa fa-check icon">
|
||||
</i>
|
||||
<div class="description">
|
||||
<strong>Start discussion</strong>
|
||||
<p>
|
||||
Discuss a specific suggestion or question.
|
||||
</p>
|
||||
</div>
|
||||
</button>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
@click="handleSave(true)"
|
||||
v-if="canUpdateIssue"
|
||||
:class="actionButtonClassNames"
|
||||
class="btn btn-comment btn-comment-and-close">
|
||||
{{issueActionButtonTitle}}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
v-if="note.length"
|
||||
@click="discard"
|
||||
class="btn btn-cancel js-note-discard">
|
||||
Discard draft
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,232 @@
|
|||
<script>
|
||||
/* global Flash */
|
||||
import { mapActions, mapGetters } from 'vuex';
|
||||
import { SYSTEM_NOTE } from '../constants';
|
||||
import issueNote from './issue_note.vue';
|
||||
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
|
||||
import issueNoteHeader from './issue_note_header.vue';
|
||||
import issueNoteActions from './issue_note_actions.vue';
|
||||
import issueNoteSignedOutWidget from './issue_note_signed_out_widget.vue';
|
||||
import issueNoteEditedText from './issue_note_edited_text.vue';
|
||||
import issueNoteForm from './issue_note_form.vue';
|
||||
import placeholderNote from './issue_placeholder_note.vue';
|
||||
import placeholderSystemNote from './issue_placeholder_system_note.vue';
|
||||
import autosave from '../mixins/autosave';
|
||||
|
||||
export default {
|
||||
props: {
|
||||
note: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
isReplying: false,
|
||||
};
|
||||
},
|
||||
components: {
|
||||
issueNote,
|
||||
userAvatarLink,
|
||||
issueNoteHeader,
|
||||
issueNoteActions,
|
||||
issueNoteSignedOutWidget,
|
||||
issueNoteEditedText,
|
||||
issueNoteForm,
|
||||
placeholderNote,
|
||||
placeholderSystemNote,
|
||||
},
|
||||
mixins: [
|
||||
autosave,
|
||||
],
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'getIssueData',
|
||||
]),
|
||||
discussion() {
|
||||
return this.note.notes[0];
|
||||
},
|
||||
author() {
|
||||
return this.discussion.author;
|
||||
},
|
||||
canReply() {
|
||||
return this.getIssueData.current_user.can_create_note;
|
||||
},
|
||||
newNotePath() {
|
||||
return this.getIssueData.create_note_path;
|
||||
},
|
||||
lastUpdatedBy() {
|
||||
const { notes } = this.note;
|
||||
|
||||
if (notes.length > 1) {
|
||||
return notes[notes.length - 1].author;
|
||||
}
|
||||
|
||||
return null;
|
||||
},
|
||||
lastUpdatedAt() {
|
||||
const { notes } = this.note;
|
||||
|
||||
if (notes.length > 1) {
|
||||
return notes[notes.length - 1].created_at;
|
||||
}
|
||||
|
||||
return null;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
...mapActions([
|
||||
'saveNote',
|
||||
'toggleDiscussion',
|
||||
'removePlaceholderNotes',
|
||||
]),
|
||||
componentName(note) {
|
||||
if (note.isPlaceholderNote) {
|
||||
if (note.placeholderType === SYSTEM_NOTE) {
|
||||
return placeholderSystemNote;
|
||||
}
|
||||
return placeholderNote;
|
||||
}
|
||||
|
||||
return issueNote;
|
||||
},
|
||||
componentData(note) {
|
||||
return note.isPlaceholderNote ? note.notes[0] : note;
|
||||
},
|
||||
toggleDiscussionHandler() {
|
||||
this.toggleDiscussion({ discussionId: this.note.id });
|
||||
},
|
||||
showReplyForm() {
|
||||
this.isReplying = true;
|
||||
},
|
||||
cancelReplyForm(shouldConfirm) {
|
||||
if (shouldConfirm && this.$refs.noteForm.isDirty) {
|
||||
// eslint-disable-next-line no-alert
|
||||
if (!confirm('Are you sure you want to cancel creating this comment?')) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
this.resetAutoSave();
|
||||
this.isReplying = false;
|
||||
},
|
||||
saveReply(noteText, form, callback) {
|
||||
const replyData = {
|
||||
endpoint: this.newNotePath,
|
||||
flashContainer: this.$el,
|
||||
data: {
|
||||
in_reply_to_discussion_id: this.note.reply_id,
|
||||
target_type: 'issue',
|
||||
target_id: this.discussion.noteable_id,
|
||||
note: { note: noteText },
|
||||
},
|
||||
};
|
||||
this.isReplying = false;
|
||||
|
||||
this.saveNote(replyData)
|
||||
.then(() => {
|
||||
this.resetAutoSave();
|
||||
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);
|
||||
});
|
||||
});
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
if (this.isReplying) {
|
||||
this.initAutoSave();
|
||||
}
|
||||
},
|
||||
updated() {
|
||||
if (this.isReplying) {
|
||||
if (!this.autosave) {
|
||||
this.initAutoSave();
|
||||
} else {
|
||||
this.setAutoSave();
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<li class="note note-discussion timeline-entry">
|
||||
<div class="timeline-entry-inner">
|
||||
<div class="timeline-icon">
|
||||
<user-avatar-link
|
||||
:link-href="author.path"
|
||||
:img-src="author.avatar_url"
|
||||
:img-alt="author.name"
|
||||
:img-size="40"
|
||||
/>
|
||||
</div>
|
||||
<div class="timeline-content">
|
||||
<div class="discussion">
|
||||
<div class="discussion-header">
|
||||
<issue-note-header
|
||||
:author="author"
|
||||
:created-at="discussion.created_at"
|
||||
:note-id="discussion.id"
|
||||
:include-toggle="true"
|
||||
@toggleHandler="toggleDiscussionHandler"
|
||||
action-text="started a discussion"
|
||||
class="discussion"
|
||||
/>
|
||||
<issue-note-edited-text
|
||||
v-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="note.expanded"
|
||||
class="discussion-body">
|
||||
<div class="panel panel-default">
|
||||
<div class="discussion-notes">
|
||||
<ul class="notes">
|
||||
<component
|
||||
v-for="note in note.notes"
|
||||
:is="componentName(note)"
|
||||
:note="componentData(note)"
|
||||
:key="note.id"
|
||||
/>
|
||||
</ul>
|
||||
<div
|
||||
:class="{ 'is-replying': isReplying }"
|
||||
class="discussion-reply-holder">
|
||||
<button
|
||||
v-if="canReply && !isReplying"
|
||||
@click="showReplyForm"
|
||||
type="button"
|
||||
class="js-vue-discussion-reply btn btn-text-field"
|
||||
title="Add a reply">Reply...</button>
|
||||
<issue-note-form
|
||||
v-if="isReplying"
|
||||
save-button-title="Comment"
|
||||
:discussion="note"
|
||||
:is-editing="false"
|
||||
@handleFormUpdate="saveReply"
|
||||
@cancelFormEdition="cancelReplyForm"
|
||||
ref="noteForm"
|
||||
/>
|
||||
<issue-note-signed-out-widget v-if="!canReply" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,186 @@
|
|||
<script>
|
||||
/* global Flash */
|
||||
|
||||
import { mapGetters, mapActions } from 'vuex';
|
||||
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
|
||||
import issueNoteHeader from './issue_note_header.vue';
|
||||
import issueNoteActions from './issue_note_actions.vue';
|
||||
import issueNoteBody from './issue_note_body.vue';
|
||||
import eventHub from '../event_hub';
|
||||
|
||||
export default {
|
||||
props: {
|
||||
note: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
isEditing: false,
|
||||
isDeleting: false,
|
||||
isRequesting: false,
|
||||
};
|
||||
},
|
||||
components: {
|
||||
userAvatarLink,
|
||||
issueNoteHeader,
|
||||
issueNoteActions,
|
||||
issueNoteBody,
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'targetNoteHash',
|
||||
'getUserData',
|
||||
]),
|
||||
author() {
|
||||
return this.note.author;
|
||||
},
|
||||
classNameBindings() {
|
||||
return {
|
||||
'is-editing': this.isEditing && !this.isRequesting,
|
||||
'is-requesting being-posted': this.isRequesting,
|
||||
'disabled-content': this.isDeleting,
|
||||
target: this.targetNoteHash === this.noteAnchorId,
|
||||
};
|
||||
},
|
||||
canReportAsAbuse() {
|
||||
return this.note.report_abuse_path && this.author.id !== this.getUserData.id;
|
||||
},
|
||||
noteAnchorId() {
|
||||
return `note_${this.note.id}`;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
...mapActions([
|
||||
'deleteNote',
|
||||
'updateNote',
|
||||
'scrollToNoteIfNeeded',
|
||||
]),
|
||||
editHandler() {
|
||||
this.isEditing = true;
|
||||
},
|
||||
deleteHandler() {
|
||||
// eslint-disable-next-line no-alert
|
||||
if (confirm('Are you sure you want to delete this list?')) {
|
||||
this.isDeleting = true;
|
||||
|
||||
this.deleteNote(this.note)
|
||||
.then(() => {
|
||||
this.isDeleting = false;
|
||||
})
|
||||
.catch(() => {
|
||||
Flash('Something went wrong while deleting your note. Please try again.');
|
||||
this.isDeleting = false;
|
||||
});
|
||||
}
|
||||
},
|
||||
formUpdateHandler(noteText, parentElement, callback) {
|
||||
const data = {
|
||||
endpoint: this.note.path,
|
||||
note: {
|
||||
target_type: 'issue',
|
||||
target_id: this.note.noteable_id,
|
||||
note: { note: noteText },
|
||||
},
|
||||
};
|
||||
this.isRequesting = true;
|
||||
this.oldContent = this.note.note_html;
|
||||
this.note.note_html = noteText;
|
||||
|
||||
this.updateNote(data)
|
||||
.then(() => {
|
||||
this.isEditing = false;
|
||||
this.isRequesting = false;
|
||||
$(this.$refs.noteBody.$el).renderGFM();
|
||||
this.$refs.noteBody.resetAutoSave();
|
||||
callback();
|
||||
})
|
||||
.catch(() => {
|
||||
this.isRequesting = false;
|
||||
this.isEditing = true;
|
||||
this.$nextTick(() => {
|
||||
const msg = 'Something went wrong while editing your comment. Please try again.';
|
||||
Flash(msg, 'alert', $(this.$el));
|
||||
this.recoverNoteContent(noteText);
|
||||
callback();
|
||||
});
|
||||
});
|
||||
},
|
||||
formCancelHandler(shouldConfirm, isDirty) {
|
||||
if (shouldConfirm && isDirty) {
|
||||
// eslint-disable-next-line no-alert
|
||||
if (!confirm('Are you sure you want to cancel editing this comment?')) return;
|
||||
}
|
||||
this.$refs.noteBody.resetAutoSave();
|
||||
if (this.oldContent) {
|
||||
this.note.note_html = this.oldContent;
|
||||
this.oldContent = null;
|
||||
}
|
||||
this.isEditing = false;
|
||||
},
|
||||
recoverNoteContent(noteText) {
|
||||
// we need to do this to prevent noteForm inconsistent content warning
|
||||
// this is something we intentionally do so we need to recover the content
|
||||
this.note.note = noteText;
|
||||
this.$refs.noteBody.$refs.noteForm.note = noteText; // TODO: This could be better
|
||||
},
|
||||
},
|
||||
created() {
|
||||
eventHub.$on('enterEditMode', ({ noteId }) => {
|
||||
if (noteId === this.note.id) {
|
||||
this.isEditing = true;
|
||||
this.scrollToNoteIfNeeded($(this.$el));
|
||||
}
|
||||
});
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<li
|
||||
class="note timeline-entry"
|
||||
:id="noteAnchorId"
|
||||
:class="classNameBindings"
|
||||
:data-award-url="note.toggle_award_path">
|
||||
<div class="timeline-entry-inner">
|
||||
<div class="timeline-icon">
|
||||
<user-avatar-link
|
||||
:link-href="author.path"
|
||||
:img-src="author.avatar_url"
|
||||
:img-alt="author.name"
|
||||
:img-size="40"
|
||||
/>
|
||||
</div>
|
||||
<div class="timeline-content">
|
||||
<div class="note-header">
|
||||
<issue-note-header
|
||||
:author="author"
|
||||
:created-at="note.created_at"
|
||||
:note-id="note.id"
|
||||
action-text="commented"
|
||||
/>
|
||||
<issue-note-actions
|
||||
:author-id="author.id"
|
||||
:note-id="note.id"
|
||||
:access-level="note.human_access"
|
||||
:can-edit="note.current_user.can_edit"
|
||||
:can-delete="note.current_user.can_edit"
|
||||
:can-report-as-abuse="canReportAsAbuse"
|
||||
:report-abuse-path="note.report_abuse_path"
|
||||
@handleEdit="editHandler"
|
||||
@handleDelete="deleteHandler"
|
||||
/>
|
||||
</div>
|
||||
<issue-note-body
|
||||
:note="note"
|
||||
:can-edit="note.current_user.can_edit"
|
||||
:is-editing="isEditing"
|
||||
@handleFormUpdate="formUpdateHandler"
|
||||
@cancelFormEdition="formCancelHandler"
|
||||
ref="noteBody"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,167 @@
|
|||
<script>
|
||||
import { mapGetters } from 'vuex';
|
||||
import emojiSmiling from 'icons/_emoji_slightly_smiling_face.svg';
|
||||
import emojiSmile from 'icons/_emoji_smile.svg';
|
||||
import emojiSmiley from 'icons/_emoji_smiley.svg';
|
||||
import editSvg from 'icons/_icon_pencil.svg';
|
||||
import ellipsisSvg from 'icons/_ellipsis_v.svg';
|
||||
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
|
||||
import tooltip from '../../vue_shared/directives/tooltip';
|
||||
|
||||
export default {
|
||||
name: 'issueNoteActions',
|
||||
props: {
|
||||
authorId: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
noteId: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
accessLevel: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: '',
|
||||
},
|
||||
reportAbusePath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
canEdit: {
|
||||
type: Boolean,
|
||||
required: true,
|
||||
},
|
||||
canDelete: {
|
||||
type: Boolean,
|
||||
required: true,
|
||||
},
|
||||
canReportAsAbuse: {
|
||||
type: Boolean,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
directives: {
|
||||
tooltip,
|
||||
},
|
||||
components: {
|
||||
loadingIcon,
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'getUserDataByProp',
|
||||
]),
|
||||
shouldShowActionsDropdown() {
|
||||
return this.currentUserId && (this.canEdit || this.canReportAsAbuse);
|
||||
},
|
||||
canAddAwardEmoji() {
|
||||
return this.currentUserId;
|
||||
},
|
||||
isAuthoredByCurrentUser() {
|
||||
return this.authorId === this.currentUserId;
|
||||
},
|
||||
currentUserId() {
|
||||
return this.getUserDataByProp('id');
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
onEdit() {
|
||||
this.$emit('handleEdit');
|
||||
},
|
||||
onDelete() {
|
||||
this.$emit('handleDelete');
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.emojiSmiling = emojiSmiling;
|
||||
this.emojiSmile = emojiSmile;
|
||||
this.emojiSmiley = emojiSmiley;
|
||||
this.editSvg = editSvg;
|
||||
this.ellipsisSvg = ellipsisSvg;
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="note-actions">
|
||||
<span
|
||||
v-if="accessLevel"
|
||||
class="note-role">{{accessLevel}}</span>
|
||||
<div
|
||||
v-if="canAddAwardEmoji"
|
||||
class="note-actions-item">
|
||||
<a
|
||||
v-tooltip
|
||||
:class="{ 'js-user-authored': isAuthoredByCurrentUser }"
|
||||
class="note-action-button note-emoji-button js-add-award js-note-emoji"
|
||||
data-position="right"
|
||||
data-placement="bottom"
|
||||
data-container="body"
|
||||
href="#"
|
||||
title="Add reaction">
|
||||
<loading-icon :inline="true" />
|
||||
<span
|
||||
v-html="emojiSmiling"
|
||||
class="link-highlight award-control-icon-neutral">
|
||||
</span>
|
||||
<span
|
||||
v-html="emojiSmiley"
|
||||
class="link-highlight award-control-icon-positive">
|
||||
</span>
|
||||
<span
|
||||
v-html="emojiSmile"
|
||||
class="link-highlight award-control-icon-super-positive">
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
<div
|
||||
v-if="canEdit"
|
||||
class="note-actions-item">
|
||||
<button
|
||||
@click="onEdit"
|
||||
v-tooltip
|
||||
type="button"
|
||||
title="Edit comment"
|
||||
class="note-action-button js-note-edit btn btn-transparent"
|
||||
data-container="body"
|
||||
data-placement="bottom">
|
||||
<span
|
||||
v-html="editSvg"
|
||||
class="link-highlight"></span>
|
||||
</button>
|
||||
</div>
|
||||
<div
|
||||
v-if="shouldShowActionsDropdown"
|
||||
class="dropdown more-actions note-actions-item">
|
||||
<button
|
||||
v-tooltip
|
||||
type="button"
|
||||
title="More actions"
|
||||
class="note-action-button more-actions-toggle btn btn-transparent"
|
||||
data-toggle="dropdown"
|
||||
data-container="body"
|
||||
data-placement="bottom">
|
||||
<span
|
||||
class="icon"
|
||||
v-html="ellipsisSvg"></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu more-actions-dropdown dropdown-open-left">
|
||||
<li v-if="canReportAsAbuse">
|
||||
<a :href="reportAbusePath">
|
||||
Report as abuse
|
||||
</a>
|
||||
</li>
|
||||
<li v-if="canEdit">
|
||||
<button
|
||||
@click.prevent="onDelete"
|
||||
class="btn btn-transparent js-note-delete js-note-delete"
|
||||
type="button">
|
||||
<span class="text-danger">
|
||||
Delete comment
|
||||
</span>
|
||||
</button>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
<script>
|
||||
export default {
|
||||
name: 'issueNoteAttachment',
|
||||
props: {
|
||||
attachment: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="note-attachment">
|
||||
<a
|
||||
v-if="attachment.image"
|
||||
:href="attachment.url"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer">
|
||||
<img
|
||||
:src="attachment.url"
|
||||
class="note-image-attach" />
|
||||
</a>
|
||||
<div class="attachment">
|
||||
<a
|
||||
v-if="attachment.url"
|
||||
:href="attachment.url"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer">
|
||||
<i
|
||||
class="fa fa-paperclip"
|
||||
aria-hidden="true"></i>
|
||||
{{attachment.filename}}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,228 @@
|
|||
<script>
|
||||
/* global Flash */
|
||||
|
||||
import { mapActions, mapGetters } from 'vuex';
|
||||
import emojiSmiling from 'icons/_emoji_slightly_smiling_face.svg';
|
||||
import emojiSmile from 'icons/_emoji_smile.svg';
|
||||
import emojiSmiley from 'icons/_emoji_smiley.svg';
|
||||
import { glEmojiTag } from '../../emoji';
|
||||
import tooltip from '../../vue_shared/directives/tooltip';
|
||||
|
||||
export default {
|
||||
props: {
|
||||
awards: {
|
||||
type: Array,
|
||||
required: true,
|
||||
},
|
||||
toggleAwardPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
noteAuthorId: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
noteId: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
directives: {
|
||||
tooltip,
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'getUserData',
|
||||
]),
|
||||
// `this.awards` is an array with emojis but they are not grouped by emoji name. See below.
|
||||
// [ { name: foo, user: user1 }, { name: bar, user: user1 }, { name: foo, user: user2 } ]
|
||||
// This method will group emojis by their name as an Object. See below.
|
||||
// {
|
||||
// foo: [ { name: foo, user: user1 }, { name: foo, user: user2 } ],
|
||||
// bar: [ { name: bar, user: user1 } ]
|
||||
// }
|
||||
// We need to do this otherwise we will render the same emoji over and over again.
|
||||
groupedAwards() {
|
||||
const awards = this.awards.reduce((acc, award) => {
|
||||
if (Object.prototype.hasOwnProperty.call(acc, award.name)) {
|
||||
acc[award.name].push(award);
|
||||
} else {
|
||||
Object.assign(acc, { [award.name]: [award] });
|
||||
}
|
||||
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
const orderedAwards = {};
|
||||
const { thumbsdown, thumbsup } = awards;
|
||||
// Always show thumbsup and thumbsdown first
|
||||
if (thumbsup) {
|
||||
orderedAwards.thumbsup = thumbsup;
|
||||
delete awards.thumbsup;
|
||||
}
|
||||
if (thumbsdown) {
|
||||
orderedAwards.thumbsdown = thumbsdown;
|
||||
delete awards.thumbsdown;
|
||||
}
|
||||
|
||||
return Object.assign({}, orderedAwards, awards);
|
||||
},
|
||||
isAuthoredByMe() {
|
||||
return this.noteAuthorId === this.getUserData.id;
|
||||
},
|
||||
isLoggedIn() {
|
||||
return this.getUserData.id;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
...mapActions([
|
||||
'toggleAwardRequest',
|
||||
]),
|
||||
getAwardHTML(name) {
|
||||
return glEmojiTag(name);
|
||||
},
|
||||
getAwardClassBindings(awardList, awardName) {
|
||||
return {
|
||||
active: this.hasReactionByCurrentUser(awardList),
|
||||
disabled: !this.canInteractWithEmoji(awardList, awardName),
|
||||
};
|
||||
},
|
||||
canInteractWithEmoji(awardList, awardName) {
|
||||
let isAllowed = true;
|
||||
const restrictedEmojis = ['thumbsup', 'thumbsdown'];
|
||||
|
||||
// Users can not add :+1: and :-1: to their own notes
|
||||
if (this.getUserData.id === this.noteAuthorId && restrictedEmojis.indexOf(awardName) > -1) {
|
||||
isAllowed = false;
|
||||
}
|
||||
|
||||
return this.getUserData.id && isAllowed;
|
||||
},
|
||||
hasReactionByCurrentUser(awardList) {
|
||||
return awardList.filter(award => award.user.id === this.getUserData.id).length;
|
||||
},
|
||||
awardTitle(awardsList) {
|
||||
const hasReactionByCurrentUser = this.hasReactionByCurrentUser(awardsList);
|
||||
const TOOLTIP_NAME_COUNT = hasReactionByCurrentUser ? 9 : 10;
|
||||
let awardList = awardsList;
|
||||
|
||||
// Filter myself from list if I am awarded.
|
||||
if (hasReactionByCurrentUser) {
|
||||
awardList = awardList.filter(award => award.user.id !== this.getUserData.id);
|
||||
}
|
||||
|
||||
// Get only 9-10 usernames to show in tooltip text.
|
||||
const namesToShow = awardList.slice(0, TOOLTIP_NAME_COUNT).map(award => award.user.name);
|
||||
|
||||
// Get the remaining list to use in `and x more` text.
|
||||
const remainingAwardList = awardList.slice(TOOLTIP_NAME_COUNT, awardList.length);
|
||||
|
||||
// Add myself to the begining of the list so title will start with You.
|
||||
if (hasReactionByCurrentUser) {
|
||||
namesToShow.unshift('You');
|
||||
}
|
||||
|
||||
let title = '';
|
||||
|
||||
// We have 10+ awarded user, join them with comma and add `and x more`.
|
||||
if (remainingAwardList.length) {
|
||||
title = `${namesToShow.join(', ')}, and ${remainingAwardList.length} more.`;
|
||||
} else if (namesToShow.length > 1) {
|
||||
// Join all names with comma but not the last one, it will be added with and text.
|
||||
title = namesToShow.slice(0, namesToShow.length - 1).join(', ');
|
||||
// If we have more than 2 users we need an extra comma before and text.
|
||||
title += namesToShow.length > 2 ? ',' : '';
|
||||
title += ` and ${namesToShow.slice(-1)}`; // Append and text
|
||||
} else { // We have only 2 users so join them with and.
|
||||
title = namesToShow.join(' and ');
|
||||
}
|
||||
|
||||
return title;
|
||||
},
|
||||
handleAward(awardName) {
|
||||
if (!this.isLoggedIn) {
|
||||
return;
|
||||
}
|
||||
|
||||
let parsedName;
|
||||
|
||||
// 100 and 1234 emoji are a number. Callback for v-for click sends it as a string
|
||||
switch (awardName) {
|
||||
case '100':
|
||||
parsedName = 100;
|
||||
break;
|
||||
case '1234':
|
||||
parsedName = 1234;
|
||||
break;
|
||||
default:
|
||||
parsedName = awardName;
|
||||
break;
|
||||
}
|
||||
|
||||
const data = {
|
||||
endpoint: this.toggleAwardPath,
|
||||
noteId: this.noteId,
|
||||
awardName: parsedName,
|
||||
};
|
||||
|
||||
this.toggleAwardRequest(data)
|
||||
.catch(() => Flash('Something went wrong on our end.'));
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.emojiSmiling = emojiSmiling;
|
||||
this.emojiSmile = emojiSmile;
|
||||
this.emojiSmiley = emojiSmiley;
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="note-awards">
|
||||
<div class="awards js-awards-block">
|
||||
<button
|
||||
v-tooltip
|
||||
v-for="(awardList, awardName, index) in groupedAwards"
|
||||
:key="index"
|
||||
:class="getAwardClassBindings(awardList, awardName)"
|
||||
:title="awardTitle(awardList)"
|
||||
@click="handleAward(awardName)"
|
||||
class="btn award-control"
|
||||
data-placement="bottom"
|
||||
type="button">
|
||||
<span v-html="getAwardHTML(awardName)"></span>
|
||||
<span class="award-control-text js-counter">
|
||||
{{awardList.length}}
|
||||
</span>
|
||||
</button>
|
||||
<div
|
||||
v-if="isLoggedIn"
|
||||
class="award-menu-holder">
|
||||
<button
|
||||
v-tooltip
|
||||
:class="{ 'js-user-authored': isAuthoredByMe }"
|
||||
class="award-control btn js-add-award"
|
||||
title="Add reaction"
|
||||
aria-label="Add reaction"
|
||||
data-placement="bottom"
|
||||
type="button">
|
||||
<span
|
||||
v-html="emojiSmiling"
|
||||
class="award-control-icon award-control-icon-neutral">
|
||||
</span>
|
||||
<span
|
||||
v-html="emojiSmiley"
|
||||
class="award-control-icon award-control-icon-positive">
|
||||
</span>
|
||||
<span
|
||||
v-html="emojiSmile"
|
||||
class="award-control-icon award-control-icon-super-positive">
|
||||
</span>
|
||||
<i
|
||||
aria-hidden="true"
|
||||
class="fa fa-spinner fa-spin award-control-icon award-control-icon-loading"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,122 @@
|
|||
<script>
|
||||
import issueNoteEditedText from './issue_note_edited_text.vue';
|
||||
import issueNoteAwardsList from './issue_note_awards_list.vue';
|
||||
import issueNoteAttachment from './issue_note_attachment.vue';
|
||||
import issueNoteForm from './issue_note_form.vue';
|
||||
import TaskList from '../../task_list';
|
||||
import autosave from '../mixins/autosave';
|
||||
|
||||
export default {
|
||||
props: {
|
||||
note: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
canEdit: {
|
||||
type: Boolean,
|
||||
required: true,
|
||||
},
|
||||
isEditing: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
mixins: [
|
||||
autosave,
|
||||
],
|
||||
components: {
|
||||
issueNoteEditedText,
|
||||
issueNoteAwardsList,
|
||||
issueNoteAttachment,
|
||||
issueNoteForm,
|
||||
},
|
||||
computed: {
|
||||
noteBody() {
|
||||
return this.note.note;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
renderGFM() {
|
||||
$(this.$refs['note-body']).renderGFM();
|
||||
},
|
||||
initTaskList() {
|
||||
if (this.canEdit) {
|
||||
this.taskList = new TaskList({
|
||||
dataType: 'note',
|
||||
fieldName: 'note',
|
||||
selector: '.notes',
|
||||
});
|
||||
}
|
||||
},
|
||||
handleFormUpdate(note, parentElement, callback) {
|
||||
this.$emit('handleFormUpdate', note, parentElement, callback);
|
||||
},
|
||||
formCancelHandler(shouldConfirm, isDirty) {
|
||||
this.$emit('cancelFormEdition', shouldConfirm, isDirty);
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.renderGFM();
|
||||
this.initTaskList();
|
||||
|
||||
if (this.isEditing) {
|
||||
this.initAutoSave();
|
||||
}
|
||||
},
|
||||
updated() {
|
||||
this.initTaskList();
|
||||
this.renderGFM();
|
||||
|
||||
if (this.isEditing) {
|
||||
if (!this.autosave) {
|
||||
this.initAutoSave();
|
||||
} else {
|
||||
this.setAutoSave();
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div
|
||||
:class="{ 'js-task-list-container': canEdit }"
|
||||
ref="note-body"
|
||||
class="note-body">
|
||||
<div
|
||||
v-html="note.note_html"
|
||||
class="note-text md"></div>
|
||||
<issue-note-form
|
||||
v-if="isEditing"
|
||||
ref="noteForm"
|
||||
@handleFormUpdate="handleFormUpdate"
|
||||
@cancelFormEdition="formCancelHandler"
|
||||
:is-editing="isEditing"
|
||||
:note-body="noteBody"
|
||||
:note-id="note.id"
|
||||
/>
|
||||
<textarea
|
||||
v-if="canEdit"
|
||||
v-model="note.note"
|
||||
:data-update-url="note.path"
|
||||
class="hidden js-task-list-field"></textarea>
|
||||
<issue-note-edited-text
|
||||
v-if="note.last_edited_at"
|
||||
:edited-at="note.last_edited_at"
|
||||
:edited-by="note.last_edited_by"
|
||||
action-text="Edited"
|
||||
/>
|
||||
<issue-note-awards-list
|
||||
v-if="note.award_emoji.length"
|
||||
:note-id="note.id"
|
||||
:note-author-id="note.author.id"
|
||||
:awards="note.award_emoji"
|
||||
:toggle-award-path="note.toggle_award_path"
|
||||
/>
|
||||
<issue-note-attachment
|
||||
v-if="note.attachment"
|
||||
:attachment="note.attachment"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
<script>
|
||||
import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
|
||||
|
||||
export default {
|
||||
name: 'editedNoteText',
|
||||
props: {
|
||||
actionText: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
editedAt: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
editedBy: {
|
||||
type: Object,
|
||||
required: false,
|
||||
},
|
||||
className: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: 'edited-text',
|
||||
},
|
||||
},
|
||||
components: {
|
||||
timeAgoTooltip,
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div :class="className">
|
||||
{{actionText}}
|
||||
<time-ago-tooltip
|
||||
:time="editedAt"
|
||||
tooltip-placement="bottom"
|
||||
/>
|
||||
<template v-if="editedBy">
|
||||
by
|
||||
<a
|
||||
:href="editedBy.path"
|
||||
class="js-vue-author author_link">
|
||||
{{editedBy.name}}
|
||||
</a>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,166 @@
|
|||
<script>
|
||||
import { mapGetters } from 'vuex';
|
||||
import eventHub from '../event_hub';
|
||||
import confidentialIssue from '../../vue_shared/components/issue/confidential_issue_warning.vue';
|
||||
import markdownField from '../../vue_shared/components/markdown/field.vue';
|
||||
|
||||
export default {
|
||||
name: 'issueNoteForm',
|
||||
props: {
|
||||
noteBody: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: '',
|
||||
},
|
||||
noteId: {
|
||||
type: Number,
|
||||
required: false,
|
||||
},
|
||||
saveButtonTitle: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: 'Save comment',
|
||||
},
|
||||
discussion: {
|
||||
type: Object,
|
||||
required: false,
|
||||
default: () => ({}),
|
||||
},
|
||||
isEditing: {
|
||||
type: Boolean,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
note: this.noteBody,
|
||||
conflictWhileEditing: false,
|
||||
isSubmitting: false,
|
||||
};
|
||||
},
|
||||
components: {
|
||||
confidentialIssue,
|
||||
markdownField,
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'getDiscussionLastNote',
|
||||
'getIssueDataByProp',
|
||||
'getNotesDataByProp',
|
||||
'getUserDataByProp',
|
||||
]),
|
||||
noteHash() {
|
||||
return `#note_${this.noteId}`;
|
||||
},
|
||||
markdownPreviewPath() {
|
||||
return this.getIssueDataByProp('preview_note_path');
|
||||
},
|
||||
markdownDocsPath() {
|
||||
return this.getNotesDataByProp('markdownDocsPath');
|
||||
},
|
||||
quickActionsDocsPath() {
|
||||
return !this.isEditing ? this.getNotesDataByProp('quickActionsDocsPath') : undefined;
|
||||
},
|
||||
currentUserId() {
|
||||
return this.getUserDataByProp('id');
|
||||
},
|
||||
isDisabled() {
|
||||
return !this.note.length || this.isSubmitting;
|
||||
},
|
||||
isConfidentialIssue() {
|
||||
return this.getIssueDataByProp('confidential');
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
handleUpdate() {
|
||||
this.isSubmitting = true;
|
||||
|
||||
this.$emit('handleFormUpdate', this.note, this.$refs.editNoteForm, () => {
|
||||
this.isSubmitting = false;
|
||||
});
|
||||
},
|
||||
editMyLastNote() {
|
||||
if (this.note === '') {
|
||||
const lastNoteInDiscussion = this.getDiscussionLastNote(this.discussion);
|
||||
|
||||
if (lastNoteInDiscussion) {
|
||||
eventHub.$emit('enterEditMode', {
|
||||
noteId: lastNoteInDiscussion.id,
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
cancelHandler(shouldConfirm = false) {
|
||||
// Sends information about confirm message and if the textarea has changed
|
||||
this.$emit('cancelFormEdition', shouldConfirm, this.noteBody !== this.note);
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.$refs.textarea.focus();
|
||||
},
|
||||
watch: {
|
||||
noteBody() {
|
||||
if (this.note === this.noteBody) {
|
||||
this.note = this.noteBody;
|
||||
} else {
|
||||
this.conflictWhileEditing = true;
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div ref="editNoteForm" class="note-edit-form current-note-edit-form">
|
||||
<div
|
||||
v-if="conflictWhileEditing"
|
||||
class="js-conflict-edit-warning alert alert-danger">
|
||||
This comment has changed since you started editing, please review the
|
||||
<a
|
||||
:href="noteHash"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer">updated comment</a>
|
||||
to ensure information is not lost.
|
||||
</div>
|
||||
<div class="flash-container timeline-content"></div>
|
||||
<form
|
||||
class="edit-note common-note-form js-quick-submit gfm-form">
|
||||
<confidentialIssue v-if="isConfidentialIssue" />
|
||||
<markdown-field
|
||||
:markdown-preview-path="markdownPreviewPath"
|
||||
:markdown-docs-path="markdownDocsPath"
|
||||
:quick-actions-docs-path="quickActionsDocsPath"
|
||||
:add-spacing-classes="false">
|
||||
<textarea
|
||||
id="note_note"
|
||||
name="note[note]"
|
||||
class="note-textarea js-gfm-input js-autosize markdown-area js-vue-issue-note-form js-vue-textarea"
|
||||
:data-supports-quick-actions="!isEditing"
|
||||
aria-label="Description"
|
||||
v-model="note"
|
||||
ref="textarea"
|
||||
slot="textarea"
|
||||
placeholder="Write a comment or drag your files here..."
|
||||
@keydown.meta.enter="handleUpdate()"
|
||||
@keydown.up="editMyLastNote()"
|
||||
@keydown.esc="cancelHandler(true)">
|
||||
</textarea>
|
||||
</markdown-field>
|
||||
<div class="note-form-actions clearfix">
|
||||
<button
|
||||
type="button"
|
||||
@click="handleUpdate()"
|
||||
:disabled="isDisabled"
|
||||
class="js-vue-issue-save btn btn-save">
|
||||
{{saveButtonTitle}}
|
||||
</button>
|
||||
<button
|
||||
@click="cancelHandler()"
|
||||
class="btn btn-cancel note-edit-cancel"
|
||||
type="button">
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
<script>
|
||||
import { mapActions } from 'vuex';
|
||||
import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
|
||||
|
||||
export default {
|
||||
props: {
|
||||
author: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
createdAt: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
actionText: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: '',
|
||||
},
|
||||
actionTextHtml: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: '',
|
||||
},
|
||||
noteId: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
includeToggle: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
isExpanded: true,
|
||||
};
|
||||
},
|
||||
components: {
|
||||
timeAgoTooltip,
|
||||
},
|
||||
computed: {
|
||||
toggleChevronClass() {
|
||||
return this.isExpanded ? 'fa-chevron-up' : 'fa-chevron-down';
|
||||
},
|
||||
noteTimestampLink() {
|
||||
return `#note_${this.noteId}`;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
...mapActions([
|
||||
'setTargetNoteHash',
|
||||
]),
|
||||
handleToggle() {
|
||||
this.isExpanded = !this.isExpanded;
|
||||
this.$emit('toggleHandler');
|
||||
},
|
||||
updateTargetNoteHash() {
|
||||
this.setTargetNoteHash(this.noteTimestampLink);
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="note-header-info">
|
||||
<a :href="author.path">
|
||||
<span class="note-header-author-name">
|
||||
{{author.name}}
|
||||
</span>
|
||||
<span class="note-headline-light">
|
||||
@{{author.username}}
|
||||
</span>
|
||||
</a>
|
||||
<span class="note-headline-light">
|
||||
<span class="note-headline-meta">
|
||||
<template v-if="actionText">
|
||||
{{actionText}}
|
||||
</template>
|
||||
<span
|
||||
v-if="actionTextHtml"
|
||||
v-html="actionTextHtml"
|
||||
class="system-note-message">
|
||||
</span>
|
||||
<a
|
||||
:href="noteTimestampLink"
|
||||
@click="updateTargetNoteHash"
|
||||
class="note-timestamp">
|
||||
<time-ago-tooltip
|
||||
:time="createdAt"
|
||||
tooltip-placement="bottom"
|
||||
/>
|
||||
</a>
|
||||
<i
|
||||
class="fa fa-spinner fa-spin editing-spinner"
|
||||
aria-label="Comment is being updated"
|
||||
aria-hidden="true">
|
||||
</i>
|
||||
</span>
|
||||
</span>
|
||||
<div
|
||||
v-if="includeToggle"
|
||||
class="discussion-actions">
|
||||
<button
|
||||
@click="handleToggle"
|
||||
class="note-action-button discussion-toggle-button js-vue-toggle-button"
|
||||
type="button">
|
||||
<i
|
||||
:class="toggleChevronClass"
|
||||
class="fa"
|
||||
aria-hidden="true">
|
||||
</i>
|
||||
Toggle discussion
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
import iconArrowCircle from 'icons/_icon_arrow_circle_o_right.svg';
|
||||
import iconCheck from 'icons/_icon_check_square_o.svg';
|
||||
import iconClock from 'icons/_icon_clock_o.svg';
|
||||
import iconCodeFork from 'icons/_icon_code_fork.svg';
|
||||
import iconComment from 'icons/_icon_comment_o.svg';
|
||||
import iconCommit from 'icons/_icon_commit.svg';
|
||||
import iconEdit from 'icons/_icon_edit.svg';
|
||||
import iconEye from 'icons/_icon_eye.svg';
|
||||
import iconEyeSlash from 'icons/_icon_eye_slash.svg';
|
||||
import iconMerge from 'icons/_icon_merge.svg';
|
||||
import iconMerged from 'icons/_icon_merged.svg';
|
||||
import iconRandom from 'icons/_icon_random.svg';
|
||||
import iconClosed from 'icons/_icon_status_closed.svg';
|
||||
import iconStatusOpen from 'icons/_icon_status_open.svg';
|
||||
import iconStopwatch from 'icons/_icon_stopwatch.svg';
|
||||
import iconTags from 'icons/_icon_tags.svg';
|
||||
import iconUser from 'icons/_icon_user.svg';
|
||||
|
||||
export default {
|
||||
icon_arrow_circle_o_right: iconArrowCircle,
|
||||
icon_check_square_o: iconCheck,
|
||||
icon_clock_o: iconClock,
|
||||
icon_code_fork: iconCodeFork,
|
||||
icon_comment_o: iconComment,
|
||||
icon_commit: iconCommit,
|
||||
icon_edit: iconEdit,
|
||||
icon_eye: iconEye,
|
||||
icon_eye_slash: iconEyeSlash,
|
||||
icon_merge: iconMerge,
|
||||
icon_merged: iconMerged,
|
||||
icon_random: iconRandom,
|
||||
icon_status_closed: iconClosed,
|
||||
icon_status_open: iconStatusOpen,
|
||||
icon_stopwatch: iconStopwatch,
|
||||
icon_tags: iconTags,
|
||||
icon_user: iconUser,
|
||||
};
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
<script>
|
||||
import { mapGetters } from 'vuex';
|
||||
|
||||
export default {
|
||||
name: 'singInLinksNotes',
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'getNotesDataByProp',
|
||||
]),
|
||||
registerLink() {
|
||||
return this.getNotesDataByProp('registerPath');
|
||||
},
|
||||
signInLink() {
|
||||
return this.getNotesDataByProp('newSessionPath');
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="disabled-comment text-center">
|
||||
Please
|
||||
<a :href="registerLink">register</a>
|
||||
or
|
||||
<a :href="signInLink">sign in</a>
|
||||
to reply
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,151 @@
|
|||
<script>
|
||||
/* global Flash */
|
||||
import { mapGetters, mapActions } from 'vuex';
|
||||
import store from '../stores/';
|
||||
import * as constants from '../constants';
|
||||
import issueNote from './issue_note.vue';
|
||||
import issueDiscussion from './issue_discussion.vue';
|
||||
import issueSystemNote from './issue_system_note.vue';
|
||||
import issueCommentForm from './issue_comment_form.vue';
|
||||
import placeholderNote from './issue_placeholder_note.vue';
|
||||
import placeholderSystemNote from './issue_placeholder_system_note.vue';
|
||||
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
|
||||
|
||||
export default {
|
||||
name: 'issueNotesApp',
|
||||
props: {
|
||||
issueData: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
notesData: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
userData: {
|
||||
type: Object,
|
||||
required: false,
|
||||
default: {},
|
||||
},
|
||||
},
|
||||
store,
|
||||
data() {
|
||||
return {
|
||||
isLoading: true,
|
||||
};
|
||||
},
|
||||
components: {
|
||||
issueNote,
|
||||
issueDiscussion,
|
||||
issueSystemNote,
|
||||
issueCommentForm,
|
||||
loadingIcon,
|
||||
placeholderNote,
|
||||
placeholderSystemNote,
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'notes',
|
||||
'getNotesDataByProp',
|
||||
]),
|
||||
},
|
||||
methods: {
|
||||
...mapActions({
|
||||
actionFetchNotes: 'fetchNotes',
|
||||
poll: 'poll',
|
||||
actionToggleAward: 'toggleAward',
|
||||
scrollToNoteIfNeeded: 'scrollToNoteIfNeeded',
|
||||
setNotesData: 'setNotesData',
|
||||
setIssueData: 'setIssueData',
|
||||
setUserData: 'setUserData',
|
||||
setLastFetchedAt: 'setLastFetchedAt',
|
||||
setTargetNoteHash: 'setTargetNoteHash',
|
||||
}),
|
||||
getComponentName(note) {
|
||||
if (note.isPlaceholderNote) {
|
||||
if (note.placeholderType === constants.SYSTEM_NOTE) {
|
||||
return placeholderSystemNote;
|
||||
}
|
||||
return placeholderNote;
|
||||
} else if (note.individual_note) {
|
||||
return note.notes[0].system ? issueSystemNote : issueNote;
|
||||
}
|
||||
|
||||
return issueDiscussion;
|
||||
},
|
||||
getComponentData(note) {
|
||||
return note.individual_note ? note.notes[0] : note;
|
||||
},
|
||||
fetchNotes() {
|
||||
return this.actionFetchNotes(this.getNotesDataByProp('discussionsPath'))
|
||||
.then(() => this.initPolling())
|
||||
.then(() => {
|
||||
this.isLoading = false;
|
||||
})
|
||||
.then(() => this.$nextTick())
|
||||
.then(() => this.checkLocationHash())
|
||||
.catch(() => {
|
||||
this.isLoading = false;
|
||||
Flash('Something went wrong while fetching issue comments. Please try again.');
|
||||
});
|
||||
},
|
||||
initPolling() {
|
||||
this.setLastFetchedAt(this.getNotesDataByProp('lastFetchedAt'));
|
||||
|
||||
this.poll();
|
||||
},
|
||||
checkLocationHash() {
|
||||
const hash = gl.utils.getLocationHash();
|
||||
const element = document.getElementById(hash);
|
||||
|
||||
if (hash && element) {
|
||||
this.setTargetNoteHash(hash);
|
||||
this.scrollToNoteIfNeeded($(element));
|
||||
}
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.setNotesData(this.notesData);
|
||||
this.setIssueData(this.issueData);
|
||||
this.setUserData(this.userData);
|
||||
},
|
||||
mounted() {
|
||||
this.fetchNotes();
|
||||
|
||||
const parentElement = this.$el.parentElement;
|
||||
|
||||
if (parentElement &&
|
||||
parentElement.classList.contains('js-vue-notes-event')) {
|
||||
parentElement.addEventListener('toggleAward', (event) => {
|
||||
const { awardName, noteId } = event.detail;
|
||||
this.actionToggleAward({ awardName, noteId });
|
||||
});
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div id="notes">
|
||||
<div
|
||||
v-if="isLoading"
|
||||
class="js-loading loading">
|
||||
<loading-icon />
|
||||
</div>
|
||||
|
||||
<ul
|
||||
v-if="!isLoading"
|
||||
id="notes-list"
|
||||
class="notes main-notes-list timeline">
|
||||
|
||||
<component
|
||||
v-for="note in notes"
|
||||
:is="getComponentName(note)"
|
||||
:note="getComponentData(note)"
|
||||
:key="note.id"
|
||||
/>
|
||||
</ul>
|
||||
|
||||
<issue-comment-form />
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
<script>
|
||||
import { mapGetters } from 'vuex';
|
||||
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
|
||||
|
||||
export default {
|
||||
name: 'issuePlaceholderNote',
|
||||
props: {
|
||||
note: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
components: {
|
||||
userAvatarLink,
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'getUserData',
|
||||
]),
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<li class="note being-posted fade-in-half timeline-entry">
|
||||
<div class="timeline-entry-inner">
|
||||
<div class="timeline-icon">
|
||||
<user-avatar-link
|
||||
:link-href="getUserData.path"
|
||||
:img-src="getUserData.avatar_url"
|
||||
:img-size="40"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
:class="{ discussion: !note.individual_note }"
|
||||
class="timeline-content">
|
||||
<div class="note-header">
|
||||
<div class="note-header-info">
|
||||
<a :href="getUserData.path">
|
||||
<span class="hidden-xs">{{getUserData.name}}</span>
|
||||
<span class="note-headline-light">@{{getUserData.username}}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="note-body">
|
||||
<div class="note-text">
|
||||
<p>{{note.body}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
<script>
|
||||
export default {
|
||||
name: 'placeholderSystemNote',
|
||||
props: {
|
||||
note: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<li class="note system-note timeline-entry being-posted fade-in-half">
|
||||
<div class="timeline-entry-inner">
|
||||
<div class="timeline-content">
|
||||
<em>{{note.body}}</em>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
<script>
|
||||
import { mapGetters } from 'vuex';
|
||||
import iconsMap from './issue_note_icons';
|
||||
import issueNoteHeader from './issue_note_header.vue';
|
||||
|
||||
export default {
|
||||
name: 'systemNote',
|
||||
props: {
|
||||
note: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
components: {
|
||||
issueNoteHeader,
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'targetNoteHash',
|
||||
]),
|
||||
noteAnchorId() {
|
||||
return `note_${this.note.id}`;
|
||||
},
|
||||
isTargetNote() {
|
||||
return this.targetNoteHash === this.noteAnchorId;
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.svg = iconsMap[this.note.system_note_icon_name];
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<li
|
||||
:id="noteAnchorId"
|
||||
:class="{ target: isTargetNote }"
|
||||
class="note system-note timeline-entry">
|
||||
<div class="timeline-entry-inner">
|
||||
<div
|
||||
class="timeline-icon"
|
||||
v-html="svg">
|
||||
</div>
|
||||
<div class="timeline-content">
|
||||
<div class="note-header">
|
||||
<issue-note-header
|
||||
:author="note.author"
|
||||
:created-at="note.created_at"
|
||||
:note-id="note.id"
|
||||
:action-text-html="note.note_html" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
export const DISCUSSION_NOTE = 'DiscussionNote';
|
||||
export const DISCUSSION = 'discussion';
|
||||
export const NOTE = 'note';
|
||||
export const SYSTEM_NOTE = 'systemNote';
|
||||
export const COMMENT = 'comment';
|
||||
export const OPENED = 'opened';
|
||||
export const REOPENED = 'reopened';
|
||||
export const CLOSED = 'closed';
|
||||
export const EMOJI_THUMBSUP = 'thumbsup';
|
||||
export const EMOJI_THUMBSDOWN = 'thumbsdown';
|
||||
export const NOTEABLE_TYPE = 'Issue';
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
import Vue from 'vue';
|
||||
|
||||
export default new Vue();
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
import Vue from 'vue';
|
||||
import issueNotesApp from './components/issue_notes_app.vue';
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => new Vue({
|
||||
el: '#js-vue-notes',
|
||||
components: {
|
||||
issueNotesApp,
|
||||
},
|
||||
data() {
|
||||
const notesDataset = document.getElementById('js-vue-notes').dataset;
|
||||
|
||||
return {
|
||||
issueData: JSON.parse(notesDataset.issueData),
|
||||
currentUserData: JSON.parse(notesDataset.currentUserData),
|
||||
notesData: {
|
||||
lastFetchedAt: notesDataset.lastFetchedAt,
|
||||
discussionsPath: notesDataset.discussionsPath,
|
||||
newSessionPath: notesDataset.newSessionPath,
|
||||
registerPath: notesDataset.registerPath,
|
||||
notesPath: notesDataset.notesPath,
|
||||
markdownDocsPath: notesDataset.markdownDocsPath,
|
||||
quickActionsDocsPath: notesDataset.quickActionsDocsPath,
|
||||
},
|
||||
};
|
||||
},
|
||||
render(createElement) {
|
||||
return createElement('issue-notes-app', {
|
||||
props: {
|
||||
issueData: this.issueData,
|
||||
notesData: this.notesData,
|
||||
userData: this.currentUserData,
|
||||
},
|
||||
});
|
||||
},
|
||||
}));
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
/* globals Autosave */
|
||||
import '../../autosave';
|
||||
|
||||
export default {
|
||||
methods: {
|
||||
initAutoSave() {
|
||||
this.autosave = new Autosave($(this.$refs.noteForm.$refs.textarea), ['Note', 'Issue', this.note.id], 'issue');
|
||||
},
|
||||
resetAutoSave() {
|
||||
this.autosave.reset();
|
||||
},
|
||||
setAutoSave() {
|
||||
this.autosave.save();
|
||||
},
|
||||
},
|
||||
};
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
import Vue from 'vue';
|
||||
import VueResource from 'vue-resource';
|
||||
|
||||
Vue.use(VueResource);
|
||||
|
||||
export default {
|
||||
fetchNotes(endpoint) {
|
||||
return Vue.http.get(endpoint);
|
||||
},
|
||||
deleteNote(endpoint) {
|
||||
return Vue.http.delete(endpoint);
|
||||
},
|
||||
replyToDiscussion(endpoint, data) {
|
||||
return Vue.http.post(endpoint, data, { emulateJSON: true });
|
||||
},
|
||||
updateNote(endpoint, data) {
|
||||
return Vue.http.put(endpoint, data, { emulateJSON: true });
|
||||
},
|
||||
createNewNote(endpoint, data) {
|
||||
return Vue.http.post(endpoint, data, { emulateJSON: true });
|
||||
},
|
||||
poll(data = {}) {
|
||||
const { endpoint, lastFetchedAt } = data;
|
||||
const options = {
|
||||
headers: {
|
||||
'X-Last-Fetched-At': lastFetchedAt,
|
||||
},
|
||||
};
|
||||
|
||||
return Vue.http.get(endpoint, options);
|
||||
},
|
||||
toggleAward(endpoint, data) {
|
||||
return Vue.http.post(endpoint, data, { emulateJSON: true });
|
||||
},
|
||||
};
|
||||
|
|
@ -0,0 +1,217 @@
|
|||
/* global Flash */
|
||||
import Visibility from 'visibilityjs';
|
||||
import Poll from '../../lib/utils/poll';
|
||||
import * as types from './mutation_types';
|
||||
import * as utils from './utils';
|
||||
import * as constants from '../constants';
|
||||
import service from '../services/issue_notes_service';
|
||||
import loadAwardsHandler from '../../awards_handler';
|
||||
import sidebarTimeTrackingEventHub from '../../sidebar/event_hub';
|
||||
|
||||
let eTagPoll;
|
||||
|
||||
export const setNotesData = ({ commit }, data) => commit(types.SET_NOTES_DATA, data);
|
||||
export const setIssueData = ({ commit }, data) => commit(types.SET_ISSUE_DATA, data);
|
||||
export const setUserData = ({ commit }, data) => commit(types.SET_USER_DATA, data);
|
||||
export const setLastFetchedAt = ({ commit }, data) => commit(types.SET_LAST_FETCHED_AT, data);
|
||||
export const setInitialNotes = ({ commit }, data) => commit(types.SET_INITIAL_NOTES, data);
|
||||
export const setTargetNoteHash = ({ commit }, data) => commit(types.SET_TARGET_NOTE_HASH, data);
|
||||
export const toggleDiscussion = ({ commit }, data) => commit(types.TOGGLE_DISCUSSION, data);
|
||||
|
||||
export const fetchNotes = ({ commit }, path) => service
|
||||
.fetchNotes(path)
|
||||
.then(res => res.json())
|
||||
.then((res) => {
|
||||
commit(types.SET_INITIAL_NOTES, res);
|
||||
});
|
||||
|
||||
export const deleteNote = ({ commit }, note) => service
|
||||
.deleteNote(note.path)
|
||||
.then(() => {
|
||||
commit(types.DELETE_NOTE, note);
|
||||
});
|
||||
|
||||
export const updateNote = ({ commit }, { endpoint, note }) => service
|
||||
.updateNote(endpoint, note)
|
||||
.then(res => res.json())
|
||||
.then((res) => {
|
||||
commit(types.UPDATE_NOTE, res);
|
||||
});
|
||||
|
||||
export const replyToDiscussion = ({ commit }, { endpoint, data }) => service
|
||||
.replyToDiscussion(endpoint, data)
|
||||
.then(res => res.json())
|
||||
.then((res) => {
|
||||
commit(types.ADD_NEW_REPLY_TO_DISCUSSION, res);
|
||||
|
||||
return res;
|
||||
});
|
||||
|
||||
export const createNewNote = ({ commit }, { endpoint, data }) => service
|
||||
.createNewNote(endpoint, data)
|
||||
.then(res => res.json())
|
||||
.then((res) => {
|
||||
if (!res.errors) {
|
||||
commit(types.ADD_NEW_NOTE, res);
|
||||
}
|
||||
return res;
|
||||
});
|
||||
|
||||
export const removePlaceholderNotes = ({ commit }) =>
|
||||
commit(types.REMOVE_PLACEHOLDER_NOTES);
|
||||
|
||||
export const saveNote = ({ commit, dispatch }, noteData) => {
|
||||
const { note } = noteData.data.note;
|
||||
let placeholderText = note;
|
||||
const hasQuickActions = utils.hasQuickActions(placeholderText);
|
||||
const replyId = noteData.data.in_reply_to_discussion_id;
|
||||
const methodToDispatch = replyId ? 'replyToDiscussion' : 'createNewNote';
|
||||
|
||||
commit(types.REMOVE_PLACEHOLDER_NOTES); // remove previous placeholders
|
||||
$('.notes-form .flash-container').hide(); // hide previous flash notification
|
||||
|
||||
if (hasQuickActions) {
|
||||
placeholderText = utils.stripQuickActions(placeholderText);
|
||||
}
|
||||
|
||||
if (placeholderText.length) {
|
||||
commit(types.SHOW_PLACEHOLDER_NOTE, {
|
||||
noteBody: placeholderText,
|
||||
replyId,
|
||||
});
|
||||
}
|
||||
|
||||
if (hasQuickActions) {
|
||||
commit(types.SHOW_PLACEHOLDER_NOTE, {
|
||||
isSystemNote: true,
|
||||
noteBody: utils.getQuickActionText(note),
|
||||
replyId,
|
||||
});
|
||||
}
|
||||
|
||||
return dispatch(methodToDispatch, noteData)
|
||||
.then((res) => {
|
||||
const { errors } = res;
|
||||
const commandsChanges = res.commands_changes;
|
||||
|
||||
if (hasQuickActions && errors && Object.keys(errors).length) {
|
||||
eTagPoll.makeRequest();
|
||||
|
||||
$('.js-gfm-input').trigger('clear-commands-cache.atwho');
|
||||
Flash('Commands applied', 'notice', $(noteData.flashContainer));
|
||||
}
|
||||
|
||||
if (commandsChanges) {
|
||||
if (commandsChanges.emoji_award) {
|
||||
const votesBlock = $('.js-awards-block').eq(0);
|
||||
|
||||
loadAwardsHandler()
|
||||
.then((awardsHandler) => {
|
||||
awardsHandler.addAwardToEmojiBar(votesBlock, commandsChanges.emoji_award);
|
||||
awardsHandler.scrollToAwards();
|
||||
})
|
||||
.catch(() => {
|
||||
Flash(
|
||||
'Something went wrong while adding your award. Please try again.',
|
||||
null,
|
||||
$(noteData.flashContainer),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
if (commandsChanges.spend_time != null || commandsChanges.time_estimate != null) {
|
||||
sidebarTimeTrackingEventHub.$emit('timeTrackingUpdated', res);
|
||||
}
|
||||
}
|
||||
|
||||
if (errors && errors.commands_only) {
|
||||
Flash(errors.commands_only, 'notice', $(noteData.flashContainer));
|
||||
}
|
||||
commit(types.REMOVE_PLACEHOLDER_NOTES);
|
||||
|
||||
return res;
|
||||
});
|
||||
};
|
||||
|
||||
const pollSuccessCallBack = (resp, commit, state, getters) => {
|
||||
if (resp.notes && resp.notes.length) {
|
||||
const { notesById } = getters;
|
||||
|
||||
resp.notes.forEach((note) => {
|
||||
if (notesById[note.id]) {
|
||||
commit(types.UPDATE_NOTE, note);
|
||||
} else if (note.type === constants.DISCUSSION_NOTE) {
|
||||
const discussion = utils.findNoteObjectById(state.notes, note.discussion_id);
|
||||
|
||||
if (discussion) {
|
||||
commit(types.ADD_NEW_REPLY_TO_DISCUSSION, note);
|
||||
} else {
|
||||
commit(types.ADD_NEW_NOTE, note);
|
||||
}
|
||||
} else {
|
||||
commit(types.ADD_NEW_NOTE, note);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
commit(types.SET_LAST_FETCHED_AT, resp.lastFetchedAt);
|
||||
|
||||
return resp;
|
||||
};
|
||||
|
||||
export const poll = ({ commit, state, getters }) => {
|
||||
const requestData = { endpoint: state.notesData.notesPath, lastFetchedAt: state.lastFetchedAt };
|
||||
|
||||
eTagPoll = new Poll({
|
||||
resource: service,
|
||||
method: 'poll',
|
||||
data: requestData,
|
||||
successCallback: resp => resp.json()
|
||||
.then(data => pollSuccessCallBack(data, commit, state, getters)),
|
||||
errorCallback: () => Flash('Something went wrong while fetching latest comments.'),
|
||||
});
|
||||
|
||||
if (!Visibility.hidden()) {
|
||||
eTagPoll.makeRequest();
|
||||
} else {
|
||||
service.poll(requestData);
|
||||
}
|
||||
|
||||
Visibility.change(() => {
|
||||
if (!Visibility.hidden()) {
|
||||
eTagPoll.restart();
|
||||
} else {
|
||||
eTagPoll.stop();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
export const fetchData = ({ commit, state, getters }) => {
|
||||
const requestData = { endpoint: state.notesData.notesPath, lastFetchedAt: state.lastFetchedAt };
|
||||
|
||||
service.poll(requestData)
|
||||
.then(resp => resp.json)
|
||||
.then(data => pollSuccessCallBack(data, commit, state, getters))
|
||||
.catch(() => Flash('Something went wrong while fetching latest comments.'));
|
||||
};
|
||||
|
||||
export const toggleAward = ({ commit, state, getters, dispatch }, { awardName, noteId }) => {
|
||||
commit(types.TOGGLE_AWARD, { awardName, note: getters.notesById[noteId] });
|
||||
};
|
||||
|
||||
export const toggleAwardRequest = ({ commit, getters, dispatch }, data) => {
|
||||
const { endpoint, awardName } = data;
|
||||
|
||||
return service
|
||||
.toggleAward(endpoint, { name: awardName })
|
||||
.then(res => res.json())
|
||||
.then(() => {
|
||||
dispatch('toggleAward', data);
|
||||
});
|
||||
};
|
||||
|
||||
export const scrollToNoteIfNeeded = (context, el) => {
|
||||
if (!gl.utils.isInViewport(el[0])) {
|
||||
gl.utils.scrollToElement(el);
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
import _ from 'underscore';
|
||||
|
||||
export const notes = state => state.notes;
|
||||
export const targetNoteHash = state => state.targetNoteHash;
|
||||
|
||||
export const getNotesData = state => state.notesData;
|
||||
export const getNotesDataByProp = state => prop => state.notesData[prop];
|
||||
|
||||
export const getIssueData = state => state.issueData;
|
||||
export const getIssueDataByProp = state => prop => state.issueData[prop];
|
||||
|
||||
export const getUserData = state => state.userData || {};
|
||||
export const getUserDataByProp = state => prop => state.userData && state.userData[prop];
|
||||
|
||||
export const notesById = state => state.notes.reduce((acc, note) => {
|
||||
note.notes.every(n => Object.assign(acc, { [n.id]: n }));
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
const reverseNotes = array => array.slice(0).reverse();
|
||||
const isLastNote = (note, state) => !note.system &&
|
||||
state.userData && note.author &&
|
||||
note.author.id === state.userData.id;
|
||||
|
||||
export const getCurrentUserLastNote = state => _.flatten(
|
||||
reverseNotes(state.notes)
|
||||
.map(note => reverseNotes(note.notes)),
|
||||
).find(el => isLastNote(el, state));
|
||||
|
||||
export const getDiscussionLastNote = state => discussion => reverseNotes(discussion.notes)
|
||||
.find(el => isLastNote(el, state));
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
import Vue from 'vue';
|
||||
import Vuex from 'vuex';
|
||||
import * as actions from './actions';
|
||||
import * as getters from './getters';
|
||||
import mutations from './mutations';
|
||||
|
||||
Vue.use(Vuex);
|
||||
|
||||
export default new Vuex.Store({
|
||||
state: {
|
||||
notes: [],
|
||||
targetNoteHash: null,
|
||||
lastFetchedAt: null,
|
||||
|
||||
// holds endpoints and permissions provided through haml
|
||||
notesData: {},
|
||||
userData: {},
|
||||
issueData: {},
|
||||
},
|
||||
actions,
|
||||
getters,
|
||||
mutations,
|
||||
});
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
export const ADD_NEW_NOTE = 'ADD_NEW_NOTE';
|
||||
export const ADD_NEW_REPLY_TO_DISCUSSION = 'ADD_NEW_REPLY_TO_DISCUSSION';
|
||||
export const DELETE_NOTE = 'DELETE_NOTE';
|
||||
export const REMOVE_PLACEHOLDER_NOTES = 'REMOVE_PLACEHOLDER_NOTES';
|
||||
export const SET_NOTES_DATA = 'SET_NOTES_DATA';
|
||||
export const SET_ISSUE_DATA = 'SET_ISSUE_DATA';
|
||||
export const SET_USER_DATA = 'SET_USER_DATA';
|
||||
export const SET_INITIAL_NOTES = 'SET_INITIAL_NOTES';
|
||||
export const SET_LAST_FETCHED_AT = 'SET_LAST_FETCHED_AT';
|
||||
export const SET_TARGET_NOTE_HASH = 'SET_TARGET_NOTE_HASH';
|
||||
export const SHOW_PLACEHOLDER_NOTE = 'SHOW_PLACEHOLDER_NOTE';
|
||||
export const TOGGLE_AWARD = 'TOGGLE_AWARD';
|
||||
export const TOGGLE_DISCUSSION = 'TOGGLE_DISCUSSION';
|
||||
export const UPDATE_NOTE = 'UPDATE_NOTE';
|
||||
|
|
@ -0,0 +1,151 @@
|
|||
import * as utils from './utils';
|
||||
import * as types from './mutation_types';
|
||||
import * as constants from '../constants';
|
||||
|
||||
export default {
|
||||
[types.ADD_NEW_NOTE](state, note) {
|
||||
const { discussion_id, type } = note;
|
||||
const noteData = {
|
||||
expanded: true,
|
||||
id: discussion_id,
|
||||
individual_note: !(type === constants.DISCUSSION_NOTE),
|
||||
notes: [note],
|
||||
reply_id: discussion_id,
|
||||
};
|
||||
|
||||
state.notes.push(noteData);
|
||||
},
|
||||
|
||||
[types.ADD_NEW_REPLY_TO_DISCUSSION](state, note) {
|
||||
const noteObj = utils.findNoteObjectById(state.notes, note.discussion_id);
|
||||
|
||||
if (noteObj) {
|
||||
noteObj.notes.push(note);
|
||||
}
|
||||
},
|
||||
|
||||
[types.DELETE_NOTE](state, note) {
|
||||
const noteObj = utils.findNoteObjectById(state.notes, note.discussion_id);
|
||||
|
||||
if (noteObj.individual_note) {
|
||||
state.notes.splice(state.notes.indexOf(noteObj), 1);
|
||||
} else {
|
||||
const comment = utils.findNoteObjectById(noteObj.notes, note.id);
|
||||
noteObj.notes.splice(noteObj.notes.indexOf(comment), 1);
|
||||
|
||||
if (!noteObj.notes.length) {
|
||||
state.notes.splice(state.notes.indexOf(noteObj), 1);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
[types.REMOVE_PLACEHOLDER_NOTES](state) {
|
||||
const { notes } = state;
|
||||
|
||||
for (let i = notes.length - 1; i >= 0; i -= 1) {
|
||||
const note = notes[i];
|
||||
const children = note.notes;
|
||||
|
||||
if (children.length && !note.individual_note) { // remove placeholder from discussions
|
||||
for (let j = children.length - 1; j >= 0; j -= 1) {
|
||||
if (children[j].isPlaceholderNote) {
|
||||
children.splice(j, 1);
|
||||
}
|
||||
}
|
||||
} else if (note.isPlaceholderNote) { // remove placeholders from state root
|
||||
notes.splice(i, 1);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
[types.SET_NOTES_DATA](state, data) {
|
||||
Object.assign(state, { notesData: data });
|
||||
},
|
||||
|
||||
[types.SET_ISSUE_DATA](state, data) {
|
||||
Object.assign(state, { issueData: data });
|
||||
},
|
||||
|
||||
[types.SET_USER_DATA](state, data) {
|
||||
Object.assign(state, { userData: data });
|
||||
},
|
||||
[types.SET_INITIAL_NOTES](state, notesData) {
|
||||
const notes = [];
|
||||
|
||||
notesData.forEach((note) => {
|
||||
// To support legacy notes, should be very rare case.
|
||||
if (note.individual_note && note.notes.length > 1) {
|
||||
note.notes.forEach((n) => {
|
||||
const nn = Object.assign({}, note);
|
||||
nn.notes = [n]; // override notes array to only have one item to mimick individual_note
|
||||
notes.push(nn);
|
||||
});
|
||||
} else {
|
||||
notes.push(note);
|
||||
}
|
||||
});
|
||||
|
||||
Object.assign(state, { notes });
|
||||
},
|
||||
|
||||
[types.SET_LAST_FETCHED_AT](state, fetchedAt) {
|
||||
Object.assign(state, { lastFetchedAt: fetchedAt });
|
||||
},
|
||||
|
||||
[types.SET_TARGET_NOTE_HASH](state, hash) {
|
||||
Object.assign(state, { targetNoteHash: hash });
|
||||
},
|
||||
|
||||
[types.SHOW_PLACEHOLDER_NOTE](state, data) {
|
||||
let notesArr = state.notes;
|
||||
if (data.replyId) {
|
||||
notesArr = utils.findNoteObjectById(notesArr, data.replyId).notes;
|
||||
}
|
||||
|
||||
notesArr.push({
|
||||
individual_note: true,
|
||||
isPlaceholderNote: true,
|
||||
placeholderType: data.isSystemNote ? constants.SYSTEM_NOTE : constants.NOTE,
|
||||
notes: [
|
||||
{
|
||||
body: data.noteBody,
|
||||
},
|
||||
],
|
||||
});
|
||||
},
|
||||
|
||||
[types.TOGGLE_AWARD](state, data) {
|
||||
const { awardName, note } = data;
|
||||
const { id, name, username } = state.userData;
|
||||
|
||||
const hasEmojiAwardedByCurrentUser = note.award_emoji
|
||||
.filter(emoji => emoji.name === data.awardName && emoji.user.id === id);
|
||||
|
||||
if (hasEmojiAwardedByCurrentUser.length) {
|
||||
// If current user has awarded this emoji, remove it.
|
||||
note.award_emoji.splice(note.award_emoji.indexOf(hasEmojiAwardedByCurrentUser[0]), 1);
|
||||
} else {
|
||||
note.award_emoji.push({
|
||||
name: awardName,
|
||||
user: { id, name, username },
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
[types.TOGGLE_DISCUSSION](state, { discussionId }) {
|
||||
const discussion = utils.findNoteObjectById(state.notes, discussionId);
|
||||
|
||||
discussion.expanded = !discussion.expanded;
|
||||
},
|
||||
|
||||
[types.UPDATE_NOTE](state, note) {
|
||||
const noteObj = utils.findNoteObjectById(state.notes, note.discussion_id);
|
||||
|
||||
if (noteObj.individual_note) {
|
||||
noteObj.notes.splice(0, 1, note);
|
||||
} else {
|
||||
const comment = utils.findNoteObjectById(noteObj.notes, note.id);
|
||||
noteObj.notes.splice(noteObj.notes.indexOf(comment), 1, note);
|
||||
}
|
||||
},
|
||||
};
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
import AjaxCache from '~/lib/utils/ajax_cache';
|
||||
|
||||
const REGEX_QUICK_ACTIONS = /^\/\w+.*$/gm;
|
||||
|
||||
export const findNoteObjectById = (notes, id) => notes.filter(n => n.id === id)[0];
|
||||
|
||||
export const getQuickActionText = (note) => {
|
||||
let text = 'Applying command';
|
||||
const quickActions = AjaxCache.get(gl.GfmAutoComplete.dataSources.commands) || [];
|
||||
|
||||
const executedCommands = quickActions.filter((command) => {
|
||||
const commandRegex = new RegExp(`/${command.name}`);
|
||||
return commandRegex.test(note);
|
||||
});
|
||||
|
||||
if (executedCommands && executedCommands.length) {
|
||||
if (executedCommands.length > 1) {
|
||||
text = 'Applying multiple commands';
|
||||
} else {
|
||||
const commandDescription = executedCommands[0].description.toLowerCase();
|
||||
text = `Applying command to ${commandDescription}`;
|
||||
}
|
||||
}
|
||||
|
||||
return text;
|
||||
};
|
||||
|
||||
export const hasQuickActions = note => REGEX_QUICK_ACTIONS.test(note);
|
||||
|
||||
export const stripQuickActions = note => note.replace(REGEX_QUICK_ACTIONS, '').trim();
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ import './shortcuts_navigation';
|
|||
Mousetrap.bind('m', this.openSidebarDropdown.bind(this, 'milestone'));
|
||||
Mousetrap.bind('r', (function(_this) {
|
||||
return function() {
|
||||
_this.replyWithSelectedText();
|
||||
_this.replyWithSelectedText(isMergeRequest);
|
||||
return false;
|
||||
};
|
||||
})(this));
|
||||
|
|
@ -38,9 +38,15 @@ import './shortcuts_navigation';
|
|||
}
|
||||
}
|
||||
|
||||
ShortcutsIssuable.prototype.replyWithSelectedText = function() {
|
||||
ShortcutsIssuable.prototype.replyWithSelectedText = function(isMergeRequest) {
|
||||
var quote, documentFragment, el, selected, separator;
|
||||
var replyField = $('.js-main-target-form #note_note');
|
||||
let replyField;
|
||||
|
||||
if (isMergeRequest) {
|
||||
replyField = $('.js-main-target-form #note_note');
|
||||
} else {
|
||||
replyField = $('.js-main-target-form .js-vue-comment-form');
|
||||
}
|
||||
|
||||
documentFragment = window.gl.utils.getSelectedFragment();
|
||||
if (!documentFragment) {
|
||||
|
|
@ -57,6 +63,7 @@ import './shortcuts_navigation';
|
|||
quote = _.map(selected.split("\n"), function(val) {
|
||||
return ("> " + val).trim() + "\n";
|
||||
});
|
||||
|
||||
// If replyField already has some content, add a newline before our quote
|
||||
separator = replyField.val().trim() !== "" && "\n\n" || '';
|
||||
replyField.val(function(a, current) {
|
||||
|
|
@ -64,7 +71,7 @@ import './shortcuts_navigation';
|
|||
});
|
||||
|
||||
// Trigger autosave
|
||||
replyField.trigger('input');
|
||||
replyField.trigger('input').trigger('change');
|
||||
|
||||
// Trigger autosize
|
||||
var event = document.createEvent('Event');
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import timeTracker from './time_tracker';
|
|||
|
||||
import Store from '../../stores/sidebar_store';
|
||||
import Mediator from '../../sidebar_mediator';
|
||||
import eventHub from '../../event_hub';
|
||||
|
||||
export default {
|
||||
data() {
|
||||
|
|
@ -20,6 +21,9 @@ export default {
|
|||
methods: {
|
||||
listenForQuickActions() {
|
||||
$(document).on('ajax:success', '.gfm-form', this.quickActionListened);
|
||||
eventHub.$on('timeTrackingUpdated', (data) => {
|
||||
this.quickActionListened(null, data);
|
||||
});
|
||||
},
|
||||
quickActionListened(e, data) {
|
||||
const subscribedCommands = ['spend_time', 'time_estimate'];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
<script>
|
||||
export default {
|
||||
name: 'confidentialIssueWarning',
|
||||
};
|
||||
</script>
|
||||
<template>
|
||||
<div class="confidential-issue-warning">
|
||||
<i
|
||||
aria-hidden="true"
|
||||
class="fa fa-eye-slash">
|
||||
</i>
|
||||
<span>
|
||||
This is a confidential issue. Your comment will not be visible to the public.
|
||||
</span>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -5,19 +5,30 @@
|
|||
|
||||
export default {
|
||||
props: {
|
||||
markdownPreviewUrl: {
|
||||
markdownPreviewPath: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: '',
|
||||
},
|
||||
markdownDocs: {
|
||||
markdownDocsPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
addSpacingClasses: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true,
|
||||
},
|
||||
quickActionsDocsPath: {
|
||||
type: String,
|
||||
required: false,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
markdownPreview: '',
|
||||
referencedCommands: '',
|
||||
referencedUsers: '',
|
||||
markdownPreviewLoading: false,
|
||||
previewMarkdown: false,
|
||||
};
|
||||
|
|
@ -26,36 +37,49 @@
|
|||
markdownHeader,
|
||||
markdownToolbar,
|
||||
},
|
||||
computed: {
|
||||
shouldShowReferencedUsers() {
|
||||
const referencedUsersThreshold = 10;
|
||||
return this.referencedUsers.length >= referencedUsersThreshold;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
toggleMarkdownPreview() {
|
||||
this.previewMarkdown = !this.previewMarkdown;
|
||||
|
||||
/*
|
||||
Can't use `$refs` as the component is technically in the parent component
|
||||
so we access the VNode & then get the element
|
||||
*/
|
||||
const text = this.$slots.textarea[0].elm.value;
|
||||
|
||||
if (!this.previewMarkdown) {
|
||||
this.markdownPreview = '';
|
||||
} else {
|
||||
} else if (text) {
|
||||
this.markdownPreviewLoading = true;
|
||||
this.$http.post(
|
||||
this.markdownPreviewUrl,
|
||||
{
|
||||
/*
|
||||
Can't use `$refs` as the component is technically in the parent component
|
||||
so we access the VNode & then get the element
|
||||
*/
|
||||
text: this.$slots.textarea[0].elm.value,
|
||||
},
|
||||
)
|
||||
.then(resp => resp.json())
|
||||
.then((data) => {
|
||||
this.markdownPreviewLoading = false;
|
||||
this.markdownPreview = data.body;
|
||||
|
||||
this.$nextTick(() => {
|
||||
$(this.$refs['markdown-preview']).renderGFM();
|
||||
});
|
||||
})
|
||||
.catch(() => new Flash('Error loading markdown preview'));
|
||||
this.$http.post(this.markdownPreviewPath, { text })
|
||||
.then(resp => resp.json())
|
||||
.then((data) => {
|
||||
this.renderMarkdown(data);
|
||||
})
|
||||
.catch(() => new Flash('Error loading markdown preview'));
|
||||
} else {
|
||||
this.renderMarkdown();
|
||||
}
|
||||
},
|
||||
renderMarkdown(data = {}) {
|
||||
this.markdownPreviewLoading = false;
|
||||
this.markdownPreview = data.body || 'Nothing to preview.';
|
||||
|
||||
if (data.references) {
|
||||
this.referencedCommands = data.references.commands;
|
||||
this.referencedUsers = data.references.users;
|
||||
}
|
||||
|
||||
this.$nextTick(() => {
|
||||
$(this.$refs['markdown-preview']).renderGFM();
|
||||
});
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
/*
|
||||
|
|
@ -74,7 +98,8 @@
|
|||
|
||||
<template>
|
||||
<div
|
||||
class="md-area prepend-top-default append-bottom-default js-vue-markdown-field"
|
||||
class="md-area js-vue-markdown-field"
|
||||
:class="{ 'prepend-top-default append-bottom-default': addSpacingClasses }"
|
||||
ref="gl-form">
|
||||
<markdown-header
|
||||
:preview-markdown="previewMarkdown"
|
||||
|
|
@ -94,7 +119,9 @@
|
|||
</i>
|
||||
</a>
|
||||
<markdown-toolbar
|
||||
:markdown-docs="markdownDocs" />
|
||||
:markdown-docs-path="markdownDocsPath"
|
||||
:quick-actions-docs-path="quickActionsDocsPath"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
|
|
@ -108,5 +135,27 @@
|
|||
Loading...
|
||||
</span>
|
||||
</div>
|
||||
<template v-if="previewMarkdown && !markdownPreviewLoading">
|
||||
<div
|
||||
v-if="referencedCommands"
|
||||
v-html="referencedCommands"
|
||||
class="referenced-commands"></div>
|
||||
<div
|
||||
v-if="shouldShowReferencedUsers"
|
||||
class="referenced-users">
|
||||
<span>
|
||||
<i
|
||||
class="fa fa-exclamation-triangle"
|
||||
aria-hidden="true">
|
||||
</i>
|
||||
You are about to add
|
||||
<strong>
|
||||
<span class="js-referenced-users-count">
|
||||
{{referencedUsers.length}}
|
||||
</span>
|
||||
</strong> people to the discussion. Proceed with caution.
|
||||
</span>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
<script>
|
||||
export default {
|
||||
props: {
|
||||
markdownDocs: {
|
||||
markdownDocsPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
quickActionsDocsPath: {
|
||||
type: String,
|
||||
required: false,
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -12,22 +16,77 @@
|
|||
<template>
|
||||
<div class="comment-toolbar clearfix">
|
||||
<div class="toolbar-text">
|
||||
<a
|
||||
:href="markdownDocs"
|
||||
target="_blank"
|
||||
tabindex="-1">
|
||||
Markdown is supported
|
||||
</a>
|
||||
<template v-if="!quickActionsDocsPath && markdownDocsPath">
|
||||
<a
|
||||
:href="markdownDocsPath"
|
||||
target="_blank"
|
||||
tabindex="-1">
|
||||
Markdown is supported
|
||||
</a>
|
||||
</template>
|
||||
<template v-if="quickActionsDocsPath && markdownDocsPath">
|
||||
<a
|
||||
:href="markdownDocsPath"
|
||||
target="_blank"
|
||||
tabindex="-1">
|
||||
Markdown
|
||||
</a>
|
||||
and
|
||||
<a
|
||||
:href="quickActionsDocsPath"
|
||||
target="_blank"
|
||||
tabindex="-1">
|
||||
quick actions
|
||||
</a>
|
||||
are supported
|
||||
</template>
|
||||
</div>
|
||||
<button
|
||||
class="toolbar-button markdown-selector"
|
||||
type="button"
|
||||
tabindex="-1">
|
||||
<i
|
||||
class="fa fa-file-image-o toolbar-button-icon"
|
||||
aria-hidden="true">
|
||||
</i>
|
||||
Attach a file
|
||||
</button>
|
||||
<span class="uploading-container">
|
||||
<span class="uploading-progress-container hide">
|
||||
<i
|
||||
class="fa fa-file-image-o toolbar-button-icon"
|
||||
aria-hidden="true"></i>
|
||||
<span class="attaching-file-message"></span>
|
||||
<span class="uploading-progress">0%</span>
|
||||
<span class="uploading-spinner">
|
||||
<i
|
||||
class="fa fa-spinner fa-spin toolbar-button-icon"
|
||||
aria-hidden="true"></i>
|
||||
</span>
|
||||
</span>
|
||||
<span class="uploading-error-container hide">
|
||||
<span class="uploading-error-icon">
|
||||
<i
|
||||
class="fa fa-file-image-o toolbar-button-icon"
|
||||
aria-hidden="true"></i>
|
||||
</span>
|
||||
<span class="uploading-error-message"></span>
|
||||
<button
|
||||
class="retry-uploading-link"
|
||||
type="button">
|
||||
Try again
|
||||
</button>
|
||||
or
|
||||
<button
|
||||
class="attach-new-file markdown-selector"
|
||||
type="button">
|
||||
attach a new file
|
||||
</button>
|
||||
</span>
|
||||
<button
|
||||
class="markdown-selector button-attach-file"
|
||||
tabindex="-1"
|
||||
type="button">
|
||||
<i
|
||||
class="fa fa-file-image-o toolbar-button-icon"
|
||||
aria-hidden="true"></i>
|
||||
Attach a file
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-default btn-xs hide button-cancel-uploading-files"
|
||||
type="button">
|
||||
Cancel
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -368,6 +368,10 @@
|
|||
transform: translateY(0);
|
||||
}
|
||||
|
||||
.comment-type-dropdown.open .dropdown-menu {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.filtered-search-box-input-container {
|
||||
.dropdown-menu,
|
||||
.dropdown-menu-nav {
|
||||
|
|
|
|||
|
|
@ -498,6 +498,7 @@
|
|||
color: $gray-darkest;
|
||||
display: block;
|
||||
margin: 16px 0 0;
|
||||
font-size: 85%;
|
||||
|
||||
.author_link {
|
||||
color: $gray-darkest;
|
||||
|
|
|
|||
|
|
@ -250,6 +250,10 @@ ul.related-merge-requests > li {
|
|||
}
|
||||
}
|
||||
|
||||
.discussion-reply-holder .note-edit-form {
|
||||
display: block;
|
||||
}
|
||||
|
||||
@media (min-width: $screen-sm-min) {
|
||||
.emoji-block .row {
|
||||
display: flex;
|
||||
|
|
|
|||
|
|
@ -20,10 +20,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.new-note {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.new-note,
|
||||
.note-edit-form {
|
||||
.note-form-actions {
|
||||
|
|
@ -202,6 +198,10 @@
|
|||
.discussion-reply-holder {
|
||||
background-color: $white-light;
|
||||
padding: 10px 16px;
|
||||
|
||||
&.is-replying {
|
||||
padding-bottom: $gl-padding;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -100,6 +100,20 @@ ul.notes {
|
|||
}
|
||||
}
|
||||
|
||||
.editing-spinner {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&.is-requesting {
|
||||
.note-timestamp {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.editing-spinner {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
&.is-editing {
|
||||
.note-header,
|
||||
.note-text,
|
||||
|
|
@ -402,6 +416,10 @@ ul.notes {
|
|||
.note-header-info {
|
||||
min-width: 0;
|
||||
padding-bottom: 8px;
|
||||
|
||||
&.discussion {
|
||||
padding-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.system-note .note-header-info {
|
||||
|
|
@ -814,10 +832,6 @@ ul.notes {
|
|||
}
|
||||
}
|
||||
|
||||
.discussion-notes .flash-container {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
// Merge request notes in diffs
|
||||
.diff-file {
|
||||
// Diff is inline
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ module NotesActions
|
|||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
before_action :set_polling_interval_header, only: [:index]
|
||||
before_action :authorize_admin_note!, only: [:update, :destroy]
|
||||
before_action :note_project, only: [:create]
|
||||
end
|
||||
|
|
@ -12,14 +13,18 @@ module NotesActions
|
|||
|
||||
notes_json = { notes: [], last_fetched_at: current_fetched_at }
|
||||
|
||||
@notes = notes_finder.execute.inc_relations_for_view
|
||||
@notes = prepare_notes_for_rendering(@notes)
|
||||
notes = notes_finder.execute
|
||||
.inc_relations_for_view
|
||||
.reject { |n| n.cross_reference_not_visible_for?(current_user) }
|
||||
|
||||
@notes.each do |note|
|
||||
next if note.cross_reference_not_visible_for?(current_user)
|
||||
notes = prepare_notes_for_rendering(notes)
|
||||
|
||||
notes_json[:notes] << note_json(note)
|
||||
end
|
||||
notes_json[:notes] =
|
||||
if noteable.discussions_rendered_on_frontend?
|
||||
note_serializer.represent(notes)
|
||||
else
|
||||
notes.map { |note| note_json(note) }
|
||||
end
|
||||
|
||||
render json: notes_json
|
||||
end
|
||||
|
|
@ -82,22 +87,27 @@ module NotesActions
|
|||
}
|
||||
|
||||
if note.persisted?
|
||||
attrs.merge!(
|
||||
valid: true,
|
||||
id: note.id,
|
||||
discussion_id: note.discussion_id(noteable),
|
||||
html: note_html(note),
|
||||
note: note.note
|
||||
)
|
||||
attrs[:valid] = true
|
||||
|
||||
discussion = note.to_discussion(noteable)
|
||||
unless discussion.individual_note?
|
||||
if noteable.nil? || noteable.discussions_rendered_on_frontend?
|
||||
attrs.merge!(note_serializer.represent(note))
|
||||
else
|
||||
attrs.merge!(
|
||||
discussion_resolvable: discussion.resolvable?,
|
||||
|
||||
diff_discussion_html: diff_discussion_html(discussion),
|
||||
discussion_html: discussion_html(discussion)
|
||||
id: note.id,
|
||||
discussion_id: note.discussion_id(noteable),
|
||||
html: note_html(note),
|
||||
note: note.note
|
||||
)
|
||||
|
||||
discussion = note.to_discussion(noteable)
|
||||
unless discussion.individual_note?
|
||||
attrs.merge!(
|
||||
discussion_resolvable: discussion.resolvable?,
|
||||
|
||||
diff_discussion_html: diff_discussion_html(discussion),
|
||||
discussion_html: discussion_html(discussion)
|
||||
)
|
||||
end
|
||||
end
|
||||
else
|
||||
attrs.merge!(
|
||||
|
|
@ -168,6 +178,10 @@ module NotesActions
|
|||
)
|
||||
end
|
||||
|
||||
def set_polling_interval_header
|
||||
Gitlab::PollingInterval.set_header(response, interval: 6_000)
|
||||
end
|
||||
|
||||
def noteable
|
||||
@noteable ||= notes_finder.target
|
||||
end
|
||||
|
|
@ -180,6 +194,10 @@ module NotesActions
|
|||
@notes_finder ||= NotesFinder.new(project, current_user, finder_params)
|
||||
end
|
||||
|
||||
def note_serializer
|
||||
NoteSerializer.new(project: project, noteable: noteable, current_user: current_user)
|
||||
end
|
||||
|
||||
def note_project
|
||||
return @note_project if defined?(@note_project)
|
||||
return nil unless project
|
||||
|
|
|
|||
|
|
@ -91,11 +91,25 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
respond_to do |format|
|
||||
format.html
|
||||
format.json do
|
||||
render json: IssueSerializer.new.represent(@issue)
|
||||
render json: serializer.represent(@issue)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def discussions
|
||||
notes = @issue.notes
|
||||
.inc_relations_for_view
|
||||
.includes(:noteable)
|
||||
.fresh
|
||||
.reject { |n| n.cross_reference_not_visible_for?(current_user) }
|
||||
|
||||
prepare_notes_for_rendering(notes)
|
||||
|
||||
discussions = Discussion.build_collection(notes, @issue)
|
||||
|
||||
render json: DiscussionSerializer.new(project: @project, noteable: @issue, current_user: current_user).represent(discussions)
|
||||
end
|
||||
|
||||
def create
|
||||
create_params = issue_params.merge(spammable_params).merge(
|
||||
merge_request_to_resolve_discussions_of: params[:merge_request_to_resolve_discussions_of],
|
||||
|
|
@ -143,7 +157,7 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
|
||||
format.json do
|
||||
if @issue.valid?
|
||||
render json: IssueSerializer.new.represent(@issue)
|
||||
render json: serializer.represent(@issue)
|
||||
else
|
||||
render json: { errors: @issue.errors.full_messages }, status: :unprocessable_entity
|
||||
end
|
||||
|
|
@ -287,4 +301,8 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
|
||||
redirect_to new_user_session_path, notice: notice
|
||||
end
|
||||
|
||||
def serializer
|
||||
IssueSerializer.new(current_user: current_user, project: issue.project)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ module IssuablesHelper
|
|||
def serialize_issuable(issuable)
|
||||
case issuable
|
||||
when Issue
|
||||
IssueSerializer.new.represent(issuable).to_json
|
||||
IssueSerializer.new(current_user: current_user, project: issuable.project).represent(issuable).to_json
|
||||
when MergeRequest
|
||||
MergeRequestSerializer
|
||||
.new(current_user: current_user, project: issuable.project)
|
||||
|
|
@ -210,9 +210,9 @@ module IssuablesHelper
|
|||
canMove: current_user ? issuable.can_move?(current_user) : false,
|
||||
issuableRef: issuable.to_reference,
|
||||
isConfidential: issuable.confidential,
|
||||
markdownPreviewUrl: preview_markdown_path(@project),
|
||||
markdownDocs: help_page_path('user/markdown'),
|
||||
projectsAutocompleteUrl: autocomplete_projects_path(project_id: @project.id),
|
||||
markdownPreviewPath: preview_markdown_path(@project),
|
||||
markdownDocsPath: help_page_path('user/markdown'),
|
||||
projectsAutocompletePath: autocomplete_projects_path(project_id: @project.id),
|
||||
issuableTemplates: issuable_templates(issuable),
|
||||
projectPath: ref_project.path,
|
||||
projectNamespace: ref_project.namespace.full_path,
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ module IssuesHelper
|
|||
end
|
||||
|
||||
def awards_sort(awards)
|
||||
awards.sort_by do |award, notes|
|
||||
awards.sort_by do |award, award_emojis|
|
||||
if award == "thumbsup"
|
||||
0
|
||||
elsif award == "thumbsdown"
|
||||
|
|
|
|||
|
|
@ -93,11 +93,13 @@ module NotesHelper
|
|||
end
|
||||
end
|
||||
|
||||
def notes_url
|
||||
def notes_url(params = {})
|
||||
if @snippet.is_a?(PersonalSnippet)
|
||||
snippet_notes_path(@snippet)
|
||||
snippet_notes_path(@snippet, params)
|
||||
else
|
||||
project_noteable_notes_path(@project, target_id: @noteable.id, target_type: @noteable.class.name.underscore)
|
||||
params.merge!(target_id: @noteable.id, target_type: @noteable.class.name.underscore)
|
||||
|
||||
project_noteable_notes_path(@project, params)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,14 @@ module SystemNoteHelper
|
|||
'duplicate' => 'icon_clone'
|
||||
}.freeze
|
||||
|
||||
def system_note_icon_name(note)
|
||||
ICON_NAMES_BY_ACTION[note.system_note_metadata&.action]
|
||||
end
|
||||
|
||||
def icon_for_system_note(note)
|
||||
icon_name = ICON_NAMES_BY_ACTION[note.system_note_metadata&.action]
|
||||
icon_name = system_note_icon_name(note)
|
||||
custom_icon(icon_name) if icon_name
|
||||
end
|
||||
|
||||
extend self
|
||||
end
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@ class AwardEmoji < ActiveRecord::Base
|
|||
scope :downvotes, -> { where(name: DOWNVOTE_NAME) }
|
||||
scope :upvotes, -> { where(name: UPVOTE_NAME) }
|
||||
|
||||
after_save :expire_etag_cache
|
||||
after_destroy :expire_etag_cache
|
||||
|
||||
class << self
|
||||
def votes_for_collection(ids, type)
|
||||
select('name', 'awardable_id', 'COUNT(*) as count')
|
||||
|
|
@ -32,4 +35,8 @@ class AwardEmoji < ActiveRecord::Base
|
|||
def upvote?
|
||||
self.name == UPVOTE_NAME
|
||||
end
|
||||
|
||||
def expire_etag_cache
|
||||
awardable.try(:expire_etag_cache)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -24,6 +24,10 @@ module Noteable
|
|||
DiscussionNote::NOTEABLE_TYPES.include?(base_class_name)
|
||||
end
|
||||
|
||||
def discussions_rendered_on_frontend?
|
||||
false
|
||||
end
|
||||
|
||||
def discussion_notes
|
||||
notes
|
||||
end
|
||||
|
|
@ -38,7 +42,7 @@ module Noteable
|
|||
|
||||
def grouped_diff_discussions(*args)
|
||||
# Doesn't use `discussion_notes`, because this may include commit diff notes
|
||||
# besides MR diff notes, that we do no want to display on the MR Changes tab.
|
||||
# besides MR diff notes, that we do not want to display on the MR Changes tab.
|
||||
notes.inc_relations_for_view.grouped_diff_discussions(*args)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,10 @@ class Discussion
|
|||
last_note.author
|
||||
end
|
||||
|
||||
def updated?
|
||||
last_updated_at != created_at
|
||||
end
|
||||
|
||||
def id
|
||||
first_note.discussion_id(context_noteable)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -269,6 +269,10 @@ class Issue < ActiveRecord::Base
|
|||
end
|
||||
end
|
||||
|
||||
def discussions_rendered_on_frontend?
|
||||
true
|
||||
end
|
||||
|
||||
def update_project_counter_caches?
|
||||
state_changed? || confidential_changed?
|
||||
end
|
||||
|
|
|
|||
|
|
@ -299,6 +299,17 @@ class Note < ActiveRecord::Base
|
|||
end
|
||||
end
|
||||
|
||||
def expire_etag_cache
|
||||
return unless noteable&.discussions_rendered_on_frontend?
|
||||
|
||||
key = Gitlab::Routing.url_helpers.project_noteable_notes_path(
|
||||
project,
|
||||
target_type: noteable_type.underscore,
|
||||
target_id: noteable_id
|
||||
)
|
||||
Gitlab::EtagCaching::Store.new.touch(key)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def keep_around_commit
|
||||
|
|
@ -326,15 +337,4 @@ class Note < ActiveRecord::Base
|
|||
def set_discussion_id
|
||||
self.discussion_id ||= discussion_class.discussion_id(self)
|
||||
end
|
||||
|
||||
def expire_etag_cache
|
||||
return unless for_issue?
|
||||
|
||||
key = Gitlab::Routing.url_helpers.project_noteable_notes_path(
|
||||
noteable.project,
|
||||
target_type: noteable_type.underscore,
|
||||
target_id: noteable.id
|
||||
)
|
||||
Gitlab::EtagCaching::Store.new.touch(key)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
class AwardEmojiEntity < Grape::Entity
|
||||
expose :name
|
||||
expose :user, using: API::Entities::UserSafe
|
||||
end
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
class DiscussionEntity < Grape::Entity
|
||||
include RequestAwareEntity
|
||||
|
||||
expose :id, :reply_id
|
||||
expose :expanded?, as: :expanded
|
||||
|
||||
expose :notes, using: NoteEntity
|
||||
|
||||
expose :individual_note?, as: :individual_note
|
||||
end
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
class DiscussionSerializer < BaseSerializer
|
||||
entity DiscussionEntity
|
||||
end
|
||||
|
|
@ -15,4 +15,6 @@ class IssuableEntity < Grape::Entity
|
|||
expose :total_time_spent
|
||||
expose :human_time_estimate
|
||||
expose :human_total_time_spent
|
||||
expose :milestone, using: API::Entities::Milestone
|
||||
expose :labels, using: LabelEntity
|
||||
end
|
||||
|
|
|
|||
|
|
@ -7,10 +7,26 @@ class IssueEntity < IssuableEntity
|
|||
expose :due_date
|
||||
expose :moved_to_id
|
||||
expose :project_id
|
||||
expose :milestone, using: API::Entities::Milestone
|
||||
expose :labels, using: LabelEntity
|
||||
|
||||
expose :web_url do |issue|
|
||||
project_issue_path(issue.project, issue)
|
||||
end
|
||||
|
||||
expose :current_user do
|
||||
expose :can_create_note do |issue|
|
||||
can?(request.current_user, :create_note, issue.project)
|
||||
end
|
||||
|
||||
expose :can_update do |issue|
|
||||
can?(request.current_user, :update_issue, issue)
|
||||
end
|
||||
end
|
||||
|
||||
expose :create_note_path do |issue|
|
||||
project_notes_path(issue.project, target_type: 'issue', target_id: issue.id)
|
||||
end
|
||||
|
||||
expose :preview_note_path do |issue|
|
||||
preview_markdown_path(issue.project, quick_actions_target_type: 'Issue', quick_actions_target_id: issue.id)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
class NoteAttachmentEntity < Grape::Entity
|
||||
expose :url
|
||||
expose :filename
|
||||
expose :image?, as: :image
|
||||
end
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
class NoteEntity < API::Entities::Note
|
||||
include RequestAwareEntity
|
||||
|
||||
expose :type
|
||||
|
||||
expose :author, using: NoteUserEntity
|
||||
|
||||
expose :human_access do |note|
|
||||
note.project.team.human_max_access(note.author_id)
|
||||
end
|
||||
|
||||
unexpose :note, as: :body
|
||||
expose :note
|
||||
|
||||
expose :redacted_note_html, as: :note_html
|
||||
|
||||
expose :last_edited_at, if: -> (note, _) { note.edited? }
|
||||
expose :last_edited_by, using: NoteUserEntity, if: -> (note, _) { note.edited? }
|
||||
|
||||
expose :current_user do
|
||||
expose :can_edit do |note|
|
||||
Ability.can_edit_note?(request.current_user, note)
|
||||
end
|
||||
end
|
||||
|
||||
expose :system_note_icon_name, if: -> (note, _) { note.system? } do |note|
|
||||
SystemNoteHelper.system_note_icon_name(note)
|
||||
end
|
||||
|
||||
expose :discussion_id do |note|
|
||||
note.discussion_id(request.noteable)
|
||||
end
|
||||
|
||||
expose :emoji_awardable?, as: :emoji_awardable
|
||||
expose :award_emoji, if: -> (note, _) { note.emoji_awardable? }, using: AwardEmojiEntity
|
||||
expose :toggle_award_path, if: -> (note, _) { note.emoji_awardable? } do |note|
|
||||
if note.for_personal_snippet?
|
||||
toggle_award_emoji_snippet_note_path(note.noteable, note)
|
||||
else
|
||||
toggle_award_emoji_project_note_path(note.project, note.id)
|
||||
end
|
||||
end
|
||||
|
||||
expose :report_abuse_path do |note|
|
||||
new_abuse_report_path(user_id: note.author.id, ref_url: Gitlab::UrlBuilder.build(note))
|
||||
end
|
||||
|
||||
expose :path do |note|
|
||||
if note.for_personal_snippet?
|
||||
snippet_note_path(note.noteable, note)
|
||||
else
|
||||
project_note_path(note.project, note)
|
||||
end
|
||||
end
|
||||
|
||||
expose :attachment, using: NoteAttachmentEntity, if: -> (note, _) { note.attachment? }
|
||||
expose :delete_attachment_path, if: -> (note, _) { note.attachment? } do |note|
|
||||
delete_attachment_project_note_path(note.project, note)
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
class NoteSerializer < BaseSerializer
|
||||
entity NoteEntity
|
||||
end
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
class NoteUserEntity < UserEntity
|
||||
unexpose :web_url
|
||||
end
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
class UserSerializer < BaseSerializer
|
||||
entity UserEntity
|
||||
end
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
by
|
||||
= link_to_member(@project, discussion.resolved_by, avatar: false)
|
||||
= time_ago_with_tooltip(discussion.resolved_at, placement: "bottom")
|
||||
- elsif discussion.last_updated_at != discussion.created_at
|
||||
- elsif discussion.updated?
|
||||
.discussion-headline-light.js-discussion-headline
|
||||
Last updated
|
||||
- if discussion.last_updated_by
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
- referenced_users = local_assigns.fetch(:referenced_users, nil)
|
||||
|
||||
- if defined?(@issue) && @issue.confidential?
|
||||
.confidential-issue-warning
|
||||
= confidential_icon(@issue)
|
||||
%span This is a confidential issue. Your comment will not be visible to the public.
|
||||
|
||||
.md-area
|
||||
.md-header
|
||||
%ul.nav-links.clearfix
|
||||
|
|
|
|||
|
|
@ -1,7 +1,17 @@
|
|||
- @gfm_form = true
|
||||
|
||||
- content_for :note_actions do
|
||||
- if can?(current_user, :update_issue, @issue)
|
||||
= link_to 'Reopen issue', issue_path(@issue, issue: {state_event: :reopen}, format: 'json'), data: {original_text: "Reopen issue", alternative_text: "Comment & reopen issue"}, class: "btn btn-nr btn-reopen btn-comment js-note-target-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
|
||||
= link_to 'Close issue', issue_path(@issue, issue: {state_event: :close}, format: 'json'), data: {original_text: "Close issue", alternative_text: "Comment & close issue"}, class: "btn btn-nr btn-close btn-comment js-note-target-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
|
||||
|
||||
#notes
|
||||
= render 'shared/notes/notes_with_form', :autocomplete => true
|
||||
%section.js-vue-notes-event
|
||||
#js-vue-notes{ data: { discussions_path: discussions_project_issue_path(@project, @issue, format: :json),
|
||||
register_path: new_session_path(:user, redirect_to_referer: 'yes', anchor: 'register-pane'),
|
||||
new_session_path: new_session_path(:user, redirect_to_referer: 'yes'),
|
||||
markdown_docs_path: help_page_path('user/markdown'),
|
||||
quick_actions_docs_path: help_page_path('user/project/quick_actions'),
|
||||
notes_path: notes_url,
|
||||
last_fetched_at: Time.now.to_i,
|
||||
issue_data: serialize_issuable(@issue),
|
||||
current_user_data: UserSerializer.new.represent(current_user).to_json } }
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
- page_title "#{@issue.title} (#{@issue.to_reference})", "Issues"
|
||||
- page_description @issue.description
|
||||
- page_card_attributes @issue.card_attributes
|
||||
|
||||
- content_for :page_specific_javascripts do
|
||||
= webpack_bundle_tag 'common_vue'
|
||||
= webpack_bundle_tag 'notes'
|
||||
|
||||
- can_update_issue = can?(current_user, :update_issue, @issue)
|
||||
- can_report_spam = @issue.submittable_as_spam_by?(current_user)
|
||||
|
||||
|
|
@ -23,7 +28,7 @@
|
|||
= icon('eye-slash', class: 'is-confidential')
|
||||
= issuable_meta(@issue, @project, "Issue")
|
||||
|
||||
.issuable-actions
|
||||
.issuable-actions.js-issuable-actions
|
||||
.clearfix.issue-btn-group.dropdown
|
||||
%button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } }
|
||||
Options
|
||||
|
|
@ -36,8 +41,8 @@
|
|||
- if @issue.author && current_user != @issue.author
|
||||
%li= link_to 'Report abuse', new_abuse_report_path(user_id: @issue.author.id, ref_url: issue_url(@issue))
|
||||
- if can_update_issue
|
||||
%li= link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, format: 'json'), class: "btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
|
||||
%li= link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, format: 'json'), class: "btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
|
||||
%li= link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, format: 'json'), class: "btn-close js-btn-issue-action #{issue_button_visibility(@issue, true)}", title: 'Close issue'
|
||||
%li= link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, format: 'json'), class: "btn-reopen js-btn-issue-action #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
|
||||
- if can_report_spam
|
||||
%li= link_to 'Submit as spam', mark_as_spam_project_issue_path(@project, @issue), method: :post, class: 'btn-spam', title: 'Submit as spam'
|
||||
- if can_update_issue || can_report_spam
|
||||
|
|
@ -74,7 +79,7 @@
|
|||
|
||||
.content-block.emoji-block
|
||||
.row
|
||||
.col-sm-8
|
||||
.col-sm-8.js-issue-note-awards
|
||||
= render 'award_emoji/awards_block', awardable: @issue, inline: true
|
||||
.col-sm-4.new-branch-col
|
||||
= render 'new_branch' unless @issue.confidential?
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
.issuable-meta
|
||||
= issuable_meta(@merge_request, @project, "Merge request")
|
||||
|
||||
.issuable-actions
|
||||
.issuable-actions.js-issuable-actions
|
||||
.clearfix.issue-btn-group.dropdown
|
||||
%button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } }
|
||||
Options
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
- if can_update && is_current_user
|
||||
= link_to "Close #{display_issuable_type}", close_issuable_url(issuable), method: button_method,
|
||||
class: "hidden-xs hidden-sm btn btn-grouped btn-close #{issuable_button_visibility(issuable, true)}", title: "Close #{display_issuable_type}"
|
||||
class: "hidden-xs hidden-sm btn btn-grouped btn-close js-btn-issue-action #{issuable_button_visibility(issuable, true)}", title: "Close #{display_issuable_type}"
|
||||
= link_to "Reopen #{display_issuable_type}", reopen_issuable_url(issuable), method: button_method,
|
||||
class: "hidden-xs hidden-sm btn btn-grouped btn-reopen #{issuable_button_visibility(issuable, false)}", title: "Reopen #{display_issuable_type}"
|
||||
class: "hidden-xs hidden-sm btn btn-grouped btn-reopen js-btn-issue-action #{issuable_button_visibility(issuable, false)}", title: "Reopen #{display_issuable_type}"
|
||||
- elsif can_update && !is_current_user
|
||||
= render 'shared/issuable/close_reopen_report_toggle', issuable: issuable
|
||||
- elsif issuable.author
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- button_action = issuable.closed? ? 'reopen' : 'close'
|
||||
- display_button_action = button_action.capitalize
|
||||
- button_responsive_class = 'hidden-xs hidden-sm'
|
||||
- button_class = "#{button_responsive_class} btn btn-grouped js-issuable-close-button issuable-close-button"
|
||||
- button_class = "#{button_responsive_class} btn btn-grouped js-issuable-close-button js-btn-issue-action issuable-close-button"
|
||||
- toggle_class = "#{button_responsive_class} btn btn-nr dropdown-toggle js-issuable-close-toggle"
|
||||
- button_method = issuable_close_reopen_button_method(issuable)
|
||||
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
- elsif !current_user
|
||||
.disabled-comment.text-center.prepend-top-default
|
||||
Please
|
||||
= link_to "register", new_session_path(:user, redirect_to_referer: 'yes')
|
||||
= link_to "register", new_session_path(:user, redirect_to_referer: 'yes', anchor: 'register-pane'), class: 'js-register-link'
|
||||
or
|
||||
= link_to "sign in", new_session_path(:user, redirect_to_referer: 'yes')
|
||||
= link_to "sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'js-sign-in-link'
|
||||
to comment
|
||||
|
||||
%script.js-notes-data{ type: "application/json" }= initial_notes_data(autocomplete).to_json.html_safe
|
||||
|
|
|
|||
|
|
@ -308,6 +308,7 @@ constraints(ProjectUrlConstrainer.new) do
|
|||
get :can_create_branch
|
||||
get :realtime_changes
|
||||
post :create_merge_request
|
||||
get :discussions, format: :json
|
||||
end
|
||||
collection do
|
||||
post :bulk_update
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ var config = {
|
|||
monitoring: './monitoring/monitoring_bundle.js',
|
||||
network: './network/network_bundle.js',
|
||||
notebook_viewer: './blob/notebook_viewer.js',
|
||||
notes: './notes/index.js',
|
||||
pdf_viewer: './blob/pdf_viewer.js',
|
||||
pipelines: './pipelines/pipelines_bundle.js',
|
||||
pipelines_charts: './pipelines/pipelines_charts.js',
|
||||
|
|
@ -194,6 +195,7 @@ var config = {
|
|||
'merge_conflicts',
|
||||
'monitoring',
|
||||
'notebook_viewer',
|
||||
'notes',
|
||||
'pdf_viewer',
|
||||
'pipelines',
|
||||
'pipelines_details',
|
||||
|
|
|
|||
|
|
@ -168,6 +168,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
|
|||
author: project.users.first,
|
||||
description: "# Description header"
|
||||
)
|
||||
wait_for_requests
|
||||
end
|
||||
|
||||
step 'project "Shop" have "Tweet control" open issue' do
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ module SharedNote
|
|||
|
||||
step 'The comment with the header should not have an ID' do
|
||||
page.within(".note-body > .note-text") do
|
||||
expect(page).to have_content("Comment with a header")
|
||||
expect(page).to have_content("Comment with a header")
|
||||
expect(page).not_to have_css("#comment-with-a-header")
|
||||
end
|
||||
end
|
||||
|
|
@ -150,15 +150,20 @@ module SharedNote
|
|||
note.find('.js-note-edit').click
|
||||
end
|
||||
|
||||
page.find('.current-note-edit-form textarea')
|
||||
|
||||
page.within(".current-note-edit-form") do
|
||||
fill_in 'note[note]', with: '+1 Awesome!'
|
||||
click_button 'Save comment'
|
||||
end
|
||||
wait_for_requests
|
||||
end
|
||||
|
||||
step 'I should see +1 in the description' do
|
||||
page.within(".note") do
|
||||
expect(page).to have_content("+1 Awesome!")
|
||||
end
|
||||
|
||||
wait_for_requests
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
module API
|
||||
module Entities
|
||||
class UserSafe < Grape::Entity
|
||||
expose :name, :username
|
||||
expose :id, :name, :username
|
||||
end
|
||||
|
||||
class UserBasic < UserSafe
|
||||
expose :id, :state
|
||||
expose :state
|
||||
expose :avatar_url do |user, options|
|
||||
user.avatar_url(only_path: false)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@
|
|||
"vue-loader": "^11.3.4",
|
||||
"vue-resource": "^1.3.4",
|
||||
"vue-template-compiler": "^2.2.6",
|
||||
"vuex": "^2.3.1",
|
||||
"webpack": "^3.5.5",
|
||||
"webpack-bundle-analyzer": "^2.8.2",
|
||||
"webpack-stats-plugin": "^0.1.5"
|
||||
|
|
|
|||
|
|
@ -879,4 +879,19 @@ describe Projects::IssuesController do
|
|||
format: :json
|
||||
end
|
||||
end
|
||||
|
||||
describe 'GET #discussions' do
|
||||
let!(:discussion) { create(:discussion_note_on_issue, noteable: issue, project: issue.project) }
|
||||
|
||||
before do
|
||||
project.add_developer(user)
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
it 'returns discussion json' do
|
||||
get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid
|
||||
|
||||
expect(JSON.parse(response.body).first.keys).to match_array(%w[id reply_id expanded notes individual_note])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -46,10 +46,13 @@ describe Projects::NotesController do
|
|||
end
|
||||
|
||||
context 'for a discussion note' do
|
||||
let!(:note) { create(:discussion_note_on_issue, noteable: issue, project: project) }
|
||||
let(:project) { create(:project, :repository) }
|
||||
let!(:note) { create(:discussion_note_on_merge_request, project: project) }
|
||||
|
||||
let(:params) { request_params.merge(target_type: 'merge_request', target_id: note.noteable_id) }
|
||||
|
||||
it 'responds with the expected attributes' do
|
||||
get :index, request_params
|
||||
get :index, params
|
||||
|
||||
expect(note_json[:id]).to eq(note.id)
|
||||
expect(note_json[:discussion_html]).not_to be_nil
|
||||
|
|
@ -104,10 +107,12 @@ describe Projects::NotesController do
|
|||
end
|
||||
|
||||
context 'for a regular note' do
|
||||
let!(:note) { create(:note, noteable: issue, project: project) }
|
||||
let!(:note) { create(:note_on_merge_request, project: project) }
|
||||
|
||||
let(:params) { request_params.merge(target_type: 'merge_request', target_id: note.noteable_id) }
|
||||
|
||||
it 'responds with the expected attributes' do
|
||||
get :index, request_params
|
||||
get :index, params
|
||||
|
||||
expect(note_json[:id]).to eq(note.id)
|
||||
expect(note_json[:html]).not_to be_nil
|
||||
|
|
@ -125,7 +130,9 @@ describe Projects::NotesController do
|
|||
note: { note: 'some note', noteable_id: merge_request.id, noteable_type: 'MergeRequest' },
|
||||
namespace_id: project.namespace,
|
||||
project_id: project,
|
||||
merge_request_diff_head_sha: 'sha'
|
||||
merge_request_diff_head_sha: 'sha',
|
||||
target_type: 'merge_request',
|
||||
target_id: merge_request.id
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -70,13 +70,13 @@ describe 'Awards Emoji' do
|
|||
it 'toggles the smiley emoji on a note', js: true do
|
||||
toggle_smiley_emoji(true)
|
||||
|
||||
within('.note-awards') do
|
||||
within('.note-body') do
|
||||
expect(find(emoji_counter)).to have_text("1")
|
||||
end
|
||||
|
||||
toggle_smiley_emoji(false)
|
||||
|
||||
within('.note-awards') do
|
||||
within('.note-body') do
|
||||
expect(page).not_to have_selector(emoji_counter)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ feature 'GFM autocomplete', js: true do
|
|||
|
||||
it 'opens autocomplete menu when field starts with text' do
|
||||
page.within '.timeline-content-form' do
|
||||
find('#note_note').native.send_keys('')
|
||||
find('#note_note').native.send_keys('@')
|
||||
find('#note-body').native.send_keys('')
|
||||
find('#note-body').native.send_keys('@')
|
||||
end
|
||||
|
||||
expect(page).to have_selector('.atwho-container')
|
||||
|
|
@ -37,8 +37,8 @@ feature 'GFM autocomplete', js: true do
|
|||
|
||||
it 'doesnt open autocomplete menu character is prefixed with text' do
|
||||
page.within '.timeline-content-form' do
|
||||
find('#note_note').native.send_keys('testing')
|
||||
find('#note_note').native.send_keys('@')
|
||||
find('#note-body').native.send_keys('testing')
|
||||
find('#note-body').native.send_keys('@')
|
||||
end
|
||||
|
||||
expect(page).not_to have_selector('.atwho-view')
|
||||
|
|
@ -46,8 +46,8 @@ feature 'GFM autocomplete', js: true do
|
|||
|
||||
it 'doesnt select the first item for non-assignee dropdowns' do
|
||||
page.within '.timeline-content-form' do
|
||||
find('#note_note').native.send_keys('')
|
||||
find('#note_note').native.send_keys(':')
|
||||
find('#note-body').native.send_keys('')
|
||||
find('#note-body').native.send_keys(':')
|
||||
end
|
||||
|
||||
expect(page).to have_selector('.atwho-container')
|
||||
|
|
@ -58,7 +58,7 @@ feature 'GFM autocomplete', js: true do
|
|||
end
|
||||
|
||||
it 'does not open autocomplete menu when ":" is prefixed by a number and letters' do
|
||||
note = find('#note_note')
|
||||
note = find('#note-body')
|
||||
|
||||
# Number.
|
||||
page.within '.timeline-content-form' do
|
||||
|
|
@ -86,8 +86,8 @@ feature 'GFM autocomplete', js: true do
|
|||
|
||||
it 'selects the first item for assignee dropdowns' do
|
||||
page.within '.timeline-content-form' do
|
||||
find('#note_note').native.send_keys('')
|
||||
find('#note_note').native.send_keys('@')
|
||||
find('#note-body').native.send_keys('')
|
||||
find('#note-body').native.send_keys('@')
|
||||
end
|
||||
|
||||
expect(page).to have_selector('.atwho-container')
|
||||
|
|
@ -99,8 +99,8 @@ feature 'GFM autocomplete', js: true do
|
|||
|
||||
it 'includes items for assignee dropdowns with non-ASCII characters in name' do
|
||||
page.within '.timeline-content-form' do
|
||||
find('#note_note').native.send_keys('')
|
||||
find('#note_note').native.send_keys("@#{user.name[0...8]}")
|
||||
find('#note-body').native.send_keys('')
|
||||
find('#note-body').native.send_keys("@#{user.name[0...8]}")
|
||||
end
|
||||
|
||||
expect(page).to have_selector('.atwho-container')
|
||||
|
|
@ -112,8 +112,8 @@ feature 'GFM autocomplete', js: true do
|
|||
|
||||
it 'selects the first item for non-assignee dropdowns if a query is entered' do
|
||||
page.within '.timeline-content-form' do
|
||||
find('#note_note').native.send_keys('')
|
||||
find('#note_note').native.send_keys(':1')
|
||||
find('#note-body').native.send_keys('')
|
||||
find('#note-body').native.send_keys(':1')
|
||||
end
|
||||
|
||||
expect(page).to have_selector('.atwho-container')
|
||||
|
|
@ -125,7 +125,7 @@ feature 'GFM autocomplete', js: true do
|
|||
|
||||
context 'if a selected value has special characters' do
|
||||
it 'wraps the result in double quotes' do
|
||||
note = find('#note_note')
|
||||
note = find('#note-body')
|
||||
page.within '.timeline-content-form' do
|
||||
note.native.send_keys('')
|
||||
note.native.send_keys("~#{label.title[0]}")
|
||||
|
|
@ -138,7 +138,7 @@ feature 'GFM autocomplete', js: true do
|
|||
end
|
||||
|
||||
it "shows dropdown after a new line" do
|
||||
note = find('#note_note')
|
||||
note = find('#note-body')
|
||||
page.within '.timeline-content-form' do
|
||||
note.native.send_keys('test')
|
||||
note.native.send_keys(:enter)
|
||||
|
|
@ -150,7 +150,7 @@ feature 'GFM autocomplete', js: true do
|
|||
end
|
||||
|
||||
it "does not show dropdown when preceded with a special character" do
|
||||
note = find('#note_note')
|
||||
note = find('#note-body')
|
||||
page.within '.timeline-content-form' do
|
||||
note.native.send_keys('')
|
||||
note.native.send_keys("@")
|
||||
|
|
@ -168,7 +168,7 @@ feature 'GFM autocomplete', js: true do
|
|||
end
|
||||
|
||||
it "does not throw an error if no labels exist" do
|
||||
note = find('#note_note')
|
||||
note = find('#note-body')
|
||||
page.within '.timeline-content-form' do
|
||||
note.native.send_keys('')
|
||||
note.native.send_keys('~')
|
||||
|
|
@ -179,7 +179,7 @@ feature 'GFM autocomplete', js: true do
|
|||
end
|
||||
|
||||
it 'doesn\'t wrap for assignee values' do
|
||||
note = find('#note_note')
|
||||
note = find('#note-body')
|
||||
page.within '.timeline-content-form' do
|
||||
note.native.send_keys('')
|
||||
note.native.send_keys("@#{user.username[0]}")
|
||||
|
|
@ -192,7 +192,7 @@ feature 'GFM autocomplete', js: true do
|
|||
end
|
||||
|
||||
it 'doesn\'t wrap for emoji values' do
|
||||
note = find('#note_note')
|
||||
note = find('#note-body')
|
||||
page.within '.timeline-content-form' do
|
||||
note.native.send_keys('')
|
||||
note.native.send_keys(":cartwheel")
|
||||
|
|
@ -206,7 +206,7 @@ feature 'GFM autocomplete', js: true do
|
|||
|
||||
it 'doesn\'t open autocomplete after non-word character' do
|
||||
page.within '.timeline-content-form' do
|
||||
find('#note_note').native.send_keys("@#{user.username[0..2]}!")
|
||||
find('#note-body').native.send_keys("@#{user.username[0..2]}!")
|
||||
end
|
||||
|
||||
expect(page).not_to have_selector('.atwho-view')
|
||||
|
|
@ -214,14 +214,14 @@ feature 'GFM autocomplete', js: true do
|
|||
|
||||
it 'doesn\'t open autocomplete if there is no space before' do
|
||||
page.within '.timeline-content-form' do
|
||||
find('#note_note').native.send_keys("hello:#{user.username[0..2]}")
|
||||
find('#note-body').native.send_keys("hello:#{user.username[0..2]}")
|
||||
end
|
||||
|
||||
expect(page).not_to have_selector('.atwho-view')
|
||||
end
|
||||
|
||||
it 'triggers autocomplete after selecting a quick action' do
|
||||
note = find('#note_note')
|
||||
note = find('#note-body')
|
||||
page.within '.timeline-content-form' do
|
||||
note.native.send_keys('')
|
||||
note.native.send_keys('/as')
|
||||
|
|
|
|||
|
|
@ -12,26 +12,26 @@ feature 'Issue markdown toolbar', js: true do
|
|||
end
|
||||
|
||||
it "doesn't include first new line when adding bold" do
|
||||
find('#note_note').native.send_keys('test')
|
||||
find('#note_note').native.send_key(:enter)
|
||||
find('#note_note').native.send_keys('bold')
|
||||
find('#note-body').native.send_keys('test')
|
||||
find('#note-body').native.send_key(:enter)
|
||||
find('#note-body').native.send_keys('bold')
|
||||
|
||||
page.evaluate_script('document.querySelectorAll(".js-main-target-form #note_note")[0].setSelectionRange(4, 9)')
|
||||
page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 9)')
|
||||
|
||||
first('.toolbar-btn').click
|
||||
|
||||
expect(find('#note_note')[:value]).to eq("test\n**bold**\n")
|
||||
expect(find('#note-body')[:value]).to eq("test\n**bold**\n")
|
||||
end
|
||||
|
||||
it "doesn't include first new line when adding underline" do
|
||||
find('#note_note').native.send_keys('test')
|
||||
find('#note_note').native.send_key(:enter)
|
||||
find('#note_note').native.send_keys('underline')
|
||||
find('#note-body').native.send_keys('test')
|
||||
find('#note-body').native.send_key(:enter)
|
||||
find('#note-body').native.send_keys('underline')
|
||||
|
||||
page.evaluate_script('document.querySelectorAll(".js-main-target-form #note_note")[0].setSelectionRange(4, 50)')
|
||||
page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 50)')
|
||||
|
||||
find('.toolbar-btn:nth-child(2)').click
|
||||
|
||||
expect(find('#note_note')[:value]).to eq("test\n*underline*\n")
|
||||
expect(find('#note-body')[:value]).to eq("test\n*underline*\n")
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ feature 'Issue notes polling', :js do
|
|||
|
||||
it 'displays the new comment' do
|
||||
note = create(:note, noteable: issue, project: project, note: 'Looks good!')
|
||||
page.execute_script('notes.refresh();')
|
||||
wait_for_requests
|
||||
|
||||
expect(page).to have_selector("#note_#{note.id}", text: 'Looks good!')
|
||||
end
|
||||
|
|
@ -31,16 +31,6 @@ feature 'Issue notes polling', :js do
|
|||
visit project_issue_path(project, issue)
|
||||
end
|
||||
|
||||
it 'has .original-note-content to compare against' do
|
||||
expect(page).to have_selector("#note_#{existing_note.id}", text: note_text)
|
||||
expect(page).to have_selector("#note_#{existing_note.id} .original-note-content", count: 1, visible: false)
|
||||
|
||||
update_note(existing_note, updated_text)
|
||||
|
||||
expect(page).to have_selector("#note_#{existing_note.id}", text: updated_text)
|
||||
expect(page).to have_selector("#note_#{existing_note.id} .original-note-content", count: 1, visible: false)
|
||||
end
|
||||
|
||||
it 'displays the updated content' do
|
||||
expect(page).to have_selector("#note_#{existing_note.id}", text: note_text)
|
||||
|
||||
|
|
@ -49,24 +39,14 @@ feature 'Issue notes polling', :js do
|
|||
expect(page).to have_selector("#note_#{existing_note.id}", text: updated_text)
|
||||
end
|
||||
|
||||
it 'when editing but have not changed anything, and an update comes in, show the updated content in the textarea' do
|
||||
it 'when editing but have not changed anything, and an update comes in, show warning and does not update the note' do
|
||||
click_edit_action(existing_note)
|
||||
|
||||
expect(page).to have_field("note[note]", with: note_text)
|
||||
|
||||
update_note(existing_note, updated_text)
|
||||
|
||||
expect(page).to have_field("note[note]", with: updated_text)
|
||||
end
|
||||
|
||||
it 'when editing but you changed some things, and an update comes in, show a warning' do
|
||||
click_edit_action(existing_note)
|
||||
|
||||
expect(page).to have_field("note[note]", with: note_text)
|
||||
|
||||
find("#note_#{existing_note.id} .js-note-text").set('something random')
|
||||
update_note(existing_note, updated_text)
|
||||
|
||||
expect(page).not_to have_field("note[note]", with: updated_text)
|
||||
expect(page).to have_selector(".alert")
|
||||
end
|
||||
|
||||
|
|
@ -75,8 +55,6 @@ feature 'Issue notes polling', :js do
|
|||
|
||||
expect(page).to have_field("note[note]", with: note_text)
|
||||
|
||||
find("#note_#{existing_note.id} .js-note-text").set('something random')
|
||||
|
||||
update_note(existing_note, updated_text)
|
||||
|
||||
find("#note_#{existing_note.id} .note-edit-cancel").click
|
||||
|
|
@ -97,14 +75,12 @@ feature 'Issue notes polling', :js do
|
|||
visit project_issue_path(project, issue)
|
||||
end
|
||||
|
||||
it 'has .original-note-content to compare against' do
|
||||
it 'displays the updated content' do
|
||||
expect(page).to have_selector("#note_#{existing_note.id}", text: note_text)
|
||||
expect(page).to have_selector("#note_#{existing_note.id} .original-note-content", count: 1, visible: false)
|
||||
|
||||
update_note(existing_note, updated_text)
|
||||
|
||||
expect(page).to have_selector("#note_#{existing_note.id}", text: updated_text)
|
||||
expect(page).to have_selector("#note_#{existing_note.id} .original-note-content", count: 1, visible: false)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -118,16 +94,15 @@ feature 'Issue notes polling', :js do
|
|||
visit project_issue_path(project, issue)
|
||||
end
|
||||
|
||||
it 'has .original-note-content to compare against' do
|
||||
it 'shows the system note' do
|
||||
expect(page).to have_selector("#note_#{system_note.id}", text: note_text)
|
||||
expect(page).to have_selector("#note_#{system_note.id} .original-note-content", count: 1, visible: false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def update_note(note, new_text)
|
||||
note.update(note: new_text)
|
||||
page.execute_script('notes.refresh();')
|
||||
wait_for_requests
|
||||
end
|
||||
|
||||
def click_edit_action(note)
|
||||
|
|
|
|||
|
|
@ -11,10 +11,14 @@ feature 'Member autocomplete', :js do
|
|||
sign_in(user)
|
||||
end
|
||||
|
||||
shared_examples "open suggestions when typing @" do
|
||||
shared_examples "open suggestions when typing @" do |resource_name|
|
||||
before do
|
||||
page.within('.new-note') do
|
||||
find('#note_note').send_keys('@')
|
||||
if resource_name == 'issue'
|
||||
find('#note-body').send_keys('@')
|
||||
else
|
||||
find('#note_note').send_keys('@')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -32,7 +36,7 @@ feature 'Member autocomplete', :js do
|
|||
visit project_issue_path(project, noteable)
|
||||
end
|
||||
|
||||
include_examples "open suggestions when typing @"
|
||||
include_examples "open suggestions when typing @", 'issue'
|
||||
end
|
||||
|
||||
context 'adding a new note on a Merge Request' do
|
||||
|
|
@ -45,7 +49,7 @@ feature 'Member autocomplete', :js do
|
|||
visit project_merge_request_path(project, noteable)
|
||||
end
|
||||
|
||||
include_examples "open suggestions when typing @"
|
||||
include_examples "open suggestions when typing @", 'merge_request'
|
||||
end
|
||||
|
||||
context 'adding a new note on a Commit' do
|
||||
|
|
@ -60,6 +64,6 @@ feature 'Member autocomplete', :js do
|
|||
visit project_commit_path(project, noteable)
|
||||
end
|
||||
|
||||
include_examples "open suggestions when typing @"
|
||||
include_examples "open suggestions when typing @", 'commit'
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ describe 'Reportable note on commit', :js do
|
|||
visit project_commit_path(project, sample_commit.id)
|
||||
end
|
||||
|
||||
it_behaves_like 'reportable note'
|
||||
it_behaves_like 'reportable note', 'commit'
|
||||
end
|
||||
|
||||
context 'a diff note' do
|
||||
|
|
@ -28,6 +28,6 @@ describe 'Reportable note on commit', :js do
|
|||
visit project_commit_path(project, sample_commit.id)
|
||||
end
|
||||
|
||||
it_behaves_like 'reportable note'
|
||||
it_behaves_like 'reportable note', 'commit'
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -13,5 +13,5 @@ describe 'Reportable note on issue', :js do
|
|||
visit project_issue_path(project, issue)
|
||||
end
|
||||
|
||||
it_behaves_like 'reportable note'
|
||||
it_behaves_like 'reportable note', 'issue'
|
||||
end
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@ describe 'Reportable note on merge request', :js do
|
|||
context 'a normal note' do
|
||||
let!(:note) { create(:note_on_merge_request, noteable: merge_request, project: project) }
|
||||
|
||||
it_behaves_like 'reportable note'
|
||||
it_behaves_like 'reportable note', 'merge_request'
|
||||
end
|
||||
|
||||
context 'a diff note' do
|
||||
let!(:note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project) }
|
||||
|
||||
it_behaves_like 'reportable note'
|
||||
it_behaves_like 'reportable note', 'merge_request'
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ describe 'Reportable note on snippets', :js do
|
|||
visit project_snippet_path(project, snippet)
|
||||
end
|
||||
|
||||
it_behaves_like 'reportable note'
|
||||
it_behaves_like 'reportable note', 'snippet'
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ feature 'Task Lists' do
|
|||
project: project, author: user)
|
||||
end
|
||||
|
||||
it 'renders for note body' do
|
||||
it 'renders for note body', :js do
|
||||
visit_issue(project, issue)
|
||||
|
||||
expect(page).to have_selector('.note ul.task-list', count: 1)
|
||||
|
|
@ -189,15 +189,14 @@ feature 'Task Lists' do
|
|||
expect(page).to have_selector('.note ul input[checked]', count: 2)
|
||||
end
|
||||
|
||||
it 'contains the required selectors' do
|
||||
it 'contains the required selectors', :js do
|
||||
visit_issue(project, issue)
|
||||
|
||||
expect(page).to have_selector('.note .js-task-list-container')
|
||||
expect(page).to have_selector('.note .js-task-list-container .task-list .task-list-item .task-list-item-checkbox')
|
||||
expect(page).to have_selector('.note .js-task-list-container .js-task-list-field')
|
||||
end
|
||||
|
||||
it 'is only editable by author' do
|
||||
it 'is only editable by author', :js do
|
||||
visit_issue(project, issue)
|
||||
expect(page).to have_selector('.js-task-list-container')
|
||||
|
||||
|
|
@ -215,7 +214,7 @@ feature 'Task Lists' do
|
|||
project: project, author: user)
|
||||
end
|
||||
|
||||
it 'renders for note body' do
|
||||
it 'renders for note body', :js do
|
||||
visit_issue(project, issue)
|
||||
|
||||
expect(page).to have_selector('.note ul.task-list', count: 1)
|
||||
|
|
@ -230,7 +229,7 @@ feature 'Task Lists' do
|
|||
project: project, author: user)
|
||||
end
|
||||
|
||||
it 'renders for note body' do
|
||||
it 'renders for note body', :js do
|
||||
visit_issue(project, issue)
|
||||
|
||||
expect(page).to have_selector('.note ul.task-list', count: 1)
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ feature 'User uploads file to note' do
|
|||
before do
|
||||
sign_in(user)
|
||||
visit project_issue_path(project, issue)
|
||||
wait_for_requests
|
||||
end
|
||||
|
||||
context 'before uploading' do
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
"total_time_spent": { "type": "integer" },
|
||||
"human_time_estimate": { "type": ["integer", "null"] },
|
||||
"human_total_time_spent": { "type": ["integer", "null"] },
|
||||
"milestone": { "type": ["object", "null"] },
|
||||
"labels": { "type": ["array", "null"] },
|
||||
"in_progress_merge_commit_sha": { "type": ["string", "null"] },
|
||||
"merge_error": { "type": ["string", "null"] },
|
||||
"merge_commit_sha": { "type": ["string", "null"] },
|
||||
|
|
|
|||
|
|
@ -25,9 +25,10 @@ import '~/lib/utils/common_utils';
|
|||
};
|
||||
|
||||
describe('AwardsHandler', function() {
|
||||
preloadFixtures('issues/issue_with_comment.html.raw');
|
||||
preloadFixtures('merge_requests/diff_comment.html.raw');
|
||||
beforeEach(function(done) {
|
||||
loadFixtures('issues/issue_with_comment.html.raw');
|
||||
loadFixtures('merge_requests/diff_comment.html.raw');
|
||||
$('body').data('page', 'projects:merge_requests:show');
|
||||
loadAwardsHandler(true).then((obj) => {
|
||||
awardsHandler = obj;
|
||||
spyOn(awardsHandler, 'postEmoji').and.callFake((button, url, emoji, cb) => cb());
|
||||
|
|
@ -139,7 +140,7 @@ import '~/lib/utils/common_utils';
|
|||
});
|
||||
describe('::getAwardUrl', function() {
|
||||
return it('returns the url for request', function() {
|
||||
return expect(awardsHandler.getAwardUrl()).toBe('http://test.host/frontend-fixtures/issues-project/issues/1/toggle_award_emoji');
|
||||
return expect(awardsHandler.getAwardUrl()).toBe('http://test.host/frontend-fixtures/merge-requests-project/merge_requests/1/toggle_award_emoji');
|
||||
});
|
||||
});
|
||||
describe('::addAward and ::checkMutuality', function() {
|
||||
|
|
|
|||
|
|
@ -1,119 +1,111 @@
|
|||
/* eslint-disable space-before-function-paren, no-var, no-return-assign, comma-dangle, jasmine/no-spec-dupes, new-cap, max-len */
|
||||
|
||||
import '~/behaviors/quick_submit';
|
||||
|
||||
(function() {
|
||||
describe('Quick Submit behavior', function() {
|
||||
var keydownEvent;
|
||||
preloadFixtures('issues/open-issue.html.raw');
|
||||
beforeEach(function() {
|
||||
loadFixtures('issues/open-issue.html.raw');
|
||||
$('form').submit(function(e) {
|
||||
// Prevent a form submit from moving us off the testing page
|
||||
return e.preventDefault();
|
||||
});
|
||||
this.spies = {
|
||||
submit: spyOnEvent('form', 'submit')
|
||||
};
|
||||
describe('Quick Submit behavior', () => {
|
||||
const keydownEvent = (options = { keyCode: 13, metaKey: true }) => $.Event('keydown', options);
|
||||
|
||||
this.textarea = $('.js-quick-submit textarea').first();
|
||||
});
|
||||
it('does not respond to other keyCodes', function() {
|
||||
this.textarea.trigger(keydownEvent({
|
||||
keyCode: 32
|
||||
}));
|
||||
return expect(this.spies.submit).not.toHaveBeenTriggered();
|
||||
});
|
||||
it('does not respond to Enter alone', function() {
|
||||
this.textarea.trigger(keydownEvent({
|
||||
ctrlKey: false,
|
||||
metaKey: false
|
||||
}));
|
||||
return expect(this.spies.submit).not.toHaveBeenTriggered();
|
||||
});
|
||||
it('does not respond to repeated events', function() {
|
||||
this.textarea.trigger(keydownEvent({
|
||||
repeat: true
|
||||
}));
|
||||
return expect(this.spies.submit).not.toHaveBeenTriggered();
|
||||
});
|
||||
it('disables input of type submit', function() {
|
||||
const submitButton = $('.js-quick-submit input[type=submit]');
|
||||
this.textarea.trigger(keydownEvent());
|
||||
preloadFixtures('merge_requests/merge_request_with_task_list.html.raw');
|
||||
|
||||
expect(submitButton).toBeDisabled();
|
||||
beforeEach(() => {
|
||||
loadFixtures('merge_requests/merge_request_with_task_list.html.raw');
|
||||
$('body').attr('data-page', 'projects:merge_requests:show');
|
||||
$('form').submit((e) => {
|
||||
// Prevent a form submit from moving us off the testing page
|
||||
e.preventDefault();
|
||||
});
|
||||
it('disables button of type submit', function() {
|
||||
const submitButton = $('.js-quick-submit input[type=submit]');
|
||||
this.textarea.trigger(keydownEvent());
|
||||
|
||||
expect(submitButton).toBeDisabled();
|
||||
});
|
||||
it('only clicks one submit', function() {
|
||||
const existingSubmit = $('.js-quick-submit input[type=submit]');
|
||||
// Add an extra submit button
|
||||
const newSubmit = $('<button type="submit">Submit it</button>');
|
||||
newSubmit.insertAfter(this.textarea);
|
||||
|
||||
const oldClick = spyOnEvent(existingSubmit, 'click');
|
||||
const newClick = spyOnEvent(newSubmit, 'click');
|
||||
|
||||
this.textarea.trigger(keydownEvent());
|
||||
|
||||
expect(oldClick).not.toHaveBeenTriggered();
|
||||
expect(newClick).toHaveBeenTriggered();
|
||||
});
|
||||
// We cannot stub `navigator.userAgent` for CI's `rake karma` task, so we'll
|
||||
// only run the tests that apply to the current platform
|
||||
if (navigator.userAgent.match(/Macintosh/)) {
|
||||
it('responds to Meta+Enter', function() {
|
||||
this.textarea.trigger(keydownEvent());
|
||||
return expect(this.spies.submit).toHaveBeenTriggered();
|
||||
});
|
||||
it('excludes other modifier keys', function() {
|
||||
this.textarea.trigger(keydownEvent({
|
||||
altKey: true
|
||||
}));
|
||||
this.textarea.trigger(keydownEvent({
|
||||
ctrlKey: true
|
||||
}));
|
||||
this.textarea.trigger(keydownEvent({
|
||||
shiftKey: true
|
||||
}));
|
||||
return expect(this.spies.submit).not.toHaveBeenTriggered();
|
||||
});
|
||||
} else {
|
||||
it('responds to Ctrl+Enter', function() {
|
||||
this.textarea.trigger(keydownEvent());
|
||||
return expect(this.spies.submit).toHaveBeenTriggered();
|
||||
});
|
||||
it('excludes other modifier keys', function() {
|
||||
this.textarea.trigger(keydownEvent({
|
||||
altKey: true
|
||||
}));
|
||||
this.textarea.trigger(keydownEvent({
|
||||
metaKey: true
|
||||
}));
|
||||
this.textarea.trigger(keydownEvent({
|
||||
shiftKey: true
|
||||
}));
|
||||
return expect(this.spies.submit).not.toHaveBeenTriggered();
|
||||
});
|
||||
}
|
||||
return keydownEvent = function(options) {
|
||||
var defaults;
|
||||
if (navigator.userAgent.match(/Macintosh/)) {
|
||||
defaults = {
|
||||
keyCode: 13,
|
||||
metaKey: true
|
||||
};
|
||||
} else {
|
||||
defaults = {
|
||||
keyCode: 13,
|
||||
ctrlKey: true
|
||||
};
|
||||
}
|
||||
return $.Event('keydown', $.extend({}, defaults, options));
|
||||
this.spies = {
|
||||
submit: spyOnEvent('form', 'submit'),
|
||||
};
|
||||
|
||||
this.textarea = $('.js-quick-submit textarea').first();
|
||||
});
|
||||
}).call(window);
|
||||
|
||||
it('does not respond to other keyCodes', () => {
|
||||
this.textarea.trigger(keydownEvent({
|
||||
keyCode: 32,
|
||||
}));
|
||||
expect(this.spies.submit).not.toHaveBeenTriggered();
|
||||
});
|
||||
|
||||
it('does not respond to Enter alone', () => {
|
||||
this.textarea.trigger(keydownEvent({
|
||||
ctrlKey: false,
|
||||
metaKey: false,
|
||||
}));
|
||||
expect(this.spies.submit).not.toHaveBeenTriggered();
|
||||
});
|
||||
|
||||
it('does not respond to repeated events', () => {
|
||||
this.textarea.trigger(keydownEvent({
|
||||
repeat: true,
|
||||
}));
|
||||
expect(this.spies.submit).not.toHaveBeenTriggered();
|
||||
});
|
||||
|
||||
it('disables input of type submit', () => {
|
||||
const submitButton = $('.js-quick-submit input[type=submit]');
|
||||
this.textarea.trigger(keydownEvent());
|
||||
|
||||
expect(submitButton).toBeDisabled();
|
||||
});
|
||||
it('disables button of type submit', () => {
|
||||
const submitButton = $('.js-quick-submit input[type=submit]');
|
||||
this.textarea.trigger(keydownEvent());
|
||||
|
||||
expect(submitButton).toBeDisabled();
|
||||
});
|
||||
it('only clicks one submit', () => {
|
||||
const existingSubmit = $('.js-quick-submit input[type=submit]');
|
||||
// Add an extra submit button
|
||||
const newSubmit = $('<button type="submit">Submit it</button>');
|
||||
newSubmit.insertAfter(this.textarea);
|
||||
|
||||
const oldClick = spyOnEvent(existingSubmit, 'click');
|
||||
const newClick = spyOnEvent(newSubmit, 'click');
|
||||
|
||||
this.textarea.trigger(keydownEvent());
|
||||
|
||||
expect(oldClick).not.toHaveBeenTriggered();
|
||||
expect(newClick).toHaveBeenTriggered();
|
||||
});
|
||||
// We cannot stub `navigator.userAgent` for CI's `rake karma` task, so we'll
|
||||
// only run the tests that apply to the current platform
|
||||
if (navigator.userAgent.match(/Macintosh/)) {
|
||||
describe('In Macintosh', () => {
|
||||
it('responds to Meta+Enter', () => {
|
||||
this.textarea.trigger(keydownEvent());
|
||||
return expect(this.spies.submit).toHaveBeenTriggered();
|
||||
});
|
||||
|
||||
it('excludes other modifier keys', () => {
|
||||
this.textarea.trigger(keydownEvent({
|
||||
altKey: true,
|
||||
}));
|
||||
this.textarea.trigger(keydownEvent({
|
||||
ctrlKey: true,
|
||||
}));
|
||||
this.textarea.trigger(keydownEvent({
|
||||
shiftKey: true,
|
||||
}));
|
||||
return expect(this.spies.submit).not.toHaveBeenTriggered();
|
||||
});
|
||||
});
|
||||
} else {
|
||||
it('responds to Ctrl+Enter', () => {
|
||||
this.textarea.trigger(keydownEvent());
|
||||
return expect(this.spies.submit).toHaveBeenTriggered();
|
||||
});
|
||||
|
||||
it('excludes other modifier keys', () => {
|
||||
this.textarea.trigger(keydownEvent({
|
||||
altKey: true,
|
||||
}));
|
||||
this.textarea.trigger(keydownEvent({
|
||||
metaKey: true,
|
||||
}));
|
||||
this.textarea.trigger(keydownEvent({
|
||||
shiftKey: true,
|
||||
}));
|
||||
return expect(this.spies.submit).not.toHaveBeenTriggered();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue