From 94f1df4d43dc0af60028546f33672a9eafa75108 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Tue, 11 Jun 2024 17:31:37 +0530
Subject: [PATCH] (fix) O3-3398: Combine the translation for Create New
 Patient/ Edit Patient (#1186)

* Combined the translation for Create New Patient/ Edit Patient

* Use proper casing for translation value

* Fixup

---------

Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
---
 .../patient-registration.component.tsx                 |  8 +++++---
 .../src/patient-registration/patient-registration.scss |  5 ++---
 .../patient-registration/patient-registration.test.tsx | 10 +++++-----
 .../esm-patient-registration-app/translations/en.json  |  4 +---
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx
index 9a35942d3..15c7e85f5 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx
@@ -159,7 +159,9 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
             <div>
               <div className={styles.stickyColumn}>
                 <h4>
-                  {inEditMode ? t('edit', 'Edit') : t('createNew', 'Create New')} {t('patient', 'Patient')}
+                  {inEditMode
+                    ? t('editPatientDetails', 'Edit patient details')
+                    : t('createNewPatient', 'Create new patient')}
                 </h4>
                 {showDummyData && <DummyDataInput setValues={props.setValues} />}
                 <p className={styles.label01}>{t('jumpTo', 'Jump to')}</p>
@@ -186,9 +188,9 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                       status="active"
                     />
                   ) : inEditMode ? (
-                    t('updatePatient', 'Update Patient')
+                    t('updatePatient', 'Update patient')
                   ) : (
-                    t('registerPatient', 'Register Patient')
+                    t('registerPatient', 'Register patient')
                   )}
                 </Button>
                 <Button className={styles.cancelButton} kind="tertiary" onClick={cancelRegistration}>
diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.scss b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.scss
index e3906d722..059b30c4e 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.scss
+++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.scss
@@ -94,9 +94,8 @@
 }
 
 .spinner {
-  &:global(.cds--inline-loading) {
-    min-height: 1rem;
-  }
+  min-height: 1rem;
+  width: max-content;
 }
 
 // Overriding styles for RTL support
diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx
index 8d77922e0..f373ce420 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx
@@ -264,7 +264,7 @@ describe('Registering a new patient', () => {
     });
 
     await fillRequiredFields();
-    await user.click(await screen.findByText('Register Patient'));
+    await user.click(await screen.findByText(/Register Patient/i));
     expect(mockedSavePatient).toHaveBeenCalledWith(
       expect.objectContaining({
         identifiers: [], //TODO when the identifer story is finished: { identifier: '', identifierType: '05a29f94-c0ed-11e2-94be-8c13b969e334', location: '' },
@@ -293,7 +293,7 @@ describe('Registering a new patient', () => {
     const givenNameInput = (await screen.findByLabelText('First Name')) as HTMLInputElement;
 
     await user.type(givenNameInput, '5');
-    await user.click(screen.getByText('Register Patient'));
+    await user.click(screen.getByText(/Register Patient/i));
 
     expect(mockedSavePatientForm).not.toHaveBeenCalled();
   });
@@ -317,7 +317,7 @@ describe('Registering a new patient', () => {
     const nationality = within(customSection).getByLabelText('Nationality');
     await user.selectOptions(nationality, 'USA');
 
-    await user.click(screen.getByText('Register Patient'));
+    await user.click(screen.getByText(/Register Patient/i));
 
     expect(mockedSavePatient).toHaveBeenCalled();
 
@@ -350,7 +350,7 @@ describe('Registering a new patient', () => {
 
     mockedSaveEncounter.mockRejectedValue({ status: 400, responseBody: { error: { message: 'an error message' } } });
 
-    const registerPatientButton = screen.getByText('Register Patient');
+    const registerPatientButton = screen.getByText(/Register Patient/i);
 
     await user.click(registerPatientButton);
 
@@ -415,7 +415,7 @@ describe('Updating an existing patient record', () => {
     await user.type(givenNameInput, 'Eric');
     await user.type(middleNameInput, 'Johnson');
     await user.type(familyNameInput, 'Smith');
-    await user.click(screen.getByText('Update Patient'));
+    await user.click(screen.getByText(/Update patient/i));
 
     expect(mockedSavePatient).toHaveBeenCalledWith(
       false,
diff --git a/packages/esm-patient-registration-app/translations/en.json b/packages/esm-patient-registration-app/translations/en.json
index fe3c5d169..389bdc124 100644
--- a/packages/esm-patient-registration-app/translations/en.json
+++ b/packages/esm-patient-registration-app/translations/en.json
@@ -15,7 +15,7 @@
   "configure": "Configure",
   "configureIdentifiers": "Configure identifiers",
   "contactSection": "Contact Details",
-  "createNew": "Create New",
+  "createNewPatient": "Create new patient",
   "dateOfBirthLabelText": "Date of Birth",
   "deathDateInputLabel": "Date of Death",
   "deathdayNotInTheFuture": "Death day cannot be in the future",
@@ -27,7 +27,6 @@
   "discardModalBody": "The changes you made to this patient's details have not been saved. Discard changes?",
   "discardModalHeader": "Confirm Discard Changes",
   "dobToggleLabelText": "Date of Birth Known?",
-  "edit": "Edit",
   "editIdentifierTooltip": "Edit",
   "editPatientDetails": "Edit patient details",
   "editPatientDetailsBreadcrumb": "Edit patient details",
@@ -61,7 +60,6 @@
   "obsFieldUnknownDatatype": "Concept for obs field '{{fieldDefinitionId}}' has unknown datatype '{{datatypeName}}'",
   "optional": "optional",
   "other": "Other",
-  "patient": "Patient",
   "patientNameKnown": "Patient's Name is Known?",
   "patientRegistrationBreadcrumb": "Patient Registration",
   "registerPatient": "Register Patient",