Merge branch 'peterhegman/refactor-cascading-settings-haml-partials' into 'master'

Refactor cascading settings HAML partials

See merge request gitlab-org/gitlab!61180

app/helpers/namespaces_helper.rb

@@ -83,6 +83,15 @@ module NamespacesHelper
     }
   end
 
+  def cascading_namespace_setting_locked?(attribute, group, **args)
+    return false if group.nil?
+
+    method_name = "#{attribute}_locked?"
+    return false unless group.namespace_settings.respond_to?(method_name)
+
+    group.namespace_settings.public_send(method_name, **args) # rubocop:disable GitlabSecurity/PublicSend
+  end
+
   private
 
   # Many importers create a temporary Group, so use the real

app/views/shared/namespaces/cascading_settings/_enforcement_checkbox.html.haml

 - attribute = local_assigns.fetch(:attribute, nil)
-- group = local_assigns.fetch(:group, nil)
 - form = local_assigns.fetch(:form, nil)
+- setting_locked = local_assigns.fetch(:setting_locked, false)
+- help_text = local_assigns.fetch(:help_text, s_('CascadingSettings|Subgroups cannot change this setting.'))
 
 - return unless attribute && group && form && cascading_namespace_settings_enabled?
-- return if group.namespace_settings.public_send("#{attribute}_locked?")
+- return if setting_locked
 
 - lock_attribute = "lock_#{attribute}"
 
 .gl-form-checkbox.custom-control.custom-checkbox
   = form.check_box lock_attribute, checked: group.namespace_settings.public_send(lock_attribute), class: 'custom-control-input', data: { testid: 'enforce-for-all-subgroups-checkbox' }
   = form.label lock_attribute, class: 'custom-control-label' do
-    %span= s_('CascadingSettings|Enforce for all subgroups')
-    %p.help-text= s_('CascadingSettings|Subgroups cannot change this setting.')
+    %span
+      = yield.presence || s_('CascadingSettings|Enforce for all subgroups')
+    %p.help-text
+      = help_text

app/views/shared/namespaces/cascading_settings/_lock_icon.html.haml

+%button.position-absolute.gl-top-3.gl-right-0.gl-translate-y-n50.gl-cursor-default.btn.btn-default.btn-sm.gl-button.btn-default-tertiary.js-cascading-settings-lock-popover-target{ class: 'gl-p-1! gl-text-gray-600! gl-bg-transparent!',
+  type: 'button',
+  data: cascading_namespace_settings_popover_data(attribute, group, settings_path_helper) }
+  = sprite_icon('lock', size: 16)

app/views/shared/namespaces/cascading_settings/_setting_label.html.haml → app/views/shared/namespaces/cascading_settings/_setting_label_checkbox.html.haml

 - attribute = local_assigns.fetch(:attribute, nil)
-- group = local_assigns.fetch(:group, nil)
-- form = local_assigns.fetch(:form, nil)
 - settings_path_helper = local_assigns.fetch(:settings_path_helper, nil)
+- form = local_assigns.fetch(:form, nil)
+- setting_locked = local_assigns.fetch(:setting_locked, false)
 - help_text = local_assigns.fetch(:help_text, nil)
 
-- return unless attribute && group && form && settings_path_helper
-
-- setting_locked = group.namespace_settings.public_send("#{attribute}_locked?")
+- return unless attribute && form && settings_path_helper
 
 = form.label attribute, class: 'custom-control-label', aria: { disabled: setting_locked } do
-  %span.position-relative.gl-pr-6.gl-display-inline-flex
+  = render 'shared/namespaces/cascading_settings/setting_label_container' do
     = yield
     - if setting_locked
-      %button.position-absolute.gl-top-3.gl-right-0.gl-translate-y-n50.gl-cursor-default.btn.btn-default.btn-sm.gl-button.btn-default-tertiary.js-cascading-settings-lock-popover-target{ class: 'gl-p-1! gl-text-gray-600! gl-bg-transparent!',
-        type: 'button',
-        data: cascading_namespace_settings_popover_data(attribute, group, settings_path_helper) }
-        = sprite_icon('lock', size: 16)
+      = render 'shared/namespaces/cascading_settings/lock_icon', local_assigns
   - if help_text
     %p.help-text
       = help_text

app/views/shared/namespaces/cascading_settings/_setting_label_container.html.haml

+%span.position-relative.gl-pr-6.gl-display-inline-flex
+  = yield

app/views/shared/namespaces/cascading_settings/_setting_label_fieldset.html.haml

+- attribute = local_assigns.fetch(:attribute, nil)
+- settings_path_helper = local_assigns.fetch(:settings_path_helper, nil)
+- setting_locked = local_assigns.fetch(:setting_locked, false)
+- help_text = local_assigns.fetch(:help_text, nil)
+
+- return unless attribute && settings_path_helper
+
+%legend.h5.gl-border-none.gl-m-0
+  = render 'shared/namespaces/cascading_settings/setting_label_container' do
+    = yield
+    - if setting_locked
+      = render 'shared/namespaces/cascading_settings/lock_icon', local_assigns
+- if help_text
+  %p.gl-text-gray-500
+    = help_text

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

 - return unless show_delayed_project_removal_setting?(group)
 
+- setting_locked = cascading_namespace_setting_locked?(:delayed_project_removal, group)
+
 .form-group{ data: { testid: 'delayed-project-removal-form-group' } }
   .gl-form-checkbox.custom-control.custom-checkbox
-    = f.check_box :delayed_project_removal, checked: group.namespace_settings.delayed_project_removal?, disabled: group.namespace_settings.delayed_project_removal_locked?, class: 'custom-control-input', data: { testid: 'delayed-project-removal-checkbox' }
-    = render 'shared/namespaces/cascading_settings/setting_label', attribute: :delayed_project_removal,
+    = f.check_box :delayed_project_removal, checked: group.namespace_settings.delayed_project_removal?, disabled: setting_locked, class: 'custom-control-input', data: { testid: 'delayed-project-removal-checkbox' }
+    = render 'shared/namespaces/cascading_settings/setting_label_checkbox', attribute: :delayed_project_removal,
         group: group,
         form: f,
+        setting_locked: setting_locked,
         settings_path_helper: -> (locked_ancestor) { edit_group_path(locked_ancestor, anchor: 'js-permissions-settings') },
         help_text: delayed_project_removal_help_text do
       = s_('GroupSettings|Enable delayed project removal')
-    = render 'shared/namespaces/cascading_settings/enforcement_checkbox', attribute: :delayed_project_removal, group: group, form: f
+    = render 'shared/namespaces/cascading_settings/enforcement_checkbox',
+        attribute: :delayed_project_removal,
+        group: group,
+        form: f,
+        setting_locked: setting_locked

spec/helpers/namespaces_helper_spec.rb

@@ -265,4 +265,32 @@ RSpec.describe NamespacesHelper do
       end
     end
   end
+
+  describe '#cascading_namespace_setting_locked?' do
+    let(:attribute) { :delayed_project_removal }
+
+    context 'when `group` argument is `nil`' do
+      it 'returns `false`' do
+        expect(helper.cascading_namespace_setting_locked?(attribute, nil)).to eq(false)
+      end
+    end
+
+    context 'when `*_locked?` method does not exist' do
+      it 'returns `false`' do
+        expect(helper.cascading_namespace_setting_locked?(:attribute_that_does_not_exist, admin_group)).to eq(false)
+      end
+    end
+
+    context 'when `*_locked?` method does exist' do
+      before do
+        allow(admin_group.namespace_settings).to receive(:delayed_project_removal_locked?).and_return(true)
+      end
+
+      it 'calls corresponding `*_locked?` method' do
+        helper.cascading_namespace_setting_locked?(attribute, admin_group, include_self: true)
+
+        expect(admin_group.namespace_settings).to have_received(:delayed_project_removal_locked?).with(include_self: true)
+      end
+    end
+  end
 end