Review changes

openmrs · Oct 3, 2024 · edee1d3 · edee1d3
1 parent 1655c0d
commit edee1d3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/packages/esm-patient-banner-app/src/config-schema.ts b/packages/esm-patient-banner-app/src/config-schema.ts
@@ -1,5 +1,4 @@
 import { Type } from '@openmrs/esm-framework';
-import _default from 'react-hook-form/dist/logic/appendErrors';
 
 export const configSchema = {
   contactAttributeTypes: {
@@ -21,7 +20,8 @@ export const configSchema = {
     },
     header: {
       _type: Type.Object,
-      _description: 'The header to display on the patient sticker',
+      _description:
+        'Configuration properties for the patient sticker headerConfiguration properties for the patient sticker header',
       showBarcode: {
         _type: Type.Boolean,
         _description: 'Whether to display a barcode on the patient sticker',

diff --git a/packages/esm-patient-banner-app/src/print-identifier-sticker/patient-detail.component.tsx b/packages/esm-patient-banner-app/src/print-identifier-sticker/patient-detail.component.tsx
@@ -95,7 +95,7 @@ export const PatientIdentifier: React.FC<PatientDetailProps> = ({ patient }) =>
 export const PatientContact: React.FC<PatientDetailProps> = ({ patient }) => {
   const { t } = useTranslation();
 
-  if (patient.telecom.length == 0) {
+  if (!patient?.telecom?.length) {
     return null;
   }
 
@@ -104,7 +104,7 @@ export const PatientContact: React.FC<PatientDetailProps> = ({ patient }) => {
       <span>
         <strong className={styles.strong}>{t('telephoneNumberWithSeparator', 'Telephone number:')}</strong>
       </span>
-      <span className={styles.patientDetail}>{patient.telecom[0]?.value}</span>
+      <span className={styles.patientDetail}>{patient.telecom?.[0]?.value}</span>
     </div>
   );
 };

diff --git a/...m-patient-banner-app/src/print-identifier-sticker/print-identifier-sticker-modal.test.tsx b/...m-patient-banner-app/src/print-identifier-sticker/print-identifier-sticker-modal.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import PrintIdentifierSticker from './print-identifier-sticker.modal';
 import { mockFhirPatient } from '../../../../__mocks__/patient.mock';
-import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
+import { age, getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
 import { type ConfigObject, configSchema } from '../config-schema';
 import { useReactToPrint } from 'react-to-print';
 import userEvent from '@testing-library/user-event';
@@ -109,7 +109,7 @@ describe('Testing PrintIdentifierStickerModal', () => {
     expect(getByTextWithMarkup(/Joshua Johnson/i)).toBeInTheDocument();
     expect(getByTextWithMarkup(/\+255777053243/i)).toBeInTheDocument();
     expect(getByTextWithMarkup(/100008E/i)).toBeInTheDocument();
-    expect(getByTextWithMarkup(/4 yrs, 11 mths/i)).toBeInTheDocument();
+    expect(getByTextWithMarkup(age(mockFhirPatient.birthDate))).toBeInTheDocument();
   });
 });
 

diff --git a/...es/esm-patient-banner-app/src/print-identifier-sticker/print-identifier-sticker.modal.tsx b/...es/esm-patient-banner-app/src/print-identifier-sticker/print-identifier-sticker.modal.tsx
@@ -42,8 +42,8 @@ const PrintIdentifierSticker: React.FC<PrintIdentifierStickerProps> = ({ closeMo
   const handleAfterPrint = useCallback(() => {
     onBeforeGetContentResolve.current = null;
     setIsPrinting(false);
-    // closeModal();
-  }, []);
+    closeModal();
+  }, [closeModal]);
 
   const handlePrintError = useCallback((errorLocation, error) => {
     onBeforeGetContentResolve.current = null;

diff --git a/.../esm-patient-banner-app/src/print-identifier-sticker/print-identifier-sticker.resource.ts b/.../esm-patient-banner-app/src/print-identifier-sticker/print-identifier-sticker.resource.ts
@@ -13,6 +13,7 @@ import {
 
 export const defaultBarcodeParams: Options = {
   width: 2,
+  format: 'CODE39',
   background: '#f4f4f4',
   displayValue: true,
   renderer: 'img',