fix(extractfullname.ts): scaffolds extractFullName()

Previously, the extractUserName() function was returning a mocked "some user." We scaffolded out
this function for when we complete the user model.

fix HospitalRun#2539

fixed extractFullName import

remove reportedBy

make app test less spurious

src/__tests__/App.test.tsx

@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react'
+import { render, screen, waitFor } from '@testing-library/react'
 import React from 'react'
 import { Provider } from 'react-redux'
 import createMockStore from 'redux-mock-store'
@@ -32,9 +32,9 @@ it('renders without crashing', async () => {
     </Provider>,
   )
 
-  expect(
-    await screen.findByRole('heading', { name: /dashboard\.label/i }, { timeout: 8000 }),
-  ).toBeInTheDocument()
+  await waitFor(() => {
+    expect(screen.getByRole('heading', { name: /dashboard\.label/i })).toBeInTheDocument()
+  })
 
   // eslint-disable-next-line no-console
   ;(console.log as jest.Mock).mockRestore()

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

@@ -18,7 +18,6 @@ describe('useReportIncident', () => {
     const expectedCode = '123456'
     const expectedDate = new Date(Date.now())
     const expectedStatus = 'reported'
-    const expectedReportedBy = 'some user'
     Date.now = jest.fn().mockReturnValue(expectedDate)
 
     const givenIncidentRequest = {
@@ -34,7 +33,6 @@ describe('useReportIncident', () => {
       code: `I-${expectedCode}`,
       reportedOn: expectedDate.toISOString(),
       status: expectedStatus,
-      reportedBy: expectedReportedBy,
     } as Incident
     jest.spyOn(shortid, 'generate').mockReturnValue(expectedCode)
     jest.spyOn(IncidentRepository, 'save').mockResolvedValue(expectedIncident)

src/incidents/hooks/useReportIncident.tsx

@@ -10,12 +10,12 @@ const getIncidentCode = (): string => `I-${shortid.generate()}`
 
 export function reportIncident(incident: Incident): Promise<Incident> {
   const error = validateIncident(incident)
+
   if (isEmpty(error)) {
     const updatedIncident: Incident = {
       ...incident,
       code: getIncidentCode(),
       status: 'reported',
-      reportedBy: 'some user',
       reportedOn: new Date(Date.now()).toISOString(),
     }
     return IncidentRepository.save(updatedIncident)

src/incidents/report/ReportIncident.tsx

@@ -1,5 +1,6 @@
 import { Button, Row, Column, Typeahead, Label } from '@hospitalrun/components'
 import React, { useState, useEffect } from 'react'
+import { useSelector } from 'react-redux'
 import { useHistory } from 'react-router-dom'
 
 import useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'
@@ -11,6 +12,7 @@ import PatientRepository from '../../shared/db/PatientRepository'
 import useTranslator from '../../shared/hooks/useTranslator'
 import Incident from '../../shared/model/Incident'
 import Patient from '../../shared/model/Patient'
+import { RootState } from '../../shared/store'
 import useReportIncident from '../hooks/useReportIncident'
 import { IncidentError } from '../util/validate-incident'
 
@@ -19,6 +21,7 @@ const ReportIncident = () => {
   const history = useHistory()
   const { t } = useTranslator()
   const updateTitle = useUpdateTitle()
+  const { user } = useSelector((state: RootState) => state.user)
   useEffect(() => {
     updateTitle(t('incidents.reports.new'))
   })
@@ -30,6 +33,7 @@ const ReportIncident = () => {
   ]
   useAddBreadcrumbs(breadcrumbs)
   const [incident, setIncident] = useState({
+    reportedBy: user?.id || 'some user',
     date: new Date().toISOString(),
     department: '',
     category: '',

src/incidents/view/ViewIncidentDetails.tsx

@@ -8,7 +8,7 @@ import TextFieldWithLabelFormGroup from '../../shared/components/input/TextField
 import TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'
 import useTranslator from '../../shared/hooks/useTranslator'
 import Permissions from '../../shared/model/Permissions'
-import { extractUsername } from '../../shared/util/extractUsername'
+import { extractFullName } from '../../shared/util/extractFullName'
 import useIncident from '../hooks/useIncident'
 import useResolveIncident from '../hooks/useResolveIncident'
 
@@ -83,7 +83,7 @@ function ViewIncidentDetails(props: Props) {
         <Column>
           <div className="form-group incident-reported-by">
             <h4>{t('incidents.reports.reportedBy')}</h4>
-            <h5>{extractUsername(data.reportedBy)}</h5>
+            <h5>{extractFullName(data.reportedBy)}</h5>
           </div>
         </Column>
         <Column>

src/shared/util/extractFullName.ts

@@ -0,0 +1,2 @@
+// TODO: extract fullname from userID when we have information on other users
+export const extractFullName = (userID: string) => userID