Jmpi 775 fix review link undefined uid bug

JeMPI_Apps/JeMPI_UI/src/components/reviewLink/CustomDataGrid.tsx

@@ -3,6 +3,7 @@ import {
   GridCellParams,
   GridColDef,
   GridRenderCellParams,
+  GridValidRowModel,
   GridValueFormatterParams,
   DataGrid as MuiDataGrid
 } from '@mui/x-data-grid'
@@ -15,7 +16,7 @@ import { useMemo } from 'react'
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>
 type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
 
-interface CustomDataGridProps extends PartialBy<DataGridProps, 'columns'> {
+interface CustomDataGridProps<R extends GridValidRowModel> extends PartialBy<DataGridProps<R>, 'columns'> {
   action?: (uid: string) => void
 }
 
@@ -35,12 +36,12 @@ const getCellClassName = (
   } else return ''
 }
 
-const CustomDataGrid: React.FC<CustomDataGridProps> = ({
+const CustomDataGrid = <R extends GridValidRowModel>({
   sx,
   rows,
   action,
   ...props
-}) => {
+}: CustomDataGridProps<R>) => {
   const { availableFields } = useAppConfig()
 
   const fieldColumns: GridColDef[] = availableFields.map(
@@ -59,7 +60,7 @@ const CustomDataGrid: React.FC<CustomDataGridProps> = ({
       cellClassName: (params: GridCellParams) =>
         fieldName === 'recordType'
           ? getRecordTypeClassName(params)
-          : getCellClassName(params, groups, rows[0]),
+          : getCellClassName(params, groups, rows[0] as any as AnyRecord),
       renderCell: (params: GridRenderCellParams) =>
         getCellComponent(fieldName, params)
     })

JeMPI_Apps/JeMPI_UI/src/components/reviewLink/ReviewLink.tsx

@@ -14,7 +14,11 @@ import { useSnackbar } from 'notistack'
 import { useState } from 'react'
 import { CustomSearchQuery, SearchQuery } from 'types/SimpleSearch'
 import { NotificationState } from '../../types/Notification'
-import { AnyRecord } from '../../types/PatientRecord'
+import {
+  AnyRecord,
+  GoldenRecord,
+  PatientRecord
+} from '../../types/PatientRecord'
 import Loading from '../common/Loading'
 import ApiErrorMessage from '../error/ApiErrorMessage'
 import NotFound from '../error/NotFound'
@@ -30,7 +34,7 @@ import { useLocation, useNavigate } from 'react-router-dom'
 import { useConfig } from 'hooks/useConfig'
 import { NotificationRequest } from 'types/BackendResponse'
 
-const getRowClassName = (type: string) => {
+const getRowClassName = (type?: string) => {
   switch (type) {
     case 'Current':
       return 'super-app-theme--Current'
@@ -72,7 +76,8 @@ const ReviewLink = () => {
   const { linkRecords, createNewGoldenRecord } = useRelink()
 
   const mutateNotification = useMutation({
-    mutationFn: (request: NotificationRequest) =>  apiClient.updateNotification(request),
+    mutationFn: (request: NotificationRequest) =>
+      apiClient.updateNotification(request),
     onError: (error: AxiosError) => {
       enqueueSnackbar(`Error updating notification: ${error.message}`, {
         variant: 'error'
@@ -182,7 +187,7 @@ const ReviewLink = () => {
         ...goldenRecord.linkRecords.filter(
           record => record.uid !== patientRecord?.uid
         ),
-        patientRecord,
+        ...(patientRecord ? [patientRecord] : []),
         goldenRecord
       ]
     : []
@@ -231,15 +236,17 @@ const ReviewLink = () => {
           <Typography pl={1} variant="dgSubTitle">
             PATIENT LINKED TO GOLDEN RECORD
           </Typography>
-          <CustomDataGrid
+          <CustomDataGrid<GoldenRecord | PatientRecord>
             rows={matches}
             sx={{
               borderRadius: '0px'
             }}
             getRowClassName={params =>
               params.row.uid === payload?.patient_id
                 ? 'super-app-theme--SelectedPatient'
-                : getRowClassName(params.row.type)
+                : 'type' in params.row
+                ? getRowClassName(params.row.type)
+                : ''
             }
           />
         </Paper>
@@ -284,7 +291,7 @@ const ReviewLink = () => {
           )}
         </Stack>
         <Paper>
-          <CustomDataGrid
+          <CustomDataGrid<AnyRecord>
             rows={
               payload?.notificationId
                 ? candidateGoldenRecords || []

JeMPI_Apps/JeMPI_UI/src/services/ApiClient.ts

@@ -52,7 +52,7 @@ export class ApiClient {
         const { method } = request
         if (['post', 'patch', 'put', 'delete'].indexOf(method || '') !== -1) {
           const csrfToken = getCookie('XSRF-TOKEN')
-          if (csrfToken) {
+          if (csrfToken && request.headers) {
             request.headers['X-XSRF-TOKEN'] = csrfToken
           }
         }