NCL-9058 Unify common Del Analysis and Brew Push operation label mappers and attributes

Author: patrikk0123

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/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,80 @@
+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 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/components/BuildPushStatusLabelMapper/BuildPushStatusLabelMapper.tsx

@@ -0,0 +1,30 @@
+import { Operation } from 'common/operationEntityAttributes';
+
+import { ILabelMapper, LabelMapper } from 'components/LabelMapper/LabelMapper';
+
+const OPERATION_PROGRESS_STATUSES: ILabelMapper<Operation['progressStatus']> = {
+  NEW: {
+    text: 'NEW',
+    color: 'grey',
+  },
+  PENDING: {
+    text: 'PENDING',
+    color: 'grey',
+  },
+  IN_PROGRESS: {
+    text: 'IN PROGRESS',
+    color: 'blue',
+  },
+  FINISHED: {
+    text: 'FINISHED',
+    color: 'green',
+  },
+};
+
+interface IOperationProgressStatusLabelMapperProps {
+  progressStatus: Exclude<Operation['progressStatus'], undefined>;
+}
+
+export const OperationProgressStatusLabelMapper = ({ progressStatus }: IOperationProgressStatusLabelMapperProps) => (
+  <LabelMapper mapperItem={OPERATION_PROGRESS_STATUSES[progressStatus]} />
+);

src/components/LabelMapper/DeliverableAnalysisProgressStatusLabelMapper.tsx

@@ -0,0 +1,38 @@
+import { Operation } from 'common/operationEntityAttributes';
+
+import { ILabelMapper, LabelMapper } from 'components/LabelMapper/LabelMapper';
+
+const OPERATION_RESULTS: ILabelMapper<Operation['result']> = {
+  SUCCESSFUL: {
+    text: 'SUCCESSFUL',
+    color: 'green',
+  },
+  FAILED: {
+    text: 'FAILED',
+    color: 'orange',
+  },
+  REJECTED: {
+    text: 'REJECTED',
+    color: 'orange',
+  },
+  CANCELLED: {
+    text: 'CANCELLED',
+    color: 'grey',
+  },
+  TIMEOUT: {
+    text: 'TIMEOUT',
+    color: 'grey',
+  },
+  SYSTEM_ERROR: {
+    text: 'SYSTEM_ERROR',
+    color: 'red',
+  },
+};
+
+interface IOperationResultLabelMapperProps {
+  result: Exclude<Operation['result'], undefined>;
+}
+
+export const OperationResultLabelMapper = ({ result }: IOperationResultLabelMapperProps) => (
+  <LabelMapper mapperItem={OPERATION_RESULTS[result]} />
+);