Merge branch '498702-br-squash-settings-rename-drawer' into 'master'

Rename RuleDrawer to AccessLevelsDrawer

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/175971



Merged-by: Paulina Sedlak-Jakubowska <psedlak-jakubowska@gitlab.com>
Approved-by: Jay Montal <jmontal@gitlab.com>
Approved-by: Paulina Sedlak-Jakubowska <psedlak-jakubowska@gitlab.com>
Co-authored-by: Jacques <jerasmus@gitlab.com>

app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue

@@ -32,7 +32,7 @@ import {
 import deleteBranchRuleMutation from '../../mutations/branch_rule_delete.mutation.graphql';
 import BranchRuleModal from '../../../components/branch_rule_modal.vue';
 import Protection from './protection.vue';
-import RuleDrawer from './rule_drawer.vue';
+import AccessLevelsDrawer from './access_levels_drawer.vue';
 import ProtectionToggle from './protection_toggle.vue';
 import {
   I18N,
@@ -68,7 +68,7 @@ export default {
     GlModal,
     GlButton,
     BranchRuleModal,
-    RuleDrawer,
+    AccessLevelsDrawer,
     PageHeading,
     CrudComponent,
     SettingsSection,
@@ -470,7 +470,7 @@ export default {
           @edit="openAllowedToPushAndMergeDrawer"
         />
 
-        <rule-drawer
+        <access-levels-drawer
           :is-open="isAllowedToMergeDrawerOpen || isAllowedToPushAndMergeDrawerOpen"
           :roles="accessLevelsDrawerData.roles"
           :users="accessLevelsDrawerData.users"

ee/spec/frontend/projects/settings/branch_rules/components/view/rule_drawer_spec.js → ee/spec/frontend/projects/settings/branch_rules/components/view/access_levels_drawer_spec.js

 import { nextTick } from 'vue';
 import { GlFormCheckbox } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import RuleDrawer from '~/projects/settings/branch_rules/components/view/rule_drawer.vue';
+import AccessLevelsDrawer from '~/projects/settings/branch_rules/components/view/access_levels_drawer.vue';
 import ItemsSelector from 'ee_component/projects/settings/branch_rules/components/view/items_selector.vue';
 import {
   allowedToMergeDrawerProps,
   allowedToPushDrawerProps,
 } from 'ee_else_ce_jest/projects/settings/branch_rules/components/view/mock_data';
 
-describe('Edit Rule Drawer', () => {
+describe('Edit Access Levels Drawer', () => {
   let wrapper;
 
   const findCheckboxes = () => wrapper.findAllComponents(GlFormCheckbox);
@@ -26,7 +26,7 @@ describe('Edit Rule Drawer', () => {
     props = allowedToMergeDrawerProps,
     showEnterpriseAccessLevels = true,
   ) => {
-    wrapper = shallowMountExtended(RuleDrawer, {
+    wrapper = shallowMountExtended(AccessLevelsDrawer, {
       components: { ItemsSelector },
       propsData: {
         ...props,

spec/frontend/projects/settings/branch_rules/components/view/rule_drawer_spec.js → spec/frontend/projects/settings/branch_rules/components/view/access_levels_drawer_spec.js

@@ -3,7 +3,7 @@ import { GlDrawer, GlFormCheckbox } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { getContentWrapperHeight } from '~/lib/utils/dom_utils';
 import { DRAWER_Z_INDEX } from '~/lib/utils/constants';
-import RuleDrawer from '~/projects/settings/branch_rules/components/view/rule_drawer.vue';
+import AccessLevelsDrawer from '~/projects/settings/branch_rules/components/view/access_levels_drawer.vue';
 import {
   allowedToMergeDrawerProps,
   editRuleData,
@@ -15,7 +15,7 @@ jest.mock('~/lib/utils/dom_utils', () => ({ getContentWrapperHeight: jest.fn() }
 
 const TEST_HEADER_HEIGHT = '123px';
 
-describe('Edit Rule Drawer', () => {
+describe('Edit Access Levels Drawer', () => {
   let wrapper;
 
   const findDrawer = () => wrapper.findComponent(GlDrawer);
@@ -30,7 +30,7 @@ describe('Edit Rule Drawer', () => {
   const findNoOneCheckbox = () => wrapper.findByTestId('no-one-role-checkbox');
 
   const createComponent = (props = allowedToMergeDrawerProps) => {
-    wrapper = shallowMountExtended(RuleDrawer, {
+    wrapper = shallowMountExtended(AccessLevelsDrawer, {
       propsData: {
         ...props,
       },

spec/frontend/projects/settings/branch_rules/components/view/index_spec.js

@@ -14,7 +14,7 @@ import PageHeading from '~/vue_shared/components/page_heading.vue';
 import CrudComponent from '~/vue_shared/components/crud_component.vue';
 import SettingsSection from '~/vue_shared/components/settings/settings_section.vue';
 import RuleView from '~/projects/settings/branch_rules/components/view/index.vue';
-import RuleDrawer from '~/projects/settings/branch_rules/components/view/rule_drawer.vue';
+import AccessLevelsDrawer from '~/projects/settings/branch_rules/components/view/access_levels_drawer.vue';
 import { useMockLocationHelper } from 'helpers/mock_window_location_helper';
 import Protection from '~/projects/settings/branch_rules/components/view/protection.vue';
 import ProtectionToggle from '~/projects/settings/branch_rules/components/view/protection_toggle.vue';
@@ -108,7 +108,7 @@ describe('View branch rules', () => {
         ProjectRules: true,
         ProtectionToggle,
         BranchRuleModal,
-        RuleDrawer,
+        AccessLevelsDrawer,
         PageHeading,
         CrudComponent,
         GlSprintf,
@@ -145,7 +145,7 @@ describe('View branch rules', () => {
   const findBranchRuleModal = () => wrapper.findComponent(BranchRuleModal);
   const findBranchRuleListbox = () => wrapper.findComponent(GlCollapsibleListbox);
   const findNoDataTitle = () => wrapper.findByText(I18N.noData);
-  const findRuleDrawer = () => wrapper.findComponent(RuleDrawer);
+  const findAccessLevelsDrawer = () => wrapper.findComponent(AccessLevelsDrawer);
 
   const findMatchingBranchesLink = () =>
     wrapper.findByText(
@@ -466,14 +466,14 @@ describe('View branch rules', () => {
       return nextTick();
     };
 
-    it('rule drawer is closed by default', () => {
-      expect(findRuleDrawer().props('isOpen')).toBe(false);
+    it('access levels drawer is closed by default', () => {
+      expect(findAccessLevelsDrawer().props('isOpen')).toBe(false);
     });
 
-    it('passes expected props to rule drawer', async () => {
+    it('passes expected props to access levels drawer', async () => {
       await openEditRuleDrawer();
 
-      expect(findRuleDrawer().props()).toMatchObject({
+      expect(findAccessLevelsDrawer().props()).toMatchObject({
         ...allowedToMergeDrawerProps,
         isOpen: true,
         title,
@@ -482,10 +482,10 @@ describe('View branch rules', () => {
 
     it('when save button is clicked it calls edit rule mutation', async () => {
       await openEditRuleDrawer();
-      findRuleDrawer().vm.$emit('editRule', [{ accessLevel: 30 }]);
+      findAccessLevelsDrawer().vm.$emit('editRule', [{ accessLevel: 30 }]);
       await nextTick();
 
-      expect(findRuleDrawer().props('isLoading')).toEqual(true);
+      expect(findAccessLevelsDrawer().props('isLoading')).toEqual(true);
 
       await waitForPromises();
 
@@ -502,13 +502,13 @@ describe('View branch rules', () => {
         }),
       );
 
-      expect(findRuleDrawer().props('isLoading')).toEqual(false);
+      expect(findAccessLevelsDrawer().props('isLoading')).toEqual(false);
     });
 
     it('emits a tracking event when save button is clicked', async () => {
       const { trackEventSpy } = bindInternalEventDocument(wrapper.element);
       await openEditRuleDrawer();
-      findRuleDrawer().vm.$emit('editRule', [{ accessLevel: 30 }]);
+      findAccessLevelsDrawer().vm.$emit('editRule', [{ accessLevel: 30 }]);
       await waitForPromises();
 
       const eventName =