fix: standardized react router imports in tests and source code (#2067)

src/__tests__/HospitalRun.test.tsx

@@ -1,7 +1,7 @@
 import '../__mocks__/matchMediaMock'
 import React from 'react'
 import { mount } from 'enzyme'
-import { MemoryRouter } from 'react-router'
+import { MemoryRouter } from 'react-router-dom'
 import { Provider } from 'react-redux'
 import thunk from 'redux-thunk'
 import configureMockStore from 'redux-mock-store'

src/__tests__/components/Sidebar.test.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 import { mount } from 'enzyme'
 import { createMemoryHistory } from 'history'
 import Sidebar from 'components/Sidebar'
-import { Router } from 'react-router'
+import { Router } from 'react-router-dom'
 import { ListItem } from '@hospitalrun/components'
 import { act } from '@testing-library/react'
 import configureMockStore from 'redux-mock-store'

src/__tests__/labs/Labs.test.tsx

@@ -1,7 +1,7 @@
 import '../../__mocks__/matchMediaMock'
 import React from 'react'
 import { mount } from 'enzyme'
-import { MemoryRouter } from 'react-router'
+import { MemoryRouter } from 'react-router-dom'
 import { Provider } from 'react-redux'
 import thunk from 'redux-thunk'
 import configureMockStore from 'redux-mock-store'

src/__tests__/labs/ViewLab.test.tsx

@@ -1,7 +1,7 @@
 import '../../__mocks__/matchMediaMock'
 import React from 'react'
 import { Provider } from 'react-redux'
-import { Router, Route } from 'react-router'
+import { Router, Route } from 'react-router-dom'
 import { mount } from 'enzyme'
 import thunk from 'redux-thunk'
 import { createMemoryHistory } from 'history'

src/__tests__/labs/ViewLabs.test.tsx

@@ -1,7 +1,7 @@
 import '../../__mocks__/matchMediaMock'
 import React from 'react'
 import { Provider } from 'react-redux'
-import { Router } from 'react-router'
+import { Router } from 'react-router-dom'
 import ViewLabs from 'labs/ViewLabs'
 import { mount, ReactWrapper } from 'enzyme'
 import { TextInput, Select } from '@hospitalrun/components'

src/__tests__/patients/allergies/Allergies.test.tsx

@@ -6,7 +6,7 @@ import Permissions from 'model/Permissions'
 import configureMockStore from 'redux-mock-store'
 import { createMemoryHistory } from 'history'
 import thunk from 'redux-thunk'
-import { Router } from 'react-router'
+import { Router } from 'react-router-dom'
 import { Provider } from 'react-redux'
 import Patient from 'model/Patient'
 import * as components from '@hospitalrun/components'

src/__tests__/patients/appointments/AppointmentsList.test.tsx

@@ -5,7 +5,7 @@ import { createMemoryHistory } from 'history'
 import configureMockStore from 'redux-mock-store'
 import thunk from 'redux-thunk'
 import Patient from 'model/Patient'
-import { Router } from 'react-router'
+import { Router } from 'react-router-dom'
 import { Provider } from 'react-redux'
 import AppointmentsList from 'patients/appointments/AppointmentsList'
 import * as components from '@hospitalrun/components'

src/__tests__/patients/diagnoses/Diagnoses.test.tsx

@@ -7,7 +7,7 @@ import thunk from 'redux-thunk'
 import Patient from 'model/Patient'
 import Diagnosis from 'model/Diagnosis'
 import Permissions from 'model/Permissions'
-import { Router } from 'react-router'
+import { Router } from 'react-router-dom'
 import { Provider } from 'react-redux'
 import Diagnoses from 'patients/diagnoses/Diagnoses'
 import * as components from '@hospitalrun/components'

src/__tests__/patients/labs/LabsTab.test.tsx

@@ -4,7 +4,7 @@ import configureMockStore from 'redux-mock-store'
 import thunk from 'redux-thunk'
 import { mount } from 'enzyme'
 import { createMemoryHistory } from 'history'
-import { Router } from 'react-router'
+import { Router } from 'react-router-dom'
 import { Provider } from 'react-redux'
 import * as components from '@hospitalrun/components'
 import format from 'date-fns/format'

src/__tests__/patients/notes/NotesTab.test.tsx

@@ -7,7 +7,7 @@ import configureMockStore from 'redux-mock-store'
 import Patient from 'model/Patient'
 import thunk from 'redux-thunk'
 import { mount } from 'enzyme'
-import { Router } from 'react-router'
+import { Router } from 'react-router-dom'
 import { Provider } from 'react-redux'
 import NoteTab from 'patients/notes/NoteTab'
 import * as components from '@hospitalrun/components'

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

@@ -1,6 +1,6 @@
 import '../../../__mocks__/matchMediaMock'
 import React from 'react'
-import { Router } from 'react-router'
+import { Router } from 'react-router-dom'
 import { createMemoryHistory } from 'history'
 import { mount } from 'enzyme'
 import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab'

src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx

@@ -1,7 +1,7 @@
 import '../../../../__mocks__/matchMediaMock'
 import React from 'react'
 import NewAppointment from 'scheduling/appointments/new/NewAppointment'
-import { Router, Route } from 'react-router'
+import { Router, Route } from 'react-router-dom'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
 import { roundToNearestMinutes, addMinutes } from 'date-fns'

src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx

@@ -6,7 +6,7 @@ import configureMockStore, { MockStore } from 'redux-mock-store'
 import thunk from 'redux-thunk'
 import Appointment from 'model/Appointment'
 import ViewAppointment from 'scheduling/appointments/view/ViewAppointment'
-import { Router, Route } from 'react-router'
+import { Router, Route } from 'react-router-dom'
 import { createMemoryHistory } from 'history'
 import AppointmentRepository from 'clients/db/AppointmentRepository'
 import { mocked } from 'ts-jest/utils'

src/breadcrumbs/Breadcrumbs.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import { useSelector } from 'react-redux'
 import { useTranslation } from 'react-i18next'
 import { Breadcrumb, BreadcrumbItem } from '@hospitalrun/components'

src/components/Navbar.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import { Navbar as HospitalRunNavbar } from '@hospitalrun/components'
 import { useTranslation } from 'react-i18next'
 

src/components/Sidebar.tsx

@@ -1,7 +1,7 @@
 import React, { useState, CSSProperties } from 'react'
 import { List, ListItem, Icon } from '@hospitalrun/components'
 import { useTranslation } from 'react-i18next'
-import { useLocation, useHistory } from 'react-router'
+import { useLocation, useHistory } from 'react-router-dom'
 import { useSelector, useDispatch } from 'react-redux'
 import { RootState } from '../store'
 import { updateSidebar } from './component-slice'

src/labs/Labs.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import PrivateRoute from 'components/PrivateRoute'
-import { Switch } from 'react-router'
+import { Switch } from 'react-router-dom'
 import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs'
 import { useSelector } from 'react-redux'
 import Permissions from 'model/Permissions'

src/labs/ViewLab.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { useParams, useHistory } from 'react-router'
+import { useParams, useHistory } from 'react-router-dom'
 import format from 'date-fns/format'
 import Lab from 'model/Lab'
 import Patient from 'model/Patient'

src/labs/ViewLabs.tsx

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
 import format from 'date-fns/format'
 import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider'
 import { Spinner, Button } from '@hospitalrun/components'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import Lab from 'model/Lab'
 import Permissions from 'model/Permissions'
 import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup'

src/labs/requests/NewLabRequest.tsx

@@ -5,7 +5,7 @@ import { Typeahead, Label, Button, Alert } from '@hospitalrun/components'
 import PatientRepository from 'clients/db/PatientRepository'
 import Patient from 'model/Patient'
 import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import Lab from 'model/Lab'
 import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup'
 import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs'

src/patients/Patients.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { useSelector } from 'react-redux'
-import { Switch } from 'react-router'
+import { Switch } from 'react-router-dom'
 import PrivateRoute from '../components/PrivateRoute'
 import Permissions from '../model/Permissions'
 import ViewPatients from './list/ViewPatients'

src/patients/appointments/AppointmentsList.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { useSelector, useDispatch } from 'react-redux'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { TextInput, Button, List, ListItem, Container, Row, Column } from '@hospitalrun/components'
 import { RootState } from '../../store'

src/patients/labs/LabsTab.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'
 import { Alert } from '@hospitalrun/components'
 import { useTranslation } from 'react-i18next'
 import format from 'date-fns/format'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import Lab from '../../model/Lab'
 import LabRepository from '../../clients/db/LabRepository'
 

src/patients/list/ViewPatients.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { useSelector, useDispatch } from 'react-redux'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { Spinner, Button, Container, Row, TextInput, Column } from '@hospitalrun/components'
 import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider'

src/patients/new/NewPatient.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { useDispatch, useSelector } from 'react-redux'
 import { Button, Toast } from '@hospitalrun/components'

src/patients/related-persons/RelatedPersonTab.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'
 import { Button, Alert, Spinner } from '@hospitalrun/components'
 import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal'
 import { useTranslation } from 'react-i18next'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import Patient from 'model/Patient'
 import { removeRelatedPerson } from 'patients/patient-slice'
 import { useDispatch, useSelector } from 'react-redux'

src/scheduling/appointments/Appointments.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { useSelector } from 'react-redux'
-import { Switch } from 'react-router'
+import { Switch } from 'react-router-dom'
 import NewAppointment from 'scheduling/appointments/new/NewAppointment'
 import EditAppointment from 'scheduling/appointments/edit/EditAppointment'
 import ViewAppointment from 'scheduling/appointments/view/ViewAppointment'

src/scheduling/appointments/ViewAppointments.tsx

@@ -4,7 +4,7 @@ import useTitle from 'page-header/useTitle'
 import { useTranslation } from 'react-i18next'
 import { useSelector, useDispatch } from 'react-redux'
 import { RootState } from 'store'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import PatientRepository from 'clients/db/PatientRepository'
 import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs'
 import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider'

src/scheduling/appointments/new/NewAppointment.tsx

@@ -2,7 +2,7 @@ import React, { useState } from 'react'
 import useTitle from 'page-header/useTitle'
 import { useTranslation } from 'react-i18next'
 import roundToNearestMinutes from 'date-fns/roundToNearestMinutes'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import { useDispatch, useSelector } from 'react-redux'
 import Appointment from 'model/Appointment'
 import addMinutes from 'date-fns/addMinutes'

src/scheduling/appointments/view/ViewAppointment.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'
 import useTitle from 'page-header/useTitle'
 import { useSelector, useDispatch } from 'react-redux'
 import { RootState } from 'store'
-import { useParams, useHistory } from 'react-router'
+import { useParams, useHistory } from 'react-router-dom'
 import { Spinner, Button, Modal, Toast } from '@hospitalrun/components'
 import { useTranslation } from 'react-i18next'
 import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider'