@@ -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;
@@ -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>
);
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> --- yocto_console_view/src/views/ConsoleView/ConsoleView.scss | 2 +- yocto_console_view/src/views/ConsoleView/ConsoleView.tsx | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-)