Merge branch 'reposition-integration-form-elements' into 'master'

Move integration inheritance override dropdown above grid layout

See merge request gitlab-org/gitlab!49325

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

@@ -95,10 +95,7 @@ export default {
 </script>
 
 <template>
-  <div>
-    <!-- helpHtml is trusted input -->
-    <div v-if="helpHtml" v-safe-html:[$options.helpHtmlConfig]="helpHtml"></div>
-
+  <div class="gl-mb-3">
     <override-dropdown
       v-if="defaultState !== null"
       :inherit-from-id="defaultState.id"
@@ -107,80 +104,91 @@ export default {
       @change="setOverride"
     />
 
-    <active-checkbox v-if="propsSource.showActive" :key="`${currentKey}-active-checkbox`" />
-    <jira-trigger-fields
-      v-if="isJira"
-      :key="`${currentKey}-jira-trigger-fields`"
-      v-bind="propsSource.triggerFieldsProps"
-    />
-    <trigger-fields
-      v-else-if="propsSource.triggerEvents.length"
-      :key="`${currentKey}-trigger-fields`"
-      :events="propsSource.triggerEvents"
-      :type="propsSource.type"
-    />
-    <dynamic-field
-      v-for="field in propsSource.fields"
-      :key="`${currentKey}-${field.name}`"
-      v-bind="field"
-    />
-    <jira-issues-fields
-      v-if="showJiraIssuesFields"
-      :key="`${currentKey}-jira-issues-fields`"
-      v-bind="propsSource.jiraIssuesProps"
-    />
-    <div v-if="isEditable" class="footer-block row-content-block">
-      <template v-if="isInstanceOrGroupLevel">
-        <gl-button
-          v-gl-modal.confirmSaveIntegration
-          category="primary"
-          variant="success"
-          :loading="isSaving"
-          :disabled="isDisabled"
-          data-qa-selector="save_changes_button"
-        >
-          {{ __('Save changes') }}
-        </gl-button>
-        <confirmation-modal @submit="onSaveClick" />
-      </template>
-      <gl-button
-        v-else
-        category="primary"
-        variant="success"
-        type="submit"
-        :loading="isSaving"
-        :disabled="isDisabled"
-        data-qa-selector="save_changes_button"
-        @click.prevent="onSaveClick"
-      >
-        {{ __('Save changes') }}
-      </gl-button>
+    <div class="row">
+      <div class="col-lg-4"></div>
+
+      <div class="col-lg-8">
+        <!-- helpHtml is trusted input -->
+        <div v-if="helpHtml" v-safe-html:[$options.helpHtmlConfig]="helpHtml"></div>
+
+        <active-checkbox v-if="propsSource.showActive" :key="`${currentKey}-active-checkbox`" />
+        <jira-trigger-fields
+          v-if="isJira"
+          :key="`${currentKey}-jira-trigger-fields`"
+          v-bind="propsSource.triggerFieldsProps"
+        />
+        <trigger-fields
+          v-else-if="propsSource.triggerEvents.length"
+          :key="`${currentKey}-trigger-fields`"
+          :events="propsSource.triggerEvents"
+          :type="propsSource.type"
+        />
+        <dynamic-field
+          v-for="field in propsSource.fields"
+          :key="`${currentKey}-${field.name}`"
+          v-bind="field"
+        />
+        <jira-issues-fields
+          v-if="showJiraIssuesFields"
+          :key="`${currentKey}-jira-issues-fields`"
+          v-bind="propsSource.jiraIssuesProps"
+        />
+        <div v-if="isEditable" class="footer-block row-content-block">
+          <template v-if="isInstanceOrGroupLevel">
+            <gl-button
+              v-gl-modal.confirmSaveIntegration
+              category="primary"
+              variant="success"
+              :loading="isSaving"
+              :disabled="isDisabled"
+              data-qa-selector="save_changes_button"
+            >
+              {{ __('Save changes') }}
+            </gl-button>
+            <confirmation-modal @submit="onSaveClick" />
+          </template>
+          <gl-button
+            v-else
+            category="primary"
+            variant="success"
+            type="submit"
+            :loading="isSaving"
+            :disabled="isDisabled"
+            data-qa-selector="save_changes_button"
+            @click.prevent="onSaveClick"
+          >
+            {{ __('Save changes') }}
+          </gl-button>
 
-      <gl-button
-        v-if="propsSource.canTest"
-        :loading="isTesting"
-        :disabled="isDisabled"
-        :href="propsSource.testPath"
-        @click.prevent="onTestClick"
-      >
-        {{ __('Test settings') }}
-      </gl-button>
+          <gl-button
+            v-if="propsSource.canTest"
+            :loading="isTesting"
+            :disabled="isDisabled"
+            :href="propsSource.testPath"
+            @click.prevent="onTestClick"
+          >
+            {{ __('Test settings') }}
+          </gl-button>
 
-      <template v-if="showReset">
-        <gl-button
-          v-gl-modal.confirmResetIntegration
-          category="secondary"
-          variant="default"
-          :loading="isResetting"
-          :disabled="isDisabled"
-          data-testid="reset-button"
-        >
-          {{ __('Reset') }}
-        </gl-button>
-        <reset-confirmation-modal @reset="onResetClick" />
-      </template>
+          <template v-if="showReset">
+            <gl-button
+              v-gl-modal.confirmResetIntegration
+              category="secondary"
+              variant="default"
+              :loading="isResetting"
+              :disabled="isDisabled"
+              data-testid="reset-button"
+            >
+              {{ __('Reset') }}
+            </gl-button>
+            <reset-confirmation-modal @reset="onResetClick" />
+          </template>
 
-      <gl-button class="btn-cancel" :href="propsSource.cancelPath">{{ __('Cancel') }}</gl-button>
+          <gl-button class="btn-cancel" :href="propsSource.cancelPath">{{
+            __('Cancel')
+          }}</gl-button>
+        </div>
+      </div>
     </div>
   </div>
 </template>

app/models/project_services/confluence_service.rb

@@ -30,8 +30,8 @@ class ConfluenceService < Service
     s_('ConfluenceService|Connect a Confluence Cloud Workspace to GitLab')
   end
 
-  def detailed_description
-    return unless project.wiki_enabled?
+  def help
+    return unless project&.wiki_enabled?
 
     if activated?
       wiki_url = project.wiki.web_url

app/views/projects/services/_form.html.haml

 - if lookup_context.template_exists?('top', "projects/services/#{@service.to_param}", true)
   = render "projects/services/#{@service.to_param}/top"
 
-.row.gl-mt-3.gl-mb-3
-  .col-lg-4
-    %h3.page-title.gl-mt-0
-      = @service.title
-      - if @service.operating?
-        = sprite_icon('check', css_class: 'gl-text-green-500')
+%h3.page-title
+  = @service.title
+  - if @service.operating?
+    = sprite_icon('check', css_class: 'gl-text-green-500')
 
-    - if @service.respond_to?(:detailed_description)
-      %p= @service.detailed_description
-  .col-lg-8
-    = form_for(@service, as: :service, url: scoped_integration_path(@service), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'test-url' => test_project_service_path(@project, @service) } }) do |form|
-      = render 'shared/service_settings', form: form, integration: @service
-      %input{ id: 'services_redirect_to', type: 'hidden', name: 'redirect_to', value: request.referrer }
+= form_for(@service, as: :service, url: scoped_integration_path(@service), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'test-url' => test_project_service_path(@project, @service) } }) do |form|
+  = render 'shared/service_settings', form: form, integration: @service
+  %input{ id: 'services_redirect_to', type: 'hidden', name: 'redirect_to', value: request.referrer }
 
 - if lookup_context.template_exists?('show', "projects/services/#{@service.to_param}", true)
   %hr

app/views/shared/_service_settings.html.haml

@@ -4,7 +4,7 @@
   - if @default_integration
     .js-vue-default-integration-settings{ data: integration_form_data(@default_integration, group: @group) }
   .js-vue-integration-settings{ data: integration_form_data(integration, group: @group) }
-    .js-integration-help-html
+    .js-integration-help-html.gl-display-none
       -# All content below will be repositioned in Vue
       - if lookup_context.template_exists?('help', "projects/services/#{integration.to_param}", true)
         = render "projects/services/#{integration.to_param}/help", subject: integration

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

 - integration = local_assigns.fetch(:integration)
 
-.row.gl-mt-3
-  .col-lg-4
-    %h3.page-title.gl-mt-0
-      = integration.title
+%h3.page-title
+  = integration.title
 
-  .col-lg-8
-    = form_for integration, as: :service, url: scoped_integration_path(integration), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'test-url' => scoped_test_integration_path(integration) } } do |form|
-      = render 'shared/service_settings', form: form, integration: integration
+= form_for integration, as: :service, url: scoped_integration_path(integration), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'test-url' => scoped_test_integration_path(integration) } } do |form|
+  = render 'shared/service_settings', form: form, integration: integration

changelogs/unreleased/reposition-integration-form-elements.yml

+---
+title: Move integration inheritance override dropdown above grid layout
+merge_request: 49325
+author:
+type: changed

ee/app/models/project_services/github_service.rb

@@ -26,10 +26,11 @@ class GithubService < Service
     "See pipeline statuses on GitHub for your commits and pull requests"
   end
 
-  def detailed_description
-    mirror_path = project_settings_repository_path(project)
-    mirror_link = link_to('mirroring your GitHub repository', mirror_path)
-    "This requires #{mirror_link} to this project.".html_safe
+  def help
+    return unless project
+
+    docs_link = link_to _('Learn more'), help_page_url('user/project/repository/repository_mirroring')
+    s_("Integrations|This requires mirroring your GitHub repository to this project. %{docs_link}" % { docs_link: docs_link }).html_safe
   end
 
   def self.to_param

ee/spec/models/project_services/github_service_spec.rb

@@ -70,9 +70,9 @@ RSpec.describe GithubService do
     end
   end
 
-  describe '#detailed_description' do
+  describe '#help' do
     it 'links to mirroring settings' do
-      expect(subject.detailed_description).to match(/href=.*mirroring/)
+      expect(subject.help).to match(/href=.*mirroring/)
     end
   end
 

locale/gitlab.pot

@@ -15907,6 +15907,9 @@ msgstr ""
 msgid "Integrations|This integration, and inheriting projects were reset."
 msgstr ""
 
+msgid "Integrations|This requires mirroring your GitHub repository to this project. %{docs_link}"
+msgstr ""
+
 msgid "Integrations|To keep this project going, create a new issue."
 msgstr ""
 

spec/models/project_services/confluence_service_spec.rb

@@ -43,13 +43,13 @@ RSpec.describe ConfluenceService do
     end
   end
 
-  describe '#detailed_description' do
+  describe '#help' do
     it 'can correctly return a link to the project wiki when active' do
       project = create(:project)
       subject.project = project
       subject.active = true
 
-      expect(subject.detailed_description).to include(Gitlab::Routing.url_helpers.project_wikis_url(project))
+      expect(subject.help).to include(Gitlab::Routing.url_helpers.project_wikis_url(project))
     end
 
     context 'when the project wiki is not enabled' do
@@ -60,7 +60,7 @@ RSpec.describe ConfluenceService do
         [true, false].each do |active|
           subject.active = active
 
-          expect(subject.detailed_description).to be_nil
+          expect(subject.help).to be_nil
         end
       end
     end