@openmrs/esm-form-entry-app 11.3.1-patch.9064 → 11.3.1-patch.9310

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11596,12 +11596,12 @@
11596
11596
  ],
11597
11597
  "files": [
11598
11598
  "main.c9fedbf76d90aec0.css",
11599
- "main.856f5b85f656feee.js"
11599
+ "main.b9510820e330a0d9.js"
11600
11600
  ],
11601
11601
  "auxiliaryFiles": [
11602
- "main.856f5b85f656feee.js.map"
11602
+ "main.b9510820e330a0d9.js.map"
11603
11603
  ],
11604
- "hash": "95b522ad0d5102f5",
11604
+ "hash": "9764752f6c0a46ff",
11605
11605
  "childrenByOrder": {}
11606
11606
  },
11607
11607
  {
@@ -14976,7 +14976,7 @@
14976
14976
  "auxiliaryFiles": [
14977
14977
  "openmrs-esm-form-entry-app.js.map"
14978
14978
  ],
14979
- "hash": "07d226e265af8ee8",
14979
+ "hash": "480f6c8395e3cd8f",
14980
14980
  "childrenByOrder": {}
14981
14981
  },
14982
14982
  {
@@ -21870,7 +21870,7 @@
21870
21870
  "styles.c9fedbf76d90aec0.css"
21871
21871
  ],
21872
21872
  "auxiliaryFiles": [],
21873
- "hash": "812588357c8fcea8",
21873
+ "hash": "c3f3b21e14911dd2",
21874
21874
  "childrenByOrder": {}
21875
21875
  },
21876
21876
  {
@@ -27295,9 +27295,9 @@
27295
27295
  "initial": false,
27296
27296
  "entry": false,
27297
27297
  "recorded": false,
27298
- "size": 6078266,
27298
+ "size": 6078284,
27299
27299
  "sizes": {
27300
- "javascript": 6078266
27300
+ "javascript": 6078284
27301
27301
  },
27302
27302
  "names": [
27303
27303
  "bootstrap"
@@ -27308,12 +27308,12 @@
27308
27308
  "main"
27309
27309
  ],
27310
27310
  "files": [
27311
- "89284.43660a91d08e0b46.js"
27311
+ "89284.f08ba981e26c23d2.js"
27312
27312
  ],
27313
27313
  "auxiliaryFiles": [
27314
- "89284.43660a91d08e0b46.js.map"
27314
+ "89284.f08ba981e26c23d2.js.map"
27315
27315
  ],
27316
- "hash": "5181fc5578b4a099",
27316
+ "hash": "eafd07c13d6236d5",
27317
27317
  "childrenByOrder": {}
27318
27318
  },
27319
27319
  {
package/dist/routes.json CHANGED
@@ -1 +1 @@
1
- {"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0","o3forms":"*"},"extensions":[{"name":"form-widget","component":"formWidget","slot":"form-widget-slot","online":true,"offline":true}],"version":"11.3.1-patch.9064"}
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-patch.9310"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openmrs/esm-form-entry-app",
3
- "version": "11.3.1-patch.9064",
3
+ "version": "11.3.1-patch.9310",
4
4
  "license": "MPL-2.0",
5
5
  "description": "Angular form engine for O3",
6
6
  "browser": "dist/openmrs-esm-form-entry-app.js",
@@ -2,8 +2,9 @@ import { Injectable } from '@angular/core';
2
2
 
3
3
  import { forkJoin, Observable, of, from } from 'rxjs';
4
4
  import { catchError, map, mergeMap, switchMap } from 'rxjs/operators';
5
- import { EncounterAdapter, PersonAttribuAdapter, Form } from '@openmrs/ngx-formentry';
5
+ import { EncounterAdapter, Form, PersonAttribuAdapter } from '@openmrs/ngx-formentry';
6
6
  import { NodeBase } from '@openmrs/ngx-formentry/form-entry/form-factory/form-node';
7
+ import { Form as ReactForm } from '@openmrs/esm-patient-common-lib';
7
8
  import { EncounterResourceService } from '../openmrs-api/encounter-resource.service';
8
9
  import { PersonResourceService } from '../openmrs-api/person-resource.service';
9
10
  import { FormDataSourceService } from '../form-data-source/form-data-source.service';
@@ -103,7 +104,9 @@ export class FormSubmissionService {
103
104
  const result: FormSubmissionResult = { encounter: encounter as any };
104
105
  const syncItem: PatientFormSyncItemContent = {
105
106
  _id: syncItemIdToEdit ?? v4(),
106
- formSchemaUuid: form.schema.uuid,
107
+ form: {
108
+ uuid: form.schema.uuid,
109
+ } as ReactForm,
107
110
  encounter,
108
111
  _payloads: {
109
112
  encounterCreate,
@@ -1,5 +1,6 @@
1
1
  import { getFullSynchronizationItems, queueSynchronizationItem, SyncItem } from '@openmrs/esm-framework';
2
2
  import { Encounter, EncounterCreate, PersonUpdate } from '../types';
3
+ import { type Form } from '@openmrs/esm-patient-common-lib';
3
4
 
4
5
  // General note:
5
6
  // 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';
10
11
 
11
12
  export interface PatientFormSyncItemContent {
12
13
  _id: string;
13
- formSchemaUuid: string;
14
+ form: Form;
14
15
  encounter: Partial<Encounter>;
15
16
  _payloads: {
16
17
  encounterCreate?: EncounterCreate;
package/src/routes.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "$schema": "https://json.openmrs.org/routes.schema.json",
3
3
  "backendDependencies": {
4
- "webservices.rest": "^2.24.0",
4
+ "webservices.rest": ">=2.2.0",
5
5
  "o3forms": "*"
6
6
  },
7
7
  "extensions": [