(fix) remove undefined entries on attributes and identifiers (#43)

palladiumkenya · Aug 26, 2024 · 31f605a · 31f605a
1 parent 3d60df1
commit 31f605a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/...ages/esm-patient-registration-app/src/client-registry/hie-client-registry/hie-resource.ts b/...ages/esm-patient-registration-app/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;
+    }, {});
   }
 }
 

diff --git a/...ient-registration-app/src/client-registry/hie-client-registry/modal/confirm-hie.modal.tsx b/...ient-registration-app/src/client-registry/hie-client-registry/modal/confirm-hie.modal.tsx
@@ -53,7 +53,7 @@ const HIEConfirmationModal: React.FC<HIEConfirmationModalProps> = ({ closeModal,
               label={t('maritalStatus', 'Marital status')}
               value={patient.maritalStatus.coding.map((m) => m.code).join('')}
             />
-            <PatientInfo label={t('relationships', 'Relationships')} value="--" />
+            <PatientInfo label={t('dependents', 'Dependents')} value="--" />
           </div>
         </div>
         <div>

diff --git a/packages/esm-patient-registration-app/translations/en.json b/packages/esm-patient-registration-app/translations/en.json
@@ -33,6 +33,7 @@
   "deleteIdentifierTooltip": "Delete",
   "deleteRelationshipTooltipText": "Delete",
   "demographicsSection": "Basic Info",
+  "dependants": "Dependants",
   "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",