@kenyaemr/esm-patient-registration-app 6.0.1-pre.1.0.6 → 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-local.0"}
+{"$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.6",
+  "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/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.component.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Tile, ComboBox, Layer, Button, Search, InlineLoading } from '@carbon/react';
+import { Tile, ComboBox, Layer, Button, Search, InlineLoading, InlineNotification } from '@carbon/react';
 import styles from './patient-verification.scss';
 import { countries, verificationIdentifierTypes } from './assets/verification-assets';
 import { searchClientRegistry, useGlobalProperties } from './patient-verification-hook';
@@ -48,13 +48,6 @@ 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' }}>
@@ -64,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
@@ -75,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>
@@ -88,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>

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/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": "需要提供一个有效的电子邮件地址",