Merge branch '31031-convert-protected-branches-es6' into 'master'

Convert Protected Branches feature JS code to ES6

See merge request !12970

app/assets/javascripts/dispatcher.js

@@ -41,7 +41,6 @@ import BlobLinePermalinkUpdater from './blob/blob_line_permalink_updater';
 import Landing from './landing';
 import BlobForkSuggestion from './blob/blob_fork_suggestion';
 import UserCallout from './user_callout';
-import { ProtectedTagCreate, ProtectedTagEditList } from './protected_tags';
 import ShortcutsWiki from './shortcuts_wiki';
 import Pipelines from './pipelines';
 import BlobViewer from './blob/viewer/index';
@@ -396,12 +395,6 @@ import PerformanceBar from './performance_bar';
           new Search();
           break;
         case 'projects:settings:repository:show':
-          // Initialize Protected Branch Settings
-          new gl.ProtectedBranchCreate();
-          new gl.ProtectedBranchEditList();
-          // Initialize Protected Tag Settings
-          new ProtectedTagCreate();
-          new ProtectedTagEditList();
           // Initialize expandable settings panels
           initSettingsPanels();
           break;

app/assets/javascripts/protected_branches/index.js

+/* eslint-disable no-unused-vars */
+
+import ProtectedBranchCreate from './protected_branch_create';
+import ProtectedBranchEditList from './protected_branch_edit_list';
+
+$(() => {
+  const protectedBranchCreate = new ProtectedBranchCreate();
+  const protectedBranchEditList = new ProtectedBranchEditList();
+});

app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js

-/* eslint-disable arrow-parens, no-param-reassign, object-shorthand, no-else-return, comma-dangle, max-len */
-
-(global => {
-  global.gl = global.gl || {};
-
-  gl.ProtectedBranchAccessDropdown = class {
+export default class ProtectedBranchAccessDropdown {
   constructor(options) {
-      const { $dropdown, data, onSelect } = options;
+    this.options = options;
+    this.initDropdown();
+  }
 
+  initDropdown() {
+    const { $dropdown, data, onSelect } = this.options;
     $dropdown.glDropdown({
-        data: data,
+      data,
       selectable: true,
       inputId: $dropdown.data('input-id'),
       fieldName: $dropdown.data('field-name'),
-        toggleLabel(item, el) {
-          if (el.is('.is-active')) {
+      toggleLabel(item, $el) {
+        if ($el.is('.is-active')) {
           return item.text;
-          } else {
-            return 'Select';
         }
+        return 'Select';
       },
-        clicked(opts) {
-          const { e } = opts;
-
-          e.preventDefault();
+      clicked(options) {
+        options.e.preventDefault();
         onSelect();
-        }
+      },
     });
   }
-  };
-})(window);
+}

app/assets/javascripts/protected_branches/protected_branch_create.js

-/* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, max-len */
-/* global ProtectedBranchDropdown */
+import ProtectedBranchAccessDropdown from './protected_branch_access_dropdown';
+import ProtectedBranchDropdown from './protected_branch_dropdown';
 
-(global => {
-  global.gl = global.gl || {};
-
-  gl.ProtectedBranchCreate = class {
+export default class ProtectedBranchCreate {
   constructor() {
-      this.$wrap = this.$form = $('#new_protected_branch');
+    this.$form = $('.js-new-protected-branch');
     this.buildDropdowns();
   }
 
   buildDropdowns() {
-      const $allowedToMergeDropdown = this.$wrap.find('.js-allowed-to-merge');
-      const $allowedToPushDropdown = this.$wrap.find('.js-allowed-to-push');
+    const $allowedToMergeDropdown = this.$form.find('.js-allowed-to-merge');
+    const $allowedToPushDropdown = this.$form.find('.js-allowed-to-push');
 
     // Cache callback
     this.onSelectCallback = this.onSelect.bind(this);
 
     // Allowed to Merge dropdown
-      new gl.ProtectedBranchAccessDropdown({
+    this.protectedBranchMergeAccessDropdown = new ProtectedBranchAccessDropdown({
       $dropdown: $allowedToMergeDropdown,
       data: gon.merge_access_levels,
-        onSelect: this.onSelectCallback
+      onSelect: this.onSelectCallback,
     });
 
     // Allowed to Push dropdown
-      new gl.ProtectedBranchAccessDropdown({
+    this.protectedBranchPushAccessDropdown = new ProtectedBranchAccessDropdown({
       $dropdown: $allowedToPushDropdown,
       data: gon.push_access_levels,
-        onSelect: this.onSelectCallback
+      onSelect: this.onSelectCallback,
     });
 
     // Select default
@@ -36,20 +33,19 @@
     $allowedToMergeDropdown.data('glDropdown').selectRowAtIndex(0);
 
     // Protected branch dropdown
-      new ProtectedBranchDropdown({
-        $dropdown: this.$wrap.find('.js-protected-branch-select'),
-        onSelect: this.onSelectCallback
+    this.protectedBranchDropdown = new ProtectedBranchDropdown({
+      $dropdown: this.$form.find('.js-protected-branch-select'),
+      onSelect: this.onSelectCallback,
     });
   }
 
   // This will run after clicked callback
   onSelect() {
     // Enable submit button
-      const $branchInput = this.$wrap.find('input[name="protected_branch[name]"]');
-      const $allowedToMergeInput = this.$wrap.find('input[name="protected_branch[merge_access_levels_attributes][0][access_level]"]');
-      const $allowedToPushInput = this.$wrap.find('input[name="protected_branch[push_access_levels_attributes][0][access_level]"]');
+    const $branchInput = this.$form.find('input[name="protected_branch[name]"]');
+    const $allowedToMergeInput = this.$form.find('input[name="protected_branch[merge_access_levels_attributes][0][access_level]"]');
+    const $allowedToPushInput = this.$form.find('input[name="protected_branch[push_access_levels_attributes][0][access_level]"]');
 
     this.$form.find('input[type="submit"]').attr('disabled', !($branchInput.val() && $allowedToMergeInput.length && $allowedToPushInput.length));
   }
-  };
-})(window);
+}

app/assets/javascripts/protected_branches/protected_branch_dropdown.js

-/* eslint-disable comma-dangle, no-unused-vars */
-
-class ProtectedBranchDropdown {
+export default class ProtectedBranchDropdown {
+  /**
+   * @param {Object} options containing
+   *                         `$dropdown` target element
+   *                          `onSelect` event callback
+   * $dropdown must be an element created using `dropdown_branch()` rails helper
+   */
   constructor(options) {
     this.onSelect = options.onSelect;
     this.$dropdown = options.$dropdown;
@@ -12,7 +16,7 @@ class ProtectedBranchDropdown {
     this.bindEvents();
 
     // Hide footer
-    this.$dropdownFooter.addClass('hidden');
+    this.toggleFooter(true);
   }
 
   buildDropdown() {
@@ -21,7 +25,7 @@ class ProtectedBranchDropdown {
       filterable: true,
       remote: false,
       search: {
-        fields: ['title']
+        fields: ['title'],
       },
       selectable: true,
       toggleLabel(selected) {
@@ -36,10 +40,9 @@ class ProtectedBranchDropdown {
       },
       onFilter: this.toggleCreateNewButton.bind(this),
       clicked: (options) => {
-        const { $el, e } = options;
-        e.preventDefault();
+        options.e.preventDefault();
         this.onSelect();
-      }
+      },
     });
   }
 
@@ -64,20 +67,22 @@ class ProtectedBranchDropdown {
   }
 
   toggleCreateNewButton(branchName) {
+    if (branchName) {
       this.selectedBranch = {
         title: branchName,
         id: branchName,
-      text: branchName
+        text: branchName,
       };
 
-    if (branchName) {
       this.$dropdownContainer
         .find('.js-create-new-protected-branch code')
         .text(branchName);
     }
 
-    this.$dropdownFooter.toggleClass('hidden', !branchName);
+    this.toggleFooter(!branchName);
   }
-}
 
-window.ProtectedBranchDropdown = ProtectedBranchDropdown;
+  toggleFooter(toggleState) {
+    this.$dropdownFooter.toggleClass('hidden', toggleState);
+  }
+}

app/assets/javascripts/protected_branches/protected_branch_edit.js

-/* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, max-len */
+/* eslint-disable no-new */
 /* global Flash */
 
-(global => {
-  global.gl = global.gl || {};
+import ProtectedBranchAccessDropdown from './protected_branch_access_dropdown';
 
-  gl.ProtectedBranchEdit = class {
+export default class ProtectedBranchEdit {
   constructor(options) {
     this.$wrap = options.$wrap;
     this.$allowedToMergeDropdown = this.$wrap.find('.js-allowed-to-merge');
     this.$allowedToPushDropdown = this.$wrap.find('.js-allowed-to-push');
+    this.onSelectCallback = this.onSelect.bind(this);
 
     this.buildDropdowns();
   }
 
   buildDropdowns() {
     // Allowed to merge dropdown
-      new gl.ProtectedBranchAccessDropdown({
+    this.protectedBranchAccessDropdown = new ProtectedBranchAccessDropdown({
       $dropdown: this.$allowedToMergeDropdown,
       data: gon.merge_access_levels,
-        onSelect: this.onSelect.bind(this)
+      onSelect: this.onSelectCallback,
     });
 
     // Allowed to push dropdown
-      new gl.ProtectedBranchAccessDropdown({
+    this.protectedBranchAccessDropdown = new ProtectedBranchAccessDropdown({
       $dropdown: this.$allowedToPushDropdown,
       data: gon.push_access_levels,
-        onSelect: this.onSelect.bind(this)
+      onSelect: this.onSelectCallback,
     });
   }
 
@@ -48,22 +48,20 @@
         protected_branch: {
           merge_access_levels_attributes: [{
             id: this.$allowedToMergeDropdown.data('access-level-id'),
-              access_level: $allowedToMergeInput.val()
+            access_level: $allowedToMergeInput.val(),
           }],
           push_access_levels_attributes: [{
             id: this.$allowedToPushDropdown.data('access-level-id'),
-              access_level: $allowedToPushInput.val()
-            }]
-          }
+            access_level: $allowedToPushInput.val(),
+          }],
+        },
       },
       error() {
-          $.scrollTo(0);
-          new Flash('Failed to update branch!');
-        }
+        new Flash('Failed to update branch!', null, $('.js-protected-branches-list'));
+      },
     }).always(() => {
       this.$allowedToMergeDropdown.enable();
       this.$allowedToPushDropdown.enable();
     });
   }
-  };
-})(window);
+}

app/assets/javascripts/protected_branches/protected_branch_edit_list.js

-/* eslint-disable arrow-parens, no-param-reassign, no-new, comma-dangle */
+/* eslint-disable no-new */
 
-(global => {
-  global.gl = global.gl || {};
+import ProtectedBranchEdit from './protected_branch_edit';
 
-  gl.ProtectedBranchEditList = class {
+export default class ProtectedBranchEditList {
   constructor() {
     this.$wrap = $('.protected-branches-list');
+    this.initEditForm();
+  }
 
-      // Build edit forms
+  initEditForm() {
     this.$wrap.find('.js-protected-branch-edit-form').each((i, el) => {
-        new gl.ProtectedBranchEdit({
-          $wrap: $(el)
+      new ProtectedBranchEdit({
+        $wrap: $(el),
       });
     });
   }
-  };
-})(window);
+}

app/assets/javascripts/protected_branches/protected_branches_bundle.js

-import './protected_branch_access_dropdown';
-import './protected_branch_create';
-import './protected_branch_dropdown';
-import './protected_branch_edit';
-import './protected_branch_edit_list';

app/assets/javascripts/protected_tags/index.js

-export { default as ProtectedTagCreate } from './protected_tag_create';
-export { default as ProtectedTagEditList } from './protected_tag_edit_list';
+/* 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/assets/stylesheets/pages/projects.scss

@@ -742,7 +742,8 @@ pre.light-well {
   }
 }
 
-.protected-tags-list {
+.protected-tags-list,
+.protected-branches-list {
   .dropdown-menu-toggle {
     width: 100%;
     max-width: 300px;

app/views/projects/protected_branches/shared/_branches_list.html.haml

-.panel.panel-default.protected-branches-list
+.panel.panel-default.protected-branches-list.js-protected-branches-list
   - if @protected_branches.empty?
     .panel-heading
       %h3.panel-title
@@ -23,6 +23,8 @@
           - if can_admin_project
             %th
       %tbody
+        %tr
+          %td.flash-container{ colspan: 5 }
         = yield
 
     = paginate @protected_branches, theme: 'gitlab'

app/views/projects/protected_branches/shared/_create_protected_branch.html.haml

-= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch] do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch], html: { class: 'new-protected-branch js-new-protected-branch' } do |f|
   .panel.panel-default
     .panel-heading
       %h3.panel-title

app/views/projects/protected_tags/shared/_tags_list.html.haml

-.panel.panel-default.protected-tags-list
+.panel.panel-default.protected-tags-list.js-protected-tags-list
   - if @protected_tags.empty?
     .panel-heading
       %h3.panel-title

config/webpack.config.js

@@ -56,7 +56,7 @@ var config = {
     pipelines_details:     './pipelines/pipeline_details_bundle.js',
     profile:              './profile/profile_bundle.js',
     prometheus_metrics:   './prometheus_metrics',
-    protected_branches:   './protected_branches/protected_branches_bundle.js',
+    protected_branches:   './protected_branches',
     protected_tags:       './protected_tags',
     sidebar:              './sidebar/sidebar_bundle.js',
     schedule_form:        './pipeline_schedules/pipeline_schedule_form_bundle.js',

spec/support/shared_examples/features/protected_branches_access_control_ce.rb

@@ -5,7 +5,7 @@ shared_examples "protected branches > access control > CE" do
 
       set_protected_branch_name('master')
 
-      within('.new_protected_branch') do
+      within('.js-new-protected-branch') do
         allowed_to_push_button = find(".js-allowed-to-push")
 
         unless allowed_to_push_button.text == access_type_name
@@ -50,7 +50,7 @@ shared_examples "protected branches > access control > CE" do
 
       set_protected_branch_name('master')
 
-      within('.new_protected_branch') do
+      within('.js-new-protected-branch') do
         allowed_to_merge_button = find(".js-allowed-to-merge")
 
         unless allowed_to_merge_button.text == access_type_name