Commit 10a1aaae authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '9971-move-ee-differences-for-app-assets-javascripts-notes-components-note_form-vue-ce' into 'master'

EE Backport to CE of EE!11151

See merge request gitlab-org/gitlab-ce!27824
parents 61ad5abc 3a62be84
......@@ -8,6 +8,7 @@ import issuableStateMixin from '../mixins/issuable_state';
import resolvable from '../mixins/resolvable';
import { __ } from '~/locale';
import { getDraft, updateDraft } from '~/lib/utils/autosave';
import noteFormMixin from 'ee_else_ce/notes/mixins/note_form';
export default {
name: 'NoteForm',
......@@ -15,7 +16,7 @@ export default {
issueWarning,
markdownField,
},
mixins: [issuableStateMixin, resolvable],
mixins: [issuableStateMixin, resolvable, noteFormMixin],
props: {
noteBody: {
type: String,
......@@ -195,21 +196,6 @@ export default {
return shouldResolve || shouldToggleState;
},
handleKeySubmit() {
this.handleUpdate();
},
handleUpdate(shouldResolve) {
const beforeSubmitDiscussionState = this.discussionResolved;
this.isSubmitting = true;
this.$emit('handleFormUpdate', this.updatedNoteBody, this.$refs.editNoteForm, () => {
this.isSubmitting = false;
if (this.shouldToggleResolved(shouldResolve, beforeSubmitDiscussionState)) {
this.resolveHandler(beforeSubmitDiscussionState);
}
});
},
editMyLastNote() {
if (this.updatedNoteBody === '') {
const lastNoteInDiscussion = this.getDiscussionLastNote(this.discussion);
......@@ -279,6 +265,51 @@ export default {
></textarea>
</markdown-field>
<div class="note-form-actions clearfix">
<template v-if="showBatchCommentsActions">
<p v-if="showResolveDiscussionToggle">
<label>
<template v-if="discussionResolved">
<input
v-model="isUnresolving"
type="checkbox"
class="qa-unresolve-review-discussion"
/>
{{ __('Unresolve discussion') }}
</template>
<template v-else>
<input v-model="isResolving" type="checkbox" class="qa-resolve-review-discussion" />
{{ __('Resolve discussion') }}
</template>
</label>
</p>
<div>
<button
:disabled="isDisabled"
type="button"
class="btn btn-success qa-start-review"
@click="handleAddToReview"
>
<template v-if="hasDrafts">{{ __('Add to review') }}</template>
<template v-else>{{ __('Start a review') }}</template>
</button>
<button
:disabled="isDisabled"
type="button"
class="btn qa-comment-now"
@click="handleUpdate()"
>
{{ __('Add comment now') }}
</button>
<button
class="btn btn-cancel note-edit-cancel js-close-discussion-note-form"
type="button"
@click="cancelHandler()"
>
{{ __('Cancel') }}
</button>
</div>
</template>
<template v-else>
<button
:disabled="isDisabled"
type="button"
......@@ -301,6 +332,7 @@ export default {
>
Cancel
</button>
</template>
</div>
</form>
</div>
......
export default {
data() {
return {
showBatchCommentsActions: false,
};
},
methods: {
handleKeySubmit() {
this.handleUpdate();
},
handleUpdate(shouldResolve) {
const beforeSubmitDiscussionState = this.discussionResolved;
this.isSubmitting = true;
this.$emit('handleFormUpdate', this.updatedNoteBody, this.$refs.editNoteForm, () => {
this.isSubmitting = false;
if (this.shouldToggleResolved(shouldResolve, beforeSubmitDiscussionState)) {
this.resolveHandler(beforeSubmitDiscussionState);
}
});
},
},
};
......@@ -529,6 +529,9 @@ msgstr ""
msgid "Add bold text"
msgstr ""
msgid "Add comment now"
msgstr ""
msgid "Add header and footer to emails. Please note that color settings will only be applied within the application interface"
msgstr ""
......@@ -562,6 +565,9 @@ msgstr ""
msgid "Add to project"
msgstr ""
msgid "Add to review"
msgstr ""
msgid "Add todo"
msgstr ""
......@@ -8864,6 +8870,9 @@ msgstr ""
msgid "Start a new merge request"
msgstr ""
msgid "Start a review"
msgstr ""
msgid "Start and due date"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment