4 files changed, 12 insertions, 9 deletions
diff --git a/app/assets/javascripts/close_reopen_report_toggle.js b/app/assets/javascripts/close_reopen_report_toggle.js
index e56ae598092..0824f124984 100644
--- a/app/assets/javascripts/close_reopen_report_toggle.js
+++ b/app/assets/javascripts/close_reopen_report_toggle.js
@@ -1,4 +1,4 @@
-import DropLab from './droplab/drop_lab';
+import * as DropLab from './droplab/drop_lab';
 import ISetter from './droplab/plugins/input_setter';
 
 // Todo: Remove this when fixing issue in input_setter plugin
@@ -9,13 +9,13 @@ class CloseReopenReportToggle {
     this.dropdownTrigger = opts.dropdownTrigger;
     this.dropdownList = opts.dropdownList;
     this.button = opts.button;
+  }
 
+  initDroplab() {
     this.reopenItem = this.dropdownList.querySelector('.reopen-item');
     this.closeItem = this.dropdownList.querySelector('.close-item');
-  }
 
-  initDroplab() {
-    this.droplab = new DropLab();
+    this.droplab = new DropLab.default();
 
     const config = this.setConfig();
 
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js
index 62ffde6c93c..b61570e88e0 100644
--- a/app/assets/javascripts/issue.js
+++ b/app/assets/javascripts/issue.js
@@ -6,7 +6,7 @@ import '~/lib/utils/text_utility';
 import './flash';
 import './task_list';
 import CreateMergeRequestDropdown from './create_merge_request_dropdown';
-import CloseReopenReportToggle from './close_reopen_report_toggle';
+import * as CloseReopenReportToggle from './close_reopen_report_toggle';
 
 class Issue {
   constructor() {
@@ -98,7 +98,7 @@ class Issue {
     const dropdownList = container.querySelector('.js-issuable-close-menu');
     const button = container.querySelector('.js-issuable-close-button');
 
-    this.closeReopenReportToggle = new CloseReopenReportToggle({
+    this.closeReopenReportToggle = new CloseReopenReportToggle.default({
       dropdownTrigger,
       dropdownList,
       button,
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index c00978bfaea..eebf45aa581 100644
--- a/app/assets/javascripts/merge_request.js
+++ b/app/assets/javascripts/merge_request.js
@@ -4,7 +4,7 @@
 import 'vendor/jquery.waitforimages';
 import './task_list';
 import './merge_request_tabs';
-import CloseReopenReportToggle from './close_reopen_report_toggle';
+import * as CloseReopenReportToggle from './close_reopen_report_toggle';
 
 (function() {
   this.MergeRequest = (function() {
@@ -123,11 +123,14 @@ import CloseReopenReportToggle from './close_reopen_report_toggle';
 
     MergeRequest.initCloseReopenReport = function () {
       const container = document.querySelector('.js-issuable-close-dropdown');
+
+      if (!container) return;
+
       const dropdownTrigger = container.querySelector('.js-issuable-close-toggle');
       const dropdownList = container.querySelector('.js-issuable-close-menu');
       const button = container.querySelector('.js-issuable-close-button');
 
-      const closeReopenReportToggle = new CloseReopenReportToggle({
+      const closeReopenReportToggle = new CloseReopenReportToggle.default({
         dropdownTrigger,
         dropdownList,
         button,
diff --git a/app/views/shared/issuable/_close_reopen_report_toggle.html.haml b/app/views/shared/issuable/_close_reopen_report_toggle.html.haml
index ece307c6b8d..27b10cdccd1 100644
--- a/app/views/shared/issuable/_close_reopen_report_toggle.html.haml
+++ b/app/views/shared/issuable/_close_reopen_report_toggle.html.haml
@@ -33,7 +33,7 @@
 
     %li.divider.droplab-item-ignore
 
-    %li{ data: { text: 'Report abuse', url: new_abuse_report_path(user_id: issuable.author.id, ref_url: issuable_url(issuable)), button_class: "#{button_class} btn-close-color", toggle_class: "#{toggle_class} btn-close-color", method: '' } }
+    %li.report-item{ data: { text: 'Report abuse', url: new_abuse_report_path(user_id: issuable.author.id, ref_url: issuable_url(issuable)), button_class: "#{button_class} btn-close-color", toggle_class: "#{toggle_class} btn-close-color", method: '' } }
       %button.btn.btn-transparent
         = icon('check', class: 'icon')
         .description