Merge branch '443268-add-minimal-access-support-to-custom-roles' into 'master'

Support minimal access base for custom roles

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



Merged-by: Lee Tickett <ltickett@gitlab.com>
Approved-by: Jarka Košanová <jarka@gitlab.com>
Approved-by: Alper Akgun <aakgun@gitlab.com>
Approved-by: Alexander Turinske <aturinske@gitlab.com>
Reviewed-by: Alper Akgun <aakgun@gitlab.com>
Reviewed-by: Lee Tickett <ltickett@gitlab.com>

app/assets/javascripts/access_level/constants.js

@@ -25,6 +25,11 @@ export const BASE_ROLES = [
   { value: 'OWNER', text: ACCESS_LEVEL_OWNER },
 ];
 
+export const BASE_ROLES_INC_MINIMAL_ACCESS = [
+  { value: 'MINIMAL_ACCESS', text: ACCESS_LEVEL_MINIMAL_ACCESS },
+  ...BASE_ROLES,
+];
+
 export const ACCESS_LEVEL_LABELS = {
   [ACCESS_LEVEL_NO_ACCESS_INTEGER]: ACCESS_LEVEL_NO_ACCESS,
   [ACCESS_LEVEL_MINIMAL_ACCESS_INTEGER]: ACCESS_LEVEL_MINIMAL_ACCESS,

ee/app/assets/javascripts/roles_and_permissions/components/create_member_role.vue

@@ -14,7 +14,7 @@ import {
 import { difference, pull } from 'lodash';
 import { createAlert } from '~/alert';
 import { sprintf, s__, __ } from '~/locale';
-import { BASE_ROLES } from '~/access_level/constants';
+import { BASE_ROLES_INC_MINIMAL_ACCESS } from '~/access_level/constants';
 import memberRolePermissionsQuery from 'ee/roles_and_permissions/graphql/member_role_permissions.query.graphql';
 import { visitUrl } from '~/lib/utils/url_utility';
 import { helpPagePath } from '~/helpers/help_page_helper';
@@ -217,7 +217,7 @@ export default {
       }
     },
   },
-  BASE_ROLES,
+  BASE_ROLES_INC_MINIMAL_ACCESS,
 };
 </script>
 
@@ -278,7 +278,7 @@ export default {
         id="base-role-select"
         v-model="baseRole"
         width="md"
-        :options="$options.BASE_ROLES"
+        :options="$options.BASE_ROLES_INC_MINIMAL_ACCESS"
         :state="baseRoleValid"
       />
     </gl-form-group>

ee/app/models/members/member_role.rb

@@ -6,7 +6,9 @@ class MemberRole < ApplicationRecord # rubocop:disable Gitlab/NamespacedClass
 
   MAX_COUNT_PER_GROUP_HIERARCHY = 10
 
-  LEVELS = ::Gitlab::Access.options_with_owner.values.freeze
+  # base_access_level is validated against this array,
+  # so a migration may be needed if you change it
+  LEVELS = ::Gitlab::Access.options_with_minimal_access.values.freeze
 
   has_many :members
   has_many :saml_providers

ee/spec/frontend/roles_and_permissions/components/create_member_role_spec.js

@@ -88,6 +88,7 @@ describe('CreateMemberRole', () => {
     createComponent({ stubs });
 
     expect(findSelect().props('options')).toEqual([
+      { value: 'MINIMAL_ACCESS', text: 'Minimal Access' },
       { value: 'GUEST', text: 'Guest' },
       { value: 'REPORTER', text: 'Reporter' },
       { value: 'DEVELOPER', text: 'Developer' },

ee/spec/models/members/member_role_spec.rb

@@ -17,7 +17,11 @@
 
     it { is_expected.to validate_presence_of(:name) }
     it { is_expected.to validate_presence_of(:base_access_level) }
-    it { is_expected.to validate_inclusion_of(:base_access_level).in_array(described_class::LEVELS) }
+
+    it do
+      is_expected.to validate_inclusion_of(:base_access_level)
+        .in_array(::Gitlab::Access.options_with_minimal_access.values.freeze)
+    end
 
     describe 'name uniqueness validation' do
       let_it_be(:group) { create(:group) }