@kenyaemr/esm-patient-registration-app 8.0.1-pre.103 → 8.0.1-pre.107

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},{"component":"cancelPatientEditModal","name":"cancel-patient-edit-modal","online":true,"offline":true},{"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},{"component":"deleteIdentifierConfirmationModal","name":"delete-identifier-confirmation-modal","online":true,"offline":true},{"component":"emptyClientRegistryModal","name":"empty-client-registry-modal","online":true,"offline":true},{"component":"confirmClientRegistryModal","name":"confirm-client-registry-modal","online":true,"offline":true}],"modals":[{"component":"hieConfirmationModal","name":"hie-confirmation-modal"}],"version":"8.0.1-pre.103"}
+{"$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},{"component":"cancelPatientEditModal","name":"cancel-patient-edit-modal","online":true,"offline":true},{"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},{"component":"deleteIdentifierConfirmationModal","name":"delete-identifier-confirmation-modal","online":true,"offline":true},{"component":"emptyClientRegistryModal","name":"empty-client-registry-modal","online":true,"offline":true},{"component":"confirmClientRegistryModal","name":"confirm-client-registry-modal","online":true,"offline":true}],"modals":[{"component":"hieConfirmationModal","name":"hie-confirmation-modal"}],"version":"8.0.1-pre.107"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-patient-registration-app",
-  "version": "8.0.1-pre.103",
+  "version": "8.0.1-pre.107",
   "description": "Patient registration microfrontend for the OpenMRS SPA",
   "browser": "dist/kenyaemr-esm-patient-registration-app.js",
   "main": "src/index.ts",

package/src/client-registry/hie-client-registry/hie-resource.ts

@@ -1,8 +1,9 @@
 import { add, capitalize } from 'lodash-es';
 import { type PatientIdentifierValue, type FormValues } from '../../patient-registration/patient-registration.types';
-import { APIClientConfig, type MapperConfig, type HIEPatient, type ErrorResponse } from './hie-types';
+import { type MapperConfig, type HIEPatient, type ErrorResponse } from './hie-types';
 import { getConfig } from '@openmrs/esm-framework';
 import { type RegistrationConfig } from '../../config-schema';
+import { v4 } from 'uuid';
 /**
  * Represents a client for interacting with a Health Information Exchange (HIE) resource.
  * @template T - The type of the resource being fetched.
@@ -59,13 +60,18 @@ class PatientMapper extends Mapper<HIEPatient, FormValues> {
       address: extensionAddressEntries,
       identifiers: updatedIdentifiers,
       attributes: telecomAttributes,
+      relationships: [],
+      patientUuid: v4(),
     } as FormValues;
   }
 
   private mapTelecomToAttributes(telecom: Array<fhir.ContactPoint>): Record<string, string> {
     return telecom.reduce<Record<string, string>>((acc, { system, value }) => {
       if (system && value && this.config.teleComMap[system]) {
-        acc[this.config.teleComMap[system]] = value.replace(/^254/, '0');
+        const filteredValue = value.replace(/^254/, '0');
+        if (filteredValue) {
+          acc[this.config.teleComMap[system]] = filteredValue;
+        }
       }
       return acc;
     }, {});
@@ -95,17 +101,27 @@ class PatientMapper extends Mapper<HIEPatient, FormValues> {
       }
     });
 
+    // Filter out undefined keys and values
+    Object.keys(updatedIdentifiers).forEach((key) => {
+      if (updatedIdentifiers[key] === undefined || updatedIdentifiers[key].identifierValue === undefined) {
+        delete updatedIdentifiers[key];
+      }
+    });
+
     return updatedIdentifiers;
   }
 
   private mapExtensionsToAddress(extensions: HIEPatient['extension']): Record<string, string> {
-    return extensions
-      .map((ext) => {
-        const identifierType = ext.url.split('/').pop();
-        const identifierValue = ext.valueString;
-        return { [this.config.addressHierarchyMap[identifierType]]: capitalize(identifierValue) };
-      })
-      .reduce<Record<string, string>>((acc, curr) => ({ ...acc, ...curr }), {});
+    return extensions.reduce<Record<string, string>>((acc, ext) => {
+      const identifierType = ext.url.split('/').pop();
+      const mappedKey = this.config.addressHierarchyMap[identifierType];
+
+      if (mappedKey && ext.valueString) {
+        acc[mappedKey] = capitalize(ext.valueString);
+      }
+
+      return acc;
+    }, {});
   }
 }
 

package/src/client-registry/hie-client-registry/modal/confirm-hie.modal.tsx

@@ -44,16 +44,16 @@ const HIEConfirmationModal: React.FC<HIEConfirmationModalProps> = ({ closeModal,
             state={{ patientName: `${firstName} ${lastName}` }}
           />
           <div style={{ width: '100%', marginLeft: '0.625rem' }}>
-            <PatientInfo label={t('healthID', 'HealthID')} value={patient.id} />
+            <PatientInfo label={t('healthID', 'HealthID')} value={patient?.id} />
             <PatientInfo label={t('patientName', 'Patient name')} value={`${firstName} ${lastName}`} />
             <PatientInfo label={t('age', 'Age')} value={age(patient?.birthDate)} />
             <PatientInfo label={t('dateOfBirth', 'Date of birth')} value={formatDate(new Date(patient?.birthDate))} />
             <PatientInfo label={t('gender', 'Gender')} value={capitalize(patient?.gender)} />
             <PatientInfo
               label={t('maritalStatus', 'Marital status')}
-              value={patient.maritalStatus.coding.map((m) => m.code).join('')}
+              value={patient?.maritalStatus?.coding?.map((m) => m.code).join('')}
             />
-            <PatientInfo label={t('relationships', 'Relationships')} value="--" />
+            <PatientInfo label={t('dependents', 'Dependents')} value="--" />
           </div>
         </div>
         <div>

package/translations/en.json

@@ -33,6 +33,7 @@
   "deleteIdentifierTooltip": "Delete",
   "deleteRelationshipTooltipText": "Delete",
   "demographicsSection": "Basic Info",
+  "dependents": "Dependents",
   "discard": "Discard",
   "discardModalBody": "The changes you made to this patient's details have not been saved. Discard changes?",
   "discardModalHeader": "Confirm Discard Changes",
@@ -95,7 +96,6 @@
   "relationshipPersonMustExist": "Related person must be an existing person",
   "relationshipPlaceholder": "Relationship",
   "relationshipRemovedText": "Relationship removed",
-  "relationships": "Relationships",
   "relationshipsSection": "Relationships",
   "relationshipToPatient": "Relationship to patient",
   "relativeFullNameLabelText": "Related person",