Merge branch '2256-auto-enable-crm' into 'master'

Enable CRM by default for new groups

See merge request !108378



Merged-by: Lee Tickett <ltickett@gitlab.com>
Approved-by: Max Orefice <morefice@gitlab.com>
Reviewed-by: Max Orefice <morefice@gitlab.com>
Reviewed-by: Eulyeon Ko <5961404-euko@users.noreply.gitlab.com>

app/models/group.rb

@@ -854,7 +854,7 @@ def group_feature
   end
 
   def crm_enabled?
-    crm_settings&.enabled?
+    crm_settings.nil? || crm_settings.enabled?
   end
 
   def shared_with_group_links_visible_to_user(user)

db/migrate/20230108205644_change_group_crm_settings_enabled_default.rb

+# frozen_string_literal: true
+
+class ChangeGroupCrmSettingsEnabledDefault < Gitlab::Database::Migration[2.1]
+  def change
+    change_column_default(:group_crm_settings, :enabled, from: false, to: true)
+  end
+end

db/schema_migrations/20230108205644

+2513a093d556b741729fc6e6015f78d5f309e4deae25f7ba379e04553e7d71f2
\ No newline at end of file

db/structure.sql

@@ -17710,7 +17710,7 @@ CREATE TABLE group_crm_settings (
     group_id bigint NOT NULL,
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
-    enabled boolean DEFAULT false NOT NULL
+    enabled boolean DEFAULT true NOT NULL
 );
 CREATE SEQUENCE group_crm_settings_group_id_seq

doc/user/crm/index.md

@@ -34,9 +34,11 @@ For more information about what is planned for the future, see [issue 2256](http
 
 ## Enable customer relations management (CRM)
 
-Customer relations management features must be enabled at the group level. If your
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108378) in GitLab 15.8.
+
+Customer relations management features are enabled at the group level. If your
 group also contains subgroups, and you want to use CRM features in the subgroup,
-you must enable CRM features for the subgroup.
+CRM features must also be enabled for the subgroup.
 
 To enable customer relations management in a group or subgroup:
 

ee/spec/features/groups/navbar_spec.rb

@@ -10,7 +10,7 @@
   include_context 'group navbar structure'
 
   let_it_be(:user) { create(:user) }
-  let_it_be(:group) { create(:group) }
+  let_it_be(:group) { create(:group, :crm_disabled) }
 
   context 'for maintainers' do
     before do
@@ -121,8 +121,8 @@
         it_behaves_like 'verified navigation bar'
       end
 
-      context 'when customer relations feature is enabled' do
-        let(:group) { create(:group, :crm_enabled) }
+      context 'when crm feature is enabled' do
+        let(:group) { create(:group) }
 
         before do
           insert_customer_relations_nav(_('Iterations'))
@@ -133,8 +133,8 @@
         it_behaves_like 'verified navigation bar'
       end
 
-      context 'when customer relations feature enabled but subgroup' do
-        let(:group) { create(:group, :crm_enabled, parent: create(:group)) }
+      context 'when crm feature enabled but subgroup' do
+        let(:group) { create(:group, parent: create(:group)) }
 
         before do
           visit group_path(group)

ee/spec/policies/group_policy_spec.rb

@@ -2541,7 +2541,7 @@ def set_access_level(access_level)
     end
 
     context 'with a public group' do
-      let_it_be(:public_group) { create(:group, :public, :crm_enabled) }
+      let_it_be(:public_group) { create(:group, :public) }
 
       subject { described_class.new(user, public_group) }
 

spec/controllers/projects/autocomplete_sources_controller_spec.rb

@@ -296,11 +296,7 @@ def members_by_username(username)
     end
 
     context 'when feature flag is enabled' do
-      context 'when a group has contact relations enabled' do
-        before do
-          create(:crm_settings, group: group, enabled: true)
-        end
-
+      context 'when a group has crm enabled' do
         context 'when a user can read contacts' do
           it 'lists contacts' do
             group.add_developer(user)
@@ -321,7 +317,11 @@ def members_by_username(username)
         end
       end
 
-      context 'when a group has contact relations disabled' do
+      context 'when a group has crm disabled' do
+        before do
+          create(:crm_settings, group: group, enabled: false)
+        end
+
         it 'renders 404' do
           group.add_developer(user)
 

spec/factories/groups.rb

@@ -113,9 +113,9 @@ def create_graph(parent: nil, children: 4, depth: 4)
       end
     end
 
-    trait :crm_enabled do
+    trait :crm_disabled do
       after(:create) do |group|
-        create(:crm_settings, group: group, enabled: true)
+        create(:crm_settings, group: group, enabled: false)
       end
     end
 

spec/features/groups/crm/contacts/create_spec.rb

@@ -4,7 +4,7 @@
 
 RSpec.describe 'Create a CRM contact', :js, feature_category: :service_desk do
   let(:user)  { create(:user) }
-  let(:group) { create(:group, :crm_enabled) }
+  let(:group) { create(:group) }
   let!(:crm_organization) { create(:crm_organization, group: group, name: 'GitLab') }
 
   before do

spec/features/groups/group_page_with_external_authorization_service_spec.rb

@@ -6,7 +6,7 @@
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }
-  let(:group) { create(:group) }
+  let(:group) { create(:group, :crm_disabled) }
 
   before do
     sign_in user

spec/features/groups/navbar_spec.rb

@@ -16,6 +16,7 @@
     create_package_nav(_('Operate'))
     insert_after_nav_item(_('Analyze'), new_nav_item: settings_for_maintainer_nav_item) if Gitlab.ee?
     insert_infrastructure_registry_nav(_('Kubernetes'))
+    insert_customer_relations_nav(Gitlab.ee? ? _('Iterations') : _('Milestones')) if group.crm_enabled?
 
     stub_config(dependency_proxy: { enabled: false })
     stub_config(registry: { enabled: false })
@@ -42,24 +43,14 @@
     it_behaves_like 'verified navigation bar'
   end
 
-  context 'when customer_relations feature is enabled' do
-    let(:group) { create(:group, :crm_enabled) }
-
-    before do
-      if Gitlab.ee?
-        insert_customer_relations_nav(_('Iterations'))
-      else
-        insert_customer_relations_nav(_('Milestones'))
-      end
-
-      visit group_path(group)
-    end
+  context 'when crm feature is disabled' do
+    let(:group) { create(:group, :crm_disabled) }
 
     it_behaves_like 'verified navigation bar'
   end
 
-  context 'when customer_relations feature is enabled but subgroup' do
-    let(:group) { create(:group, :crm_enabled, parent: create(:group)) }
+  context 'when crm feature is enabled but subgroup' do
+    let(:group) { create(:group, parent: create(:group)) }
 
     before do
       visit group_path(group)

spec/features/issues/gfm_autocomplete_spec.rb

@@ -8,7 +8,7 @@
   let_it_be(:user) { create(:user, name: '💃speciąl someone💃', username: 'someone.special') }
   let_it_be(:user2) { create(:user, name: 'Marge Simpson', username: 'msimpson') }
 
-  let_it_be(:group) { create(:group, :crm_enabled) }
+  let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, group: group) }
   let_it_be(:issue) { create(:issue, project: project, assignees: [user]) }
   let_it_be(:label) { create(:label, project: project, title: 'special+') }

spec/finders/crm/contacts_finder_spec.rb

@@ -9,7 +9,7 @@
     subject { described_class.new(user, group: group).execute }
 
     context 'when customer relations feature is enabled for the group' do
-      let_it_be(:root_group) { create(:group, :crm_enabled) }
+      let_it_be(:root_group) { create(:group) }
       let_it_be(:group) { create(:group, parent: root_group) }
 
       let_it_be(:contact_1) { create(:contact, group: root_group) }
@@ -44,8 +44,8 @@
       end
     end
 
-    context 'when customer relations feature is disabled for the group' do
-      let_it_be(:group) { create(:group) }
+    context 'when crm feature is disabled for the group' do
+      let_it_be(:group) { create(:group, :crm_disabled) }
       let_it_be(:contact) { create(:contact, group: group) }
 
       before do
@@ -58,7 +58,7 @@
     end
 
     context 'with search informations' do
-      let_it_be(:search_test_group) { create(:group, :crm_enabled) }
+      let_it_be(:search_test_group) { create(:group) }
 
       let_it_be(:search_test_a) do
         create(
@@ -189,7 +189,7 @@
   end
 
   describe '.counts_by_state' do
-    let_it_be(:group) { create(:group, :crm_enabled) }
+    let_it_be(:group) { create(:group) }
     let_it_be(:active_contacts) { create_list(:contact, 3, group: group, state: :active) }
     let_it_be(:inactive_contacts) { create_list(:contact, 2, group: group, state: :inactive) }
 

spec/finders/crm/organizations_finder_spec.rb

@@ -9,7 +9,7 @@
     subject { described_class.new(user, group: group).execute }
 
     context 'when customer relations feature is enabled for the group' do
-      let_it_be(:root_group) { create(:group, :crm_enabled) }
+      let_it_be(:root_group) { create(:group) }
       let_it_be(:group) { create(:group, parent: root_group) }
 
       let_it_be(:crm_organization_1) { create(:crm_organization, group: root_group) }
@@ -45,7 +45,7 @@
     end
 
     context 'when customer relations feature is disabled for the group' do
-      let_it_be(:group) { create(:group) }
+      let_it_be(:group) { create(:group, :crm_disabled) }
       let_it_be(:crm_organization) { create(:crm_organization, group: group) }
 
       before do
@@ -58,7 +58,7 @@
     end
 
     context 'with search informations' do
-      let_it_be(:search_test_group) { create(:group, :crm_enabled) }
+      let_it_be(:search_test_group) { create(:group) }
 
       let_it_be(:search_test_a) do
         create(
@@ -130,7 +130,7 @@
     end
 
     context 'when sorting' do
-      let_it_be(:group) { create(:group, :crm_enabled) }
+      let_it_be(:group) { create(:group) }
 
       let_it_be(:sort_test_a) do
         create(
@@ -185,7 +185,7 @@
   end
 
   describe '.counts_by_state' do
-    let_it_be(:group) { create(:group, :crm_enabled) }
+    let_it_be(:group) { create(:group) }
     let_it_be(:active_crm_organizations) { create_list(:crm_organization, 3, group: group, state: :active) }
     let_it_be(:inactive_crm_organizations) { create_list(:crm_organization, 2, group: group, state: :inactive) }
 

spec/graphql/mutations/customer_relations/contacts/create_spec.rb

@@ -7,7 +7,7 @@
 
   let_it_be(:user) { create(:user) }
 
-  let(:group) { create(:group, :crm_enabled) }
+  let(:group) { create(:group) }
   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,
@@ -41,7 +41,7 @@
       end
 
       context 'when crm_enabled is false' do
-        let(:group) { create(:group) }
+        let(:group) { create(:group, :crm_disabled) }
 
         it 'raises an error' do
           expect { resolve_mutation }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)

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, :crm_enabled) }
+  let_it_be(:group) { create(:group) }
 
   let(:first_name) { 'Lionel' }
   let(:last_name) { 'Smith' }

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, :crm_enabled) }
+  let_it_be(:group) { create(:group) }
 
   let(:valid_params) do
     attributes_for(:crm_organization,

spec/graphql/mutations/customer_relations/organizations/update_spec.rb

@@ -4,7 +4,7 @@
 
 RSpec.describe Mutations::CustomerRelations::Organizations::Update do
   let_it_be(:user) { create(:user) }
-  let_it_be(:group) { create(:group, :crm_enabled) }
+  let_it_be(:group) { create(:group) }
 
   let(:name) { 'GitLab' }
   let(:default_rate) { 1000.to_f }

spec/graphql/resolvers/crm/contact_state_counts_resolver_spec.rb

@@ -6,7 +6,7 @@
   include GraphqlHelpers
 
   let_it_be(:user) { create(:user) }
-  let_it_be(:group) { create(:group, :crm_enabled) }
+  let_it_be(:group) { create(:group) }
 
   before_all do
     create(:contact, group: group, email: "x@test.com")