feat(patients): new related person to add related person (#1955)

HospitalRun · Apr 1, 2020 · 0afeee1 · 0afeee1 · vercel · Apr 1, 2020
1 parent 85d95bd
commit 0afeee1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/...ed-persons/NewRelatedPersonModal.test.tsx → ...ed-persons/AddRelatedPersonModal.test.tsx b/...ed-persons/NewRelatedPersonModal.test.tsx → ...ed-persons/AddRelatedPersonModal.test.tsx
@@ -3,15 +3,15 @@ import React from 'react'
 import { ReactWrapper, mount } from 'enzyme'
 import { Modal, Alert, Typeahead } from '@hospitalrun/components'
 import { act } from '@testing-library/react'
-import NewRelatedPersonModal from '../../../patients/related-persons/NewRelatedPersonModal'
+import AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal'
 import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup'
 
-describe('New Related Person Modal', () => {
+describe('Add Related Person Modal', () => {
   describe('layout', () => {
     let wrapper: ReactWrapper
     beforeEach(() => {
       wrapper = mount(
-        <NewRelatedPersonModal
+        <AddRelatedPersonModal
           show
           onSave={jest.fn()}
           onCloseButtonClick={jest.fn()}
@@ -46,14 +46,16 @@ describe('New Related Person Modal', () => {
     })
 
     it('should render a cancel button', () => {
-      const cancelButton = wrapper.findWhere((w) => w.text() === 'actions.cancel')
+      const cancelButton = wrapper.findWhere(
+        (w: { text: () => string }) => w.text() === 'actions.cancel',
+      )
 
       expect(cancelButton).toHaveLength(1)
     })
 
     it('should render an add new related person button button', () => {
       const modal = wrapper.find(Modal)
-      expect(modal.prop('successButton').children).toEqual('patient.relatedPersons.new')
+      expect(modal.prop('successButton').children).toEqual('patient.relatedPersons.add')
     })
   })
 
@@ -63,7 +65,7 @@ describe('New Related Person Modal', () => {
     beforeEach(() => {
       onSaveSpy = jest.fn()
       wrapper = mount(
-        <NewRelatedPersonModal
+        <AddRelatedPersonModal
           show
           onSave={onSaveSpy}
           onCloseButtonClick={jest.fn()}

diff --git a/src/__tests__/patients/related-persons/RelatedPersons.test.tsx b/src/__tests__/patients/related-persons/RelatedPersons.test.tsx
@@ -6,7 +6,7 @@ import { mount } from 'enzyme'
 import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab'
 import * as components from '@hospitalrun/components'
 
-import NewRelatedPersonModal from 'patients/related-persons/NewRelatedPersonModal'
+import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal'
 import { act } from '@testing-library/react'
 import PatientRepository from 'clients/db/PatientRepository'
 import Patient from 'model/Patient'
@@ -58,7 +58,7 @@ describe('Related Persons Tab', () => {
       const newRelatedPersonButton = wrapper.find(components.Button)
 
       expect(newRelatedPersonButton).toHaveLength(1)
-      expect(newRelatedPersonButton.text().trim()).toEqual('patient.relatedPersons.new')
+      expect(newRelatedPersonButton.text().trim()).toEqual('patient.relatedPersons.add')
     })
 
     it('should not render a New Related Person button if the user does not have write privileges for a patient', () => {
@@ -77,7 +77,7 @@ describe('Related Persons Tab', () => {
     })
 
     it('should render a New Related Person modal', () => {
-      const newRelatedPersonModal = wrapper.find(NewRelatedPersonModal)
+      const newRelatedPersonModal = wrapper.find(AddRelatedPersonModal)
 
       expect(newRelatedPersonModal.prop('show')).toBeFalsy()
       expect(newRelatedPersonModal).toHaveLength(1)
@@ -92,7 +92,7 @@ describe('Related Persons Tab', () => {
 
       wrapper.update()
 
-      const newRelatedPersonModal = wrapper.find(NewRelatedPersonModal)
+      const newRelatedPersonModal = wrapper.find(AddRelatedPersonModal)
       expect(newRelatedPersonModal.prop('show')).toBeTruthy()
     })
 
@@ -124,7 +124,7 @@ describe('Related Persons Tab', () => {
       wrapper.update()
 
       await act(async () => {
-        const newRelatedPersonModal = wrapper.find(NewRelatedPersonModal)
+        const newRelatedPersonModal = wrapper.find(AddRelatedPersonModal)
         const onSave = newRelatedPersonModal.prop('onSave') as any
         onSave(expectedRelatedPerson)
       })
@@ -145,20 +145,20 @@ describe('Related Persons Tab', () => {
       wrapper.update()
 
       act(() => {
-        const newRelatedPersonModal = wrapper.find(NewRelatedPersonModal)
+        const newRelatedPersonModal = wrapper.find(AddRelatedPersonModal)
         const onSave = newRelatedPersonModal.prop('onSave') as any
         onSave({ patientId: '123', type: 'type' })
       })
 
       wrapper.update()
 
-      const newRelatedPersonModal = wrapper.find(NewRelatedPersonModal)
+      const newRelatedPersonModal = wrapper.find(AddRelatedPersonModal)
       expect(newRelatedPersonModal.prop('show')).toBeFalsy()
     })
 
     it('should display a success message when the new related person is added', async () => {
       await act(async () => {
-        const newRelatedPersonModal = wrapper.find(NewRelatedPersonModal)
+        const newRelatedPersonModal = wrapper.find(AddRelatedPersonModal)
         const onSave = newRelatedPersonModal.prop('onSave') as any
         await onSave({ patientId: 'testMessage', type: 'type' })
       })

diff --git a/src/locales/enUs/translations/patient/index.ts b/src/locales/enUs/translations/patient/index.ts
@@ -30,6 +30,7 @@ export default {
       },
       label: 'Related Persons',
       new: 'New Related Person',
+      add: 'Add Related Person',
       relationshipType: 'Relationship Type',
       warning: {
         noRelatedPersons: 'No related persons',

diff --git a/...related-persons/NewRelatedPersonModal.tsx → ...related-persons/AddRelatedPersonModal.tsx b/...related-persons/NewRelatedPersonModal.tsx → ...related-persons/AddRelatedPersonModal.tsx
@@ -13,7 +13,7 @@ interface Props {
   onSave: (relatedPerson: RelatedPerson) => void
 }
 
-const NewRelatedPersonModal = (props: Props) => {
+const AddRelatedPersonModal = (props: Props) => {
   const { show, toggle, onCloseButtonClick, onSave } = props
   const { t } = useTranslation()
   const [errorMessage, setErrorMessage] = useState('')
@@ -78,15 +78,15 @@ const NewRelatedPersonModal = (props: Props) => {
     <Modal
       show={show}
       toggle={toggle}
-      title={t('patient.relatedPersons.new')}
+      title={t('patient.relatedPersons.add')}
       body={body}
       closeButton={{
         children: t('actions.cancel'),
         color: 'danger',
         onClick: onCloseButtonClick,
       }}
       successButton={{
-        children: t('patient.relatedPersons.new'),
+        children: t('patient.relatedPersons.add'),
         color: 'success',
         icon: 'add',
         iconLocation: 'left',
@@ -111,4 +111,4 @@ const NewRelatedPersonModal = (props: Props) => {
   )
 }
 
-export default NewRelatedPersonModal
+export default AddRelatedPersonModal
diff --git a/src/patients/related-persons/RelatedPersonTab.tsx b/src/patients/related-persons/RelatedPersonTab.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { Button, Panel, List, ListItem, Alert, Spinner, Toast } from '@hospitalrun/components'
-import NewRelatedPersonModal from 'patients/related-persons/NewRelatedPersonModal'
+import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal'
 import RelatedPerson from 'model/RelatedPerson'
 import { useTranslation } from 'react-i18next'
 import { useHistory } from 'react-router'
@@ -100,7 +100,7 @@ const RelatedPersonTab = (props: Props) => {
               iconLocation="left"
               onClick={onNewRelatedPersonClick}
             >
-              {t('patient.relatedPersons.new')}
+              {t('patient.relatedPersons.add')}
             </Button>
           )}
         </div>
@@ -132,7 +132,7 @@ const RelatedPersonTab = (props: Props) => {
         </div>
       </div>
 
-      <NewRelatedPersonModal
+      <AddRelatedPersonModal
         show={showNewRelatedPersonModal}
         toggle={closeNewRelatedPersonModal}
         onCloseButtonClick={closeNewRelatedPersonModal}