Merge branch 'ee-protected-tags-bundle-refactor' into 'master'

Ee protected tags bundle refactor

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

app/assets/javascripts/pages/projects/settings/repository/show/index.js

+/* eslint-disable no-new */
+
+import ProtectedTagCreate from '~/protected_tags/protected_tag_create';
+import ProtectedTagEditList from '~/protected_tags/protected_tag_edit_list';
 import initSettingsPanels from '~/settings_panels';
 import initDeployKeys from '~/deploy_keys';
 
 document.addEventListener('DOMContentLoaded', () => {
+  new ProtectedTagCreate();
+  new ProtectedTagEditList();
   initDeployKeys();
   initSettingsPanels();
 });

app/assets/javascripts/protected_tags/index.js

-/* eslint-disable no-unused-vars */
-
-import ProtectedTagCreate from './protected_tag_create';
-import ProtectedTagEditList from './protected_tag_edit_list';
-
-$(() => {
-  const protectedtTagCreate = new ProtectedTagCreate();
-  const protectedtTagEditList = new ProtectedTagEditList();
-});

app/views/projects/protected_tags/_index.html.haml

-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag('protected_tags')
-
 - content_for :create_protected_tag do
   = render 'projects/protected_tags/create_protected_tag'
 

app/views/projects/settings/repository/show.html.haml

@@ -13,8 +13,9 @@
 -# Those are used throughout the actual views. These `shared` views are then
 -# reused in EE.
 - if @project.feature_available?(:protected_refs_for_users, current_user)
-  = render "projects/protected_branches/ee/index"
-  = render "projects/protected_tags/ee/index"
+  .js-protected-refs-for-users
+    = render "projects/protected_branches/ee/index"
+    = render "projects/protected_tags/ee/index"
 - else
   = render "projects/protected_branches/index"
   = render "projects/protected_tags/index"

config/webpack.config.js

@@ -57,7 +57,6 @@ function generateEntries() {
     pdf_viewer:           './blob/pdf_viewer.js',
     project_import_gl:    './projects/project_import_gitlab_project.js',
     protected_branches:   './protected_branches',
-    protected_tags:       './protected_tags',
     registry_list:        './registry/index.js',
     sketch_viewer:        './blob/sketch_viewer.js',
     stl_viewer:           './blob/stl_viewer.js',
@@ -86,7 +85,6 @@ function generateEntries() {
     ldap_group_links:     'ee/groups/ldap_group_links.js',
     mirrors:              'ee/mirrors',
     ee_protected_branches: 'ee/protected_branches',
-    ee_protected_tags:    'ee/protected_tags',
     service_desk:         'ee/projects/settings_service_desk/service_desk_bundle.js',
     service_desk_issues:  'ee/service_desk_issues/index.js',
     roadmap:              'ee/roadmap',

ee/app/assets/javascripts/pages/projects/settings/repository/show/index.js

-import '~/pages/projects/settings/repository/show/index';
+/* eslint-disable no-new */
 import UsersSelect from '~/users_select';
 import UserCallout from '~/user_callout';
+import initSettingsPanels from '~/settings_panels';
+import initDeployKeys from '~/deploy_keys';
+import ProtectedTagCreate from 'ee/protected_tags/protected_tag_create';
+import ProtectedTagEditList from 'ee/protected_tags/protected_tag_edit_list';
+import CEProtectedTagCreate from '~/protected_tags/protected_tag_create';
+import CEProtectedTagEditList from '~/protected_tags/protected_tag_edit_list';
 
 document.addEventListener('DOMContentLoaded', () => {
-  new UsersSelect(); // eslint-disable-line no-new
-  new UserCallout(); // eslint-disable-line no-new
+  new UsersSelect();
+  new UserCallout();
+  if (document.querySelector('.js-protected-refs-for-users')) {
+    new ProtectedTagCreate();
+    new ProtectedTagEditList();
+  } else {
+    new CEProtectedTagCreate();
+    new CEProtectedTagEditList();
+  }
+  initDeployKeys();
+  initSettingsPanels();
 });

ee/app/assets/javascripts/protected_tags/index.js

-/* eslint-disable no-unused-vars */
-
-import ProtectedTagCreate from './protected_tag_create';
-import ProtectedTagEditList from './protected_tag_edit_list';
-
-$(() => {
-  const protectedtTagCreate = new ProtectedTagCreate();
-  const protectedtTagEditList = new ProtectedTagEditList();
-});

ee/app/views/projects/protected_tags/ee/_index.html.haml

-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'ee_protected_tags'
-
 - content_for :create_protected_tag do
   = render 'projects/protected_tags/ee/create_protected_tag'