refactor: resolve merge conflict

package.json

@@ -73,8 +73,8 @@
     "@types/shortid": "^0.0.29",
     "@types/uuid": "^7.0.0",
     "@types/validator": "~13.0.0",
-    "@typescript-eslint/eslint-plugin": "~2.30.0",
-    "@typescript-eslint/parser": "~2.30.0",
+    "@typescript-eslint/eslint-plugin": "~2.31.0",
+    "@typescript-eslint/parser": "~2.31.0",
     "commitizen": "~4.0.3",
     "commitlint-config-cz": "~0.13.0",
     "cross-env": "~7.0.0",

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

@@ -0,0 +1,14 @@
+import shortid from 'shortid'
+import LabRepository from '../../../clients/db/LabRepository'
+import Lab from '../../../model/Lab'
+
+describe('lab repository', () => {
+  it('should generate a lab code', async () => {
+    const newLab = await LabRepository.save({
+      patientId: '123',
+      type: 'test',
+    } as Lab)
+
+    expect(shortid.isValid(newLab.code)).toBeTruthy()
+  })
+})

src/__tests__/labs/ViewLab.test.tsx

@@ -25,6 +25,7 @@ describe('View Labs', () => {
   let history: any
   const mockPatient = { fullName: 'test' }
   const mockLab = {
+    code: 'L-1234',
     id: '12456',
     status: 'requested',
     patientId: '1234',
@@ -83,7 +84,9 @@ describe('View Labs', () => {
   it('should set the title', async () => {
     await setup(mockLab, [Permissions.ViewLab])
 
-    expect(titleSpy).toHaveBeenCalledWith(`${mockLab.type} for ${mockPatient.fullName}`)
+    expect(titleSpy).toHaveBeenCalledWith(
+      `${mockLab.type} for ${mockPatient.fullName}(${mockLab.code})`,
+    )
   })
 
   describe('page content', () => {

src/__tests__/labs/ViewLabs.test.tsx

@@ -94,6 +94,7 @@ describe('View Labs', () => {
     let wrapper: ReactWrapper
     let history: any
     const expectedLab = {
+      code: 'L-1234',
       id: '1234',
       type: 'lab type',
       patientId: 'patientId',
@@ -133,19 +134,23 @@ describe('View Labs', () => {
       expect(table).toBeDefined()
       expect(tableHeader).toBeDefined()
       expect(tableBody).toBeDefined()
-      expect(tableColumnHeaders.at(0).text().trim()).toEqual('labs.lab.type')
+      expect(tableColumnHeaders.at(0).text().trim()).toEqual('labs.lab.code')
 
-      expect(tableColumnHeaders.at(1).text().trim()).toEqual('labs.lab.requestedOn')
+      expect(tableColumnHeaders.at(1).text().trim()).toEqual('labs.lab.type')
 
-      expect(tableColumnHeaders.at(2).text().trim()).toEqual('labs.lab.status')
+      expect(tableColumnHeaders.at(2).text().trim()).toEqual('labs.lab.requestedOn')
 
-      expect(tableDataColumns.at(0).text().trim()).toEqual(expectedLab.type)
+      expect(tableColumnHeaders.at(3).text().trim()).toEqual('labs.lab.status')
 
-      expect(tableDataColumns.at(1).text().trim()).toEqual(
+      expect(tableDataColumns.at(0).text().trim()).toEqual(expectedLab.code)
+
+      expect(tableDataColumns.at(1).text().trim()).toEqual(expectedLab.type)
+
+      expect(tableDataColumns.at(2).text().trim()).toEqual(
         format(new Date(expectedLab.requestedOn), 'yyyy-MM-dd hh:mm a'),
       )
 
-      expect(tableDataColumns.at(2).text().trim()).toEqual(expectedLab.status)
+      expect(tableDataColumns.at(3).text().trim()).toEqual(expectedLab.status)
     })
 
     it('should navigate to the lab when the row is clicked', () => {

src/__tests__/patients/list/ViewPatients.test.tsx

@@ -92,6 +92,18 @@ describe('Patients', () => {
     )
   })
 
+  describe('initalLoad', () => {
+    afterEach(() => {
+      jest.restoreAllMocks()
+    })
+
+    it('should call fetchPatients only once', () => {
+      setup()
+      const findAllPagedSpy = jest.spyOn(PatientRepository, 'findAllPaged')
+      expect(findAllPagedSpy).toHaveBeenCalledTimes(1)
+    })
+  })
+
   describe('layout', () => {
     afterEach(() => {
       jest.restoreAllMocks()

src/__tests__/utils/generateCode.test.ts

@@ -0,0 +1,6 @@
+import generateCode from '../../util/generateCode'
+
+it('should generate a code with prefix A-', () => {
+  const generatedCode = generateCode('A')
+  expect(generatedCode).toMatch(/^A-/)
+})

src/clients/db/LabRepository.ts

@@ -1,4 +1,5 @@
 import Lab from 'model/Lab'
+import generateCode from '../../util/generateCode'
 import Repository from './Repository'
 import { labs } from '../../config/pouchdb'
 
@@ -10,6 +11,12 @@ export class LabRepository extends Repository<Lab> {
     })
   }
 
+  async save(entity: Lab): Promise<Lab> {
+    const labCode = generateCode('L')
+    entity.code = labCode
+    return super.save(entity)
+  }
+
   async findAllByPatientId(patientId: string): Promise<Lab[]> {
     return super.search({
       selector: {

src/clients/db/PatientRepository.ts

@@ -1,16 +1,12 @@
 import escapeStringRegexp from 'escape-string-regexp'
-import shortid from 'shortid'
 import Page from 'clients/Page'
 import Patient from '../../model/Patient'
+import generateCode from '../../util/generateCode'
 import Repository from './Repository'
 import { patients } from '../../config/pouchdb'
 import PageRequest, { UnpagedRequest } from './PageRequest'
 import SortRequest, { Unsorted } from './SortRequest'
 
-const formatPatientCode = (prefix: string, sequenceNumber: string) => `${prefix}${sequenceNumber}`
-
-const getPatientCode = (): string => formatPatientCode('P-', shortid.generate())
-
 export class PatientRepository extends Repository<Patient> {
   constructor() {
     super(patients)
@@ -84,7 +80,7 @@ export class PatientRepository extends Repository<Patient> {
   }
 
   async save(entity: Patient): Promise<Patient> {
-    const patientCode = getPatientCode()
+    const patientCode = generateCode('P')
     entity.code = patientCode
     entity.index = (entity.fullName ? entity.fullName : '') + patientCode
     return super.save(entity)

src/labs/ViewLab.tsx

@@ -14,7 +14,7 @@ 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}` : ''
+  patient && lab ? `${lab.type} for ${patient.fullName}(${lab.code})` : ''
 
 const ViewLab = () => {
   const { id } = useParams()

src/labs/ViewLabs.tsx

@@ -72,6 +72,7 @@ const ViewLabs = () => {
       <table className="table table-hover">
         <thead className="thead-light">
           <tr>
+            <th>{t('labs.lab.code')}</th>
             <th>{t('labs.lab.type')}</th>
             <th>{t('labs.lab.requestedOn')}</th>
             <th>{t('labs.lab.status')}</th>
@@ -80,6 +81,7 @@ const ViewLabs = () => {
         <tbody>
           {labs.map((lab) => (
             <tr onClick={() => onTableRowClick(lab)} key={lab.id}>
+              <td>{lab.code}</td>
               <td>{lab.type}</td>
               <td>{format(new Date(lab.requestedOn), 'yyyy-MM-dd hh:mm a')}</td>
               <td>{lab.status}</td>

src/locales/ar/translations/labs/index.ts

@@ -0,0 +1,7 @@
+export default {
+  labs: {
+    lab: {
+      code: 'كود المختبر',
+    },
+  },
+}

src/locales/de/translations/labs/index.ts

@@ -0,0 +1,7 @@
+export default {
+  labs: {
+    lab: {
+      code: 'Laborcode',
+    },
+  },
+}

src/locales/enUs/translations/labs/index.ts

@@ -15,6 +15,7 @@ export default {
       },
     },
     lab: {
+      code: 'Lab Code',
       status: 'Status',
       for: 'For',
       type: 'Type',

src/locales/es/translations/labs/index.ts

@@ -0,0 +1,7 @@
+export default {
+  labs: {
+    lab: {
+      code: 'Código',
+    },
+  },
+}

src/locales/fr/translations/labs/index.ts

@@ -15,6 +15,7 @@ export default {
       },
     },
     lab: {
+      code: 'Code',
       status: 'Statut',
       for: 'Pour',
       type: 'Type',

src/locales/in/translations/labs/index.ts

@@ -0,0 +1,7 @@
+export default {
+  labs: {
+    lab: {
+      code: 'Kode',
+    },
+  },
+}

src/locales/ja/translations/labs/index.ts

@@ -0,0 +1,7 @@
+export default {
+  labs: {
+    lab: {
+      code: '検査コード',
+    },
+  },
+}

src/locales/ptBr/translations/labs/index.ts

@@ -15,6 +15,7 @@ export default {
       },
     },
     lab: {
+      code: 'Código',
       status: 'Estado',
       for: 'Por',
       type: 'Tipo',

src/locales/ru/translations/labs/index.ts

@@ -0,0 +1,7 @@
+export default {
+  labs: {
+    lab: {
+      code: 'Лабораторный код',
+    },
+  },
+}

src/locales/zr/translations/labs/index.ts

@@ -0,0 +1,7 @@
+export default {
+  labs: {
+    lab: {
+      code: 'Лабораторный код',
+    },
+  },
+}

src/model/Lab.ts

@@ -1,6 +1,7 @@
 import AbstractDBModel from './AbstractDBModel'
 
 export default interface Lab extends AbstractDBModel {
+  code: string
   patientId: string
   type: string
   notes?: string

src/patients/list/ViewPatients.tsx

@@ -9,7 +9,7 @@ import SortRequest from 'clients/db/SortRequest'
 import PageRequest from 'clients/db/PageRequest'
 import PageComponent from 'components/PageComponent'
 import { RootState } from '../../store'
-import { fetchPatients, searchPatients } from '../patients-slice'
+import { searchPatients } from '../patients-slice'
 import useTitle from '../../page-header/useTitle'
 import useAddBreadcrumbs from '../../breadcrumbs/useAddBreadcrumbs'
 import useDebounce from '../../hooks/debounce'
@@ -75,11 +75,6 @@ const ViewPatients = () => {
   }, [dispatch, debouncedSearchText, userPageRequest])
 
   useEffect(() => {
-    const sortRequest: SortRequest = {
-      sorts: [{ field: 'index', direction: 'asc' }],
-    }
-    dispatch(fetchPatients(sortRequest, userPageRequest))
-
     setButtonToolBar([
       <Button
         key="newPatientButton"
@@ -95,7 +90,7 @@ const ViewPatients = () => {
     return () => {
       setButtonToolBar([])
     }
-  }, [dispatch, setButtonToolBar, t, history, userPageRequest])
+  }, [dispatch, setButtonToolBar, t, history])
 
   const loadingIndicator = <Spinner color="blue" loading size={[10, 25]} type="ScaleLoader" />
   const table = (

src/util/generateCode.ts

@@ -0,0 +1,8 @@
+import shortid from 'shortid'
+
+const generateCode = (prefix: string) => {
+  const id = shortid.generate()
+  return `${prefix}-${id}`
+}
+
+export default generateCode