@openmrs/esm-form-engine-lib 2.1.0-pre.1604 → 2.1.0-pre.1606

package/__mocks__/forms/rfe-forms/sample_ui-select-ext.json

@@ -26,7 +26,6 @@
                   }
                 }
               },
-              "meta": {},
               "id": "patient_transfer_location"
             },
             {

package/package.json

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

package/src/adapters/inline-date-adapter.ts

@@ -18,8 +18,8 @@ export const InlineDateAdapter: FormFieldValueAdapter = {
       } else {
         targetField.meta.submission.newValue.obsDatetime = dateString;
       }
-    } else if (!hasSubmission(targetField) && targetField.meta.previousValue) {
-      if (isEmpty(value) && isEmpty(targetField.meta.previousValue.obsDatetime)) {
+    } else if (!hasSubmission(targetField) && targetField.meta.initialValue?.omrsObject) {
+      if (isEmpty(value) && isEmpty((targetField.meta.initialValue.omrsObject as OpenmrsResource)?.obsDatetime)) {
         return null;
       }
       // generate submission
@@ -37,8 +37,9 @@ export const InlineDateAdapter: FormFieldValueAdapter = {
     if (encounter) {
       const targetFieldId = field.id.split('_inline_date')[0];
       const targetField = context.formFields.find((field) => field.id === targetFieldId);
-      if (targetField?.meta.previousValue?.obsDatetime) {
-        return parseDate(targetField?.meta.previousValue?.obsDatetime);
+      const targetFieldInitialObs = targetField?.meta.initialValue?.omrsObject as OpenmrsResource;
+      if (targetFieldInitialObs?.obsDatetime) {
+        return parseDate(targetFieldInitialObs.obsDatetime);
       }
     }
     return null;

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

@@ -198,15 +198,17 @@ describe('ObsAdapter - transformFieldValue', () => {
         concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
       },
       meta: {
-        previousValue: {
-          uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
-          person: '833db896-c1f0-11eb-8529-0242ac130003',
-          concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
-          location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
-          order: null,
-          groupMembers: [],
-          voided: false,
-          value: 'Can be discharged in next visit',
+        initialValue: {
+          omrsObject: {
+            uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
+            person: '833db896-c1f0-11eb-8529-0242ac130003',
+            concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
+            location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
+            order: null,
+            groupMembers: [],
+            voided: false,
+            value: 'Can be discharged in next visit',
+          },
         },
       },
       id: 'visit-note',
@@ -236,15 +238,17 @@ describe('ObsAdapter - transformFieldValue', () => {
         concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
       },
       meta: {
-        previousValue: {
-          uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
-          person: '833db896-c1f0-11eb-8529-0242ac130003',
-          concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
-          location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
-          order: null,
-          groupMembers: [],
-          voided: false,
-          value: '5197ca4f-f0f7-4e63-9a68-8614224dce44',
+        initialValue: {
+          omrsObject: {
+            uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
+            person: '833db896-c1f0-11eb-8529-0242ac130003',
+            concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
+            location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
+            order: null,
+            groupMembers: [],
+            voided: false,
+            value: '5197ca4f-f0f7-4e63-9a68-8614224dce44',
+          },
         },
       },
       id: 'hts-result',
@@ -276,22 +280,24 @@ describe('ObsAdapter - transformFieldValue', () => {
         ],
       },
       meta: {
-        previousValue: [
-          {
-            uuid: 'f2487de5-e55f-4689-8791-0c919179818b',
-            person: '833db896-c1f0-11eb-8529-0242ac130003',
-            concept: '3hbkj9-b6d8-4eju-8f37-0b14f5347jv9',
-            location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
-            order: null,
-            groupMembers: [],
-            voided: false,
-            formFieldNamespace: 'rfe-forms',
-            formFieldPath: 'rfe-forms-past-patient-programs',
-            value: {
-              uuid: '105e7ad6-c1fd-11eb-8529-0242ac130ju9',
+        initialValue: {
+          omrsObject: [
+            {
+              uuid: 'f2487de5-e55f-4689-8791-0c919179818b',
+              person: '833db896-c1f0-11eb-8529-0242ac130003',
+              concept: '3hbkj9-b6d8-4eju-8f37-0b14f5347jv9',
+              location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
+              order: null,
+              groupMembers: [],
+              voided: false,
+              formFieldNamespace: 'rfe-forms',
+              formFieldPath: 'rfe-forms-past-patient-programs',
+              value: {
+                uuid: '105e7ad6-c1fd-11eb-8529-0242ac130ju9',
+              },
             },
-          },
-        ],
+          ],
+        },
       },
       id: 'past-patient-programs',
     };
@@ -327,15 +333,17 @@ describe('ObsAdapter - transformFieldValue', () => {
         concept: '3e432ad5-7b19-4866-a68f-abf0d9f52a01',
       },
       meta: {
-        previousValue: {
-          uuid: 'bca7277f-a726-4d3d-9db8-40937228ead5',
-          person: '833db896-c1f0-11eb-8529-0242ac130003',
-          concept: '3e432ad5-7b19-4866-a68f-abf0d9f52a01',
-          location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
-          order: null,
-          groupMembers: [],
-          voided: false,
-          value: new Date(2020, 11, 16),
+        initialValue: {
+          omrsObject: {
+            uuid: 'bca7277f-a726-4d3d-9db8-40937228ead5',
+            person: '833db896-c1f0-11eb-8529-0242ac130003',
+            concept: '3e432ad5-7b19-4866-a68f-abf0d9f52a01',
+            location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
+            order: null,
+            groupMembers: [],
+            voided: false,
+            value: new Date(2020, 11, 16),
+          },
         },
       },
       id: 'hts-date',
@@ -365,15 +373,17 @@ describe('ObsAdapter - transformFieldValue', () => {
         concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
       },
       meta: {
-        previousValue: {
-          uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
-          person: '833db896-c1f0-11eb-8529-0242ac130003',
-          concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
-          location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
-          order: null,
-          groupMembers: [],
-          voided: false,
-          value: 'Can be discharged in next visit',
+        initialValue: {
+          omrsObject: {
+            uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
+            person: '833db896-c1f0-11eb-8529-0242ac130003',
+            concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
+            location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
+            order: null,
+            groupMembers: [],
+            voided: false,
+            value: 'Can be discharged in next visit',
+          },
         },
       },
       id: 'visit-note',
@@ -401,15 +411,17 @@ describe('ObsAdapter - transformFieldValue', () => {
         concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
       },
       meta: {
-        previousValue: {
-          uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
-          person: '833db896-c1f0-11eb-8529-0242ac130003',
-          concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
-          location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
-          order: null,
-          groupMembers: [],
-          voided: false,
-          value: '5197ca4f-f0f7-4e63-9a68-8614224dce44',
+        initialValue: {
+          omrsObject: {
+            uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
+            person: '833db896-c1f0-11eb-8529-0242ac130003',
+            concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
+            location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
+            order: null,
+            groupMembers: [],
+            voided: false,
+            value: '5197ca4f-f0f7-4e63-9a68-8614224dce44',
+          },
         },
       },
       id: 'hts-result',
@@ -435,20 +447,22 @@ describe('ObsAdapter - transformFieldValue', () => {
         answers: [{ label: 'Option 1', concept: '105e7ad6-c1fd-11eb-8529-0242ac130ju9' }],
       },
       meta: {
-        previousValue: [
-          {
-            uuid: 'f2487de5-e55f-4689-8791-0c919179818b',
-            person: '833db896-c1f0-11eb-8529-0242ac130003',
-            concept: '3hbkj9-b6d8-4eju-8f37-0b14f5347jv9',
-            location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
-            order: null,
-            groupMembers: [],
-            voided: false,
-            value: {
-              uuid: '105e7ad6-c1fd-11eb-8529-0242ac130ju9',
+        initialValue: {
+          omrsObject: [
+            {
+              uuid: 'f2487de5-e55f-4689-8791-0c919179818b',
+              person: '833db896-c1f0-11eb-8529-0242ac130003',
+              concept: '3hbkj9-b6d8-4eju-8f37-0b14f5347jv9',
+              location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
+              order: null,
+              groupMembers: [],
+              voided: false,
+              value: {
+                uuid: '105e7ad6-c1fd-11eb-8529-0242ac130ju9',
+              },
             },
-          },
-        ],
+          ],
+        },
       },
       id: 'past-patient-programs',
     };
@@ -479,15 +493,17 @@ describe('ObsAdapter - transformFieldValue', () => {
         concept: '3e432ad5-7b19-4866-a68f-abf0d9f52a01',
       },
       meta: {
-        previousValue: {
-          uuid: 'bca7277f-a726-4d3d-9db8-40937228ead5',
-          person: '833db896-c1f0-11eb-8529-0242ac130003',
-          concept: '3e432ad5-7b19-4866-a68f-abf0d9f52a01',
-          location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
-          order: null,
-          groupMembers: [],
-          voided: false,
-          value: htsDate,
+        initialValue: {
+          omrsObject: {
+            uuid: 'bca7277f-a726-4d3d-9db8-40937228ead5',
+            person: '833db896-c1f0-11eb-8529-0242ac130003',
+            concept: '3e432ad5-7b19-4866-a68f-abf0d9f52a01',
+            location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
+            order: null,
+            groupMembers: [],
+            voided: false,
+            value: htsDate,
+          },
         },
       },
       id: 'hts-date',
@@ -790,9 +806,11 @@ describe('hasPreviousObsValueChanged', () => {
         rendering: 'radio',
       },
       meta: {
-        previousValue: {
-          value: {
-            uuid: '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+        initialValue: {
+          omrsObject: {
+            value: {
+              uuid: '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            },
           },
         },
       },
@@ -808,8 +826,10 @@ describe('hasPreviousObsValueChanged', () => {
         rendering: 'date',
       },
       meta: {
-        previousValue: {
-          value: '2024-05-01T19:49:50.000+0000',
+        initialValue: {
+          omrsObject: {
+            value: '2024-05-01T19:49:50.000+0000',
+          },
         },
       },
     } as any as FormField;
@@ -823,8 +843,10 @@ describe('hasPreviousObsValueChanged', () => {
         rendering: 'datetime',
       },
       meta: {
-        previousValue: {
-          value: '2024-04-01T19:50:00.000+0000',
+        initialValue: {
+          omrsObject: {
+            value: '2024-04-01T19:50:00.000+0000',
+          },
         },
       },
     } as any as FormField;
@@ -837,8 +859,10 @@ describe('hasPreviousObsValueChanged', () => {
         rendering: 'text',
       },
       meta: {
-        previousValue: {
-          value: 'Text value',
+        initialValue: {
+          omrsObject: {
+            value: 'Text value',
+          },
         },
       },
     } as any as FormField;
@@ -1128,10 +1152,12 @@ describe('ObsAdapter - handling nested obsGroups', () => {
 
     const healthCenterField = fields.questions[0];
     healthCenterField.meta = {
-      previousValue: {
-        uuid: 'health-center-uuid',
-        value: {
-          uuid: '1588AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      initialValue: {
+        omrsObject: {
+          uuid: 'health-center-uuid',
+          value: {
+            uuid: '1588AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+          },
         },
       },
     };
@@ -1151,9 +1177,11 @@ describe('ObsAdapter - handling nested obsGroups', () => {
 
     const commentField = fields.questions[1].questions[0];
     commentField.meta = {
-      previousValue: {
-        uuid: 'comment-uuid',
-        value: 'Test comment for nested group',
+      initialValue: {
+        omrsObject: {
+          uuid: 'comment-uuid',
+          value: 'Test comment for nested group',
+        },
       },
     };
 
@@ -1173,9 +1201,11 @@ describe('ObsAdapter - handling nested obsGroups', () => {
 
     const commentField = fields.questions[1].questions[0];
     commentField.meta = {
-      previousValue: {
-        uuid: 'comment-uuid',
-        value: 'Test comment for nested group',
+      initialValue: {
+        omrsObject: {
+          uuid: 'comment-uuid',
+          value: 'Test comment for nested group',
+        },
       },
     };
 
@@ -1188,10 +1218,12 @@ describe('ObsAdapter - handling nested obsGroups', () => {
 
     const diagnosisField = fields.questions[1].questions[1];
     diagnosisField.meta = {
-      previousValue: {
-        uuid: 'diagnosis-uuid',
-        value: {
-          uuid: '159394AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      initialValue: {
+        omrsObject: {
+          uuid: 'diagnosis-uuid',
+          value: {
+            uuid: '159394AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+          },
         },
       },
     };

package/src/adapters/obs-adapter.ts

@@ -20,7 +20,7 @@ import {
 import { type FormContextProps } from '../provider/form-provider';
 import { isEmpty } from '../validators/form-validator';
 import { getAttachmentByUuid } from '../api';
-import { formatDate, restBaseUrl } from '@openmrs/esm-framework';
+import { formatDate, type OpenmrsResource, restBaseUrl } from '@openmrs/esm-framework';
 
 // Temporarily holds observations that have already been bound with matching fields
 export let assignedObsIds: string[] = [];
@@ -63,7 +63,7 @@ export const ObsAdapter: FormFieldValueAdapter = {
     if (value instanceof Date) {
       return formatDateAsDisplayString(field, value);
     }
-    if (rendering == 'checkbox') {
+    if (rendering === 'checkbox') {
       return value.map(
         (selected) => field.questionOptions.answers?.find((option) => option.concept == selected)?.label,
       );
@@ -79,7 +79,7 @@ export const ObsAdapter: FormFieldValueAdapter = {
   transformFieldValue: (field: FormField, value: any, context: FormContextProps) => {
     // clear previous submission
     clearSubmission(field);
-    if (!field.meta.previousValue && isEmpty(value)) {
+    if (!field.meta.initialValue?.omrsObject && isEmpty(value)) {
       return null;
     }
     if (hasRendering(field, 'checkbox')) {
@@ -88,8 +88,8 @@ export const ObsAdapter: FormFieldValueAdapter = {
     if (!isEmpty(value) && hasPreviousObsValueChanged(field, value)) {
       return gracefullySetSubmission(field, editObs(field, value), undefined);
     }
-    if (field.meta.previousValue && isEmpty(value)) {
-      return gracefullySetSubmission(field, undefined, voidObs(field.meta.previousValue));
+    if (field.meta.initialValue?.omrsObject && isEmpty(value)) {
+      return gracefullySetSubmission(field, undefined, voidObs(field.meta.initialValue.omrsObject as OpenmrsObs));
     }
     if (!isEmpty(value)) {
       return gracefullySetSubmission(field, constructObs(field, value), undefined);
@@ -110,25 +110,29 @@ function extractFieldValue(field: FormField, obsList: OpenmrsObs[] = [], makeFie
   const rendering = field.questionOptions.rendering;
   if (!field.meta) {
     field.meta = {
-      previousValue: null,
+      initialValue: {
+        omrsObject: null,
+        refinedValue: null,
+      },
     };
   }
   if (obsList.length) {
     if (rendering == 'checkbox') {
       assignedObsIds.push(...obsList.map((obs) => obs.uuid));
-      field.meta.previousValue = makeFieldDirty ? obsList : null;
+      field.meta.initialValue.omrsObject = makeFieldDirty ? obsList : null;
       return obsList.map((o) => o.value.uuid);
     }
     const obs = obsList[0];
     if (makeFieldDirty) {
-      field.meta.previousValue = { ...obs };
+      field.meta.initialValue.omrsObject = { ...obs };
     }
     assignedObsIds.push(obs.uuid);
     if (typeof obs.value === 'string' || typeof obs.value === 'number') {
       if (rendering.startsWith('date')) {
         const dateObject = parseToLocalDateTime(obs.value as string);
         if (makeFieldDirty) {
-          field.meta.previousValue.value = dayjs(dateObject).format('YYYY-MM-DD HH:mm');
+          const obsObject = field.meta.initialValue.omrsObject as OpenmrsObs;
+          obsObject.value = dayjs(dateObject).format('YYYY-MM-DD HH:mm');
         }
         return dateObject;
       }
@@ -168,7 +172,7 @@ export function voidObs(obs: OpenmrsObs) {
 }
 
 export function editObs(field: FormField, newValue: any) {
-  const oldObs = field.meta.previousValue;
+  const oldObs = field.meta.initialValue?.omrsObject as OpenmrsResource;
   const formattedValue = field.questionOptions.rendering.startsWith('date')
     ? formatDateByPickerType(field, newValue)
     : newValue;
@@ -197,7 +201,7 @@ function formatDateByPickerType(field: FormField, value: Date) {
 }
 
 export function hasPreviousObsValueChanged(field: FormField, newValue: any) {
-  const previousObs = field.meta.previousValue;
+  const previousObs = field.meta.initialValue?.omrsObject as OpenmrsResource;
   if (isEmpty(previousObs)) {
     return false;
   }
@@ -221,19 +225,19 @@ function handleMultiSelect(field: FormField, values: Array<string> = []) {
   // 1. we have a previous value and an empty current value
   // 2. a mix of both (previous and current)
   // 3. we only have a current value
-
-  if (field.meta.previousValue && isEmpty(values)) {
+  const obsArray = field.meta.initialValue?.omrsObject as Array<OpenmrsResource>;
+  if (obsArray?.length && isEmpty(values)) {
     // we assume the user cleared the existing value(s)
     // so we void all previous values
     return gracefullySetSubmission(
       field,
       null,
-      field.meta.previousValue.map((previousValue) => voidObs(previousValue)),
+      obsArray.map((previousValue) => voidObs(previousValue)),
     );
   }
-  if (field.meta.previousValue && !isEmpty(values)) {
-    const toBeVoided = field.meta.previousValue.filter((obs) => !values.includes(obs.value.uuid));
-    const toBeCreated = values.filter((v) => !field.meta.previousValue.some((obs) => obs.value.uuid === v));
+  if (obsArray?.length && !isEmpty(values)) {
+    const toBeVoided = obsArray.filter((obs) => !values.includes(obs.value.uuid));
+    const toBeCreated = values.filter((v) => !obsArray.some((obs) => obs.value.uuid === v));
     return gracefullySetSubmission(
       field,
       toBeCreated.map((value) => constructObs(field, value)),

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

@@ -9,6 +9,7 @@ export const ObsCommentAdapter: FormFieldValueAdapter = {
   transformFieldValue: function (field: FormField, value: any, context: FormContextProps) {
     const targetField = context.getFormField(field.meta.targetField);
     const targetFieldCurrentValue = context.methods.getValues(targetField.id);
+    const targetFieldInitialObs = targetField.meta.initialValue?.omrsObject as OpenmrsResource;
 
     if (targetField.meta.submission?.newValue) {
       if (isEmpty(value) && !isNewSubmissionEffective(targetField, targetFieldCurrentValue)) {
@@ -17,8 +18,8 @@ export const ObsCommentAdapter: FormFieldValueAdapter = {
       } else {
         targetField.meta.submission.newValue.comment = value;
       }
-    } else if (!hasSubmission(targetField) && targetField.meta.previousValue) {
-      if (isEmpty(value) && isEmpty(targetField.meta.previousValue.comment)) {
+    } else if (!hasSubmission(targetField) && targetFieldInitialObs) {
+      if (isEmpty(value) && isEmpty(targetFieldInitialObs.comment)) {
         return null;
       }
       // generate submission
@@ -37,7 +38,7 @@ export const ObsCommentAdapter: FormFieldValueAdapter = {
     if (encounter) {
       const targetFieldId = field.id.split('_obs_comment')[0];
       const targetField = context.formFields.find((field) => field.id === targetFieldId);
-      return targetField?.meta.previousValue?.comment;
+      return (targetField?.meta.initialValue.omrsObject as OpenmrsResource)?.comment;
     }
     return null;
   },

package/src/adapters/orders-adapter.ts

@@ -10,7 +10,7 @@ const defaultCareSetting = '6f0c9a92-6f24-11e3-af88-005056821db0';
 
 export const OrdersAdapter: FormFieldValueAdapter = {
   transformFieldValue: function (field: FormField, value: any, context: FormContextProps) {
-    if (context.sessionMode == 'edit' && field.meta?.previousValue?.uuid) {
+    if (context.sessionMode == 'edit' && field.meta.initialValue?.omrsObject) {
       return editOrder(value, field, context.currentProvider.uuid);
     }
     const newValue = constructNewOrder(value, field, context.currentProvider.uuid);
@@ -27,7 +27,13 @@ export const OrdersAdapter: FormFieldValueAdapter = {
       .filter((order) => !assignedOrderIds.includes(order.uuid) && !order.voided)
       .find((order) => availableOrderables.includes(order.concept.uuid));
     if (matchedOrder) {
-      field.meta = { ...(field.meta || {}), previousValue: matchedOrder };
+      field.meta = {
+        ...(field.meta || {}),
+        initialValue: {
+          omrsObject: matchedOrder,
+          refinedValue: matchedOrder.concept.uuid,
+        },
+      };
       assignedOrderIds.push(matchedOrder.uuid);
       return matchedOrder.concept.uuid;
     }
@@ -62,12 +68,13 @@ function constructNewOrder(value: any, field: FormField, orderer: string) {
 }
 
 function editOrder(newOrder: any, field: FormField, orderer: string) {
-  if (newOrder === field.meta.previousValue?.concept?.uuid) {
+  const previousOrder = field.meta.initialValue?.omrsObject as OpenmrsResource;
+  if (newOrder === previousOrder?.concept?.uuid) {
     clearSubmission(field);
     return null;
   }
   const voided = {
-    uuid: field.meta.previousValue?.uuid,
+    uuid: previousOrder?.uuid,
     voided: true,
   };
   gracefullySetSubmission(field, constructNewOrder(newOrder, field, orderer), voided);

package/src/adapters/patient-identifier-adapter.ts

@@ -7,13 +7,13 @@ import { isEmpty } from '../validators/form-validator';
 export const PatientIdentifierAdapter: FormFieldValueAdapter = {
   transformFieldValue: function (field: FormField, value: any, context: FormContextProps) {
     clearSubmission(field);
-    if (field.meta?.previousValue?.value === value || isEmpty(value)) {
+    if (field.meta.initialValue?.refinedValue === value || isEmpty(value)) {
       return null;
     }
     field.meta.submission.newValue = {
       identifier: value,
       identifierType: field.questionOptions.identifierType,
-      uuid: field.meta.previousValue?.id,
+      uuid: (field.meta.initialValue?.omrsObject as OpenmrsResource)?.id,
       location: context.location,
     };
     return field.meta.submission.newValue;
@@ -22,7 +22,13 @@ export const PatientIdentifierAdapter: FormFieldValueAdapter = {
     const latestIdentifier = context.patient?.identifier?.find(
       (identifier) => identifier.type?.coding[0]?.code === field.questionOptions.identifierType,
     );
-    field.meta = { ...(field.meta || {}), previousValue: latestIdentifier };
+    field.meta = {
+      ...(field.meta || {}),
+      initialValue: {
+        omrsObject: latestIdentifier as any,
+        refinedValue: latestIdentifier?.value,
+      },
+    };
     return latestIdentifier?.value;
   },
   getPreviousValue: function (field: FormField, sourceObject: OpenmrsResource, context: FormProcessorContextProps) {

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

@@ -364,7 +364,7 @@ describe('ProgramStateAdapter', () => {
   });
 
   it('should return null if the new value is the same as the previous value', () => {
-    field.meta.previousValue = { uuid: '7293cb90-c93f-4386-b32f-e8cfc633dc3e' };
+    field.meta.initialValue = { omrsObject: { uuid: '7293cb90-c93f-4386-b32f-e8cfc633dc3e' } };
     const value = '7293cb90-c93f-4386-b32f-e8cfc633dc3e';
     const result = ProgramStateAdapter.transformFieldValue(field, value, formContext);
     expect(result).toBeNull();

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

@@ -8,7 +8,7 @@ import { isEmpty } from '../validators/form-validator';
 export const ProgramStateAdapter: FormFieldValueAdapter = {
   transformFieldValue: function (field: FormField, value: any, context: FormContextProps) {
     clearSubmission(field);
-    if (field.meta?.previousValue?.uuid === value || isEmpty(value)) {
+    if ((field.meta?.initialValue?.omrsObject as OpenmrsResource)?.uuid === value || isEmpty(value)) {
       return null;
     }
     field.meta.submission.newValue = {
@@ -28,7 +28,12 @@ export const ProgramStateAdapter: FormFieldValueAdapter = {
       const currentState = program.states
         .filter((state) => !state.endDate)
         .find((state) => state.state.programWorkflow?.uuid === field.questionOptions.workflowUuid)?.state;
-      field.meta = { ...(field.meta || {}), previousValue: currentState };
+      field.meta = {
+        ...(field.meta || {}),
+        initialValue: {
+          omrsObject: currentState,
+        },
+      };
       return currentState?.uuid;
     }
     return null;

package/src/components/inputs/fixed-value/fixed-value.component.tsx

@@ -7,7 +7,7 @@ const FixedValue: React.FC<FormFieldInputProps> = ({ field, setFieldValue }) =>
   const context = useFormProviderContext();
 
   useEffect(() => {
-    if (!field.meta?.previousValue && !isEmpty(field.meta.fixedValue)) {
+    if (!field.meta?.initialValue?.omrsObject && !isEmpty(field.meta.fixedValue)) {
       setFieldValue(field.meta.fixedValue);
       context.formFieldAdapters[field.type].transformFieldValue(field, field.meta.fixedValue, context);
     }

package/src/components/inputs/select/dropdown.test.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { act, fireEvent, render, screen } from '@testing-library/react';
 import Dropdown from './dropdown.component';
 import { type FormField } from '../../../types';
+import { type OpenmrsResource } from '@openmrs/esm-framework';
 
 const question: FormField = {
   label: 'Patient past program.',
@@ -87,18 +88,20 @@ describe.skip('dropdown input field', () => {
 
   it('should edit obs', async () => {
     // setup
-    question.meta.previousValue = {
-      uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
-      person: '833db896-c1f0-11eb-8529-0242ac130003',
-      obsDatetime: encounterContext.encounterDate,
-      concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
-      location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
-      order: null,
-      groupMembers: [],
-      voided: false,
-      value: '6ddd933a-e65c-4f35-8884-c555b50c55e1',
+    question.meta.initialValue = {
+      omrsObject: {
+        uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
+        person: '833db896-c1f0-11eb-8529-0242ac130003',
+        obsDatetime: encounterContext.encounterDate,
+        concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
+        location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
+        order: null,
+        groupMembers: [],
+        voided: false,
+        value: '6ddd933a-e65c-4f35-8884-c555b50c55e1',
+      },
     };
-    await renderForm({ 'patient-past-program': question.meta.previousValue.value });
+    await renderForm({ 'patient-past-program': (question.meta.initialValue.omrsObject as OpenmrsResource).value });
     const dropdownWidget = screen.getByRole('combobox', { name: /Patient past program./ });
 
     // do some edits
@@ -119,18 +122,20 @@ describe.skip('dropdown input field', () => {
 
   it('should clear selection when empty option is selected', async () => {
     // setup
-    question.meta.previousValue = {
-      uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
-      person: '833db896-c1f0-11eb-8529-0242ac130003',
-      obsDatetime: encounterContext.encounterDate,
-      concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
-      location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
-      order: null,
-      groupMembers: [],
-      voided: false,
-      value: '6ddd933a-e65c-4f35-8884-c555b50c55e1',
+    question.meta.initialValue = {
+      omrsObject: {
+        uuid: '305ed1fc-c1fd-11eb-8529-0242ac130003',
+        person: '833db896-c1f0-11eb-8529-0242ac130003',
+        obsDatetime: encounterContext.encounterDate,
+        concept: '1c43b05b-b6d8-4eb5-8f37-0b14f5347568',
+        location: { uuid: '41e6e516-c1f0-11eb-8529-0242ac130003' },
+        order: null,
+        groupMembers: [],
+        voided: false,
+        value: '6ddd933a-e65c-4f35-8884-c555b50c55e1',
+      },
     };
-    await renderForm({ 'patient-past-program': question.meta.previousValue.value });
+    await renderForm({ 'patient-past-program': (question.meta.initialValue.omrsObject as OpenmrsResource).value });
     const dropdownWidget = screen.getByRole('combobox', { name: /Patient past program./ });
 
     // select an option first

package/src/components/inputs/toggle/toggle.component.tsx

@@ -20,7 +20,7 @@ const Toggle: React.FC<FormFieldInputProps> = ({ field, value, errors, warnings,
   useEffect(() => {
     // The toggle input doesn't support blank values
     // by default, the value should be false
-    if (!field.meta?.previousValue && context.sessionMode == 'enter') {
+    if (!field.meta?.initialValue?.omrsObject && context.sessionMode == 'enter') {
       context.formFieldAdapters[field.type].transformFieldValue(field, value ?? false, context);
     }
   }, []);

package/src/components/repeat/helpers.ts

@@ -8,13 +8,21 @@ export function cloneRepeatField(srcField: FormField, value: OpenmrsResource, id
   const originalGroupMembersIds: string[] = [];
   const clonedField = cloneDeep(srcField) as FormField;
   clonedField.questionOptions.repeatOptions = { ...(clonedField.questionOptions.repeatOptions ?? {}) };
-  clonedField.meta = { repeat: { ...(clonedField.meta ?? {}), isClone: true }, previousValue: value };
+  clonedField.meta = {
+    repeat: { ...(clonedField.meta ?? {}), isClone: true },
+    initialValue: {
+      omrsObject: value,
+    },
+  };
   clonedField.id = `${clonedField.id}_${idSuffix}`;
   clonedField.questions?.forEach((childField) => {
     originalGroupMembersIds.push(childField.id);
     childField.id = `${childField.id}_${idSuffix}`;
     childField.meta.groupId = clonedField.id;
-    childField.meta.previousValue = null;
+    childField.meta.initialValue = {
+      omrsObject: null,
+      refinedValue: null,
+    };
     childField.fieldDependents = new Set();
     clearSubmission(childField);
 

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

@@ -100,7 +100,7 @@ const Repeat: React.FC<FormFieldInputProps> = ({ field }) => {
   );
 
   const removeNthRow = (field: FormField) => {
-    if (field.meta.previousValue) {
+    if (field.meta.initialValue?.omrsObject) {
       formFieldAdapters[field.type]?.transformFieldValue(field, null, context);
       field.meta.repeat = { ...(field.meta.repeat || {}), wasDeleted: true };
       if (field.type === 'obsGroup') {

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

@@ -216,10 +216,13 @@ export class EncounterFormProcessor extends FormProcessor {
     const initialValues = {};
     const repeatableFields = [];
     if (encounter) {
-      const filteredFields = formFields.filter((field) => isEmpty(field.meta?.previousValue));
       await Promise.all(
-        filteredFields.map(async (field) => {
+        formFields.map(async (field) => {
           const adapter = formFieldAdapters[field.type];
+          if (field.meta.initialValue?.omrsObject && !isEmpty(field.meta.initialValue.refinedValue)) {
+            initialValues[field.id] = field.meta.initialValue.refinedValue;
+            return;
+          }
           if (adapter) {
             if (hasRendering(field, 'repeating') && !field.meta?.repeat?.isClone) {
               repeatableFields.push(field);
@@ -227,6 +230,7 @@ export class EncounterFormProcessor extends FormProcessor {
             let value = null;
             try {
               value = await adapter.getInitialValue(field, encounter, context);
+              field.meta.initialValue.refinedValue = value;
             } catch (error) {
               console.error(error);
             }
@@ -241,7 +245,11 @@ export class EncounterFormProcessor extends FormProcessor {
               initialValues[field.id] = emptyValues[field.questionOptions.rendering] ?? '';
             }
             if (field.questionOptions.calculate?.calculateExpression) {
-              await evaluateCalculateExpression(field, initialValues, context);
+              try {
+                await evaluateCalculateExpression(field, initialValues, context);
+              } catch (error) {
+                console.error(error);
+              }
             }
           } else {
             console.warn(`No adapter found for field type ${field.type}`);

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

@@ -16,6 +16,7 @@ import { ConceptTrue } from '../../constants';
 import { DefaultValueValidator } from '../../validators/default-value-validator';
 import { cloneRepeatField } from '../../components/repeat/helpers';
 import { assignedOrderIds } from '../../adapters/orders-adapter';
+import { type OpenmrsResource } from '@openmrs/esm-framework';
 
 export function prepareEncounter(
   context: FormContextProps,
@@ -189,8 +190,10 @@ function prepareObs(obsForSubmission: OpenmrsObs[], fields: FormField[]) {
 }
 
 function processObsField(obsForSubmission: OpenmrsObs[], field: FormField) {
-  if ((field.isHidden || field.isParentHidden) && field.meta.previousValue) {
-    const valuesArray = Array.isArray(field.meta.previousValue) ? field.meta.previousValue : [field.meta.previousValue];
+  if ((field.isHidden || field.isParentHidden) && field.meta.initialValue.omrsObject) {
+    const valuesArray = Array.isArray(field.meta.initialValue.omrsObject)
+      ? field.meta.initialValue.omrsObject
+      : [field.meta.initialValue.omrsObject];
     addObsToList(
       obsForSubmission,
       valuesArray.map((obs) => voidObs(obs)),
@@ -214,8 +217,8 @@ function processObsGroup(obsForSubmission: OpenmrsObs[], groupField: FormField)
   }
 
   const obsGroup = constructObs(groupField, null);
-  if (groupField.meta.previousValue) {
-    obsGroup.uuid = groupField.meta.previousValue.uuid;
+  if (groupField.meta.initialValue?.omrsObject) {
+    obsGroup.uuid = (groupField.meta.initialValue.omrsObject as OpenmrsResource).uuid;
   }
 
   groupField.questions.forEach((nestedField) => {
@@ -261,7 +264,7 @@ function hasSubmittableObs(field: FormField) {
   if (isTransient || !['obs', 'obsGroup'].includes(type) || hasRendering(field, 'file') || field.meta.groupId) {
     return false;
   }
-  if ((field.isHidden || field.isParentHidden) && field.meta.previousValue) {
+  if ((field.isHidden || field.isParentHidden) && field.meta.initialValue?.omrsObject) {
     return true;
   }
   return !field.isHidden && !field.isParentHidden && (type === 'obsGroup' || hasSubmission(field));
@@ -288,7 +291,7 @@ export async function hydrateRepeatField(
   const unMappedGroups = encounter.obs.filter(
     (obs) =>
       obs.concept.uuid === field.questionOptions.concept &&
-      obs.uuid != field.meta.previousValue?.uuid &&
+      obs.uuid != (field.meta.initialValue?.omrsObject as OpenmrsResource)?.uuid &&
       !assignedObsIds.includes(obs.uuid),
   );
   const unMappedOrders = encounter.orders.filter((order) => {

package/src/transformers/default-schema-transformer.test.ts

@@ -35,6 +35,10 @@ const expectedTransformedSchema = {
               meta: {
                 submission: null,
                 pageId: 'page-Page1-0',
+                initialValue: {
+                  omrsObject: null,
+                  refinedValue: null,
+                },
               },
             },
             {
@@ -56,6 +60,10 @@ const expectedTransformedSchema = {
               meta: {
                 submission: null,
                 pageId: 'page-Page1-0',
+                initialValue: {
+                  omrsObject: null,
+                  refinedValue: null,
+                },
               },
             },
             {
@@ -77,6 +85,10 @@ const expectedTransformedSchema = {
               meta: {
                 submission: null,
                 pageId: 'page-Page1-0',
+                initialValue: {
+                  omrsObject: null,
+                  refinedValue: null,
+                },
               },
             },
             {
@@ -105,12 +117,20 @@ const expectedTransformedSchema = {
                   meta: {
                     submission: null,
                     pageId: 'page-Page1-0',
+                    initialValue: {
+                      omrsObject: null,
+                      refinedValue: null,
+                    },
                   },
                 },
               ],
               meta: {
                 submission: null,
                 pageId: 'page-Page1-0',
+                initialValue: {
+                  omrsObject: null,
+                  refinedValue: null,
+                },
               },
             },
             {
@@ -148,6 +168,10 @@ const expectedTransformedSchema = {
               meta: {
                 submission: null,
                 pageId: 'page-Page1-0',
+                initialValue: {
+                  omrsObject: null,
+                  refinedValue: null,
+                },
               },
             },
           ],

package/src/transformers/default-schema-transformer.ts

@@ -1,3 +1,4 @@
+import { type OpenmrsResource } from '@openmrs/esm-framework';
 import { type FormField, type FormSchema, type FormSchemaTransformer, type RenderType, type FormPage } from '../types';
 import { isTrue } from '../utils/boolean-utils';
 import { hasRendering } from '../utils/common-utils';
@@ -74,7 +75,9 @@ function handleQuestionsWithDateOptions(sectionQuestions: Array<FormField>): Arr
         hide: question.questionOptions.shownDateOptions?.hide || question.hide,
         meta: {
           targetField: question.id,
-          previousValue: question.meta?.previousValue?.obsDatetime,
+          initialValue: {
+            omrsObject: (question.meta?.initialValue?.omrsObject as OpenmrsResource)?.obsDatetime,
+          },
         },
       };
 
@@ -97,6 +100,10 @@ function sanitizeQuestion(question: FormField) {
   if (!question.meta) {
     question.meta = {
       submission: null,
+      initialValue: {
+        omrsObject: null,
+        refinedValue: null,
+      },
     };
   }
 }
@@ -257,7 +264,9 @@ function handleQuestionsWithObsComments(sectionQuestions: Array<FormField>): Arr
         hide: question.questionOptions.shownCommentOptions?.hide || question.hide,
         meta: {
           targetField: question.id,
-          previousValue: question.meta?.previousValue?.comment,
+          initialValue: {
+            omrsObject: (question.meta?.initialValue?.omrsObject as OpenmrsResource)?.comment,
+          },
         },
       };
 

package/src/types/schema.ts

@@ -113,7 +113,10 @@ export interface RepeatOptions {
 
 export interface QuestionMetaProps {
   concept?: OpenmrsResource;
-  previousValue?: any;
+  initialValue?: {
+    omrsObject: OpenmrsResource | Array<OpenmrsResource>;
+    refinedValue?: string | number | Date | Array<string | number>;
+  };
   submission?: {
     voidedValue?: any;
     newValue?: any;