Prettify protected_branches and protected_tags modules

4 files changed, 68 insertions, 40 deletions

diff --git a/app/assets/javascripts/protected_branches/protected_branch_create.js b/app/assets/javascripts/protected_branches/protected_branch_create.js
index b601b19e7be..48343c8ba0a 100644
--- a/app/assets/javascripts/protected_branches/protected_branch_create.js
+++ b/app/assets/javascripts/protected_branches/protected_branch_create.js
@@ -46,8 +46,12 @@ export default class ProtectedBranchCreate {
   onSelect() {
     // Enable submit button
     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]"]');
+    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]"]',
+    );
     const completedForm = !(
       $branchInput.val() &&
       $allowedToMergeInput.length &&
diff --git a/app/assets/javascripts/protected_branches/protected_branch_edit.js b/app/assets/javascripts/protected_branches/protected_branch_edit.js
index 54560d08ad7..5bc08f60d16 100644
--- a/app/assets/javascripts/protected_branches/protected_branch_edit.js
+++ b/app/assets/javascripts/protected_branches/protected_branch_edit.js
@@ -29,8 +29,12 @@ export default class ProtectedBranchEdit {
   }
 
   onSelect() {
-    const $allowedToMergeInput = this.$wrap.find(`input[name="${this.$allowedToMergeDropdown.data('fieldName')}"]`);
-    const $allowedToPushInput = this.$wrap.find(`input[name="${this.$allowedToPushDropdown.data('fieldName')}"]`);
+    const $allowedToMergeInput = this.$wrap.find(
+      `input[name="${this.$allowedToMergeDropdown.data('fieldName')}"]`,
+    );
+    const $allowedToPushInput = this.$wrap.find(
+      `input[name="${this.$allowedToPushDropdown.data('fieldName')}"]`,
+    );
 
     // Do not update if one dropdown has not selected any option
     if (!($allowedToMergeInput.length && $allowedToPushInput.length)) return;
@@ -38,25 +42,36 @@ export default class ProtectedBranchEdit {
     this.$allowedToMergeDropdown.disable();
     this.$allowedToPushDropdown.disable();
 
-    axios.patch(this.$wrap.data('url'), {
-      protected_branch: {
-        merge_access_levels_attributes: [{
-          id: this.$allowedToMergeDropdown.data('accessLevelId'),
-          access_level: $allowedToMergeInput.val(),
-        }],
-        push_access_levels_attributes: [{
-          id: this.$allowedToPushDropdown.data('accessLevelId'),
-          access_level: $allowedToPushInput.val(),
-        }],
-      },
-    }).then(() => {
-      this.$allowedToMergeDropdown.enable();
-      this.$allowedToPushDropdown.enable();
-    }).catch(() => {
-      this.$allowedToMergeDropdown.enable();
-      this.$allowedToPushDropdown.enable();
-
-      flash('Failed to update branch!', 'alert', document.querySelector('.js-protected-branches-list'));
-    });
+    axios
+      .patch(this.$wrap.data('url'), {
+        protected_branch: {
+          merge_access_levels_attributes: [
+            {
+              id: this.$allowedToMergeDropdown.data('accessLevelId'),
+              access_level: $allowedToMergeInput.val(),
+            },
+          ],
+          push_access_levels_attributes: [
+            {
+              id: this.$allowedToPushDropdown.data('accessLevelId'),
+              access_level: $allowedToPushInput.val(),
+            },
+          ],
+        },
+      })
+      .then(() => {
+        this.$allowedToMergeDropdown.enable();
+        this.$allowedToPushDropdown.enable();
+      })
+      .catch(() => {
+        this.$allowedToMergeDropdown.enable();
+        this.$allowedToPushDropdown.enable();
+
+        flash(
+          'Failed to update branch!',
+          'alert',
+          document.querySelector('.js-protected-branches-list'),
+        );
+      });
   }
 }
diff --git a/app/assets/javascripts/protected_tags/protected_tag_create.js b/app/assets/javascripts/protected_tags/protected_tag_create.js
index 2f8116df0d2..fddf2674cbb 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_create.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_create.js
@@ -40,7 +40,9 @@ export default class ProtectedTagCreate {
     const $tagInput = this.$form.find('input[name="protected_tag[name]"]');
     const $allowedToCreateInput = this.$form.find('#create_access_levels_attributes');
 
-    this.$form.find('input[type="submit"]').prop('disabled', !($tagInput.val() && $allowedToCreateInput.length));
+    this.$form
+      .find('input[type="submit"]')
+      .prop('disabled', !($tagInput.val() && $allowedToCreateInput.length));
   }
 
   static getProtectedTags(term, callback) {
diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js
index 8687b2a4044..c52497e62f2 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_edit.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js
@@ -21,26 +21,33 @@ export default class ProtectedTagEdit {
   }
 
   onSelect() {
-    const $allowedToCreateInput = this.$wrap.find(`input[name="${this.$allowedToCreateDropdownButton.data('fieldName')}"]`);
+    const $allowedToCreateInput = this.$wrap.find(
+      `input[name="${this.$allowedToCreateDropdownButton.data('fieldName')}"]`,
+    );
 
     // Do not update if one dropdown has not selected any option
     if (!$allowedToCreateInput.length) return;
 
     this.$allowedToCreateDropdownButton.disable();
 
-    axios.patch(this.$wrap.data('url'), {
-      protected_tag: {
-        create_access_levels_attributes: [{
-          id: this.$allowedToCreateDropdownButton.data('accessLevelId'),
-          access_level: $allowedToCreateInput.val(),
-        }],
-      },
-    }).then(() => {
-      this.$allowedToCreateDropdownButton.enable();
-    }).catch(() => {
-      this.$allowedToCreateDropdownButton.enable();
-
-      flash('Failed to update tag!', 'alert', document.querySelector('.js-protected-tags-list'));
-    });
+    axios
+      .patch(this.$wrap.data('url'), {
+        protected_tag: {
+          create_access_levels_attributes: [
+            {
+              id: this.$allowedToCreateDropdownButton.data('accessLevelId'),
+              access_level: $allowedToCreateInput.val(),
+            },
+          ],
+        },
+      })
+      .then(() => {
+        this.$allowedToCreateDropdownButton.enable();
+      })
+      .catch(() => {
+        this.$allowedToCreateDropdownButton.enable();
+
+        flash('Failed to update tag!', 'alert', document.querySelector('.js-protected-tags-list'));
+      });
   }
 }