Merge branch '238983-add-group-integrations-to-sidebar-navigation' into 'master'

Update group integrations sidebar navigation and add docs link

Closes #238983

See merge request gitlab-org/gitlab!39948

app/assets/javascripts/integrations/edit/components/integration_form.vue

@@ -42,6 +42,7 @@ export default {
       v-if="adminState !== null"
       :inherit-from-id="adminState.id"
       :override="override"
+      :learn-more-path="propsSource.learnMorePath"
       @change="setOverride"
     />
     <active-checkbox v-if="propsSource.showActive" :key="`${currentKey}-active-checkbox`" />

app/assets/javascripts/integrations/edit/components/override_dropdown.vue

 <script>
-import { GlNewDropdown, GlNewDropdownItem } from '@gitlab/ui';
+import { GlNewDropdown, GlNewDropdownItem, GlLink } from '@gitlab/ui';
 import { s__ } from '~/locale';
 
 const dropdownOptions = [
@@ -19,12 +19,18 @@ export default {
   components: {
     GlNewDropdown,
     GlNewDropdownItem,
+    GlLink,
   },
   props: {
     inheritFromId: {
       type: Number,
       required: true,
     },
+    learnMorePath: {
+      type: String,
+      required: false,
+      default: null,
+    },
     override: {
       type: Boolean,
       required: true,
@@ -48,7 +54,12 @@ export default {
   <div
     class="gl-display-flex gl-justify-content-space-between gl-align-items-baseline gl-py-4 gl-mt-5 gl-mb-6 gl-border-t-1 gl-border-t-solid gl-border-b-1 gl-border-b-solid gl-border-gray-100"
   >
-    <span>{{ s__('Integrations|Default settings are inherited from the instance level.') }}</span>
+    <span
+      >{{ s__('Integrations|Default settings are inherited from the instance level.') }}
+      <gl-link v-if="learnMorePath" :href="learnMorePath" target="_blank">{{
+        __('Learn more')
+      }}</gl-link>
+    </span>
     <input name="service[inherit_from_id]" :value="override ? '' : inheritFromId" type="hidden" />
     <gl-new-dropdown :text="selected.text">
       <gl-new-dropdown-item

app/assets/javascripts/integrations/edit/index.js

@@ -19,6 +19,7 @@ function parseDatasetToProps(data) {
     projectKey,
     upgradePlanPath,
     editProjectPath,
+    learnMorePath,
     triggerEvents,
     fields,
     inheritFromId,
@@ -51,6 +52,7 @@ function parseDatasetToProps(data) {
       upgradePlanPath,
       editProjectPath,
     },
+    learnMorePath,
     triggerEvents: JSON.parse(triggerEvents),
     fields: JSON.parse(fields),
     inheritFromId: parseInt(inheritFromId, 10),

app/helpers/services_helper.rb

@@ -92,6 +92,7 @@ module ServicesHelper
       commit_events: integration.commit_events.to_s,
       enable_comments: integration.comment_on_event_enabled.to_s,
       comment_detail: integration.comment_detail,
+      learn_more_path: integrations_help_page_path,
       trigger_events: trigger_events_for_service(integration),
       fields: fields_for_service(integration),
       inherit_from_id: integration.inherit_from_id
@@ -106,10 +107,18 @@ module ServicesHelper
     ServiceFieldSerializer.new(service: integration).represent(integration.global_fields).to_json
   end
 
+  def integrations_help_page_path
+    help_page_path('user/admin_area/settings/project_integration_management')
+  end
+
   def project_jira_issues_integration?
     false
   end
 
+  def group_level_integrations?
+    @group.present? && Feature.enabled?(:group_level_integrations, @group)
+  end
+
   extend self
 end
 

app/views/admin/application_settings/integrations.html.haml

@@ -16,5 +16,5 @@
 %h4= s_('AdminSettings|Apply integration settings to all Projects')
 %p
   = s_('AdminSettings|Integrations configured here will automatically apply to all projects on this instance.')
-  = link_to _('Learn more'), '#'
+  = link_to _('Learn more'), integrations_help_page_path, target: '_blank', rel: 'noopener noreferrer'
 = render 'shared/integrations/index', integrations: @integrations

app/views/groups/settings/integrations/index.html.haml

@@ -5,5 +5,5 @@
 %h4= s_('GroupSettings|Apply integration settings to all Projects')
 %p
   = s_('GroupSettings|Integrations configured here will automatically apply to all projects in this group.')
-  = link_to _('Learn more'), '#'
+  = link_to _('Learn more'), integrations_help_page_path, target: '_blank', rel: 'noopener noreferrer'
 = render 'shared/integrations/index', integrations: @integrations

app/views/layouts/nav/sidebar/_group.html.haml

@@ -157,6 +157,12 @@
                 %span
                   = _('General')
 
+            - if group_level_integrations?
+              = nav_link(controller: :integrations) do
+                = link_to group_settings_integrations_path(@group), title: _('Integrations') do
+                  %span
+                    = _('Integrations')
+
             = nav_link(path: 'groups#projects') do
               = link_to projects_group_path(@group), title: _('Projects') do
                 %span
@@ -171,11 +177,6 @@
               = link_to group_settings_ci_cd_path(@group), title: _('CI / CD') do
                 %span
                   = _('CI / CD')
-            - if Feature.enabled?(:group_level_integrations, @group)
-              = nav_link(controller: :integrations) do
-                = link_to group_settings_integrations_path(@group), title: _('Integrations') do
-                  %span
-                    = _('Integrations')
 
             = render_if_exists "groups/ee/settings_nav"
 

app/views/shared/integrations/_form.html.haml

@@ -12,4 +12,4 @@
       - if integration.editable?
         .footer-block.row-content-block
           = service_save_button
-          = link_to _('Cancel'), scoped_integration_path(integration), class: 'btn btn-cancel'
+          = link_to _('Cancel'), scoped_integrations_path, class: 'btn btn-cancel'

spec/frontend/integrations/edit/components/override_dropdown_spec.js

+import { shallowMount } from '@vue/test-utils';
+import { GlNewDropdown, GlLink } from '@gitlab/ui';
+
+import OverrideDropdown from '~/integrations/edit/components/override_dropdown.vue';
+
+describe('OverrideDropdown', () => {
+  let wrapper;
+
+  const defaultProps = {
+    inheritFromId: 1,
+    override: true,
+  };
+
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(OverrideDropdown, {
+      propsData: { ...defaultProps, ...props },
+    });
+  };
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
+  });
+
+  const findGlLink = () => wrapper.find(GlLink);
+  const findGlNewDropdown = () => wrapper.find(GlNewDropdown);
+
+  describe('template', () => {
+    describe('override prop is true', () => {
+      it('renders GlToggle as disabled', () => {
+        createComponent();
+
+        expect(findGlNewDropdown().props('text')).toBe('Use custom settings');
+      });
+    });
+
+    describe('override prop is false', () => {
+      it('renders GlToggle as disabled', () => {
+        createComponent({ override: false });
+
+        expect(findGlNewDropdown().props('text')).toBe('Use default settings');
+      });
+    });
+
+    describe('learnMorePath is present', () => {
+      it('renders GlLink with correct link', () => {
+        createComponent({
+          learnMorePath: '/docs',
+        });
+
+        expect(findGlLink().text()).toBe('Learn more');
+        expect(findGlLink().attributes('href')).toBe('/docs');
+      });
+    });
+  });
+});

spec/helpers/services_helper_spec.rb

@@ -26,4 +26,36 @@ RSpec.describe ServicesHelper do
       end
     end
   end
+
+  describe '#group_level_integrations?' do
+    subject { helper.group_level_integrations? }
+
+    context 'when no group is present' do
+      it { is_expected.to eq(false) }
+    end
+
+    context 'when group is present' do
+      let(:group) { build_stubbed(:group) }
+
+      before do
+        assign(:group, group)
+      end
+
+      context 'when `group_level_integrations` is not enabled' do
+        it 'returns false' do
+          stub_feature_flags(group_level_integrations: false)
+
+          is_expected.to eq(false)
+        end
+      end
+
+      context 'when `group_level_integrations` is enabled for the group' do
+        it 'returns true' do
+          stub_feature_flags(group_level_integrations: group)
+
+          is_expected.to eq(true)
+        end
+      end
+    end
+  end
 end

spec/support/shared_contexts/navbar_structure_context.rb

@@ -119,10 +119,10 @@ RSpec.shared_context 'group navbar structure' do
       nav_item: _('Settings'),
       nav_sub_items: [
         _('General'),
+        _('Integrations'),
         _('Projects'),
         _('Repository'),
         _('CI / CD'),
-        _('Integrations'),
         _('Webhooks'),
         _('Audit Events')
       ]