@kenyaemr/esm-patient-registration-app 6.0.1-pre.1.0.5 → 6.0.2

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}],"version":"6.0.1-pre.1.0.4"}
+{"$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}],"version":"6.0.1-pre.1.0.6"}

package/package.json

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

package/src/patient-registration/form-manager.ts

@@ -189,7 +189,6 @@ export class FormManager {
         );
       } else {
         const encounterToSave: Encounter = {
-          encounterDatetime: new Date(),
           patient: savePatientResponse.data.uuid,
           encounterType: config.registrationObs.encounterTypeUuid,
           location: currentLocation,

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

@@ -121,6 +121,26 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
 
       setTarget(redirectUrl);
     } catch (error) {
+      const fieldErrors = Object.entries(error.responseBody?.error?.fieldErrors || {}) as Array<
+        [string, Array<{ code: string; message: string }>]
+      >;
+
+      if (savePatientTransactionManager.current.patientSaved) {
+        fieldErrors.forEach(([field, error]) => {
+          const errorMessage = error.map((e) => e.message).join(', ');
+          showSnackbar({
+            subtitle: errorMessage,
+            title: `Patient registration successful, with errors for registration encounter`,
+            kind: 'warning',
+            timeoutInMs: 8000,
+          });
+        });
+        const afterUrl = new URLSearchParams(search).get('afterUrl');
+        const redirectUrl = interpolateUrl(afterUrl || config.links.submitButton, { patientUuid: values.patientUuid });
+
+        setTarget(redirectUrl);
+      }
+
       if (error.responseBody?.error?.globalErrors) {
         error.responseBody.error.globalErrors.forEach((error) => {
           showSnackbar({
@@ -141,6 +161,7 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
         });
       } else {
         createErrorHandler()(error);
+        console.error(error);
       }
 
       helpers.setSubmitting(false);

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

@@ -118,7 +118,7 @@ export type Patient = {
 };
 
 export interface Encounter {
-  encounterDatetime: Date;
+  encounterDatetime?: Date;
   patient: string;
   encounterType: string;
   location: string;

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

@@ -177,7 +177,11 @@ export const RelationshipsSection = () => {
           uuid: type.uuid,
           direction: 'bIsToA',
         };
-        aIsToB.display === bIsToA.display ? tmp.push(aIsToB) : tmp.push(aIsToB, bIsToA);
+        aIsToB.display === bIsToA.display
+          ? tmp.push(aIsToB)
+          : bIsToA.display === 'Patient'
+            ? tmp.push(aIsToB, { display: `Patient (${aIsToB.display})`, uuid: type.uuid, direction: 'bIsToA' })
+            : tmp.push(aIsToB, bIsToA);
       });
       setDisplayRelationshipTypes(tmp);
     }

package/src/patient-verification/assets/verification-assets.ts

@@ -7,5 +7,5 @@ export const countries = [
 export const verificationIdentifierTypes = [
   { name: 'National ID', value: 'national-id' },
   { name: 'Passport', value: 'passport' },
-  { name: 'Birth certificate number', value: 'birth-certificate-number' },
+  { name: 'Birth certificate number', value: 'birth-certificate' },
 ];

package/src/patient-verification/patient-verification-utils.ts

@@ -62,7 +62,7 @@ export function handleClientRegistryResponse(
         required: false,
         identifierTypeUuid: '49af6cdc-7968-4abb-bf46-de10d7f4859f',
         identifierName: 'National ID',
-        identifierValue: identifications !== undefined && identifications[0]?.identificationNumber?.trim(),
+        identifierValue: identifications !== undefined && identifications[0]?.identificationNumber,
       },
 
       ['nationalUniquePatientIdentifier']: {
@@ -81,9 +81,9 @@ export function handleClientRegistryResponse(
       onConfirm: () => {
         props.setValues({
           ...props.values,
-          familyName: lastName?.trim() ?? '',
-          middleName: middleName?.trim() ?? '',
-          givenName: firstName.trim() ?? '',
+          familyName: lastName,
+          middleName: middleName,
+          givenName: firstName,
           gender: clientResponse.client.gender,
           birthdate: new Date(dateOfBirth),
           isDead: !isAlive,

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

@@ -4,7 +4,7 @@ import { Tile, ComboBox, Layer, Button, Search, InlineLoading, InlineNotificatio
 import styles from './patient-verification.scss';
 import { countries, verificationIdentifierTypes } from './assets/verification-assets';
 import { searchClientRegistry, useGlobalProperties } from './patient-verification-hook';
-import { showSnackbar } from '@openmrs/esm-framework';
+import { showSnackbar, showToast } from '@openmrs/esm-framework';
 import { handleClientRegistryResponse } from './patient-verification-utils';
 import { type FormikProps } from 'formik';
 import { type FormValues } from '../patient-registration/patient-registration.types';
@@ -57,6 +57,20 @@ const PatientVerification: React.FC<PatientVerificationProps> = ({ props }) => {
         <Layer>
           {isLoading && <InlineLoading status="active" iconDescription="Loading" description="Loading data..." />}
         </Layer>
+        {error && (
+          <InlineNotification
+            className={styles.errorWrapper}
+            aria-label="closes notification"
+            kind="error"
+            lowContrast
+            statusIconDescription="notification"
+            subtitle={t(
+              'clientRegistryErrorSubtitle',
+              'Please proceed with registration contact system admin and  try again later',
+            )}
+            title={t('clientRegistryError', 'Error occurred while reaching the client registry')}
+          />
+        )}
         <Tile className={styles.verificationWrapper}>
           <Layer>
             <ComboBox
@@ -68,7 +82,7 @@ const PatientVerification: React.FC<PatientVerificationProps> = ({ props }) => {
               titleText={t('selectCountry', 'Select country')}
               initialSelectedItem={countries[0]}
               onChange={({ selectedItem }) =>
-                setVerificationCriteria({ ...verificationCriteria, countryCode: selectedItem.initials })
+                setVerificationCriteria({ ...verificationCriteria, countryCode: selectedItem?.initials })
               }
             />
           </Layer>
@@ -81,7 +95,7 @@ const PatientVerification: React.FC<PatientVerificationProps> = ({ props }) => {
               label="Select identifier type"
               titleText={t('selectIdentifierType', 'Select identifier type')}
               onChange={({ selectedItem }) =>
-                setVerificationCriteria({ ...verificationCriteria, identifierType: selectedItem.value })
+                setVerificationCriteria({ ...verificationCriteria, identifierType: selectedItem?.value })
               }
             />
           </Layer>
@@ -103,18 +117,6 @@ const PatientVerification: React.FC<PatientVerificationProps> = ({ props }) => {
           )}
         </Tile>
       </div>
-      {error && (
-        <Tile className={styles.errorWrapper}>
-          <InlineNotification
-            aria-label="closes notification"
-            kind="error"
-            statusIconDescription="notification"
-            subtitle="Access to national client registry may be blocked by a proxy server. Please proceed with registration and try again later. Contact your system administrator if the issue persists."
-            title="Error: Failed to reach client registry."
-            lowContrast={true}
-          />
-        </Tile>
-      )}
     </div>
   );
 };

package/src/patient-verification/patient-verification.scss

@@ -21,9 +21,5 @@
 }
 
 .errorWrapper {
-  color: colors.$red-50;
   margin: 0 0 1rem 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
 }

package/src/patient-verification/verification-modal/confirm-prompt.component.tsx

@@ -39,7 +39,7 @@ const ConfirmPrompt: React.FC<ConfirmPromptProps> = ({ close, onConfirm, patient
         <div style={{ display: 'flex', margin: '1rem' }}>
           <ExtensionSlot
             style={{ display: 'flex', alignItems: 'center' }}
-            extensionSlotName="patient-photo-slot"
+            name="patient-photo-slot"
             state={{ patientName: `${patient?.firstName} ${patient?.lastName}` }}
           />
           <div style={{ width: '100%', marginLeft: '0.625rem' }}>

package/translations/en.json

@@ -65,7 +65,7 @@
   "negativeYears": "Negative years",
   "no": "No",
   "numberInNameDubious": "Number in name is dubious",
-  "nupi": "NUPI",
+  "NUPI": "",
   "obsFieldUnknownDatatype": "Concept for obs field '{{fieldDefinitionId}}' has unknown datatype '{{datatypeName}}'",
   "optional": "optional",
   "other": "Other",
@@ -97,7 +97,7 @@
   "selectCountry": "Select country",
   "selectIdentifierType": "Select identifier type",
   "sexFieldLabelText": "Sex",
-  "shaNumber": "SHA Number",
+  "SHA Number": "",
   "source": "Source",
   "stroke": "Stroke",
   "submitting": "Submitting",

package/translations/zh.json

@@ -45,7 +45,7 @@
   "givenNameLabelText": "名字",
   "givenNameRequired": "名字是必填项",
   "identifierValueRequired": "ID标识是必填项",
-  "idFieldLabelText": "ID标识",
+  "idFieldLabelText": "ID",
   "IDInstructions": "选择您想为该患者添加的ID标识：",
   "incompleteForm": "表单未填完",
   "invalidEmail": "需要提供一个有效的电子邮件地址",

package/translations/zh_CN.json

@@ -45,7 +45,7 @@
   "givenNameLabelText": "名字",
   "givenNameRequired": "名字是必填项",
   "identifierValueRequired": "ID标识是必填项",
-  "idFieldLabelText": "ID标识",
+  "idFieldLabelText": "ID",
   "IDInstructions": "选择您想为该患者添加的ID标识：",
   "incompleteForm": "表单未填完",
   "invalidEmail": "需要提供一个有效的电子邮件地址",