Add customer relations group setting

This MR removes the customer relations feature flag and introduces a new group setting to enable crm. Changelog: added

Add customer relations group setting
This MR removes the customer relations feature flag and introduces a new group setting to enable crm. Changelog: added
3ecdc804 · Lee Tickett · Mayra Cabrera · 8ad3d6eb · 3ecdc804 · 3ecdc804
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -276,7 +276,8 @@ def group_params_attributes
      :resource_access_token_creation_allowed,
      :prevent_sharing_groups_outside_hierarchy,
      :setup_for_company,
-      :jobs_to_be_done
+      :jobs_to_be_done,
+      :crm_enabled
    ]
  end


--- a/app/graphql/mutations/issues/set_crm_contacts.rb
+++ b/app/graphql/mutations/issues/set_crm_contacts.rb
@@ -18,7 +18,8 @@ class SetCrmContacts < Base
      def resolve(project_path:, iid:, contact_ids:, operation_mode: Types::MutationOperationModeEnum.enum[:replace])
        issue = authorized_find!(project_path: project_path, iid: iid)
        project = issue.project
-        raise Gitlab::Graphql::Errors::ResourceNotAvailable, 'Feature disabled' unless Feature.enabled?(:customer_relations, project.group, default_enabled: :yaml)
+
+        raise Gitlab::Graphql::Errors::ResourceNotAvailable, 'Feature disabled' unless feature_enabled?(project)

        contact_ids = contact_ids.compact.map do |contact_id|
          raise Gitlab::Graphql::Errors::ArgumentError, "Contact #{contact_id} is invalid." unless contact_id.respond_to?(:model_id)
@@ -43,6 +44,12 @@ def resolve(project_path:, iid:, contact_ids:, operation_mode: Types::MutationOp
          errors: response.errors
        }
      end
+
+      private
+
+      def feature_enabled?(project)
+        Feature.enabled?(:customer_relations, project.group, default_enabled: :yaml) && project.group&.crm_enabled?
+      end
    end
  end
 end
--- a/app/helpers/groups/crm_settings_helper.rb
+++ b/app/helpers/groups/crm_settings_helper.rb
+# frozen_string_literal: true
+
+module Groups
+  module CrmSettingsHelper
+    def crm_feature_flag_enabled?(group)
+      Feature.enabled?(:customer_relations, group)
+    end
+  end
+end
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -75,7 +75,7 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
  with_scope :subject
  condition(:has_project_with_service_desk_enabled) { @subject.has_project_with_service_desk_enabled? }

-  condition(:crm_enabled, score: 0, scope: :subject) { Feature.enabled?(:customer_relations, @subject) }
+  condition(:crm_enabled, score: 0, scope: :subject) { Feature.enabled?(:customer_relations, @subject) && @subject.crm_enabled? }

  with_scope :subject
  condition(:group_runner_registration_allowed, score: 0, scope: :subject) do

--- a/app/services/groups/update_service.rb
+++ b/app/services/groups/update_service.rb
@@ -107,6 +107,7 @@ def remove_unallowed_params

    def handle_changes
      handle_settings_update
+      handle_crm_settings_update unless params[:crm_enabled].nil?
    end

    def handle_settings_update
@@ -116,6 +117,15 @@ def handle_settings_update
      ::NamespaceSettings::UpdateService.new(current_user, group, settings_params).execute
    end

+    def handle_crm_settings_update
+      crm_enabled = params.delete(:crm_enabled)
+      return if group.crm_enabled? == crm_enabled
+
+      crm_settings = group.crm_settings || group.build_crm_settings
+      crm_settings.enabled = crm_enabled
+      crm_settings.save
+    end
+
    def allowed_settings_params
      SETTINGS_PARAMS
    end

--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -20,11 +20,11 @@
 %section.settings.gs-permissions.no-animate#js-permissions-settings{ class: ('expanded' if expanded), data: { qa_selector: 'permission_lfs_2fa_content' } }
  .settings-header
    %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' }
-      = _('Permissions, LFS, 2FA')
+      = _('Permissions and group features')
    %button.btn.gl-button.js-settings-toggle{ type: 'button' }
      = expanded ? _('Collapse') : _('Expand')
    %p
-      = _('Configure advanced permissions, Large File Storage, and two-factor authentication settings.')
+      = _('Configure advanced permissions, Large File Storage, two-factor authentication, and customer relations settings.')
  .settings-content
    = render 'groups/settings/permissions'


--- a/app/views/groups/settings/_permissions.html.haml
+++ b/app/views/groups/settings/_permissions.html.haml
@@ -41,4 +41,13 @@
    = render 'groups/settings/two_factor_auth', f: f, group: @group
    = render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group
    = render 'groups/settings/membership', f: f, group: @group
+
+    - if crm_feature_flag_enabled?(@group)
+      %h5= _('Customer relations')
+      .form-group.gl-mb-3
+        = f.gitlab_ui_checkbox_component :crm_enabled,
+            s_('GroupSettings|Enable customer relations'),
+            checkbox_options: { checked: @group.crm_enabled? },
+            help_text: s_('GroupSettings|Allows creating organizations and contacts and associating them with issues.')
+
  = f.submit _('Save changes'), class: 'btn gl-button btn-confirm gl-mt-3 js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' }
--- a/doc/security/two_factor_authentication.md
+++ b/doc/security/two_factor_authentication.md
@@ -49,7 +49,7 @@ Gitlab::CurrentSettings.update!('require_two_factor_authentication': false)
 To enforce 2FA only for certain groups:

 1. Go to the group's **Settings > General** page.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Select the **Require all users in this group to set up two-factor authentication** option.

 You can also specify a grace period in the **Time before enforced** option.
@@ -76,7 +76,7 @@ The following are important notes about 2FA:
  groups) the shortest grace period is used.
 - It is possible to disallow subgroups from setting up their own 2FA requirements:
  1. Go to the top-level group's **Settings > General**.
-  1. Expand the **Permissions, LFS, 2FA** section.
+  1. Expand the **Permissions and group features** section.
  1. Uncheck the **Allow subgroups to set up their own two-factor authentication rule** field.

  This action causes all subgroups with 2FA requirements to stop requiring that from their members.

--- a/doc/user/crm/index.md
+++ b/doc/user/crm/index.md
@@ -6,13 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w

 # Customer relations management (CRM) **(FREE)**

-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/2256) in GitLab 14.6 [with a flag](../../administration/feature_flags.md) named `customer_relations`. Disabled by default.
-
-FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available,
-ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `customer_relations`.
-On GitLab.com, this feature is not available.
-You should not use this feature for production environments.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/2256) in GitLab 14.6 [with a flag](../../administration/feature_flags.md) named `customer_relations`. Disabled by default.

 With customer relations management (CRM) you can create a record of contacts
 (individuals) and organizations (companies) and relate them to issues.
@@ -20,6 +14,16 @@ With customer relations management (CRM) you can create a record of contacts
 You can use contacts and organizations to tie work to customers for billing and reporting purposes.
 To read more about what is planned for the future, see [issue 2256](https://gitlab.com/gitlab-org/gitlab/-/issues/2256).

+## Enable customer relations management (CRM)
+
+To enable customer relations management in a group:
+
+1. On the top bar, select **Menu > Groups** and find your group.
+1. On the left sidebar, select **Settings > General**.
+1. Expand the **Permissions and group features** section.
+1. Select **Enable customer relations**.
+1. Select **Save changes**.
+
 ## Contacts

 ### View contacts linked to a group

--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -123,7 +123,7 @@ your group.
 1. Select **Your Groups**.
 1. Find the group and select it.
 1. From the left menu, select **Settings > General**.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Clear the **Allow users to request access** checkbox.
 1. Select **Save changes**.

@@ -219,7 +219,7 @@ To change this setting for a specific group:
 1. Select **Your Groups**.
 1. Find the group and select it.
 1. From the left menu, select **Settings > General**.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Select the desired option in the **Default branch protection** dropdown list.
 1. Select **Save changes**.

@@ -250,7 +250,7 @@ To change this setting for a specific group:
 1. Select **Your Groups**.
 1. Find the group and select it.
 1. From the left menu, select **Settings > General**.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Select the desired option in the **Allowed to create projects** dropdown list.
 1. Select **Save changes**.

@@ -489,7 +489,7 @@ If you select this setting in the **Animals** group:
 To prevent sharing outside of the group's hierarchy:

 1. Go to the group's **Settings > General** page.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Select **Prevent members from sending invitations to groups outside of `<group_name>` and its subgroups**.
 1. Select **Save changes**.

@@ -501,7 +501,7 @@ a project with another group](../project/members/share_project_with_groups.md) t
 To prevent a project from being shared with other groups:

 1. Go to the group's **Settings > General** page.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Select **Prevent sharing a project within `<group_name>` with other groups**.
 1. Select **Save changes**.

@@ -523,7 +523,7 @@ The setting does not cascade. Projects in subgroups observe the subgroup configu
 To prevent members from being added to projects in a group:

 1. Go to the group's **Settings > General** page.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Under **Member lock**, select **Prevent adding new members to project membership within this group**.
 1. Select **Save changes**.

@@ -574,7 +574,7 @@ You should consider these security implications before configuring IP address re
 To restrict group access by IP address:

 1. Go to the group's **Settings > General** page.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. In the **Allow access to the following IP addresses** field, enter IP address ranges in CIDR notation.
 1. Select **Save changes**.

@@ -591,7 +591,7 @@ You can prevent users with email addresses in specific domains from being added
 To restrict group access by domain:

 1. Go to the group's **Settings > General** page.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. In the **Restrict membership by email** field, enter the domain names.
 1. Select **Save changes**.

@@ -645,7 +645,7 @@ You can disable all email notifications related to the group, which includes its
 To disable email notifications:

 1. Go to the group's **Settings > General** page.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Select **Disable email notifications**.
 1. Select **Save changes**.

@@ -663,7 +663,7 @@ This is particularly helpful for groups with a large number of users.
 To disable group mentions:

 1. Go to the group's **Settings > General** page.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Select **Disable group mentions**.
 1. Select **Save changes**.

@@ -688,7 +688,7 @@ the default setting.
 To enable delayed deletion of projects in a group:

 1. Go to the group's **Settings > General** page.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Check **Enable delayed project deletion**.
 1. Optional. To prevent subgroups from changing this setting, select **Enforce for all subgroups**.
 1. Select **Save changes**.
@@ -713,7 +713,7 @@ If even one is set to `true`, then the group does not allow outside forks.
 To prevent projects from being forked outside the group:

 1. Go to the top-level group's **Settings > General** page.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Check **Prevent project forking outside current group**.
 1. Select **Save changes**.


--- a/doc/user/group/saml_sso/group_managed_accounts.md
+++ b/doc/user/group/saml_sso/group_managed_accounts.md
@@ -113,7 +113,7 @@ on the lifetime of personal access tokens apply.
 To set a limit on how long personal access tokens are valid for users in a group managed account:

 1. Navigate to the **Settings > General** page in your group's sidebar.
-1. Expand the **Permissions, LFS, 2FA** section.
+1. Expand the **Permissions and group features** section.
 1. Fill in the **Maximum allowable lifetime for personal access tokens (days)** field.
 1. Click **Save changes**.


--- a/doc/user/group/subgroups/index.md
+++ b/doc/user/group/subgroups/index.md
@@ -101,7 +101,7 @@ You can change this setting:
 - As group owner:
  1. Select the group.
  1. On the left sidebar, select **Settings > General**.
-  1. Expand **Permissions, LFS, 2FA**.
+  1. Expand **Permissions and group features**.
 - As an administrator:
  1. On the top bar, select **Menu > Admin**.
  1. On the left sidebar, select **Overview > Groups**.

--- a/doc/user/project/settings/project_access_tokens.md
+++ b/doc/user/project/settings/project_access_tokens.md
@@ -78,7 +78,7 @@ To enable or disable project access token creation for all projects in a top-lev

 1. On the top bar, select **Menu > Groups** and find your group.
 1. On the left sidebar, select **Settings > General**.
-1. Expand **Permissions, LFS, 2FA**.
+1. Expand **Permissions and group features**.
 1. Under **Permissions**, turn on or off **Allow project access token creation**.

 Even when creation is disabled, you can still use and revoke existing project access tokens.

--- a/ee/spec/features/groups/navbar_spec.rb
+++ b/ee/spec/features/groups/navbar_spec.rb
@@ -191,10 +191,11 @@
      it_behaves_like 'verified navigation bar'
    end

-    context 'when customer_relations feature flag is enabled' do
+    context 'when customer relations feature and flag is enabled' do
+      let(:group) { create(:group, :crm_enabled) }
+
      before do
        stub_feature_flags(customer_relations: true)
-
        insert_customer_relations_nav(_('Analytics'))

        visit group_path(group)

--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -9034,7 +9034,7 @@ msgstr ""
 msgid "Configure a %{codeStart}.gitlab-webide.yml%{codeEnd} file in the %{codeStart}.gitlab%{codeEnd} directory to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}"
 msgstr ""
  
-msgid "Configure advanced permissions, Large File Storage, and two-factor authentication settings."
+msgid "Configure advanced permissions, Large File Storage, two-factor authentication, and customer relations settings."
 msgstr ""
  
 msgid "Configure existing installation"
@@ -17078,6 +17078,9 @@ msgstr ""
 msgid "GroupSettings|Allow project access token creation"
 msgstr ""
  
+msgid "GroupSettings|Allows creating organizations and contacts and associating them with issues."
+msgstr ""
+
 msgid "GroupSettings|Applied to all subgroups unless overridden by a group owner. Groups already added to the project lose access."
 msgstr ""
  
@@ -17123,6 +17126,9 @@ msgstr ""
 msgid "GroupSettings|Disable group mentions"
 msgstr ""
  
+msgid "GroupSettings|Enable customer relations"
+msgstr ""
+
 msgid "GroupSettings|Enable delayed project deletion"
 msgstr ""
  
@@ -25810,7 +25816,7 @@ msgstr ""
 msgid "Permissions Help"
 msgstr ""
  
-msgid "Permissions, LFS, 2FA"
+msgid "Permissions and group features"
 msgstr ""
  
 msgid "Personal Access Token"

--- a/spec/factories/groups.rb
+++ b/spec/factories/groups.rb
@@ -112,5 +112,11 @@ def create_graph(parent: nil, children: 4, depth: 4)
        )
      end
    end
+
+    trait :crm_enabled do
+      after(:create) do |group|
+        create(:crm_settings, group: group, enabled: true)
+      end
+    end
  end
 end
--- a/spec/features/groups/navbar_spec.rb
+++ b/spec/features/groups/navbar_spec.rb
@@ -9,7 +9,8 @@
  include_context 'group navbar structure'

  let_it_be(:user) { create(:user) }
-  let_it_be(:group) { create(:group) }
+
+  let(:group) { create(:group) }

  before do
    insert_package_nav(_('Kubernetes'))
@@ -40,7 +41,9 @@
    it_behaves_like 'verified navigation bar'
  end

-  context 'when customer_relations feature flag is enabled' do
+  context 'when customer_relations feature and flag is enabled' do
+    let(:group) { create(:group, :crm_enabled) }
+
    before do
      stub_feature_flags(customer_relations: true)


--- a/spec/graphql/mutations/customer_relations/contacts/create_spec.rb
+++ b/spec/graphql/mutations/customer_relations/contacts/create_spec.rb
@@ -4,8 +4,8 @@

 RSpec.describe Mutations::CustomerRelations::Contacts::Create do
  let_it_be(:user) { create(:user) }
-  let_it_be(:group) { create(:group) }

+  let(:group) { create(:group, :crm_enabled) }
  let(:not_found_or_does_not_belong) { 'The specified organization was not found or does not belong to this group' }
  let(:valid_params) do
    attributes_for(:contact,
@@ -34,11 +34,11 @@
    end

    context 'when the user has permission' do
-      before_all do
+      before do
        group.add_developer(user)
      end

-      context 'when the feature is disabled' do
+      context 'when the feature flag is disabled' do
        before do
          stub_feature_flags(customer_relations: false)
        end
@@ -49,6 +49,15 @@
        end
      end

+      context 'when crm_enabled is false' do
+        let(:group) { create(:group) }
+
+        it 'raises an error' do
+          expect { resolve_mutation }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+            .with_message("The resource that you are attempting to access does not exist or you don't have permission to perform this action")
+        end
+      end
+
      context 'when the params are invalid' do
        it 'returns the validation error' do
          valid_params[:first_name] = nil

--- a/spec/graphql/mutations/customer_relations/contacts/update_spec.rb
+++ b/spec/graphql/mutations/customer_relations/contacts/update_spec.rb
@@ -4,7 +4,7 @@

 RSpec.describe Mutations::CustomerRelations::Contacts::Update do
  let_it_be(:user) { create(:user) }
-  let_it_be(:group) { create(:group) }
+  let_it_be(:group) { create(:group, :crm_enabled) }

  let(:first_name) { 'Lionel' }
  let(:last_name) { 'Smith' }

--- a/spec/graphql/mutations/customer_relations/organizations/create_spec.rb
+++ b/spec/graphql/mutations/customer_relations/organizations/create_spec.rb
@@ -4,7 +4,7 @@

 RSpec.describe Mutations::CustomerRelations::Organizations::Create do
  let_it_be(:user) { create(:user) }
-  let_it_be(:group) { create(:group) }
+  let_it_be(:group) { create(:group, :crm_enabled) }

  let(:valid_params) do
    attributes_for(:organization,