feat: ✨ add new columns (#864)

* feat: ✨ add new columns * feat: ✨ add new datafield and new columns * remove commented code
equinor · Mar 8, 2024 · 8c918b9 · 8c918b9
1 parent 15342ce
commit 8c918b9
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 2 deletions.
diff --git a/libs/heattraceapp/src/lib/config/tableConfig.tsx b/libs/heattraceapp/src/lib/config/tableConfig.tsx
@@ -6,13 +6,15 @@ import {
   useGridDataSource,
 } from '@cc-components/shared/workspace-config';
 import {
+  BaseStatus,
   DateCell,
   DescriptionCell,
   LinkCell,
   StatusCircle,
   StyledMonospace,
   domainNames,
   pipetestStatusColormap,
+  statusColorMap,
   useHttpClient,
 } from '@cc-components/shared';
 
@@ -70,6 +72,16 @@ const columnDefinitions: [ColDef<HeatTrace>, ...ColDef<HeatTrace>[]] = [
     headerName: domainNames.commPriority1,
     valueGetter: (pkg) => pkg.data?.priority1,
   },
+  {
+    colId: 'Priority2',
+    headerName: domainNames.commPriority2,
+    valueGetter: (pkg) => pkg.data?.priority2,
+  },
+  {
+    colId: 'Priority3',
+    headerName: domainNames.commPriority3,
+    valueGetter: (pkg) => pkg.data?.priority3,
+  },
   {
     colId: 'Location',
     headerName: domainNames.mcLocation,
@@ -78,8 +90,25 @@ const columnDefinitions: [ColDef<HeatTrace>, ...ColDef<HeatTrace>[]] = [
       return <StyledMonospace>{props.value}</StyledMonospace>;
     },
   },
+  {
+    colId: 'MechanicalCompletionStatus',
+    headerName: domainNames.mcStatus,
+    valueGetter: (pkg) => pkg.data?.mechanicalCompletionStatus,
+    cellRenderer: (props: ICellRendererProps<HeatTrace, string>) => {
+      if (!props.data?.mechanicalCompletionStatus) return null;
+      return (
+        <StatusCircle
+          content={props.data.mechanicalCompletionStatus}
+          statusColor={
+            statusColorMap[props.data.mechanicalCompletionStatus as BaseStatus]
+          }
+        />
+      );
+    },
+  },
   // Need to implement the visual checklistStatus
   {
+    colId: 'FormStatus',
     headerName: domainNames.checklistStatus,
     valueGetter: (pkg) => pkg.data?.formStatus,
     cellRenderer: (props: ICellRendererProps<HeatTrace, string>) => {
@@ -94,12 +123,33 @@ const columnDefinitions: [ColDef<HeatTrace>, ...ColDef<HeatTrace>[]] = [
   },
   { headerName: domainNames.currentStep, valueGetter: (pkg) => pkg.data?.checklistStep },
   {
+    colId: 'RfCPlannedForecastDate',
     headerName: 'RFC',
     valueGetter: (pkg) => pkg.data?.rfCPlannedForecastDate,
     cellRenderer: (props: ICellRendererProps<HeatTrace, string | null | undefined>) => {
       return props.value ? <DateCell dateString={props.value} /> : null;
     },
   },
+  {
+    colId: 'CommissioningIdentifierCode',
+    headerName: domainNames.commIdentifier,
+    valueGetter: (pkg) => pkg.data?.commissioningIdentifierDescription,
+  },
+  {
+    colId: 'MechanicalCompletionHandoverStatus',
+    headerName: domainNames.mcHandoverStatus,
+    valueGetter: (pkg) => pkg.data?.mechanicalCompletionHandoverStatus,
+  },
+  {
+    colId: 'MechanicalCompletionResponsible',
+    headerName: domainNames.mcResponsible,
+    valueGetter: (pkg) => pkg.data?.mechanicalCompletionResponsible,
+  },
+  {
+    colId: 'MechanicalCompletionPhase',
+    headerName: domainNames.mcPhase,
+    valueGetter: (pkg) => pkg.data?.mechanicalCompletionPhase,
+  },
   {
     headerName: 'Pipetests',
     valueGetter: (pkg) => pkg.data?.pipetest,

diff --git a/libs/heattraceshared/src/lib/types/heattrace.ts b/libs/heattraceshared/src/lib/types/heattrace.ts
@@ -11,11 +11,15 @@ export type HeatTrace = {
   commissioningPackageUrlId: string | null;
   commissioningResponsible: string | null;
   commissioningStatus: string | null;
+  commissioningIdentifierCode: string | null;
+  commissioningIdentifierDescription: string | null;
   mechanicalCompletionPackageNo: string | null;
   mechanicalCompletionPackageId: string | null;
   mechanicalCompletionUrlId: string | null;
   mechanicalCompletionResponsible: string | null;
   mechanicalCompletionStatus: string | null;
+  mechanicalCompletionPhase: string | null;
+  mechanicalCompletionHandoverStatus: string | null;
   status: string;
   discipline: string;
   location: string;

diff --git a/libs/pipingapp/src/lib/config/tableConfig.tsx b/libs/pipingapp/src/lib/config/tableConfig.tsx
@@ -86,7 +86,7 @@ const columnDefinitions: [ColDef<Pipetest>, ...ColDef<Pipetest>[]] = [
   },
   {
     headerName: domainNames.mcStatus,
-    colId: 'MechanicalCompletionStatus',
+    colId: 'mechanicalCompletionStatus',
     valueGetter: (element) => element.data?.mechanicalCompletionStatus,
     cellRenderer: (props: ICellRendererProps<Pipetest, string | null>) => {
       if (!props.value) return;
@@ -154,4 +154,4 @@ const columnDefinitions: [ColDef<Pipetest>, ...ColDef<Pipetest>[]] = [
       return <DescriptionCell description={values} />;
     },
   },
-];
+];
diff --git a/libs/shared/src/packages/utils-domain/names.ts b/libs/shared/src/packages/utils-domain/names.ts
@@ -56,6 +56,7 @@ export const domainNames = {
   mcPkg: 'Mc Pkg',
   mcResponsible: `MC ${'Responsible'}`,
   mcStatus: 'MC Status',
+  mcHandoverStatus: 'MC Handover Status',
 
   // Punch
   punch: 'Punch',