Merge branch 'Mohamed' of https://github.com/M-BenAli/hospitalrun-frontend into Mohamed

Author: M-BenAli

package.json

@@ -5,15 +5,15 @@
   "private": false,
   "license": "MIT",
   "dependencies": {
-    "@hospitalrun/components": "~0.30.2",
+    "@hospitalrun/components": "~0.30.3",
     "@reduxjs/toolkit": "~1.2.1",
-    "@semantic-release/changelog": "~3.0.4",
+    "@semantic-release/changelog": "~5.0.0",
     "@semantic-release/git": "~7.0.16",
-    "@semantic-release/release-notes-generator": "~7.3.0",
+    "@semantic-release/release-notes-generator": "~9.0.0",
     "@types/pouchdb-find": "~6.3.4",
     "bootstrap": "~4.4.1",
     "date-fns": "~2.9.0",
-    "i18next": "~19.0.1",
+    "i18next": "~19.1.0",
     "i18next-browser-languagedetector": "~4.0.1",
     "i18next-xhr-backend": "~3.2.2",
     "node-sass": "~4.13.0",
@@ -49,14 +49,14 @@
     "@commitlint/config-conventional": "~8.3.3",
     "@commitlint/core": "~8.3.3",
     "@commitlint/prompt": "~8.3.3",
-    "@semantic-release/changelog": "~3.0.4",
+    "@semantic-release/changelog": "~5.0.0",
     "@semantic-release/commit-analyzer": "~6.3.0",
     "@semantic-release/git": "~7.0.16",
     "@semantic-release/github": "~5.5.5",
-    "@semantic-release/release-notes-generator": "~7.3.0",
+    "@semantic-release/release-notes-generator": "~9.0.0",
     "@testing-library/react": "~9.4.0",
     "@testing-library/react-hooks": "~3.2.1",
-    "@types/jest": "~24.9.0",
+    "@types/jest": "~25.1.0",
     "@types/node": "~13.5.0",
     "@types/pouchdb": "~6.4.0",
     "@types/react": "~16.9.17",
@@ -65,19 +65,19 @@
     "@types/react-router": "~5.1.2",
     "@types/react-router-dom": "~5.1.0",
     "@types/redux-mock-store": "~1.0.1",
-    "@typescript-eslint/eslint-plugin": "~2.17.0",
-    "@typescript-eslint/parser": "~2.17.0",
+    "@typescript-eslint/eslint-plugin": "~2.18.0",
+    "@typescript-eslint/parser": "~2.18.0",
     "commitizen": "~4.0.3",
     "commitlint-config-cz": "~0.12.1",
     "coveralls": "~3.0.9",
-    "cross-env": "~6.0.3",
-    "cz-conventional-changelog": "~3.0.2",
+    "cross-env": "~7.0.0",
+    "cz-conventional-changelog": "~3.1.0",
     "dateformat": "~3.0.3",
     "enzyme": "~3.11.0",
     "enzyme-adapter-react-16": "~1.15.2",
     "eslint": "~6.8.0",
     "eslint-config-airbnb": "~18.0.1",
-    "eslint-config-prettier": "~6.9.0",
+    "eslint-config-prettier": "~6.10.0",
     "eslint-plugin-import": "~2.20.0",
     "eslint-plugin-jest": "~23.6.0",
     "eslint-plugin-jsx-a11y": "~6.2.3",

src/__tests__/clients/db/PatientRepository.test.ts

@@ -2,6 +2,7 @@ import { patients } from 'config/pouchdb'
 import PatientRepository from 'clients/db/PatientRepository'
 import Patient from 'model/Patient'
 import { fromUnixTime } from 'date-fns'
+import { updatePatientStart } from 'patients/patient-slice'
 
 describe('patient repository', () => {
   describe('find', () => {
@@ -105,6 +106,57 @@ describe('patient repository', () => {
     })
   })
 
+  describe('saveOrUpdate', () => {
+    it('should save the patient if an id was not on the entity', async () => {
+      const newPatient = await PatientRepository.saveOrUpdate({
+        fullName: 'test1 test1',
+      } as Patient)
+
+      expect(newPatient.id).toBeDefined()
+
+      await patients.remove(await patients.get(newPatient.id))
+    })
+
+    it('should update the patient if one was already existing', async () => {
+      const existingPatient = await PatientRepository.save({
+        fullName: 'test test',
+      } as Patient)
+
+      const updatedPatient = await PatientRepository.saveOrUpdate(existingPatient)
+
+      expect(updatedPatient.id).toEqual(existingPatient.id)
+
+      await patients.remove(await patients.get(existingPatient.id))
+    })
+
+    it('should update the existing fields', async () => {
+      const existingPatient = await PatientRepository.save({
+        fullName: 'test test',
+      } as Patient)
+      existingPatient.fullName = 'changed'
+
+      const updatedPatient = await PatientRepository.saveOrUpdate(existingPatient)
+
+      expect(updatedPatient.fullName).toEqual('changed')
+
+      await patients.remove(await patients.get(existingPatient.id))
+    })
+
+    it('should add new fields without changing existing fields', async () => {
+      const existingPatient = await PatientRepository.save({
+        fullName: 'test test',
+      } as Patient)
+      existingPatient.givenName = 'givenName'
+
+      const updatedPatient = await PatientRepository.saveOrUpdate(existingPatient)
+
+      expect(updatedPatient.fullName).toEqual(existingPatient.fullName)
+      expect(updatedPatient.givenName).toEqual('givenName')
+
+      await patients.remove(await patients.get(existingPatient.id))
+    })
+  })
+
   describe('delete', () => {
     it('should delete the patient', async () => {
       const patientToDelete = await PatientRepository.save({

src/__tests__/patients/patient-slice.test.ts

@@ -4,6 +4,9 @@ import patient, {
   getPatientStart,
   getPatientSuccess,
   fetchPatient,
+  updatePatientStart,
+  updatePatientSuccess,
+  updatePatient,
 } from '../../patients/patient-slice'
 import Patient from '../../model/Patient'
 import PatientRepository from '../../clients/db/PatientRepository'
@@ -47,6 +50,34 @@ describe('patients slice', () => {
       expect(patientStore.isLoading).toBeFalsy()
       expect(patientStore.patient).toEqual(expectedPatient)
     })
+
+    it('should handle the UPDATE_PATIENT_START action', () => {
+      const patientStore = patient(undefined, {
+        type: updatePatientStart.type,
+      })
+
+      expect(patientStore.isLoading).toBeTruthy()
+    })
+
+    it('should handle the UPDATE_PATIENT_SUCCESS action', () => {
+      const expectedPatient = {
+        id: '123',
+        rev: '123',
+        sex: 'male',
+        dateOfBirth: new Date().toISOString(),
+        givenName: 'test',
+        familyName: 'test',
+      }
+      const patientStore = patient(undefined, {
+        type: updatePatientSuccess.type,
+        payload: {
+          ...expectedPatient,
+        },
+      })
+
+      expect(patientStore.isLoading).toBeFalsy()
+      expect(patientStore.patient).toEqual(expectedPatient)
+    })
   })
 
   describe('fetchPatient()', () => {
@@ -98,4 +129,51 @@ describe('patients slice', () => {
       })
     })
   })
+
+  describe('update patient', () => {
+    it('should dispatch the UPDATE_PATIENT_START action', async () => {
+      const dispatch = jest.fn()
+      const getState = jest.fn()
+      jest.spyOn(PatientRepository, 'saveOrUpdate')
+      const expectedPatientId = '12345'
+      const expectedPatient = { id: expectedPatientId } as Patient
+      const mockedPatientRepository = mocked(PatientRepository, true)
+      mockedPatientRepository.saveOrUpdate.mockResolvedValue(expectedPatient)
+
+      await updatePatient(expectedPatient)(dispatch, getState, null)
+
+      expect(dispatch).toHaveBeenCalledWith({ type: updatePatientStart.type })
+    })
+
+    it('should call the PatientRepository saveOrUpdate function with the correct data', async () => {
+      const dispatch = jest.fn()
+      const getState = jest.fn()
+      jest.spyOn(PatientRepository, 'saveOrUpdate')
+      const expectedPatientId = '12345'
+      const expectedPatient = { id: expectedPatientId } as Patient
+      const mockedPatientRepository = mocked(PatientRepository, true)
+      mockedPatientRepository.saveOrUpdate.mockResolvedValue(expectedPatient)
+
+      await updatePatient(expectedPatient)(dispatch, getState, null)
+
+      expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(expectedPatient)
+    })
+
+    it('should dispatch the UPDATE_PATIENT_SUCCESS action with the correct data', async () => {
+      const dispatch = jest.fn()
+      const getState = jest.fn()
+      jest.spyOn(PatientRepository, 'saveOrUpdate')
+      const expectedPatientId = '12345'
+      const expectedPatient = { id: expectedPatientId } as Patient
+      const mockedPatientRepository = mocked(PatientRepository, true)
+      mockedPatientRepository.saveOrUpdate.mockResolvedValue(expectedPatient)
+
+      await updatePatient(expectedPatient)(dispatch, getState, null)
+
+      expect(dispatch).toHaveBeenCalledWith({
+        type: updatePatientSuccess.type,
+        payload: expectedPatient,
+      })
+    })
+  })
 })

src/__tests__/patients/related-persons/NewRelatedPersonModal.test.tsx

@@ -0,0 +1,120 @@
+import '../../../__mocks__/matchMediaMock'
+import React from 'react'
+import { ReactWrapper, mount } from 'enzyme'
+import { Modal, Alert } from '@hospitalrun/components'
+import { act } from '@testing-library/react'
+import { Typeahead } from 'react-bootstrap-typeahead'
+import NewRelatedPersonModal from '../../../patients/related-persons/NewRelatedPersonModal'
+import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup'
+
+describe('New Related Person Modal', () => {
+  describe('layout', () => {
+    let wrapper: ReactWrapper
+    beforeEach(() => {
+      wrapper = mount(
+        <NewRelatedPersonModal
+          show
+          onSave={jest.fn()}
+          onCloseButtonClick={jest.fn()}
+          toggle={jest.fn()}
+        />,
+      )
+    })
+
+    it('should render a modal', () => {
+      const modal = wrapper.find(Modal)
+      expect(modal).toHaveLength(1)
+      expect(modal.prop('show')).toBeTruthy()
+    })
+
+    it('should render a patient search typeahead', () => {
+      const patientSearchTypeahead = wrapper.find(Typeahead)
+
+      expect(patientSearchTypeahead).toHaveLength(1)
+      expect(patientSearchTypeahead.prop('placeholder')).toEqual('patient.relatedPerson')
+    })
+
+    it('should render a relationship type text input', () => {
+      const relationshipTypeTextInput = wrapper.findWhere((w) => w.prop('name') === 'type')
+
+      expect(relationshipTypeTextInput).toHaveLength(1)
+      expect(relationshipTypeTextInput.type()).toBe(TextInputWithLabelFormGroup)
+      expect(relationshipTypeTextInput.prop('name')).toEqual('type')
+      expect(relationshipTypeTextInput.prop('isEditable')).toBeTruthy()
+      expect(relationshipTypeTextInput.prop('label')).toEqual(
+        'patient.relatedPersons.relationshipType',
+      )
+    })
+
+    it('should render a cancel button', () => {
+      const cancelButton = wrapper.findWhere((w) => 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')
+    })
+  })
+
+  describe('save', () => {
+    let wrapper: ReactWrapper
+    let onSaveSpy = jest.fn()
+    beforeEach(() => {
+      onSaveSpy = jest.fn()
+      wrapper = mount(
+        <NewRelatedPersonModal
+          show
+          onSave={onSaveSpy}
+          onCloseButtonClick={jest.fn()}
+          toggle={jest.fn()}
+        />,
+      )
+    })
+
+    it('should call the save function with the correct data', () => {
+      act(() => {
+        const patientTypeahead = wrapper.find(Typeahead)
+        patientTypeahead.prop('onChange')([{ id: '123' }])
+      })
+      wrapper.update()
+
+      act(() => {
+        const relationshipTypeTextInput = wrapper.findWhere((w) => w.prop('name') === 'type')
+        relationshipTypeTextInput.prop('onChange')({ target: { value: 'relationship' } })
+      })
+      wrapper.update()
+
+      const addNewButton = wrapper.findWhere((w) => w.text() === 'patient.relatedPersons.new')
+      act(() => {
+        ;(wrapper.find(Modal).prop('successButton') as any).onClick(
+          {} as React.MouseEvent<HTMLButtonElement, MouseEvent>,
+        )
+      })
+      expect(onSaveSpy).toHaveBeenCalledTimes(1)
+      expect(onSaveSpy).toHaveBeenCalledWith({
+        patientId: '123',
+        type: 'relationship',
+      })
+    })
+
+    it('should display an error message if given name or relationship type is not entered.', () => {
+      act(() => {
+        wrapper
+          .find(Modal)
+          .prop('successButton')
+          .onClick({} as React.MouseEvent<HTMLButtonElement, MouseEvent>)
+      })
+
+      wrapper.update()
+
+      const errorAlert = wrapper.find(Alert)
+      expect(onSaveSpy).not.toHaveBeenCalled()
+      expect(errorAlert).toHaveLength(1)
+      expect(errorAlert.prop('message')).toEqual(
+        'patient.relatedPersons.error.relatedPersonRequired patient.relatedPersons.error.relationshipTypeRequired',
+      )
+    })
+  })
+})