@openmrs/esm-patient-registration-app 8.5.1-pre.6282 → 8.5.1-pre.6289

package/dist/openmrs-esm-patient-registration-app.js.buildmanifest.json

@@ -521,9 +521,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 145819,
+      "size": 145744,
       "sizes": {
-        "javascript": 145819
+        "javascript": 145744
       },
       "names": [],
       "idHints": [],
@@ -536,7 +536,7 @@
       "auxiliaryFiles": [
         "3474.js.map"
       ],
-      "hash": "9ae0e5005593a284",
+      "hash": "1ad8b2da2a5465cd",
       "childrenByOrder": {}
     },
     {
@@ -1365,10 +1365,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 2370328,
+      "size": 2370253,
       "sizes": {
         "consume-shared": 168,
-        "javascript": 2347750,
+        "javascript": 2347675,
         "share-init": 336,
         "runtime": 22074
       },
@@ -1385,7 +1385,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "8d83ee270f21fef0",
+      "hash": "f78fd60f1e8e8143",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0"},"pages":[{"component":"root","route":"patient-registration","online":true,"offline":true},{"component":"editPatient","routeRegex":"patient\\/([a-zA-Z0-9\\-]+)\\/edit","online":true,"offline":true}],"extensions":[{"component":"addPatientLink","name":"add-patient-action","slot":"top-nav-actions-slot","online":true,"offline":true,"order":30},{"component":"patientPhotoExtension","name":"patient-photo-widget","slot":"patient-photo-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-actions-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-search-actions-slot","online":true,"offline":true}],"modals":[{"name":"cancel-patient-edit-modal","component":"cancelPatientEditModal"},{"name":"delete-identifier-confirmation-modal","component":"deleteIdentifierConfirmationModal"}],"version":"8.5.1-pre.6282"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0"},"pages":[{"component":"root","route":"patient-registration","online":true,"offline":true},{"component":"editPatient","routeRegex":"patient\\/([a-zA-Z0-9\\-]+)\\/edit","online":true,"offline":true}],"extensions":[{"component":"addPatientLink","name":"add-patient-action","slot":"top-nav-actions-slot","online":true,"offline":true,"order":30},{"component":"patientPhotoExtension","name":"patient-photo-widget","slot":"patient-photo-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-actions-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-search-actions-slot","online":true,"offline":true}],"modals":[{"name":"cancel-patient-edit-modal","component":"cancelPatientEditModal"},{"name":"delete-identifier-confirmation-modal","component":"deleteIdentifierConfirmationModal"}],"version":"8.5.1-pre.6289"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-registration-app",
-  "version": "8.5.1-pre.6282",
+  "version": "8.5.1-pre.6289",
   "description": "Patient registration microfrontend for O3",
   "browser": "dist/openmrs-esm-patient-registration-app.js",
   "main": "src/index.ts",

package/src/config-schema.ts

@@ -124,6 +124,7 @@ export const esmPatientRegistrationSchema = {
   },
   sectionDefinitions: {
     _type: Type.Array,
+    _default: [],
     _elements: {
       id: {
         _type: Type.String,
@@ -141,13 +142,17 @@ export const esmPatientRegistrationSchema = {
         _description: `The parts to include in the section. Can be any of the following built-in fields: ${builtInFields.join(
           ', ',
         )}. Can also be an id from an object in the \`fieldDefinitions\` array, which you can use to define custom fields.`,
-        _elements: { _type: Type.String },
+        _elements: {
+          _type: Type.String,
+        },
       },
     },
-    _default: [],
   },
   fieldDefinitions: {
     _type: Type.Array,
+    _default: [],
+    _description:
+      'Definitions for custom fields that can be used in sectionDefinitions. Can also be used to override built-in fields.',
     _elements: {
       id: {
         _type: Type.String,
@@ -165,12 +170,12 @@ export const esmPatientRegistrationSchema = {
       },
       showHeading: {
         _type: Type.Boolean,
-        _description: 'Whether to show a heading above the person attribute field.',
         _default: false,
+        _description: 'Whether to show a heading above the person attribute field.',
       },
       label: {
         _type: Type.String,
-        _default: null,
+        _default: '',
         _description: 'The label of the input. By default, uses the metadata `display` attribute.',
       },
       placeholder: {
@@ -189,27 +194,33 @@ export const esmPatientRegistrationSchema = {
         _description: 'Indicates whether the date input field should allow the selection of past dates or not.',
       },
       validation: {
-        required: { _type: Type.Boolean, _default: false },
+        required: {
+          _type: Type.Boolean,
+          _default: false,
+        },
         matches: {
           _type: Type.String,
-          _default: null,
+          _default: '',
           _description: 'Optional RegEx for testing the validity of the input.',
         },
       },
       locationTag: {
         _type: Type.String,
-        _default: null,
+        _default: '',
         _description:
           'Only for fields with "person attribute" type `org.openmrs.Location`. This filters the list of location options in the dropdown based on their location tag. By default, all locations are shown.',
       },
       answerConceptSetUuid: {
         _type: Type.ConceptUuid,
-        _default: null,
+        _default: '',
         _description:
           'For coded questions only. A concept which has the possible responses either as answers or as set members.',
       },
       customConceptAnswers: {
         _type: Type.Array,
+        _default: [],
+        _description:
+          'For coded questions only (obs or person attrbute). A list of custom concept answers. Overrides answers that come from the obs concept or from `answerSetConceptUuid`.',
         _elements: {
           uuid: {
             _type: Type.UUID,
@@ -217,31 +228,31 @@ export const esmPatientRegistrationSchema = {
           },
           label: {
             _type: Type.String,
-            _default: null,
+            _default: '',
             _description: 'The custom label for the answer concept.',
           },
         },
-        _default: [],
-        _description:
-          'For coded questions only (obs or person attrbute). A list of custom concept answers. Overrides answers that come from the obs concept or from `answerSetConceptUuid`.',
       },
     },
     // Do not add fields here. If you want to add a field in code, add it to built-in fields above.
-    _default: [],
-    _description:
-      'Definitions for custom fields that can be used in sectionDefinitions. Can also be used to override built-in fields.',
   },
   fieldConfigurations: {
     causeOfDeath: {
       conceptUuid: {
         _type: Type.ConceptUuid,
-        _description: 'The concept UUID to get cause of death answers',
         _default: '9272a14b-7260-4353-9e5b-5787b5dead9d',
+        _description: 'The concept UUID to get cause of death answers',
+      },
+      required: {
+        _type: Type.Boolean,
+        _default: false,
       },
-      required: { _type: Type.Boolean, _default: false },
     },
     name: {
-      displayMiddleName: { _type: Type.Boolean, _default: true },
+      displayMiddleName: {
+        _type: Type.Boolean,
+        _default: true,
+      },
       allowUnidentifiedPatients: {
         _type: Type.Boolean,
         _default: true,
@@ -270,20 +281,6 @@ export const esmPatientRegistrationSchema = {
     },
     gender: {
       _type: Type.Array,
-      _elements: {
-        value: {
-          _type: Type.String,
-          _description:
-            'Value that will be sent to the server. Limited to FHIR-supported values for Administrative Gender',
-          _validators: [validators.oneOf(['male', 'female', 'other', 'unknown'])],
-        },
-        label: {
-          _type: Type.String,
-          _default: null,
-          _description:
-            'The label displayed for the sex option, if it should be different from the value (the value will be translated; the English "translation" is upper-case).',
-        },
-      },
       _default: [
         {
           value: 'male',
@@ -300,54 +297,66 @@ export const esmPatientRegistrationSchema = {
       ],
       _description:
         'The options for sex selection during patient registration. This is Administrative Gender as it is called by FHIR (Possible options are limited to those defined in FHIR Administrative Gender, see https://hl7.org/fhir/R4/valueset-administrative-gender.html).',
+      _elements: {
+        value: {
+          _type: Type.String,
+          _description:
+            'Value that will be sent to the server. Limited to FHIR-supported values for Administrative Gender',
+          _validators: [validators.oneOf(['male', 'female', 'other', 'unknown'])],
+        },
+        label: {
+          _type: Type.String,
+          _default: '',
+          _description:
+            'The label displayed for the sex option, if it should be different from the value (the value will be translated; the English "translation" is upper-case).',
+        },
+      },
     },
     address: {
       useAddressHierarchy: {
         enabled: {
           _type: Type.Boolean,
-          _description: 'Whether to use the Address hierarchy in the registration form or not',
           _default: true,
+          _description: 'Whether to use the Address hierarchy in the registration form or not',
         },
         useQuickSearch: {
           _type: Type.Boolean,
+          _default: true,
           _description:
             'Whether to use the quick searching through the address saved in the database pre-fill the form.',
-          _default: true,
         },
         searchAddressByLevel: {
           _type: Type.Boolean,
+          _default: false,
           _description:
             "Whether to fill the addresses by levels, i.e. County => subCounty, the current field is dependent on it's previous field.",
-          _default: false,
-        },
-        useAddressHierarchyLabel: {
-          _type: Type.Object,
-          _description: 'Whether to use custom labels for address hierarchy',
-          _default: {},
         },
       },
     },
     dateOfBirth: {
       allowEstimatedDateOfBirth: {
         _type: Type.Boolean,
-        _description: 'Whether to allow estimated date of birth for a patient during registration',
         _default: true,
+        _description: 'Whether to allow estimated date of birth for a patient during registration',
       },
       useEstimatedDateOfBirth: {
         enabled: {
           _type: Type.Boolean,
-          _description: 'Whether to use a fixed day and month for estimated date of birth',
           _default: false,
+          _description: 'Whether to use a fixed day and month for estimated date of birth',
         },
         dayOfMonth: {
           _type: Type.Number,
-          _description: 'The custom day of the month use on the estimated date of birth',
           _default: 0,
+          _description:
+            'The custom day of the month use on the estimated date of birth  (0 = last day of previous month, 1-31 = specific day)',
+          _validators: [validators.inRange(0, 31)],
         },
         month: {
           _type: Type.Number,
-          _description: 'The custom month to use on the estimated date of birth i.e 0 = Jan & 11 = Dec',
           _default: 0,
+          _description: 'The custom month to use on the estimated date of birth i.e 0 = Jan & 11 = Dec',
+          _validators: [validators.inRange(0, 11)],
         },
       },
     },
@@ -358,10 +367,13 @@ export const esmPatientRegistrationSchema = {
         _description: 'The UUID of the phone number person attribute type',
       },
       validation: {
-        required: { _type: Type.Boolean, _default: false },
+        required: {
+          _type: Type.Boolean,
+          _default: false,
+        },
         matches: {
           _type: Type.String,
-          _default: null,
+          _default: '',
           _description: 'Optional RegEx for testing the validity of the input.',
         },
       },
@@ -376,15 +388,15 @@ export const esmPatientRegistrationSchema = {
   },
   defaultPatientIdentifierTypes: {
     _type: Type.Array,
+    _default: [],
     _elements: {
       _type: Type.PatientIdentifierTypeUuid,
     },
-    _default: [],
   },
   registrationObs: {
     encounterTypeUuid: {
       _type: Type.UUID,
-      _default: null,
+      _default: '',
       _description:
         'Obs created during registration will be associated with an encounter of this type. This must be set in order to use fields of type `obs`.',
     },
@@ -395,14 +407,14 @@ export const esmPatientRegistrationSchema = {
     },
     registrationFormUuid: {
       _type: Type.UUID,
-      _default: null,
+      _default: '',
       _description:
         'The form UUID to associate with the registration encounter. By default no form will be associated.',
     },
   },
   freeTextFieldConceptUuid: {
-    _default: '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
     _type: Type.ConceptUuid,
+    _default: '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
   },
   _validators: [
     validator(

package/src/patient-registration/patient-registration.test.tsx

@@ -133,7 +133,7 @@ const mockOpenmrsConfig: RegistrationConfig = {
       allowEstimatedDateOfBirth: true,
       useEstimatedDateOfBirth: {
         enabled: true,
-        dayOfMonth: new Date().getDay(),
+        dayOfMonth: new Date().getDate(),
         month: new Date().getMonth(),
       },
     },
@@ -397,8 +397,8 @@ describe('Registering a new patient', () => {
     expect(mockSavePatient).toHaveBeenCalledTimes(1);
     expect(mockSaveEncounter).toHaveBeenCalledTimes(1);
 
-    expect(mockShowSnackbar).toHaveBeenCalledWith(expect.objectContaining({ subtitle: 'an error message' })),
-      mockSaveEncounter.mockResolvedValue({} as FetchResponse);
+    (expect(mockShowSnackbar).toHaveBeenCalledWith(expect.objectContaining({ subtitle: 'an error message' })),
+      mockSaveEncounter.mockResolvedValue({} as FetchResponse));
 
     await user.click(registerPatientButton);
     expect(mockSavePatient).toHaveBeenCalledTimes(2);