feat: handover workorders tab

equinor · Aug 21, 2024 · cf32aed · cf32aed
1 parent 060c233
commit cf32aed
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 35 deletions.
diff --git a/libs/handoversidesheet/src/lib/types.ts b/libs/handoversidesheet/src/lib/types.ts
@@ -84,24 +84,25 @@ export type HandoverUnsignedTask = {
 } & HandoverChild;
 
 export type HandoverWorkOrder = {
-  workOrderNo: string;
+  workOrderNumber: string;
   workOrderId: string;
   workOrderUrlId: string;
   projectProgress: number | null;
-  title: string | null;
-  description: null | null;
-  jobStatus: string | null;
-  materialStatus: string | null;
-  commissioningPackageNo: string | null;
-  commissioningPackageId: string | null;
-  facility: string | null;
-  commissioningPackageUrlId: string | null;
-  discipline: string | null;
-  plannedCompletionDate: string | null;
+  title: string;
+  jobStatus: string;
+  materialStatus: string;
+  commissioningPackageUrl: string;
+  facility: string;
+  discipline: string;
+  workOrderUrl: string | null;
   actualCompletionDate: string | null;
-  workOrderUrl: string;
-  estimatedManHours: number | null;
-  remainingManHours: number | null;
-  workBreakdownStructure: string | null;
-  responsible: string | null;
+  plannedFinishDate: string | null;
+  remainingHours: number | null;
+  estimatedHours: number | null;
+  responsible: string;
+  workBreakdownStructure: string;
+  commpkgId: string | null;
+  commissioningPackageUrlId: string | null;
+  commpkgNumber: string | null;
 } & HandoverChild;
+
diff --git a/libs/handoversidesheet/src/lib/ui-sidesheet/HandoverSidesheet.tsx b/libs/handoversidesheet/src/lib/ui-sidesheet/HandoverSidesheet.tsx
@@ -251,21 +251,7 @@ const HandoverSidesheetComponent = (props: Required<HandoverProps>) => {
           </StyledPanel>
           <StyledPanel>
             <WorkorderTab
-              workorders={(workOrderPackages ?? []).map(
-                (workorder): WorkorderBase => ({
-                  ...workorder,
-                  workOrderNumber: workorder.workOrderNo,
-                  actualCompletionDate: workorder.actualCompletionDate,
-                  plannedFinishDate: workorder.plannedCompletionDate,
-                  discipline: workorder.discipline,
-                  estimatedHours: workorder.estimatedManHours,
-                  jobStatus: workorder.jobStatus,
-                  remainingHours: workorder.remainingManHours,
-                  title: workorder.title,
-                  workOrderUrl: workorder.workOrderUrl,
-                  projectProgress: workorder.projectProgress,
-                })
-              )}
+              workorders={workOrderPackages}
               isFetching={isDataFetchingWorkOrder}
               error={woError}
             />

diff --git a/libs/shared/src/packages/sidesheet/src/lib/sidesheet/tabs/workorder/columns.tsx b/libs/shared/src/packages/sidesheet/src/lib/sidesheet/tabs/workorder/columns.tsx
@@ -1,6 +1,4 @@
 import { ColDef, ICellRendererProps } from '@equinor/workspace-ag-grid';
-import styled from 'styled-components';
-
 import { DateCell } from '../../../../../../table-helpers/src/lib/table/cells/DateCell';
 import { DescriptionCell } from '../../../../../../table-helpers/src/lib/table/cells/DescriptionCell';
 import { EstimateCell } from '../../../../../../table-helpers/src/lib/table/cells/EstimateCell';
@@ -19,7 +17,7 @@ export const columns = (
       cellRenderer: (props: ICellRendererProps<WorkorderBase, string | null>) => {
         return (
           <LinkCell
-            url={props.data?.workOrderUrl}
+            url={props.data?.workOrderUrl ?? undefined}
             urlText={props.data?.workOrderNumber}
           />
         );

diff --git a/libs/shared/src/packages/sidesheet/src/lib/sidesheet/tabs/workorder/types.ts b/libs/shared/src/packages/sidesheet/src/lib/sidesheet/tabs/workorder/types.ts
@@ -10,5 +10,5 @@ export type WorkorderBase = {
   title: string | null;
   workOrderUrlId: string;
   workOrderNumber: string;
-  workOrderUrl:string;
+  workOrderUrl: string | null;
 };