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

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-local.0"}

package/package.json

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

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-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

@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Tile, ComboBox, Layer, Button, Search, InlineLoading, InlineNotification } from '@carbon/react';
+import { Tile, ComboBox, Layer, Button, Search, InlineLoading } from '@carbon/react';
 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';
@@ -48,6 +48,13 @@ const PatientVerification: React.FC<PatientVerificationProps> = ({ props }) => {
     }
   };
 
+  if (error) {
+    return (
+      <Tile className={styles.errorWrapper}>
+        <p>Error occurred while reaching the client registry, please proceed with registration and try again later</p>
+      </Tile>
+    );
+  }
   return (
     <div id={'patientVerification'}>
       <h3 className={styles.productiveHeading02} style={{ color: '#161616' }}>
@@ -103,18 +110,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/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",