Merge branch '356687-investigate-using-viewcomponent-for-shared-global_alert' into 'master'

Convert last remaining shared/global_alert to ViewComponent

See merge request gitlab-org/gitlab!84395

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

@@ -16,10 +16,9 @@
     .js-text.d-inline= _('Download payload')
   %pre.js-syntax-highlight.code.highlight.gl-mt-2.gl-display-none{ class: payload_class, data: { endpoint: usage_data_admin_application_settings_path(format: :html) } }
 - else
-  = render 'shared/global_alert',
-    variant: :warning,
+  = render Pajamas::AlertComponent.new(variant: :warning,
     dismissible: false,
-    title: 'Service Ping payload not found in the application cache' do
+    title: _('Service Ping payload not found in the application cache')) do
 
     .gl-alert-body
       - enable_service_ping_link_url = help_page_path('user/admin_area/settings/usage_statistics', anchor: 'enable-or-disable-usage-statistics')

app/views/clusters/clusters/_deprecation_alert.html.haml

-= render 'shared/global_alert', variant: :warning, dismissible: false, alert_class: 'gl-mt-6 gl-mb-3' do
+= render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_class: 'gl-mt-6 gl-mb-3') do
   .gl-alert-body
     - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe
     - issue_link_start = link_start % { url: 'https://gitlab.com/gitlab-org/configure/general/-/issues/199' }

app/views/groups/_import_group_from_file_panel.html.haml

@@ -6,9 +6,8 @@
   .gl-border-l-solid.gl-border-r-solid.gl-border-gray-100.gl-border-1.gl-p-5
     %h4
       = _('Import group from file')
-    = render 'shared/global_alert',
-      variant: :warning,
-      dismissible: false do
+    = render Pajamas::AlertComponent.new(variant: :warning,
+      dismissible: false) do
       .gl-alert-body
         - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md') }
         - link_end = '</a>'.html_safe

app/views/profiles/notifications/show.html.haml

@@ -3,8 +3,7 @@
 
 %div
   - if @user.errors.any?
-    = render 'shared/global_alert',
-      variant: :danger do
+    = render Pajamas::AlertComponent.new(variant: :danger) do
       .gl-alert-body
         %ul
           - @user.errors.full_messages.each do |msg|

app/views/shared/_global_alert.html.haml

-- icons = { info: 'information-o', warning: 'warning', success: 'check-circle', danger: 'error', tip: 'bulb' }
-
-- title = local_assigns.fetch(:title, nil)
-- variant = local_assigns.fetch(:variant, :info)
-- dismissible = local_assigns.fetch(:dismissible, true)
-- alert_class = local_assigns.fetch(:alert_class, nil)
-- alert_data = local_assigns.fetch(:alert_data, nil)
-- close_button_class = local_assigns.fetch(:close_button_class, nil)
-- close_button_data = local_assigns.fetch(:close_button_data, nil)
-- icon = icons[variant]
-
-%div{ role: 'alert', class: ['gl-alert', "gl-alert-#{variant}", alert_class], data: alert_data }
-  = sprite_icon(icon, css_class: "gl-alert-icon#{' gl-alert-icon-no-title' if title.nil?}")
-  - if dismissible
-    %button.btn.gl-dismiss-btn.btn-default.btn-sm.gl-button.btn-default-tertiary.btn-icon.js-close{ type: 'button', aria: { label: _('Dismiss') }, class: close_button_class, data: close_button_data }
-      = sprite_icon('close')
-  .gl-alert-content{ role: 'alert' }
-    - if title
-      %h4.gl-alert-title
-        = title
-    = yield

locale/gitlab.pot

@@ -34469,6 +34469,9 @@ msgstr ""
 msgid "Service Desk allows people to create issues in your GitLab instance without their own user account. It provides a unique email address for end users to create issues in a project. Replies can be sent either through the GitLab interface or by email. End users only see threads through email."
 msgstr ""
 
+msgid "Service Ping payload not found in the application cache"
+msgstr ""
+
 msgid "Service account generated successfully"
 msgstr ""
 

spec/views/shared/_global_alert.html.haml_spec.rb

-# frozen_string_literal: true
-require 'spec_helper'
-
-RSpec.describe 'shared/_global_alert.html.haml' do
-  before do
-    allow(view).to receive(:sprite_icon).and_return('<span class="icon"></span>'.html_safe)
-  end
-
-  it 'renders the title' do
-    title = "The alert's title"
-    render partial: 'shared/global_alert', locals: { title: title }
-
-    expect(rendered).to have_text(title)
-  end
-
-  context 'variants' do
-    it 'renders an info alert by default' do
-      render
-
-      expect(rendered).to have_selector(".gl-alert-info")
-    end
-
-    %w[warning success danger tip].each do |variant|
-      it "renders a #{variant} variant" do
-        allow(view).to receive(:variant).and_return(variant)
-        render partial: 'shared/global_alert', locals: { variant: variant }
-
-        expect(rendered).to have_selector(".gl-alert-#{variant}")
-      end
-    end
-  end
-
-  context 'dismissible option' do
-    it 'shows the dismiss button by default' do
-      render
-
-      expect(rendered).to have_selector('.gl-dismiss-btn')
-    end
-
-    it 'does not show the dismiss button when dismissible is false' do
-      render partial: 'shared/global_alert', locals: { dismissible: false }
-
-      expect(rendered).not_to have_selector('.gl-dismiss-btn')
-    end
-  end
-end