@openmrs/esm-form-engine-lib 4.2.1-pre.2438 → 4.2.1-pre.2441

package/dist/processors/encounter/encounter-processor-helper.js

@@ -32,7 +32,9 @@ export function prepareEncounter(context, encounterDate, encounterRole, encounte
             ];
         }
         // TODO: Question: Should we be editing the location, form and visit here?
-        encounterForSubmission.encounterDatetime = encounterDate;
+        if (encounterDate) {
+            encounterForSubmission.encounterDatetime = encounterDate;
+        }
         encounterForSubmission.location = location;
         encounterForSubmission.form = {
             uuid: formJson.uuid
@@ -46,7 +48,6 @@ export function prepareEncounter(context, encounterDate, encounterRole, encounte
     } else {
         encounterForSubmission = {
             patient: patient.id,
-            encounterDatetime: encounterDate,
             location: location,
             encounterType: formJson.encounterType,
             encounterProviders: [
@@ -63,6 +64,9 @@ export function prepareEncounter(context, encounterDate, encounterRole, encounte
             orders: ordersForSubmission,
             diagnoses: diagnosesForSubmission
         };
+        if (encounterDate) {
+            encounterForSubmission.encounterDatetime = encounterDate;
+        }
     }
     return encounterForSubmission;
 }
@@ -134,20 +138,22 @@ export function saveAttachments(fields, encounter, abortController) {
     return Promise.all(allPromises);
 }
 export function getMutableSessionProps(context) {
-    const { formFields, location, currentProvider, customDependencies, sessionDate, domainObjectValue: encounter } = context;
+    const { formFields, location, currentProvider, customDependencies, sessionDate, domainObjectValue: encounter, visit } = context;
     const { defaultEncounterRole } = customDependencies;
     const encounterRole = formFields.find((field)=>field.type === 'encounterRole')?.meta.submission?.newValue || defaultEncounterRole?.uuid;
     const encounterProvider = formFields.find((field)=>field.type === 'encounterProvider')?.meta.submission?.newValue || currentProvider.uuid;
     const explicitEncounterDate = formFields.find((field)=>field.type === 'encounterDatetime')?.meta.submission?.newValue;
-    // Always submit an explicit datetime for new encounters; if it is omitted, the backend
-    // defaults it to "now", which fails validation when saving into a past (stopped) visit.
-    // `sessionDate` is already constrained to the visit window.
-    const encounterDate = explicitEncounterDate ?? (encounter?.encounterDatetime ? new Date(encounter.encounterDatetime) : sessionDate);
+    // Stopped visits need an explicit datetime because the backend defaults omitted
+    // encounter datetimes to server "now", which can be outside the visit window.
+    // Active visits should use the backend default so client clock skew does not
+    // submit future encounter datetimes.
+    const defaultEncounterDate = visit?.stopDatetime ? sessionDate : undefined;
+    const encounterDate = explicitEncounterDate ?? (encounter?.encounterDatetime ? new Date(encounter.encounterDatetime) : defaultEncounterDate);
     const encounterLocation = formFields.find((field)=>field.type === 'encounterLocation')?.meta.submission?.newValue || encounter?.location?.uuid || location.uuid;
     return {
         encounterRole: encounterRole,
         encounterProvider: encounterProvider,
-        encounterDate: encounterDate,
+        encounterDate,
         encounterLocation: encounterLocation
     };
 }

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

@@ -1,6 +1,12 @@
 import { type FormField, type FormProcessorContextProps, type OpenmrsEncounter, type PatientIdentifier, type PatientProgram, type PatientProgramPayload, type PersonAttribute } from '../../types';
 import { type FormContextProps } from '../../provider/form-provider';
-export declare function prepareEncounter(context: FormContextProps, encounterDate: Date, encounterRole: string, encounterProvider: string, location: string): OpenmrsEncounter;
+type MutableSessionProps = {
+    encounterRole: string;
+    encounterProvider: string;
+    encounterDate?: Date;
+    encounterLocation: string;
+};
+export declare function prepareEncounter(context: FormContextProps, encounterDate: Date | undefined, encounterRole: string, encounterProvider: string, location: string): OpenmrsEncounter;
 export declare function preparePatientIdentifiers(fields: FormField[], encounterLocation: string): PatientIdentifier[];
 export declare function savePatientIdentifiers(patient: fhir.Patient, identifiers: PatientIdentifier[]): Promise<import("@openmrs/esm-api").FetchResponse<any>>[];
 export declare function preparePersonAttributes(fields: FormField[]): PersonAttribute[];
@@ -8,12 +14,8 @@ export declare function savePersonAttributes(patient: fhir.Patient, attributes:
 export declare function preparePatientPrograms(fields: FormField[], patient: fhir.Patient, currentPatientPrograms: Array<PatientProgram>): Array<PatientProgramPayload>;
 export declare function savePatientPrograms(patientPrograms: PatientProgramPayload[]): Promise<import("@openmrs/esm-api").FetchResponse<any>[]>;
 export declare function saveAttachments(fields: FormField[], encounter: OpenmrsEncounter, abortController: AbortController): any[] | Promise<import("@openmrs/esm-api").FetchResponse<any>[]>;
-export declare function getMutableSessionProps(context: FormContextProps): {
-    encounterRole: string;
-    encounterProvider: string;
-    encounterDate: Date;
-    encounterLocation: string;
-};
+export declare function getMutableSessionProps(context: FormContextProps): MutableSessionProps;
 export declare function inferInitialValueFromDefaultFieldValue(field: FormField): any;
 export declare function hydrateRepeatField(field: FormField, encounter: OpenmrsEncounter, initialValues: Record<string, any>, context: FormProcessorContextProps): Promise<FormField[]>;
+export {};
 //# sourceMappingURL=encounter-processor-helper.d.ts.map

package/dist/src/processors/encounter/encounter-processor-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encounter-processor-helper.d.ts","sourceRoot":"","sources":["../../../../src/processors/encounter/encounter-processor-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AAKrB,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQrE,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,MAAM,oBA6DjB;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,iBAAiB,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAI7G;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,4DAI7F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,EAAE,CAI9E;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,4DAIxF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,EAAE,EACnB,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,sBAAsB,EAAE,KAAK,CAAC,cAAc,CAAC,GAC5C,KAAK,CAAC,qBAAqB,CAAC,CA+B9B;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,qBAAqB,EAAE,4DAG3E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,oEAcjH;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB;mBA0B5B,MAAM;uBACE,MAAM;mBACd,IAAI;uBACI,MAAM;EAEjD;AA4FD,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,SAAS,OAetE;AAED,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAClC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,SAAS,EAAE,CAAC,CAwEtB"}
+{"version":3,"file":"encounter-processor-helper.d.ts","sourceRoot":"","sources":["../../../../src/processors/encounter/encounter-processor-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AAKrB,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQrE,KAAK,mBAAmB,GAAG;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,IAAI,GAAG,SAAS,EAC/B,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,MAAM,oBAiEjB;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,iBAAiB,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAI7G;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,4DAI7F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,EAAE,CAI9E;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,4DAIxF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,EAAE,EACnB,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,sBAAsB,EAAE,KAAK,CAAC,cAAc,CAAC,GAC5C,KAAK,CAAC,qBAAqB,CAAC,CA+B9B;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,qBAAqB,EAAE,4DAG3E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,oEAcjH;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,mBAAmB,CAmCrF;AA4FD,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,SAAS,OAetE;AAED,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAClC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,SAAS,EAAE,CAAC,CAwEtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "4.2.1-pre.2438",
+  "version": "4.2.1-pre.2441",
   "description": "React Form Engine for O3",
   "main": "dist/index.js",
   "module": "dist/index.js",

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

@@ -21,9 +21,16 @@ import { assignedOrderIds } from '../../adapters/orders-adapter';
 import { type OpenmrsResource } from '@openmrs/esm-framework';
 import { assignedDiagnosesIds } from '../../adapters/encounter-diagnosis-adapter';
 
+type MutableSessionProps = {
+  encounterRole: string;
+  encounterProvider: string;
+  encounterDate?: Date;
+  encounterLocation: string;
+};
+
 export function prepareEncounter(
   context: FormContextProps,
-  encounterDate: Date,
+  encounterDate: Date | undefined,
   encounterRole: string,
   encounterProvider: string,
   location: string,
@@ -54,7 +61,9 @@ export function prepareEncounter(
       ];
     }
     // TODO: Question: Should we be editing the location, form and visit here?
-    encounterForSubmission.encounterDatetime = encounterDate;
+    if (encounterDate) {
+      encounterForSubmission.encounterDatetime = encounterDate;
+    }
     encounterForSubmission.location = location;
     encounterForSubmission.form = {
       uuid: formJson.uuid,
@@ -68,7 +77,6 @@ export function prepareEncounter(
   } else {
     encounterForSubmission = {
       patient: patient.id,
-      encounterDatetime: encounterDate,
       location: location,
       encounterType: formJson.encounterType,
       encounterProviders: [
@@ -85,6 +93,9 @@ export function prepareEncounter(
       orders: ordersForSubmission,
       diagnoses: diagnosesForSubmission,
     };
+    if (encounterDate) {
+      encounterForSubmission.encounterDatetime = encounterDate;
+    }
   }
   return encounterForSubmission;
 }
@@ -171,7 +182,7 @@ export function saveAttachments(fields: FormField[], encounter: OpenmrsEncounter
   return Promise.all(allPromises);
 }
 
-export function getMutableSessionProps(context: FormContextProps) {
+export function getMutableSessionProps(context: FormContextProps): MutableSessionProps {
   const {
     formFields,
     location,
@@ -179,6 +190,7 @@ export function getMutableSessionProps(context: FormContextProps) {
     customDependencies,
     sessionDate,
     domainObjectValue: encounter,
+    visit,
   } = context;
   const { defaultEncounterRole } = customDependencies;
   const encounterRole =
@@ -186,12 +198,15 @@ export function getMutableSessionProps(context: FormContextProps) {
   const encounterProvider =
     formFields.find((field) => field.type === 'encounterProvider')?.meta.submission?.newValue || currentProvider.uuid;
   const explicitEncounterDate = formFields.find((field) => field.type === 'encounterDatetime')?.meta.submission
-    ?.newValue;
-  // Always submit an explicit datetime for new encounters; if it is omitted, the backend
-  // defaults it to "now", which fails validation when saving into a past (stopped) visit.
-  // `sessionDate` is already constrained to the visit window.
+    ?.newValue as Date | undefined;
+  // Stopped visits need an explicit datetime because the backend defaults omitted
+  // encounter datetimes to server "now", which can be outside the visit window.
+  // Active visits should use the backend default so client clock skew does not
+  // submit future encounter datetimes.
+  const defaultEncounterDate = visit?.stopDatetime ? sessionDate : undefined;
   const encounterDate =
-    explicitEncounterDate ?? (encounter?.encounterDatetime ? new Date(encounter.encounterDatetime) : sessionDate);
+    explicitEncounterDate ??
+    (encounter?.encounterDatetime ? new Date(encounter.encounterDatetime) : defaultEncounterDate);
   const encounterLocation =
     formFields.find((field) => field.type === 'encounterLocation')?.meta.submission?.newValue ||
     encounter?.location?.uuid ||
@@ -199,7 +214,7 @@ export function getMutableSessionProps(context: FormContextProps) {
   return {
     encounterRole: encounterRole as string,
     encounterProvider: encounterProvider as string,
-    encounterDate: encounterDate as Date,
+    encounterDate,
     encounterLocation: encounterLocation as string,
   };
 }