resolved conflicts

openmrs · Oct 7, 2024 · 9875458 · 9875458
2 parents e9ff288 + fb914c6
commit 9875458
Show file tree

Hide file tree

Showing 38 changed files with 870 additions and 624 deletions.
diff --git a/.gitignore b/.gitignore
@@ -90,3 +90,6 @@ results.xml
 moduleName
 
 .env
+
+# vim
+.swp
diff --git a/.husky/pre-push b/.husky/pre-push
@@ -3,4 +3,4 @@
 
 set -e  # die on error
 
-# yarn verify
+yarn verify
diff --git a/.tx/config b/.tx/config
@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-active-visits-app]
+[o:openmrs:p:openmrs3:r:esm-active-visits-app]
 file_filter            = packages/esm-active-visits-app/translations/<lang>.json
 source_file            = packages/esm-active-visits-app/translations/en.json
 source_lang            = en
@@ -10,7 +10,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-active-visits-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-appointments-app]
+[o:openmrs:p:openmrs3:r:esm-appointments-app]
 file_filter            = packages/esm-appointments-app/translations/<lang>.json
 source_file            = packages/esm-appointments-app/translations/en.json
 source_lang            = en
@@ -19,7 +19,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-appointments-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-bed-management-app]
+[o:openmrs:p:openmrs3:r:esm-bed-management-app]
 file_filter            = packages/esm-bed-management-app/translations/<lang>.json
 source_file            = packages/esm-bed-management-app/translations/en.json
 source_lang            = en
@@ -28,7 +28,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-bed-management-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-patient-list-management-app]
+[o:openmrs:p:openmrs3:r:esm-patient-list-management-app]
 file_filter            = packages/esm-patient-list-management-app/translations/<lang>.json
 source_file            = packages/esm-patient-list-management-app/translations/en.json
 source_lang            = en
@@ -37,7 +37,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-patient-list-management-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-patient-registration-app]
+[o:openmrs:p:openmrs3:r:esm-patient-registration-app]
 file_filter            = packages/esm-patient-registration-app/translations/<lang>.json
 source_file            = packages/esm-patient-registration-app/translations/en.json
 source_lang            = en
@@ -46,7 +46,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-patient-registration-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-patient-search-app]
+[o:openmrs:p:openmrs3:r:esm-patient-search-app]
 file_filter            = packages/esm-patient-search-app/translations/<lang>.json
 source_file            = packages/esm-patient-search-app/translations/en.json
 source_lang            = en
@@ -55,7 +55,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-patient-search-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-service-queues-app]
+[o:openmrs:p:openmrs3:r:esm-service-queues-app]
 file_filter            = packages/esm-service-queues-app/translations/<lang>.json
 source_file            = packages/esm-service-queues-app/translations/en.json
 source_lang            = en

diff --git a/e2e/commands/cohort-operations.ts b/e2e/commands/cohort-operations.ts
@@ -1,5 +1,5 @@
-import { APIRequestContext, expect } from '@playwright/test';
-import { Patient } from './patient-operations';
+import { type APIRequestContext, expect } from '@playwright/test';
+import { type Patient } from './patient-operations';
 
 export interface CohortType {
   uuid: string;

diff --git a/...s/esm-patient-list-management-app/src/add-patient-to-patient-list-menu-item.component.tsx b/...s/esm-patient-list-management-app/src/add-patient-to-patient-list-menu-item.component.tsx
@@ -22,6 +22,7 @@ const AddPatientToPatientListMenuItem: React.FC<AddPastVisitOverflowMenuItemProp
     const dispose = showModal('add-patient-to-patient-list-modal', {
       closeModal: () => dispose(),
       patientUuid,
+      size: 'sm',
     });
     closeOverflowMenu();
   }, [patientUuid]);

diff --git a/packages/esm-patient-list-management-app/src/add-patient-to-patient-list-menu-item.test.tsx b/packages/esm-patient-list-management-app/src/add-patient-to-patient-list-menu-item.test.tsx
@@ -26,6 +26,10 @@ describe('AddPatientToPatientListMenuItem', () => {
 
     await user.click(button);
 
-    expect(mockShowModal).toHaveBeenCalledWith('add-patient-to-patient-list-modal', expect.any(Object));
+    expect(mockShowModal).toHaveBeenCalledWith('add-patient-to-patient-list-modal', {
+      closeModal: expect.any(Function),
+      size: 'sm',
+      patientUuid: mockPatient.uuid,
+    });
   });
 });