Merge branch '208412-fj-add-group-wiki-feature-settings-form' into 'master'

Add wiki to group settings form

See merge request gitlab-org/gitlab!82298

app/controllers/groups_controller.rb

@@ -293,7 +293,7 @@ class GroupsController < Groups::ApplicationController
       :setup_for_company,
       :jobs_to_be_done,
       :crm_enabled
-    ]
+    ] + [group_feature_attributes: group_feature_attributes]
   end
 
   # rubocop: disable CodeReuse/ActiveRecord
@@ -396,6 +396,10 @@ class GroupsController < Groups::ApplicationController
 
     experiment(:require_verification_for_namespace_creation, user: current_user).track(:start_create_group)
   end
+
+  def group_feature_attributes
+    []
+  end
 end
 
 GroupsController.prepend_mod_with('GroupsController')

app/views/groups/settings/_permissions.html.haml

@@ -34,6 +34,8 @@
     = render 'groups/settings/ip_restriction_registration_features_cta', f: f
     = render_if_exists 'groups/settings/ip_restriction', f: f, group: @group
     = render_if_exists 'groups/settings/allowed_email_domain', f: f, group: @group
+    - if Feature.enabled?(:group_wiki_settings_toggle, @group, default_enabled: :yaml)
+      = render_if_exists 'groups/settings/wiki', f: f, group: @group
     = render 'groups/settings/lfs', f: f
     = render 'groups/settings/project_creation_level', f: f, group: @group
     = render 'groups/settings/subgroup_creation_level', f: f, group: @group

config/feature_flags/development/group_wiki_settings_toggle.yml

+---
+name: group_wiki_settings_toggle
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82298
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358387
+milestone: '14.10'
+type: development
+group: group::editor
+default_enabled: false

ee/app/controllers/ee/groups_controller.rb

@@ -126,5 +126,12 @@ module EE
 
       invite_members(group, invite_source: 'group-creation-page')
     end
+
+    override :group_feature_attributes
+    def group_feature_attributes
+      return super if ::Feature.disabled?(:group_wiki_settings_toggle, current_group, default_enabled: :yaml)
+
+      super + [:wiki_access_level]
+    end
   end
 end

ee/app/views/groups/settings/_wiki.html.haml

+%h5= _('Wiki')
+
+- group_feature = group.group_feature
+
+= f.fields_for :group_feature_attributes, group_feature do |group_feature_form|
+  .form-group.gl-mb-3
+    = group_feature_form.gitlab_ui_radio_component :wiki_access_level, Featurable::ENABLED,
+            s_('Enabled'),
+            help_text: s_('Allow access to everyone')
+
+    = group_feature_form.gitlab_ui_radio_component :wiki_access_level, Featurable::PRIVATE,
+            s_('Private'),
+            help_text: s_('Allow access only to members of this group')
+
+    = group_feature_form.gitlab_ui_radio_component :wiki_access_level, Featurable::DISABLED,
+            s_('Disabled'),
+            help_text: s_('Disable the group-level wiki')

ee/spec/controllers/ee/groups_controller_spec.rb

@@ -652,5 +652,35 @@ RSpec.describe GroupsController do
         end
       end
     end
+
+    context 'when group feature setting `wiki_access_level` is specified' do
+      before do
+        group.add_owner(user)
+
+        sign_in(user)
+      end
+
+      it 'updates the attribute' do
+        [Featurable::PRIVATE, Featurable::DISABLED, Featurable::ENABLED].each do |visibility_level|
+          request(visibility_level)
+
+          expect(group.reload.group_feature.wiki_access_level).to eq(visibility_level)
+        end
+      end
+
+      context 'when feature flag :group_wiki_settings_toggle is disabled' do
+        before do
+          stub_feature_flags(group_wiki_settings_toggle: false)
+        end
+
+        it 'does not update the attribute' do
+          expect { request(Featurable::PRIVATE) }.not_to change { group.reload.group_feature.wiki_access_level }
+        end
+      end
+
+      def request(visibility_level)
+        put :update, params: { id: group.to_param, group: { group_feature_attributes: { wiki_access_level: visibility_level } } }
+      end
+    end
   end
 end

ee/spec/features/groups_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Group' do
+  describe 'group edit', :js do
+    let_it_be(:user) { create(:user) }
+
+    let_it_be(:group) do
+      create(:group, :public).tap do |g|
+        g.add_owner(user)
+      end
+    end
+
+    let(:path) { edit_group_path(group, anchor: 'js-permissions-settings') }
+    let(:group_wiki_toggle) { true }
+
+    before do
+      stub_feature_flags(group_wiki_settings_toggle: group_wiki_toggle)
+
+      sign_in(user)
+
+      visit path
+    end
+
+    context 'wiki_access_level setting' do
+      it 'saves new settings', :aggregate_failures do
+        expect(page).to have_content('Disable the group-level wiki')
+
+        [Featurable::PRIVATE, Featurable::DISABLED, Featurable::ENABLED].each do |wiki_access_level|
+          find(
+            ".js-general-permissions-form "\
+              "#group_group_feature_attributes_wiki_access_level_#{wiki_access_level}").click
+
+          click_button 'Save changes'
+
+          expect(page).to have_content 'successfully updated'
+          expect(group.reload.group_feature.wiki_access_level).to eq wiki_access_level
+        end
+      end
+
+      context 'when feature flag :group_wiki_settings_toggle is disabled' do
+        let(:group_wiki_toggle) { false }
+
+        it 'wiki settings form is not present' do
+          expect(page).not_to have_content('Disable the group-level wiki')
+        end
+      end
+    end
+  end
+end

locale/gitlab.pot

@@ -3660,6 +3660,12 @@ msgstr ""
 msgid "Allow \"%{group_name}\" to sign you in"
 msgstr ""
 
+msgid "Allow access only to members of this group"
+msgstr ""
+
+msgid "Allow access to everyone"
+msgstr ""
+
 msgid "Allow access to members of the following group"
 msgstr ""
 
@@ -13124,6 +13130,9 @@ msgstr ""
 msgid "Disable group runners"
 msgstr ""
 
+msgid "Disable the group-level wiki"
+msgstr ""
+
 msgid "Disable two-factor authentication"
 msgstr ""