From 066eb69794ba1ac9a9a547d5f119431c8926db48 Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy.davis@sonarsource.com>
Date: Mon, 30 Oct 2023 15:34:30 +0100
Subject: [PATCH] SONAR-20828 show analysis date for correct branch in
 portfolio breakdonw

---
 .../src/main/js/apps/code/components/CodeAppRenderer.tsx      | 2 +-
 server/sonar-web/src/main/js/apps/code/utils.ts               | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/code/components/CodeAppRenderer.tsx b/server/sonar-web/src/main/js/apps/code/components/CodeAppRenderer.tsx
index 6a573b846ec..33aac584a0a 100644
--- a/server/sonar-web/src/main/js/apps/code/components/CodeAppRenderer.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/CodeAppRenderer.tsx
@@ -181,7 +181,7 @@ export default function CodeAppRenderer(props: Props) {
       </div>
 
       {(showComponentList || showSearch) && (
-        <Card className="sw-mt-2">
+        <Card className="sw-mt-2 sw-overflow-auto">
           <Spinner loading={loading}>
             {showComponentList && (
               <Components
diff --git a/server/sonar-web/src/main/js/apps/code/utils.ts b/server/sonar-web/src/main/js/apps/code/utils.ts
index e4465315cbe..5309f2004e0 100644
--- a/server/sonar-web/src/main/js/apps/code/utils.ts
+++ b/server/sonar-web/src/main/js/apps/code/utils.ts
@@ -188,7 +188,9 @@ export async function retrieveComponentChildren(
   if (instance.mounted && isPortfolioLike(qualifier)) {
     await Promise.all(
       // eslint-disable-next-line local-rules/no-api-imports
-      result.components.map((c) => getComponentData({ component: c.refKey ?? c.key })),
+      result.components.map((c) =>
+        getComponentData({ component: c.refKey ?? c.key, branch: c.branch }),
+      ),
     ).then(
       (data) => {
         data.forEach(({ component: { analysisDate } }, i) => {
-- 
2.39.5