@openmrs/esm-form-builder-app 3.4.2-pre.3477 → 3.4.2-pre.3481

package/dist/openmrs-esm-form-builder-app.js.buildmanifest.json

@@ -575,9 +575,9 @@
       "initial": false,
       "entry": false,
       "reason": "split chunk (cache group: defaultVendors)",
-      "size": 3225273,
+      "size": 3225562,
       "sizes": {
-        "javascript": 3225273
+        "javascript": 3225562
       },
       "names": [],
       "idHints": [
@@ -593,7 +593,7 @@
       "auxiliaryFiles": [
         "4701.js.map"
       ],
-      "hash": "e120ad6160a9f3f7",
+      "hash": "fbcad02bff1f2cf9",
       "childrenByOrder": {}
     },
     {
@@ -819,9 +819,9 @@
       "initial": false,
       "entry": false,
       "reason": "split chunk (cache group: defaultVendors)",
-      "size": 3555377,
+      "size": 3557838,
       "sizes": {
-        "javascript": 3555377
+        "javascript": 3557838
       },
       "names": [],
       "idHints": [
@@ -1307,7 +1307,7 @@
         "fec23c6964d6cf25681d1f3e24b076a4.js",
         "ffd3b83e8b5878f4785591ff54b1dfff.js"
       ],
-      "hash": "68d98372afce03c1",
+      "hash": "df675858fc8b1fcf",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"pages":[{"component":"root","route":"form-builder","online":true,"offline":true,"order":1}],"extensions":[{"name":"system-administration-form-builder-card-link","slot":"system-admin-page-card-link-slot","component":"systemAdministrationFormBuilderCardLink","online":true,"offline":true}],"modals":[{"name":"new-form-modal","component":"newFormModal"},{"name":"new-page-modal","component":"newPageModal"},{"name":"delete-page-modal","component":"deletePageModal"},{"name":"new-section-modal","component":"newSectionModal"},{"name":"delete-section-modal","component":"deleteSectionModal"},{"name":"add-form-reference-modal","component":"addFormReferenceModal"},{"name":"question-modal","component":"questionModal"},{"name":"delete-question-modal","component":"deleteQuestionModal"},{"name":"edit-question-modal","component":"editQuestionModal"},{"name":"restore-draft-schema-modal","component":"restoreDraftSchemaModal"},{"name":"unpublish-form-modal","component":"unpublishFormModal"},{"name":"delete-form-modal","component":"deleteFormModal"},{"name":"edit-translation-modal","component":"editTranslationModal"}],"version":"3.4.2-pre.3477"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"pages":[{"component":"root","route":"form-builder","online":true,"offline":true,"order":1}],"extensions":[{"name":"system-administration-form-builder-card-link","slot":"system-admin-page-card-link-slot","component":"systemAdministrationFormBuilderCardLink","online":true,"offline":true}],"modals":[{"name":"new-form-modal","component":"newFormModal"},{"name":"new-page-modal","component":"newPageModal"},{"name":"delete-page-modal","component":"deletePageModal"},{"name":"new-section-modal","component":"newSectionModal"},{"name":"delete-section-modal","component":"deleteSectionModal"},{"name":"add-form-reference-modal","component":"addFormReferenceModal"},{"name":"question-modal","component":"questionModal"},{"name":"delete-question-modal","component":"deleteQuestionModal"},{"name":"edit-question-modal","component":"editQuestionModal"},{"name":"restore-draft-schema-modal","component":"restoreDraftSchemaModal"},{"name":"unpublish-form-modal","component":"unpublishFormModal"},{"name":"delete-form-modal","component":"deleteFormModal"},{"name":"edit-translation-modal","component":"editTranslationModal"}],"version":"3.4.2-pre.3481"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-builder-app",
-  "version": "3.4.2-pre.3477",
+  "version": "3.4.2-pre.3481",
   "license": "MPL-2.0",
   "description": "Form Builder for O3",
   "browser": "dist/openmrs-esm-form-builder-app.js",
@@ -13,11 +13,11 @@
     "analyze": "rspack --mode=production --env.analyze=true",
     "lint": "eslint src --ext js,jsx,ts,tsx --max-warnings=0",
     "typescript": "tsc",
-    "test": "jest --config jest.config.js --color",
-    "test:watch": "jest --config jest.config.js --watch --color",
+    "test": "cross-env TZ=UTC vitest run --passWithNoTests",
+    "test:watch": "cross-env TZ=UTC vitest watch",
     "test-e2e": "playwright test",
     "verify": "turbo run lint typescript coverage --color",
-    "coverage": "yarn test --coverage --passWithNoTests",
+    "coverage": "cross-env TZ=UTC vitest run --coverage --passWithNoTests",
     "postinstall": "husky install",
     "extract-translations": "i18next 'src/**/*.component.tsx' 'src/**/*.modal.tsx' --config ./tools/i18next-parser.config.js",
     "ci:bump-form-engine-lib": "yarn up @openmrs/esm-form-engine-lib@latest"
@@ -75,16 +75,16 @@
     "@playwright/test": "^1.50.1",
     "@swc/cli": "^0.1.65",
     "@swc/core": "^1.5.7",
-    "@swc/jest": "^0.2.36",
-    "@testing-library/dom": "^9.3.4",
-    "@testing-library/jest-dom": "^6.4.8",
-    "@testing-library/react": "^14.3.1",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.8.0",
+    "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.5.2",
-    "@types/jest": "^29.5.12",
     "@types/react": "^18.3.2",
     "@types/react-dom": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
+    "@vitest/coverage-v8": "^4.1.2",
+    "cross-env": "^10.1.0",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest-dom": "^5.4.0",
@@ -95,9 +95,7 @@
     "i18next": "^25.0.0",
     "i18next-parser": "^9.3.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^29.7.0",
-    "jest-cli": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
+    "jsdom": "^28.0.0",
     "lint-staged": "^14.0.1",
     "openmrs": "next",
     "prettier": "^3.3.3",
@@ -107,7 +105,8 @@
     "react-i18next": "^16.0.0",
     "rxjs": "^6.6.7",
     "turbo": "^2.5.2",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "vitest": "^4.1.2"
   },
   "lint-staged": {
     "*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",

package/src/components/dashboard/dashboard.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { type FetchResponse, navigate, openmrsFetch, showModal } from '@openmrs/esm-framework';
@@ -12,9 +13,9 @@ type OpenmrsFetchResponse = Promise<
   }>
 >;
 
-const mockedOpenmrsFetch = jest.mocked(openmrsFetch);
-const mockedDeleteForm = jest.mocked(deleteForm);
-const mockedShowModal = jest.mocked(showModal);
+const mockedOpenmrsFetch = vi.mocked(openmrsFetch);
+const mockedDeleteForm = vi.mocked(deleteForm);
+const mockedShowModal = vi.mocked(showModal);
 
 const formsResponse = [
   {
@@ -38,11 +39,11 @@ const formsResponse = [
   },
 ];
 
-jest.mock('@resources/forms.resource', () => ({
-  deleteForm: jest.fn(),
+vi.mock('@resources/forms.resource', () => ({
+  deleteForm: vi.fn(),
 }));
 
-global.window.URL.createObjectURL = jest.fn();
+global.window.URL.createObjectURL = vi.fn();
 
 describe('Dashboard', () => {
   it('renders an empty state view if no forms are available', async () => {

package/src/components/interactive-builder/drag-and-drop-helpers.test.ts

@@ -1,4 +1,5 @@
 import { moveQuestion, type DragQuestionData } from './drag-and-drop-helpers';
+import { describe, it, expect } from 'vitest';
 import type { FormField } from '@openmrs/esm-form-engine-lib';
 import type { Schema } from '../../types';
 

package/src/components/interactive-builder/interactive-builder.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
 import { showModal } from '@openmrs/esm-framework';
@@ -6,7 +7,7 @@ import { type FormSchema } from '@openmrs/esm-form-engine-lib';
 import { type Schema } from '../../types';
 import InteractiveBuilder from './interactive-builder.component';
 
-const mockShowModal = jest.mocked(showModal);
+const mockShowModal = vi.mocked(showModal);
 
 describe('InteractiveBuilder', () => {
   it('renders the interactive builder', async () => {
@@ -104,7 +105,7 @@ describe('InteractiveBuilder', () => {
 function renderInteractiveBuilder(props = {}) {
   const defaultProps = {
     isLoading: false,
-    onSchemaChange: jest.fn(),
+    onSchemaChange: vi.fn(),
     schema: {} as Schema,
     validationResponse: [],
   };

package/src/components/interactive-builder/modals/add-form-reference/add-form-reference.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect, beforeEach } from 'vitest';
 import { screen, waitFor } from '@testing-library/react';
 import AddFormReferenceModal from './add-form-reference.modal';
 import { Form, type Schema } from '@types';
@@ -12,9 +13,9 @@ type OpenmrsFetchResponse = Promise<
   }>
 >;
 
-const mockedOpenmrsFetch = jest.mocked(openmrsFetch);
-const mockedCloseModal = jest.fn();
-const mockedOnSchemaChange = jest.fn();
+const mockedOpenmrsFetch = vi.mocked(openmrsFetch);
+const mockedCloseModal = vi.fn();
+const mockedOnSchemaChange = vi.fn();
 
 const formsResponse = [
   {

package/src/components/interactive-builder/modals/question/question-form/common/concept-search/concept-search.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect, beforeEach } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
 import { useConceptId } from '@hooks/useConceptId';
@@ -32,22 +33,22 @@ const concepts: Array<Concept> = [
     mappings: [{ display: 'CIEL:1656', conceptMapType: { display: 'SAME-AS' } }],
   },
 ];
-const mockUseConceptLookup = jest.mocked(useConceptLookup);
-jest.mock('@hooks/useConceptLookup', () => ({
-  ...jest.requireActual('@hooks/useConceptLookup'),
-  useConceptLookup: jest.fn(),
+const mockUseConceptLookup = vi.mocked(useConceptLookup);
+vi.mock('@hooks/useConceptLookup', async () => ({
+  ...((await vi.importActual('@hooks/useConceptLookup')) as object),
+  useConceptLookup: vi.fn(),
 }));
-const mockUseConceptId = jest.mocked(useConceptId);
-jest.mock('@hooks/useConceptId', () => ({
-  ...jest.requireActual('@hooks/useConceptId'),
-  useConceptId: jest.fn(),
+const mockUseConceptId = vi.mocked(useConceptId);
+vi.mock('@hooks/useConceptId', async () => ({
+  ...((await vi.importActual('@hooks/useConceptId')) as object),
+  useConceptId: vi.fn(),
 }));
-const onSelectConcept = jest.fn();
-const mockSetFormField = jest.fn();
-const setConcept = jest.fn();
-const setIsConceptValid = jest.fn();
-jest.mock('../../../form-field-context', () => ({
-  ...jest.requireActual('../../../form-field-context'),
+const onSelectConcept = vi.fn();
+const mockSetFormField = vi.fn();
+const setConcept = vi.fn();
+const setIsConceptValid = vi.fn();
+vi.mock('../../../form-field-context', async () => ({
+  ...((await vi.importActual('../../../form-field-context')) as object),
   useFormField: () => ({ formField, setFormField: mockSetFormField, setConcept, setIsConceptValid }),
 }));
 

package/src/components/interactive-builder/modals/question/question-form/question/question.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import Question from './question.component';
@@ -15,7 +16,7 @@ const initialFormField: FormField = {
   },
 };
 
-const checkIfQuestionIdExists = jest.fn(() => false);
+const checkIfQuestionIdExists = vi.fn(() => false);
 
 const renderWithFormFieldProvider = (
   component: React.ReactElement,
@@ -57,7 +58,7 @@ describe('Question Component', () => {
   });
 
   it('should validate duplicate question ids', () => {
-    const duplicateCheckFn = jest.fn().mockReturnValue(true);
+    const duplicateCheckFn = vi.fn().mockReturnValue(true);
 
     renderWithFormFieldProvider(<Question checkIfQuestionIdExists={duplicateCheckFn} />);
 

package/src/components/interactive-builder/modals/question/question-form/question-types/inputs/obs/obs-type-question.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import ObsTypeQuestion from './obs-type-question.component';
@@ -8,9 +9,9 @@ import { useConceptLookup } from '@hooks/useConceptLookup';
 import type { FormField } from '@openmrs/esm-form-engine-lib';
 import type { Concept } from '@types';
 
-const mockSetFormField = jest.fn();
-const setConcept = jest.fn();
-const setIsConceptValid = jest.fn();
+const mockSetFormField = vi.fn();
+const setConcept = vi.fn();
+const setIsConceptValid = vi.fn();
 const formField: FormField = {
   id: '1',
   type: 'obs',
@@ -19,8 +20,8 @@ const formField: FormField = {
   },
 };
 
-jest.mock('../../../../form-field-context', () => ({
-  ...jest.requireActual('../../../../form-field-context'),
+vi.mock('../../../../form-field-context', async () => ({
+  ...((await vi.importActual('../../../../form-field-context')) as object),
   useFormField: () => ({ formField, setFormField: mockSetFormField, setConcept, setIsConceptValid }),
 }));
 
@@ -43,16 +44,16 @@ const concepts: Array<Concept> = [
   },
 ];
 
-const mockUseConceptLookup = jest.mocked(useConceptLookup);
-jest.mock('@hooks/useConceptLookup', () => ({
-  ...jest.requireActual('@hooks/useConceptLookup'),
-  useConceptLookup: jest.fn(),
+const mockUseConceptLookup = vi.mocked(useConceptLookup);
+vi.mock('@hooks/useConceptLookup', async () => ({
+  ...((await vi.importActual('@hooks/useConceptLookup')) as object),
+  useConceptLookup: vi.fn(),
 }));
 
-const mockUseConceptId = jest.mocked(useConceptId);
-jest.mock('@hooks/useConceptId', () => ({
-  ...jest.requireActual('@hooks/useConceptId'),
-  useConceptId: jest.fn(),
+const mockUseConceptId = vi.mocked(useConceptId);
+vi.mock('@hooks/useConceptId', async () => ({
+  ...((await vi.importActual('@hooks/useConceptId')) as object),
+  useConceptId: vi.fn(),
 }));
 
 describe('ObsTypeQuestion', () => {

package/src/components/interactive-builder/modals/question/question-form/question-types/inputs/patient-identifier/patient-identifier-type.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
 import type { FormField } from '@openmrs/esm-form-engine-lib';
@@ -7,7 +8,7 @@ import { FormFieldProvider } from '../../../../form-field-context';
 import { usePatientIdentifierTypes } from '@hooks/usePatientIdentifierTypes';
 import PatientIdentifierTypeQuestion from './patient-identifier-type-question.component';
 
-const mockSetFormField = jest.fn();
+const mockSetFormField = vi.fn();
 const formField: FormField = {
   id: '1',
   type: 'patientIdentifier',
@@ -16,15 +17,15 @@ const formField: FormField = {
   },
 };
 
-jest.mock('../../../../form-field-context', () => ({
-  ...jest.requireActual('../../../../form-field-context'),
+vi.mock('../../../../form-field-context', async () => ({
+  ...((await vi.importActual('../../../../form-field-context')) as object),
   useFormField: () => ({ formField, setFormField: mockSetFormField }),
 }));
 
-const mockUsePatientIdentifierTypes = jest.mocked(usePatientIdentifierTypes);
-jest.mock('@hooks/usePatientIdentifierTypes', () => ({
-  ...jest.requireActual('@hooks/usePatientIdentifierTypes'),
-  usePatientIdentifierTypes: jest.fn((value: string) => value),
+const mockUsePatientIdentifierTypes = vi.mocked(usePatientIdentifierTypes);
+vi.mock('@hooks/usePatientIdentifierTypes', async () => ({
+  ...((await vi.importActual('@hooks/usePatientIdentifierTypes')) as object),
+  usePatientIdentifierTypes: vi.fn((value: string) => value),
 }));
 
 const patientIdentifierTypes: Array<PatientIdentifierType> = [

package/src/components/interactive-builder/modals/question/question-form/question-types/inputs/person-attribute/person-attribute-type-question.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect, beforeEach } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
 import type { FormField } from '@openmrs/esm-form-engine-lib';
@@ -7,7 +8,7 @@ import { useFormField } from '../../../../form-field-context';
 import { usePersonAttributeTypes } from '@hooks/usePersonAttributeTypes';
 import PersonAttributeTypeQuestion from './person-attribute-type-question.component';
 
-const mockSetFormField = jest.fn();
+const mockSetFormField = vi.fn();
 const formField: FormField = {
   id: '1',
   type: 'personAttribute',
@@ -16,11 +17,11 @@ const formField: FormField = {
   },
 };
 
-jest.mock('../../../../form-field-context');
-const mockUseFormField = jest.mocked(useFormField);
+vi.mock('../../../../form-field-context');
+const mockUseFormField = vi.mocked(useFormField);
 
-jest.mock('@hooks/usePersonAttributeTypes');
-const mockUsePersonAttributeTypes = jest.mocked(usePersonAttributeTypes);
+vi.mock('@hooks/usePersonAttributeTypes');
+const mockUsePersonAttributeTypes = vi.mocked(usePersonAttributeTypes);
 
 const personAttributeTypes: Array<PersonAttributeType> = [
   { uuid: '1', display: 'Email', format: 'java.lang.String', concept: null },
@@ -33,7 +34,7 @@ describe('PersonAttributeTypeQuestion', () => {
       formField,
       setFormField: mockSetFormField,
       concept: null,
-      setConcept: jest.fn(),
+      setConcept: vi.fn(),
     });
   });
 

package/src/components/interactive-builder/modals/question/question-form/question-types/inputs/program-state/program-state.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
 import ProgramStateTypeQuestion from './program-state-type-question.component';
@@ -7,7 +8,7 @@ import { usePrograms, useProgramWorkStates } from '@hooks/useProgramStates';
 import type { FormField, ProgramState } from '@openmrs/esm-form-engine-lib';
 import type { Program } from '@types';
 
-const mockSetFormField = jest.fn();
+const mockSetFormField = vi.fn();
 const formField: FormField = {
   id: '1',
   type: 'programState',
@@ -16,17 +17,17 @@ const formField: FormField = {
   },
 };
 
-jest.mock('../../../../form-field-context', () => ({
-  ...jest.requireActual('../../../../form-field-context'),
+vi.mock('../../../../form-field-context', async () => ({
+  ...((await vi.importActual('../../../../form-field-context')) as object),
   useFormField: () => ({ formField, setFormField: mockSetFormField }),
 }));
 
-const mockUsePrograms = jest.mocked(usePrograms);
-const mockUseProgramWorkflowStates = jest.mocked(useProgramWorkStates);
-jest.mock('@hooks/useProgramStates', () => ({
-  ...jest.requireActual('@hooks/useProgramStates'),
-  usePrograms: jest.fn(),
-  useProgramWorkStates: jest.fn(),
+const mockUsePrograms = vi.mocked(usePrograms);
+const mockUseProgramWorkflowStates = vi.mocked(useProgramWorkStates);
+vi.mock('@hooks/useProgramStates', async () => ({
+  ...((await vi.importActual('@hooks/useProgramStates')) as object),
+  usePrograms: vi.fn(),
+  useProgramWorkStates: vi.fn(),
 }));
 
 const programOneWorkflowOneStates: Array<ProgramState> = [
@@ -79,7 +80,7 @@ describe('ProgramStateTypeQuestion', () => {
       programStates: [],
       programStatesLookupError: null,
       isLoadingProgramStates: null,
-      mutateProgramStates: jest.fn(),
+      mutateProgramStates: vi.fn(),
     });
     renderComponent();
 
@@ -92,7 +93,7 @@ describe('ProgramStateTypeQuestion', () => {
       programStates: [],
       programStatesLookupError: null,
       isLoadingProgramStates: null,
-      mutateProgramStates: jest.fn(),
+      mutateProgramStates: vi.fn(),
     });
     renderComponent();
 
@@ -106,7 +107,7 @@ describe('ProgramStateTypeQuestion', () => {
       programStates: programOneWorkflowOneStates,
       programStatesLookupError: null,
       isLoadingProgramStates: null,
-      mutateProgramStates: jest.fn(),
+      mutateProgramStates: vi.fn(),
     });
     const user = userEvent.setup();
     renderComponent();
@@ -168,7 +169,7 @@ describe('ProgramStateTypeQuestion', () => {
       programStates: programOneWorkflowOneStates,
       programStatesLookupError: null,
       isLoadingProgramStates: null,
-      mutateProgramStates: jest.fn(),
+      mutateProgramStates: vi.fn(),
     });
     formField.questionOptions = {
       rendering: 'select',

package/src/components/interactive-builder/modals/question/question-form/question-types/inputs/test-order/test-order-type-question.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import TestOrderTypeQuestion from './test-order-type-question.component';
@@ -7,21 +8,21 @@ import { useConceptId } from '@hooks/useConceptId';
 import { useConceptLookup } from '@hooks/useConceptLookup';
 import type { FormField } from '@openmrs/esm-form-engine-lib';
 
-const mockUseConceptLookup = jest.mocked(useConceptLookup);
-jest.mock('@hooks/useConceptLookup', () => ({
-  ...jest.requireActual('@hooks/useConceptLookup'),
-  useConceptLookup: jest.fn(),
+const mockUseConceptLookup = vi.mocked(useConceptLookup);
+vi.mock('@hooks/useConceptLookup', async () => ({
+  ...((await vi.importActual('@hooks/useConceptLookup')) as object),
+  useConceptLookup: vi.fn(),
 }));
 
-const mockUseConceptId = jest.mocked(useConceptId);
-jest.mock('@hooks/useConceptId', () => ({
-  ...jest.requireActual('@hooks/useConceptId'),
-  useConceptId: jest.fn(),
+const mockUseConceptId = vi.mocked(useConceptId);
+vi.mock('@hooks/useConceptId', async () => ({
+  ...((await vi.importActual('@hooks/useConceptId')) as object),
+  useConceptId: vi.fn(),
 }));
 
-const mockSetFormField = jest.fn();
-const mockSetConcept = jest.fn();
-const mockSetIsConceptValid = jest.fn();
+const mockSetFormField = vi.fn();
+const mockSetConcept = vi.fn();
+const mockSetIsConceptValid = vi.fn();
 const formField: FormField = {
   id: 'test-order-1',
   type: 'testOrder',
@@ -32,8 +33,8 @@ const formField: FormField = {
   },
 };
 
-jest.mock('../../../../form-field-context', () => ({
-  ...jest.requireActual('../../../../form-field-context'),
+vi.mock('../../../../form-field-context', async () => ({
+  ...((await vi.importActual('../../../../form-field-context')) as object),
   useFormField: () => ({
     formField,
     setFormField: mockSetFormField,
@@ -44,7 +45,7 @@ jest.mock('../../../../form-field-context', () => ({
 
 describe('TestOrderTypeQuestion', () => {
   beforeEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
     mockUseConceptLookup.mockReturnValue({ concepts: [], conceptLookupError: null, isLoadingConcepts: false });
     mockUseConceptId.mockReturnValue({
       concept: null,

package/src/components/interactive-builder/modals/question/question-form/question-types/question-type.test.tsx

@@ -1,18 +1,19 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import { render, screen } from '@testing-library/react';
 import { FormFieldProvider } from '../../form-field-context';
 import QuestionTypeComponent from './question-type.component';
 import type { FormField } from '@openmrs/esm-form-engine-lib';
 
-const mockSetFormField = jest.fn();
+const mockSetFormField = vi.fn();
 const formField: FormField = {
   type: 'obs',
   questionOptions: { rendering: 'text' },
   id: '1',
 };
 
-jest.mock('../../form-field-context', () => ({
-  ...jest.requireActual('../../form-field-context'),
+vi.mock('../../form-field-context', async () => ({
+  ...((await vi.importActual('../../form-field-context')) as object),
   useFormField: () => ({ formField, setFormField: mockSetFormField }),
 }));
 
@@ -53,7 +54,7 @@ describe('RenderingType Component', () => {
   });
 
   it('prints error to console if component cannot be found for type', () => {
-    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
+    const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
     formField.type = 'control';
     renderQuestionTypeComponent();
 

package/src/components/interactive-builder/modals/question/question-form/rendering-types/inputs/date/date.test.tsx

@@ -1,19 +1,20 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import Date from './date.component';
 import { FormFieldProvider } from '../../../../form-field-context';
 import type { FormField } from '@openmrs/esm-form-engine-lib';
 
-const mockSetFormField = jest.fn();
+const mockSetFormField = vi.fn();
 const formField: FormField = {
   datePickerFormat: 'both',
   type: 'obs',
   questionOptions: { rendering: 'date' },
   id: '1',
 };
-jest.mock('../../../../form-field-context', () => ({
-  ...jest.requireActual('../../../../form-field-context'),
+vi.mock('../../../../form-field-context', async () => ({
+  ...((await vi.importActual('../../../../form-field-context')) as object),
   useFormField: () => ({ formField, setFormField: mockSetFormField }),
 }));
 

package/src/components/interactive-builder/modals/question/question-form/rendering-types/inputs/number/number.test.tsx

@@ -1,19 +1,20 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import Number from './number.component';
 import { FormFieldProvider } from '../../../../form-field-context';
 import type { FormField } from '@openmrs/esm-form-engine-lib';
 
-const mockSetFormField = jest.fn();
+const mockSetFormField = vi.fn();
 const formField: FormField = {
   type: 'obs',
   questionOptions: { rendering: 'number', min: '1', max: '10' },
   id: '1',
 };
 
-jest.mock('../../../../form-field-context', () => ({
-  ...jest.requireActual('../../../../form-field-context'),
+vi.mock('../../../../form-field-context', async () => ({
+  ...((await vi.importActual('../../../../form-field-context')) as object),
   useFormField: () => ({ formField, setFormField: mockSetFormField }),
 }));