(fix) Additional fixes supporting #1338

packages/esm-patient-registration-app/src/patient-registration/field/field.scss

@@ -99,7 +99,13 @@
   align-items: center;
 }
 
+.arrowRightIcon {
+  fill: currentColor !important;
+}
+
 .configureIdentifiersButton {
+  display: flex;
+  align-items: center;
   margin: 0 0 layout.$spacing-05 layout.$spacing-05;
 
   svg {

packages/esm-patient-registration-app/src/patient-registration/field/id/id-field.component.tsx

@@ -128,7 +128,7 @@ export const Identifiers: React.FC = () => {
             className={styles.configureIdentifiersButton}
             onClick={() => setShowIdentifierOverlay(true)}
             size={isDesktop(layout) ? 'sm' : 'md'}>
-            {t('configure', 'Configure')} <ArrowRight size={16} />
+            {t('configure', 'Configure')} <ArrowRight className={styles.arrowRightIcon} size={16} />
           </Button>
         </div>
       </UserHasAccess>

packages/esm-patient-registration-app/src/patient-registration/field/id/id-field.test.tsx

@@ -1,19 +1,19 @@
-import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
+import React from 'react';
+import { Form, Formik } from 'formik';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { Form, Formik } from 'formik';
-import React from 'react';
+import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
+import { type AddressTemplate, type IdentifierSource } from '../../patient-registration.types';
 import { mockIdentifierTypes, mockOpenmrsId, mockPatient, mockSession } from '__mocks__';
 import { esmPatientRegistrationSchema, type RegistrationConfig } from '../../../config-schema';
 import { ResourcesContext, type Resources } from '../../../offline.resources';
 import { PatientRegistrationContext, type PatientRegistrationContextProps } from '../../patient-registration-context';
-import { type IdentifierSource } from '../../patient-registration.types';
 import { Identifiers, setIdentifierSource } from './id-field.component';
 
 const mockUseConfig = jest.mocked(useConfig<RegistrationConfig>);
 
 const mockResourcesContextValue = {
-  addressTemplate: null,
+  addressTemplate: null as unknown as AddressTemplate,
   currentSession: mockSession.data,
   identifierTypes: [],
   relationshipTypes: [],
@@ -53,7 +53,7 @@ const mockContextValues: PatientRegistrationContextProps = {
   setInitialFormValues: jest.fn(),
   validationSchema: null,
   values: mockInitialFormValues,
-};
+} as unknown as PatientRegistrationContextProps;
 
 describe('Identifiers', () => {
   beforeEach(() => {

packages/esm-patient-registration-app/src/patient-registration/form-manager.test.ts

@@ -69,6 +69,7 @@ describe('FormManager', () => {
         },
       ]);
     });
+
     it('should generate identifier if it has autoGeneration and manual entry disabled', async () => {
       formValues.identifiers.foo.autoGeneration = true;
       formValues.identifiers.foo.selectedSource.autoGenerationOption.manualEntryEnabled = false;

packages/esm-patient-registration-app/src/patient-registration/form-manager.ts

@@ -250,6 +250,7 @@ export class FormManager {
             : await (
                 await generateIdentifier(selectedSource.uuid)
               ).data.identifier;
+
         const identifierToCreate = {
           uuid: identifierUuid,
           identifier,

packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.component.tsx

@@ -117,7 +117,7 @@ const IdentifierInput: React.FC<IdentifierInputProps> = ({ patientIdentifier, fi
           )}
         </div>
       )}
-      <div style={{ marginBottom: '1rem' }}>
+      <div className={styles.actionButtonContainer}>
         {showEditButton && (
           <UserHasAccess privilege="Edit Patient Identifiers">
             <Button

packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.test.tsx

@@ -9,7 +9,12 @@ import {
   PatientRegistrationContext,
   type PatientRegistrationContextProps,
 } from '../../../patient-registration-context';
-import type { AddressTemplate, FormValues, PatientIdentifierValue } from '../../../patient-registration.types';
+import type {
+  AddressTemplate,
+  FormValues,
+  IdentifierSource,
+  PatientIdentifierValue,
+} from '../../../patient-registration.types';
 import IdentifierInput from './identifier-input.component';
 import userEvent from '@testing-library/user-event';
 
@@ -79,11 +84,11 @@ describe('identifier input', () => {
         manualEntryEnabled: false,
         automaticGenerationEnabled: true,
       },
-    },
+    } as IdentifierSource,
     autoGeneration: false,
     preferred: true,
     required: true,
-  };
+  } as PatientIdentifierValue;
 
   const setupIdentifierInput = (patientIdentifier: PatientIdentifierValue, initialValues = {}) => {
     render(
@@ -101,7 +106,7 @@ describe('identifier input', () => {
 
   it('shows the identifier input', () => {
     openmrsID.autoGeneration = false;
-    setupIdentifierInput(openmrsID);
+    setupIdentifierInput(openmrsID as PatientIdentifierValue);
     expect(screen.getByLabelText(openmrsID.identifierName)).toBeInTheDocument();
   });
 
@@ -112,7 +117,7 @@ describe('identifier input', () => {
     openmrsID.initialValue = '1002UU9';
     openmrsID.identifierValue = '1002UU9';
     // replay
-    setupIdentifierInput(openmrsID);
+    setupIdentifierInput(openmrsID as PatientIdentifierValue);
     expect(screen.getByText('Edit')).toBeInTheDocument();
   });
 
@@ -139,7 +144,7 @@ describe('identifier input', () => {
     it('hides the input when the identifier is auto-generated', () => {
       openmrsID.autoGeneration = true;
       setupIdentifierInput(openmrsID);
-      expect(screen.getByTestId('identifier-input').type).toBe('hidden');
+      expect(screen.getByTestId('identifier-input')).toHaveAttribute('type', 'hidden');
     });
 
     it("displays 'Auto-Generated' when the indentifier has auto generation", () => {
@@ -154,7 +159,7 @@ describe('identifier input', () => {
         autoGenerationOption: {
           manualEntryEnabled: true,
         },
-      };
+      } as IdentifierSource;
 
       it('shows the edit button', () => {
         openmrsID.autoGeneration = true;
@@ -171,11 +176,11 @@ describe('identifier input', () => {
             autoGenerationOption: {
               manualEntryEnabled: true,
             },
-          };
+          } as IdentifierSource;
           setupIdentifierInput(openmrsID);
           const editButton = screen.getByTestId('edit-button');
           await user.click(editButton);
-          expect(screen.getByLabelText(new RegExp(`${openmrsID.identifierName}`)).value).toBe('');
+          expect(screen.getByLabelText(new RegExp(`${openmrsID.identifierName}`))).toHaveValue('');
         });
 
         it('displays an input field with the identifier value if it exists', async () => {
@@ -186,11 +191,11 @@ describe('identifier input', () => {
             autoGenerationOption: {
               manualEntryEnabled: true,
             },
-          };
+          } as IdentifierSource;
           setupIdentifierInput(openmrsID, { identifiers: { [fieldName]: { identifierValue: '10001V' } } });
           const editButton = screen.getByTestId('edit-button');
           await user.click(editButton);
-          expect(screen.getByLabelText(new RegExp(`${openmrsID.identifierName}`)).value).toBe('10001V');
+          expect(screen.getByLabelText(new RegExp(`${openmrsID.identifierName}`))).toHaveValue('10001V');
         });
       });
     });

packages/esm-patient-registration-app/src/patient-registration/input/input.scss

@@ -116,3 +116,8 @@
   margin: 0;
   padding-left: layout.$spacing-05;
 }
+
+.actionButtonContainer {
+  margin-left: layout.$spacing-05;
+  margin-bottom: layout.$spacing-05;
+}

packages/esm-ward-app/src/ward-view/materal-ward/maternal-ward-patient-card.component.tsx

@@ -84,7 +84,7 @@ const MotherChildBedShareDivider = () => {
   return (
     <div className={maternalWardPatientCardStyles.motherChildBedDivider}>
       <div className={maternalWardPatientCardStyles.motherChildBedDividerLine}></div>
-      <Tag type="purple">{t('motherChildbedShare', 'Mother / Child')}</Tag>
+      <Tag type="purple">{t('motherChildBedShare', 'Mother / Child')}</Tag>
       <div className={maternalWardPatientCardStyles.motherChildBedDividerLine}></div>
     </div>
   );

turbo.json

@@ -18,8 +18,15 @@
         "^typescript"
       ]
     },
-    "test": {},
+    "test": {
+      "dependsOn": [
+        "^test"
+      ]
+    },
     "test:watch": {
+      "dependsOn": [
+        "^test:watch"
+      ],
       "cache": false,
       "persistent": true
     }