Merge branch 'service-desk-webpack-bundle-refactor' into 'master'

Removed service_desk webpack bundle tag

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

app/views/projects/edit.html.haml

@@ -5,7 +5,6 @@
 
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag('common_vue')
-  = webpack_bundle_tag('service_desk')
 
 .project-edit-container
   %section.settings.general-settings.no-animate{ class: ('expanded' if expanded) }

config/webpack.config.js

@@ -58,7 +58,6 @@ function generateEntries() {
     // EE-only
     ide:                  'ee/ide/index.js',
     geo_nodes:            'ee/geo_nodes',
-    service_desk:         'ee/projects/settings_service_desk/service_desk_bundle.js',
   };
 
   return Object.assign(manualEntries, autoEntries);

ee/app/assets/javascripts/pages/projects/edit/index.js

@@ -4,6 +4,7 @@ import UsersSelect from '~/users_select';
 import UserCallout from '~/user_callout';
 import groupsSelect from '~/groups_select';
 import ApproversSelect from 'ee/approvers_select';
+import initServiceDesk from 'ee/projects/settings_service_desk';
 
 document.addEventListener('DOMContentLoaded', () => {
   new UsersSelect();
@@ -12,4 +13,5 @@ document.addEventListener('DOMContentLoaded', () => {
   new UserCallout({ className: 'js-service-desk-callout' });
   new UserCallout({ className: 'js-mr-approval-callout' });
   new ApproversSelect();
+  initServiceDesk();
 });

ee/app/assets/javascripts/projects/settings_service_desk/service_desk_bundle.js → ee/app/assets/javascripts/projects/settings_service_desk/index.js

@@ -2,7 +2,7 @@ import Vue from 'vue';
 import { convertPermissionToBoolean } from '~/lib/utils/common_utils';
 import serviceDeskRoot from './components/service_desk_root.vue';
 
-document.addEventListener('DOMContentLoaded', () => {
+export default () => {
   const serviceDeskRootElement = document.querySelector('.js-service-desk-setting-root');
   if (serviceDeskRootElement) {
     // eslint-disable-next-line no-new
@@ -32,4 +32,4 @@ document.addEventListener('DOMContentLoaded', () => {
       },
     });
   }
-});
+};