@kenyaemr/esm-patient-registration-app 8.0.1-pre.95 → 8.1.0

package/src/config-schema.ts

@@ -83,6 +83,11 @@ export interface RegistrationConfig {
     encounterProviderRoleUuid: string;
     registrationFormUuid: string | null;
   };
+  hieClientRegistry: {
+    identifierTypes: Array<{ identifierType: string; identifierValue: string }>;
+    baseUrl: string;
+    encodedCredentials: string;
+  };
 }
 
 export const builtInSections: Array<SectionDefinition> = [
@@ -364,6 +369,38 @@ export const esmPatientRegistrationSchema = {
         'The form UUID to associate with the registration encounter. By default no form will be associated.',
     },
   },
+  hieClientRegistry: {
+    identifierTypes: {
+      _type: Type.Array,
+      _elements: {
+        identifierType: {
+          _type: Type.String,
+          _description: 'The label of the identifier type',
+        },
+        identifierValue: {
+          _type: Type.String,
+          _description: 'The value of the identifier type',
+        },
+      },
+      _default: [
+        { identifierType: 'National ID', identifierValue: 'national-id' },
+        { identifierType: 'Passport Number', identifierValue: 'passport-number' },
+        { identifierType: 'Birth Certificate Number', identifierValue: 'birth-certificate-number' },
+        { identifierType: 'Alien ID Number', identifierValue: 'alien-id-number' },
+        { identifierType: 'Refugee ID Number', identifierValue: 'refugee-number' },
+      ],
+    },
+    baseUrl: {
+      _type: Type.String,
+      _default: 'https://hie.paperless.co.ke/v4/custom/',
+      _description: 'The base URL for the HIE API',
+    },
+    encodedCredentials: {
+      _type: Type.String,
+      _default: 'a2VueWFfZW1yOkFsZG5iJmtmayZKc2whMjM0',
+      _description: 'The base64 encoded credentials for the HIE API',
+    },
+  },
   _validators: [
     validator(
       (config: RegistrationConfig) =>

package/src/index.ts

@@ -6,6 +6,7 @@ import rootComponent from './root.component';
 import addPatientLinkComponent from './add-patient-link';
 import editPatientDetailsButtonComponent from './widgets/edit-patient-details-button.component';
 import { PatientPhotoExtension } from './patient-photo.extension';
+import HIEConfirmationModal from './client-registry/hie-client-registry/modal/confirm-hie.modal';
 
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
@@ -68,11 +69,13 @@ export const deleteIdentifierConfirmationModal = getAsyncLifecycle(
 );
 
 export const confirmClientRegistryModal = getAsyncLifecycle(
-  () => import('./patient-verification/verification-modal/confirm-prompt.component'),
+  () => import('./client-registry/patient-verification/verification-modal/confirm-prompt.component'),
   options,
 );
 
 export const emptyClientRegistryModal = getAsyncLifecycle(
-  () => import('./patient-verification/verification-modal/empty-prompt.component'),
+  () => import('./client-registry/patient-verification/verification-modal/empty-prompt.component'),
   options,
 );
+
+export const hieConfirmationModal = getSyncLifecycle(HIEConfirmationModal, options);

package/src/patient-registration/field/obs/obs-field.component.tsx

@@ -33,7 +33,7 @@ export function ObsField({ fieldDefinition }: ObsFieldProps) {
     return null;
   }
 
-  switch (concept.datatype.display) {
+  switch (concept?.datatype?.display) {
     case 'Text':
       return (
         <TextObsField

package/src/patient-registration/patient-registration-hooks.ts

@@ -14,7 +14,10 @@ import useSWR from 'swr';
 import { v4 } from 'uuid';
 import { type RegistrationConfig } from '../config-schema';
 import { patientRegistration } from '../constants';
-import { useConceptAnswers, useGlobalProperties } from '../patient-verification/patient-verification-hook';
+import {
+  useConceptAnswers,
+  useGlobalProperties,
+} from '../client-registry/patient-verification/patient-verification-hook';
 import {
   type FormValues,
   type PatientRegistration,

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

@@ -12,6 +12,7 @@ import {
   interpolateUrl,
   usePatient,
   usePatientPhoto,
+  useFeatureFlag,
 } from '@openmrs/esm-framework';
 import { getValidationSchema } from './validation/patient-registration-validation';
 import { type FormValues, type CapturePhotoProps } from './patient-registration.types';
@@ -19,14 +20,15 @@ import { PatientRegistrationContext } from './patient-registration-context';
 import { type SavePatientForm, SavePatientTransactionManager } from './form-manager';
 import { DummyDataInput } from './input/dummy-data/dummy-data-input.component';
 import { cancelRegistration, filterOutUndefinedPatientIdentifiers, scrollIntoView } from './patient-registration-utils';
-import { useInitialAddressFieldValues, useInitialFormValues, usePatientUuidMap,usePatientObs } from './patient-registration-hooks';
+import { useInitialAddressFieldValues, useInitialFormValues, usePatientUuidMap } from './patient-registration-hooks';
 import { ResourcesContext } from '../offline.resources';
 import { builtInSections, type RegistrationConfig, type SectionDefinition } from '../config-schema';
 import { SectionWrapper } from './section/section-wrapper.component';
 import BeforeSavePrompt from './before-save-prompt';
 import styles from './patient-registration.scss';
-import PatientVerification from '../patient-verification/patient-verification.component';
-import { handleSavePatientToClientRegistry } from '../patient-verification/patient-verification-hook';
+import PatientVerification from '../client-registry/patient-verification/patient-verification.component';
+import { handleSavePatientToClientRegistry } from '../client-registry/patient-verification/patient-verification-hook';
+import ClientRegistry from '../client-registry/client-registry.component';
 
 let exportedInitialFormValuesForTesting = {} as FormValues;
 
@@ -36,6 +38,7 @@ export interface PatientRegistrationProps {
 }
 
 export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePatientForm, isOffline }) => {
+  const healthInformationExchangeFlag = useFeatureFlag('healthInformationExchange');
   const { currentSession, identifierTypes } = useContext(ResourcesContext);
   const { search } = useLocation();
   const config = useConfig() as RegistrationConfig;
@@ -158,6 +161,8 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
     }
   };
 
+  const enableRegistryButton = healthInformationExchangeFlag ? false : !enableClientRegistry;
+
   const displayErrors = (errors) => {
     if (errors && typeof errors === 'object' && !!Object.keys(errors).length) {
       Object.keys(errors).forEach((error) => {
@@ -198,18 +203,20 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                     </Link>
                   </div>
                 ))}
-                <Button
-                  renderIcon={ShareKnowledge}
-                  disabled={!currentSession || !identifierTypes}
-                  onClick={() => {
-                    setEnableClientRegistry(true);
-                    props.isValid
-                      ? handleSavePatientToClientRegistry(props.values, props.setValues, inEditMode)
-                      : props.validateForm().then((errors) => displayErrors(errors));
-                  }}
-                  className={styles.submitButton}>
-                  {t('postToRegistry', 'Post to registry')}
-                </Button>
+                {!healthInformationExchangeFlag && (
+                  <Button
+                    renderIcon={ShareKnowledge}
+                    disabled={!currentSession || !identifierTypes}
+                    onClick={() => {
+                      setEnableClientRegistry(true);
+                      props.isValid
+                        ? handleSavePatientToClientRegistry(props.values, props.setValues, inEditMode)
+                        : props.validateForm().then((errors) => displayErrors(errors));
+                    }}
+                    className={styles.submitButton}>
+                    {t('postToRegistry', 'Post to registry')}
+                  </Button>
+                )}
                 <Button
                   className={styles.submitButton}
                   type="submit"
@@ -217,7 +224,7 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                   // Current session and identifiers are required for patient registration.
                   // If currentSession or identifierTypes are not available, then the
                   // user should be blocked to register the patient.
-                  disabled={!currentSession || !identifierTypes || props.isSubmitting || !enableClientRegistry}>
+                  disabled={!currentSession || !identifierTypes || props.isSubmitting || enableRegistryButton}>
                   {props.isSubmitting ? (
                     <InlineLoading
                       className={styles.spinner}
@@ -249,7 +256,7 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                   initialFormValues: props.initialValues,
                   setInitialFormValues,
                 }}>
-                <PatientVerification props={props} setInitialFormValues={setInitialFormValues} />
+                <ClientRegistry props={props} setInitialFormValues={setInitialFormValues} />
                 {sections.map((section, index) => (
                   <SectionWrapper
                     key={`registration-section-${section.id}`}

package/src/routes.json

@@ -70,6 +70,11 @@
       "online": true,
       "offline": true
     }
+  ],
+  "modals": [
+    {
+      "component": "hieConfirmationModal",
+      "name": "hie-confirmation-modal"
+    }
   ]
-}
-    
+}

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",
@@ -40,8 +41,10 @@
   "editIdentifierTooltip": "Edit",
   "editPatientDetails": "Edit patient details",
   "editPatientDetailsBreadcrumb": "Edit patient details",
+  "enterIdentifierSearchValue": "Enter identifier search value",
   "error": "Error",
   "errorFetchingOrderedFields": "Error occured fetching ordered fields for address hierarchy",
+  "errorFetchingPatient": "Error fetching patient",
   "estimatedAgeInMonthsLabelText": "Estimated age in months",
   "estimatedAgeInYearsLabelText": "Estimated age in years",
   "familyNameLabelText": "Family Name",
@@ -54,6 +57,10 @@
   "genderUnspecified": "Gender is not specified",
   "givenNameLabelText": "First Name",
   "givenNameRequired": "Given name is required",
+  "healthID": "HealthID",
+  "hieModal": "HIE Patient Record Found",
+  "identifierSearch": "Identifier search",
+  "identifierType": "Identifier type",
   "identifierValueRequired": "Identifier value is required",
   "idFieldLabelText": "Identifiers",
   "IDInstructions": "Select the identifiers you'd like to add for this patient:",
@@ -63,6 +70,7 @@
   "isDeadInputLabel": "Is Dead",
   "jumpTo": "Jump to",
   "male": "Male",
+  "maritalStatus": "Marital status",
   "middleNameLabelText": "Middle Name",
   "nationalId": "National ID",
   "negativeMonths": "Negative months",
@@ -78,6 +86,7 @@
   "patientNameKnown": "Patient's Name is Known?",
   "patientNotFound": "The patient records could not be found in Client registry, do you want to continue to create and post patient to registry",
   "patientRegistrationBreadcrumb": "Patient Registration",
+  "patientVerificationFromHIE": "Patient verification from HIE",
   "postToRegistry": "Post to registry",
   "registerPatient": "Register Patient",
   "registerPatientSuccessSnackbarSubtitle": "The patient can now be found by searching for them using their name or ID number",
@@ -97,6 +106,8 @@
   "searchAddress": "Search address",
   "searchClientRegistry": "Search client registry",
   "searchIdentifierPlaceholder": "Search identifier",
+  "searchingRegistry": "Searching registry...",
+  "searchRegistry": "Search registry",
   "selectAnOption": "Select an option",
   "selectCountry": "Select country",
   "selectIdentifierType": "Select identifier type",
@@ -114,6 +125,7 @@
   "updatePatientSuccessSnackbarTitle": "Patient Details Updated",
   "useValues": "Use values",
   "validate": "Validate",
+  "viewFullResponse": "View full response",
   "yearsEstimateRequired": "Years estimate required",
   "yes": "Yes"
 }

package/dist/330.js

@@ -1 +0,0 @@
-"use strict";(globalThis.webpackChunk_kenyaemr_esm_patient_registration_app=globalThis.webpackChunk_kenyaemr_esm_patient_registration_app||[]).push([[330],{1330:(e,t,n)=>{n.r(t),n.d(t,{default:()=>i});var a=n(268),o=n.n(a),r=n(4924),c=n(5950);const i=function(e){var t=e.close,n=e.onConfirm,a=(0,r.useTranslation)().t;return o().createElement(o().Fragment,null,o().createElement("div",{className:"cds--modal-header"},o().createElement("h3",{className:"cds--modal-header__heading"},a("clientRegistryEmpty","Create & Post Patient"))),o().createElement("div",{className:"cds--modal-content"},o().createElement("p",null,a("patientNotFound","The patient records could not be found in Client registry, do you want to continue to create and post patient to registry"))),o().createElement("div",{className:"cds--modal-footer"},o().createElement(c.zxk,{kind:"secondary",onClick:t},a("cancel","Cancel")),o().createElement(c.zxk,{onClick:n},a("continue","Continue to registration"))))}}}]);

package/dist/330.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"330.js","mappings":"mPAkCA,QAzBgD,Y,IAAGA,EAAAA,EAAAA,MAAOC,EAAAA,EAAAA,UAClD,GAAQC,EAAAA,EAAAA,kBAANC,EACR,OACE,oCACE,kBAACC,MAAAA,CAAIC,UAAU,qBACb,kBAACC,KAAAA,CAAGD,UAAU,8BAA8BF,EAAE,sBAAuB,2BAEvE,kBAACC,MAAAA,CAAIC,UAAU,sBACb,kBAACE,IAAAA,KACEJ,EACC,kBACA,+HAIN,kBAACC,MAAAA,CAAIC,UAAU,qBACb,kBAACG,EAAAA,IAAMA,CAACC,KAAK,YAAYC,QAASV,GAC/BG,EAAE,SAAU,WAEf,kBAACK,EAAAA,IAAMA,CAACE,QAAST,GAAYE,EAAE,WAAY,8BAInD,C","sources":["webpack://@kenyaemr/esm-patient-registration-app/./src/patient-verification/verification-modal/empty-prompt.component.tsx"],"names":["close","onConfirm","useTranslation","t","div","className","h3","p","Button","kind","onClick"],"sourceRoot":""}