From d9bcc41cf7a0089c471b7e7ec6995ec88ddda682 Mon Sep 17 00:00:00 2001
From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Date: Tue, 11 Feb 2025 15:48:18 +0100
Subject: [PATCH] yocto_console_view: Group similar builder builds

Builds from similar builders have to be in the same <td>, compacting a
bit the whole view.

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../src/views/ConsoleView/ConsoleView.scss            |  2 +-
 .../src/views/ConsoleView/ConsoleView.tsx             | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/yocto_console_view/src/views/ConsoleView/ConsoleView.scss b/yocto_console_view/src/views/ConsoleView/ConsoleView.scss
index a3421d9..7969b22 100644
--- a/yocto_console_view/src/views/ConsoleView/ConsoleView.scss
+++ b/yocto_console_view/src/views/ConsoleView/ConsoleView.scss
@@ -17,7 +17,7 @@ tr.bb-console-table-first-row {
   font-size: 1em;
   width: 1.5em;
   text-align: center;
-  transform: rotate(-45deg) translate(.5em, 1em);
+  transform: rotate(-45deg) translate(-.2em, .8em);
   transform-origin: bottom left;
   text-decoration: none;
   white-space: nowrap;
diff --git a/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx b/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx
index a44be81..973c264 100644
--- a/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx
+++ b/yocto_console_view/src/views/ConsoleView/ConsoleView.tsx
@@ -412,14 +412,17 @@ export const ConsoleView = observer(() => {
   const changeRows = changesToShow.map(changeInfo => {
     const change = changeInfo.change;
 
-    const builderColumns = buildersToShow.map(builder => {
-      const builds = changeInfo.buildsByBuilderId.get(builder.builderid) ?? [];
+    const builderColumns = builderGroups.map((builderGroup, i) => {
+      const builds: Build[] = [];
+      for (const builder of builderGroup.builders) {
+        const builderBuilds = changeInfo.buildsByBuilderId.get(builder.builderid) ?? []
+        builds.push(...builderBuilds);
+      }
       const buildLinks = builds.map(build => (
         <BuildLinkWithSummaryTooltip key={build.buildid} build={build}/>
       ));
-
       return (
-        <td key={builder.name} title={builder.name} className="column">
+        <td key={i} title={builderGroup.name} colSpan={builderGroup.colspan} className="column">
           {buildLinks}
         </td>
       );