Commit 3a62be84 authored by Sam Bigelow's avatar Sam Bigelow

EE Backport to CE of Note Form EE Diffs

This moves all EE Specific lines into the ee directory

CE Backport of
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11151/commits?view=parallel
parent f6909250
...@@ -8,6 +8,7 @@ import issuableStateMixin from '../mixins/issuable_state'; ...@@ -8,6 +8,7 @@ import issuableStateMixin from '../mixins/issuable_state';
import resolvable from '../mixins/resolvable'; import resolvable from '../mixins/resolvable';
import { __ } from '~/locale'; import { __ } from '~/locale';
import { getDraft, updateDraft } from '~/lib/utils/autosave'; import { getDraft, updateDraft } from '~/lib/utils/autosave';
import noteFormMixin from 'ee_else_ce/notes/mixins/note_form';
export default { export default {
name: 'NoteForm', name: 'NoteForm',
...@@ -15,7 +16,7 @@ export default { ...@@ -15,7 +16,7 @@ export default {
issueWarning, issueWarning,
markdownField, markdownField,
}, },
mixins: [issuableStateMixin, resolvable], mixins: [issuableStateMixin, resolvable, noteFormMixin],
props: { props: {
noteBody: { noteBody: {
type: String, type: String,
...@@ -195,21 +196,6 @@ export default { ...@@ -195,21 +196,6 @@ export default {
return shouldResolve || shouldToggleState; 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() { editMyLastNote() {
if (this.updatedNoteBody === '') { if (this.updatedNoteBody === '') {
const lastNoteInDiscussion = this.getDiscussionLastNote(this.discussion); const lastNoteInDiscussion = this.getDiscussionLastNote(this.discussion);
...@@ -279,6 +265,51 @@ export default { ...@@ -279,6 +265,51 @@ export default {
></textarea> ></textarea>
</markdown-field> </markdown-field>
<div class="note-form-actions clearfix"> <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 <button
:disabled="isDisabled" :disabled="isDisabled"
type="button" type="button"
...@@ -301,6 +332,7 @@ export default { ...@@ -301,6 +332,7 @@ export default {
> >
Cancel Cancel
</button> </button>
</template>
</div> </div>
</form> </form>
</div> </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);
}
});
},
},
};
...@@ -507,6 +507,9 @@ msgstr "" ...@@ -507,6 +507,9 @@ msgstr ""
msgid "Add bold text" msgid "Add bold text"
msgstr "" 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" msgid "Add header and footer to emails. Please note that color settings will only be applied within the application interface"
msgstr "" msgstr ""
...@@ -540,6 +543,9 @@ msgstr "" ...@@ -540,6 +543,9 @@ msgstr ""
msgid "Add to project" msgid "Add to project"
msgstr "" msgstr ""
msgid "Add to review"
msgstr ""
msgid "Add todo" msgid "Add todo"
msgstr "" msgstr ""
...@@ -8764,6 +8770,9 @@ msgstr "" ...@@ -8764,6 +8770,9 @@ msgstr ""
msgid "Start a new merge request" msgid "Start a new merge request"
msgstr "" msgstr ""
msgid "Start a review"
msgstr ""
msgid "Start and due date" msgid "Start and due date"
msgstr "" 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