Merge branch 'alert-settings-link-follow-through' into 'master'

Add follow through for alerts

See merge request gitlab-org/gitlab!36649

app/helpers/projects/alert_management_helper.rb

@@ -4,7 +4,7 @@ module Projects::AlertManagementHelper
   def alert_management_data(current_user, project)
     {
       'project-path' => project.full_path,
-      'enable-alert-management-path' => edit_project_service_path(project, AlertsService),
+      'enable-alert-management-path' => project_settings_operations_path(project, anchor: 'js-alert-management-settings'),
       'populating-alerts-help-url' => help_page_url('user/project/operations/alert_management.html', anchor: 'enable-alert-management'),
       'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg'),
       'user-can-enable-alert-management' => can?(current_user, :admin_operations, project).to_s,

app/views/projects/services/alerts/_top.html.haml

@@ -5,4 +5,4 @@
       .gl-alert-body
         = _('You can now manage alert endpoint configuration in the Alerts section on the Operations settings page. Fields on this page have been deprecated.')
       .gl-alert-actions
-        = link_to _('Visit settings page'), project_settings_operations_path(@project), class: 'btn gl-alert-action btn-info new-gl-button'
+        = link_to _('Visit settings page'), project_settings_operations_path(@project, anchor: 'js-alert-management-settings'), class: 'btn gl-alert-action btn-info new-gl-button'

app/views/projects/services/prometheus/_top.html.haml

@@ -7,4 +7,4 @@
       .gl-alert-body
         = s_('AlertSettings|You can now set up alert endpoints for manually configured Prometheus instances in the Alerts section on the Operations settings page. Alert endpoint fields on this page have been deprecated.')
       .gl-alert-actions
-        = link_to _('Visit settings page'), project_settings_operations_path(@project), class: 'btn gl-alert-action btn-info gl-button'
+        = link_to _('Visit settings page'), project_settings_operations_path(@project, anchor: 'js-alert-management-settings'), class: 'btn gl-alert-action btn-info gl-button'

app/views/projects/settings/operations/_alert_management.html.haml

 - return unless can?(current_user, :admin_operations, @project)
+- expanded = expanded_by_default?
 
-%section.settings.no-animate.js-alert-management-settings
+%section.settings.no-animate#js-alert-management-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h3{ :class => "h4" }
       = _('Alerts')

changelogs/unreleased/alert-settings-link-follow-through.yml

+---
+title: Expand Operations > Alerts section by default via link follow through
+merge_request: 36649
+author:
+type: other

spec/helpers/projects/alert_management_helper_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Projects::AlertManagementHelper do
 
   describe '#alert_management_data' do
     let(:user_can_enable_alert_management) { true }
-    let(:setting_path) { edit_project_service_path(project, AlertsService) }
+    let(:setting_path) { project_settings_operations_path(project, anchor: 'js-alert-management-settings') }
 
     subject(:data) { helper.alert_management_data(current_user, project) }