diff --git a/src/__tests__/incidents/report/ReportIncident.test.tsx b/src/__tests__/incidents/report/ReportIncident.test.tsx index acb34e78a5..ff42274b0b 100644 --- a/src/__tests__/incidents/report/ReportIncident.test.tsx +++ b/src/__tests__/incidents/report/ReportIncident.test.tsx @@ -65,7 +65,7 @@ describe('Report Incident', () => { userEvent.type(departmentInput, 'Engineering Bay') expect(departmentInput).toHaveDisplayValue('Engineering Bay') - }) + }) it('renders a category form element that allows user input', async () => { setup([Permissions.ViewIncident, Permissions.ResolveIncident]) diff --git a/src/incidents/hooks/useReportIncident.tsx b/src/incidents/hooks/useReportIncident.tsx index 1421e4ff88..0bba5c3ced 100644 --- a/src/incidents/hooks/useReportIncident.tsx +++ b/src/incidents/hooks/useReportIncident.tsx @@ -6,16 +6,17 @@ import IncidentRepository from '../../shared/db/IncidentRepository' import Incident from '../../shared/model/Incident' import validateIncident from '../util/validate-incident' + const getIncidentCode = (): string => `I-${shortid.generate()}` export function reportIncident(incident: Incident): Promise { 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) diff --git a/src/incidents/report/ReportIncident.tsx b/src/incidents/report/ReportIncident.tsx index 62bee68cf8..a13f9fd9df 100644 --- a/src/incidents/report/ReportIncident.tsx +++ b/src/incidents/report/ReportIncident.tsx @@ -13,23 +13,28 @@ 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?.id || 'some user', date: new Date().toISOString(), department: '', category: '',