From bf35ba5ac37bf5a4c8f95773b40438dac3ba5e4c Mon Sep 17 00:00:00 2001 From: Matthew Dorner Date: Wed, 13 May 2020 15:54:44 -0500 Subject: [PATCH 1/6] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Add=20linter=20r?= =?UTF-8?q?ules=20for=20import=20order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add linter rules for import order, enforce only absolute paths for internal modules, do not export repository classes where the default export is an instance of that class. --- .eslintrc.js | 24 +++++++++++++- package.json | 3 +- src/App.tsx | 8 ++--- src/HospitalRun.tsx | 21 ++++++------ src/__tests__/App.test.tsx | 9 +++-- src/__tests__/HospitalRun.test.tsx | 19 ++++++----- .../breadcrumbs/Breadcrumbs.test.tsx | 14 ++++---- .../breadcrumbs/breadcrumbs-slice.test.ts | 5 ++- .../breadcrumbs/useAddBreadcrumbs.test.tsx | 9 ++--- .../clients/db/LabRepository.test.ts | 5 +-- .../clients/db/PatientRepository.test.ts | 7 ++-- src/__tests__/components/Navbar.test.tsx | 13 +++++--- src/__tests__/components/Sidebar.test.tsx | 13 +++++--- .../DatePickerWithLabelFormGroup.test.tsx | 7 ++-- .../DateTimePickerWithLabelFormGroup.test.tsx | 7 ++-- .../input/SelectWithLabelFormGroup.test.tsx | 9 +++-- .../TestInputWithLabelFormGroup.test.tsx | 7 ++-- .../TextFieldWithLabelFormGroup.test.tsx | 7 ++-- src/__tests__/hooks/debounce.test.ts | 1 + src/__tests__/labs/Labs.test.tsx | 17 ++++++---- src/__tests__/labs/ViewLab.test.tsx | 23 +++++++------ src/__tests__/labs/ViewLabs.test.tsx | 19 ++++++----- src/__tests__/labs/lab-slice.test.ts | 15 +++++---- src/__tests__/labs/labs.slice.test.ts | 7 ++-- .../labs/requests/NewLabRequest.test.tsx | 21 +++++++----- .../page-header/ButtonBarProvider.test.tsx | 7 ++-- .../page-header/ButtonToolBar.test.tsx | 11 ++++--- src/__tests__/page-header/title-slice.test.ts | 3 +- src/__tests__/page-header/useTitle.test.tsx | 9 ++--- .../patients/GeneralInformation.test.tsx | 15 +++++---- src/__tests__/patients/Patients.test.tsx | 25 +++++++------- .../patients/allergies/Allergies.test.tsx | 21 +++++++----- .../allergies/NewAllergyModal.test.tsx | 19 ++++++----- .../appointments/AppointmentsList.test.tsx | 15 +++++---- .../diagnoses/AddDiagnosisModal.test.tsx | 23 +++++++------ .../patients/diagnoses/Diagnoses.test.tsx | 17 ++++++---- .../patients/edit/EditPatient.test.tsx | 25 +++++++------- src/__tests__/patients/labs/LabsTab.test.tsx | 27 ++++++++------- .../patients/list/ViewPatients.test.tsx | 21 +++++++----- .../patients/new/NewPatient.test.tsx | 25 +++++++------- .../patients/notes/NewNoteModal.test.tsx | 19 ++++++----- .../patients/notes/NotesTab.test.tsx | 21 +++++++----- src/__tests__/patients/patient-slice.test.ts | 21 +++++++----- src/__tests__/patients/patients-slice.test.ts | 9 +++-- .../AddRelatedPersonModal.test.tsx | 17 ++++++---- .../related-persons/RelatedPersons.test.tsx | 23 +++++++------ .../patients/util/patient-name-util.test.ts | 2 +- .../patients/view/ViewPatient.test.tsx | 33 ++++++++++--------- .../AppointmentDetailForm.test.tsx | 15 +++++---- .../appointments/Appointments.test.tsx | 25 +++++++------- .../appointments/ViewAppointments.test.tsx | 21 +++++++----- .../appointments/appointment-slice.test.ts | 12 ++++--- .../appointments/appointments-slice.test.ts | 6 ++-- .../edit/EditAppointment.test.tsx | 31 +++++++++-------- .../appointments/new/NewAppointment.test.tsx | 29 ++++++++-------- .../util/scheduling-appointment.util.test.ts | 2 +- .../view/ViewAppointment.test.tsx | 27 ++++++++------- src/__tests__/user/user-slice.test.ts | 4 +-- src/__tests__/utils/generateCode.test.ts | 2 +- src/breadcrumbs/Breadcrumbs.tsx | 9 ++--- src/breadcrumbs/breadcrumbs-slice.ts | 1 + src/breadcrumbs/useAddBreadcrumbs.ts | 3 +- src/clients/db/AppointmentRepository.ts | 7 ++-- src/clients/db/LabRepository.ts | 10 +++--- src/clients/db/PatientRepository.ts | 11 ++++--- src/clients/db/Repository.ts | 5 +-- src/components/Navbar.tsx | 4 +-- src/components/Sidebar.tsx | 9 ++--- src/components/component-slice.ts | 3 +- .../input/DatePickerWithLabelFormGroup.tsx | 2 +- .../DateTimePickerWithLabelFormGroup.tsx | 2 +- .../input/SelectWithLableFormGroup.tsx | 2 +- .../input/TextFieldWithLabelFormGroup.tsx | 2 +- .../input/TextInputWithLabelFormGroup.tsx | 2 +- src/dashboard/Dashboard.tsx | 3 +- src/i18n.ts | 22 ++++++------- src/index.tsx | 9 ++--- src/labs/Labs.tsx | 13 ++++---- src/labs/ViewLab.tsx | 19 ++++++----- src/labs/ViewLabs.tsx | 21 ++++++------ src/labs/lab-slice.ts | 7 ++-- src/labs/labs-slice.ts | 9 ++--- src/labs/requests/NewLabRequest.tsx | 17 +++++----- src/locales/ar/translations/index.ts | 8 ++--- src/locales/de/translations/index.ts | 8 ++--- src/locales/enUs/translations/index.ts | 16 ++++----- src/locales/es/translations/index.ts | 8 ++--- src/locales/fr/translations/index.ts | 16 ++++----- src/locales/in/translations/index.ts | 8 ++--- src/locales/it/translations/index.ts | 16 ++++----- src/locales/ja/translations/index.ts | 8 ++--- src/locales/ptBr/translations/index.ts | 16 ++++----- src/locales/ru/translations/index.ts | 8 ++--- src/locales/zr/translations/index.ts | 8 ++--- src/model/Appointment.ts | 2 +- src/model/Lab.ts | 2 +- src/model/Patient.ts | 14 ++++---- src/page-header/ButtonToolBar.tsx | 3 +- src/page-header/title-slice.ts | 3 +- src/page-header/useTitle.tsx | 3 +- src/patients/GeneralInformation.tsx | 14 ++++---- src/patients/Patients.tsx | 15 +++++---- src/patients/allergies/Allergies.tsx | 13 ++++---- src/patients/allergies/NewAllergyModal.tsx | 11 ++++--- .../appointments/AppointmentsList.tsx | 11 ++++--- src/patients/diagnoses/AddDiagnosisModal.tsx | 13 ++++---- src/patients/diagnoses/Diagnoses.tsx | 15 +++++---- src/patients/edit/EditPatient.tsx | 19 ++++++----- src/patients/labs/LabsTab.tsx | 9 ++--- src/patients/list/ViewPatients.tsx | 17 +++++----- src/patients/new/NewPatient.tsx | 19 ++++++----- src/patients/notes/NewNoteModal.tsx | 9 ++--- src/patients/notes/NoteTab.tsx | 11 ++++--- src/patients/patient-slice.ts | 17 +++++----- src/patients/patients-slice.ts | 7 ++-- .../related-persons/AddRelatedPersonModal.tsx | 13 ++++---- .../related-persons/RelatedPersonTab.tsx | 13 ++++---- src/patients/util/patient-name-util.ts | 2 +- src/patients/view/ViewPatient.tsx | 28 ++++++++-------- .../appointments/AppointmentDetailForm.tsx | 15 +++++---- src/scheduling/appointments/Appointments.tsx | 11 ++++--- .../appointments/ViewAppointments.tsx | 11 ++++--- .../appointments/appointment-slice.ts | 11 ++++--- .../appointments/appointments-slice.ts | 3 +- .../appointments/edit/EditAppointment.tsx | 18 +++++----- .../appointments/new/NewAppointment.tsx | 19 ++++++----- .../util/scheduling-appointment.util.ts | 2 +- .../appointments/view/ViewAppointment.tsx | 19 ++++++----- src/store/index.ts | 21 ++++++------ src/user/user-slice.ts | 3 +- 130 files changed, 900 insertions(+), 700 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 2692cbdf5b..efe06b1170 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,10 +28,17 @@ module.exports = { 'import/resolver': { node: { extensions: ['.js', '.jsx', '.ts', '.tsx'], + moduleDirectory: ["node_modules", "src/"], }, + "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,27 @@ 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', + 'no-restricted-imports': ['error', { patterns: ['../', './']}], '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'], }, } diff --git a/package.json b/package.json index eab097d2d8..72240116b8 100644 --- a/package.json +++ b/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.10.0", "eslint-plugin-jsx-a11y": "~6.2.3", "eslint-plugin-prettier": "~3.1.2", diff --git a/src/App.tsx b/src/App.tsx index f813de0874..656cc41695 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,10 +1,10 @@ +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 store from './store' +import HospitalRun from 'HospitalRun' +import store from 'store' const App: React.FC = () => (
diff --git a/src/HospitalRun.tsx b/src/HospitalRun.tsx index 8b6ba566f5..bbb84e845e 100644 --- a/src/HospitalRun.tsx +++ b/src/HospitalRun.tsx @@ -1,18 +1,19 @@ +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 { Switch, Route } from 'react-router-dom' + import Breadcrumbs from 'breadcrumbs/Breadcrumbs' +import Navbar from 'components/Navbar' +import PrivateRoute from 'components/PrivateRoute' +import Sidebar from 'components/Sidebar' +import Dashboard from 'dashboard/Dashboard' +import Labs from 'labs/Labs' 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 Navbar from './components/Navbar' -import PrivateRoute from './components/PrivateRoute' -import Patients from './patients/Patients' -import Appointments from './scheduling/appointments/Appointments' +import Patients from 'patients/Patients' +import Appointments from 'scheduling/appointments/Appointments' +import { RootState } from 'store' const HospitalRun = () => { const { title } = useSelector((state: RootState) => state.title) diff --git a/src/__tests__/App.test.tsx b/src/__tests__/App.test.tsx index 9d82e2646a..44c5e91820 100644 --- a/src/__tests__/App.test.tsx +++ b/src/__tests__/App.test.tsx @@ -1,8 +1,11 @@ +// eslint-disable-next-line no-restricted-imports import '../__mocks__/matchMediaMock' -import React from 'react' + import { mount } from 'enzyme' -import HospitalRun from '../HospitalRun' -import App from '../App' +import React from 'react' + +import App from 'App' +import HospitalRun from 'HospitalRun' it('renders without crashing', () => { const wrapper = mount() diff --git a/src/__tests__/HospitalRun.test.tsx b/src/__tests__/HospitalRun.test.tsx index 3179d925ca..2c1093ffb7 100644 --- a/src/__tests__/HospitalRun.test.tsx +++ b/src/__tests__/HospitalRun.test.tsx @@ -1,17 +1,20 @@ +// eslint-disable-next-line no-restricted-imports import '../__mocks__/matchMediaMock' -import React from 'react' + +import { Toaster } from '@hospitalrun/components' import { mount } from 'enzyme' -import { MemoryRouter } from 'react-router' +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' import configureMockStore from 'redux-mock-store' -import { Toaster } from '@hospitalrun/components' -import { act } from 'react-dom/test-utils' +import thunk from 'redux-thunk' + +import LabRepository from 'clients/db/LabRepository' import Dashboard from 'dashboard/Dashboard' +import HospitalRun from 'HospitalRun' import ViewLabs from 'labs/ViewLabs' -import LabRepository from 'clients/db/LabRepository' -import HospitalRun from '../HospitalRun' -import Permissions from '../model/Permissions' +import Permissions from 'model/Permissions' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx b/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx index f14bc46b9f..f06785e90d 100644 --- a/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx +++ b/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx @@ -1,14 +1,16 @@ +// eslint-disable-next-line no-restricted-imports 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 configureMockStore from 'redux-mock-store' + import { Breadcrumb as HRBreadcrumb, BreadcrumbItem as HRBreadcrumbItem, } from '@hospitalrun/components' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' +import { Provider } from 'react-redux' +import { Router } from 'react-router-dom' +import configureMockStore from 'redux-mock-store' import Breadcrumbs from 'breadcrumbs/Breadcrumbs' import Breadcrumb from 'model/Breadcrumb' diff --git a/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts b/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts index 10f73f19ff..0ff7877b88 100644 --- a/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts +++ b/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts @@ -1,6 +1,9 @@ +// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' + import { AnyAction } from 'redux' -import breadcrumbs, { addBreadcrumbs, removeBreadcrumbs } from '../../breadcrumbs/breadcrumbs-slice' + +import breadcrumbs, { addBreadcrumbs, removeBreadcrumbs } from 'breadcrumbs/breadcrumbs-slice' describe('breadcrumbs slice', () => { describe('breadcrumbs reducer', () => { diff --git a/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx b/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx index 452f76ebdc..3f80465af5 100644 --- a/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx +++ b/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx @@ -1,9 +1,10 @@ -import React from 'react' import { renderHook } from '@testing-library/react-hooks' -import configureMockStore from 'redux-mock-store' +import React from 'react' import { Provider } from 'react-redux' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' -import * as breadcrumbsSlice from '../../breadcrumbs/breadcrumbs-slice' +import configureMockStore from 'redux-mock-store' + +import * as breadcrumbsSlice from 'breadcrumbs/breadcrumbs-slice' +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' const store = configureMockStore() diff --git a/src/__tests__/clients/db/LabRepository.test.ts b/src/__tests__/clients/db/LabRepository.test.ts index f9ed08130e..b82bc3c540 100644 --- a/src/__tests__/clients/db/LabRepository.test.ts +++ b/src/__tests__/clients/db/LabRepository.test.ts @@ -1,9 +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 Lab from '../../../model/Lab' +import { labs } from 'config/pouchdb' +import Lab from 'model/Lab' interface SearchContainer { text: string diff --git a/src/__tests__/clients/db/PatientRepository.test.ts b/src/__tests__/clients/db/PatientRepository.test.ts index e45cd7262b..97e84d069c 100644 --- a/src/__tests__/clients/db/PatientRepository.test.ts +++ b/src/__tests__/clients/db/PatientRepository.test.ts @@ -1,8 +1,9 @@ -import { patients } from 'config/pouchdb' +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' -import shortid from 'shortid' -import { getTime, isAfter } from 'date-fns' 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 diff --git a/src/__tests__/components/Navbar.test.tsx b/src/__tests__/components/Navbar.test.tsx index 8354bce74d..bebc2c9013 100644 --- a/src/__tests__/components/Navbar.test.tsx +++ b/src/__tests__/components/Navbar.test.tsx @@ -1,11 +1,14 @@ +// eslint-disable-next-line no-restricted-imports 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 Navbar from '../../components/Navbar' +import React from 'react' +import { act } from 'react-dom/test-utils' +import { Router } from 'react-router-dom' + +import Navbar from 'components/Navbar' describe('Navbar', () => { const history = createMemoryHistory() diff --git a/src/__tests__/components/Sidebar.test.tsx b/src/__tests__/components/Sidebar.test.tsx index 11bf2804af..7994ebe465 100644 --- a/src/__tests__/components/Sidebar.test.tsx +++ b/src/__tests__/components/Sidebar.test.tsx @@ -1,14 +1,17 @@ +// eslint-disable-next-line no-restricted-imports 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' -import { ListItem } from '@hospitalrun/components' -import { act } from '@testing-library/react' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' + +import Sidebar from 'components/Sidebar' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx b/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx index 0bb2fec902..a41f7edb2b 100644 --- a/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx @@ -1,8 +1,11 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React, { ChangeEvent } from 'react' + import { DateTimePicker, Label } from '@hospitalrun/components' import { shallow } from 'enzyme' -import DatePickerWithLabelFormGroup from '../../../components/input/DatePickerWithLabelFormGroup' +import React, { ChangeEvent } from 'react' + +import DatePickerWithLabelFormGroup from 'components/input/DatePickerWithLabelFormGroup' describe('date picker with label form group', () => { describe('layout', () => { diff --git a/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx b/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx index cba26f9131..6b26e36ef2 100644 --- a/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx @@ -1,8 +1,11 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React, { ChangeEvent } from 'react' + import { DateTimePicker, Label } from '@hospitalrun/components' import { shallow } from 'enzyme' -import DateTimePickerWithLabelFormGroup from '../../../components/input/DateTimePickerWithLabelFormGroup' +import React, { ChangeEvent } from 'react' + +import DateTimePickerWithLabelFormGroup from 'components/input/DateTimePickerWithLabelFormGroup' describe('date picker with label form group', () => { describe('layout', () => { diff --git a/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx b/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx index 74be6cbfeb..daf069de89 100644 --- a/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx @@ -1,8 +1,11 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { shallow } from 'enzyme' + import { Label, Select } from '@hospitalrun/components' -import SelectWithLabelFormGroup from '../../../components/input/SelectWithLableFormGroup' +import { shallow } from 'enzyme' +import React from 'react' + +import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' describe('select with label form group', () => { describe('layout', () => { diff --git a/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx b/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx index 01fbc66d14..12ba95ab2d 100644 --- a/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx @@ -1,8 +1,11 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' + import { Label, TextInput } from '@hospitalrun/components' import { shallow } from 'enzyme' -import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' +import React from 'react' + +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' describe('text input with label form group', () => { describe('layout', () => { diff --git a/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx b/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx index 64367b1e64..960e3a2d7c 100644 --- a/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx @@ -1,8 +1,11 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' + import { Label, TextField } from '@hospitalrun/components' import { shallow } from 'enzyme' -import TextFieldWithLabelFormGroup from '../../../components/input/TextFieldWithLabelFormGroup' +import React from 'react' + +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' describe('text field with label form group', () => { describe('layout', () => { diff --git a/src/__tests__/hooks/debounce.test.ts b/src/__tests__/hooks/debounce.test.ts index 73be39e3eb..7feb833332 100644 --- a/src/__tests__/hooks/debounce.test.ts +++ b/src/__tests__/hooks/debounce.test.ts @@ -1,4 +1,5 @@ import { renderHook, act } from '@testing-library/react-hooks' + import useDebounce from 'hooks/debounce' describe('useDebounce', () => { diff --git a/src/__tests__/labs/Labs.test.tsx b/src/__tests__/labs/Labs.test.tsx index 03fddb7284..0faaf3003f 100644 --- a/src/__tests__/labs/Labs.test.tsx +++ b/src/__tests__/labs/Labs.test.tsx @@ -1,19 +1,22 @@ +// eslint-disable-next-line no-restricted-imports 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' import configureMockStore from 'redux-mock-store' -import { act } from '@testing-library/react' +import thunk from 'redux-thunk' + +import LabRepository from 'clients/db/LabRepository' +import PatientRepository from 'clients/db/PatientRepository' import Labs from 'labs/Labs' import NewLabRequest from 'labs/requests/NewLabRequest' -import Permissions from 'model/Permissions' import ViewLab from 'labs/ViewLab' -import LabRepository from 'clients/db/LabRepository' import Lab from 'model/Lab' import Patient from 'model/Patient' -import PatientRepository from 'clients/db/PatientRepository' +import Permissions from 'model/Permissions' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/labs/ViewLab.test.tsx b/src/__tests__/labs/ViewLab.test.tsx index bbd6dba8fc..1895f1e35f 100644 --- a/src/__tests__/labs/ViewLab.test.tsx +++ b/src/__tests__/labs/ViewLab.test.tsx @@ -1,23 +1,26 @@ +// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' + +import { Badge, Button, Alert } from '@hospitalrun/components' +import { act } from '@testing-library/react' +import format from 'date-fns/format' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' import React from 'react' import { Provider } from 'react-redux' import { Router, Route } from 'react-router' -import { mount } from 'enzyme' +import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { createMemoryHistory } from 'history' -import Permissions from 'model/Permissions' -import { act } from '@testing-library/react' + import LabRepository from 'clients/db/LabRepository' import PatientRepository from 'clients/db/PatientRepository' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import ViewLab from 'labs/ViewLab' import Lab from 'model/Lab' import Patient from 'model/Patient' +import Permissions from 'model/Permissions' import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import createMockStore from 'redux-mock-store' -import { Badge, Button, Alert } from '@hospitalrun/components' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import format from 'date-fns/format' -import * as titleUtil from '../../page-header/useTitle' -import ViewLab from '../../labs/ViewLab' +import * as titleUtil from 'page-header/useTitle' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/labs/ViewLabs.test.tsx b/src/__tests__/labs/ViewLabs.test.tsx index 0cf1eaaf64..39dc94e788 100644 --- a/src/__tests__/labs/ViewLabs.test.tsx +++ b/src/__tests__/labs/ViewLabs.test.tsx @@ -1,21 +1,24 @@ +// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' + +import { TextInput, Select } from '@hospitalrun/components' +import { act } from '@testing-library/react' +import format from 'date-fns/format' +import { mount, ReactWrapper } from 'enzyme' +import { createMemoryHistory } from 'history' import React from 'react' import { Provider } from 'react-redux' import { Router } from 'react-router' -import ViewLabs from 'labs/ViewLabs' -import { mount, ReactWrapper } from 'enzyme' -import { TextInput, Select } from '@hospitalrun/components' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { createMemoryHistory } from 'history' -import Permissions from 'model/Permissions' -import { act } from '@testing-library/react' + import LabRepository from 'clients/db/LabRepository' import * as labsSlice from 'labs/labs-slice' +import ViewLabs from 'labs/ViewLabs' import Lab from 'model/Lab' -import format from 'date-fns/format' +import Permissions from 'model/Permissions' import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import * as titleUtil from '../../page-header/useTitle' +import * as titleUtil from 'page-header/useTitle' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/labs/lab-slice.test.ts b/src/__tests__/labs/lab-slice.test.ts index 6296f36b7e..883992c3ba 100644 --- a/src/__tests__/labs/lab-slice.test.ts +++ b/src/__tests__/labs/lab-slice.test.ts @@ -1,9 +1,8 @@ -import thunk from 'redux-thunk' import createMockStore from 'redux-mock-store' -import PatientRepository from '../../clients/db/PatientRepository' -import LabRepository from '../../clients/db/LabRepository' -import Lab from '../../model/Lab' -import Patient from '../../model/Patient' +import thunk from 'redux-thunk' + +import LabRepository from 'clients/db/LabRepository' +import PatientRepository from 'clients/db/PatientRepository' import labSlice, { requestLab, fetchLabStart, @@ -22,8 +21,10 @@ import labSlice, { completeLabError, requestLabError, updateLab, -} from '../../labs/lab-slice' -import { RootState } from '../../store' +} from 'labs/lab-slice' +import Lab from 'model/Lab' +import Patient from 'model/Patient' +import { RootState } from 'store' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/labs/labs.slice.test.ts b/src/__tests__/labs/labs.slice.test.ts index a380d0beb3..0534fc6054 100644 --- a/src/__tests__/labs/labs.slice.test.ts +++ b/src/__tests__/labs/labs.slice.test.ts @@ -1,9 +1,10 @@ import { AnyAction } from 'redux' import { mocked } from 'ts-jest/utils' + +import LabRepository from 'clients/db/LabRepository' import SortRequest from 'clients/db/SortRequest' -import labs, { fetchLabsStart, fetchLabsSuccess, searchLabs } from '../../labs/labs-slice' -import Lab from '../../model/Lab' -import LabRepository from '../../clients/db/LabRepository' +import labs, { fetchLabsStart, fetchLabsSuccess, searchLabs } from 'labs/labs-slice' +import Lab from 'model/Lab' interface SearchContainer { text: string diff --git a/src/__tests__/labs/requests/NewLabRequest.test.tsx b/src/__tests__/labs/requests/NewLabRequest.test.tsx index 7e280b0e58..100c5431b9 100644 --- a/src/__tests__/labs/requests/NewLabRequest.test.tsx +++ b/src/__tests__/labs/requests/NewLabRequest.test.tsx @@ -1,21 +1,24 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -import NewLabRequest from 'labs/requests/NewLabRequest' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import { mount, ReactWrapper } from 'enzyme' + import { Button, Typeahead, Label, Alert } from '@hospitalrun/components' -import { Router } from 'react-router-dom' +import { mount, ReactWrapper } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' +import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' +import { Router } from 'react-router-dom' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { createMemoryHistory } from 'history' -import { act } from 'react-dom/test-utils' + import LabRepository from 'clients/db/LabRepository' import PatientRepository from 'clients/db/PatientRepository' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import NewLabRequest from 'labs/requests/NewLabRequest' import Lab from 'model/Lab' import Patient from 'model/Patient' -import * as titleUtil from '../../../page-header/useTitle' +import * as titleUtil from 'page-header/useTitle' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/page-header/ButtonBarProvider.test.tsx b/src/__tests__/page-header/ButtonBarProvider.test.tsx index af8527735d..df4fff4475 100644 --- a/src/__tests__/page-header/ButtonBarProvider.test.tsx +++ b/src/__tests__/page-header/ButtonBarProvider.test.tsx @@ -1,12 +1,15 @@ +// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' -import React, { useEffect } from 'react' + +import { Button } from '@hospitalrun/components' import { renderHook } from '@testing-library/react-hooks' +import React, { useEffect } from 'react' + import { ButtonBarProvider, useButtons, useButtonToolbarSetter, } from 'page-header/ButtonBarProvider' -import { Button } from '@hospitalrun/components' describe('Button Bar Provider', () => { it('should update and fetch data from the button bar provider', () => { diff --git a/src/__tests__/page-header/ButtonToolBar.test.tsx b/src/__tests__/page-header/ButtonToolBar.test.tsx index ff369b086d..e23753cb83 100644 --- a/src/__tests__/page-header/ButtonToolBar.test.tsx +++ b/src/__tests__/page-header/ButtonToolBar.test.tsx @@ -1,10 +1,13 @@ +// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' -import React from 'react' + import { Button } from '@hospitalrun/components' -import { mocked } from 'ts-jest/utils' import { mount } from 'enzyme' -import * as ButtonBarProvider from '../../page-header/ButtonBarProvider' -import ButtonToolBar from '../../page-header/ButtonToolBar' +import React from 'react' +import { mocked } from 'ts-jest/utils' + +import * as ButtonBarProvider from 'page-header/ButtonBarProvider' +import ButtonToolBar from 'page-header/ButtonToolBar' describe('Button Tool Bar', () => { beforeEach(() => { diff --git a/src/__tests__/page-header/title-slice.test.ts b/src/__tests__/page-header/title-slice.test.ts index d15bfef444..a581cb022b 100644 --- a/src/__tests__/page-header/title-slice.test.ts +++ b/src/__tests__/page-header/title-slice.test.ts @@ -1,5 +1,6 @@ import { AnyAction } from 'redux' -import title, { updateTitle, changeTitle } from '../../page-header/title-slice' + +import title, { updateTitle, changeTitle } from 'page-header/title-slice' describe('title slice', () => { describe('title reducer', () => { diff --git a/src/__tests__/page-header/useTitle.test.tsx b/src/__tests__/page-header/useTitle.test.tsx index a913147e81..83ce95f936 100644 --- a/src/__tests__/page-header/useTitle.test.tsx +++ b/src/__tests__/page-header/useTitle.test.tsx @@ -1,10 +1,11 @@ -import React from 'react' import { renderHook } from '@testing-library/react-hooks' +import React from 'react' +import { Provider } from 'react-redux' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' -import useTitle from '../../page-header/useTitle' -import * as titleSlice from '../../page-header/title-slice' + +import * as titleSlice from 'page-header/title-slice' +import useTitle from 'page-header/useTitle' const store = configureMockStore([thunk]) diff --git a/src/__tests__/patients/GeneralInformation.test.tsx b/src/__tests__/patients/GeneralInformation.test.tsx index 368079a078..2537879f46 100644 --- a/src/__tests__/patients/GeneralInformation.test.tsx +++ b/src/__tests__/patients/GeneralInformation.test.tsx @@ -1,13 +1,16 @@ +// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' + +import { Alert } from '@hospitalrun/components' +import { act } from '@testing-library/react' +import { startOfDay, subYears } from 'date-fns' +import { mount, ReactWrapper } from 'enzyme' +import { createMemoryHistory } from 'history' import React from 'react' import { Router } from 'react-router' -import { mount, ReactWrapper } from 'enzyme' + +import Patient from 'model/Patient' import GeneralInformation from 'patients/GeneralInformation' -import { createMemoryHistory } from 'history' -import { startOfDay, subYears } from 'date-fns' -import { Alert } from '@hospitalrun/components' -import { act } from '@testing-library/react' -import Patient from '../../model/Patient' describe('Error handling', () => { it('should display errors', () => { diff --git a/src/__tests__/patients/Patients.test.tsx b/src/__tests__/patients/Patients.test.tsx index a37c8979e1..dde70186f9 100644 --- a/src/__tests__/patients/Patients.test.tsx +++ b/src/__tests__/patients/Patients.test.tsx @@ -1,20 +1,23 @@ +// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' + +import { mount } from 'enzyme' import React from 'react' +import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' import { MemoryRouter } from 'react-router' import configureMockStore from 'redux-mock-store' -import { mount } from 'enzyme' import thunk from 'redux-thunk' -import { act } from 'react-dom/test-utils' -import Permissions from '../../model/Permissions' -import HospitalRun from '../../HospitalRun' -import NewPatient from '../../patients/new/NewPatient' -import { addBreadcrumbs } from '../../breadcrumbs/breadcrumbs-slice' -import Dashboard from '../../dashboard/Dashboard' -import PatientRepository from '../../clients/db/PatientRepository' -import Patient from '../../model/Patient' -import EditPatient from '../../patients/edit/EditPatient' -import ViewPatient from '../../patients/view/ViewPatient' + +import { addBreadcrumbs } from 'breadcrumbs/breadcrumbs-slice' +import PatientRepository from 'clients/db/PatientRepository' +import Dashboard from 'dashboard/Dashboard' +import HospitalRun from 'HospitalRun' +import Patient from 'model/Patient' +import Permissions from 'model/Permissions' +import EditPatient from 'patients/edit/EditPatient' +import NewPatient from 'patients/new/NewPatient' +import ViewPatient from 'patients/view/ViewPatient' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/allergies/Allergies.test.tsx b/src/__tests__/patients/allergies/Allergies.test.tsx index cd76204a89..5c724ffb44 100644 --- a/src/__tests__/patients/allergies/Allergies.test.tsx +++ b/src/__tests__/patients/allergies/Allergies.test.tsx @@ -1,18 +1,21 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' + +import * as components from '@hospitalrun/components' +import { act } from '@testing-library/react' import { mount } from 'enzyme' -import Allergies from 'patients/allergies/Allergies' -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 React from 'react' import { Provider } from 'react-redux' -import Patient from 'model/Patient' -import * as components from '@hospitalrun/components' -import { act } from '@testing-library/react' +import { Router } from 'react-router' +import configureMockStore from 'redux-mock-store' +import thunk from 'redux-thunk' + import PatientRepository from 'clients/db/PatientRepository' import Allergy from 'model/Allergy' +import Patient from 'model/Patient' +import Permissions from 'model/Permissions' +import Allergies from 'patients/allergies/Allergies' const mockStore = configureMockStore([thunk]) const history = createMemoryHistory() diff --git a/src/__tests__/patients/allergies/NewAllergyModal.test.tsx b/src/__tests__/patients/allergies/NewAllergyModal.test.tsx index c9420eb4a0..5027d70a66 100644 --- a/src/__tests__/patients/allergies/NewAllergyModal.test.tsx +++ b/src/__tests__/patients/allergies/NewAllergyModal.test.tsx @@ -1,16 +1,19 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -import NewAllergyModal from 'patients/allergies/NewAllergyModal' -import { mount } from 'enzyme' + import { Modal, Alert } from '@hospitalrun/components' import { act } from '@testing-library/react' +import { mount } from 'enzyme' +import React from 'react' +import { Provider } from 'react-redux' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' -import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' -import * as patientSlice from '../../../patients/patient-slice' -import PatientRepository from '../../../clients/db/PatientRepository' -import Patient from '../../../model/Patient' + +import PatientRepository from 'clients/db/PatientRepository' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import Patient from 'model/Patient' +import NewAllergyModal from 'patients/allergies/NewAllergyModal' +import * as patientSlice from 'patients/patient-slice' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/appointments/AppointmentsList.test.tsx b/src/__tests__/patients/appointments/AppointmentsList.test.tsx index 249ce68023..abaf8ac983 100644 --- a/src/__tests__/patients/appointments/AppointmentsList.test.tsx +++ b/src/__tests__/patients/appointments/AppointmentsList.test.tsx @@ -1,16 +1,19 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' + +import * as components from '@hospitalrun/components' import { mount, ReactWrapper } from 'enzyme' import { createMemoryHistory } from 'history' +import React from 'react' +import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router } from 'react-router' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' + import Patient from 'model/Patient' -import { Router } from 'react-router' -import { Provider } from 'react-redux' import AppointmentsList from 'patients/appointments/AppointmentsList' -import * as components from '@hospitalrun/components' -import { act } from 'react-dom/test-utils' -import * as appointmentsSlice from '../../../scheduling/appointments/appointments-slice' +import * as appointmentsSlice from 'scheduling/appointments/appointments-slice' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx b/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx index 9f6ba327cc..0ca475a5f7 100644 --- a/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx +++ b/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx @@ -1,18 +1,21 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { mount } from 'enzyme' + import { Modal, Alert } from '@hospitalrun/components' import { act } from '@testing-library/react' -import AddDiagnosisModal from 'patients/diagnoses/AddDiagnosisModal' +import { mount } from 'enzyme' +import React from 'react' +import { Provider } from 'react-redux' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' -import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' -import DatePickerWithLabelFormGroup from '../../../components/input/DatePickerWithLabelFormGroup' -import Diagnosis from '../../../model/Diagnosis' -import * as patientSlice from '../../../patients/patient-slice' -import PatientRepository from '../../../clients/db/PatientRepository' -import Patient from '../../../model/Patient' + +import PatientRepository from 'clients/db/PatientRepository' +import DatePickerWithLabelFormGroup from 'components/input/DatePickerWithLabelFormGroup' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import Diagnosis from 'model/Diagnosis' +import Patient from 'model/Patient' +import AddDiagnosisModal from 'patients/diagnoses/AddDiagnosisModal' +import * as patientSlice from 'patients/patient-slice' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/diagnoses/Diagnoses.test.tsx b/src/__tests__/patients/diagnoses/Diagnoses.test.tsx index 261932f2a7..a1e6e8cb94 100644 --- a/src/__tests__/patients/diagnoses/Diagnoses.test.tsx +++ b/src/__tests__/patients/diagnoses/Diagnoses.test.tsx @@ -1,18 +1,21 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' + +import * as components from '@hospitalrun/components' import { mount } from 'enzyme' import { createMemoryHistory } from 'history' +import React from 'react' +import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router } from 'react-router' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import Patient from 'model/Patient' + +import PatientRepository from 'clients/db/PatientRepository' import Diagnosis from 'model/Diagnosis' +import Patient from 'model/Patient' import Permissions from 'model/Permissions' -import { Router } from 'react-router' -import { Provider } from 'react-redux' import Diagnoses from 'patients/diagnoses/Diagnoses' -import * as components from '@hospitalrun/components' -import { act } from 'react-dom/test-utils' -import PatientRepository from 'clients/db/PatientRepository' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/edit/EditPatient.test.tsx b/src/__tests__/patients/edit/EditPatient.test.tsx index 62de9c53a9..8ea0099332 100644 --- a/src/__tests__/patients/edit/EditPatient.test.tsx +++ b/src/__tests__/patients/edit/EditPatient.test.tsx @@ -1,20 +1,23 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' + +import { Button } from '@hospitalrun/components' +import { subDays } from 'date-fns' import { mount } from 'enzyme' -import { Router, Route } from 'react-router-dom' -import { Provider } from 'react-redux' import { createMemoryHistory } from 'history' +import React from 'react' import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router, Route } from 'react-router-dom' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import { Button } from '@hospitalrun/components' -import { subDays } from 'date-fns' -import EditPatient from '../../../patients/edit/EditPatient' -import GeneralInformation from '../../../patients/GeneralInformation' -import Patient from '../../../model/Patient' -import * as titleUtil from '../../../page-header/useTitle' -import * as patientSlice from '../../../patients/patient-slice' -import PatientRepository from '../../../clients/db/PatientRepository' + +import PatientRepository from 'clients/db/PatientRepository' +import Patient from 'model/Patient' +import * as titleUtil from 'page-header/useTitle' +import EditPatient from 'patients/edit/EditPatient' +import GeneralInformation from 'patients/GeneralInformation' +import * as patientSlice from 'patients/patient-slice' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/labs/LabsTab.test.tsx b/src/__tests__/patients/labs/LabsTab.test.tsx index cc5f5c0518..564fa4c09b 100644 --- a/src/__tests__/patients/labs/LabsTab.test.tsx +++ b/src/__tests__/patients/labs/LabsTab.test.tsx @@ -1,19 +1,22 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -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 { Provider } from 'react-redux' + import * as components from '@hospitalrun/components' import format from 'date-fns/format' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' import { act } from 'react-dom/test-utils' -import LabsTab from '../../../patients/labs/LabsTab' -import Patient from '../../../model/Patient' -import Lab from '../../../model/Lab' -import Permissions from '../../../model/Permissions' -import LabRepository from '../../../clients/db/LabRepository' +import { Provider } from 'react-redux' +import { Router } from 'react-router' +import configureMockStore from 'redux-mock-store' +import thunk from 'redux-thunk' + +import LabRepository from 'clients/db/LabRepository' +import Lab from 'model/Lab' +import Patient from 'model/Patient' +import Permissions from 'model/Permissions' +import LabsTab from 'patients/labs/LabsTab' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/list/ViewPatients.test.tsx b/src/__tests__/patients/list/ViewPatients.test.tsx index a250d28a1d..eecc854cef 100644 --- a/src/__tests__/patients/list/ViewPatients.test.tsx +++ b/src/__tests__/patients/list/ViewPatients.test.tsx @@ -1,18 +1,21 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { mount } from 'enzyme' + import { TextInput, Spinner } from '@hospitalrun/components' -import { MemoryRouter } from 'react-router-dom' +import format from 'date-fns/format' +import { mount } from 'enzyme' +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 configureStore from 'redux-mock-store' +import thunk from 'redux-thunk' import { mocked } from 'ts-jest/utils' -import { act } from 'react-dom/test-utils' + +import PatientRepository from 'clients/db/PatientRepository' import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import format from 'date-fns/format' -import ViewPatients from '../../../patients/list/ViewPatients' -import PatientRepository from '../../../clients/db/PatientRepository' -import * as patientSlice from '../../../patients/patients-slice' +import ViewPatients from 'patients/list/ViewPatients' +import * as patientSlice from 'patients/patients-slice' const middlewares = [thunk] const mockStore = configureStore(middlewares) diff --git a/src/__tests__/patients/new/NewPatient.test.tsx b/src/__tests__/patients/new/NewPatient.test.tsx index dbea001bc0..28aba74822 100644 --- a/src/__tests__/patients/new/NewPatient.test.tsx +++ b/src/__tests__/patients/new/NewPatient.test.tsx @@ -1,20 +1,23 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' + +import * as components from '@hospitalrun/components' import { mount } from 'enzyme' -import { Router, Route } from 'react-router-dom' -import { Provider } from 'react-redux' -import { mocked } from 'ts-jest/utils' import { createMemoryHistory } from 'history' +import React from 'react' import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router, Route } from 'react-router-dom' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import * as components from '@hospitalrun/components' -import NewPatient from '../../../patients/new/NewPatient' -import GeneralInformation from '../../../patients/GeneralInformation' -import Patient from '../../../model/Patient' -import * as patientSlice from '../../../patients/patient-slice' -import * as titleUtil from '../../../page-header/useTitle' -import PatientRepository from '../../../clients/db/PatientRepository' +import { mocked } from 'ts-jest/utils' + +import PatientRepository from 'clients/db/PatientRepository' +import Patient from 'model/Patient' +import * as titleUtil from 'page-header/useTitle' +import GeneralInformation from 'patients/GeneralInformation' +import NewPatient from 'patients/new/NewPatient' +import * as patientSlice from 'patients/patient-slice' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/notes/NewNoteModal.test.tsx b/src/__tests__/patients/notes/NewNoteModal.test.tsx index 8ac6dafcc3..01d96d764c 100644 --- a/src/__tests__/patients/notes/NewNoteModal.test.tsx +++ b/src/__tests__/patients/notes/NewNoteModal.test.tsx @@ -1,16 +1,19 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -import NewNoteModal from 'patients/notes/NewNoteModal' -import { mount } from 'enzyme' + import { Alert, Modal } from '@hospitalrun/components' import { act } from '@testing-library/react' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import { mount } from 'enzyme' +import React from 'react' +import { Provider } from 'react-redux' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' -import * as patientSlice from '../../../patients/patient-slice' -import PatientRepository from '../../../clients/db/PatientRepository' -import Patient from '../../../model/Patient' + +import PatientRepository from 'clients/db/PatientRepository' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import Patient from 'model/Patient' +import NewNoteModal from 'patients/notes/NewNoteModal' +import * as patientSlice from 'patients/patient-slice' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/notes/NotesTab.test.tsx b/src/__tests__/patients/notes/NotesTab.test.tsx index 4cfbfb0f87..9e8d36ce76 100644 --- a/src/__tests__/patients/notes/NotesTab.test.tsx +++ b/src/__tests__/patients/notes/NotesTab.test.tsx @@ -1,18 +1,21 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' + +import * as components from '@hospitalrun/components' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' import React from 'react' +import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router } from 'react-router' +import configureMockStore from 'redux-mock-store' +import thunk from 'redux-thunk' + import PatientRepository from 'clients/db/PatientRepository' import Note from 'model/Note' -import { createMemoryHistory } from 'history' -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 { Provider } from 'react-redux' +import Permissions from 'model/Permissions' import NoteTab from 'patients/notes/NoteTab' -import * as components from '@hospitalrun/components' -import { act } from 'react-dom/test-utils' -import Permissions from '../../../model/Permissions' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/patient-slice.test.ts b/src/__tests__/patients/patient-slice.test.ts index dba7899dcd..9773002c43 100644 --- a/src/__tests__/patients/patient-slice.test.ts +++ b/src/__tests__/patients/patient-slice.test.ts @@ -1,9 +1,16 @@ +// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' + +import { addDays } from 'date-fns' import { AnyAction } from 'redux' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { addDays } from 'date-fns' -import * as uuid from '../../util/uuid' + +import PatientRepository from 'clients/db/PatientRepository' +import Allergy from 'model/Allergy' +import Diagnosis from 'model/Diagnosis' +import Patient from 'model/Patient' +import RelatedPerson from 'model/RelatedPerson' import patient, { fetchPatientStart, fetchPatientSuccess, @@ -23,13 +30,9 @@ import patient, { addAllergyError, addDiagnosisError, addRelatedPersonError, -} from '../../patients/patient-slice' -import Patient from '../../model/Patient' -import PatientRepository from '../../clients/db/PatientRepository' -import { RootState } from '../../store' -import RelatedPerson from '../../model/RelatedPerson' -import Diagnosis from '../../model/Diagnosis' -import Allergy from '../../model/Allergy' +} from 'patients/patient-slice' +import { RootState } from 'store' +import * as uuid from 'util/uuid' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/patients-slice.test.ts b/src/__tests__/patients/patients-slice.test.ts index b0f32778a5..6908db5b5d 100644 --- a/src/__tests__/patients/patients-slice.test.ts +++ b/src/__tests__/patients/patients-slice.test.ts @@ -1,13 +1,16 @@ +// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' + import { AnyAction } from 'redux' import { mocked } from 'ts-jest/utils' + +import PatientRepository from 'clients/db/PatientRepository' +import Patient from 'model/Patient' import patients, { fetchPatientsStart, fetchPatientsSuccess, searchPatients, -} from '../../patients/patients-slice' -import Patient from '../../model/Patient' -import PatientRepository from '../../clients/db/PatientRepository' +} from 'patients/patients-slice' describe('patients slice', () => { beforeEach(() => { diff --git a/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx b/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx index 4ef438bd50..8f380c78f8 100644 --- a/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx +++ b/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx @@ -1,16 +1,19 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { ReactWrapper, mount } from 'enzyme' + import { Modal, Alert, Typeahead } from '@hospitalrun/components' import { act } from '@testing-library/react' +import { ReactWrapper, mount } from 'enzyme' +import React from 'react' import { Provider } from 'react-redux' -import thunk from 'redux-thunk' import configureMockStore, { MockStore } from 'redux-mock-store' +import thunk from 'redux-thunk' + +import PatientRepository from 'clients/db/PatientRepository' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' import Patient from 'model/Patient' -import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' -import AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal' -import * as patientSlice from '../../../patients/patient-slice' -import PatientRepository from '../../../clients/db/PatientRepository' +import * as patientSlice from 'patients/patient-slice' +import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/related-persons/RelatedPersons.test.tsx b/src/__tests__/patients/related-persons/RelatedPersons.test.tsx index 49da165c9c..781c108e55 100644 --- a/src/__tests__/patients/related-persons/RelatedPersons.test.tsx +++ b/src/__tests__/patients/related-persons/RelatedPersons.test.tsx @@ -1,20 +1,23 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { Router } from 'react-router' -import { createMemoryHistory } from 'history' -import { mount } from 'enzyme' -import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab' + import * as components from '@hospitalrun/components' -import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' import { act } from '@testing-library/react' -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' +import { Provider } from 'react-redux' +import { Router } from 'react-router' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' + +import PatientRepository from 'clients/db/PatientRepository' +import Patient from 'model/Patient' import Permissions from 'model/Permissions' import RelatedPerson from 'model/RelatedPerson' -import * as patientSlice from '../../../patients/patient-slice' +import * as patientSlice from 'patients/patient-slice' +import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' +import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/util/patient-name-util.test.ts b/src/__tests__/patients/util/patient-name-util.test.ts index bc65a1289c..acc7ae6037 100644 --- a/src/__tests__/patients/util/patient-name-util.test.ts +++ b/src/__tests__/patients/util/patient-name-util.test.ts @@ -1,5 +1,5 @@ -import { getPatientFullName, getPatientName } from 'patients/util/patient-name-util' import Patient from 'model/Patient' +import { getPatientFullName, getPatientName } from 'patients/util/patient-name-util' describe('patient name util', () => { describe('getPatientName', () => { diff --git a/src/__tests__/patients/view/ViewPatient.test.tsx b/src/__tests__/patients/view/ViewPatient.test.tsx index 3080e73384..e1b33902a2 100644 --- a/src/__tests__/patients/view/ViewPatient.test.tsx +++ b/src/__tests__/patients/view/ViewPatient.test.tsx @@ -1,28 +1,31 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { Provider } from 'react-redux' + +import { TabsHeader, Tab } from '@hospitalrun/components' import { mount } from 'enzyme' -import { mocked } from 'ts-jest/utils' +import { createMemoryHistory } from 'history' +import React from 'react' import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' import { Route, Router } from 'react-router-dom' -import { TabsHeader, Tab } from '@hospitalrun/components' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import GeneralInformation from 'patients/GeneralInformation' -import { createMemoryHistory } from 'history' -import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab' +import { mocked } from 'ts-jest/utils' + +import LabRepository from 'clients/db/LabRepository' +import PatientRepository from 'clients/db/PatientRepository' +import Patient from 'model/Patient' +import Permissions from 'model/Permissions' import * as ButtonBarProvider from 'page-header/ButtonBarProvider' +import * as titleUtil from 'page-header/useTitle' import Allergies from 'patients/allergies/Allergies' import Diagnoses from 'patients/diagnoses/Diagnoses' +import GeneralInformation from 'patients/GeneralInformation' +import LabsTab from 'patients/labs/LabsTab' import NotesTab from 'patients/notes/NoteTab' -import Patient from '../../../model/Patient' -import PatientRepository from '../../../clients/db/PatientRepository' -import * as titleUtil from '../../../page-header/useTitle' -import ViewPatient from '../../../patients/view/ViewPatient' -import * as patientSlice from '../../../patients/patient-slice' -import Permissions from '../../../model/Permissions' -import LabsTab from '../../../patients/labs/LabsTab' -import LabRepository from '../../../clients/db/LabRepository' +import * as patientSlice from 'patients/patient-slice' +import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab' +import ViewPatient from 'patients/view/ViewPatient' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx b/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx index 27828f2ce3..379ad34e07 100644 --- a/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx +++ b/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx @@ -1,13 +1,16 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { mount, ReactWrapper } from 'enzyme' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import Appointment from 'model/Appointment' -import { roundToNearestMinutes, addMinutes } from 'date-fns' + import { Typeahead, Alert } from '@hospitalrun/components' +import { act } from '@testing-library/react' +import { roundToNearestMinutes, addMinutes } from 'date-fns' +import { mount, ReactWrapper } from 'enzyme' +import React from 'react' + import PatientRepository from 'clients/db/PatientRepository' +import Appointment from 'model/Appointment' import Patient from 'model/Patient' -import { act } from '@testing-library/react' +import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' describe('AppointmentDetailForm', () => { describe('Error handling', () => { diff --git a/src/__tests__/scheduling/appointments/Appointments.test.tsx b/src/__tests__/scheduling/appointments/Appointments.test.tsx index c6acd3459a..38130edda7 100644 --- a/src/__tests__/scheduling/appointments/Appointments.test.tsx +++ b/src/__tests__/scheduling/appointments/Appointments.test.tsx @@ -1,22 +1,25 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' + +import { mount } from 'enzyme' import React from 'react' +import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' import { MemoryRouter } from 'react-router' import configureMockStore from 'redux-mock-store' -import { mount } from 'enzyme' import thunk from 'redux-thunk' -import { act } from 'react-dom/test-utils' -import NewAppointment from 'scheduling/appointments/new/NewAppointment' + +import { addBreadcrumbs } from 'breadcrumbs/breadcrumbs-slice' +import AppointmentRepository from 'clients/db/AppointmentRepository' +import PatientRepository from 'clients/db/PatientRepository' +import Dashboard from 'dashboard/Dashboard' +import HospitalRun from 'HospitalRun' +import Appointment from 'model/Appointment' +import Patient from 'model/Patient' +import Permissions from 'model/Permissions' import EditAppointment from 'scheduling/appointments/edit/EditAppointment' +import NewAppointment from 'scheduling/appointments/new/NewAppointment' import ViewAppointments from 'scheduling/appointments/ViewAppointments' -import Permissions from '../../../model/Permissions' -import HospitalRun from '../../../HospitalRun' -import { addBreadcrumbs } from '../../../breadcrumbs/breadcrumbs-slice' -import Dashboard from '../../../dashboard/Dashboard' -import PatientRepository from '../../../clients/db/PatientRepository' -import AppointmentRepository from '../../../clients/db/AppointmentRepository' -import Patient from '../../../model/Patient' -import Appointment from '../../../model/Appointment' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx b/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx index 2f5db67cf3..412de4950e 100644 --- a/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx +++ b/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx @@ -1,20 +1,23 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' -import React from 'react' + +import { Calendar } from '@hospitalrun/components' +import { act } from '@testing-library/react' import { mount } from 'enzyme' -import { MemoryRouter } from 'react-router-dom' +import React from 'react' import { Provider } from 'react-redux' -import ViewAppointments from 'scheduling/appointments/ViewAppointments' +import { MemoryRouter } from 'react-router-dom' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Calendar } from '@hospitalrun/components' -import { act } from '@testing-library/react' -import PatientRepository from 'clients/db/PatientRepository' import { mocked } from 'ts-jest/utils' -import Patient from 'model/Patient' -import * as ButtonBarProvider from 'page-header/ButtonBarProvider' + import AppointmentRepository from 'clients/db/AppointmentRepository' +import PatientRepository from 'clients/db/PatientRepository' import Appointment from 'model/Appointment' -import * as titleUtil from '../../../page-header/useTitle' +import Patient from 'model/Patient' +import * as ButtonBarProvider from 'page-header/ButtonBarProvider' +import * as titleUtil from 'page-header/useTitle' +import ViewAppointments from 'scheduling/appointments/ViewAppointments' describe('ViewAppointments', () => { const expectedAppointments = [ diff --git a/src/__tests__/scheduling/appointments/appointment-slice.test.ts b/src/__tests__/scheduling/appointments/appointment-slice.test.ts index 50c8ecedbd..ea1714dcf7 100644 --- a/src/__tests__/scheduling/appointments/appointment-slice.test.ts +++ b/src/__tests__/scheduling/appointments/appointment-slice.test.ts @@ -1,12 +1,14 @@ +// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' + +import { subDays } from 'date-fns' import { AnyAction } from 'redux' -import Appointment from 'model/Appointment' -import AppointmentRepository from 'clients/db/AppointmentRepository' import { mocked } from 'ts-jest/utils' + +import AppointmentRepository from 'clients/db/AppointmentRepository' import PatientRepository from 'clients/db/PatientRepository' +import Appointment from 'model/Appointment' import Patient from 'model/Patient' -import { subDays } from 'date-fns' - import appointment, { fetchAppointmentStart, fetchAppointmentSuccess, @@ -22,7 +24,7 @@ import appointment, { deleteAppointment, deleteAppointmentStart, deleteAppointmentSuccess, -} from '../../../scheduling/appointments/appointment-slice' +} from 'scheduling/appointments/appointment-slice' describe('appointment slice', () => { describe('appointment reducer', () => { diff --git a/src/__tests__/scheduling/appointments/appointments-slice.test.ts b/src/__tests__/scheduling/appointments/appointments-slice.test.ts index bb40a08644..acb0ac62bf 100644 --- a/src/__tests__/scheduling/appointments/appointments-slice.test.ts +++ b/src/__tests__/scheduling/appointments/appointments-slice.test.ts @@ -1,13 +1,13 @@ import { AnyAction } from 'redux' import { mocked } from 'ts-jest/utils' -import Appointment from 'model/Appointment' -import AppointmentRepository from 'clients/db/AppointmentRepository' +import AppointmentRepository from 'clients/db/AppointmentRepository' +import Appointment from 'model/Appointment' import appointments, { fetchAppointmentsStart, fetchAppointmentsSuccess, fetchAppointments, -} from '../../../scheduling/appointments/appointments-slice' +} from 'scheduling/appointments/appointments-slice' describe('appointments slice', () => { describe('appointments reducer', () => { diff --git a/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx b/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx index 0a4cdca935..0db0f564e3 100644 --- a/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx +++ b/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx @@ -1,23 +1,26 @@ +// eslint-disable-next-line no-restricted-imports import '../../../../__mocks__/matchMediaMock' -import React from 'react' + +import { Button } from '@hospitalrun/components' +import { roundToNearestMinutes, addMinutes } from 'date-fns' import { mount } from 'enzyme' -import { Router, Route } from 'react-router-dom' -import { Provider } from 'react-redux' -import { mocked } from 'ts-jest/utils' import { createMemoryHistory } from 'history' +import React from 'react' import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router, Route } from 'react-router-dom' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import { roundToNearestMinutes, addMinutes } from 'date-fns' -import { Button } from '@hospitalrun/components' -import EditAppointment from '../../../../scheduling/appointments/edit/EditAppointment' -import AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm' -import Appointment from '../../../../model/Appointment' -import Patient from '../../../../model/Patient' -import * as titleUtil from '../../../../page-header/useTitle' -import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice' -import AppointmentRepository from '../../../../clients/db/AppointmentRepository' -import PatientRepository from '../../../../clients/db/PatientRepository' +import { mocked } from 'ts-jest/utils' + +import AppointmentRepository from 'clients/db/AppointmentRepository' +import PatientRepository from 'clients/db/PatientRepository' +import Appointment from 'model/Appointment' +import Patient from 'model/Patient' +import * as titleUtil from 'page-header/useTitle' +import * as appointmentSlice from 'scheduling/appointments/appointment-slice' +import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' +import EditAppointment from 'scheduling/appointments/edit/EditAppointment' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx b/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx index 492add87cc..b4ae314b93 100644 --- a/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx +++ b/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx @@ -1,24 +1,27 @@ +// eslint-disable-next-line no-restricted-imports import '../../../../__mocks__/matchMediaMock' -import React from 'react' -import NewAppointment from 'scheduling/appointments/new/NewAppointment' -import { Router, Route } from 'react-router' -import { Provider } from 'react-redux' -import { mount } from 'enzyme' + +import * as components from '@hospitalrun/components' +import { act } from '@testing-library/react' import { roundToNearestMinutes, addMinutes } from 'date-fns' +import { mount } from 'enzyme' import { createMemoryHistory, MemoryHistory } from 'history' -import { act } from '@testing-library/react' -import AppointmentRepository from 'clients/db/AppointmentRepository' -import { mocked } from 'ts-jest/utils' +import React from 'react' +import { Provider } from 'react-redux' +import { Router, Route } from 'react-router' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' +import { mocked } from 'ts-jest/utils' + +import AppointmentRepository from 'clients/db/AppointmentRepository' +import LabRepository from 'clients/db/LabRepository' import Appointment from 'model/Appointment' +import Lab from 'model/Lab' import Patient from 'model/Patient' +import * as titleUtil from 'page-header/useTitle' +import * as appointmentSlice from 'scheduling/appointments/appointment-slice' import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import * as components from '@hospitalrun/components' -import * as titleUtil from '../../../../page-header/useTitle' -import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice' -import LabRepository from '../../../../clients/db/LabRepository' -import Lab from '../../../../model/Lab' +import NewAppointment from 'scheduling/appointments/new/NewAppointment' const mockStore = configureMockStore([thunk]) const mockedComponents = mocked(components, true) diff --git a/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts b/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts index 292e71cd9d..8b443054a3 100644 --- a/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts +++ b/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts @@ -1,5 +1,5 @@ import Appointment from 'model/Appointment' -import { getAppointmentLabel } from '../../../../scheduling/appointments/util/scheduling-appointment.util' +import { getAppointmentLabel } from 'scheduling/appointments/util/scheduling-appointment.util' describe('scheduling appointment util', () => { describe('getAppointmentLabel', () => { diff --git a/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx b/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx index e090672c51..b9ddafdb7d 100644 --- a/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx +++ b/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx @@ -1,24 +1,27 @@ +// eslint-disable-next-line no-restricted-imports import '../../../../__mocks__/matchMediaMock' -import React from 'react' + +import * as components from '@hospitalrun/components' import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' +import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' +import { Router, Route } from 'react-router' 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 { createMemoryHistory } from 'history' -import AppointmentRepository from 'clients/db/AppointmentRepository' import { mocked } from 'ts-jest/utils' -import { act } from 'react-dom/test-utils' -import * as components from '@hospitalrun/components' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' + +import AppointmentRepository from 'clients/db/AppointmentRepository' import PatientRepository from 'clients/db/PatientRepository' +import Appointment from 'model/Appointment' import Patient from 'model/Patient' -import * as ButtonBarProvider from 'page-header/ButtonBarProvider' import Permissions from 'model/Permissions' -import * as titleUtil from '../../../../page-header/useTitle' -import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice' +import * as ButtonBarProvider from 'page-header/ButtonBarProvider' +import * as titleUtil from 'page-header/useTitle' +import * as appointmentSlice from 'scheduling/appointments/appointment-slice' +import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' +import ViewAppointment from 'scheduling/appointments/view/ViewAppointment' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/user/user-slice.test.ts b/src/__tests__/user/user-slice.test.ts index 71ce829406..1507489448 100644 --- a/src/__tests__/user/user-slice.test.ts +++ b/src/__tests__/user/user-slice.test.ts @@ -1,5 +1,5 @@ -import user, { fetchPermissions } from '../../user/user-slice' -import Permissions from '../../model/Permissions' +import Permissions from 'model/Permissions' +import user, { fetchPermissions } from 'user/user-slice' describe('user slice', () => { it('should handle the FETCH_PERMISSIONS action', () => { diff --git a/src/__tests__/utils/generateCode.test.ts b/src/__tests__/utils/generateCode.test.ts index 22a44dd2a5..272788c78d 100644 --- a/src/__tests__/utils/generateCode.test.ts +++ b/src/__tests__/utils/generateCode.test.ts @@ -1,4 +1,4 @@ -import generateCode from '../../util/generateCode' +import generateCode from 'util/generateCode' it('should generate a code with prefix A-', () => { const generatedCode = generateCode('A') diff --git a/src/breadcrumbs/Breadcrumbs.tsx b/src/breadcrumbs/Breadcrumbs.tsx index 263f8e9476..7a4d99d67e 100644 --- a/src/breadcrumbs/Breadcrumbs.tsx +++ b/src/breadcrumbs/Breadcrumbs.tsx @@ -1,9 +1,10 @@ +import { Breadcrumb, BreadcrumbItem } from '@hospitalrun/components' import React from 'react' -import { useHistory } from 'react-router' -import { useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' -import { Breadcrumb, BreadcrumbItem } from '@hospitalrun/components' -import { RootState } from '../store' +import { useSelector } from 'react-redux' +import { useHistory } from 'react-router' + +import { RootState } from 'store' const Breadcrumbs = () => { const history = useHistory() diff --git a/src/breadcrumbs/breadcrumbs-slice.ts b/src/breadcrumbs/breadcrumbs-slice.ts index 86a689e0d8..ed800b002c 100644 --- a/src/breadcrumbs/breadcrumbs-slice.ts +++ b/src/breadcrumbs/breadcrumbs-slice.ts @@ -1,4 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' + import Breadcrumb from 'model/Breadcrumb' interface BreadcrumbsState { diff --git a/src/breadcrumbs/useAddBreadcrumbs.ts b/src/breadcrumbs/useAddBreadcrumbs.ts index 76d68e80ce..182deafe60 100644 --- a/src/breadcrumbs/useAddBreadcrumbs.ts +++ b/src/breadcrumbs/useAddBreadcrumbs.ts @@ -1,7 +1,8 @@ import { useEffect } from 'react' import { useDispatch } from 'react-redux' + +import { addBreadcrumbs, removeBreadcrumbs } from 'breadcrumbs/breadcrumbs-slice' import Breadcrumb from 'model/Breadcrumb' -import { addBreadcrumbs, removeBreadcrumbs } from './breadcrumbs-slice' export default function useAddBreadcrumbs(breadcrumbs: Breadcrumb[], withDashboard = false): void { const dispatch = useDispatch() diff --git a/src/clients/db/AppointmentRepository.ts b/src/clients/db/AppointmentRepository.ts index 42ba8dce42..4fbc02c328 100644 --- a/src/clients/db/AppointmentRepository.ts +++ b/src/clients/db/AppointmentRepository.ts @@ -1,9 +1,10 @@ import escapeStringRegexp from 'escape-string-regexp' -import Appointment from 'model/Appointment' + +import Repository from 'clients/db/Repository' import { appointments } from 'config/pouchdb' -import Repository from './Repository' +import Appointment from 'model/Appointment' -export class AppointmentRepository extends Repository { +class AppointmentRepository extends Repository { constructor() { super(appointments) } diff --git a/src/clients/db/LabRepository.ts b/src/clients/db/LabRepository.ts index 3581c96e12..c6c1565b19 100644 --- a/src/clients/db/LabRepository.ts +++ b/src/clients/db/LabRepository.ts @@ -1,15 +1,15 @@ +import Repository from 'clients/db/Repository' +import SortRequest from 'clients/db/SortRequest' +import { labs } from 'config/pouchdb' import Lab from 'model/Lab' -import generateCode from '../../util/generateCode' -import Repository from './Repository' -import { labs } from '../../config/pouchdb' -import SortRequest from './SortRequest' +import generateCode from 'util/generateCode' interface SearchContainer { text: string status: 'requested' | 'completed' | 'canceled' | 'all' defaultSortRequest: SortRequest } -export class LabRepository extends Repository { +class LabRepository extends Repository { constructor() { super(labs) } diff --git a/src/clients/db/PatientRepository.ts b/src/clients/db/PatientRepository.ts index 172e380a7f..a72db46df0 100644 --- a/src/clients/db/PatientRepository.ts +++ b/src/clients/db/PatientRepository.ts @@ -1,10 +1,11 @@ import escapeStringRegexp from 'escape-string-regexp' -import Patient from '../../model/Patient' -import generateCode from '../../util/generateCode' -import Repository from './Repository' -import { patients } from '../../config/pouchdb' -export class PatientRepository extends Repository { +import Repository from 'clients/db/Repository' +import { patients } from 'config/pouchdb' +import Patient from 'model/Patient' +import generateCode from 'util/generateCode' + +class PatientRepository extends Repository { constructor() { super(patients) } diff --git a/src/clients/db/Repository.ts b/src/clients/db/Repository.ts index df56a1d3a9..76a07d1f0e 100644 --- a/src/clients/db/Repository.ts +++ b/src/clients/db/Repository.ts @@ -1,7 +1,8 @@ /* eslint "@typescript-eslint/camelcase": "off" */ import { v4 as uuidv4 } from 'uuid' -import AbstractDBModel from '../../model/AbstractDBModel' -import SortRequest, { Unsorted } from './SortRequest' + +import SortRequest, { Unsorted } from 'clients/db/SortRequest' +import AbstractDBModel from 'model/AbstractDBModel' function mapDocument(document: any): any { const { _id, _rev, ...values } = document diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index fe90ff8df7..04bbd8afcd 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -1,7 +1,7 @@ -import React from 'react' -import { useHistory } from 'react-router' import { Navbar as HospitalRunNavbar } from '@hospitalrun/components' +import React from 'react' import { useTranslation } from 'react-i18next' +import { useHistory } from 'react-router' const Navbar = () => { const { t } = useTranslation() diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index 06134b07f8..c723a2ce7c 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -1,10 +1,11 @@ -import React, { useState, CSSProperties } from 'react' import { List, ListItem, Icon } from '@hospitalrun/components' +import React, { useState, CSSProperties } from 'react' import { useTranslation } from 'react-i18next' -import { useLocation, useHistory } from 'react-router' import { useSelector, useDispatch } from 'react-redux' -import { RootState } from '../store' -import { updateSidebar } from './component-slice' +import { useLocation, useHistory } from 'react-router' + +import { updateSidebar } from 'components/component-slice' +import { RootState } from 'store' const Sidebar = () => { const dispatch = useDispatch() diff --git a/src/components/component-slice.ts b/src/components/component-slice.ts index 62a6aeeefe..4171b32bc1 100644 --- a/src/components/component-slice.ts +++ b/src/components/component-slice.ts @@ -1,5 +1,6 @@ import { createSlice } from '@reduxjs/toolkit' -import { AppThunk } from '../store' + +import { AppThunk } from 'store' interface ComponentState { sidebarCollapsed: boolean diff --git a/src/components/input/DatePickerWithLabelFormGroup.tsx b/src/components/input/DatePickerWithLabelFormGroup.tsx index ea9b923fc0..a2b15d6b69 100644 --- a/src/components/input/DatePickerWithLabelFormGroup.tsx +++ b/src/components/input/DatePickerWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import React from 'react' import { Label, DateTimePicker } from '@hospitalrun/components' +import React from 'react' interface Props { name: string diff --git a/src/components/input/DateTimePickerWithLabelFormGroup.tsx b/src/components/input/DateTimePickerWithLabelFormGroup.tsx index f31a186692..5f2e9caefa 100644 --- a/src/components/input/DateTimePickerWithLabelFormGroup.tsx +++ b/src/components/input/DateTimePickerWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import React from 'react' import { Label, DateTimePicker } from '@hospitalrun/components' +import React from 'react' interface Props { name: string diff --git a/src/components/input/SelectWithLableFormGroup.tsx b/src/components/input/SelectWithLableFormGroup.tsx index e7451d1e43..be9874aca1 100644 --- a/src/components/input/SelectWithLableFormGroup.tsx +++ b/src/components/input/SelectWithLableFormGroup.tsx @@ -1,5 +1,5 @@ -import React from 'react' import { Label, Select } from '@hospitalrun/components' +import React from 'react' interface Option { label: string diff --git a/src/components/input/TextFieldWithLabelFormGroup.tsx b/src/components/input/TextFieldWithLabelFormGroup.tsx index 3848ddf02a..5fcd4b4863 100644 --- a/src/components/input/TextFieldWithLabelFormGroup.tsx +++ b/src/components/input/TextFieldWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import React from 'react' import { TextField, Label } from '@hospitalrun/components' +import React from 'react' interface Props { value: string diff --git a/src/components/input/TextInputWithLabelFormGroup.tsx b/src/components/input/TextInputWithLabelFormGroup.tsx index 2e68c196d6..0cb7efb972 100644 --- a/src/components/input/TextInputWithLabelFormGroup.tsx +++ b/src/components/input/TextInputWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import React from 'react' import { TextInput, Label } from '@hospitalrun/components' +import React from 'react' interface Props { value: string diff --git a/src/dashboard/Dashboard.tsx b/src/dashboard/Dashboard.tsx index bf295875dc..9ff2257824 100644 --- a/src/dashboard/Dashboard.tsx +++ b/src/dashboard/Dashboard.tsx @@ -1,6 +1,7 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import useTitle from '../page-header/useTitle' + +import useTitle from 'page-header/useTitle' const Dashboard: React.FC = () => { const { t } = useTranslation() diff --git a/src/i18n.ts b/src/i18n.ts index b237cb7da6..946f858d9f 100644 --- a/src/i18n.ts +++ b/src/i18n.ts @@ -2,17 +2,17 @@ import i18n from 'i18next' import LanguageDetector from 'i18next-browser-languagedetector' import { initReactI18next } from 'react-i18next' -import translationAR from './locales/ar/translations' -import translationDE from './locales/de/translations' -import translationEnUs from './locales/enUs/translations' -import translationES from './locales/es/translations' -import translationFR from './locales/fr/translations' -import translationIN from './locales/in/translations' -import translationJA from './locales/ja/translations' -import translationPtBR from './locales/ptBr/translations' -import translationRU from './locales/ru/translations' -import translationZR from './locales/zr/translations' -import translationIT from './locales/it/translations' +import translationAR from 'locales/ar/translations' +import translationDE from 'locales/de/translations' +import translationEnUs from 'locales/enUs/translations' +import translationES from 'locales/es/translations' +import translationFR from 'locales/fr/translations' +import translationIN from 'locales/in/translations' +import translationIT from 'locales/it/translations' +import translationJA from 'locales/ja/translations' +import translationPtBR from 'locales/ptBr/translations' +import translationRU from 'locales/ru/translations' +import translationZR from 'locales/zr/translations' const resources = { it: { diff --git a/src/index.tsx b/src/index.tsx index 71b2ba1135..ed4cd67c6a 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,10 +1,11 @@ import React from 'react' import ReactDOM from 'react-dom' + import '@hospitalrun/components/scss/main.scss' -import './index.css' -import App from './App' -import * as serviceWorker from './serviceWorker' -import './i18n' +import 'index.css' +import App from 'App' +import * as serviceWorker from 'serviceWorker' +import 'i18n' ReactDOM.render(, document.getElementById('root')) diff --git a/src/labs/Labs.tsx b/src/labs/Labs.tsx index a610af4052..7f93d75bc2 100644 --- a/src/labs/Labs.tsx +++ b/src/labs/Labs.tsx @@ -1,13 +1,14 @@ import React from 'react' -import PrivateRoute from 'components/PrivateRoute' +import { useSelector } from 'react-redux' import { Switch } from 'react-router' + import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import { useSelector } from 'react-redux' +import PrivateRoute from 'components/PrivateRoute' +import NewLabRequest from 'labs/requests/NewLabRequest' +import ViewLab from 'labs/ViewLab' +import LabRequests from 'labs/ViewLabs' import Permissions from 'model/Permissions' -import LabRequests from './ViewLabs' -import NewLabRequest from './requests/NewLabRequest' -import ViewLab from './ViewLab' -import { RootState } from '../store' +import { RootState } from 'store' const Labs = () => { const { permissions } = useSelector((state: RootState) => state.user) diff --git a/src/labs/ViewLab.tsx b/src/labs/ViewLab.tsx index 6f58f2c9e6..7b97330a51 100644 --- a/src/labs/ViewLab.tsx +++ b/src/labs/ViewLab.tsx @@ -1,17 +1,18 @@ +import { Row, Column, Badge, Button, Alert } from '@hospitalrun/components' +import format from 'date-fns/format' import React, { useEffect, useState } from 'react' +import { useTranslation } from 'react-i18next' +import { useSelector, useDispatch } from 'react-redux' import { useParams, useHistory } from 'react-router' -import format from 'date-fns/format' + +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import { cancelLab, completeLab, updateLab, fetchLab } from 'labs/lab-slice' import Lab from 'model/Lab' import Patient from 'model/Patient' -import useTitle from 'page-header/useTitle' -import { useTranslation } from 'react-i18next' -import { Row, Column, Badge, Button, Alert } from '@hospitalrun/components' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import { useSelector, useDispatch } from 'react-redux' import Permissions from 'model/Permissions' -import { RootState } from '../store' -import { cancelLab, completeLab, updateLab, fetchLab } from './lab-slice' +import useTitle from 'page-header/useTitle' +import { RootState } from 'store' const getTitle = (patient: Patient | undefined, lab: Lab | undefined) => patient && lab ? `${lab.type} for ${patient.fullName}(${lab.code})` : '' diff --git a/src/labs/ViewLabs.tsx b/src/labs/ViewLabs.tsx index 012b26a836..751c5c9772 100644 --- a/src/labs/ViewLabs.tsx +++ b/src/labs/ViewLabs.tsx @@ -1,18 +1,19 @@ +import { Spinner, Button } from '@hospitalrun/components' +import format from 'date-fns/format' import React, { useState, useEffect, useCallback } from 'react' -import { useSelector, useDispatch } from 'react-redux' -import useTitle from 'page-header/useTitle' import { useTranslation } from 'react-i18next' -import format from 'date-fns/format' -import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import { Spinner, Button } from '@hospitalrun/components' +import { useSelector, useDispatch } from 'react-redux' import { useHistory } from 'react-router' -import Lab from 'model/Lab' -import Permissions from 'model/Permissions' + import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import { RootState } from '../store' -import { searchLabs } from './labs-slice' -import useDebounce from '../hooks/debounce' +import useDebounce from 'hooks/debounce' +import { searchLabs } from 'labs/labs-slice' +import Lab from 'model/Lab' +import Permissions from 'model/Permissions' +import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' +import useTitle from 'page-header/useTitle' +import { RootState } from 'store' type filter = 'requested' | 'completed' | 'canceled' | 'all' diff --git a/src/labs/lab-slice.ts b/src/labs/lab-slice.ts index 224ffbd722..5fc15f7a21 100644 --- a/src/labs/lab-slice.ts +++ b/src/labs/lab-slice.ts @@ -1,9 +1,10 @@ -import Lab from 'model/Lab' -import Patient from 'model/Patient' import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { AppThunk } from 'store' + import LabRepository from 'clients/db/LabRepository' import PatientRepository from 'clients/db/PatientRepository' +import Lab from 'model/Lab' +import Patient from 'model/Patient' +import { AppThunk } from 'store' interface Error { result?: string diff --git a/src/labs/labs-slice.ts b/src/labs/labs-slice.ts index db956992da..0a453976f9 100644 --- a/src/labs/labs-slice.ts +++ b/src/labs/labs-slice.ts @@ -1,8 +1,9 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import Lab from '../model/Lab' -import LabRepository from '../clients/db/LabRepository' -import SortRequest from '../clients/db/SortRequest' -import { AppThunk } from '../store' + +import LabRepository from 'clients/db/LabRepository' +import SortRequest from 'clients/db/SortRequest' +import Lab from 'model/Lab' +import { AppThunk } from 'store' interface LabsState { isLoading: boolean diff --git a/src/labs/requests/NewLabRequest.tsx b/src/labs/requests/NewLabRequest.tsx index fb4035686e..8a5392c078 100644 --- a/src/labs/requests/NewLabRequest.tsx +++ b/src/labs/requests/NewLabRequest.tsx @@ -1,16 +1,17 @@ +import { Typeahead, Label, Button, Alert } from '@hospitalrun/components' import React, { useState } from 'react' -import useTitle from 'page-header/useTitle' import { useTranslation } from 'react-i18next' -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 { useDispatch, useSelector } from 'react-redux' import { useHistory } from 'react-router' -import Lab from 'model/Lab' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' + import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import { useDispatch, useSelector } from 'react-redux' +import PatientRepository from 'clients/db/PatientRepository' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' import { requestLab } from 'labs/lab-slice' +import Lab from 'model/Lab' +import Patient from 'model/Patient' +import useTitle from 'page-header/useTitle' import { RootState } from 'store' const NewLabRequest = () => { diff --git a/src/locales/ar/translations/index.ts b/src/locales/ar/translations/index.ts index e948f4340c..1b22bc9fc8 100644 --- a/src/locales/ar/translations/index.ts +++ b/src/locales/ar/translations/index.ts @@ -1,7 +1,7 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' +import actions from 'locales/ar/translations/actions' +import dashboard from 'locales/ar/translations/dashboard' +import patient from 'locales/ar/translations/patient' +import patients from 'locales/ar/translations/patients' export default { ...actions, diff --git a/src/locales/de/translations/index.ts b/src/locales/de/translations/index.ts index e948f4340c..f4a90cbd54 100644 --- a/src/locales/de/translations/index.ts +++ b/src/locales/de/translations/index.ts @@ -1,7 +1,7 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' +import actions from 'locales/de/translations/actions' +import dashboard from 'locales/de/translations/dashboard' +import patient from 'locales/de/translations/patient' +import patients from 'locales/de/translations/patients' export default { ...actions, diff --git a/src/locales/enUs/translations/index.ts b/src/locales/enUs/translations/index.ts index d6bf2a1db2..4d17464895 100644 --- a/src/locales/enUs/translations/index.ts +++ b/src/locales/enUs/translations/index.ts @@ -1,11 +1,11 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' -import scheduling from './scheduling' -import states from './states' -import sex from './sex' -import labs from './labs' +import actions from 'locales/enUs/translations/actions' +import dashboard from 'locales/enUs/translations/dashboard' +import labs from 'locales/enUs/translations/labs' +import patient from 'locales/enUs/translations/patient' +import patients from 'locales/enUs/translations/patients' +import scheduling from 'locales/enUs/translations/scheduling' +import sex from 'locales/enUs/translations/sex' +import states from 'locales/enUs/translations/states' export default { ...actions, diff --git a/src/locales/es/translations/index.ts b/src/locales/es/translations/index.ts index e948f4340c..09761d8b04 100644 --- a/src/locales/es/translations/index.ts +++ b/src/locales/es/translations/index.ts @@ -1,7 +1,7 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' +import actions from 'locales/es/translations/actions' +import dashboard from 'locales/es/translations/dashboard' +import patient from 'locales/es/translations/patient' +import patients from 'locales/es/translations/patients' export default { ...actions, diff --git a/src/locales/fr/translations/index.ts b/src/locales/fr/translations/index.ts index d6bf2a1db2..3066a23d72 100644 --- a/src/locales/fr/translations/index.ts +++ b/src/locales/fr/translations/index.ts @@ -1,11 +1,11 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' -import scheduling from './scheduling' -import states from './states' -import sex from './sex' -import labs from './labs' +import actions from 'locales/fr/translations/actions' +import dashboard from 'locales/fr/translations/dashboard' +import labs from 'locales/fr/translations/labs' +import patient from 'locales/fr/translations/patient' +import patients from 'locales/fr/translations/patients' +import scheduling from 'locales/fr/translations/scheduling' +import sex from 'locales/fr/translations/sex' +import states from 'locales/fr/translations/states' export default { ...actions, diff --git a/src/locales/in/translations/index.ts b/src/locales/in/translations/index.ts index e948f4340c..9419fb982d 100644 --- a/src/locales/in/translations/index.ts +++ b/src/locales/in/translations/index.ts @@ -1,7 +1,7 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' +import actions from 'locales/in/translations/actions' +import dashboard from 'locales/in/translations/dashboard' +import patient from 'locales/in/translations/patient' +import patients from 'locales/in/translations/patients' export default { ...actions, diff --git a/src/locales/it/translations/index.ts b/src/locales/it/translations/index.ts index d6bf2a1db2..14d1ad1f3b 100644 --- a/src/locales/it/translations/index.ts +++ b/src/locales/it/translations/index.ts @@ -1,11 +1,11 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' -import scheduling from './scheduling' -import states from './states' -import sex from './sex' -import labs from './labs' +import actions from 'locales/it/translations/actions' +import dashboard from 'locales/it/translations/dashboard' +import labs from 'locales/it/translations/labs' +import patient from 'locales/it/translations/patient' +import patients from 'locales/it/translations/patients' +import scheduling from 'locales/it/translations/scheduling' +import sex from 'locales/it/translations/sex' +import states from 'locales/it/translations/states' export default { ...actions, diff --git a/src/locales/ja/translations/index.ts b/src/locales/ja/translations/index.ts index e948f4340c..9d927e389f 100644 --- a/src/locales/ja/translations/index.ts +++ b/src/locales/ja/translations/index.ts @@ -1,7 +1,7 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' +import actions from 'locales/ja/translations/actions' +import dashboard from 'locales/ja/translations/dashboard' +import patient from 'locales/ja/translations/patient' +import patients from 'locales/ja/translations/patients' export default { ...actions, diff --git a/src/locales/ptBr/translations/index.ts b/src/locales/ptBr/translations/index.ts index d6bf2a1db2..786d30d39e 100644 --- a/src/locales/ptBr/translations/index.ts +++ b/src/locales/ptBr/translations/index.ts @@ -1,11 +1,11 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' -import scheduling from './scheduling' -import states from './states' -import sex from './sex' -import labs from './labs' +import actions from 'locales/ptBr/translations/actions' +import dashboard from 'locales/ptBr/translations/dashboard' +import labs from 'locales/ptBr/translations/labs' +import patient from 'locales/ptBr/translations/patient' +import patients from 'locales/ptBr/translations/patients' +import scheduling from 'locales/ptBr/translations/scheduling' +import sex from 'locales/ptBr/translations/sex' +import states from 'locales/ptBr/translations/states' export default { ...actions, diff --git a/src/locales/ru/translations/index.ts b/src/locales/ru/translations/index.ts index e948f4340c..a668cc46e5 100644 --- a/src/locales/ru/translations/index.ts +++ b/src/locales/ru/translations/index.ts @@ -1,7 +1,7 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' +import actions from 'locales/ru/translations/actions' +import dashboard from 'locales/ru/translations/dashboard' +import patient from 'locales/ru/translations/patient' +import patients from 'locales/ru/translations/patients' export default { ...actions, diff --git a/src/locales/zr/translations/index.ts b/src/locales/zr/translations/index.ts index e948f4340c..933b19a9e3 100644 --- a/src/locales/zr/translations/index.ts +++ b/src/locales/zr/translations/index.ts @@ -1,7 +1,7 @@ -import actions from './actions' -import dashboard from './dashboard' -import patient from './patient' -import patients from './patients' +import actions from 'locales/zr/translations/actions' +import dashboard from 'locales/zr/translations/dashboard' +import patient from 'locales/zr/translations/patient' +import patients from 'locales/zr/translations/patients' export default { ...actions, diff --git a/src/model/Appointment.ts b/src/model/Appointment.ts index a82dc4d590..0ddeb59068 100644 --- a/src/model/Appointment.ts +++ b/src/model/Appointment.ts @@ -1,4 +1,4 @@ -import AbstractDBModel from './AbstractDBModel' +import AbstractDBModel from 'model/AbstractDBModel' export default interface Appointment extends AbstractDBModel { startDateTime: string diff --git a/src/model/Lab.ts b/src/model/Lab.ts index 64b17ce431..ddd0cbe628 100644 --- a/src/model/Lab.ts +++ b/src/model/Lab.ts @@ -1,4 +1,4 @@ -import AbstractDBModel from './AbstractDBModel' +import AbstractDBModel from 'model/AbstractDBModel' export default interface Lab extends AbstractDBModel { code: string diff --git a/src/model/Patient.ts b/src/model/Patient.ts index 27fde51a46..c013da2eff 100644 --- a/src/model/Patient.ts +++ b/src/model/Patient.ts @@ -1,10 +1,10 @@ -import AbstractDBModel from './AbstractDBModel' -import Name from './Name' -import ContactInformation from './ContactInformation' -import RelatedPerson from './RelatedPerson' -import Allergy from './Allergy' -import Diagnosis from './Diagnosis' -import Note from './Note' +import AbstractDBModel from 'model/AbstractDBModel' +import Allergy from 'model/Allergy' +import ContactInformation from 'model/ContactInformation' +import Diagnosis from 'model/Diagnosis' +import Name from 'model/Name' +import Note from 'model/Note' +import RelatedPerson from 'model/RelatedPerson' export default interface Patient extends AbstractDBModel, Name, ContactInformation { sex: string diff --git a/src/page-header/ButtonToolBar.tsx b/src/page-header/ButtonToolBar.tsx index 72eec7b627..020d5591f7 100644 --- a/src/page-header/ButtonToolBar.tsx +++ b/src/page-header/ButtonToolBar.tsx @@ -1,5 +1,6 @@ import React from 'react' -import { useButtons } from './ButtonBarProvider' + +import { useButtons } from 'page-header/ButtonBarProvider' const ButtonToolBar = () => { const buttons = useButtons() diff --git a/src/page-header/title-slice.ts b/src/page-header/title-slice.ts index 09f548684a..bbff8fd035 100644 --- a/src/page-header/title-slice.ts +++ b/src/page-header/title-slice.ts @@ -1,5 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { AppThunk } from '../store' + +import { AppThunk } from 'store' interface TitleState { title: string diff --git a/src/page-header/useTitle.tsx b/src/page-header/useTitle.tsx index f8cd1b4a32..abbf38f272 100644 --- a/src/page-header/useTitle.tsx +++ b/src/page-header/useTitle.tsx @@ -1,6 +1,7 @@ import { useEffect } from 'react' import { useDispatch } from 'react-redux' -import { updateTitle } from './title-slice' + +import { updateTitle } from 'page-header/title-slice' export default function useTitle(title: string): void { const dispatch = useDispatch() diff --git a/src/patients/GeneralInformation.tsx b/src/patients/GeneralInformation.tsx index e945ea996d..be794cb488 100644 --- a/src/patients/GeneralInformation.tsx +++ b/src/patients/GeneralInformation.tsx @@ -1,13 +1,13 @@ -import React from 'react' import { Panel, Checkbox, Alert } from '@hospitalrun/components' -import { useTranslation } from 'react-i18next' import { startOfDay, subYears, differenceInYears } from 'date-fns' +import React from 'react' +import { useTranslation } from 'react-i18next' -import Patient from '../model/Patient' -import TextFieldWithLabelFormGroup from '../components/input/TextFieldWithLabelFormGroup' -import TextInputWithLabelFormGroup from '../components/input/TextInputWithLabelFormGroup' -import SelectWithLabelFormGroup from '../components/input/SelectWithLableFormGroup' -import DatePickerWithLabelFormGroup from '../components/input/DatePickerWithLabelFormGroup' +import DatePickerWithLabelFormGroup from 'components/input/DatePickerWithLabelFormGroup' +import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import Patient from 'model/Patient' interface Props { patient: Patient diff --git a/src/patients/Patients.tsx b/src/patients/Patients.tsx index d1670a1ce0..facdef64fc 100644 --- a/src/patients/Patients.tsx +++ b/src/patients/Patients.tsx @@ -1,13 +1,14 @@ import React from 'react' import { useSelector } from 'react-redux' import { Switch } from 'react-router' -import PrivateRoute from '../components/PrivateRoute' -import Permissions from '../model/Permissions' -import ViewPatients from './list/ViewPatients' -import NewPatient from './new/NewPatient' -import EditPatient from './edit/EditPatient' -import ViewPatient from './view/ViewPatient' -import { RootState } from '../store' + +import PrivateRoute from 'components/PrivateRoute' +import Permissions from 'model/Permissions' +import EditPatient from 'patients/edit/EditPatient' +import ViewPatients from 'patients/list/ViewPatients' +import NewPatient from 'patients/new/NewPatient' +import ViewPatient from 'patients/view/ViewPatient' +import { RootState } from 'store' const Patients = () => { const permissions = useSelector((state: RootState) => state.user.permissions) diff --git a/src/patients/allergies/Allergies.tsx b/src/patients/allergies/Allergies.tsx index 5ae17c3704..b771cae378 100644 --- a/src/patients/allergies/Allergies.tsx +++ b/src/patients/allergies/Allergies.tsx @@ -1,13 +1,14 @@ +import { Button, List, ListItem, Alert } from '@hospitalrun/components' import React, { useState } from 'react' +import { useTranslation } from 'react-i18next' +import { useSelector } from 'react-redux' + import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import Allergy from 'model/Allergy' import Patient from 'model/Patient' -import { Button, List, ListItem, Alert } from '@hospitalrun/components' -import { useSelector } from 'react-redux' -import { RootState } from 'store' import Permissions from 'model/Permissions' -import { useTranslation } from 'react-i18next' -import Allergy from 'model/Allergy' -import NewAllergyModal from './NewAllergyModal' +import NewAllergyModal from 'patients/allergies/NewAllergyModal' +import { RootState } from 'store' interface AllergiesProps { patient: Patient diff --git a/src/patients/allergies/NewAllergyModal.tsx b/src/patients/allergies/NewAllergyModal.tsx index d335f2fb92..e20f9d0ec8 100644 --- a/src/patients/allergies/NewAllergyModal.tsx +++ b/src/patients/allergies/NewAllergyModal.tsx @@ -1,11 +1,12 @@ -import React, { useState, useEffect } from 'react' import { Modal, Alert } from '@hospitalrun/components' +import React, { useState, useEffect } from 'react' import { useTranslation } from 'react-i18next' -import Allergy from 'model/Allergy' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' import { useDispatch, useSelector } from 'react-redux' -import { RootState } from '../../store' -import { addAllergy } from '../patient-slice' + +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import Allergy from 'model/Allergy' +import { addAllergy } from 'patients/patient-slice' +import { RootState } from 'store' interface NewAllergyModalProps { show: boolean diff --git a/src/patients/appointments/AppointmentsList.tsx b/src/patients/appointments/AppointmentsList.tsx index 4b964fdfba..63ddb273d6 100644 --- a/src/patients/appointments/AppointmentsList.tsx +++ b/src/patients/appointments/AppointmentsList.tsx @@ -1,11 +1,12 @@ +import { TextInput, Button, List, ListItem, Container, Row, Column } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' +import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' import { useHistory } from 'react-router' -import { useTranslation } from 'react-i18next' -import { TextInput, Button, List, ListItem, Container, Row, Column } from '@hospitalrun/components' -import { RootState } from '../../store' -import { fetchPatientAppointments } from '../../scheduling/appointments/appointments-slice' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' + +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import { fetchPatientAppointments } from 'scheduling/appointments/appointments-slice' +import { RootState } from 'store' interface Props { patientId: string diff --git a/src/patients/diagnoses/AddDiagnosisModal.tsx b/src/patients/diagnoses/AddDiagnosisModal.tsx index 7706c1b632..9a427aa171 100644 --- a/src/patients/diagnoses/AddDiagnosisModal.tsx +++ b/src/patients/diagnoses/AddDiagnosisModal.tsx @@ -1,12 +1,13 @@ -import React, { useState, useEffect } from 'react' import { Modal, Alert } from '@hospitalrun/components' +import React, { useState, useEffect } from 'react' import { useTranslation } from 'react-i18next' -import Diagnosis from 'model/Diagnosis' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import DatePickerWithLabelFormGroup from 'components/input/DatePickerWithLabelFormGroup' import { useDispatch, useSelector } from 'react-redux' -import { RootState } from '../../store' -import { addDiagnosis } from '../patient-slice' + +import DatePickerWithLabelFormGroup from 'components/input/DatePickerWithLabelFormGroup' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import Diagnosis from 'model/Diagnosis' +import { addDiagnosis } from 'patients/patient-slice' +import { RootState } from 'store' interface Props { show: boolean diff --git a/src/patients/diagnoses/Diagnoses.tsx b/src/patients/diagnoses/Diagnoses.tsx index af774eda7e..d00103c118 100644 --- a/src/patients/diagnoses/Diagnoses.tsx +++ b/src/patients/diagnoses/Diagnoses.tsx @@ -1,13 +1,14 @@ -import React, { useState } from 'react' -import { RootState } from 'store' -import Patient from 'model/Patient' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import { useSelector } from 'react-redux' -import Permissions from 'model/Permissions' import { Button, List, ListItem, Alert } from '@hospitalrun/components' +import React, { useState } from 'react' import { useTranslation } from 'react-i18next' +import { useSelector } from 'react-redux' + +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' import Diagnosis from 'model/Diagnosis' -import AddDiagnosisModal from './AddDiagnosisModal' +import Patient from 'model/Patient' +import Permissions from 'model/Permissions' +import AddDiagnosisModal from 'patients/diagnoses/AddDiagnosisModal' +import { RootState } from 'store' interface Props { patient: Patient diff --git a/src/patients/edit/EditPatient.tsx b/src/patients/edit/EditPatient.tsx index 350a3f2bdd..ec4652d9b0 100644 --- a/src/patients/edit/EditPatient.tsx +++ b/src/patients/edit/EditPatient.tsx @@ -1,15 +1,16 @@ +import { Spinner, Button, Toast } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' -import { useHistory, useParams } from 'react-router-dom' import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' -import { Spinner, Button, Toast } from '@hospitalrun/components' -import GeneralInformation from '../GeneralInformation' -import useTitle from '../../page-header/useTitle' -import Patient from '../../model/Patient' -import { updatePatient, fetchPatient } from '../patient-slice' -import { RootState } from '../../store' -import { getPatientFullName, getPatientName } from '../util/patient-name-util' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import { useHistory, useParams } from 'react-router-dom' + +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import Patient from 'model/Patient' +import useTitle from 'page-header/useTitle' +import GeneralInformation from 'patients/GeneralInformation' +import { updatePatient, fetchPatient } from 'patients/patient-slice' +import { getPatientFullName, getPatientName } from 'patients/util/patient-name-util' +import { RootState } from 'store' const getPatientCode = (p: Patient): string => { if (p) { diff --git a/src/patients/labs/LabsTab.tsx b/src/patients/labs/LabsTab.tsx index 6b40d81353..d9704b4810 100644 --- a/src/patients/labs/LabsTab.tsx +++ b/src/patients/labs/LabsTab.tsx @@ -1,10 +1,11 @@ -import React, { useEffect, useState } from 'react' import { Alert } from '@hospitalrun/components' -import { useTranslation } from 'react-i18next' import format from 'date-fns/format' +import React, { useEffect, useState } from 'react' +import { useTranslation } from 'react-i18next' import { useHistory } from 'react-router' -import Lab from '../../model/Lab' -import LabRepository from '../../clients/db/LabRepository' + +import LabRepository from 'clients/db/LabRepository' +import Lab from 'model/Lab' interface Props { patientId: string diff --git a/src/patients/list/ViewPatients.tsx b/src/patients/list/ViewPatients.tsx index ba2c470013..dc1dfac3d4 100644 --- a/src/patients/list/ViewPatients.tsx +++ b/src/patients/list/ViewPatients.tsx @@ -1,15 +1,16 @@ +import { Spinner, Button, Container, Row, TextInput, Column } from '@hospitalrun/components' +import format from 'date-fns/format' import React, { useEffect, useState } from 'react' +import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' import { useHistory } from 'react-router' -import { useTranslation } from 'react-i18next' -import { Spinner, Button, Container, Row, TextInput, Column } from '@hospitalrun/components' + +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import useDebounce from 'hooks/debounce' import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import format from 'date-fns/format' -import { RootState } from '../../store' -import { searchPatients } from '../patients-slice' -import useTitle from '../../page-header/useTitle' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' -import useDebounce from '../../hooks/debounce' +import useTitle from 'page-header/useTitle' +import { searchPatients } from 'patients/patients-slice' +import { RootState } from 'store' const breadcrumbs = [{ i18nKey: 'patients.label', location: '/patients' }] diff --git a/src/patients/new/NewPatient.tsx b/src/patients/new/NewPatient.tsx index c42f52d363..8dcaa654f8 100644 --- a/src/patients/new/NewPatient.tsx +++ b/src/patients/new/NewPatient.tsx @@ -1,15 +1,16 @@ +import { Button, Toast } from '@hospitalrun/components' import React, { useState } from 'react' -import { useHistory } from 'react-router' import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' -import { Button, Toast } from '@hospitalrun/components' -import GeneralInformation from '../GeneralInformation' -import useTitle from '../../page-header/useTitle' -import Patient from '../../model/Patient' -import { createPatient } from '../patient-slice' -import { getPatientName } from '../util/patient-name-util' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' -import { RootState } from '../../store' +import { useHistory } from 'react-router' + +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import Patient from 'model/Patient' +import useTitle from 'page-header/useTitle' +import GeneralInformation from 'patients/GeneralInformation' +import { createPatient } from 'patients/patient-slice' +import { getPatientName } from 'patients/util/patient-name-util' +import { RootState } from 'store' const breadcrumbs = [ { i18nKey: 'patients.label', location: '/patients' }, diff --git a/src/patients/notes/NewNoteModal.tsx b/src/patients/notes/NewNoteModal.tsx index e8b9d3a5cd..f1b8eb7f5a 100644 --- a/src/patients/notes/NewNoteModal.tsx +++ b/src/patients/notes/NewNoteModal.tsx @@ -1,11 +1,12 @@ -import React, { useState } from 'react' import { Modal, Alert } from '@hospitalrun/components' +import React, { useState } from 'react' import { useTranslation } from 'react-i18next' +import { useDispatch, useSelector } from 'react-redux' + import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import Note from 'model/Note' import { addNote } from 'patients/patient-slice' -import { useDispatch, useSelector } from 'react-redux' -import Note from '../../model/Note' -import { RootState } from '../../store' +import { RootState } from 'store' interface Props { show: boolean diff --git a/src/patients/notes/NoteTab.tsx b/src/patients/notes/NoteTab.tsx index e4be1c76bc..0b38dc6866 100644 --- a/src/patients/notes/NoteTab.tsx +++ b/src/patients/notes/NoteTab.tsx @@ -1,13 +1,14 @@ /* eslint-disable react/no-danger */ +import { Button, List, ListItem, Alert } from '@hospitalrun/components' import React, { useState } from 'react' -import { useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' -import { Button, List, ListItem, Alert } from '@hospitalrun/components' -import NewNoteModal from 'patients/notes/NewNoteModal' +import { useSelector } from 'react-redux' + import Note from 'model/Note' import Patient from 'model/Patient' -import { RootState } from '../../store' -import Permissions from '../../model/Permissions' +import Permissions from 'model/Permissions' +import NewNoteModal from 'patients/notes/NewNoteModal' +import { RootState } from 'store' interface Props { patient: Patient diff --git a/src/patients/patient-slice.ts b/src/patients/patient-slice.ts index f106abb18e..0a97b2c6f7 100644 --- a/src/patients/patient-slice.ts +++ b/src/patients/patient-slice.ts @@ -2,14 +2,15 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { isAfter, parseISO } from 'date-fns' import _ from 'lodash' import validator from 'validator' -import { uuid } from '../util/uuid' -import Patient from '../model/Patient' -import PatientRepository from '../clients/db/PatientRepository' -import { AppThunk } from '../store' -import RelatedPerson from '../model/RelatedPerson' -import Diagnosis from '../model/Diagnosis' -import Allergy from '../model/Allergy' -import Note from '../model/Note' + +import PatientRepository from 'clients/db/PatientRepository' +import Allergy from 'model/Allergy' +import Diagnosis from 'model/Diagnosis' +import Note from 'model/Note' +import Patient from 'model/Patient' +import RelatedPerson from 'model/RelatedPerson' +import { AppThunk } from 'store' +import { uuid } from 'util/uuid' interface PatientState { status: 'loading' | 'error' | 'completed' diff --git a/src/patients/patients-slice.ts b/src/patients/patients-slice.ts index 73cb93f3e6..9eaea15813 100644 --- a/src/patients/patients-slice.ts +++ b/src/patients/patients-slice.ts @@ -1,7 +1,8 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import Patient from '../model/Patient' -import PatientRepository from '../clients/db/PatientRepository' -import { AppThunk } from '../store' + +import PatientRepository from 'clients/db/PatientRepository' +import Patient from 'model/Patient' +import { AppThunk } from 'store' interface PatientsState { isLoading: boolean diff --git a/src/patients/related-persons/AddRelatedPersonModal.tsx b/src/patients/related-persons/AddRelatedPersonModal.tsx index f39cf4331d..5a5da28f76 100644 --- a/src/patients/related-persons/AddRelatedPersonModal.tsx +++ b/src/patients/related-persons/AddRelatedPersonModal.tsx @@ -1,13 +1,14 @@ -import React, { useState } from 'react' import { Modal, Alert, Typeahead, Label } from '@hospitalrun/components' +import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import RelatedPerson from 'model/RelatedPerson' +import { useDispatch, useSelector } from 'react-redux' + import PatientRepository from 'clients/db/PatientRepository' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' import Patient from 'model/Patient' -import { useDispatch, useSelector } from 'react-redux' -import { RootState } from '../../store' -import { addRelatedPerson } from '../patient-slice' +import RelatedPerson from 'model/RelatedPerson' +import { addRelatedPerson } from 'patients/patient-slice' +import { RootState } from 'store' interface Props { show: boolean diff --git a/src/patients/related-persons/RelatedPersonTab.tsx b/src/patients/related-persons/RelatedPersonTab.tsx index a84a519b6b..bae49816ee 100644 --- a/src/patients/related-persons/RelatedPersonTab.tsx +++ b/src/patients/related-persons/RelatedPersonTab.tsx @@ -1,15 +1,16 @@ -import React, { useState, useEffect } from 'react' import { Button, Alert, Spinner } from '@hospitalrun/components' -import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' +import React, { useState, useEffect } from 'react' import { useTranslation } from 'react-i18next' +import { useDispatch, useSelector } from 'react-redux' import { useHistory } from 'react-router' + +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import PatientRepository from 'clients/db/PatientRepository' import Patient from 'model/Patient' +import Permissions from 'model/Permissions' import { removeRelatedPerson } from 'patients/patient-slice' -import { useDispatch, useSelector } from 'react-redux' +import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' import { RootState } from 'store' -import Permissions from 'model/Permissions' -import PatientRepository from 'clients/db/PatientRepository' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' interface Props { patient: Patient diff --git a/src/patients/util/patient-name-util.ts b/src/patients/util/patient-name-util.ts index 3b6b8b86c5..165c7d571f 100644 --- a/src/patients/util/patient-name-util.ts +++ b/src/patients/util/patient-name-util.ts @@ -1,4 +1,4 @@ -import Patient from '../../model/Patient' +import Patient from 'model/Patient' const getNamePartString = (namePart: string | undefined) => { if (!namePart) { diff --git a/src/patients/view/ViewPatient.tsx b/src/patients/view/ViewPatient.tsx index 6119142e0b..64ded9f841 100644 --- a/src/patients/view/ViewPatient.tsx +++ b/src/patients/view/ViewPatient.tsx @@ -1,24 +1,24 @@ +import { Panel, Spinner, TabsHeader, Tab, Button } from '@hospitalrun/components' import React, { useEffect } from 'react' +import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' import { useParams, withRouter, Route, useHistory, useLocation } from 'react-router-dom' -import { Panel, Spinner, TabsHeader, Tab, Button } from '@hospitalrun/components' -import { useTranslation } from 'react-i18next' +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import Patient from 'model/Patient' +import Permissions from 'model/Permissions' import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' +import useTitle from 'page-header/useTitle' import Allergies from 'patients/allergies/Allergies' +import AppointmentsList from 'patients/appointments/AppointmentsList' import Diagnoses from 'patients/diagnoses/Diagnoses' -import useTitle from '../../page-header/useTitle' -import { fetchPatient } from '../patient-slice' -import { RootState } from '../../store' -import { getPatientFullName } from '../util/patient-name-util' -import Permissions from '../../model/Permissions' -import Patient from '../../model/Patient' -import GeneralInformation from '../GeneralInformation' -import RelatedPerson from '../related-persons/RelatedPersonTab' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' -import AppointmentsList from '../appointments/AppointmentsList' -import Note from '../notes/NoteTab' -import Labs from '../labs/LabsTab' +import GeneralInformation from 'patients/GeneralInformation' +import Labs from 'patients/labs/LabsTab' +import Note from 'patients/notes/NoteTab' +import { fetchPatient } from 'patients/patient-slice' +import RelatedPerson from 'patients/related-persons/RelatedPersonTab' +import { getPatientFullName } from 'patients/util/patient-name-util' +import { RootState } from 'store' const getPatientCode = (p: Patient): string => { if (p) { diff --git a/src/scheduling/appointments/AppointmentDetailForm.tsx b/src/scheduling/appointments/AppointmentDetailForm.tsx index 6fe9837a3f..a9183c5f74 100644 --- a/src/scheduling/appointments/AppointmentDetailForm.tsx +++ b/src/scheduling/appointments/AppointmentDetailForm.tsx @@ -1,13 +1,14 @@ -import React from 'react' -import Appointment from 'model/Appointment' -import DateTimePickerWithLabelFormGroup from 'components/input/DateTimePickerWithLabelFormGroup' import { Typeahead, Label, Alert } from '@hospitalrun/components' -import Patient from 'model/Patient' +import React from 'react' +import { useTranslation } from 'react-i18next' + import PatientRepository from 'clients/db/PatientRepository' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import DateTimePickerWithLabelFormGroup from 'components/input/DateTimePickerWithLabelFormGroup' import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' -import { useTranslation } from 'react-i18next' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import Appointment from 'model/Appointment' +import Patient from 'model/Patient' interface Props { appointment: Appointment diff --git a/src/scheduling/appointments/Appointments.tsx b/src/scheduling/appointments/Appointments.tsx index 142bff601a..ce28dd1206 100644 --- a/src/scheduling/appointments/Appointments.tsx +++ b/src/scheduling/appointments/Appointments.tsx @@ -1,13 +1,14 @@ import React from 'react' import { useSelector } from 'react-redux' import { Switch } from 'react-router' -import NewAppointment from 'scheduling/appointments/new/NewAppointment' + +import PrivateRoute from 'components/PrivateRoute' +import Permissions from 'model/Permissions' import EditAppointment from 'scheduling/appointments/edit/EditAppointment' +import NewAppointment from 'scheduling/appointments/new/NewAppointment' import ViewAppointment from 'scheduling/appointments/view/ViewAppointment' -import ViewAppointments from './ViewAppointments' -import PrivateRoute from '../../components/PrivateRoute' -import Permissions from '../../model/Permissions' -import { RootState } from '../../store' +import ViewAppointments from 'scheduling/appointments/ViewAppointments' +import { RootState } from 'store' const Appointments = () => { const permissions = useSelector((state: RootState) => state.user.permissions) diff --git a/src/scheduling/appointments/ViewAppointments.tsx b/src/scheduling/appointments/ViewAppointments.tsx index b569c2b4a7..5e707e24e0 100644 --- a/src/scheduling/appointments/ViewAppointments.tsx +++ b/src/scheduling/appointments/ViewAppointments.tsx @@ -1,14 +1,15 @@ -import React, { useEffect, useState } from 'react' import { Calendar, Button } from '@hospitalrun/components' -import useTitle from 'page-header/useTitle' +import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' -import { RootState } from 'store' import { useHistory } from 'react-router' -import PatientRepository from 'clients/db/PatientRepository' + import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import PatientRepository from 'clients/db/PatientRepository' import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import { fetchAppointments } from './appointments-slice' +import useTitle from 'page-header/useTitle' +import { fetchAppointments } from 'scheduling/appointments/appointments-slice' +import { RootState } from 'store' interface Event { id: string diff --git a/src/scheduling/appointments/appointment-slice.ts b/src/scheduling/appointments/appointment-slice.ts index af8732531d..1ef290895a 100644 --- a/src/scheduling/appointments/appointment-slice.ts +++ b/src/scheduling/appointments/appointment-slice.ts @@ -1,12 +1,13 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import Appointment from 'model/Appointment' -import { AppThunk } from 'store' -import AppointmentRepository from 'clients/db/AppointmentRepository' -import Patient from 'model/Patient' -import PatientRepository from 'clients/db/PatientRepository' import { isBefore } from 'date-fns' import _ from 'lodash' +import AppointmentRepository from 'clients/db/AppointmentRepository' +import PatientRepository from 'clients/db/PatientRepository' +import Appointment from 'model/Appointment' +import Patient from 'model/Patient' +import { AppThunk } from 'store' + function validateAppointment(appointment: Appointment) { const err: Error = {} diff --git a/src/scheduling/appointments/appointments-slice.ts b/src/scheduling/appointments/appointments-slice.ts index f902684d03..2fa89aa207 100644 --- a/src/scheduling/appointments/appointments-slice.ts +++ b/src/scheduling/appointments/appointments-slice.ts @@ -1,7 +1,8 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' + +import AppointmentRepository from 'clients/db/AppointmentRepository' import Appointment from 'model/Appointment' import { AppThunk } from 'store' -import AppointmentRepository from 'clients/db/AppointmentRepository' interface AppointmentsState { isLoading: boolean diff --git a/src/scheduling/appointments/edit/EditAppointment.tsx b/src/scheduling/appointments/edit/EditAppointment.tsx index d52d757c46..1b725db90b 100644 --- a/src/scheduling/appointments/edit/EditAppointment.tsx +++ b/src/scheduling/appointments/edit/EditAppointment.tsx @@ -1,16 +1,16 @@ +import { Spinner, Button } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' -import { useHistory, useParams } from 'react-router-dom' import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' -import { Spinner, Button } from '@hospitalrun/components' +import { useHistory, useParams } from 'react-router-dom' -import AppointmentDetailForm from '../AppointmentDetailForm' -import useTitle from '../../../page-header/useTitle' -import Appointment from '../../../model/Appointment' -import { updateAppointment, fetchAppointment } from '../appointment-slice' -import { RootState } from '../../../store' -import { getAppointmentLabel } from '../util/scheduling-appointment.util' -import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import Appointment from 'model/Appointment' +import useTitle from 'page-header/useTitle' +import { updateAppointment, fetchAppointment } from 'scheduling/appointments/appointment-slice' +import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' +import { getAppointmentLabel } from 'scheduling/appointments/util/scheduling-appointment.util' +import { RootState } from 'store' const EditAppointment = () => { const { t } = useTranslation() diff --git a/src/scheduling/appointments/new/NewAppointment.tsx b/src/scheduling/appointments/new/NewAppointment.tsx index 438869dc9e..0505b9fc30 100644 --- a/src/scheduling/appointments/new/NewAppointment.tsx +++ b/src/scheduling/appointments/new/NewAppointment.tsx @@ -1,16 +1,17 @@ +import { Button, Toast } from '@hospitalrun/components' +import addMinutes from 'date-fns/addMinutes' +import roundToNearestMinutes from 'date-fns/roundToNearestMinutes' 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 { useDispatch, useSelector } from 'react-redux' +import { useHistory } from 'react-router' + +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' import Appointment from 'model/Appointment' -import addMinutes from 'date-fns/addMinutes' -import { Button, Toast } from '@hospitalrun/components' -import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' -import { createAppointment } from '../appointment-slice' -import AppointmentDetailForm from '../AppointmentDetailForm' -import { RootState } from '../../../store' +import useTitle from 'page-header/useTitle' +import { createAppointment } from 'scheduling/appointments/appointment-slice' +import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' +import { RootState } from 'store' const breadcrumbs = [ { i18nKey: 'scheduling.appointments.label', location: '/appointments' }, diff --git a/src/scheduling/appointments/util/scheduling-appointment.util.ts b/src/scheduling/appointments/util/scheduling-appointment.util.ts index eb1d28bdd8..f491e390fe 100644 --- a/src/scheduling/appointments/util/scheduling-appointment.util.ts +++ b/src/scheduling/appointments/util/scheduling-appointment.util.ts @@ -1,4 +1,4 @@ -import Appointment from '../../../model/Appointment' +import Appointment from 'model/Appointment' const options = { year: 'numeric', diff --git a/src/scheduling/appointments/view/ViewAppointment.tsx b/src/scheduling/appointments/view/ViewAppointment.tsx index c90002b2e4..880aa1faaf 100644 --- a/src/scheduling/appointments/view/ViewAppointment.tsx +++ b/src/scheduling/appointments/view/ViewAppointment.tsx @@ -1,16 +1,17 @@ +import { Spinner, Button, Modal, Toast } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' -import useTitle from 'page-header/useTitle' +import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' -import { RootState } from 'store' import { useParams, useHistory } from 'react-router' -import { Spinner, Button, Modal, Toast } from '@hospitalrun/components' -import { useTranslation } from 'react-i18next' -import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' + +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' import Permissions from 'model/Permissions' -import { fetchAppointment, deleteAppointment } from '../appointment-slice' -import AppointmentDetailForm from '../AppointmentDetailForm' -import { getAppointmentLabel } from '../util/scheduling-appointment.util' -import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' +import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' +import useTitle from 'page-header/useTitle' +import { fetchAppointment, deleteAppointment } from 'scheduling/appointments/appointment-slice' +import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' +import { getAppointmentLabel } from 'scheduling/appointments/util/scheduling-appointment.util' +import { RootState } from 'store' const ViewAppointment = () => { const { t } = useTranslation() diff --git a/src/store/index.ts b/src/store/index.ts index 1a39af5ff3..9d54647990 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -1,15 +1,16 @@ import { configureStore, combineReducers, Action } from '@reduxjs/toolkit' import ReduxThunk, { ThunkAction } from 'redux-thunk' -import patient from '../patients/patient-slice' -import patients from '../patients/patients-slice' -import appointment from '../scheduling/appointments/appointment-slice' -import appointments from '../scheduling/appointments/appointments-slice' -import title from '../page-header/title-slice' -import user from '../user/user-slice' -import lab from '../labs/lab-slice' -import labs from '../labs/labs-slice' -import breadcrumbs from '../breadcrumbs/breadcrumbs-slice' -import components from '../components/component-slice' + +import breadcrumbs from 'breadcrumbs/breadcrumbs-slice' +import components from 'components/component-slice' +import lab from 'labs/lab-slice' +import labs from 'labs/labs-slice' +import title from 'page-header/title-slice' +import patient from 'patients/patient-slice' +import patients from 'patients/patients-slice' +import appointment from 'scheduling/appointments/appointment-slice' +import appointments from 'scheduling/appointments/appointments-slice' +import user from 'user/user-slice' const reducer = combineReducers({ patient, diff --git a/src/user/user-slice.ts b/src/user/user-slice.ts index 98c163429c..e9cab3f327 100644 --- a/src/user/user-slice.ts +++ b/src/user/user-slice.ts @@ -1,5 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import Permissions from '../model/Permissions' + +import Permissions from 'model/Permissions' interface UserState { permissions: Permissions[] From bcae4c360c0a8968f65fb127230355b582d56829 Mon Sep 17 00:00:00 2001 From: Matthew Dorner Date: Thu, 14 May 2020 11:50:15 -0500 Subject: [PATCH 2/6] =?UTF-8?q?Revert=20"refactor:=20=F0=9F=92=A1=20Add=20?= =?UTF-8?q?linter=20rules=20for=20import=20order"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bf35ba5ac37bf5a4c8f95773b40438dac3ba5e4c. --- .eslintrc.js | 24 +------------- package.json | 3 +- src/App.tsx | 8 ++--- src/HospitalRun.tsx | 21 ++++++------ src/__tests__/App.test.tsx | 9 ++--- src/__tests__/HospitalRun.test.tsx | 19 +++++------ .../breadcrumbs/Breadcrumbs.test.tsx | 14 ++++---- .../breadcrumbs/breadcrumbs-slice.test.ts | 5 +-- .../breadcrumbs/useAddBreadcrumbs.test.tsx | 9 +++-- .../clients/db/LabRepository.test.ts | 5 ++- .../clients/db/PatientRepository.test.ts | 7 ++-- src/__tests__/components/Navbar.test.tsx | 13 +++----- src/__tests__/components/Sidebar.test.tsx | 13 +++----- .../DatePickerWithLabelFormGroup.test.tsx | 7 ++-- .../DateTimePickerWithLabelFormGroup.test.tsx | 7 ++-- .../input/SelectWithLabelFormGroup.test.tsx | 9 ++--- .../TestInputWithLabelFormGroup.test.tsx | 7 ++-- .../TextFieldWithLabelFormGroup.test.tsx | 7 ++-- src/__tests__/hooks/debounce.test.ts | 1 - src/__tests__/labs/Labs.test.tsx | 17 ++++------ src/__tests__/labs/ViewLab.test.tsx | 23 ++++++------- src/__tests__/labs/ViewLabs.test.tsx | 19 +++++------ src/__tests__/labs/lab-slice.test.ts | 15 ++++----- src/__tests__/labs/labs.slice.test.ts | 7 ++-- .../labs/requests/NewLabRequest.test.tsx | 21 +++++------- .../page-header/ButtonBarProvider.test.tsx | 7 ++-- .../page-header/ButtonToolBar.test.tsx | 11 +++---- src/__tests__/page-header/title-slice.test.ts | 3 +- src/__tests__/page-header/useTitle.test.tsx | 9 +++-- .../patients/GeneralInformation.test.tsx | 15 ++++----- src/__tests__/patients/Patients.test.tsx | 25 +++++++------- .../patients/allergies/Allergies.test.tsx | 21 +++++------- .../allergies/NewAllergyModal.test.tsx | 19 +++++------ .../appointments/AppointmentsList.test.tsx | 15 ++++----- .../diagnoses/AddDiagnosisModal.test.tsx | 23 ++++++------- .../patients/diagnoses/Diagnoses.test.tsx | 17 ++++------ .../patients/edit/EditPatient.test.tsx | 25 +++++++------- src/__tests__/patients/labs/LabsTab.test.tsx | 27 +++++++-------- .../patients/list/ViewPatients.test.tsx | 21 +++++------- .../patients/new/NewPatient.test.tsx | 25 +++++++------- .../patients/notes/NewNoteModal.test.tsx | 19 +++++------ .../patients/notes/NotesTab.test.tsx | 21 +++++------- src/__tests__/patients/patient-slice.test.ts | 21 +++++------- src/__tests__/patients/patients-slice.test.ts | 9 ++--- .../AddRelatedPersonModal.test.tsx | 17 ++++------ .../related-persons/RelatedPersons.test.tsx | 23 ++++++------- .../patients/util/patient-name-util.test.ts | 2 +- .../patients/view/ViewPatient.test.tsx | 33 +++++++++---------- .../AppointmentDetailForm.test.tsx | 15 ++++----- .../appointments/Appointments.test.tsx | 25 +++++++------- .../appointments/ViewAppointments.test.tsx | 21 +++++------- .../appointments/appointment-slice.test.ts | 12 +++---- .../appointments/appointments-slice.test.ts | 6 ++-- .../edit/EditAppointment.test.tsx | 31 ++++++++--------- .../appointments/new/NewAppointment.test.tsx | 29 ++++++++-------- .../util/scheduling-appointment.util.test.ts | 2 +- .../view/ViewAppointment.test.tsx | 27 +++++++-------- src/__tests__/user/user-slice.test.ts | 4 +-- src/__tests__/utils/generateCode.test.ts | 2 +- src/breadcrumbs/Breadcrumbs.tsx | 9 +++-- src/breadcrumbs/breadcrumbs-slice.ts | 1 - src/breadcrumbs/useAddBreadcrumbs.ts | 3 +- src/clients/db/AppointmentRepository.ts | 7 ++-- src/clients/db/LabRepository.ts | 10 +++--- src/clients/db/PatientRepository.ts | 11 +++---- src/clients/db/Repository.ts | 5 ++- src/components/Navbar.tsx | 4 +-- src/components/Sidebar.tsx | 9 +++-- src/components/component-slice.ts | 3 +- .../input/DatePickerWithLabelFormGroup.tsx | 2 +- .../DateTimePickerWithLabelFormGroup.tsx | 2 +- .../input/SelectWithLableFormGroup.tsx | 2 +- .../input/TextFieldWithLabelFormGroup.tsx | 2 +- .../input/TextInputWithLabelFormGroup.tsx | 2 +- src/dashboard/Dashboard.tsx | 3 +- src/i18n.ts | 22 ++++++------- src/index.tsx | 9 +++-- src/labs/Labs.tsx | 13 ++++---- src/labs/ViewLab.tsx | 19 +++++------ src/labs/ViewLabs.tsx | 21 ++++++------ src/labs/lab-slice.ts | 7 ++-- src/labs/labs-slice.ts | 9 +++-- src/labs/requests/NewLabRequest.tsx | 17 +++++----- src/locales/ar/translations/index.ts | 8 ++--- src/locales/de/translations/index.ts | 8 ++--- src/locales/enUs/translations/index.ts | 16 ++++----- src/locales/es/translations/index.ts | 8 ++--- src/locales/fr/translations/index.ts | 16 ++++----- src/locales/in/translations/index.ts | 8 ++--- src/locales/it/translations/index.ts | 16 ++++----- src/locales/ja/translations/index.ts | 8 ++--- src/locales/ptBr/translations/index.ts | 16 ++++----- src/locales/ru/translations/index.ts | 8 ++--- src/locales/zr/translations/index.ts | 8 ++--- src/model/Appointment.ts | 2 +- src/model/Lab.ts | 2 +- src/model/Patient.ts | 14 ++++---- src/page-header/ButtonToolBar.tsx | 3 +- src/page-header/title-slice.ts | 3 +- src/page-header/useTitle.tsx | 3 +- src/patients/GeneralInformation.tsx | 14 ++++---- src/patients/Patients.tsx | 15 ++++----- src/patients/allergies/Allergies.tsx | 13 ++++---- src/patients/allergies/NewAllergyModal.tsx | 11 +++---- .../appointments/AppointmentsList.tsx | 11 +++---- src/patients/diagnoses/AddDiagnosisModal.tsx | 13 ++++---- src/patients/diagnoses/Diagnoses.tsx | 15 ++++----- src/patients/edit/EditPatient.tsx | 19 +++++------ src/patients/labs/LabsTab.tsx | 9 +++-- src/patients/list/ViewPatients.tsx | 17 +++++----- src/patients/new/NewPatient.tsx | 19 +++++------ src/patients/notes/NewNoteModal.tsx | 9 +++-- src/patients/notes/NoteTab.tsx | 11 +++---- src/patients/patient-slice.ts | 17 +++++----- src/patients/patients-slice.ts | 7 ++-- .../related-persons/AddRelatedPersonModal.tsx | 13 ++++---- .../related-persons/RelatedPersonTab.tsx | 13 ++++---- src/patients/util/patient-name-util.ts | 2 +- src/patients/view/ViewPatient.tsx | 28 ++++++++-------- .../appointments/AppointmentDetailForm.tsx | 15 ++++----- src/scheduling/appointments/Appointments.tsx | 11 +++---- .../appointments/ViewAppointments.tsx | 11 +++---- .../appointments/appointment-slice.ts | 11 +++---- .../appointments/appointments-slice.ts | 3 +- .../appointments/edit/EditAppointment.tsx | 18 +++++----- .../appointments/new/NewAppointment.tsx | 19 +++++------ .../util/scheduling-appointment.util.ts | 2 +- .../appointments/view/ViewAppointment.tsx | 19 +++++------ src/store/index.ts | 21 ++++++------ src/user/user-slice.ts | 3 +- 130 files changed, 700 insertions(+), 900 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index efe06b1170..2692cbdf5b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,17 +28,10 @@ module.exports = { 'import/resolver': { node: { extensions: ['.js', '.jsx', '.ts', '.tsx'], - moduleDirectory: ["node_modules", "src/"], }, - "typescript": { - alwaysTryTypes: true, - } - }, - 'import/parsers': { - '@typescript-eslint/parser': ['.ts', '.tsx'], }, }, - plugins: ['react', '@typescript-eslint', 'prettier', 'jest', 'import'], + plugins: ['react', '@typescript-eslint', 'prettier', 'jest'], rules: { 'prettier/prettier': 'error', '@typescript-eslint/member-delimiter-style': 'off', @@ -54,27 +47,12 @@ 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', - 'no-restricted-imports': ['error', { patterns: ['../', './']}], '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'], }, } diff --git a/package.json b/package.json index 72240116b8..eab097d2d8 100644 --- a/package.json +++ b/package.json @@ -85,8 +85,7 @@ "eslint": "~6.8.0", "eslint-config-airbnb": "~18.1.0", "eslint-config-prettier": "~6.11.0", - "eslint-import-resolver-typescript": "~2.0.0", - "eslint-plugin-import": "~2.20.2", + "eslint-plugin-import": "~2.20.0", "eslint-plugin-jest": "~23.10.0", "eslint-plugin-jsx-a11y": "~6.2.3", "eslint-plugin-prettier": "~3.1.2", diff --git a/src/App.tsx b/src/App.tsx index 656cc41695..f813de0874 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,10 +1,10 @@ -import { Spinner } from '@hospitalrun/components' import React, { Suspense } from 'react' -import { Provider } from 'react-redux' import { BrowserRouter } from 'react-router-dom' +import { Provider } from 'react-redux' +import { Spinner } from '@hospitalrun/components' +import HospitalRun from './HospitalRun' -import HospitalRun from 'HospitalRun' -import store from 'store' +import store from './store' const App: React.FC = () => (
diff --git a/src/HospitalRun.tsx b/src/HospitalRun.tsx index bbb84e845e..8b6ba566f5 100644 --- a/src/HospitalRun.tsx +++ b/src/HospitalRun.tsx @@ -1,19 +1,18 @@ -import { Toaster } from '@hospitalrun/components' import React from 'react' -import { useSelector } from 'react-redux' import { Switch, Route } from 'react-router-dom' - +import { useSelector } from 'react-redux' +import { Toaster } from '@hospitalrun/components' import Breadcrumbs from 'breadcrumbs/Breadcrumbs' -import Navbar from 'components/Navbar' -import PrivateRoute from 'components/PrivateRoute' -import Sidebar from 'components/Sidebar' -import Dashboard from 'dashboard/Dashboard' -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' +import Labs from 'labs/Labs' +import Sidebar from './components/Sidebar' +import Dashboard from './dashboard/Dashboard' +import { RootState } from './store' +import Navbar from './components/Navbar' +import PrivateRoute from './components/PrivateRoute' +import Patients from './patients/Patients' +import Appointments from './scheduling/appointments/Appointments' const HospitalRun = () => { const { title } = useSelector((state: RootState) => state.title) diff --git a/src/__tests__/App.test.tsx b/src/__tests__/App.test.tsx index 44c5e91820..9d82e2646a 100644 --- a/src/__tests__/App.test.tsx +++ b/src/__tests__/App.test.tsx @@ -1,11 +1,8 @@ -// eslint-disable-next-line no-restricted-imports import '../__mocks__/matchMediaMock' - -import { mount } from 'enzyme' import React from 'react' - -import App from 'App' -import HospitalRun from 'HospitalRun' +import { mount } from 'enzyme' +import HospitalRun from '../HospitalRun' +import App from '../App' it('renders without crashing', () => { const wrapper = mount() diff --git a/src/__tests__/HospitalRun.test.tsx b/src/__tests__/HospitalRun.test.tsx index 2c1093ffb7..3179d925ca 100644 --- a/src/__tests__/HospitalRun.test.tsx +++ b/src/__tests__/HospitalRun.test.tsx @@ -1,20 +1,17 @@ -// eslint-disable-next-line no-restricted-imports import '../__mocks__/matchMediaMock' - -import { Toaster } from '@hospitalrun/components' -import { mount } from 'enzyme' import React from 'react' -import { act } from 'react-dom/test-utils' -import { Provider } from 'react-redux' +import { mount } from 'enzyme' import { MemoryRouter } from 'react-router' -import configureMockStore from 'redux-mock-store' +import { Provider } from 'react-redux' import thunk from 'redux-thunk' - -import LabRepository from 'clients/db/LabRepository' +import configureMockStore from 'redux-mock-store' +import { Toaster } from '@hospitalrun/components' +import { act } from 'react-dom/test-utils' import Dashboard from 'dashboard/Dashboard' -import HospitalRun from 'HospitalRun' import ViewLabs from 'labs/ViewLabs' -import Permissions from 'model/Permissions' +import LabRepository from 'clients/db/LabRepository' +import HospitalRun from '../HospitalRun' +import Permissions from '../model/Permissions' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx b/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx index f06785e90d..f14bc46b9f 100644 --- a/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx +++ b/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx @@ -1,16 +1,14 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { - Breadcrumb as HRBreadcrumb, - BreadcrumbItem as HRBreadcrumbItem, -} from '@hospitalrun/components' -import { mount } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' import { Provider } from 'react-redux' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' import { Router } from 'react-router-dom' import configureMockStore from 'redux-mock-store' +import { + Breadcrumb as HRBreadcrumb, + BreadcrumbItem as HRBreadcrumbItem, +} from '@hospitalrun/components' import Breadcrumbs from 'breadcrumbs/Breadcrumbs' import Breadcrumb from 'model/Breadcrumb' diff --git a/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts b/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts index 0ff7877b88..10f73f19ff 100644 --- a/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts +++ b/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts @@ -1,9 +1,6 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - import { AnyAction } from 'redux' - -import breadcrumbs, { addBreadcrumbs, removeBreadcrumbs } from 'breadcrumbs/breadcrumbs-slice' +import breadcrumbs, { addBreadcrumbs, removeBreadcrumbs } from '../../breadcrumbs/breadcrumbs-slice' describe('breadcrumbs slice', () => { describe('breadcrumbs reducer', () => { diff --git a/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx b/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx index 3f80465af5..452f76ebdc 100644 --- a/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx +++ b/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx @@ -1,10 +1,9 @@ -import { renderHook } from '@testing-library/react-hooks' import React from 'react' -import { Provider } from 'react-redux' +import { renderHook } from '@testing-library/react-hooks' import configureMockStore from 'redux-mock-store' - -import * as breadcrumbsSlice from 'breadcrumbs/breadcrumbs-slice' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import { Provider } from 'react-redux' +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import * as breadcrumbsSlice from '../../breadcrumbs/breadcrumbs-slice' const store = configureMockStore() diff --git a/src/__tests__/clients/db/LabRepository.test.ts b/src/__tests__/clients/db/LabRepository.test.ts index b82bc3c540..f9ed08130e 100644 --- a/src/__tests__/clients/db/LabRepository.test.ts +++ b/src/__tests__/clients/db/LabRepository.test.ts @@ -1,10 +1,9 @@ /* 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 { labs } from 'config/pouchdb' -import Lab from 'model/Lab' +import Lab from '../../../model/Lab' interface SearchContainer { text: string diff --git a/src/__tests__/clients/db/PatientRepository.test.ts b/src/__tests__/clients/db/PatientRepository.test.ts index 97e84d069c..e45cd7262b 100644 --- a/src/__tests__/clients/db/PatientRepository.test.ts +++ b/src/__tests__/clients/db/PatientRepository.test.ts @@ -1,9 +1,8 @@ -import { getTime, isAfter } from 'date-fns' -import shortid from 'shortid' - -import PatientRepository from 'clients/db/PatientRepository' 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' 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 diff --git a/src/__tests__/components/Navbar.test.tsx b/src/__tests__/components/Navbar.test.tsx index bebc2c9013..8354bce74d 100644 --- a/src/__tests__/components/Navbar.test.tsx +++ b/src/__tests__/components/Navbar.test.tsx @@ -1,14 +1,11 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { Navbar as HospitalRunNavbar } from '@hospitalrun/components' -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' +import { mount } from 'enzyme' +import { Navbar as HospitalRunNavbar } from '@hospitalrun/components' +import { act } from 'react-dom/test-utils' +import { createMemoryHistory } from 'history' +import Navbar from '../../components/Navbar' describe('Navbar', () => { const history = createMemoryHistory() diff --git a/src/__tests__/components/Sidebar.test.tsx b/src/__tests__/components/Sidebar.test.tsx index 7994ebe465..11bf2804af 100644 --- a/src/__tests__/components/Sidebar.test.tsx +++ b/src/__tests__/components/Sidebar.test.tsx @@ -1,17 +1,14 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { ListItem } from '@hospitalrun/components' -import { act } from '@testing-library/react' +import React from 'react' import { mount } from 'enzyme' import { createMemoryHistory } from 'history' -import React from 'react' -import { Provider } from 'react-redux' +import Sidebar from 'components/Sidebar' import { Router } from 'react-router' +import { ListItem } from '@hospitalrun/components' +import { act } from '@testing-library/react' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - -import Sidebar from 'components/Sidebar' +import { Provider } from 'react-redux' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx b/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx index a41f7edb2b..0bb2fec902 100644 --- a/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx @@ -1,11 +1,8 @@ -// eslint-disable-next-line no-restricted-imports 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' +import DatePickerWithLabelFormGroup from '../../../components/input/DatePickerWithLabelFormGroup' describe('date picker with label form group', () => { describe('layout', () => { diff --git a/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx b/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx index 6b26e36ef2..cba26f9131 100644 --- a/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx @@ -1,11 +1,8 @@ -// eslint-disable-next-line no-restricted-imports 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' +import DateTimePickerWithLabelFormGroup from '../../../components/input/DateTimePickerWithLabelFormGroup' describe('date picker with label form group', () => { describe('layout', () => { diff --git a/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx b/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx index daf069de89..74be6cbfeb 100644 --- a/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx @@ -1,11 +1,8 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import { Label, Select } from '@hospitalrun/components' -import { shallow } from 'enzyme' import React from 'react' - -import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' +import { shallow } from 'enzyme' +import { Label, Select } from '@hospitalrun/components' +import SelectWithLabelFormGroup from '../../../components/input/SelectWithLableFormGroup' describe('select with label form group', () => { describe('layout', () => { diff --git a/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx b/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx index 12ba95ab2d..01fbc66d14 100644 --- a/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx @@ -1,11 +1,8 @@ -// eslint-disable-next-line no-restricted-imports 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' +import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' describe('text input with label form group', () => { describe('layout', () => { diff --git a/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx b/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx index 960e3a2d7c..64367b1e64 100644 --- a/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx @@ -1,11 +1,8 @@ -// eslint-disable-next-line no-restricted-imports 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' +import TextFieldWithLabelFormGroup from '../../../components/input/TextFieldWithLabelFormGroup' describe('text field with label form group', () => { describe('layout', () => { diff --git a/src/__tests__/hooks/debounce.test.ts b/src/__tests__/hooks/debounce.test.ts index 7feb833332..73be39e3eb 100644 --- a/src/__tests__/hooks/debounce.test.ts +++ b/src/__tests__/hooks/debounce.test.ts @@ -1,5 +1,4 @@ import { renderHook, act } from '@testing-library/react-hooks' - import useDebounce from 'hooks/debounce' describe('useDebounce', () => { diff --git a/src/__tests__/labs/Labs.test.tsx b/src/__tests__/labs/Labs.test.tsx index 0faaf3003f..03fddb7284 100644 --- a/src/__tests__/labs/Labs.test.tsx +++ b/src/__tests__/labs/Labs.test.tsx @@ -1,22 +1,19 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { act } from '@testing-library/react' -import { mount } from 'enzyme' import React from 'react' -import { Provider } from 'react-redux' +import { mount } from 'enzyme' import { MemoryRouter } from 'react-router' -import configureMockStore from 'redux-mock-store' +import { Provider } from 'react-redux' import thunk from 'redux-thunk' - -import LabRepository from 'clients/db/LabRepository' -import PatientRepository from 'clients/db/PatientRepository' +import configureMockStore from 'redux-mock-store' +import { act } from '@testing-library/react' import Labs from 'labs/Labs' import NewLabRequest from 'labs/requests/NewLabRequest' +import Permissions from 'model/Permissions' import ViewLab from 'labs/ViewLab' +import LabRepository from 'clients/db/LabRepository' import Lab from 'model/Lab' import Patient from 'model/Patient' -import Permissions from 'model/Permissions' +import PatientRepository from 'clients/db/PatientRepository' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/labs/ViewLab.test.tsx b/src/__tests__/labs/ViewLab.test.tsx index 1895f1e35f..bbd6dba8fc 100644 --- a/src/__tests__/labs/ViewLab.test.tsx +++ b/src/__tests__/labs/ViewLab.test.tsx @@ -1,26 +1,23 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { Badge, Button, Alert } from '@hospitalrun/components' -import { act } from '@testing-library/react' -import format from 'date-fns/format' -import { mount } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' import { Provider } from 'react-redux' import { Router, Route } from 'react-router' -import createMockStore from 'redux-mock-store' +import { mount } from 'enzyme' import thunk from 'redux-thunk' - +import { createMemoryHistory } from 'history' +import Permissions from 'model/Permissions' +import { act } from '@testing-library/react' import LabRepository from 'clients/db/LabRepository' import PatientRepository from 'clients/db/PatientRepository' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import ViewLab from 'labs/ViewLab' import Lab from 'model/Lab' import Patient from 'model/Patient' -import Permissions from 'model/Permissions' import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import * as titleUtil from 'page-header/useTitle' +import createMockStore from 'redux-mock-store' +import { Badge, Button, Alert } from '@hospitalrun/components' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import format from 'date-fns/format' +import * as titleUtil from '../../page-header/useTitle' +import ViewLab from '../../labs/ViewLab' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/labs/ViewLabs.test.tsx b/src/__tests__/labs/ViewLabs.test.tsx index 39dc94e788..0cf1eaaf64 100644 --- a/src/__tests__/labs/ViewLabs.test.tsx +++ b/src/__tests__/labs/ViewLabs.test.tsx @@ -1,24 +1,21 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { TextInput, Select } from '@hospitalrun/components' -import { act } from '@testing-library/react' -import format from 'date-fns/format' -import { mount, ReactWrapper } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' import { Provider } from 'react-redux' import { Router } from 'react-router' +import ViewLabs from 'labs/ViewLabs' +import { mount, ReactWrapper } from 'enzyme' +import { TextInput, Select } from '@hospitalrun/components' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - +import { createMemoryHistory } from 'history' +import Permissions from 'model/Permissions' +import { act } from '@testing-library/react' import LabRepository from 'clients/db/LabRepository' import * as labsSlice from 'labs/labs-slice' -import ViewLabs from 'labs/ViewLabs' import Lab from 'model/Lab' -import Permissions from 'model/Permissions' +import format from 'date-fns/format' import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import * as titleUtil from 'page-header/useTitle' +import * as titleUtil from '../../page-header/useTitle' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/labs/lab-slice.test.ts b/src/__tests__/labs/lab-slice.test.ts index 883992c3ba..6296f36b7e 100644 --- a/src/__tests__/labs/lab-slice.test.ts +++ b/src/__tests__/labs/lab-slice.test.ts @@ -1,8 +1,9 @@ -import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - -import LabRepository from 'clients/db/LabRepository' -import PatientRepository from 'clients/db/PatientRepository' +import createMockStore from 'redux-mock-store' +import PatientRepository from '../../clients/db/PatientRepository' +import LabRepository from '../../clients/db/LabRepository' +import Lab from '../../model/Lab' +import Patient from '../../model/Patient' import labSlice, { requestLab, fetchLabStart, @@ -21,10 +22,8 @@ import labSlice, { completeLabError, requestLabError, updateLab, -} from 'labs/lab-slice' -import Lab from 'model/Lab' -import Patient from 'model/Patient' -import { RootState } from 'store' +} from '../../labs/lab-slice' +import { RootState } from '../../store' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/labs/labs.slice.test.ts b/src/__tests__/labs/labs.slice.test.ts index 0534fc6054..a380d0beb3 100644 --- a/src/__tests__/labs/labs.slice.test.ts +++ b/src/__tests__/labs/labs.slice.test.ts @@ -1,10 +1,9 @@ import { AnyAction } from 'redux' import { mocked } from 'ts-jest/utils' - -import LabRepository from 'clients/db/LabRepository' import SortRequest from 'clients/db/SortRequest' -import labs, { fetchLabsStart, fetchLabsSuccess, searchLabs } from 'labs/labs-slice' -import Lab from 'model/Lab' +import labs, { fetchLabsStart, fetchLabsSuccess, searchLabs } from '../../labs/labs-slice' +import Lab from '../../model/Lab' +import LabRepository from '../../clients/db/LabRepository' interface SearchContainer { text: string diff --git a/src/__tests__/labs/requests/NewLabRequest.test.tsx b/src/__tests__/labs/requests/NewLabRequest.test.tsx index 100c5431b9..7e280b0e58 100644 --- a/src/__tests__/labs/requests/NewLabRequest.test.tsx +++ b/src/__tests__/labs/requests/NewLabRequest.test.tsx @@ -1,24 +1,21 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import { Button, Typeahead, Label, Alert } from '@hospitalrun/components' -import { mount, ReactWrapper } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' -import { act } from 'react-dom/test-utils' -import { Provider } from 'react-redux' +import NewLabRequest from 'labs/requests/NewLabRequest' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import { mount, ReactWrapper } from 'enzyme' +import { Button, Typeahead, Label, Alert } from '@hospitalrun/components' import { Router } from 'react-router-dom' +import { Provider } from 'react-redux' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - +import { createMemoryHistory } from 'history' +import { act } from 'react-dom/test-utils' import LabRepository from 'clients/db/LabRepository' import PatientRepository from 'clients/db/PatientRepository' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import NewLabRequest from 'labs/requests/NewLabRequest' import Lab from 'model/Lab' import Patient from 'model/Patient' -import * as titleUtil from 'page-header/useTitle' +import * as titleUtil from '../../../page-header/useTitle' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/page-header/ButtonBarProvider.test.tsx b/src/__tests__/page-header/ButtonBarProvider.test.tsx index df4fff4475..af8527735d 100644 --- a/src/__tests__/page-header/ButtonBarProvider.test.tsx +++ b/src/__tests__/page-header/ButtonBarProvider.test.tsx @@ -1,15 +1,12 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { Button } from '@hospitalrun/components' -import { renderHook } from '@testing-library/react-hooks' import React, { useEffect } from 'react' - +import { renderHook } from '@testing-library/react-hooks' import { ButtonBarProvider, useButtons, useButtonToolbarSetter, } from 'page-header/ButtonBarProvider' +import { Button } from '@hospitalrun/components' describe('Button Bar Provider', () => { it('should update and fetch data from the button bar provider', () => { diff --git a/src/__tests__/page-header/ButtonToolBar.test.tsx b/src/__tests__/page-header/ButtonToolBar.test.tsx index e23753cb83..ff369b086d 100644 --- a/src/__tests__/page-header/ButtonToolBar.test.tsx +++ b/src/__tests__/page-header/ButtonToolBar.test.tsx @@ -1,13 +1,10 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { Button } from '@hospitalrun/components' -import { mount } from 'enzyme' import React from 'react' +import { Button } from '@hospitalrun/components' import { mocked } from 'ts-jest/utils' - -import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import ButtonToolBar from 'page-header/ButtonToolBar' +import { mount } from 'enzyme' +import * as ButtonBarProvider from '../../page-header/ButtonBarProvider' +import ButtonToolBar from '../../page-header/ButtonToolBar' describe('Button Tool Bar', () => { beforeEach(() => { diff --git a/src/__tests__/page-header/title-slice.test.ts b/src/__tests__/page-header/title-slice.test.ts index a581cb022b..d15bfef444 100644 --- a/src/__tests__/page-header/title-slice.test.ts +++ b/src/__tests__/page-header/title-slice.test.ts @@ -1,6 +1,5 @@ import { AnyAction } from 'redux' - -import title, { updateTitle, changeTitle } from 'page-header/title-slice' +import title, { updateTitle, changeTitle } from '../../page-header/title-slice' describe('title slice', () => { describe('title reducer', () => { diff --git a/src/__tests__/page-header/useTitle.test.tsx b/src/__tests__/page-header/useTitle.test.tsx index 83ce95f936..a913147e81 100644 --- a/src/__tests__/page-header/useTitle.test.tsx +++ b/src/__tests__/page-header/useTitle.test.tsx @@ -1,11 +1,10 @@ -import { renderHook } from '@testing-library/react-hooks' import React from 'react' -import { Provider } from 'react-redux' +import { renderHook } from '@testing-library/react-hooks' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - -import * as titleSlice from 'page-header/title-slice' -import useTitle from 'page-header/useTitle' +import { Provider } from 'react-redux' +import useTitle from '../../page-header/useTitle' +import * as titleSlice from '../../page-header/title-slice' const store = configureMockStore([thunk]) diff --git a/src/__tests__/patients/GeneralInformation.test.tsx b/src/__tests__/patients/GeneralInformation.test.tsx index 2537879f46..368079a078 100644 --- a/src/__tests__/patients/GeneralInformation.test.tsx +++ b/src/__tests__/patients/GeneralInformation.test.tsx @@ -1,16 +1,13 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { Alert } from '@hospitalrun/components' -import { act } from '@testing-library/react' -import { startOfDay, subYears } from 'date-fns' -import { mount, ReactWrapper } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' import { Router } from 'react-router' - -import Patient from 'model/Patient' +import { mount, ReactWrapper } from 'enzyme' import GeneralInformation from 'patients/GeneralInformation' +import { createMemoryHistory } from 'history' +import { startOfDay, subYears } from 'date-fns' +import { Alert } from '@hospitalrun/components' +import { act } from '@testing-library/react' +import Patient from '../../model/Patient' describe('Error handling', () => { it('should display errors', () => { diff --git a/src/__tests__/patients/Patients.test.tsx b/src/__tests__/patients/Patients.test.tsx index dde70186f9..a37c8979e1 100644 --- a/src/__tests__/patients/Patients.test.tsx +++ b/src/__tests__/patients/Patients.test.tsx @@ -1,23 +1,20 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { mount } from 'enzyme' import React from 'react' -import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' import { MemoryRouter } from 'react-router' import configureMockStore from 'redux-mock-store' +import { mount } from 'enzyme' import thunk from 'redux-thunk' - -import { addBreadcrumbs } from 'breadcrumbs/breadcrumbs-slice' -import PatientRepository from 'clients/db/PatientRepository' -import Dashboard from 'dashboard/Dashboard' -import HospitalRun from 'HospitalRun' -import Patient from 'model/Patient' -import Permissions from 'model/Permissions' -import EditPatient from 'patients/edit/EditPatient' -import NewPatient from 'patients/new/NewPatient' -import ViewPatient from 'patients/view/ViewPatient' +import { act } from 'react-dom/test-utils' +import Permissions from '../../model/Permissions' +import HospitalRun from '../../HospitalRun' +import NewPatient from '../../patients/new/NewPatient' +import { addBreadcrumbs } from '../../breadcrumbs/breadcrumbs-slice' +import Dashboard from '../../dashboard/Dashboard' +import PatientRepository from '../../clients/db/PatientRepository' +import Patient from '../../model/Patient' +import EditPatient from '../../patients/edit/EditPatient' +import ViewPatient from '../../patients/view/ViewPatient' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/allergies/Allergies.test.tsx b/src/__tests__/patients/allergies/Allergies.test.tsx index 5c724ffb44..cd76204a89 100644 --- a/src/__tests__/patients/allergies/Allergies.test.tsx +++ b/src/__tests__/patients/allergies/Allergies.test.tsx @@ -1,21 +1,18 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import * as components from '@hospitalrun/components' -import { act } from '@testing-library/react' -import { mount } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' -import { Provider } from 'react-redux' -import { Router } from 'react-router' +import { mount } from 'enzyme' +import Allergies from 'patients/allergies/Allergies' +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 { Provider } from 'react-redux' +import Patient from 'model/Patient' +import * as components from '@hospitalrun/components' +import { act } from '@testing-library/react' import PatientRepository from 'clients/db/PatientRepository' import Allergy from 'model/Allergy' -import Patient from 'model/Patient' -import Permissions from 'model/Permissions' -import Allergies from 'patients/allergies/Allergies' const mockStore = configureMockStore([thunk]) const history = createMemoryHistory() diff --git a/src/__tests__/patients/allergies/NewAllergyModal.test.tsx b/src/__tests__/patients/allergies/NewAllergyModal.test.tsx index 5027d70a66..c9420eb4a0 100644 --- a/src/__tests__/patients/allergies/NewAllergyModal.test.tsx +++ b/src/__tests__/patients/allergies/NewAllergyModal.test.tsx @@ -1,19 +1,16 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - +import React from 'react' +import NewAllergyModal from 'patients/allergies/NewAllergyModal' +import { mount } from 'enzyme' import { Modal, Alert } from '@hospitalrun/components' import { act } from '@testing-library/react' -import { mount } from 'enzyme' -import React from 'react' -import { Provider } from 'react-redux' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - -import PatientRepository from 'clients/db/PatientRepository' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import Patient from 'model/Patient' -import NewAllergyModal from 'patients/allergies/NewAllergyModal' -import * as patientSlice from 'patients/patient-slice' +import { Provider } from 'react-redux' +import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' +import * as patientSlice from '../../../patients/patient-slice' +import PatientRepository from '../../../clients/db/PatientRepository' +import Patient from '../../../model/Patient' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/appointments/AppointmentsList.test.tsx b/src/__tests__/patients/appointments/AppointmentsList.test.tsx index abaf8ac983..249ce68023 100644 --- a/src/__tests__/patients/appointments/AppointmentsList.test.tsx +++ b/src/__tests__/patients/appointments/AppointmentsList.test.tsx @@ -1,19 +1,16 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import * as components from '@hospitalrun/components' +import React from 'react' import { mount, ReactWrapper } from 'enzyme' import { createMemoryHistory } from 'history' -import React from 'react' -import { act } from 'react-dom/test-utils' -import { Provider } from 'react-redux' -import { Router } from 'react-router' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - import Patient from 'model/Patient' +import { Router } from 'react-router' +import { Provider } from 'react-redux' import AppointmentsList from 'patients/appointments/AppointmentsList' -import * as appointmentsSlice from 'scheduling/appointments/appointments-slice' +import * as components from '@hospitalrun/components' +import { act } from 'react-dom/test-utils' +import * as appointmentsSlice from '../../../scheduling/appointments/appointments-slice' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx b/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx index 0ca475a5f7..9f6ba327cc 100644 --- a/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx +++ b/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx @@ -1,21 +1,18 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - +import React from 'react' +import { mount } from 'enzyme' import { Modal, Alert } from '@hospitalrun/components' import { act } from '@testing-library/react' -import { mount } from 'enzyme' -import React from 'react' -import { Provider } from 'react-redux' +import AddDiagnosisModal from 'patients/diagnoses/AddDiagnosisModal' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - -import PatientRepository from 'clients/db/PatientRepository' -import DatePickerWithLabelFormGroup from 'components/input/DatePickerWithLabelFormGroup' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import Diagnosis from 'model/Diagnosis' -import Patient from 'model/Patient' -import AddDiagnosisModal from 'patients/diagnoses/AddDiagnosisModal' -import * as patientSlice from 'patients/patient-slice' +import { Provider } from 'react-redux' +import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' +import DatePickerWithLabelFormGroup from '../../../components/input/DatePickerWithLabelFormGroup' +import Diagnosis from '../../../model/Diagnosis' +import * as patientSlice from '../../../patients/patient-slice' +import PatientRepository from '../../../clients/db/PatientRepository' +import Patient from '../../../model/Patient' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/diagnoses/Diagnoses.test.tsx b/src/__tests__/patients/diagnoses/Diagnoses.test.tsx index a1e6e8cb94..261932f2a7 100644 --- a/src/__tests__/patients/diagnoses/Diagnoses.test.tsx +++ b/src/__tests__/patients/diagnoses/Diagnoses.test.tsx @@ -1,21 +1,18 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import * as components from '@hospitalrun/components' +import React from 'react' import { mount } from 'enzyme' import { createMemoryHistory } from 'history' -import React from 'react' -import { act } from 'react-dom/test-utils' -import { Provider } from 'react-redux' -import { Router } from 'react-router' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - -import PatientRepository from 'clients/db/PatientRepository' -import Diagnosis from 'model/Diagnosis' import Patient from 'model/Patient' +import Diagnosis from 'model/Diagnosis' import Permissions from 'model/Permissions' +import { Router } from 'react-router' +import { Provider } from 'react-redux' import Diagnoses from 'patients/diagnoses/Diagnoses' +import * as components from '@hospitalrun/components' +import { act } from 'react-dom/test-utils' +import PatientRepository from 'clients/db/PatientRepository' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/edit/EditPatient.test.tsx b/src/__tests__/patients/edit/EditPatient.test.tsx index 8ea0099332..62de9c53a9 100644 --- a/src/__tests__/patients/edit/EditPatient.test.tsx +++ b/src/__tests__/patients/edit/EditPatient.test.tsx @@ -1,23 +1,20 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import { Button } from '@hospitalrun/components' -import { subDays } from 'date-fns' +import React from 'react' import { mount } from 'enzyme' +import { Router, Route } from 'react-router-dom' +import { Provider } from 'react-redux' import { createMemoryHistory } from 'history' -import React from 'react' import { act } from 'react-dom/test-utils' -import { Provider } from 'react-redux' -import { Router, Route } from 'react-router-dom' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' - -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' -import * as titleUtil from 'page-header/useTitle' -import EditPatient from 'patients/edit/EditPatient' -import GeneralInformation from 'patients/GeneralInformation' -import * as patientSlice from 'patients/patient-slice' +import { Button } from '@hospitalrun/components' +import { subDays } from 'date-fns' +import EditPatient from '../../../patients/edit/EditPatient' +import GeneralInformation from '../../../patients/GeneralInformation' +import Patient from '../../../model/Patient' +import * as titleUtil from '../../../page-header/useTitle' +import * as patientSlice from '../../../patients/patient-slice' +import PatientRepository from '../../../clients/db/PatientRepository' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/labs/LabsTab.test.tsx b/src/__tests__/patients/labs/LabsTab.test.tsx index 564fa4c09b..cc5f5c0518 100644 --- a/src/__tests__/patients/labs/LabsTab.test.tsx +++ b/src/__tests__/patients/labs/LabsTab.test.tsx @@ -1,22 +1,19 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import * as components from '@hospitalrun/components' -import format from 'date-fns/format' -import { mount } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' -import { act } from 'react-dom/test-utils' -import { Provider } from 'react-redux' -import { Router } from 'react-router' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - -import LabRepository from 'clients/db/LabRepository' -import Lab from 'model/Lab' -import Patient from 'model/Patient' -import Permissions from 'model/Permissions' -import LabsTab from 'patients/labs/LabsTab' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' +import { Router } from 'react-router' +import { Provider } from 'react-redux' +import * as components from '@hospitalrun/components' +import format from 'date-fns/format' +import { act } from 'react-dom/test-utils' +import LabsTab from '../../../patients/labs/LabsTab' +import Patient from '../../../model/Patient' +import Lab from '../../../model/Lab' +import Permissions from '../../../model/Permissions' +import LabRepository from '../../../clients/db/LabRepository' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/list/ViewPatients.test.tsx b/src/__tests__/patients/list/ViewPatients.test.tsx index eecc854cef..a250d28a1d 100644 --- a/src/__tests__/patients/list/ViewPatients.test.tsx +++ b/src/__tests__/patients/list/ViewPatients.test.tsx @@ -1,21 +1,18 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import { TextInput, Spinner } from '@hospitalrun/components' -import format from 'date-fns/format' -import { mount } from 'enzyme' import React from 'react' -import { act } from 'react-dom/test-utils' -import { Provider } from 'react-redux' +import { mount } from 'enzyme' +import { TextInput, Spinner } from '@hospitalrun/components' import { MemoryRouter } from 'react-router-dom' -import configureStore from 'redux-mock-store' +import { Provider } from 'react-redux' import thunk from 'redux-thunk' +import configureStore from 'redux-mock-store' import { mocked } from 'ts-jest/utils' - -import PatientRepository from 'clients/db/PatientRepository' +import { act } from 'react-dom/test-utils' import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import ViewPatients from 'patients/list/ViewPatients' -import * as patientSlice from 'patients/patients-slice' +import format from 'date-fns/format' +import ViewPatients from '../../../patients/list/ViewPatients' +import PatientRepository from '../../../clients/db/PatientRepository' +import * as patientSlice from '../../../patients/patients-slice' const middlewares = [thunk] const mockStore = configureStore(middlewares) diff --git a/src/__tests__/patients/new/NewPatient.test.tsx b/src/__tests__/patients/new/NewPatient.test.tsx index 28aba74822..dbea001bc0 100644 --- a/src/__tests__/patients/new/NewPatient.test.tsx +++ b/src/__tests__/patients/new/NewPatient.test.tsx @@ -1,23 +1,20 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import * as components from '@hospitalrun/components' +import React from 'react' import { mount } from 'enzyme' +import { Router, Route } from 'react-router-dom' +import { Provider } from 'react-redux' +import { mocked } from 'ts-jest/utils' import { createMemoryHistory } from 'history' -import React from 'react' import { act } from 'react-dom/test-utils' -import { Provider } from 'react-redux' -import { Router, Route } from 'react-router-dom' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import { mocked } from 'ts-jest/utils' - -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' -import * as titleUtil from 'page-header/useTitle' -import GeneralInformation from 'patients/GeneralInformation' -import NewPatient from 'patients/new/NewPatient' -import * as patientSlice from 'patients/patient-slice' +import * as components from '@hospitalrun/components' +import NewPatient from '../../../patients/new/NewPatient' +import GeneralInformation from '../../../patients/GeneralInformation' +import Patient from '../../../model/Patient' +import * as patientSlice from '../../../patients/patient-slice' +import * as titleUtil from '../../../page-header/useTitle' +import PatientRepository from '../../../clients/db/PatientRepository' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/notes/NewNoteModal.test.tsx b/src/__tests__/patients/notes/NewNoteModal.test.tsx index 01d96d764c..8ac6dafcc3 100644 --- a/src/__tests__/patients/notes/NewNoteModal.test.tsx +++ b/src/__tests__/patients/notes/NewNoteModal.test.tsx @@ -1,19 +1,16 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - +import React from 'react' +import NewNoteModal from 'patients/notes/NewNoteModal' +import { mount } from 'enzyme' import { Alert, Modal } from '@hospitalrun/components' import { act } from '@testing-library/react' -import { mount } from 'enzyme' -import React from 'react' -import { Provider } from 'react-redux' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - -import PatientRepository from 'clients/db/PatientRepository' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import Patient from 'model/Patient' -import NewNoteModal from 'patients/notes/NewNoteModal' -import * as patientSlice from 'patients/patient-slice' +import { Provider } from 'react-redux' +import * as patientSlice from '../../../patients/patient-slice' +import PatientRepository from '../../../clients/db/PatientRepository' +import Patient from '../../../model/Patient' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/notes/NotesTab.test.tsx b/src/__tests__/patients/notes/NotesTab.test.tsx index 9e8d36ce76..4cfbfb0f87 100644 --- a/src/__tests__/patients/notes/NotesTab.test.tsx +++ b/src/__tests__/patients/notes/NotesTab.test.tsx @@ -1,21 +1,18 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import * as components from '@hospitalrun/components' -import { mount } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' -import { act } from 'react-dom/test-utils' -import { Provider } from 'react-redux' -import { Router } from 'react-router' -import configureMockStore from 'redux-mock-store' -import thunk from 'redux-thunk' - import PatientRepository from 'clients/db/PatientRepository' import Note from 'model/Note' +import { createMemoryHistory } from 'history' +import configureMockStore from 'redux-mock-store' import Patient from 'model/Patient' -import Permissions from 'model/Permissions' +import thunk from 'redux-thunk' +import { mount } from 'enzyme' +import { Router } from 'react-router' +import { Provider } from 'react-redux' import NoteTab from 'patients/notes/NoteTab' +import * as components from '@hospitalrun/components' +import { act } from 'react-dom/test-utils' +import Permissions from '../../../model/Permissions' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/patient-slice.test.ts b/src/__tests__/patients/patient-slice.test.ts index 9773002c43..dba7899dcd 100644 --- a/src/__tests__/patients/patient-slice.test.ts +++ b/src/__tests__/patients/patient-slice.test.ts @@ -1,16 +1,9 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - -import { addDays } from 'date-fns' import { AnyAction } from 'redux' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' - -import PatientRepository from 'clients/db/PatientRepository' -import Allergy from 'model/Allergy' -import Diagnosis from 'model/Diagnosis' -import Patient from 'model/Patient' -import RelatedPerson from 'model/RelatedPerson' +import { addDays } from 'date-fns' +import * as uuid from '../../util/uuid' import patient, { fetchPatientStart, fetchPatientSuccess, @@ -30,9 +23,13 @@ import patient, { addAllergyError, addDiagnosisError, addRelatedPersonError, -} from 'patients/patient-slice' -import { RootState } from 'store' -import * as uuid from 'util/uuid' +} from '../../patients/patient-slice' +import Patient from '../../model/Patient' +import PatientRepository from '../../clients/db/PatientRepository' +import { RootState } from '../../store' +import RelatedPerson from '../../model/RelatedPerson' +import Diagnosis from '../../model/Diagnosis' +import Allergy from '../../model/Allergy' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/patients-slice.test.ts b/src/__tests__/patients/patients-slice.test.ts index 6908db5b5d..b0f32778a5 100644 --- a/src/__tests__/patients/patients-slice.test.ts +++ b/src/__tests__/patients/patients-slice.test.ts @@ -1,16 +1,13 @@ -// eslint-disable-next-line no-restricted-imports import '../../__mocks__/matchMediaMock' - import { AnyAction } from 'redux' import { mocked } from 'ts-jest/utils' - -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' import patients, { fetchPatientsStart, fetchPatientsSuccess, searchPatients, -} from 'patients/patients-slice' +} from '../../patients/patients-slice' +import Patient from '../../model/Patient' +import PatientRepository from '../../clients/db/PatientRepository' describe('patients slice', () => { beforeEach(() => { diff --git a/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx b/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx index 8f380c78f8..4ef438bd50 100644 --- a/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx +++ b/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx @@ -1,19 +1,16 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - +import React from 'react' +import { ReactWrapper, mount } from 'enzyme' import { Modal, Alert, Typeahead } from '@hospitalrun/components' import { act } from '@testing-library/react' -import { ReactWrapper, mount } from 'enzyme' -import React from 'react' import { Provider } from 'react-redux' -import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' - -import PatientRepository from 'clients/db/PatientRepository' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import configureMockStore, { MockStore } from 'redux-mock-store' import Patient from 'model/Patient' -import * as patientSlice from 'patients/patient-slice' -import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' +import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' +import AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal' +import * as patientSlice from '../../../patients/patient-slice' +import PatientRepository from '../../../clients/db/PatientRepository' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/related-persons/RelatedPersons.test.tsx b/src/__tests__/patients/related-persons/RelatedPersons.test.tsx index 781c108e55..49da165c9c 100644 --- a/src/__tests__/patients/related-persons/RelatedPersons.test.tsx +++ b/src/__tests__/patients/related-persons/RelatedPersons.test.tsx @@ -1,23 +1,20 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import * as components from '@hospitalrun/components' -import { act } from '@testing-library/react' -import { mount } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' -import { Provider } from 'react-redux' import { Router } from 'react-router' -import configureMockStore from 'redux-mock-store' -import thunk from 'redux-thunk' - +import { createMemoryHistory } from 'history' +import { mount } from 'enzyme' +import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab' +import * as components from '@hospitalrun/components' +import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' +import { act } from '@testing-library/react' import PatientRepository from 'clients/db/PatientRepository' import Patient from 'model/Patient' +import configureMockStore from 'redux-mock-store' +import thunk from 'redux-thunk' +import { Provider } from 'react-redux' import Permissions from 'model/Permissions' import RelatedPerson from 'model/RelatedPerson' -import * as patientSlice from 'patients/patient-slice' -import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' -import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab' +import * as patientSlice from '../../../patients/patient-slice' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/util/patient-name-util.test.ts b/src/__tests__/patients/util/patient-name-util.test.ts index acc7ae6037..bc65a1289c 100644 --- a/src/__tests__/patients/util/patient-name-util.test.ts +++ b/src/__tests__/patients/util/patient-name-util.test.ts @@ -1,5 +1,5 @@ -import Patient from 'model/Patient' import { getPatientFullName, getPatientName } from 'patients/util/patient-name-util' +import Patient from 'model/Patient' describe('patient name util', () => { describe('getPatientName', () => { diff --git a/src/__tests__/patients/view/ViewPatient.test.tsx b/src/__tests__/patients/view/ViewPatient.test.tsx index e1b33902a2..3080e73384 100644 --- a/src/__tests__/patients/view/ViewPatient.test.tsx +++ b/src/__tests__/patients/view/ViewPatient.test.tsx @@ -1,31 +1,28 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import { TabsHeader, Tab } from '@hospitalrun/components' -import { mount } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' -import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' +import { mount } from 'enzyme' +import { mocked } from 'ts-jest/utils' +import { act } from 'react-dom/test-utils' import { Route, Router } from 'react-router-dom' +import { TabsHeader, Tab } from '@hospitalrun/components' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import { mocked } from 'ts-jest/utils' - -import LabRepository from 'clients/db/LabRepository' -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' -import Permissions from 'model/Permissions' +import GeneralInformation from 'patients/GeneralInformation' +import { createMemoryHistory } from 'history' +import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab' import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import * as titleUtil from 'page-header/useTitle' import Allergies from 'patients/allergies/Allergies' import Diagnoses from 'patients/diagnoses/Diagnoses' -import GeneralInformation from 'patients/GeneralInformation' -import LabsTab from 'patients/labs/LabsTab' import NotesTab from 'patients/notes/NoteTab' -import * as patientSlice from 'patients/patient-slice' -import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab' -import ViewPatient from 'patients/view/ViewPatient' +import Patient from '../../../model/Patient' +import PatientRepository from '../../../clients/db/PatientRepository' +import * as titleUtil from '../../../page-header/useTitle' +import ViewPatient from '../../../patients/view/ViewPatient' +import * as patientSlice from '../../../patients/patient-slice' +import Permissions from '../../../model/Permissions' +import LabsTab from '../../../patients/labs/LabsTab' +import LabRepository from '../../../clients/db/LabRepository' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx b/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx index 379ad34e07..27828f2ce3 100644 --- a/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx +++ b/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx @@ -1,16 +1,13 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import { Typeahead, Alert } from '@hospitalrun/components' -import { act } from '@testing-library/react' -import { roundToNearestMinutes, addMinutes } from 'date-fns' -import { mount, ReactWrapper } from 'enzyme' import React from 'react' - -import PatientRepository from 'clients/db/PatientRepository' +import { mount, ReactWrapper } from 'enzyme' +import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' import Appointment from 'model/Appointment' +import { roundToNearestMinutes, addMinutes } from 'date-fns' +import { Typeahead, Alert } from '@hospitalrun/components' +import PatientRepository from 'clients/db/PatientRepository' import Patient from 'model/Patient' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' +import { act } from '@testing-library/react' describe('AppointmentDetailForm', () => { describe('Error handling', () => { diff --git a/src/__tests__/scheduling/appointments/Appointments.test.tsx b/src/__tests__/scheduling/appointments/Appointments.test.tsx index 38130edda7..c6acd3459a 100644 --- a/src/__tests__/scheduling/appointments/Appointments.test.tsx +++ b/src/__tests__/scheduling/appointments/Appointments.test.tsx @@ -1,25 +1,22 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import { mount } from 'enzyme' import React from 'react' -import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' import { MemoryRouter } from 'react-router' import configureMockStore from 'redux-mock-store' +import { mount } from 'enzyme' import thunk from 'redux-thunk' - -import { addBreadcrumbs } from 'breadcrumbs/breadcrumbs-slice' -import AppointmentRepository from 'clients/db/AppointmentRepository' -import PatientRepository from 'clients/db/PatientRepository' -import Dashboard from 'dashboard/Dashboard' -import HospitalRun from 'HospitalRun' -import Appointment from 'model/Appointment' -import Patient from 'model/Patient' -import Permissions from 'model/Permissions' -import EditAppointment from 'scheduling/appointments/edit/EditAppointment' +import { act } from 'react-dom/test-utils' import NewAppointment from 'scheduling/appointments/new/NewAppointment' +import EditAppointment from 'scheduling/appointments/edit/EditAppointment' import ViewAppointments from 'scheduling/appointments/ViewAppointments' +import Permissions from '../../../model/Permissions' +import HospitalRun from '../../../HospitalRun' +import { addBreadcrumbs } from '../../../breadcrumbs/breadcrumbs-slice' +import Dashboard from '../../../dashboard/Dashboard' +import PatientRepository from '../../../clients/db/PatientRepository' +import AppointmentRepository from '../../../clients/db/AppointmentRepository' +import Patient from '../../../model/Patient' +import Appointment from '../../../model/Appointment' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx b/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx index 412de4950e..2f5db67cf3 100644 --- a/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx +++ b/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx @@ -1,23 +1,20 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import { Calendar } from '@hospitalrun/components' -import { act } from '@testing-library/react' -import { mount } from 'enzyme' import React from 'react' -import { Provider } from 'react-redux' +import { mount } from 'enzyme' import { MemoryRouter } from 'react-router-dom' +import { Provider } from 'react-redux' +import ViewAppointments from 'scheduling/appointments/ViewAppointments' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { mocked } from 'ts-jest/utils' - -import AppointmentRepository from 'clients/db/AppointmentRepository' +import { Calendar } from '@hospitalrun/components' +import { act } from '@testing-library/react' import PatientRepository from 'clients/db/PatientRepository' -import Appointment from 'model/Appointment' +import { mocked } from 'ts-jest/utils' import Patient from 'model/Patient' import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import * as titleUtil from 'page-header/useTitle' -import ViewAppointments from 'scheduling/appointments/ViewAppointments' +import AppointmentRepository from 'clients/db/AppointmentRepository' +import Appointment from 'model/Appointment' +import * as titleUtil from '../../../page-header/useTitle' describe('ViewAppointments', () => { const expectedAppointments = [ diff --git a/src/__tests__/scheduling/appointments/appointment-slice.test.ts b/src/__tests__/scheduling/appointments/appointment-slice.test.ts index ea1714dcf7..50c8ecedbd 100644 --- a/src/__tests__/scheduling/appointments/appointment-slice.test.ts +++ b/src/__tests__/scheduling/appointments/appointment-slice.test.ts @@ -1,14 +1,12 @@ -// eslint-disable-next-line no-restricted-imports import '../../../__mocks__/matchMediaMock' - -import { subDays } from 'date-fns' import { AnyAction } from 'redux' -import { mocked } from 'ts-jest/utils' - +import Appointment from 'model/Appointment' import AppointmentRepository from 'clients/db/AppointmentRepository' +import { mocked } from 'ts-jest/utils' import PatientRepository from 'clients/db/PatientRepository' -import Appointment from 'model/Appointment' import Patient from 'model/Patient' +import { subDays } from 'date-fns' + import appointment, { fetchAppointmentStart, fetchAppointmentSuccess, @@ -24,7 +22,7 @@ import appointment, { deleteAppointment, deleteAppointmentStart, deleteAppointmentSuccess, -} from 'scheduling/appointments/appointment-slice' +} from '../../../scheduling/appointments/appointment-slice' describe('appointment slice', () => { describe('appointment reducer', () => { diff --git a/src/__tests__/scheduling/appointments/appointments-slice.test.ts b/src/__tests__/scheduling/appointments/appointments-slice.test.ts index acb0ac62bf..bb40a08644 100644 --- a/src/__tests__/scheduling/appointments/appointments-slice.test.ts +++ b/src/__tests__/scheduling/appointments/appointments-slice.test.ts @@ -1,13 +1,13 @@ import { AnyAction } from 'redux' import { mocked } from 'ts-jest/utils' - -import AppointmentRepository from 'clients/db/AppointmentRepository' import Appointment from 'model/Appointment' +import AppointmentRepository from 'clients/db/AppointmentRepository' + import appointments, { fetchAppointmentsStart, fetchAppointmentsSuccess, fetchAppointments, -} from 'scheduling/appointments/appointments-slice' +} from '../../../scheduling/appointments/appointments-slice' describe('appointments slice', () => { describe('appointments reducer', () => { diff --git a/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx b/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx index 0db0f564e3..0a4cdca935 100644 --- a/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx +++ b/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx @@ -1,26 +1,23 @@ -// eslint-disable-next-line no-restricted-imports import '../../../../__mocks__/matchMediaMock' - -import { Button } from '@hospitalrun/components' -import { roundToNearestMinutes, addMinutes } from 'date-fns' +import React from 'react' import { mount } from 'enzyme' +import { Router, Route } from 'react-router-dom' +import { Provider } from 'react-redux' +import { mocked } from 'ts-jest/utils' import { createMemoryHistory } from 'history' -import React from 'react' import { act } from 'react-dom/test-utils' -import { Provider } from 'react-redux' -import { Router, Route } from 'react-router-dom' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import { mocked } from 'ts-jest/utils' - -import AppointmentRepository from 'clients/db/AppointmentRepository' -import PatientRepository from 'clients/db/PatientRepository' -import Appointment from 'model/Appointment' -import Patient from 'model/Patient' -import * as titleUtil from 'page-header/useTitle' -import * as appointmentSlice from 'scheduling/appointments/appointment-slice' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import EditAppointment from 'scheduling/appointments/edit/EditAppointment' +import { roundToNearestMinutes, addMinutes } from 'date-fns' +import { Button } from '@hospitalrun/components' +import EditAppointment from '../../../../scheduling/appointments/edit/EditAppointment' +import AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm' +import Appointment from '../../../../model/Appointment' +import Patient from '../../../../model/Patient' +import * as titleUtil from '../../../../page-header/useTitle' +import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice' +import AppointmentRepository from '../../../../clients/db/AppointmentRepository' +import PatientRepository from '../../../../clients/db/PatientRepository' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx b/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx index b4ae314b93..492add87cc 100644 --- a/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx +++ b/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx @@ -1,27 +1,24 @@ -// eslint-disable-next-line no-restricted-imports import '../../../../__mocks__/matchMediaMock' - -import * as components from '@hospitalrun/components' -import { act } from '@testing-library/react' -import { roundToNearestMinutes, addMinutes } from 'date-fns' -import { mount } from 'enzyme' -import { createMemoryHistory, MemoryHistory } from 'history' import React from 'react' -import { Provider } from 'react-redux' +import NewAppointment from 'scheduling/appointments/new/NewAppointment' import { Router, Route } from 'react-router' +import { Provider } from 'react-redux' +import { mount } from 'enzyme' +import { roundToNearestMinutes, addMinutes } from 'date-fns' +import { createMemoryHistory, MemoryHistory } from 'history' +import { act } from '@testing-library/react' +import AppointmentRepository from 'clients/db/AppointmentRepository' +import { mocked } from 'ts-jest/utils' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import { mocked } from 'ts-jest/utils' - -import AppointmentRepository from 'clients/db/AppointmentRepository' -import LabRepository from 'clients/db/LabRepository' import Appointment from 'model/Appointment' -import Lab from 'model/Lab' import Patient from 'model/Patient' -import * as titleUtil from 'page-header/useTitle' -import * as appointmentSlice from 'scheduling/appointments/appointment-slice' import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import NewAppointment from 'scheduling/appointments/new/NewAppointment' +import * as components from '@hospitalrun/components' +import * as titleUtil from '../../../../page-header/useTitle' +import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice' +import LabRepository from '../../../../clients/db/LabRepository' +import Lab from '../../../../model/Lab' const mockStore = configureMockStore([thunk]) const mockedComponents = mocked(components, true) diff --git a/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts b/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts index 8b443054a3..292e71cd9d 100644 --- a/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts +++ b/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts @@ -1,5 +1,5 @@ import Appointment from 'model/Appointment' -import { getAppointmentLabel } from 'scheduling/appointments/util/scheduling-appointment.util' +import { getAppointmentLabel } from '../../../../scheduling/appointments/util/scheduling-appointment.util' describe('scheduling appointment util', () => { describe('getAppointmentLabel', () => { diff --git a/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx b/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx index b9ddafdb7d..e090672c51 100644 --- a/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx +++ b/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx @@ -1,27 +1,24 @@ -// eslint-disable-next-line no-restricted-imports import '../../../../__mocks__/matchMediaMock' - -import * as components from '@hospitalrun/components' -import { mount } from 'enzyme' -import { createMemoryHistory } from 'history' import React from 'react' -import { act } from 'react-dom/test-utils' +import { mount } from 'enzyme' import { Provider } from 'react-redux' -import { Router, Route } from 'react-router' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import { mocked } from 'ts-jest/utils' - +import Appointment from 'model/Appointment' +import ViewAppointment from 'scheduling/appointments/view/ViewAppointment' +import { Router, Route } from 'react-router' +import { createMemoryHistory } from 'history' import AppointmentRepository from 'clients/db/AppointmentRepository' +import { mocked } from 'ts-jest/utils' +import { act } from 'react-dom/test-utils' +import * as components from '@hospitalrun/components' +import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' import PatientRepository from 'clients/db/PatientRepository' -import Appointment from 'model/Appointment' import Patient from 'model/Patient' -import Permissions from 'model/Permissions' import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import * as titleUtil from 'page-header/useTitle' -import * as appointmentSlice from 'scheduling/appointments/appointment-slice' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import ViewAppointment from 'scheduling/appointments/view/ViewAppointment' +import Permissions from 'model/Permissions' +import * as titleUtil from '../../../../page-header/useTitle' +import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/user/user-slice.test.ts b/src/__tests__/user/user-slice.test.ts index 1507489448..71ce829406 100644 --- a/src/__tests__/user/user-slice.test.ts +++ b/src/__tests__/user/user-slice.test.ts @@ -1,5 +1,5 @@ -import Permissions from 'model/Permissions' -import user, { fetchPermissions } from 'user/user-slice' +import user, { fetchPermissions } from '../../user/user-slice' +import Permissions from '../../model/Permissions' describe('user slice', () => { it('should handle the FETCH_PERMISSIONS action', () => { diff --git a/src/__tests__/utils/generateCode.test.ts b/src/__tests__/utils/generateCode.test.ts index 272788c78d..22a44dd2a5 100644 --- a/src/__tests__/utils/generateCode.test.ts +++ b/src/__tests__/utils/generateCode.test.ts @@ -1,4 +1,4 @@ -import generateCode from 'util/generateCode' +import generateCode from '../../util/generateCode' it('should generate a code with prefix A-', () => { const generatedCode = generateCode('A') diff --git a/src/breadcrumbs/Breadcrumbs.tsx b/src/breadcrumbs/Breadcrumbs.tsx index 7a4d99d67e..263f8e9476 100644 --- a/src/breadcrumbs/Breadcrumbs.tsx +++ b/src/breadcrumbs/Breadcrumbs.tsx @@ -1,10 +1,9 @@ -import { Breadcrumb, BreadcrumbItem } from '@hospitalrun/components' import React from 'react' -import { useTranslation } from 'react-i18next' -import { useSelector } from 'react-redux' import { useHistory } from 'react-router' - -import { RootState } from 'store' +import { useSelector } from 'react-redux' +import { useTranslation } from 'react-i18next' +import { Breadcrumb, BreadcrumbItem } from '@hospitalrun/components' +import { RootState } from '../store' const Breadcrumbs = () => { const history = useHistory() diff --git a/src/breadcrumbs/breadcrumbs-slice.ts b/src/breadcrumbs/breadcrumbs-slice.ts index ed800b002c..86a689e0d8 100644 --- a/src/breadcrumbs/breadcrumbs-slice.ts +++ b/src/breadcrumbs/breadcrumbs-slice.ts @@ -1,5 +1,4 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' - import Breadcrumb from 'model/Breadcrumb' interface BreadcrumbsState { diff --git a/src/breadcrumbs/useAddBreadcrumbs.ts b/src/breadcrumbs/useAddBreadcrumbs.ts index 182deafe60..76d68e80ce 100644 --- a/src/breadcrumbs/useAddBreadcrumbs.ts +++ b/src/breadcrumbs/useAddBreadcrumbs.ts @@ -1,8 +1,7 @@ import { useEffect } from 'react' import { useDispatch } from 'react-redux' - -import { addBreadcrumbs, removeBreadcrumbs } from 'breadcrumbs/breadcrumbs-slice' import Breadcrumb from 'model/Breadcrumb' +import { addBreadcrumbs, removeBreadcrumbs } from './breadcrumbs-slice' export default function useAddBreadcrumbs(breadcrumbs: Breadcrumb[], withDashboard = false): void { const dispatch = useDispatch() diff --git a/src/clients/db/AppointmentRepository.ts b/src/clients/db/AppointmentRepository.ts index 4fbc02c328..42ba8dce42 100644 --- a/src/clients/db/AppointmentRepository.ts +++ b/src/clients/db/AppointmentRepository.ts @@ -1,10 +1,9 @@ import escapeStringRegexp from 'escape-string-regexp' - -import Repository from 'clients/db/Repository' -import { appointments } from 'config/pouchdb' import Appointment from 'model/Appointment' +import { appointments } from 'config/pouchdb' +import Repository from './Repository' -class AppointmentRepository extends Repository { +export class AppointmentRepository extends Repository { constructor() { super(appointments) } diff --git a/src/clients/db/LabRepository.ts b/src/clients/db/LabRepository.ts index c6c1565b19..3581c96e12 100644 --- a/src/clients/db/LabRepository.ts +++ b/src/clients/db/LabRepository.ts @@ -1,15 +1,15 @@ -import Repository from 'clients/db/Repository' -import SortRequest from 'clients/db/SortRequest' -import { labs } from 'config/pouchdb' import Lab from 'model/Lab' -import generateCode from 'util/generateCode' +import generateCode from '../../util/generateCode' +import Repository from './Repository' +import { labs } from '../../config/pouchdb' +import SortRequest from './SortRequest' interface SearchContainer { text: string status: 'requested' | 'completed' | 'canceled' | 'all' defaultSortRequest: SortRequest } -class LabRepository extends Repository { +export class LabRepository extends Repository { constructor() { super(labs) } diff --git a/src/clients/db/PatientRepository.ts b/src/clients/db/PatientRepository.ts index a72db46df0..172e380a7f 100644 --- a/src/clients/db/PatientRepository.ts +++ b/src/clients/db/PatientRepository.ts @@ -1,11 +1,10 @@ import escapeStringRegexp from 'escape-string-regexp' +import Patient from '../../model/Patient' +import generateCode from '../../util/generateCode' +import Repository from './Repository' +import { patients } from '../../config/pouchdb' -import Repository from 'clients/db/Repository' -import { patients } from 'config/pouchdb' -import Patient from 'model/Patient' -import generateCode from 'util/generateCode' - -class PatientRepository extends Repository { +export class PatientRepository extends Repository { constructor() { super(patients) } diff --git a/src/clients/db/Repository.ts b/src/clients/db/Repository.ts index 76a07d1f0e..df56a1d3a9 100644 --- a/src/clients/db/Repository.ts +++ b/src/clients/db/Repository.ts @@ -1,8 +1,7 @@ /* eslint "@typescript-eslint/camelcase": "off" */ import { v4 as uuidv4 } from 'uuid' - -import SortRequest, { Unsorted } from 'clients/db/SortRequest' -import AbstractDBModel from 'model/AbstractDBModel' +import AbstractDBModel from '../../model/AbstractDBModel' +import SortRequest, { Unsorted } from './SortRequest' function mapDocument(document: any): any { const { _id, _rev, ...values } = document diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 04bbd8afcd..fe90ff8df7 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -1,7 +1,7 @@ -import { Navbar as HospitalRunNavbar } from '@hospitalrun/components' import React from 'react' -import { useTranslation } from 'react-i18next' import { useHistory } from 'react-router' +import { Navbar as HospitalRunNavbar } from '@hospitalrun/components' +import { useTranslation } from 'react-i18next' const Navbar = () => { const { t } = useTranslation() diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index c723a2ce7c..06134b07f8 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -1,11 +1,10 @@ -import { List, ListItem, Icon } from '@hospitalrun/components' import React, { useState, CSSProperties } from 'react' +import { List, ListItem, Icon } from '@hospitalrun/components' import { useTranslation } from 'react-i18next' -import { useSelector, useDispatch } from 'react-redux' import { useLocation, useHistory } from 'react-router' - -import { updateSidebar } from 'components/component-slice' -import { RootState } from 'store' +import { useSelector, useDispatch } from 'react-redux' +import { RootState } from '../store' +import { updateSidebar } from './component-slice' const Sidebar = () => { const dispatch = useDispatch() diff --git a/src/components/component-slice.ts b/src/components/component-slice.ts index 4171b32bc1..62a6aeeefe 100644 --- a/src/components/component-slice.ts +++ b/src/components/component-slice.ts @@ -1,6 +1,5 @@ import { createSlice } from '@reduxjs/toolkit' - -import { AppThunk } from 'store' +import { AppThunk } from '../store' interface ComponentState { sidebarCollapsed: boolean diff --git a/src/components/input/DatePickerWithLabelFormGroup.tsx b/src/components/input/DatePickerWithLabelFormGroup.tsx index a2b15d6b69..ea9b923fc0 100644 --- a/src/components/input/DatePickerWithLabelFormGroup.tsx +++ b/src/components/input/DatePickerWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import { Label, DateTimePicker } from '@hospitalrun/components' import React from 'react' +import { Label, DateTimePicker } from '@hospitalrun/components' interface Props { name: string diff --git a/src/components/input/DateTimePickerWithLabelFormGroup.tsx b/src/components/input/DateTimePickerWithLabelFormGroup.tsx index 5f2e9caefa..f31a186692 100644 --- a/src/components/input/DateTimePickerWithLabelFormGroup.tsx +++ b/src/components/input/DateTimePickerWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import { Label, DateTimePicker } from '@hospitalrun/components' import React from 'react' +import { Label, DateTimePicker } from '@hospitalrun/components' interface Props { name: string diff --git a/src/components/input/SelectWithLableFormGroup.tsx b/src/components/input/SelectWithLableFormGroup.tsx index be9874aca1..e7451d1e43 100644 --- a/src/components/input/SelectWithLableFormGroup.tsx +++ b/src/components/input/SelectWithLableFormGroup.tsx @@ -1,5 +1,5 @@ -import { Label, Select } from '@hospitalrun/components' import React from 'react' +import { Label, Select } from '@hospitalrun/components' interface Option { label: string diff --git a/src/components/input/TextFieldWithLabelFormGroup.tsx b/src/components/input/TextFieldWithLabelFormGroup.tsx index 5fcd4b4863..3848ddf02a 100644 --- a/src/components/input/TextFieldWithLabelFormGroup.tsx +++ b/src/components/input/TextFieldWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import { TextField, Label } from '@hospitalrun/components' import React from 'react' +import { TextField, Label } from '@hospitalrun/components' interface Props { value: string diff --git a/src/components/input/TextInputWithLabelFormGroup.tsx b/src/components/input/TextInputWithLabelFormGroup.tsx index 0cb7efb972..2e68c196d6 100644 --- a/src/components/input/TextInputWithLabelFormGroup.tsx +++ b/src/components/input/TextInputWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import { TextInput, Label } from '@hospitalrun/components' import React from 'react' +import { TextInput, Label } from '@hospitalrun/components' interface Props { value: string diff --git a/src/dashboard/Dashboard.tsx b/src/dashboard/Dashboard.tsx index 9ff2257824..bf295875dc 100644 --- a/src/dashboard/Dashboard.tsx +++ b/src/dashboard/Dashboard.tsx @@ -1,7 +1,6 @@ import React from 'react' import { useTranslation } from 'react-i18next' - -import useTitle from 'page-header/useTitle' +import useTitle from '../page-header/useTitle' const Dashboard: React.FC = () => { const { t } = useTranslation() diff --git a/src/i18n.ts b/src/i18n.ts index 946f858d9f..b237cb7da6 100644 --- a/src/i18n.ts +++ b/src/i18n.ts @@ -2,17 +2,17 @@ import i18n from 'i18next' import LanguageDetector from 'i18next-browser-languagedetector' import { initReactI18next } from 'react-i18next' -import translationAR from 'locales/ar/translations' -import translationDE from 'locales/de/translations' -import translationEnUs from 'locales/enUs/translations' -import translationES from 'locales/es/translations' -import translationFR from 'locales/fr/translations' -import translationIN from 'locales/in/translations' -import translationIT from 'locales/it/translations' -import translationJA from 'locales/ja/translations' -import translationPtBR from 'locales/ptBr/translations' -import translationRU from 'locales/ru/translations' -import translationZR from 'locales/zr/translations' +import translationAR from './locales/ar/translations' +import translationDE from './locales/de/translations' +import translationEnUs from './locales/enUs/translations' +import translationES from './locales/es/translations' +import translationFR from './locales/fr/translations' +import translationIN from './locales/in/translations' +import translationJA from './locales/ja/translations' +import translationPtBR from './locales/ptBr/translations' +import translationRU from './locales/ru/translations' +import translationZR from './locales/zr/translations' +import translationIT from './locales/it/translations' const resources = { it: { diff --git a/src/index.tsx b/src/index.tsx index ed4cd67c6a..71b2ba1135 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,11 +1,10 @@ import React from 'react' import ReactDOM from 'react-dom' - import '@hospitalrun/components/scss/main.scss' -import 'index.css' -import App from 'App' -import * as serviceWorker from 'serviceWorker' -import 'i18n' +import './index.css' +import App from './App' +import * as serviceWorker from './serviceWorker' +import './i18n' ReactDOM.render(, document.getElementById('root')) diff --git a/src/labs/Labs.tsx b/src/labs/Labs.tsx index 7f93d75bc2..a610af4052 100644 --- a/src/labs/Labs.tsx +++ b/src/labs/Labs.tsx @@ -1,14 +1,13 @@ import React from 'react' -import { useSelector } from 'react-redux' +import PrivateRoute from 'components/PrivateRoute' import { Switch } from 'react-router' - import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import PrivateRoute from 'components/PrivateRoute' -import NewLabRequest from 'labs/requests/NewLabRequest' -import ViewLab from 'labs/ViewLab' -import LabRequests from 'labs/ViewLabs' +import { useSelector } from 'react-redux' import Permissions from 'model/Permissions' -import { RootState } from 'store' +import LabRequests from './ViewLabs' +import NewLabRequest from './requests/NewLabRequest' +import ViewLab from './ViewLab' +import { RootState } from '../store' const Labs = () => { const { permissions } = useSelector((state: RootState) => state.user) diff --git a/src/labs/ViewLab.tsx b/src/labs/ViewLab.tsx index 7b97330a51..6f58f2c9e6 100644 --- a/src/labs/ViewLab.tsx +++ b/src/labs/ViewLab.tsx @@ -1,18 +1,17 @@ -import { Row, Column, Badge, Button, Alert } from '@hospitalrun/components' -import format from 'date-fns/format' import React, { useEffect, useState } from 'react' -import { useTranslation } from 'react-i18next' -import { useSelector, useDispatch } from 'react-redux' import { useParams, useHistory } from 'react-router' - -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import { cancelLab, completeLab, updateLab, fetchLab } from 'labs/lab-slice' +import format from 'date-fns/format' import Lab from 'model/Lab' import Patient from 'model/Patient' -import Permissions from 'model/Permissions' import useTitle from 'page-header/useTitle' -import { RootState } from 'store' +import { useTranslation } from 'react-i18next' +import { Row, Column, Badge, Button, Alert } from '@hospitalrun/components' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import { useSelector, useDispatch } from 'react-redux' +import Permissions from 'model/Permissions' +import { RootState } from '../store' +import { cancelLab, completeLab, updateLab, fetchLab } from './lab-slice' const getTitle = (patient: Patient | undefined, lab: Lab | undefined) => patient && lab ? `${lab.type} for ${patient.fullName}(${lab.code})` : '' diff --git a/src/labs/ViewLabs.tsx b/src/labs/ViewLabs.tsx index 751c5c9772..012b26a836 100644 --- a/src/labs/ViewLabs.tsx +++ b/src/labs/ViewLabs.tsx @@ -1,19 +1,18 @@ -import { Spinner, Button } from '@hospitalrun/components' -import format from 'date-fns/format' import React, { useState, useEffect, useCallback } from 'react' -import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' +import useTitle from 'page-header/useTitle' +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 SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import useDebounce from 'hooks/debounce' -import { searchLabs } from 'labs/labs-slice' import Lab from 'model/Lab' import Permissions from 'model/Permissions' -import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import useTitle from 'page-header/useTitle' -import { RootState } from 'store' +import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import { RootState } from '../store' +import { searchLabs } from './labs-slice' +import useDebounce from '../hooks/debounce' type filter = 'requested' | 'completed' | 'canceled' | 'all' diff --git a/src/labs/lab-slice.ts b/src/labs/lab-slice.ts index 5fc15f7a21..224ffbd722 100644 --- a/src/labs/lab-slice.ts +++ b/src/labs/lab-slice.ts @@ -1,10 +1,9 @@ -import { createSlice, PayloadAction } from '@reduxjs/toolkit' - -import LabRepository from 'clients/db/LabRepository' -import PatientRepository from 'clients/db/PatientRepository' import Lab from 'model/Lab' import Patient from 'model/Patient' +import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { AppThunk } from 'store' +import LabRepository from 'clients/db/LabRepository' +import PatientRepository from 'clients/db/PatientRepository' interface Error { result?: string diff --git a/src/labs/labs-slice.ts b/src/labs/labs-slice.ts index 0a453976f9..db956992da 100644 --- a/src/labs/labs-slice.ts +++ b/src/labs/labs-slice.ts @@ -1,9 +1,8 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' - -import LabRepository from 'clients/db/LabRepository' -import SortRequest from 'clients/db/SortRequest' -import Lab from 'model/Lab' -import { AppThunk } from 'store' +import Lab from '../model/Lab' +import LabRepository from '../clients/db/LabRepository' +import SortRequest from '../clients/db/SortRequest' +import { AppThunk } from '../store' interface LabsState { isLoading: boolean diff --git a/src/labs/requests/NewLabRequest.tsx b/src/labs/requests/NewLabRequest.tsx index 8a5392c078..fb4035686e 100644 --- a/src/labs/requests/NewLabRequest.tsx +++ b/src/labs/requests/NewLabRequest.tsx @@ -1,17 +1,16 @@ -import { Typeahead, Label, Button, Alert } from '@hospitalrun/components' import React, { useState } from 'react' +import useTitle from 'page-header/useTitle' import { useTranslation } from 'react-i18next' -import { useDispatch, useSelector } from 'react-redux' -import { useHistory } from 'react-router' - -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import { Typeahead, Label, Button, Alert } from '@hospitalrun/components' import PatientRepository from 'clients/db/PatientRepository' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import Patient from 'model/Patient' import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import { requestLab } from 'labs/lab-slice' +import { useHistory } from 'react-router' import Lab from 'model/Lab' -import Patient from 'model/Patient' -import useTitle from 'page-header/useTitle' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import { useDispatch, useSelector } from 'react-redux' +import { requestLab } from 'labs/lab-slice' import { RootState } from 'store' const NewLabRequest = () => { diff --git a/src/locales/ar/translations/index.ts b/src/locales/ar/translations/index.ts index 1b22bc9fc8..e948f4340c 100644 --- a/src/locales/ar/translations/index.ts +++ b/src/locales/ar/translations/index.ts @@ -1,7 +1,7 @@ -import actions from 'locales/ar/translations/actions' -import dashboard from 'locales/ar/translations/dashboard' -import patient from 'locales/ar/translations/patient' -import patients from 'locales/ar/translations/patients' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' export default { ...actions, diff --git a/src/locales/de/translations/index.ts b/src/locales/de/translations/index.ts index f4a90cbd54..e948f4340c 100644 --- a/src/locales/de/translations/index.ts +++ b/src/locales/de/translations/index.ts @@ -1,7 +1,7 @@ -import actions from 'locales/de/translations/actions' -import dashboard from 'locales/de/translations/dashboard' -import patient from 'locales/de/translations/patient' -import patients from 'locales/de/translations/patients' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' export default { ...actions, diff --git a/src/locales/enUs/translations/index.ts b/src/locales/enUs/translations/index.ts index 4d17464895..d6bf2a1db2 100644 --- a/src/locales/enUs/translations/index.ts +++ b/src/locales/enUs/translations/index.ts @@ -1,11 +1,11 @@ -import actions from 'locales/enUs/translations/actions' -import dashboard from 'locales/enUs/translations/dashboard' -import labs from 'locales/enUs/translations/labs' -import patient from 'locales/enUs/translations/patient' -import patients from 'locales/enUs/translations/patients' -import scheduling from 'locales/enUs/translations/scheduling' -import sex from 'locales/enUs/translations/sex' -import states from 'locales/enUs/translations/states' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' +import scheduling from './scheduling' +import states from './states' +import sex from './sex' +import labs from './labs' export default { ...actions, diff --git a/src/locales/es/translations/index.ts b/src/locales/es/translations/index.ts index 09761d8b04..e948f4340c 100644 --- a/src/locales/es/translations/index.ts +++ b/src/locales/es/translations/index.ts @@ -1,7 +1,7 @@ -import actions from 'locales/es/translations/actions' -import dashboard from 'locales/es/translations/dashboard' -import patient from 'locales/es/translations/patient' -import patients from 'locales/es/translations/patients' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' export default { ...actions, diff --git a/src/locales/fr/translations/index.ts b/src/locales/fr/translations/index.ts index 3066a23d72..d6bf2a1db2 100644 --- a/src/locales/fr/translations/index.ts +++ b/src/locales/fr/translations/index.ts @@ -1,11 +1,11 @@ -import actions from 'locales/fr/translations/actions' -import dashboard from 'locales/fr/translations/dashboard' -import labs from 'locales/fr/translations/labs' -import patient from 'locales/fr/translations/patient' -import patients from 'locales/fr/translations/patients' -import scheduling from 'locales/fr/translations/scheduling' -import sex from 'locales/fr/translations/sex' -import states from 'locales/fr/translations/states' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' +import scheduling from './scheduling' +import states from './states' +import sex from './sex' +import labs from './labs' export default { ...actions, diff --git a/src/locales/in/translations/index.ts b/src/locales/in/translations/index.ts index 9419fb982d..e948f4340c 100644 --- a/src/locales/in/translations/index.ts +++ b/src/locales/in/translations/index.ts @@ -1,7 +1,7 @@ -import actions from 'locales/in/translations/actions' -import dashboard from 'locales/in/translations/dashboard' -import patient from 'locales/in/translations/patient' -import patients from 'locales/in/translations/patients' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' export default { ...actions, diff --git a/src/locales/it/translations/index.ts b/src/locales/it/translations/index.ts index 14d1ad1f3b..d6bf2a1db2 100644 --- a/src/locales/it/translations/index.ts +++ b/src/locales/it/translations/index.ts @@ -1,11 +1,11 @@ -import actions from 'locales/it/translations/actions' -import dashboard from 'locales/it/translations/dashboard' -import labs from 'locales/it/translations/labs' -import patient from 'locales/it/translations/patient' -import patients from 'locales/it/translations/patients' -import scheduling from 'locales/it/translations/scheduling' -import sex from 'locales/it/translations/sex' -import states from 'locales/it/translations/states' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' +import scheduling from './scheduling' +import states from './states' +import sex from './sex' +import labs from './labs' export default { ...actions, diff --git a/src/locales/ja/translations/index.ts b/src/locales/ja/translations/index.ts index 9d927e389f..e948f4340c 100644 --- a/src/locales/ja/translations/index.ts +++ b/src/locales/ja/translations/index.ts @@ -1,7 +1,7 @@ -import actions from 'locales/ja/translations/actions' -import dashboard from 'locales/ja/translations/dashboard' -import patient from 'locales/ja/translations/patient' -import patients from 'locales/ja/translations/patients' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' export default { ...actions, diff --git a/src/locales/ptBr/translations/index.ts b/src/locales/ptBr/translations/index.ts index 786d30d39e..d6bf2a1db2 100644 --- a/src/locales/ptBr/translations/index.ts +++ b/src/locales/ptBr/translations/index.ts @@ -1,11 +1,11 @@ -import actions from 'locales/ptBr/translations/actions' -import dashboard from 'locales/ptBr/translations/dashboard' -import labs from 'locales/ptBr/translations/labs' -import patient from 'locales/ptBr/translations/patient' -import patients from 'locales/ptBr/translations/patients' -import scheduling from 'locales/ptBr/translations/scheduling' -import sex from 'locales/ptBr/translations/sex' -import states from 'locales/ptBr/translations/states' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' +import scheduling from './scheduling' +import states from './states' +import sex from './sex' +import labs from './labs' export default { ...actions, diff --git a/src/locales/ru/translations/index.ts b/src/locales/ru/translations/index.ts index a668cc46e5..e948f4340c 100644 --- a/src/locales/ru/translations/index.ts +++ b/src/locales/ru/translations/index.ts @@ -1,7 +1,7 @@ -import actions from 'locales/ru/translations/actions' -import dashboard from 'locales/ru/translations/dashboard' -import patient from 'locales/ru/translations/patient' -import patients from 'locales/ru/translations/patients' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' export default { ...actions, diff --git a/src/locales/zr/translations/index.ts b/src/locales/zr/translations/index.ts index 933b19a9e3..e948f4340c 100644 --- a/src/locales/zr/translations/index.ts +++ b/src/locales/zr/translations/index.ts @@ -1,7 +1,7 @@ -import actions from 'locales/zr/translations/actions' -import dashboard from 'locales/zr/translations/dashboard' -import patient from 'locales/zr/translations/patient' -import patients from 'locales/zr/translations/patients' +import actions from './actions' +import dashboard from './dashboard' +import patient from './patient' +import patients from './patients' export default { ...actions, diff --git a/src/model/Appointment.ts b/src/model/Appointment.ts index 0ddeb59068..a82dc4d590 100644 --- a/src/model/Appointment.ts +++ b/src/model/Appointment.ts @@ -1,4 +1,4 @@ -import AbstractDBModel from 'model/AbstractDBModel' +import AbstractDBModel from './AbstractDBModel' export default interface Appointment extends AbstractDBModel { startDateTime: string diff --git a/src/model/Lab.ts b/src/model/Lab.ts index ddd0cbe628..64b17ce431 100644 --- a/src/model/Lab.ts +++ b/src/model/Lab.ts @@ -1,4 +1,4 @@ -import AbstractDBModel from 'model/AbstractDBModel' +import AbstractDBModel from './AbstractDBModel' export default interface Lab extends AbstractDBModel { code: string diff --git a/src/model/Patient.ts b/src/model/Patient.ts index c013da2eff..27fde51a46 100644 --- a/src/model/Patient.ts +++ b/src/model/Patient.ts @@ -1,10 +1,10 @@ -import AbstractDBModel from 'model/AbstractDBModel' -import Allergy from 'model/Allergy' -import ContactInformation from 'model/ContactInformation' -import Diagnosis from 'model/Diagnosis' -import Name from 'model/Name' -import Note from 'model/Note' -import RelatedPerson from 'model/RelatedPerson' +import AbstractDBModel from './AbstractDBModel' +import Name from './Name' +import ContactInformation from './ContactInformation' +import RelatedPerson from './RelatedPerson' +import Allergy from './Allergy' +import Diagnosis from './Diagnosis' +import Note from './Note' export default interface Patient extends AbstractDBModel, Name, ContactInformation { sex: string diff --git a/src/page-header/ButtonToolBar.tsx b/src/page-header/ButtonToolBar.tsx index 020d5591f7..72eec7b627 100644 --- a/src/page-header/ButtonToolBar.tsx +++ b/src/page-header/ButtonToolBar.tsx @@ -1,6 +1,5 @@ import React from 'react' - -import { useButtons } from 'page-header/ButtonBarProvider' +import { useButtons } from './ButtonBarProvider' const ButtonToolBar = () => { const buttons = useButtons() diff --git a/src/page-header/title-slice.ts b/src/page-header/title-slice.ts index bbff8fd035..09f548684a 100644 --- a/src/page-header/title-slice.ts +++ b/src/page-header/title-slice.ts @@ -1,6 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' - -import { AppThunk } from 'store' +import { AppThunk } from '../store' interface TitleState { title: string diff --git a/src/page-header/useTitle.tsx b/src/page-header/useTitle.tsx index abbf38f272..f8cd1b4a32 100644 --- a/src/page-header/useTitle.tsx +++ b/src/page-header/useTitle.tsx @@ -1,7 +1,6 @@ import { useEffect } from 'react' import { useDispatch } from 'react-redux' - -import { updateTitle } from 'page-header/title-slice' +import { updateTitle } from './title-slice' export default function useTitle(title: string): void { const dispatch = useDispatch() diff --git a/src/patients/GeneralInformation.tsx b/src/patients/GeneralInformation.tsx index be794cb488..e945ea996d 100644 --- a/src/patients/GeneralInformation.tsx +++ b/src/patients/GeneralInformation.tsx @@ -1,13 +1,13 @@ -import { Panel, Checkbox, Alert } from '@hospitalrun/components' -import { startOfDay, subYears, differenceInYears } from 'date-fns' import React from 'react' +import { Panel, Checkbox, Alert } from '@hospitalrun/components' import { useTranslation } from 'react-i18next' +import { startOfDay, subYears, differenceInYears } from 'date-fns' -import DatePickerWithLabelFormGroup from 'components/input/DatePickerWithLabelFormGroup' -import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import Patient from 'model/Patient' +import Patient from '../model/Patient' +import TextFieldWithLabelFormGroup from '../components/input/TextFieldWithLabelFormGroup' +import TextInputWithLabelFormGroup from '../components/input/TextInputWithLabelFormGroup' +import SelectWithLabelFormGroup from '../components/input/SelectWithLableFormGroup' +import DatePickerWithLabelFormGroup from '../components/input/DatePickerWithLabelFormGroup' interface Props { patient: Patient diff --git a/src/patients/Patients.tsx b/src/patients/Patients.tsx index facdef64fc..d1670a1ce0 100644 --- a/src/patients/Patients.tsx +++ b/src/patients/Patients.tsx @@ -1,14 +1,13 @@ import React from 'react' import { useSelector } from 'react-redux' import { Switch } from 'react-router' - -import PrivateRoute from 'components/PrivateRoute' -import Permissions from 'model/Permissions' -import EditPatient from 'patients/edit/EditPatient' -import ViewPatients from 'patients/list/ViewPatients' -import NewPatient from 'patients/new/NewPatient' -import ViewPatient from 'patients/view/ViewPatient' -import { RootState } from 'store' +import PrivateRoute from '../components/PrivateRoute' +import Permissions from '../model/Permissions' +import ViewPatients from './list/ViewPatients' +import NewPatient from './new/NewPatient' +import EditPatient from './edit/EditPatient' +import ViewPatient from './view/ViewPatient' +import { RootState } from '../store' const Patients = () => { const permissions = useSelector((state: RootState) => state.user.permissions) diff --git a/src/patients/allergies/Allergies.tsx b/src/patients/allergies/Allergies.tsx index b771cae378..5ae17c3704 100644 --- a/src/patients/allergies/Allergies.tsx +++ b/src/patients/allergies/Allergies.tsx @@ -1,14 +1,13 @@ -import { Button, List, ListItem, Alert } from '@hospitalrun/components' import React, { useState } from 'react' -import { useTranslation } from 'react-i18next' -import { useSelector } from 'react-redux' - import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import Allergy from 'model/Allergy' import Patient from 'model/Patient' -import Permissions from 'model/Permissions' -import NewAllergyModal from 'patients/allergies/NewAllergyModal' +import { Button, List, ListItem, Alert } from '@hospitalrun/components' +import { useSelector } from 'react-redux' import { RootState } from 'store' +import Permissions from 'model/Permissions' +import { useTranslation } from 'react-i18next' +import Allergy from 'model/Allergy' +import NewAllergyModal from './NewAllergyModal' interface AllergiesProps { patient: Patient diff --git a/src/patients/allergies/NewAllergyModal.tsx b/src/patients/allergies/NewAllergyModal.tsx index e20f9d0ec8..d335f2fb92 100644 --- a/src/patients/allergies/NewAllergyModal.tsx +++ b/src/patients/allergies/NewAllergyModal.tsx @@ -1,12 +1,11 @@ -import { Modal, Alert } from '@hospitalrun/components' import React, { useState, useEffect } from 'react' +import { Modal, Alert } from '@hospitalrun/components' import { useTranslation } from 'react-i18next' -import { useDispatch, useSelector } from 'react-redux' - -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' import Allergy from 'model/Allergy' -import { addAllergy } from 'patients/patient-slice' -import { RootState } from 'store' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import { useDispatch, useSelector } from 'react-redux' +import { RootState } from '../../store' +import { addAllergy } from '../patient-slice' interface NewAllergyModalProps { show: boolean diff --git a/src/patients/appointments/AppointmentsList.tsx b/src/patients/appointments/AppointmentsList.tsx index 63ddb273d6..4b964fdfba 100644 --- a/src/patients/appointments/AppointmentsList.tsx +++ b/src/patients/appointments/AppointmentsList.tsx @@ -1,12 +1,11 @@ -import { TextInput, Button, List, ListItem, Container, Row, Column } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' -import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' import { useHistory } from 'react-router' - -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import { fetchPatientAppointments } from 'scheduling/appointments/appointments-slice' -import { RootState } from 'store' +import { useTranslation } from 'react-i18next' +import { TextInput, Button, List, ListItem, Container, Row, Column } from '@hospitalrun/components' +import { RootState } from '../../store' +import { fetchPatientAppointments } from '../../scheduling/appointments/appointments-slice' +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' interface Props { patientId: string diff --git a/src/patients/diagnoses/AddDiagnosisModal.tsx b/src/patients/diagnoses/AddDiagnosisModal.tsx index 9a427aa171..7706c1b632 100644 --- a/src/patients/diagnoses/AddDiagnosisModal.tsx +++ b/src/patients/diagnoses/AddDiagnosisModal.tsx @@ -1,13 +1,12 @@ -import { Modal, Alert } from '@hospitalrun/components' import React, { useState, useEffect } from 'react' +import { Modal, Alert } from '@hospitalrun/components' import { useTranslation } from 'react-i18next' -import { useDispatch, useSelector } from 'react-redux' - -import DatePickerWithLabelFormGroup from 'components/input/DatePickerWithLabelFormGroup' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' import Diagnosis from 'model/Diagnosis' -import { addDiagnosis } from 'patients/patient-slice' -import { RootState } from 'store' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import DatePickerWithLabelFormGroup from 'components/input/DatePickerWithLabelFormGroup' +import { useDispatch, useSelector } from 'react-redux' +import { RootState } from '../../store' +import { addDiagnosis } from '../patient-slice' interface Props { show: boolean diff --git a/src/patients/diagnoses/Diagnoses.tsx b/src/patients/diagnoses/Diagnoses.tsx index d00103c118..af774eda7e 100644 --- a/src/patients/diagnoses/Diagnoses.tsx +++ b/src/patients/diagnoses/Diagnoses.tsx @@ -1,14 +1,13 @@ -import { Button, List, ListItem, Alert } from '@hospitalrun/components' import React, { useState } from 'react' -import { useTranslation } from 'react-i18next' -import { useSelector } from 'react-redux' - -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import Diagnosis from 'model/Diagnosis' +import { RootState } from 'store' import Patient from 'model/Patient' +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import { useSelector } from 'react-redux' import Permissions from 'model/Permissions' -import AddDiagnosisModal from 'patients/diagnoses/AddDiagnosisModal' -import { RootState } from 'store' +import { Button, List, ListItem, Alert } from '@hospitalrun/components' +import { useTranslation } from 'react-i18next' +import Diagnosis from 'model/Diagnosis' +import AddDiagnosisModal from './AddDiagnosisModal' interface Props { patient: Patient diff --git a/src/patients/edit/EditPatient.tsx b/src/patients/edit/EditPatient.tsx index ec4652d9b0..350a3f2bdd 100644 --- a/src/patients/edit/EditPatient.tsx +++ b/src/patients/edit/EditPatient.tsx @@ -1,16 +1,15 @@ -import { Spinner, Button, Toast } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' +import { useHistory, useParams } from 'react-router-dom' import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' -import { useHistory, useParams } from 'react-router-dom' - -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import Patient from 'model/Patient' -import useTitle from 'page-header/useTitle' -import GeneralInformation from 'patients/GeneralInformation' -import { updatePatient, fetchPatient } from 'patients/patient-slice' -import { getPatientFullName, getPatientName } from 'patients/util/patient-name-util' -import { RootState } from 'store' +import { Spinner, Button, Toast } from '@hospitalrun/components' +import GeneralInformation from '../GeneralInformation' +import useTitle from '../../page-header/useTitle' +import Patient from '../../model/Patient' +import { updatePatient, fetchPatient } from '../patient-slice' +import { RootState } from '../../store' +import { getPatientFullName, getPatientName } from '../util/patient-name-util' +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' const getPatientCode = (p: Patient): string => { if (p) { diff --git a/src/patients/labs/LabsTab.tsx b/src/patients/labs/LabsTab.tsx index d9704b4810..6b40d81353 100644 --- a/src/patients/labs/LabsTab.tsx +++ b/src/patients/labs/LabsTab.tsx @@ -1,11 +1,10 @@ -import { Alert } from '@hospitalrun/components' -import format from 'date-fns/format' 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 LabRepository from 'clients/db/LabRepository' -import Lab from 'model/Lab' +import Lab from '../../model/Lab' +import LabRepository from '../../clients/db/LabRepository' interface Props { patientId: string diff --git a/src/patients/list/ViewPatients.tsx b/src/patients/list/ViewPatients.tsx index dc1dfac3d4..ba2c470013 100644 --- a/src/patients/list/ViewPatients.tsx +++ b/src/patients/list/ViewPatients.tsx @@ -1,16 +1,15 @@ -import { Spinner, Button, Container, Row, TextInput, Column } from '@hospitalrun/components' -import format from 'date-fns/format' import React, { useEffect, useState } from 'react' -import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' import { useHistory } from 'react-router' - -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import useDebounce from 'hooks/debounce' +import { useTranslation } from 'react-i18next' +import { Spinner, Button, Container, Row, TextInput, Column } from '@hospitalrun/components' import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import useTitle from 'page-header/useTitle' -import { searchPatients } from 'patients/patients-slice' -import { RootState } from 'store' +import format from 'date-fns/format' +import { RootState } from '../../store' +import { searchPatients } from '../patients-slice' +import useTitle from '../../page-header/useTitle' +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import useDebounce from '../../hooks/debounce' const breadcrumbs = [{ i18nKey: 'patients.label', location: '/patients' }] diff --git a/src/patients/new/NewPatient.tsx b/src/patients/new/NewPatient.tsx index 8dcaa654f8..c42f52d363 100644 --- a/src/patients/new/NewPatient.tsx +++ b/src/patients/new/NewPatient.tsx @@ -1,16 +1,15 @@ -import { Button, Toast } from '@hospitalrun/components' import React, { useState } from 'react' +import { useHistory } from 'react-router' import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' -import { useHistory } from 'react-router' - -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import Patient from 'model/Patient' -import useTitle from 'page-header/useTitle' -import GeneralInformation from 'patients/GeneralInformation' -import { createPatient } from 'patients/patient-slice' -import { getPatientName } from 'patients/util/patient-name-util' -import { RootState } from 'store' +import { Button, Toast } from '@hospitalrun/components' +import GeneralInformation from '../GeneralInformation' +import useTitle from '../../page-header/useTitle' +import Patient from '../../model/Patient' +import { createPatient } from '../patient-slice' +import { getPatientName } from '../util/patient-name-util' +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import { RootState } from '../../store' const breadcrumbs = [ { i18nKey: 'patients.label', location: '/patients' }, diff --git a/src/patients/notes/NewNoteModal.tsx b/src/patients/notes/NewNoteModal.tsx index f1b8eb7f5a..e8b9d3a5cd 100644 --- a/src/patients/notes/NewNoteModal.tsx +++ b/src/patients/notes/NewNoteModal.tsx @@ -1,12 +1,11 @@ -import { Modal, Alert } from '@hospitalrun/components' import React, { useState } from 'react' +import { Modal, Alert } from '@hospitalrun/components' import { useTranslation } from 'react-i18next' -import { useDispatch, useSelector } from 'react-redux' - import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import Note from 'model/Note' import { addNote } from 'patients/patient-slice' -import { RootState } from 'store' +import { useDispatch, useSelector } from 'react-redux' +import Note from '../../model/Note' +import { RootState } from '../../store' interface Props { show: boolean diff --git a/src/patients/notes/NoteTab.tsx b/src/patients/notes/NoteTab.tsx index 0b38dc6866..e4be1c76bc 100644 --- a/src/patients/notes/NoteTab.tsx +++ b/src/patients/notes/NoteTab.tsx @@ -1,14 +1,13 @@ /* eslint-disable react/no-danger */ -import { Button, List, ListItem, Alert } from '@hospitalrun/components' import React, { useState } from 'react' -import { useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' - +import { useTranslation } from 'react-i18next' +import { Button, List, ListItem, Alert } from '@hospitalrun/components' +import NewNoteModal from 'patients/notes/NewNoteModal' import Note from 'model/Note' import Patient from 'model/Patient' -import Permissions from 'model/Permissions' -import NewNoteModal from 'patients/notes/NewNoteModal' -import { RootState } from 'store' +import { RootState } from '../../store' +import Permissions from '../../model/Permissions' interface Props { patient: Patient diff --git a/src/patients/patient-slice.ts b/src/patients/patient-slice.ts index 0a97b2c6f7..f106abb18e 100644 --- a/src/patients/patient-slice.ts +++ b/src/patients/patient-slice.ts @@ -2,15 +2,14 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { isAfter, parseISO } from 'date-fns' import _ from 'lodash' import validator from 'validator' - -import PatientRepository from 'clients/db/PatientRepository' -import Allergy from 'model/Allergy' -import Diagnosis from 'model/Diagnosis' -import Note from 'model/Note' -import Patient from 'model/Patient' -import RelatedPerson from 'model/RelatedPerson' -import { AppThunk } from 'store' -import { uuid } from 'util/uuid' +import { uuid } from '../util/uuid' +import Patient from '../model/Patient' +import PatientRepository from '../clients/db/PatientRepository' +import { AppThunk } from '../store' +import RelatedPerson from '../model/RelatedPerson' +import Diagnosis from '../model/Diagnosis' +import Allergy from '../model/Allergy' +import Note from '../model/Note' interface PatientState { status: 'loading' | 'error' | 'completed' diff --git a/src/patients/patients-slice.ts b/src/patients/patients-slice.ts index 9eaea15813..73cb93f3e6 100644 --- a/src/patients/patients-slice.ts +++ b/src/patients/patients-slice.ts @@ -1,8 +1,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' - -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' -import { AppThunk } from 'store' +import Patient from '../model/Patient' +import PatientRepository from '../clients/db/PatientRepository' +import { AppThunk } from '../store' interface PatientsState { isLoading: boolean diff --git a/src/patients/related-persons/AddRelatedPersonModal.tsx b/src/patients/related-persons/AddRelatedPersonModal.tsx index 5a5da28f76..f39cf4331d 100644 --- a/src/patients/related-persons/AddRelatedPersonModal.tsx +++ b/src/patients/related-persons/AddRelatedPersonModal.tsx @@ -1,14 +1,13 @@ -import { Modal, Alert, Typeahead, Label } from '@hospitalrun/components' import React, { useState } from 'react' +import { Modal, Alert, Typeahead, Label } from '@hospitalrun/components' import { useTranslation } from 'react-i18next' -import { useDispatch, useSelector } from 'react-redux' - -import PatientRepository from 'clients/db/PatientRepository' import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import Patient from 'model/Patient' import RelatedPerson from 'model/RelatedPerson' -import { addRelatedPerson } from 'patients/patient-slice' -import { RootState } from 'store' +import PatientRepository from 'clients/db/PatientRepository' +import Patient from 'model/Patient' +import { useDispatch, useSelector } from 'react-redux' +import { RootState } from '../../store' +import { addRelatedPerson } from '../patient-slice' interface Props { show: boolean diff --git a/src/patients/related-persons/RelatedPersonTab.tsx b/src/patients/related-persons/RelatedPersonTab.tsx index bae49816ee..a84a519b6b 100644 --- a/src/patients/related-persons/RelatedPersonTab.tsx +++ b/src/patients/related-persons/RelatedPersonTab.tsx @@ -1,16 +1,15 @@ -import { Button, Alert, Spinner } from '@hospitalrun/components' 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 { useDispatch, useSelector } from 'react-redux' import { useHistory } from 'react-router' - -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import PatientRepository from 'clients/db/PatientRepository' import Patient from 'model/Patient' -import Permissions from 'model/Permissions' import { removeRelatedPerson } from 'patients/patient-slice' -import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' +import { useDispatch, useSelector } from 'react-redux' import { RootState } from 'store' +import Permissions from 'model/Permissions' +import PatientRepository from 'clients/db/PatientRepository' +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' interface Props { patient: Patient diff --git a/src/patients/util/patient-name-util.ts b/src/patients/util/patient-name-util.ts index 165c7d571f..3b6b8b86c5 100644 --- a/src/patients/util/patient-name-util.ts +++ b/src/patients/util/patient-name-util.ts @@ -1,4 +1,4 @@ -import Patient from 'model/Patient' +import Patient from '../../model/Patient' const getNamePartString = (namePart: string | undefined) => { if (!namePart) { diff --git a/src/patients/view/ViewPatient.tsx b/src/patients/view/ViewPatient.tsx index 64ded9f841..6119142e0b 100644 --- a/src/patients/view/ViewPatient.tsx +++ b/src/patients/view/ViewPatient.tsx @@ -1,24 +1,24 @@ -import { Panel, Spinner, TabsHeader, Tab, Button } from '@hospitalrun/components' import React, { useEffect } from 'react' -import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' import { useParams, withRouter, Route, useHistory, useLocation } from 'react-router-dom' +import { Panel, Spinner, TabsHeader, Tab, Button } from '@hospitalrun/components' +import { useTranslation } from 'react-i18next' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import Patient from 'model/Patient' -import Permissions from 'model/Permissions' import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import useTitle from 'page-header/useTitle' import Allergies from 'patients/allergies/Allergies' -import AppointmentsList from 'patients/appointments/AppointmentsList' import Diagnoses from 'patients/diagnoses/Diagnoses' -import GeneralInformation from 'patients/GeneralInformation' -import Labs from 'patients/labs/LabsTab' -import Note from 'patients/notes/NoteTab' -import { fetchPatient } from 'patients/patient-slice' -import RelatedPerson from 'patients/related-persons/RelatedPersonTab' -import { getPatientFullName } from 'patients/util/patient-name-util' -import { RootState } from 'store' +import useTitle from '../../page-header/useTitle' +import { fetchPatient } from '../patient-slice' +import { RootState } from '../../store' +import { getPatientFullName } from '../util/patient-name-util' +import Permissions from '../../model/Permissions' +import Patient from '../../model/Patient' +import GeneralInformation from '../GeneralInformation' +import RelatedPerson from '../related-persons/RelatedPersonTab' +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import AppointmentsList from '../appointments/AppointmentsList' +import Note from '../notes/NoteTab' +import Labs from '../labs/LabsTab' const getPatientCode = (p: Patient): string => { if (p) { diff --git a/src/scheduling/appointments/AppointmentDetailForm.tsx b/src/scheduling/appointments/AppointmentDetailForm.tsx index a9183c5f74..6fe9837a3f 100644 --- a/src/scheduling/appointments/AppointmentDetailForm.tsx +++ b/src/scheduling/appointments/AppointmentDetailForm.tsx @@ -1,14 +1,13 @@ -import { Typeahead, Label, Alert } from '@hospitalrun/components' import React from 'react' -import { useTranslation } from 'react-i18next' - -import PatientRepository from 'clients/db/PatientRepository' -import DateTimePickerWithLabelFormGroup from 'components/input/DateTimePickerWithLabelFormGroup' -import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' import Appointment from 'model/Appointment' +import DateTimePickerWithLabelFormGroup from 'components/input/DateTimePickerWithLabelFormGroup' +import { Typeahead, Label, Alert } from '@hospitalrun/components' import Patient from 'model/Patient' +import PatientRepository from 'clients/db/PatientRepository' +import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' +import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' +import { useTranslation } from 'react-i18next' interface Props { appointment: Appointment diff --git a/src/scheduling/appointments/Appointments.tsx b/src/scheduling/appointments/Appointments.tsx index ce28dd1206..142bff601a 100644 --- a/src/scheduling/appointments/Appointments.tsx +++ b/src/scheduling/appointments/Appointments.tsx @@ -1,14 +1,13 @@ import React from 'react' import { useSelector } from 'react-redux' import { Switch } from 'react-router' - -import PrivateRoute from 'components/PrivateRoute' -import Permissions from 'model/Permissions' -import EditAppointment from 'scheduling/appointments/edit/EditAppointment' import NewAppointment from 'scheduling/appointments/new/NewAppointment' +import EditAppointment from 'scheduling/appointments/edit/EditAppointment' import ViewAppointment from 'scheduling/appointments/view/ViewAppointment' -import ViewAppointments from 'scheduling/appointments/ViewAppointments' -import { RootState } from 'store' +import ViewAppointments from './ViewAppointments' +import PrivateRoute from '../../components/PrivateRoute' +import Permissions from '../../model/Permissions' +import { RootState } from '../../store' const Appointments = () => { const permissions = useSelector((state: RootState) => state.user.permissions) diff --git a/src/scheduling/appointments/ViewAppointments.tsx b/src/scheduling/appointments/ViewAppointments.tsx index 5e707e24e0..b569c2b4a7 100644 --- a/src/scheduling/appointments/ViewAppointments.tsx +++ b/src/scheduling/appointments/ViewAppointments.tsx @@ -1,15 +1,14 @@ -import { Calendar, Button } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' +import { Calendar, Button } from '@hospitalrun/components' +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 useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' import PatientRepository from 'clients/db/PatientRepository' +import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import useTitle from 'page-header/useTitle' -import { fetchAppointments } from 'scheduling/appointments/appointments-slice' -import { RootState } from 'store' +import { fetchAppointments } from './appointments-slice' interface Event { id: string diff --git a/src/scheduling/appointments/appointment-slice.ts b/src/scheduling/appointments/appointment-slice.ts index 1ef290895a..af8732531d 100644 --- a/src/scheduling/appointments/appointment-slice.ts +++ b/src/scheduling/appointments/appointment-slice.ts @@ -1,12 +1,11 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { isBefore } from 'date-fns' -import _ from 'lodash' - -import AppointmentRepository from 'clients/db/AppointmentRepository' -import PatientRepository from 'clients/db/PatientRepository' import Appointment from 'model/Appointment' -import Patient from 'model/Patient' import { AppThunk } from 'store' +import AppointmentRepository from 'clients/db/AppointmentRepository' +import Patient from 'model/Patient' +import PatientRepository from 'clients/db/PatientRepository' +import { isBefore } from 'date-fns' +import _ from 'lodash' function validateAppointment(appointment: Appointment) { const err: Error = {} diff --git a/src/scheduling/appointments/appointments-slice.ts b/src/scheduling/appointments/appointments-slice.ts index 2fa89aa207..f902684d03 100644 --- a/src/scheduling/appointments/appointments-slice.ts +++ b/src/scheduling/appointments/appointments-slice.ts @@ -1,8 +1,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' - -import AppointmentRepository from 'clients/db/AppointmentRepository' import Appointment from 'model/Appointment' import { AppThunk } from 'store' +import AppointmentRepository from 'clients/db/AppointmentRepository' interface AppointmentsState { isLoading: boolean diff --git a/src/scheduling/appointments/edit/EditAppointment.tsx b/src/scheduling/appointments/edit/EditAppointment.tsx index 1b725db90b..d52d757c46 100644 --- a/src/scheduling/appointments/edit/EditAppointment.tsx +++ b/src/scheduling/appointments/edit/EditAppointment.tsx @@ -1,16 +1,16 @@ -import { Spinner, Button } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' +import { useHistory, useParams } from 'react-router-dom' import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' -import { useHistory, useParams } from 'react-router-dom' +import { Spinner, Button } from '@hospitalrun/components' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import Appointment from 'model/Appointment' -import useTitle from 'page-header/useTitle' -import { updateAppointment, fetchAppointment } from 'scheduling/appointments/appointment-slice' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import { getAppointmentLabel } from 'scheduling/appointments/util/scheduling-appointment.util' -import { RootState } from 'store' +import AppointmentDetailForm from '../AppointmentDetailForm' +import useTitle from '../../../page-header/useTitle' +import Appointment from '../../../model/Appointment' +import { updateAppointment, fetchAppointment } from '../appointment-slice' +import { RootState } from '../../../store' +import { getAppointmentLabel } from '../util/scheduling-appointment.util' +import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' const EditAppointment = () => { const { t } = useTranslation() diff --git a/src/scheduling/appointments/new/NewAppointment.tsx b/src/scheduling/appointments/new/NewAppointment.tsx index 0505b9fc30..438869dc9e 100644 --- a/src/scheduling/appointments/new/NewAppointment.tsx +++ b/src/scheduling/appointments/new/NewAppointment.tsx @@ -1,17 +1,16 @@ -import { Button, Toast } from '@hospitalrun/components' -import addMinutes from 'date-fns/addMinutes' -import roundToNearestMinutes from 'date-fns/roundToNearestMinutes' import React, { useState } from 'react' +import useTitle from 'page-header/useTitle' import { useTranslation } from 'react-i18next' -import { useDispatch, useSelector } from 'react-redux' +import roundToNearestMinutes from 'date-fns/roundToNearestMinutes' import { useHistory } from 'react-router' - -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' +import { useDispatch, useSelector } from 'react-redux' import Appointment from 'model/Appointment' -import useTitle from 'page-header/useTitle' -import { createAppointment } from 'scheduling/appointments/appointment-slice' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import { RootState } from 'store' +import addMinutes from 'date-fns/addMinutes' +import { Button, Toast } from '@hospitalrun/components' +import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' +import { createAppointment } from '../appointment-slice' +import AppointmentDetailForm from '../AppointmentDetailForm' +import { RootState } from '../../../store' const breadcrumbs = [ { i18nKey: 'scheduling.appointments.label', location: '/appointments' }, diff --git a/src/scheduling/appointments/util/scheduling-appointment.util.ts b/src/scheduling/appointments/util/scheduling-appointment.util.ts index f491e390fe..eb1d28bdd8 100644 --- a/src/scheduling/appointments/util/scheduling-appointment.util.ts +++ b/src/scheduling/appointments/util/scheduling-appointment.util.ts @@ -1,4 +1,4 @@ -import Appointment from 'model/Appointment' +import Appointment from '../../../model/Appointment' const options = { year: 'numeric', diff --git a/src/scheduling/appointments/view/ViewAppointment.tsx b/src/scheduling/appointments/view/ViewAppointment.tsx index 880aa1faaf..c90002b2e4 100644 --- a/src/scheduling/appointments/view/ViewAppointment.tsx +++ b/src/scheduling/appointments/view/ViewAppointment.tsx @@ -1,17 +1,16 @@ -import { Spinner, Button, Modal, Toast } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' -import { useTranslation } from 'react-i18next' +import useTitle from 'page-header/useTitle' import { useSelector, useDispatch } from 'react-redux' +import { RootState } from 'store' import { useParams, useHistory } from 'react-router' - -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import Permissions from 'model/Permissions' +import { Spinner, Button, Modal, Toast } from '@hospitalrun/components' +import { useTranslation } from 'react-i18next' import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import useTitle from 'page-header/useTitle' -import { fetchAppointment, deleteAppointment } from 'scheduling/appointments/appointment-slice' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import { getAppointmentLabel } from 'scheduling/appointments/util/scheduling-appointment.util' -import { RootState } from 'store' +import Permissions from 'model/Permissions' +import { fetchAppointment, deleteAppointment } from '../appointment-slice' +import AppointmentDetailForm from '../AppointmentDetailForm' +import { getAppointmentLabel } from '../util/scheduling-appointment.util' +import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' const ViewAppointment = () => { const { t } = useTranslation() diff --git a/src/store/index.ts b/src/store/index.ts index 9d54647990..1a39af5ff3 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -1,16 +1,15 @@ import { configureStore, combineReducers, Action } from '@reduxjs/toolkit' import ReduxThunk, { ThunkAction } from 'redux-thunk' - -import breadcrumbs from 'breadcrumbs/breadcrumbs-slice' -import components from 'components/component-slice' -import lab from 'labs/lab-slice' -import labs from 'labs/labs-slice' -import title from 'page-header/title-slice' -import patient from 'patients/patient-slice' -import patients from 'patients/patients-slice' -import appointment from 'scheduling/appointments/appointment-slice' -import appointments from 'scheduling/appointments/appointments-slice' -import user from 'user/user-slice' +import patient from '../patients/patient-slice' +import patients from '../patients/patients-slice' +import appointment from '../scheduling/appointments/appointment-slice' +import appointments from '../scheduling/appointments/appointments-slice' +import title from '../page-header/title-slice' +import user from '../user/user-slice' +import lab from '../labs/lab-slice' +import labs from '../labs/labs-slice' +import breadcrumbs from '../breadcrumbs/breadcrumbs-slice' +import components from '../components/component-slice' const reducer = combineReducers({ patient, diff --git a/src/user/user-slice.ts b/src/user/user-slice.ts index e9cab3f327..98c163429c 100644 --- a/src/user/user-slice.ts +++ b/src/user/user-slice.ts @@ -1,6 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' - -import Permissions from 'model/Permissions' +import Permissions from '../model/Permissions' interface UserState { permissions: Permissions[] From fc51ae878887d06a6f99bfe7ca976c37fbab3e5c Mon Sep 17 00:00:00 2001 From: Matthew Dorner Date: Thu, 14 May 2020 14:00:20 -0500 Subject: [PATCH 3/6] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Disallow=20absol?= =?UTF-8?q?ute=20paths=20for=20internal=20modules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disallow absolute paths for internal modules, add eslint import order rules. --- .eslintrc.js | 25 ++++++++++++-- package.json | 3 +- src/App.tsx | 6 ++-- src/HospitalRun.tsx | 19 ++++++----- src/__tests__/App.test.tsx | 5 +-- src/__tests__/HospitalRun.test.tsx | 17 +++++----- .../breadcrumbs/Breadcrumbs.test.tsx | 16 ++++----- .../breadcrumbs/breadcrumbs-slice.test.ts | 1 + .../breadcrumbs/useAddBreadcrumbs.test.tsx | 7 ++-- .../clients/db/AppointmentRepository.test.ts | 6 ++-- .../clients/db/LabRepository.test.ts | 8 +++-- .../clients/db/PatientRepository.test.ts | 9 ++--- src/__tests__/components/Navbar.test.tsx | 9 ++--- src/__tests__/components/Sidebar.test.tsx | 11 +++--- .../DatePickerWithLabelFormGroup.test.tsx | 3 +- .../DateTimePickerWithLabelFormGroup.test.tsx | 3 +- .../input/SelectWithLabelFormGroup.test.tsx | 5 +-- .../TestInputWithLabelFormGroup.test.tsx | 3 +- .../TextFieldWithLabelFormGroup.test.tsx | 3 +- src/__tests__/hooks/debounce.test.ts | 3 +- src/__tests__/labs/Labs.test.tsx | 25 +++++++------- src/__tests__/labs/ViewLab.test.tsx | 29 ++++++++-------- src/__tests__/labs/ViewLabs.test.tsx | 23 +++++++------ src/__tests__/labs/lab-slice.test.ts | 9 ++--- src/__tests__/labs/labs.slice.test.ts | 5 +-- .../labs/requests/NewLabRequest.test.tsx | 25 +++++++------- .../page-header/ButtonBarProvider.test.tsx | 7 ++-- .../page-header/ButtonToolBar.test.tsx | 5 +-- src/__tests__/page-header/title-slice.test.ts | 1 + src/__tests__/page-header/useTitle.test.tsx | 7 ++-- .../patients/GeneralInformation.test.tsx | 13 +++---- src/__tests__/patients/Patients.test.tsx | 13 +++---- .../patients/allergies/Allergies.test.tsx | 23 +++++++------ .../allergies/NewAllergyModal.test.tsx | 13 +++---- .../appointments/AppointmentsList.test.tsx | 15 ++++---- .../diagnoses/AddDiagnosisModal.test.tsx | 15 ++++---- .../patients/diagnoses/Diagnoses.test.tsx | 21 ++++++------ .../patients/edit/EditPatient.test.tsx | 18 +++++----- src/__tests__/patients/labs/LabsTab.test.tsx | 22 ++++++------ .../patients/list/ViewPatients.test.tsx | 18 +++++----- .../patients/new/NewPatient.test.tsx | 20 ++++++----- .../patients/notes/NewNoteModal.test.tsx | 14 ++++---- .../patients/notes/NotesTab.test.tsx | 22 ++++++------ src/__tests__/patients/patient-slice.test.ts | 15 ++++---- src/__tests__/patients/patients-slice.test.ts | 5 +-- .../AddRelatedPersonModal.test.tsx | 14 ++++---- .../related-persons/RelatedPersons.test.tsx | 24 +++++++------ .../patients/util/patient-name-util.test.ts | 4 +-- .../patients/view/ViewPatient.test.tsx | 34 ++++++++++--------- .../AppointmentDetailForm.test.tsx | 16 +++++---- .../appointments/Appointments.test.tsx | 22 ++++++------ .../appointments/ViewAppointments.test.tsx | 22 ++++++------ .../appointments/appointment-slice.test.ts | 11 +++--- .../appointments/appointments-slice.test.ts | 4 +-- .../edit/EditAppointment.test.tsx | 22 ++++++------ .../appointments/new/NewAppointment.test.tsx | 30 ++++++++-------- .../util/scheduling-appointment.util.test.ts | 2 +- .../view/ViewAppointment.test.tsx | 28 ++++++++------- src/__tests__/user/user-slice.test.ts | 2 +- src/breadcrumbs/Breadcrumbs.tsx | 7 ++-- src/breadcrumbs/breadcrumbs-slice.ts | 3 +- src/breadcrumbs/useAddBreadcrumbs.ts | 3 +- src/clients/db/AppointmentRepository.ts | 7 ++-- src/clients/db/LabRepository.ts | 6 ++-- src/clients/db/PatientRepository.ts | 5 +-- src/clients/db/Repository.ts | 1 + src/clients/db/SortRequest.ts | 2 +- src/components/Navbar.tsx | 4 +-- src/components/Sidebar.tsx | 5 +-- src/components/component-slice.ts | 1 + .../input/DatePickerWithLabelFormGroup.tsx | 2 +- .../DateTimePickerWithLabelFormGroup.tsx | 2 +- .../input/SelectWithLableFormGroup.tsx | 2 +- .../input/TextFieldWithLabelFormGroup.tsx | 2 +- .../input/TextInputWithLabelFormGroup.tsx | 2 +- src/dashboard/Dashboard.tsx | 1 + src/i18n.ts | 2 +- src/index.tsx | 1 + src/labs/Labs.tsx | 13 +++---- src/labs/ViewLab.tsx | 19 ++++++----- src/labs/ViewLabs.tsx | 21 ++++++------ src/labs/lab-slice.ts | 11 +++--- src/labs/labs-slice.ts | 3 +- src/labs/requests/NewLabRequest.tsx | 23 +++++++------ src/locales/enUs/translations/index.ts | 4 +-- .../enUs/translations/patients/index.ts | 1 + src/locales/fr/translations/index.ts | 4 +-- src/locales/it/translations/index.ts | 4 +-- src/locales/ptBr/translations/index.ts | 4 +-- src/model/Patient.ts | 6 ++-- src/page-header/ButtonToolBar.tsx | 1 + src/page-header/title-slice.ts | 1 + src/page-header/useTitle.tsx | 1 + src/patients/GeneralInformation.tsx | 10 +++--- src/patients/Patients.tsx | 5 +-- src/patients/allergies/Allergies.tsx | 15 ++++---- src/patients/allergies/NewAllergyModal.tsx | 7 ++-- .../appointments/AppointmentsList.tsx | 9 ++--- src/patients/diagnoses/AddDiagnosisModal.tsx | 9 ++--- src/patients/diagnoses/Diagnoses.tsx | 15 ++++---- src/patients/edit/EditPatient.tsx | 13 +++---- src/patients/labs/LabsTab.tsx | 7 ++-- src/patients/list/ViewPatients.tsx | 15 ++++---- src/patients/new/NewPatient.tsx | 13 +++---- src/patients/notes/NewNoteModal.tsx | 7 ++-- src/patients/notes/NoteTab.tsx | 13 +++---- src/patients/patient-slice.ts | 11 +++--- src/patients/patients-slice.ts | 3 +- .../related-persons/AddRelatedPersonModal.tsx | 11 +++--- .../related-persons/RelatedPersonTab.tsx | 17 +++++----- src/patients/view/ViewPatient.tsx | 26 +++++++------- .../appointments/AppointmentDetailForm.tsx | 17 +++++----- src/scheduling/appointments/Appointments.tsx | 9 ++--- .../appointments/ViewAppointments.tsx | 13 +++---- .../appointments/appointment-slice.ts | 11 +++--- .../appointments/appointments-slice.ts | 7 ++-- .../appointments/edit/EditAppointment.tsx | 12 +++---- .../appointments/new/NewAppointment.tsx | 15 ++++---- .../appointments/view/ViewAppointment.tsx | 15 ++++---- src/store/index.ts | 11 +++--- src/user/user-slice.ts | 1 + tsconfig.json | 2 +- 122 files changed, 703 insertions(+), 570 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 2692cbdf5b..b028754d0d 100644 --- a/.eslintrc.js +++ b/.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/no-unresolved': 'error', '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'], }, } diff --git a/package.json b/package.json index eab097d2d8..72240116b8 100644 --- a/package.json +++ b/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.10.0", "eslint-plugin-jsx-a11y": "~6.2.3", "eslint-plugin-prettier": "~3.1.2", diff --git a/src/App.tsx b/src/App.tsx index f813de0874..5d69f48774 100644 --- a/src/App.tsx +++ b/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 = () => ( diff --git a/src/HospitalRun.tsx b/src/HospitalRun.tsx index 8b6ba566f5..106ad24ff1 100644 --- a/src/HospitalRun.tsx +++ b/src/HospitalRun.tsx @@ -1,18 +1,19 @@ +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 Sidebar from './components/Sidebar' +import Dashboard from './dashboard/Dashboard' +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) diff --git a/src/__tests__/App.test.tsx b/src/__tests__/App.test.tsx index 9d82e2646a..247460b0e3 100644 --- a/src/__tests__/App.test.tsx +++ b/src/__tests__/App.test.tsx @@ -1,8 +1,9 @@ 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() diff --git a/src/__tests__/HospitalRun.test.tsx b/src/__tests__/HospitalRun.test.tsx index 3179d925ca..36148bb24d 100644 --- a/src/__tests__/HospitalRun.test.tsx +++ b/src/__tests__/HospitalRun.test.tsx @@ -1,16 +1,17 @@ import '../__mocks__/matchMediaMock' -import React from 'react' +import { Toaster } from '@hospitalrun/components' import { mount } from 'enzyme' -import { MemoryRouter } from 'react-router' +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' import configureMockStore 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 thunk from 'redux-thunk' + +import LabRepository from '../clients/db/LabRepository' +import Dashboard from '../dashboard/Dashboard' import HospitalRun from '../HospitalRun' +import ViewLabs from '../labs/ViewLabs' import Permissions from '../model/Permissions' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx b/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx index f14bc46b9f..ae1a42b2fb 100644 --- a/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx +++ b/src/__tests__/breadcrumbs/Breadcrumbs.test.tsx @@ -1,17 +1,17 @@ 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 configureMockStore from 'redux-mock-store' import { Breadcrumb as HRBreadcrumb, BreadcrumbItem as HRBreadcrumbItem, } from '@hospitalrun/components' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' +import { Provider } from 'react-redux' +import { Router } from 'react-router-dom' +import configureMockStore from 'redux-mock-store' -import Breadcrumbs from 'breadcrumbs/Breadcrumbs' -import Breadcrumb from 'model/Breadcrumb' +import Breadcrumbs from '../../breadcrumbs/Breadcrumbs' +import Breadcrumb from '../../model/Breadcrumb' const mockStore = configureMockStore() diff --git a/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts b/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts index 10f73f19ff..c43211a0b6 100644 --- a/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts +++ b/src/__tests__/breadcrumbs/breadcrumbs-slice.test.ts @@ -1,5 +1,6 @@ import '../../__mocks__/matchMediaMock' import { AnyAction } from 'redux' + import breadcrumbs, { addBreadcrumbs, removeBreadcrumbs } from '../../breadcrumbs/breadcrumbs-slice' describe('breadcrumbs slice', () => { diff --git a/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx b/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx index 452f76ebdc..8736bb1412 100644 --- a/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx +++ b/src/__tests__/breadcrumbs/useAddBreadcrumbs.test.tsx @@ -1,9 +1,10 @@ -import React from 'react' import { renderHook } from '@testing-library/react-hooks' -import configureMockStore from 'redux-mock-store' +import React from 'react' import { Provider } from 'react-redux' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import configureMockStore from 'redux-mock-store' + import * as breadcrumbsSlice from '../../breadcrumbs/breadcrumbs-slice' +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' const store = configureMockStore() diff --git a/src/__tests__/clients/db/AppointmentRepository.test.ts b/src/__tests__/clients/db/AppointmentRepository.test.ts index 042b4e8c96..6877aa2083 100644 --- a/src/__tests__/clients/db/AppointmentRepository.test.ts +++ b/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 diff --git a/src/__tests__/clients/db/LabRepository.test.ts b/src/__tests__/clients/db/LabRepository.test.ts index f9ed08130e..cbbc7238a0 100644 --- a/src/__tests__/clients/db/LabRepository.test.ts +++ b/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 { diff --git a/src/__tests__/clients/db/PatientRepository.test.ts b/src/__tests__/clients/db/PatientRepository.test.ts index e45cd7262b..1a30bd157e 100644 --- a/src/__tests__/clients/db/PatientRepository.test.ts +++ b/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 diff --git a/src/__tests__/components/Navbar.test.tsx b/src/__tests__/components/Navbar.test.tsx index 8354bce74d..4b6570a79b 100644 --- a/src/__tests__/components/Navbar.test.tsx +++ b/src/__tests__/components/Navbar.test.tsx @@ -1,10 +1,11 @@ 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', () => { diff --git a/src/__tests__/components/Sidebar.test.tsx b/src/__tests__/components/Sidebar.test.tsx index 11bf2804af..61a4b2c96b 100644 --- a/src/__tests__/components/Sidebar.test.tsx +++ b/src/__tests__/components/Sidebar.test.tsx @@ -1,14 +1,15 @@ 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' -import { ListItem } from '@hospitalrun/components' -import { act } from '@testing-library/react' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' + +import Sidebar from '../../components/Sidebar' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx b/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx index 0bb2fec902..a300d4750f 100644 --- a/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/DatePickerWithLabelFormGroup.test.tsx @@ -1,7 +1,8 @@ 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', () => { diff --git a/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx b/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx index cba26f9131..983b0365ba 100644 --- a/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/DateTimePickerWithLabelFormGroup.test.tsx @@ -1,7 +1,8 @@ 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', () => { diff --git a/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx b/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx index 74be6cbfeb..0bd6417398 100644 --- a/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/SelectWithLabelFormGroup.test.tsx @@ -1,7 +1,8 @@ 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', () => { diff --git a/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx b/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx index 01fbc66d14..de4ea6b229 100644 --- a/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/TestInputWithLabelFormGroup.test.tsx @@ -1,7 +1,8 @@ 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', () => { diff --git a/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx b/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx index 64367b1e64..45227cfc29 100644 --- a/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx +++ b/src/__tests__/components/input/TextFieldWithLabelFormGroup.test.tsx @@ -1,7 +1,8 @@ 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', () => { diff --git a/src/__tests__/hooks/debounce.test.ts b/src/__tests__/hooks/debounce.test.ts index 73be39e3eb..d4ced8c57d 100644 --- a/src/__tests__/hooks/debounce.test.ts +++ b/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()) diff --git a/src/__tests__/labs/Labs.test.tsx b/src/__tests__/labs/Labs.test.tsx index 03fddb7284..33f424052e 100644 --- a/src/__tests__/labs/Labs.test.tsx +++ b/src/__tests__/labs/Labs.test.tsx @@ -1,19 +1,20 @@ 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' import configureMockStore from 'redux-mock-store' -import { act } from '@testing-library/react' -import Labs from 'labs/Labs' -import NewLabRequest from 'labs/requests/NewLabRequest' -import Permissions from 'model/Permissions' -import ViewLab from 'labs/ViewLab' -import LabRepository from 'clients/db/LabRepository' -import Lab from 'model/Lab' -import Patient from 'model/Patient' -import PatientRepository from 'clients/db/PatientRepository' +import thunk from 'redux-thunk' + +import LabRepository from '../../clients/db/LabRepository' +import PatientRepository from '../../clients/db/PatientRepository' +import Labs from '../../labs/Labs' +import NewLabRequest from '../../labs/requests/NewLabRequest' +import ViewLab from '../../labs/ViewLab' +import Lab from '../../model/Lab' +import Patient from '../../model/Patient' +import Permissions from '../../model/Permissions' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/labs/ViewLab.test.tsx b/src/__tests__/labs/ViewLab.test.tsx index bbd6dba8fc..c909fc2a2d 100644 --- a/src/__tests__/labs/ViewLab.test.tsx +++ b/src/__tests__/labs/ViewLab.test.tsx @@ -1,23 +1,24 @@ import '../../__mocks__/matchMediaMock' +import { Badge, Button, Alert } from '@hospitalrun/components' +import { act } from '@testing-library/react' +import format from 'date-fns/format' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' import React from 'react' import { Provider } from 'react-redux' import { Router, Route } from 'react-router' -import { mount } from 'enzyme' -import thunk from 'redux-thunk' -import { createMemoryHistory } from 'history' -import Permissions from 'model/Permissions' -import { act } from '@testing-library/react' -import LabRepository from 'clients/db/LabRepository' -import PatientRepository from 'clients/db/PatientRepository' -import Lab from 'model/Lab' -import Patient from 'model/Patient' -import * as ButtonBarProvider from 'page-header/ButtonBarProvider' import createMockStore from 'redux-mock-store' -import { Badge, Button, Alert } from '@hospitalrun/components' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import format from 'date-fns/format' -import * as titleUtil from '../../page-header/useTitle' +import thunk from 'redux-thunk' + +import LabRepository from '../../clients/db/LabRepository' +import PatientRepository from '../../clients/db/PatientRepository' +import TextFieldWithLabelFormGroup from '../../components/input/TextFieldWithLabelFormGroup' import ViewLab from '../../labs/ViewLab' +import Lab from '../../model/Lab' +import Patient from '../../model/Patient' +import Permissions from '../../model/Permissions' +import * as ButtonBarProvider from '../../page-header/ButtonBarProvider' +import * as titleUtil from '../../page-header/useTitle' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/labs/ViewLabs.test.tsx b/src/__tests__/labs/ViewLabs.test.tsx index 0cf1eaaf64..183262367f 100644 --- a/src/__tests__/labs/ViewLabs.test.tsx +++ b/src/__tests__/labs/ViewLabs.test.tsx @@ -1,20 +1,21 @@ import '../../__mocks__/matchMediaMock' +import { TextInput, Select } from '@hospitalrun/components' +import { act } from '@testing-library/react' +import format from 'date-fns/format' +import { mount, ReactWrapper } from 'enzyme' +import { createMemoryHistory } from 'history' import React from 'react' import { Provider } from 'react-redux' import { Router } from 'react-router' -import ViewLabs from 'labs/ViewLabs' -import { mount, ReactWrapper } from 'enzyme' -import { TextInput, Select } from '@hospitalrun/components' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { createMemoryHistory } from 'history' -import Permissions from 'model/Permissions' -import { act } from '@testing-library/react' -import LabRepository from 'clients/db/LabRepository' -import * as labsSlice from 'labs/labs-slice' -import Lab from 'model/Lab' -import format from 'date-fns/format' -import * as ButtonBarProvider from 'page-header/ButtonBarProvider' + +import LabRepository from '../../clients/db/LabRepository' +import * as labsSlice from '../../labs/labs-slice' +import ViewLabs from '../../labs/ViewLabs' +import Lab from '../../model/Lab' +import Permissions from '../../model/Permissions' +import * as ButtonBarProvider from '../../page-header/ButtonBarProvider' import * as titleUtil from '../../page-header/useTitle' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/labs/lab-slice.test.ts b/src/__tests__/labs/lab-slice.test.ts index 6296f36b7e..21122cab33 100644 --- a/src/__tests__/labs/lab-slice.test.ts +++ b/src/__tests__/labs/lab-slice.test.ts @@ -1,9 +1,8 @@ -import thunk from 'redux-thunk' import createMockStore from 'redux-mock-store' -import PatientRepository from '../../clients/db/PatientRepository' +import thunk from 'redux-thunk' + import LabRepository from '../../clients/db/LabRepository' -import Lab from '../../model/Lab' -import Patient from '../../model/Patient' +import PatientRepository from '../../clients/db/PatientRepository' import labSlice, { requestLab, fetchLabStart, @@ -23,6 +22,8 @@ import labSlice, { requestLabError, updateLab, } from '../../labs/lab-slice' +import Lab from '../../model/Lab' +import Patient from '../../model/Patient' import { RootState } from '../../store' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/labs/labs.slice.test.ts b/src/__tests__/labs/labs.slice.test.ts index a380d0beb3..d02dbca38b 100644 --- a/src/__tests__/labs/labs.slice.test.ts +++ b/src/__tests__/labs/labs.slice.test.ts @@ -1,9 +1,10 @@ import { AnyAction } from 'redux' import { mocked } from 'ts-jest/utils' -import SortRequest from 'clients/db/SortRequest' + +import LabRepository from '../../clients/db/LabRepository' +import SortRequest from '../../clients/db/SortRequest' import labs, { fetchLabsStart, fetchLabsSuccess, searchLabs } from '../../labs/labs-slice' import Lab from '../../model/Lab' -import LabRepository from '../../clients/db/LabRepository' interface SearchContainer { text: string diff --git a/src/__tests__/labs/requests/NewLabRequest.test.tsx b/src/__tests__/labs/requests/NewLabRequest.test.tsx index 7e280b0e58..a89111ba2b 100644 --- a/src/__tests__/labs/requests/NewLabRequest.test.tsx +++ b/src/__tests__/labs/requests/NewLabRequest.test.tsx @@ -1,20 +1,21 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -import NewLabRequest from 'labs/requests/NewLabRequest' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import { mount, ReactWrapper } from 'enzyme' import { Button, Typeahead, Label, Alert } from '@hospitalrun/components' -import { Router } from 'react-router-dom' +import { mount, ReactWrapper } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' +import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' +import { Router } from 'react-router-dom' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { createMemoryHistory } from 'history' -import { act } from 'react-dom/test-utils' -import LabRepository from 'clients/db/LabRepository' -import PatientRepository from 'clients/db/PatientRepository' -import Lab from 'model/Lab' -import Patient from 'model/Patient' + +import LabRepository from '../../../clients/db/LabRepository' +import PatientRepository from '../../../clients/db/PatientRepository' +import TextFieldWithLabelFormGroup from '../../../components/input/TextFieldWithLabelFormGroup' +import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' +import NewLabRequest from '../../../labs/requests/NewLabRequest' +import Lab from '../../../model/Lab' +import Patient from '../../../model/Patient' import * as titleUtil from '../../../page-header/useTitle' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/page-header/ButtonBarProvider.test.tsx b/src/__tests__/page-header/ButtonBarProvider.test.tsx index af8527735d..9823088ebe 100644 --- a/src/__tests__/page-header/ButtonBarProvider.test.tsx +++ b/src/__tests__/page-header/ButtonBarProvider.test.tsx @@ -1,12 +1,13 @@ import '../../__mocks__/matchMediaMock' -import React, { useEffect } from 'react' +import { Button } from '@hospitalrun/components' import { renderHook } from '@testing-library/react-hooks' +import React, { useEffect } from 'react' + import { ButtonBarProvider, useButtons, useButtonToolbarSetter, -} from 'page-header/ButtonBarProvider' -import { Button } from '@hospitalrun/components' +} from '../../page-header/ButtonBarProvider' describe('Button Bar Provider', () => { it('should update and fetch data from the button bar provider', () => { diff --git a/src/__tests__/page-header/ButtonToolBar.test.tsx b/src/__tests__/page-header/ButtonToolBar.test.tsx index ff369b086d..0d589b6873 100644 --- a/src/__tests__/page-header/ButtonToolBar.test.tsx +++ b/src/__tests__/page-header/ButtonToolBar.test.tsx @@ -1,8 +1,9 @@ import '../../__mocks__/matchMediaMock' -import React from 'react' import { Button } from '@hospitalrun/components' -import { mocked } from 'ts-jest/utils' import { mount } from 'enzyme' +import React from 'react' +import { mocked } from 'ts-jest/utils' + import * as ButtonBarProvider from '../../page-header/ButtonBarProvider' import ButtonToolBar from '../../page-header/ButtonToolBar' diff --git a/src/__tests__/page-header/title-slice.test.ts b/src/__tests__/page-header/title-slice.test.ts index d15bfef444..0c56a92fe3 100644 --- a/src/__tests__/page-header/title-slice.test.ts +++ b/src/__tests__/page-header/title-slice.test.ts @@ -1,4 +1,5 @@ import { AnyAction } from 'redux' + import title, { updateTitle, changeTitle } from '../../page-header/title-slice' describe('title slice', () => { diff --git a/src/__tests__/page-header/useTitle.test.tsx b/src/__tests__/page-header/useTitle.test.tsx index a913147e81..b77ad99778 100644 --- a/src/__tests__/page-header/useTitle.test.tsx +++ b/src/__tests__/page-header/useTitle.test.tsx @@ -1,10 +1,11 @@ -import React from 'react' import { renderHook } from '@testing-library/react-hooks' +import React from 'react' +import { Provider } from 'react-redux' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' -import useTitle from '../../page-header/useTitle' + import * as titleSlice from '../../page-header/title-slice' +import useTitle from '../../page-header/useTitle' const store = configureMockStore([thunk]) diff --git a/src/__tests__/patients/GeneralInformation.test.tsx b/src/__tests__/patients/GeneralInformation.test.tsx index 368079a078..74d4225c45 100644 --- a/src/__tests__/patients/GeneralInformation.test.tsx +++ b/src/__tests__/patients/GeneralInformation.test.tsx @@ -1,13 +1,14 @@ import '../../__mocks__/matchMediaMock' -import React from 'react' -import { Router } from 'react-router' -import { mount, ReactWrapper } from 'enzyme' -import GeneralInformation from 'patients/GeneralInformation' -import { createMemoryHistory } from 'history' -import { startOfDay, subYears } from 'date-fns' import { Alert } from '@hospitalrun/components' import { act } from '@testing-library/react' +import { startOfDay, subYears } from 'date-fns' +import { mount, ReactWrapper } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' +import { Router } from 'react-router' + import Patient from '../../model/Patient' +import GeneralInformation from '../../patients/GeneralInformation' describe('Error handling', () => { it('should display errors', () => { diff --git a/src/__tests__/patients/Patients.test.tsx b/src/__tests__/patients/Patients.test.tsx index a37c8979e1..d2c17b2714 100644 --- a/src/__tests__/patients/Patients.test.tsx +++ b/src/__tests__/patients/Patients.test.tsx @@ -1,19 +1,20 @@ import '../../__mocks__/matchMediaMock' +import { mount } from 'enzyme' import React from 'react' +import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' import { MemoryRouter } from 'react-router' import configureMockStore from 'redux-mock-store' -import { mount } from 'enzyme' import thunk from 'redux-thunk' -import { act } from 'react-dom/test-utils' -import Permissions from '../../model/Permissions' -import HospitalRun from '../../HospitalRun' -import NewPatient from '../../patients/new/NewPatient' + import { addBreadcrumbs } from '../../breadcrumbs/breadcrumbs-slice' -import Dashboard from '../../dashboard/Dashboard' import PatientRepository from '../../clients/db/PatientRepository' +import Dashboard from '../../dashboard/Dashboard' +import HospitalRun from '../../HospitalRun' import Patient from '../../model/Patient' +import Permissions from '../../model/Permissions' import EditPatient from '../../patients/edit/EditPatient' +import NewPatient from '../../patients/new/NewPatient' import ViewPatient from '../../patients/view/ViewPatient' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/allergies/Allergies.test.tsx b/src/__tests__/patients/allergies/Allergies.test.tsx index cd76204a89..efa53d9a04 100644 --- a/src/__tests__/patients/allergies/Allergies.test.tsx +++ b/src/__tests__/patients/allergies/Allergies.test.tsx @@ -1,18 +1,19 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' +import * as components from '@hospitalrun/components' +import { act } from '@testing-library/react' import { mount } from 'enzyme' -import Allergies from 'patients/allergies/Allergies' -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 React from 'react' import { Provider } from 'react-redux' -import Patient from 'model/Patient' -import * as components from '@hospitalrun/components' -import { act } from '@testing-library/react' -import PatientRepository from 'clients/db/PatientRepository' -import Allergy from 'model/Allergy' +import { Router } from 'react-router' +import configureMockStore from 'redux-mock-store' +import thunk from 'redux-thunk' + +import PatientRepository from '../../../clients/db/PatientRepository' +import Allergy from '../../../model/Allergy' +import Patient from '../../../model/Patient' +import Permissions from '../../../model/Permissions' +import Allergies from '../../../patients/allergies/Allergies' const mockStore = configureMockStore([thunk]) const history = createMemoryHistory() diff --git a/src/__tests__/patients/allergies/NewAllergyModal.test.tsx b/src/__tests__/patients/allergies/NewAllergyModal.test.tsx index c9420eb4a0..dda22d94fc 100644 --- a/src/__tests__/patients/allergies/NewAllergyModal.test.tsx +++ b/src/__tests__/patients/allergies/NewAllergyModal.test.tsx @@ -1,16 +1,17 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -import NewAllergyModal from 'patients/allergies/NewAllergyModal' -import { mount } from 'enzyme' import { Modal, Alert } from '@hospitalrun/components' import { act } from '@testing-library/react' +import { mount } from 'enzyme' +import React from 'react' +import { Provider } from 'react-redux' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' -import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' -import * as patientSlice from '../../../patients/patient-slice' + import PatientRepository from '../../../clients/db/PatientRepository' +import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' import Patient from '../../../model/Patient' +import NewAllergyModal from '../../../patients/allergies/NewAllergyModal' +import * as patientSlice from '../../../patients/patient-slice' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/appointments/AppointmentsList.test.tsx b/src/__tests__/patients/appointments/AppointmentsList.test.tsx index 249ce68023..0cf97fc546 100644 --- a/src/__tests__/patients/appointments/AppointmentsList.test.tsx +++ b/src/__tests__/patients/appointments/AppointmentsList.test.tsx @@ -1,15 +1,16 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' +import * as components from '@hospitalrun/components' import { mount, ReactWrapper } from 'enzyme' import { createMemoryHistory } from 'history' +import React from 'react' +import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router } from 'react-router' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import Patient from 'model/Patient' -import { Router } from 'react-router' -import { Provider } from 'react-redux' -import AppointmentsList from 'patients/appointments/AppointmentsList' -import * as components from '@hospitalrun/components' -import { act } from 'react-dom/test-utils' + +import Patient from '../../../model/Patient' +import AppointmentsList from '../../../patients/appointments/AppointmentsList' import * as appointmentsSlice from '../../../scheduling/appointments/appointments-slice' const expectedPatient = { diff --git a/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx b/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx index 9f6ba327cc..347e19badc 100644 --- a/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx +++ b/src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx @@ -1,18 +1,19 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { mount } from 'enzyme' import { Modal, Alert } from '@hospitalrun/components' import { act } from '@testing-library/react' -import AddDiagnosisModal from 'patients/diagnoses/AddDiagnosisModal' +import { mount } from 'enzyme' +import React from 'react' +import { Provider } from 'react-redux' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' -import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' + +import PatientRepository from '../../../clients/db/PatientRepository' import DatePickerWithLabelFormGroup from '../../../components/input/DatePickerWithLabelFormGroup' +import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' import Diagnosis from '../../../model/Diagnosis' -import * as patientSlice from '../../../patients/patient-slice' -import PatientRepository from '../../../clients/db/PatientRepository' import Patient from '../../../model/Patient' +import AddDiagnosisModal from '../../../patients/diagnoses/AddDiagnosisModal' +import * as patientSlice from '../../../patients/patient-slice' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/diagnoses/Diagnoses.test.tsx b/src/__tests__/patients/diagnoses/Diagnoses.test.tsx index 261932f2a7..88d3701e9d 100644 --- a/src/__tests__/patients/diagnoses/Diagnoses.test.tsx +++ b/src/__tests__/patients/diagnoses/Diagnoses.test.tsx @@ -1,18 +1,19 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' +import * as components from '@hospitalrun/components' import { mount } from 'enzyme' import { createMemoryHistory } from 'history' +import React from 'react' +import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router } from 'react-router' import configureMockStore from 'redux-mock-store' 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 { Provider } from 'react-redux' -import Diagnoses from 'patients/diagnoses/Diagnoses' -import * as components from '@hospitalrun/components' -import { act } from 'react-dom/test-utils' -import PatientRepository from 'clients/db/PatientRepository' + +import PatientRepository from '../../../clients/db/PatientRepository' +import Diagnosis from '../../../model/Diagnosis' +import Patient from '../../../model/Patient' +import Permissions from '../../../model/Permissions' +import Diagnoses from '../../../patients/diagnoses/Diagnoses' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/edit/EditPatient.test.tsx b/src/__tests__/patients/edit/EditPatient.test.tsx index 62de9c53a9..9fc0a5a96f 100644 --- a/src/__tests__/patients/edit/EditPatient.test.tsx +++ b/src/__tests__/patients/edit/EditPatient.test.tsx @@ -1,20 +1,22 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' + +import { Button } from '@hospitalrun/components' +import { subDays } from 'date-fns' import { mount } from 'enzyme' -import { Router, Route } from 'react-router-dom' -import { Provider } from 'react-redux' import { createMemoryHistory } from 'history' +import React from 'react' import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router, Route } from 'react-router-dom' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import { Button } from '@hospitalrun/components' -import { subDays } from 'date-fns' -import EditPatient from '../../../patients/edit/EditPatient' -import GeneralInformation from '../../../patients/GeneralInformation' + +import PatientRepository from '../../../clients/db/PatientRepository' import Patient from '../../../model/Patient' import * as titleUtil from '../../../page-header/useTitle' +import EditPatient from '../../../patients/edit/EditPatient' +import GeneralInformation from '../../../patients/GeneralInformation' import * as patientSlice from '../../../patients/patient-slice' -import PatientRepository from '../../../clients/db/PatientRepository' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/labs/LabsTab.test.tsx b/src/__tests__/patients/labs/LabsTab.test.tsx index cc5f5c0518..bbf9b538e9 100644 --- a/src/__tests__/patients/labs/LabsTab.test.tsx +++ b/src/__tests__/patients/labs/LabsTab.test.tsx @@ -1,19 +1,21 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -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 { Provider } from 'react-redux' + import * as components from '@hospitalrun/components' import format from 'date-fns/format' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' import { act } from 'react-dom/test-utils' -import LabsTab from '../../../patients/labs/LabsTab' -import Patient from '../../../model/Patient' +import { Provider } from 'react-redux' +import { Router } from 'react-router' +import configureMockStore from 'redux-mock-store' +import thunk from 'redux-thunk' + +import LabRepository from '../../../clients/db/LabRepository' import Lab from '../../../model/Lab' +import Patient from '../../../model/Patient' import Permissions from '../../../model/Permissions' -import LabRepository from '../../../clients/db/LabRepository' +import LabsTab from '../../../patients/labs/LabsTab' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/list/ViewPatients.test.tsx b/src/__tests__/patients/list/ViewPatients.test.tsx index a250d28a1d..b85e7d6be3 100644 --- a/src/__tests__/patients/list/ViewPatients.test.tsx +++ b/src/__tests__/patients/list/ViewPatients.test.tsx @@ -1,17 +1,19 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { mount } from 'enzyme' + import { TextInput, Spinner } from '@hospitalrun/components' -import { MemoryRouter } from 'react-router-dom' +import format from 'date-fns/format' +import { mount } from 'enzyme' +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 configureStore from 'redux-mock-store' +import thunk from 'redux-thunk' import { mocked } from 'ts-jest/utils' -import { act } from 'react-dom/test-utils' -import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import format from 'date-fns/format' -import ViewPatients from '../../../patients/list/ViewPatients' + import PatientRepository from '../../../clients/db/PatientRepository' +import * as ButtonBarProvider from '../../../page-header/ButtonBarProvider' +import ViewPatients from '../../../patients/list/ViewPatients' import * as patientSlice from '../../../patients/patients-slice' const middlewares = [thunk] diff --git a/src/__tests__/patients/new/NewPatient.test.tsx b/src/__tests__/patients/new/NewPatient.test.tsx index dbea001bc0..9d3e53b5a7 100644 --- a/src/__tests__/patients/new/NewPatient.test.tsx +++ b/src/__tests__/patients/new/NewPatient.test.tsx @@ -1,20 +1,22 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' + +import * as components from '@hospitalrun/components' import { mount } from 'enzyme' -import { Router, Route } from 'react-router-dom' -import { Provider } from 'react-redux' -import { mocked } from 'ts-jest/utils' import { createMemoryHistory } from 'history' +import React from 'react' import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router, Route } from 'react-router-dom' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import * as components from '@hospitalrun/components' -import NewPatient from '../../../patients/new/NewPatient' -import GeneralInformation from '../../../patients/GeneralInformation' +import { mocked } from 'ts-jest/utils' + +import PatientRepository from '../../../clients/db/PatientRepository' import Patient from '../../../model/Patient' -import * as patientSlice from '../../../patients/patient-slice' import * as titleUtil from '../../../page-header/useTitle' -import PatientRepository from '../../../clients/db/PatientRepository' +import GeneralInformation from '../../../patients/GeneralInformation' +import NewPatient from '../../../patients/new/NewPatient' +import * as patientSlice from '../../../patients/patient-slice' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/notes/NewNoteModal.test.tsx b/src/__tests__/patients/notes/NewNoteModal.test.tsx index 8ac6dafcc3..44becf6f9e 100644 --- a/src/__tests__/patients/notes/NewNoteModal.test.tsx +++ b/src/__tests__/patients/notes/NewNoteModal.test.tsx @@ -1,16 +1,18 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -import NewNoteModal from 'patients/notes/NewNoteModal' -import { mount } from 'enzyme' + import { Alert, Modal } from '@hospitalrun/components' import { act } from '@testing-library/react' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' +import { mount } from 'enzyme' +import React from 'react' +import { Provider } from 'react-redux' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' -import * as patientSlice from '../../../patients/patient-slice' + import PatientRepository from '../../../clients/db/PatientRepository' +import TextFieldWithLabelFormGroup from '../../../components/input/TextFieldWithLabelFormGroup' import Patient from '../../../model/Patient' +import NewNoteModal from '../../../patients/notes/NewNoteModal' +import * as patientSlice from '../../../patients/patient-slice' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/notes/NotesTab.test.tsx b/src/__tests__/patients/notes/NotesTab.test.tsx index 4cfbfb0f87..fec2b2c114 100644 --- a/src/__tests__/patients/notes/NotesTab.test.tsx +++ b/src/__tests__/patients/notes/NotesTab.test.tsx @@ -1,18 +1,20 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -import PatientRepository from 'clients/db/PatientRepository' -import Note from 'model/Note' + +import * as components from '@hospitalrun/components' +import { mount } from 'enzyme' import { createMemoryHistory } from 'history' +import React from 'react' +import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router } from 'react-router' 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 { Provider } from 'react-redux' -import NoteTab from 'patients/notes/NoteTab' -import * as components from '@hospitalrun/components' -import { act } from 'react-dom/test-utils' + +import PatientRepository from '../../../clients/db/PatientRepository' +import Note from '../../../model/Note' +import Patient from '../../../model/Patient' import Permissions from '../../../model/Permissions' +import NoteTab from '../../../patients/notes/NoteTab' const expectedPatient = { id: '123', diff --git a/src/__tests__/patients/patient-slice.test.ts b/src/__tests__/patients/patient-slice.test.ts index dba7899dcd..b93ef77f31 100644 --- a/src/__tests__/patients/patient-slice.test.ts +++ b/src/__tests__/patients/patient-slice.test.ts @@ -1,9 +1,14 @@ import '../../__mocks__/matchMediaMock' +import { addDays } from 'date-fns' import { AnyAction } from 'redux' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { addDays } from 'date-fns' -import * as uuid from '../../util/uuid' + +import PatientRepository from '../../clients/db/PatientRepository' +import Allergy from '../../model/Allergy' +import Diagnosis from '../../model/Diagnosis' +import Patient from '../../model/Patient' +import RelatedPerson from '../../model/RelatedPerson' import patient, { fetchPatientStart, fetchPatientSuccess, @@ -24,12 +29,8 @@ import patient, { addDiagnosisError, addRelatedPersonError, } from '../../patients/patient-slice' -import Patient from '../../model/Patient' -import PatientRepository from '../../clients/db/PatientRepository' import { RootState } from '../../store' -import RelatedPerson from '../../model/RelatedPerson' -import Diagnosis from '../../model/Diagnosis' -import Allergy from '../../model/Allergy' +import * as uuid from '../../util/uuid' const mockStore = createMockStore([thunk]) diff --git a/src/__tests__/patients/patients-slice.test.ts b/src/__tests__/patients/patients-slice.test.ts index b0f32778a5..1b60fc5eff 100644 --- a/src/__tests__/patients/patients-slice.test.ts +++ b/src/__tests__/patients/patients-slice.test.ts @@ -1,13 +1,14 @@ import '../../__mocks__/matchMediaMock' import { AnyAction } from 'redux' import { mocked } from 'ts-jest/utils' + +import PatientRepository from '../../clients/db/PatientRepository' +import Patient from '../../model/Patient' import patients, { fetchPatientsStart, fetchPatientsSuccess, searchPatients, } from '../../patients/patients-slice' -import Patient from '../../model/Patient' -import PatientRepository from '../../clients/db/PatientRepository' describe('patients slice', () => { beforeEach(() => { diff --git a/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx b/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx index 4ef438bd50..015a4055ef 100644 --- a/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx +++ b/src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx @@ -1,16 +1,18 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { ReactWrapper, mount } from 'enzyme' + import { Modal, Alert, Typeahead } from '@hospitalrun/components' import { act } from '@testing-library/react' +import { ReactWrapper, mount } from 'enzyme' +import React from 'react' import { Provider } from 'react-redux' -import thunk from 'redux-thunk' import configureMockStore, { MockStore } from 'redux-mock-store' -import Patient from 'model/Patient' +import thunk from 'redux-thunk' + +import PatientRepository from '../../../clients/db/PatientRepository' import TextInputWithLabelFormGroup from '../../../components/input/TextInputWithLabelFormGroup' -import AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal' +import Patient from '../../../model/Patient' import * as patientSlice from '../../../patients/patient-slice' -import PatientRepository from '../../../clients/db/PatientRepository' +import AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/related-persons/RelatedPersons.test.tsx b/src/__tests__/patients/related-persons/RelatedPersons.test.tsx index 49da165c9c..5aaf3d502b 100644 --- a/src/__tests__/patients/related-persons/RelatedPersons.test.tsx +++ b/src/__tests__/patients/related-persons/RelatedPersons.test.tsx @@ -1,20 +1,22 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { Router } from 'react-router' -import { createMemoryHistory } from 'history' -import { mount } from 'enzyme' -import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab' + import * as components from '@hospitalrun/components' -import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' import { act } from '@testing-library/react' -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' +import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' +import { Provider } from 'react-redux' +import { Router } from 'react-router' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Provider } from 'react-redux' -import Permissions from 'model/Permissions' -import RelatedPerson from 'model/RelatedPerson' + +import PatientRepository from '../../../clients/db/PatientRepository' +import Patient from '../../../model/Patient' +import Permissions from '../../../model/Permissions' +import RelatedPerson from '../../../model/RelatedPerson' import * as patientSlice from '../../../patients/patient-slice' +import AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal' +import RelatedPersonTab from '../../../patients/related-persons/RelatedPersonTab' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/patients/util/patient-name-util.test.ts b/src/__tests__/patients/util/patient-name-util.test.ts index bc65a1289c..ef668c36fd 100644 --- a/src/__tests__/patients/util/patient-name-util.test.ts +++ b/src/__tests__/patients/util/patient-name-util.test.ts @@ -1,5 +1,5 @@ -import { getPatientFullName, getPatientName } from 'patients/util/patient-name-util' -import Patient from 'model/Patient' +import Patient from '../../../model/Patient' +import { getPatientFullName, getPatientName } from '../../../patients/util/patient-name-util' describe('patient name util', () => { describe('getPatientName', () => { diff --git a/src/__tests__/patients/view/ViewPatient.test.tsx b/src/__tests__/patients/view/ViewPatient.test.tsx index 3080e73384..cb874e4317 100644 --- a/src/__tests__/patients/view/ViewPatient.test.tsx +++ b/src/__tests__/patients/view/ViewPatient.test.tsx @@ -1,28 +1,30 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { Provider } from 'react-redux' + +import { TabsHeader, Tab } from '@hospitalrun/components' import { mount } from 'enzyme' -import { mocked } from 'ts-jest/utils' +import { createMemoryHistory } from 'history' +import React from 'react' import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' import { Route, Router } from 'react-router-dom' -import { TabsHeader, Tab } from '@hospitalrun/components' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import GeneralInformation from 'patients/GeneralInformation' -import { createMemoryHistory } from 'history' -import RelatedPersonTab from 'patients/related-persons/RelatedPersonTab' -import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import Allergies from 'patients/allergies/Allergies' -import Diagnoses from 'patients/diagnoses/Diagnoses' -import NotesTab from 'patients/notes/NoteTab' -import Patient from '../../../model/Patient' +import { mocked } from 'ts-jest/utils' + +import LabRepository from '../../../clients/db/LabRepository' import PatientRepository from '../../../clients/db/PatientRepository' -import * as titleUtil from '../../../page-header/useTitle' -import ViewPatient from '../../../patients/view/ViewPatient' -import * as patientSlice from '../../../patients/patient-slice' +import Patient from '../../../model/Patient' import Permissions from '../../../model/Permissions' +import * as ButtonBarProvider from '../../../page-header/ButtonBarProvider' +import * as titleUtil from '../../../page-header/useTitle' +import Allergies from '../../../patients/allergies/Allergies' +import Diagnoses from '../../../patients/diagnoses/Diagnoses' +import GeneralInformation from '../../../patients/GeneralInformation' import LabsTab from '../../../patients/labs/LabsTab' -import LabRepository from '../../../clients/db/LabRepository' +import NotesTab from '../../../patients/notes/NoteTab' +import * as patientSlice from '../../../patients/patient-slice' +import RelatedPersonTab from '../../../patients/related-persons/RelatedPersonTab' +import ViewPatient from '../../../patients/view/ViewPatient' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx b/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx index 27828f2ce3..3b57080793 100644 --- a/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx +++ b/src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx @@ -1,13 +1,15 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' -import { mount, ReactWrapper } from 'enzyme' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import Appointment from 'model/Appointment' -import { roundToNearestMinutes, addMinutes } from 'date-fns' + import { Typeahead, Alert } from '@hospitalrun/components' -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' import { act } from '@testing-library/react' +import { roundToNearestMinutes, addMinutes } from 'date-fns' +import { mount, ReactWrapper } from 'enzyme' +import React from 'react' + +import PatientRepository from '../../../clients/db/PatientRepository' +import Appointment from '../../../model/Appointment' +import Patient from '../../../model/Patient' +import AppointmentDetailForm from '../../../scheduling/appointments/AppointmentDetailForm' describe('AppointmentDetailForm', () => { describe('Error handling', () => { diff --git a/src/__tests__/scheduling/appointments/Appointments.test.tsx b/src/__tests__/scheduling/appointments/Appointments.test.tsx index c6acd3459a..ebe2d9e63c 100644 --- a/src/__tests__/scheduling/appointments/Appointments.test.tsx +++ b/src/__tests__/scheduling/appointments/Appointments.test.tsx @@ -1,22 +1,24 @@ import '../../../__mocks__/matchMediaMock' + +import { mount } from 'enzyme' import React from 'react' +import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' import { MemoryRouter } from 'react-router' import configureMockStore from 'redux-mock-store' -import { mount } from 'enzyme' import thunk from 'redux-thunk' -import { act } from 'react-dom/test-utils' -import NewAppointment from 'scheduling/appointments/new/NewAppointment' -import EditAppointment from 'scheduling/appointments/edit/EditAppointment' -import ViewAppointments from 'scheduling/appointments/ViewAppointments' -import Permissions from '../../../model/Permissions' -import HospitalRun from '../../../HospitalRun' + import { addBreadcrumbs } from '../../../breadcrumbs/breadcrumbs-slice' -import Dashboard from '../../../dashboard/Dashboard' -import PatientRepository from '../../../clients/db/PatientRepository' import AppointmentRepository from '../../../clients/db/AppointmentRepository' -import Patient from '../../../model/Patient' +import PatientRepository from '../../../clients/db/PatientRepository' +import Dashboard from '../../../dashboard/Dashboard' +import HospitalRun from '../../../HospitalRun' import Appointment from '../../../model/Appointment' +import Patient from '../../../model/Patient' +import Permissions from '../../../model/Permissions' +import EditAppointment from '../../../scheduling/appointments/edit/EditAppointment' +import NewAppointment from '../../../scheduling/appointments/new/NewAppointment' +import ViewAppointments from '../../../scheduling/appointments/ViewAppointments' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx b/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx index 2f5db67cf3..a47418d7c9 100644 --- a/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx +++ b/src/__tests__/scheduling/appointments/ViewAppointments.test.tsx @@ -1,20 +1,22 @@ import '../../../__mocks__/matchMediaMock' -import React from 'react' + +import { Calendar } from '@hospitalrun/components' +import { act } from '@testing-library/react' import { mount } from 'enzyme' -import { MemoryRouter } from 'react-router-dom' +import React from 'react' import { Provider } from 'react-redux' -import ViewAppointments from 'scheduling/appointments/ViewAppointments' +import { MemoryRouter } from 'react-router-dom' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' -import { Calendar } from '@hospitalrun/components' -import { act } from '@testing-library/react' -import PatientRepository from 'clients/db/PatientRepository' import { mocked } from 'ts-jest/utils' -import Patient from 'model/Patient' -import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import AppointmentRepository from 'clients/db/AppointmentRepository' -import Appointment from 'model/Appointment' + +import AppointmentRepository from '../../../clients/db/AppointmentRepository' +import PatientRepository from '../../../clients/db/PatientRepository' +import Appointment from '../../../model/Appointment' +import Patient from '../../../model/Patient' +import * as ButtonBarProvider from '../../../page-header/ButtonBarProvider' import * as titleUtil from '../../../page-header/useTitle' +import ViewAppointments from '../../../scheduling/appointments/ViewAppointments' describe('ViewAppointments', () => { const expectedAppointments = [ diff --git a/src/__tests__/scheduling/appointments/appointment-slice.test.ts b/src/__tests__/scheduling/appointments/appointment-slice.test.ts index 50c8ecedbd..428c95be1e 100644 --- a/src/__tests__/scheduling/appointments/appointment-slice.test.ts +++ b/src/__tests__/scheduling/appointments/appointment-slice.test.ts @@ -1,12 +1,13 @@ import '../../../__mocks__/matchMediaMock' + +import { subDays } from 'date-fns' import { AnyAction } from 'redux' -import Appointment from 'model/Appointment' -import AppointmentRepository from 'clients/db/AppointmentRepository' import { mocked } from 'ts-jest/utils' -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' -import { subDays } from 'date-fns' +import AppointmentRepository from '../../../clients/db/AppointmentRepository' +import PatientRepository from '../../../clients/db/PatientRepository' +import Appointment from '../../../model/Appointment' +import Patient from '../../../model/Patient' import appointment, { fetchAppointmentStart, fetchAppointmentSuccess, diff --git a/src/__tests__/scheduling/appointments/appointments-slice.test.ts b/src/__tests__/scheduling/appointments/appointments-slice.test.ts index bb40a08644..46272dd887 100644 --- a/src/__tests__/scheduling/appointments/appointments-slice.test.ts +++ b/src/__tests__/scheduling/appointments/appointments-slice.test.ts @@ -1,8 +1,8 @@ import { AnyAction } from 'redux' import { mocked } from 'ts-jest/utils' -import Appointment from 'model/Appointment' -import AppointmentRepository from 'clients/db/AppointmentRepository' +import AppointmentRepository from '../../../clients/db/AppointmentRepository' +import Appointment from '../../../model/Appointment' import appointments, { fetchAppointmentsStart, fetchAppointmentsSuccess, diff --git a/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx b/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx index 0a4cdca935..0c85659751 100644 --- a/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx +++ b/src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx @@ -1,23 +1,25 @@ import '../../../../__mocks__/matchMediaMock' -import React from 'react' + +import { Button } from '@hospitalrun/components' +import { roundToNearestMinutes, addMinutes } from 'date-fns' import { mount } from 'enzyme' -import { Router, Route } from 'react-router-dom' -import { Provider } from 'react-redux' -import { mocked } from 'ts-jest/utils' import { createMemoryHistory } from 'history' +import React from 'react' import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import { Router, Route } from 'react-router-dom' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import { roundToNearestMinutes, addMinutes } from 'date-fns' -import { Button } from '@hospitalrun/components' -import EditAppointment from '../../../../scheduling/appointments/edit/EditAppointment' -import AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm' +import { mocked } from 'ts-jest/utils' + +import AppointmentRepository from '../../../../clients/db/AppointmentRepository' +import PatientRepository from '../../../../clients/db/PatientRepository' import Appointment from '../../../../model/Appointment' import Patient from '../../../../model/Patient' import * as titleUtil from '../../../../page-header/useTitle' import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice' -import AppointmentRepository from '../../../../clients/db/AppointmentRepository' -import PatientRepository from '../../../../clients/db/PatientRepository' +import AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm' +import EditAppointment from '../../../../scheduling/appointments/edit/EditAppointment' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx b/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx index 492add87cc..4cb7ead89e 100644 --- a/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx +++ b/src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx @@ -1,24 +1,26 @@ import '../../../../__mocks__/matchMediaMock' -import React from 'react' -import NewAppointment from 'scheduling/appointments/new/NewAppointment' -import { Router, Route } from 'react-router' -import { Provider } from 'react-redux' -import { mount } from 'enzyme' + +import * as components from '@hospitalrun/components' +import { act } from '@testing-library/react' import { roundToNearestMinutes, addMinutes } from 'date-fns' +import { mount } from 'enzyme' import { createMemoryHistory, MemoryHistory } from 'history' -import { act } from '@testing-library/react' -import AppointmentRepository from 'clients/db/AppointmentRepository' -import { mocked } from 'ts-jest/utils' +import React from 'react' +import { Provider } from 'react-redux' +import { Router, Route } from 'react-router' import configureMockStore, { MockStore } from 'redux-mock-store' import thunk from 'redux-thunk' -import Appointment from 'model/Appointment' -import Patient from 'model/Patient' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import * as components from '@hospitalrun/components' -import * as titleUtil from '../../../../page-header/useTitle' -import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice' +import { mocked } from 'ts-jest/utils' + +import AppointmentRepository from '../../../../clients/db/AppointmentRepository' import LabRepository from '../../../../clients/db/LabRepository' +import Appointment from '../../../../model/Appointment' import Lab from '../../../../model/Lab' +import Patient from '../../../../model/Patient' +import * as titleUtil from '../../../../page-header/useTitle' +import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice' +import AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm' +import NewAppointment from '../../../../scheduling/appointments/new/NewAppointment' const mockStore = configureMockStore([thunk]) const mockedComponents = mocked(components, true) diff --git a/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts b/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts index 292e71cd9d..9f248451f1 100644 --- a/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts +++ b/src/__tests__/scheduling/appointments/util/scheduling-appointment.util.test.ts @@ -1,4 +1,4 @@ -import Appointment from 'model/Appointment' +import Appointment from '../../../../model/Appointment' import { getAppointmentLabel } from '../../../../scheduling/appointments/util/scheduling-appointment.util' describe('scheduling appointment util', () => { diff --git a/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx b/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx index e090672c51..1ce5ad1263 100644 --- a/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx +++ b/src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx @@ -1,24 +1,26 @@ import '../../../../__mocks__/matchMediaMock' -import React from 'react' + +import * as components from '@hospitalrun/components' import { mount } from 'enzyme' +import { createMemoryHistory } from 'history' +import React from 'react' +import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' +import { Router, Route } from 'react-router' 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 { createMemoryHistory } from 'history' -import AppointmentRepository from 'clients/db/AppointmentRepository' import { mocked } from 'ts-jest/utils' -import { act } from 'react-dom/test-utils' -import * as components from '@hospitalrun/components' -import AppointmentDetailForm from 'scheduling/appointments/AppointmentDetailForm' -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' -import * as ButtonBarProvider from 'page-header/ButtonBarProvider' -import Permissions from 'model/Permissions' + +import AppointmentRepository from '../../../../clients/db/AppointmentRepository' +import PatientRepository from '../../../../clients/db/PatientRepository' +import Appointment from '../../../../model/Appointment' +import Patient from '../../../../model/Patient' +import Permissions from '../../../../model/Permissions' +import * as ButtonBarProvider from '../../../../page-header/ButtonBarProvider' import * as titleUtil from '../../../../page-header/useTitle' import * as appointmentSlice from '../../../../scheduling/appointments/appointment-slice' +import AppointmentDetailForm from '../../../../scheduling/appointments/AppointmentDetailForm' +import ViewAppointment from '../../../../scheduling/appointments/view/ViewAppointment' const mockStore = configureMockStore([thunk]) diff --git a/src/__tests__/user/user-slice.test.ts b/src/__tests__/user/user-slice.test.ts index 71ce829406..ec13b46bb4 100644 --- a/src/__tests__/user/user-slice.test.ts +++ b/src/__tests__/user/user-slice.test.ts @@ -1,5 +1,5 @@ -import user, { fetchPermissions } from '../../user/user-slice' import Permissions from '../../model/Permissions' +import user, { fetchPermissions } from '../../user/user-slice' describe('user slice', () => { it('should handle the FETCH_PERMISSIONS action', () => { diff --git a/src/breadcrumbs/Breadcrumbs.tsx b/src/breadcrumbs/Breadcrumbs.tsx index 263f8e9476..d5e11b08c6 100644 --- a/src/breadcrumbs/Breadcrumbs.tsx +++ b/src/breadcrumbs/Breadcrumbs.tsx @@ -1,8 +1,9 @@ +import { Breadcrumb, BreadcrumbItem } from '@hospitalrun/components' import React from 'react' -import { useHistory } from 'react-router' -import { useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' -import { Breadcrumb, BreadcrumbItem } from '@hospitalrun/components' +import { useSelector } from 'react-redux' +import { useHistory } from 'react-router' + import { RootState } from '../store' const Breadcrumbs = () => { diff --git a/src/breadcrumbs/breadcrumbs-slice.ts b/src/breadcrumbs/breadcrumbs-slice.ts index 86a689e0d8..5785326efd 100644 --- a/src/breadcrumbs/breadcrumbs-slice.ts +++ b/src/breadcrumbs/breadcrumbs-slice.ts @@ -1,5 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import Breadcrumb from 'model/Breadcrumb' + +import Breadcrumb from '../model/Breadcrumb' interface BreadcrumbsState { breadcrumbs: Breadcrumb[] diff --git a/src/breadcrumbs/useAddBreadcrumbs.ts b/src/breadcrumbs/useAddBreadcrumbs.ts index 76d68e80ce..f3822cecf1 100644 --- a/src/breadcrumbs/useAddBreadcrumbs.ts +++ b/src/breadcrumbs/useAddBreadcrumbs.ts @@ -1,6 +1,7 @@ import { useEffect } from 'react' import { useDispatch } from 'react-redux' -import Breadcrumb from 'model/Breadcrumb' + +import Breadcrumb from '../model/Breadcrumb' import { addBreadcrumbs, removeBreadcrumbs } from './breadcrumbs-slice' export default function useAddBreadcrumbs(breadcrumbs: Breadcrumb[], withDashboard = false): void { diff --git a/src/clients/db/AppointmentRepository.ts b/src/clients/db/AppointmentRepository.ts index 42ba8dce42..0aebe2504e 100644 --- a/src/clients/db/AppointmentRepository.ts +++ b/src/clients/db/AppointmentRepository.ts @@ -1,9 +1,10 @@ import escapeStringRegexp from 'escape-string-regexp' -import Appointment from 'model/Appointment' -import { appointments } from 'config/pouchdb' + +import { appointments } from '../../config/pouchdb' +import Appointment from '../../model/Appointment' import Repository from './Repository' -export class AppointmentRepository extends Repository { +class AppointmentRepository extends Repository { constructor() { super(appointments) } diff --git a/src/clients/db/LabRepository.ts b/src/clients/db/LabRepository.ts index 3581c96e12..fd4aaf0fab 100644 --- a/src/clients/db/LabRepository.ts +++ b/src/clients/db/LabRepository.ts @@ -1,7 +1,7 @@ -import Lab from 'model/Lab' +import { labs } from '../../config/pouchdb' +import Lab from '../../model/Lab' import generateCode from '../../util/generateCode' import Repository from './Repository' -import { labs } from '../../config/pouchdb' import SortRequest from './SortRequest' interface SearchContainer { @@ -9,7 +9,7 @@ interface SearchContainer { status: 'requested' | 'completed' | 'canceled' | 'all' defaultSortRequest: SortRequest } -export class LabRepository extends Repository { +class LabRepository extends Repository { constructor() { super(labs) } diff --git a/src/clients/db/PatientRepository.ts b/src/clients/db/PatientRepository.ts index 172e380a7f..7bc53884ef 100644 --- a/src/clients/db/PatientRepository.ts +++ b/src/clients/db/PatientRepository.ts @@ -1,10 +1,11 @@ import escapeStringRegexp from 'escape-string-regexp' + +import { patients } from '../../config/pouchdb' import Patient from '../../model/Patient' import generateCode from '../../util/generateCode' import Repository from './Repository' -import { patients } from '../../config/pouchdb' -export class PatientRepository extends Repository { +class PatientRepository extends Repository { constructor() { super(patients) } diff --git a/src/clients/db/Repository.ts b/src/clients/db/Repository.ts index df56a1d3a9..895dcc0ffe 100644 --- a/src/clients/db/Repository.ts +++ b/src/clients/db/Repository.ts @@ -1,5 +1,6 @@ /* eslint "@typescript-eslint/camelcase": "off" */ import { v4 as uuidv4 } from 'uuid' + import AbstractDBModel from '../../model/AbstractDBModel' import SortRequest, { Unsorted } from './SortRequest' diff --git a/src/clients/db/SortRequest.ts b/src/clients/db/SortRequest.ts index 3079fd01c5..fde109b2cd 100644 --- a/src/clients/db/SortRequest.ts +++ b/src/clients/db/SortRequest.ts @@ -1,4 +1,4 @@ -import Sort from 'clients/Sort' +import Sort from '../Sort' export default interface SortRequest { sorts: Sort[] diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index fe90ff8df7..04bbd8afcd 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -1,7 +1,7 @@ -import React from 'react' -import { useHistory } from 'react-router' import { Navbar as HospitalRunNavbar } from '@hospitalrun/components' +import React from 'react' import { useTranslation } from 'react-i18next' +import { useHistory } from 'react-router' const Navbar = () => { const { t } = useTranslation() diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index 06134b07f8..c38b79f6b6 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -1,8 +1,9 @@ -import React, { useState, CSSProperties } from 'react' import { List, ListItem, Icon } from '@hospitalrun/components' +import React, { useState, CSSProperties } from 'react' import { useTranslation } from 'react-i18next' -import { useLocation, useHistory } from 'react-router' import { useSelector, useDispatch } from 'react-redux' +import { useLocation, useHistory } from 'react-router' + import { RootState } from '../store' import { updateSidebar } from './component-slice' diff --git a/src/components/component-slice.ts b/src/components/component-slice.ts index 62a6aeeefe..5eb7d61857 100644 --- a/src/components/component-slice.ts +++ b/src/components/component-slice.ts @@ -1,4 +1,5 @@ import { createSlice } from '@reduxjs/toolkit' + import { AppThunk } from '../store' interface ComponentState { diff --git a/src/components/input/DatePickerWithLabelFormGroup.tsx b/src/components/input/DatePickerWithLabelFormGroup.tsx index ea9b923fc0..a2b15d6b69 100644 --- a/src/components/input/DatePickerWithLabelFormGroup.tsx +++ b/src/components/input/DatePickerWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import React from 'react' import { Label, DateTimePicker } from '@hospitalrun/components' +import React from 'react' interface Props { name: string diff --git a/src/components/input/DateTimePickerWithLabelFormGroup.tsx b/src/components/input/DateTimePickerWithLabelFormGroup.tsx index f31a186692..5f2e9caefa 100644 --- a/src/components/input/DateTimePickerWithLabelFormGroup.tsx +++ b/src/components/input/DateTimePickerWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import React from 'react' import { Label, DateTimePicker } from '@hospitalrun/components' +import React from 'react' interface Props { name: string diff --git a/src/components/input/SelectWithLableFormGroup.tsx b/src/components/input/SelectWithLableFormGroup.tsx index e7451d1e43..be9874aca1 100644 --- a/src/components/input/SelectWithLableFormGroup.tsx +++ b/src/components/input/SelectWithLableFormGroup.tsx @@ -1,5 +1,5 @@ -import React from 'react' import { Label, Select } from '@hospitalrun/components' +import React from 'react' interface Option { label: string diff --git a/src/components/input/TextFieldWithLabelFormGroup.tsx b/src/components/input/TextFieldWithLabelFormGroup.tsx index 3848ddf02a..5fcd4b4863 100644 --- a/src/components/input/TextFieldWithLabelFormGroup.tsx +++ b/src/components/input/TextFieldWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import React from 'react' import { TextField, Label } from '@hospitalrun/components' +import React from 'react' interface Props { value: string diff --git a/src/components/input/TextInputWithLabelFormGroup.tsx b/src/components/input/TextInputWithLabelFormGroup.tsx index 2e68c196d6..0cb7efb972 100644 --- a/src/components/input/TextInputWithLabelFormGroup.tsx +++ b/src/components/input/TextInputWithLabelFormGroup.tsx @@ -1,5 +1,5 @@ -import React from 'react' import { TextInput, Label } from '@hospitalrun/components' +import React from 'react' interface Props { value: string diff --git a/src/dashboard/Dashboard.tsx b/src/dashboard/Dashboard.tsx index bf295875dc..8a26e4df9e 100644 --- a/src/dashboard/Dashboard.tsx +++ b/src/dashboard/Dashboard.tsx @@ -1,5 +1,6 @@ import React from 'react' import { useTranslation } from 'react-i18next' + import useTitle from '../page-header/useTitle' const Dashboard: React.FC = () => { diff --git a/src/i18n.ts b/src/i18n.ts index b237cb7da6..91e580f582 100644 --- a/src/i18n.ts +++ b/src/i18n.ts @@ -8,11 +8,11 @@ import translationEnUs from './locales/enUs/translations' import translationES from './locales/es/translations' import translationFR from './locales/fr/translations' import translationIN from './locales/in/translations' +import translationIT from './locales/it/translations' import translationJA from './locales/ja/translations' import translationPtBR from './locales/ptBr/translations' import translationRU from './locales/ru/translations' import translationZR from './locales/zr/translations' -import translationIT from './locales/it/translations' const resources = { it: { diff --git a/src/index.tsx b/src/index.tsx index 71b2ba1135..f9549cac06 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,5 +1,6 @@ import React from 'react' import ReactDOM from 'react-dom' + import '@hospitalrun/components/scss/main.scss' import './index.css' import App from './App' diff --git a/src/labs/Labs.tsx b/src/labs/Labs.tsx index a610af4052..387e7dc776 100644 --- a/src/labs/Labs.tsx +++ b/src/labs/Labs.tsx @@ -1,13 +1,14 @@ import React from 'react' -import PrivateRoute from 'components/PrivateRoute' -import { Switch } from 'react-router' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' import { useSelector } from 'react-redux' -import Permissions from 'model/Permissions' -import LabRequests from './ViewLabs' +import { Switch } from 'react-router' + +import useAddBreadcrumbs from '../breadcrumbs/useAddBreadcrumbs' +import PrivateRoute from '../components/PrivateRoute' +import Permissions from '../model/Permissions' +import { RootState } from '../store' import NewLabRequest from './requests/NewLabRequest' import ViewLab from './ViewLab' -import { RootState } from '../store' +import LabRequests from './ViewLabs' const Labs = () => { const { permissions } = useSelector((state: RootState) => state.user) diff --git a/src/labs/ViewLab.tsx b/src/labs/ViewLab.tsx index 6f58f2c9e6..4a197a48c5 100644 --- a/src/labs/ViewLab.tsx +++ b/src/labs/ViewLab.tsx @@ -1,15 +1,16 @@ -import React, { useEffect, useState } from 'react' -import { useParams, useHistory } from 'react-router' +import { Row, Column, Badge, Button, Alert } from '@hospitalrun/components' import format from 'date-fns/format' -import Lab from 'model/Lab' -import Patient from 'model/Patient' -import useTitle from 'page-header/useTitle' +import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { Row, Column, Badge, Button, Alert } from '@hospitalrun/components' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' import { useSelector, useDispatch } from 'react-redux' -import Permissions from 'model/Permissions' +import { useParams, useHistory } from 'react-router' + +import useAddBreadcrumbs from '../breadcrumbs/useAddBreadcrumbs' +import TextFieldWithLabelFormGroup from '../components/input/TextFieldWithLabelFormGroup' +import Lab from '../model/Lab' +import Patient from '../model/Patient' +import Permissions from '../model/Permissions' +import useTitle from '../page-header/useTitle' import { RootState } from '../store' import { cancelLab, completeLab, updateLab, fetchLab } from './lab-slice' diff --git a/src/labs/ViewLabs.tsx b/src/labs/ViewLabs.tsx index 012b26a836..d2a4f582cb 100644 --- a/src/labs/ViewLabs.tsx +++ b/src/labs/ViewLabs.tsx @@ -1,18 +1,19 @@ +import { Spinner, Button } from '@hospitalrun/components' +import format from 'date-fns/format' import React, { useState, useEffect, useCallback } from 'react' -import { useSelector, useDispatch } from 'react-redux' -import useTitle from 'page-header/useTitle' import { useTranslation } from 'react-i18next' -import format from 'date-fns/format' -import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import { Spinner, Button } from '@hospitalrun/components' +import { useSelector, useDispatch } from 'react-redux' import { useHistory } from 'react-router' -import Lab from 'model/Lab' -import Permissions from 'model/Permissions' -import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' + +import SelectWithLabelFormGroup from '../components/input/SelectWithLableFormGroup' +import TextInputWithLabelFormGroup from '../components/input/TextInputWithLabelFormGroup' +import useDebounce from '../hooks/debounce' +import Lab from '../model/Lab' +import Permissions from '../model/Permissions' +import { useButtonToolbarSetter } from '../page-header/ButtonBarProvider' +import useTitle from '../page-header/useTitle' import { RootState } from '../store' import { searchLabs } from './labs-slice' -import useDebounce from '../hooks/debounce' type filter = 'requested' | 'completed' | 'canceled' | 'all' diff --git a/src/labs/lab-slice.ts b/src/labs/lab-slice.ts index 224ffbd722..4d60aadb49 100644 --- a/src/labs/lab-slice.ts +++ b/src/labs/lab-slice.ts @@ -1,9 +1,10 @@ -import Lab from 'model/Lab' -import Patient from 'model/Patient' import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { AppThunk } from 'store' -import LabRepository from 'clients/db/LabRepository' -import PatientRepository from 'clients/db/PatientRepository' + +import LabRepository from '../clients/db/LabRepository' +import PatientRepository from '../clients/db/PatientRepository' +import Lab from '../model/Lab' +import Patient from '../model/Patient' +import { AppThunk } from '../store' interface Error { result?: string diff --git a/src/labs/labs-slice.ts b/src/labs/labs-slice.ts index db956992da..2951d739b6 100644 --- a/src/labs/labs-slice.ts +++ b/src/labs/labs-slice.ts @@ -1,7 +1,8 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import Lab from '../model/Lab' + import LabRepository from '../clients/db/LabRepository' import SortRequest from '../clients/db/SortRequest' +import Lab from '../model/Lab' import { AppThunk } from '../store' interface LabsState { diff --git a/src/labs/requests/NewLabRequest.tsx b/src/labs/requests/NewLabRequest.tsx index fb4035686e..15b5e4f581 100644 --- a/src/labs/requests/NewLabRequest.tsx +++ b/src/labs/requests/NewLabRequest.tsx @@ -1,17 +1,18 @@ +import { Typeahead, Label, Button, Alert } from '@hospitalrun/components' import React, { useState } from 'react' -import useTitle from 'page-header/useTitle' import { useTranslation } from 'react-i18next' -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 Lab from 'model/Lab' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' import { useDispatch, useSelector } from 'react-redux' -import { requestLab } from 'labs/lab-slice' -import { RootState } from 'store' +import { useHistory } from 'react-router' + +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import PatientRepository from '../../clients/db/PatientRepository' +import TextFieldWithLabelFormGroup from '../../components/input/TextFieldWithLabelFormGroup' +import TextInputWithLabelFormGroup from '../../components/input/TextInputWithLabelFormGroup' +import Lab from '../../model/Lab' +import Patient from '../../model/Patient' +import useTitle from '../../page-header/useTitle' +import { RootState } from '../../store' +import { requestLab } from '../lab-slice' const NewLabRequest = () => { const { t } = useTranslation() diff --git a/src/locales/enUs/translations/index.ts b/src/locales/enUs/translations/index.ts index d6bf2a1db2..5235352afc 100644 --- a/src/locales/enUs/translations/index.ts +++ b/src/locales/enUs/translations/index.ts @@ -1,11 +1,11 @@ import actions from './actions' import dashboard from './dashboard' +import labs from './labs' import patient from './patient' import patients from './patients' import scheduling from './scheduling' -import states from './states' import sex from './sex' -import labs from './labs' +import states from './states' export default { ...actions, diff --git a/src/locales/enUs/translations/patients/index.ts b/src/locales/enUs/translations/patients/index.ts index b936a2846f..3be64bf9d0 100644 --- a/src/locales/enUs/translations/patients/index.ts +++ b/src/locales/enUs/translations/patients/index.ts @@ -5,6 +5,7 @@ export default { viewPatients: 'View Patients', viewPatient: 'View Patient', newPatient: 'New Patient', + editPatient: 'Edit Patient', successfullyCreated: 'Successfully created patient', successfullyAddedNote: 'Successfully added the new note', successfullyAddedRelatedPerson: 'Successfully added a new related person', diff --git a/src/locales/fr/translations/index.ts b/src/locales/fr/translations/index.ts index d6bf2a1db2..5235352afc 100644 --- a/src/locales/fr/translations/index.ts +++ b/src/locales/fr/translations/index.ts @@ -1,11 +1,11 @@ import actions from './actions' import dashboard from './dashboard' +import labs from './labs' import patient from './patient' import patients from './patients' import scheduling from './scheduling' -import states from './states' import sex from './sex' -import labs from './labs' +import states from './states' export default { ...actions, diff --git a/src/locales/it/translations/index.ts b/src/locales/it/translations/index.ts index d6bf2a1db2..5235352afc 100644 --- a/src/locales/it/translations/index.ts +++ b/src/locales/it/translations/index.ts @@ -1,11 +1,11 @@ import actions from './actions' import dashboard from './dashboard' +import labs from './labs' import patient from './patient' import patients from './patients' import scheduling from './scheduling' -import states from './states' import sex from './sex' -import labs from './labs' +import states from './states' export default { ...actions, diff --git a/src/locales/ptBr/translations/index.ts b/src/locales/ptBr/translations/index.ts index d6bf2a1db2..5235352afc 100644 --- a/src/locales/ptBr/translations/index.ts +++ b/src/locales/ptBr/translations/index.ts @@ -1,11 +1,11 @@ import actions from './actions' import dashboard from './dashboard' +import labs from './labs' import patient from './patient' import patients from './patients' import scheduling from './scheduling' -import states from './states' import sex from './sex' -import labs from './labs' +import states from './states' export default { ...actions, diff --git a/src/model/Patient.ts b/src/model/Patient.ts index 27fde51a46..56b33def3f 100644 --- a/src/model/Patient.ts +++ b/src/model/Patient.ts @@ -1,10 +1,10 @@ import AbstractDBModel from './AbstractDBModel' -import Name from './Name' -import ContactInformation from './ContactInformation' -import RelatedPerson from './RelatedPerson' import Allergy from './Allergy' +import ContactInformation from './ContactInformation' import Diagnosis from './Diagnosis' +import Name from './Name' import Note from './Note' +import RelatedPerson from './RelatedPerson' export default interface Patient extends AbstractDBModel, Name, ContactInformation { sex: string diff --git a/src/page-header/ButtonToolBar.tsx b/src/page-header/ButtonToolBar.tsx index 72eec7b627..b8a5097c98 100644 --- a/src/page-header/ButtonToolBar.tsx +++ b/src/page-header/ButtonToolBar.tsx @@ -1,4 +1,5 @@ import React from 'react' + import { useButtons } from './ButtonBarProvider' const ButtonToolBar = () => { diff --git a/src/page-header/title-slice.ts b/src/page-header/title-slice.ts index 09f548684a..1025ed4456 100644 --- a/src/page-header/title-slice.ts +++ b/src/page-header/title-slice.ts @@ -1,4 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' + import { AppThunk } from '../store' interface TitleState { diff --git a/src/page-header/useTitle.tsx b/src/page-header/useTitle.tsx index f8cd1b4a32..ff2382457f 100644 --- a/src/page-header/useTitle.tsx +++ b/src/page-header/useTitle.tsx @@ -1,5 +1,6 @@ import { useEffect } from 'react' import { useDispatch } from 'react-redux' + import { updateTitle } from './title-slice' export default function useTitle(title: string): void { diff --git a/src/patients/GeneralInformation.tsx b/src/patients/GeneralInformation.tsx index e945ea996d..94cdcede91 100644 --- a/src/patients/GeneralInformation.tsx +++ b/src/patients/GeneralInformation.tsx @@ -1,13 +1,13 @@ -import React from 'react' import { Panel, Checkbox, Alert } from '@hospitalrun/components' -import { useTranslation } from 'react-i18next' import { startOfDay, subYears, differenceInYears } from 'date-fns' +import React from 'react' +import { useTranslation } from 'react-i18next' -import Patient from '../model/Patient' +import DatePickerWithLabelFormGroup from '../components/input/DatePickerWithLabelFormGroup' +import SelectWithLabelFormGroup from '../components/input/SelectWithLableFormGroup' import TextFieldWithLabelFormGroup from '../components/input/TextFieldWithLabelFormGroup' import TextInputWithLabelFormGroup from '../components/input/TextInputWithLabelFormGroup' -import SelectWithLabelFormGroup from '../components/input/SelectWithLableFormGroup' -import DatePickerWithLabelFormGroup from '../components/input/DatePickerWithLabelFormGroup' +import Patient from '../model/Patient' interface Props { patient: Patient diff --git a/src/patients/Patients.tsx b/src/patients/Patients.tsx index d1670a1ce0..f43d9799bd 100644 --- a/src/patients/Patients.tsx +++ b/src/patients/Patients.tsx @@ -1,13 +1,14 @@ import React from 'react' import { useSelector } from 'react-redux' import { Switch } from 'react-router' + import PrivateRoute from '../components/PrivateRoute' import Permissions from '../model/Permissions' +import { RootState } from '../store' +import EditPatient from './edit/EditPatient' import ViewPatients from './list/ViewPatients' import NewPatient from './new/NewPatient' -import EditPatient from './edit/EditPatient' import ViewPatient from './view/ViewPatient' -import { RootState } from '../store' const Patients = () => { const permissions = useSelector((state: RootState) => state.user.permissions) diff --git a/src/patients/allergies/Allergies.tsx b/src/patients/allergies/Allergies.tsx index 5ae17c3704..9a8d9d5cc6 100644 --- a/src/patients/allergies/Allergies.tsx +++ b/src/patients/allergies/Allergies.tsx @@ -1,12 +1,13 @@ -import React, { useState } from 'react' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import Patient from 'model/Patient' import { Button, List, ListItem, Alert } from '@hospitalrun/components' -import { useSelector } from 'react-redux' -import { RootState } from 'store' -import Permissions from 'model/Permissions' +import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import Allergy from 'model/Allergy' +import { useSelector } from 'react-redux' + +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import Allergy from '../../model/Allergy' +import Patient from '../../model/Patient' +import Permissions from '../../model/Permissions' +import { RootState } from '../../store' import NewAllergyModal from './NewAllergyModal' interface AllergiesProps { diff --git a/src/patients/allergies/NewAllergyModal.tsx b/src/patients/allergies/NewAllergyModal.tsx index d335f2fb92..9ea5374bf3 100644 --- a/src/patients/allergies/NewAllergyModal.tsx +++ b/src/patients/allergies/NewAllergyModal.tsx @@ -1,9 +1,10 @@ -import React, { useState, useEffect } from 'react' import { Modal, Alert } from '@hospitalrun/components' +import React, { useState, useEffect } from 'react' import { useTranslation } from 'react-i18next' -import Allergy from 'model/Allergy' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' import { useDispatch, useSelector } from 'react-redux' + +import TextInputWithLabelFormGroup from '../../components/input/TextInputWithLabelFormGroup' +import Allergy from '../../model/Allergy' import { RootState } from '../../store' import { addAllergy } from '../patient-slice' diff --git a/src/patients/appointments/AppointmentsList.tsx b/src/patients/appointments/AppointmentsList.tsx index 4b964fdfba..4f9b4dc4fa 100644 --- a/src/patients/appointments/AppointmentsList.tsx +++ b/src/patients/appointments/AppointmentsList.tsx @@ -1,11 +1,12 @@ +import { TextInput, Button, List, ListItem, Container, Row, Column } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' +import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' import { useHistory } from 'react-router' -import { useTranslation } from 'react-i18next' -import { TextInput, Button, List, ListItem, Container, Row, Column } from '@hospitalrun/components' -import { RootState } from '../../store' -import { fetchPatientAppointments } from '../../scheduling/appointments/appointments-slice' + import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import { fetchPatientAppointments } from '../../scheduling/appointments/appointments-slice' +import { RootState } from '../../store' interface Props { patientId: string diff --git a/src/patients/diagnoses/AddDiagnosisModal.tsx b/src/patients/diagnoses/AddDiagnosisModal.tsx index 7706c1b632..110dab5f68 100644 --- a/src/patients/diagnoses/AddDiagnosisModal.tsx +++ b/src/patients/diagnoses/AddDiagnosisModal.tsx @@ -1,10 +1,11 @@ -import React, { useState, useEffect } from 'react' import { Modal, Alert } from '@hospitalrun/components' +import React, { useState, useEffect } from 'react' import { useTranslation } from 'react-i18next' -import Diagnosis from 'model/Diagnosis' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import DatePickerWithLabelFormGroup from 'components/input/DatePickerWithLabelFormGroup' import { useDispatch, useSelector } from 'react-redux' + +import DatePickerWithLabelFormGroup from '../../components/input/DatePickerWithLabelFormGroup' +import TextInputWithLabelFormGroup from '../../components/input/TextInputWithLabelFormGroup' +import Diagnosis from '../../model/Diagnosis' import { RootState } from '../../store' import { addDiagnosis } from '../patient-slice' diff --git a/src/patients/diagnoses/Diagnoses.tsx b/src/patients/diagnoses/Diagnoses.tsx index af774eda7e..78dd595e44 100644 --- a/src/patients/diagnoses/Diagnoses.tsx +++ b/src/patients/diagnoses/Diagnoses.tsx @@ -1,12 +1,13 @@ -import React, { useState } from 'react' -import { RootState } from 'store' -import Patient from 'model/Patient' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import { useSelector } from 'react-redux' -import Permissions from 'model/Permissions' import { Button, List, ListItem, Alert } from '@hospitalrun/components' +import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import Diagnosis from 'model/Diagnosis' +import { useSelector } from 'react-redux' + +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import Diagnosis from '../../model/Diagnosis' +import Patient from '../../model/Patient' +import Permissions from '../../model/Permissions' +import { RootState } from '../../store' import AddDiagnosisModal from './AddDiagnosisModal' interface Props { diff --git a/src/patients/edit/EditPatient.tsx b/src/patients/edit/EditPatient.tsx index 350a3f2bdd..a707fc532f 100644 --- a/src/patients/edit/EditPatient.tsx +++ b/src/patients/edit/EditPatient.tsx @@ -1,15 +1,16 @@ +import { Spinner, Button, Toast } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' -import { useHistory, useParams } from 'react-router-dom' import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' -import { Spinner, Button, Toast } from '@hospitalrun/components' -import GeneralInformation from '../GeneralInformation' -import useTitle from '../../page-header/useTitle' +import { useHistory, useParams } from 'react-router-dom' + +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' import Patient from '../../model/Patient' -import { updatePatient, fetchPatient } from '../patient-slice' +import useTitle from '../../page-header/useTitle' import { RootState } from '../../store' +import GeneralInformation from '../GeneralInformation' +import { updatePatient, fetchPatient } from '../patient-slice' import { getPatientFullName, getPatientName } from '../util/patient-name-util' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' const getPatientCode = (p: Patient): string => { if (p) { diff --git a/src/patients/labs/LabsTab.tsx b/src/patients/labs/LabsTab.tsx index 6b40d81353..d78db9623a 100644 --- a/src/patients/labs/LabsTab.tsx +++ b/src/patients/labs/LabsTab.tsx @@ -1,10 +1,11 @@ -import React, { useEffect, useState } from 'react' import { Alert } from '@hospitalrun/components' -import { useTranslation } from 'react-i18next' import format from 'date-fns/format' +import React, { useEffect, useState } from 'react' +import { useTranslation } from 'react-i18next' import { useHistory } from 'react-router' -import Lab from '../../model/Lab' + import LabRepository from '../../clients/db/LabRepository' +import Lab from '../../model/Lab' interface Props { patientId: string diff --git a/src/patients/list/ViewPatients.tsx b/src/patients/list/ViewPatients.tsx index ba2c470013..2c5543570b 100644 --- a/src/patients/list/ViewPatients.tsx +++ b/src/patients/list/ViewPatients.tsx @@ -1,15 +1,16 @@ +import { Spinner, Button, Container, Row, TextInput, Column } from '@hospitalrun/components' +import format from 'date-fns/format' import React, { useEffect, useState } from 'react' +import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' import { useHistory } from 'react-router' -import { useTranslation } from 'react-i18next' -import { Spinner, Button, Container, Row, TextInput, Column } from '@hospitalrun/components' -import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import format from 'date-fns/format' -import { RootState } from '../../store' -import { searchPatients } from '../patients-slice' -import useTitle from '../../page-header/useTitle' + import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' import useDebounce from '../../hooks/debounce' +import { useButtonToolbarSetter } from '../../page-header/ButtonBarProvider' +import useTitle from '../../page-header/useTitle' +import { RootState } from '../../store' +import { searchPatients } from '../patients-slice' const breadcrumbs = [{ i18nKey: 'patients.label', location: '/patients' }] diff --git a/src/patients/new/NewPatient.tsx b/src/patients/new/NewPatient.tsx index c42f52d363..4c7870748f 100644 --- a/src/patients/new/NewPatient.tsx +++ b/src/patients/new/NewPatient.tsx @@ -1,15 +1,16 @@ +import { Button, Toast } from '@hospitalrun/components' import React, { useState } from 'react' -import { useHistory } from 'react-router' import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' -import { Button, Toast } from '@hospitalrun/components' -import GeneralInformation from '../GeneralInformation' -import useTitle from '../../page-header/useTitle' +import { useHistory } from 'react-router' + +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' import Patient from '../../model/Patient' +import useTitle from '../../page-header/useTitle' +import { RootState } from '../../store' +import GeneralInformation from '../GeneralInformation' import { createPatient } from '../patient-slice' import { getPatientName } from '../util/patient-name-util' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' -import { RootState } from '../../store' const breadcrumbs = [ { i18nKey: 'patients.label', location: '/patients' }, diff --git a/src/patients/notes/NewNoteModal.tsx b/src/patients/notes/NewNoteModal.tsx index e8b9d3a5cd..4363d45ee3 100644 --- a/src/patients/notes/NewNoteModal.tsx +++ b/src/patients/notes/NewNoteModal.tsx @@ -1,11 +1,12 @@ -import React, { useState } from 'react' import { Modal, Alert } from '@hospitalrun/components' +import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import { addNote } from 'patients/patient-slice' import { useDispatch, useSelector } from 'react-redux' + +import TextFieldWithLabelFormGroup from '../../components/input/TextFieldWithLabelFormGroup' import Note from '../../model/Note' import { RootState } from '../../store' +import { addNote } from '../patient-slice' interface Props { show: boolean diff --git a/src/patients/notes/NoteTab.tsx b/src/patients/notes/NoteTab.tsx index e4be1c76bc..41671c60b9 100644 --- a/src/patients/notes/NoteTab.tsx +++ b/src/patients/notes/NoteTab.tsx @@ -1,13 +1,14 @@ /* eslint-disable react/no-danger */ +import { Button, List, ListItem, Alert } from '@hospitalrun/components' import React, { useState } from 'react' -import { useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' -import { Button, List, ListItem, Alert } from '@hospitalrun/components' -import NewNoteModal from 'patients/notes/NewNoteModal' -import Note from 'model/Note' -import Patient from 'model/Patient' -import { RootState } from '../../store' +import { useSelector } from 'react-redux' + +import Note from '../../model/Note' +import Patient from '../../model/Patient' import Permissions from '../../model/Permissions' +import { RootState } from '../../store' +import NewNoteModal from './NewNoteModal' interface Props { patient: Patient diff --git a/src/patients/patient-slice.ts b/src/patients/patient-slice.ts index f106abb18e..1e3b25dbad 100644 --- a/src/patients/patient-slice.ts +++ b/src/patients/patient-slice.ts @@ -2,14 +2,15 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { isAfter, parseISO } from 'date-fns' import _ from 'lodash' import validator from 'validator' -import { uuid } from '../util/uuid' -import Patient from '../model/Patient' + import PatientRepository from '../clients/db/PatientRepository' -import { AppThunk } from '../store' -import RelatedPerson from '../model/RelatedPerson' -import Diagnosis from '../model/Diagnosis' import Allergy from '../model/Allergy' +import Diagnosis from '../model/Diagnosis' import Note from '../model/Note' +import Patient from '../model/Patient' +import RelatedPerson from '../model/RelatedPerson' +import { AppThunk } from '../store' +import { uuid } from '../util/uuid' interface PatientState { status: 'loading' | 'error' | 'completed' diff --git a/src/patients/patients-slice.ts b/src/patients/patients-slice.ts index 73cb93f3e6..37029bd1ad 100644 --- a/src/patients/patients-slice.ts +++ b/src/patients/patients-slice.ts @@ -1,6 +1,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import Patient from '../model/Patient' + import PatientRepository from '../clients/db/PatientRepository' +import Patient from '../model/Patient' import { AppThunk } from '../store' interface PatientsState { diff --git a/src/patients/related-persons/AddRelatedPersonModal.tsx b/src/patients/related-persons/AddRelatedPersonModal.tsx index f39cf4331d..3c1ccf906a 100644 --- a/src/patients/related-persons/AddRelatedPersonModal.tsx +++ b/src/patients/related-persons/AddRelatedPersonModal.tsx @@ -1,11 +1,12 @@ -import React, { useState } from 'react' import { Modal, Alert, Typeahead, Label } from '@hospitalrun/components' +import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import RelatedPerson from 'model/RelatedPerson' -import PatientRepository from 'clients/db/PatientRepository' -import Patient from 'model/Patient' import { useDispatch, useSelector } from 'react-redux' + +import PatientRepository from '../../clients/db/PatientRepository' +import TextInputWithLabelFormGroup from '../../components/input/TextInputWithLabelFormGroup' +import Patient from '../../model/Patient' +import RelatedPerson from '../../model/RelatedPerson' import { RootState } from '../../store' import { addRelatedPerson } from '../patient-slice' diff --git a/src/patients/related-persons/RelatedPersonTab.tsx b/src/patients/related-persons/RelatedPersonTab.tsx index a84a519b6b..a5b144fca3 100644 --- a/src/patients/related-persons/RelatedPersonTab.tsx +++ b/src/patients/related-persons/RelatedPersonTab.tsx @@ -1,15 +1,16 @@ -import React, { useState, useEffect } from 'react' import { Button, Alert, Spinner } from '@hospitalrun/components' -import AddRelatedPersonModal from 'patients/related-persons/AddRelatedPersonModal' +import React, { useState, useEffect } from 'react' import { useTranslation } from 'react-i18next' -import { useHistory } from 'react-router' -import Patient from 'model/Patient' -import { removeRelatedPerson } from 'patients/patient-slice' import { useDispatch, useSelector } from 'react-redux' -import { RootState } from 'store' -import Permissions from 'model/Permissions' -import PatientRepository from 'clients/db/PatientRepository' +import { useHistory } from 'react-router' + import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import PatientRepository from '../../clients/db/PatientRepository' +import Patient from '../../model/Patient' +import Permissions from '../../model/Permissions' +import { RootState } from '../../store' +import { removeRelatedPerson } from '../patient-slice' +import AddRelatedPersonModal from './AddRelatedPersonModal' interface Props { patient: Patient diff --git a/src/patients/view/ViewPatient.tsx b/src/patients/view/ViewPatient.tsx index 6119142e0b..f966a8b9b6 100644 --- a/src/patients/view/ViewPatient.tsx +++ b/src/patients/view/ViewPatient.tsx @@ -1,24 +1,24 @@ +import { Panel, Spinner, TabsHeader, Tab, Button } from '@hospitalrun/components' import React, { useEffect } from 'react' +import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' import { useParams, withRouter, Route, useHistory, useLocation } from 'react-router-dom' -import { Panel, Spinner, TabsHeader, Tab, Button } from '@hospitalrun/components' -import { useTranslation } from 'react-i18next' -import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import Allergies from 'patients/allergies/Allergies' -import Diagnoses from 'patients/diagnoses/Diagnoses' +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import Patient from '../../model/Patient' +import Permissions from '../../model/Permissions' +import { useButtonToolbarSetter } from '../../page-header/ButtonBarProvider' import useTitle from '../../page-header/useTitle' -import { fetchPatient } from '../patient-slice' import { RootState } from '../../store' -import { getPatientFullName } from '../util/patient-name-util' -import Permissions from '../../model/Permissions' -import Patient from '../../model/Patient' -import GeneralInformation from '../GeneralInformation' -import RelatedPerson from '../related-persons/RelatedPersonTab' -import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import Allergies from '../allergies/Allergies' import AppointmentsList from '../appointments/AppointmentsList' -import Note from '../notes/NoteTab' +import Diagnoses from '../diagnoses/Diagnoses' +import GeneralInformation from '../GeneralInformation' import Labs from '../labs/LabsTab' +import Note from '../notes/NoteTab' +import { fetchPatient } from '../patient-slice' +import RelatedPerson from '../related-persons/RelatedPersonTab' +import { getPatientFullName } from '../util/patient-name-util' const getPatientCode = (p: Patient): string => { if (p) { diff --git a/src/scheduling/appointments/AppointmentDetailForm.tsx b/src/scheduling/appointments/AppointmentDetailForm.tsx index 6fe9837a3f..b00bd77841 100644 --- a/src/scheduling/appointments/AppointmentDetailForm.tsx +++ b/src/scheduling/appointments/AppointmentDetailForm.tsx @@ -1,14 +1,15 @@ -import React from 'react' -import Appointment from 'model/Appointment' -import DateTimePickerWithLabelFormGroup from 'components/input/DateTimePickerWithLabelFormGroup' import { Typeahead, Label, Alert } from '@hospitalrun/components' -import Patient from 'model/Patient' -import PatientRepository from 'clients/db/PatientRepository' -import TextInputWithLabelFormGroup from 'components/input/TextInputWithLabelFormGroup' -import TextFieldWithLabelFormGroup from 'components/input/TextFieldWithLabelFormGroup' -import SelectWithLabelFormGroup from 'components/input/SelectWithLableFormGroup' +import React from 'react' import { useTranslation } from 'react-i18next' +import PatientRepository from '../../clients/db/PatientRepository' +import DateTimePickerWithLabelFormGroup from '../../components/input/DateTimePickerWithLabelFormGroup' +import SelectWithLabelFormGroup from '../../components/input/SelectWithLableFormGroup' +import TextFieldWithLabelFormGroup from '../../components/input/TextFieldWithLabelFormGroup' +import TextInputWithLabelFormGroup from '../../components/input/TextInputWithLabelFormGroup' +import Appointment from '../../model/Appointment' +import Patient from '../../model/Patient' + interface Props { appointment: Appointment patient?: Patient diff --git a/src/scheduling/appointments/Appointments.tsx b/src/scheduling/appointments/Appointments.tsx index 142bff601a..816cc05b04 100644 --- a/src/scheduling/appointments/Appointments.tsx +++ b/src/scheduling/appointments/Appointments.tsx @@ -1,13 +1,14 @@ import React from 'react' import { useSelector } from 'react-redux' import { Switch } from 'react-router' -import NewAppointment from 'scheduling/appointments/new/NewAppointment' -import EditAppointment from 'scheduling/appointments/edit/EditAppointment' -import ViewAppointment from 'scheduling/appointments/view/ViewAppointment' -import ViewAppointments from './ViewAppointments' + import PrivateRoute from '../../components/PrivateRoute' import Permissions from '../../model/Permissions' import { RootState } from '../../store' +import EditAppointment from './edit/EditAppointment' +import NewAppointment from './new/NewAppointment' +import ViewAppointment from './view/ViewAppointment' +import ViewAppointments from './ViewAppointments' const Appointments = () => { const permissions = useSelector((state: RootState) => state.user.permissions) diff --git a/src/scheduling/appointments/ViewAppointments.tsx b/src/scheduling/appointments/ViewAppointments.tsx index b569c2b4a7..4a1866ab44 100644 --- a/src/scheduling/appointments/ViewAppointments.tsx +++ b/src/scheduling/appointments/ViewAppointments.tsx @@ -1,13 +1,14 @@ -import React, { useEffect, useState } from 'react' import { Calendar, Button } from '@hospitalrun/components' -import useTitle from 'page-header/useTitle' +import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' -import { RootState } from 'store' import { useHistory } from 'react-router' -import PatientRepository from 'clients/db/PatientRepository' -import useAddBreadcrumbs from 'breadcrumbs/useAddBreadcrumbs' -import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' + +import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' +import PatientRepository from '../../clients/db/PatientRepository' +import { useButtonToolbarSetter } from '../../page-header/ButtonBarProvider' +import useTitle from '../../page-header/useTitle' +import { RootState } from '../../store' import { fetchAppointments } from './appointments-slice' interface Event { diff --git a/src/scheduling/appointments/appointment-slice.ts b/src/scheduling/appointments/appointment-slice.ts index af8732531d..2836775f12 100644 --- a/src/scheduling/appointments/appointment-slice.ts +++ b/src/scheduling/appointments/appointment-slice.ts @@ -1,12 +1,13 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import Appointment from 'model/Appointment' -import { AppThunk } from 'store' -import AppointmentRepository from 'clients/db/AppointmentRepository' -import Patient from 'model/Patient' -import PatientRepository from 'clients/db/PatientRepository' import { isBefore } from 'date-fns' import _ from 'lodash' +import AppointmentRepository from '../../clients/db/AppointmentRepository' +import PatientRepository from '../../clients/db/PatientRepository' +import Appointment from '../../model/Appointment' +import Patient from '../../model/Patient' +import { AppThunk } from '../../store' + function validateAppointment(appointment: Appointment) { const err: Error = {} diff --git a/src/scheduling/appointments/appointments-slice.ts b/src/scheduling/appointments/appointments-slice.ts index f902684d03..4a6f93f663 100644 --- a/src/scheduling/appointments/appointments-slice.ts +++ b/src/scheduling/appointments/appointments-slice.ts @@ -1,7 +1,8 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import Appointment from 'model/Appointment' -import { AppThunk } from 'store' -import AppointmentRepository from 'clients/db/AppointmentRepository' + +import AppointmentRepository from '../../clients/db/AppointmentRepository' +import Appointment from '../../model/Appointment' +import { AppThunk } from '../../store' interface AppointmentsState { isLoading: boolean diff --git a/src/scheduling/appointments/edit/EditAppointment.tsx b/src/scheduling/appointments/edit/EditAppointment.tsx index d52d757c46..765700f8f5 100644 --- a/src/scheduling/appointments/edit/EditAppointment.tsx +++ b/src/scheduling/appointments/edit/EditAppointment.tsx @@ -1,16 +1,16 @@ +import { Spinner, Button } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' -import { useHistory, useParams } from 'react-router-dom' import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' -import { Spinner, Button } from '@hospitalrun/components' +import { useHistory, useParams } from 'react-router-dom' -import AppointmentDetailForm from '../AppointmentDetailForm' -import useTitle from '../../../page-header/useTitle' +import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' import Appointment from '../../../model/Appointment' -import { updateAppointment, fetchAppointment } from '../appointment-slice' +import useTitle from '../../../page-header/useTitle' import { RootState } from '../../../store' +import { updateAppointment, fetchAppointment } from '../appointment-slice' +import AppointmentDetailForm from '../AppointmentDetailForm' import { getAppointmentLabel } from '../util/scheduling-appointment.util' -import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' const EditAppointment = () => { const { t } = useTranslation() diff --git a/src/scheduling/appointments/new/NewAppointment.tsx b/src/scheduling/appointments/new/NewAppointment.tsx index 438869dc9e..dc3f043448 100644 --- a/src/scheduling/appointments/new/NewAppointment.tsx +++ b/src/scheduling/appointments/new/NewAppointment.tsx @@ -1,16 +1,17 @@ +import { Button, Toast } from '@hospitalrun/components' +import addMinutes from 'date-fns/addMinutes' +import roundToNearestMinutes from 'date-fns/roundToNearestMinutes' 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 { useDispatch, useSelector } from 'react-redux' -import Appointment from 'model/Appointment' -import addMinutes from 'date-fns/addMinutes' -import { Button, Toast } from '@hospitalrun/components' +import { useHistory } from 'react-router' + import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' +import Appointment from '../../../model/Appointment' +import useTitle from '../../../page-header/useTitle' +import { RootState } from '../../../store' import { createAppointment } from '../appointment-slice' import AppointmentDetailForm from '../AppointmentDetailForm' -import { RootState } from '../../../store' const breadcrumbs = [ { i18nKey: 'scheduling.appointments.label', location: '/appointments' }, diff --git a/src/scheduling/appointments/view/ViewAppointment.tsx b/src/scheduling/appointments/view/ViewAppointment.tsx index c90002b2e4..e0764a1548 100644 --- a/src/scheduling/appointments/view/ViewAppointment.tsx +++ b/src/scheduling/appointments/view/ViewAppointment.tsx @@ -1,16 +1,17 @@ +import { Spinner, Button, Modal, Toast } from '@hospitalrun/components' import React, { useEffect, useState } from 'react' -import useTitle from 'page-header/useTitle' +import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' -import { RootState } from 'store' import { useParams, useHistory } from 'react-router' -import { Spinner, Button, Modal, Toast } from '@hospitalrun/components' -import { useTranslation } from 'react-i18next' -import { useButtonToolbarSetter } from 'page-header/ButtonBarProvider' -import Permissions from 'model/Permissions' + +import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' +import Permissions from '../../../model/Permissions' +import { useButtonToolbarSetter } from '../../../page-header/ButtonBarProvider' +import useTitle from '../../../page-header/useTitle' +import { RootState } from '../../../store' import { fetchAppointment, deleteAppointment } from '../appointment-slice' import AppointmentDetailForm from '../AppointmentDetailForm' import { getAppointmentLabel } from '../util/scheduling-appointment.util' -import useAddBreadcrumbs from '../../../breadcrumbs/useAddBreadcrumbs' const ViewAppointment = () => { const { t } = useTranslation() diff --git a/src/store/index.ts b/src/store/index.ts index 1a39af5ff3..fa47ec0c6f 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -1,15 +1,16 @@ import { configureStore, combineReducers, Action } from '@reduxjs/toolkit' import ReduxThunk, { ThunkAction } from 'redux-thunk' + +import breadcrumbs from '../breadcrumbs/breadcrumbs-slice' +import components from '../components/component-slice' +import lab from '../labs/lab-slice' +import labs from '../labs/labs-slice' +import title from '../page-header/title-slice' import patient from '../patients/patient-slice' import patients from '../patients/patients-slice' import appointment from '../scheduling/appointments/appointment-slice' import appointments from '../scheduling/appointments/appointments-slice' -import title from '../page-header/title-slice' import user from '../user/user-slice' -import lab from '../labs/lab-slice' -import labs from '../labs/labs-slice' -import breadcrumbs from '../breadcrumbs/breadcrumbs-slice' -import components from '../components/component-slice' const reducer = combineReducers({ patient, diff --git a/src/user/user-slice.ts b/src/user/user-slice.ts index 98c163429c..d983902355 100644 --- a/src/user/user-slice.ts +++ b/src/user/user-slice.ts @@ -1,4 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' + import Permissions from '../model/Permissions' interface UserState { diff --git a/tsconfig.json b/tsconfig.json index 408f737883..f37b7e2b46 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -29,7 +29,7 @@ "resolveJsonModule": true, "importHelpers": true, "jsx": "react", - "baseUrl": "./src", + // "baseUrl": "./src", "allowJs": true, "skipLibCheck": true, "noEmit": true, From 87ea103821813e8f276e7166c132dc4a6c404dad Mon Sep 17 00:00:00 2001 From: Matthew Dorner Date: Thu, 14 May 2020 15:07:28 -0500 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Set=20`no-unreso?= =?UTF-8?q?lved`=20rule=20to=20off=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I had turned it on to help during my refactor. --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index b028754d0d..e397908a74 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -59,7 +59,7 @@ module.exports = { 'eol-last': ['error', 'always'], 'no-debugger': 'error', 'no-nested-ternary': 'off', - 'import/no-unresolved': 'error', + 'import/no-unresolved': 'off', 'import/extensions': ['error', 'never'], 'import/order': ["error", { "groups": [ From a0223dab7c541a257d640717f2522150c29ec10d Mon Sep 17 00:00:00 2001 From: Matthew Dorner Date: Thu, 14 May 2020 15:26:54 -0500 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Fix=20'react-rou?= =?UTF-8?q?ter'=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/__tests__/incidents/list/ViewIncidents.test.tsx | 2 +- src/__tests__/incidents/report/ReportIncident.test.tsx | 2 +- src/__tests__/incidents/view/ViewIncident.test.tsx | 2 +- src/__tests__/patients/GeneralInformation.test.tsx | 2 +- src/incidents/view/ViewIncident.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/__tests__/incidents/list/ViewIncidents.test.tsx b/src/__tests__/incidents/list/ViewIncidents.test.tsx index a6d17e6991..0eb2502c8d 100644 --- a/src/__tests__/incidents/list/ViewIncidents.test.tsx +++ b/src/__tests__/incidents/list/ViewIncidents.test.tsx @@ -5,7 +5,7 @@ import { mount } from 'enzyme' import { createMemoryHistory } from 'history' import React from 'react' import { Provider } from 'react-redux' -import { Route, Router } from 'react-router' +import { Route, Router } from 'react-router-dom' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' diff --git a/src/__tests__/incidents/report/ReportIncident.test.tsx b/src/__tests__/incidents/report/ReportIncident.test.tsx index e4474fe302..83fa8aef07 100644 --- a/src/__tests__/incidents/report/ReportIncident.test.tsx +++ b/src/__tests__/incidents/report/ReportIncident.test.tsx @@ -6,7 +6,7 @@ import { mount } from 'enzyme' import { createMemoryHistory } from 'history' import React from 'react' import { Provider } from 'react-redux' -import { Route, Router } from 'react-router' +import { Route, Router } from 'react-router-dom' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' diff --git a/src/__tests__/incidents/view/ViewIncident.test.tsx b/src/__tests__/incidents/view/ViewIncident.test.tsx index b278c05b8a..15a5ebeb10 100644 --- a/src/__tests__/incidents/view/ViewIncident.test.tsx +++ b/src/__tests__/incidents/view/ViewIncident.test.tsx @@ -5,7 +5,7 @@ import { mount } from 'enzyme' import { createMemoryHistory } from 'history' import React from 'react' import { Provider } from 'react-redux' -import { Route, Router } from 'react-router' +import { Route, Router } from 'react-router-dom' import createMockStore from 'redux-mock-store' import thunk from 'redux-thunk' diff --git a/src/__tests__/patients/GeneralInformation.test.tsx b/src/__tests__/patients/GeneralInformation.test.tsx index 8630122e78..353334e293 100644 --- a/src/__tests__/patients/GeneralInformation.test.tsx +++ b/src/__tests__/patients/GeneralInformation.test.tsx @@ -6,7 +6,7 @@ import { startOfDay, subYears } from 'date-fns' import { mount, ReactWrapper } from 'enzyme' import { createMemoryHistory } from 'history' import React from 'react' -import { Router } from 'react-router' +import { Router } from 'react-router-dom' import Patient from '../../model/Patient' import GeneralInformation from '../../patients/GeneralInformation' diff --git a/src/incidents/view/ViewIncident.tsx b/src/incidents/view/ViewIncident.tsx index 786ecb0823..fae2e0c7ec 100644 --- a/src/incidents/view/ViewIncident.tsx +++ b/src/incidents/view/ViewIncident.tsx @@ -3,7 +3,7 @@ import format from 'date-fns/format' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' -import { useParams } from 'react-router' +import { useParams } from 'react-router-dom' import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs' import TextFieldWithLabelFormGroup from '../../components/input/TextFieldWithLabelFormGroup' From c791de39fa8c67d875f8fb1aa99baf164691b5eb Mon Sep 17 00:00:00 2001 From: marcosvega91 Date: Sun, 17 May 2020 11:24:24 +0200 Subject: [PATCH 6/6] feat(newlabrequest): add requestBy to model Add new field into the model. The field is auto filled by system when a new lab request is created. The new field will contain the user id of the current user fix #2082 --- src/__tests__/labs/lab-slice.test.ts | 18 ++++++++++++++++-- .../labs/requests/NewLabRequest.test.tsx | 11 +++++++++-- src/labs/lab-slice.ts | 2 ++ src/model/Lab.ts | 1 + 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/__tests__/labs/lab-slice.test.ts b/src/__tests__/labs/lab-slice.test.ts index 21122cab33..a6dbe8de95 100644 --- a/src/__tests__/labs/lab-slice.test.ts +++ b/src/__tests__/labs/lab-slice.test.ts @@ -304,11 +304,19 @@ describe('lab slice', () => { }) it('should request a new lab', async () => { - const store = mockStore() + const store = mockStore({ + user: { + user: { + id: 'fake id', + }, + }, + } as any) + const expectedRequestedLab = { ...mockLab, requestedOn: new Date(Date.now()).toISOString(), status: 'requested', + requestedBy: store.getState().user.user.id, } as Lab await store.dispatch(requestLab(mockLab)) @@ -321,7 +329,13 @@ describe('lab slice', () => { }) it('should execute the onSuccess callback if provided', async () => { - const store = mockStore() + const store = mockStore({ + user: { + user: { + id: 'fake id', + }, + }, + } as any) const onSuccessSpy = jest.fn() await store.dispatch(requestLab(mockLab, onSuccessSpy)) diff --git a/src/__tests__/labs/requests/NewLabRequest.test.tsx b/src/__tests__/labs/requests/NewLabRequest.test.tsx index 8afe2eb98f..e496c57718 100644 --- a/src/__tests__/labs/requests/NewLabRequest.test.tsx +++ b/src/__tests__/labs/requests/NewLabRequest.test.tsx @@ -27,7 +27,10 @@ describe('New Lab Request', () => { const history = createMemoryHistory() beforeEach(() => { - const store = mockStore({ title: '', lab: { status: 'loading', error: {} } }) + const store = mockStore({ + title: '', + lab: { status: 'loading', error: {} }, + }) titleSpy = jest.spyOn(titleUtil, 'default') history.push('/labs/new') @@ -197,7 +200,11 @@ describe('New Lab Request', () => { .mockResolvedValue([{ id: expectedLab.patientId, fullName: 'some full name' }] as Patient[]) history.push('/labs/new') - const store = mockStore({ title: '', lab: { status: 'loading', error: {} } }) + const store = mockStore({ + title: '', + lab: { status: 'loading', error: {} }, + user: { user: { id: 'fake id' } }, + }) wrapper = mount( diff --git a/src/labs/lab-slice.ts b/src/labs/lab-slice.ts index 4d60aadb49..4294448a87 100644 --- a/src/labs/lab-slice.ts +++ b/src/labs/lab-slice.ts @@ -105,6 +105,7 @@ const validateLabRequest = (newLab: Lab): Error => { export const requestLab = (newLab: Lab, onSuccess?: (lab: Lab) => void): AppThunk => async ( dispatch, + getState, ) => { dispatch(requestLabStart()) @@ -115,6 +116,7 @@ export const requestLab = (newLab: Lab, onSuccess?: (lab: Lab) => void): AppThun } else { newLab.status = 'requested' newLab.requestedOn = new Date(Date.now().valueOf()).toISOString() + newLab.requestedBy = getState().user.user.id const requestedLab = await LabRepository.save(newLab) dispatch(requestLabSuccess(requestedLab)) diff --git a/src/model/Lab.ts b/src/model/Lab.ts index 64b17ce431..1a53d67542 100644 --- a/src/model/Lab.ts +++ b/src/model/Lab.ts @@ -4,6 +4,7 @@ export default interface Lab extends AbstractDBModel { code: string patientId: string type: string + requestedBy: string notes?: string result?: string status: 'requested' | 'completed' | 'canceled'