Datasets:

---

JetBrains-Research

/

commit-chronicle

like 9

Follow

JetBrains Research 66

[ { "change_type": "MODIFY", "old_path": "src/incidents/list/ViewIncidentsTable.tsx", "new_path": "src/incidents/list/ViewIncidentsTable.tsx", "diff": "@@ -25,6 +25,8 @@ function ViewIncidentsTable(props: Props) {\n// filter data\nconst exportData = [{}]\n+\n+ function populateExportData() {\nlet first = true\nif (data != null) {\ndata.forEach((elm) => {\n@@ -43,16 +45,22 @@ function ViewIncidentsTable(props: Props) {\n}\n})\n}\n+ }\nfunction downloadCSV() {\n+ populateExportData()\n+\nconst fields = Object.keys(exportData[0])\nconst opts = { fields }\nconst parser = new Parser(opts)\nconst csv = parser.parse(exportData)\n- console.log(csv)\nconst incidentsText = t('incidents.label')\n- const filename = incidentsText.concat('.csv')\n+\n+ const filename = incidentsText\n+ .concat('-')\n+ .concat(format(new Date(Date.now()), 'yyyy-MM-dd--hh-mma'))\n+ .concat('.csv')\nconst text = csv\nconst element = document.createElement('a')\n@@ -76,8 +84,20 @@ function ViewIncidentsTable(props: Props) {\n},\n]\n+ const dropStyle = {\n+ marginLeft: 'auto', // note the capital 'W' here\n+ marginBottom: '4px', // 'ms' is the only lowercase vendor prefix\n+ }\n+\nreturn (\n<>\n+ <Dropdown\n+ direction=\"down\"\n+ variant=\"secondary\"\n+ text={t('incidents.reports.download')}\n+ style={dropStyle}\n+ items={dropdownItems}\n+ />\n<Table\ngetID={(row) => row.id}\ndata={data}\n@@ -115,7 +135,6 @@ function ViewIncidentsTable(props: Props) {\n},\n]}\n/>\n- <Dropdown direction=\"down\" variant=\"secondary\" text=\"DOWNLOAD\" items={dropdownItems} />\n</>\n)\n}\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/incidents/index.ts", "new_path": "src/shared/locales/enUs/translations/incidents/index.ts", "diff": "@@ -17,6 +17,7 @@ export default {\nresolve: 'Resolve Incident',\ndateOfIncident: 'Date of Incident',\ndepartment: 'Department',\n+ download: 'Download',\ncategory: 'Category',\ncategoryItem: 'Category Item',\ndescription: 'Description of Incident',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/shared/components/Sidebar.test.tsx", "new_path": "src/__tests__/shared/components/Sidebar.test.tsx", "diff": "import { ListItem } from '@hospitalrun/components'\nimport { act } from '@testing-library/react'\n-import { mount } from 'enzyme'\n+import { mount, ReactWrapper } from 'enzyme'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -75,6 +75,9 @@ describe('Sidebar', () => {\n)\n}\n+ const getIndex = (wrapper: ReactWrapper, label: string) =>\n+ wrapper.reduce((result, item, index) => (item.text().trim() === label ? index : result), -1)\n+\ndescribe('dashboard links', () => {\nit('should render the dashboard link', () => {\nconst wrapper = setup('/')\n@@ -220,61 +223,64 @@ describe('Sidebar', () => {\nconst wrapper = setup('/appointments')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.label')\n- expect(listItems.at(3).text().trim()).toEqual('scheduling.label')\n+ expect(appointmentsIndex).not.toBe(-1)\n})\nit('should render the new appointment link', () => {\nconst wrapper = setup('/appointments/new')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.appointments.new')\n- expect(listItems.at(4).text().trim()).toEqual('scheduling.appointments.new')\n+ expect(appointmentsIndex).not.toBe(-1)\n})\nit('should not render the new appointment link when the user does not have write appointments privileges', () => {\nconst wrapper = setupNoPermissions('/appointments')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.appointments.new')\n- listItems.forEach((_, i) => {\n- expect(listItems.at(i).text().trim()).not.toEqual('scheduling.appointments.new')\n- })\n+ expect(appointmentsIndex).toBe(-1)\n})\nit('should render the appointments schedule link', () => {\nconst wrapper = setup('/appointments')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.appointments.schedule')\n- expect(listItems.at(5).text().trim()).toEqual('scheduling.appointments.schedule')\n+ expect(appointmentsIndex).not.toBe(-1)\n})\nit('should not render the appointments schedule link when the user does not have read appointments privileges', () => {\nconst wrapper = setupNoPermissions('/appointments')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.appointments.schedule')\n- listItems.forEach((_, i) => {\n- expect(listItems.at(i).text().trim()).not.toEqual('scheduling.appointments.schedule')\n- })\n+ expect(appointmentsIndex).toBe(-1)\n})\nit('main scheduling link should be active when the current path is /appointments', () => {\nconst wrapper = setup('/appointments')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.label')\n- expect(listItems.at(3).prop('active')).toBeTruthy()\n+ expect(listItems.at(appointmentsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /appointments when the main scheduling link is clicked', () => {\nconst wrapper = setup('/')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.label')\nact(() => {\n- const onClick = listItems.at(3).prop('onClick') as any\n+ const onClick = listItems.at(appointmentsIndex).prop('onClick') as any\nonClick()\n})\n@@ -285,17 +291,19 @@ describe('Sidebar', () => {\nconst wrapper = setup('/appointments/new')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.appointments.new')\n- expect(listItems.at(4).prop('active')).toBeTruthy()\n+ expect(listItems.at(appointmentsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /appointments/new when the new appointment link is clicked', () => {\nconst wrapper = setup('/appointments')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.appointments.new')\nact(() => {\n- const onClick = listItems.at(4).prop('onClick') as any\n+ const onClick = listItems.at(appointmentsIndex).prop('onClick') as any\nonClick()\n})\n@@ -306,17 +314,19 @@ describe('Sidebar', () => {\nconst wrapper = setup('/appointments')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.label')\n- expect(listItems.at(5).prop('active')).toBeTruthy()\n+ expect(listItems.at(appointmentsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /appointments when the appointments schedule link is clicked', () => {\nconst wrapper = setup('/appointments')\nconst listItems = wrapper.find(ListItem)\n+ const appointmentsIndex = getIndex(listItems, 'scheduling.label')\nact(() => {\n- const onClick = listItems.at(5).prop('onClick') as any\n+ const onClick = listItems.at(appointmentsIndex).prop('onClick') as any\nonClick()\n})\n@@ -329,61 +339,64 @@ describe('Sidebar', () => {\nconst wrapper = setup('/labs')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.label')\n- expect(listItems.at(4).text().trim()).toEqual('labs.label')\n+ expect(labsIndex).not.toBe(-1)\n})\nit('should render the new labs request link', () => {\nconst wrapper = setup('/labs')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.requests.new')\n- expect(listItems.at(5).text().trim()).toEqual('labs.requests.new')\n+ expect(labsIndex).not.toBe(-1)\n})\nit('should not render the new labs request link when user does not have request labs privileges', () => {\nconst wrapper = setupNoPermissions('/labs')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.requests.new')\n- listItems.forEach((_, i) => {\n- expect(listItems.at(i).text().trim()).not.toEqual('labs.requests.new')\n- })\n+ expect(labsIndex).toBe(-1)\n})\nit('should render the labs list link', () => {\nconst wrapper = setup('/labs')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.requests.label')\n- expect(listItems.at(6).text().trim()).toEqual('labs.requests.label')\n+ expect(labsIndex).not.toBe(-1)\n})\nit('should not render the labs list link when user does not have view labs privileges', () => {\nconst wrapper = setupNoPermissions('/labs')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.requests.label')\n- listItems.forEach((_, i) => {\n- expect(listItems.at(i).text().trim()).not.toEqual('labs.requests.label')\n- })\n+ expect(labsIndex).toBe(-1)\n})\nit('main labs link should be active when the current path is /labs', () => {\nconst wrapper = setup('/labs')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.label')\n- expect(listItems.at(4).prop('active')).toBeTruthy()\n+ expect(listItems.at(labsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /labs when the main lab link is clicked', () => {\nconst wrapper = setup('/')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.label')\nact(() => {\n- const onClick = listItems.at(4).prop('onClick') as any\n+ const onClick = listItems.at(labsIndex).prop('onClick') as any\nonClick()\n})\n@@ -394,17 +407,19 @@ describe('Sidebar', () => {\nconst wrapper = setup('/labs/new')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.requests.new')\n- expect(listItems.at(5).prop('active')).toBeTruthy()\n+ expect(listItems.at(labsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /labs/new when the new labs link is clicked', () => {\nconst wrapper = setup('/labs')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.requests.new')\nact(() => {\n- const onClick = listItems.at(5).prop('onClick') as any\n+ const onClick = listItems.at(labsIndex).prop('onClick') as any\nonClick()\n})\n@@ -415,17 +430,19 @@ describe('Sidebar', () => {\nconst wrapper = setup('/labs')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.requests.label')\n- expect(listItems.at(6).prop('active')).toBeTruthy()\n+ expect(listItems.at(labsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /labs when the labs list link is clicked', () => {\nconst wrapper = setup('/labs/new')\nconst listItems = wrapper.find(ListItem)\n+ const labsIndex = getIndex(listItems, 'labs.requests.label')\nact(() => {\n- const onClick = listItems.at(6).prop('onClick') as any\n+ const onClick = listItems.at(labsIndex).prop('onClick') as any\nonClick()\n})\n@@ -438,61 +455,85 @@ describe('Sidebar', () => {\nconst wrapper = setup('/incidents')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.label')\n+\n+ expect(incidentsIndex).not.toBe(-1)\n+ })\n+\n+ it('should be the last one in the sidebar', () => {\n+ const wrapper = setup('/incidents')\n+\n+ const listItems = wrapper.find(ListItem)\n+ const lastOne = listItems.length - 1\n- expect(listItems.at(5).text().trim()).toEqual('incidents.label')\n+ expect(listItems.at(lastOne).text().trim()).toBe('incidents.reports.label')\n+ expect(\n+ listItems\n+ .at(lastOne - 1)\n+ .text()\n+ .trim(),\n+ ).toBe('incidents.reports.new')\n+ expect(\n+ listItems\n+ .at(lastOne - 2)\n+ .text()\n+ .trim(),\n+ ).toBe('incidents.label')\n})\nit('should render the new incident report link', () => {\nconst wrapper = setup('/incidents')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.reports.new')\n- expect(listItems.at(6).text().trim()).toEqual('incidents.reports.new')\n+ expect(incidentsIndex).not.toBe(-1)\n})\nit('should not render the new incident report link when user does not have the report incidents privileges', () => {\nconst wrapper = setupNoPermissions('/incidents')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.reports.new')\n- listItems.forEach((_, i) => {\n- expect(listItems.at(i).text().trim()).not.toEqual('incidents.reports.new')\n- })\n+ expect(incidentsIndex).toBe(-1)\n})\nit('should render the incidents list link', () => {\nconst wrapper = setup('/incidents')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.reports.label')\n- expect(listItems.at(7).text().trim()).toEqual('incidents.reports.label')\n+ expect(incidentsIndex).not.toBe(-1)\n})\nit('should not render the incidents list link when user does not have the view incidents privileges', () => {\nconst wrapper = setupNoPermissions('/incidents')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.reports.label')\n- listItems.forEach((_, i) => {\n- expect(listItems.at(i).text().trim()).not.toEqual('incidents.reports.label')\n- })\n+ expect(incidentsIndex).toBe(-1)\n})\nit('main incidents link should be active when the current path is /incidents', () => {\nconst wrapper = setup('/incidents')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.label')\n- expect(listItems.at(5).prop('active')).toBeTruthy()\n+ expect(listItems.at(incidentsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /incidents when the main incident link is clicked', () => {\nconst wrapper = setup('/')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.label')\nact(() => {\n- const onClick = listItems.at(5).prop('onClick') as any\n+ const onClick = listItems.at(incidentsIndex).prop('onClick') as any\nonClick()\n})\n@@ -503,17 +544,19 @@ describe('Sidebar', () => {\nconst wrapper = setup('/incidents/new')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.reports.new')\n- expect(listItems.at(6).prop('active')).toBeTruthy()\n+ expect(listItems.at(incidentsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /incidents/new when the new labs link is clicked', () => {\nconst wrapper = setup('/incidents')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.reports.new')\nact(() => {\n- const onClick = listItems.at(6).prop('onClick') as any\n+ const onClick = listItems.at(incidentsIndex).prop('onClick') as any\nonClick()\n})\n@@ -524,17 +567,19 @@ describe('Sidebar', () => {\nconst wrapper = setup('/incidents')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.reports.label')\n- expect(listItems.at(7).prop('active')).toBeTruthy()\n+ expect(listItems.at(incidentsIndex).prop('active')).toBeTruthy()\n})\n- it('should navigate to /labs when the labs list link is clicked', () => {\n+ it('should navigate to /incidents when the incidents list link is clicked', () => {\nconst wrapper = setup('/incidents/new')\nconst listItems = wrapper.find(ListItem)\n+ const incidentsIndex = getIndex(listItems, 'incidents.reports.label')\nact(() => {\n- const onClick = listItems.at(7).prop('onClick') as any\n+ const onClick = listItems.at(incidentsIndex).prop('onClick') as any\nonClick()\n})\n@@ -547,61 +592,64 @@ describe('Sidebar', () => {\nconst wrapper = setup('/imaging')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.label')\n- expect(listItems.at(7).text().trim()).toEqual('imagings.label')\n+ expect(imagingsIndex).not.toBe(-1)\n})\nit('should render the new imaging request link', () => {\nconst wrapper = setup('/imagings')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.requests.new')\n- expect(listItems.at(8).text().trim()).toEqual('imagings.requests.new')\n+ expect(imagingsIndex).not.toBe(-1)\n})\nit('should not render the new imaging request link when user does not have the request imaging privileges', () => {\nconst wrapper = setupNoPermissions('/imagings')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.requests.new')\n- listItems.forEach((_, i) => {\n- expect(listItems.at(i).text().trim()).not.toEqual('imagings.requests.new')\n- })\n+ expect(imagingsIndex).toBe(-1)\n})\nit('should render the imagings list link', () => {\nconst wrapper = setup('/imagings')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.requests.label')\n- expect(listItems.at(9).text().trim()).toEqual('imagings.requests.label')\n+ expect(imagingsIndex).not.toBe(-1)\n})\nit('should not render the imagings list link when user does not have the view imagings privileges', () => {\nconst wrapper = setupNoPermissions('/imagings')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.requests.label')\n- listItems.forEach((_, i) => {\n- expect(listItems.at(i).text().trim()).not.toEqual('imagings.requests.label')\n- })\n+ expect(imagingsIndex).toBe(-1)\n})\nit('main imagings link should be active when the current path is /imagings', () => {\nconst wrapper = setup('/imagings')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.label')\n- expect(listItems.at(7).prop('active')).toBeTruthy()\n+ expect(listItems.at(imagingsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /imaging when the main imagings link is clicked', () => {\nconst wrapper = setup('/')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.label')\nact(() => {\n- const onClick = listItems.at(7).prop('onClick') as any\n+ const onClick = listItems.at(imagingsIndex).prop('onClick') as any\nonClick()\n})\n@@ -612,17 +660,19 @@ describe('Sidebar', () => {\nconst wrapper = setup('/imagings/new')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.requests.new')\n- expect(listItems.at(8).prop('active')).toBeTruthy()\n+ expect(listItems.at(imagingsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /imaging/new when the new imaging link is clicked', () => {\nconst wrapper = setup('/imagings')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.requests.new')\nact(() => {\n- const onClick = listItems.at(8).prop('onClick') as any\n+ const onClick = listItems.at(imagingsIndex).prop('onClick') as any\nonClick()\n})\n@@ -633,17 +683,19 @@ describe('Sidebar', () => {\nconst wrapper = setup('/imagings')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.label')\n- expect(listItems.at(7).prop('active')).toBeTruthy()\n+ expect(listItems.at(imagingsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /imaging when the imagings list link is clicked', () => {\nconst wrapper = setup('/imagings/new')\nconst listItems = wrapper.find(ListItem)\n+ const imagingsIndex = getIndex(listItems, 'imagings.label')\nact(() => {\n- const onClick = listItems.at(7).prop('onClick') as any\n+ const onClick = listItems.at(imagingsIndex).prop('onClick') as any\nonClick()\n})\n@@ -656,61 +708,64 @@ describe('Sidebar', () => {\nconst wrapper = setup('/medications')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.label')\n- expect(listItems.at(6).text().trim()).toEqual('medications.label')\n+ expect(medicationsIndex).not.toBe(-1)\n})\nit('should render the new medications request link', () => {\nconst wrapper = setup('/medications')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.requests.new')\n- expect(listItems.at(7).text().trim()).toEqual('medications.requests.new')\n+ expect(medicationsIndex).not.toBe(-1)\n})\nit('should not render the new medications request link when user does not have request medications privileges', () => {\nconst wrapper = setupNoPermissions('/medications')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.requests.new')\n- listItems.forEach((_, i) => {\n- expect(listItems.at(i).text().trim()).not.toEqual('medications.requests.new')\n- })\n+ expect(medicationsIndex).toBe(-1)\n})\nit('should render the medications list link', () => {\nconst wrapper = setup('/medications')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.requests.label')\n- expect(listItems.at(7).text().trim()).toEqual('medications.requests.new')\n+ expect(medicationsIndex).not.toBe(-1)\n})\nit('should not render the medications list link when user does not have view medications privileges', () => {\nconst wrapper = setupNoPermissions('/medications')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.requests.label')\n- listItems.forEach((_, i) => {\n- expect(listItems.at(i).text().trim()).not.toEqual('medications.requests.new')\n- })\n+ expect(medicationsIndex).toBe(-1)\n})\nit('main medications link should be active when the current path is /medications', () => {\nconst wrapper = setup('/medications')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.label')\n- expect(listItems.at(6).prop('active')).toBeTruthy()\n+ expect(listItems.at(medicationsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /medications when the main lab link is clicked', () => {\nconst wrapper = setup('/')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.label')\nact(() => {\n- const onClick = listItems.at(6).prop('onClick') as any\n+ const onClick = listItems.at(medicationsIndex).prop('onClick') as any\nonClick()\n})\n@@ -721,17 +776,19 @@ describe('Sidebar', () => {\nconst wrapper = setup('/medications/new')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.requests.new')\n- expect(listItems.at(7).prop('active')).toBeTruthy()\n+ expect(listItems.at(medicationsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /medications/new when the new medications link is clicked', () => {\nconst wrapper = setup('/medications')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.requests.new')\nact(() => {\n- const onClick = listItems.at(7).prop('onClick') as any\n+ const onClick = listItems.at(medicationsIndex).prop('onClick') as any\nonClick()\n})\n@@ -742,17 +799,19 @@ describe('Sidebar', () => {\nconst wrapper = setup('/medications')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.requests.label')\n- expect(listItems.at(8).prop('active')).toBeTruthy()\n+ expect(listItems.at(medicationsIndex).prop('active')).toBeTruthy()\n})\nit('should navigate to /medications when the medications list link is clicked', () => {\nconst wrapper = setup('/medications/new')\nconst listItems = wrapper.find(ListItem)\n+ const medicationsIndex = getIndex(listItems, 'medications.requests.label')\nact(() => {\n- const onClick = listItems.at(8).prop('onClick') as any\n+ const onClick = listItems.at(medicationsIndex).prop('onClick') as any\nonClick()\n})\n" }, { "change_type": "MODIFY", "old_path": "src/shared/components/Sidebar.tsx", "new_path": "src/shared/components/Sidebar.tsx", "diff": "@@ -421,10 +421,10 @@ const Sidebar = () => {\n{getDashboardLink()}\n{getPatientLinks()}\n{getAppointmentLinks()}\n- {getLabLinks()}\n- {getIncidentLinks()}\n{getMedicationLinks()}\n+ {getLabLinks()}\n{getImagingLinks()}\n+ {getIncidentLinks()}\n</List>\n</div>\n</nav>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/labs/ViewLab.tsx", "new_path": "src/labs/ViewLab.tsx", "diff": "@@ -69,7 +69,7 @@ const ViewLab = () => {\nToast(\n'success',\nt('states.success'),\n- `${t('labs.successfullyUpdated')} ${update.type} ${patient?.fullName}`,\n+ `${t('labs.successfullyUpdated')} ${update.type} for ${patient?.fullName}`,\n)\n}\nif (labToView) {\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/labs/index.ts", "new_path": "src/shared/locales/enUs/translations/labs/index.ts", "diff": "@@ -3,6 +3,7 @@ export default {\nlabel: 'Labs',\nfilterTitle: 'Filter by status',\nsearch: 'Search labs',\n+ successfullyUpdated: 'Successfully updated',\nstatus: {\nrequested: 'Requested',\ncompleted: 'Completed',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/useAddAllergy.test.tsx", "new_path": "src/__tests__/patients/hooks/useAddAllergy.test.tsx", "diff": "@@ -42,6 +42,6 @@ describe('use add allergy', () => {\nexpect(PatientRepository.find).toHaveBeenCalledTimes(1)\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(expectedPatient)\n- expect(result).toEqual(expectedAllergy)\n+ expect(result).toEqual([expectedAllergy])\n})\n})\n" }, { "change_type": "RENAME", "old_path": "src/__tests__/patients/hooks/useAllergy.tsx", "new_path": "src/__tests__/patients/hooks/useAllergy.test.tsx", "diff": "" }, { "change_type": "MODIFY", "old_path": "src/patients/hooks/useAddAllergy.tsx", "new_path": "src/patients/hooks/useAddAllergy.tsx", "diff": "@@ -11,7 +11,7 @@ interface AddAllergyRequest {\nallergy: Allergy\n}\n-async function addAllergy(request: AddAllergyRequest): Promise<Allergy> {\n+async function addAllergy(request: AddAllergyRequest): Promise<Allergy[]> {\nconst error = validateAllergy(request.allergy)\nif (isEmpty(error)) {\n@@ -28,7 +28,7 @@ async function addAllergy(request: AddAllergyRequest): Promise<Allergy> {\nallergies,\n})\n- return newAllergy\n+ return allergies\n}\nthrow error\n@@ -36,8 +36,8 @@ async function addAllergy(request: AddAllergyRequest): Promise<Allergy> {\nexport default function useAddAllergy() {\nreturn useMutation(addAllergy, {\n- onSuccess: async (_, variables) => {\n- await queryCache.invalidateQueries(['allergies', variables.patientId])\n+ onSuccess: async (data, variables) => {\n+ await queryCache.setQueryData(['allergies', variables.patientId], data)\n},\nthrowOnError: true,\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/patient-slice.test.ts", "new_path": "src/__tests__/patients/patient-slice.test.ts", "diff": "-import { addDays, subDays } from 'date-fns'\n+import { addDays } from 'date-fns'\nimport { AnyAction } from 'redux'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\nimport patient, {\n- addAllergy,\n- addAllergyError,\n- addCarePlan,\naddDiagnosis,\naddDiagnosisError,\naddRelatedPerson,\n@@ -23,11 +20,8 @@ import patient, {\nupdatePatientError,\nupdatePatientStart,\nupdatePatientSuccess,\n- addCarePlanError,\n} from '../../patients/patient-slice'\nimport PatientRepository from '../../shared/db/PatientRepository'\n-import Allergy from '../../shared/model/Allergy'\n-import CarePlan, { CarePlanIntent, CarePlanStatus } from '../../shared/model/CarePlan'\nimport Diagnosis, { DiagnosisStatus } from '../../shared/model/Diagnosis'\nimport Patient from '../../shared/model/Patient'\nimport RelatedPerson from '../../shared/model/RelatedPerson'\n@@ -597,139 +591,4 @@ describe('patients slice', () => {\nexpect(onSuccessSpy).not.toHaveBeenCalled()\n})\n})\n-\n- describe('add allergy', () => {\n- it('should add the allergy to the patient with the given id', async () => {\n- const expectedAllergyId = 'expected id'\n- const store = mockStore()\n- const expectedPatientId = '123'\n-\n- const expectedPatient = {\n- id: expectedPatientId,\n- givenName: 'some name',\n- } as Patient\n-\n- const expectedAllergy = {\n- name: 'allergy name',\n- } as Allergy\n-\n- const expectedUpdatedPatient = {\n- ...expectedPatient,\n- allergies: [{ ...expectedAllergy, id: expectedAllergyId }],\n- } as Patient\n-\n- const findPatientSpy = jest\n- .spyOn(PatientRepository, 'find')\n- .mockResolvedValue(expectedPatient)\n- jest.spyOn(uuid, 'uuid').mockReturnValue(expectedAllergyId)\n- jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedUpdatedPatient)\n- const onSuccessSpy = jest.fn()\n-\n- await store.dispatch(addAllergy(expectedPatientId, expectedAllergy, onSuccessSpy))\n-\n- expect(findPatientSpy).toHaveBeenCalledWith(expectedPatientId)\n- expect(store.getActions()[1]).toEqual(updatePatientSuccess(expectedUpdatedPatient))\n- expect(onSuccessSpy).toHaveBeenCalledWith(expectedUpdatedPatient)\n- })\n-\n- it('should validate the allergy', async () => {\n- const expectedError = {\n- message: 'patient.allergies.error.unableToAdd',\n- name: 'patient.allergies.error.nameRequired',\n- }\n- const store = mockStore()\n- const expectedAllergy = {} as Allergy\n- const onSuccessSpy = jest.fn()\n-\n- await store.dispatch(addAllergy('some id', expectedAllergy, onSuccessSpy))\n-\n- expect(store.getActions()[0]).toEqual(addAllergyError(expectedError))\n- expect(onSuccessSpy).not.toHaveBeenCalled()\n- })\n- })\n-\n- describe('add care plan', () => {\n- it('should add a care plan', async () => {\n- const expectedCarePlanId = 'expected id'\n- const store = mockStore()\n- const expectedPatientId = '123'\n-\n- const expectedPatient = {\n- id: expectedPatientId,\n- givenName: 'some name',\n- } as Patient\n-\n- const expectedCarePlan = {\n- id: 'some id',\n- title: 'care plan title',\n- description: 'care plan description',\n- status: CarePlanStatus.Completed,\n- intent: CarePlanIntent.Proposal,\n- startDate: new Date().toISOString(),\n- endDate: new Date().toISOString(),\n- createdOn: new Date(Date.now()).toISOString(),\n- diagnosisId: 'some diagnosis id',\n- note: 'care plan note',\n- } as CarePlan\n-\n- const expectedUpdatedPatient = {\n- ...expectedPatient,\n- carePlans: [{ ...expectedCarePlan, id: expectedCarePlanId }],\n- } as Patient\n-\n- const findPatientSpy = jest\n- .spyOn(PatientRepository, 'find')\n- .mockResolvedValue(expectedPatient)\n- jest.spyOn(uuid, 'uuid').mockReturnValue(expectedCarePlanId)\n- jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedUpdatedPatient)\n- const onSuccessSpy = jest.fn()\n-\n- await store.dispatch(addCarePlan(expectedPatientId, expectedCarePlan, onSuccessSpy))\n-\n- expect(findPatientSpy).toHaveBeenCalledWith(expectedPatientId)\n- expect(store.getActions()[1]).toEqual(updatePatientSuccess(expectedUpdatedPatient))\n- expect(onSuccessSpy).toHaveBeenCalledWith(expectedUpdatedPatient)\n- })\n-\n- it('should validate the required fields', async () => {\n- const expectedError = {\n- message: 'patient.carePlan.error.unableToAdd',\n- title: 'patient.carePlan.error.titleRequired',\n- description: 'patient.carePlan.error.descriptionRequired',\n- status: 'patient.carePlan.error.statusRequired',\n- intent: 'patient.carePlan.error.intentRequired',\n- startDate: 'patient.carePlan.error.startDateRequired',\n- endDate: 'patient.carePlan.error.endDateRequired',\n- condition: 'patient.carePlan.error.conditionRequired',\n- }\n- const store = mockStore()\n- const expectedCarePlan = {} as CarePlan\n- const onSuccessSpy = jest.fn()\n-\n- await store.dispatch(addCarePlan('some id', expectedCarePlan, onSuccessSpy))\n-\n- expect(store.getActions()[0]).toEqual(addCarePlanError(expectedError))\n- expect(onSuccessSpy).not.toHaveBeenCalled()\n- })\n-\n- it('should validate that start date is before end date', async () => {\n- const store = mockStore()\n- const expectedCarePlan = {\n- startDate: new Date().toISOString(),\n- endDate: subDays(new Date(), 1).toISOString(),\n- } as CarePlan\n- const onSuccessSpy = jest.fn()\n-\n- await store.dispatch(addCarePlan('some id', expectedCarePlan, onSuccessSpy))\n-\n- expect(store.getActions()[0]).toEqual(\n- addCarePlanError(\n- expect.objectContaining({\n- endDate: 'patient.carePlan.error.endDateMustBeAfterStartDate',\n- }),\n- ),\n- )\n- expect(onSuccessSpy).not.toHaveBeenCalled()\n- })\n- })\n})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/patient-slice.ts", "new_path": "src/patients/patient-slice.ts", "diff": "@@ -4,8 +4,6 @@ import { isEmpty } from 'lodash'\nimport validator from 'validator'\nimport PatientRepository from '../shared/db/PatientRepository'\n-import Allergy from '../shared/model/Allergy'\n-import CarePlan from '../shared/model/CarePlan'\nimport Diagnosis from '../shared/model/Diagnosis'\nimport Note from '../shared/model/Note'\nimport Patient from '../shared/model/Patient'\n@@ -385,36 +383,6 @@ export const addDiagnosis = (\n}\n}\n-function validateAllergy(allergy: Allergy) {\n- const error: AddAllergyError = {}\n-\n- if (!allergy.name) {\n- error.name = 'patient.allergies.error.nameRequired'\n- }\n-\n- return error\n-}\n-\n-export const addAllergy = (\n- patientId: string,\n- allergy: Allergy,\n- onSuccess?: (patient: Patient) => void,\n-): AppThunk => async (dispatch) => {\n- const newAllergyError = validateAllergy(allergy)\n-\n- if (isEmpty(newAllergyError)) {\n- const patient = await PatientRepository.find(patientId)\n- const allergies = patient.allergies || []\n- allergies.push({ id: uuid(), ...allergy })\n- patient.allergies = allergies\n-\n- await dispatch(updatePatient(patient, onSuccess))\n- } else {\n- newAllergyError.message = 'patient.allergies.error.unableToAdd'\n- dispatch(addAllergyError(newAllergyError))\n- }\n-}\n-\nfunction validateNote(note: Note) {\nconst error: AddNoteError = {}\nif (!note.text) {\n@@ -444,69 +412,6 @@ export const addNote = (\n}\n}\n-function validateCarePlan(carePlan: CarePlan): AddCarePlanError {\n- const error: AddCarePlanError = {}\n-\n- if (!carePlan.title) {\n- error.title = 'patient.carePlan.error.titleRequired'\n- }\n-\n- if (!carePlan.description) {\n- error.description = 'patient.carePlan.error.descriptionRequired'\n- }\n-\n- if (!carePlan.status) {\n- error.status = 'patient.carePlan.error.statusRequired'\n- }\n-\n- if (!carePlan.intent) {\n- error.intent = 'patient.carePlan.error.intentRequired'\n- }\n-\n- if (!carePlan.startDate) {\n- error.startDate = 'patient.carePlan.error.startDateRequired'\n- }\n-\n- if (!carePlan.endDate) {\n- error.endDate = 'patient.carePlan.error.endDateRequired'\n- }\n-\n- if (carePlan.startDate && carePlan.endDate) {\n- if (isBefore(new Date(carePlan.endDate), new Date(carePlan.startDate))) {\n- error.endDate = 'patient.carePlan.error.endDateMustBeAfterStartDate'\n- }\n- }\n-\n- if (!carePlan.diagnosisId) {\n- error.condition = 'patient.carePlan.error.conditionRequired'\n- }\n-\n- return error\n-}\n-\n-export const addCarePlan = (\n- patientId: string,\n- carePlan: CarePlan,\n- onSuccess?: (patient: Patient) => void,\n-): AppThunk => async (dispatch) => {\n- const carePlanError = validateCarePlan(carePlan)\n- if (isEmpty(carePlanError)) {\n- const patient = await PatientRepository.find(patientId)\n- const carePlans = patient.carePlans || ([] as CarePlan[])\n- carePlans.push({\n- id: uuid(),\n- createdOn: new Date(Date.now().valueOf()).toISOString(),\n- ...carePlan,\n- })\n- patient.carePlans = carePlans\n-\n- await dispatch(updatePatient(patient, onSuccess))\n- } else {\n- carePlanError.message = 'patient.carePlan.error.unableToAdd'\n- dispatch(addCarePlanError(carePlanError))\n- }\n-}\n-\nfunction validateVisit(visit: Visit): AddVisitError {\nconst error: AddVisitError = {}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "new_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "diff": "@@ -61,6 +61,8 @@ describe('Add Care Plan Modal', () => {\n})\nit('should save care plan when the save button is clicked and close', async () => {\n+ const expectedCreatedDate = new Date()\n+ Date.now = jest.fn().mockReturnValue(expectedCreatedDate)\nconst expectedCarePlan = {\nid: '123',\ntitle: 'some title',\n@@ -70,6 +72,7 @@ describe('Add Care Plan Modal', () => {\nendDate: new Date().toISOString(),\nstatus: CarePlanStatus.Active,\nintent: CarePlanIntent.Proposal,\n+ createdOn: expectedCreatedDate,\n}\nconst { wrapper } = setup()\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/useAddCarePlan.test.tsx", "new_path": "src/__tests__/patients/hooks/useAddCarePlan.test.tsx", "diff": "@@ -13,6 +13,8 @@ describe('use add care plan', () => {\n})\nit('should add a care plan to the patient', async () => {\n+ const expectedCreatedDate = new Date()\n+ Date.now = jest.fn().mockReturnValue(expectedCreatedDate)\nconst expectedCarePlan: CarePlan = {\nid: 'some id',\ndescription: 'some description',\n@@ -21,7 +23,7 @@ describe('use add care plan', () => {\ntitle: 'some title',\nintent: CarePlanIntent.Option,\nstatus: CarePlanStatus.Active,\n- createdOn: new Date().toISOString(),\n+ createdOn: expectedCreatedDate.toISOString(),\ndiagnosisId: 'someDiagnosis',\nnote: 'some note',\n}\n" }, { "change_type": "MODIFY", "old_path": "src/patients/allergies/NewAllergyModal.tsx", "new_path": "src/patients/allergies/NewAllergyModal.tsx", "diff": "@@ -3,7 +3,6 @@ import React, { useState, useEffect } from 'react'\nimport TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'\nimport useTranslator from '../../shared/hooks/useTranslator'\n-import Allergy from '../../shared/model/Allergy'\nimport useAddAllergy from '../hooks/useAddAllergy'\nimport { AllergyError } from '../util/validate-allergy'\n@@ -32,7 +31,7 @@ const NewAllergyModal = (props: NewAllergyModalProps) => {\nconst onSaveButtonClick = async () => {\ntry {\n- await mutate({ patientId, allergy: allergy as Allergy })\n+ await mutate({ patientId, allergy })\nonCloseButtonClick()\n} catch (e) {\nsetAllergyError(e)\n" }, { "change_type": "MODIFY", "old_path": "src/patients/care-plans/AddCarePlanModal.tsx", "new_path": "src/patients/care-plans/AddCarePlanModal.tsx", "diff": "@@ -3,7 +3,7 @@ import { addMonths } from 'date-fns'\nimport React, { useState, useEffect } from 'react'\nimport useTranslator from '../../shared/hooks/useTranslator'\n-import CarePlan from '../../shared/model/CarePlan'\n+import CarePlan, { CarePlanIntent, CarePlanStatus } from '../../shared/model/CarePlan'\nimport Patient from '../../shared/model/Patient'\nimport useAddCarePlan from '../hooks/useAddCarePlan'\nimport { CarePlanError } from '../util/validate-careplan'\n@@ -22,6 +22,8 @@ const initialCarePlanState = {\nendDate: addMonths(new Date(), 1).toISOString(),\nnote: '',\ndiagnosisId: '',\n+ status: CarePlanStatus.Active,\n+ intent: CarePlanIntent.Plan,\n}\nconst AddCarePlanModal = (props: Props) => {\n@@ -45,7 +47,7 @@ const AddCarePlanModal = (props: Props) => {\nconst onSaveButtonClick = async () => {\ntry {\n- await mutate({ patientId: patient.id, carePlan: carePlan as CarePlan })\n+ await mutate({ patientId: patient.id, carePlan })\nonClose()\n} catch (e) {\nsetCarePlanError(e)\n" }, { "change_type": "MODIFY", "old_path": "src/patients/hooks/useAddAllergy.tsx", "new_path": "src/patients/hooks/useAddAllergy.tsx", "diff": "@@ -8,7 +8,7 @@ import validateAllergy from '../util/validate-allergy'\ninterface AddAllergyRequest {\npatientId: string\n- allergy: Allergy\n+ allergy: Omit<Allergy, 'id'>\n}\nasync function addAllergy(request: AddAllergyRequest): Promise<Allergy[]> {\n@@ -17,7 +17,7 @@ async function addAllergy(request: AddAllergyRequest): Promise<Allergy[]> {\nif (isEmpty(error)) {\nconst patient = await PatientRepository.find(request.patientId)\nconst allergies = patient.allergies ? [...patient.allergies] : []\n- const newAllergy = {\n+ const newAllergy: Allergy = {\nid: uuid(),\n...request.allergy,\n}\n" }, { "change_type": "MODIFY", "old_path": "src/patients/hooks/useAddCarePlan.tsx", "new_path": "src/patients/hooks/useAddCarePlan.tsx", "diff": "@@ -8,7 +8,7 @@ import validateCarePlan from '../util/validate-careplan'\ninterface AddCarePlanRequest {\npatientId: string\n- carePlan: CarePlan\n+ carePlan: Omit<CarePlan, 'id' | 'createdOn'>\n}\nasync function addCarePlan(request: AddCarePlanRequest): Promise<CarePlan[]> {\n@@ -18,8 +18,9 @@ async function addCarePlan(request: AddCarePlanRequest): Promise<CarePlan[]> {\nconst patient = await PatientRepository.find(request.patientId)\nconst carePlans = patient.carePlans ? [...patient.carePlans] : []\n- const newCarePlan = {\n+ const newCarePlan: CarePlan = {\nid: uuid(),\n+ createdOn: new Date(Date.now()).toISOString(),\n...request.carePlan,\n}\ncarePlans.push(newCarePlan)\n" }, { "change_type": "MODIFY", "old_path": "src/patients/util/validate-allergy.tsx", "new_path": "src/patients/util/validate-allergy.tsx", "diff": "@@ -10,7 +10,7 @@ export class AllergyError extends Error {\n}\n}\n-export default function validateAllergy(allergy: Allergy) {\n+export default function validateAllergy(allergy: Partial<Allergy>) {\nconst error: any = {}\nif (!allergy.name) {\nerror.nameError = 'patient.allergies.error.nameRequired'\n" }, { "change_type": "MODIFY", "old_path": "src/patients/util/validate-careplan.ts", "new_path": "src/patients/util/validate-careplan.ts", "diff": "@@ -45,7 +45,7 @@ export class CarePlanError extends Error {\n}\n}\n-export default function validateCarePlan(carePlan: CarePlan): CarePlanError {\n+export default function validateCarePlan(carePlan: Partial<CarePlan>): CarePlanError {\nconst error = {} as CarePlanError\nif (!carePlan.title) {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/visualize/VisualizeIncidents.tsx", "new_path": "src/incidents/visualize/VisualizeIncidents.tsx", "diff": "@@ -9,62 +9,48 @@ const VisualizeIncidents = () => {\nconst searchFilter = IncidentFilter.reported\nconst searchRequest: IncidentSearchRequest = { status: searchFilter }\nconst { data, isLoading } = useIncidents(searchRequest)\n- const [monthlyIncidents, setMonthlyIncidents] = useState({\n- January: 0,\n- February: 0,\n- March: 0,\n- April: 0,\n- May: 0,\n- June: 0,\n- July: 0,\n- August: 0,\n- September: 0,\n- November: 0,\n- December: 0,\n- })\n+ const [monthlyIncidents, setMonthlyIncidents] = useState([\n+ // monthlyIncidents[0] -> January ... monthlyIncidents[11] -> December\n+ 0,\n+ 0,\n+ 0,\n+ 0,\n+ 0,\n+ 0,\n+ 0,\n+ 0,\n+ 0,\n+ 0,\n+ 0,\n+ 0,\n+ ])\n- const getIncidentMonth = (reportedOn: string) => {\n- // reportedOn: \"2020-08-12T19:53:30.153Z\"\n- // splices the data.reportedOn string at position 5-6 to get the month\n- const months = [\n- 'January',\n- 'February',\n- 'March',\n- 'April',\n- 'May',\n- 'June',\n- 'July',\n- 'August',\n- 'September',\n- 'November',\n- 'December',\n- ]\n- return months[Number(reportedOn.slice(5, 7)) - 1]\n+ const handleUpdate = (incidentMonth: number) => {\n+ console.log('monthlyIncidents:', monthlyIncidents)\n+ const newMonthlyIncidents = [...monthlyIncidents]\n+ newMonthlyIncidents[incidentMonth] += 1\n+ console.log('newMonthlyIncidents: ', newMonthlyIncidents)\n+ setMonthlyIncidents(newMonthlyIncidents)\n}\n+ const getIncidentMonth = (reportedOn: string) =>\n+ // reportedOn: \"2020-08-12T19:53:30.153Z\"\n+ Number(reportedOn.slice(5, 7)) - 1\n+\nuseEffect(() => {\nif (data === undefined || isLoading) {\nconsole.log('data is undefined')\n} else {\n- console.log('data:', data)\n- let incidentMonth: string\nconst totalIncidents: number = data.length\nfor (let incident = 0; incident < totalIncidents; incident += 1) {\n- incidentMonth = getIncidentMonth(data[incident].reportedOn)\n- setMonthlyIncidents((state) => ({\n- ...state,\n- // incidentMonth: incidentMonth + 1,\n- }))\n- console.log('incidentMonth: ', incidentMonth)\n+ const incidentMonth = getIncidentMonth(data[incident].reportedOn)\n+ console.log('iteration number ', incident)\n+ handleUpdate(incidentMonth)\n}\n}\n}, [data])\n- // if (data === undefined || isLoading) {\n- // return <Spinner type=\"DotLoader\" loading />\n- // }\n-\n- console.log('August: ', monthlyIncidents.August)\n+ // console.log(\"after updating: \", monthlyIncidents)\nreturn (\n<>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/visualize/VisualizeIncidents.tsx", "new_path": "src/incidents/visualize/VisualizeIncidents.tsx", "diff": "@@ -25,33 +25,28 @@ const VisualizeIncidents = () => {\n0,\n])\n+ const getIncidentMonth = (reportedOn: string) =>\n+ // reportedOn: \"2020-08-12T19:53:30.153Z\"\n+ Number(reportedOn.slice(5, 7)) - 1\n+\nconst handleUpdate = (incidentMonth: number) => {\n- console.log('monthlyIncidents:', monthlyIncidents)\nconst newMonthlyIncidents = [...monthlyIncidents]\nnewMonthlyIncidents[incidentMonth] += 1\n- console.log('newMonthlyIncidents: ', newMonthlyIncidents)\nsetMonthlyIncidents(newMonthlyIncidents)\n}\n- const getIncidentMonth = (reportedOn: string) =>\n- // reportedOn: \"2020-08-12T19:53:30.153Z\"\n- Number(reportedOn.slice(5, 7)) - 1\n-\nuseEffect(() => {\nif (data === undefined || isLoading) {\n- console.log('data is undefined')\n+ // const spinner = <Spinner type=\"DotLoader\" loading />\n} else {\nconst totalIncidents: number = data.length\nfor (let incident = 0; incident < totalIncidents; incident += 1) {\nconst incidentMonth = getIncidentMonth(data[incident].reportedOn)\n- console.log('iteration number ', incident)\nhandleUpdate(incidentMonth)\n}\n}\n}, [data])\n- // console.log(\"after updating: \", monthlyIncidents)\n-\nreturn (\n<>\n<LineGraph\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/visualize/VisualizeIncidents.tsx", "new_path": "src/incidents/visualize/VisualizeIncidents.tsx", "diff": "@@ -9,6 +9,7 @@ const VisualizeIncidents = () => {\nconst searchFilter = IncidentFilter.reported\nconst searchRequest: IncidentSearchRequest = { status: searchFilter }\nconst { data, isLoading } = useIncidents(searchRequest)\n+ const [incident, setIncident] = useState(0)\nconst [monthlyIncidents, setMonthlyIncidents] = useState([\n// monthlyIncidents[0] -> January ... monthlyIncidents[11] -> December\n0,\n@@ -29,23 +30,20 @@ const VisualizeIncidents = () => {\n// reportedOn: \"2020-08-12T19:53:30.153Z\"\nNumber(reportedOn.slice(5, 7)) - 1\n- const handleUpdate = (incidentMonth: number) => {\n- const newMonthlyIncidents = [...monthlyIncidents]\n- newMonthlyIncidents[incidentMonth] += 1\n- setMonthlyIncidents(newMonthlyIncidents)\n- }\n-\nuseEffect(() => {\nif (data === undefined || isLoading) {\n// const spinner = <Spinner type=\"DotLoader\" loading />\n} else {\nconst totalIncidents: number = data.length\n- for (let incident = 0; incident < totalIncidents; incident += 1) {\n+ if (totalIncidents > incident) {\nconst incidentMonth = getIncidentMonth(data[incident].reportedOn)\n- handleUpdate(incidentMonth)\n+ setMonthlyIncidents((prevIncidents) =>\n+ prevIncidents.map((value, index) => (index === incidentMonth ? value + 1 : value)),\n+ )\n+ setIncident(incident + 1)\n}\n}\n- }, [data])\n+ }, [data, monthlyIncidents])\nreturn (\n<>\n" } ]

[ { "change_type": "MODIFY", "old_path": ".eslintrc.js", "new_path": ".eslintrc.js", "diff": "@@ -57,7 +57,7 @@ module.exports = {\n'no-param-reassign': ['error', { props: false }],\n'import/prefer-default-export': 'off',\n'import/no-cycle': 'off',\n- 'no-console': 'off',\n+ 'no-console': 'error',\n'eol-last': ['error', 'always'],\n'no-debugger': 'error',\n'no-nested-ternary': 'off',\n" }, { "change_type": "ADD", "old_path": null, "new_path": "couchdb-cleanup.sh", "diff": "+#!/bin/zsh\n+\n+docker-compose down -v --rmi all --remove-orphans\n" }, { "change_type": "ADD", "old_path": null, "new_path": "couchdb-init.sh", "diff": "+#!/bin/zsh\n+\n+docker-compose up --build -d\n" }, { "change_type": "MODIFY", "old_path": "scripts/check-translations/index.ts", "new_path": "scripts/check-translations/index.ts", "diff": "+/* eslint-disable no-console */\n+\nimport chalk from 'chalk'\nimport { ResourceKey } from 'i18next'\n" }, { "change_type": "MODIFY", "old_path": "src/App.tsx", "new_path": "src/App.tsx", "diff": "+/* eslint-disable no-console */\n+\nimport { Spinner } from '@hospitalrun/components'\nimport React, { Suspense, useEffect, useState } from 'react'\nimport { ReactQueryDevtools } from 'react-query-devtools'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/hooks/useReportIncident.test.tsx", "new_path": "src/__tests__/incidents/hooks/useReportIncident.test.tsx", "diff": "+/* eslint-disable no-console */\n+\nimport { subDays } from 'date-fns'\nimport shortid from 'shortid'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "new_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "diff": "+/* eslint-disable no-console */\n+\nimport { Button } from '@hospitalrun/components'\nimport { mount, ReactWrapper } from 'enzyme'\nimport { createMemoryHistory } from 'history'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/NewAllergyModal.test.tsx", "new_path": "src/__tests__/patients/allergies/NewAllergyModal.test.tsx", "diff": "+/* eslint-disable no-console */\n+\nimport { Modal, Alert } from '@hospitalrun/components'\nimport { mount } from 'enzyme'\nimport React from 'react'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/useAddAllergy.test.tsx", "new_path": "src/__tests__/patients/hooks/useAddAllergy.test.tsx", "diff": "+/* eslint-disable no-console */\n+\nimport useAddAllergy from '../../../patients/hooks/useAddAllergy'\nimport * as validateAllergy from '../../../patients/util/validate-allergy'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/shared/config/pouchdb.ts", "new_path": "src/shared/config/pouchdb.ts", "diff": "@@ -26,14 +26,7 @@ if (process.env.NODE_ENV === 'test') {\n})\nlocalDb = new PouchDB('local_hospitalrun')\n- localDb\n- .sync(serverDb, { live: true, retry: true })\n- .on('change', (info) => {\n- console.log(info)\n- })\n- .on('error', (info) => {\n- console.error(info)\n- })\n+ localDb.sync(serverDb, { live: true, retry: true })\n}\nexport const schema = [\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/CONTRIBUTING.md", "new_path": ".github/CONTRIBUTING.md", "diff": "@@ -18,14 +18,14 @@ root of this project to launch CouchDB. Below are the steps:\n1. Start [Docker](https://docs.docker.com/get-docker/). Install it if you don't have it yet.\n2. Install [Docker Compose](https://docs.docker.com/compose/install/) if you don't have it yet.\n-3. Run `docker-compose up --build -d` in the root directory.\n+3. Run `./couchdb/couchdb-init.sh` in the root directory.\nThis should launch a new CouchDB instance on `http://localhost:5984`, create system database, configure CouchDB as Single Node, enable CORS, create `hospitalrun` database, create a default admin with a username of `admin` and password of 'password', create a sample user with a username of `username` and password of 'password' to use new login page [#2137](https://github.com/HospitalRun/hospitalrun-frontend/pull/2137).\nGo to `http://localhost:5984/_utils` in your browser to view Fauxton and perform administrative tasks.\n**_Cleanup_**\n-To delete the development database, go to the root of the project and run `docker-compose down -v --rmi all --remove-orphans`\n+To delete the development database, go to the root of the project and run `./couchdb/couchdb-cleanup.sh`\n### Install dependencies & start the application\n" }, { "change_type": "ADD", "old_path": null, "new_path": "couchdb/couchdb-cleanup.sh", "diff": "+#!/bin/sh\n+\n+docker-compose down -v --rmi all --remove-orphans\n" }, { "change_type": "ADD", "old_path": null, "new_path": "couchdb/couchdb-init.sh", "diff": "+#!/bin/sh\n+\n+docker-compose up --build -d\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/CONTRIBUTING.md", "new_path": ".github/CONTRIBUTING.md", "diff": "@@ -18,14 +18,14 @@ root of this project to launch CouchDB. Below are the steps:\n1. Start [Docker](https://docs.docker.com/get-docker/). Install it if you don't have it yet.\n2. Install [Docker Compose](https://docs.docker.com/compose/install/) if you don't have it yet.\n-3. Run `./couchdb/couchdb-init.sh` in the root directory.\n+3. Run `docker-compose up --build -d` in the root directory (on UNIX systems you can run `./couchdb/couchdb-init.sh` instead).\nThis should launch a new CouchDB instance on `http://localhost:5984`, create system database, configure CouchDB as Single Node, enable CORS, create `hospitalrun` database, create a default admin with a username of `admin` and password of 'password', create a sample user with a username of `username` and password of 'password' to use new login page [#2137](https://github.com/HospitalRun/hospitalrun-frontend/pull/2137).\nGo to `http://localhost:5984/_utils` in your browser to view Fauxton and perform administrative tasks.\n**_Cleanup_**\n-To delete the development database, go to the root of the project and run `./couchdb/couchdb-cleanup.sh`\n+To delete the development database, go to the root of the project and run `docker-compose down -v --rmi all --remove-orphans` (on UNIX systems you can run `./couchdb/couchdb-cleanup.sh` instead)\n### Install dependencies & start the application\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/visualize/VisualizeIncidents.tsx", "new_path": "src/incidents/visualize/VisualizeIncidents.tsx", "diff": "-import { LineGraph } from '@hospitalrun/components'\n+import { LineGraph, Spinner } from '@hospitalrun/components'\nimport React, { useEffect, useState } from 'react'\nimport useIncidents from '../hooks/useIncidents'\n@@ -10,6 +10,7 @@ const VisualizeIncidents = () => {\nconst searchRequest: IncidentSearchRequest = { status: searchFilter }\nconst { data, isLoading } = useIncidents(searchRequest)\nconst [incident, setIncident] = useState(0)\n+ const [showGraph, setShowGraph] = useState(false)\nconst [monthlyIncidents, setMonthlyIncidents] = useState([\n// monthlyIncidents[0] -> January ... monthlyIncidents[11] -> December\n0,\n@@ -32,7 +33,7 @@ const VisualizeIncidents = () => {\nuseEffect(() => {\nif (data === undefined || isLoading) {\n- // const spinner = <Spinner type=\"DotLoader\" loading />\n+ // incidents data not loaded yet, do nothing\n} else {\nconst totalIncidents: number = data.length\nif (totalIncidents > incident) {\n@@ -41,11 +42,16 @@ const VisualizeIncidents = () => {\nprevIncidents.map((value, index) => (index === incidentMonth ? value + 1 : value)),\n)\nsetIncident(incident + 1)\n+ } else if (totalIncidents === incident) {\n+ // incidents data finished processing\n+ setShowGraph(true)\n}\n}\n}, [data, monthlyIncidents])\n- return (\n+ return !showGraph ? (\n+ <Spinner type=\"DotLoader\" loading />\n+ ) : (\n<>\n<LineGraph\ndatasets={[\n@@ -55,15 +61,51 @@ const VisualizeIncidents = () => {\ndata: [\n{\nx: 'January',\n- y: 12,\n+ y: monthlyIncidents[0],\n},\n{\nx: 'February',\n- y: 11,\n+ y: monthlyIncidents[1],\n},\n{\nx: 'March',\n- y: 10,\n+ y: monthlyIncidents[2],\n+ },\n+ {\n+ x: 'April',\n+ y: monthlyIncidents[3],\n+ },\n+ {\n+ x: 'May',\n+ y: monthlyIncidents[4],\n+ },\n+ {\n+ x: 'June',\n+ y: monthlyIncidents[5],\n+ },\n+ {\n+ x: 'July',\n+ y: monthlyIncidents[6],\n+ },\n+ {\n+ x: 'August',\n+ y: monthlyIncidents[7],\n+ },\n+ {\n+ x: 'September',\n+ y: monthlyIncidents[8],\n+ },\n+ {\n+ x: 'October',\n+ y: monthlyIncidents[9],\n+ },\n+ {\n+ x: 'November',\n+ y: monthlyIncidents[10],\n+ },\n+ {\n+ x: 'December',\n+ y: monthlyIncidents[11],\n},\n],\nlabel: 'Incidents',\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/CONTRIBUTING.md", "new_path": ".github/CONTRIBUTING.md", "diff": "@@ -18,14 +18,14 @@ root of this project to launch CouchDB. Below are the steps:\n1. Start [Docker](https://docs.docker.com/get-docker/). Install it if you don't have it yet.\n2. Install [Docker Compose](https://docs.docker.com/compose/install/) if you don't have it yet.\n-3. Run `docker-compose up --build -d` in the root directory (on UNIX systems you can run `./couchdb/couchdb-init.sh` instead).\n+3. In the root directory run `./couchdb/couchdb-init.bat` on Windows or `./couchdb/couchdb-init.sh` on UNIX like systems.\nThis should launch a new CouchDB instance on `http://localhost:5984`, create system database, configure CouchDB as Single Node, enable CORS, create `hospitalrun` database, create a default admin with a username of `admin` and password of 'password', create a sample user with a username of `username` and password of 'password' to use new login page [#2137](https://github.com/HospitalRun/hospitalrun-frontend/pull/2137).\nGo to `http://localhost:5984/_utils` in your browser to view Fauxton and perform administrative tasks.\n**_Cleanup_**\n-To delete the development database, go to the root of the project and run `docker-compose down -v --rmi all --remove-orphans` (on UNIX systems you can run `./couchdb/couchdb-cleanup.sh` instead)\n+To delete the development database, go to the root of the project and run `./couchdb/couchdb-init.bat` on Windows or `./couchdb/couchdb-init.sh` on UNIX like systems.\n### Install dependencies & start the application\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/visualize/VisualizeIncidents.tsx", "new_path": "src/incidents/visualize/VisualizeIncidents.tsx", "diff": "@@ -11,21 +11,7 @@ const VisualizeIncidents = () => {\nconst { data, isLoading } = useIncidents(searchRequest)\nconst [incident, setIncident] = useState(0)\nconst [showGraph, setShowGraph] = useState(false)\n- const [monthlyIncidents, setMonthlyIncidents] = useState([\n- // monthlyIncidents[0] -> January ... monthlyIncidents[11] -> December\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- ])\n+ const [monthlyIncidents, setMonthlyIncidents] = useState(Array(12).fill(0))\nconst getIncidentMonth = (reportedOn: string) =>\n// reportedOn: \"2020-08-12T19:53:30.153Z\"\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/list/ViewIncidentsTable.tsx", "new_path": "src/incidents/list/ViewIncidentsTable.tsx", "diff": "import { Spinner, Table, Dropdown } from '@hospitalrun/components'\nimport format from 'date-fns/format'\n-import { Parser } from 'json2csv'\nimport React from 'react'\nimport { useHistory } from 'react-router'\nimport useTranslator from '../../shared/hooks/useTranslator'\n+import { DownloadLink, getCSV } from '../../shared/util/DataHelpers'\nimport { extractUsername } from '../../shared/util/extractUsername'\nimport useIncidents from '../hooks/useIncidents'\nimport IncidentSearchRequest from '../model/IncidentSearchRequest'\n@@ -50,10 +50,7 @@ function ViewIncidentsTable(props: Props) {\nfunction downloadCSV() {\npopulateExportData()\n- const fields = Object.keys(exportData[0])\n- const opts = { fields }\n- const parser = new Parser(opts)\n- const csv = parser.parse(exportData)\n+ const csv = getCSV(exportData)\nconst incidentsText = t('incidents.label')\n@@ -62,17 +59,7 @@ function ViewIncidentsTable(props: Props) {\n.concat(format(new Date(Date.now()), 'yyyy-MM-dd--hh-mma'))\n.concat('.csv')\n- const text = csv\n- const element = document.createElement('a')\n- element.setAttribute('href', `data:text/plain;charset=utf-8,${encodeURIComponent(text)}`)\n- element.setAttribute('download', filename)\n-\n- element.style.display = 'none'\n- document.body.appendChild(element)\n-\n- element.click()\n-\n- document.body.removeChild(element)\n+ DownloadLink(csv, filename)\n}\nconst dropdownItems = [\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/shared/util/DataHelpers.tsx", "diff": "+import { Parser } from 'json2csv'\n+\n+export function getCSV<T>(data: T[]): string {\n+ const fields = Object.keys(data[0])\n+ const opts = { fields }\n+ const parser = new Parser(opts)\n+ const csv = parser.parse(data)\n+ return csv\n+}\n+\n+export function DownloadLink(data: string, fileName: string) {\n+ const text = data\n+ const element = document.createElement('a')\n+ element.setAttribute('href', `data:text/plain;charset=utf-8,${encodeURIComponent(text)}`)\n+ element.setAttribute('download', fileName)\n+\n+ element.style.display = 'none'\n+ document.body.appendChild(element)\n+ element.click()\n+\n+ return document.body.removeChild(element)\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/ViewImagings.test.tsx", "new_path": "src/__tests__/imagings/ViewImagings.test.tsx", "diff": "@@ -28,6 +28,7 @@ describe('View Imagings', () => {\nid: '1234',\ntype: 'imaging type',\npatient: 'patient',\n+ fullName: 'full name',\nstatus: 'requested',\nrequestedOn: expectedDate.toISOString(),\nrequestedBy: 'some user',\n@@ -110,7 +111,7 @@ describe('View Imagings', () => {\nexpect.objectContaining({ label: 'imagings.imaging.requestedOn', key: 'requestedOn' }),\n)\nexpect(columns[3]).toEqual(\n- expect.objectContaining({ label: 'imagings.imaging.patient', key: 'patient' }),\n+ expect.objectContaining({ label: 'imagings.imaging.patient', key: 'fullName' }),\n)\nexpect(columns[4]).toEqual(\nexpect.objectContaining({ label: 'imagings.imaging.requestedBy', key: 'requestedBy' }),\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/requests/NewImagingRequest.test.tsx", "new_path": "src/__tests__/imagings/requests/NewImagingRequest.test.tsx", "diff": "@@ -86,6 +86,14 @@ describe('New Imaging Request', () => {\nexpect(typeahead.prop('searchAccessor')).toEqual('fullName')\n})\n+ it('should render a dropdown list of visits', async () => {\n+ const wrapper = await setup('loading', {})\n+ const visitsTypeSelect = wrapper.find('.visits').find(SelectWithLabelFormGroup)\n+ expect(visitsTypeSelect).toBeDefined()\n+ expect(visitsTypeSelect.prop('label')).toEqual('patient.visits.label')\n+ expect(visitsTypeSelect.prop('isRequired')).toBeTruthy()\n+ })\n+\nit('should render a type input box', async () => {\nconst wrapper = await setup('loading', {})\nconst typeInputBox = wrapper.find(TextInputWithLabelFormGroup)\n@@ -98,7 +106,7 @@ describe('New Imaging Request', () => {\nit('should render a status types select', async () => {\nconst wrapper = await setup('loading', {})\n- const statusTypesSelect = wrapper.find(SelectWithLabelFormGroup)\n+ const statusTypesSelect = wrapper.find('.imaging-status').find(SelectWithLabelFormGroup)\nexpect(statusTypesSelect).toBeDefined()\nexpect(statusTypesSelect.prop('label')).toEqual('imagings.imaging.status')\n@@ -184,6 +192,7 @@ describe('New Imaging Request', () => {\npatient: 'patient',\ntype: 'expected type',\nstatus: 'requested',\n+ visitId: 'expected visitId',\nnotes: 'expected notes',\nid: '1234',\nrequestedOn: expectedDate.toISOString(),\n@@ -204,12 +213,18 @@ describe('New Imaging Request', () => {\nonChange({ currentTarget: { value: expectedImaging.type } })\n})\n- const statusSelect = wrapper.find(SelectWithLabelFormGroup)\n+ const statusSelect = wrapper.find('.imaging-status').find(SelectWithLabelFormGroup)\nact(() => {\nconst onChange = statusSelect.prop('onChange') as any\nonChange({ currentTarget: { value: expectedImaging.status } })\n})\n+ const visitsSelect = wrapper.find('.visits').find(SelectWithLabelFormGroup)\n+ act(() => {\n+ const onChange = visitsSelect.prop('onChange') as any\n+ onChange({ currentTarget: { value: expectedImaging.visitId } })\n+ })\n+\nconst notesTextField = wrapper.find(TextFieldWithLabelFormGroup)\nact(() => {\nconst onChange = notesTextField.prop('onChange') as any\n" }, { "change_type": "MODIFY", "old_path": "src/imagings/ViewImagings.tsx", "new_path": "src/imagings/ViewImagings.tsx", "diff": "@@ -74,7 +74,7 @@ const ViewImagings = () => {\nformatter: (row) =>\nrow.requestedOn ? format(new Date(row.requestedOn), 'yyyy-MM-dd hh:mm a') : '',\n},\n- { label: t('imagings.imaging.patient'), key: 'patient' },\n+ { label: t('imagings.imaging.patient'), key: 'fullName' },\n{\nlabel: t('imagings.imaging.requestedBy'),\nkey: 'requestedBy',\n" }, { "change_type": "MODIFY", "old_path": "src/imagings/imaging-slice.ts", "new_path": "src/imagings/imaging-slice.ts", "diff": "@@ -10,6 +10,7 @@ interface Error {\ntype?: string\nstatus?: string\nmessage?: string\n+ visitId?: string\n}\ninterface ImagingState {\n" }, { "change_type": "MODIFY", "old_path": "src/imagings/requests/NewImagingRequest.tsx", "new_path": "src/imagings/requests/NewImagingRequest.tsx", "diff": "-import { Typeahead, Label, Button, Alert } from '@hospitalrun/components'\n+import { Typeahead, Label, Button, Alert, Column, Row } from '@hospitalrun/components'\n+import format from 'date-fns/format'\nimport React, { useState } from 'react'\nimport { useDispatch, useSelector } from 'react-redux'\nimport { useHistory } from 'react-router-dom'\n@@ -23,6 +24,7 @@ const NewImagingRequest = () => {\nconst history = useHistory()\nuseTitle(t('imagings.requests.new'))\nconst { status, error } = useSelector((state: RootState) => state.imaging)\n+ const [visitOption, setVisitOption] = useState([] as Option[])\nconst statusOptions: Option[] = [\n{ label: t('imagings.status.requested'), value: 'requested' },\n@@ -32,9 +34,11 @@ const NewImagingRequest = () => {\nconst [newImagingRequest, setNewImagingRequest] = useState({\npatient: '',\n+ fullName: '',\ntype: '',\nnotes: '',\nstatus: '',\n+ visitId: '',\n})\nconst breadcrumbs = [\n@@ -46,10 +50,28 @@ const NewImagingRequest = () => {\nuseAddBreadcrumbs(breadcrumbs)\nconst onPatientChange = (patient: Patient) => {\n+ if (patient) {\nsetNewImagingRequest((previousNewImagingRequest) => ({\n...previousNewImagingRequest,\n- patient: patient.fullName as string,\n+ patient: patient.id,\n+ fullName: patient.fullName as string,\n}))\n+\n+ const visits = patient.visits?.map((v) => ({\n+ label: `${v.type} at ${format(new Date(v.startDateTime), 'yyyy-MM-dd hh:mm a')}`,\n+ value: v.id,\n+ })) as Option[]\n+\n+ setVisitOption(visits)\n+ } else {\n+ setNewImagingRequest((previousNewImagingRequest) => ({\n+ ...previousNewImagingRequest,\n+ patient: '',\n+ fullName: '',\n+ visitId: '',\n+ }))\n+ setVisitOption([])\n+ }\n}\nconst onImagingTypeChange = (event: React.ChangeEvent<HTMLInputElement>) => {\n@@ -67,6 +89,13 @@ const NewImagingRequest = () => {\n}))\n}\n+ const onVisitChange = (value: string) => {\n+ setNewImagingRequest((previousNewImagingRequest) => ({\n+ ...previousNewImagingRequest,\n+ visitId: value,\n+ }))\n+ }\n+\nconst onNoteChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {\nconst notes = event.currentTarget.value\nsetNewImagingRequest((previousNewImagingRequest) => ({\n@@ -88,18 +117,29 @@ const NewImagingRequest = () => {\nhistory.push('/imaging')\n}\n+ const defaultSelectedVisitsOption = () => {\n+ if (visitOption !== undefined) {\n+ return visitOption.filter(({ value }) => value === newImagingRequest.visitId)\n+ }\n+ return []\n+ }\n+\nreturn (\n<>\n{status === 'error' && (\n<Alert color=\"danger\" title={t('states.error')} message={t(error.message || '')} />\n)}\n<form>\n+ <Row>\n+ <Column>\n<div className=\"form-group patient-typeahead\">\n<Label htmlFor=\"patientTypeahead\" isRequired text={t('imagings.imaging.patient')} />\n<Typeahead\nid=\"patientTypeahead\"\nplaceholder={t('imagings.imaging.patient')}\n- onChange={(p: Patient[]) => onPatientChange(p[0])}\n+ onChange={(p: Patient[]) => {\n+ onPatientChange(p[0])\n+ }}\nonSearch={async (query: string) => PatientRepository.search(query)}\nsearchAccessor=\"fullName\"\nrenderMenuItemChildren={(p: Patient) => <div>{`${p.fullName} (${p.code})`}</div>}\n@@ -107,6 +147,24 @@ const NewImagingRequest = () => {\nfeedback={t(error.patient as string)}\n/>\n</div>\n+ </Column>\n+ <Column>\n+ <div className=\"visits\">\n+ <SelectWithLabelFormGroup\n+ name=\"visit\"\n+ label={t('patient.visits.label')}\n+ isRequired\n+ isEditable={newImagingRequest.patient !== undefined}\n+ options={visitOption || []}\n+ defaultSelected={defaultSelectedVisitsOption()}\n+ onChange={(values) => {\n+ onVisitChange(values[0])\n+ }}\n+ />\n+ </div>\n+ </Column>\n+ </Row>\n+\n<TextInputWithLabelFormGroup\nname=\"imagingType\"\nlabel={t('imagings.imaging.type')}\n@@ -117,15 +175,19 @@ const NewImagingRequest = () => {\nvalue={newImagingRequest.type}\nonChange={onImagingTypeChange}\n/>\n+ <div className=\"imaging-status\">\n<SelectWithLabelFormGroup\nname=\"status\"\nlabel={t('imagings.imaging.status')}\noptions={statusOptions}\nisRequired\nisEditable\n- defaultSelected={statusOptions.filter(({ value }) => value === newImagingRequest.status)}\n+ defaultSelected={statusOptions.filter(\n+ ({ value }) => value === newImagingRequest.status,\n+ )}\nonChange={(values) => onStatusChange(values[0])}\n/>\n+ </div>\n<div className=\"form-group\">\n<TextFieldWithLabelFormGroup\nname=\"ImagingNotes\"\n" }, { "change_type": "MODIFY", "old_path": "src/shared/model/Imaging.ts", "new_path": "src/shared/model/Imaging.ts", "diff": "@@ -3,8 +3,10 @@ import AbstractDBModel from './AbstractDBModel'\nexport default interface Imaging extends AbstractDBModel {\ncode: string\npatient: string\n+ fullName: string\ntype: string\nstatus: 'requested' | 'completed' | 'canceled'\n+ visitId: string\nrequestedOn: string\nrequestedBy: string // will be the currently logged in user's id\ncompletedOn?: string\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/diagnoses/DiagnosisForm.test.tsx", "new_path": "src/__tests__/patients/diagnoses/DiagnosisForm.test.tsx", "diff": "@@ -6,6 +6,7 @@ import { act } from 'react-dom/test-utils'\nimport DiagnosisForm from '../../../patients/diagnoses/DiagnosisForm'\nimport Diagnosis, { DiagnosisStatus } from '../../../shared/model/Diagnosis'\n+import Patient from '../../../shared/model/Patient'\ndescribe('Diagnosis Form', () => {\nlet onDiagnosisChangeSpy: any\n@@ -17,8 +18,14 @@ describe('Diagnosis Form', () => {\nabatementDate: new Date().toISOString(),\nstatus: DiagnosisStatus.Active,\nnote: 'some note',\n+ visit: 'some visit',\n}\n+ const patient = {\n+ givenName: 'first',\n+ fullName: 'first',\n+ } as Patient\n+\nconst setup = (disabled = false, initializeDiagnosis = true, error?: any) => {\nonDiagnosisChangeSpy = jest.fn()\nconst wrapper = mount(\n@@ -27,6 +34,7 @@ describe('Diagnosis Form', () => {\ndiagnosis={initializeDiagnosis ? diagnosis : {}}\ndiagnosisError={error}\ndisabled={disabled}\n+ patient={patient}\n/>,\n)\nreturn { wrapper }\n@@ -55,6 +63,29 @@ describe('Diagnosis Form', () => {\nexpect(onDiagnosisChangeSpy).toHaveBeenCalledWith({ name: expectedNewname })\n})\n+ it('should render a visit selector', () => {\n+ const { wrapper } = setup()\n+\n+ const visitSelector = wrapper.findWhere((w) => w.prop('name') === 'visit')\n+\n+ expect(visitSelector).toHaveLength(1)\n+ expect(visitSelector.prop('patient.diagnoses.visit'))\n+ expect(visitSelector.prop('isRequired')).toBeFalsy()\n+ expect(visitSelector.prop('defaultSelected')).toEqual([])\n+ })\n+\n+ it('should call the on change handler when visit changes', () => {\n+ const expectedNewVisit = patient.visits\n+ const { wrapper } = setup(false, false)\n+ act(() => {\n+ const visitSelector = wrapper.findWhere((w) => w.prop('name') === 'visit')\n+ const onChange = visitSelector.prop('onChange') as any\n+ onChange([expectedNewVisit])\n+ })\n+\n+ expect(onDiagnosisChangeSpy).toHaveBeenCalledWith({ status: expectedNewVisit })\n+ })\n+\nit('should render a status selector', () => {\nconst { wrapper } = setup()\n" }, { "change_type": "MODIFY", "old_path": "src/patients/diagnoses/AddDiagnosisModal.tsx", "new_path": "src/patients/diagnoses/AddDiagnosisModal.tsx", "diff": "@@ -19,6 +19,7 @@ const initialDiagnosisState = {\nonsetDate: new Date().toISOString(),\nabatementDate: new Date().toISOString(),\nnote: '',\n+ visit: '',\n}\nconst AddDiagnosisModal = (props: Props) => {\n@@ -45,6 +46,7 @@ const AddDiagnosisModal = (props: Props) => {\ndiagnosis={diagnosis}\ndiagnosisError={diagnosisError}\nonChange={onDiagnosisChange}\n+ patient={patient}\n/>\n)\nreturn (\n" }, { "change_type": "MODIFY", "old_path": "src/patients/diagnoses/DiagnosisForm.tsx", "new_path": "src/patients/diagnoses/DiagnosisForm.tsx", "diff": "import { Alert, Row, Column } from '@hospitalrun/components'\n+import format from 'date-fns/format'\nimport React, { useState } from 'react'\nimport { useTranslation } from 'react-i18next'\n@@ -9,6 +10,7 @@ import SelectWithLabelFormGroup, {\nimport TextFieldWithLabelFormGroup from '../../shared/components/input/TextFieldWithLabelFormGroup'\nimport TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'\nimport Diagnosis, { DiagnosisStatus } from '../../shared/model/Diagnosis'\n+import Patient from '../../shared/model/Patient'\ninterface Error {\nmessage?: string\n@@ -19,16 +21,18 @@ interface Error {\nstatus?: string\nnote?: string\n}\n+\ninterface Props {\ndiagnosis: Partial<Diagnosis>\ndiagnosisError?: Error\nonChange?: (newDiagnosis: Partial<Diagnosis>) => void\ndisabled: boolean\n+ patient: Patient\n}\nconst DiagnosisForm = (props: Props) => {\nconst { t } = useTranslation()\n- const { diagnosis, diagnosisError, disabled, onChange } = props\n+ const { diagnosis, diagnosisError, disabled, onChange, patient } = props\nconst [status, setStatus] = useState(diagnosis.status)\nconst onFieldChange = (name: string, value: string | DiagnosisStatus) => {\n@@ -41,6 +45,18 @@ const DiagnosisForm = (props: Props) => {\n}\n}\n+ const patientVisits = patient?.visits?.map((v) => ({\n+ label: `${v.type} at ${format(new Date(v.startDateTime), 'yyyy-MM-dd, hh:mm a')}`,\n+ value: v.id,\n+ })) as Option[]\n+\n+ const defaultSelectedVisitOption = () => {\n+ if (patientVisits !== undefined) {\n+ return patientVisits.filter(({ value }) => value === diagnosis.visit)\n+ }\n+ return []\n+ }\n+\nconst statusOptions: Option[] = Object.values(DiagnosisStatus).map((v) => ({\nlabel: v,\nvalue: v,\n@@ -116,6 +132,22 @@ const DiagnosisForm = (props: Props) => {\n</Column>\n</Row>\n+ <Row>\n+ <Column md={12}>\n+ <SelectWithLabelFormGroup\n+ name=\"visit\"\n+ label={t('patient.diagnoses.visit')}\n+ isRequired={false}\n+ options={patientVisits || []}\n+ defaultSelected={defaultSelectedVisitOption()}\n+ onChange={(values) => {\n+ onFieldChange('visit', values[0])\n+ }}\n+ isEditable={patient?.visits !== undefined}\n+ />\n+ </Column>\n+ </Row>\n+\n<Row>\n<Column md={12}>\n<SelectWithLabelFormGroup\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/patient/index.ts", "new_path": "src/shared/locales/enUs/translations/patient/index.ts", "diff": "@@ -78,6 +78,7 @@ export default {\ndiagnosisDate: 'Diagnosis Date',\nonsetDate: 'Onset Date',\nabatementDate: 'Abatement Date',\n+ visit: 'Visit',\nstatus: 'Status',\nactive: 'Active',\nrecurrence: 'Recurrence',\n" }, { "change_type": "MODIFY", "old_path": "src/shared/model/Diagnosis.ts", "new_path": "src/shared/model/Diagnosis.ts", "diff": "@@ -15,4 +15,5 @@ export default interface Diagnosis {\nabatementDate: string\nstatus: DiagnosisStatus\nnote: string\n+ visit: string\n}\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/view/ImportantPatientInfo.test.tsx", "diff": "+import * as components from '@hospitalrun/components'\n+// import { act } from '@testing-library/react'\n+import format from 'date-fns/format'\n+import { mount } from 'enzyme'\n+import { createMemoryHistory } from 'history'\n+import React from 'react'\n+// import { startOfDay, subYears } from 'date-fns'\n+import { act } from 'react-dom/test-utils'\n+import { Provider } from 'react-redux'\n+import { Router } from 'react-router-dom'\n+import createMockStore from 'redux-mock-store'\n+import thunk from 'redux-thunk'\n+\n+// import Diagnoses from '../../../patients/diagnoses/Diagnoses'\n+import NewAllergyModal from '../../../patients/allergies/NewAllergyModal'\n+import AddDiagnosisModal from '../../../patients/diagnoses/AddDiagnosisModal'\n+import ImportantPatientInfo from '../../../patients/view/ImportantPatientInfo'\n+import AddVisitModal from '../../../patients/visits/AddVisitModal'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import CarePlan from '../../../shared/model/CarePlan'\n+import Diagnosis from '../../../shared/model/Diagnosis'\n+// import Allergies from '../../../patients/allergies/Allergies'\n+// import AllergiesList from '../../../patients/allergies/AllergiesList'\n+// import PatientRepository from '../../../shared/db/PatientRepository'\n+import Patient from '../../../shared/model/Patient'\n+import Permissions from '../../../shared/model/Permissions'\n+import { RootState } from '../../../shared/store'\n+// import * as getPatientName from '../../../patients/util/patient-name-util'\n+// import AddCarePlanModal from '../../../patients/care-plans/AddCarePlanModal'\n+\n+const mockStore = createMockStore<RootState, any>([thunk])\n+\n+describe('Important Patient Info Panel', () => {\n+ let history: any\n+ let user: any\n+ let store: any\n+\n+ const expectedPatient = {\n+ id: '123',\n+ sex: 'male',\n+ fullName: 'full Name',\n+ code: 'P-123',\n+ dateOfBirth: format(new Date(), 'MM/dd/yyyy'),\n+ diagnoses: [\n+ { id: '123', name: 'diagnosis1', diagnosisDate: new Date().toISOString() } as Diagnosis,\n+ ],\n+ allergies: [\n+ { id: '1', name: 'allergy1' },\n+ { id: '2', name: 'allergy2' },\n+ ],\n+ carePlans: [\n+ {\n+ id: '123',\n+ title: 'title1',\n+ description: 'test',\n+ diagnosisId: '12345',\n+ status: 'status' as string,\n+ intent: 'intent' as string,\n+ startDate: new Date().toISOString(),\n+ endDate: new Date().toISOString(),\n+ createdOn: new Date().toISOString(),\n+ note: 'note',\n+ } as CarePlan,\n+ ],\n+ } as Patient\n+\n+ const setup = async (patient = expectedPatient, permissions: Permissions[]) => {\n+ jest.resetAllMocks()\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+ history = createMemoryHistory()\n+ user = { permissions }\n+ store = mockStore({ patient, user } as any)\n+\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await mount(\n+ <Provider store={store}>\n+ <Router history={history}>\n+ <ImportantPatientInfo patient={patient} />\n+ </Router>\n+ </Provider>,\n+ )\n+ })\n+ wrapper.update()\n+ return wrapper\n+ }\n+\n+ describe(\"patient's full name, patient's code, sex, and date of birth\", () => {\n+ it(\"should render patient's full name\", async () => {\n+ const wrapper = await setup(expectedPatient, [])\n+ const code = wrapper.find('.col-2')\n+ expect(code.at(0).text()).toEqual(expectedPatient.fullName)\n+ })\n+\n+ it(\"should render patient's code\", async () => {\n+ const wrapper = await setup(expectedPatient, [])\n+ const code = wrapper.find('.col-2')\n+ expect(code.at(1).text()).toEqual(`patient.code${expectedPatient.code}`)\n+ })\n+\n+ it(\"should render patient's sex\", async () => {\n+ const wrapper = await setup(expectedPatient, [])\n+ const sex = wrapper.find('.patient-sex')\n+ expect(sex.text()).toEqual(`patient.sex${expectedPatient.sex}`)\n+ })\n+\n+ it(\"should render patient's dateOfDate\", async () => {\n+ const wrapper = await setup(expectedPatient, [])\n+ const sex = wrapper.find('.patient-dateOfBirth')\n+ expect(sex.text()).toEqual(`patient.dateOfBirth${expectedPatient.dateOfBirth}`)\n+ })\n+ })\n+\n+ describe('add new visit button', () => {\n+ it('should render an add visit button if user has correct permissions', async () => {\n+ const wrapper = await setup(expectedPatient, [Permissions.AddVisit])\n+\n+ const addNewButton = wrapper.find(components.Button)\n+ expect(addNewButton).toHaveLength(1)\n+ expect(addNewButton.text().trim()).toEqual('patient.visits.new')\n+ })\n+\n+ it('should open the add visit modal on click', async () => {\n+ const wrapper = await setup(expectedPatient, [Permissions.AddVisit])\n+\n+ act(() => {\n+ const addNewButton = wrapper.find(components.Button)\n+ const onClick = addNewButton.prop('onClick') as any\n+ onClick()\n+ })\n+ wrapper.update()\n+\n+ const modal = wrapper.find(AddVisitModal)\n+ expect(modal.prop('show')).toBeTruthy()\n+ })\n+\n+ it('should close the modal when the close button is clicked', async () => {\n+ const wrapper = await setup(expectedPatient, [Permissions.AddVisit])\n+\n+ act(() => {\n+ const addNewButton = wrapper.find(components.Button)\n+ const onClick = addNewButton.prop('onClick') as any\n+ onClick()\n+ })\n+ wrapper.update()\n+\n+ act(() => {\n+ const modal = wrapper.find(AddVisitModal)\n+ const onClose = modal.prop('onCloseButtonClick') as any\n+ onClose()\n+ })\n+ wrapper.update()\n+\n+ expect(wrapper.find(AddVisitModal).prop('show')).toBeFalsy()\n+ })\n+\n+ it('should not render new visit button if user does not have permissions', async () => {\n+ const wrapper = await setup(expectedPatient, [])\n+\n+ expect(wrapper.find(components.Button)).toHaveLength(0)\n+ })\n+ })\n+\n+ describe('add new allergy button', () => {\n+ it('should render an add allergy button if user has correct permissions', async () => {\n+ const wrapper = await setup(expectedPatient, [Permissions.AddAllergy])\n+\n+ const addNewButton = wrapper.find(components.Button)\n+ expect(addNewButton).toHaveLength(1)\n+ expect(addNewButton.text().trim()).toEqual('patient.allergies.new')\n+ })\n+\n+ it('should open the add allergy modal on click', async () => {\n+ const wrapper = await setup(expectedPatient, [Permissions.AddAllergy])\n+\n+ act(() => {\n+ const addNewButton = wrapper.find(components.Button)\n+ const onClick = addNewButton.prop('onClick') as any\n+ onClick()\n+ })\n+ wrapper.update()\n+\n+ const modal = wrapper.find(NewAllergyModal)\n+ expect(modal.prop('show')).toBeTruthy()\n+ })\n+\n+ it('should close the modal when the close button is clicked', async () => {\n+ const wrapper = await setup(expectedPatient, [Permissions.AddAllergy])\n+\n+ act(() => {\n+ const addNewButton = wrapper.find(components.Button)\n+ const onClick = addNewButton.prop('onClick') as any\n+ onClick()\n+ })\n+ wrapper.update()\n+\n+ act(() => {\n+ const modal = wrapper.find(NewAllergyModal)\n+ const onClose = modal.prop('onCloseButtonClick') as any\n+ onClose()\n+ })\n+ wrapper.update()\n+\n+ expect(wrapper.find(NewAllergyModal).prop('show')).toBeFalsy()\n+ })\n+\n+ it('should not render new allergy button if user does not have permissions', async () => {\n+ const wrapper = await setup(expectedPatient, [])\n+\n+ expect(wrapper.find(components.Button)).toHaveLength(0)\n+ })\n+ })\n+\n+ describe('add diagnoses button', () => {\n+ it('should render an add diagnosis button if user has correct permissions', async () => {\n+ const wrapper = await setup(expectedPatient, [Permissions.AddDiagnosis])\n+\n+ const addNewButton = wrapper.find(components.Button)\n+ expect(addNewButton).toHaveLength(1)\n+ expect(addNewButton.text().trim()).toEqual('patient.diagnoses.new')\n+ })\n+\n+ it('should open the add diagnosis modal on click', async () => {\n+ const wrapper = await setup(expectedPatient, [Permissions.AddDiagnosis])\n+\n+ act(() => {\n+ const addNewButton = wrapper.find(components.Button)\n+ const onClick = addNewButton.prop('onClick') as any\n+ onClick()\n+ })\n+ wrapper.update()\n+\n+ const modal = wrapper.find(AddDiagnosisModal)\n+ expect(modal.prop('show')).toBeTruthy()\n+ })\n+\n+ it('should close the modal when the close button is clicked', async () => {\n+ const wrapper = await setup(expectedPatient, [Permissions.AddDiagnosis])\n+\n+ act(() => {\n+ const addNewButton = wrapper.find(components.Button)\n+ const onClick = addNewButton.prop('onClick') as any\n+ onClick()\n+ })\n+ wrapper.update()\n+\n+ act(() => {\n+ const modal = wrapper.find(AddDiagnosisModal)\n+ const onClose = modal.prop('onCloseButtonClick') as any\n+ onClose()\n+ })\n+ wrapper.update()\n+\n+ expect(wrapper.find(AddDiagnosisModal).prop('show')).toBeFalsy()\n+ })\n+\n+ it('should not render new diagnosis button if user does not have permissions', async () => {\n+ const wrapper = await setup(expectedPatient, [])\n+\n+ expect(wrapper.find(components.Button)).toHaveLength(0)\n+ })\n+ })\n+\n+ // describe('add new care plan button', () => {\n+ // it('should render an add diagnosis button if user has correct permissions', async () => {\n+ // const wrapper = await setup(expectedPatient, [Permissions.AddCarePlan])\n+\n+ // const addNewButton = wrapper.find(components.Button)\n+ // expect(addNewButton).toHaveLength(1)\n+ // expect(addNewButton.text().trim()).toEqual('patient.carePlan.new')\n+ // })\n+\n+ // it('should open the add care plan modal on click', async () => {\n+ // const wrapper = await setup(expectedPatient, [Permissions.AddCarePlan])\n+\n+ // act(() => {\n+ // const addNewButton = wrapper.find(components.Button)\n+ // const onClick = addNewButton.prop('onClick') as any\n+ // onClick()\n+ // })\n+ // wrapper.update()\n+\n+ // const modal = wrapper.find(AddCarePlanModal)\n+ // expect(modal.prop('show')).toBeTruthy()\n+ // })\n+\n+ // it('should close the modal when the close button is clicked', async () => {\n+ // const wrapper = await setup(expectedPatient, [Permissions.AddCarePlan])\n+\n+ // act(() => {\n+ // const addNewButton = wrapper.find(components.Button)\n+ // const onClick = addNewButton.prop('onClick') as any\n+ // onClick()\n+ // })\n+ // wrapper.update()\n+\n+ // act(() => {\n+ // const modal = wrapper.find(AddCarePlanModal)\n+ // const onClose = modal.prop('onCloseButtonClick') as any\n+ // onClose()\n+ // })\n+ // wrapper.update()\n+\n+ // expect(wrapper.find(AddCarePlanModal).prop('show')).toBeFalsy()\n+ // })\n+\n+ // it('should not render new care plan button if user does not have permissions', async () => {\n+ // const wrapper = await setup(expectedPatient, [])\n+\n+ // expect(wrapper.find(components.Button)).toHaveLength(0)\n+ // })\n+ // })\n+})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "new_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "diff": "@@ -96,9 +96,7 @@ describe('ViewPatient', () => {\nawait setup()\n- expect(titleUtil.default).toHaveBeenCalledWith(\n- `${patient.givenName} ${patient.familyName} ${patient.suffix} (${patient.code})`,\n- )\n+ expect(titleUtil.default).toHaveBeenCalledWith(`patient.label`)\n})\nit('should add a \"Edit Patient\" button to the button tool bar if has WritePatients permissions', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/patients/care-plans/CarePlanTable.tsx", "new_path": "src/patients/care-plans/CarePlanTable.tsx", "diff": "@@ -52,7 +52,7 @@ const CarePlanTable = (props: Props) => {\nactionsHeaderText={t('actions.label')}\nactions={[\n{\n- label: 'actions.view',\n+ label: t('actions.view'),\naction: (row) => history.push(`/patients/${patientId}/care-plans/${row.id}`),\n},\n]}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/view/ImportantPatientInfo.tsx", "diff": "+import { Panel, Container, Row, Table, Button, Typography } from '@hospitalrun/components'\n+import format from 'date-fns/format'\n+import React, { CSSProperties, useState } from 'react'\n+import { useSelector } from 'react-redux'\n+import { Link, useHistory } from 'react-router-dom'\n+\n+import useTranslator from '../../shared/hooks/useTranslator'\n+import Allergy from '../../shared/model/Allergy'\n+import Diagnosis from '../../shared/model/Diagnosis'\n+import Patient from '../../shared/model/Patient'\n+import Permissions from '../../shared/model/Permissions'\n+import { RootState } from '../../shared/store'\n+import NewAllergyModal from '../allergies/NewAllergyModal'\n+import AddCarePlanModal from '../care-plans/AddCarePlanModal'\n+import AddDiagnosisModal from '../diagnoses/AddDiagnosisModal'\n+import AddVisitModal from '../visits/AddVisitModal'\n+// import {getPatientFullName} from '../util/patient-name-util'\n+\n+interface Props {\n+ patient: Patient\n+}\n+\n+const getPatientCode = (p: Patient): string => {\n+ if (p) {\n+ return p.code\n+ }\n+\n+ return ''\n+}\n+\n+const ImportantPatientInfo = (props: Props) => {\n+ const { patient } = props\n+ const { t } = useTranslator()\n+ const history = useHistory()\n+ const { permissions } = useSelector((state: RootState) => state.user)\n+ const [showNewAllergyModal, setShowNewAllergyModal] = useState(false)\n+ const [showDiagnosisModal, setShowDiagnosisModal] = useState(false)\n+ const [showAddCarePlanModal, setShowAddCarePlanModal] = useState(false)\n+ const [showAddVisitModal, setShowAddVisitModal] = useState(false)\n+\n+ const patientCodeStyle: CSSProperties = {\n+ position: 'relative',\n+ color: 'black',\n+ backgroundColor: 'rgba(245,245,245,1)',\n+ fontSize: 'small',\n+ textAlign: 'center',\n+ }\n+\n+ const allergiesSectionStyle: CSSProperties = {\n+ position: 'relative',\n+ color: 'black',\n+ backgroundColor: 'rgba(245,245,245,1)',\n+ fontSize: 'small',\n+ }\n+\n+ const tableStyle: CSSProperties = {\n+ position: 'relative',\n+ marginLeft: '2px',\n+ marginRight: '2px',\n+ fontSize: 'small',\n+ }\n+\n+ const addAllergyButtonStyle: CSSProperties = {\n+ fontSize: 'small',\n+ position: 'absolute',\n+ top: '0px',\n+ right: '0px',\n+ }\n+\n+ return (\n+ <div>\n+ <Panel collapsible title=\"Brief Patient Information\">\n+ <Container>\n+ <Row>\n+ <div className=\"col-2\">\n+ <h3>{patient.fullName}</h3>\n+ </div>\n+ <div className=\"col-2\">\n+ <div style={patientCodeStyle}>\n+ <strong>{t('patient.code')}</strong>\n+ <h6>{getPatientCode(patient)}</h6>\n+ </div>\n+ </div>\n+ <div className=\"col d-flex justify-content-end\">\n+ {permissions.includes(Permissions.AddVisit) && (\n+ <Button\n+ outlined\n+ color=\"success\"\n+ icon=\"add\"\n+ iconLocation=\"left\"\n+ onClick={() => setShowAddVisitModal(true)}\n+ >\n+ {t('patient.visits.new')}\n+ </Button>\n+ )}\n+ </div>\n+ </Row>\n+ <Row>\n+ <div className=\"col\">\n+ <div className=\"patient-sex\">\n+ <strong>{t('patient.sex')}</strong>\n+ <h6>{patient.sex}</h6>\n+ </div>\n+ <div className=\"patient-dateOfBirth\">\n+ <strong>{t('patient.dateOfBirth')}</strong>\n+ <h6>\n+ {patient.dateOfBirth\n+ ? format(new Date(patient.dateOfBirth), 'MM/dd/yyyy')\n+ : t('patient.unknownDateOfBirth')}\n+ </h6>\n+ </div>\n+ {/* <Row>\n+ <strong>Sex</strong>\n+ </Row>\n+ <Row>{patient.sex}</Row>\n+ <Row>\n+ <strong>DateOfBirth</strong>\n+ </Row>\n+ <Row>\n+ {patient.dateOfBirth\n+ ? format(new Date(patient.dateOfBirth), 'MM/dd/yyyy')\n+ : 'Unknown'}\n+ </Row> */}\n+ <br />\n+\n+ <div style={allergiesSectionStyle}>\n+ <Typography variant=\"h5\">{t('patient.allergies.label')}</Typography>\n+ {patient.allergies ? (\n+ patient.allergies?.map((a: Allergy) => (\n+ <li key={a.id.toString()}>\n+ <Link to={`/patients/${patient.id}/allergies`}>{a.name}</Link>\n+ </li>\n+ ))\n+ ) : (\n+ <></>\n+ )}\n+ {permissions.includes(Permissions.AddAllergy) && (\n+ <Button\n+ style={addAllergyButtonStyle}\n+ color=\"primary\"\n+ icon=\"add\"\n+ outlined\n+ iconLocation=\"left\"\n+ onClick={() => setShowNewAllergyModal(true)}\n+ >\n+ {t('patient.allergies.new')}\n+ </Button>\n+ )}\n+ </div>\n+ </div>\n+\n+ <div className=\"col diagnoses-section\">\n+ <Typography variant=\"h5\">{t('patient.diagnoses.label')}</Typography>\n+ <div className=\"border border-primary\" style={tableStyle}>\n+ <Table\n+ getID={(row) => row.id}\n+ columns={[\n+ { label: t('patient.diagnoses.diagnosisName'), key: 'name' },\n+ {\n+ label: t('patient.diagnoses.diagnosisDate'),\n+ key: 'diagnosisDate',\n+ formatter: (row) =>\n+ row.diagnosisDate\n+ ? format(new Date(row.diagnosisDate), 'yyyy-MM-dd hh:mm a')\n+ : '',\n+ },\n+ ]}\n+ data={patient.diagnoses ? (patient.diagnoses as Diagnosis[]) : []}\n+ />\n+ </div>\n+ {permissions.includes(Permissions.AddDiagnosis) && (\n+ <Button\n+ color=\"light\"\n+ icon=\"add\"\n+ iconLocation=\"left\"\n+ onClick={() => setShowDiagnosisModal(true)}\n+ >\n+ {t('patient.diagnoses.new')}\n+ </Button>\n+ )}\n+ </div>\n+ <div className=\"col carePlan-section\">\n+ <Typography variant=\"h5\">{t('patient.carePlan.label')}</Typography>\n+ <div className=\"border border-primary\" style={tableStyle}>\n+ {/* <CarePlanTable /> */}\n+ <Table\n+ onRowClick={(row) => history.push(`/patients/${patient.id}/care-plans/${row.id}`)}\n+ getID={(row) => row.id}\n+ data={patient.carePlans || []}\n+ columns={[\n+ { label: t('patient.carePlan.title'), key: 'title' },\n+ {\n+ label: t('patient.carePlan.startDate'),\n+ key: 'startDate',\n+ formatter: (row) => format(new Date(row.startDate), 'yyyy-MM-dd'),\n+ },\n+ {\n+ label: t('patient.carePlan.endDate'),\n+ key: 'endDate',\n+ formatter: (row) => format(new Date(row.endDate), 'yyyy-MM-dd'),\n+ },\n+ { label: t('patient.carePlan.status'), key: 'status' },\n+ ]}\n+ />\n+ </div>\n+ {permissions.includes(Permissions.AddCarePlan) && (\n+ <Button\n+ color=\"light\"\n+ icon=\"add\"\n+ iconLocation=\"left\"\n+ onClick={() => setShowAddCarePlanModal(true)}\n+ >\n+ {t('patient.carePlan.new')}\n+ </Button>\n+ )}\n+ </div>\n+ </Row>\n+ </Container>\n+ </Panel>\n+\n+ <NewAllergyModal\n+ show={showNewAllergyModal}\n+ onCloseButtonClick={() => setShowNewAllergyModal(false)}\n+ patientId={patient.id}\n+ />\n+\n+ <AddDiagnosisModal\n+ show={showDiagnosisModal}\n+ onCloseButtonClick={() => setShowDiagnosisModal(false)}\n+ />\n+\n+ <AddCarePlanModal\n+ show={showAddCarePlanModal}\n+ onCloseButtonClick={() => setShowAddCarePlanModal(false)}\n+ patient={patient}\n+ />\n+\n+ <AddVisitModal\n+ show={showAddVisitModal}\n+ onCloseButtonClick={() => setShowAddVisitModal(false)}\n+ />\n+ <br />\n+ </div>\n+ )\n+}\n+\n+export default ImportantPatientInfo\n" }, { "change_type": "MODIFY", "old_path": "src/patients/view/ViewPatient.tsx", "new_path": "src/patients/view/ViewPatient.tsx", "diff": "@@ -14,7 +14,6 @@ import useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport { useButtonToolbarSetter } from '../../page-header/button-toolbar/ButtonBarProvider'\nimport useTitle from '../../page-header/title/useTitle'\nimport useTranslator from '../../shared/hooks/useTranslator'\n-import Patient from '../../shared/model/Patient'\nimport Permissions from '../../shared/model/Permissions'\nimport { RootState } from '../../shared/store'\nimport Allergies from '../allergies/Allergies'\n@@ -28,14 +27,7 @@ import { fetchPatient } from '../patient-slice'\nimport RelatedPerson from '../related-persons/RelatedPersonTab'\nimport { getPatientFullName } from '../util/patient-name-util'\nimport VisitTab from '../visits/VisitTab'\n-\n-const getPatientCode = (p: Patient): string => {\n- if (p) {\n- return p.code\n- }\n-\n- return ''\n-}\n+import ImportantPatientInfo from './ImportantPatientInfo'\nconst ViewPatient = () => {\nconst { t } = useTranslator()\n@@ -47,7 +39,7 @@ const ViewPatient = () => {\nconst { patient, status } = useSelector((state: RootState) => state.patient)\nconst { permissions } = useSelector((state: RootState) => state.user)\n- useTitle(`${getPatientFullName(patient)} (${getPatientCode(patient)})`)\n+ useTitle(t('patient.label'))\nconst setButtonToolBar = useButtonToolbarSetter()\n@@ -92,6 +84,9 @@ const ViewPatient = () => {\n}\nreturn (\n+ <div>\n+ {' '}\n+ <ImportantPatientInfo patient={patient} />\n<div>\n<TabsHeader>\n<Tab\n@@ -170,6 +165,7 @@ const ViewPatient = () => {\n</Route>\n</Panel>\n</div>\n+ </div>\n)\n}\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/patient/index.ts", "new_path": "src/shared/locales/enUs/translations/patient/index.ts", "diff": "export default {\npatient: {\n+ label: 'Patient',\ncode: 'Patient Code',\nfirstName: 'First Name',\nlastName: 'Last Name',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/visualize/VisualizeIncidents.tsx", "new_path": "src/incidents/visualize/VisualizeIncidents.tsx", "diff": "import { LineGraph, Spinner } from '@hospitalrun/components'\nimport React, { useEffect, useState } from 'react'\n+import useTitle from '../../page-header/title/useTitle'\n+import useTranslator from '../../shared/hooks/useTranslator'\nimport useIncidents from '../hooks/useIncidents'\nimport IncidentFilter from '../IncidentFilter'\nimport IncidentSearchRequest from '../model/IncidentSearchRequest'\nconst VisualizeIncidents = () => {\n+ const { t } = useTranslator()\n+ useTitle(t('incidents.visualize.view'))\nconst searchFilter = IncidentFilter.reported\nconst searchRequest: IncidentSearchRequest = { status: searchFilter }\nconst { data, isLoading } = useIncidents(searchRequest)\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/incidents/index.ts", "new_path": "src/shared/locales/enUs/translations/incidents/index.ts", "diff": "@@ -34,5 +34,9 @@ export default {\ndescriptionRequired: 'Description is required',\n},\n},\n+ visualize: {\n+ label: 'Visualize',\n+ view: 'Visualize Incidents',\n+ },\n},\n}\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/imagings/hooks/useImagingRequest.test.tsx", "diff": "+import { renderHook, act } from '@testing-library/react-hooks'\n+\n+import useImagingRequest from '../../../imagings/hooks/useImagingRequest'\n+import ImagingRepository from '../../../shared/db/ImagingRepository'\n+import Imaging from '../../../shared/model/Imaging'\n+import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+\n+describe('useImagingRequest', () => {\n+ it('should get an imaging request by id', async () => {\n+ const expectedImagingId = 'some id'\n+ const expectedImagingRequest = {\n+ id: expectedImagingId,\n+ patient: 'some patient',\n+ visitId: 'visit id',\n+ status: 'requested',\n+ type: 'some type',\n+ } as Imaging\n+ jest.spyOn(ImagingRepository, 'find').mockResolvedValue(expectedImagingRequest)\n+\n+ let actualData: any\n+ await act(async () => {\n+ const renderHookResult = renderHook(() => useImagingRequest(expectedImagingId))\n+ const { result } = renderHookResult\n+ await waitUntilQueryIsSuccessful(renderHookResult)\n+ actualData = result.current.data\n+ })\n+\n+ expect(ImagingRepository.find).toHaveBeenCalledTimes(1)\n+ expect(ImagingRepository.find).toBeCalledWith(expectedImagingId)\n+ expect(actualData).toEqual(expectedImagingRequest)\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/imagings/hooks/useImagingRequest.tsx", "diff": "+import { QueryKey, useQuery } from 'react-query'\n+\n+import ImagingRepository from '../../shared/db/ImagingRepository'\n+import Imaging from '../../shared/model/Imaging'\n+\n+function getImagingRequestById(_: QueryKey<string>, imagingRequestId: string): Promise<Imaging> {\n+ return ImagingRepository.find(imagingRequestId)\n+}\n+\n+export default function useImagingRequest(imagingRequestId: string) {\n+ return useQuery(['imaging', imagingRequestId], getImagingRequestById)\n+}\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/imagings/hooks/useImagingSearch.test.tsx", "diff": "+import { act, renderHook } from '@testing-library/react-hooks'\n+\n+import useImagingSearch from '../../../imagings/hooks/useImagingSearch'\n+import ImagingRepository from '../../../shared/db/ImagingRepository'\n+import SortRequest from '../../../shared/db/SortRequest'\n+import Imaging from '../../../shared/model/Imaging'\n+import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import ImagingSearchRequest from '../../../imagings/model/ImagingSearchRequest'\n+\n+const defaultSortRequest: SortRequest = {\n+ sorts: [\n+ {\n+ field: 'requestedOn',\n+ direction: 'desc',\n+ },\n+ ],\n+}\n+\n+describe('useImagingSearch', () => {\n+ it('it should search imaging requests', async () => {\n+ const expectedSearchRequest: ImagingSearchRequest = {\n+ status: 'completed',\n+ text: 'some search request',\n+ }\n+ const expectedImagingRequests = [{ id: 'some id' }] as Imaging[]\n+ jest.spyOn(ImagingRepository, 'search').mockResolvedValue(expectedImagingRequests)\n+\n+ let actualData: any\n+ await act(async () => {\n+ const renderHookResult = renderHook(() => useImagingSearch(expectedSearchRequest))\n+ const { result } = renderHookResult\n+ await waitUntilQueryIsSuccessful(renderHookResult)\n+ actualData = result.current.data\n+ })\n+\n+ expect(ImagingRepository.search).toHaveBeenCalledTimes(1)\n+ expect(ImagingRepository.search).toBeCalledWith({\n+ ...expectedSearchRequest,\n+ defaultSortRequest,\n+ })\n+ expect(actualData).toEqual(expectedImagingRequests)\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/imagings/hooks/useImagingSearch.tsx", "diff": "+import { QueryKey, useQuery } from 'react-query'\n+\n+import ImagingSearchRequest from '../model/ImagingSearchRequest'\n+import ImagingRepository from '../../shared/db/ImagingRepository'\n+import SortRequest from '../../shared/db/SortRequest'\n+import Imaging from '../../shared/model/Imaging'\n+\n+const defaultSortRequest: SortRequest = {\n+ sorts: [\n+ {\n+ field: 'requestedOn',\n+ direction: 'desc',\n+ },\n+ ],\n+}\n+\n+function searchImagingRequests(\n+ _: QueryKey<string>,\n+ searchRequest: ImagingSearchRequest,\n+): Promise<Imaging[]> {\n+ return ImagingRepository.search({ ...searchRequest, defaultSortRequest })\n+}\n+\n+export default function useImagingSearch(searchRequest: ImagingSearchRequest) {\n+ return useQuery(['imagings', searchRequest], searchImagingRequests)\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/imagings/model/ImagingSearchRequest.ts", "diff": "+export default interface ImagingSearchRequest {\n+ status: 'completed' | 'requested' | 'canceled'\n+ text: string\n+}\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/imagings/hooks/useRequestImaging.test.tsx", "diff": "+/* eslint-disable no-console */\n+\n+import useRequestImaging from '../../../imagings/hooks/useRequestImaging'\n+import { ImagingRequestError } from '../../../imagings/util/validate-imaging-request'\n+import * as imagingRequestValidator from '../../../imagings/util/validate-imaging-request'\n+import ImagingRepository from '../../../shared/db/ImagingRepository'\n+import Imaging from '../../../shared/model/Imaging'\n+import executeMutation from '../../test-utils/use-mutation.util'\n+\n+describe('useReportIncident', () => {\n+ beforeEach(() => {\n+ jest.restoreAllMocks()\n+ console.error = jest.fn()\n+ })\n+\n+ it('should save the imaging request with correct data', async () => {\n+ const expectedDate = new Date(Date.now())\n+ Date.now = jest.fn().mockReturnValue(expectedDate)\n+ const givenImagingRequest = {\n+ patient: 'some patient',\n+ fullName: 'some full name',\n+ status: 'requested',\n+ type: 'some type',\n+ notes: 'some notes',\n+ visitId: 'some visit id',\n+ } as Imaging\n+\n+ const expectedImagingRequest = {\n+ ...givenImagingRequest,\n+ requestedOn: expectedDate.toISOString(),\n+ requestedBy: 'test',\n+ } as Imaging\n+ jest.spyOn(ImagingRepository, 'save').mockResolvedValue(expectedImagingRequest)\n+\n+ await executeMutation(() => useRequestImaging(), givenImagingRequest)\n+ expect(ImagingRepository.save).toHaveBeenCalledTimes(1)\n+ expect(ImagingRepository.save).toBeCalledWith(expectedImagingRequest)\n+ })\n+\n+ it('should throw an error if validation fails', async () => {\n+ const expectedImagingRequestError = {\n+ patient: 'some patient error',\n+ } as ImagingRequestError\n+\n+ jest.spyOn(imagingRequestValidator, 'default').mockReturnValue(expectedImagingRequestError)\n+ jest.spyOn(ImagingRepository, 'save').mockResolvedValue({} as Imaging)\n+\n+ try {\n+ await executeMutation(() => useRequestImaging(), {})\n+ } catch (e) {\n+ expect(e).toEqual(expectedImagingRequestError)\n+ expect(ImagingRepository.save).not.toHaveBeenCalled()\n+ }\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/imagings/util/validate-imaging-request.test.ts", "diff": "+import validateImagingRequest from '../../../imagings/util/validate-imaging-request'\n+import Imaging from '../../../shared/model/Imaging'\n+\n+describe('imaging request validator', () => {\n+ it('should validate the required fields apart of an incident', async () => {\n+ const newImagingRequest = {} as Imaging\n+ const expectedError = {\n+ patient: 'imagings.requests.error.patientRequired',\n+ status: 'imagings.requests.error.statusRequired',\n+ type: 'imagings.requests.error.typeRequired',\n+ }\n+\n+ const actualError = validateImagingRequest(newImagingRequest)\n+\n+ expect(actualError).toEqual(expectedError)\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/imagings/hooks/useRequestImaging.tsx", "diff": "+import { isEmpty } from 'lodash'\n+import { queryCache, useMutation } from 'react-query'\n+\n+import ImagingRepository from '../../shared/db/ImagingRepository'\n+import AbstractDBModel from '../../shared/model/AbstractDBModel'\n+import Imaging from '../../shared/model/Imaging'\n+import validateImagingRequest from '../util/validate-imaging-request'\n+\n+type ImagingRequest = Omit<Imaging, 'id' & keyof AbstractDBModel>\n+\n+async function requestImaging(request: ImagingRequest): Promise<void> {\n+ const error = validateImagingRequest(request)\n+\n+ if (!isEmpty(error)) {\n+ throw error\n+ }\n+\n+ await ImagingRepository.save({\n+ ...request,\n+ requestedBy: 'test',\n+ requestedOn: new Date(Date.now()).toISOString(),\n+ } as Imaging)\n+}\n+\n+export default function useRequestImaging() {\n+ return useMutation(requestImaging, {\n+ onSuccess: async () => {\n+ await queryCache.invalidateQueries('imagings')\n+ },\n+ throwOnError: true,\n+ })\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/imagings/util/validate-imaging-request.ts", "diff": "+import Imaging from '../../shared/model/Imaging'\n+\n+const statusType: string[] = ['requested', 'completed', 'canceled']\n+\n+export class ImagingRequestError extends Error {\n+ patient?: string\n+\n+ type?: string\n+\n+ status?: string\n+\n+ constructor(message: string, patient?: string, type?: string, status?: string) {\n+ super(message)\n+ this.patient = patient\n+ this.type = type\n+ this.status = status\n+ Object.setPrototypeOf(this, ImagingRequestError.prototype)\n+ }\n+}\n+\n+export default function validateImagingRequest(request: Partial<Imaging>) {\n+ const imagingRequestError = {} as any\n+ if (!request.patient) {\n+ imagingRequestError.patient = 'imagings.requests.error.patientRequired'\n+ }\n+\n+ if (!request.type) {\n+ imagingRequestError.type = 'imagings.requests.error.typeRequired'\n+ }\n+\n+ if (!request.status) {\n+ imagingRequestError.status = 'imagings.requests.error.statusRequired'\n+ } else if (!statusType.includes(request.status)) {\n+ imagingRequestError.status = 'imagings.requests.error.incorrectStatus'\n+ }\n+\n+ return imagingRequestError\n+}\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/hooks/useAddPatientNote.test.ts", "diff": "+/* eslint-disable no-console */\n+\n+import useAddPatientNote from '../../../patients/hooks/useAddPatientNote'\n+import * as validateNote from '../../../patients/util/validate-note'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Note from '../../../shared/model/Note'\n+import Patient from '../../../shared/model/Patient'\n+import * as uuid from '../../../shared/util/uuid'\n+import executeMutation from '../../test-utils/use-mutation.util'\n+\n+describe('use add note', () => {\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n+ console.error = jest.fn()\n+ })\n+\n+ it('should throw an error if note validation fails', async () => {\n+ const expectedError = { nameError: 'some error' }\n+ jest.spyOn(validateNote, 'default').mockReturnValue(expectedError)\n+ jest.spyOn(PatientRepository, 'saveOrUpdate')\n+\n+ try {\n+ await executeMutation(() => useAddPatientNote(), { patientId: '123', note: {} })\n+ } catch (e) {\n+ expect(e).toEqual(expectedError)\n+ }\n+\n+ expect(PatientRepository.saveOrUpdate).not.toHaveBeenCalled()\n+ })\n+\n+ it('should add the note to the patient', async () => {\n+ const expectedNote = { id: '456', text: 'eome name', date: '1947-09-09T14:48:00.000Z' }\n+ const givenPatient = { id: 'patientId', notes: [] as Note[] } as Patient\n+ jest.spyOn(uuid, 'uuid').mockReturnValue(expectedNote.id)\n+ const expectedPatient = { ...givenPatient, notes: [expectedNote] }\n+ jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedPatient)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(givenPatient)\n+\n+ const result = await executeMutation(() => useAddPatientNote(), {\n+ patientId: givenPatient.id,\n+ note: expectedNote,\n+ })\n+\n+ expect(PatientRepository.find).toHaveBeenCalledTimes(1)\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(expectedPatient)\n+ expect(result).toEqual([expectedNote])\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/hooks/usePatientNote.test.ts", "diff": "+/* eslint-disable no-console */\n+\n+import usePatientNote from '../../../patients/hooks/usePatientNote'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Patient from '../../../shared/model/Patient'\n+import executeQuery from '../../test-utils/use-query.util'\n+\n+describe('use note', () => {\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n+ console.error = jest.fn()\n+ })\n+\n+ it('should return a note given a patient id and note id', async () => {\n+ const expectedPatientId = '123'\n+ const expectedNote = { id: '456', text: 'eome name', date: '1947-09-09T14:48:00.000Z' }\n+ const expectedPatient = { id: expectedPatientId, notes: [expectedNote] } as Patient\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValueOnce(expectedPatient)\n+\n+ const actualNote = await executeQuery(() => usePatientNote(expectedPatientId, expectedNote.id))\n+\n+ expect(PatientRepository.find).toHaveBeenCalledTimes(1)\n+ expect(PatientRepository.find).toHaveBeenCalledWith(expectedPatientId)\n+ expect(actualNote).toEqual(expectedNote)\n+ })\n+\n+ it('should throw an error if patient does not have note with id', async () => {\n+ const expectedPatientId = '123'\n+ const expectedNote = { id: '456', text: 'eome name', date: '1947-09-09T14:48:00.000Z' }\n+ const expectedPatient = {\n+ id: expectedPatientId,\n+ notes: [{ id: '426', text: 'eome name', date: '1947-09-09T14:48:00.000Z' }],\n+ } as Patient\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValueOnce(expectedPatient)\n+\n+ try {\n+ await executeQuery(() => usePatientNote(expectedPatientId, expectedNote.id))\n+ } catch (e) {\n+ expect(e).toEqual(new Error('Timed out in waitFor after 1000ms.'))\n+ }\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/hooks/usePatientNotes.test.ts", "diff": "+import usePatientNotes from '../../../patients/hooks/usePatientNotes'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Patient from '../../../shared/model/Patient'\n+import executeQuery from '../../test-utils/use-query.util'\n+\n+describe('use patient notes', () => {\n+ it('should get patient notes', async () => {\n+ const expectedPatientId = '123'\n+\n+ const expectedNotes = [{ id: '456', text: 'eome name', date: '1947-09-09T14:48:00.000Z' }]\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValueOnce({\n+ id: expectedPatientId,\n+ notes: expectedNotes,\n+ } as Patient)\n+\n+ const actualNotes = await executeQuery(() => usePatientNotes(expectedPatientId))\n+\n+ expect(PatientRepository.find).toHaveBeenCalledWith(expectedPatientId)\n+ expect(actualNotes).toEqual(expectedNotes)\n+ })\n+})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/notes/NewNoteModal.test.tsx", "new_path": "src/__tests__/patients/notes/NewNoteModal.test.tsx", "diff": "+/* eslint-disable no-console */\n+\nimport { Alert, Modal } from '@hospitalrun/components'\nimport { act } from '@testing-library/react'\nimport { mount } from 'enzyme'\nimport React from 'react'\n-import { Provider } from 'react-redux'\n-import createMockStore from 'redux-mock-store'\n-import thunk from 'redux-thunk'\nimport NewNoteModal from '../../../patients/notes/NewNoteModal'\n-import * as patientSlice from '../../../patients/patient-slice'\nimport TextFieldWithLabelFormGroup from '../../../shared/components/input/TextFieldWithLabelFormGroup'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\n-import { RootState } from '../../../shared/store'\n-\n-const mockStore = createMockStore<RootState, any>([thunk])\ndescribe('New Note Modal', () => {\n+ const mockPatient = {\n+ id: '123',\n+ givenName: 'someName',\n+ } as Patient\n+\n+ const setup = (onCloseSpy = jest.fn()) => {\n+ jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(mockPatient)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(mockPatient)\n+ const wrapper = mount(\n+ <NewNoteModal\n+ show\n+ onCloseButtonClick={onCloseSpy}\n+ toggle={jest.fn()}\n+ patientId={mockPatient.id}\n+ />,\n+ )\n+ return { wrapper }\n+ }\n+\nbeforeEach(() => {\n- jest.spyOn(PatientRepository, 'find')\n- jest.spyOn(PatientRepository, 'saveOrUpdate')\n+ console.error = jest.fn()\n})\nit('should render a modal with the correct labels', () => {\n- const expectedPatient = {\n- id: '1234',\n- givenName: 'some name',\n- }\n- const store = mockStore({\n- patient: {\n- patient: expectedPatient,\n- },\n- } as any)\n- const wrapper = mount(\n- <Provider store={store}>\n- <NewNoteModal show onCloseButtonClick={jest.fn()} toggle={jest.fn()} />\n- </Provider>,\n- )\n+ const { wrapper } = setup()\n+\nconst modal = wrapper.find(Modal)\nexpect(modal).toHaveLength(1)\nexpect(modal.prop('title')).toEqual('patient.notes.new')\n@@ -47,20 +48,7 @@ describe('New Note Modal', () => {\n})\nit('should render a notes rich text editor', () => {\n- const expectedPatient = {\n- id: '1234',\n- givenName: 'some name',\n- }\n- const store = mockStore({\n- patient: {\n- patient: expectedPatient,\n- },\n- } as any)\n- const wrapper = mount(\n- <Provider store={store}>\n- <NewNoteModal show onCloseButtonClick={jest.fn()} toggle={jest.fn()} />\n- </Provider>,\n- )\n+ const { wrapper } = setup()\nconst noteTextField = wrapper.find(TextFieldWithLabelFormGroup)\nexpect(noteTextField.prop('label')).toEqual('patient.note')\n@@ -68,29 +56,22 @@ describe('New Note Modal', () => {\nexpect(noteTextField).toHaveLength(1)\n})\n- it('should render note error', () => {\n- const expectedPatient = {\n- id: '1234',\n- givenName: 'some name',\n- }\n+ it('should render note error', async () => {\nconst expectedError = {\n- message: 'some message',\n- note: 'some note error',\n+ message: 'patient.notes.error.unableToAdd',\n+ note: 'patient.notes.error.noteRequired',\n}\n- const store = mockStore({\n- patient: {\n- patient: expectedPatient,\n- noteError: expectedError,\n- },\n- } as any)\n- const wrapper = mount(\n- <Provider store={store}>\n- <NewNoteModal show onCloseButtonClick={jest.fn()} toggle={jest.fn()} />\n- </Provider>,\n- )\n+ const { wrapper } = setup()\n+ await act(async () => {\n+ const modal = wrapper.find(Modal)\n+ const onSave = (modal.prop('successButton') as any).onClick\n+ await onSave({} as React.MouseEvent<HTMLButtonElement>)\n+ })\n+ wrapper.update()\nconst alert = wrapper.find(Alert)\nconst noteTextField = wrapper.find(TextFieldWithLabelFormGroup)\n+\nexpect(alert.prop('title')).toEqual('states.error')\nexpect(alert.prop('message')).toEqual(expectedError.message)\nexpect(noteTextField.prop('isInvalid')).toBeTruthy()\n@@ -100,20 +81,7 @@ describe('New Note Modal', () => {\ndescribe('on cancel', () => {\nit('should call the onCloseButtonCLick function when the cancel button is clicked', () => {\nconst onCloseButtonClickSpy = jest.fn()\n- const expectedPatient = {\n- id: '1234',\n- givenName: 'some name',\n- }\n- const store = mockStore({\n- patient: {\n- patient: expectedPatient,\n- },\n- } as any)\n- const wrapper = mount(\n- <Provider store={store}>\n- <NewNoteModal show onCloseButtonClick={onCloseButtonClickSpy} toggle={jest.fn()} />\n- </Provider>,\n- )\n+ const { wrapper } = setup(onCloseButtonClickSpy)\nact(() => {\nconst modal = wrapper.find(Modal)\n@@ -126,42 +94,34 @@ describe('New Note Modal', () => {\n})\ndescribe('on save', () => {\n- it('should dispatch add note', () => {\n+ it('should dispatch add note', async () => {\nconst expectedNote = 'some note'\n- jest.spyOn(patientSlice, 'addNote')\n- const expectedPatient = {\n- id: '1234',\n- givenName: 'some name',\n- }\n- const store = mockStore({\n- patient: {\n- patient: expectedPatient,\n- },\n- } as any)\n-\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient as Patient)\n- jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedPatient as Patient)\n-\n- const wrapper = mount(\n- <Provider store={store}>\n- <NewNoteModal show onCloseButtonClick={jest.fn()} toggle={jest.fn()} />\n- </Provider>,\n- )\n-\n- act(() => {\n+ const { wrapper } = setup()\nconst noteTextField = wrapper.find(TextFieldWithLabelFormGroup)\n+\n+ await act(async () => {\nconst onChange = noteTextField.prop('onChange') as any\n- onChange({ currentTarget: { value: expectedNote } })\n+ await onChange({ currentTarget: { value: expectedNote } })\n})\nwrapper.update()\n- act(() => {\n+\n+ await act(async () => {\nconst modal = wrapper.find(Modal)\n- const { onClick } = modal.prop('successButton') as any\n- onClick()\n+ const onSave = (modal.prop('successButton') as any).onClick\n+ await onSave({} as React.MouseEvent<HTMLButtonElement>)\n+ wrapper.update()\n})\n- expect(patientSlice.addNote).toHaveBeenCalledWith(expectedPatient.id, { text: expectedNote })\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\n+ expect.objectContaining({\n+ notes: [expect.objectContaining({ text: expectedNote })],\n+ }),\n+ )\n+\n+ // Does the form reset value back to blank?\n+ expect(noteTextField.prop('value')).toEqual('')\n})\n})\n})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/notes/NotesList.test.tsx", "diff": "+import { Alert, List, ListItem } from '@hospitalrun/components'\n+import { mount, ReactWrapper } from 'enzyme'\n+import { createMemoryHistory } from 'history'\n+import React from 'react'\n+import { act } from 'react-dom/test-utils'\n+import { Router } from 'react-router-dom'\n+\n+import NotesList from '../../../patients/notes/NotesList'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Note from '../../../shared/model/Note'\n+import Patient from '../../../shared/model/Patient'\n+\n+describe('Notes list', () => {\n+ const setup = async (notes: Note[]) => {\n+ const mockPatient = { id: '123', notes } as Patient\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValueOnce(mockPatient)\n+ const history = createMemoryHistory()\n+ history.push(`/patients/${mockPatient.id}/notes`)\n+ let wrapper: any\n+ await act(async () => {\n+ wrapper = await mount(\n+ <Router history={history}>\n+ <NotesList patientId={mockPatient.id} />\n+ </Router>,\n+ )\n+ })\n+\n+ wrapper.update()\n+ return { wrapper: wrapper as ReactWrapper, history }\n+ }\n+\n+ it('should render a list of notes', async () => {\n+ const expectedNotes = [\n+ {\n+ id: '456',\n+ text: 'some name',\n+ date: '1947-09-09T14:48:00.000Z',\n+ },\n+ ]\n+ const { wrapper } = await setup(expectedNotes)\n+ const listItems = wrapper.find(ListItem)\n+\n+ expect(wrapper.exists(List)).toBeTruthy()\n+ expect(listItems).toHaveLength(expectedNotes.length)\n+ expect(listItems.at(0).find('.ref__note-item-date').text().length)\n+ expect(listItems.at(0).find('.ref__note-item-text').text()).toEqual(expectedNotes[0].text)\n+ })\n+\n+ it('should display a warning when no notes are present', async () => {\n+ const expectedNotes: Note[] = []\n+ const { wrapper } = await setup(expectedNotes)\n+\n+ const alert = wrapper.find(Alert)\n+\n+ expect(wrapper.exists(Alert)).toBeTruthy()\n+ expect(wrapper.exists(List)).toBeFalsy()\n+\n+ expect(alert.prop('color')).toEqual('warning')\n+ expect(alert.prop('title')).toEqual('patient.notes.warning.noNotes')\n+ expect(alert.prop('message')).toEqual('patient.notes.addNoteAbove')\n+ })\n+\n+ it('should navigate to the note view when the note is clicked', async () => {\n+ const expectedNotes = [{ id: '456', text: 'some name', date: '1947-09-09T14:48:00.000Z' }]\n+ const { wrapper, history } = await setup(expectedNotes)\n+ const item = wrapper.find(ListItem)\n+ act(() => {\n+ const onClick = item.prop('onClick') as any\n+ onClick({ stopPropagation: jest.fn() })\n+ })\n+\n+ expect(history.location.pathname).toEqual(`/patients/123/notes/${expectedNotes[0].id}`)\n+ })\n+})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/notes/NotesTab.test.tsx", "new_path": "src/__tests__/patients/notes/NotesTab.test.tsx", "diff": "+/* eslint-disable no-console */\n+\nimport * as components from '@hospitalrun/components'\nimport { mount } from 'enzyme'\nimport { createMemoryHistory } from 'history'\n+import assign from 'lodash/assign'\nimport React from 'react'\nimport { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\n@@ -26,16 +29,30 @@ const history = createMemoryHistory()\nlet user: any\nlet store: any\n-const setup = (patient = expectedPatient, permissions = [Permissions.WritePatients]) => {\n+const setup = (props: any = {}) => {\n+ const { permissions, patient, route } = assign(\n+ {},\n+ {\n+ patient: expectedPatient,\n+ permissions: [Permissions.WritePatients],\n+ route: '/patients/123/notes',\n+ },\n+ props,\n+ )\n+\nuser = { permissions }\nstore = mockStore({ patient, user } as any)\n- const wrapper = mount(\n+ history.push(route)\n+ let wrapper: any\n+ act(() => {\n+ wrapper = mount(\n<Router history={history}>\n<Provider store={store}>\n<NoteTab patient={patient} />\n</Provider>\n</Router>,\n)\n+ })\nreturn wrapper\n}\n@@ -45,6 +62,7 @@ describe('Notes Tab', () => {\nbeforeEach(() => {\njest.resetAllMocks()\njest.spyOn(PatientRepository, 'saveOrUpdate')\n+ console.error = jest.fn()\n})\nit('should render a add notes button', () => {\n@@ -56,7 +74,7 @@ describe('Notes Tab', () => {\n})\nit('should not render a add notes button if the user does not have permissions', () => {\n- const wrapper = setup(expectedPatient, [])\n+ const wrapper = setup({ permissions: [] })\nconst addNotesButton = wrapper.find(components.Button)\nexpect(addNotesButton).toHaveLength(0)\n@@ -64,7 +82,6 @@ describe('Notes Tab', () => {\nit('should open the Add Notes Modal', () => {\nconst wrapper = setup()\n-\nact(() => {\nconst onClick = wrapper.find(components.Button).prop('onClick') as any\nonClick()\n@@ -74,27 +91,14 @@ describe('Notes Tab', () => {\nexpect(wrapper.find(components.Modal).prop('show')).toBeTruthy()\n})\n})\n-\n- describe('notes list', () => {\n- it('should list the patients diagnoses', () => {\n- const notes = expectedPatient.notes as Note[]\n- const wrapper = setup()\n-\n- const list = wrapper.find(components.List)\n- const listItems = wrapper.find(components.ListItem)\n-\n- expect(list).toHaveLength(1)\n- expect(listItems).toHaveLength(notes.length)\n+ describe('/patients/:id/notes', () => {\n+ it('should render the view notes screen when /patients/:id/notes is accessed', () => {\n+ const route = '/patients/123/notes'\n+ const permissions = [Permissions.WritePatients]\n+ const wrapper = setup({ route, permissions })\n+ act(() => {\n+ expect(wrapper.exists(NoteTab)).toBeTruthy()\n})\n-\n- it('should render a warning message if the patient does not have any diagnoses', () => {\n- const wrapper = setup({ ...expectedPatient, notes: [] })\n-\n- const alert = wrapper.find(components.Alert)\n-\n- expect(alert).toHaveLength(1)\n- expect(alert.prop('title')).toEqual('patient.notes.warning.noNotes')\n- expect(alert.prop('message')).toEqual('patient.notes.addNoteAbove')\n})\n})\n})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/notes/ViewNote.test.tsx", "diff": "+import { mount, ReactWrapper } from 'enzyme'\n+import { createMemoryHistory } from 'history'\n+import React from 'react'\n+import { act } from 'react-dom/test-utils'\n+import { Route, Router } from 'react-router-dom'\n+\n+import ViewNote from '../../../patients/notes/ViewNote'\n+import TextInputWithLabelFormGroup from '../../../shared/components/input/TextInputWithLabelFormGroup'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Patient from '../../../shared/model/Patient'\n+\n+describe('View Note', () => {\n+ const patient = {\n+ id: 'patientId',\n+ notes: [{ id: '123', text: 'some name', date: '1947-09-09T14:48:00.000Z' }],\n+ } as Patient\n+\n+ const setup = async () => {\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+ const history = createMemoryHistory()\n+ history.push(`/patients/${patient.id}/notes/${patient.notes![0].id}`)\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await mount(\n+ <Router history={history}>\n+ <Route path=\"/patients/:id/notes/:noteId\">\n+ <ViewNote />\n+ </Route>\n+ </Router>,\n+ )\n+ })\n+\n+ wrapper.update()\n+\n+ return { wrapper: wrapper as ReactWrapper }\n+ }\n+\n+ it('should render a note input with the correct data', async () => {\n+ const { wrapper } = await setup()\n+\n+ const noteText = wrapper.find(TextInputWithLabelFormGroup)\n+ expect(noteText).toHaveLength(1)\n+ expect(noteText.prop('value')).toEqual(patient.notes![0].text)\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/hooks/useAddPatientNote.ts", "diff": "+import { isEmpty } from 'lodash'\n+import { queryCache, useMutation } from 'react-query'\n+\n+import PatientRepository from '../../shared/db/PatientRepository'\n+import Note from '../../shared/model/Note'\n+import { uuid } from '../../shared/util/uuid'\n+import validateNote from '../util/validate-note'\n+\n+interface AddNoteRequest {\n+ patientId: string\n+ note: Omit<Note, 'id'>\n+}\n+\n+async function addNote(request: AddNoteRequest): Promise<Note[]> {\n+ const error = validateNote(request.note)\n+\n+ if (isEmpty(error)) {\n+ const patient = await PatientRepository.find(request.patientId)\n+ const notes = patient.notes ? [...patient.notes] : []\n+ const newNote: Note = {\n+ id: uuid(),\n+ ...request.note,\n+ }\n+ notes.push(newNote)\n+\n+ await PatientRepository.saveOrUpdate({\n+ ...patient,\n+ notes,\n+ })\n+\n+ return notes\n+ }\n+\n+ throw error\n+}\n+\n+export default function useAddPatientNote() {\n+ return useMutation(addNote, {\n+ onSuccess: async (data, variables) => {\n+ await queryCache.setQueryData(['notes', variables.patientId], data)\n+ },\n+ throwOnError: true,\n+ })\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/hooks/usePatientNote.ts", "diff": "+import { QueryKey, useQuery } from 'react-query'\n+\n+import PatientRepository from '../../shared/db/PatientRepository'\n+import Note from '../../shared/model/Note'\n+\n+async function getNote(_: QueryKey<string>, patientId: string, noteId: string): Promise<Note> {\n+ const patient = await PatientRepository.find(patientId)\n+ const maybeNote = patient.notes?.find((n) => n.id === noteId)\n+\n+ if (!maybeNote) {\n+ throw new Error('Note not found')\n+ }\n+\n+ return maybeNote\n+}\n+\n+export default function usePatientNote(patientId: string, noteId: string) {\n+ return useQuery(['notes', patientId, noteId], getNote)\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/hooks/usePatientNotes.ts", "diff": "+import { QueryKey, useQuery } from 'react-query'\n+\n+import PatientRepository from '../../shared/db/PatientRepository'\n+import Note from '../../shared/model/Note'\n+\n+async function fetchPatientNotes(_: QueryKey<string>, patientId: string): Promise<Note[]> {\n+ const patient = await PatientRepository.find(patientId)\n+ return patient.notes || []\n+}\n+\n+export default function usePatientNotes(patientId: string) {\n+ return useQuery(['notes', patientId], fetchPatientNotes)\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/patients/notes/NewNoteModal.tsx", "new_path": "src/patients/notes/NewNoteModal.tsx", "diff": "import { Modal, Alert } from '@hospitalrun/components'\nimport React, { useState } from 'react'\n-import { useDispatch, useSelector } from 'react-redux'\nimport TextFieldWithLabelFormGroup from '../../shared/components/input/TextFieldWithLabelFormGroup'\nimport useTranslator from '../../shared/hooks/useTranslator'\n-import Note from '../../shared/model/Note'\n-import { RootState } from '../../shared/store'\n-import { addNote } from '../patient-slice'\n+import useAddPatientNote from '../hooks/useAddPatientNote'\n+import { NoteError } from '../util/validate-note'\ninterface Props {\nshow: boolean\ntoggle: () => void\nonCloseButtonClick: () => void\n+ patientId: string\n}\n+const initialNoteState = { text: '', date: new Date().toISOString() }\nconst NewNoteModal = (props: Props) => {\n- const { show, toggle, onCloseButtonClick } = props\n- const dispatch = useDispatch()\n- const { patient, noteError } = useSelector((state: RootState) => state.patient)\n+ const { show, toggle, onCloseButtonClick, patientId } = props\nconst { t } = useTranslator()\n- const [note, setNote] = useState({\n- text: '',\n- })\n+ const [mutate] = useAddPatientNote()\n+\n+ const [noteError, setNoteError] = useState<NoteError | undefined>(undefined)\n+ const [note, setNote] = useState(initialNoteState)\n- const onFieldChange = (key: string, value: string | any) => {\n+ const onNoteTextChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {\n+ const text = event.currentTarget.value\nsetNote({\n...note,\n- [key]: value,\n+ text,\n})\n}\n- const onNoteTextChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {\n- const text = event.currentTarget.value\n- onFieldChange('text', text)\n+ const onSaveButtonClick = async () => {\n+ try {\n+ await mutate({ patientId, note })\n+ setNote(initialNoteState)\n+ onCloseButtonClick()\n+ } catch (e) {\n+ setNoteError(e)\n}\n-\n- const onSaveButtonClick = () => {\n- dispatch(addNote(patient.id, note as Note))\n}\nconst body = (\n<form>\n- {noteError?.message && (\n- <Alert color=\"danger\" title={t('states.error')} message={t(noteError?.message || '')} />\n+ {noteError && (\n+ <Alert\n+ color=\"danger\"\n+ title={t('states.error')}\n+ message={t('patient.notes.error.unableToAdd')}\n+ />\n)}\n<div className=\"row\">\n<div className=\"col-md-12\">\n@@ -53,8 +58,8 @@ const NewNoteModal = (props: Props) => {\nname=\"noteTextField\"\nlabel={t('patient.note')}\nvalue={note.text}\n- isInvalid={!!noteError?.note}\n- feedback={t(noteError?.note || '')}\n+ isInvalid={!!noteError?.noteError}\n+ feedback={t(noteError?.noteError || '')}\nonChange={onNoteTextChange}\n/>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "src/patients/notes/NoteTab.tsx", "new_path": "src/patients/notes/NoteTab.tsx", "diff": "-import { Button, List, ListItem, Alert } from '@hospitalrun/components'\n+import { Button } from '@hospitalrun/components'\nimport React, { useState } from 'react'\nimport { useSelector } from 'react-redux'\n+import { Route, Switch } from 'react-router-dom'\n+import useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport useTranslator from '../../shared/hooks/useTranslator'\n-import Note from '../../shared/model/Note'\nimport Patient from '../../shared/model/Patient'\nimport Permissions from '../../shared/model/Permissions'\nimport { RootState } from '../../shared/store'\nimport NewNoteModal from './NewNoteModal'\n+import NotesList from './NotesList'\n+import ViewNote from './ViewNote'\ninterface Props {\npatient: Patient\n@@ -19,6 +22,14 @@ const NoteTab = (props: Props) => {\nconst { permissions } = useSelector((state: RootState) => state.user)\nconst [showNewNoteModal, setShowNoteModal] = useState<boolean>(false)\n+ const breadcrumbs = [\n+ {\n+ i18nKey: 'patient.notes.label',\n+ location: `/patients/${patient.id}/notes`,\n+ },\n+ ]\n+ useAddBreadcrumbs(breadcrumbs)\n+\nconst onNewNoteClick = () => {\nsetShowNoteModal(true)\n}\n@@ -45,25 +56,20 @@ const NoteTab = (props: Props) => {\n</div>\n</div>\n<br />\n- {(!patient.notes || patient.notes.length === 0) && (\n- <Alert\n- color=\"warning\"\n- title={t('patient.notes.warning.noNotes')}\n- message={t('patient.notes.addNoteAbove')}\n- />\n- )}\n- <List>\n- {patient.notes?.map((note: Note) => (\n- <ListItem key={note.date}>\n- {new Date(note.date).toLocaleString()}\n- <p>{note.text}</p>\n- </ListItem>\n- ))}\n- </List>\n+ <Switch>\n+ <Route exact path=\"/patients/:id/notes\">\n+ <NotesList patientId={patient.id} />\n+ </Route>\n+ <Route exact path=\"/patients/:id/notes/:noteId\">\n+ <ViewNote />\n+ </Route>\n+ </Switch>\n+\n<NewNoteModal\nshow={showNewNoteModal}\ntoggle={closeNewNoteModal}\nonCloseButtonClick={closeNewNoteModal}\n+ patientId={patient.id}\n/>\n</div>\n)\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/notes/NotesList.tsx", "diff": "+import { Alert, List, ListItem } from '@hospitalrun/components'\n+import React from 'react'\n+import { useHistory } from 'react-router-dom'\n+\n+import Loading from '../../shared/components/Loading'\n+import useTranslator from '../../shared/hooks/useTranslator'\n+import Note from '../../shared/model/Note'\n+import usePatientNotes from '../hooks/usePatientNotes'\n+\n+interface Props {\n+ patientId: string\n+}\n+\n+const NotesList = (props: Props) => {\n+ const { patientId } = props\n+ const history = useHistory()\n+ const { t } = useTranslator()\n+ const { data, status } = usePatientNotes(patientId)\n+\n+ if (data === undefined || status === 'loading') {\n+ return <Loading />\n+ }\n+\n+ if (data.length === 0) {\n+ return (\n+ <Alert\n+ color=\"warning\"\n+ title={t('patient.notes.warning.noNotes')}\n+ message={t('patient.notes.addNoteAbove')}\n+ />\n+ )\n+ }\n+\n+ return (\n+ <List>\n+ {data.map((note: Note) => (\n+ <ListItem\n+ action\n+ key={note.id}\n+ onClick={() => history.push(`/patients/${patientId}/notes/${note.id}`)}\n+ >\n+ <p className=\"ref__note-item-date\">{new Date(note.date).toLocaleString()}</p>\n+ <p className=\"ref__note-item-text\">{note.text}</p>\n+ </ListItem>\n+ ))}\n+ </List>\n+ )\n+}\n+\n+export default NotesList\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/notes/ViewNote.tsx", "diff": "+import React from 'react'\n+import { useParams } from 'react-router-dom'\n+\n+import TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'\n+import Loading from '../../shared/components/Loading'\n+import useTranslator from '../../shared/hooks/useTranslator'\n+import usePatientNote from '../hooks/usePatientNote'\n+\n+const ViewNote = () => {\n+ const { t } = useTranslator()\n+ const { noteId, id: patientId } = useParams()\n+ const { data, status } = usePatientNote(patientId, noteId)\n+\n+ if (data === undefined || status === 'loading') {\n+ return <Loading />\n+ }\n+\n+ return (\n+ <div>\n+ <p>Date: {new Date(data.date).toLocaleString()}</p>\n+ <TextInputWithLabelFormGroup\n+ name=\"text\"\n+ label={t('patient.note')}\n+ isEditable={false}\n+ placeholder={t('patient.note')}\n+ value={data.text}\n+ />\n+ </div>\n+ )\n+}\n+\n+export default ViewNote\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/util/validate-note.ts", "diff": "+import Note from '../../shared/model/Note'\n+\n+export class NoteError extends Error {\n+ noteError?: string\n+\n+ constructor(message: string, note: string) {\n+ super(message)\n+ this.noteError = note\n+ Object.setPrototypeOf(this, NoteError.prototype)\n+ }\n+}\n+\n+export default function validateNote(note: Partial<Note>) {\n+ const error: any = {}\n+ if (!note.text) {\n+ error.noteError = 'patient.notes.error.noteRequired'\n+ }\n+\n+ return error\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/patients/view/ViewPatient.tsx", "new_path": "src/patients/view/ViewPatient.tsx", "diff": "@@ -156,7 +156,7 @@ const ViewPatient = () => {\n<Route exact path={`${path}/diagnoses`}>\n<Diagnoses patient={patient} />\n</Route>\n- <Route exact path={`${path}/notes`}>\n+ <Route path={`${path}/notes`}>\n<Note patient={patient} />\n</Route>\n<Route exact path={`${path}/labs`}>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/appointments/AppointmentsList.test.tsx", "new_path": "src/__tests__/patients/appointments/AppointmentsList.test.tsx", "diff": "import * as components from '@hospitalrun/components'\nimport { Table } from '@hospitalrun/components'\n-import { mount } from 'enzyme'\n+import { mount, ReactWrapper } from 'enzyme'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { act } from 'react-dom/test-utils'\n@@ -45,26 +45,35 @@ const history = createMemoryHistory()\nlet store: any\n-const setup = (patient = expectedPatient, appointments = expectedAppointments) => {\n+const setup = async (patient = expectedPatient, appointments = expectedAppointments) => {\njest.resetAllMocks()\njest.spyOn(PatientRepository, 'getAppointments').mockResolvedValue(appointments)\nstore = mockStore({ patient, appointments: { appointments } } as any)\n- const wrapper = mount(\n+\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await mount(\n<Router history={history}>\n<Provider store={store}>\n<AppointmentsList patientId={patient.id} />\n</Provider>\n</Router>,\n)\n- return wrapper\n+ })\n+\n+ wrapper.update()\n+\n+ return { wrapper: wrapper as ReactWrapper }\n}\ndescribe('AppointmentsList', () => {\ndescribe('Table', () => {\n- it('should render a list of appointments', () => {\n- const wrapper = setup()\n+ it('should render a list of appointments', async () => {\n+ const { wrapper } = await setup()\nconst table = wrapper.find(Table)\n+\nconst columns = table.prop('columns')\nconst actions = table.prop('actions') as any\n@@ -91,7 +100,7 @@ describe('AppointmentsList', () => {\n})\nit('should navigate to appointment profile on appointment click', async () => {\n- const wrapper = setup()\n+ const { wrapper } = await setup()\nconst tr = wrapper.find('tr').at(1)\nact(() => {\n@@ -104,8 +113,8 @@ describe('AppointmentsList', () => {\n})\ndescribe('Empty list', () => {\n- it('should render a warning message if there are no appointments', () => {\n- const wrapper = setup(expectedPatient, [])\n+ it('should render a warning message if there are no appointments', async () => {\n+ const { wrapper } = await setup(expectedPatient, [])\nconst alert = wrapper.find(components.Alert)\nexpect(alert).toHaveLength(1)\n@@ -115,8 +124,16 @@ describe('AppointmentsList', () => {\n})\ndescribe('New appointment button', () => {\n- it('should render a new appointment button', () => {\n- const wrapper = setup()\n+ it('should render a new appointment button if there is an appointment', async () => {\n+ const { wrapper } = await setup()\n+\n+ const addNewAppointmentButton = wrapper.find(components.Button).at(0)\n+ expect(addNewAppointmentButton).toHaveLength(1)\n+ expect(addNewAppointmentButton.text().trim()).toEqual('scheduling.appointments.new')\n+ })\n+\n+ it('should render a new appointment button if there are no appointments', async () => {\n+ const { wrapper } = await setup(expectedPatient, [])\nconst addNewAppointmentButton = wrapper.find(components.Button).at(0)\nexpect(addNewAppointmentButton).toHaveLength(1)\n@@ -124,7 +141,7 @@ describe('AppointmentsList', () => {\n})\nit('should navigate to new appointment page', async () => {\n- const wrapper = setup()\n+ const { wrapper } = await setup()\nawait act(async () => {\nawait wrapper.find(components.Button).at(0).simulate('click')\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/hooks/usePatientAppointments.test.tsx", "diff": "+import usePatientAppointments from '../../../patients/hooks/usePatientAppointments'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Appointment from '../../shared/model/Appointment'\n+import executeQuery from '../../test-utils/use-query.util'\n+\n+describe('use patient appointments', () => {\n+ it(`should return the should return the patient's appointments`, async () => {\n+ const expectedPatientId = '123'\n+\n+ const expectedAppointments = [\n+ {\n+ id: '456',\n+ rev: '1',\n+ patient: expectedPatientId,\n+ startDateTime: new Date(2020, 1, 1, 9, 0, 0, 0).toISOString(),\n+ endDateTime: new Date(2020, 1, 1, 9, 30, 0, 0).toISOString(),\n+ location: 'location',\n+ reason: 'Follow Up',\n+ },\n+ {\n+ id: '123',\n+ rev: '1',\n+ patient: expectedPatientId,\n+ startDateTime: new Date(2020, 1, 1, 8, 0, 0, 0).toISOString(),\n+ endDateTime: new Date(2020, 1, 1, 8, 30, 0, 0).toISOString(),\n+ location: 'location',\n+ reason: 'Checkup',\n+ },\n+ ] as Appointment[]\n+\n+ jest.spyOn(PatientRepository, 'getAppointments').mockResolvedValueOnce(expectedAppointments)\n+\n+ const actualAppointments = await executeQuery(() => usePatientAppointments(expectedPatientId))\n+\n+ expect(PatientRepository.getAppointments).toHaveBeenCalledTimes(1)\n+ expect(PatientRepository.getAppointments).toHaveBeenCalledWith(expectedPatientId)\n+ expect(actualAppointments).toEqual(expectedAppointments)\n+ })\n+})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/appointments/AppointmentsList.tsx", "new_path": "src/patients/appointments/AppointmentsList.tsx", "diff": "-import { Button, Table, Spinner, Alert } from '@hospitalrun/components'\n+import { Button, Table, Alert } from '@hospitalrun/components'\nimport format from 'date-fns/format'\n-import React, { useEffect } from 'react'\n-import { useSelector, useDispatch } from 'react-redux'\n+import React from 'react'\nimport { useHistory } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\n-import { fetchPatientAppointments } from '../../scheduling/appointments/appointments-slice'\n+import Loading from '../../shared/components/Loading'\nimport useTranslator from '../../shared/hooks/useTranslator'\n-import { RootState } from '../../shared/store'\n+import usePatientsAppointments from '../hooks/usePatientAppointments'\ninterface Props {\npatientId: string\n}\nconst AppointmentsList = (props: Props) => {\n- const dispatch = useDispatch()\nconst history = useHistory()\nconst { t } = useTranslator()\nconst { patientId } = props\n- const { appointments } = useSelector((state: RootState) => state.appointments)\n+\n+ const { data, status } = usePatientsAppointments(patientId)\nconst breadcrumbs = [\n{\n@@ -27,11 +26,12 @@ const AppointmentsList = (props: Props) => {\nlocation: `/patients/${patientId}/appointments`,\n},\n]\n+\nuseAddBreadcrumbs(breadcrumbs)\n- useEffect(() => {\n- dispatch(fetchPatientAppointments(patientId))\n- }, [dispatch, patientId])\n+ if (data === undefined || status === 'loading') {\n+ return <Loading />\n+ }\nreturn (\n<>\n@@ -51,10 +51,9 @@ const AppointmentsList = (props: Props) => {\n<br />\n<div className=\"row\">\n<div className=\"col-md-12\">\n- {appointments ? (\n- appointments.length > 0 ? (\n+ {data.length > 0 ? (\n<Table\n- data={appointments}\n+ data={data}\ngetID={(row) => row.id}\nonRowClick={(row) => history.push(`/appointments/${row.id}`)}\ncolumns={[\n@@ -70,9 +69,7 @@ const AppointmentsList = (props: Props) => {\nlabel: t('scheduling.appointment.endDate'),\nkey: 'endDateTime',\nformatter: (row) =>\n- row.endDateTime\n- ? format(new Date(row.endDateTime), 'yyyy-MM-dd, hh:mm a')\n- : '',\n+ row.endDateTime ? format(new Date(row.endDateTime), 'yyyy-MM-dd, hh:mm a') : '',\n},\n{ label: t('scheduling.appointment.location'), key: 'location' },\n{ label: t('scheduling.appointment.type'), key: 'type' },\n@@ -91,9 +88,6 @@ const AppointmentsList = (props: Props) => {\ntitle={t('patient.appointments.warning.noAppointments')}\nmessage={t('patient.appointments.addAppointmentAbove')}\n/>\n- )\n- ) : (\n- <Spinner color=\"blue\" loading size={[10, 25]} type=\"ScaleLoader\" />\n)}\n</div>\n</div>\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/hooks/usePatientAppointments.tsx", "diff": "+import { QueryKey, useQuery } from 'react-query'\n+\n+import PatientRepository from '../../shared/db/PatientRepository'\n+import Appointments from '../../shared/model/Appointment'\n+\n+async function fetchPatientAppointments(\n+ _: QueryKey<string>,\n+ patientId: string,\n+): Promise<Appointments[]> {\n+ return PatientRepository.getAppointments(patientId)\n+}\n+\n+export default function usePatientsAppointments(patientId: string) {\n+ return useQuery(['appointments', patientId], fetchPatientAppointments)\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/appointments-slice.ts", "new_path": "src/scheduling/appointments/appointments-slice.ts", "diff": "import { createSlice, PayloadAction } from '@reduxjs/toolkit'\nimport AppointmentRepository from '../../shared/db/AppointmentRepository'\n-import PatientRepository from '../../shared/db/PatientRepository'\nimport Appointment from '../../shared/model/Appointment'\nimport { AppThunk } from '../../shared/store'\n@@ -39,12 +38,4 @@ export const fetchAppointments = (): AppThunk => async (dispatch) => {\ndispatch(fetchAppointmentsSuccess(appointments))\n}\n-export const fetchPatientAppointments = (patientId: string): AppThunk => async (dispatch) => {\n- dispatch(fetchAppointmentsStart())\n-\n- const appointments = await PatientRepository.getAppointments(patientId)\n-\n- dispatch(fetchAppointmentsSuccess(appointments))\n-}\n-\nexport default appointmentsSlice.reducer\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/shared/components/navbar/Navbar.tsx", "new_path": "src/shared/components/navbar/Navbar.tsx", "diff": "@@ -48,10 +48,10 @@ const Navbar = () => {\nconst addPages = [\npageMap.newPatient,\npageMap.newAppointment,\n- pageMap.newLab,\npageMap.newMedication,\n- pageMap.newIncident,\n+ pageMap.newLab,\npageMap.newImaging,\n+ pageMap.newIncident,\n]\nreturn (\n" }, { "change_type": "MODIFY", "old_path": "src/shared/components/navbar/pageMap.tsx", "new_path": "src/shared/components/navbar/pageMap.tsx", "diff": "@@ -35,6 +35,18 @@ const pageMap: {\npath: '/appointments',\nicon: 'appointment',\n},\n+ newMedication: {\n+ permission: Permissions.RequestMedication,\n+ label: 'medications.requests.new',\n+ path: '/medications/new',\n+ icon: 'add',\n+ },\n+ viewMedications: {\n+ permission: Permissions.ViewMedications,\n+ label: 'medications.requests.label',\n+ path: '/medications',\n+ icon: 'medication',\n+ },\nnewLab: {\npermission: Permissions.RequestLab,\nlabel: 'labs.requests.new',\n@@ -47,17 +59,17 @@ const pageMap: {\npath: '/labs',\nicon: 'lab',\n},\n- newMedication: {\n- permission: Permissions.RequestMedication,\n- label: 'medications.requests.new',\n- path: '/medications/new',\n+ newImaging: {\n+ permission: Permissions.RequestImaging,\n+ label: 'imagings.requests.new',\n+ path: '/imaging/new',\nicon: 'add',\n},\n- viewMedications: {\n- permission: Permissions.ViewMedications,\n- label: 'medications.requests.label',\n- path: '/medications',\n- icon: 'medication',\n+ viewImagings: {\n+ permission: Permissions.ReadPatients,\n+ label: 'imagings.requests.label',\n+ path: '/imaging',\n+ icon: 'image',\n},\nnewIncident: {\npermission: Permissions.ReportIncident,\n@@ -83,18 +95,6 @@ const pageMap: {\npath: '/visits',\nicon: 'visit',\n},\n- newImaging: {\n- permission: Permissions.RequestImaging,\n- label: 'imagings.requests.new',\n- path: '/imaging/new',\n- icon: 'add',\n- },\n- viewImagings: {\n- permission: Permissions.ReadPatients,\n- label: 'imagings.requests.label',\n- path: '/imaging',\n- icon: 'image',\n- },\nsettings: {\npermission: null,\nlabel: 'settings.label',\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/hooks/usePatientLabs.test.tsx", "diff": "+import usePatientLabs from '../../../patients/hooks/usePatientLabs'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Lab from '../../../shared/model/Lab'\n+import executeQuery from '../../test-utils/use-query.util'\n+\n+describe('use patient labs', () => {\n+ it('should get patient labs', async () => {\n+ const expectedPatientId = '123'\n+ const expectedLabs = ([{ id: expectedPatientId, type: 'lab type' }] as unknown) as Lab[]\n+ jest.spyOn(PatientRepository, 'getLabs').mockResolvedValueOnce(expectedLabs)\n+\n+ const actualLabs = await executeQuery(() => usePatientLabs(expectedPatientId))\n+\n+ expect(PatientRepository.getLabs).toHaveBeenCalledTimes(1)\n+ expect(PatientRepository.getLabs).toHaveBeenCalledWith(expectedPatientId)\n+ expect(actualLabs).toEqual(expectedLabs)\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/labs/Labs.test.tsx", "diff": "+import { mount, ReactWrapper } from 'enzyme'\n+import { createMemoryHistory } from 'history'\n+import React from 'react'\n+import { Provider } from 'react-redux'\n+import { Router } from 'react-router-dom'\n+import createMockStore from 'redux-mock-store'\n+import thunk from 'redux-thunk'\n+\n+import Labs from '../../../patients/labs/Labs'\n+import LabsList from '../../../patients/labs/LabsList'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Patient from '../../../shared/model/Patient'\n+import Permissions from '../../../shared/model/Permissions'\n+import { RootState } from '../../../shared/store'\n+\n+const mockStore = createMockStore<RootState, any>([thunk])\n+const history = createMemoryHistory()\n+const expectedPatient = ({\n+ id: '123',\n+ rev: '123',\n+ labs: [\n+ { id: '1', type: 'lab type 1' },\n+ { id: '2', type: 'lab type 2' },\n+ ],\n+} as unknown) as Patient\n+\n+let store: any\n+\n+const setup = async (\n+ patient = expectedPatient,\n+ permissions = [Permissions.ViewLabs],\n+ route = '/patients/123/labs',\n+) => {\n+ store = mockStore({ patient: { patient }, user: { permissions } } as any)\n+ history.push(route)\n+\n+ const wrapper = await mount(\n+ <Router history={history}>\n+ <Provider store={store}>\n+ <Labs patient={patient} />\n+ </Provider>\n+ </Router>,\n+ )\n+ return { wrapper: wrapper as ReactWrapper }\n+}\n+\n+describe('Labs', () => {\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n+ jest.spyOn(PatientRepository, 'saveOrUpdate')\n+ })\n+\n+ describe('patient labs list', () => {\n+ it('should render patient labs', async () => {\n+ const { wrapper } = await setup()\n+\n+ expect(wrapper.exists(LabsList)).toBeTruthy()\n+ })\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/labs/LabsList.test.tsx", "diff": "+import * as components from '@hospitalrun/components'\n+import { Table } from '@hospitalrun/components'\n+import { mount, ReactWrapper } from 'enzyme'\n+import { createMemoryHistory } from 'history'\n+import React from 'react'\n+import { act } from 'react-dom/test-utils'\n+import { Provider } from 'react-redux'\n+import { Router } from 'react-router-dom'\n+import createMockStore from 'redux-mock-store'\n+import thunk from 'redux-thunk'\n+\n+import LabsList from '../../../patients/labs/LabsList'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Lab from '../../../shared/model/Lab'\n+import Patient from '../../../shared/model/Patient'\n+import { RootState } from '../../../shared/store'\n+\n+const expectedPatient = {\n+ id: '1234',\n+} as Patient\n+\n+const expectedLabs = [\n+ {\n+ id: '456',\n+ rev: '1',\n+ patient: '1234',\n+ requestedOn: new Date(2020, 1, 1, 9, 0, 0, 0).toISOString(),\n+ requestedBy: 'someone',\n+ type: 'lab type',\n+ },\n+ {\n+ id: '123',\n+ rev: '1',\n+ patient: '1234',\n+ requestedOn: new Date(2020, 1, 1, 9, 0, 0, 0).toISOString(),\n+ requestedBy: 'someone',\n+ type: 'lab type',\n+ },\n+] as Lab[]\n+\n+const mockStore = createMockStore<RootState, any>([thunk])\n+const history = createMemoryHistory()\n+\n+let store: any\n+\n+const setup = async (patient = expectedPatient, labs = expectedLabs) => {\n+ jest.resetAllMocks()\n+ jest.spyOn(PatientRepository, 'getLabs').mockResolvedValue(labs)\n+ store = mockStore({ patient, labs: { labs } } as any)\n+\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await mount(\n+ <Router history={history}>\n+ <Provider store={store}>\n+ <LabsList patient={patient} />\n+ </Provider>\n+ </Router>,\n+ )\n+ })\n+\n+ wrapper.update()\n+\n+ return { wrapper: wrapper as ReactWrapper }\n+}\n+\n+describe('LabsList', () => {\n+ describe('Table', () => {\n+ it('should render a list of labs', async () => {\n+ const { wrapper } = await setup()\n+\n+ const table = wrapper.find(Table)\n+\n+ const columns = table.prop('columns')\n+ const actions = table.prop('actions') as any\n+\n+ expect(table).toHaveLength(1)\n+\n+ expect(columns[0]).toEqual(expect.objectContaining({ label: 'labs.lab.type', key: 'type' }))\n+ expect(columns[1]).toEqual(\n+ expect.objectContaining({ label: 'labs.lab.requestedOn', key: 'requestedOn' }),\n+ )\n+ expect(columns[2]).toEqual(\n+ expect.objectContaining({\n+ label: 'labs.lab.status',\n+ key: 'status',\n+ }),\n+ )\n+ expect(actions[0]).toEqual(expect.objectContaining({ label: 'actions.view' }))\n+ expect(table.prop('actionsHeaderText')).toEqual('actions.label')\n+ expect(table.prop('data')).toEqual(expectedLabs)\n+ })\n+\n+ it('should navigate to lab view on lab click', async () => {\n+ const { wrapper } = await setup()\n+ const tr = wrapper.find('tr').at(1)\n+\n+ act(() => {\n+ const onClick = tr.find('button').at(0).prop('onClick') as any\n+ onClick({ stopPropagation: jest.fn() })\n+ })\n+\n+ expect(history.location.pathname).toEqual('/labs/456')\n+ })\n+ })\n+\n+ describe('no patient labs', () => {\n+ it('should render a warning message if there are no labs', async () => {\n+ const { wrapper } = await setup(expectedPatient, [])\n+ const alert = wrapper.find(components.Alert)\n+\n+ expect(alert).toHaveLength(1)\n+ expect(alert.prop('title')).toEqual('patient.labs.warning.noLabs')\n+ expect(alert.prop('message')).toEqual('patient.labs.noLabsMessage')\n+ })\n+ })\n+})\n" }, { "change_type": "DELETE", "old_path": "src/__tests__/patients/labs/LabsTab.test.tsx", "new_path": null, "diff": "-import * as components from '@hospitalrun/components'\n-import { Table } from '@hospitalrun/components'\n-import { mount, ReactWrapper } from 'enzyme'\n-import { createMemoryHistory } from 'history'\n-import React from 'react'\n-import { act } from 'react-dom/test-utils'\n-import { Provider } from 'react-redux'\n-import { Router } from 'react-router-dom'\n-import createMockStore from 'redux-mock-store'\n-import thunk from 'redux-thunk'\n-\n-import LabsTab from '../../../patients/labs/LabsTab'\n-import PatientRepository from '../../../shared/db/PatientRepository'\n-import Lab from '../../../shared/model/Lab'\n-import Patient from '../../../shared/model/Patient'\n-import Permissions from '../../../shared/model/Permissions'\n-import { RootState } from '../../../shared/store'\n-\n-const expectedPatient = {\n- id: '123',\n-} as Patient\n-\n-const expectedLabs = [\n- {\n- id: 'labId',\n- patient: '123',\n- type: 'type',\n- status: 'requested',\n- requestedOn: new Date().toISOString(),\n- } as Lab,\n-]\n-\n-const mockStore = createMockStore<RootState, any>([thunk])\n-const history = createMemoryHistory()\n-\n-let user: any\n-let store: any\n-\n-const setup = async (labs = expectedLabs) => {\n- jest.resetAllMocks()\n- user = { permissions: [Permissions.ReadPatients] }\n- store = mockStore({ patient: expectedPatient, user } as any)\n- jest.spyOn(PatientRepository, 'getLabs').mockResolvedValue(labs)\n-\n- let wrapper: any\n- await act(async () => {\n- wrapper = await mount(\n- <Router history={history}>\n- <Provider store={store}>\n- <LabsTab patientId={expectedPatient.id} />\n- </Provider>\n- </Router>,\n- )\n- })\n-\n- wrapper.update()\n- return { wrapper: wrapper as ReactWrapper }\n-}\n-\n-describe('Labs Tab', () => {\n- it('should list the patients labs', async () => {\n- const { wrapper } = await setup()\n-\n- const table = wrapper.find(Table)\n- const columns = table.prop('columns')\n- const actions = table.prop('actions') as any\n- expect(columns[0]).toEqual(expect.objectContaining({ label: 'labs.lab.type', key: 'type' }))\n- expect(columns[1]).toEqual(\n- expect.objectContaining({ label: 'labs.lab.requestedOn', key: 'requestedOn' }),\n- )\n- expect(columns[2]).toEqual(\n- expect.objectContaining({\n- label: 'labs.lab.status',\n- key: 'status',\n- }),\n- )\n-\n- expect(actions[0]).toEqual(expect.objectContaining({ label: 'actions.view' }))\n- expect(table.prop('actionsHeaderText')).toEqual('actions.label')\n- expect(table.prop('data')).toEqual(expectedLabs)\n- })\n-\n- it('should render a warning message if the patient does not have any labs', async () => {\n- const { wrapper } = await setup([])\n-\n- const alert = wrapper.find(components.Alert)\n-\n- expect(alert).toHaveLength(1)\n- expect(alert.prop('title')).toEqual('patient.labs.warning.noLabs')\n- expect(alert.prop('message')).toEqual('patient.labs.noLabsMessage')\n- })\n-})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "new_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "diff": "@@ -16,7 +16,7 @@ import AppointmentsList from '../../../patients/appointments/AppointmentsList'\nimport CarePlanTab from '../../../patients/care-plans/CarePlanTab'\nimport Diagnoses from '../../../patients/diagnoses/Diagnoses'\nimport GeneralInformation from '../../../patients/GeneralInformation'\n-import LabsTab from '../../../patients/labs/LabsTab'\n+import Labs from '../../../patients/labs/Labs'\nimport NotesTab from '../../../patients/notes/NoteTab'\nimport * as patientSlice from '../../../patients/patient-slice'\nimport RelatedPersonTab from '../../../patients/related-persons/RelatedPersonTab'\n@@ -29,7 +29,7 @@ import { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\ndescribe('ViewPatient', () => {\n- const patient = {\n+ const patient = ({\nid: '123',\nprefix: 'prefix',\ngivenName: 'givenName',\n@@ -44,7 +44,7 @@ describe('ViewPatient', () => {\naddress: 'address',\ncode: 'P00001',\ndateOfBirth: new Date().toISOString(),\n- } as Patient\n+ } as unknown) as Patient\nlet history: any\nlet store: MockStore\n@@ -59,6 +59,7 @@ describe('ViewPatient', () => {\npatient: { patient },\nuser: { permissions },\nappointments: { appointments: [] },\n+ labs: { labs: [] },\n} as any)\nhistory.push('/patients/123')\n@@ -291,12 +292,12 @@ describe('ViewPatient', () => {\nconst tabsHeader = wrapper.find(TabsHeader)\nconst tabs = tabsHeader.find(Tab)\n- const labsTab = wrapper.find(LabsTab)\n+ const labsTab = wrapper.find(Labs)\nexpect(history.location.pathname).toEqual(`/patients/${patient.id}/labs`)\nexpect(tabs.at(6).prop('active')).toBeTruthy()\nexpect(labsTab).toHaveLength(1)\n- expect(labsTab.prop('patientId')).toEqual(patient.id)\n+ expect(labsTab.prop('patient')).toEqual(patient)\n})\nit('should mark the care plans tab as active when it is clicked and render the care plan tab component when route is /patients/:id/care-plans', async () => {\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/hooks/usePatientLabs.tsx", "diff": "+import { QueryKey, useQuery } from 'react-query'\n+\n+import PatientRepository from '../../shared/db/PatientRepository'\n+import Lab from '../../shared/model/Lab'\n+\n+async function fetchPatientLabs(_: QueryKey<string>, patientId: string): Promise<Lab[]> {\n+ const fetchedLabs = await PatientRepository.getLabs(patientId)\n+ return fetchedLabs || []\n+}\n+\n+export default function usePatientLabs(patientId: string) {\n+ return useQuery(['labs', patientId], fetchPatientLabs)\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/labs/Labs.tsx", "diff": "+import React from 'react'\n+import { Route } from 'react-router-dom'\n+\n+import useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\n+import Patient from '../../shared/model/Patient'\n+import LabsList from './LabsList'\n+\n+interface LabsProps {\n+ patient: Patient\n+}\n+\n+const Labs = (props: LabsProps) => {\n+ const { patient } = props\n+\n+ const breadcrumbs = [\n+ {\n+ i18nKey: 'patient.labs.label',\n+ location: `/patients/${patient.id}/labs`,\n+ },\n+ ]\n+ useAddBreadcrumbs(breadcrumbs)\n+\n+ return (\n+ <Route exact path=\"/patients/:id/labs\">\n+ <LabsList patient={patient} />\n+ </Route>\n+ )\n+}\n+\n+export default Labs\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/labs/LabsList.tsx", "diff": "+import { Alert, Table } from '@hospitalrun/components'\n+import format from 'date-fns/format'\n+import React from 'react'\n+import { useHistory } from 'react-router-dom'\n+\n+import Loading from '../../shared/components/Loading'\n+import useTranslator from '../../shared/hooks/useTranslator'\n+import Patient from '../../shared/model/Patient'\n+import usePatientLabs from '../hooks/usePatientLabs'\n+\n+interface Props {\n+ patient: Patient\n+}\n+\n+const LabsList = (props: Props) => {\n+ const { patient } = props\n+ const history = useHistory()\n+ const { t } = useTranslator()\n+ const { data, status } = usePatientLabs(patient.id)\n+\n+ if (data === undefined || status === 'loading') {\n+ return <Loading />\n+ }\n+\n+ if (data.length === 0) {\n+ return (\n+ <Alert\n+ color=\"warning\"\n+ title={t('patient.labs.warning.noLabs')}\n+ message={t('patient.labs.noLabsMessage')}\n+ />\n+ )\n+ }\n+\n+ return (\n+ <Table\n+ actionsHeaderText={t('actions.label')}\n+ getID={(row) => row.id}\n+ data={data}\n+ columns={[\n+ { label: t('labs.lab.type'), key: 'type' },\n+ {\n+ label: t('labs.lab.requestedOn'),\n+ key: 'requestedOn',\n+ formatter: (row) => format(new Date(row.requestedOn), 'yyyy-MM-dd hh:mm a'),\n+ },\n+ { label: t('labs.lab.status'), key: 'status' },\n+ ]}\n+ actions={[{ label: t('actions.view'), action: (row) => history.push(`/labs/${row.id}`) }]}\n+ />\n+ )\n+}\n+\n+export default LabsList\n" }, { "change_type": "DELETE", "old_path": "src/patients/labs/LabsTab.tsx", "new_path": null, "diff": "-import { Alert, Table } from '@hospitalrun/components'\n-import format from 'date-fns/format'\n-import React, { useEffect, useState } from 'react'\n-import { useHistory } from 'react-router-dom'\n-\n-import PatientRepository from '../../shared/db/PatientRepository'\n-import useTranslator from '../../shared/hooks/useTranslator'\n-import Lab from '../../shared/model/Lab'\n-\n-interface Props {\n- patientId: string\n-}\n-\n-const LabsTab = (props: Props) => {\n- const history = useHistory()\n- const { patientId } = props\n- const { t } = useTranslator()\n-\n- const [labs, setLabs] = useState<Lab[]>([])\n-\n- useEffect(() => {\n- const fetch = async () => {\n- const fetchedLabs = await PatientRepository.getLabs(patientId)\n- setLabs(fetchedLabs)\n- }\n-\n- fetch()\n- }, [patientId])\n-\n- return (\n- <div>\n- {(!labs || labs.length === 0) && (\n- <Alert\n- color=\"warning\"\n- title={t('patient.labs.warning.noLabs')}\n- message={t('patient.labs.noLabsMessage')}\n- />\n- )}\n- {labs && labs.length > 0 && (\n- <Table\n- actionsHeaderText={t('actions.label')}\n- getID={(row) => row.id}\n- data={labs}\n- columns={[\n- { label: t('labs.lab.type'), key: 'type' },\n- {\n- label: t('labs.lab.requestedOn'),\n- key: 'requestedOn',\n- formatter: (row) => format(new Date(row.requestedOn), 'yyyy-MM-dd hh:mm a'),\n- },\n- { label: t('labs.lab.status'), key: 'status' },\n- ]}\n- actions={[{ label: t('actions.view'), action: (row) => history.push(`/labs/${row.id}`) }]}\n- />\n- )}\n- </div>\n- )\n-}\n-\n-export default LabsTab\n" }, { "change_type": "MODIFY", "old_path": "src/patients/view/ViewPatient.tsx", "new_path": "src/patients/view/ViewPatient.tsx", "diff": "@@ -22,7 +22,7 @@ import AppointmentsList from '../appointments/AppointmentsList'\nimport CarePlanTab from '../care-plans/CarePlanTab'\nimport Diagnoses from '../diagnoses/Diagnoses'\nimport GeneralInformation from '../GeneralInformation'\n-import Labs from '../labs/LabsTab'\n+import Labs from '../labs/Labs'\nimport Note from '../notes/NoteTab'\nimport { fetchPatient } from '../patient-slice'\nimport RelatedPerson from '../related-persons/RelatedPersonTab'\n@@ -160,7 +160,7 @@ const ViewPatient = () => {\n<Note patient={patient} />\n</Route>\n<Route exact path={`${path}/labs`}>\n- <Labs patientId={patient.id} />\n+ <Labs patient={patient} />\n</Route>\n<Route path={`${path}/care-plans`}>\n<CarePlanTab />\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/list/ViewIncidentsTable.test.tsx", "new_path": "src/__tests__/incidents/list/ViewIncidentsTable.test.tsx", "diff": "-import { Table } from '@hospitalrun/components'\n+import { Table, Dropdown } from '@hospitalrun/components'\nimport { mount, ReactWrapper } from 'enzyme'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -6,7 +6,7 @@ import { act } from 'react-dom/test-utils'\nimport { Router } from 'react-router'\nimport IncidentFilter from '../../../incidents/IncidentFilter'\n-import ViewIncidentsTable from '../../../incidents/list/ViewIncidentsTable'\n+import ViewIncidentsTable, { populateExportData } from '../../../incidents/list/ViewIncidentsTable'\nimport IncidentSearchRequest from '../../../incidents/model/IncidentSearchRequest'\nimport IncidentRepository from '../../../shared/db/IncidentRepository'\nimport Incident from '../../../shared/model/Incident'\n@@ -73,6 +73,58 @@ describe('View Incidents Table', () => {\nexpect(incidentsTable.prop('actionsHeaderText')).toEqual('actions.label')\n})\n+ it('should display a download button', async () => {\n+ const expectedIncidents: Incident[] = [\n+ {\n+ id: 'incidentId1',\n+ code: 'someCode',\n+ date: new Date(2020, 7, 4, 0, 0, 0, 0).toISOString(),\n+ reportedOn: new Date(2020, 8, 4, 0, 0, 0, 0).toISOString(),\n+ reportedBy: 'com.test:user',\n+ status: 'reported',\n+ } as Incident,\n+ ]\n+ const { wrapper } = await setup({ status: IncidentFilter.all }, expectedIncidents)\n+\n+ const dropDownButton = wrapper.find(Dropdown)\n+ expect(dropDownButton.exists()).toBeTruthy()\n+ })\n+\n+ it('should populate export data correctly', async () => {\n+ const data = [\n+ {\n+ category: 'asdf',\n+ categoryItem: 'asdf',\n+ code: 'I-eClU6OdkR',\n+ createdAt: '2020-09-06T04:02:38.011Z',\n+ date: '2020-09-06T04:02:32.855Z',\n+ department: 'asdf',\n+ description: 'asdf',\n+ id: 'af9f968f-61d9-47c3-9321-5da3f381c38b',\n+ reportedBy: 'some user',\n+ reportedOn: '2020-09-06T04:02:38.011Z',\n+ rev: '1-91d1ba60588b779c9554c7e20e15419c',\n+ status: 'reported',\n+ updatedAt: '2020-09-06T04:02:38.011Z',\n+ },\n+ ]\n+\n+ const expectedExportData = [\n+ {\n+ code: 'I-eClU6OdkR',\n+ date: '2020-09-06 12:02 PM',\n+ reportedBy: 'some user',\n+ reportedOn: '2020-09-06 12:02 PM',\n+ status: 'reported',\n+ },\n+ ]\n+\n+ const exportData = [{}]\n+ populateExportData(exportData, data)\n+\n+ expect(exportData).toEqual(expectedExportData)\n+ })\n+\nit('should format the data correctly', async () => {\nconst expectedIncidents: Incident[] = [\n{\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/shared/utils/DataHelpers.test.ts", "diff": "+import { getCSV, DownloadLink } from '../../../shared/util/DataHelpers'\n+\n+describe('Use Data Helpers util', () => {\n+ it('should construct csv', () => {\n+ const input = [\n+ {\n+ code: 'I-eClU6OdkR',\n+ date: '2020-09-06 12:02 PM',\n+ reportedBy: 'some user',\n+ reportedOn: '2020-09-06 12:02 PM',\n+ status: 'reported',\n+ },\n+ ]\n+ const output = getCSV(input)\n+ const expectedOutput =\n+ '\"code\",\"date\",\"reportedBy\",\"reportedOn\",\"status\"\\r\\n\"I-eClU6OdkR\",\"2020-09-06 12:02 PM\",\"some user\",\"2020-09-06 12:02 PM\",\"reported\"'\n+ expect(output).toMatch(expectedOutput)\n+ })\n+\n+ it('should download data as expected', () => {\n+ const response = DownloadLink('data to be downloaded', 'filename.txt')\n+\n+ const element = document.createElement('a')\n+ element.setAttribute(\n+ 'href',\n+ `data:text/plain;charset=utf-8,${encodeURIComponent('data to be downloaded')}`,\n+ )\n+ element.setAttribute('download', 'filename.txt')\n+\n+ element.style.display = 'none'\n+ expect(response).toEqual(element)\n+ })\n+})\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/list/ViewIncidentsTable.tsx", "new_path": "src/incidents/list/ViewIncidentsTable.tsx", "diff": "@@ -13,23 +13,10 @@ interface Props {\nsearchRequest: IncidentSearchRequest\n}\n-function ViewIncidentsTable(props: Props) {\n- const { searchRequest } = props\n- const { t } = useTranslator()\n- const history = useHistory()\n- const { data, isLoading } = useIncidents(searchRequest)\n-\n- if (data === undefined || isLoading) {\n- return <Spinner type=\"DotLoader\" loading />\n- }\n-\n- // filter data\n- const exportData = [{}]\n-\n- function populateExportData() {\n+export function populateExportData(dataToPopulate: any, theData: any) {\nlet first = true\n- if (data != null) {\n- data.forEach((elm) => {\n+ if (theData != null) {\n+ theData.forEach((elm: any) => {\nconst entry = {\ncode: elm.code,\ndate: format(new Date(elm.date), 'yyyy-MM-dd hh:mm a'),\n@@ -38,17 +25,30 @@ function ViewIncidentsTable(props: Props) {\nstatus: elm.status,\n}\nif (first) {\n- exportData[0] = entry\n+ dataToPopulate[0] = entry\nfirst = false\n} else {\n- exportData.push(entry)\n+ dataToPopulate.push(entry)\n}\n})\n}\n}\n+function ViewIncidentsTable(props: Props) {\n+ const { searchRequest } = props\n+ const { t } = useTranslator()\n+ const history = useHistory()\n+ const { data, isLoading } = useIncidents(searchRequest)\n+\n+ if (data === undefined || isLoading) {\n+ return <Spinner type=\"DotLoader\" loading />\n+ }\n+\n+ // filter data\n+ const exportData = [{}]\n+\nfunction downloadCSV() {\n- populateExportData()\n+ populateExportData(exportData, data)\nconst csv = getCSV(exportData)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/list/ViewIncidentsTable.test.tsx", "new_path": "src/__tests__/incidents/list/ViewIncidentsTable.test.tsx", "diff": "import { Table, Dropdown } from '@hospitalrun/components'\n+import format from 'date-fns/format'\nimport { mount, ReactWrapper } from 'enzyme'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -112,9 +113,9 @@ describe('View Incidents Table', () => {\nconst expectedExportData = [\n{\ncode: 'I-eClU6OdkR',\n- date: '2020-09-06 12:02 PM',\n+ date: format(new Date(data[0].date), 'yyyy-MM-dd hh:mm a'),\nreportedBy: 'some user',\n- reportedOn: '2020-09-06 12:02 PM',\n+ reportedOn: format(new Date(data[0].reportedOn), 'yyyy-MM-dd hh:mm a'),\nstatus: 'reported',\n},\n]\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/shared/utils/DataHelpers.test.ts", "new_path": "src/__tests__/shared/utils/DataHelpers.test.ts", "diff": "@@ -11,9 +11,9 @@ describe('Use Data Helpers util', () => {\nstatus: 'reported',\n},\n]\n- const output = getCSV(input)\n+ const output = getCSV(input).replace(/(\\r\\n|\\n|\\r)/gm, '')\nconst expectedOutput =\n- '\"code\",\"date\",\"reportedBy\",\"reportedOn\",\"status\"\\r\\n\"I-eClU6OdkR\",\"2020-09-06 12:02 PM\",\"some user\",\"2020-09-06 12:02 PM\",\"reported\"'\n+ '\"code\",\"date\",\"reportedBy\",\"reportedOn\",\"status\"\"I-eClU6OdkR\",\"2020-09-06 12:02 PM\",\"some user\",\"2020-09-06 12:02 PM\",\"reported\"'\nexpect(output).toMatch(expectedOutput)\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/visualize/VisualizeIncidents.tsx", "new_path": "src/incidents/visualize/VisualizeIncidents.tsx", "diff": "@@ -37,7 +37,7 @@ const VisualizeIncidents = () => {\nsetShowGraph(true)\n}\n}\n- }, [data, monthlyIncidents])\n+ }, [data, monthlyIncidents, isLoading, incident])\nreturn !showGraph ? (\n<Spinner type=\"DotLoader\" loading />\n" } ]

[ { "change_type": "MODIFY", "old_path": "nginx.conf", "new_path": "nginx.conf", "diff": "@@ -5,6 +5,8 @@ server {\nroot /usr/share/nginx/html;\nindex index.html index.htm;\ntry_files $uri /index.html;\n+ # replace WWW-Authenticate header in response if authorization failed\n+ more_set_headers -s 401 'WWW-Authenticate: Other realm=\"App\"';\n}\nerror_page 500 502 503 504 /50x.html;\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"private\": false,\n\"license\": \"MIT\",\n\"dependencies\": {\n- \"@hospitalrun/components\": \"~2.0.0\",\n+ \"@hospitalrun/components\": \"~2.0.1\",\n\"@reduxjs/toolkit\": \"~1.4.0\",\n\"@types/escape-string-regexp\": \"~2.0.1\",\n\"@types/json2csv\": \"~5.0.1\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"private\": false,\n\"license\": \"MIT\",\n\"dependencies\": {\n- \"@hospitalrun/components\": \"~2.0.0\",\n+ \"@hospitalrun/components\": \"2.0.0\",\n\"@reduxjs/toolkit\": \"~1.4.0\",\n\"@types/escape-string-regexp\": \"~2.0.1\",\n\"@types/json2csv\": \"~5.0.1\",\n" } ]

[ { "change_type": "RENAME", "old_path": "src/patients/hooks/useAddPatientNote.ts", "new_path": "src/patients/hooks/useAddPatientNote.tsx", "diff": "" }, { "change_type": "RENAME", "old_path": "src/patients/hooks/usePatientNote.ts", "new_path": "src/patients/hooks/usePatientNote.tsx", "diff": "" }, { "change_type": "RENAME", "old_path": "src/patients/hooks/usePatientNotes.ts", "new_path": "src/patients/hooks/usePatientNotes.tsx", "diff": "" }, { "change_type": "MODIFY", "old_path": "src/patients/patient-slice.ts", "new_path": "src/patients/patient-slice.ts", "diff": "@@ -5,7 +5,6 @@ import validator from 'validator'\nimport PatientRepository from '../shared/db/PatientRepository'\nimport Diagnosis from '../shared/model/Diagnosis'\n-import Note from '../shared/model/Note'\nimport Patient from '../shared/model/Patient'\nimport RelatedPerson from '../shared/model/RelatedPerson'\nimport Visit from '../shared/model/Visit'\n@@ -22,9 +21,7 @@ interface PatientState {\nupdateError?: Error\nallergyError?: AddAllergyError\ndiagnosisError?: AddDiagnosisError\n- noteError?: AddNoteError\nrelatedPersonError?: AddRelatedPersonError\n- carePlanError?: AddCarePlanError\nvisitError?: AddVisitError\n}\n@@ -58,23 +55,6 @@ interface AddDiagnosisError {\nstatus?: string\n}\n-interface AddNoteError {\n- message?: string\n- note?: string\n-}\n-\n-interface AddCarePlanError {\n- message?: string\n- title?: string\n- description?: string\n- status?: string\n- intent?: string\n- startDate?: string\n- endDate?: string\n- note?: string\n- condition?: string\n-}\n-\ninterface AddVisitError {\nmessage?: string\nstatus?: string\n@@ -90,11 +70,8 @@ const initialState: PatientState = {\nrelatedPersons: [],\ncreateError: undefined,\nupdateError: undefined,\n- allergyError: undefined,\ndiagnosisError: undefined,\n- noteError: undefined,\nrelatedPersonError: undefined,\n- carePlanError: undefined,\nvisitError: undefined,\n}\n@@ -129,10 +106,6 @@ const patientSlice = createSlice({\nstate.status = 'error'\nstate.updateError = payload\n},\n- addAllergyError(state, { payload }: PayloadAction<AddAllergyError>) {\n- state.status = 'error'\n- state.allergyError = payload\n- },\naddDiagnosisError(state, { payload }: PayloadAction<AddDiagnosisError>) {\nstate.status = 'error'\nstate.diagnosisError = payload\n@@ -141,18 +114,6 @@ const patientSlice = createSlice({\nstate.status = 'error'\nstate.relatedPersonError = payload\n},\n- addNoteError(state, { payload }: PayloadAction<AddRelatedPersonError>) {\n- state.status = 'error'\n- state.noteError = payload\n- },\n- addCarePlanError(state, { payload }: PayloadAction<AddRelatedPersonError>) {\n- state.status = 'error'\n- state.carePlanError = payload\n- },\n- addVisitError(state, { payload }: PayloadAction<AddVisitError>) {\n- state.status = 'error'\n- state.visitError = payload\n- },\n},\n})\n@@ -165,12 +126,8 @@ export const {\nupdatePatientStart,\nupdatePatientSuccess,\nupdatePatientError,\n- addAllergyError,\naddDiagnosisError,\naddRelatedPersonError,\n- addNoteError,\n- addCarePlanError,\n- addVisitError,\n} = patientSlice.actions\nexport const fetchPatient = (id: string): AppThunk => async (dispatch) => {\n@@ -383,35 +340,6 @@ export const addDiagnosis = (\n}\n}\n-function validateNote(note: Note) {\n- const error: AddNoteError = {}\n- if (!note.text) {\n- error.message = 'patient.notes.error.noteRequired'\n- }\n-\n- return error\n-}\n-\n-export const addNote = (\n- patientId: string,\n- note: Note,\n- onSuccess?: (patient: Patient) => void,\n-): AppThunk => async (dispatch) => {\n- const newNoteError = validateNote(note)\n-\n- if (isEmpty(newNoteError)) {\n- const patient = await PatientRepository.find(patientId)\n- const notes = patient.notes || []\n- notes.push({ id: uuid(), date: new Date().toISOString(), ...note })\n- patient.notes = notes\n-\n- await dispatch(updatePatient(patient, onSuccess))\n- } else {\n- newNoteError.message = 'patient.notes.error.unableToAdd'\n- dispatch(addNoteError(newNoteError))\n- }\n-}\n-\nfunction validateVisit(visit: Visit): AddVisitError {\nconst error: AddVisitError = {}\n" } ]

[ { "change_type": "DELETE", "old_path": ".replit", "new_path": null, "diff": "-language = \"nodejs\"\n-run = \"npm start\"\n" }, { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": " [](https://github.com/HospitalRun/hospitalrun-frontend/releases) [](https://github.com/HospitalRun/hospitalrun-frontend/releases)\n[](https://github.com/HospitalRun/frontend/actions) [](https://coveralls.io/github/HospitalRun/hospitalrun-frontend?branch=master) [](https://lgtm.com/projects/g/HospitalRun/hospitalrun-frontend/context:javascript)  [](https://hospitalrun-frontend.readthedocs.io)\n[](https://app.fossa.io/projects/git%2Bgithub.com%2FHospitalRun%2Fhospitalrun-frontend?ref=badge_large) [](http://commitizen.github.io/cz-cli/)\n- [](https://hospitalrun-slack.herokuapp.com) [](https://repl.it/github/HospitalRun/hospitalrun-frontend)\n+ [](https://hospitalrun-slack.herokuapp.com)\n[](https://gitpod.io/#https://github.com/HospitalRun/hospitalrun-frontend)\n</div>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/labs/index.ts", "new_path": "src/shared/locales/enUs/translations/labs/index.ts", "diff": "@@ -4,6 +4,7 @@ export default {\nfilterTitle: 'Filter by status',\nsearch: 'Search labs',\nsuccessfullyUpdated: 'Successfully updated',\n+ successfullyCompleted: 'Succesfully Completed',\nstatus: {\nrequested: 'Requested',\ncompleted: 'Completed',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/care-plans/CarePlanTable.tsx", "new_path": "src/patients/care-plans/CarePlanTable.tsx", "diff": "@@ -52,7 +52,7 @@ const CarePlanTable = (props: Props) => {\nactionsHeaderText={t('actions.label')}\nactions={[\n{\n- label: 'actions.view',\n+ label: t('actions.view'),\naction: (row) => history.push(`/patients/${patientId}/care-plans/${row.id}`),\n},\n]}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/labs/index.ts", "new_path": "src/shared/locales/enUs/translations/labs/index.ts", "diff": "@@ -4,7 +4,7 @@ export default {\nfilterTitle: 'Filter by status',\nsearch: 'Search labs',\nsuccessfullyUpdated: 'Successfully updated',\n- successfullyCompleted: 'Succesfully Completed',\n+ successfullyCompleted: 'Successfully completed',\nstatus: {\nrequested: 'Requested',\ncompleted: 'Completed',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/labs/ViewLab.tsx", "new_path": "src/labs/ViewLab.tsx", "diff": "@@ -82,7 +82,7 @@ const ViewLab = () => {\nToast(\n'success',\nt('states.success'),\n- `${t('labs.successfullyCompleted')} ${complete.type} ${patient?.fullName} `,\n+ `${t('labs.successfullyCompleted')} ${complete.type} for ${patient?.fullName} `,\n)\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"private\": false,\n\"license\": \"MIT\",\n\"dependencies\": {\n- \"@hospitalrun/components\": \"2.0.0\",\n+ \"@hospitalrun/components\": \"~3.0.0\",\n\"@reduxjs/toolkit\": \"~1.4.0\",\n\"@types/escape-string-regexp\": \"~2.0.1\",\n\"@types/json2csv\": \"~5.0.1\",\n" }, { "change_type": "MODIFY", "old_path": "src/HospitalRun.tsx", "new_path": "src/HospitalRun.tsx", "diff": "@@ -33,7 +33,9 @@ const HospitalRun = () => {\n<NetworkStatusMessage />\n<Navbar />\n<div className=\"container-fluid\">\n+ <div className=\"col-md-2\">\n<Sidebar />\n+ </div>\n<ButtonBarProvider>\n<div className=\"row\">\n<main\n" }, { "change_type": "MODIFY", "old_path": "src/index.tsx", "new_path": "src/index.tsx", "diff": "import React from 'react'\nimport ReactDOM from 'react-dom'\nimport { Provider } from 'react-redux'\n-import '@hospitalrun/components/scss/main.scss'\nimport './index.css'\nimport App from './App'\n" }, { "change_type": "MODIFY", "old_path": "src/shared/components/Sidebar.tsx", "new_path": "src/shared/components/Sidebar.tsx", "diff": "@@ -414,7 +414,7 @@ const Sidebar = () => {\nreturn (\n<nav\n- className=\"col-md-2 d-none d-md-block bg-light sidebar\"\n+ className=\"d-none d-md-block bg-light sidebar\"\nstyle={{ width: sidebarCollapsed ? '56px' : '' }}\n>\n<div className=\"sidebar-sticky\">\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/hooks/useAddPatientRelatedPerson.test.tsx", "diff": "+import useAddPatientRelatedPerson from '../../../patients/hooks/useAddPatientRelatedPerson'\n+import * as validateRelatedPerson from '../../../patients/util/validate-related-person'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Patient from '../../../shared/model/Patient'\n+import RelatedPerson from '../../../shared/model/RelatedPerson'\n+import * as uuid from '../../../shared/util/uuid'\n+import executeMutation from '../../test-utils/use-mutation.util'\n+\n+describe('use add patient related person', () => {\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n+ })\n+\n+ it('should throw an error if related person not specified', async () => {\n+ const expectedError = { relatedPersonError: 'some error' }\n+ jest.spyOn(validateRelatedPerson, 'default').mockReturnValue(expectedError)\n+ jest.spyOn(PatientRepository, 'saveOrUpdate')\n+\n+ try {\n+ await executeMutation(() => useAddPatientRelatedPerson(), {\n+ patientId: '123',\n+ relatedPerson: {},\n+ })\n+ } catch (e) {\n+ expect(e).toEqual(expectedError)\n+ }\n+\n+ expect(PatientRepository.saveOrUpdate).not.toHaveBeenCalled()\n+ })\n+\n+ it('should throw an error if the relation type is not specified', async () => {\n+ const expectedError = { relationshipTypeError: 'some error' }\n+ jest.spyOn(validateRelatedPerson, 'default').mockReturnValue(expectedError)\n+ jest.spyOn(PatientRepository, 'saveOrUpdate')\n+\n+ try {\n+ await executeMutation(() => useAddPatientRelatedPerson(), {\n+ patientId: '123',\n+ relatedPerson: { patientId: '456' },\n+ })\n+ } catch (e) {\n+ expect(e).toEqual(expectedError)\n+ }\n+\n+ expect(PatientRepository.saveOrUpdate).not.toHaveBeenCalled()\n+ })\n+\n+ it('should add the related person to the patient', async () => {\n+ const expectedRelated = { id: '123', patientId: '456', type: 'some type' } as RelatedPerson\n+ const givenPatient = { id: 'patientId', relatedPersons: [] as RelatedPerson[] } as Patient\n+ const expectedPatient = { ...givenPatient, relatedPersons: [expectedRelated] } as Patient\n+ jest.spyOn(uuid, 'uuid').mockReturnValue(expectedRelated.id)\n+ jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedPatient)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(givenPatient)\n+\n+ const result = await executeMutation(() => useAddPatientRelatedPerson(), {\n+ patientId: givenPatient.id,\n+ relatedPerson: expectedRelated,\n+ })\n+\n+ expect(PatientRepository.find).toHaveBeenCalledTimes(2) // Once looking up the patient, once looking up the related person to cache\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(expectedPatient)\n+ expect(result).toEqual([expectedRelated])\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/patients/hooks/useRemovePatientRelatedPerson.test.tsx", "diff": "+import useRemovePatientRelatedPerson from '../../../patients/hooks/useRemovePatientRelatedPerson'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Patient from '../../../shared/model/Patient'\n+import RelatedPerson from '../../../shared/model/RelatedPerson'\n+import * as uuid from '../../../shared/util/uuid'\n+import executeMutation from '../../test-utils/use-mutation.util'\n+\n+describe('use remove patient related person', () => {\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n+ })\n+\n+ it('should remove a related person with the given id', async () => {\n+ const expectedRelatedPersonPatientId = 'expected id'\n+ const expectedPatientId = '123'\n+\n+ const expectedRelatedPerson = {\n+ id: 'some id',\n+ patientId: expectedRelatedPersonPatientId,\n+ type: 'some type',\n+ } as RelatedPerson\n+\n+ const expectedPatient = {\n+ id: expectedPatientId,\n+ givenName: 'some name',\n+ relatedPersons: [expectedRelatedPerson],\n+ } as Patient\n+\n+ const expectedUpdatedPatient = {\n+ ...expectedPatient,\n+ relatedPersons: [],\n+ } as Patient\n+\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n+ jest.spyOn(uuid, 'uuid').mockReturnValue(expectedRelatedPersonPatientId)\n+ jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedUpdatedPatient)\n+\n+ const result = await executeMutation(() => useRemovePatientRelatedPerson(), {\n+ patientId: expectedPatientId,\n+ relatedPersonId: expectedRelatedPersonPatientId,\n+ })\n+\n+ expect(PatientRepository.find).toHaveBeenCalledTimes(1)\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(expectedUpdatedPatient)\n+ expect(result).toEqual([])\n+ })\n+})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/patient-slice.test.ts", "new_path": "src/__tests__/patients/patient-slice.test.ts", "diff": "@@ -6,8 +6,6 @@ import thunk from 'redux-thunk'\nimport patient, {\naddDiagnosis,\naddDiagnosisError,\n- addRelatedPerson,\n- addRelatedPersonError,\ncreatePatient,\ncreatePatientError,\ncreatePatientStart,\n@@ -15,7 +13,6 @@ import patient, {\nfetchPatient,\nfetchPatientStart,\nfetchPatientSuccess,\n- removeRelatedPerson,\nupdatePatient,\nupdatePatientError,\nupdatePatientStart,\n@@ -24,7 +21,6 @@ import patient, {\nimport PatientRepository from '../../shared/db/PatientRepository'\nimport Diagnosis, { DiagnosisStatus } from '../../shared/model/Diagnosis'\nimport Patient from '../../shared/model/Patient'\n-import RelatedPerson from '../../shared/model/RelatedPerson'\nimport { RootState } from '../../shared/store'\nimport * as uuid from '../../shared/util/uuid'\n@@ -447,95 +443,6 @@ describe('patients slice', () => {\n})\n})\n- describe('add related person', () => {\n- it('should add the related person to the patient with the given id', async () => {\n- const expectedRelatedPersonId = 'expected id'\n- const store = mockStore()\n- const expectedPatientId = '123'\n-\n- const expectedPatient = {\n- id: expectedPatientId,\n- givenName: 'some name',\n- } as Patient\n-\n- const expectedRelatedPerson = {\n- patientId: '456',\n- type: '1234',\n- } as RelatedPerson\n-\n- const expectedUpdatedPatient = {\n- ...expectedPatient,\n- relatedPersons: [{ ...expectedRelatedPerson, id: expectedRelatedPersonId }],\n- } as Patient\n-\n- const findPatientSpy = jest\n- .spyOn(PatientRepository, 'find')\n- .mockResolvedValue(expectedPatient)\n- jest.spyOn(uuid, 'uuid').mockReturnValue(expectedRelatedPersonId)\n- jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedUpdatedPatient)\n- const onSuccessSpy = jest.fn()\n-\n- await store.dispatch(addRelatedPerson(expectedPatientId, expectedRelatedPerson, onSuccessSpy))\n-\n- expect(findPatientSpy).toHaveBeenCalledWith(expectedPatientId)\n- expect(store.getActions()[1]).toEqual(updatePatientSuccess(expectedUpdatedPatient))\n- expect(onSuccessSpy).toHaveBeenCalledWith(expectedUpdatedPatient)\n- })\n-\n- it('should validate the related person', async () => {\n- const expectedError = {\n- message: 'patient.relatedPersons.error.unableToAddRelatedPerson',\n- relationshipType: 'patient.relatedPersons.error.relationshipTypeRequired',\n- relatedPerson: 'patient.relatedPersons.error.relatedPersonRequired',\n- }\n- const store = mockStore()\n- const expectedRelatedPerson = {} as RelatedPerson\n- const onSuccessSpy = jest.fn()\n-\n- await store.dispatch(addRelatedPerson('some id', expectedRelatedPerson, onSuccessSpy))\n-\n- expect(store.getActions()[0]).toEqual(addRelatedPersonError(expectedError))\n- expect(onSuccessSpy).not.toHaveBeenCalled()\n- })\n- })\n-\n- describe('remove related person', () => {\n- it('should remove the related related person rom patient with the given id', async () => {\n- const store = mockStore()\n-\n- const expectedRelatedPersonPatientId = 'expected id'\n- const expectedPatientId = '123'\n-\n- const expectedRelatedPerson = {\n- id: 'some id',\n- patientId: expectedRelatedPersonPatientId,\n- type: 'some type',\n- } as RelatedPerson\n-\n- const expectedPatient = {\n- id: expectedPatientId,\n- givenName: 'some name',\n- relatedPersons: [expectedRelatedPerson],\n- } as Patient\n-\n- const expectedUpdatedPatient = {\n- ...expectedPatient,\n- relatedPersons: [],\n- } as Patient\n-\n- const findPatientSpy = jest\n- .spyOn(PatientRepository, 'find')\n- .mockResolvedValue(expectedPatient)\n- jest.spyOn(uuid, 'uuid').mockReturnValue(expectedRelatedPersonPatientId)\n- jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedUpdatedPatient)\n-\n- await store.dispatch(removeRelatedPerson(expectedPatientId, expectedRelatedPersonPatientId))\n-\n- expect(findPatientSpy).toHaveBeenCalledWith(expectedPatientId)\n- expect(store.getActions()[1]).toEqual(updatePatientSuccess(expectedUpdatedPatient))\n- })\n- })\n-\ndescribe('add diagnosis', () => {\nit('should add the diagnosis to the patient with the given id', async () => {\nconst expectedDiagnosisId = 'expected id'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "new_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "diff": "import { Modal, Alert, Typeahead } from '@hospitalrun/components'\nimport { act } from '@testing-library/react'\n-import { ReactWrapper, mount } from 'enzyme'\n+import { mount } from 'enzyme'\nimport React from 'react'\n-import { Provider } from 'react-redux'\n-import createMockStore, { MockStore } from 'redux-mock-store'\n-import thunk from 'redux-thunk'\n-import * as patientSlice from '../../../patients/patient-slice'\nimport AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal'\nimport TextInputWithLabelFormGroup from '../../../shared/components/input/TextInputWithLabelFormGroup'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\n-import { RootState } from '../../../shared/store'\n-\n-const mockStore = createMockStore<RootState, any>([thunk])\ndescribe('Add Related Person Modal', () => {\nconst patient = {\n@@ -33,32 +26,30 @@ describe('Add Related Person Modal', () => {\ndateOfBirth: new Date().toISOString(),\n} as Patient\n- let store: MockStore\n-\n- describe('layout', () => {\n- let wrapper: ReactWrapper\n-\n- store = mockStore({\n- patient: { patient },\n- } as any)\n- beforeEach(() => {\n+ const setup = () => {\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\njest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(patient)\n- wrapper = mount(\n- <Provider store={store}>\n- <AddRelatedPersonModal show onCloseButtonClick={jest.fn()} toggle={jest.fn()} />\n- </Provider>,\n+ return mount(\n+ <AddRelatedPersonModal\n+ show\n+ patientId={patient.id}\n+ onCloseButtonClick={jest.fn()}\n+ toggle={jest.fn()}\n+ />,\n)\n- })\n+ }\n+ describe('layout', () => {\nit('should render a modal', () => {\n+ const wrapper = setup()\nconst modal = wrapper.find(Modal)\nexpect(modal).toHaveLength(1)\nexpect(modal.prop('show')).toBeTruthy()\n})\nit('should render a patient search typeahead', () => {\n+ const wrapper = setup()\nconst patientSearchTypeahead = wrapper.find(Typeahead)\nexpect(patientSearchTypeahead).toHaveLength(1)\n@@ -66,6 +57,7 @@ describe('Add Related Person Modal', () => {\n})\nit('should render a relationship type text input', () => {\n+ const wrapper = setup()\nconst relationshipTypeTextInput = wrapper.findWhere((w: any) => w.prop('name') === 'type')\nexpect(relationshipTypeTextInput).toHaveLength(1)\n@@ -78,6 +70,7 @@ describe('Add Related Person Modal', () => {\n})\nit('should render a cancel button', () => {\n+ const wrapper = setup()\nconst cancelButton = wrapper.findWhere(\n(w: { text: () => string }) => w.text() === 'actions.cancel',\n)\n@@ -86,27 +79,25 @@ describe('Add Related Person Modal', () => {\n})\nit('should render an add new related person button button', () => {\n+ const wrapper = setup()\nconst modal = wrapper.find(Modal) as any\nexpect(modal.prop('successButton').children).toEqual('patient.relatedPersons.add')\n})\n- it('should render the error', () => {\n+ it('should render the error when there is an error saving', async () => {\n+ const wrapper = setup()\nconst expectedError = {\n- message: 'some message',\n- relatedPerson: 'some related person error',\n- relationshipType: 'some relationship type error',\n+ message: 'patient.relatedPersons.error.unableToAddRelatedPerson',\n+ relatedPersonError: 'patient.relatedPersons.error.relatedPersonRequired',\n+ relationshipTypeError: 'patient.relatedPersons.error.relationshipTypeRequired',\n}\n- store = mockStore({\n- patient: {\n- patient,\n- relatedPersonError: expectedError,\n- },\n- } as any)\n- wrapper = mount(\n- <Provider store={store}>\n- <AddRelatedPersonModal show onCloseButtonClick={jest.fn()} toggle={jest.fn()} />\n- </Provider>,\n- )\n+\n+ await act(async () => {\n+ const modal = wrapper.find(Modal)\n+ const onSave = (modal.prop('successButton') as any).onClick\n+ await onSave({} as React.MouseEvent<HTMLButtonElement>)\n+ })\n+ wrapper.update()\nconst alert = wrapper.find(Alert)\nconst typeahead = wrapper.find(Typeahead)\n@@ -116,27 +107,13 @@ describe('Add Related Person Modal', () => {\nexpect(alert.prop('title')).toEqual('states.error')\nexpect(typeahead.prop('isInvalid')).toBeTruthy()\nexpect(relationshipTypeInput.prop('isInvalid')).toBeTruthy()\n- expect(relationshipTypeInput.prop('feedback')).toEqual(expectedError.relationshipType)\n+ expect(relationshipTypeInput.prop('feedback')).toEqual(expectedError.relationshipTypeError)\n})\n})\ndescribe('save', () => {\n- jest.spyOn(patientSlice, 'addRelatedPerson')\n- let wrapper: ReactWrapper\n- store = mockStore({\n- patient: {\n- patient,\n- },\n- } as any)\n- beforeEach(() => {\n- wrapper = mount(\n- <Provider store={store}>\n- <AddRelatedPersonModal show onCloseButtonClick={jest.fn()} toggle={jest.fn()} />\n- </Provider>,\n- )\n- })\n-\n- it('should call the save function with the correct data', () => {\n+ it('should call the save function with the correct data', async () => {\n+ const wrapper = setup()\nact(() => {\nconst patientTypeahead = wrapper.find(Typeahead)\npatientTypeahead.prop('onChange')([{ id: '123' }])\n@@ -149,15 +126,22 @@ describe('Add Related Person Modal', () => {\n})\nwrapper.update()\n- act(() => {\n+ await act(async () => {\nconst { onClick } = wrapper.find(Modal).prop('successButton') as any\n- onClick({} as React.MouseEvent<HTMLButtonElement, MouseEvent>)\n+ await onClick({} as React.MouseEvent<HTMLButtonElement, MouseEvent>)\n})\n- expect(patientSlice.addRelatedPerson).toHaveBeenCalledWith(patient.id, {\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\n+ expect.objectContaining({\n+ relatedPersons: [\n+ expect.objectContaining({\npatientId: '123',\ntype: 'relationship',\n- })\n+ }),\n+ ],\n+ }),\n+ )\n})\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/related-persons/RelatedPersonsTab.test.tsx", "new_path": "src/__tests__/patients/related-persons/RelatedPersonsTab.test.tsx", "diff": "@@ -9,7 +9,6 @@ import { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import * as patientSlice from '../../../patients/patient-slice'\nimport AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal'\nimport RelatedPersonTab from '../../../patients/related-persons/RelatedPersonTab'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n@@ -119,7 +118,10 @@ describe('Related Persons Tab', () => {\nbeforeEach(async () => {\njest.spyOn(PatientRepository, 'saveOrUpdate')\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedRelatedPerson)\n+ jest\n+ .spyOn(PatientRepository, 'find')\n+ .mockResolvedValueOnce(patient)\n+ .mockResolvedValueOnce(expectedRelatedPerson)\nawait act(async () => {\nwrapper = await mount(\n@@ -157,14 +159,14 @@ describe('Related Persons Tab', () => {\n})\nit('should remove the related person when the delete button is clicked', async () => {\n- const removeRelatedPersonSpy = jest.spyOn(patientSlice, 'removeRelatedPerson')\n+ const removeRelatedPersonSpy = jest.spyOn(PatientRepository, 'saveOrUpdate')\nconst tr = wrapper.find('tr').at(1)\n- act(() => {\n+ await act(async () => {\nconst onClick = tr.find('button').at(1).prop('onClick') as any\n- onClick({ stopPropagation: jest.fn() })\n+ await onClick({ stopPropagation: jest.fn() })\n})\n- expect(removeRelatedPersonSpy).toHaveBeenCalledWith(patient.id, expectedRelatedPerson.id)\n+ expect(removeRelatedPersonSpy).toHaveBeenCalledWith({ ...patient, relatedPersons: [] })\n})\nit('should navigate to related person patient profile on related person click', async () => {\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/hooks/useAddPatientRelatedPerson.tsx", "diff": "+import { isEmpty } from 'lodash'\n+import { useMutation, queryCache } from 'react-query'\n+\n+import PatientRepository from '../../shared/db/PatientRepository'\n+import RelatedPerson from '../../shared/model/RelatedPerson'\n+import { uuid } from '../../shared/util/uuid'\n+import validateRelatedPerson from '../util/validate-related-person'\n+\n+interface AddRelatedPersonRequest {\n+ patientId: string\n+ relatedPerson: Omit<RelatedPerson, 'id'>\n+}\n+\n+async function addRelatedPerson(request: AddRelatedPersonRequest): Promise<RelatedPerson[]> {\n+ const error = validateRelatedPerson(request.relatedPerson)\n+\n+ if (isEmpty(error)) {\n+ const patient = await PatientRepository.find(request.patientId)\n+ const relatedPersons = patient.relatedPersons ? [...patient.relatedPersons] : []\n+ const newRelated: RelatedPerson = {\n+ id: uuid(),\n+ ...request.relatedPerson,\n+ }\n+ relatedPersons.push(newRelated)\n+\n+ await PatientRepository.saveOrUpdate({\n+ ...patient,\n+ relatedPersons,\n+ })\n+\n+ return relatedPersons\n+ }\n+\n+ throw error\n+}\n+\n+export default function useAddPatientRelatedPerson() {\n+ return useMutation(addRelatedPerson, {\n+ onSuccess: async (data, variables) => {\n+ const relatedPersons = await Promise.all(\n+ data.map(async (rp) => {\n+ const patient = await PatientRepository.find(rp.patientId)\n+ return { ...patient, type: rp.type }\n+ }),\n+ )\n+ await queryCache.setQueryData(['related-persons', variables.patientId], relatedPersons)\n+ },\n+ throwOnError: true,\n+ })\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/hooks/useRemovePatientRelatedPerson.tsx", "diff": "+import { useMutation, queryCache } from 'react-query'\n+\n+import PatientRepository from '../../shared/db/PatientRepository'\n+import RelatedPerson from '../../shared/model/RelatedPerson'\n+\n+interface removeRelatedPersonRequest {\n+ patientId: string\n+ relatedPersonId: string\n+}\n+\n+async function removeRelatedPerson(request: removeRelatedPersonRequest): Promise<RelatedPerson[]> {\n+ const patient = await PatientRepository.find(request.patientId)\n+ const relatedPersons = patient.relatedPersons\n+ ? patient.relatedPersons.filter((rp) => rp.patientId !== request.relatedPersonId)\n+ : []\n+ await PatientRepository.saveOrUpdate({\n+ ...patient,\n+ relatedPersons,\n+ })\n+\n+ return relatedPersons\n+}\n+\n+export default function useRemovePatientRelatedPerson() {\n+ return useMutation(removeRelatedPerson, {\n+ onSuccess: async (data, variables) => {\n+ const relatedPersons = await Promise.all(\n+ data.map(async (rp) => {\n+ const patient = await PatientRepository.find(rp.patientId)\n+ return { ...patient, type: rp.type }\n+ }),\n+ )\n+ await queryCache.setQueryData(['related-persons', variables.patientId], relatedPersons)\n+ },\n+ throwOnError: true,\n+ })\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/patients/patient-slice.ts", "new_path": "src/patients/patient-slice.ts", "diff": "@@ -6,7 +6,6 @@ import validator from 'validator'\nimport PatientRepository from '../shared/db/PatientRepository'\nimport Diagnosis from '../shared/model/Diagnosis'\nimport Patient from '../shared/model/Patient'\n-import RelatedPerson from '../shared/model/RelatedPerson'\nimport Visit from '../shared/model/Visit'\nimport { AppThunk } from '../shared/store'\nimport { uuid } from '../shared/util/uuid'\n@@ -254,51 +253,6 @@ export const updatePatient = (\n}\n}\n-function validateRelatedPerson(relatedPerson: RelatedPerson) {\n- const error: AddRelatedPersonError = {}\n-\n- if (!relatedPerson.patientId) {\n- error.relatedPerson = 'patient.relatedPersons.error.relatedPersonRequired'\n- }\n-\n- if (!relatedPerson.type) {\n- error.relationshipType = 'patient.relatedPersons.error.relationshipTypeRequired'\n- }\n-\n- return error\n-}\n-\n-export const addRelatedPerson = (\n- patientId: string,\n- relatedPerson: RelatedPerson,\n- onSuccess?: (patient: Patient) => void,\n-): AppThunk => async (dispatch) => {\n- const newRelatedPersonError = validateRelatedPerson(relatedPerson)\n-\n- if (isEmpty(newRelatedPersonError)) {\n- const patient = await PatientRepository.find(patientId)\n- const relatedPersons = patient.relatedPersons || []\n- relatedPersons.push({ id: uuid(), ...relatedPerson })\n- patient.relatedPersons = relatedPersons\n-\n- await dispatch(updatePatient(patient, onSuccess))\n- } else {\n- newRelatedPersonError.message = 'patient.relatedPersons.error.unableToAddRelatedPerson'\n- dispatch(addRelatedPersonError(newRelatedPersonError))\n- }\n-}\n-\n-export const removeRelatedPerson = (\n- patientId: string,\n- relatedPersonId: string,\n- onSuccess?: (patient: Patient) => void,\n-): AppThunk => async (dispatch) => {\n- const patient = await PatientRepository.find(patientId)\n- patient.relatedPersons = patient.relatedPersons?.filter((r) => r.patientId !== relatedPersonId)\n-\n- await dispatch(updatePatient(patient, onSuccess))\n-}\n-\nfunction validateDiagnosis(diagnosis: Diagnosis) {\nconst error: AddDiagnosisError = {}\n" }, { "change_type": "MODIFY", "old_path": "src/patients/related-persons/AddRelatedPersonModal.tsx", "new_path": "src/patients/related-persons/AddRelatedPersonModal.tsx", "diff": "import { Modal, Alert, Typeahead, Label } from '@hospitalrun/components'\nimport format from 'date-fns/format'\nimport React, { useState } from 'react'\n-import { useDispatch, useSelector } from 'react-redux'\nimport TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'\n-import PatientRepository from '../../shared/db/PatientRepository'\nimport useTranslator from '../../shared/hooks/useTranslator'\nimport Patient from '../../shared/model/Patient'\n-import RelatedPerson from '../../shared/model/RelatedPerson'\n-import { RootState } from '../../shared/store'\n-import { addRelatedPerson } from '../patient-slice'\n+import useAddPatientRelatedPerson from '../hooks/useAddPatientRelatedPerson'\n+import usePatients from '../hooks/usePatients'\n+import { RelatedPersonError } from '../util/validate-related-person'\ninterface Props {\n+ patientId: string\nshow: boolean\ntoggle: () => void\nonCloseButtonClick: () => void\n}\nconst AddRelatedPersonModal = (props: Props) => {\n- const dispatch = useDispatch()\nconst { t } = useTranslator()\n- const { patient, relatedPersonError } = useSelector((state: RootState) => state.patient)\n- const { show, toggle, onCloseButtonClick } = props\n+ const { patientId, show, toggle, onCloseButtonClick } = props\nconst [relatedPerson, setRelatedPerson] = useState({\npatientId: '',\ntype: '',\n})\n+ const [patientQuery, setPatientQuery] = useState<string>('')\n+\n+ const { data, status } = usePatients({ queryString: patientQuery })\n+ let patients = [] as Patient[]\n+ if (data !== undefined && status !== 'loading') {\n+ patients = data.patients.filter((p: Patient) => p.id !== patientId)\n+ }\n+\n+ const [mutate] = useAddPatientRelatedPerson()\n+ const [relatedPersonError, setRelatedPersonError] = useState<RelatedPersonError | undefined>(\n+ undefined,\n+ )\n+\nconst onFieldChange = (key: string, value: string) => {\nsetRelatedPerson({\n...relatedPerson,\n@@ -40,20 +50,35 @@ const AddRelatedPersonModal = (props: Props) => {\n}\nconst onPatientSelect = (p: Patient[]) => {\n+ if (p.length > 0) {\nsetRelatedPerson({ ...relatedPerson, patientId: p[0].id })\n}\n+ }\nconst onSearch = async (query: string) => {\n- const patients: Patient[] = await PatientRepository.search(query)\n- return patients.filter((p: Patient) => p.id !== patient.id)\n+ setPatientQuery(query)\n+ return [...patients]\n+ }\n+\n+ const onSaveButtonClick = async () => {\n+ try {\n+ await mutate({ patientId, relatedPerson })\n+ onCloseButtonClick()\n+ } catch (e) {\n+ setRelatedPersonError(e)\n+ }\n}\nconst formattedDate = (date: string) => (date ? format(new Date(date), 'yyyy-MM-dd') : '')\nconst body = (\n<form>\n- {relatedPersonError?.message && (\n- <Alert color=\"danger\" title={t('states.error')} message={t(relatedPersonError?.message)} />\n+ {relatedPersonError && (\n+ <Alert\n+ color=\"danger\"\n+ title={t('states.error')}\n+ message={t('patient.relatedPersons.error.unableToAddRelatedPerson')}\n+ />\n)}\n<div className=\"row\">\n<div className=\"col-md-12\">\n@@ -64,15 +89,15 @@ const AddRelatedPersonModal = (props: Props) => {\nsearchAccessor=\"fullName\"\nplaceholder={t('patient.relatedPerson')}\nonChange={onPatientSelect}\n- isInvalid={!!relatedPersonError?.relatedPerson}\n+ isInvalid={!!relatedPersonError?.relatedPersonError}\nonSearch={onSearch}\nrenderMenuItemChildren={(p: Patient) => (\n<div>{`${p.fullName} - ${formattedDate(p.dateOfBirth)} (${p.code})`}</div>\n)}\n/>\n- {relatedPersonError?.relatedPerson && (\n+ {relatedPersonError?.relatedPersonError && (\n<div className=\"text-left ml-3 mt-1 text-small text-danger invalid-feedback d-block related-person-feedback\">\n- {t(relatedPersonError?.relatedPerson)}\n+ {t(relatedPersonError?.relatedPersonError)}\n</div>\n)}\n</div>\n@@ -85,8 +110,8 @@ const AddRelatedPersonModal = (props: Props) => {\nlabel={t('patient.relatedPersons.relationshipType')}\nvalue={relatedPerson.type}\nisEditable\n- isInvalid={!!relatedPersonError?.relationshipType}\n- feedback={t(relatedPersonError?.relationshipType || '')}\n+ isInvalid={!!relatedPersonError?.relationshipTypeError}\n+ feedback={t(relatedPersonError?.relationshipTypeError)}\nisRequired\nonChange={(event: React.ChangeEvent<HTMLInputElement>) => {\nonInputElementChange(event, 'type')\n@@ -113,9 +138,7 @@ const AddRelatedPersonModal = (props: Props) => {\ncolor: 'success',\nicon: 'add',\niconLocation: 'left',\n- onClick: () => {\n- dispatch(addRelatedPerson(patient.id, relatedPerson as RelatedPerson))\n- },\n+ onClick: onSaveButtonClick,\n}}\n/>\n)\n" }, { "change_type": "MODIFY", "old_path": "src/patients/related-persons/RelatedPersonTab.tsx", "new_path": "src/patients/related-persons/RelatedPersonTab.tsx", "diff": "import { Button, Alert, Spinner, Table } from '@hospitalrun/components'\n-import React, { useState, useEffect } from 'react'\n-import { useDispatch, useSelector } from 'react-redux'\n+import React, { useState } from 'react'\n+import { useSelector } from 'react-redux'\nimport { useHistory } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\n-import PatientRepository from '../../shared/db/PatientRepository'\nimport useTranslator from '../../shared/hooks/useTranslator'\nimport Patient from '../../shared/model/Patient'\nimport Permissions from '../../shared/model/Permissions'\nimport { RootState } from '../../shared/store'\n-import { removeRelatedPerson } from '../patient-slice'\n+import usePatientRelatedPersons from '../hooks/usePatientRelatedPersons'\n+import useRemovePatientRelatedPerson from '../hooks/useRemovePatientRelatedPerson'\nimport AddRelatedPersonModal from './AddRelatedPersonModal'\ninterface Props {\n@@ -17,7 +17,6 @@ interface Props {\n}\nconst RelatedPersonTab = (props: Props) => {\n- const dispatch = useDispatch()\nconst history = useHistory()\nconst navigateTo = (location: string) => {\n@@ -27,7 +26,7 @@ const RelatedPersonTab = (props: Props) => {\nconst { t } = useTranslator()\nconst { permissions } = useSelector((state: RootState) => state.user)\nconst [showNewRelatedPersonModal, setShowRelatedPersonModal] = useState<boolean>(false)\n- const [relatedPersons, setRelatedPersons] = useState<Patient[] | undefined>(undefined)\n+ const [mutate] = useRemovePatientRelatedPerson()\nconst breadcrumbs = [\n{\n@@ -37,23 +36,7 @@ const RelatedPersonTab = (props: Props) => {\n]\nuseAddBreadcrumbs(breadcrumbs)\n- useEffect(() => {\n- const fetchRelatedPersons = async () => {\n- const fetchedRelatedPersons: Patient[] = []\n- if (patient.relatedPersons) {\n- await Promise.all(\n- patient.relatedPersons.map(async (person) => {\n- const fetchedRelatedPerson = await PatientRepository.find(person.patientId)\n- fetchedRelatedPersons.push({ ...fetchedRelatedPerson, type: person.type })\n- }),\n- )\n- }\n-\n- setRelatedPersons(fetchedRelatedPersons)\n- }\n-\n- fetchRelatedPersons()\n- }, [patient.relatedPersons])\n+ const { data: relatedPersons } = usePatientRelatedPersons(patient.id)\nconst onNewRelatedPersonClick = () => {\nsetShowRelatedPersonModal(true)\n@@ -64,7 +47,7 @@ const RelatedPersonTab = (props: Props) => {\n}\nconst onRelatedPersonDelete = (relatedPerson: Patient) => {\n- dispatch(removeRelatedPerson(patient.id, relatedPerson.id))\n+ mutate({ patientId: patient.id, relatedPersonId: relatedPerson.id })\n}\nreturn (\n@@ -121,6 +104,7 @@ const RelatedPersonTab = (props: Props) => {\n</div>\n<AddRelatedPersonModal\n+ patientId={patient.id}\nshow={showNewRelatedPersonModal}\ntoggle={closeNewRelatedPersonModal}\nonCloseButtonClick={closeNewRelatedPersonModal}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/patients/util/validate-related-person.ts", "diff": "+import RelatedPerson from '../../shared/model/RelatedPerson'\n+\n+export class RelatedPersonError extends Error {\n+ relatedPersonError?: string\n+\n+ relationshipTypeError?: string\n+\n+ constructor(message: string, related: string, relationship: string) {\n+ super(message)\n+ this.relatedPersonError = related\n+ this.relationshipTypeError = relationship\n+ Object.setPrototypeOf(this, RelatedPersonError.prototype)\n+ }\n+}\n+\n+export default function validateRelatedPerson(relatedPerson: Partial<RelatedPerson>) {\n+ const error: any = {}\n+\n+ if (!relatedPerson.patientId) {\n+ error.relatedPersonError = 'patient.relatedPersons.error.relatedPersonRequired'\n+ }\n+\n+ if (!relatedPerson.type) {\n+ error.relationshipTypeError = 'patient.relatedPersons.error.relationshipTypeRequired'\n+ }\n+\n+ return error\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/Labs.test.tsx", "new_path": "src/__tests__/labs/Labs.test.tsx", "diff": "@@ -36,7 +36,7 @@ describe('Labs', () => {\nbreadcrumbs: { breadcrumbs: [] },\ncomponents: { sidebarCollapsed: false },\nlab: {\n- lab: { id: 'labId', patientId: 'patientId' } as Lab,\n+ lab: { id: 'labId', patient: 'patientId' } as Lab,\npatient: { id: 'patientId', fullName: 'some name' },\nerror: {},\n},\n@@ -83,7 +83,7 @@ describe('Labs', () => {\nlab: {\nlab: {\nid: 'labId',\n- patientId: 'patientId',\n+ patient: 'patientId',\nrequestedOn: new Date().toISOString(),\n} as Lab,\npatient: { id: 'patientId', fullName: 'some name' },\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLab.test.tsx", "new_path": "src/__tests__/labs/ViewLab.test.tsx", "diff": "import { Badge, Button, Alert } from '@hospitalrun/components'\nimport { act } from '@testing-library/react'\nimport format from 'date-fns/format'\n-import { mount } from 'enzyme'\n+import { mount, ReactWrapper } from 'enzyme'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -31,7 +31,7 @@ describe('View Lab', () => {\nstatus: 'requested',\npatient: '1234',\ntype: 'lab type',\n- notes: 'lab notes',\n+ notes: ['lab notes'],\nrequestedOn: '2020-03-30T04:43:20.102Z',\n} as Lab\n@@ -150,15 +150,31 @@ describe('View Lab', () => {\nexpect(resultTextField.prop('value')).toEqual(expectedLab.result)\n})\n- it('should display the notes in the notes text field', async () => {\n- const expectedLab = { ...mockLab, notes: 'expected notes' } as Lab\n+ it('should display the past notes', async () => {\n+ const expectedNotes = 'expected notes'\n+ const expectedLab = { ...mockLab, notes: [expectedNotes] } as Lab\n+ const wrapper = await setup(expectedLab, [Permissions.ViewLab])\n+\n+ const notes = wrapper.find('[data-test=\"note\"]')\n+ const pastNotesIndex = notes.reduce(\n+ (result: number, item: ReactWrapper, index: number) =>\n+ item.text().trim() === expectedNotes ? index : result,\n+ -1,\n+ )\n+\n+ expect(pastNotesIndex).not.toBe(-1)\n+ expect(notes.length).toBe(1)\n+ })\n+\n+ it('should display the notes text field empty', async () => {\n+ const expectedNotes = 'expected notes'\n+ const expectedLab = { ...mockLab, notes: [expectedNotes] } as Lab\nconst wrapper = await setup(expectedLab, [Permissions.ViewLab])\nconst notesTextField = wrapper.find(TextFieldWithLabelFormGroup).at(1)\nexpect(notesTextField).toBeDefined()\n- expect(notesTextField.prop('label')).toEqual('labs.lab.notes')\n- expect(notesTextField.prop('value')).toEqual(expectedLab.notes)\n+ expect(notesTextField.prop('value')).toEqual('')\n})\nit('should display errors', async () => {\n@@ -188,9 +204,7 @@ describe('View Lab', () => {\n})\nit('should display a update lab, complete lab, and cancel lab button if the lab is in a requested state', async () => {\n- const expectedLab = { ...mockLab, notes: 'expected notes' } as Lab\n-\n- const wrapper = await setup(expectedLab, [\n+ const wrapper = await setup(mockLab, [\nPermissions.ViewLab,\nPermissions.CompleteLab,\nPermissions.CancelLab,\n@@ -254,6 +268,18 @@ describe('View Lab', () => {\nconst updateButton = wrapper.find(Button)\nexpect(updateButton).toHaveLength(0)\n})\n+\n+ it('should not display notes text field if the status is canceled', async () => {\n+ const expectedLab = { ...mockLab, status: 'canceled' } as Lab\n+\n+ const wrapper = await setup(expectedLab, [Permissions.ViewLab])\n+\n+ const textsField = wrapper.find(TextFieldWithLabelFormGroup)\n+ const notesTextField = wrapper.find('notesTextField')\n+\n+ expect(textsField.length).toBe(1)\n+ expect(notesTextField).toHaveLength(0)\n+ })\n})\ndescribe('completed lab request', () => {\n@@ -297,6 +323,22 @@ describe('View Lab', () => {\nconst buttons = wrapper.find(Button)\nexpect(buttons).toHaveLength(0)\n})\n+\n+ it('should not display notes text field if the status is completed', async () => {\n+ const expectedLab = { ...mockLab, status: 'completed' } as Lab\n+\n+ const wrapper = await setup(expectedLab, [\n+ Permissions.ViewLab,\n+ Permissions.CompleteLab,\n+ Permissions.CancelLab,\n+ ])\n+\n+ const textsField = wrapper.find(TextFieldWithLabelFormGroup)\n+ const notesTextField = wrapper.find('notesTextField')\n+\n+ expect(textsField.length).toBe(1)\n+ expect(notesTextField).toHaveLength(0)\n+ })\n})\n})\n@@ -304,7 +346,7 @@ describe('View Lab', () => {\nit('should update the lab with the new information', async () => {\nconst wrapper = await setup(mockLab, [Permissions.ViewLab])\nconst expectedResult = 'expected result'\n- const expectedNotes = 'expected notes'\n+ const newNotes = 'expected notes'\nconst resultTextField = wrapper.find(TextFieldWithLabelFormGroup).at(0)\nact(() => {\n@@ -316,7 +358,7 @@ describe('View Lab', () => {\nconst notesTextField = wrapper.find(TextFieldWithLabelFormGroup).at(1)\nact(() => {\nconst onChange = notesTextField.prop('onChange')\n- onChange({ currentTarget: { value: expectedNotes } })\n+ onChange({ currentTarget: { value: newNotes } })\n})\nwrapper.update()\nconst updateButton = wrapper.find(Button)\n@@ -325,6 +367,8 @@ describe('View Lab', () => {\nonClick()\n})\n+ const expectedNotes = mockLab.notes ? [...mockLab.notes, newNotes] : [newNotes]\n+\nexpect(labRepositorySaveSpy).toHaveBeenCalledTimes(1)\nexpect(labRepositorySaveSpy).toHaveBeenCalledWith(\nexpect.objectContaining({ ...mockLab, result: expectedResult, notes: expectedNotes }),\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "new_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "diff": "@@ -177,11 +177,12 @@ describe('New Lab Request', () => {\nconst history = createMemoryHistory()\nlet labRepositorySaveSpy: any\nconst expectedDate = new Date()\n+ const expectedNotes = 'expected notes'\nconst expectedLab = {\npatient: '12345',\ntype: 'expected type',\nstatus: 'requested',\n- notes: 'expected notes',\n+ notes: [expectedNotes],\nid: '1234',\nrequestedOn: expectedDate.toISOString(),\n} as Lab\n@@ -226,7 +227,7 @@ describe('New Lab Request', () => {\nconst notesTextField = wrapper.find(TextFieldWithLabelFormGroup)\nact(() => {\nconst onChange = notesTextField.prop('onChange') as any\n- onChange({ currentTarget: { value: expectedLab.notes } })\n+ onChange({ currentTarget: { value: expectedNotes } })\n})\nwrapper.update()\n" }, { "change_type": "MODIFY", "old_path": "src/labs/ViewLab.tsx", "new_path": "src/labs/ViewLab.tsx", "diff": "-import { Row, Column, Badge, Button, Alert, Toast } from '@hospitalrun/components'\n+import { Row, Column, Badge, Button, Alert, Toast, Callout, Label } from '@hospitalrun/components'\nimport format from 'date-fns/format'\nimport React, { useEffect, useState } from 'react'\nimport { useSelector, useDispatch } from 'react-redux'\n@@ -12,6 +12,7 @@ import Lab from '../shared/model/Lab'\nimport Patient from '../shared/model/Patient'\nimport Permissions from '../shared/model/Permissions'\nimport { RootState } from '../shared/store'\n+import { uuid } from '../shared/util/uuid'\nimport { cancelLab, completeLab, updateLab, fetchLab } from './lab-slice'\nconst getTitle = (patient: Patient | undefined, lab: Lab | undefined) =>\n@@ -26,6 +27,7 @@ const ViewLab = () => {\nconst { lab, patient, status, error } = useSelector((state: RootState) => state.lab)\nconst [labToView, setLabToView] = useState<Lab>()\n+ const [newNotes, setNewNotes] = useState<string>()\nconst [isEditable, setIsEditable] = useState<boolean>(true)\nuseTitle(getTitle(patient, labToView))\n@@ -59,8 +61,7 @@ const ViewLab = () => {\nconst onNotesChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {\nconst notes = event.currentTarget.value\n- const newLab = labToView as Lab\n- setLabToView({ ...newLab, notes })\n+ setNewNotes(notes)\n}\nconst onUpdate = async () => {\n@@ -73,7 +74,12 @@ const ViewLab = () => {\n)\n}\nif (labToView) {\n- dispatch(updateLab(labToView, onSuccess))\n+ const newLab = labToView as Lab\n+ if (newNotes) {\n+ newLab.notes = newLab.notes ? [...newLab.notes, newNotes] : [newNotes]\n+ setNewNotes('')\n+ }\n+ dispatch(updateLab(newLab, onSuccess))\n}\n}\nconst onComplete = async () => {\n@@ -167,6 +173,18 @@ const ViewLab = () => {\nreturn <></>\n}\n+ const getPastNotes = () => {\n+ if (labToView.notes && labToView.notes[0] !== '') {\n+ return labToView.notes.map((note: string) => (\n+ <Callout key={uuid()} data-test=\"note\" color=\"info\">\n+ <p>{note}</p>\n+ </Callout>\n+ ))\n+ }\n+\n+ return <></>\n+ }\n+\nreturn (\n<>\n{status === 'error' && (\n@@ -212,13 +230,16 @@ const ViewLab = () => {\nfeedback={t(error.result as string)}\nonChange={onResultChange}\n/>\n+ <Label text={t('labs.lab.notes')} htmlFor=\"notesTextField\" />\n+ {getPastNotes()}\n+ {isEditable && (\n<TextFieldWithLabelFormGroup\nname=\"notes\"\n- label={t('labs.lab.notes')}\n- value={labToView.notes}\n+ value={newNotes}\nisEditable={isEditable}\nonChange={onNotesChange}\n/>\n+ )}\n{isEditable && (\n<div className=\"row float-right\">\n<div className=\"btn-group btn-group-lg mt-3\">{getButtons()}</div>\n" }, { "change_type": "MODIFY", "old_path": "src/labs/requests/NewLabRequest.tsx", "new_path": "src/labs/requests/NewLabRequest.tsx", "diff": "@@ -24,10 +24,11 @@ const NewLabRequest = () => {\nconst [newLabRequest, setNewLabRequest] = useState({\npatient: '',\ntype: '',\n- notes: '',\nstatus: 'requested',\n})\n+ const [newNote, setNewNote] = useState('')\n+\nuseEffect(() => {\ndispatch(resetLab())\n}, [dispatch])\n@@ -58,9 +59,10 @@ const NewLabRequest = () => {\nconst onNoteChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {\nconst notes = event.currentTarget.value\n+ setNewNote(notes)\nsetNewLabRequest((previousNewLabRequest) => ({\n...previousNewLabRequest,\n- notes,\n+ notes: [notes],\n}))\n}\n@@ -114,7 +116,7 @@ const NewLabRequest = () => {\nname=\"labNotes\"\nlabel={t('labs.lab.notes')}\nisEditable\n- value={newLabRequest.notes}\n+ value={newNote}\nonChange={onNoteChange}\n/>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "src/shared/model/Lab.ts", "new_path": "src/shared/model/Lab.ts", "diff": "@@ -5,7 +5,7 @@ export default interface Lab extends AbstractDBModel {\npatient: string\ntype: string\nrequestedBy: string\n- notes?: string\n+ notes?: string[]\nresult?: string\nstatus: 'requested' | 'completed' | 'canceled'\nrequestedOn: string\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/login/Login.test.tsx", "diff": "+import { Alert } from '@hospitalrun/components'\n+import { mount, ReactWrapper } from 'enzyme'\n+import { createMemoryHistory } from 'history'\n+import React from 'react'\n+import Button from 'react-bootstrap/Button'\n+import { act } from 'react-dom/test-utils'\n+import { Provider } from 'react-redux'\n+import { Router } from 'react-router'\n+import createMockStore, { MockStore } from 'redux-mock-store'\n+import thunk from 'redux-thunk'\n+\n+import Login from '../../login/Login'\n+import TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'\n+import { remoteDb } from '../../shared/config/pouchdb'\n+import User from '../../shared/model/User'\n+import { RootState } from '../../shared/store'\n+\n+const mockStore = createMockStore<RootState, any>([thunk])\n+\n+describe('Login', () => {\n+ const history = createMemoryHistory()\n+ let store: MockStore\n+\n+ const setup = (storeValue: any = { loginError: {}, user: {} as User }) => {\n+ history.push('/login')\n+ store = mockStore(storeValue)\n+\n+ const wrapper = mount(\n+ <Provider store={store}>\n+ <Router history={history}>\n+ <Login />\n+ </Router>\n+ </Provider>,\n+ )\n+\n+ wrapper.update()\n+ return wrapper\n+ }\n+\n+ describe('Layout initial validations', () => {\n+ it('should render a login form', async () => {\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await setup()\n+ })\n+\n+ const form = wrapper.find('form')\n+ expect(form).toHaveLength(1)\n+ })\n+\n+ it('should render a username and password input', async () => {\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = setup()\n+ })\n+\n+ const user = wrapper.find(TextInputWithLabelFormGroup)\n+ expect(user).toHaveLength(2)\n+ })\n+\n+ it('should render a submit button', async () => {\n+ let wrapper: any\n+ await act(async () => {\n+ wrapper = setup()\n+ })\n+\n+ const button = wrapper.find(Button)\n+ expect(button).toHaveLength(1)\n+ })\n+ })\n+\n+ describe('Unable to login', () => {\n+ it('should get field required error message if no username is provided', async () => {\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await setup()\n+ })\n+\n+ jest.spyOn(remoteDb, 'logIn')\n+\n+ const password = wrapper.find('#passwordTextInput').at(0)\n+ await act(async () => {\n+ const onChange = password.prop('onChange') as any\n+ await onChange({ currentTarget: { value: 'password' } })\n+ })\n+\n+ wrapper.update()\n+\n+ const saveButton = wrapper.find({ type: 'submit' }).at(0)\n+\n+ await act(async () => {\n+ const onClick = saveButton.prop('onClick') as any\n+ await onClick({ preventDefault: jest.fn() })\n+ })\n+\n+ wrapper.update()\n+\n+ expect(remoteDb.logIn).toHaveBeenCalledWith('', 'password')\n+ expect(history.location.pathname).toEqual('/login')\n+ expect(store.getActions()).toContainEqual({\n+ type: 'user/loginError',\n+ payload: {\n+ message: 'user.login.error.message.required',\n+ username: 'user.login.error.username.required',\n+ password: 'user.login.error.password.required',\n+ },\n+ })\n+ })\n+\n+ it('should show required username error message', async () => {\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await setup({\n+ user: {\n+ loginError: {\n+ message: 'user.login.error.message.required',\n+ username: 'user.login.error.username.required',\n+ password: 'user.login.error.password.required',\n+ },\n+ },\n+ } as any)\n+ })\n+\n+ let password: ReactWrapper = wrapper.find('#passwordTextInput').at(0)\n+ await act(async () => {\n+ const onChange = password.prop('onChange') as any\n+ await onChange({ currentTarget: { value: 'password' } })\n+ })\n+\n+ wrapper.update()\n+\n+ const alert = wrapper.find(Alert)\n+ const username = wrapper.find('#usernameTextInput')\n+ password = wrapper.find('#passwordTextInput')\n+\n+ const usernameFeedback = username.find('Feedback')\n+ const passwordFeedback = password.find('Feedback')\n+\n+ expect(alert.prop('message')).toEqual('user.login.error.message.required')\n+ expect(usernameFeedback.hasClass('undefined')).not.toBeTruthy()\n+ expect(passwordFeedback.hasClass('undefined')).toBeTruthy()\n+ })\n+\n+ it('should get field required error message if no password is provided', async () => {\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await setup()\n+ })\n+\n+ jest.spyOn(remoteDb, 'logIn')\n+\n+ const username = wrapper.find('#usernameTextInput').at(0)\n+ await act(async () => {\n+ const onChange = username.prop('onChange') as any\n+ await onChange({ currentTarget: { value: 'username' } })\n+ })\n+\n+ wrapper.update()\n+\n+ const saveButton = wrapper.find({ type: 'submit' }).at(0)\n+\n+ await act(async () => {\n+ const onClick = saveButton.prop('onClick') as any\n+ await onClick({ preventDefault: jest.fn() })\n+ })\n+\n+ wrapper.update()\n+\n+ expect(remoteDb.logIn).toHaveBeenCalledWith('username', '')\n+ expect(history.location.pathname).toEqual('/login')\n+ expect(store.getActions()).toContainEqual({\n+ type: 'user/loginError',\n+ payload: {\n+ message: 'user.login.error.message.required',\n+ username: 'user.login.error.username.required',\n+ password: 'user.login.error.password.required',\n+ },\n+ })\n+ })\n+\n+ it('should show required password error message', async () => {\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await setup({\n+ user: {\n+ loginError: {\n+ message: 'user.login.error.message.required',\n+ username: 'user.login.error.username.required',\n+ password: 'user.login.error.password.required',\n+ },\n+ },\n+ } as any)\n+ })\n+\n+ let username: ReactWrapper = wrapper.find('#usernameTextInput').at(0)\n+ await act(async () => {\n+ const onChange = username.prop('onChange') as any\n+ await onChange({ currentTarget: { value: 'username' } })\n+ })\n+\n+ wrapper.update()\n+\n+ const alert = wrapper.find(Alert)\n+ const password = wrapper.find('#passwordTextInput').at(0)\n+ username = wrapper.find('#usernameTextInput').at(0)\n+\n+ const passwordFeedback = password.find('Feedback')\n+ const usernameFeedback = username.find('Feedback')\n+\n+ expect(alert.prop('message')).toEqual('user.login.error.message.required')\n+ expect(passwordFeedback.hasClass('undefined')).not.toBeTruthy()\n+ expect(usernameFeedback.hasClass('undefined')).toBeTruthy()\n+ })\n+\n+ it('should get incorrect username or password error when incorrect username or password is provided', async () => {\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await setup()\n+ })\n+\n+ jest.spyOn(remoteDb, 'logIn').mockRejectedValue({ status: 401 })\n+\n+ const username = wrapper.find('#usernameTextInput').at(0)\n+ await act(async () => {\n+ const onChange = username.prop('onChange') as any\n+ await onChange({ currentTarget: { value: 'username' } })\n+ })\n+\n+ const password = wrapper.find('#passwordTextInput').at(0)\n+ await act(async () => {\n+ const onChange = password.prop('onChange') as any\n+ await onChange({ currentTarget: { value: 'password' } })\n+ })\n+\n+ wrapper.update()\n+\n+ const saveButton = wrapper.find({ type: 'submit' }).at(0)\n+ await act(async () => {\n+ const onClick = saveButton.prop('onClick') as any\n+ await onClick({ preventDefault: jest.fn() })\n+ })\n+\n+ wrapper.update()\n+\n+ expect(remoteDb.logIn).toHaveBeenCalledWith('username', 'password')\n+ expect(history.location.pathname).toEqual('/login')\n+ expect(store.getActions()).toContainEqual({\n+ type: 'user/loginError',\n+ payload: {\n+ message: 'user.login.error.message.incorrect',\n+ },\n+ })\n+ })\n+ })\n+\n+ describe('Sucessfully login', () => {\n+ it('should log in if username and password is correct', async () => {\n+ let wrapper: any\n+\n+ await act(async () => {\n+ wrapper = await setup()\n+ })\n+\n+ jest.spyOn(remoteDb, 'logIn').mockResolvedValue({\n+ name: 'username',\n+ ok: true,\n+ roles: [],\n+ })\n+\n+ jest.spyOn(remoteDb, 'getUser').mockResolvedValue({\n+ _id: 'userId',\n+ metadata: {\n+ givenName: 'test',\n+ familyName: 'user',\n+ },\n+ } as any)\n+\n+ const username = wrapper.find('#usernameTextInput').at(0)\n+ await act(async () => {\n+ const onChange = username.prop('onChange') as any\n+ await onChange({ currentTarget: { value: 'username' } })\n+ })\n+\n+ const password = wrapper.find('#passwordTextInput').at(0)\n+ await act(async () => {\n+ const onChange = password.prop('onChange') as any\n+ await onChange({ currentTarget: { value: 'password' } })\n+ })\n+\n+ const saveButton = wrapper.find({ type: 'submit' }).at(0)\n+\n+ await act(async () => {\n+ const onClick = saveButton.prop('onClick') as any\n+ await onClick({ preventDefault: jest.fn() })\n+ })\n+\n+ wrapper.update()\n+\n+ expect(store.getActions()[0].payload.user).toEqual({\n+ id: 'userId',\n+ givenName: 'test',\n+ familyName: 'user',\n+ })\n+ expect(store.getActions()[0].type).toEqual('user/loginSuccess')\n+ })\n+ })\n+})\n" } ]

[ { "change_type": "MODIFY", "old_path": ".eslintrc.js", "new_path": ".eslintrc.js", "diff": "@@ -11,6 +11,7 @@ module.exports = {\n'eslint:recommended',\n'plugin:@typescript-eslint/eslint-recommended',\n'plugin:@typescript-eslint/recommended',\n+ 'plugin:react-hooks/recommended',\n'prettier',\n'prettier/@typescript-eslint',\n'plugin:prettier/recommended',\n" }, { "change_type": "MODIFY", "old_path": "couchdb/local.ini", "new_path": "couchdb/local.ini", "diff": "@@ -14,3 +14,4 @@ credentials = true\n[chttpd]\nbind_address = 0.0.0.0\n+authentication_handlers = {chttpd_auth, cookie_authentication_handler}, {couch_httpd_auth, proxy_authentication_handler}, {chttpd_auth, default_authentication_handler}\n" }, { "change_type": "MODIFY", "old_path": "docker-compose.yml", "new_path": "docker-compose.yml", "diff": "# Dockerc compose only for developing purpose\n-version: \"3.8\"\n+version: \"3.3\"\nservices:\ncouchdb:\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"eslint-plugin-jsx-a11y\": \"~6.3.0\",\n\"eslint-plugin-prettier\": \"~3.1.2\",\n\"eslint-plugin-react\": \"~7.20.0\",\n- \"eslint-plugin-react-hooks\": \"~4.1.0\",\n+ \"eslint-plugin-react-hooks\": \"~4.1.2\",\n\"history\": \"4.10.1\",\n\"husky\": \"~4.3.0\",\n\"jest\": \"24.9.0\",\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "diff": "@@ -11,7 +11,6 @@ import { mocked } from 'ts-jest/utils'\nimport * as ButtonBarProvider from '../../../../page-header/button-toolbar/ButtonBarProvider'\nimport * as titleUtil from '../../../../page-header/title/useTitle'\n-import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice'\nimport AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm'\nimport ViewAppointment from '../../../../scheduling/appointments/view/ViewAppointment'\nimport AppointmentRepository from '../../../../shared/db/AppointmentRepository'\n@@ -39,8 +38,11 @@ const patient = {\ndescribe('View Appointment', () => {\nlet history: any\nlet store: MockStore\n+ let setButtonToolBarSpy: any\nconst setup = async (status = 'completed', permissions = [Permissions.ReadAppointments]) => {\n+ setButtonToolBarSpy = jest.fn()\n+ jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\njest.spyOn(AppointmentRepository, 'find').mockResolvedValue(appointment)\njest.spyOn(AppointmentRepository, 'delete').mockResolvedValue(appointment)\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n@@ -88,9 +90,6 @@ describe('View Appointment', () => {\n})\nit('should add a \"Edit Appointment\" button to the button tool bar if has WriteAppointment permissions', async () => {\n- const setButtonToolBarSpy = jest.fn()\n- jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\n-\nawait setup('loading', [Permissions.WriteAppointments, Permissions.ReadAppointments])\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\n@@ -98,10 +97,6 @@ describe('View Appointment', () => {\n})\nit('should add a \"Delete Appointment\" button to the button tool bar if has DeleteAppointment permissions', async () => {\n- jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter')\n- const setButtonToolBarSpy = jest.fn()\n- mocked(ButtonBarProvider).useButtonToolbarSetter.mockReturnValue(setButtonToolBarSpy)\n-\nawait setup('loading', [Permissions.DeleteAppointment, Permissions.ReadAppointments])\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\n@@ -111,32 +106,23 @@ describe('View Appointment', () => {\n})\nit('button toolbar empty if has only ReadAppointments permission', async () => {\n- const setButtonToolBarSpy = jest.fn()\n- jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\n-\nawait setup('loading')\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nexpect(actualButtons.length).toEqual(0)\n})\n- it('should dispatch getAppointment if id is present', async () => {\n+ it('should call getAppointment by id if id is present', async () => {\nawait setup()\n-\nexpect(AppointmentRepository.find).toHaveBeenCalledWith(appointment.id)\n- expect(store.getActions()).toContainEqual(appointmentSlice.fetchAppointmentStart())\n- expect(store.getActions()).toContainEqual(\n- appointmentSlice.fetchAppointmentSuccess({ appointment, patient }),\n- )\n})\n- it('should render a loading spinner', async () => {\n- const { wrapper } = await setup('loading')\n-\n- expect(wrapper.find(components.Spinner)).toHaveLength(1)\n- })\n+ // it('should render a loading spinner', async () => {\n+ // const { wrapper } = await setup('loading')\n+ // expect(wrapper.find(components.Spinner)).toHaveLength(1)\n+ // })\n- it('should render a AppointmentDetailForm with the correct data', async () => {\n+ it('should render an AppointmentDetailForm with the correct data', async () => {\nconst { wrapper } = await setup()\nconst appointmentDetailForm = wrapper.find(AppointmentDetailForm)\n@@ -159,20 +145,20 @@ describe('View Appointment', () => {\n})\ndescribe('delete appointment', () => {\n- let setButtonToolBarSpy = jest.fn()\n+ // let setButtonToolBarSpy = jest.fn()\nlet deleteAppointmentSpy = jest.spyOn(AppointmentRepository, 'delete')\nbeforeEach(() => {\n- jest.resetAllMocks()\n+ jest.restoreAllMocks()\njest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter')\ndeleteAppointmentSpy = jest.spyOn(AppointmentRepository, 'delete')\n- setButtonToolBarSpy = jest.fn()\n- mocked(ButtonBarProvider).useButtonToolbarSetter.mockReturnValue(setButtonToolBarSpy)\n+ // setButtonToolBarSpy = jest.fn()\n+ // mocked(ButtonBarProvider).useButtonToolbarSetter.mockReturnValue(setButtonToolBarSpy)\n})\nit('should render a delete appointment button in the button toolbar', async () => {\nawait setup('completed', [Permissions.ReadAppointments, Permissions.DeleteAppointment])\n- expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\n+ expect(setButtonToolBarSpy).toHaveBeenCalled()\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nexpect((actualButtons[0] as any).props.children).toEqual(\n'scheduling.appointments.deleteAppointment',\n@@ -185,7 +171,7 @@ describe('View Appointment', () => {\nPermissions.DeleteAppointment,\n])\n- expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\n+ expect(setButtonToolBarSpy).toHaveBeenCalled()\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nact(() => {\n@@ -204,7 +190,7 @@ describe('View Appointment', () => {\nPermissions.DeleteAppointment,\n])\n- expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\n+ expect(setButtonToolBarSpy).toHaveBeenCalled()\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nact(() => {\n@@ -223,7 +209,7 @@ describe('View Appointment', () => {\nexpect(deleteConfirmationModal.prop('show')).toEqual(false)\n})\n- it('should dispatch DELETE_APPOINTMENT action when modal confirmation button is clicked', async () => {\n+ it('should delete from appointment repository when modal confirmation button is clicked', async () => {\nconst { wrapper } = await setup('completed', [\nPermissions.ReadAppointments,\nPermissions.DeleteAppointment,\n@@ -239,9 +225,6 @@ describe('View Appointment', () => {\nexpect(deleteAppointmentSpy).toHaveBeenCalledTimes(1)\nexpect(deleteAppointmentSpy).toHaveBeenCalledWith(appointment)\n-\n- expect(store.getActions()).toContainEqual(appointmentSlice.deleteAppointmentStart())\n- expect(store.getActions()).toContainEqual(appointmentSlice.deleteAppointmentSuccess())\n})\nit('should navigate to /appointments and display a message when delete is successful', async () => {\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/scheduling/hooks/useAppointment.test.tsx", "diff": "+import { renderHook, act } from '@testing-library/react-hooks'\n+\n+import useAppointment from '../../../scheduling/hooks/useAppointment'\n+import AppointmentRepository from '../../../shared/db/AppointmentRepository'\n+import Appointment from '../../../shared/model/Appointment'\n+import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+\n+describe('useAppointment', () => {\n+ it('should get an appointment by id', async () => {\n+ const expectedAppointmentId = 'some id'\n+ const expectedAppointment = {\n+ id: expectedAppointmentId,\n+ } as Appointment\n+ jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(expectedAppointment)\n+\n+ let actualData: any\n+ await act(async () => {\n+ const renderHookResult = renderHook(() => useAppointment(expectedAppointmentId))\n+ const { result } = renderHookResult\n+ await waitUntilQueryIsSuccessful(renderHookResult)\n+ actualData = result.current.data\n+ })\n+\n+ expect(AppointmentRepository.find).toHaveBeenCalledTimes(1)\n+ expect(AppointmentRepository.find).toBeCalledWith(expectedAppointmentId)\n+ expect(actualData).toEqual(expectedAppointment)\n+ })\n+})\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/view/ViewAppointment.tsx", "new_path": "src/scheduling/appointments/view/ViewAppointment.tsx", "diff": "import { Spinner, Button, Modal, Toast } from '@hospitalrun/components'\n-import React, { useEffect, useState } from 'react'\n-import { useSelector, useDispatch } from 'react-redux'\n-import { useParams, useHistory } from 'react-router-dom'\n+import React, { useCallback, useEffect, useState } from 'react'\n+import { useSelector } from 'react-redux'\n+import { useHistory, useParams } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport { useButtonToolbarSetter } from '../../../page-header/button-toolbar/ButtonBarProvider'\nimport useTitle from '../../../page-header/title/useTitle'\n+import usePatient from '../../../patients/hooks/usePatient'\nimport useTranslator from '../../../shared/hooks/useTranslator'\nimport Permissions from '../../../shared/model/Permissions'\nimport { RootState } from '../../../shared/store'\n-import { fetchAppointment, deleteAppointment } from '../appointment-slice'\n+import useAppointment from '../../hooks/useAppointment'\n+import useDeleteAppointment from '../../hooks/useDeleteAppointment'\nimport AppointmentDetailForm from '../AppointmentDetailForm'\nimport { getAppointmentLabel } from '../util/scheduling-appointment.util'\nconst ViewAppointment = () => {\nconst { t } = useTranslator()\n- useTitle(t('scheduling.appointments.viewAppointment'))\n- const dispatch = useDispatch()\nconst { id } = useParams()\n+ useTitle(t('scheduling.appointments.viewAppointment'))\nconst history = useHistory()\n- const { appointment, patient, status } = useSelector((state: RootState) => state.appointment)\n- const { permissions } = useSelector((state: RootState) => state.user)\n+ const [deleteMutate] = useDeleteAppointment()\nconst [showDeleteConfirmation, setShowDeleteConfirmation] = useState<boolean>(false)\nconst setButtonToolBar = useButtonToolbarSetter()\n+ const { permissions } = useSelector((state: RootState) => state.user)\n+ const { data } = useAppointment(id)\n+ const { data: patient } = usePatient(data ? data.patient : id)\nconst breadcrumbs = [\n{ i18nKey: 'scheduling.appointments.label', location: '/appointments' },\n- { text: getAppointmentLabel(appointment), location: `/patients/${appointment.id}` },\n+ { text: data ? getAppointmentLabel(data) : '', location: `/patients/${id}` },\n]\nuseAddBreadcrumbs(breadcrumbs, true)\n@@ -35,19 +38,21 @@ const ViewAppointment = () => {\nsetShowDeleteConfirmation(true)\n}\n- const onDeleteSuccess = () => {\n- history.push('/appointments')\n- Toast('success', t('states.success'), t('scheduling.appointment.successfullyDeleted'))\n+ const onDeleteConfirmationButtonClick = () => {\n+ if (!data) {\n+ return\n}\n- const onDeleteConfirmationButtonClick = () => {\n- dispatch(deleteAppointment(appointment, onDeleteSuccess))\n+ deleteMutate({ appointmentId: data.id }).then(() => {\n+ history.push('/appointments')\n+ Toast('success', t('states.success'), t('scheduling.appointment.successfullyDeleted'))\n+ })\nsetShowDeleteConfirmation(false)\n}\n- useEffect(() => {\n- const buttons = []\n- if (permissions.includes(Permissions.WriteAppointments)) {\n+ const getButtons = useCallback(() => {\n+ const buttons: React.ReactNode[] = []\n+ if (data && permissions.includes(Permissions.WriteAppointments)) {\nbuttons.push(\n<Button\nkey=\"editAppointmentButton\"\n@@ -55,7 +60,7 @@ const ViewAppointment = () => {\nicon=\"edit\"\noutlined\nonClick={() => {\n- history.push(`/appointments/edit/${appointment.id}`)\n+ history.push(`/appointments/edit/${data.id}`)\n}}\n>\n{t('actions.edit')}\n@@ -76,26 +81,22 @@ const ViewAppointment = () => {\n)\n}\n- setButtonToolBar(buttons)\n- }, [appointment.id, history, permissions, setButtonToolBar, t])\n+ return buttons\n+ }, [data, permissions, t, history])\nuseEffect(() => {\n- if (id) {\n- dispatch(fetchAppointment(id))\n- }\n+ setButtonToolBar(getButtons())\nreturn () => {\nsetButtonToolBar([])\n}\n- }, [dispatch, id, setButtonToolBar])\n-\n- if (status === 'loading') {\n- return <Spinner type=\"BarLoader\" loading />\n- }\n+ }, [setButtonToolBar, getButtons])\nreturn (\n+ <>\n+ {patient && data ? (\n<div>\n- <AppointmentDetailForm appointment={appointment} isEditable={false} patient={patient} />\n+ <AppointmentDetailForm appointment={data} isEditable={false} patient={patient} />\n<Modal\nbody={t('scheduling.appointment.deleteConfirmationMessage')}\nbuttonsAlignment=\"right\"\n@@ -109,6 +110,10 @@ const ViewAppointment = () => {\ntoggle={() => setShowDeleteConfirmation(false)}\n/>\n</div>\n+ ) : (\n+ <Spinner type=\"BarLoader\" loading />\n+ )}\n+ </>\n)\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/scheduling/hooks/useAppointment.tsx", "diff": "+import { QueryKey, useQuery } from 'react-query'\n+\n+import AppointmentRepository from '../../shared/db/AppointmentRepository'\n+import Appointment from '../../shared/model/Appointment'\n+\n+function getAppointmentById(_: QueryKey<string>, appointmentId: string): Promise<Appointment> {\n+ return AppointmentRepository.find(appointmentId)\n+}\n+\n+export default function useAppointment(appointmentId: string) {\n+ return useQuery(['appointment', appointmentId], getAppointmentById)\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/scheduling/hooks/useDeleteAppointment.tsx", "diff": "+import { queryCache, useMutation } from 'react-query'\n+\n+import AppointmentRepository from '../../shared/db/AppointmentRepository'\n+import Appointment from '../../shared/model/Appointment'\n+\n+interface deleteAppointmentRequest {\n+ appointmentId: string\n+}\n+\n+async function deleteAppointment(request: deleteAppointmentRequest): Promise<Appointment> {\n+ const appointment = await AppointmentRepository.find(request.appointmentId)\n+ return AppointmentRepository.delete(appointment)\n+}\n+\n+export default function useDeleteAppointment() {\n+ return useMutation(deleteAppointment, {\n+ onSuccess: async () => {\n+ queryCache.invalidateQueries('appointment')\n+ },\n+ })\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/ViewAppointments.tsx", "new_path": "src/scheduling/appointments/ViewAppointments.tsx", "diff": "import { Calendar, Button } from '@hospitalrun/components'\nimport React, { useEffect, useState } from 'react'\n-import { useSelector, useDispatch } from 'react-redux'\nimport { useHistory } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\n@@ -8,8 +7,7 @@ import { useButtonToolbarSetter } from '../../page-header/button-toolbar/ButtonB\nimport useTitle from '../../page-header/title/useTitle'\nimport PatientRepository from '../../shared/db/PatientRepository'\nimport useTranslator from '../../shared/hooks/useTranslator'\n-import { RootState } from '../../shared/store'\n-import { fetchAppointments } from './appointments-slice'\n+import useAppointments from '../hooks/useAppointments'\ninterface Event {\nid: string\n@@ -25,14 +23,12 @@ const ViewAppointments = () => {\nconst { t } = useTranslator()\nconst history = useHistory()\nuseTitle(t('scheduling.appointments.label'))\n- const dispatch = useDispatch()\n- const { appointments } = useSelector((state: RootState) => state.appointments)\n+ const appointments = useAppointments()\nconst [events, setEvents] = useState<Event[]>([])\nconst setButtonToolBar = useButtonToolbarSetter()\nuseAddBreadcrumbs(breadcrumbs, true)\nuseEffect(() => {\n- dispatch(fetchAppointments())\nsetButtonToolBar([\n<Button\nkey=\"newAppointmentButton\"\n@@ -48,29 +44,26 @@ const ViewAppointments = () => {\nreturn () => {\nsetButtonToolBar([])\n}\n- }, [dispatch, setButtonToolBar, history, t])\n+ }, [setButtonToolBar, history, t])\nuseEffect(() => {\n- const getAppointments = async () => {\n+ appointments.then(async (results) => {\n+ if (results) {\nconst newEvents = await Promise.all(\n- appointments.map(async (a) => {\n- const patient = await PatientRepository.find(a.patient)\n+ results.map(async (result) => {\n+ const patient = await PatientRepository.find(result.patient)\nreturn {\n- id: a.id,\n- start: new Date(a.startDateTime),\n- end: new Date(a.endDateTime),\n+ id: result.id,\n+ start: new Date(result.startDateTime),\n+ end: new Date(result.endDateTime),\ntitle: patient.fullName || '',\nallDay: false,\n}\n}),\n)\n-\nsetEvents(newEvents)\n}\n-\n- if (appointments) {\n- getAppointments()\n- }\n+ })\n}, [appointments])\nreturn (\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/scheduling/hooks/useAppointments.tsx", "diff": "+import AppointmentRepository from '../../shared/db/AppointmentRepository'\n+import Appointment from '../../shared/model/Appointment'\n+\n+async function fetchAppointments(): Promise<Appointment[]> {\n+ const fetchedAppointments = await AppointmentRepository.findAll()\n+ return fetchedAppointments || []\n+}\n+\n+export default function useAppointments() {\n+ return fetchAppointments()\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/Patients.test.tsx", "new_path": "src/__tests__/patients/Patients.test.tsx", "diff": "@@ -12,6 +12,7 @@ import { addBreadcrumbs } from '../../page-header/breadcrumbs/breadcrumbs-slice'\nimport * as titleUtil from '../../page-header/title/TitleContext'\nimport EditPatient from '../../patients/edit/EditPatient'\nimport NewPatient from '../../patients/new/NewPatient'\n+import * as patientNameUtil from '../../patients/util/patient-util'\nimport ViewPatient from '../../patients/view/ViewPatient'\nimport PatientRepository from '../../shared/db/PatientRepository'\nimport Patient from '../../shared/model/Patient'\n@@ -27,8 +28,8 @@ describe('/patients/new', () => {\nconst store = mockStore({\ntitle: 'test',\nuser: { user: { id: '123' }, permissions: [Permissions.WritePatients] },\n- patient: {},\nbreadcrumbs: { breadcrumbs: [] },\n+ patient: {},\ncomponents: { sidebarCollapsed: false },\n} as any)\n@@ -46,6 +47,8 @@ describe('/patients/new', () => {\n)\n})\n+ wrapper.update()\n+\nexpect(wrapper.find(NewPatient)).toHaveLength(1)\nexpect(store.getActions()).toContainEqual(\n@@ -91,6 +94,9 @@ describe('/patients/edit/:id', () => {\n} as Patient\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+ jest\n+ .spyOn(patientNameUtil, 'getPatientFullName')\n+ .mockReturnValue(`${patient.prefix} ${patient.givenName} ${patient.familyName}`)\nconst store = mockStore({\ntitle: 'test',\n@@ -115,14 +121,14 @@ describe('/patients/edit/:id', () => {\nexpect(wrapper.find(EditPatient)).toHaveLength(1)\n- expect(store.getActions()).toContainEqual(\n- addBreadcrumbs([\n+ expect(store.getActions()).toContainEqual({\n+ ...addBreadcrumbs([\n{ i18nKey: 'patients.label', location: '/patients' },\n{ text: 'test test test', location: `/patients/${patient.id}` },\n{ i18nKey: 'patients.editPatient', location: `/patients/${patient.id}/edit` },\n{ i18nKey: 'dashboard.label', location: '/' },\n]),\n- )\n+ })\n})\nit('should render the Dashboard when the user does not have read patient privileges', () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/edit/EditPatient.test.tsx", "new_path": "src/__tests__/patients/edit/EditPatient.test.tsx", "diff": "@@ -11,7 +11,6 @@ import thunk from 'redux-thunk'\nimport * as titleUtil from '../../../page-header/title/TitleContext'\nimport EditPatient from '../../../patients/edit/EditPatient'\nimport GeneralInformation from '../../../patients/GeneralInformation'\n-import * as patientSlice from '../../../patients/patient-slice'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport { RootState } from '../../../shared/store'\n@@ -63,7 +62,9 @@ describe('Edit Patient', () => {\n)\nwrapper.find(EditPatient).props().updateTitle = jest.fn()\n+\nwrapper.update()\n+\nreturn wrapper\n}\n@@ -87,14 +88,12 @@ describe('Edit Patient', () => {\nexpect(wrapper.find(GeneralInformation)).toHaveLength(1)\n})\n- it('should dispatch fetchPatient when component loads', async () => {\n+ it('should load a Patient when component loads', async () => {\nawait act(async () => {\nawait setup()\n})\nexpect(PatientRepository.find).toHaveBeenCalledWith(patient.id)\n- expect(store.getActions()).toContainEqual(patientSlice.fetchPatientStart())\n- expect(store.getActions()).toContainEqual(patientSlice.fetchPatientSuccess(patient))\n})\nit('should dispatch updatePatient when save button is clicked', async () => {\n@@ -114,8 +113,6 @@ describe('Edit Patient', () => {\n})\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(patient)\n- expect(store.getActions()).toContainEqual(patientSlice.updatePatientStart())\n- expect(store.getActions()).toContainEqual(patientSlice.updatePatientSuccess(patient))\n})\nit('should navigate to /patients/:id when cancel is clicked', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/patient-slice.test.ts", "new_path": "src/__tests__/patients/patient-slice.test.ts", "diff": "@@ -10,9 +10,6 @@ import patient, {\ncreatePatientError,\ncreatePatientStart,\ncreatePatientSuccess,\n- fetchPatient,\n- fetchPatientStart,\n- fetchPatientSuccess,\nupdatePatient,\nupdatePatientError,\nupdatePatientStart,\n@@ -38,34 +35,6 @@ describe('patients slice', () => {\nexpect(patientStore.patient).toEqual({})\n})\n- it('should handle the FETCH_PATIENT_START action', () => {\n- const patientStore = patient(undefined, {\n- type: fetchPatientStart.type,\n- })\n-\n- expect(patientStore.status).toEqual('loading')\n- })\n-\n- it('should handle the FETCH_PATIENT_SUCCESS actions', () => {\n- const expectedPatient = {\n- id: '123',\n- rev: '123',\n- sex: 'male',\n- dateOfBirth: new Date().toISOString(),\n- givenName: 'test',\n- familyName: 'test',\n- }\n- const patientStore = patient(undefined, {\n- type: fetchPatientSuccess.type,\n- payload: {\n- ...expectedPatient,\n- },\n- })\n-\n- expect(patientStore.status).toEqual('completed')\n- expect(patientStore.patient).toEqual(expectedPatient)\n- })\n-\nit('should handle the CREATE_PATIENT_START action', () => {\nconst patientsStore = patient(undefined, {\ntype: createPatientStart.type,\n@@ -321,42 +290,6 @@ describe('patients slice', () => {\n)\n})\n})\n-\n- describe('fetch patient', () => {\n- it('should dispatch the FETCH_PATIENT_START action', async () => {\n- const store = mockStore()\n- const expectedPatientId = 'sliceId6'\n- const expectedPatient = { id: expectedPatientId, givenName: 'some name' } as Patient\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n-\n- await store.dispatch(fetchPatient(expectedPatientId))\n-\n- expect(store.getActions()[0]).toEqual(fetchPatientStart())\n- })\n-\n- it('should call the PatientRepository find method with the correct patient id', async () => {\n- const store = mockStore()\n- const expectedPatientId = 'sliceId6'\n- const expectedPatient = { id: expectedPatientId, givenName: 'some name' } as Patient\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n-\n- await store.dispatch(fetchPatient(expectedPatientId))\n-\n- expect(PatientRepository.find).toHaveBeenCalledWith(expectedPatientId)\n- })\n-\n- it('should dispatch the FETCH_PATIENT_SUCCESS action with the correct data', async () => {\n- const store = mockStore()\n- const expectedPatientId = 'sliceId6'\n- const expectedPatient = { id: expectedPatientId, givenName: 'some name' } as Patient\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n-\n- await store.dispatch(fetchPatient(expectedPatientId))\n-\n- expect(store.getActions()[1]).toEqual(fetchPatientSuccess(expectedPatient))\n- })\n- })\n-\ndescribe('update patient', () => {\nit('should dispatch the UPDATE_PATIENT_START action', async () => {\nconst store = mockStore()\n" }, { "change_type": "RENAME", "old_path": "src/__tests__/patients/util/patient-name-util.test.ts", "new_path": "src/__tests__/patients/util/patient-util.test.ts", "diff": "-import { getPatientFullName, getPatientName } from '../../../patients/util/patient-name-util'\n+import {\n+ getPatientCode,\n+ getPatientFullName,\n+ getPatientName,\n+} from '../../../patients/util/patient-util'\nimport Patient from '../../../shared/model/Patient'\n-describe('patient name util', () => {\n+describe('patient util', () => {\ndescribe('getPatientName', () => {\nit('should build the patients name when three different type of names are passed in', () => {\nconst expectedGiven = 'given'\n@@ -56,10 +60,32 @@ describe('patient name util', () => {\nsuffix: 'suffix',\n} as Patient\n+ it('should return the patients name given a patient', () => {\nconst expectedFullName = `${patient.givenName} ${patient.familyName} ${patient.suffix}`\nconst actualFullName = getPatientFullName(patient)\nexpect(actualFullName).toEqual(expectedFullName)\n})\n+\n+ it('should return a empty string given undefined', () => {\n+ expect(getPatientFullName(undefined)).toEqual('')\n+ })\n+ })\n+\n+ describe('getPatientCode', () => {\n+ const patient = {\n+ code: 'code',\n+ } as Patient\n+\n+ it('should return the patients code given a patient', () => {\n+ const actualFullName = getPatientCode(patient)\n+\n+ expect(actualFullName).toEqual(patient.code)\n+ })\n+\n+ it('should return a empty string given undefined', () => {\n+ expect(getPatientCode(undefined)).toEqual('')\n+ })\n+ })\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "new_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "diff": "@@ -18,7 +18,6 @@ import Diagnoses from '../../../patients/diagnoses/Diagnoses'\nimport GeneralInformation from '../../../patients/GeneralInformation'\nimport Labs from '../../../patients/labs/Labs'\nimport NotesTab from '../../../patients/notes/NoteTab'\n-import * as patientSlice from '../../../patients/patient-slice'\nimport RelatedPersonTab from '../../../patients/related-persons/RelatedPersonTab'\nimport ViewPatient from '../../../patients/view/ViewPatient'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n@@ -93,8 +92,6 @@ describe('ViewPatient', () => {\nawait setup()\nexpect(PatientRepository.find).toHaveBeenCalledWith(patient.id)\n- expect(store.getActions()).toContainEqual(patientSlice.fetchPatientStart())\n- expect(store.getActions()).toContainEqual(patientSlice.fetchPatientSuccess(patient))\n})\nit('should have called useUpdateTitle hook', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/patients/appointments/AppointmentsList.tsx", "new_path": "src/patients/appointments/AppointmentsList.tsx", "diff": "@@ -12,12 +12,10 @@ interface Props {\npatientId: string\n}\n-const AppointmentsList = (props: Props) => {\n+const AppointmentsList = ({ patientId }: Props) => {\nconst history = useHistory()\nconst { t } = useTranslator()\n- const { patientId } = props\n-\nconst { data, status } = usePatientsAppointments(patientId)\nconst breadcrumbs = [\n" }, { "change_type": "MODIFY", "old_path": "src/patients/edit/EditPatient.tsx", "new_path": "src/patients/edit/EditPatient.tsx", "diff": "@@ -9,52 +9,39 @@ import useTranslator from '../../shared/hooks/useTranslator'\nimport Patient from '../../shared/model/Patient'\nimport { RootState } from '../../shared/store'\nimport GeneralInformation from '../GeneralInformation'\n-import { updatePatient, fetchPatient } from '../patient-slice'\n-import { getPatientFullName } from '../util/patient-name-util'\n-\n-const getPatientCode = (p: Patient): string => {\n- if (p) {\n- return p.code\n- }\n-\n- return ''\n-}\n+import usePatient from '../hooks/usePatient'\n+import { updatePatient } from '../patient-slice'\n+import { getPatientCode, getPatientFullName } from '../util/patient-util'\nconst EditPatient = () => {\nconst { t } = useTranslator()\nconst history = useHistory()\nconst dispatch = useDispatch()\n+ const { id } = useParams()\n+ const { data: givenPatient, status } = usePatient(id)\nconst [patient, setPatient] = useState({} as Patient)\n- const { patient: reduxPatient, status, updateError } = useSelector(\n- (state: RootState) => state.patient,\n- )\n+ const { updateError } = useSelector((state: RootState) => state.patient)\nconst updateTitle = useUpdateTitle()\n+\nupdateTitle(\n- `${t('patients.editPatient')}: ${getPatientFullName(reduxPatient)} (${getPatientCode(\n- reduxPatient,\n+ `${t('patients.editPatient')}: ${getPatientFullName(givenPatient)} (${getPatientCode(\n+ givenPatient,\n)})`,\n)\nconst breadcrumbs = [\n{ i18nKey: 'patients.label', location: '/patients' },\n- { text: getPatientFullName(reduxPatient), location: `/patients/${reduxPatient.id}` },\n- { i18nKey: 'patients.editPatient', location: `/patients/${reduxPatient.id}/edit` },\n+ { text: getPatientFullName(givenPatient), location: `/patients/${id}` },\n+ { i18nKey: 'patients.editPatient', location: `/patients/${id}/edit` },\n]\nuseAddBreadcrumbs(breadcrumbs, true)\nuseEffect(() => {\n- setPatient(reduxPatient)\n- }, [reduxPatient])\n-\n- const { id } = useParams()\n- useEffect(() => {\n- if (id) {\n- dispatch(fetchPatient(id))\n- }\n- }, [id, dispatch])\n+ setPatient(givenPatient || ({} as Patient))\n+ }, [givenPatient])\nconst onCancel = () => {\nhistory.push(`/patients/${patient.id}`)\n" }, { "change_type": "MODIFY", "old_path": "src/patients/patient-slice.ts", "new_path": "src/patients/patient-slice.ts", "diff": "@@ -72,11 +72,6 @@ const patientSlice = createSlice({\nname: 'patient',\ninitialState,\nreducers: {\n- fetchPatientStart: start,\n- fetchPatientSuccess(state, { payload }: PayloadAction<Patient>) {\n- state.status = 'completed'\n- state.patient = payload\n- },\ncreatePatientStart: start,\ncreatePatientSuccess(state) {\nstate.status = 'completed'\n@@ -102,8 +97,6 @@ const patientSlice = createSlice({\n})\nexport const {\n- fetchPatientStart,\n- fetchPatientSuccess,\ncreatePatientStart,\ncreatePatientSuccess,\ncreatePatientError,\n@@ -113,12 +106,6 @@ export const {\naddDiagnosisError,\n} = patientSlice.actions\n-export const fetchPatient = (id: string): AppThunk => async (dispatch) => {\n- dispatch(fetchPatientStart())\n- const patient = await PatientRepository.find(id)\n- dispatch(fetchPatientSuccess(patient))\n-}\n-\nfunction validatePatient(patient: Patient) {\nconst error: Error = {}\n" }, { "change_type": "RENAME", "old_path": "src/patients/util/patient-name-util.ts", "new_path": "src/patients/util/patient-util.ts", "diff": "@@ -19,7 +19,15 @@ export function getPatientName(givenName?: string, familyName?: string, suffix?:\nreturn name.trim()\n}\n-export function getPatientFullName(patient: Patient): string {\n+export const getPatientCode = (p: Patient | undefined): string => {\n+ if (p) {\n+ return p.code\n+ }\n+\n+ return ''\n+}\n+\n+export function getPatientFullName(patient: Patient | undefined): string {\nif (!patient) {\nreturn ''\n}\n" }, { "change_type": "MODIFY", "old_path": "src/patients/util/set-patient-helper.ts", "new_path": "src/patients/util/set-patient-helper.ts", "diff": "import Patient from '../../shared/model/Patient'\n-import { getPatientName } from './patient-name-util'\n+import { getPatientName } from './patient-util'\n/**\n* Add full name. Get rid of empty phone numbers, emails, and addresses.\n" }, { "change_type": "MODIFY", "old_path": "src/patients/view/ViewPatient.tsx", "new_path": "src/patients/view/ViewPatient.tsx", "diff": "import { Panel, Spinner, TabsHeader, Tab, Button } from '@hospitalrun/components'\nimport React, { useEffect } from 'react'\n-import { useDispatch, useSelector } from 'react-redux'\n+import { useSelector } from 'react-redux'\nimport {\nuseParams,\nwithRouter,\n@@ -14,7 +14,6 @@ import useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport { useButtonToolbarSetter } from '../../page-header/button-toolbar/ButtonBarProvider'\nimport { useUpdateTitle } from '../../page-header/title/TitleContext'\nimport useTranslator from '../../shared/hooks/useTranslator'\n-import Patient from '../../shared/model/Patient'\nimport Permissions from '../../shared/model/Permissions'\nimport { RootState } from '../../shared/store'\nimport Allergies from '../allergies/Allergies'\n@@ -23,48 +22,34 @@ import CareGoalTab from '../care-goals/CareGoalTab'\nimport CarePlanTab from '../care-plans/CarePlanTab'\nimport Diagnoses from '../diagnoses/Diagnoses'\nimport GeneralInformation from '../GeneralInformation'\n+import usePatient from '../hooks/usePatient'\nimport Labs from '../labs/Labs'\nimport Note from '../notes/NoteTab'\n-import { fetchPatient } from '../patient-slice'\nimport RelatedPerson from '../related-persons/RelatedPersonTab'\n-import { getPatientFullName } from '../util/patient-name-util'\n+import { getPatientCode, getPatientFullName } from '../util/patient-util'\nimport VisitTab from '../visits/VisitTab'\n-const getPatientCode = (p: Patient): string => {\n- if (p) {\n- return p.code\n- }\n-\n- return ''\n-}\n-\nconst ViewPatient = () => {\nconst { t } = useTranslator()\nconst history = useHistory()\n- const dispatch = useDispatch()\nconst location = useLocation()\nconst { path } = useRouteMatch()\n+ const setButtonToolBar = useButtonToolbarSetter()\n- const { patient, status } = useSelector((state: RootState) => state.patient)\n+ const { id } = useParams()\nconst { permissions } = useSelector((state: RootState) => state.user)\n+ const { data: patient, status } = usePatient(id)\nconst updateTitle = useUpdateTitle()\nupdateTitle(`${getPatientFullName(patient)} (${getPatientCode(patient)})`)\n- const setButtonToolBar = useButtonToolbarSetter()\n-\nconst breadcrumbs = [\n{ i18nKey: 'patients.label', location: '/patients' },\n- { text: getPatientFullName(patient), location: `/patients/${patient.id}` },\n+ { text: getPatientFullName(patient), location: `/patients/${id}` },\n]\nuseAddBreadcrumbs(breadcrumbs, true)\n- const { id } = useParams()\nuseEffect(() => {\n- if (id) {\n- dispatch(fetchPatient(id))\n- }\n-\nconst buttons = []\nif (permissions.includes(Permissions.WritePatients)) {\nbuttons.push(\n@@ -74,7 +59,7 @@ const ViewPatient = () => {\nicon=\"edit\"\noutlined\nonClick={() => {\n- history.push(`/patients/edit/${patient.id}`)\n+ history.push(`/patients/edit/${id}`)\n}}\n>\n{t('actions.edit')}\n@@ -87,7 +72,7 @@ const ViewPatient = () => {\nreturn () => {\nsetButtonToolBar([])\n}\n- }, [dispatch, id, setButtonToolBar, history, patient.id, permissions, t])\n+ }, [setButtonToolBar, history, id, permissions, t])\nif (status === 'loading' || !patient) {\nreturn <Spinner color=\"blue\" loading size={[10, 25]} type=\"ScaleLoader\" />\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/Appointments.test.tsx", "new_path": "src/__tests__/scheduling/appointments/Appointments.test.tsx", "diff": "@@ -155,18 +155,21 @@ describe('/appointments/edit/:id', () => {\n)\nexpect(wrapper.find(EditAppointment)).toHaveLength(1)\n-\n- expect(store.getActions()).toContainEqual(\n- addBreadcrumbs([\n- { i18nKey: 'scheduling.appointments.label', location: '/appointments' },\n- { text: '123', location: '/appointments/123' },\n- {\n- i18nKey: 'scheduling.appointments.editAppointment',\n- location: '/appointments/edit/123',\n- },\n- { i18nKey: 'dashboard.label', location: '/' },\n- ]),\n- )\n+ expect(AppointmentRepository.find).toHaveBeenCalledWith(appointment.id)\n+\n+ // TODO: Not sure why calling AppointmentRepo.find(id) does not seem to get appointment.\n+ // Possibly something to do with store and state ?\n+ // expect(store.getActions()).toContainEqual({\n+ // ...addBreadcrumbs([\n+ // { i18nKey: 'scheduling.appointments.label', location: '/appointments' },\n+ // { text: '123', location: '/appointments/123' },\n+ // {\n+ // i18nKey: 'scheduling.appointments.editAppointment',\n+ // location: '/appointments/edit/123',\n+ // },\n+ // { i18nKey: 'dashboard.label', location: '/' },\n+ // ]),\n+ // })\n})\nit('should render the Dashboard when the user does not have read appointment privileges', () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "diff": "@@ -11,7 +11,6 @@ import thunk from 'redux-thunk'\nimport { mocked } from 'ts-jest/utils'\nimport * as titleUtil from '../../../../page-header/title/useTitle'\n-import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice'\nimport AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm'\nimport EditAppointment from '../../../../scheduling/appointments/edit/EditAppointment'\nimport AppointmentRepository from '../../../../shared/db/AppointmentRepository'\n@@ -99,17 +98,13 @@ describe('Edit Appointment', () => {\nexpect(wrapper.find(AppointmentDetailForm)).toHaveLength(1)\n})\n- it('should dispatch fetchAppointment when component loads', async () => {\n+ it('should load an appointment when component loads', async () => {\nawait act(async () => {\nawait setup()\n})\nexpect(AppointmentRepository.find).toHaveBeenCalledWith(appointment.id)\nexpect(PatientRepository.find).toHaveBeenCalledWith(appointment.patient)\n- expect(store.getActions()).toContainEqual(appointmentSlice.fetchAppointmentStart())\n- expect(store.getActions()).toContainEqual(\n- appointmentSlice.fetchAppointmentSuccess({ appointment, patient }),\n- )\n})\nit('should use the correct title', async () => {\n@@ -120,7 +115,7 @@ describe('Edit Appointment', () => {\nexpect(titleUtil.default).toHaveBeenCalledWith('scheduling.appointments.editAppointment')\n})\n- it('should dispatch updateAppointment when save button is clicked', async () => {\n+ it('should updateAppointment when save button is clicked', async () => {\nlet wrapper: any\nawait act(async () => {\nwrapper = await setup()\n@@ -137,10 +132,6 @@ describe('Edit Appointment', () => {\n})\nexpect(AppointmentRepository.saveOrUpdate).toHaveBeenCalledWith(appointment)\n- expect(store.getActions()).toContainEqual(appointmentSlice.updateAppointmentStart())\n- expect(store.getActions()).toContainEqual(\n- appointmentSlice.updateAppointmentSuccess(appointment),\n- )\n})\nit('should navigate to /appointments/:id when save is successful', async () => {\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/scheduling/hooks/useAppointments.test.tsx", "diff": "+import { act } from '@testing-library/react-hooks'\n+\n+import useAppointments from '../../../scheduling/hooks/useAppointments'\n+import AppointmentRepository from '../../../shared/db/AppointmentRepository'\n+import Appointment from '../../../shared/model/Appointment'\n+\n+describe('useAppointments', () => {\n+ it('should get an appointment by id', async () => {\n+ const expectedAppointmentId = '123'\n+\n+ const expectedAppointments = [\n+ {\n+ id: '456',\n+ rev: '1',\n+ patient: expectedAppointmentId,\n+ startDateTime: new Date(2020, 1, 1, 9, 0, 0, 0).toISOString(),\n+ endDateTime: new Date(2020, 1, 1, 9, 30, 0, 0).toISOString(),\n+ location: 'location',\n+ reason: 'Follow Up',\n+ },\n+ {\n+ id: '123',\n+ rev: '1',\n+ patient: expectedAppointmentId,\n+ startDateTime: new Date(2020, 1, 1, 8, 0, 0, 0).toISOString(),\n+ endDateTime: new Date(2020, 1, 1, 8, 30, 0, 0).toISOString(),\n+ location: 'location',\n+ reason: 'Checkup',\n+ },\n+ ] as Appointment[]\n+ jest.spyOn(AppointmentRepository, 'findAll').mockResolvedValue(expectedAppointments)\n+\n+ // let actualData: any\n+ await act(async () => {\n+ // const renderHookResult = renderHook(() => useAppointments())\n+ const result = useAppointments()\n+ // await waitUntilQueryIsSuccessful(result)\n+ result.then((actualData) => {\n+ expect(AppointmentRepository.findAll).toHaveBeenCalledTimes(1)\n+ // expect(AppointmentRepository.findAll).toBeCalledWith(expectedAppointmentId)\n+ expect(actualData).toEqual(expectedAppointments)\n+ })\n+ })\n+ })\n+})\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/ViewAppointments.tsx", "new_path": "src/scheduling/appointments/ViewAppointments.tsx", "diff": "@@ -47,15 +47,17 @@ const ViewAppointments = () => {\n}, [setButtonToolBar, history, t])\nuseEffect(() => {\n- appointments.then(async (results) => {\n- if (results) {\n+ // get appointments, find patients, then make Event objects out of the two and set events.\n+ const getAppointments = async () => {\n+ appointments.then(async (appointmentsList) => {\n+ if (appointmentsList) {\nconst newEvents = await Promise.all(\n- results.map(async (result) => {\n- const patient = await PatientRepository.find(result.patient)\n+ appointmentsList.map(async (appointment) => {\n+ const patient = await PatientRepository.find(appointment.patient)\nreturn {\n- id: result.id,\n- start: new Date(result.startDateTime),\n- end: new Date(result.endDateTime),\n+ id: appointment.id,\n+ start: new Date(appointment.startDateTime),\n+ end: new Date(appointment.endDateTime),\ntitle: patient.fullName || '',\nallDay: false,\n}\n@@ -64,7 +66,9 @@ const ViewAppointments = () => {\nsetEvents(newEvents)\n}\n})\n- }, [appointments])\n+ }\n+ getAppointments()\n+ }, []) // provide an empty dependency array, to ensure this useEffect will only run on mount.\nreturn (\n<div>\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "new_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "diff": "-import { Spinner, Button } from '@hospitalrun/components'\n+import { Spinner, Button, Toast } from '@hospitalrun/components'\nimport React, { useEffect, useState } from 'react'\n-import { useDispatch, useSelector } from 'react-redux'\nimport { useHistory, useParams } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport useTitle from '../../../page-header/title/useTitle'\n+import usePatient from '../../../patients/hooks/usePatient'\nimport useTranslator from '../../../shared/hooks/useTranslator'\nimport Appointment from '../../../shared/model/Appointment'\n-import { RootState } from '../../../shared/store'\n-import { updateAppointment, fetchAppointment } from '../appointment-slice'\n+import useAppointment from '../../hooks/useAppointment'\n+import useUpdateAppointment from '../../hooks/useUpdateAppointment'\nimport AppointmentDetailForm from '../AppointmentDetailForm'\nimport { getAppointmentLabel } from '../util/scheduling-appointment.util'\nconst EditAppointment = () => {\nconst { t } = useTranslator()\n+ const { id } = useParams()\n+\nuseTitle(t('scheduling.appointments.editAppointment'))\nconst history = useHistory()\n- const dispatch = useDispatch()\n- const [appointment, setAppointment] = useState({} as Appointment)\n+ const [newAppointment, setAppointment] = useState({} as Appointment)\n+ const { data: currentAppointment, isLoading: isLoadingAppointment } = useAppointment(id)\n+\n+ const {\n+ mutate: updateMutate,\n+ isLoading: isLoadingUpdate,\n+ isError: isErrorUpdate,\n+ error: updateMutateError,\n+ } = useUpdateAppointment(newAppointment)\n+ const { data: patient } = usePatient(currentAppointment ? currentAppointment.patient : id)\n- const { appointment: reduxAppointment, patient, status, error } = useSelector(\n- (state: RootState) => state.appointment,\n- )\nconst breadcrumbs = [\n{ i18nKey: 'scheduling.appointments.label', location: '/appointments' },\n{\n- text: getAppointmentLabel(reduxAppointment),\n- location: `/appointments/${reduxAppointment.id}`,\n+ text: currentAppointment ? getAppointmentLabel(currentAppointment) : '',\n+ location: `/appointments/${id}`,\n},\n{\ni18nKey: 'scheduling.appointments.editAppointment',\n- location: `/appointments/edit/${reduxAppointment.id}`,\n+ location: `/appointments/edit/${id}`,\n},\n]\nuseAddBreadcrumbs(breadcrumbs, true)\nuseEffect(() => {\n- setAppointment(reduxAppointment)\n- }, [reduxAppointment])\n-\n- const { id } = useParams()\n- useEffect(() => {\n- if (id) {\n- dispatch(fetchAppointment(id))\n+ if (currentAppointment !== undefined) {\n+ setAppointment(currentAppointment)\n}\n- }, [id, dispatch])\n+ }, [currentAppointment])\nconst onCancel = () => {\n- history.push(`/appointments/${appointment.id}`)\n- }\n-\n- const onSaveSuccess = () => {\n- history.push(`/appointments/${appointment.id}`)\n+ history.push(`/appointments/${newAppointment.id}`)\n}\nconst onSave = () => {\n- dispatch(updateAppointment(appointment as Appointment, onSaveSuccess))\n+ if (Object.keys(updateMutateError).length === 0 && !isErrorUpdate) {\n+ updateMutate(newAppointment).then(() => {\n+ Toast('success', t('states.success'), t('scheduling.appointment.successfullyUpdated'))\n+ history.push(`/appointments/${newAppointment.id}`)\n+ })\n+ }\n}\nconst onFieldChange = (key: string, value: string | boolean) => {\nsetAppointment({\n- ...appointment,\n+ ...newAppointment,\n[key]: value,\n})\n}\n- if (status === 'loading') {\n+ if (isLoadingAppointment || isLoadingUpdate) {\nreturn <Spinner color=\"blue\" loading size={[10, 25]} type=\"ScaleLoader\" />\n}\n@@ -74,10 +77,10 @@ const EditAppointment = () => {\n<div>\n<AppointmentDetailForm\nisEditable\n- appointment={appointment}\n+ appointment={newAppointment}\npatient={patient}\nonFieldChange={onFieldChange}\n- error={error}\n+ error={updateMutateError}\n/>\n<div className=\"row float-right\">\n<div className=\"btn-group btn-group-lg\">\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/scheduling/appointments/util/validate-appointment.ts", "diff": "+import { isBefore } from 'date-fns'\n+\n+import Appointment from '../../../shared/model/Appointment'\n+\n+export class AppointmentError extends Error {\n+ patient?: string\n+\n+ startDateTime?: string\n+\n+ constructor(patient: string, startDateTime: string, message: string) {\n+ super(message)\n+ this.patient = patient\n+ this.startDateTime = startDateTime\n+ Object.setPrototypeOf(this, AppointmentError.prototype)\n+ }\n+}\n+\n+export default function validateAppointment(appointment: Appointment): AppointmentError {\n+ const newError: any = {}\n+\n+ if (!appointment.patient) {\n+ newError.patient = 'scheduling.appointment.errors.patientRequired'\n+ }\n+ if (isBefore(new Date(appointment.endDateTime), new Date(appointment.startDateTime))) {\n+ newError.startDateTime = 'scheduling.appointment.errors.startDateMustBeBeforeEndDate'\n+ }\n+\n+ return newError as AppointmentError\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/view/ViewAppointment.tsx", "new_path": "src/scheduling/appointments/view/ViewAppointment.tsx", "diff": "@@ -25,11 +25,11 @@ const ViewAppointment = () => {\nconst setButtonToolBar = useButtonToolbarSetter()\nconst { permissions } = useSelector((state: RootState) => state.user)\n- const { data } = useAppointment(id)\n- const { data: patient } = usePatient(data ? data.patient : id)\n+ const { data: appointment } = useAppointment(id)\n+ const { data: patient } = usePatient(appointment ? appointment.patient : id)\nconst breadcrumbs = [\n{ i18nKey: 'scheduling.appointments.label', location: '/appointments' },\n- { text: data ? getAppointmentLabel(data) : '', location: `/patients/${id}` },\n+ { text: appointment ? getAppointmentLabel(appointment) : '', location: `/patients/${id}` },\n]\nuseAddBreadcrumbs(breadcrumbs, true)\n@@ -39,11 +39,11 @@ const ViewAppointment = () => {\n}\nconst onDeleteConfirmationButtonClick = () => {\n- if (!data) {\n+ if (!appointment) {\nreturn\n}\n- deleteMutate({ appointmentId: data.id }).then(() => {\n+ deleteMutate({ appointmentId: appointment.id }).then(() => {\nhistory.push('/appointments')\nToast('success', t('states.success'), t('scheduling.appointment.successfullyDeleted'))\n})\n@@ -52,7 +52,7 @@ const ViewAppointment = () => {\nconst getButtons = useCallback(() => {\nconst buttons: React.ReactNode[] = []\n- if (data && permissions.includes(Permissions.WriteAppointments)) {\n+ if (appointment && permissions.includes(Permissions.WriteAppointments)) {\nbuttons.push(\n<Button\nkey=\"editAppointmentButton\"\n@@ -60,7 +60,7 @@ const ViewAppointment = () => {\nicon=\"edit\"\noutlined\nonClick={() => {\n- history.push(`/appointments/edit/${data.id}`)\n+ history.push(`/appointments/edit/${appointment.id}`)\n}}\n>\n{t('actions.edit')}\n@@ -82,7 +82,7 @@ const ViewAppointment = () => {\n}\nreturn buttons\n- }, [data, permissions, t, history])\n+ }, [appointment, permissions, t, history])\nuseEffect(() => {\nsetButtonToolBar(getButtons())\n@@ -94,9 +94,9 @@ const ViewAppointment = () => {\nreturn (\n<>\n- {patient && data ? (\n+ {patient && appointment ? (\n<div>\n- <AppointmentDetailForm appointment={data} isEditable={false} patient={patient} />\n+ <AppointmentDetailForm appointment={appointment} isEditable={false} patient={patient} />\n<Modal\nbody={t('scheduling.appointment.deleteConfirmationMessage')}\nbuttonsAlignment=\"right\"\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/hooks/useAppointment.tsx", "new_path": "src/scheduling/hooks/useAppointment.tsx", "diff": "-import { QueryKey, useQuery } from 'react-query'\n+import { useQuery } from 'react-query'\nimport AppointmentRepository from '../../shared/db/AppointmentRepository'\nimport Appointment from '../../shared/model/Appointment'\n-function getAppointmentById(_: QueryKey<string>, appointmentId: string): Promise<Appointment> {\n+function getAppointmentById(_: string, appointmentId: string): Promise<Appointment> {\nreturn AppointmentRepository.find(appointmentId)\n}\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/hooks/useDeleteAppointment.tsx", "new_path": "src/scheduling/hooks/useDeleteAppointment.tsx", "diff": "@@ -15,7 +15,7 @@ async function deleteAppointment(request: deleteAppointmentRequest): Promise<App\nexport default function useDeleteAppointment() {\nreturn useMutation(deleteAppointment, {\nonSuccess: async () => {\n- queryCache.invalidateQueries('appointment')\n+ await queryCache.invalidateQueries('appointment')\n},\n})\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/scheduling/hooks/useUpdateAppointment.tsx", "diff": "+import { MutateFunction, queryCache, useMutation } from 'react-query'\n+\n+import AppointmentRepository from '../../shared/db/AppointmentRepository'\n+import Appointment from '../../shared/model/Appointment'\n+import validateAppointment, { AppointmentError } from '../appointments/util/validate-appointment'\n+\n+interface updateAppointmentResult {\n+ mutate: MutateFunction<Appointment, unknown, Appointment, unknown>\n+ isLoading: boolean\n+ isError: boolean\n+ error: AppointmentError\n+}\n+\n+async function updateAppointment(appointment: Appointment): Promise<Appointment> {\n+ return AppointmentRepository.saveOrUpdate(appointment)\n+}\n+\n+export default function useUpdateAppointment(appointment: Appointment): updateAppointmentResult {\n+ const updateAppointmentError = validateAppointment(appointment)\n+ const [mutate, { isLoading, isError }] = useMutation(updateAppointment, {\n+ onSuccess: async () => {\n+ await queryCache.invalidateQueries('appointment')\n+ },\n+ throwOnError: true,\n+ })\n+ const result: updateAppointmentResult = {\n+ mutate,\n+ isLoading,\n+ isError,\n+ error: updateAppointmentError,\n+ }\n+ return result\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/scheduling/index.ts", "new_path": "src/shared/locales/enUs/translations/scheduling/index.ts", "diff": "@@ -32,6 +32,7 @@ export default {\ndeleteConfirmationMessage: 'Are you sure that you want to delete this appointment?',\nsuccessfullyCreated: 'Successfully created appointment.',\nsuccessfullyDeleted: 'Successfully deleted appointment.',\n+ successfullyUpdated: 'Successfully updated appointment.',\n},\n},\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/view/ImportantPatientInfo.tsx", "new_path": "src/patients/view/ImportantPatientInfo.tsx", "diff": "@@ -50,6 +50,7 @@ const ImportantPatientInfo = (props: Props) => {\ncolor: 'black',\nbackgroundColor: 'rgba(245,245,245,1)',\nfontSize: 'small',\n+ padding: '10px',\n}\nconst tableStyle: CSSProperties = {\n@@ -61,9 +62,9 @@ const ImportantPatientInfo = (props: Props) => {\nconst addAllergyButtonStyle: CSSProperties = {\nfontSize: 'small',\n- position: 'absolute',\n- top: '0px',\n- right: '0px',\n+ position: 'relative',\n+ top: '5px',\n+ bottom: '5px',\n}\nreturn (\n@@ -138,6 +139,7 @@ const ImportantPatientInfo = (props: Props) => {\n<Typography variant=\"h5\">{t('patient.diagnoses.label')}</Typography>\n<div className=\"border border-primary\" style={tableStyle}>\n<Table\n+ onRowClick={() => history.push(`/patients/${patient.id}/diagnoses`)}\ngetID={(row) => row.id}\ncolumns={[\n{ label: t('patient.diagnoses.diagnosisName'), key: 'name' },\n@@ -149,6 +151,7 @@ const ImportantPatientInfo = (props: Props) => {\n? format(new Date(row.diagnosisDate), 'yyyy-MM-dd hh:mm a')\n: '',\n},\n+ { label: t('patient.diagnoses.status'), key: 'status' },\n]}\ndata={patient.diagnoses ? (patient.diagnoses as Diagnosis[]) : []}\n/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/view/ViewPatient.tsx", "new_path": "src/patients/view/ViewPatient.tsx", "diff": "@@ -26,7 +26,7 @@ import usePatient from '../hooks/usePatient'\nimport Labs from '../labs/Labs'\nimport Note from '../notes/NoteTab'\nimport RelatedPerson from '../related-persons/RelatedPersonTab'\n-import { getPatientCode, getPatientFullName } from '../util/patient-util'\n+import { getPatientFullName } from '../util/patient-util'\nimport VisitTab from '../visits/VisitTab'\nimport ImportantPatientInfo from './ImportantPatientInfo'\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"build\": \"react-scripts build\",\n\"update\": \"npx npm-check -u\",\n\"prepublishOnly\": \"npm run build\",\n- \"test\": \"npm run translation:check && react-scripts test --detectOpenHandles --testPathIgnorePatterns=src/__tests__/test-utils\",\n- \"test:ci\": \"cross-env CI=true react-scripts test --passWithNoTests --testPathIgnorePatterns=src/__tests__/test-utils\",\n+ \"test\": \"npm run translation:check && react-scripts test --testPathIgnorePatterns=src/__tests__/test-utils --detectOpenHandles\",\n+ \"test:ci\": \"cross-env CI=true react-scripts test --testPathIgnorePatterns=src/__tests__/test-utils --passWithNoTests\",\n\"lint\": \"eslint \\\"src/**/*.{js,jsx,ts,tsx}\\\" \\\"scripts/check-translations/**/*.{js,ts}\\\"\",\n\"lint:fix\": \"eslint \\\"src/**/*.{js,jsx,ts,tsx}\\\" \\\"scripts/check-translations/**/*.{js,ts}\\\" --fix\",\n\"lint-staged\": \"lint-staged\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "diff": "@@ -29,6 +29,7 @@ const appointment = {\nendDateTime: new Date().toISOString(),\nreason: 'reason',\nlocation: 'location',\n+ patient: '123',\n} as Appointment\nconst patient = {\n@@ -40,13 +41,17 @@ describe('View Appointment', () => {\nlet history: any\nlet store: MockStore\nlet setButtonToolBarSpy: any\n+ let deleteAppointmentSpy: any\n+ let findAppointmentSpy: any\nconst setup = async (status = 'completed', permissions = [Permissions.ReadAppointments]) => {\n- setButtonToolBarSpy = jest.fn()\n- jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(appointment)\n- jest.spyOn(AppointmentRepository, 'delete').mockResolvedValue(appointment)\n+ if (status === 'completed') {\n+ findAppointmentSpy = jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(appointment)\n+ deleteAppointmentSpy = jest\n+ .spyOn(AppointmentRepository, 'delete')\n+ .mockResolvedValue(appointment)\n+ }\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\nhistory = createMemoryHistory()\n@@ -83,7 +88,13 @@ describe('View Appointment', () => {\n}\nbeforeEach(() => {\n- jest.restoreAllMocks()\n+ jest.resetAllMocks()\n+ jest.clearAllMocks()\n+ setButtonToolBarSpy = jest.fn()\n+ jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\n+ })\n+ afterEach(() => {\n+ setButtonToolBarSpy.mockReset()\n})\nit('should have called the useUpdateTitle hook', async () => {\n@@ -117,16 +128,17 @@ describe('View Appointment', () => {\nit('should call getAppointment by id if id is present', async () => {\nawait setup()\n- expect(AppointmentRepository.find).toHaveBeenCalledWith(appointment.id)\n+ expect(findAppointmentSpy).toHaveBeenCalledWith(appointment.id)\n})\n- // it('should render a loading spinner', async () => {\n- // const { wrapper } = await setup('loading')\n- // expect(wrapper.find(components.Spinner)).toHaveLength(1)\n- // })\n+ it('should render a loading spinner', async () => {\n+ const { wrapper } = await setup('loading')\n+ expect(wrapper.find(components.Spinner)).toHaveLength(1)\n+ })\nit('should render an AppointmentDetailForm with the correct data', async () => {\nconst { wrapper } = await setup()\n+ wrapper.update()\nconst appointmentDetailForm = wrapper.find(AppointmentDetailForm)\nexpect(appointmentDetailForm.prop('appointment')).toEqual(appointment)\n@@ -147,21 +159,18 @@ describe('View Appointment', () => {\nexpect(deleteAppointmentConfirmationModal.prop('title')).toEqual('actions.confirmDelete')\n})\n- describe('delete appointment', () => {\n- // let setButtonToolBarSpy = jest.fn()\n- let deleteAppointmentSpy = jest.spyOn(AppointmentRepository, 'delete')\n- beforeEach(() => {\n- jest.restoreAllMocks()\n- jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter')\n- deleteAppointmentSpy = jest.spyOn(AppointmentRepository, 'delete')\n+ // describe('delete appointment', () => {\n+ // beforeEach(() => {\n// setButtonToolBarSpy = jest.fn()\n+ // deleteAppointmentSpy = jest.spyOn(AppointmentRepository, 'delete')\n+ // jest.resetAllMocks()\n+ // jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter')\n// mocked(ButtonBarProvider).useButtonToolbarSetter.mockReturnValue(setButtonToolBarSpy)\n- })\n+ // })\nit('should render a delete appointment button in the button toolbar', async () => {\nawait setup('completed', [Permissions.ReadAppointments, Permissions.DeleteAppointment])\n-\n- expect(setButtonToolBarSpy).toHaveBeenCalled()\n+ expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nexpect((actualButtons[0] as any).props.children).toEqual(\n'scheduling.appointments.deleteAppointment',\n@@ -174,7 +183,7 @@ describe('View Appointment', () => {\nPermissions.DeleteAppointment,\n])\n- expect(setButtonToolBarSpy).toHaveBeenCalled()\n+ expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nact(() => {\n@@ -193,7 +202,7 @@ describe('View Appointment', () => {\nPermissions.DeleteAppointment,\n])\n- expect(setButtonToolBarSpy).toHaveBeenCalled()\n+ expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nact(() => {\n@@ -253,6 +262,6 @@ describe('View Appointment', () => {\n'states.success',\n'scheduling.appointment.successfullyDeleted',\n)\n- })\n+ // })\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/ViewAppointments.tsx", "new_path": "src/scheduling/appointments/ViewAppointments.tsx", "diff": "@@ -59,7 +59,7 @@ const ViewAppointments = () => {\nid: appointment.id,\nstart: new Date(appointment.startDateTime),\nend: new Date(appointment.endDateTime),\n- title: patient.fullName || '',\n+ title: patient && patient.fullName ? patient.fullName : '',\nallDay: false,\n}\n}),\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "new_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "diff": "import { Spinner, Button, Toast } from '@hospitalrun/components'\n+import _ from 'lodash'\nimport React, { useEffect, useState } from 'react'\nimport { useHistory, useParams } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../../page-header/breadcrumbs/useAddBreadcrumbs'\n-import usePatient from '../../../patients/hooks/usePatient'\nimport { useUpdateTitle } from '../../../page-header/title/TitleContext'\n+import usePatient from '../../../patients/hooks/usePatient'\nimport useTranslator from '../../../shared/hooks/useTranslator'\nimport Appointment from '../../../shared/model/Appointment'\nimport useAppointment from '../../hooks/useAppointment'\n@@ -55,7 +56,7 @@ const EditAppointment = () => {\n}\nconst onSave = () => {\n- if (Object.keys(updateMutateError).length === 0 && !isErrorUpdate) {\n+ if (_.isEmpty(updateMutateError) && !isErrorUpdate) {\nupdateMutate(newAppointment).then(() => {\nToast('success', t('states.success'), t('scheduling.appointment.successfullyUpdated'))\nhistory.push(`/appointments/${newAppointment.id}`)\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/new/NewAppointment.tsx", "new_path": "src/scheduling/appointments/new/NewAppointment.tsx", "diff": "-import { Button, Toast } from '@hospitalrun/components'\n+import { Button, Spinner, Toast } from '@hospitalrun/components'\nimport addMinutes from 'date-fns/addMinutes'\nimport roundToNearestMinutes from 'date-fns/roundToNearestMinutes'\n-import React, { useState } from 'react'\n-import { useDispatch, useSelector } from 'react-redux'\n+import _ from 'lodash'\n+import React, { useEffect, useState } from 'react'\nimport { useHistory } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport { useUpdateTitle } from '../../../page-header/title/TitleContext'\nimport useTranslator from '../../../shared/hooks/useTranslator'\nimport Appointment from '../../../shared/model/Appointment'\n-import { RootState } from '../../../shared/store'\n-import { createAppointment } from '../appointment-slice'\n+import useScheduleAppointment from '../../hooks/useScheduleAppointment'\nimport AppointmentDetailForm from '../AppointmentDetailForm'\n+import { AppointmentError } from '../util/validate-appointment'\nconst breadcrumbs = [\n{ i18nKey: 'scheduling.appointments.label', location: '/appointments' },\n@@ -21,39 +21,63 @@ const breadcrumbs = [\nconst NewAppointment = () => {\nconst { t } = useTranslator()\nconst history = useHistory()\n- const dispatch = useDispatch()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('scheduling.appointments.new'))\n+ })\nuseAddBreadcrumbs(breadcrumbs, true)\n+\nconst startDateTime = roundToNearestMinutes(new Date(), { nearestTo: 15 })\nconst endDateTime = addMinutes(startDateTime, 60)\n- const { error } = useSelector((state: RootState) => state.appointment)\n-\n- const [appointment, setAppointment] = useState({\n+ const [saved, setSaved] = useState(false)\n+ const [newAppointmentMutateError, setError] = useState<AppointmentError>({} as AppointmentError)\n+ const [newAppointment, setAppointment] = useState({\npatient: '',\nstartDateTime: startDateTime.toISOString(),\nendDateTime: endDateTime.toISOString(),\nlocation: '',\nreason: '',\ntype: '',\n- })\n+ } as Appointment)\n+\n+ const {\n+ mutate: newAppointmentMutate,\n+ isLoading: isLoadingNewAppointment,\n+ isError: isErrorNewAppointment,\n+ validator: validateNewAppointment,\n+ } = useScheduleAppointment()\nconst onCancelClick = () => {\nhistory.push('/appointments')\n}\n- const onSaveSuccess = (newAppointment: Appointment) => {\n- history.push(`/appointments/${newAppointment.id}`)\n- Toast('success', t('states.success'), `${t('scheduling.appointment.successfullyCreated')}`)\n+ const onSave = () => {\n+ setSaved(true)\n+ setError(validateNewAppointment(newAppointment))\n}\n- const onSave = () => {\n- dispatch(createAppointment(appointment as Appointment, onSaveSuccess))\n+ useEffect(() => {\n+ // if save click and no error proceed, else give error message.\n+ if (saved) {\n+ if (_.isEmpty(newAppointmentMutateError) && !isErrorNewAppointment) {\n+ newAppointmentMutate(newAppointment).then((result) => {\n+ Toast('success', t('states.success'), t('scheduling.appointment.successfullyCreated'))\n+ history.push(`/appointments/${result?.id}`)\n+ })\n+ } else if (!_.isEmpty(newAppointmentMutateError)) {\n+ newAppointmentMutateError.message = 'scheduling.appointment.errors.createAppointmentError'\n+ }\n+ }\n+ setSaved(false)\n+ }, [saved, newAppointmentMutateError])\n+\n+ if (isLoadingNewAppointment) {\n+ return <Spinner color=\"blue\" loading size={[10, 25]} type=\"ScaleLoader\" />\n}\nconst onFieldChange = (key: string, value: string | boolean) => {\nsetAppointment({\n- ...appointment,\n+ ...newAppointment,\n[key]: value,\n})\n}\n@@ -62,8 +86,8 @@ const NewAppointment = () => {\n<div>\n<form>\n<AppointmentDetailForm\n- appointment={appointment as Appointment}\n- error={error}\n+ appointment={newAppointment as Appointment}\n+ error={newAppointmentMutateError}\nonFieldChange={onFieldChange}\n/>\n<div className=\"row float-right\">\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/view/ViewAppointment.tsx", "new_path": "src/scheduling/appointments/view/ViewAppointment.tsx", "diff": "@@ -5,8 +5,8 @@ import { useHistory, useParams } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport { useButtonToolbarSetter } from '../../../page-header/button-toolbar/ButtonBarProvider'\n-import usePatient from '../../../patients/hooks/usePatient'\nimport { useUpdateTitle } from '../../../page-header/title/TitleContext'\n+import usePatient from '../../../patients/hooks/usePatient'\nimport useTranslator from '../../../shared/hooks/useTranslator'\nimport Permissions from '../../../shared/model/Permissions'\nimport { RootState } from '../../../shared/store'\n@@ -83,7 +83,7 @@ const ViewAppointment = () => {\n}\nreturn buttons\n- }, [appointment, permissions, t, history])\n+ }, [appointment, permissions])\nuseEffect(() => {\nsetButtonToolBar(getButtons())\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/scheduling/hooks/useScheduleAppointment.tsx", "diff": "+import { MutateFunction, queryCache, useMutation } from 'react-query'\n+\n+import AppointmentRepository from '../../shared/db/AppointmentRepository'\n+import Appointment from '../../shared/model/Appointment'\n+import validateAppointment, { AppointmentError } from '../appointments/util/validate-appointment'\n+\n+interface newAppointmentResult {\n+ mutate: MutateFunction<Appointment, unknown, Appointment, unknown>\n+ isLoading: boolean\n+ isError: boolean\n+ validator(appointment: Appointment): AppointmentError\n+}\n+\n+async function createNewAppointment(appointment: Appointment): Promise<Appointment> {\n+ return AppointmentRepository.save(appointment)\n+}\n+\n+function validateCreateAppointment(appointment: Appointment): AppointmentError {\n+ return validateAppointment(appointment)\n+}\n+\n+export default function useScheduleAppointment(): newAppointmentResult {\n+ const [mutate, { isLoading, isError }] = useMutation(createNewAppointment, {\n+ onSuccess: async () => {\n+ await queryCache.invalidateQueries('appointment')\n+ },\n+ throwOnError: true,\n+ })\n+ const result: newAppointmentResult = {\n+ mutate,\n+ isLoading,\n+ isError,\n+ validator: validateCreateAppointment,\n+ }\n+ return result\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/shared/store/index.ts", "new_path": "src/shared/store/index.ts", "diff": "@@ -5,8 +5,6 @@ import medication from '../../medications/medication-slice'\nimport breadcrumbs from '../../page-header/breadcrumbs/breadcrumbs-slice'\nimport patient from '../../patients/patient-slice'\nimport patients from '../../patients/patients-slice'\n-import appointment from '../../scheduling/appointments/appointment-slice'\n-import appointments from '../../scheduling/appointments/appointments-slice'\nimport user from '../../user/user-slice'\nimport components from '../components/component-slice'\n@@ -14,8 +12,6 @@ const reducer = combineReducers({\npatient,\npatients,\nuser,\n- appointment,\n- appointments,\nbreadcrumbs,\ncomponents,\nmedication,\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "diff": "-import { Button } from '@hospitalrun/components'\n+import { Button, Spinner } from '@hospitalrun/components'\nimport { roundToNearestMinutes, addMinutes } from 'date-fns'\nimport { mount, ReactWrapper } from 'enzyme'\nimport { createMemoryHistory } from 'history'\n@@ -13,6 +13,7 @@ import { mocked } from 'ts-jest/utils'\nimport * as titleUtil from '../../../../page-header/title/TitleContext'\nimport AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm'\nimport EditAppointment from '../../../../scheduling/appointments/edit/EditAppointment'\n+import useUpdateAppointment from '../../../../scheduling/hooks/useUpdateAppointment'\nimport AppointmentRepository from '../../../../shared/db/AppointmentRepository'\nimport PatientRepository from '../../../../shared/db/PatientRepository'\nimport Appointment from '../../../../shared/model/Appointment'\n@@ -23,7 +24,7 @@ const { TitleProvider } = titleUtil\nconst mockStore = createMockStore<RootState, any>([thunk])\ndescribe('Edit Appointment', () => {\n- const appointment = {\n+ const expectedAppointment = {\nid: '123',\npatient: '456',\nstartDateTime: roundToNearestMinutes(new Date(), { nearestTo: 15 }).toISOString(),\n@@ -33,7 +34,7 @@ describe('Edit Appointment', () => {\ntype: 'type',\n} as Appointment\n- const patient = ({\n+ const expectedPatient = ({\nid: '456',\nprefix: 'prefix',\ngivenName: 'givenName',\n@@ -54,21 +55,23 @@ describe('Edit Appointment', () => {\nlet history: any\nlet store: MockStore\n- const setup = async () => {\n+ const setup = async (mockAppointment: Appointment, mockPatient: Patient) => {\n+ jest.resetAllMocks()\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n+ // jest.spyOn(titleUtil, 'useUpdateAppointment').mockImplementation(() => jest.fn())\njest.spyOn(AppointmentRepository, 'saveOrUpdate')\njest.spyOn(AppointmentRepository, 'find')\njest.spyOn(PatientRepository, 'find')\nconst mockedAppointmentRepository = mocked(AppointmentRepository, true)\n- mockedAppointmentRepository.find.mockResolvedValue(appointment)\n- mockedAppointmentRepository.saveOrUpdate.mockResolvedValue(appointment)\n+ mockedAppointmentRepository.find.mockResolvedValue(mockAppointment)\n+ mockedAppointmentRepository.saveOrUpdate.mockResolvedValue(mockAppointment)\nconst mockedPatientRepository = mocked(PatientRepository, true)\n- mockedPatientRepository.find.mockResolvedValue(patient)\n+ mockedPatientRepository.find.mockResolvedValue(mockPatient)\nhistory = createMemoryHistory()\n- store = mockStore({ appointment: { appointment, patient } } as any)\n+ store = mockStore({ appointment: { mockAppointment, mockPatient } } as any)\nhistory.push('/appointments/edit/123')\nconst wrapper = await mount(\n@@ -93,28 +96,28 @@ describe('Edit Appointment', () => {\n})\nit('should render an edit appointment form', async () => {\n- const { wrapper } = await setup()\n+ const { wrapper } = await setup(expectedAppointment, expectedPatient)\n- expect(wrapper.find(AppointmentDetailForm)).toHaveLength(1)\n+ expect(wrapper.find(Spinner)).toHaveLength(1)\n})\nit('should load an appointment when component loads', async () => {\n- const { wrapper } = await setup()\n+ const { wrapper } = await setup(expectedAppointment, expectedPatient)\nawait act(async () => {\nawait wrapper.update()\n})\n- expect(AppointmentRepository.find).toHaveBeenCalledWith(appointment.id)\n- expect(PatientRepository.find).toHaveBeenCalledWith(appointment.patient)\n+ expect(AppointmentRepository.find).toHaveBeenCalledWith(expectedAppointment.id)\n+ expect(PatientRepository.find).toHaveBeenCalledWith(expectedAppointment.patient)\n})\nit('should have called useUpdateTitle hook', async () => {\n- await setup()\n+ await setup(expectedAppointment, expectedPatient)\nexpect(titleUtil.useUpdateTitle).toHaveBeenCalled()\n})\nit('should updateAppointment when save button is clicked', async () => {\n- const { wrapper } = await setup()\n+ const { wrapper } = await setup(expectedAppointment, expectedPatient)\nawait act(async () => {\nawait wrapper.update()\n})\n@@ -127,11 +130,11 @@ describe('Edit Appointment', () => {\nawait onClick()\n})\n- expect(AppointmentRepository.saveOrUpdate).toHaveBeenCalledWith(appointment)\n+ expect(AppointmentRepository.saveOrUpdate).toHaveBeenCalledWith(expectedAppointment)\n})\nit('should navigate to /appointments/:id when save is successful', async () => {\n- const { wrapper } = await setup()\n+ const { wrapper } = await setup(expectedAppointment, expectedPatient)\nconst saveButton = wrapper.find(Button).at(0)\nconst onClick = saveButton.prop('onClick') as any\n@@ -144,7 +147,7 @@ describe('Edit Appointment', () => {\n})\nit('should navigate to /appointments/:id when cancel is clicked', async () => {\n- const { wrapper } = await setup()\n+ const { wrapper } = await setup(expectedAppointment, expectedPatient)\nconst cancelButton = wrapper.find(Button).at(1)\nconst onClick = cancelButton.prop('onClick') as any\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx", "diff": "import * as components from '@hospitalrun/components'\n+import { Alert, Typeahead } from '@hospitalrun/components'\nimport { act } from '@testing-library/react'\nimport { roundToNearestMinutes, addMinutes } from 'date-fns'\nimport { mount } from 'enzyme'\n@@ -11,9 +12,9 @@ import thunk from 'redux-thunk'\nimport { mocked } from 'ts-jest/utils'\nimport * as titleUtil from '../../../../page-header/title/TitleContext'\n-import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice'\nimport AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm'\nimport NewAppointment from '../../../../scheduling/appointments/new/NewAppointment'\n+import DateTimePickerWithLabelFormGroup from '../../../../shared/components/input/DateTimePickerWithLabelFormGroup'\nimport AppointmentRepository from '../../../../shared/db/AppointmentRepository'\nimport LabRepository from '../../../../shared/db/LabRepository'\nimport Appointment from '../../../../shared/model/Appointment'\n@@ -74,7 +75,7 @@ describe('New Appointment', () => {\n})\ndescribe('layout', () => {\n- it('should render a Appointment Detail Component', async () => {\n+ it('should render an Appointment Detail Component', async () => {\nlet wrapper: any\nawait act(async () => {\nwrapper = await setup()\n@@ -85,7 +86,99 @@ describe('New Appointment', () => {\n})\ndescribe('on save click', () => {\n- it('should dispatch createAppointment when save button is clicked', async () => {\n+ it('should have error when error saving without patient', async () => {\n+ let wrapper: any\n+ await act(async () => {\n+ wrapper = await setup()\n+ })\n+ const expectedError = {\n+ message: 'scheduling.appointment.errors.createAppointmentError',\n+ patient: 'scheduling.appointment.errors.patientRequired',\n+ }\n+ const expectedAppointment = {\n+ patient: '',\n+ startDateTime: roundToNearestMinutes(new Date(), { nearestTo: 15 }).toISOString(),\n+ endDateTime: addMinutes(\n+ roundToNearestMinutes(new Date(), { nearestTo: 15 }),\n+ 60,\n+ ).toISOString(),\n+ location: 'location',\n+ reason: 'reason',\n+ type: 'type',\n+ } as Appointment\n+\n+ act(() => {\n+ const appointmentDetailForm = wrapper.find(AppointmentDetailForm)\n+ const onFieldChange = appointmentDetailForm.prop('onFieldChange')\n+ onFieldChange('patient', expectedAppointment.patient)\n+ })\n+\n+ wrapper.update()\n+\n+ const saveButton = wrapper.find(mockedComponents.Button).at(0)\n+ expect(saveButton.text().trim()).toEqual('actions.save')\n+ const onClick = saveButton.prop('onClick') as any\n+\n+ await act(async () => {\n+ await onClick()\n+ })\n+ wrapper.update()\n+ const alert = wrapper.find(Alert)\n+ const typeahead = wrapper.find(Typeahead)\n+\n+ expect(AppointmentRepository.save).toHaveBeenCalledTimes(0)\n+ expect(alert.prop('message')).toEqual(expectedError.message)\n+ expect(typeahead.prop('isInvalid')).toBeTruthy()\n+ })\n+\n+ it('should have error when error saving with end time earlier than start time', async () => {\n+ let wrapper: any\n+ await act(async () => {\n+ wrapper = await setup()\n+ })\n+ const expectedError = {\n+ message: 'scheduling.appointment.errors.createAppointmentError',\n+ startDateTime: 'scheduling.appointment.errors.startDateMustBeBeforeEndDate',\n+ }\n+ const expectedAppointment = {\n+ patient: 'Mr Popo',\n+ startDateTime: new Date(2020, 10, 10, 0, 0, 0, 0).toISOString(),\n+ endDateTime: new Date(1957, 10, 10, 0, 0, 0, 0).toISOString(),\n+ location: 'location',\n+ reason: 'reason',\n+ type: 'type',\n+ } as Appointment\n+\n+ act(() => {\n+ const appointmentDetailForm = wrapper.find(AppointmentDetailForm)\n+ const onFieldChange = appointmentDetailForm.prop('onFieldChange')\n+ onFieldChange('patient', expectedAppointment.patient)\n+ onFieldChange('startDateTime', expectedAppointment.startDateTime)\n+ onFieldChange('endDateTime', expectedAppointment.endDateTime)\n+ })\n+\n+ wrapper.update()\n+\n+ const saveButton = wrapper.find(mockedComponents.Button).at(0)\n+ expect(saveButton.text().trim()).toEqual('actions.save')\n+ const onClick = saveButton.prop('onClick') as any\n+\n+ await act(async () => {\n+ await onClick()\n+ })\n+ wrapper.update()\n+ const alert = wrapper.find(Alert)\n+ const typeahead = wrapper.find(Typeahead)\n+ const dateInput = wrapper.find(DateTimePickerWithLabelFormGroup).at(0)\n+\n+ expect(AppointmentRepository.save).toHaveBeenCalledTimes(0)\n+ expect(alert.prop('message')).toEqual(expectedError.message)\n+ expect(typeahead.prop('isInvalid')).toBeTruthy()\n+ expect(dateInput.prop('isInvalid')).toBeTruthy()\n+ expect(dateInput.prop('feedback')).toEqual(expectedError.startDateTime)\n+ })\n+\n+ it('should call AppointmentRepo.save when save button is clicked', async () => {\nlet wrapper: any\nawait act(async () => {\nwrapper = await setup()\n@@ -160,8 +253,6 @@ describe('New Appointment', () => {\n})\nexpect(AppointmentRepository.save).toHaveBeenCalledWith(expectedAppointment)\n- expect(store.getActions()).toContainEqual(appointmentSlice.createAppointmentStart())\n- expect(store.getActions()).toContainEqual(appointmentSlice.createAppointmentSuccess())\n})\nit('should navigate to /appointments/:id when a new appointment is created', async () => {\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/scheduling/hooks/useScheduleAppointment.test.tsx", "diff": "+import * as AppointmentValidator from '../../../scheduling/appointments/util/validate-appointment'\n+import { AppointmentError } from '../../../scheduling/appointments/util/validate-appointment'\n+import useScheduleAppointment from '../../../scheduling/hooks/useScheduleAppointment'\n+import AppointmentRepository from '../../../shared/db/AppointmentRepository'\n+import Appointment from '../../../shared/model/Appointment'\n+import executeMutation from '../../test-utils/use-mutation.util'\n+\n+describe('useScheduleAppointment', () => {\n+ beforeEach(() => {\n+ jest.restoreAllMocks()\n+ })\n+\n+ it('should save the appointment with correct data', async () => {\n+ const expectedAppointment = {\n+ patient: 'Granny Getyourgun',\n+ startDateTime: new Date(2020, 10, 1, 0, 0, 0, 0).toISOString(),\n+ endDateTime: new Date(2020, 10, 1, 1, 0, 0, 0).toISOString(),\n+ location: 'location',\n+ reason: 'reason',\n+ type: 'type',\n+ } as Appointment\n+\n+ jest.spyOn(AppointmentRepository, 'save').mockResolvedValue(expectedAppointment)\n+\n+ const actualData = await executeMutation(() => {\n+ const result = useScheduleAppointment()\n+ return [result.mutate]\n+ }, expectedAppointment)\n+ expect(AppointmentRepository.save).toHaveBeenCalledTimes(1)\n+ expect(AppointmentRepository.save).toBeCalledWith(expectedAppointment)\n+ expect(actualData).toEqual(expectedAppointment)\n+ })\n+\n+ it('should throw an error if validation fails', async () => {\n+ const expectedAppointmentError = {\n+ message: 'scheduling.appointment.errors.createAppointmentError',\n+ patient: 'scheduling.appointment.errors.patientRequired',\n+ startDateTime: 'scheduling.appointment.errors.startDateMustBeBeforeEndDate',\n+ } as AppointmentError\n+\n+ jest.spyOn(AppointmentValidator, 'default').mockReturnValue(expectedAppointmentError)\n+ jest.spyOn(AppointmentRepository, 'save').mockResolvedValue({} as Appointment)\n+\n+ try {\n+ await executeMutation(() => {\n+ const result = useScheduleAppointment()\n+ return [result.mutate]\n+ }, {})\n+ } catch (e) {\n+ expect(e).toEqual(expectedAppointmentError)\n+ expect(AppointmentRepository.save).not.toHaveBeenCalled()\n+ }\n+ })\n+})\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/scheduling/hooks/useDeleteAppointment.test.tsx", "diff": "+import useDeleteAppointment from '../../../scheduling/hooks/useDeleteAppointment'\n+import AppointmentRepository from '../../../shared/db/AppointmentRepository'\n+import Appointment from '../../../shared/model/Appointment'\n+import * as uuid from '../../../shared/util/uuid'\n+import executeMutation from '../../test-utils/use-mutation.util'\n+\n+describe('use delete appoinment', () => {\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n+ })\n+\n+ it('should remove an appointment with the given id', async () => {\n+ const expectedAppointmentId = '123'\n+\n+ const expectedAppointment = {\n+ id: '123',\n+ patient: '456',\n+ startDateTime: new Date(2020, 10, 1, 0, 0, 0, 0).toISOString(),\n+ endDateTime: new Date(2020, 10, 1, 1, 0, 0, 0).toISOString(),\n+ location: 'location',\n+ reason: 'reason',\n+ type: 'type',\n+ } as Appointment\n+\n+ jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(expectedAppointment)\n+ jest.spyOn(uuid, 'uuid').mockReturnValue(expectedAppointmentId)\n+ jest.spyOn(AppointmentRepository, 'delete').mockResolvedValue(expectedAppointment)\n+\n+ const result = await executeMutation(() => useDeleteAppointment(), {\n+ appointmentId: expectedAppointmentId,\n+ })\n+\n+ expect(AppointmentRepository.find).toHaveBeenCalledTimes(1)\n+ expect(AppointmentRepository.delete).toHaveBeenCalledTimes(1)\n+ expect(AppointmentRepository.delete).toHaveBeenCalledWith(expectedAppointment)\n+ expect(result).toEqual(expectedAppointment)\n+ })\n+})\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/scheduling/hooks/useUpdateAppointment.test.tsx", "diff": "+import { act } from '@testing-library/react-hooks'\n+\n+import useUpdateLab from '../../../labs/hooks/useUpdateLab'\n+import useUpdateAppointment from '../../../scheduling/hooks/useUpdateAppointment'\n+import AppointmentRepository from '../../../shared/db/AppointmentRepository'\n+import Appointment from '../../../shared/model/Appointment'\n+import executeMutation from '../../test-utils/use-mutation.util'\n+\n+describe('Use update appointment', () => {\n+ const expectedAppointment = {\n+ id: '123',\n+ patient: '456',\n+ startDateTime: new Date(2020, 10, 1, 0, 0, 0, 0).toISOString(),\n+ endDateTime: new Date(2020, 10, 1, 1, 0, 0, 0).toISOString(),\n+ location: 'location',\n+ reason: 'reason',\n+ type: 'type',\n+ } as Appointment\n+\n+ jest.spyOn(AppointmentRepository, 'saveOrUpdate').mockResolvedValue(expectedAppointment)\n+\n+ it('should update appointment', async () => {\n+ let actualData: any\n+\n+ await act(async () => {\n+ actualData = await executeMutation(() => {\n+ const result = useUpdateAppointment(expectedAppointment)\n+ return [result.mutate]\n+ }, expectedAppointment)\n+ })\n+\n+ expect(AppointmentRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n+ expect(AppointmentRepository.saveOrUpdate).toHaveBeenCalledWith(expectedAppointment)\n+ expect(actualData).toEqual(expectedAppointment)\n+ })\n+})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/labs/requests/NewLabRequest.tsx", "new_path": "src/labs/requests/NewLabRequest.tsx", "diff": "@@ -72,7 +72,9 @@ const NewLabRequest = () => {\nToast(\n'success',\nt('states.success'),\n- `${t('lab.successfullyCreated')} ${newLab?.type} ${newLab?.patient}`,\n+ `${t('labs.successfullyCreated')} ${newLab?.type} ${t('labs.lab.for')} ${\n+ (await PatientRepository.find(newLab?.patient || '')).fullName\n+ }`,\n)\nsetError(undefined)\n} catch (e) {\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/labs/index.ts", "new_path": "src/shared/locales/enUs/translations/labs/index.ts", "diff": "@@ -5,6 +5,7 @@ export default {\nsearch: 'Search labs',\nsuccessfullyUpdated: 'Successfully updated',\nsuccessfullyCompleted: 'Successfully completed',\n+ successfullyCreated: 'Successfully created',\nstatus: {\nrequested: 'Requested',\ncompleted: 'Completed',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx", "diff": "@@ -16,9 +16,7 @@ import AppointmentDetailForm from '../../../../scheduling/appointments/Appointme\nimport NewAppointment from '../../../../scheduling/appointments/new/NewAppointment'\nimport DateTimePickerWithLabelFormGroup from '../../../../shared/components/input/DateTimePickerWithLabelFormGroup'\nimport AppointmentRepository from '../../../../shared/db/AppointmentRepository'\n-import LabRepository from '../../../../shared/db/LabRepository'\nimport Appointment from '../../../../shared/model/Appointment'\n-import Lab from '../../../../shared/model/Lab'\nimport Patient from '../../../../shared/model/Patient'\nimport { RootState } from '../../../../shared/store'\n@@ -37,8 +35,6 @@ describe('New Appointment', () => {\nmocked(AppointmentRepository, true).save.mockResolvedValue(\nexpectedNewAppointment as Appointment,\n)\n- jest.spyOn(LabRepository, 'findAllByPatientId').mockResolvedValue([] as Lab[])\n-\nhistory = createMemoryHistory()\nstore = mockStore({\nappointment: {\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "new_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "diff": "@@ -35,7 +35,7 @@ const EditAppointment = () => {\nconst breadcrumbs = [\n{ i18nKey: 'scheduling.appointments.label', location: '/appointments' },\n{\n- text: currentAppointment ? getAppointmentLabel(currentAppointment) : '',\n+ text: getAppointmentLabel(currentAppointment),\nlocation: `/appointments/${id}`,\n},\n{\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/util/scheduling-appointment.util.ts", "new_path": "src/scheduling/appointments/util/scheduling-appointment.util.ts", "diff": "@@ -12,7 +12,11 @@ function toLocaleString(date: Date) {\nreturn date.toLocaleString([], options)\n}\n-export function getAppointmentLabel(appointment: Appointment) {\n+export function getAppointmentLabel(appointment: Appointment | undefined) {\n+ if (!appointment) {\n+ return ''\n+ }\n+\nconst { id, startDateTime, endDateTime } = appointment\nreturn startDateTime && endDateTime\n" } ]

[ { "change_type": "MODIFY", "old_path": ".eslintrc.js", "new_path": ".eslintrc.js", "diff": "@@ -11,7 +11,6 @@ module.exports = {\n'eslint:recommended',\n'plugin:@typescript-eslint/eslint-recommended',\n'plugin:@typescript-eslint/recommended',\n- 'plugin:react-hooks/recommended',\n'prettier',\n'prettier/@typescript-eslint',\n'plugin:prettier/recommended',\n" }, { "change_type": "MODIFY", "old_path": "couchdb/local.ini", "new_path": "couchdb/local.ini", "diff": "@@ -14,4 +14,3 @@ credentials = true\n[chttpd]\nbind_address = 0.0.0.0\n-authentication_handlers = {chttpd_auth, cookie_authentication_handler}, {couch_httpd_auth, proxy_authentication_handler}, {chttpd_auth, default_authentication_handler}\n" }, { "change_type": "MODIFY", "old_path": "docker-compose.yml", "new_path": "docker-compose.yml", "diff": "# Dockerc compose only for developing purpose\n-version: \"3.3\"\n+version: \"3.8\"\nservices:\ncouchdb:\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/Appointments.test.tsx", "new_path": "src/__tests__/scheduling/appointments/Appointments.test.tsx", "diff": "import { mount, ReactWrapper } from 'enzyme'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\n-import { MemoryRouter } from 'react-router-dom'\n+import { MemoryRouter, Route } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n@@ -27,7 +26,8 @@ let route: any\ndescribe('/appointments', () => {\n// eslint-disable-next-line no-shadow\n- const setup = (route: string, permissions: Permissions[], renderHr: boolean = false) => {\n+\n+ const setup = (setup_route: string, permissions: Permissions[], renderHr: boolean = false) => {\nconst appointment = {\nid: '123',\npatient: '456',\n@@ -49,14 +49,15 @@ describe('/appointments', () => {\nbreadcrumbs: { breadcrumbs: [] },\ncomponents: { sidebarCollapsed: false },\n} as any)\n-\n+ jest.useFakeTimers()\nconst wrapper = mount(\n<Provider store={store}>\n- <MemoryRouter initialEntries={[route]}>\n+ <MemoryRouter initialEntries={[setup_route]}>\n<TitleProvider>{renderHr ? <HospitalRun /> : <Appointments />}</TitleProvider>\n</MemoryRouter>\n</Provider>,\n)\n+ jest.advanceTimersByTime(100)\nif (!renderHr) {\nwrapper.find(Appointments).props().updateTitle = jest.fn()\n}\n@@ -68,7 +69,7 @@ describe('/appointments', () => {\nit('should render the appointments screen when /appointments is accessed', async () => {\nroute = '/appointments'\nconst permissions: Permissions[] = [Permissions.ReadAppointments]\n- const { wrapper, store } = setup(route, permissions)\n+ const { wrapper, store } = await setup(route, permissions)\nexpect(wrapper.find(ViewAppointments)).toHaveLength(1)\n@@ -83,11 +84,9 @@ describe('/appointments', () => {\nit('should render the Dashboard when the user does not have read appointment privileges', async () => {\nroute = '/appointments'\nconst permissions: Permissions[] = []\n- const { wrapper } = setup(route, permissions, true)\n+ const { wrapper } = await setup(route, permissions, true)\n- await act(async () => {\nwrapper.update()\n- })\nexpect(wrapper.find(Dashboard)).toHaveLength(1)\n})\n})\n@@ -136,9 +135,7 @@ describe('/appointments/new', () => {\nconst permissions: Permissions[] = [Permissions.WriteAppointments]\nconst { wrapper, store } = setup(route, permissions, false)\n- await act(async () => {\n- await wrapper.update()\n- })\n+ wrapper.update()\nexpect(wrapper.find(NewAppointment)).toHaveLength(1)\nexpect(store.getActions()).toContainEqual(\n@@ -161,7 +158,7 @@ describe('/appointments/new', () => {\ndescribe('/appointments/edit/:id', () => {\n// eslint-disable-next-line no-shadow\n- const setup = (route: string, permissions: Permissions[], renderHr: boolean = false) => {\n+ const setup = async (route: string, permissions: Permissions[], renderHr: boolean = false) => {\nconst appointment = {\nid: '123',\npatient: '456',\n@@ -184,10 +181,12 @@ describe('/appointments/edit/:id', () => {\ncomponents: { sidebarCollapsed: false },\n} as any)\n- const wrapper = mount(\n+ const wrapper = await mount(\n<Provider store={store}>\n<MemoryRouter initialEntries={[route]}>\n+ <Route path=\"/appointments/edit/:id\">\n<TitleProvider>{renderHr ? <HospitalRun /> : <EditAppointment />}</TitleProvider>\n+ </Route>\n</MemoryRouter>\n</Provider>,\n)\n@@ -199,41 +198,88 @@ describe('/appointments/edit/:id', () => {\nreturn { wrapper: wrapper as ReactWrapper, store }\n}\n- it('should render the edit appointment screen when /appointments/edit/:id is accessed', () => {\n+ it('should render the edit appointment screen when /appointments/edit/:id is accessed', async () => {\nroute = '/appointments/edit/123'\nconst permissions: Permissions[] = [Permissions.WriteAppointments, Permissions.ReadAppointments]\n- const { wrapper, store } = setup(route, permissions, false)\n+ const { wrapper, store } = await setup(route, permissions, false)\nexpect(wrapper.find(EditAppointment)).toHaveLength(1)\n- expect(AppointmentRepository.find).toHaveBeenCalledWith(appointment.id)\n-\n- // TODO: Not sure why calling AppointmentRepo.find(id) does not seem to get appointment.\n- // Possibly something to do with store and state ?\n- // expect(store.getActions()).toContainEqual({\n- // ...addBreadcrumbs([\n- // { i18nKey: 'scheduling.appointments.label', location: '/appointments' },\n- // { text: '123', location: '/appointments/123' },\n- // {\n- // i18nKey: 'scheduling.appointments.editAppointment',\n- // location: '/appointments/edit/123',\n- // },\n- // { i18nKey: 'dashboard.label', location: '/' },\n- // ]),\n- // })\n+ expect(AppointmentRepository.find).toHaveBeenCalledTimes(1)\n+ expect(AppointmentRepository.find).toHaveBeenCalledWith('123')\n})\n- it('should render the Dashboard when the user does not have read appointment privileges', () => {\n+ it('should render the Dashboard when the user does not have read appointment privileges', async () => {\nroute = '/appointments/edit/123'\nconst permissions: Permissions[] = []\n- const { wrapper } = setup(route, permissions, true)\n+ const appointment = {\n+ id: '123',\n+ patient: '456',\n+ } as Appointment\n+\n+ const patient = {\n+ id: '456',\n+ } as Patient\n+\n+ jest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n+ jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(appointment)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+ const store = mockStore({\n+ title: 'test',\n+ user: { user: { id: '123' }, permissions },\n+ appointment: { appointment, patient: { id: '456' } as Patient },\n+ appointments: [{ appointment, patient: { id: '456' } as Patient }],\n+ breadcrumbs: { breadcrumbs: [] },\n+ components: { sidebarCollapsed: false },\n+ } as any)\n+\n+ const wrapper = await mount(\n+ <Provider store={store}>\n+ <MemoryRouter initialEntries={[route]}>\n+ <TitleProvider>\n+ <HospitalRun />\n+ </TitleProvider>\n+ </MemoryRouter>\n+ </Provider>,\n+ )\n+ await wrapper.update()\nexpect(wrapper.find(Dashboard)).toHaveLength(1)\n})\n- it('should render the Dashboard when the user does not have write appointment privileges', () => {\n+ it('should render the Dashboard when the user does not have write appointment privileges', async () => {\nroute = '/appointments/edit/123'\nconst permissions: Permissions[] = []\n- const { wrapper } = setup(route, permissions, true)\n+ const appointment = {\n+ id: '123',\n+ patient: '456',\n+ } as Appointment\n+\n+ const patient = {\n+ id: '456',\n+ } as Patient\n+\n+ jest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n+ jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(appointment)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+ const store = mockStore({\n+ title: 'test',\n+ user: { user: { id: '123' }, permissions },\n+ appointment: { appointment, patient: { id: '456' } as Patient },\n+ appointments: [{ appointment, patient: { id: '456' } as Patient }],\n+ breadcrumbs: { breadcrumbs: [] },\n+ components: { sidebarCollapsed: false },\n+ } as any)\n+ const wrapper = await mount(\n+ <Provider store={store}>\n+ <MemoryRouter initialEntries={[route]}>\n+ <TitleProvider>\n+ <HospitalRun />\n+ </TitleProvider>\n+ </MemoryRouter>\n+ </Provider>,\n+ )\n+\n+ await wrapper.update()\nexpect(wrapper.find(Dashboard)).toHaveLength(1)\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/Appointments.test.tsx", "new_path": "src/__tests__/scheduling/appointments/Appointments.test.tsx", "diff": "@@ -27,7 +27,7 @@ let route: any\ndescribe('/appointments', () => {\n// eslint-disable-next-line no-shadow\n- const setup = (setup_route: string, permissions: Permissions[], renderHr: boolean = false) => {\n+ const setup = (setupRoute: string, permissions: Permissions[], renderHr: boolean = false) => {\nconst appointment = {\nid: '123',\npatient: '456',\n@@ -52,7 +52,7 @@ describe('/appointments', () => {\njest.useFakeTimers()\nconst wrapper = mount(\n<Provider store={store}>\n- <MemoryRouter initialEntries={[setup_route]}>\n+ <MemoryRouter initialEntries={[setupRoute]}>\n<TitleProvider>{renderHr ? <HospitalRun /> : <Appointments />}</TitleProvider>\n</MemoryRouter>\n</Provider>,\n@@ -201,7 +201,7 @@ describe('/appointments/edit/:id', () => {\nit('should render the edit appointment screen when /appointments/edit/:id is accessed', async () => {\nroute = '/appointments/edit/123'\nconst permissions: Permissions[] = [Permissions.WriteAppointments, Permissions.ReadAppointments]\n- const { wrapper, store } = await setup(route, permissions, false)\n+ const { wrapper } = await setup(route, permissions, false)\nexpect(wrapper.find(EditAppointment)).toHaveLength(1)\nexpect(AppointmentRepository.find).toHaveBeenCalledTimes(1)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "diff": "@@ -11,9 +11,7 @@ import thunk from 'redux-thunk'\nimport { mocked } from 'ts-jest/utils'\nimport * as titleUtil from '../../../../page-header/title/TitleContext'\n-import AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm'\nimport EditAppointment from '../../../../scheduling/appointments/edit/EditAppointment'\n-import useUpdateAppointment from '../../../../scheduling/hooks/useUpdateAppointment'\nimport AppointmentRepository from '../../../../shared/db/AppointmentRepository'\nimport PatientRepository from '../../../../shared/db/PatientRepository'\nimport Appointment from '../../../../shared/model/Appointment'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "diff": "@@ -93,9 +93,6 @@ describe('View Appointment', () => {\nsetButtonToolBarSpy = jest.fn()\njest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\n})\n- afterEach(() => {\n- setButtonToolBarSpy.mockReset()\n- })\nit('should have called the useUpdateTitle hook', async () => {\nawait setup()\n@@ -159,15 +156,6 @@ describe('View Appointment', () => {\nexpect(deleteAppointmentConfirmationModal.prop('title')).toEqual('actions.confirmDelete')\n})\n- // describe('delete appointment', () => {\n- // beforeEach(() => {\n- // setButtonToolBarSpy = jest.fn()\n- // deleteAppointmentSpy = jest.spyOn(AppointmentRepository, 'delete')\n- // jest.resetAllMocks()\n- // jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter')\n- // mocked(ButtonBarProvider).useButtonToolbarSetter.mockReturnValue(setButtonToolBarSpy)\n- // })\n-\nit('should render a delete appointment button in the button toolbar', async () => {\nawait setup('completed', [Permissions.ReadAppointments, Permissions.DeleteAppointment])\nexpect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\n@@ -262,6 +250,5 @@ describe('View Appointment', () => {\n'states.success',\n'scheduling.appointment.successfullyDeleted',\n)\n- // })\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/hooks/useUpdateAppointment.test.tsx", "new_path": "src/__tests__/scheduling/hooks/useUpdateAppointment.test.tsx", "diff": "import { act } from '@testing-library/react-hooks'\n-import useUpdateLab from '../../../labs/hooks/useUpdateLab'\nimport useUpdateAppointment from '../../../scheduling/hooks/useUpdateAppointment'\nimport AppointmentRepository from '../../../shared/db/AppointmentRepository'\nimport Appointment from '../../../shared/model/Appointment'\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/view/ViewAppointment.tsx", "new_path": "src/scheduling/appointments/view/ViewAppointment.tsx", "diff": "@@ -91,7 +91,7 @@ const ViewAppointment = () => {\nreturn () => {\nsetButtonToolBar([])\n}\n- }, [setButtonToolBar, getButtons])\n+ }, [getButtons])\nreturn (\n<>\n" } ]

[ { "change_type": "DELETE", "old_path": "src/__tests__/scheduling/appointments/appointment-slice.test.ts", "new_path": null, "diff": "-import { subDays } from 'date-fns'\n-import { AnyAction } from 'redux'\n-import { mocked } from 'ts-jest/utils'\n-\n-import appointment, {\n- fetchAppointmentStart,\n- fetchAppointmentSuccess,\n- fetchAppointment,\n- createAppointmentStart,\n- createAppointmentSuccess,\n- createAppointmentError,\n- createAppointment,\n- updateAppointmentStart,\n- updateAppointmentSuccess,\n- updateAppointmentError,\n- updateAppointment,\n- deleteAppointment,\n- deleteAppointmentStart,\n- deleteAppointmentSuccess,\n-} from '../../../scheduling/appointments/appointment-slice'\n-import AppointmentRepository from '../../../shared/db/AppointmentRepository'\n-import PatientRepository from '../../../shared/db/PatientRepository'\n-import Appointment from '../../../shared/model/Appointment'\n-import Patient from '../../../shared/model/Patient'\n-\n-describe('appointment slice', () => {\n- describe('appointment reducer', () => {\n- it('should create an initial state properly', () => {\n- const appointmentStore = appointment(undefined, {} as AnyAction)\n-\n- expect(appointmentStore.appointment).toEqual({} as Appointment)\n- expect(appointmentStore.status).toEqual('loading')\n- })\n- it('should handle the CREATE_APPOINTMENT_START action', () => {\n- const appointmentStore = appointment(undefined, {\n- type: createAppointmentStart.type,\n- })\n-\n- expect(appointmentStore.status).toEqual('loading')\n- })\n-\n- it('should handle the CREATE_APPOINTMENT_SUCCESS action', () => {\n- const appointmentStore = appointment(undefined, {\n- type: createAppointmentSuccess.type,\n- })\n-\n- expect(appointmentStore.status).toEqual('completed')\n- })\n-\n- it('should handle the UPDATE_APPOINTMENT_START action', () => {\n- const appointmentStore = appointment(undefined, {\n- type: updateAppointmentStart.type,\n- })\n-\n- expect(appointmentStore.status).toEqual('loading')\n- })\n-\n- it('should handle the UPDATE_APPOINTMENT_SUCCESS action', () => {\n- const expectedAppointment = {\n- patient: '123',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- } as Appointment\n- const appointmentStore = appointment(undefined, {\n- type: updateAppointmentSuccess.type,\n- payload: {\n- ...expectedAppointment,\n- },\n- })\n-\n- expect(appointmentStore.status).toEqual('completed')\n- expect(appointmentStore.appointment).toEqual(expectedAppointment)\n- })\n-\n- it('should handle the FETCH_APPOINTMENT_START action', () => {\n- const appointmentStore = appointment(undefined, {\n- type: fetchAppointmentStart.type,\n- })\n-\n- expect(appointmentStore.status).toEqual('loading')\n- })\n- it('should handle the FETCH_APPOINTMENT_SUCCESS action', () => {\n- const expectedAppointment = {\n- patientId: '1234',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- }\n-\n- const expectedPatient = {\n- id: '123',\n- fullName: 'full name',\n- }\n-\n- const appointmentStore = appointment(undefined, {\n- type: fetchAppointmentSuccess.type,\n- payload: { appointment: expectedAppointment, patient: expectedPatient },\n- })\n-\n- expect(appointmentStore.status).toEqual('completed')\n- expect(appointmentStore.appointment).toEqual(expectedAppointment)\n- expect(appointmentStore.patient).toEqual(expectedPatient)\n- })\n-\n- it('should handle the DELETE_APPOINTMENT_START action', () => {\n- const appointmentStore = appointment(undefined, {\n- type: deleteAppointmentStart.type,\n- })\n-\n- expect(appointmentStore.status).toEqual('loading')\n- })\n-\n- it('should handle the DELETE_APPOINTMENT_SUCCESS action', () => {\n- const appointmentStore = appointment(undefined, {\n- type: deleteAppointmentSuccess.type,\n- })\n-\n- expect(appointmentStore.status).toEqual('completed')\n- })\n- })\n-\n- describe('createAppointment()', () => {\n- it('should dispatch the CREATE_APPOINTMENT_START action', async () => {\n- jest.spyOn(AppointmentRepository, 'save')\n- mocked(AppointmentRepository, true).save.mockResolvedValue({ id: '123' } as Appointment)\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- const expectedAppointment = {\n- patient: '123',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- } as Appointment\n-\n- await createAppointment(expectedAppointment)(dispatch, getState, null)\n-\n- expect(dispatch).toHaveBeenCalledWith({ type: createAppointmentStart.type })\n- })\n-\n- it('should call the the AppointmentRepository save function with the correct data', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- const appointmentRepositorySaveSpy = jest.spyOn(AppointmentRepository, 'save')\n- mocked(AppointmentRepository, true).save.mockResolvedValue({ id: '123' } as Appointment)\n-\n- const expectedAppointment = {\n- patient: '123',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- } as Appointment\n-\n- await createAppointment(expectedAppointment)(dispatch, getState, null)\n-\n- expect(appointmentRepositorySaveSpy).toHaveBeenCalled()\n- expect(appointmentRepositorySaveSpy).toHaveBeenCalledWith(expectedAppointment)\n- })\n-\n- it('should call the onSuccess function', async () => {\n- const onSuccessSpy = jest.fn()\n- jest.spyOn(AppointmentRepository, 'save')\n- const expectedSavedAppointment = { id: '123' }\n- mocked(AppointmentRepository, true).save.mockResolvedValue(\n- expectedSavedAppointment as Appointment,\n- )\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n-\n- const expectedAppointment = {\n- patient: '123',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- } as Appointment\n-\n- await createAppointment(expectedAppointment, onSuccessSpy)(dispatch, getState, null)\n-\n- expect(onSuccessSpy).toHaveBeenCalledWith(expectedSavedAppointment)\n- })\n-\n- it('should validate the appointment', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- const expectedAppointment = {\n- startDateTime: new Date().toISOString(),\n- endDateTime: subDays(new Date(), 5).toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- } as Appointment\n-\n- await createAppointment(expectedAppointment)(dispatch, getState, null)\n-\n- expect(dispatch).toHaveBeenNthCalledWith(2, {\n- type: createAppointmentError.type,\n- payload: {\n- message: 'scheduling.appointment.errors.createAppointmentError',\n- patient: 'scheduling.appointment.errors.patientRequired',\n- startDateTime: 'scheduling.appointment.errors.startDateMustBeBeforeEndDate',\n- },\n- })\n- })\n- })\n-\n- describe('fetchAppointment()', () => {\n- let findSpy = jest.spyOn(AppointmentRepository, 'find')\n- let findPatientSpy = jest.spyOn(PatientRepository, 'find')\n- const expectedAppointment: Appointment = {\n- id: '1',\n- rev: '1',\n- patient: '123',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- createdAt: new Date().toISOString(),\n- updatedAt: new Date().toISOString(),\n- }\n-\n- const expectedPatient: Patient = {\n- id: '123',\n- fullName: 'expected full name',\n- } as Patient\n-\n- beforeEach(() => {\n- jest.resetAllMocks()\n- findSpy = jest.spyOn(AppointmentRepository, 'find')\n- mocked(AppointmentRepository, true).find.mockResolvedValue(expectedAppointment)\n- findPatientSpy = jest.spyOn(PatientRepository, 'find')\n- mocked(PatientRepository, true).find.mockResolvedValue(expectedPatient)\n- })\n-\n- it('should dispatch the FETCH_APPOINTMENT_START action', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- await fetchAppointment('id')(dispatch, getState, null)\n-\n- expect(dispatch).toHaveBeenCalledWith({ type: fetchAppointmentStart.type })\n- })\n-\n- it('should call appointment repository find', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- const expectedId = '1234'\n- await fetchAppointment(expectedId)(dispatch, getState, null)\n-\n- expect(findSpy).toHaveBeenCalledTimes(1)\n- expect(findSpy).toHaveBeenCalledWith(expectedId)\n- })\n-\n- it('should call patient repository find', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- const expectedId = '123'\n- await fetchAppointment(expectedId)(dispatch, getState, null)\n-\n- expect(findPatientSpy).toHaveBeenCalledTimes(1)\n- expect(findPatientSpy).toHaveBeenCalledWith(expectedId)\n- })\n-\n- it('should dispatch the FETCH_APPOINTMENT_SUCCESS action', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- await fetchAppointment('id')(dispatch, getState, null)\n- })\n- })\n-\n- describe('deleteAppointment()', () => {\n- let deleteAppointmentSpy = jest.spyOn(AppointmentRepository, 'delete')\n- beforeEach(() => {\n- jest.resetAllMocks()\n- deleteAppointmentSpy = jest.spyOn(AppointmentRepository, 'delete')\n- })\n-\n- it('should dispatch the DELETE_APPOINTMENT_START action', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n-\n- await deleteAppointment({ id: 'test1' } as Appointment)(dispatch, getState, null)\n-\n- expect(dispatch).toHaveBeenCalledWith({ type: deleteAppointmentStart.type })\n- })\n-\n- it('should call the AppointmentRepository delete function with the appointment', async () => {\n- const expectedAppointment = { id: 'appointmentId1' } as Appointment\n-\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n-\n- await deleteAppointment(expectedAppointment)(dispatch, getState, null)\n-\n- expect(deleteAppointmentSpy).toHaveBeenCalledTimes(1)\n- expect(deleteAppointmentSpy).toHaveBeenCalledWith(expectedAppointment)\n- })\n-\n- it('should call the onSuccess function after successfully deleting', async () => {\n- const onSuccessSpy = jest.fn()\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n-\n- await deleteAppointment({ id: 'test1' } as Appointment, onSuccessSpy)(\n- dispatch,\n- getState,\n- null,\n- )\n-\n- expect(onSuccessSpy).toHaveBeenCalled()\n- })\n-\n- it('should dispatch the DELETE_APPOINTMENT_SUCCESS action', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n-\n- await deleteAppointment({ id: 'test1' } as Appointment)(dispatch, getState, null)\n-\n- expect(dispatch).toHaveBeenCalledWith({ type: deleteAppointmentSuccess.type })\n- })\n- })\n-\n- describe('update appointment', () => {\n- it('should dispatch the UPDATE_APPOINTMENT_START action', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- jest.spyOn(AppointmentRepository, 'saveOrUpdate')\n-\n- const expectedAppointment = {\n- patient: 'sliceId9',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- } as Appointment\n-\n- const mockedAppointmentRepository = mocked(AppointmentRepository, true)\n- mockedAppointmentRepository.saveOrUpdate.mockResolvedValue(expectedAppointment)\n-\n- await updateAppointment(expectedAppointment)(dispatch, getState, null)\n-\n- expect(dispatch).toHaveBeenCalledWith({ type: updateAppointmentStart.type })\n- })\n-\n- it('should call the AppointmentRepository saveOrUpdate function with the correct data', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- jest.spyOn(AppointmentRepository, 'saveOrUpdate')\n-\n- const expectedAppointment = {\n- patient: 'sliceId10',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- } as Appointment\n-\n- const mockedAppointmentRepository = mocked(AppointmentRepository, true)\n- mockedAppointmentRepository.saveOrUpdate.mockResolvedValue(expectedAppointment)\n-\n- await updateAppointment(expectedAppointment)(dispatch, getState, null)\n-\n- expect(AppointmentRepository.saveOrUpdate).toHaveBeenCalledWith(expectedAppointment)\n- })\n-\n- it('should dispatch the UPDATE_APPOINTMENT_SUCCESS action with the correct data', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- jest.spyOn(AppointmentRepository, 'saveOrUpdate')\n-\n- const expectedAppointment = {\n- patient: 'sliceId11',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- } as Appointment\n-\n- const mockedAppointmentRepository = mocked(AppointmentRepository, true)\n- mockedAppointmentRepository.saveOrUpdate.mockResolvedValue(expectedAppointment)\n-\n- await updateAppointment(expectedAppointment)(dispatch, getState, null)\n-\n- expect(dispatch).toHaveBeenCalledWith({\n- type: updateAppointmentSuccess.type,\n- payload: expectedAppointment,\n- })\n- })\n-\n- it('should call on the onSuccess function after successfully updating', async () => {\n- const onSuccessSpy = jest.fn()\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- jest.spyOn(AppointmentRepository, 'saveOrUpdate')\n-\n- const expectedAppointment = {\n- patient: 'sliceId12',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- } as Appointment\n-\n- const mockedAppointmentRepository = mocked(AppointmentRepository, true)\n- mockedAppointmentRepository.saveOrUpdate.mockResolvedValue(expectedAppointment)\n-\n- await updateAppointment(expectedAppointment, onSuccessSpy)(dispatch, getState, null)\n-\n- expect(onSuccessSpy).toHaveBeenCalledWith(expectedAppointment)\n- })\n-\n- it('should validate the appointment', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- const expectedAppointment = {\n- startDateTime: new Date().toISOString(),\n- endDateTime: subDays(new Date(), 5).toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- } as Appointment\n-\n- await updateAppointment(expectedAppointment)(dispatch, getState, null)\n-\n- expect(dispatch).toHaveBeenNthCalledWith(2, {\n- type: updateAppointmentError.type,\n- payload: {\n- message: 'scheduling.appointment.errors.updateAppointmentError',\n- patient: 'scheduling.appointment.errors.patientRequired',\n- startDateTime: 'scheduling.appointment.errors.startDateMustBeBeforeEndDate',\n- },\n- })\n- })\n- })\n-})\n" }, { "change_type": "DELETE", "old_path": "src/__tests__/scheduling/appointments/appointments-slice.test.ts", "new_path": null, "diff": "-import { AnyAction } from 'redux'\n-import { mocked } from 'ts-jest/utils'\n-\n-import appointments, {\n- fetchAppointmentsStart,\n- fetchAppointmentsSuccess,\n- fetchAppointments,\n-} from '../../../scheduling/appointments/appointments-slice'\n-import AppointmentRepository from '../../../shared/db/AppointmentRepository'\n-import Appointment from '../../../shared/model/Appointment'\n-\n-describe('appointments slice', () => {\n- describe('appointments reducer', () => {\n- it('should create the initial state properly', () => {\n- const appointmentsStore = appointments(undefined, {} as AnyAction)\n-\n- expect(appointmentsStore.isLoading).toBeFalsy()\n- })\n-\n- it('should handle the GET_APPOINTMENTS_START action', () => {\n- const appointmentsStore = appointments(undefined, {\n- type: fetchAppointmentsStart.type,\n- })\n-\n- expect(appointmentsStore.isLoading).toBeTruthy()\n- })\n-\n- it('should handle the GET_APPOINTMENTS_SUCCESS action', () => {\n- const expectedAppointments = [\n- {\n- patientId: '1234',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- },\n- ]\n- const appointmentsStore = appointments(undefined, {\n- type: fetchAppointmentsSuccess.type,\n- payload: expectedAppointments,\n- })\n-\n- expect(appointmentsStore.isLoading).toBeFalsy()\n- expect(appointmentsStore.appointments).toEqual(expectedAppointments)\n- })\n- })\n-\n- describe('fetchAppointments()', () => {\n- let findAllSpy = jest.spyOn(AppointmentRepository, 'findAll')\n- const expectedAppointments: Appointment[] = [\n- {\n- id: '1',\n- rev: '1',\n- patient: '123',\n- startDateTime: new Date().toISOString(),\n- endDateTime: new Date().toISOString(),\n- location: 'location',\n- type: 'type',\n- reason: 'reason',\n- },\n- ]\n-\n- beforeEach(() => {\n- findAllSpy = jest.spyOn(AppointmentRepository, 'findAll')\n- mocked(AppointmentRepository, true).findAll.mockResolvedValue(\n- expectedAppointments as Appointment[],\n- )\n- })\n-\n- it('should dispatch the FETCH_APPOINTMENTS_START event', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- await fetchAppointments()(dispatch, getState, null)\n-\n- expect(dispatch).toHaveBeenCalledWith({ type: fetchAppointmentsStart.type })\n- })\n-\n- it('should call the AppointmentRepository findAll() function', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- await fetchAppointments()(dispatch, getState, null)\n-\n- expect(findAllSpy).toHaveBeenCalled()\n- })\n-\n- it('should dispatch the FETCH_APPOINTMENTS_SUCCESS event', async () => {\n- const dispatch = jest.fn()\n- const getState = jest.fn()\n- await fetchAppointments()(dispatch, getState, null)\n-\n- expect(dispatch).toHaveBeenCalledWith({\n- type: fetchAppointmentsSuccess.type,\n- payload: expectedAppointments,\n- })\n- })\n- })\n-})\n" }, { "change_type": "DELETE", "old_path": "src/scheduling/appointments/appointment-slice.ts", "new_path": null, "diff": "-import { createSlice, PayloadAction } from '@reduxjs/toolkit'\n-import { isBefore } from 'date-fns'\n-import _ from 'lodash'\n-\n-import AppointmentRepository from '../../shared/db/AppointmentRepository'\n-import PatientRepository from '../../shared/db/PatientRepository'\n-import Appointment from '../../shared/model/Appointment'\n-import Patient from '../../shared/model/Patient'\n-import { AppThunk } from '../../shared/store'\n-\n-function validateAppointment(appointment: Appointment) {\n- const err: Error = {}\n-\n- if (!appointment.patient) {\n- err.patient = 'scheduling.appointment.errors.patientRequired'\n- }\n-\n- if (isBefore(new Date(appointment.endDateTime), new Date(appointment.startDateTime))) {\n- err.startDateTime = 'scheduling.appointment.errors.startDateMustBeBeforeEndDate'\n- }\n-\n- return err\n-}\n-\n-interface Error {\n- patient?: string\n- startDateTime?: string\n- message?: string\n-}\n-\n-interface AppointmentState {\n- error: Error\n- appointment: Appointment\n- patient: Patient\n- status: 'loading' | 'error' | 'completed'\n-}\n-\n-const initialState: AppointmentState = {\n- error: {},\n- appointment: {} as Appointment,\n- patient: {} as Patient,\n- status: 'loading',\n-}\n-\n-function start(state: AppointmentState) {\n- state.status = 'loading'\n-}\n-\n-function finish(state: AppointmentState, { payload }: PayloadAction<Appointment>) {\n- state.status = 'completed'\n- state.appointment = payload\n- state.error = {}\n-}\n-\n-function error(state: AppointmentState, { payload }: PayloadAction<Error>) {\n- state.status = 'error'\n- state.error = payload\n-}\n-\n-const appointmentSlice = createSlice({\n- name: 'appointment',\n- initialState,\n- reducers: {\n- fetchAppointmentStart: start,\n- fetchAppointmentSuccess: (\n- state: AppointmentState,\n- { payload }: PayloadAction<{ appointment: Appointment; patient: Patient }>,\n- ) => {\n- state.status = 'completed'\n- state.appointment = payload.appointment\n- state.patient = payload.patient\n- },\n- createAppointmentStart: start,\n- createAppointmentSuccess(state) {\n- state.status = 'completed'\n- },\n- createAppointmentError: error,\n- updateAppointmentStart: start,\n- updateAppointmentSuccess: finish,\n- updateAppointmentError: error,\n- deleteAppointmentStart: start,\n- deleteAppointmentSuccess(state) {\n- state.status = 'completed'\n- },\n- },\n-})\n-\n-export const {\n- createAppointmentStart,\n- createAppointmentSuccess,\n- createAppointmentError,\n- updateAppointmentStart,\n- updateAppointmentSuccess,\n- updateAppointmentError,\n- fetchAppointmentStart,\n- fetchAppointmentSuccess,\n- deleteAppointmentStart,\n- deleteAppointmentSuccess,\n-} = appointmentSlice.actions\n-\n-export const fetchAppointment = (id: string): AppThunk => async (dispatch) => {\n- dispatch(fetchAppointmentStart())\n- const appointment = await AppointmentRepository.find(id)\n- const patient = await PatientRepository.find(appointment.patient)\n-\n- dispatch(fetchAppointmentSuccess({ appointment, patient }))\n-}\n-\n-export const createAppointment = (\n- appointment: Appointment,\n- onSuccess?: (appointment: Appointment) => void,\n-): AppThunk => async (dispatch) => {\n- dispatch(createAppointmentStart())\n- const newAppointmentError = validateAppointment(appointment)\n-\n- if (_.isEmpty(newAppointmentError)) {\n- const newAppointment = await AppointmentRepository.save(appointment)\n- dispatch(createAppointmentSuccess())\n- if (onSuccess) {\n- onSuccess(newAppointment)\n- }\n- } else {\n- newAppointmentError.message = 'scheduling.appointment.errors.createAppointmentError'\n- dispatch(createAppointmentError(newAppointmentError))\n- }\n-}\n-\n-export const updateAppointment = (\n- appointment: Appointment,\n- onSuccess?: (appointment: Appointment) => void,\n-): AppThunk => async (dispatch) => {\n- dispatch(updateAppointmentStart())\n- const updatedAppointmentError = validateAppointment(appointment)\n-\n- if (_.isEmpty(updatedAppointmentError)) {\n- const updatedAppointment = await AppointmentRepository.saveOrUpdate(appointment)\n- dispatch(updateAppointmentSuccess(updatedAppointment))\n-\n- if (onSuccess) {\n- onSuccess(updatedAppointment)\n- }\n- } else {\n- updatedAppointmentError.message = 'scheduling.appointment.errors.updateAppointmentError'\n- dispatch(updateAppointmentError(updatedAppointmentError))\n- }\n-}\n-\n-export const deleteAppointment = (\n- appointment: Appointment,\n- onSuccess?: () => void,\n-): AppThunk => async (dispatch) => {\n- dispatch(deleteAppointmentStart())\n- await AppointmentRepository.delete(appointment)\n- dispatch(deleteAppointmentSuccess())\n-\n- if (onSuccess) {\n- onSuccess()\n- }\n-}\n-\n-export default appointmentSlice.reducer\n" }, { "change_type": "DELETE", "old_path": "src/scheduling/appointments/appointments-slice.ts", "new_path": null, "diff": "-import { createSlice, PayloadAction } from '@reduxjs/toolkit'\n-\n-import AppointmentRepository from '../../shared/db/AppointmentRepository'\n-import Appointment from '../../shared/model/Appointment'\n-import { AppThunk } from '../../shared/store'\n-\n-interface AppointmentsState {\n- isLoading: boolean\n- appointments: Appointment[]\n-}\n-\n-const initialState: AppointmentsState = {\n- isLoading: false,\n- appointments: [],\n-}\n-\n-function startLoading(state: AppointmentsState) {\n- state.isLoading = true\n-}\n-\n-const appointmentsSlice = createSlice({\n- name: 'appointments',\n- initialState,\n- reducers: {\n- fetchAppointmentsStart: startLoading,\n- fetchAppointmentsSuccess: (state, { payload }: PayloadAction<Appointment[]>) => {\n- state.isLoading = false\n- state.appointments = payload\n- },\n- },\n-})\n-\n-export const { fetchAppointmentsStart, fetchAppointmentsSuccess } = appointmentsSlice.actions\n-\n-export const fetchAppointments = (): AppThunk => async (dispatch) => {\n- dispatch(fetchAppointmentsStart())\n- const appointments = await AppointmentRepository.findAll()\n- dispatch(fetchAppointmentsSuccess(appointments))\n-}\n-\n-export default appointmentsSlice.reducer\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "diff": "@@ -158,7 +158,7 @@ describe('View Appointment', () => {\nit('should render a delete appointment button in the button toolbar', async () => {\nawait setup('completed', [Permissions.ReadAppointments, Permissions.DeleteAppointment])\n- expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\n+ // expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nexpect((actualButtons[0] as any).props.children).toEqual(\n'scheduling.appointments.deleteAppointment',\n@@ -171,7 +171,7 @@ describe('View Appointment', () => {\nPermissions.DeleteAppointment,\n])\n- expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\n+ // expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nact(() => {\n@@ -190,7 +190,7 @@ describe('View Appointment', () => {\nPermissions.DeleteAppointment,\n])\n- expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\n+ // expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nact(() => {\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/view/ViewAppointment.tsx", "new_path": "src/scheduling/appointments/view/ViewAppointment.tsx", "diff": "@@ -83,7 +83,7 @@ const ViewAppointment = () => {\n}\nreturn buttons\n- }, [appointment, permissions])\n+ }, [appointment, history, permissions, t])\nuseEffect(() => {\nsetButtonToolBar(getButtons())\n@@ -91,7 +91,7 @@ const ViewAppointment = () => {\nreturn () => {\nsetButtonToolBar([])\n}\n- }, [getButtons])\n+ }, [getButtons, setButtonToolBar])\nreturn (\n<>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/hooks/useAppointments.test.tsx", "new_path": "src/__tests__/scheduling/hooks/useAppointments.test.tsx", "diff": "-import { act } from '@testing-library/react-hooks'\n+import { act, renderHook } from '@testing-library/react-hooks'\nimport useAppointments from '../../../scheduling/hooks/useAppointments'\nimport AppointmentRepository from '../../../shared/db/AppointmentRepository'\nimport Appointment from '../../../shared/model/Appointment'\n+import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\ndescribe('useAppointments', () => {\nit('should get an appointment by id', async () => {\n@@ -30,16 +31,16 @@ describe('useAppointments', () => {\n] as Appointment[]\njest.spyOn(AppointmentRepository, 'findAll').mockResolvedValue(expectedAppointments)\n- // let actualData: any\n+ let actualData: any\nawait act(async () => {\n- // const renderHookResult = renderHook(() => useAppointments())\n- const result = useAppointments()\n- // await waitUntilQueryIsSuccessful(result)\n- result.then((actualData) => {\n+ await act(async () => {\n+ const renderHookResult = renderHook(() => useAppointments())\n+ const { result } = renderHookResult\n+ await waitUntilQueryIsSuccessful(renderHookResult)\n+ actualData = result.current.data\n+ })\nexpect(AppointmentRepository.findAll).toHaveBeenCalledTimes(1)\n- // expect(AppointmentRepository.findAll).toBeCalledWith(expectedAppointmentId)\nexpect(actualData).toEqual(expectedAppointments)\n})\n})\n})\n-})\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/ViewAppointments.tsx", "new_path": "src/scheduling/appointments/ViewAppointments.tsx", "diff": "@@ -5,8 +5,10 @@ import { useHistory } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport { useButtonToolbarSetter } from '../../page-header/button-toolbar/ButtonBarProvider'\nimport { useUpdateTitle } from '../../page-header/title/TitleContext'\n+import Loading from '../../shared/components/Loading'\nimport PatientRepository from '../../shared/db/PatientRepository'\nimport useTranslator from '../../shared/hooks/useTranslator'\n+import Appointment from '../../shared/model/Appointment'\nimport useAppointments from '../hooks/useAppointments'\ninterface Event {\n@@ -24,7 +26,7 @@ const ViewAppointments = () => {\nconst history = useHistory()\nconst updateTitle = useUpdateTitle()\nupdateTitle(t('scheduling.appointments.label'))\n- const appointments = useAppointments()\n+ const { data: appointments, isLoading } = useAppointments()\nconst [events, setEvents] = useState<Event[]>([])\nconst setButtonToolBar = useButtonToolbarSetter()\nuseAddBreadcrumbs(breadcrumbs, true)\n@@ -48,28 +50,29 @@ const ViewAppointments = () => {\n}, [setButtonToolBar, history, t])\nuseEffect(() => {\n- // get appointments, find patients, then make Event objects out of the two and set events.\n- const getAppointments = async () => {\n- appointments.then(async (appointmentsList) => {\n- if (appointmentsList) {\n- const newEvents = await Promise.all(\n- appointmentsList.map(async (appointment) => {\n+ if (appointments && !isLoading) {\n+ appointments.map(async (appointment: Appointment) => {\nconst patient = await PatientRepository.find(appointment.patient)\n- return {\n+ setEvents((eventsArray) => [\n+ ...eventsArray,\n+ {\nid: appointment.id,\nstart: new Date(appointment.startDateTime),\nend: new Date(appointment.endDateTime),\ntitle: patient && patient.fullName ? patient.fullName : '',\nallDay: false,\n+ },\n+ ])\n+ })\n}\n- }),\n- )\n- setEvents(newEvents)\n+ return () => {\n+ setEvents([])\n}\n- })\n+ }, [appointments, isLoading])\n+\n+ if (isLoading || appointments === undefined) {\n+ return <Loading />\n}\n- getAppointments()\n- }, []) // provide an empty dependency array, to ensure this useEffect will only run on mount.\nreturn (\n<div>\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/hooks/useAppointments.tsx", "new_path": "src/scheduling/hooks/useAppointments.tsx", "diff": "+import { useQuery } from 'react-query'\n+\nimport AppointmentRepository from '../../shared/db/AppointmentRepository'\nimport Appointment from '../../shared/model/Appointment'\n@@ -7,5 +9,5 @@ async function fetchAppointments(): Promise<Appointment[]> {\n}\nexport default function useAppointments() {\n- return fetchAppointments()\n+ return useQuery(['appointments'], fetchAppointments)\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/new/NewAppointment.tsx", "new_path": "src/scheduling/appointments/new/NewAppointment.tsx", "diff": "@@ -69,7 +69,15 @@ const NewAppointment = () => {\n}\n}\nsetSaved(false)\n- }, [saved, newAppointmentMutateError])\n+ }, [\n+ saved,\n+ newAppointmentMutateError,\n+ isErrorNewAppointment,\n+ newAppointmentMutate,\n+ newAppointment,\n+ t,\n+ history,\n+ ])\nif (isLoadingNewAppointment) {\nreturn <Spinner color=\"blue\" loading size={[10, 25]} type=\"ScaleLoader\" />\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "diff": "-import { Button, Spinner } from '@hospitalrun/components'\n+import { Button } from '@hospitalrun/components'\nimport { roundToNearestMinutes, addMinutes } from 'date-fns'\nimport { mount, ReactWrapper } from 'enzyme'\nimport { createMemoryHistory } from 'history'\n@@ -11,6 +11,7 @@ import thunk from 'redux-thunk'\nimport { mocked } from 'ts-jest/utils'\nimport * as titleUtil from '../../../../page-header/title/TitleContext'\n+import AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm'\nimport EditAppointment from '../../../../scheduling/appointments/edit/EditAppointment'\nimport AppointmentRepository from '../../../../shared/db/AppointmentRepository'\nimport PatientRepository from '../../../../shared/db/PatientRepository'\n@@ -56,7 +57,6 @@ describe('Edit Appointment', () => {\nconst setup = async (mockAppointment: Appointment, mockPatient: Patient) => {\njest.resetAllMocks()\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- // jest.spyOn(titleUtil, 'useUpdateAppointment').mockImplementation(() => jest.fn())\njest.spyOn(AppointmentRepository, 'saveOrUpdate')\njest.spyOn(AppointmentRepository, 'find')\njest.spyOn(PatientRepository, 'find')\n@@ -93,12 +93,6 @@ describe('Edit Appointment', () => {\njest.restoreAllMocks()\n})\n- it('should render an edit appointment form', async () => {\n- const { wrapper } = await setup(expectedAppointment, expectedPatient)\n-\n- expect(wrapper.find(Spinner)).toHaveLength(1)\n- })\n-\nit('should load an appointment when component loads', async () => {\nconst { wrapper } = await setup(expectedAppointment, expectedPatient)\nawait act(async () => {\n@@ -158,4 +152,11 @@ describe('Edit Appointment', () => {\nwrapper.update()\nexpect(history.location.pathname).toEqual('/appointments/123')\n})\n+ it('should render an edit appointment form', async () => {\n+ const { wrapper } = await setup(expectedAppointment, expectedPatient)\n+ await act(async () => {\n+ await wrapper.update()\n+ })\n+ expect(wrapper.find(AppointmentDetailForm)).toHaveLength(1)\n+ })\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "diff": "@@ -89,7 +89,6 @@ describe('View Appointment', () => {\nbeforeEach(() => {\njest.resetAllMocks()\n- jest.clearAllMocks()\nsetButtonToolBarSpy = jest.fn()\njest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\n})\n@@ -158,7 +157,6 @@ describe('View Appointment', () => {\nit('should render a delete appointment button in the button toolbar', async () => {\nawait setup('completed', [Permissions.ReadAppointments, Permissions.DeleteAppointment])\n- // expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nexpect((actualButtons[0] as any).props.children).toEqual(\n'scheduling.appointments.deleteAppointment',\n@@ -171,7 +169,6 @@ describe('View Appointment', () => {\nPermissions.DeleteAppointment,\n])\n- // expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nact(() => {\n@@ -190,7 +187,6 @@ describe('View Appointment', () => {\nPermissions.DeleteAppointment,\n])\n- // expect(setButtonToolBarSpy).toHaveBeenCalledTimes(1)\nconst actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\nact(() => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/App.tsx", "new_path": "src/App.tsx", "diff": "@@ -7,7 +7,6 @@ import { useDispatch } from 'react-redux'\nimport { BrowserRouter, Route, Switch } from 'react-router-dom'\nimport HospitalRun from './HospitalRun'\n-import Login from './login/Login'\nimport { TitleProvider } from './page-header/title/TitleContext'\nimport { remoteDb } from './shared/config/pouchdb'\nimport { getCurrentSession } from './user/user-slice'\n@@ -41,7 +40,6 @@ const App: React.FC = () => {\n<BrowserRouter>\n<Suspense fallback={<Spinner color=\"blue\" loading size={[10, 25]} type=\"ScaleLoader\" />}>\n<Switch>\n- <Route exact path=\"/login\" component={Login} />\n<TitleProvider>\n<Route path=\"/\" component={HospitalRun} />\n</TitleProvider>\n" }, { "change_type": "MODIFY", "old_path": "src/HospitalRun.tsx", "new_path": "src/HospitalRun.tsx", "diff": "import { Toaster } from '@hospitalrun/components'\nimport React from 'react'\nimport { useSelector } from 'react-redux'\n-import { Redirect, Route, Switch } from 'react-router-dom'\n+import { Route, Switch } from 'react-router-dom'\nimport Dashboard from './dashboard/Dashboard'\nimport Imagings from './imagings/Imagings'\n@@ -23,11 +23,6 @@ import { RootState } from './shared/store'\nconst HospitalRun = () => {\nconst { title } = useTitle()\nconst { sidebarCollapsed } = useSelector((state: RootState) => state.components)\n- const { user } = useSelector((root: RootState) => root.user)\n-\n- if (user === undefined) {\n- return <Redirect to=\"/login\" />\n- }\nreturn (\n<div>\n" }, { "change_type": "DELETE", "old_path": "src/__tests__/login/Login.test.tsx", "new_path": null, "diff": "-import { Alert } from '@hospitalrun/components'\n-import { mount, ReactWrapper } from 'enzyme'\n-import { createMemoryHistory } from 'history'\n-import React from 'react'\n-import Button from 'react-bootstrap/Button'\n-import { act } from 'react-dom/test-utils'\n-import { Provider } from 'react-redux'\n-import { Router } from 'react-router'\n-import createMockStore, { MockStore } from 'redux-mock-store'\n-import thunk from 'redux-thunk'\n-\n-import Login from '../../login/Login'\n-import TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'\n-import { remoteDb } from '../../shared/config/pouchdb'\n-import User from '../../shared/model/User'\n-import { RootState } from '../../shared/store'\n-\n-const mockStore = createMockStore<RootState, any>([thunk])\n-\n-describe('Login', () => {\n- const history = createMemoryHistory()\n- let store: MockStore\n-\n- const setup = (storeValue: any = { loginError: {}, user: {} as User }) => {\n- history.push('/login')\n- store = mockStore(storeValue)\n-\n- const wrapper = mount(\n- <Provider store={store}>\n- <Router history={history}>\n- <Login />\n- </Router>\n- </Provider>,\n- )\n-\n- wrapper.update()\n- return wrapper\n- }\n-\n- describe('Layout initial validations', () => {\n- it('should render a login form', async () => {\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await setup()\n- })\n-\n- const form = wrapper.find('form')\n- expect(form).toHaveLength(1)\n- })\n-\n- it('should render a username and password input', async () => {\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = setup()\n- })\n-\n- const user = wrapper.find(TextInputWithLabelFormGroup)\n- expect(user).toHaveLength(2)\n- })\n-\n- it('should render a submit button', async () => {\n- let wrapper: any\n- await act(async () => {\n- wrapper = setup()\n- })\n-\n- const button = wrapper.find(Button)\n- expect(button).toHaveLength(1)\n- })\n- })\n-\n- describe('Unable to login', () => {\n- it('should get field required error message if no username is provided', async () => {\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await setup()\n- })\n-\n- jest.spyOn(remoteDb, 'logIn')\n-\n- const password = wrapper.find('#passwordTextInput').at(0)\n- await act(async () => {\n- const onChange = password.prop('onChange') as any\n- await onChange({ currentTarget: { value: 'password' } })\n- })\n-\n- wrapper.update()\n-\n- const saveButton = wrapper.find({ type: 'submit' }).at(0)\n-\n- await act(async () => {\n- const onClick = saveButton.prop('onClick') as any\n- await onClick({ preventDefault: jest.fn() })\n- })\n-\n- wrapper.update()\n-\n- expect(remoteDb.logIn).toHaveBeenCalledWith('', 'password')\n- expect(history.location.pathname).toEqual('/login')\n- expect(store.getActions()).toContainEqual({\n- type: 'user/loginError',\n- payload: {\n- message: 'user.login.error.message.required',\n- username: 'user.login.error.username.required',\n- password: 'user.login.error.password.required',\n- },\n- })\n- })\n-\n- it('should show required username error message', async () => {\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await setup({\n- user: {\n- loginError: {\n- message: 'user.login.error.message.required',\n- username: 'user.login.error.username.required',\n- password: 'user.login.error.password.required',\n- },\n- },\n- } as any)\n- })\n-\n- let password: ReactWrapper = wrapper.find('#passwordTextInput').at(0)\n- await act(async () => {\n- const onChange = password.prop('onChange') as any\n- await onChange({ currentTarget: { value: 'password' } })\n- })\n-\n- wrapper.update()\n-\n- const alert = wrapper.find(Alert)\n- const username = wrapper.find('#usernameTextInput')\n- password = wrapper.find('#passwordTextInput')\n-\n- const usernameFeedback = username.find('Feedback')\n- const passwordFeedback = password.find('Feedback')\n-\n- expect(alert.prop('message')).toEqual('user.login.error.message.required')\n- expect(usernameFeedback.hasClass('undefined')).not.toBeTruthy()\n- expect(passwordFeedback.hasClass('undefined')).toBeTruthy()\n- })\n-\n- it('should get field required error message if no password is provided', async () => {\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await setup()\n- })\n-\n- jest.spyOn(remoteDb, 'logIn')\n-\n- const username = wrapper.find('#usernameTextInput').at(0)\n- await act(async () => {\n- const onChange = username.prop('onChange') as any\n- await onChange({ currentTarget: { value: 'username' } })\n- })\n-\n- wrapper.update()\n-\n- const saveButton = wrapper.find({ type: 'submit' }).at(0)\n-\n- await act(async () => {\n- const onClick = saveButton.prop('onClick') as any\n- await onClick({ preventDefault: jest.fn() })\n- })\n-\n- wrapper.update()\n-\n- expect(remoteDb.logIn).toHaveBeenCalledWith('username', '')\n- expect(history.location.pathname).toEqual('/login')\n- expect(store.getActions()).toContainEqual({\n- type: 'user/loginError',\n- payload: {\n- message: 'user.login.error.message.required',\n- username: 'user.login.error.username.required',\n- password: 'user.login.error.password.required',\n- },\n- })\n- })\n-\n- it('should show required password error message', async () => {\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await setup({\n- user: {\n- loginError: {\n- message: 'user.login.error.message.required',\n- username: 'user.login.error.username.required',\n- password: 'user.login.error.password.required',\n- },\n- },\n- } as any)\n- })\n-\n- let username: ReactWrapper = wrapper.find('#usernameTextInput').at(0)\n- await act(async () => {\n- const onChange = username.prop('onChange') as any\n- await onChange({ currentTarget: { value: 'username' } })\n- })\n-\n- wrapper.update()\n-\n- const alert = wrapper.find(Alert)\n- const password = wrapper.find('#passwordTextInput').at(0)\n- username = wrapper.find('#usernameTextInput').at(0)\n-\n- const passwordFeedback = password.find('Feedback')\n- const usernameFeedback = username.find('Feedback')\n-\n- expect(alert.prop('message')).toEqual('user.login.error.message.required')\n- expect(passwordFeedback.hasClass('undefined')).not.toBeTruthy()\n- expect(usernameFeedback.hasClass('undefined')).toBeTruthy()\n- })\n-\n- it('should get incorrect username or password error when incorrect username or password is provided', async () => {\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await setup()\n- })\n-\n- jest.spyOn(remoteDb, 'logIn').mockRejectedValue({ status: 401 })\n-\n- const username = wrapper.find('#usernameTextInput').at(0)\n- await act(async () => {\n- const onChange = username.prop('onChange') as any\n- await onChange({ currentTarget: { value: 'username' } })\n- })\n-\n- const password = wrapper.find('#passwordTextInput').at(0)\n- await act(async () => {\n- const onChange = password.prop('onChange') as any\n- await onChange({ currentTarget: { value: 'password' } })\n- })\n-\n- wrapper.update()\n-\n- const saveButton = wrapper.find({ type: 'submit' }).at(0)\n- await act(async () => {\n- const onClick = saveButton.prop('onClick') as any\n- await onClick({ preventDefault: jest.fn() })\n- })\n-\n- wrapper.update()\n-\n- expect(remoteDb.logIn).toHaveBeenCalledWith('username', 'password')\n- expect(history.location.pathname).toEqual('/login')\n- expect(store.getActions()).toContainEqual({\n- type: 'user/loginError',\n- payload: {\n- message: 'user.login.error.message.incorrect',\n- },\n- })\n- })\n- })\n-\n- describe('Sucessfully login', () => {\n- it('should log in if username and password is correct', async () => {\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await setup()\n- })\n-\n- jest.spyOn(remoteDb, 'logIn').mockResolvedValue({\n- name: 'username',\n- ok: true,\n- roles: [],\n- })\n-\n- jest.spyOn(remoteDb, 'getUser').mockResolvedValue({\n- _id: 'userId',\n- metadata: {\n- givenName: 'test',\n- familyName: 'user',\n- },\n- } as any)\n-\n- const username = wrapper.find('#usernameTextInput').at(0)\n- await act(async () => {\n- const onChange = username.prop('onChange') as any\n- await onChange({ currentTarget: { value: 'username' } })\n- })\n-\n- const password = wrapper.find('#passwordTextInput').at(0)\n- await act(async () => {\n- const onChange = password.prop('onChange') as any\n- await onChange({ currentTarget: { value: 'password' } })\n- })\n-\n- const saveButton = wrapper.find({ type: 'submit' }).at(0)\n-\n- await act(async () => {\n- const onClick = saveButton.prop('onClick') as any\n- await onClick({ preventDefault: jest.fn() })\n- })\n-\n- wrapper.update()\n-\n- expect(store.getActions()[0].payload.user).toEqual({\n- id: 'userId',\n- givenName: 'test',\n- familyName: 'user',\n- })\n- expect(store.getActions()[0].type).toEqual('user/loginSuccess')\n- })\n- })\n-})\n" }, { "change_type": "DELETE", "old_path": "src/login/Login.tsx", "new_path": null, "diff": "-import { Alert, Container, Panel } from '@hospitalrun/components'\n-import React, { useState } from 'react'\n-import Button from 'react-bootstrap/Button'\n-import { useDispatch, useSelector } from 'react-redux'\n-import { Redirect } from 'react-router-dom'\n-\n-import TextInputWithLabelFormGroup from '../shared/components/input/TextInputWithLabelFormGroup'\n-import useTranslator from '../shared/hooks/useTranslator'\n-import logo from '../shared/static/images/logo-on-transparent.png'\n-import { RootState } from '../shared/store'\n-import { login } from '../user/user-slice'\n-\n-const Login = () => {\n- const dispatch = useDispatch()\n- const { t } = useTranslator()\n- const [username, setUsername] = useState('')\n- const [password, setPassword] = useState('')\n- const { loginError, user } = useSelector((root: RootState) => root.user)\n-\n- const onUsernameChange = (event: React.ChangeEvent<HTMLInputElement>) => {\n- const { value } = event.currentTarget\n- setUsername(value)\n- }\n-\n- const onPasswordChange = (event: React.ChangeEvent<HTMLInputElement>) => {\n- const { value } = event.currentTarget\n- setPassword(value)\n- }\n-\n- const onSignInClick = async (event: React.MouseEvent<HTMLButtonElement>) => {\n- event.preventDefault()\n- await dispatch(login(username, password))\n- }\n-\n- if (user) {\n- return <Redirect to=\"/\" />\n- }\n-\n- return (\n- <>\n- <Container className=\"container align-items-center\" style={{ width: '50%' }}>\n- <img src={logo} alt=\"HospitalRun\" style={{ width: '100%', textAlign: 'center' }} />\n- <form>\n- <Panel title=\"Please Sign In\" color=\"primary\">\n- {loginError?.message && (\n- <Alert color=\"danger\" message={t(loginError?.message)} title=\"Unable to login\" />\n- )}\n- <TextInputWithLabelFormGroup\n- isEditable\n- label=\"username\"\n- name=\"username\"\n- value={username}\n- onChange={onUsernameChange}\n- isRequired\n- isInvalid={!!loginError?.username && !username}\n- feedback={t(loginError?.username)}\n- />\n- <TextInputWithLabelFormGroup\n- isEditable\n- type=\"password\"\n- label=\"password\"\n- name=\"password\"\n- value={password}\n- onChange={onPasswordChange}\n- isRequired\n- isInvalid={!!loginError?.password && !password}\n- feedback={t(loginError?.password)}\n- />\n- <Button type=\"submit\" block onClick={onSignInClick}>\n- Sign In\n- </Button>\n- </Panel>\n- </form>\n- </Container>\n- </>\n- )\n-}\n-\n-export default Login\n" }, { "change_type": "MODIFY", "old_path": "src/shared/config/pouchdb.ts", "new_path": "src/shared/config/pouchdb.ts", "diff": "@@ -21,12 +21,7 @@ if (process.env.NODE_ENV === 'test') {\nserverDb = new PouchDB('hospitalrun', { skip_setup: true, adapter: 'memory' })\nlocalDb = new PouchDB('local_hospitalrun', { skip_setup: true, adapter: 'memory' })\n} else {\n- serverDb = new PouchDB(`${process.env.REACT_APP_HOSPITALRUN_API}/hospitalrun`, {\n- skip_setup: true,\n- })\n-\nlocalDb = new PouchDB('local_hospitalrun', { skip_setup: true })\n- localDb.sync(serverDb, { live: true, retry: true })\n}\nexport const schema = [\n" }, { "change_type": "MODIFY", "old_path": "src/user/user-slice.ts", "new_path": "src/user/user-slice.ts", "diff": "@@ -19,6 +19,12 @@ interface UserState {\n}\nconst initialState: UserState = {\n+ user: {\n+ givenName: 'HospitalRun',\n+ familyName: 'Test',\n+ fullName: 'HospitalRun Test',\n+ id: 'test-hospitalrun',\n+ },\npermissions: [\nPermissions.ReadPatients,\nPermissions.WritePatients,\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"private\": false,\n\"license\": \"MIT\",\n\"dependencies\": {\n- \"@hospitalrun/components\": \"~3.0.0\",\n+ \"@hospitalrun/components\": \"~3.0.3\",\n\"@reduxjs/toolkit\": \"~1.4.0\",\n\"@types/escape-string-regexp\": \"~2.0.1\",\n\"@types/json2csv\": \"~5.0.1\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "CHANGELOG.md", "new_path": "CHANGELOG.md", "diff": "All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n+## [2.0.0-alpha.6](https://github.com/HospitalRun/hospitalrun-frontend/compare/v2.0.0-alpha.5...v2.0.0-alpha.6) (2020-10-24)\n+\n+\n+### Features\n+\n+* **patient:** add panel to display useful patient information ([0baf3af](https://github.com/HospitalRun/hospitalrun-frontend/commit/0baf3af504c1cc0b9512c1d1be4d0b1eeb268f49)), closes [#2259](https://github.com/HospitalRun/hospitalrun-frontend/issues/2259)\n+* **patient:** refactor add allergy button ([4b234a1](https://github.com/HospitalRun/hospitalrun-frontend/commit/4b234a1968802e45038197f1e765020e9ca15bff)), closes [#2259](https://github.com/HospitalRun/hospitalrun-frontend/issues/2259)\n+* **patient:** remove unused function ([eba6074](https://github.com/HospitalRun/hospitalrun-frontend/commit/eba6074adb0a52be03cc5e4b6c2945f4d7d24f9c)), closes [#2259](https://github.com/HospitalRun/hospitalrun-frontend/issues/2259)\n+* **patient:** resolve merge conflict ([981f59f](https://github.com/HospitalRun/hospitalrun-frontend/commit/981f59f48ded2c48b932180e45ff677b28d63f14)), closes [#2259](https://github.com/HospitalRun/hospitalrun-frontend/issues/2259)\n+\n+\n+### Bug Fixes\n+\n+* **EditAppointment:** refactor editing appointment to use ([56e058f](https://github.com/HospitalRun/hospitalrun-frontend/commit/56e058f9c78f519be6c598b10d8eb48f3d7df97d))\n+* **lab request:** Update toast success message ([734ac30](https://github.com/HospitalRun/hospitalrun-frontend/commit/734ac3029da18ec0abf2e8d21dc7fb8f6b931eee))\n+* **scheduling:** added hook tests ([da046c7](https://github.com/HospitalRun/hospitalrun-frontend/commit/da046c7087626cc269c4a96ad97989deee2e207f))\n+\n## [2.0.0-alpha.5](https://github.com/HospitalRun/hospitalrun-frontend/compare/v2.0.0-alpha.4...v2.0.0-alpha.5) (2020-09-28)\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "{\n\"name\": \"@hospitalrun/frontend\",\n- \"version\": \"2.0.0-alpha.5\",\n+ \"version\": \"2.0.0-alpha.6\",\n\"description\": \"React frontend for HospitalRun\",\n\"private\": false,\n\"license\": \"MIT\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/dashboard/Dashboard.tsx", "new_path": "src/dashboard/Dashboard.tsx", "diff": "-import React from 'react'\n+import React, { useEffect } from 'react'\nimport { useUpdateTitle } from '../page-header/title/TitleContext'\nimport useTranslator from '../shared/hooks/useTranslator'\n@@ -6,7 +6,9 @@ import useTranslator from '../shared/hooks/useTranslator'\nconst Dashboard: React.FC = () => {\nconst { t } = useTranslator()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('dashboard.label'))\n+ })\nreturn <h3>Example</h3>\n}\n" }, { "change_type": "MODIFY", "old_path": "src/imagings/requests/NewImagingRequest.tsx", "new_path": "src/imagings/requests/NewImagingRequest.tsx", "diff": "import { Typeahead, Label, Button, Alert, Column, Row } from '@hospitalrun/components'\nimport format from 'date-fns/format'\n-import React, { useState } from 'react'\n+import React, { useState, useEffect } from 'react'\nimport { useHistory } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\n@@ -20,7 +20,9 @@ const NewImagingRequest = () => {\nconst { t } = useTranslator()\nconst history = useHistory()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('imagings.requests.new'))\n+ })\nconst [mutate] = useRequestImaging()\nconst [error, setError] = useState<ImagingRequestError>()\nconst [visitOption, setVisitOption] = useState([] as Option[])\n" }, { "change_type": "MODIFY", "old_path": "src/imagings/search/ViewImagings.tsx", "new_path": "src/imagings/search/ViewImagings.tsx", "diff": "@@ -17,8 +17,9 @@ const ViewImagings = () => {\nconst history = useHistory()\nconst setButtons = useButtonToolbarSetter()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('imagings.label'))\n-\n+ })\nconst [searchRequest, setSearchRequest] = useState<ImagingSearchRequest>({\nstatus: 'all',\ntext: '',\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/list/ViewIncidents.tsx", "new_path": "src/incidents/list/ViewIncidents.tsx", "diff": "@@ -16,7 +16,9 @@ const ViewIncidents = () => {\nconst history = useHistory()\nconst setButtonToolBar = useButtonToolbarSetter()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('incidents.reports.label'))\n+ })\nconst [searchFilter, setSearchFilter] = useState(IncidentFilter.reported)\nuseEffect(() => {\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/report/ReportIncident.tsx", "new_path": "src/incidents/report/ReportIncident.tsx", "diff": "import { Button, Row, Column } from '@hospitalrun/components'\n-import React, { useState } from 'react'\n+import React, { useState, useEffect } from 'react'\nimport { useHistory } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\n@@ -17,7 +17,9 @@ const ReportIncident = () => {\nconst history = useHistory()\nconst { t } = useTranslator()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('incidents.reports.new'))\n+ })\nconst breadcrumbs = [\n{\ni18nKey: 'incidents.reports.new',\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/visualize/VisualizeIncidents.tsx", "new_path": "src/incidents/visualize/VisualizeIncidents.tsx", "diff": "@@ -10,8 +10,9 @@ import IncidentSearchRequest from '../model/IncidentSearchRequest'\nconst VisualizeIncidents = () => {\nconst { t } = useTranslator()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('incidents.visualize.view'))\n-\n+ })\nconst searchFilter = IncidentFilter.reported\nconst searchRequest: IncidentSearchRequest = { status: searchFilter }\nconst { data, isLoading } = useIncidents(searchRequest)\n" }, { "change_type": "MODIFY", "old_path": "src/labs/ViewLabs.tsx", "new_path": "src/labs/ViewLabs.tsx", "diff": "@@ -23,8 +23,9 @@ const ViewLabs = () => {\nconst history = useHistory()\nconst setButtons = useButtonToolbarSetter()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('labs.label'))\n-\n+ })\nconst { permissions } = useSelector((state: RootState) => state.user)\nconst [searchFilter, setSearchFilter] = useState<LabFilter>('all')\nconst [searchText, setSearchText] = useState<string>('')\n" }, { "change_type": "MODIFY", "old_path": "src/labs/requests/NewLabRequest.tsx", "new_path": "src/labs/requests/NewLabRequest.tsx", "diff": "import { Typeahead, Label, Button, Alert, Toast } from '@hospitalrun/components'\n-import React, { useState } from 'react'\n+import React, { useState, useEffect } from 'react'\nimport { useSelector } from 'react-redux'\nimport { useHistory } from 'react-router-dom'\n@@ -23,8 +23,9 @@ const NewLabRequest = () => {\nconst [newNote, setNewNote] = useState('')\nconst [error, setError] = useState<LabError | undefined>(undefined)\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('labs.requests.new'))\n-\n+ })\nconst [newLabRequest, setNewLabRequest] = useState({\npatient: '',\ntype: '',\n" }, { "change_type": "MODIFY", "old_path": "src/medications/requests/NewMedicationRequest.tsx", "new_path": "src/medications/requests/NewMedicationRequest.tsx", "diff": "import { Typeahead, Label, Button, Alert, Column, Row } from '@hospitalrun/components'\n-import React, { useState } from 'react'\n+import React, { useState, useEffect } from 'react'\nimport { useDispatch, useSelector } from 'react-redux'\nimport { useHistory } from 'react-router-dom'\n@@ -22,7 +22,9 @@ const NewMedicationRequest = () => {\nconst dispatch = useDispatch()\nconst history = useHistory()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('medications.requests.new'))\n+ })\nconst { status, error } = useSelector((state: RootState) => state.medication)\nconst [newMedicationRequest, setNewMedicationRequest] = useState(({\n" }, { "change_type": "MODIFY", "old_path": "src/medications/search/ViewMedications.tsx", "new_path": "src/medications/search/ViewMedications.tsx", "diff": "@@ -17,8 +17,9 @@ const ViewMedications = () => {\nconst history = useHistory()\nconst setButtons = useButtonToolbarSetter()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('medications.label'))\n-\n+ })\nconst { permissions } = useSelector((state: RootState) => state.user)\nconst getButtons = useCallback(() => {\n" }, { "change_type": "MODIFY", "old_path": "src/patients/new/NewPatient.tsx", "new_path": "src/patients/new/NewPatient.tsx", "diff": "import { Button, Toast } from '@hospitalrun/components'\n-import React, { useState } from 'react'\n+import React, { useState, useEffect } from 'react'\nimport { useDispatch, useSelector } from 'react-redux'\nimport { useHistory } from 'react-router-dom'\n@@ -37,7 +37,9 @@ const NewPatient = () => {\n} as Patient\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('patients.newPatient'))\n+ })\nuseAddBreadcrumbs(breadcrumbs, true)\nconst onCancel = () => {\n" }, { "change_type": "MODIFY", "old_path": "src/patients/search/ViewPatients.tsx", "new_path": "src/patients/search/ViewPatients.tsx", "diff": "@@ -15,7 +15,9 @@ const ViewPatients = () => {\nconst { t } = useTranslator()\nconst history = useHistory()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('patients.label'))\n+ })\nconst dispatch = useDispatch()\nconst setButtonToolBar = useButtonToolbarSetter()\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/ViewAppointments.tsx", "new_path": "src/scheduling/appointments/ViewAppointments.tsx", "diff": "@@ -25,7 +25,9 @@ const ViewAppointments = () => {\nconst { t } = useTranslator()\nconst history = useHistory()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('scheduling.appointments.label'))\n+ })\nconst { data: appointments, isLoading } = useAppointments()\nconst [events, setEvents] = useState<Event[]>([])\nconst setButtonToolBar = useButtonToolbarSetter()\n" }, { "change_type": "MODIFY", "old_path": "src/settings/Settings.tsx", "new_path": "src/settings/Settings.tsx", "diff": "import { Row, Column } from '@hospitalrun/components'\n-import React from 'react'\n+import React, { useEffect } from 'react'\nimport { useUpdateTitle } from '../page-header/title/TitleContext'\nimport LanguageSelector from '../shared/components/input/LanguageSelector'\n@@ -8,8 +8,9 @@ import useTranslator from '../shared/hooks/useTranslator'\nconst Settings = () => {\nconst { t } = useTranslator()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('settings.label'))\n-\n+ })\nreturn (\n<>\n<Row>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/diagnoses/DiagnosisForm.tsx", "new_path": "src/patients/diagnoses/DiagnosisForm.tsx", "diff": "@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next'\nimport Input, { Option } from '../../shared/components/input'\nimport Diagnosis, { DiagnosisStatus } from '../../shared/model/Diagnosis'\nimport Patient from '../../shared/model/Patient'\n+import usePatientVisits from '../hooks/usePatientVisits'\ninterface Error {\nmessage?: string\n@@ -29,6 +30,7 @@ const DiagnosisForm = (props: Props) => {\nconst { t } = useTranslation()\nconst { diagnosis, diagnosisError, disabled, onChange, patient } = props\nconst [status, setStatus] = useState(diagnosis.status)\n+ const { data: visits } = usePatientVisits(patient?.id)\nconst onFieldChange = (name: string, value: string | DiagnosisStatus) => {\nif (onChange) {\n@@ -40,7 +42,7 @@ const DiagnosisForm = (props: Props) => {\n}\n}\n- const patientVisits = patient?.visits?.map((v) => ({\n+ const patientVisits = visits?.map((v) => ({\nlabel: `${v.type} at ${format(new Date(v.startDateTime), 'yyyy-MM-dd, hh:mm a')}`,\nvalue: v.id,\n})) as Option[]\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"react-bootstrap-typeahead\": \"~5.1.0\",\n\"react-dom\": \"~16.13.0\",\n\"react-i18next\": \"~11.7.0\",\n- \"react-query\": \"~2.23.0\",\n+ \"react-query\": \"~2.25.2\",\n\"react-query-devtools\": \"~2.6.0\",\n\"react-redux\": \"~7.2.0\",\n\"react-router\": \"~5.2.0\",\n\"redux-thunk\": \"~2.3.0\",\n\"relational-pouch\": \"~4.0.0\",\n\"shortid\": \"^2.2.15\",\n- \"typescript\": \"~3.8.3\",\n+ \"typescript\": \"~3x.8.3\",\n\"uuid\": \"^8.0.0\",\n\"validator\": \"^13.0.0\"\n},\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/view/ImportantPatientInfo.tsx", "new_path": "src/patients/view/ImportantPatientInfo.tsx", "diff": "@@ -13,6 +13,7 @@ import { RootState } from '../../shared/store'\nimport NewAllergyModal from '../allergies/NewAllergyModal'\nimport AddCarePlanModal from '../care-plans/AddCarePlanModal'\nimport AddDiagnosisModal from '../diagnoses/AddDiagnosisModal'\n+import usePatientAllergies from '../hooks/usePatientAllergies'\nimport AddVisitModal from '../visits/AddVisitModal'\ninterface Props {\n@@ -36,6 +37,7 @@ const ImportantPatientInfo = (props: Props) => {\nconst [showDiagnosisModal, setShowDiagnosisModal] = useState(false)\nconst [showAddCarePlanModal, setShowAddCarePlanModal] = useState(false)\nconst [showAddVisitModal, setShowAddVisitModal] = useState(false)\n+ const { data, status } = usePatientAllergies(patient.id)\nconst patientCodeStyle: CSSProperties = {\nposition: 'relative',\n@@ -111,8 +113,8 @@ const ImportantPatientInfo = (props: Props) => {\n<div style={allergiesSectionStyle}>\n<Typography variant=\"h5\">{t('patient.allergies.label')}</Typography>\n- {patient.allergies ? (\n- patient.allergies?.map((a: Allergy) => (\n+ {data && status !== 'loading' ? (\n+ data?.map((a: Allergy) => (\n<li key={a.id.toString()}>\n<Link to={`/patients/${patient.id}/allergies`}>{a.name}</Link>\n</li>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/view/ImportantPatientInfo.tsx", "new_path": "src/patients/view/ImportantPatientInfo.tsx", "diff": "@@ -81,7 +81,7 @@ const ImportantPatientInfo = (props: Props) => {\n<h6>{getPatientCode(patient)}</h6>\n</div>\n</div>\n- <div className=\"col d-flex justify-content-end\">\n+ <div className=\"col d-flex justify-content-end h-100\">\n{permissions.includes(Permissions.AddVisit) && (\n<Button\noutlined\n" } ]

[ { "change_type": "MODIFY", "old_path": "jest.config.js", "new_path": "jest.config.js", "diff": "module.exports = {\nroots: ['<rootDir>/src'],\ntestMatch: ['**/__tests__/**/*.+(ts|tsx)', '**/?(*.)+(spec|test).+(ts|tsx)'],\n- transform: {\n- '^.+\\\\.(ts|tsx)$': 'ts-jest',\n- },\ncoverageDirectory: './coverage',\ntestPathIgnorePatterns: ['<rootDir>/jest.config.js'],\n}\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"redux-mock-store\": \"~1.5.4\",\n\"rimraf\": \"~3.0.2\",\n\"source-map-explorer\": \"^2.2.2\",\n- \"standard-version\": \"~9.0.0\",\n- \"ts-jest\": \"~26.4.0\"\n+ \"standard-version\": \"~9.0.0\"\n},\n\"scripts\": {\n\"analyze\": \"source-map-explorer 'build/static/js/*.js'\",\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/medications/requests/NewMedicationRequest.test.tsx", "new_path": "src/__tests__/medications/requests/NewMedicationRequest.test.tsx", "diff": "@@ -38,9 +38,8 @@ describe('New Medication Request', () => {\n</Provider>,\n)\n- wrapper.find(NewMedicationRequest).props().updateTitle = jest.fn()\nwrapper.update()\n- return { wrapper }\n+ return { wrapper, history }\n}\ndescribe('form layout', () => {\n@@ -100,11 +99,9 @@ describe('New Medication Request', () => {\n})\n})\n- describe('on cancel', async () => {\n- const history = createMemoryHistory()\n- const { wrapper } = await setup()\n-\n- it('should navigate back to /medications', () => {\n+ describe('on cancel', () => {\n+ it('should navigate back to /medications', async () => {\n+ const { wrapper, history } = await setup()\nconst cancelButton = wrapper.find(Button).at(1)\nact(() => {\n@@ -116,8 +113,7 @@ describe('New Medication Request', () => {\n})\n})\n- describe('on save', async () => {\n- const history = createMemoryHistory()\n+ describe('on save', () => {\nlet medicationRepositorySaveSpy: any\nconst expectedDate = new Date()\nconst expectedMedication = {\n@@ -132,7 +128,6 @@ describe('New Medication Request', () => {\nmedication: { status: 'loading', error: {} },\nuser: { user: { id: 'fake id' } },\n} as any)\n- const { wrapper } = await setup(store)\nbeforeEach(() => {\njest.resetAllMocks()\nDate.now = jest.fn(() => expectedDate.valueOf())\n@@ -148,6 +143,8 @@ describe('New Medication Request', () => {\n})\nit('should save the medication request and navigate to \"/medications/:id\"', async () => {\n+ const { wrapper, history } = await setup(store)\n+\nconst patientTypeahead = wrapper.find(Typeahead)\nawait act(async () => {\nconst onChange = patientTypeahead.prop('onChange')\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/page-header/button-toolbar/ButtonToolBar.test.tsx", "new_path": "src/__tests__/page-header/button-toolbar/ButtonToolBar.test.tsx", "diff": "import { Button } from '@hospitalrun/components'\nimport { mount } from 'enzyme'\nimport React from 'react'\n-import { mocked } from 'ts-jest/utils'\nimport * as ButtonBarProvider from '../../../page-header/button-toolbar/ButtonBarProvider'\nimport ButtonToolBar from '../../../page-header/button-toolbar/ButtonToolBar'\n@@ -16,8 +15,7 @@ describe('Button Tool Bar', () => {\n<Button key=\"test1\">Test 1</Button>,\n<Button key=\"test2\">Test 2</Button>,\n]\n- jest.spyOn(ButtonBarProvider, 'useButtons')\n- mocked(ButtonBarProvider).useButtons.mockReturnValue(buttons)\n+ jest.spyOn(ButtonBarProvider, 'useButtons').mockReturnValue(buttons)\nconst wrapper = mount(<ButtonToolBar />).find('.button-toolbar')\n@@ -26,8 +24,7 @@ describe('Button Tool Bar', () => {\n})\nit('should return null when there is no button in the provider', () => {\n- jest.spyOn(ButtonBarProvider, 'useButtons')\n- mocked(ButtonBarProvider).useButtons.mockReturnValue([])\n+ jest.spyOn(ButtonBarProvider, 'useButtons').mockReturnValue([])\nconst wrapper = mount(<ButtonToolBar />)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/new/NewPatient.test.tsx", "new_path": "src/__tests__/patients/new/NewPatient.test.tsx", "diff": "@@ -7,7 +7,6 @@ import { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\nimport createMockStore, { MockStore } from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import { mocked } from 'ts-jest/utils'\nimport * as titleUtil from '../../../page-header/title/TitleContext'\nimport GeneralInformation from '../../../patients/GeneralInformation'\n@@ -31,9 +30,7 @@ describe('New Patient', () => {\nconst setup = (error?: any) => {\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- jest.spyOn(PatientRepository, 'save')\n- const mockedPatientRepository = mocked(PatientRepository, true)\n- mockedPatientRepository.save.mockResolvedValue(patient)\n+ jest.spyOn(PatientRepository, 'save').mockResolvedValue(patient)\nhistory = createMemoryHistory()\nstore = mockStore({ patient: { patient: {} as Patient, createError: error } } as any)\n@@ -126,8 +123,7 @@ describe('New Patient', () => {\n})\nit('should navigate to /patients/:id and display a message after a new patient is successfully created', async () => {\n- jest.spyOn(components, 'Toast')\n- const mockedComponents = mocked(components, true)\n+ jest.spyOn(components, 'Toast').mockImplementation(jest.fn())\nlet wrapper: any\nawait act(async () => {\nwrapper = await setup()\n@@ -150,7 +146,7 @@ describe('New Patient', () => {\n})\nexpect(history.location.pathname).toEqual(`/patients/${patient.id}`)\n- expect(mockedComponents.Toast).toHaveBeenCalledWith(\n+ expect(components.Toast).toHaveBeenCalledWith(\n'success',\n'states.success',\n`patients.successfullyCreated ${patient.fullName}`,\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "new_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "diff": "@@ -7,7 +7,6 @@ import { Provider } from 'react-redux'\nimport { Route, Router } from 'react-router-dom'\nimport createMockStore, { MockStore } from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import { mocked } from 'ts-jest/utils'\nimport * as ButtonBarProvider from '../../../page-header/button-toolbar/ButtonBarProvider'\nimport * as titleUtil from '../../../page-header/title/TitleContext'\n@@ -54,10 +53,8 @@ describe('ViewPatient', () => {\nsetButtonToolBarSpy = jest.fn()\njest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- jest.spyOn(PatientRepository, 'find')\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\njest.spyOn(PatientRepository, 'getLabs').mockResolvedValue([])\n- const mockedPatientRepository = mocked(PatientRepository, true)\n- mockedPatientRepository.find.mockResolvedValue(patient)\nhistory = createMemoryHistory()\nstore = mockStore({\npatient: { patient },\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/ViewAppointments.test.tsx", "new_path": "src/__tests__/scheduling/appointments/ViewAppointments.test.tsx", "diff": "@@ -6,7 +6,6 @@ import { Provider } from 'react-redux'\nimport { MemoryRouter } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import { mocked } from 'ts-jest/utils'\nimport * as ButtonBarProvider from '../../../page-header/button-toolbar/ButtonBarProvider'\nimport * as titleUtil from '../../../page-header/title/TitleContext'\n@@ -31,16 +30,15 @@ describe('ViewAppointments', () => {\nreason: 'reason',\n},\n] as Appointment[]\n+ const expectedPatient = {\n+ id: '123',\n+ fullName: 'patient full name',\n+ } as Patient\nconst setup = async () => {\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\njest.spyOn(AppointmentRepository, 'findAll').mockResolvedValue(expectedAppointments)\n- jest.spyOn(PatientRepository, 'find')\n- const mockedPatientRepository = mocked(PatientRepository, true)\n- mockedPatientRepository.find.mockResolvedValue({\n- id: '123',\n- fullName: 'patient full name',\n- } as Patient)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\nconst mockStore = createMockStore<RootState, any>([thunk])\nreturn mount(\n<Provider store={mockStore({ appointments: { appointments: expectedAppointments } } as any)}>\n@@ -61,9 +59,8 @@ describe('ViewAppointments', () => {\n})\nit('should add a \"New Appointment\" button to the button tool bar', async () => {\n- jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter')\nconst setButtonToolBarSpy = jest.fn()\n- mocked(ButtonBarProvider).useButtonToolbarSetter.mockReturnValue(setButtonToolBarSpy)\n+ jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\nawait act(async () => {\nawait setup()\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "diff": "@@ -8,7 +8,6 @@ import { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\nimport createMockStore, { MockStore } from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import { mocked } from 'ts-jest/utils'\nimport * as titleUtil from '../../../../page-header/title/TitleContext'\nimport AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm'\n@@ -57,16 +56,9 @@ describe('Edit Appointment', () => {\nconst setup = async (mockAppointment: Appointment, mockPatient: Patient) => {\njest.resetAllMocks()\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- jest.spyOn(AppointmentRepository, 'saveOrUpdate')\n- jest.spyOn(AppointmentRepository, 'find')\n- jest.spyOn(PatientRepository, 'find')\n-\n- const mockedAppointmentRepository = mocked(AppointmentRepository, true)\n- mockedAppointmentRepository.find.mockResolvedValue(mockAppointment)\n- mockedAppointmentRepository.saveOrUpdate.mockResolvedValue(mockAppointment)\n-\n- const mockedPatientRepository = mocked(PatientRepository, true)\n- mockedPatientRepository.find.mockResolvedValue(mockPatient)\n+ jest.spyOn(AppointmentRepository, 'saveOrUpdate').mockResolvedValue(mockAppointment)\n+ jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(mockAppointment)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(mockPatient)\nhistory = createMemoryHistory()\nstore = mockStore({ appointment: { mockAppointment, mockPatient } } as any)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx", "diff": "import * as components from '@hospitalrun/components'\n-import { Alert, Typeahead } from '@hospitalrun/components'\n+import { Alert, Button, Typeahead } from '@hospitalrun/components'\nimport { act } from '@testing-library/react'\nimport { roundToNearestMinutes, addMinutes } from 'date-fns'\nimport { mount } from 'enzyme'\n@@ -9,7 +9,6 @@ import { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\nimport createMockStore, { MockStore } from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import { mocked } from 'ts-jest/utils'\nimport * as titleUtil from '../../../../page-header/title/TitleContext'\nimport AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm'\n@@ -22,7 +21,6 @@ import { RootState } from '../../../../shared/store'\nconst { TitleProvider } = titleUtil\nconst mockStore = createMockStore<RootState, any>([thunk])\n-const mockedComponents = mocked(components, true)\ndescribe('New Appointment', () => {\nlet history: MemoryHistory\n@@ -31,10 +29,9 @@ describe('New Appointment', () => {\nconst setup = () => {\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- jest.spyOn(AppointmentRepository, 'save')\n- mocked(AppointmentRepository, true).save.mockResolvedValue(\n- expectedNewAppointment as Appointment,\n- )\n+ jest\n+ .spyOn(AppointmentRepository, 'save')\n+ .mockResolvedValue(expectedNewAppointment as Appointment)\nhistory = createMemoryHistory()\nstore = mockStore({\nappointment: {\n@@ -111,7 +108,7 @@ describe('New Appointment', () => {\nwrapper.update()\n- const saveButton = wrapper.find(mockedComponents.Button).at(0)\n+ const saveButton = wrapper.find(Button).at(0)\nexpect(saveButton.text().trim()).toEqual('actions.save')\nconst onClick = saveButton.prop('onClick') as any\n@@ -155,7 +152,7 @@ describe('New Appointment', () => {\nwrapper.update()\n- const saveButton = wrapper.find(mockedComponents.Button).at(0)\n+ const saveButton = wrapper.find(Button).at(0)\nexpect(saveButton.text().trim()).toEqual('actions.save')\nconst onClick = saveButton.prop('onClick') as any\n@@ -240,7 +237,7 @@ describe('New Appointment', () => {\nwrapper.update()\n- const saveButton = wrapper.find(mockedComponents.Button).at(0)\n+ const saveButton = wrapper.find(Button).at(0)\nexpect(saveButton.text().trim()).toEqual('actions.save')\nconst onClick = saveButton.prop('onClick') as any\n@@ -276,7 +273,7 @@ describe('New Appointment', () => {\nonFieldChange('patient', expectedAppointment.patient)\n})\nwrapper.update()\n- const saveButton = wrapper.find(mockedComponents.Button).at(0)\n+ const saveButton = wrapper.find(Button).at(0)\nexpect(saveButton.text().trim()).toEqual('actions.save')\nconst onClick = saveButton.prop('onClick') as any\n@@ -285,7 +282,7 @@ describe('New Appointment', () => {\n})\nexpect(history.location.pathname).toEqual(`/appointments/${expectedNewAppointment.id}`)\n- expect(mockedComponents.Toast).toHaveBeenCalledWith(\n+ expect(components.Toast).toHaveBeenCalledWith(\n'success',\n'states.success',\n`scheduling.appointment.successfullyCreated`,\n@@ -300,7 +297,7 @@ describe('New Appointment', () => {\nwrapper = await setup()\n})\n- const cancelButton = wrapper.find(mockedComponents.Button).at(1)\n+ const cancelButton = wrapper.find(Button).at(1)\nact(() => {\nconst onClick = cancelButton.prop('onClick') as any\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "diff": "@@ -7,7 +7,6 @@ import { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\nimport createMockStore, { MockStore } from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import { mocked } from 'ts-jest/utils'\nimport * as ButtonBarProvider from '../../../../page-header/button-toolbar/ButtonBarProvider'\nimport * as titleUtil from '../../../../page-header/title/TitleContext'\n@@ -225,7 +224,6 @@ describe('View Appointment', () => {\nit('should navigate to /appointments and display a message when delete is successful', async () => {\njest.spyOn(components, 'Toast')\n- const mockedComponents = mocked(components, true)\nconst { wrapper } = await setup('completed', [\nPermissions.ReadAppointments,\n@@ -241,7 +239,7 @@ describe('View Appointment', () => {\nwrapper.update()\nexpect(history.location.pathname).toEqual('/appointments')\n- expect(mockedComponents.Toast).toHaveBeenCalledWith(\n+ expect(components.Toast).toHaveBeenCalledWith(\n'success',\n'states.success',\n'scheduling.appointment.successfullyDeleted',\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/shared/utils/formatDate.test.ts", "diff": "+import { formatDate } from '../../../shared/util/formatDate'\n+\n+it('should format a valid date provided as a string', () => {\n+ const formattedDate = formatDate('2020-10-25T12:54:15.353Z')\n+ expect(formattedDate).toEqual('10/25/2020')\n+})\n+\n+it('should format a valid date provided as a Date object', () => {\n+ const formattedDate = formatDate(new Date('2020-10-25T12:54:15.353Z'))\n+ expect(formattedDate).toEqual('10/25/2020')\n+})\n+\n+it('should return \"\" when passed undefined', () => {\n+ const formattedDate = formatDate()\n+ expect(formattedDate).toEqual('')\n+})\n+\n+it('should return \"\" when passed invalid date string', () => {\n+ const formattedDate = formatDate('invalid')\n+ expect(formattedDate).toEqual('')\n+})\n+\n+it('should return \"\" when passed invalid date object', () => {\n+ const formattedDate = formatDate(new Date('invalid'))\n+ expect(formattedDate).toEqual('')\n+})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/search/ViewPatientsTable.tsx", "new_path": "src/patients/search/ViewPatientsTable.tsx", "diff": "import { Table } from '@hospitalrun/components'\n-import format from 'date-fns/format'\nimport React from 'react'\nimport { useHistory } from 'react-router'\nimport Loading from '../../shared/components/Loading'\nimport useTranslator from '../../shared/hooks/useTranslator'\n+import { formatDate } from '../../shared/util/formatDate'\nimport usePatients from '../hooks/usePatients'\nimport PatientSearchRequest from '../models/PatientSearchRequest'\nimport NoPatientsExist from './NoPatientsExist'\n@@ -39,8 +39,7 @@ const ViewPatientsTable = (props: Props) => {\n{\nlabel: t('patient.dateOfBirth'),\nkey: 'dateOfBirth',\n- formatter: (row) =>\n- row.dateOfBirth ? format(new Date(row.dateOfBirth), 'yyyy-MM-dd') : '',\n+ formatter: (row) => formatDate(row.dateOfBirth),\n},\n]}\nactionsHeaderText={t('actions.label')}\n" }, { "change_type": "MODIFY", "old_path": "src/patients/view/ImportantPatientInfo.tsx", "new_path": "src/patients/view/ImportantPatientInfo.tsx", "diff": "import { Row, Table, Button, Typography } from '@hospitalrun/components'\n-import format from 'date-fns/format'\nimport React, { CSSProperties, useState } from 'react'\nimport { useSelector } from 'react-redux'\nimport { Link, useHistory } from 'react-router-dom'\n@@ -10,6 +9,7 @@ import Diagnosis from '../../shared/model/Diagnosis'\nimport Patient from '../../shared/model/Patient'\nimport Permissions from '../../shared/model/Permissions'\nimport { RootState } from '../../shared/store'\n+import { formatDate } from '../../shared/util/formatDate'\nimport NewAllergyModal from '../allergies/NewAllergyModal'\nimport AddCarePlanModal from '../care-plans/AddCarePlanModal'\nimport AddDiagnosisModal from '../diagnoses/AddDiagnosisModal'\n@@ -105,7 +105,7 @@ const ImportantPatientInfo = (props: Props) => {\n<strong>{t('patient.dateOfBirth')}</strong>\n<h6>\n{patient.dateOfBirth\n- ? format(new Date(patient.dateOfBirth), 'MM/dd/yyyy')\n+ ? formatDate(patient.dateOfBirth)\n: t('patient.unknownDateOfBirth')}\n</h6>\n</div>\n@@ -148,10 +148,7 @@ const ImportantPatientInfo = (props: Props) => {\n{\nlabel: t('patient.diagnoses.diagnosisDate'),\nkey: 'diagnosisDate',\n- formatter: (row) =>\n- row.diagnosisDate\n- ? format(new Date(row.diagnosisDate), 'yyyy-MM-dd hh:mm a')\n- : '',\n+ formatter: (row) => formatDate(row.diagnosisDate),\n},\n{ label: t('patient.diagnoses.status'), key: 'status' },\n]}\n@@ -181,12 +178,12 @@ const ImportantPatientInfo = (props: Props) => {\n{\nlabel: t('patient.carePlan.startDate'),\nkey: 'startDate',\n- formatter: (row) => format(new Date(row.startDate), 'yyyy-MM-dd'),\n+ formatter: (row) => formatDate(row.startDate),\n},\n{\nlabel: t('patient.carePlan.endDate'),\nkey: 'endDate',\n- formatter: (row) => format(new Date(row.endDate), 'yyyy-MM-dd'),\n+ formatter: (row) => formatDate(row.endDate),\n},\n{ label: t('patient.carePlan.status'), key: 'status' },\n]}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/shared/util/formatDate.ts", "diff": "+import format from 'date-fns/format'\n+\n+export const formatDate = (date?: string | Date) => {\n+ if (!date) {\n+ return ''\n+ }\n+ const dateObject = typeof date === 'string' ? new Date(date) : date\n+ if (Number.isNaN(dateObject.getTime())) {\n+ return ''\n+ }\n+ return format(dateObject, 'MM/dd/yyyy')\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/shared/model/Diagnosis.ts", "new_path": "src/shared/model/Diagnosis.ts", "diff": "@@ -3,7 +3,7 @@ export enum DiagnosisStatus {\nRecurrence = 'recurrence',\nRelapse = 'relapse',\nInactive = 'inactive',\n- Remission = 'remisison',\n+ Remission = 'remission',\nResolved = 'resolved',\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/appointments/AppointmentsList.test.tsx", "new_path": "src/__tests__/patients/appointments/AppointmentsList.test.tsx", "diff": "@@ -56,7 +56,7 @@ const setup = async (patient = expectedPatient, appointments = expectedAppointme\nwrapper = await mount(\n<Router history={history}>\n<Provider store={store}>\n- <AppointmentsList patientId={patient.id} />\n+ <AppointmentsList patient={patient} />\n</Provider>\n</Router>,\n)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "new_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "diff": "@@ -204,7 +204,7 @@ describe('ViewPatient', () => {\nexpect(history.location.pathname).toEqual(`/patients/${patient.id}/appointments`)\nexpect(tabs.at(2).prop('active')).toBeTruthy()\nexpect(appointmentsTab).toHaveLength(1)\n- expect(appointmentsTab.prop('patientId')).toEqual(patient.id)\n+ expect(appointmentsTab.prop('patient')).toEqual(patient)\n})\nit('should mark the allergies tab as active when it is clicked and render the allergies component when route is /patients/:id/allergies', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/patients/appointments/AppointmentsList.tsx", "new_path": "src/patients/appointments/AppointmentsList.tsx", "diff": "@@ -6,15 +6,17 @@ import { useHistory } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport Loading from '../../shared/components/Loading'\nimport useTranslator from '../../shared/hooks/useTranslator'\n+import Patient from '../../shared/model/Patient'\nimport usePatientsAppointments from '../hooks/usePatientAppointments'\ninterface Props {\n- patientId: string\n+ patient: Patient\n}\n-const AppointmentsList = ({ patientId }: Props) => {\n+const AppointmentsList = ({ patient }: Props) => {\nconst history = useHistory()\nconst { t } = useTranslator()\n+ const patientId = patient.id\nconst { data, status } = usePatientsAppointments(patientId)\n@@ -40,7 +42,7 @@ const AppointmentsList = ({ patientId }: Props) => {\noutlined\ncolor=\"success\"\nicon=\"appointment-add\"\n- onClick={() => history.push('/appointments/new')}\n+ onClick={() => history.push({ pathname: '/appointments/new', state: { patient } })}\n>\n{t('scheduling.appointments.new')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/patients/view/ViewPatient.tsx", "new_path": "src/patients/view/ViewPatient.tsx", "diff": "@@ -150,7 +150,7 @@ const ViewPatient = () => {\n<RelatedPerson patient={patient} />\n</Route>\n<Route exact path={`${path}/appointments`}>\n- <AppointmentsList patientId={patient.id} />\n+ <AppointmentsList patient={patient} />\n</Route>\n<Route path={`${path}/allergies`}>\n<Allergies patient={patient} />\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/new/NewAppointment.tsx", "new_path": "src/scheduling/appointments/new/NewAppointment.tsx", "diff": "@@ -3,12 +3,13 @@ import addMinutes from 'date-fns/addMinutes'\nimport roundToNearestMinutes from 'date-fns/roundToNearestMinutes'\nimport _ from 'lodash'\nimport React, { useEffect, useState } from 'react'\n-import { useHistory } from 'react-router-dom'\n+import { useHistory, useLocation } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport { useUpdateTitle } from '../../../page-header/title/TitleContext'\nimport useTranslator from '../../../shared/hooks/useTranslator'\nimport Appointment from '../../../shared/model/Appointment'\n+import Patient from '../../../shared/model/Patient'\nimport useScheduleAppointment from '../../hooks/useScheduleAppointment'\nimport AppointmentDetailForm from '../AppointmentDetailForm'\nimport { AppointmentError } from '../util/validate-appointment'\n@@ -18,9 +19,18 @@ const breadcrumbs = [\n{ i18nKey: 'scheduling.appointments.new', location: '/appointments/new' },\n]\n+interface LocationProps {\n+ pathname: string\n+ state?: {\n+ patient: Patient\n+ }\n+}\n+\nconst NewAppointment = () => {\nconst { t } = useTranslator()\nconst history = useHistory()\n+ const location: LocationProps = useLocation()\n+ const patient = location.state?.patient\nconst updateTitle = useUpdateTitle()\nuseEffect(() => {\nupdateTitle(t('scheduling.appointments.new'))\n@@ -32,7 +42,7 @@ const NewAppointment = () => {\nconst [saved, setSaved] = useState(false)\nconst [newAppointmentMutateError, setError] = useState<AppointmentError>({} as AppointmentError)\nconst [newAppointment, setAppointment] = useState({\n- patient: '',\n+ patient: patient || '',\nstartDateTime: startDateTime.toISOString(),\nendDateTime: endDateTime.toISOString(),\nlocation: '',\n@@ -95,6 +105,7 @@ const NewAppointment = () => {\n<form>\n<AppointmentDetailForm\nappointment={newAppointment as Appointment}\n+ patient={patient as Patient}\nerror={newAppointmentMutateError}\nonFieldChange={onFieldChange}\n/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"husky\": \"~4.3.0\",\n\"jest\": \"24.9.0\",\n\"lint-staged\": \"~10.5.0\",\n+ \"jest-canvas-mock\": \"~2.3.0\",\n\"memdown\": \"~5.1.0\",\n\"prettier\": \"~2.1.0\",\n\"redux-mock-store\": \"~1.5.4\",\n" }, { "change_type": "MODIFY", "old_path": "src/setupTests.js", "new_path": "src/setupTests.js", "diff": "/* eslint-disable import/no-extraneous-dependencies */\nimport Enzyme from 'enzyme'\nimport Adapter from 'enzyme-adapter-react-16'\n+import 'jest-canvas-mock'\nimport './__mocks__/i18next'\nimport './__mocks__/matchMediaMock'\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/view/ImportantPatientInfo.test.tsx", "new_path": "src/__tests__/patients/view/ImportantPatientInfo.test.tsx", "diff": "@@ -99,8 +99,8 @@ describe('Important Patient Info Panel', () => {\nit(\"should render patient's dateOfDate\", async () => {\nconst wrapper = await setup(expectedPatient, [])\n- const sex = wrapper.find('.patient-dateOfBirth')\n- expect(sex.text()).toEqual(`patient.dateOfBirth${expectedPatient.dateOfBirth}`)\n+ const dateOfBirth = wrapper.find('.patient-dateOfBirth')\n+ expect(dateOfBirth.text()).toEqual(`patient.dateOfBirth${expectedPatient.dateOfBirth}`)\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/view/ImportantPatientInfo.tsx", "new_path": "src/patients/view/ImportantPatientInfo.tsx", "diff": "import { Row, Table, Button, Typography } from '@hospitalrun/components'\nimport React, { CSSProperties, useState } from 'react'\nimport { useSelector } from 'react-redux'\n-import { Link, useHistory } from 'react-router-dom'\n+import { useHistory } from 'react-router-dom'\nimport useTranslator from '../../shared/hooks/useTranslator'\nimport Allergy from '../../shared/model/Allergy'\n@@ -39,55 +39,90 @@ const ImportantPatientInfo = (props: Props) => {\nconst [showAddVisitModal, setShowAddVisitModal] = useState(false)\nconst { data, status } = usePatientAllergies(patient.id)\n- const patientCodeStyle: CSSProperties = {\n+ const headerRowStyle: CSSProperties = {\n+ minHeight: '3rem',\n+ marginBottom: '1rem',\n+ }\n+\n+ const middleRowStyle: CSSProperties = {\n+ minHeight: '3rem',\n+ marginBottom: '1rem',\n+ }\n+\n+ const headerInfoStyle: CSSProperties = {\n+ display: 'flex',\n+ flexDirection: 'column',\nposition: 'relative',\ncolor: 'black',\nbackgroundColor: 'rgba(245,245,245,1)',\nfontSize: 'small',\ntextAlign: 'center',\n+ justifyContent: 'center',\n+ height: '100%',\n}\n- const allergiesSectionStyle: CSSProperties = {\n- position: 'relative',\n+ const headerInfoPatientNameStyle: CSSProperties = {\n+ display: 'flex',\n+ flexDirection: 'column',\ncolor: 'black',\n- backgroundColor: 'rgba(245,245,245,1)',\n- fontSize: 'small',\n- padding: '10px',\n+ textAlign: 'left',\n+ justifyContent: 'center',\n+ height: '100%',\n}\n- const tableStyle: CSSProperties = {\n- position: 'relative',\n- marginLeft: '2px',\n- marginRight: '2px',\n- fontSize: 'small',\n+ const headerAddVisitButtonStyle: CSSProperties = {\n+ height: '2.5rem',\n}\n- const addAllergyButtonStyle: CSSProperties = {\n+ const middleRowSectionStyle: CSSProperties = {\n+ display: 'flex',\n+ flexDirection: 'column',\n+ height: '100%',\n+ }\n+\n+ const tableContainerStyle: CSSProperties = {\nfontSize: 'small',\n- position: 'relative',\n- top: '5px',\n- bottom: '5px',\n}\nreturn (\n<div>\n- <Row>\n+ <Row style={headerRowStyle}>\n<div className=\"col-2\">\n+ <div style={headerInfoPatientNameStyle}>\n<h3>{patient.fullName}</h3>\n</div>\n+ </div>\n<div className=\"col-2\">\n- <div style={patientCodeStyle}>\n+ <div style={headerInfoStyle}>\n<strong>{t('patient.code')}</strong>\n<h6>{getPatientCode(patient)}</h6>\n</div>\n</div>\n- <div className=\"col d-flex justify-content-end h-100\">\n+ <div className=\"col-2\">\n+ <div style={headerInfoStyle} className=\"patient-sex\">\n+ <strong>{t('patient.sex')}</strong>\n+ <h6>{patient.sex}</h6>\n+ </div>\n+ </div>\n+ <div className=\"col-2\">\n+ <div style={headerInfoStyle} className=\"patient-dateOfBirth\">\n+ <strong>{t('patient.dateOfBirth')}</strong>\n+ <h6>\n+ {patient.dateOfBirth\n+ ? formatDate(patient.dateOfBirth)\n+ : t('patient.unknownDateOfBirth')}\n+ </h6>\n+ </div>\n+ </div>\n+\n+ <div className=\"col d-flex justify-content-end align-items-center\">\n{permissions.includes(Permissions.AddVisit) && (\n<Button\noutlined\ncolor=\"success\"\nicon=\"add\"\niconLocation=\"left\"\n+ style={headerAddVisitButtonStyle}\nonClick={() => setShowAddVisitModal(true)}\n>\n{t('patient.visits.new')}\n@@ -95,39 +130,24 @@ const ImportantPatientInfo = (props: Props) => {\n)}\n</div>\n</Row>\n- <Row>\n- <div className=\"col\">\n- <div className=\"patient-sex\">\n- <strong>{t('patient.sex')}</strong>\n- <h6>{patient.sex}</h6>\n- </div>\n- <div className=\"patient-dateOfBirth\">\n- <strong>{t('patient.dateOfBirth')}</strong>\n- <h6>\n- {patient.dateOfBirth\n- ? formatDate(patient.dateOfBirth)\n- : t('patient.unknownDateOfBirth')}\n- </h6>\n- </div>\n- <br />\n- <div style={allergiesSectionStyle}>\n+ <Row style={middleRowStyle}>\n+ <div className=\"col allergies-section\" style={middleRowSectionStyle}>\n<Typography variant=\"h5\">{t('patient.allergies.label')}</Typography>\n- {data && status !== 'loading' ? (\n- data?.map((a: Allergy) => (\n- <li key={a.id.toString()}>\n- <Link to={`/patients/${patient.id}/allergies`}>{a.name}</Link>\n- </li>\n- ))\n- ) : (\n- <></>\n- )}\n+ <div className=\"border border-primary\" style={tableContainerStyle}>\n+ <Table\n+ tableClassName=\"table table-hover table-sm m-0\"\n+ onRowClick={() => history.push(`/patients/${patient.id}/allergies`)}\n+ getID={(row) => row.id}\n+ columns={[{ label: t('patient.allergies.allergyName'), key: 'name' }]}\n+ data={data && status !== 'loading' ? (data as Allergy[]) : []}\n+ />\n+ </div>\n{permissions.includes(Permissions.AddAllergy) && (\n<Button\n- style={addAllergyButtonStyle}\n- color=\"primary\"\n+ size=\"small\"\n+ color=\"light\"\nicon=\"add\"\n- outlined\niconLocation=\"left\"\nonClick={() => setShowNewAllergyModal(true)}\n>\n@@ -135,12 +155,12 @@ const ImportantPatientInfo = (props: Props) => {\n</Button>\n)}\n</div>\n- </div>\n- <div className=\"col diagnoses-section\">\n+ <div className=\"col diagnoses-section\" style={middleRowSectionStyle}>\n<Typography variant=\"h5\">{t('patient.diagnoses.label')}</Typography>\n- <div className=\"border border-primary\" style={tableStyle}>\n+ <div className=\"border border-primary\" style={tableContainerStyle}>\n<Table\n+ tableClassName=\"table table-hover table-sm m-0\"\nonRowClick={() => history.push(`/patients/${patient.id}/diagnoses`)}\ngetID={(row) => row.id}\ncolumns={[\n@@ -157,6 +177,7 @@ const ImportantPatientInfo = (props: Props) => {\n</div>\n{permissions.includes(Permissions.AddDiagnosis) && (\n<Button\n+ size=\"small\"\ncolor=\"light\"\nicon=\"add\"\niconLocation=\"left\"\n@@ -166,10 +187,12 @@ const ImportantPatientInfo = (props: Props) => {\n</Button>\n)}\n</div>\n- <div className=\"col carePlan-section\">\n+\n+ <div className=\"col carePlan-section\" style={middleRowSectionStyle}>\n<Typography variant=\"h5\">{t('patient.carePlan.label')}</Typography>\n- <div className=\"border border-primary\" style={tableStyle}>\n+ <div className=\"border border-primary\" style={tableContainerStyle}>\n<Table\n+ tableClassName=\"table table-hover table-sm m-0\"\nonRowClick={(row) => history.push(`/patients/${patient.id}/care-plans/${row.id}`)}\ngetID={(row) => row.id}\ndata={patient.carePlans || []}\n@@ -191,6 +214,7 @@ const ImportantPatientInfo = (props: Props) => {\n</div>\n{permissions.includes(Permissions.AddCarePlan) && (\n<Button\n+ size=\"small\"\ncolor=\"light\"\nicon=\"add\"\niconLocation=\"left\"\n@@ -225,7 +249,6 @@ const ImportantPatientInfo = (props: Props) => {\nonCloseButtonClick={() => setShowAddVisitModal(false)}\npatientId={patient.id}\n/>\n- <br />\n</div>\n)\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/patient/index.ts", "new_path": "src/shared/locales/enUs/translations/patient/index.ts", "diff": "@@ -75,8 +75,8 @@ export default {\ndiagnoses: {\nlabel: 'Diagnoses',\nnew: 'Add Diagnosis',\n- diagnosisName: 'Diagnosis Name',\n- diagnosisDate: 'Diagnosis Date',\n+ diagnosisName: 'Name',\n+ diagnosisDate: 'Date',\nonsetDate: 'Onset Date',\nabatementDate: 'Abatement Date',\nvisit: 'Visit',\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/fr/translations/patient/index.ts", "new_path": "src/shared/locales/fr/translations/patient/index.ts", "diff": "@@ -59,8 +59,8 @@ export default {\ndiagnoses: {\nlabel: 'Diagnostics',\nnew: 'Ajouter un diagnostic',\n- diagnosisName: 'Nom du diagnostic',\n- diagnosisDate: 'Date du diagnostic',\n+ diagnosisName: 'Nom',\n+ diagnosisDate: 'Date',\nwarning: {\nnoDiagnoses: 'Aucun diagnostic',\n},\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/it/translations/patient/index.ts", "new_path": "src/shared/locales/it/translations/patient/index.ts", "diff": "@@ -60,8 +60,8 @@ export default {\ndiagnoses: {\nlabel: 'Diagnosi',\nnew: 'Aggiungi diagnosi',\n- diagnosisName: 'Nome della diagnosi',\n- diagnosisDate: 'Data della diagnosi',\n+ diagnosisName: 'Nome',\n+ diagnosisDate: 'Data',\nwarning: {\nnoDiagnoses: 'Non ci sono diagnosi',\n},\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "new_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "diff": "@@ -12,6 +12,7 @@ import NewLabRequest from '../../../labs/requests/NewLabRequest'\nimport * as validationUtil from '../../../labs/utils/validate-lab'\nimport { LabError } from '../../../labs/utils/validate-lab'\nimport * as titleUtil from '../../../page-header/title/TitleContext'\n+import SelectWithLabelFormGroup from '../../../shared/components/input/SelectWithLabelFormGroup'\nimport TextFieldWithLabelFormGroup from '../../../shared/components/input/TextFieldWithLabelFormGroup'\nimport TextInputWithLabelFormGroup from '../../../shared/components/input/TextInputWithLabelFormGroup'\nimport LabRepository from '../../../shared/db/LabRepository'\n@@ -90,6 +91,15 @@ describe('New Lab Request', () => {\nexpect(notesTextField.prop('isEditable')).toBeTruthy()\n})\n+ it('should render a visit select', async () => {\n+ const { wrapper } = await setup()\n+ const visitSelect = wrapper.find(SelectWithLabelFormGroup)\n+\n+ expect(visitSelect).toBeDefined()\n+ expect(visitSelect.prop('label') as string).toEqual('patient.visit')\n+ expect(visitSelect.prop('isRequired')).toBeTruthy()\n+ })\n+\nit('should render a save button', async () => {\nconst { wrapper } = await setup()\nconst saveButton = wrapper.find(Button).at(0)\n" }, { "change_type": "MODIFY", "old_path": "src/labs/requests/NewLabRequest.tsx", "new_path": "src/labs/requests/NewLabRequest.tsx", "diff": "-import { Typeahead, Label, Button, Alert, Toast } from '@hospitalrun/components'\n+import { Typeahead, Label, Button, Alert, Toast, Column, Row } from '@hospitalrun/components'\n+import format from 'date-fns/format'\nimport React, { useState, useEffect } from 'react'\nimport { useSelector } from 'react-redux'\nimport { useHistory } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport { useUpdateTitle } from '../../page-header/title/TitleContext'\n+import SelectWithLabelFormGroup, {\n+ Option,\n+} from '../../shared/components/input/SelectWithLabelFormGroup'\nimport TextFieldWithLabelFormGroup from '../../shared/components/input/TextFieldWithLabelFormGroup'\nimport TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'\nimport PatientRepository from '../../shared/db/PatientRepository'\n@@ -22,6 +26,8 @@ const NewLabRequest = () => {\nconst [mutate] = useRequestLab()\nconst [newNote, setNewNote] = useState('')\nconst [error, setError] = useState<LabError | undefined>(undefined)\n+ const [visitOptions, setVisitOptions] = useState([] as Option[])\n+\nconst updateTitle = useUpdateTitle()\nuseEffect(() => {\nupdateTitle(t('labs.requests.new'))\n@@ -31,6 +37,8 @@ const NewLabRequest = () => {\ntype: '',\nstatus: 'requested',\nrequestedBy: user?.id || '',\n+ requestedOn: '',\n+ visitId: '',\n})\nconst breadcrumbs = [\n@@ -42,6 +50,12 @@ const NewLabRequest = () => {\nuseAddBreadcrumbs(breadcrumbs)\nconst onPatientChange = (patient: Patient) => {\n+ const visits = patient.visits?.map((v) => ({\n+ label: `${v.type} at ${format(new Date(v.startDateTime), 'yyyy-MM-dd hh:mm a')}`,\n+ value: v.id,\n+ })) as Option[]\n+ setVisitOptions(visits)\n+\nsetNewLabRequest((previousNewLabRequest) => ({\n...previousNewLabRequest,\npatient: patient.id,\n@@ -83,14 +97,30 @@ const NewLabRequest = () => {\n}\n}\n+ const onVisitChange = (value: string) => {\n+ setNewLabRequest((previousNewLabRequest) => ({\n+ ...previousNewLabRequest,\n+ visitId: value,\n+ }))\n+ }\n+\nconst onCancel = () => {\nhistory.push('/labs')\n}\n+ const defaultSelectedVisitsOption = () => {\n+ if (visitOptions !== undefined) {\n+ return visitOptions.filter(({ value }) => value === newLabRequest.visitId)\n+ }\n+ return []\n+ }\n+\nreturn (\n<>\n{error && <Alert color=\"danger\" title={t('states.error')} message={t(error.message || '')} />}\n<form>\n+ <Row>\n+ <Column>\n<div className=\"form-group patient-typeahead\">\n<Label htmlFor=\"patientTypeahead\" isRequired text={t('labs.lab.patient')} />\n<Typeahead\n@@ -104,6 +134,23 @@ const NewLabRequest = () => {\nfeedback={t(error?.patient as string)}\n/>\n</div>\n+ </Column>\n+ <Column>\n+ <div className=\"form-group\">\n+ <SelectWithLabelFormGroup\n+ name=\"visit\"\n+ label={t('patient.visit')}\n+ isRequired\n+ isEditable={newLabRequest.patient !== undefined}\n+ options={visitOptions || []}\n+ defaultSelected={defaultSelectedVisitsOption()}\n+ onChange={(values) => {\n+ onVisitChange(values[0])\n+ }}\n+ />\n+ </div>\n+ </Column>\n+ </Row>\n<TextInputWithLabelFormGroup\nname=\"labType\"\nlabel={t('labs.lab.type')}\n" }, { "change_type": "MODIFY", "old_path": "src/shared/model/Lab.ts", "new_path": "src/shared/model/Lab.ts", "diff": "@@ -11,4 +11,5 @@ export default interface Lab extends AbstractDBModel {\nrequestedOn: string\ncompletedOn?: string\ncanceledOn?: string\n+ visitId?: string\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "{\n\"name\": \"@hospitalrun/frontend\",\n- \"version\": \"2.0.0-alpha.6\",\n+ \"version\": \"2.0.0-alpha.7\",\n\"description\": \"React frontend for HospitalRun\",\n\"private\": false,\n\"license\": \"MIT\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/imagings/search/ViewImagings.tsx", "new_path": "src/imagings/search/ViewImagings.tsx", "diff": "-import { Button } from '@hospitalrun/components'\n+import { Button, Container, Row } from '@hospitalrun/components'\nimport React, { useState, useEffect, useCallback } from 'react'\nimport { useSelector } from 'react-redux'\nimport { useHistory } from 'react-router-dom'\n@@ -57,9 +57,11 @@ const ViewImagings = () => {\n}, [getButtons, setButtons])\nreturn (\n- <div className=\"row\">\n+ <Container>\n+ <Row>\n<ImagingRequestTable searchRequest={searchRequest} />\n- </div>\n+ </Row>\n+ </Container>\n)\n}\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/list/ViewIncidents.tsx", "new_path": "src/incidents/list/ViewIncidents.tsx", "diff": "-import { Button } from '@hospitalrun/components'\n+import { Button, Container, Row, Column } from '@hospitalrun/components'\nimport React, { useEffect, useState } from 'react'\nimport { useHistory } from 'react-router-dom'\n@@ -45,9 +45,9 @@ const ViewIncidents = () => {\n}))\nreturn (\n- <>\n- <div className=\"row\">\n- <div className=\"col-md-3 col-lg-2\">\n+ <Container>\n+ <Row>\n+ <Column md={3} lg={2}>\n<SelectWithLabelFormGroup\nname=\"type\"\nlabel={t('incidents.filterTitle')}\n@@ -56,12 +56,12 @@ const ViewIncidents = () => {\nonChange={(values) => setSearchFilter(values[0] as IncidentFilter)}\nisEditable\n/>\n- </div>\n- </div>\n- <div className=\"row\">\n+ </Column>\n+ </Row>\n+ <Row>\n<ViewIncidentsTable searchRequest={{ status: searchFilter }} />\n- </div>\n- </>\n+ </Row>\n+ </Container>\n)\n}\n" }, { "change_type": "MODIFY", "old_path": "src/labs/ViewLabs.tsx", "new_path": "src/labs/ViewLabs.tsx", "diff": "-import { Button, Table } from '@hospitalrun/components'\n+import { Button, Table, Container, Row, Column } from '@hospitalrun/components'\nimport format from 'date-fns/format'\nimport React, { useState, useEffect, useCallback } from 'react'\nimport { useSelector } from 'react-redux'\n@@ -78,9 +78,9 @@ const ViewLabs = () => {\n]\nreturn (\n- <>\n- <div className=\"row\">\n- <div className=\"col-md-3 col-lg-2\">\n+ <Container>\n+ <Row>\n+ <Column md={3} lg={2}>\n<SelectWithLabelFormGroup\nname=\"type\"\nlabel={t('labs.filterTitle')}\n@@ -89,8 +89,8 @@ const ViewLabs = () => {\nonChange={(values) => setSearchFilter(values[0] as LabFilter)}\nisEditable\n/>\n- </div>\n- <div className=\"col\">\n+ </Column>\n+ <Column>\n<TextInputWithLabelFormGroup\nname=\"searchbox\"\nlabel={t('labs.search')}\n@@ -99,9 +99,9 @@ const ViewLabs = () => {\nisEditable\nonChange={onSearchBoxChange}\n/>\n- </div>\n- </div>\n- <div className=\"row\">\n+ </Column>\n+ </Row>\n+ <Row>\n<Table\ngetID={(row) => row.id}\ncolumns={[\n@@ -119,8 +119,8 @@ const ViewLabs = () => {\nactionsHeaderText={t('actions.label')}\nactions={[{ label: t('actions.view'), action: (row) => onViewClick(row as Lab) }]}\n/>\n- </div>\n- </>\n+ </Row>\n+ </Container>\n)\n}\n" }, { "change_type": "MODIFY", "old_path": "src/medications/search/MedicationRequestSearch.tsx", "new_path": "src/medications/search/MedicationRequestSearch.tsx", "diff": "+import { Row, Column } from '@hospitalrun/components'\nimport React, { ChangeEvent } from 'react'\nimport SelectWithLabelFormGroup, {\n@@ -43,8 +44,8 @@ const MedicationRequestSearch = (props: Props) => {\n}\nreturn (\n- <div className=\"row\">\n- <div className=\"col-md-3 col-lg-2\">\n+ <Row>\n+ <Column md={3} lg={2}>\n<SelectWithLabelFormGroup\nname=\"filterStatus\"\nlabel={t('medications.filterTitle')}\n@@ -53,8 +54,8 @@ const MedicationRequestSearch = (props: Props) => {\nonChange={(values) => onFilterChange(values[0] as MedicationStatus)}\nisEditable\n/>\n- </div>\n- <div className=\"col\">\n+ </Column>\n+ <Column>\n<TextInputWithLabelFormGroup\nname=\"searchbox\"\nlabel={t('medications.search')}\n@@ -63,8 +64,8 @@ const MedicationRequestSearch = (props: Props) => {\nisEditable\nonChange={onSearchQueryChange}\n/>\n- </div>\n- </div>\n+ </Column>\n+ </Row>\n)\n}\n" }, { "change_type": "MODIFY", "old_path": "src/medications/search/ViewMedications.tsx", "new_path": "src/medications/search/ViewMedications.tsx", "diff": "-import { Button, Column, Container, Row } from '@hospitalrun/components'\n+import { Button, Container, Row } from '@hospitalrun/components'\nimport React, { useEffect, useCallback, useState } from 'react'\nimport { useSelector } from 'react-redux'\nimport { useHistory } from 'react-router-dom'\n@@ -62,9 +62,7 @@ const ViewMedications = () => {\n<Container>\n<MedicationRequestSearch searchRequest={searchRequest} onChange={onSearchRequestChange} />\n<Row>\n- <Column md={12}>\n<MedicationRequestTable searchRequest={searchRequest} />\n- </Column>\n</Row>\n</Container>\n)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/medications/index.ts", "new_path": "src/shared/locales/enUs/translations/medications/index.ts", "diff": "@@ -7,7 +7,7 @@ export default {\ndraft: 'Draft',\nactive: 'Active',\nonHold: 'On Hold',\n- cancelled: 'Cancelled',\n+ canceled: 'Canceled',\ncompleted: 'Completed',\nenteredInError: 'Entered In Error',\nstopped: 'Stopped',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/view/ImportantPatientInfo.tsx", "new_path": "src/patients/view/ImportantPatientInfo.tsx", "diff": "@@ -146,7 +146,7 @@ const ImportantPatientInfo = (props: Props) => {\n{permissions.includes(Permissions.AddAllergy) && (\n<Button\nsize=\"small\"\n- color=\"light\"\n+ color=\"primary\"\nicon=\"add\"\niconLocation=\"left\"\nonClick={() => setShowNewAllergyModal(true)}\n@@ -178,7 +178,7 @@ const ImportantPatientInfo = (props: Props) => {\n{permissions.includes(Permissions.AddDiagnosis) && (\n<Button\nsize=\"small\"\n- color=\"light\"\n+ color=\"primary\"\nicon=\"add\"\niconLocation=\"left\"\nonClick={() => setShowDiagnosisModal(true)}\n@@ -215,7 +215,7 @@ const ImportantPatientInfo = (props: Props) => {\n{permissions.includes(Permissions.AddCarePlan) && (\n<Button\nsize=\"small\"\n- color=\"light\"\n+ color=\"primary\"\nicon=\"add\"\niconLocation=\"left\"\nonClick={() => setShowAddCarePlanModal(true)}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "new_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "diff": "import { Button, Typeahead, Label, Alert } from '@hospitalrun/components'\n+import format from 'date-fns/format'\nimport { mount, ReactWrapper } from 'enzyme'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -19,6 +20,7 @@ import LabRepository from '../../../shared/db/LabRepository'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Lab from '../../../shared/model/Lab'\nimport Patient from '../../../shared/model/Patient'\n+import Visit from '../../../shared/model/Visit'\nimport { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\n@@ -97,7 +99,8 @@ describe('New Lab Request', () => {\nexpect(visitSelect).toBeDefined()\nexpect(visitSelect.prop('label') as string).toEqual('patient.visit')\n- expect(visitSelect.prop('isRequired')).toBeTruthy()\n+ expect(visitSelect.prop('isRequired')).toBeFalsy()\n+ expect(visitSelect.prop('defaultSelected')).toEqual([])\n})\nit('should render a save button', async () => {\n@@ -113,6 +116,54 @@ describe('New Lab Request', () => {\nexpect(cancelButton).toBeDefined()\nexpect(cancelButton.text().trim()).toEqual('actions.cancel')\n})\n+\n+ it('should clear visit when patient is changed', async () => {\n+ const { wrapper } = await setup()\n+ const patientTypeahead = wrapper.find(Typeahead)\n+ const expectedDate = new Date()\n+ const expectedNotes = 'expected notes'\n+ const expectedLab = {\n+ patient: '1234567',\n+ type: 'expected type',\n+ status: 'requested',\n+ notes: [expectedNotes],\n+ id: '1234',\n+ requestedOn: expectedDate.toISOString(),\n+ } as Lab\n+\n+ const visits = [\n+ {\n+ startDateTime: new Date().toISOString(),\n+ id: 'visit_id',\n+ type: 'visit_type',\n+ },\n+ ] as Visit[]\n+\n+ await act(async () => {\n+ const onChange = patientTypeahead.prop('onChange') as any\n+ await onChange([{ id: expectedLab.patient, visits }] as Patient[])\n+ })\n+ wrapper.update()\n+\n+ // The visits dropdown should be populated with the patient's visits.\n+ expect(wrapper.find(SelectWithLabelFormGroup).prop('options')).toEqual([\n+ {\n+ label: `${visits[0].type} at ${format(\n+ new Date(visits[0].startDateTime),\n+ 'yyyy-MM-dd hh:mm a',\n+ )}`,\n+ value: 'visit_id',\n+ },\n+ ])\n+ await act(async () => {\n+ const onChange = patientTypeahead.prop('onChange')\n+ await onChange([] as Patient[])\n+ })\n+\n+ wrapper.update()\n+ // The visits dropdown option should be reset when the patient is changed.\n+ expect(wrapper.find(SelectWithLabelFormGroup).prop('options')).toEqual([])\n+ })\n})\ndescribe('errors', () => {\n@@ -197,7 +248,7 @@ describe('New Lab Request', () => {\nconst patientTypeahead = wrapper.find(Typeahead)\nawait act(async () => {\nconst onChange = patientTypeahead.prop('onChange')\n- await onChange([{ id: expectedLab.patient }] as Patient[])\n+ await onChange([{ id: expectedLab.patient, visits: [] as Visit[] }] as Patient[])\n})\nconst typeInput = wrapper.find(TextInputWithLabelFormGroup)\n" }, { "change_type": "MODIFY", "old_path": "src/labs/requests/NewLabRequest.tsx", "new_path": "src/labs/requests/NewLabRequest.tsx", "diff": "@@ -50,17 +50,26 @@ const NewLabRequest = () => {\nuseAddBreadcrumbs(breadcrumbs)\nconst onPatientChange = (patient: Patient) => {\n- const visits = patient.visits?.map((v) => ({\n+ if (patient) {\n+ const visits = patient.visits.map((v) => ({\nlabel: `${v.type} at ${format(new Date(v.startDateTime), 'yyyy-MM-dd hh:mm a')}`,\nvalue: v.id,\n})) as Option[]\n- setVisitOptions(visits)\n+ setVisitOptions(visits)\nsetNewLabRequest((previousNewLabRequest) => ({\n...previousNewLabRequest,\npatient: patient.id,\nfullName: patient.fullName,\n}))\n+ } else {\n+ setVisitOptions([])\n+ setNewLabRequest((previousNewLabRequest) => ({\n+ ...previousNewLabRequest,\n+ patient: '',\n+ visitId: '',\n+ }))\n+ }\n}\nconst onLabTypeChange = (event: React.ChangeEvent<HTMLInputElement>) => {\n@@ -97,10 +106,10 @@ const NewLabRequest = () => {\n}\n}\n- const onVisitChange = (value: string) => {\n+ const onVisitChange = (visitId: string) => {\nsetNewLabRequest((previousNewLabRequest) => ({\n...previousNewLabRequest,\n- visitId: value,\n+ visitId,\n}))\n}\n@@ -140,9 +149,8 @@ const NewLabRequest = () => {\n<SelectWithLabelFormGroup\nname=\"visit\"\nlabel={t('patient.visit')}\n- isRequired\nisEditable={newLabRequest.patient !== undefined}\n- options={visitOptions || []}\n+ options={visitOptions}\ndefaultSelected={defaultSelectedVisitsOption()}\nonChange={(values) => {\nonVisitChange(values[0])\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "new_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "diff": "@@ -164,6 +164,55 @@ describe('New Lab Request', () => {\n// The visits dropdown option should be reset when the patient is changed.\nexpect(wrapper.find(SelectWithLabelFormGroup).prop('options')).toEqual([])\n})\n+\n+ it('should support selecting a visit', async () => {\n+ const { wrapper } = await setup()\n+ const patientTypeahead = wrapper.find(Typeahead)\n+ const expectedDate = new Date()\n+ const expectedNotes = 'expected notes'\n+ const expectedLab = {\n+ patient: '123456789',\n+ type: 'expected type',\n+ status: 'requested',\n+ notes: [expectedNotes],\n+ id: '1234',\n+ requestedOn: expectedDate.toISOString(),\n+ } as Lab\n+\n+ const visits = [\n+ {\n+ startDateTime: new Date().toISOString(),\n+ id: 'visit_id',\n+ type: 'visit_type',\n+ },\n+ ] as Visit[]\n+ const visitOptions = [\n+ {\n+ label: `${visits[0].type} at ${format(\n+ new Date(visits[0].startDateTime),\n+ 'yyyy-MM-dd hh:mm a',\n+ )}`,\n+ value: 'visit_id',\n+ },\n+ ]\n+ expect(wrapper.find(SelectWithLabelFormGroup).prop('defaultSelected')).toEqual([])\n+ await act(async () => {\n+ const onChange = patientTypeahead.prop('onChange') as any\n+ await onChange([{ id: expectedLab.patient, visits }] as Patient[])\n+ })\n+ wrapper.update()\n+ expect(wrapper.find(SelectWithLabelFormGroup).prop('defaultSelected')).toEqual([])\n+ const dropdown = wrapper.find(SelectWithLabelFormGroup)\n+ await act(async () => {\n+ // The onChange method takes a list of possible values,\n+ // but our dropdown is single-select, so the argument passed to onChange()\n+ // is a list with just one element. This is why we pass\n+ // the whole array `visitOptions` as opposed to `visitOptions[0]`.\n+ await (dropdown.prop('onChange') as any)(visitOptions.map((option) => option.value))\n+ })\n+ wrapper.update()\n+ expect(wrapper.find(SelectWithLabelFormGroup).prop('defaultSelected')).toEqual(visitOptions)\n+ })\n})\ndescribe('errors', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "jest.config.js", "new_path": "jest.config.js", "diff": "module.exports = {\nroots: ['<rootDir>/src'],\n+ setupFilesAfterEnv: ['./jest.setup.js'],\ntestMatch: ['**/__tests__/**/*.+(ts|tsx)', '**/?(*.)+(spec|test).+(ts|tsx)'],\ncoverageDirectory: './coverage',\ntestPathIgnorePatterns: ['<rootDir>/jest.config.js'],\n" }, { "change_type": "ADD", "old_path": null, "new_path": "jest.setup.ts", "diff": "+// eslint-disable-next-line import/no-extraneous-dependencies\n+import '@testing-library/jest-dom'\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"@commitlint/config-conventional\": \"~11.0.0\",\n\"@commitlint/core\": \"~11.0.0\",\n\"@commitlint/prompt\": \"~11.0.0\",\n- \"@testing-library/react\": \"~11.2.0\",\n- \"@testing-library/react-hooks\": \"~3.4.1\",\n+ \"@testing-library/jest-dom\": \"~5.11.6\",\n+ \"@testing-library/react\": \"~11.2.2\",\n+ \"@testing-library/react-hooks\": \"~3.7.0\",\n\"@types/enzyme\": \"^3.10.5\",\n\"@types/jest\": \"~26.0.0\",\n\"@types/lodash\": \"^4.14.150\",\n\"eslint-plugin-react-hooks\": \"~4.1.0\",\n\"history\": \"4.10.1\",\n\"husky\": \"~4.3.0\",\n- \"jest\": \"24.9.0\",\n- \"lint-staged\": \"~10.5.0\",\n+ \"jest\": \"26.6.3\",\n\"jest-canvas-mock\": \"~2.3.0\",\n+ \"lint-staged\": \"~10.5.0\",\n\"memdown\": \"~5.1.0\",\n\"prettier\": \"~2.2.0\",\n\"redux-mock-store\": \"~1.5.4\",\n" }, { "change_type": "MODIFY", "old_path": "tsconfig.json", "new_path": "tsconfig.json", "diff": "{\n\"include\": [\n\"src\",\n- \"types\"\n+ \"types\",\n+ \"./jest.setup.ts\"\n],\n\"exclude\": [\n\"node_modules\",\n\"noEmit\": true,\n\"isolatedModules\": true,\n\"allowSyntheticDefaultImports\": true\n- }\n+ },\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"eslint-plugin-react-hooks\": \"~4.1.0\",\n\"history\": \"4.10.1\",\n\"husky\": \"~4.3.0\",\n- \"jest\": \"26.6.3\",\n\"jest-canvas-mock\": \"~2.3.0\",\n\"lint-staged\": \"~10.5.0\",\n\"memdown\": \"~5.1.0\",\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/App.test.tsx", "new_path": "src/__tests__/App.test.tsx", "diff": "-import { shallow } from 'enzyme'\n+import { render, screen, waitFor } from '@testing-library/react'\nimport React from 'react'\nimport { Provider } from 'react-redux'\nimport configureStore from 'redux-mock-store'\nimport App from '../App'\n-it('renders without crashing', () => {\n+// TODO: Causing Cannot log after tests are done. \"Did you forget to wait for something async in your test? Attempted to log \"Error: connect ECONNREFUSED 127.0.0.1:80 at TCPConnectWrap.afterConnect [as oncomplete] (node:net:1133:16)\"\n+// ? MSW integration with tests\n+it('renders without crashing', async () => {\nconst mockStore = configureStore()({})\nconst AppWithStore = () => (\n@@ -14,6 +16,7 @@ it('renders without crashing', () => {\n</Provider>\n)\n- const wrapper = shallow(<AppWithStore />)\n- expect(wrapper).toBeDefined()\n+ const { container } = render(<AppWithStore />)\n+ // ! until the Error mention in above TODO is resolved smoke testing the container is a placeholder\n+ expect(container).toBeInTheDocument()\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/App.test.tsx", "new_path": "src/__tests__/App.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n+import { render } from '@testing-library/react'\nimport React from 'react'\nimport { Provider } from 'react-redux'\nimport configureStore from 'redux-mock-store'\n" } ]

[ { "change_type": "MODIFY", "old_path": "jest.config.js", "new_path": "jest.config.js", "diff": "module.exports = {\nroots: ['<rootDir>/src'],\n- setupFilesAfterEnv: ['./jest.setup.js'],\n+ setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],\ntestMatch: ['**/__tests__/**/*.+(ts|tsx)', '**/?(*.)+(spec|test).+(ts|tsx)'],\ncoverageDirectory: './coverage',\ntestPathIgnorePatterns: ['<rootDir>/jest.config.js'],\n" }, { "change_type": "RENAME", "old_path": "jest.setup.ts", "new_path": "jest.setup.js", "diff": "" }, { "change_type": "MODIFY", "old_path": "tsconfig.json", "new_path": "tsconfig.json", "diff": "{\n\"include\": [\n\"src\",\n- \"types\",\n- \"./jest.setup.ts\"\n+ \"types\"\n],\n\"exclude\": [\n\"node_modules\",\n\"noEmit\": true,\n\"isolatedModules\": true,\n\"allowSyntheticDefaultImports\": true\n- },\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "jest.config.js", "new_path": "jest.config.js", "diff": "module.exports = {\nroots: ['<rootDir>/src'],\n- setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],\n+ setupFilesAfterEnv: ['<rootDir>/setupTests.js'],\ntestMatch: ['**/__tests__/**/*.+(ts|tsx)', '**/?(*.)+(spec|test).+(ts|tsx)'],\ncoverageDirectory: './coverage',\ntestPathIgnorePatterns: ['<rootDir>/jest.config.js'],\n" }, { "change_type": "RENAME", "old_path": "jest.setup.js", "new_path": "setupTests.js", "diff": "" }, { "change_type": "MODIFY", "old_path": "tsconfig.json", "new_path": "tsconfig.json", "diff": "\"include\": [\n\"src\",\n\"types\",\n- \"jest.setup.js\"\n+ \"setupTests.js\"\n],\n\"exclude\": [\n\"node_modules\",\n" } ]

[ { "change_type": "DELETE", "old_path": "setupTests.js", "new_path": null, "diff": "-// eslint-disable-next-line import/no-extraneous-dependencies\n-import '@testing-library/jest-dom'\n" }, { "change_type": "MODIFY", "old_path": "src/setupTests.js", "new_path": "src/setupTests.js", "diff": "/* eslint-disable import/no-extraneous-dependencies */\n+import '@testing-library/jest-dom'\nimport Enzyme from 'enzyme'\nimport Adapter from 'enzyme-adapter-react-16'\nimport 'jest-canvas-mock'\n@@ -8,3 +9,4 @@ import './__mocks__/matchMediaMock'\nimport './__mocks__/react-i18next'\nEnzyme.configure({ adapter: new Adapter() })\n+// eslint-disable-next-line import/no-extraneous-dependencies\n" }, { "change_type": "MODIFY", "old_path": "tsconfig.json", "new_path": "tsconfig.json", "diff": "\"include\": [\n\"src\",\n\"types\",\n- \"setupTests.js\"\n+ \"./setupTests.js\"\n],\n\"exclude\": [\n\"node_modules\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/imagings/requests/NewImagingRequest.tsx", "new_path": "src/imagings/requests/NewImagingRequest.tsx", "diff": "@@ -199,7 +199,7 @@ const NewImagingRequest = () => {\n/>\n</div>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('actions.save')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/report/ReportIncident.tsx", "new_path": "src/incidents/report/ReportIncident.tsx", "diff": "@@ -133,7 +133,7 @@ const ReportIncident = () => {\n</Row>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('incidents.actions.report')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/view/ViewIncidentDetails.tsx", "new_path": "src/incidents/view/ViewIncidentDetails.tsx", "diff": "@@ -134,7 +134,7 @@ function ViewIncidentDetails(props: Props) {\n</Row>\n{data.resolvedOn === undefined && (\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">{getButtons()}</div>\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">{getButtons()}</div>\n</div>\n)}\n</>\n" }, { "change_type": "MODIFY", "old_path": "src/labs/ViewLab.tsx", "new_path": "src/labs/ViewLab.tsx", "diff": "@@ -248,7 +248,7 @@ const ViewLab = () => {\n)}\n{isEditable && (\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">{getButtons()}</div>\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">{getButtons()}</div>\n</div>\n)}\n</form>\n" }, { "change_type": "MODIFY", "old_path": "src/labs/requests/NewLabRequest.tsx", "new_path": "src/labs/requests/NewLabRequest.tsx", "diff": "@@ -124,7 +124,7 @@ const NewLabRequest = () => {\n/>\n</div>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('labs.requests.save')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/medications/ViewMedication.tsx", "new_path": "src/medications/ViewMedication.tsx", "diff": "@@ -307,7 +307,7 @@ const ViewMedication = () => {\n</Row>\n{isEditable && (\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">{getButtons()}</div>\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">{getButtons()}</div>\n</div>\n)}\n</form>\n" }, { "change_type": "MODIFY", "old_path": "src/medications/requests/NewMedicationRequest.tsx", "new_path": "src/medications/requests/NewMedicationRequest.tsx", "diff": "@@ -225,7 +225,7 @@ const NewMedicationRequest = () => {\n/>\n</div>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('actions.save')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/patients/new/NewPatient.tsx", "new_path": "src/patients/new/NewPatient.tsx", "diff": "@@ -98,7 +98,7 @@ const NewPatient = () => {\nerror={createError}\n/>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"btn-save mr-2\" color=\"success\" onClick={onSave}>\n{t('actions.save')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/new/NewAppointment.tsx", "new_path": "src/scheduling/appointments/new/NewAppointment.tsx", "diff": "@@ -110,7 +110,7 @@ const NewAppointment = () => {\nonFieldChange={onFieldChange}\n/>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg\">\n+ <div className=\"btn-group btn-group-lg mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('actions.save')}\n</Button>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/view/ViewIncidentDetails.tsx", "new_path": "src/incidents/view/ViewIncidentDetails.tsx", "diff": "@@ -40,12 +40,7 @@ function ViewIncidentDetails(props: Props) {\nif (permissions.includes(Permissions.ResolveIncident)) {\nbuttons.push(\n- <Button\n- className=\"mr-2\"\n- onClick={onResolve}\n- color=\"primary\"\n- key=\"incidents.reports.resolve\"\n- >\n+ <Button onClick={onResolve} color=\"primary\" key=\"incidents.reports.resolve\">\n{t('incidents.reports.resolve')}\n</Button>,\n)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/imagings/requests/NewImagingRequest.tsx", "new_path": "src/imagings/requests/NewImagingRequest.tsx", "diff": "@@ -199,7 +199,7 @@ const NewImagingRequest = () => {\n/>\n</div>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('actions.save')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/report/ReportIncident.tsx", "new_path": "src/incidents/report/ReportIncident.tsx", "diff": "@@ -133,7 +133,7 @@ const ReportIncident = () => {\n</Row>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('incidents.actions.report')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/view/ViewIncidentDetails.tsx", "new_path": "src/incidents/view/ViewIncidentDetails.tsx", "diff": "@@ -40,12 +40,7 @@ function ViewIncidentDetails(props: Props) {\nif (permissions.includes(Permissions.ResolveIncident)) {\nbuttons.push(\n- <Button\n- className=\"mr-2\"\n- onClick={onResolve}\n- color=\"primary\"\n- key=\"incidents.reports.resolve\"\n- >\n+ <Button onClick={onResolve} color=\"primary\" key=\"incidents.reports.resolve\">\n{t('incidents.reports.resolve')}\n</Button>,\n)\n@@ -134,7 +129,7 @@ function ViewIncidentDetails(props: Props) {\n</Row>\n{data.resolvedOn === undefined && (\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">{getButtons()}</div>\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">{getButtons()}</div>\n</div>\n)}\n</>\n" }, { "change_type": "MODIFY", "old_path": "src/labs/ViewLab.tsx", "new_path": "src/labs/ViewLab.tsx", "diff": "@@ -248,7 +248,7 @@ const ViewLab = () => {\n)}\n{isEditable && (\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">{getButtons()}</div>\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">{getButtons()}</div>\n</div>\n)}\n</form>\n" }, { "change_type": "MODIFY", "old_path": "src/labs/requests/NewLabRequest.tsx", "new_path": "src/labs/requests/NewLabRequest.tsx", "diff": "@@ -124,7 +124,7 @@ const NewLabRequest = () => {\n/>\n</div>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('labs.requests.save')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/medications/ViewMedication.tsx", "new_path": "src/medications/ViewMedication.tsx", "diff": "@@ -307,7 +307,7 @@ const ViewMedication = () => {\n</Row>\n{isEditable && (\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">{getButtons()}</div>\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">{getButtons()}</div>\n</div>\n)}\n</form>\n" }, { "change_type": "MODIFY", "old_path": "src/medications/requests/NewMedicationRequest.tsx", "new_path": "src/medications/requests/NewMedicationRequest.tsx", "diff": "@@ -225,7 +225,7 @@ const NewMedicationRequest = () => {\n/>\n</div>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('actions.save')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/patients/new/NewPatient.tsx", "new_path": "src/patients/new/NewPatient.tsx", "diff": "@@ -98,7 +98,7 @@ const NewPatient = () => {\nerror={createError}\n/>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg mt-3\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"btn-save mr-2\" color=\"success\" onClick={onSave}>\n{t('actions.save')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/new/NewAppointment.tsx", "new_path": "src/scheduling/appointments/new/NewAppointment.tsx", "diff": "@@ -110,7 +110,7 @@ const NewAppointment = () => {\nonFieldChange={onFieldChange}\n/>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg\">\n+ <div className=\"btn-group btn-group-lg mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('actions.save')}\n</Button>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/edit/EditPatient.tsx", "new_path": "src/patients/edit/EditPatient.tsx", "diff": "@@ -77,7 +77,7 @@ const EditPatient = () => {\nerror={updateError}\n/>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg\">\n+ <div className=\"btn-group btn-group-lg mt-3 mr-3\">\n<Button className=\"btn-save mr-2\" color=\"success\" onClick={onSave}>\n{t('actions.save')}\n</Button>\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "new_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "diff": "@@ -85,7 +85,7 @@ const EditAppointment = () => {\nerror={updateMutateError}\n/>\n<div className=\"row float-right\">\n- <div className=\"btn-group btn-group-lg\">\n+ <div className=\"btn-group btn-group-lg mr-3\">\n<Button className=\"mr-2\" color=\"success\" onClick={onSave}>\n{t('actions.save')}\n</Button>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLab.test.tsx", "new_path": "src/__tests__/labs/ViewLab.test.tsx", "diff": "@@ -21,6 +21,7 @@ import Lab from '../../shared/model/Lab'\nimport Patient from '../../shared/model/Patient'\nimport Permissions from '../../shared/model/Permissions'\nimport { RootState } from '../../shared/store'\n+import { expectOneConsoleError } from '../test-utils/console.utils'\nconst mockStore = createMockStore<RootState, any>([thunk])\n@@ -196,6 +197,7 @@ describe('View Lab', () => {\nconst { wrapper } = await setup(expectedLab, [Permissions.ViewLab, Permissions.CompleteLab])\nconst expectedError = { message: 'some message', result: 'some result feedback' } as LabError\n+ expectOneConsoleError(expectedError)\njest.spyOn(validateUtil, 'validateLabComplete').mockReturnValue(expectedError)\nconst completeButton = wrapper.find(Button).at(1)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/hooks/useCompleteLab.test.ts", "new_path": "src/__tests__/labs/hooks/useCompleteLab.test.ts", "diff": "@@ -5,6 +5,7 @@ import { LabError } from '../../../labs/utils/validate-lab'\nimport * as validateLabUtils from '../../../labs/utils/validate-lab'\nimport LabRepository from '../../../shared/db/LabRepository'\nimport Lab from '../../../shared/model/Lab'\n+import { expectOneConsoleError } from '../../test-utils/console.utils'\nimport executeMutation from '../../test-utils/use-mutation.util'\ndescribe('Use Complete lab', () => {\n@@ -44,6 +45,7 @@ describe('Use Complete lab', () => {\nresult: 'some result error message',\n} as LabError\n+ expectOneConsoleError(expectedLabError)\njest.spyOn(validateLabUtils, 'validateLabComplete').mockReturnValue(expectedLabError)\nawait act(async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/hooks/useRequestLab.test.ts", "new_path": "src/__tests__/labs/hooks/useRequestLab.test.ts", "diff": "@@ -5,6 +5,7 @@ import * as validateLabRequest from '../../../labs/utils/validate-lab'\nimport { LabError } from '../../../labs/utils/validate-lab'\nimport LabRepository from '../../../shared/db/LabRepository'\nimport Lab from '../../../shared/model/Lab'\n+import { expectOneConsoleError } from '../../test-utils/console.utils'\nimport executeMutation from '../../test-utils/use-mutation.util'\ndescribe('Use Request lab', () => {\n@@ -45,6 +46,7 @@ describe('Use Request lab', () => {\ntype: 'error type',\n} as LabError\n+ expectOneConsoleError(expectedError)\njest.spyOn(validateLabRequest, 'validateLabRequest').mockReturnValue(expectedError)\nawait act(async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "new_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "diff": "@@ -19,6 +19,7 @@ import PatientRepository from '../../../shared/db/PatientRepository'\nimport Lab from '../../../shared/model/Lab'\nimport Patient from '../../../shared/model/Patient'\nimport { RootState } from '../../../shared/store'\n+import { expectOneConsoleError } from '../../test-utils/console.utils'\nconst mockStore = createMockStore<RootState, any>([thunk])\ndescribe('New Lab Request', () => {\n@@ -112,6 +113,7 @@ describe('New Lab Request', () => {\ntype: 'some type error',\n} as LabError\n+ expectOneConsoleError(error)\njest.spyOn(validationUtil, 'validateLabRequest').mockReturnValue(error)\nit('should display errors', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/useAddCareGoal.test.tsx", "new_path": "src/__tests__/patients/hooks/useAddCareGoal.test.tsx", "diff": "@@ -5,6 +5,7 @@ import PatientRepository from '../../../shared/db/PatientRepository'\nimport CareGoal, { CareGoalStatus, CareGoalAchievementStatus } from '../../../shared/model/CareGoal'\nimport Patient from '../../../shared/model/Patient'\nimport * as uuid from '../../../shared/util/uuid'\n+import { expectOneConsoleError } from '../../test-utils/console.utils'\nimport executeMutation from '../../test-utils/use-mutation.util'\ndescribe('use add care goal', () => {\n@@ -59,8 +60,9 @@ describe('use add care goal', () => {\nconst expectedError = {\nmessage: 'patient.careGoal.error.unableToAdd',\ndescription: 'some error',\n- }\n- jest.spyOn(validateCareGoal, 'default').mockReturnValue(expectedError as CareGoalError)\n+ } as CareGoalError\n+ expectOneConsoleError(expectedError)\n+ jest.spyOn(validateCareGoal, 'default').mockReturnValue(expectedError)\njest.spyOn(PatientRepository, 'saveOrUpdate')\ntry {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/useAddCarePlan.test.tsx", "new_path": "src/__tests__/patients/hooks/useAddCarePlan.test.tsx", "diff": "@@ -5,6 +5,7 @@ import PatientRepository from '../../../shared/db/PatientRepository'\nimport CarePlan, { CarePlanIntent, CarePlanStatus } from '../../../shared/model/CarePlan'\nimport Patient from '../../../shared/model/Patient'\nimport * as uuid from '../../../shared/util/uuid'\n+import { expectOneConsoleError } from '../../test-utils/console.utils'\nimport executeMutation from '../../test-utils/use-mutation.util'\ndescribe('use add care plan', () => {\n@@ -45,8 +46,12 @@ describe('use add care plan', () => {\n})\nit('should throw an error if validation fails', async () => {\n- const expectedError = { message: 'patient.carePlan.error.unableToAdd', title: 'some error' }\n- jest.spyOn(validateCarePlan, 'default').mockReturnValue(expectedError as CarePlanError)\n+ const expectedError = {\n+ message: 'patient.carePlan.error.unableToAdd',\n+ title: 'some error',\n+ } as CarePlanError\n+ expectOneConsoleError(expectedError)\n+ jest.spyOn(validateCarePlan, 'default').mockReturnValue(expectedError)\njest.spyOn(PatientRepository, 'saveOrUpdate')\ntry {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/useAddPatientDiagnosis.test.tsx", "new_path": "src/__tests__/patients/hooks/useAddPatientDiagnosis.test.tsx", "diff": "@@ -6,6 +6,7 @@ import PatientRepository from '../../../shared/db/PatientRepository'\nimport Diagnosis, { DiagnosisStatus } from '../../../shared/model/Diagnosis'\nimport Patient from '../../../shared/model/Patient'\nimport * as uuid from '../../../shared/util/uuid'\n+import { expectOneConsoleError } from '../../test-utils/console.utils'\nimport executeMutation from '../../test-utils/use-mutation.util'\ndescribe('use add diagnosis', () => {\n@@ -16,6 +17,7 @@ describe('use add diagnosis', () => {\nit('should throw an error if diagnosis validation fails', async () => {\nconst expectedError = { name: 'some error' }\n+ expectOneConsoleError(expectedError as Error)\njest.spyOn(validateDiagnosis, 'default').mockReturnValue(expectedError)\njest.spyOn(PatientRepository, 'saveOrUpdate')\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/test-utils/console.utils.ts", "diff": "+export function expectOneConsoleError(expected: Error) {\n+ jest.spyOn(console, 'error').mockImplementationOnce((actual) => {\n+ expect(actual).toEqual(expected)\n+ })\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/page-header/breadcrumbs/Breadcrumbs.test.tsx", "new_path": "src/__tests__/page-header/breadcrumbs/Breadcrumbs.test.tsx", "diff": "-import {\n- Breadcrumb as HRBreadcrumb,\n- BreadcrumbItem as HRBreadcrumbItem,\n-} from '@hospitalrun/components'\n-import { mount } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -23,22 +19,20 @@ describe('Breadcrumbs', () => {\nbreadcrumbs: { breadcrumbs },\n} as any)\n- const wrapper = mount(\n+ return render(\n<Provider store={store}>\n<Router history={history}>\n<Breadcrumbs />\n</Router>\n</Provider>,\n)\n-\n- return wrapper\n}\nit('should not render the breadcrumb when there are no items in the store', () => {\n- const wrapper = setup([])\n+ setup([])\n- expect(wrapper.find(HRBreadcrumb)).toHaveLength(0)\n- expect(wrapper.find(HRBreadcrumbItem)).toHaveLength(0)\n+ expect(screen.queryByRole('list')).toBeNull()\n+ expect(screen.queryByRole('listitem')).toBeNull()\n})\nit('should render breadcrumbs items', () => {\n@@ -47,13 +41,14 @@ describe('Breadcrumbs', () => {\n{ text: 'Bob', location: '/patient/1' },\n{ text: 'Edit Patient', location: '/patient/1/edit' },\n]\n- const wrapper = setup(breadcrumbs)\n- const items = wrapper.find(HRBreadcrumbItem)\n+ setup(breadcrumbs)\n+\n+ const breadCrumbItems = screen.getAllByRole('listitem')\n- expect(items).toHaveLength(3)\n- expect(items.at(0).text()).toEqual('patient.label')\n- expect(items.at(1).text()).toEqual('Bob')\n- expect(items.at(2).text()).toEqual('Edit Patient')\n+ expect(breadCrumbItems).toHaveLength(3)\n+ expect(breadCrumbItems[0]).toHaveTextContent('patient.label')\n+ expect(breadCrumbItems[1]).toHaveTextContent('Bob')\n+ expect(breadCrumbItems[2]).toHaveTextContent('Edit Patient')\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/page-header/breadcrumbs/useAddBreadcrumbs.test.tsx", "new_path": "src/__tests__/page-header/breadcrumbs/useAddBreadcrumbs.test.tsx", "diff": "@@ -13,16 +13,21 @@ const mockStore = createMockStore<RootState, any>([thunk])\ndescribe('useAddBreadcrumbs', () => {\nbeforeEach(() => jest.clearAllMocks())\n- it('should call addBreadcrumbs with the correct data', () => {\n- const wrapper = ({ children }: any) => <Provider store={mockStore({})}>{children}</Provider>\n-\n- jest.spyOn(breadcrumbsSlice, 'addBreadcrumbs')\n+ const setup = () => {\nconst breadcrumbs = [\n{\ntext: 'Patients',\nlocation: '/patients',\n},\n]\n+ const wrapper = ({ children }: any) => <Provider store={mockStore({})}>{children}</Provider>\n+\n+ return { breadcrumbs, wrapper }\n+ }\n+\n+ it('should call addBreadcrumbs with the correct data', () => {\n+ jest.spyOn(breadcrumbsSlice, 'addBreadcrumbs')\n+ const { breadcrumbs, wrapper } = setup()\nrenderHook(() => useAddBreadcrumbs(breadcrumbs), { wrapper } as any)\nexpect(breadcrumbsSlice.addBreadcrumbs).toHaveBeenCalledTimes(1)\n@@ -30,15 +35,8 @@ describe('useAddBreadcrumbs', () => {\n})\nit('should call addBreadcrumbs with an additional dashboard breadcrumb', () => {\n- const wrapper = ({ children }: any) => <Provider store={mockStore({})}>{children}</Provider>\n-\njest.spyOn(breadcrumbsSlice, 'addBreadcrumbs')\n- const breadcrumbs = [\n- {\n- text: 'Patients',\n- location: '/patients',\n- },\n- ]\n+ const { breadcrumbs, wrapper } = setup()\nrenderHook(() => useAddBreadcrumbs(breadcrumbs, true), { wrapper } as any)\nexpect(breadcrumbsSlice.addBreadcrumbs).toHaveBeenCalledTimes(1)\n@@ -49,16 +47,8 @@ describe('useAddBreadcrumbs', () => {\n})\nit('should call removeBreadcrumbs with the correct data after unmount', () => {\n- const wrapper = ({ children }: any) => <Provider store={mockStore({})}>{children}</Provider>\n-\n- jest.spyOn(breadcrumbsSlice, 'addBreadcrumbs')\njest.spyOn(breadcrumbsSlice, 'removeBreadcrumbs')\n- const breadcrumbs = [\n- {\n- text: 'Patients',\n- location: '/patients',\n- },\n- ]\n+ const { breadcrumbs, wrapper } = setup()\nconst { unmount } = renderHook(() => useAddBreadcrumbs(breadcrumbs), { wrapper } as any)\nunmount()\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/shared/components/network-status/NetworkStatusMessage.test.tsx", "new_path": "src/__tests__/shared/components/network-status/NetworkStatusMessage.test.tsx", "diff": "+import { render } from '@testing-library/react'\nimport { renderHook } from '@testing-library/react-hooks'\n-import { render, shallow } from 'enzyme'\nimport React from 'react'\nimport { useTranslation } from '../../../../__mocks__/react-i18next'\n@@ -27,16 +27,17 @@ describe('NetworkStatusMessage', () => {\nisOnline: true,\nwasOffline: false,\n})\n- const wrapper = shallow(<NetworkStatusMessage />)\n- expect(wrapper.equals(null as any)).toBe(true)\n+ const { container } = render(<NetworkStatusMessage />)\n+\n+ expect(container).toBeEmptyDOMElement()\n})\nit(`shows the message \"${t('networkStatus.offline')}\" if the app goes offline`, () => {\nuseNetworkStatusMock.mockReturnValue({\nisOnline: false,\nwasOffline: false,\n})\n- const wrapper = render(<NetworkStatusMessage />)\n- expect(wrapper.text()).toContain(t('networkStatus.offline'))\n+ const { container } = render(<NetworkStatusMessage />)\n+ expect(container).toHaveTextContent(t('networkStatus.offline'))\n})\nit(`shows the message \"${t(\n'networkStatus.online',\n@@ -45,7 +46,7 @@ describe('NetworkStatusMessage', () => {\nisOnline: true,\nwasOffline: true,\n})\n- const wrapper = render(<NetworkStatusMessage />)\n- expect(wrapper.text()).toContain(t('networkStatus.online'))\n+ const { container } = render(<NetworkStatusMessage />)\n+ expect(container).toHaveTextContent(t('networkStatus.online'))\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/setupTests.js", "new_path": "src/setupTests.js", "diff": "@@ -9,4 +9,3 @@ import './__mocks__/matchMediaMock'\nimport './__mocks__/react-i18next'\nEnzyme.configure({ adapter: new Adapter() })\n-// eslint-disable-next-line import/no-extraneous-dependencies\n" } ]