fix(lab): required visit not enforced

src/__tests__/labs/hooks/useRequestLab.test.ts

@@ -11,6 +11,7 @@ describe('Use Request lab', () => {
  const lab = {
  type: 'test',
  patient: '123',
+ visitId: 'test visit id',
  } as Lab
  const expectedRequestedLab = {
  ...lab,

src/__tests__/labs/requests/NewLabRequest.test.tsx

@@ -34,6 +34,7 @@ const setup = (
  const expectedLab = {
  patient: '1234567',
  type: 'expected type',
+ visitId: 'visit_id',
  status: 'requested',
  notes: [expectedNotes],
  id: '1234',
@@ -224,6 +225,8 @@ describe('New Lab Request', () => {
  userEvent.type(screen.getByPlaceholderText(/labs.lab.patient/i), 'Jim Bob')
  expect(await screen.findByText(/jim bob/i)).toBeVisible()
  userEvent.click(screen.getByText(/jim bob/i))
+ userEvent.click(screen.getByPlaceholderText('-- Choose --')) // click the Visit field
+ userEvent.click(screen.getByText(/visit_type/i))
  userEvent.type(screen.getByLabelText(/labs\.lab\.type/i), expectedLab.type)
  userEvent.type(screen.getByLabelText(/labs\.lab\.notes/i), (expectedLab.notes as string[])[0])
  userEvent.click(screen.getByRole('button', { name: /labs\.requests\.new/i }))

src/__tests__/labs/utils/validate-lab.test.ts

@@ -7,6 +7,7 @@ describe('lab validator', () => {
  const lab = {
  patient: 'some patient',
  type: 'type test',
+ visitId: 'test visit id',
  } as Lab
 
  const expectedError = {} as LabError
@@ -23,6 +24,7 @@ describe('lab validator', () => {
  patient: 'labs.requests.error.patientRequired',
  type: 'labs.requests.error.typeRequired',
  message: 'labs.requests.error.unableToRequest',
+ visit: 'labs.requests.error.visitRequired',
  } as LabError
 
  const actualError = validateLabRequest(lab)

src/labs/requests/NewLabRequest.tsx

@@ -151,6 +151,7 @@ const NewLabRequest = () => {
  label={t('patient.visit')}
  isRequired
  isEditable={newLabRequest.patient !== undefined}
+ isInvalid={!!error?.visit}
  options={visitOptions || []}
  defaultSelected={defaultSelectedVisitsOption()}
  onChange={(values) => {

src/labs/utils/validate-lab.ts

@@ -11,6 +11,8 @@ export class LabError extends Error {
 
  type?: string
 
+ visit?: string
+
  constructor(message: string, result: string, patient: string, type: string) {
  super(message)
  this.message = message
@@ -31,6 +33,10 @@ export function validateLabRequest(lab: Partial<Lab>): LabError {
  labError.type = 'labs.requests.error.typeRequired'
  }
 
+ if (!lab.visitId) {
+ labError.visit = 'labs.requests.error.visitRequired'
+ }
+
  if (!isEmpty(labError)) {
  labError.message = 'labs.requests.error.unableToRequest'
  }

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

@@ -27,6 +27,7 @@ export default {
  unableToComplete: 'Unable to complete lab request.',
  typeRequired: 'Type is required.',
  patientRequired: 'Patient is required.',
+ visitRequired: 'Visit is required.',
  resultRequiredToComplete: 'Result is required to complete.',
  },
  },

src/shared/model/Lab.ts

@@ -11,5 +11,5 @@ export default interface Lab extends AbstractDBModel {
  requestedOn: string
  completedOn?: string
  canceledOn?: string
- visitId?: string
+ visitId: string
 }