Merge branch '331190-remove-old-alert-components' into 'master'

Remove notices of moved Integrations related pages

See merge request gitlab-org/gitlab!61960

app/assets/javascripts/pages/admin/application_settings/integrations/index.js

 import initIntegrationsList from '~/integrations/index';
-import PersistentUserCallout from '~/persistent_user_callout';
-
-const callout = document.querySelector('.js-admin-integrations-moved');
-
-PersistentUserCallout.factory(callout);
 
 initIntegrationsList();

app/assets/javascripts/pages/projects/settings/integrations/show/index.js

 import initIntegrationsList from '~/integrations/index';
-import PersistentUserCallout from '~/persistent_user_callout';
-
-const callout = document.querySelector('.js-webhooks-moved-alert');
-PersistentUserCallout.factory(callout);
 
 initIntegrationsList();

app/assets/stylesheets/utilities.scss

@@ -77,12 +77,6 @@
 // https://gitlab.com/groups/gitlab-org/-/epics/2882
 .gl-h-200\! { height: px-to-rem($grid-size * 25) !important; }
 
-.d-sm-table-column {
-  @include media-breakpoint-up(sm) {
-    display: table-column !important;
-  }
-}
-
 .gl-bg-purple-light { background-color: $purple-light; }
 
 // move this to GitLab UI once onboarding experiment is considered a success

app/helpers/user_callouts_helper.rb

 # frozen_string_literal: true
 
 module UserCalloutsHelper
-  ADMIN_INTEGRATIONS_MOVED = 'admin_integrations_moved'
   GKE_CLUSTER_INTEGRATION = 'gke_cluster_integration'
   GCP_SIGNUP_OFFER = 'gcp_signup_offer'
   SUGGEST_POPOVER_DISMISSED = 'suggest_popover_dismissed'
   SERVICE_TEMPLATES_DEPRECATED_CALLOUT = 'service_templates_deprecated_callout'
   TABS_POSITION_HIGHLIGHT = 'tabs_position_highlight'
-  WEBHOOKS_MOVED = 'webhooks_moved'
   CUSTOMIZE_HOMEPAGE = 'customize_homepage'
   FEATURE_FLAGS_NEW_VERSION = 'feature_flags_new_version'
   REGISTRATION_ENABLED_CALLOUT = 'registration_enabled_callout'
   UNFINISHED_TAG_CLEANUP_CALLOUT = 'unfinished_tag_cleanup_callout'
 
-  def show_admin_integrations_moved?
-    !user_dismissed?(ADMIN_INTEGRATIONS_MOVED)
-  end
-
   def show_gke_cluster_integration_callout?(project)
     active_nav_link?(controller: sidebar_operations_paths) &&
       can?(current_user, :create_cluster, project) &&
@@ -48,10 +42,6 @@ module UserCalloutsHelper
     !user_dismissed?(SERVICE_TEMPLATES_DEPRECATED_CALLOUT)
   end
 
-  def show_webhooks_moved_alert?
-    !user_dismissed?(WEBHOOKS_MOVED)
-  end
-
   def show_customize_homepage_banner?
     !user_dismissed?(CUSTOMIZE_HOMEPAGE)
   end

app/models/user_callout.rb

@@ -16,9 +16,7 @@ class UserCallout < ApplicationRecord
     tabs_position_highlight: 10,
     threat_monitoring_info: 11,                # EE-only
     account_recovery_regular_check: 12,        # EE-only
-    webhooks_moved: 13,
     service_templates_deprecated_callout: 14,
-    admin_integrations_moved: 15,
     web_ide_alert_dismissed: 16,               # no longer in use
     active_user_count_threshold: 18,           # EE-only
     buy_pipeline_minutes_notification_dot: 19, # EE-only

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

@@ -2,17 +2,6 @@
 - page_title _('Integrations')
 - @content_class = 'limit-container-width' unless fluid_layout
 
-- if show_admin_integrations_moved?
-  .gl-alert.gl-alert-info.js-admin-integrations-moved.mt-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::ADMIN_INTEGRATIONS_MOVED, dismiss_endpoint: user_callouts_path } }
-    = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
-    %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
-      = sprite_icon('close', css_class: 'gl-icon')
-    .gl-alert-body
-      %h4.gl-alert-title= s_('AdminSettings|Some settings have moved')
-      = html_escape_once(s_('AdminSettings|PlantUML, Slack application, Third party offers, Snowplow, Amazon EKS have moved to Settings > General.')).html_safe
-    .gl-alert-actions
-      = link_to s_('AdminSettings|Go to General Settings'), general_admin_application_settings_path, class: 'btn gl-alert-action btn-info gl-button'
-
 %h3= s_('Integrations|Project integration management')
 
 - integrations_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: integrations_help_page_path }

app/views/projects/settings/integrations/show.html.haml

@@ -2,16 +2,6 @@
 - breadcrumb_title _('Integration Settings')
 - page_title _('Integrations')
 
-- if show_webhooks_moved_alert?
-  .gl-alert.gl-alert-info.js-webhooks-moved-alert.gl-mt-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::WEBHOOKS_MOVED, dismiss_endpoint: user_callouts_path } }
-    = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
-    %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
-      = sprite_icon('close', css_class: 'gl-icon')
-    .gl-alert-body
-      = _('Webhooks have moved. They can now be found under the Settings menu.')
-    .gl-alert-actions
-      = link_to _('Go to Webhooks'), project_hooks_path(@project), class: 'gl-button btn gl-alert-action btn-info'
-
 %h3= _('Integrations')
 - integrations_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('user/project/integrations/overview') }
 - webhooks_link_start = '<a href="%{url}">'.html_safe % { url: project_hooks_path(@project) }

doc/api/graphql/reference/index.md

@@ -14688,7 +14688,6 @@ Name of the feature that the callout is for.
 | ----- | ----------- |
 | <a id="usercalloutfeaturenameenumaccount_recovery_regular_check"></a>`ACCOUNT_RECOVERY_REGULAR_CHECK` | Callout feature name for account_recovery_regular_check. |
 | <a id="usercalloutfeaturenameenumactive_user_count_threshold"></a>`ACTIVE_USER_COUNT_THRESHOLD` | Callout feature name for active_user_count_threshold. |
-| <a id="usercalloutfeaturenameenumadmin_integrations_moved"></a>`ADMIN_INTEGRATIONS_MOVED` | Callout feature name for admin_integrations_moved. |
 | <a id="usercalloutfeaturenameenumbuy_pipeline_minutes_notification_dot"></a>`BUY_PIPELINE_MINUTES_NOTIFICATION_DOT` | Callout feature name for buy_pipeline_minutes_notification_dot. |
 | <a id="usercalloutfeaturenameenumcanary_deployment"></a>`CANARY_DEPLOYMENT` | Callout feature name for canary_deployment. |
 | <a id="usercalloutfeaturenameenumcluster_security_warning"></a>`CLUSTER_SECURITY_WARNING` | Callout feature name for cluster_security_warning. |
@@ -14712,7 +14711,6 @@ Name of the feature that the callout is for.
 | <a id="usercalloutfeaturenameenumthreat_monitoring_info"></a>`THREAT_MONITORING_INFO` | Callout feature name for threat_monitoring_info. |
 | <a id="usercalloutfeaturenameenumultimate_trial"></a>`ULTIMATE_TRIAL` | Callout feature name for ultimate_trial. |
 | <a id="usercalloutfeaturenameenumunfinished_tag_cleanup_callout"></a>`UNFINISHED_TAG_CLEANUP_CALLOUT` | Callout feature name for unfinished_tag_cleanup_callout. |
-| <a id="usercalloutfeaturenameenumwebhooks_moved"></a>`WEBHOOKS_MOVED` | Callout feature name for webhooks_moved. |
 | <a id="usercalloutfeaturenameenumweb_ide_alert_dismissed"></a>`WEB_IDE_ALERT_DISMISSED` | Callout feature name for web_ide_alert_dismissed. |
 | <a id="usercalloutfeaturenameenumweb_ide_ci_environments_guidance"></a>`WEB_IDE_CI_ENVIRONMENTS_GUIDANCE` | Callout feature name for web_ide_ci_environments_guidance. |
 

locale/gitlab.pot

@@ -2350,9 +2350,6 @@ msgstr ""
 msgid "AdminSettings|Feed token"
 msgstr ""
 
-msgid "AdminSettings|Go to General Settings"
-msgstr ""
-
 msgid "AdminSettings|Keep the latest artifacts for all jobs in the latest successful pipelines"
 msgstr ""
 
@@ -2365,9 +2362,6 @@ msgstr ""
 msgid "AdminSettings|No required pipeline"
 msgstr ""
 
-msgid "AdminSettings|PlantUML, Slack application, Third party offers, Snowplow, Amazon EKS have moved to Settings > General."
-msgstr ""
-
 msgid "AdminSettings|Required pipeline configuration"
 msgstr ""
 
@@ -2392,9 +2386,6 @@ msgstr ""
 msgid "AdminSettings|Set an instance-wide auto included %{link_start}pipeline configuration%{link_end}. This pipeline configuration will be run after the project's own configuration."
 msgstr ""
 
-msgid "AdminSettings|Some settings have moved"
-msgstr ""
-
 msgid "AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages."
 msgstr ""
 
@@ -15419,9 +15410,6 @@ msgstr ""
 msgid "Go full screen"
 msgstr ""
 
-msgid "Go to Webhooks"
-msgstr ""
-
 msgid "Go to commits"
 msgstr ""
 
@@ -36500,9 +36488,6 @@ msgstr ""
 msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group."
 msgstr ""
 
-msgid "Webhooks have moved. They can now be found under the Settings menu."
-msgstr ""
-
 msgid "Webhooks|Comments"
 msgstr ""
 

spec/features/admin/admin_settings_spec.rb

@@ -315,19 +315,6 @@ RSpec.describe 'Admin updates settings' do
         visit integrations_admin_application_settings_path
       end
 
-      it 'allows user to dismiss deprecation notice' do
-        expect(page).to have_content('Some settings have moved')
-
-        click_button 'Dismiss'
-        wait_for_requests
-
-        expect(page).not_to have_content('Some settings have moved')
-
-        visit integrations_admin_application_settings_path
-
-        expect(page).not_to have_content('Some settings have moved')
-      end
-
       it 'shows integrations table' do
         expect(page).to have_selector '[data-testid="inactive-integrations-table"]'
       end

spec/helpers/user_callouts_helper_spec.rb

@@ -61,26 +61,6 @@ RSpec.describe UserCalloutsHelper do
     end
   end
 
-  describe '.show_admin_integrations_moved?' do
-    subject { helper.show_admin_integrations_moved? }
-
-    context 'when user has not dismissed' do
-      before do
-        allow(helper).to receive(:user_dismissed?).with(described_class::ADMIN_INTEGRATIONS_MOVED) { false }
-      end
-
-      it { is_expected.to be true }
-    end
-
-    context 'when user dismissed' do
-      before do
-        allow(helper).to receive(:user_dismissed?).with(described_class::ADMIN_INTEGRATIONS_MOVED) { true }
-      end
-
-      it { is_expected.to be false }
-    end
-  end
-
   describe '.show_service_templates_deprecated_callout?' do
     using RSpec::Parameterized::TableSyntax