Merge branch 'webpack-ldap' into 'master'

Remove ldap group links webpack entry point

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

config/webpack.config.js

@@ -63,7 +63,6 @@ function generateEntries() {
 
     // EE-only
     geo_nodes:            'ee/geo_nodes',
-    ldap_group_links:     'ee/groups/ldap_group_links.js',
     mirrors:              'ee/mirrors',
     service_desk:         'ee/projects/settings_service_desk/service_desk_bundle.js',
   };

ee/app/assets/javascripts/groups/ldap_group_links.js

-document.addEventListener('DOMContentLoaded', () => {
+export default () => {
   const showGroupLink = () => {
     const $cnLink = $('.cn-link');
     const $filterLink = $('.filter-link');
@@ -12,4 +12,4 @@ document.addEventListener('DOMContentLoaded', () => {
 
   $('input[name="sync_method"]').on('change', showGroupLink);
   showGroupLink();
-});
+};

ee/app/assets/javascripts/pages/admin/groups/edit/index.js

 import initLDAPGroupsSelect from 'ee/ldap_groups_select';
+import initLDAPGroupLinks from 'ee/groups/ldap_group_links';
 
-document.addEventListener('DOMContentLoaded', initLDAPGroupsSelect);
+document.addEventListener('DOMContentLoaded', () => {
+  initLDAPGroupsSelect();
+  initLDAPGroupLinks();
+});

ee/app/assets/javascripts/pages/admin/groups/new/index.js

+import '~/pages/admin/groups/new/index';
+import initLDAPGroupLinks from 'ee/groups/ldap_group_links';
+
+document.addEventListener('DOMContentLoaded', initLDAPGroupLinks);

ee/app/assets/javascripts/pages/groups/ldap_group_links/index.js

 import initLDAPGroupsSelect from 'ee/ldap_groups_select';
+import initLDAPGroupLinks from 'ee/groups/ldap_group_links';
 
-document.addEventListener('DOMContentLoaded', initLDAPGroupsSelect);
+document.addEventListener('DOMContentLoaded', () => {
+  initLDAPGroupsSelect();
+  initLDAPGroupLinks();
+});

ee/app/views/ldap_group_links/_form.html.haml

-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'ldap_group_links'
 %section.ldap-group-links
   = form_for [group, LdapGroupLink.new], html: { class: 'form-horizontal' } do |f|
     .form-holder