@openmrs/esm-form-entry-app 11.3.1-pre.9447 → 11.3.1-pre.9455

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

@@ -11644,12 +11644,12 @@
       ],
       "files": [
         "main.c9fedbf76d90aec0.css",
-        "main.1ca4a8aa21a572c4.js"
+        "main.9596a352a1ad2dbd.js"
       ],
       "auxiliaryFiles": [
-        "main.1ca4a8aa21a572c4.js.map"
+        "main.9596a352a1ad2dbd.js.map"
       ],
-      "hash": "e3701605579a197f",
+      "hash": "9a04fd1d22c1ebd8",
       "childrenByOrder": {}
     },
     {
@@ -15024,7 +15024,7 @@
       "auxiliaryFiles": [
         "openmrs-esm-form-entry-app.js.map"
       ],
-      "hash": "4765b1a2e7a95bf2",
+      "hash": "a955c0e89b288622",
       "childrenByOrder": {}
     },
     {
@@ -27367,9 +27367,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 6078266,
+      "size": 6078284,
       "sizes": {
-        "javascript": 6078266
+        "javascript": 6078284
       },
       "names": [
         "bootstrap"
@@ -27380,12 +27380,12 @@
         "main"
       ],
       "files": [
-        "89284.c0acd2b835eddca3.js"
+        "89284.d15c283f899702d9.js"
       ],
       "auxiliaryFiles": [
-        "89284.c0acd2b835eddca3.js.map"
+        "89284.d15c283f899702d9.js.map"
       ],
-      "hash": "07660ed420dae2fe",
+      "hash": "f5687c0b08d45774",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0","o3forms":"*"},"extensions":[{"name":"form-widget","component":"formWidget","slot":"form-widget-slot","online":true,"offline":true}],"version":"11.3.1-pre.9447"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0","o3forms":"*"},"extensions":[{"name":"form-widget","component":"formWidget","slot":"form-widget-slot","online":true,"offline":true}],"version":"11.3.1-pre.9455"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-entry-app",
-  "version": "11.3.1-pre.9447",
+  "version": "11.3.1-pre.9455",
   "license": "MPL-2.0",
   "description": "Angular form engine for O3",
   "browser": "dist/openmrs-esm-form-entry-app.js",

package/src/app/form-submission/form-submission.service.ts

@@ -2,8 +2,9 @@ import { Injectable } from '@angular/core';
 
 import { forkJoin, Observable, of, from } from 'rxjs';
 import { catchError, map, mergeMap, switchMap } from 'rxjs/operators';
-import { EncounterAdapter, PersonAttribuAdapter, Form } from '@openmrs/ngx-formentry';
+import { EncounterAdapter, Form, PersonAttribuAdapter } from '@openmrs/ngx-formentry';
 import { NodeBase } from '@openmrs/ngx-formentry/form-entry/form-factory/form-node';
+import { Form as ReactForm } from '@openmrs/esm-patient-common-lib';
 import { EncounterResourceService } from '../openmrs-api/encounter-resource.service';
 import { PersonResourceService } from '../openmrs-api/person-resource.service';
 import { FormDataSourceService } from '../form-data-source/form-data-source.service';
@@ -103,7 +104,9 @@ export class FormSubmissionService {
     const result: FormSubmissionResult = { encounter: encounter as any };
     const syncItem: PatientFormSyncItemContent = {
       _id: syncItemIdToEdit ?? v4(),
-      formSchemaUuid: form.schema.uuid,
+      form: {
+        uuid: form.schema.uuid,
+      } as ReactForm,
       encounter,
       _payloads: {
         encounterCreate,

package/src/app/offline/sync.ts

@@ -1,5 +1,6 @@
 import { getFullSynchronizationItems, queueSynchronizationItem, SyncItem } from '@openmrs/esm-framework';
 import { Encounter, EncounterCreate, PersonUpdate } from '../types';
+import { type Form } from '@openmrs/esm-patient-common-lib';
 
 // General note:
 // The synchronization handler which actually synchronizes the queued items has been moved to `esm-patient-forms-app`.
@@ -10,7 +11,7 @@ export const patientFormSyncItem = 'patient-form';
 
 export interface PatientFormSyncItemContent {
   _id: string;
-  formSchemaUuid: string;
+  form: Form;
   encounter: Partial<Encounter>;
   _payloads: {
     encounterCreate?: EncounterCreate;