Merge branch '234087-do-not-render-k8s-feature-highlight' into 'master'

Do not render k8s feature highlight if not necessary

Closes #234087

See merge request gitlab-org/gitlab!39228

app/assets/stylesheets/framework/feature_highlight.scss

@@ -29,12 +29,6 @@
   }
 }
 
-.is-showing-fly-out {
-  .feature-highlight {
-    display: none;
-  }
-}
-
 .feature-highlight-popover-content {
   display: none;
 

app/helpers/user_callouts_helper.rb

@@ -13,7 +13,8 @@ module UserCalloutsHelper
   end
 
   def show_gke_cluster_integration_callout?(project)
-    can?(current_user, :create_cluster, project) &&
+    active_nav_link?(controller: sidebar_operations_paths) &&
+      can?(current_user, :create_cluster, project) &&
       !user_dismissed?(GKE_CLUSTER_INTEGRATION)
   end
 

changelogs/unreleased/234087-do-not-render-k8s-feature-highlight.yml

+---
+title: Increase sidebar performance by not rendering k8s highlight when not needed
+merge_request: 39228
+author:
+type: performance

spec/helpers/user_callouts_helper_spec.rb

@@ -25,7 +25,21 @@ RSpec.describe UserCalloutsHelper do
           allow(helper).to receive(:user_dismissed?).and_return(false)
         end
 
-        it { is_expected.to be true }
+        context 'when active_nav_link is in the operations section' do
+          before do
+            allow(helper).to receive(:active_nav_link?).and_return(true)
+          end
+
+          it { is_expected.to be true }
+        end
+
+        context 'when active_nav_link is not in the operations section' do
+          before do
+            allow(helper).to receive(:active_nav_link?).and_return(false)
+          end
+
+          it { is_expected.to be false }
+        end
       end
 
       context 'when user dismissed' do