fix: resolve merge conflicts

.eslintrc.js

@@ -28,10 +28,17 @@ module.exports = {
     'import/resolver': {
       node: {
         extensions: ['.js', '.jsx', '.ts', '.tsx'],
+        moduleDirectory: ["node_modules"],
       },
+      "typescript": {
+        alwaysTryTypes: true,
+      }
+    },
+    'import/parsers': {
+      '@typescript-eslint/parser': ['.ts', '.tsx'],
     },
   },
-  plugins: ['react', '@typescript-eslint', 'prettier', 'jest'],
+  plugins: ['react', '@typescript-eslint', 'prettier', 'jest', 'import'],
   rules: {
     'prettier/prettier': 'error',
     '@typescript-eslint/member-delimiter-style': 'off',
@@ -47,12 +54,26 @@ module.exports = {
     'arrow-body-style': ['warn', 'as-needed'],
     'no-param-reassign': ['error', { props: false }],
     'import/prefer-default-export': 'off',
+    'import/no-cycle': 'off',
     'no-console': 'off',
     'eol-last': ['error', 'always'],
     'no-debugger': 'error',
     'no-nested-ternary': 'off',
     'import/no-unresolved': 'off',
     'import/extensions': ['error', 'never'],
+    'import/order': ["error", {
+      "groups": [
+        "external",
+        ["sibling","parent","internal"],
+        "builtin",
+        "unknown",
+      ],
+      "newlines-between": "always",
+      "alphabetize": {
+        "order": 'asc',
+        "caseInsensitive": true,
+      },
+    }],
     curly: ['error', 'all'],
   },
 }

package.json

@@ -85,7 +85,8 @@
     "eslint": "~6.8.0",
     "eslint-config-airbnb": "~18.1.0",
     "eslint-config-prettier": "~6.11.0",
-    "eslint-plugin-import": "~2.20.0",
+    "eslint-import-resolver-typescript": "~2.0.0",
+    "eslint-plugin-import": "~2.20.2",
     "eslint-plugin-jest": "~23.13.0",
     "eslint-plugin-jsx-a11y": "~6.2.3",
     "eslint-plugin-prettier": "~3.1.2",

src/App.tsx

@@ -1,9 +1,9 @@
+import { Spinner } from '@hospitalrun/components'
 import React, { Suspense } from 'react'
-import { BrowserRouter } from 'react-router-dom'
 import { Provider } from 'react-redux'
-import { Spinner } from '@hospitalrun/components'
-import HospitalRun from './HospitalRun'
+import { BrowserRouter } from 'react-router-dom'
 
+import HospitalRun from './HospitalRun'
 import store from './store'
 
 const App: React.FC = () => (

src/HospitalRun.tsx

@@ -1,19 +1,20 @@
+import { Toaster } from '@hospitalrun/components'
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
 import { useSelector } from 'react-redux'
-import { Toaster } from '@hospitalrun/components'
-import Breadcrumbs from 'breadcrumbs/Breadcrumbs'
-import { ButtonBarProvider } from 'page-header/ButtonBarProvider'
-import ButtonToolBar from 'page-header/ButtonToolBar'
-import Labs from 'labs/Labs'
-import Sidebar from './components/Sidebar'
-import Dashboard from './dashboard/Dashboard'
-import { RootState } from './store'
+import { Switch, Route } from 'react-router-dom'
+
+import Breadcrumbs from './breadcrumbs/Breadcrumbs'
 import Navbar from './components/Navbar'
 import PrivateRoute from './components/PrivateRoute'
-import Patients from './patients/Patients'
+import Sidebar from './components/Sidebar'
+import Dashboard from './dashboard/Dashboard'
 import Incidents from './incidents/Incidents'
+import Labs from './labs/Labs'
+import { ButtonBarProvider } from './page-header/ButtonBarProvider'
+import ButtonToolBar from './page-header/ButtonToolBar'
+import Patients from './patients/Patients'
 import Appointments from './scheduling/appointments/Appointments'
+import { RootState } from './store'
 
 const HospitalRun = () => {
   const { title } = useSelector((state: RootState) => state.title)

src/__tests__/App.test.tsx

@@ -1,8 +1,10 @@
 import '../__mocks__/matchMediaMock'
-import React from 'react'
+
 import { mount } from 'enzyme'
-import HospitalRun from '../HospitalRun'
+import React from 'react'
+
 import App from '../App'
+import HospitalRun from '../HospitalRun'
 
 it('renders without crashing', () => {
   const wrapper = mount(<App />)

src/__tests__/HospitalRun.test.tsx

@@ -1,20 +1,22 @@
 import '../__mocks__/matchMediaMock'
-import React from 'react'
+
+import { Toaster } from '@hospitalrun/components'
 import { mount } from 'enzyme'
-import { MemoryRouter } from 'react-router-dom'
+import React from 'react'
+import { act } from 'react-dom/test-utils'
 import { Provider } from 'react-redux'
-import thunk from 'redux-thunk'
+import { MemoryRouter } from 'react-router-dom'
 import createMockStore from 'redux-mock-store'
-import { Toaster } from '@hospitalrun/components'
-import { act } from 'react-dom/test-utils'
-import Dashboard from 'dashboard/Dashboard'
-import ViewLabs from 'labs/ViewLabs'
-import LabRepository from 'clients/db/LabRepository'
-import { addBreadcrumbs } from 'breadcrumbs/breadcrumbs-slice'
-import Appointments from 'scheduling/appointments/Appointments'
+import thunk from 'redux-thunk'
+
+import { addBreadcrumbs } from '../breadcrumbs/breadcrumbs-slice'
+import LabRepository from '../clients/db/LabRepository'
+import Dashboard from '../dashboard/Dashboard'
 import HospitalRun from '../HospitalRun'
-import Permissions from '../model/Permissions'
 import Incidents from '../incidents/Incidents'
+import ViewLabs from '../labs/ViewLabs'
+import Permissions from '../model/Permissions'
+import Appointments from '../scheduling/appointments/Appointments'
 import { RootState } from '../store'
 
 const mockStore = createMockStore<RootState, any>([thunk])

src/__tests__/breadcrumbs/Breadcrumbs.test.tsx

@@ -1,18 +1,18 @@
 import '../../__mocks__/matchMediaMock'
-import React from 'react'
-import { Provider } from 'react-redux'
-import { mount } from 'enzyme'
-import { createMemoryHistory } from 'history'
-import { Router } from 'react-router-dom'
-import createMockStore from 'redux-mock-store'
 import {
   Breadcrumb as HRBreadcrumb,
   BreadcrumbItem as HRBreadcrumbItem,
 } from '@hospitalrun/components'
-
-import Breadcrumbs from 'breadcrumbs/Breadcrumbs'
-import Breadcrumb from 'model/Breadcrumb'
+import { mount } from 'enzyme'
+import { createMemoryHistory } from 'history'
+import React from 'react'
+import { Provider } from 'react-redux'
+import { Router } from 'react-router-dom'
+import createMockStore from 'redux-mock-store'
 import thunk from 'redux-thunk'
+
+import Breadcrumbs from '../../breadcrumbs/Breadcrumbs'
+import Breadcrumb from '../../model/Breadcrumb'
 import { RootState } from '../../store'
 
 const mockStore = createMockStore<RootState, any>([thunk])

src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts

@@ -1,5 +1,7 @@
 import '../../__mocks__/matchMediaMock'
+
 import { AnyAction } from 'redux'
+
 import breadcrumbs, { addBreadcrumbs, removeBreadcrumbs } from '../../breadcrumbs/breadcrumbs-slice'
 
 describe('breadcrumbs slice', () => {

src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx

@@ -1,10 +1,11 @@
-import React from 'react'
 import { renderHook } from '@testing-library/react-hooks'
-import createMockStore from 'redux-mock-store'
+import React from 'react'
 import { Provider } from 'react-redux'
+import createMockStore from 'redux-mock-store'
 import thunk from 'redux-thunk'
-import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs'
+
 import * as breadcrumbsSlice from '../../breadcrumbs/breadcrumbs-slice'
+import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs'
 import { RootState } from '../../store'
 
 const mockStore = createMockStore<RootState, any>([thunk])

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

@@ -1,6 +1,6 @@
-import AppointmentRepository from 'clients/db/AppointmentRepository'
-import { appointments, patients } from 'config/pouchdb'
-import Appointment from 'model/Appointment'
+import AppointmentRepository from '../../../clients/db/AppointmentRepository'
+import { appointments, patients } from '../../../config/pouchdb'
+import Appointment from '../../../model/Appointment'
 
 const uuidV4Regex = /^[A-F\d]{8}-[A-F\d]{4}-4[A-F\d]{3}-[89AB][A-F\d]{3}-[A-F\d]{12}$/i
 

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

@@ -1,8 +1,10 @@
 /* eslint "@typescript-eslint/camelcase": "off" */
+
 import shortid from 'shortid'
-import { labs } from 'config/pouchdb'
-import LabRepository from 'clients/db/LabRepository'
-import SortRequest from 'clients/db/SortRequest'
+
+import LabRepository from '../../../clients/db/LabRepository'
+import SortRequest from '../../../clients/db/SortRequest'
+import { labs } from '../../../config/pouchdb'
 import Lab from '../../../model/Lab'
 
 interface SearchContainer {

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

@@ -1,8 +1,9 @@
-import { patients } from 'config/pouchdb'
-import PatientRepository from 'clients/db/PatientRepository'
-import Patient from 'model/Patient'
-import shortid from 'shortid'
 import { getTime, isAfter } from 'date-fns'
+import shortid from 'shortid'
+
+import PatientRepository from '../../../clients/db/PatientRepository'
+import { patients } from '../../../config/pouchdb'
+import Patient from '../../../model/Patient'
 
 const uuidV4Regex = /^[A-F\d]{8}-[A-F\d]{4}-4[A-F\d]{3}-[89AB][A-F\d]{3}-[A-F\d]{12}$/i
 

src/__tests__/components/Navbar.test.tsx

@@ -1,10 +1,12 @@
 import '../../__mocks__/matchMediaMock'
-import React from 'react'
-import { Router } from 'react-router-dom'
-import { mount } from 'enzyme'
+
 import { Navbar as HospitalRunNavbar } from '@hospitalrun/components'
-import { act } from 'react-dom/test-utils'
+import { mount } from 'enzyme'
 import { createMemoryHistory } from 'history'
+import React from 'react'
+import { act } from 'react-dom/test-utils'
+import { Router } from 'react-router-dom'
+
 import Navbar from '../../components/Navbar'
 
 describe('Navbar', () => {

src/__tests__/components/Sidebar.test.tsx

@@ -1,14 +1,16 @@
 import '../../__mocks__/matchMediaMock'
-import React from 'react'
+
+import { ListItem } from '@hospitalrun/components'
+import { act } from '@testing-library/react'
 import { mount } from 'enzyme'
 import { createMemoryHistory } from 'history'
-import Sidebar from 'components/Sidebar'
+import React from 'react'
+import { Provider } from 'react-redux'
 import { Router } from 'react-router-dom'
-import { ListItem } from '@hospitalrun/components'
-import { act } from '@testing-library/react'
 import createMockStore from 'redux-mock-store'
 import thunk from 'redux-thunk'
-import { Provider } from 'react-redux'
+
+import Sidebar from '../../components/Sidebar'
 import { RootState } from '../../store'
 
 const mockStore = createMockStore<RootState, any>([thunk])

src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx

@@ -1,7 +1,9 @@
 import '../../../__mocks__/matchMediaMock'
-import React, { ChangeEvent } from 'react'
+
 import { DateTimePicker, Label } from '@hospitalrun/components'
 import { shallow } from 'enzyme'
+import React, { ChangeEvent } from 'react'
+
 import DatePickerWithLabelFormGroup from '../../../components/input/DatePickerWithLabelFormGroup'
 
 describe('date picker with label form group', () => {

src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx

@@ -1,7 +1,9 @@
 import '../../../__mocks__/matchMediaMock'
-import React, { ChangeEvent } from 'react'
+
 import { DateTimePicker, Label } from '@hospitalrun/components'
 import { shallow } from 'enzyme'
+import React, { ChangeEvent } from 'react'
+
 import DateTimePickerWithLabelFormGroup from '../../../components/input/DateTimePickerWithLabelFormGroup'
 
 describe('date picker with label form group', () => {

src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx

@@ -1,7 +1,9 @@
 import '../../../__mocks__/matchMediaMock'
-import React from 'react'
-import { shallow } from 'enzyme'
+
 import { Label, Select } from '@hospitalrun/components'
+import { shallow } from 'enzyme'
+import React from 'react'
+
 import SelectWithLabelFormGroup from '../../../components/input/SelectWithLableFormGroup'
 
 describe('select with label form group', () => {

src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx

@@ -1,7 +1,9 @@
 import '../../../__mocks__/matchMediaMock'
-import React from 'react'
+
 import { Label, TextInput } from '@hospitalrun/components'
 import { shallow } from 'enzyme'
+import React from 'react'
+
 import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup'
 
 describe('text input with label form group', () => {

src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx

@@ -1,7 +1,9 @@
 import '../../../__mocks__/matchMediaMock'
-import React from 'react'
+
 import { Label, TextField } from '@hospitalrun/components'
 import { shallow } from 'enzyme'
+import React from 'react'
+
 import TextFieldWithLabelFormGroup from '../../../components/input/TextFieldWithLabelFormGroup'
 
 describe('text field with label form group', () => {

src/__tests__/hooks/debounce.test.ts

@@ -1,5 +1,6 @@
 import { renderHook, act } from '@testing-library/react-hooks'
-import useDebounce from 'hooks/debounce'
+
+import useDebounce from '../../hooks/debounce'
 
 describe('useDebounce', () => {
   beforeAll(() => jest.useFakeTimers())

src/__tests__/incidents/Incidents.test.tsx

@@ -1,17 +1,19 @@
 import '../../__mocks__/matchMediaMock'
-import React from 'react'
+
+import { act } from '@testing-library/react'
 import { mount } from 'enzyme'
-import { MemoryRouter } from 'react-router'
+import React from 'react'
 import { Provider } from 'react-redux'
-import thunk from 'redux-thunk'
+import { MemoryRouter } from 'react-router-dom'
 import createMockStore from 'redux-mock-store'
-import { act } from '@testing-library/react'
-import Permissions from 'model/Permissions'
-import ViewIncident from '../../incidents/view/ViewIncident'
+import thunk from 'redux-thunk'
+
+import IncidentRepository from '../../clients/db/IncidentRepository'
 import Incidents from '../../incidents/Incidents'
 import ReportIncident from '../../incidents/report/ReportIncident'
+import ViewIncident from '../../incidents/view/ViewIncident'
 import Incident from '../../model/Incident'
-import IncidentRepository from '../../clients/db/IncidentRepository'
+import Permissions from '../../model/Permissions'
 import { RootState } from '../../store'
 
 const mockStore = createMockStore<RootState, any>([thunk])

src/__tests__/incidents/incident-slice.test.ts

@@ -1,8 +1,10 @@
+import { addDays } from 'date-fns'
 import { AnyAction } from 'redux'
 import createMockStore from 'redux-mock-store'
 import thunk from 'redux-thunk'
 import shortid from 'shortid'
-import { addDays } from 'date-fns'
+
+import IncidentRepository from '../../clients/db/IncidentRepository'
 import incident, {
   reportIncidentStart,
   reportIncidentSuccess,
@@ -13,10 +15,9 @@ import incident, {
   fetchIncident,
 } from '../../incidents/incident-slice'
 import Incident from '../../model/Incident'
-import { RootState } from '../../store'
-import IncidentRepository from '../../clients/db/IncidentRepository'
 import Permissions from '../../model/Permissions'
 import User from '../../model/User'
+import { RootState } from '../../store'
 
 const mockStore = createMockStore<RootState, any>([thunk])