[ci skip] Improve code as per code reviews

2 files changed, 11 insertions, 12 deletions

diff --git a/app/assets/javascripts/notes/components/issue_comment_form.vue b/app/assets/javascripts/notes/components/issue_comment_form.vue
index acb15a7c601..5b2bfeb0043 100644
--- a/app/assets/javascripts/notes/components/issue_comment_form.vue
+++ b/app/assets/javascripts/notes/components/issue_comment_form.vue
@@ -29,18 +29,10 @@
     },
     watch: {
       note(newNote) {
-        if (!_.isEmpty(newNote) && !this.isSubmitting) {
-          this.isSubmitButtonDisabled = false;
-        } else {
-          this.isSubmitButtonDisabled = true;
-        }
+        this.setIsSubmitButtonDisabled(newNote, this.isSubmitting);
       },
       isSubmitting(newValue) {
-        if (!_.isEmpty(this.note) && !newValue) {
-          this.isSubmitButtonDisabled = false;
-        } else {
-          this.isSubmitButtonDisabled = true;
-        }
+        this.setIsSubmitButtonDisabled(this.note, newValue);
       },
     },
     computed: {
@@ -99,6 +91,13 @@
       ...mapActions([
         'saveNote',
       ]),
+      setIsSubmitButtonDisabled(note, isSubmitting) {
+         if (!_.isEmpty(note) && !isSubmitting) {
+          this.isSubmitButtonDisabled = false;
+        } else {
+          this.isSubmitButtonDisabled = true;
+        }
+      },
       handleSave(withIssueAction) {
         if (this.note.length) {
           const noteData = {
@@ -176,7 +175,7 @@
       },
       editCurrentUserLastNote() {
         if (this.note === '') {
-          const lastNote = this.getCurrentUserLastNote(window.gon.current_user_id);
+          const lastNote = this.getCurrentUserLastNote;
 
           if (lastNote) {
             eventHub.$emit('enterEditMode', {
diff --git a/app/assets/javascripts/notes/components/issue_discussion.vue b/app/assets/javascripts/notes/components/issue_discussion.vue
index d6dd0be55ac..b806f1bfc01 100644
--- a/app/assets/javascripts/notes/components/issue_discussion.vue
+++ b/app/assets/javascripts/notes/components/issue_discussion.vue
@@ -183,7 +183,7 @@
                     title="Add a reply">Reply...</button>
                   <issue-note-form
                     v-if="isReplying"
-                    saveButtonTitle="Comment"
+                    save-button-title="Comment"
                     :discussion="note"
                     :is-editing="false"
                     @handleFormUpdate="saveReply"