From b53eb410076e916f554f0ffe71ff0d350cde5362 Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy.davis@sonarsource.com>
Date: Wed, 27 Sep 2023 11:04:25 +0200
Subject: [PATCH] SONAR-20382 Fix flaky test - 2nd attempt

---
 .../src/main/js/app/components/ComponentContainer.tsx    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx b/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx
index 6b37df5b8de..8fee8246f08 100644
--- a/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx
+++ b/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx
@@ -102,9 +102,12 @@ export class ComponentContainer extends React.PureComponent<Props, State> {
     }
   };
 
-  fetchComponent = async (shouldRedirectToDashboard = false, backgroundLoading = false) => {
+  fetchComponent = async (shouldRedirectToDashboard = false) => {
     const { branch, id: key, pullRequest } = this.props.location.query;
-    if (!backgroundLoading) {
+    const { component } = this.state;
+
+    // Only show loader if we're changing components
+    if (component?.key !== key) {
       this.setState({ loading: true });
     }
 
@@ -191,7 +194,7 @@ export class ComponentContainer extends React.PureComponent<Props, State> {
             },
             () => {
               if (shouldFetchComponent) {
-                this.fetchComponent(shouldRedirectToDashboard, true);
+                this.fetchComponent(shouldRedirectToDashboard);
               }
             },
           );
-- 
2.39.5