MR Diffs Refactor Part 03: Remove legacy stuff and prettify._mr-refactor-part-3

6 files changed, 62 insertions, 83 deletions

diff --git a/app/assets/javascripts/diff_notes/components/resolve_btn.js b/app/assets/javascripts/diff_notes/components/resolve_btn.js
index df4c72ba0ed..08e3a6302cf 100644
--- a/app/assets/javascripts/diff_notes/components/resolve_btn.js
+++ b/app/assets/javascripts/diff_notes/components/resolve_btn.js
@@ -1,4 +1,3 @@
-/* eslint-disable comma-dangle, object-shorthand, func-names, quote-props, no-else-return, camelcase, max-len */
 /* global CommentsStore */
 /* global ResolveService */
 
@@ -17,26 +16,26 @@ const ResolveBtn = Vue.extend({
     authorAvatar: String,
     noteTruncated: String,
   },
-  data: function () {
+  data: function() {
     return {
       discussions: CommentsStore.state,
-      loading: false
+      loading: false,
     };
   },
   watch: {
-    'discussions': {
+    discussions: {
       handler: 'updateTooltip',
-      deep: true
-    }
+      deep: true,
+    },
   },
   computed: {
-    discussion: function () {
+    discussion: function() {
       return this.discussions[this.discussionId];
     },
-    note: function () {
+    note: function() {
       return this.discussion ? this.discussion.getNote(this.noteId) : {};
     },
-    buttonText: function () {
+    buttonText: function() {
       if (this.isResolved) {
         return `Resolved by ${this.resolvedByName}`;
       } else if (this.canResolve) {
@@ -45,65 +44,71 @@ const ResolveBtn = Vue.extend({
         return 'Unable to resolve';
       }
     },
-    isResolved: function () {
+    isResolved: function() {
       if (this.note) {
         return this.note.resolved;
       } else {
         return false;
       }
     },
-    resolvedByName: function () {
+    resolvedByName: function() {
       return this.note.resolved_by;
     },
   },
   methods: {
-    updateTooltip: function () {
+    updateTooltip: function() {
       this.$nextTick(() => {
         $(this.$refs.button)
           .tooltip('hide')
           .tooltip('fixTitle');
       });
     },
-    resolve: function () {
+    resolve: function() {
       if (!this.canResolve) return;
 
       let promise;
       this.loading = true;
 
       if (this.isResolved) {
-        promise = ResolveService
-          .unresolve(this.noteId);
+        promise = ResolveService.unresolve(this.noteId);
       } else {
-        promise = ResolveService
-          .resolve(this.noteId);
+        promise = ResolveService.resolve(this.noteId);
       }
 
       promise
         .then(resp => resp.json())
-        .then((data) => {
+        .then(data => {
           this.loading = false;
 
           const resolved_by = data ? data.resolved_by : null;
 
-          CommentsStore.update(this.discussionId, this.noteId, !this.isResolved, resolved_by);
+          CommentsStore.update(
+            this.discussionId,
+            this.noteId,
+            !this.isResolved,
+            resolved_by,
+          );
           this.discussion.updateHeadline(data);
           gl.mrWidget.checkStatus();
-          document.dispatchEvent(new CustomEvent('refreshVueNotes'));
-
           this.updateTooltip();
         })
-        .catch(() => new Flash('An error occurred when trying to resolve a comment. Please try again.'));
-    }
+        .catch(
+          () =>
+            new Flash(
+              'An error occurred when trying to resolve a comment. Please try again.',
+            ),
+        );
+    },
   },
-  mounted: function () {
+  mounted: function() {
     $(this.$refs.button).tooltip({
-      container: 'body'
+      container: 'body',
     });
   },
-  beforeDestroy: function () {
+  beforeDestroy: function() {
     CommentsStore.delete(this.discussionId, this.noteId);
   },
-  created: function () {
+  created: function() {
     CommentsStore.create({
       discussionId: this.discussionId,
       noteId: this.noteId,
@@ -114,7 +119,7 @@ const ResolveBtn = Vue.extend({
       authorAvatar: this.authorAvatar,
       noteTruncated: this.noteTruncated,
     });
-  }
+  },
 });
 
 Vue.component('resolve-btn', ResolveBtn);
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js b/app/assets/javascripts/diff_notes/services/resolve.js
index d16f9297de1..0b3568e432d 100644
--- a/app/assets/javascripts/diff_notes/services/resolve.js
+++ b/app/assets/javascripts/diff_notes/services/resolve.js
@@ -8,8 +8,12 @@ window.gl = window.gl || {};
 
 class ResolveServiceClass {
   constructor(root) {
-    this.noteResource = Vue.resource(`${root}/notes{/noteId}/resolve?html=true`);
-    this.discussionResource = Vue.resource(`${root}/merge_requests{/mergeRequestId}/discussions{/discussionId}/resolve?html=true`);
+    this.noteResource = Vue.resource(
+      `${root}/notes{/noteId}/resolve?html=true`,
+    );
+    this.discussionResource = Vue.resource(
+      `${root}/merge_requests{/mergeRequestId}/discussions{/discussionId}/resolve?html=true`,
+    );
   }
 
   resolve(noteId) {
@@ -33,7 +37,7 @@ class ResolveServiceClass {
 
     promise
       .then(resp => resp.json())
-      .then((data) => {
+      .then(data => {
         discussion.loading = false;
         const resolvedBy = data ? data.resolved_by : null;
 
@@ -45,9 +49,13 @@ class ResolveServiceClass {
 
         if (gl.mrWidget) gl.mrWidget.checkStatus();
         discussion.updateHeadline(data);
-        document.dispatchEvent(new CustomEvent('refreshVueNotes'));
       })
-      .catch(() => new Flash('An error occurred when trying to resolve a discussion. Please try again.'));
+      .catch(
+        () =>
+          new Flash(
+            'An error occurred when trying to resolve a discussion. Please try again.',
+          ),
+      );
   }
 
   resolveAll(mergeRequestId, discussionId) {
@@ -55,10 +63,13 @@ class ResolveServiceClass {
 
     discussion.loading = true;
 
-    return this.discussionResource.save({
-      mergeRequestId,
-      discussionId,
-    }, {});
+    return this.discussionResource.save(
+      {
+        mergeRequestId,
+        discussionId,
+      },
+      {},
+    );
   }
 
   unResolveAll(mergeRequestId, discussionId) {
@@ -66,10 +77,13 @@ class ResolveServiceClass {
 
     discussion.loading = true;
 
-    return this.discussionResource.delete({
-      mergeRequestId,
-      discussionId,
-    }, {});
+    return this.discussionResource.delete(
+      {
+        mergeRequestId,
+        discussionId,
+      },
+      {},
+    );
   }
 }
 
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 659ae575219..7ca0245234d 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -225,7 +225,6 @@ export default class Notes {
     // When the URL fragment/hash has changed, `#note_xxx`
     $(window).on('hashchange', this.onHashChange);
     this.boundGetContent = this.getContent.bind(this);
-    document.addEventListener('refreshLegacyNotes', this.boundGetContent);
     this.eventsBound = true;
   }
 
@@ -253,7 +252,6 @@ export default class Notes {
     this.$wrapperEl.off('ajax:success', '.js-main-target-form');
     this.$wrapperEl.off('ajax:success', '.js-discussion-note-form');
     this.$wrapperEl.off('ajax:complete', '.js-main-target-form');
-    document.removeEventListener('refreshLegacyNotes', this.boundGetContent);
     $(window).off('hashchange', this.onHashChange);
   }
 
@@ -537,8 +535,6 @@ export default class Notes {
         this.setupNewNote($updatedNote);
       }
     }
-
-    Notes.refreshVueNotes();
   }
 
   isParallelView() {
@@ -1021,7 +1017,6 @@ export default class Notes {
       })(this),
     );
 
-    Notes.refreshVueNotes();
     Notes.checkMergeRequestStatus();
     return this.updateNotesCount(-1);
   }
@@ -1037,7 +1032,7 @@ export default class Notes {
     $note.find('.note-attachment').remove();
     $note.find('.note-body > .note-text').show();
     $note.find('.note-header').show();
-    return $note.find('.current-note-edit-form').remove();
+    return $note.find('.diffs .current-note-edit-form').remove();
   }
 
   /**
@@ -1581,10 +1576,6 @@ export default class Notes {
     return $updatedNote;
   }
 
-  static refreshVueNotes() {
-    document.dispatchEvent(new CustomEvent('refreshVueNotes'));
-  }
-
   /**
    * Get data from Form attributes to use for saving/submitting comment.
    */
@@ -1887,8 +1878,6 @@ export default class Notes {
               '<div class="flash-container" style="display: none;"></div>',
             );
           }
-
-          Notes.refreshVueNotes();
         } else if (isMainForm) {
           // Check if this was main thread comment
           // Show final note element on UI and perform form and action buttons cleanup
diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue
index a90c6d6381d..dd61bd7fb74 100644
--- a/app/assets/javascripts/notes/components/notes_app.vue
+++ b/app/assets/javascripts/notes/components/notes_app.vue
@@ -86,10 +86,6 @@ export default {
         this.actionToggleAward({ awardName, noteId });
       });
     }
-    document.addEventListener('refreshVueNotes', this.fetchNotes);
-  },
-  beforeDestroy() {
-    document.removeEventListener('refreshVueNotes', this.fetchNotes);
   },
   methods: {
     ...mapActions({
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js
index c8edc06349f..356f261bea5 100644
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/notes/stores/mutations.js
@@ -26,7 +26,6 @@ export default {
       }
 
       state.notes.push(noteData);
-      document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
     }
   },
 
@@ -35,7 +34,6 @@ export default {
 
     if (noteObj) {
       noteObj.notes.push(note);
-      document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
     }
   },
 
@@ -52,8 +50,6 @@ export default {
         state.notes.splice(state.notes.indexOf(noteObj), 1);
       }
     }
-
-    document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
   },
 
   [types.REMOVE_PLACEHOLDER_NOTES](state) {
@@ -161,8 +157,6 @@ export default {
         user: { id, name, username },
       });
     }
-
-    document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
   },
 
   [types.TOGGLE_DISCUSSION](state, { discussionId }) {
@@ -180,8 +174,6 @@ export default {
       const comment = utils.findNoteObjectById(noteObj.notes, note.id);
       noteObj.notes.splice(noteObj.notes.indexOf(comment), 1, note);
     }
-
-    // document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
   },
 
   [types.UPDATE_DISCUSSION](state, noteData) {
@@ -196,8 +188,6 @@ export default {
 
     note.expanded = true; // override expand flag to prevent collapse
     state.notes.splice(index, 1, note);
-
-    document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
   },
 
   [types.CLOSE_ISSUE](state) {
diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
index 28d8761b502..26ead75cec4 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
@@ -1,30 +1,15 @@
-import MergeRequest from '~/merge_request';
 import ZenMode from '~/zen_mode';
-import initNotes from '~/init_notes';
 import initIssuableSidebar from '~/init_issuable_sidebar';
-import initDiffNotes from '~/diff_notes/diff_notes_bundle';
 import ShortcutsIssuable from '~/shortcuts_issuable';
-import Diff from '~/diff';
 import { handleLocationHash } from '~/lib/utils/common_utils';
 import howToMerge from '~/how_to_merge';
 import initPipelines from '~/commit/pipelines/pipelines_bundle';
 import initWidget from '../../../vue_merge_request_widget';
 
-export default function () {
-  new Diff(); // eslint-disable-line no-new
+export default function() {
   new ZenMode(); // eslint-disable-line no-new
-
   initIssuableSidebar();
-  initNotes();
-  initDiffNotes();
   initPipelines();
-
-  const mrShowNode = document.querySelector('.merge-request');
-
-  window.mergeRequest = new MergeRequest({
-    action: mrShowNode.dataset.mrAction,
-  });
-
   new ShortcutsIssuable(true); // eslint-disable-line no-new
   handleLocationHash();
   howToMerge();