fix(fullname): added extractFullName() template

fix HospitalRun#2539

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 } 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'
@@ -9,6 +10,7 @@ import TextFieldWithLabelFormGroup from '../../shared/components/input/TextField
 import TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'
 import useTranslator from '../../shared/hooks/useTranslator'
 import Incident from '../../shared/model/Incident'
+import { RootState } from '../../shared/store'
 import useReportIncident from '../hooks/useReportIncident'
 import { IncidentError } from '../util/validate-incident'
 
@@ -17,6 +19,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'))
  })
@@ -28,6 +31,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

@@ -7,7 +7,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'
 
@@ -86,7 +86,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