Merge pull request #3 from xhefribala/fixUserLogin

Fix Incident - reportedBy store the currently logged in user id

src/__tests__/incidents/hooks/useReportIncident.test.tsx

@@ -27,7 +27,9 @@ describe('useReportIncident', () => {
       date: subDays(new Date(), 3).toISOString(),
       department: 'some department',
       description: 'some description',
-    } as Incident
+      reportedBy: 'some user',
+      reportByUserID: 'some id',
+        } as Incident
 
     const expectedIncident = {
       ...givenIncidentRequest,

src/incidents/hooks/useReportIncident.tsx

@@ -15,7 +15,6 @@ export function reportIncident(incident: Incident): Promise<Incident> {
       ...incident,
       code: getIncidentCode(),
       status: 'reported',
-      reportedBy: 'some user',
       reportedOn: new Date(Date.now()).toISOString(),
     }
     return IncidentRepository.save(updatedIncident)
@@ -31,4 +30,4 @@ export default function useReportIncident() {
     },
     throwOnError: true,
   })
-}
+}

src/incidents/report/ReportIncident.tsx

@@ -13,30 +13,36 @@ import Incident from '../../shared/model/Incident'
 import Patient from '../../shared/model/Patient'
 import useReportIncident from '../hooks/useReportIncident'
 import { IncidentError } from '../util/validate-incident'
+import {useSelector } from 'react-redux'
+import { RootState } from '../../shared/store'
 
 const ReportIncident = () => {
   const [mutate] = useReportIncident()
   const history = useHistory()
   const { t } = useTranslator()
   const updateTitle = useUpdateTitle()
+  const {user} = useSelector((state: RootState) => state.user)
+
   useEffect(() => {
     updateTitle(t('incidents.reports.new'))
   })
   const breadcrumbs = [
     {
-      i18nKey: 'incidents.reports.new',
+      i18nKey: 'incidents.reports.new',  
       location: `/incidents/new`,
     },
   ]
   useAddBreadcrumbs(breadcrumbs)
   const [incident, setIncident] = useState({
+    reportedBy: user?.fullName, //user is read from redux store state.user and the fullName is used while showing details
+    reportByUserID: user?.id,
     date: new Date().toISOString(),
     department: '',
     category: '',
     categoryItem: '',
     description: '',
     patient: '',
-  })
+        })
 
   const [error, setError] = useState<IncidentError | undefined>(undefined)
 
@@ -179,4 +185,4 @@ const ReportIncident = () => {
   )
 }
 
-export default ReportIncident
+export default ReportIncident

src/shared/model/Incident.ts

@@ -12,4 +12,5 @@ export default interface Incident extends AbstractDBModel {
   status: 'reported' | 'resolved'
   resolvedOn: string
   patient?: string
+  reportByUserID: string
 }