Merge branch...

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

Resolve "Move EE differences for `app/assets/javascripts/notes/components/note_form.vue`"

Closes #9971

See merge request gitlab-org/gitlab-ee!11151

app/assets/javascripts/notes/components/note_form.vue

@@ -8,7 +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/batch_comments/mixins/note_form';
+import noteFormMixin from 'ee_else_ce/notes/mixins/note_form';
 
 export default {
   name: 'NoteForm',
@@ -196,31 +196,6 @@ export default {
 
       return shouldResolve || shouldToggleState;
     },
-    handleKeySubmit() {
-      if (this.showBatchCommentsActions) {
-        this.handleAddToReview();
-      } else {
-        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);
-          }
-        },
-        this.discussionResolved ? !this.isUnresolving : this.isResolving,
-      );
-    },
     editMyLastNote() {
       if (this.updatedNoteBody === '') {
         const lastNoteInDiscussion = this.getDiscussionLastNote(this.discussion);
@@ -290,6 +265,7 @@ export default {
         ></textarea>
       </markdown-field>
       <div class="note-form-actions clearfix">
+        <template v-if="showBatchCommentsActions">
           <p v-if="showResolveDiscussionToggle">
             <label>
               <template v-if="discussionResolved">
@@ -306,7 +282,7 @@ export default {
               </template>
             </label>
           </p>
-        <div v-if="showBatchCommentsActions">
+          <div>
             <button
               :disabled="isDisabled"
               type="button"
@@ -332,6 +308,7 @@ export default {
               {{ __('Cancel') }}
             </button>
           </div>
+        </template>
         <template v-else>
           <button
             :disabled="isDisabled"

app/assets/javascripts/notes/mixins/note_form.js

+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);
+        }
+      });
+    },
+  },
+};

ee/app/assets/javascripts/batch_comments/mixins/note_form.js → ee/app/assets/javascripts/notes/mixins/note_form.js

@@ -24,6 +24,31 @@ export default {
     },
   },
   methods: {
+    handleKeySubmit() {
+      if (this.showBatchCommentsActions) {
+        this.handleAddToReview();
+      } else {
+        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);
+          }
+        },
+        this.discussionResolved ? !this.isUnresolving : this.isResolving,
+      );
+    },
     shouldBeResolved(resolveStatus) {
       if (this.withBatchComments) {
         return (