@kenyaemr/esm-patient-registration-app 7.0.3-pre.89 → 8.0.0

package/src/patient-registration/validation/patient-registration-validation.test.tsx

@@ -1,21 +1,45 @@
-import { defineConfigSchema, getConfig } from '@openmrs/esm-framework';
+import { getConfig } from '@openmrs/esm-framework';
+import { type RegistrationConfig } from '../../config-schema';
 import { getValidationSchema } from './patient-registration-validation';
-import { type RegistrationConfig, esmPatientRegistrationSchema } from '../../config-schema';
-describe('Patient Registration Validation', () => {
-  beforeAll(() => {
-    defineConfigSchema('@openmrs/esm-patient-registration-app', esmPatientRegistrationSchema);
+
+const mockGetConfig = jest.mocked(getConfig);
+
+describe('Patient registration validation', () => {
+  beforeEach(() => {
+    mockGetConfig.mockResolvedValue({
+      fieldConfigurations: {
+        gender: [
+          {
+            label: 'M',
+            value: 'male',
+          },
+          {
+            label: 'F',
+            value: 'female',
+          },
+          {
+            label: 'O',
+            value: 'other',
+          },
+          {
+            label: 'U',
+            value: 'unknown',
+          },
+        ],
+      },
+    });
   });
 
   const validFormValues = {
-    givenName: 'John',
-    familyName: 'Doe',
-    additionalGivenName: '',
     additionalFamilyName: '',
-    gender: 'male',
+    additionalGivenName: '',
     birthdate: new Date('1990-01-01'),
     birthdateEstimated: false,
     deathDate: null,
     email: 'john.doe@example.com',
+    familyName: 'Doe',
+    gender: 'male',
+    givenName: 'John',
     identifiers: {
       nationalId: {
         required: true,
@@ -29,7 +53,8 @@ describe('Patient Registration Validation', () => {
   };
 
   const validateFormValues = async (formValues) => {
-    const config = (await getConfig('@openmrs/esm-patient-registration-app')) as any as RegistrationConfig;
+    const config = (await getConfig('@openmrs/esm-patient-registration-app')) as unknown as RegistrationConfig;
+
     const validationSchema = getValidationSchema(config);
     try {
       await validationSchema.validate(formValues, { abortEarly: false });

package/src/patient-verification/patient-verification-utils.ts

@@ -4,7 +4,6 @@ import { type ClientRegistryPatient, type RegistryPatient } from './verification
 import counties from './assets/counties.json';
 import { type FormValues } from '../patient-registration/patient-registration.types';
 import { capitalize } from 'lodash-es';
-import { IdentifierInput } from '../patient-registration/input/custom-input/identifier/identifier-input.component';
 
 export function handleClientRegistryResponse(
   clientResponse: ClientRegistryPatient,

package/src/widgets/cancel-patient-edit.test.tsx

@@ -7,10 +7,6 @@ describe('CancelPatientEdit component', () => {
   const mockClose = jest.fn();
   const mockOnConfirm = jest.fn();
 
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
   it('renders the modal and triggers close and onConfirm functions', async () => {
     const user = userEvent.setup();
 

package/src/widgets/delete-identifier-confirmation.scss

@@ -1,6 +1,6 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '../patient-registration/patient-registration.scss';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .productiveHeading {
   @include type.type-style('heading-compact-02');
@@ -9,7 +9,7 @@
 .modalContent {
   width: 100%;
   background-color: $ui-01;
-  padding: spacing.$spacing-05;
+  padding: layout.$spacing-05;
 }
 
 .modalSubtitle {
@@ -18,15 +18,15 @@
 
 .modalBody {
   @include type.type-style('body-compact-01');
-  margin: spacing.$spacing-05 0;
+  margin: layout.$spacing-05 0;
 }
 
 .buttonSet {
   display: grid;
   grid-template-columns: 1fr 1fr;
-  margin-left: -(spacing.$spacing-05);
-  margin-right: -(spacing.$spacing-05);
-  margin-bottom: -(spacing.$spacing-05);
+  margin-left: -(layout.$spacing-05);
+  margin-right: -(layout.$spacing-05);
+  margin-bottom: -(layout.$spacing-05);
 }
 
 .buttonSet > button {

package/src/widgets/delete-identifier-confirmation.test.tsx

@@ -8,10 +8,6 @@ describe('DeleteIdentifierConfirmationModal component', () => {
   const mockIdentifierName = 'Identifier Name';
   const mockIdentifierValue = 'Identifier Value';
 
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
   it('renders the modal and triggers deleteIdentifier function', async () => {
     const user = userEvent.setup();
 

package/src/widgets/edit-patient-details-button.test.tsx

@@ -5,19 +5,13 @@ import { navigate } from '@openmrs/esm-framework';
 import { mockPatient } from '__mocks__';
 import EditPatientDetailsButton from './edit-patient-details-button.component';
 
+const mockNavigate = jest.mocked(navigate);
+
 describe('EditPatientDetailsButton', () => {
   const patientUuid = mockPatient.uuid;
 
   it('should navigate to the edit page when clicked', async () => {
     const user = userEvent.setup();
-    const mockNavigate = navigate as jest.Mock;
-
-    jest.mock('@openmrs/esm-framework', () => {
-      const originalModule = jest.requireActual('@openmrs/esm-framework');
-      return {
-        ...originalModule,
-      };
-    });
 
     render(<EditPatientDetailsButton patientUuid={patientUuid} />);
 

package/translations/am.json

@@ -17,6 +17,7 @@
   "codedPersonAttributeNoAnswerSet": "The person attribute field '{{codedPersonAttributeFieldId}}' is of type 'coded' but has been defined without an answer concept set UUID. The 'answerConceptSetUuid' key is required.",
   "configure": "Configure",
   "configureIdentifiers": "Configure identifiers",
+  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
   "contactSection": "Contact Details",
   "createNewPatient": "Create new patient",
   "continue": "Continue to registration",
@@ -26,6 +27,8 @@
   "deathDateInputLabel": "Date of Death",
   "deathdayNotInTheFuture": "Death day cannot be in the future",
   "deathSection": "Death Info",
+  "deleteIdentifierModalHeading": "Remove identifier?",
+  "deleteIdentifierModalText": " has a value of ",
   "deleteIdentifierTooltip": "Delete",
   "deleteRelationshipTooltipText": "Delete",
   "demographicsSection": "Basic Info",
@@ -88,6 +91,7 @@
   "relationshipToPatient": "Relationship to patient",
   "relativeFullNameLabelText": "Related person",
   "relativeNamePlaceholder": "Firstname Familyname",
+  "removeIdentifierButton": "Remove Identifier",
   "resetIdentifierTooltip": "Reset",
   "restoreRelationshipActionButton": "Undo",
   "searchAddress": "Search address",

package/translations/ar.json

@@ -17,6 +17,7 @@
   "codedPersonAttributeNoAnswerSet": "The person attribute field '{{codedPersonAttributeFieldId}}' is of type 'coded' but has been defined without an answer concept set UUID. The 'answerConceptSetUuid' key is required.",
   "configure": "تكوين",
   "configureIdentifiers": "Configure identifiers",
+  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
   "contactSection": "تفاصيل الاتصال",
   "createNewPatient": "Create new patient",
   "continue": "Continue to registration",
@@ -26,6 +27,8 @@
   "deathDateInputLabel": "تاريخ الوفاة",
   "deathdayNotInTheFuture": "Death day cannot be in the future",
   "deathSection": "معلومات الوفاة",
+  "deleteIdentifierModalHeading": "Remove identifier?",
+  "deleteIdentifierModalText": " has a value of ",
   "deleteIdentifierTooltip": "حذف",
   "deleteRelationshipTooltipText": "حذف",
   "demographicsSection": "معلومات أساسية",
@@ -88,6 +91,7 @@
   "relationshipToPatient": "العلاقة بالمريض",
   "relativeFullNameLabelText": "الاسم الكامل للقريب",
   "relativeNamePlaceholder": "الاسم الأول اسم العائلة",
+  "removeIdentifierButton": "Remove Identifier",
   "resetIdentifierTooltip": "إعادة تعيين",
   "restoreRelationshipActionButton": "تراجع",
   "searchAddress": "ابحث عن العنوان",

package/translations/es.json

@@ -15,6 +15,7 @@
   "codedPersonAttributeNoAnswerSet": "El campo de atributo de persona '{{codedPersonAttributeFieldId}}' es de tipo 'codificado' pero se ha definido sin UUID de conjunto de conceptos de respuesta. La clave 'answerConceptSetUuid' es requerida.",
   "configure": "Configurar",
   "configureIdentifiers": "Configurar identificadores",
+  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
   "contactSection": "Detalles de Contacto",
   "createNewPatient": "Create new patient",
   "continue": "Continue to registration",
@@ -24,6 +25,8 @@
   "deathDateInputLabel": "Fecha de fallecimiento",
   "deathdayNotInTheFuture": "El día de la muerte no puede ser en el futuro",
   "deathSection": "Información de Fallecimiento",
+  "deleteIdentifierModalHeading": "Remove identifier?",
+  "deleteIdentifierModalText": " has a value of ",
   "deleteIdentifierTooltip": "Eliminar",
   "deleteRelationshipTooltipText": "Eliminar",
   "demographicsSection": "Información Básica",
@@ -84,6 +87,7 @@
   "relationshipToPatient": "Relación con el paciente",
   "relativeFullNameLabelText": "Nombre y Apellidos",
   "relativeNamePlaceholder": "Nombre Apellido",
+  "removeIdentifierButton": "Remove Identifier",
   "resetIdentifierTooltip": "Resetear",
   "restoreRelationshipActionButton": "Deshacer",
   "searchAddress": "Buscar dirección",

package/translations/fr.json

@@ -15,6 +15,7 @@
   "codedPersonAttributeNoAnswerSet": "Le champ d'attribut de personne '{{codedPersonAttributeFieldId}}' est de type 'codé' mais a été défini sans UUID d'ensemble de concepts de réponse. La clé 'answerConceptSetUuid' est requise.",
   "configure": "Configurer",
   "configureIdentifiers": "Configurer les identifiants",
+  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
   "contactSection": "Détails du contact",
   "createNewPatient": "Create new patient",
   "createNew": "Créer un nouveau",
@@ -23,6 +24,8 @@
   "deathDateInputLabel": "Date de décès",
   "deathdayNotInTheFuture": "Le décès ne peut pas être dans le futur",
   "deathSection": "Informations sur le décès",
+  "deleteIdentifierModalHeading": "Remove identifier?",
+  "deleteIdentifierModalText": " has a value of ",
   "deleteIdentifierTooltip": "Supprimer",
   "deleteRelationshipTooltipText": "Supprimer",
   "demographicsSection": "Informations de base",
@@ -82,6 +85,7 @@
   "relationshipToPatient": "Relation avec le patient",
   "relativeFullNameLabelText": "Personne liée",
   "relativeNamePlaceholder": "Prénom Nom de famille",
+  "removeIdentifierButton": "Remove Identifier",
   "resetIdentifierTooltip": "Réinitialiser",
   "restoreRelationshipActionButton": "Restaurer",
   "searchAddress": "Rechercher une adresse",

package/translations/he.json

@@ -17,6 +17,7 @@
   "codedPersonAttributeNoAnswerSet": "The person attribute field '{{codedPersonAttributeFieldId}}' is of type 'coded' but has been defined without an answer concept set UUID. The 'answerConceptSetUuid' key is required.",
   "configure": "הגדר",
   "configureIdentifiers": "הגדר זיהויים",
+  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
   "contactSection": "פרטי יצירת קשר",
   "createNewPatient": "Create new patient",
   "continue": "Continue to registration",
@@ -26,6 +27,8 @@
   "deathDateInputLabel": "תאריך המוות",
   "deathdayNotInTheFuture": "תאריך המוות לא יכול להיות בעתיד",
   "deathSection": "מידע על המוות",
+  "deleteIdentifierModalHeading": "Remove identifier?",
+  "deleteIdentifierModalText": " has a value of ",
   "deleteIdentifierTooltip": "מחק",
   "deleteRelationshipTooltipText": "מחק",
   "demographicsSection": "מידע בסיסי",
@@ -90,6 +93,7 @@
   "relationshipToPatient": "קשר למטופל",
   "relativeFullNameLabelText": "שם מלא",
   "relativeNamePlaceholder": "שם פרטי שם משפחה",
+  "removeIdentifierButton": "Remove Identifier",
   "resetIdentifierTooltip": "איפוס",
   "restoreRelationshipActionButton": "ביטול",
   "searchAddress": "חיפוש כתובת",

package/translations/km.json

@@ -17,6 +17,7 @@
   "codedPersonAttributeNoAnswerSet": "The person attribute field '{{codedPersonAttributeFieldId}}' is of type 'coded' but has been defined without an answer concept set UUID. The 'answerConceptSetUuid' key is required.",
   "configure": "កំណត់រចនាសម្ព័ន្ធ",
   "configureIdentifiers": "ឯកសារកំណត់អត្តសញ្ញាណផ្សេងទៀត",
+  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
   "contactSection": "ព័ត៌មានមរណភាព",
   "createNewPatient": "Create new patient",
   "continue": "Continue to registration",
@@ -26,6 +27,8 @@
   "deathDateInputLabel": "កាលបរិច្ឆេទនៃការស្លាប់",
   "deathdayNotInTheFuture": "ថ្ងៃស្លាប់មិនអាចមាននាពេលអនាគតទេ។",
   "deathSection": "ព័ត៌មានមរណភាព",
+  "deleteIdentifierModalHeading": "Remove identifier?",
+  "deleteIdentifierModalText": " has a value of ",
   "deleteIdentifierTooltip": "លុប",
   "deleteRelationshipTooltipText": "លុប",
   "demographicsSection": "ព័ត៌មានផ្ទាល់ខ្លួនអ្នកជំងឺ",
@@ -90,6 +93,7 @@
   "relationshipToPatient": "ការទាក់ទងទៅនឹងអ្នកជំងឺ",
   "relativeFullNameLabelText": "ឈ្មោះពេញ",
   "relativeNamePlaceholder": "នាមត្រកូលនាមខ្លួន",
+  "removeIdentifierButton": "Remove Identifier",
   "resetIdentifierTooltip": "រៀបចំឡើងវិញ",
   "restoreRelationshipActionButton": "វិលត្រឡប់មកដើមវិញ",
   "searchAddress": "ស្វែងរកអាសយដ្ឋាន",

package/translations/zh.json

@@ -14,12 +14,15 @@
   "codedPersonAttributeNoAnswerSet": "人员属性字段'{{codedPersonAttributeFieldId}}'的类型为'coded'，但未定义答案概念集UUID。'answerConceptSetUuid'键是必需的。",
   "configure": "配置",
   "configureIdentifiers": "配置ID标识",
+  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
   "contactSection": "联系方式",
   "createNewPatient": "Create new patient",
   "dateOfBirthLabelText": "出生日期",
   "deathDateInputLabel": "死亡日期",
   "deathdayNotInTheFuture": "死亡日期不能是未来的日期",
   "deathSection": "死亡信息",
+  "deleteIdentifierModalHeading": "Remove identifier?",
+  "deleteIdentifierModalText": " has a value of ",
   "deleteIdentifierTooltip": "删除",
   "deleteRelationshipTooltipText": "删除",
   "demographicsSection": "基本信息",
@@ -74,6 +77,7 @@
   "relationshipToPatient": "与患者的关系",
   "relativeFullNameLabelText": "关系人",
   "relativeNamePlaceholder": "名字 姓氏",
+  "removeIdentifierButton": "Remove Identifier",
   "resetIdentifierTooltip": "重置",
   "restoreRelationshipActionButton": "撤销",
   "searchAddress": "搜索地址",

package/translations/zh_CN.json

@@ -14,12 +14,15 @@
   "codedPersonAttributeNoAnswerSet": "人员属性字段'{{codedPersonAttributeFieldId}}'的类型为'coded'，但未定义答案概念集UUID。'answerConceptSetUuid'键是必需的。",
   "configure": "配置",
   "configureIdentifiers": "配置ID标识",
+  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
   "contactSection": "联系方式",
   "createNewPatient": "Create new patient",
   "dateOfBirthLabelText": "出生日期",
   "deathDateInputLabel": "死亡日期",
   "deathdayNotInTheFuture": "死亡日期不能是未来的日期",
   "deathSection": "死亡信息",
+  "deleteIdentifierModalHeading": "Remove identifier?",
+  "deleteIdentifierModalText": " has a value of ",
   "deleteIdentifierTooltip": "删除",
   "deleteRelationshipTooltipText": "删除",
   "demographicsSection": "基本信息",
@@ -74,6 +77,7 @@
   "relationshipToPatient": "与患者的关系",
   "relativeFullNameLabelText": "关系人",
   "relativeNamePlaceholder": "名字 姓氏",
+  "removeIdentifierButton": "Remove Identifier",
   "resetIdentifierTooltip": "重置",
   "restoreRelationshipActionButton": "撤销",
   "searchAddress": "搜索地址",