From 68fdc2a29ec09b6faa15d3238fa8eecfd242b852 Mon Sep 17 00:00:00 2001
From: Julia Miocene <jmiocene@gitlab.com>
Date: Mon, 19 Feb 2024 20:39:25 +0100
Subject: [PATCH] Replace cluster_popover illustration

For admins using Chinese language illustration on transfering banner was replaced with a new one.

For projects with no error tracking the empty state illustration was updated with the new one.

Changelog: changed
---
 .../components/jh_transition_banner.vue                     | 3 +--
 .../error_tracking/components/error_tracking_list.vue       | 6 +-----
 app/helpers/projects/error_tracking_helper.rb               | 2 +-
 spec/helpers/projects/error_tracking_helper_spec.rb         | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/admin/banners/jh_transition_banner/components/jh_transition_banner.vue b/app/assets/javascripts/admin/banners/jh_transition_banner/components/jh_transition_banner.vue
index 8a6e1f5510659f..1c5346520d6625 100644
--- a/app/assets/javascripts/admin/banners/jh_transition_banner/components/jh_transition_banner.vue
+++ b/app/assets/javascripts/admin/banners/jh_transition_banner/components/jh_transition_banner.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlBanner, GlSprintf, GlLink } from '@gitlab/ui';
-import ClusterPopoverSvg from '@gitlab/svgs/dist/illustrations/cluster_popover.svg?url';
+import ClusterPopoverSvg from '@gitlab/svgs/dist/illustrations/devops-sm.svg?url';
 import UserCalloutDismisser from '~/vue_shared/components/user_callout_dismisser.vue';
 import { transitionBannerTexts } from '../constants';
 
@@ -51,7 +51,6 @@ export default {
         :svg-path="$options.ClusterPopoverSvg"
         button-link="https://gitlab.cn/upgrade/"
         class="gl-mt-3"
-        variant="introduction"
         @close="dismiss"
       >
         <p>
diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
index 95ae5e5a92ccd0..0408e5e4bf0847 100644
--- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
+++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
@@ -493,11 +493,7 @@ export default {
     </div>
     <!-- Get Started with ET -->
     <div v-else>
-      <gl-empty-state
-        :title="__('Get started with error tracking')"
-        :svg-path="illustrationPath"
-        :svg-height="null"
-      >
+      <gl-empty-state :title="__('Get started with error tracking')" :svg-path="illustrationPath">
         <template #description>
           <div>
             <span>{{ __('Monitor your errors directly in GitLab.') }}</span>
diff --git a/app/helpers/projects/error_tracking_helper.rb b/app/helpers/projects/error_tracking_helper.rb
index b21bac9da7f475..30e705771b589d 100644
--- a/app/helpers/projects/error_tracking_helper.rb
+++ b/app/helpers/projects/error_tracking_helper.rb
@@ -12,7 +12,7 @@ def error_tracking_data(current_user, project)
       'integrated-error-tracking-enabled' => integrated_tracking_enabled?(project).to_s,
       'project-path' => project.full_path,
       'list-path' => project_error_tracking_index_path(project),
-      'illustration-path' => image_path('illustrations/cluster_popover.svg'),
+      'illustration-path' => image_path('illustrations/empty-state/empty-radar-md.svg'),
       'show-integrated-tracking-disabled-alert' => show_integrated_tracking_disabled_alert?(project).to_s
     }
   end
diff --git a/spec/helpers/projects/error_tracking_helper_spec.rb b/spec/helpers/projects/error_tracking_helper_spec.rb
index c2fefdae9d1de1..1ae595a5b10c7b 100644
--- a/spec/helpers/projects/error_tracking_helper_spec.rb
+++ b/spec/helpers/projects/error_tracking_helper_spec.rb
@@ -35,7 +35,7 @@
           'integrated-error-tracking-enabled' => 'false',
           'list-path' => list_path,
           'project-path' => project_path,
-          'illustration-path' => match_asset_path('/assets/illustrations/cluster_popover.svg'),
+          'illustration-path' => match_asset_path('/assets/illustrations/empty-state/empty-radar-md.svg'),
           'show-integrated-tracking-disabled-alert' => 'false'
         )
       end
-- 
GitLab