NCL-9058 Synchronize Build Pushes with the current REST

Author: patrikk0123

src/AppRoutes.tsx

@@ -14,7 +14,6 @@ import { ArtifactsPage } from 'components/ArtifactsPage/ArtifactsPage';
 import { BuildAlignmentLogPage } from 'components/BuildAlignmentLogPage/BuildAlignmentLogPage';
 import { BuildArtifactDependencyGraphPage } from 'components/BuildArtifactDependencyGraphPage/BuildArtifactDependencyGraphPage';
 import { BuildArtifactsPage } from 'components/BuildArtifactsPage/BuildArtifactsPage';
-import { BuildBrewPushPage } from 'components/BuildBrewPushPage/BuildBrewPushPage';
 import { BuildConfigBuildMetricsPage } from 'components/BuildConfigBuildMetricsPage/BuildConfigBuildMetricsPage';
 import { BuildConfigCreateEditPage } from 'components/BuildConfigCreateEditPage/BuildConfigCreateEditPage';
 import { BuildConfigDependantsPage } from 'components/BuildConfigDependantsPage/BuildConfigDependantsPage';
@@ -31,6 +30,8 @@ import { BuildDetailPage } from 'components/BuildDetailPage/BuildDetailPage';
 import { BuildLogPage } from 'components/BuildLogPage/BuildLogPage';
 import { BuildMetricsPage } from 'components/BuildMetricsPage/BuildMetricsPage';
 import { BuildPages } from 'components/BuildPages/BuildPages';
+import { BuildPushPage } from 'components/BuildPushPage/BuildPushPage';
+import { BuildPushesPage } from 'components/BuildPushesPage/BuildPushesPage';
 import { BuildsPage } from 'components/BuildsPage/BuildsPage';
 import { DashboardPage } from 'components/DashboardPage/DashboardPage';
 import { DeliverableAnalysesPage } from 'components/DeliverableAnalysesPage/DeliverableAnalysesPage';
@@ -51,6 +52,7 @@ import { LiveBuildLogPage } from 'components/LiveBuildLogPage/LiveBuildLogPage';
 import { PreferencesPage } from 'components/PreferencesPage/PreferencesPage';
 import { ProductCreateEditPage } from 'components/ProductCreateEditPage/ProductCreateEditPage';
 import { ProductDetailPage } from 'components/ProductDetailPage/ProductDetailPage';
+import { ProductMilestoneBuildPushesPage } from 'components/ProductMilestoneBuildPushesPage/ProductMilestoneBuildPushesPage';
 import { ProductMilestoneBuildsPerformedPage } from 'components/ProductMilestoneBuildsPerformedPage/ProductMilestoneBuildsPerformedPage';
 import { ProductMilestoneComparisonPage } from 'components/ProductMilestoneComparisonPage/ProductMilestoneComparisonPage';
 import { ProductMilestoneCreateEditPage } from 'components/ProductMilestoneCreateEditPage/ProductMilestoneCreateEditPage';
@@ -179,6 +181,7 @@ export const AppRoutes = (
               <Route path=":productMilestoneId" element={<ProductMilestonePages />} handle={breadcrumbData.productMilestone.id}>
                 <Route path="details" element={<ProductMilestoneDetailPage />} />
                 <Route path="builds-performed" element={<ProductMilestoneBuildsPerformedPage />} />
+                <Route path="build-pushes" element={<ProductMilestoneBuildPushesPage />} />
                 <Route path="deliverable-analyses" element={<ProductMilestoneDeliverableAnalysesPage />} />
                 <Route path="delivered-artifacts" element={<ProductMilestoneDeliveredArtifactsPage />} />
                 <Route path="interconnection-graph" element={<ProductMilestoneInterconnectionGraphPage />} />
@@ -318,7 +321,10 @@ export const AppRoutes = (
         <Route path="alignment-log" element={<BuildAlignmentLogPage />} />
         <Route path="artifacts" element={<BuildArtifactsPage />} />
         <Route path="dependencies" element={<BuildDependenciesPage />} />
-        <Route path="brew-push" element={<BuildBrewPushPage />} />
+        <Route path="build-pushes" handle={breadcrumbData.buildPushes.id}>
+          <Route index element={<BuildPushesPage />} />
+          <Route path=":buildPushId" element={<BuildPushPage />} handle={breadcrumbData.buildPush.id} />
+        </Route>
         <Route path="build-metrics" element={<BuildMetricsPage />} />
         <Route
           path="artifact-dependency-graph"

src/common/breadcrumbData.ts

@@ -64,6 +64,14 @@ export const breadcrumbData = {
     id: 'build',
     title: EntityTitles.build,
   },
+  buildPushes: {
+    id: 'buildPushes',
+    title: PageTitles.buildPushes,
+  },
+  buildPush: {
+    id: 'buildPush',
+    title: EntityTitles.buildPush,
+  },
   groupBuilds: {
     id: 'groupBuilds',
     title: PageTitles.groupBuilds,

src/common/buildPushResultEntityAttributes.ts renamed to src/common/buildPushReportEntityAttributes.ts

@@ -1,18 +1,14 @@
-import { BuildPushResult } from 'pnc-api-types-ts';
+import { BuildPushReport } from 'pnc-api-types-ts';
 
 import { TEntityAttributes } from 'common/entityAttributes';
 
-export const buildPushResultEntityAttributes = {
+export const buildPushReportEntityAttributes = {
   id: {
     id: 'id',
     title: 'ID',
   },
-  status: {
-    id: 'status',
-    title: 'Status',
-  },
-  buildId: {
-    id: 'buildId',
+  build: {
+    id: 'build',
     title: 'Build ID',
   },
   brewBuildId: {
@@ -23,4 +19,4 @@ export const buildPushResultEntityAttributes = {
     id: 'brewBuildUrl',
     title: 'Brew Build URL',
   },
-} as const satisfies TEntityAttributes<BuildPushResult>;
+} as const satisfies TEntityAttributes<BuildPushReport>;

src/common/constants.ts

@@ -27,6 +27,7 @@ export const PageTitles = {
   groupConfigCreate: 'Create Group Config',
   groupConfigEdit: 'Edit Group Config',
   builds: 'Builds',
+  buildPushes: 'Build Pushes',
   buildHistory: 'Build History',
   buildMetrics: 'Build Metrics',
   groupBuilds: 'Group Builds',
@@ -55,6 +56,7 @@ export const ButtonTitles = {
 export const EntityTitles = {
   artifact: 'Artifact',
   build: 'Build',
+  buildPush: 'Build Push',
   buildConfig: 'Build Config',
   groupBuild: 'Group Build',
   groupConfig: 'Group Config',

src/components/BuildBrewPushPage/BuildBrewPushPage.tsx

@@ -8,7 +8,12 @@ import { buildStatusData } from 'common/buildStatusData';
 import { TOTAL_COUNT_REQUEST_CONFIG } from 'common/constants';
 
 import { useParamsRequired } from 'hooks/useParamsRequired';
-import { hasBuildFinished, hasBuildStatusChanged, usePncWebSocketEffect } from 'hooks/usePncWebSocketEffect';
+import {
+  hasBuildFinished,
+  hasBuildPushFinished,
+  hasBuildStatusChanged,
+  usePncWebSocketEffect,
+} from 'hooks/usePncWebSocketEffect';
 import { IServiceContainerState, useServiceContainer } from 'hooks/useServiceContainer';
 import { useTitle } from 'hooks/useTitle';
 
@@ -49,6 +54,9 @@ export const BuildPages = () => {
   const serviceContainerDependencies = useServiceContainer(buildApi.getDependencies);
   const serviceContainerDependenciesRunner = serviceContainerDependencies.run;
 
+  const serviceContainerBuildPushes = useServiceContainer(buildApi.getBuildPushes);
+  const serviceContainerBuildPushesRunner = serviceContainerBuildPushes.run;
+
   const serviceContainerBuildSshCredentials = useServiceContainer(buildApi.getSshCredentials);
   const serviceContainerBuildSshCredentialsRunner = serviceContainerBuildSshCredentials.run;
 
@@ -72,7 +80,14 @@ export const BuildPages = () => {
 
     serviceContainerArtifactsRunner({ serviceData: { id: buildId }, requestConfig: TOTAL_COUNT_REQUEST_CONFIG });
     serviceContainerDependenciesRunner({ serviceData: { id: buildId }, requestConfig: TOTAL_COUNT_REQUEST_CONFIG });
-  }, [serviceContainerBuildRunner, serviceContainerArtifactsRunner, serviceContainerDependenciesRunner, buildId]);
+    serviceContainerBuildPushesRunner({ serviceData: { id: buildId }, requestConfig: TOTAL_COUNT_REQUEST_CONFIG });
+  }, [
+    serviceContainerBuildRunner,
+    serviceContainerArtifactsRunner,
+    serviceContainerDependenciesRunner,
+    serviceContainerBuildPushesRunner,
+    buildId,
+  ]);
 
   useEffect(() => {
     if (
@@ -107,13 +122,19 @@ export const BuildPages = () => {
         } else if (hasBuildStatusChanged(wsData, { buildId })) {
           const wsBuild: Build = wsData.build;
           serviceContainerBuildSetter(wsBuild);
+        } else if (hasBuildPushFinished(wsData, { buildId })) {
+          serviceContainerBuildPushesRunner({
+            serviceData: { id: buildId },
+            requestConfig: TOTAL_COUNT_REQUEST_CONFIG,
+          });
         }
       },
       [
         serviceContainerBuildRunner,
         serviceContainerBuildSetter,
         serviceContainerArtifactsRunner,
         serviceContainerDependenciesRunner,
+        serviceContainerBuildPushesRunner,
         buildId,
       ]
     )
@@ -156,8 +177,8 @@ export const BuildPages = () => {
           {serviceContainerDependencies.data?.totalHits}
         </PageTabsLabel>
       </PageTabsItem>
-      <PageTabsItem url="brew-push" isDisabled={isBuilding} tooltip={staticDataTooltip}>
-        Brew Push
+      <PageTabsItem url="build-pushes" isDisabled={isBuilding} tooltip={staticDataTooltip}>
+        Build Pushes
       </PageTabsItem>
       <PageTabsItem url="build-metrics">Build Metrics</PageTabsItem>
       <ExperimentalContent>
@@ -198,7 +219,10 @@ export const BuildPages = () => {
     <ServiceContainerLoading {...serviceContainerBuild} title="Build details">
       <PageLayout
         title={<BuildStatus build={serviceContainerBuild.data!} long hideDatetime hideUsername includeConfigLink />}
-        breadcrumbs={[{ entity: breadcrumbData.build.id, title: serviceContainerBuild.data?.id }]}
+        breadcrumbs={[
+          { entity: breadcrumbData.build.id, title: serviceContainerBuild.data?.id },
+          { entity: breadcrumbData.buildPush.id, title: serviceContainerBuild.data?.id },
+        ]}
         tabs={pageTabs}
         actions={actions}
       >