@openmrs/esm-form-engine-lib 3.0.1-pre.1652 → 3.0.1-pre.1661

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "3.0.1-pre.1652",
+  "version": "3.0.1-pre.1661",
   "description": "React Form Engine for O3",
   "browser": "dist/openmrs-esm-form-engine-lib.js",
   "main": "src/index.ts",

package/src/adapters/obs-adapter.test.ts

@@ -28,6 +28,7 @@ const formContext = {
   formFieldAdapters: null,
   formFieldValidators: null,
   customDependencies: null,
+  deletedFields: [],
   getFormField: jest.fn(),
   addFormField: jest.fn(),
   updateFormField: jest.fn(),
@@ -36,6 +37,7 @@ const formContext = {
   removeInvalidField: jest.fn(),
   setInvalidFields: jest.fn(),
   setForm: jest.fn(),
+  setDeletedFields: jest.fn(),
 } as FormContextProps;
 
 describe('ObsAdapter - transformFieldValue', () => {

package/src/adapters/program-state-adapter.test.ts

@@ -30,6 +30,7 @@ const formContext = {
   customDependencies: {
     patientPrograms: [],
   },
+  deletedFields: [],
   getFormField: jest.fn(),
   addFormField: jest.fn(),
   updateFormField: jest.fn(),
@@ -38,6 +39,7 @@ const formContext = {
   removeInvalidField: jest.fn(),
   setInvalidFields: jest.fn(),
   setForm: jest.fn(),
+  setDeletedFields: jest.fn(),
 } as FormContextProps;
 
 const field = {

package/src/components/inputs/ui-select-extended/ui-select-extended.component.tsx

@@ -169,13 +169,6 @@ const UiSelectExtended: React.FC<FormFieldInputProps> = ({ field, errors, warnin
             itemToString={(item) => item?.display}
             selectedItem={selectedItem}
             placeholder={isSearchable ? t('search', 'Search') + '...' : null}
-            shouldFilterItem={({ item, inputValue }) => {
-              if (!inputValue) {
-                // Carbon's initial call at component mount
-                return true;
-              }
-              return item.display?.toLowerCase().includes(inputValue.toLowerCase());
-            }}
             onChange={({ selectedItem }) => {
               isProcessingSelection.current = true;
               setFieldValue(selectedItem?.uuid);

package/src/components/inputs/ui-select-extended/ui-select-extended.test.tsx

@@ -252,18 +252,27 @@ describe('UiSelectExtended', () => {
       );
     });
 
-    it('should filter items based on user input', async () => {
+    it('should display all items regardless of user input', async () => {
       await act(async () => {
         renderForm();
       });
 
-      const transferLocationSelect = await findSelectInput(screen, 'Transfer Location');
+      const transferLocationSelect = await findSelectInput(screen, 'Transfer Location');    
+      // Open the dropdown
       await user.click(transferLocationSelect);
+    
+      // Verify all items are displayed initially
+      expect(screen.getByText('Kololo')).toBeInTheDocument();
+      expect(screen.getByText('Naguru')).toBeInTheDocument();
+      expect(screen.getByText('Muyenga')).toBeInTheDocument();
+    
+      // Type input
       await user.type(transferLocationSelect, 'Nag');
-
+    
+      // Verify all items are still displayed
+      expect(screen.getByText('Kololo')).toBeInTheDocument();
       expect(screen.getByText('Naguru')).toBeInTheDocument();
-      expect(screen.queryByText('Kololo')).not.toBeInTheDocument();
-      expect(screen.queryByText('Muyenga')).not.toBeInTheDocument();
+      expect(screen.getByText('Muyenga')).toBeInTheDocument();
     });
   });
 

package/src/components/renderer/form/form-renderer.component.tsx

@@ -37,7 +37,7 @@ export const FormRenderer = ({
     formState: { isDirty },
   } = methods;
 
-  const [{ formFields, invalidFields, formJson }, dispatch] = useReducer(formStateReducer, {
+  const [{ formFields, invalidFields, formJson, deletedFields }, dispatch] = useReducer(formStateReducer, {
     ...initialState,
     formFields: evaluatedFields,
     formJson: evaluatedFormJson,
@@ -52,6 +52,7 @@ export const FormRenderer = ({
     addInvalidField,
     removeInvalidField,
     setForm,
+    setDeletedFields,
   } = useFormStateHelpers(dispatch, formFields);
 
   useEffect(() => {
@@ -75,6 +76,7 @@ export const FormRenderer = ({
       formFields,
       formJson,
       invalidFields,
+      deletedFields,
       addFormField,
       updateFormField,
       getFormField,
@@ -83,8 +85,9 @@ export const FormRenderer = ({
       addInvalidField,
       removeInvalidField,
       setForm,
+      setDeletedFields,
     };
-  }, [processorContext, workspaceLayout, methods, formFields, formJson, invalidFields]);
+  }, [processorContext, workspaceLayout, methods, formFields, formJson, invalidFields, deletedFields]);
 
   useEffect(() => {
     registerForm(formJson.name, isSubForm, context);

package/src/components/renderer/form/state.ts

@@ -4,6 +4,7 @@ type FormState = {
   formFields: FormField[];
   invalidFields: FormField[];
   formJson: FormSchema;
+  deletedFields: FormField[];
 };
 
 type Action =
@@ -15,12 +16,14 @@ type Action =
   | { type: 'ADD_INVALID_FIELD'; value: FormField }
   | { type: 'REMOVE_INVALID_FIELD'; value: string }
   | { type: 'CLEAR_INVALID_FIELDS' }
-  | { type: 'SET_FORM_JSON'; value: any };
+  | { type: 'SET_FORM_JSON'; value: any }
+  | { type: 'SET_DELETED_FIELDS'; value: FormField[] };
 
 const initialState: FormState = {
   formFields: [],
   invalidFields: [],
   formJson: null,
+  deletedFields: [],
 };
 
 const formStateReducer = (state: FormState, action: Action): FormState => {
@@ -46,6 +49,8 @@ const formStateReducer = (state: FormState, action: Action): FormState => {
       return { ...state, invalidFields: [] };
     case 'SET_FORM_JSON':
       return { ...state, formJson: action.value };
+    case 'SET_DELETED_FIELDS':
+      return { ...state, deletedFields: action.value };
     default:
       return state;
   }

package/src/components/repeat/repeat.component.tsx

@@ -32,6 +32,8 @@ const Repeat: React.FC<FormFieldInputProps> = ({ field }) => {
     methods: { getValues, setValue },
     addFormField,
     removeFormField,
+    deletedFields,
+    setDeletedFields,
   } = context;
 
   useEffect(() => {
@@ -113,6 +115,7 @@ const Repeat: React.FC<FormFieldInputProps> = ({ field }) => {
       clearSubmission(field);
     }
     setRows(rows.filter((q) => q.id !== field.id));
+    setDeletedFields([...deletedFields, field]);
     removeFormField(field.id);
   };
 

package/src/hooks/useFormStateHelpers.ts

@@ -54,6 +54,10 @@ export function useFormStateHelpers(dispatch: Dispatch<Action>, formFields: Form
     dispatch({ type: 'SET_FORM_JSON', value: updateFormSectionReferences(formJson) });
   }, []);
 
+  const setDeletedFields = useCallback((fields: FormField[]) => {
+    dispatch({ type: 'SET_DELETED_FIELDS', value: fields });
+  }, []);
+
   return {
     addFormField,
     updateFormField,
@@ -63,5 +67,6 @@ export function useFormStateHelpers(dispatch: Dispatch<Action>, formFields: Form
     addInvalidField,
     removeInvalidField,
     setForm,
+    setDeletedFields,
   };
 }

package/src/processors/encounter/encounter-processor-helper.ts

@@ -25,10 +25,11 @@ export function prepareEncounter(
   encounterProvider: string,
   location: string,
 ) {
-  const { patient, formJson, domainObjectValue: encounter, formFields, visit } = context;
+  const { patient, formJson, domainObjectValue: encounter, formFields, visit, deletedFields } = context;
+  const allFormFields = [...formFields, ...deletedFields];
   const obsForSubmission = [];
-  prepareObs(obsForSubmission, formFields);
-  const ordersForSubmission = prepareOrders(formFields);
+  prepareObs(obsForSubmission, allFormFields);
+  const ordersForSubmission = prepareOrders(allFormFields);
   let encounterForSubmission: OpenmrsEncounter = {};
 
   if (encounter) {

package/src/provider/form-provider.tsx

@@ -7,6 +7,7 @@ export interface FormContextProps extends FormProcessorContextProps {
   methods: UseFormReturn<any>;
   workspaceLayout: 'minimized' | 'maximized';
   isSubmitting?: boolean;
+  deletedFields: FormField[];
   getFormField?: (field: string) => FormField;
   addFormField?: (field: FormField) => void;
   updateFormField?: (field: FormField) => void;
@@ -15,6 +16,7 @@ export interface FormContextProps extends FormProcessorContextProps {
   removeInvalidField?: (fieldId: string) => void;
   setInvalidFields?: (fields: FormField[]) => void;
   setForm?: (formJson: FormSchema) => void;
+  setDeletedFields?: (fields: FormField[]) => void;
 }
 
 export interface FormProviderProps extends FormContextProps {