Merge pull request #7211 from tdesveaux/tds/react-base/fix_skipped_bu…

…ildrequests www/react: BuildRequestSummary correctly display skipped BuildRequest
buildbot · Dec 1, 2023 · f227b3f · f227b3f
2 parents 09a54ab + 9fc8b98
commit f227b3f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/www/react-base/src/components/BuildRequestSummary/BuildRequestSummary.tsx b/www/react-base/src/components/BuildRequestSummary/BuildRequestSummary.tsx
@@ -18,7 +18,7 @@
 import './BuildRequestSummary.scss';
 import {observer} from "mobx-react";
 import {Card} from "react-bootstrap";
-import {Builder, Buildrequest, Buildset, useDataAccessor, useDataApiQuery} from "buildbot-data-js";
+import {Builder, Buildrequest, Buildset, useDataAccessor, useDataApiQuery, SKIPPED, results2text} from "buildbot-data-js";
 import {BadgeStatus} from "buildbot-ui";
 import {BuildSummary} from "../BuildSummary/BuildSummary";
 import {Link} from "react-router-dom";
@@ -48,6 +48,9 @@ export const BuildRequestSummary = observer(({buildrequestid}: BuildRequestSumma
                   parentRelationship={null}/>
   ));
 
+  const isRequestSkipped = buildRequest?.results === SKIPPED;
+  const requestResultClass = isRequestSkipped ? "results_SKIPPED" : "results_PENDING";
+
   const renderBuildRequestDetails = () => {
     if (buildRequest === null) {
       return <>loading buildrequests details...</>
@@ -65,17 +68,19 @@ export const BuildRequestSummary = observer(({buildrequestid}: BuildRequestSumma
           | {reason}
         </div>
         <div className="flex-grow-1 text-right">
-          <span>waiting for available worker and locks</span>
-          <BadgeStatus className="results_PENDING">...</BadgeStatus>
+          {!isRequestSkipped ? <span>waiting for available worker and locks</span> : <></>}
+          <BadgeStatus className={requestResultClass}>
+            {results2text(buildRequest)}
+          </BadgeStatus>
         </div>
       </>
     );
   }
 
-  const renderPendingBuilds = () => {
+  const renderRequest = () => {
     return (
       <div>
-        <Card className="bb-build-request-summary-pending-panel results_PENDING">
+        <Card className={"bb-build-request-summary-pending-panel " + requestResultClass}>
           <Card.Header className="no-select">
             <div className="flex-row">
               {renderBuildRequestDetails()}
@@ -89,8 +94,7 @@ export const BuildRequestSummary = observer(({buildrequestid}: BuildRequestSumma
   return (
     <div className="bb-build-request-summary">
       <>
-        {buildElements}
-        {builds.array.length === 0 ? renderPendingBuilds() : <></>}
+        {builds.array.length > 0 ? buildElements : renderRequest()}
       </>
     </div>
   );