[NCl-9058] Build Push and Milestone close

package.json

@@ -16,7 +16,7 @@
     "graphology-layout": "^0.6.1",
     "graphology-layout-forceatlas2": "^0.10.1",
     "lodash-es": "^4.17.21",
-    "pnc-api-types-ts": "project-ncl/pnc-api-types-ts#v3.1.3-SNAPSHOT-pnc-7abd9ec33",
+    "pnc-api-types-ts": "project-ncl/pnc-api-types-ts#v3.1.3-SNAPSHOT-pnc-c84e958d9",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router": "^7.5.0",

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,9 +52,8 @@ 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 { ProductMilestoneCloseResultDetailPage } from 'components/ProductMilestoneCloseResultDetailPage/ProductMilestoneCloseResultDetailPage';
-import { ProductMilestoneCloseResultsPage } from 'components/ProductMilestoneCloseResultsPage/ProductMilestoneCloseResultsPage';
 import { ProductMilestoneComparisonPage } from 'components/ProductMilestoneComparisonPage/ProductMilestoneComparisonPage';
 import { ProductMilestoneCreateEditPage } from 'components/ProductMilestoneCreateEditPage/ProductMilestoneCreateEditPage';
 import { ProductMilestoneDeliverableAnalysesPage } from 'components/ProductMilestoneDeliverableAnalysesPage/ProductMilestoneDeliverableAnalysesPage';
@@ -177,17 +177,11 @@ export const AppRoutes = (
                     </ProtectedRoute>
                   }
                 />
-                <Route
-                  path="close-results/:closeResultId"
-                  index
-                  handle={breadcrumbData.productMilestone.id}
-                  element={<ProductMilestoneCloseResultDetailPage />}
-                />
               </Route>
               <Route path=":productMilestoneId" element={<ProductMilestonePages />} handle={breadcrumbData.productMilestone.id}>
                 <Route path="details" element={<ProductMilestoneDetailPage />} />
                 <Route path="builds-performed" element={<ProductMilestoneBuildsPerformedPage />} />
-                <Route path="close-results" element={<ProductMilestoneCloseResultsPage />} />
+                <Route path="build-pushes" element={<ProductMilestoneBuildPushesPage />} />
                 <Route path="deliverable-analyses" element={<ProductMilestoneDeliverableAnalysesPage />} />
                 <Route path="delivered-artifacts" element={<ProductMilestoneDeliveredArtifactsPage />} />
                 <Route path="interconnection-graph" element={<ProductMilestoneInterconnectionGraphPage />} />
@@ -327,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/backendErrorMessageMapper.ts

@@ -18,6 +18,10 @@ export const backendErrorMessageMapper = (errorStatus: number, backendErrorMessa
       return backendErrorMessage.replace(/Artifact \d+/, 'Artifact');
     }
 
+    if (/Build push.*already in progress/.test(backendErrorMessage)) {
+      return backendErrorMessage;
+    }
+
     const labelMatch = backendErrorMessage.match(/Unable to add the label (\w+)/);
     if (labelMatch) {
       const label = labelMatch[1];

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/buildPushOperationEntityAttributes.ts

@@ -0,0 +1,17 @@
+import { BuildPushOperation } from 'pnc-api-types-ts';
+
+import { TEntityAttributes } from 'common/entityAttributes';
+import { operationEntityAttributes } from 'common/operationEntityAttributes';
+
+interface IExtendedBuildPushOperation extends BuildPushOperation {
+  'user.username': string;
+  buildId: string;
+}
+
+export const buildPushOperationEntityAttributes = {
+  ...operationEntityAttributes,
+  buildId: {
+    id: 'buildId',
+    title: 'Build ID',
+  },
+} as const satisfies TEntityAttributes<IExtendedBuildPushOperation>;

src/common/buildPushResultEntityAttributes.ts → 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/common/deliverableAnalysisOperationEntityAttributes.ts

@@ -1,67 +1,17 @@
 import { DeliverableAnalyzerOperation } from 'pnc-api-types-ts';
 
 import { TEntityAttributes } from 'common/entityAttributes';
-
-const resultValues: DeliverableAnalyzerOperation['result'][] = [
-  'SUCCESSFUL',
-  'FAILED',
-  'REJECTED',
-  'CANCELLED',
-  'TIMEOUT',
-  'SYSTEM_ERROR',
-];
-
-const progressStatusValues: DeliverableAnalyzerOperation['progressStatus'][] = ['NEW', 'PENDING', 'IN_PROGRESS', 'FINISHED'];
+import { operationEntityAttributes } from 'common/operationEntityAttributes';
 
 interface IExtendedDeliverableAnalyzerOperation extends DeliverableAnalyzerOperation {
   'user.username': string;
+  'productMilestone.version': string;
   deliverablesUrls: string;
   runAsScratchAnalysis: boolean;
-  'productMilestone.version': string;
 }
 
 export const deliverableAnalysisOperationEntityAttributes = {
-  id: {
-    id: 'id',
-    title: 'ID',
-  },
-  submitTime: {
-    id: 'submitTime',
-    title: 'Submit Time',
-    sort: {
-      group: 'times',
-    },
-  },
-  startTime: {
-    id: 'startTime',
-    title: 'Start Time',
-    sort: {
-      group: 'times',
-    },
-  },
-  endTime: {
-    id: 'endTime',
-    title: 'End Time',
-    sort: {
-      group: 'times',
-    },
-  },
-  progressStatus: {
-    id: 'progressStatus',
-    title: 'Progress Status',
-    values: progressStatusValues,
-    filter: {
-      operator: '==',
-    },
-  },
-  result: {
-    id: 'result',
-    title: 'Result',
-    values: resultValues,
-    filter: {
-      operator: '==',
-    },
-  },
+  ...operationEntityAttributes,
   'productMilestone.version': {
     id: 'productMilestone.version',
     title: 'Milestone Version',
@@ -70,18 +20,6 @@ export const deliverableAnalysisOperationEntityAttributes = {
     },
     sort: {},
   },
-  'user.username': {
-    id: 'user.username',
-    title: 'User',
-    filter: {
-      operator: '=like=',
-    },
-    sort: {},
-  },
-  parameters: {
-    id: 'parameters',
-    title: 'Parameters',
-  },
   deliverablesUrls: {
     id: 'deliverablesUrls',
     title: 'Deliverables URLs',

src/common/operationEntityAttributes.ts

@@ -0,0 +1,82 @@
+import { DeliverableAnalyzerOperation } from 'pnc-api-types-ts';
+
+import { TEntityAttributes } from 'common/entityAttributes';
+
+/*
+ * This supertype is not coming from pnc-api-types-ts,
+ * but these props are the same for all Operations.
+ */
+export interface Operation {
+  id: DeliverableAnalyzerOperation['id'];
+  parameters?: DeliverableAnalyzerOperation['parameters'];
+  progressStatus?: DeliverableAnalyzerOperation['progressStatus'];
+  result?: DeliverableAnalyzerOperation['result'];
+  submitTime?: DeliverableAnalyzerOperation['submitTime'];
+  startTime?: DeliverableAnalyzerOperation['startTime'];
+  endTime?: DeliverableAnalyzerOperation['endTime'];
+  user?: DeliverableAnalyzerOperation['user'];
+}
+
+const operationResultValues: Operation['result'][] = ['SUCCESSFUL', 'FAILED', 'REJECTED', 'CANCELLED', 'TIMEOUT', 'SYSTEM_ERROR'];
+
+const operationProgressStatusValues: Operation['progressStatus'][] = ['NEW', 'PENDING', 'IN_PROGRESS', 'FINISHED'];
+
+interface IExtendedOperation extends Operation {
+  'user.username': string;
+}
+
+export const operationEntityAttributes = {
+  id: {
+    id: 'id',
+    title: 'ID',
+  },
+  submitTime: {
+    id: 'submitTime',
+    title: 'Submit Time',
+    sort: {
+      group: 'times',
+    },
+  },
+  startTime: {
+    id: 'startTime',
+    title: 'Start Time',
+    sort: {
+      group: 'times',
+    },
+  },
+  endTime: {
+    id: 'endTime',
+    title: 'End Time',
+    sort: {
+      group: 'times',
+    },
+  },
+  progressStatus: {
+    id: 'progressStatus',
+    title: 'Progress Status',
+    values: operationProgressStatusValues,
+    filter: {
+      operator: '==',
+    },
+  },
+  result: {
+    id: 'result',
+    title: 'Result',
+    values: operationResultValues,
+    filter: {
+      operator: '==',
+    },
+  },
+  'user.username': {
+    id: 'user.username',
+    title: 'User',
+    filter: {
+      operator: '=like=',
+    },
+    sort: {},
+  },
+  parameters: {
+    id: 'parameters',
+    title: 'Parameters',
+  },
+} as const satisfies TEntityAttributes<IExtendedOperation>;

src/common/productMilestoneCloseRequestEntityAttributes.ts

@@ -0,0 +1,11 @@
+import { MilestoneCloseRequest } from 'pnc-api-types-ts';
+
+import { TEntityAttributes } from 'common/entityAttributes';
+
+export const productMilestoneCloseRequestEntityAttributes = {
+  skipBrewPush: {
+    id: 'skipBrewPush',
+    title: 'Skip Brew push',
+    tooltip: 'Brew push of the Builds in the Milestone will be skipped and the Milestone will be closed immediately.',
+  },
+} as const satisfies TEntityAttributes<MilestoneCloseRequest>;

src/common/productMilestoneEntityAttributes.ts

@@ -4,7 +4,6 @@ import { TEntityAttributes } from 'common/entityAttributes';
 
 interface IExtendedProductMilestone extends ProductMilestone {
   status: any; // derived from endDate
-  lastCloseResult: any; // loaded from getCloseResults
   isCurrent: boolean; // loaded from Product Version
 }
 
@@ -40,10 +39,6 @@ export const productMilestoneEntityAttributes = {
     title: 'End Date',
     sort: {},
   },
-  lastCloseResult: {
-    id: 'lastCloseResult',
-    title: 'Last Close Result',
-  },
   isCurrent: {
     id: 'isCurrent',
     title: 'Is Product Milestone Current',