From a2be84a12766bcaa16f5fbd9bbd1e751639dff51 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Wed, 10 Jan 2024 15:37:56 +0300
Subject: [PATCH 1/3] (refactor) Set global testTimeout in Jest config

---
 jest.config.js                                                  | 1 +
 .../src/allergies/allergies-form/allergy-form.test.tsx          | 2 --
 .../src/visit/visit-form/visit-form.test.tsx                    | 2 --
 .../visits-widget/encounters-table/encounters-table.test.tsx    | 2 --
 .../past-visits-components/visits-table/visits-table.test.tsx   | 2 --
 .../src/visit/visits-widget/visit-detail-overview.test.tsx      | 2 --
 .../src/conditions/conditions-form.test.tsx                     | 2 --
 .../src/conditions/conditions-overview.test.tsx                 | 2 --
 .../src/flags/flags-highlight-bar.test.tsx                      | 2 --
 .../src/lab-orders/add-lab-order/add-lab-order.test.tsx         | 2 --
 .../esm-patient-notes-app/src/notes/notes-overview.test.tsx     | 2 --
 .../esm-patient-notes-app/src/notes/visit-notes-form.test.tsx   | 2 --
 .../src/programs/programs-detailed-summary.test.tsx             | 2 --
 .../src/programs/programs-form.test.tsx                         | 2 --
 .../src/programs/programs-overview.test.tsx                     | 2 --
 15 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 1da5959e6d..27563237ce 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -39,4 +39,5 @@ module.exports = {
   testEnvironmentOptions: {
     url: 'http://localhost/',
   },
+  testTimeout: 30000,
 };
diff --git a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
index 0246f6fb91..20e8c95985 100644
--- a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
+++ b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
@@ -14,8 +14,6 @@ const mockUseAllergicReactions = useAllergicReactions as jest.Mock;
 const mockShowSnackbar = showSnackbar as jest.Mock;
 const mockShowToast = showToast as jest.Mock;
 
-jest.setTimeout(15000);
-
 jest.mock('./allergy-form.resource', () => {
   const originalModule = jest.requireActual('./allergy-form.resource');
 
diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
index f39acc2232..6cbd63148c 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
@@ -8,8 +8,6 @@ import { mockPatient } from 'tools';
 import { useVisitAttributeType } from '../hooks/useVisitAttributeType';
 import StartVisitForm from './visit-form.component';
 
-jest.setTimeout(10000);
-
 const mockCloseWorkspace = jest.fn();
 const mockPromptBeforeClosing = jest.fn();
 
diff --git a/packages/esm-patient-chart-app/src/visit/visits-widget/encounters-table/encounters-table.test.tsx b/packages/esm-patient-chart-app/src/visit/visits-widget/encounters-table/encounters-table.test.tsx
index 5323abf2e6..99f213dab5 100644
--- a/packages/esm-patient-chart-app/src/visit/visits-widget/encounters-table/encounters-table.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visits-widget/encounters-table/encounters-table.test.tsx
@@ -6,8 +6,6 @@ import { renderWithSwr } from 'tools';
 import { mockEncounters2 } from '__mocks__';
 import EncountersTable from './encounters-table.component';
 
-jest.setTimeout(10000);
-
 const testProps = {
   showAllEncounters: true,
   encounters: mockEncounters2,
diff --git a/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visits-table/visits-table.test.tsx b/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visits-table/visits-table.test.tsx
index f3748000e9..2cbc0328d2 100644
--- a/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visits-table/visits-table.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visits-table/visits-table.test.tsx
@@ -6,8 +6,6 @@ import { mockPatient, renderWithSwr } from 'tools';
 import { mockEncounters } from '__mocks__';
 import VisitsTable from './visits-table.component';
 
-jest.setTimeout(10000);
-
 const testProps = {
   patientUuid: mockPatient.id,
   showAllEncounters: true,
diff --git a/packages/esm-patient-chart-app/src/visit/visits-widget/visit-detail-overview.test.tsx b/packages/esm-patient-chart-app/src/visit/visits-widget/visit-detail-overview.test.tsx
index 40d77f83ac..2dbbd1fdd6 100644
--- a/packages/esm-patient-chart-app/src/visit/visits-widget/visit-detail-overview.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visits-widget/visit-detail-overview.test.tsx
@@ -10,8 +10,6 @@ const testProps = {
   patientUuid: mockPatient.id,
 };
 
-jest.setTimeout(5000);
-
 const mockOpenmrsFetch = openmrsFetch as jest.Mock;
 const mockUseConfig = useConfig as jest.Mock;
 const mockGetConfig = getConfig as jest.Mock;
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
index f1067acbef..6a92b0c378 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
@@ -8,8 +8,6 @@ import { getByTextWithMarkup, mockPatient } from 'tools';
 import { createCondition, useConditionsSearch } from './conditions.resource';
 import ConditionsForm from './conditions-form.component';
 
-jest.setTimeout(10000);
-
 jest.mock('zod', () => {
   const originalModule = jest.requireActual('zod');
   const mockedZod = {
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx
index 66953db679..a8579d431e 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx
@@ -8,8 +8,6 @@ import { mockConditions, mockFhirConditionsResponse } from '__mocks__';
 import { mockPatient, renderWithSwr, waitForLoadingToFinish } from 'tools';
 import ConditionsOverview from './conditions-overview.component';
 
-jest.setTimeout(15000);
-
 const testProps = {
   patientUuid: mockPatient.id,
 };
diff --git a/packages/esm-patient-flags-app/src/flags/flags-highlight-bar.test.tsx b/packages/esm-patient-flags-app/src/flags/flags-highlight-bar.test.tsx
index afb3280317..8ff296cabb 100644
--- a/packages/esm-patient-flags-app/src/flags/flags-highlight-bar.test.tsx
+++ b/packages/esm-patient-flags-app/src/flags/flags-highlight-bar.test.tsx
@@ -7,8 +7,6 @@ import { mockPatientFlags } from '__mocks__';
 import { usePatientFlags } from './hooks/usePatientFlags';
 import FlagsHighlightBar from './flags-highlight-bar.component';
 
-jest.setTimeout(5000);
-
 const mockedUsePatientFlags = usePatientFlags as jest.Mock;
 
 jest.mock('@openmrs/esm-patient-common-lib', () => {
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
index 3d56cd27ff..efa5a9cd82 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
@@ -8,8 +8,6 @@ import { age, useConfig, useLayoutType, usePatient, useSession } from '@openmrs/
 import { type PostDataPrepFunction, useOrderBasket } from '@openmrs/esm-patient-common-lib';
 import { createEmptyLabOrder } from './lab-order';
 
-jest.setTimeout(10000);
-
 const mockUseConfig = useConfig as jest.Mock;
 const mockUseSession = useSession as jest.Mock;
 const mockUsePatient = usePatient as jest.Mock;
diff --git a/packages/esm-patient-notes-app/src/notes/notes-overview.test.tsx b/packages/esm-patient-notes-app/src/notes/notes-overview.test.tsx
index 029125dea7..11b6856b8c 100644
--- a/packages/esm-patient-notes-app/src/notes/notes-overview.test.tsx
+++ b/packages/esm-patient-notes-app/src/notes/notes-overview.test.tsx
@@ -7,8 +7,6 @@ import { mockPatient, patientChartBasePath, renderWithSwr } from 'tools';
 import NotesOverview from './notes-overview.component';
 import { useVisitNotes } from './visit-notes.resource';
 
-jest.setTimeout(20000);
-
 const testProps = {
   basePath: patientChartBasePath,
   patient: mockPatient,
diff --git a/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx b/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
index 37a694f9d3..ad4841d0d4 100644
--- a/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
+++ b/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
@@ -14,8 +14,6 @@ import {
 import { mockPatient, getByTextWithMarkup } from 'tools';
 import VisitNotesForm from './visit-notes-form.component';
 
-jest.setTimeout(10000);
-
 const testProps = {
   patientUuid: mockPatient.id,
   closeWorkspace: jest.fn(),
diff --git a/packages/esm-patient-programs-app/src/programs/programs-detailed-summary.test.tsx b/packages/esm-patient-programs-app/src/programs/programs-detailed-summary.test.tsx
index 4332df300a..6ecda40442 100644
--- a/packages/esm-patient-programs-app/src/programs/programs-detailed-summary.test.tsx
+++ b/packages/esm-patient-programs-app/src/programs/programs-detailed-summary.test.tsx
@@ -7,8 +7,6 @@ import { mockEnrolledProgramsResponse } from '__mocks__';
 import { mockPatient, renderWithSwr, waitForLoadingToFinish } from 'tools';
 import ProgramsDetailedSummary from './programs-detailed-summary.component';
 
-jest.setTimeout(20000);
-
 const mockOpenmrsFetch = openmrsFetch as jest.Mock;
 
 jest.mock('@openmrs/esm-framework', () => {
diff --git a/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx b/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
index 0df0ed02b2..6e438ca719 100644
--- a/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
+++ b/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
@@ -9,8 +9,6 @@ import { createProgramEnrollment, updateProgramEnrollment } from './programs.res
 import { mockPatient } from 'tools';
 import ProgramsForm from './programs-form.component';
 
-jest.setTimeout(20000);
-
 const testProps = {
   closeWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
diff --git a/packages/esm-patient-programs-app/src/programs/programs-overview.test.tsx b/packages/esm-patient-programs-app/src/programs/programs-overview.test.tsx
index ba3de4ef98..8ad1606bfe 100644
--- a/packages/esm-patient-programs-app/src/programs/programs-overview.test.tsx
+++ b/packages/esm-patient-programs-app/src/programs/programs-overview.test.tsx
@@ -8,8 +8,6 @@ import { mockEnrolledProgramsResponse } from '__mocks__';
 import { mockPatient, renderWithSwr, waitForLoadingToFinish } from 'tools';
 import ProgramsOverview from './programs-overview.component';
 
-jest.setTimeout(5000);
-
 const mockOpenmrsFetch = openmrsFetch as jest.Mock;
 const mockUsePagination = usePagination as jest.Mock;
 

From e225e59213ad06d70482d1b9fdf659a6d98a1e53 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Wed, 10 Jan 2024 15:39:32 +0300
Subject: [PATCH 2/3] Commit some orphaned translations

---
 packages/esm-patient-chart-app/translations/am.json | 2 --
 packages/esm-patient-chart-app/translations/ar.json | 2 --
 packages/esm-patient-chart-app/translations/en.json | 2 --
 packages/esm-patient-chart-app/translations/es.json | 2 --
 packages/esm-patient-chart-app/translations/fr.json | 2 --
 packages/esm-patient-chart-app/translations/he.json | 2 --
 packages/esm-patient-chart-app/translations/km.json | 2 --
 7 files changed, 14 deletions(-)

diff --git a/packages/esm-patient-chart-app/translations/am.json b/packages/esm-patient-chart-app/translations/am.json
index 4252b9656a..726d5e6a87 100644
--- a/packages/esm-patient-chart-app/translations/am.json
+++ b/packages/esm-patient-chart-app/translations/am.json
@@ -102,8 +102,6 @@
   "noDiagnosesFound": "No diagnoses found",
   "noEncountersFound": "No encounters found",
   "noEncountersToDisplay": "No encounters to display",
-  "noMedicationsFound": "No medications found",
-  "noNotesFound": "No notes found",
   "noObservationsFound": "No observations found",
   "notes": "Notes",
   "Offline Actions dashboard": "Offline Actions dashboard",
diff --git a/packages/esm-patient-chart-app/translations/ar.json b/packages/esm-patient-chart-app/translations/ar.json
index a1069ae6a0..3bb6f41833 100644
--- a/packages/esm-patient-chart-app/translations/ar.json
+++ b/packages/esm-patient-chart-app/translations/ar.json
@@ -102,8 +102,6 @@
   "noDiagnosesFound": "لم يتم العثور على تشخيصات",
   "noEncountersFound": "لم يتم العثور على لقاءات",
   "noEncountersToDisplay": "لا يوجد لقاءات لعرضها",
-  "noMedicationsFound": "لم يتم العثور على أدوية",
-  "noNotesFound": "لم يتم العثور على ملاحظات",
   "noObservationsFound": "لم يتم العثور على ملاحظات",
   "notes": "ملاحظات",
   "Offline Actions dashboard": "لوحة الإجراءات دون اتصال",
diff --git a/packages/esm-patient-chart-app/translations/en.json b/packages/esm-patient-chart-app/translations/en.json
index 72aece3346..a0fb764a17 100644
--- a/packages/esm-patient-chart-app/translations/en.json
+++ b/packages/esm-patient-chart-app/translations/en.json
@@ -102,8 +102,6 @@
   "noDiagnosesFound": "No diagnoses found",
   "noEncountersFound": "No encounters found",
   "noEncountersToDisplay": "No encounters to display",
-  "noMedicationsFound": "No medications found",
-  "noNotesFound": "No notes found",
   "noObservationsFound": "No observations found",
   "notes": "Notes",
   "Offline Actions dashboard": "Offline Actions dashboard",
diff --git a/packages/esm-patient-chart-app/translations/es.json b/packages/esm-patient-chart-app/translations/es.json
index 500d167d80..82d13ab356 100644
--- a/packages/esm-patient-chart-app/translations/es.json
+++ b/packages/esm-patient-chart-app/translations/es.json
@@ -102,8 +102,6 @@
   "noDiagnosesFound": "No se encontraron diagnósticos",
   "noEncountersFound": "No se encontraron encuentros",
   "noEncountersToDisplay": "No hay encuentros para mostrar",
-  "noMedicationsFound": "No se encontraron medicamentos",
-  "noNotesFound": "No se encontraron notas",
   "noObservationsFound": "No se encontraron observaciones",
   "notes": "Notas",
   "Offline Actions dashboard": "Panel de Acciones sin Conexión",
diff --git a/packages/esm-patient-chart-app/translations/fr.json b/packages/esm-patient-chart-app/translations/fr.json
index 94cc9b7491..8f9719c619 100644
--- a/packages/esm-patient-chart-app/translations/fr.json
+++ b/packages/esm-patient-chart-app/translations/fr.json
@@ -102,8 +102,6 @@
   "noDiagnosesFound": "Aucun diagnostic trouvé",
   "noEncountersFound": "Aucune rencontre trouvée",
   "noEncountersToDisplay": "Aucune rencontre à afficher",
-  "noMedicationsFound": "Aucun médicament trouvé",
-  "noNotesFound": "Aucune note trouvée",
   "noObservationsFound": "Aucune observation trouvée",
   "notes": "Notes",
   "Offline Actions dashboard": "Tableau de bord des actions hors ligne",
diff --git a/packages/esm-patient-chart-app/translations/he.json b/packages/esm-patient-chart-app/translations/he.json
index 9cca45d0ef..aa9833e481 100644
--- a/packages/esm-patient-chart-app/translations/he.json
+++ b/packages/esm-patient-chart-app/translations/he.json
@@ -102,8 +102,6 @@
   "noDiagnosesFound": "לא נמצאו אבחנות",
   "noEncountersFound": "לא נמצאו ביקורים",
   "noEncountersToDisplay": "אין ביקורים להצגה",
-  "noMedicationsFound": "לא נמצאו תרופות",
-  "noNotesFound": "לא נמצאו הערות",
   "noObservationsFound": "לא נמצאו תצפיות",
   "notes": "הערות",
   "Offline Actions dashboard": "לוח הפעולות לא מקוונות",
diff --git a/packages/esm-patient-chart-app/translations/km.json b/packages/esm-patient-chart-app/translations/km.json
index 4434df6458..29ee8d13c4 100644
--- a/packages/esm-patient-chart-app/translations/km.json
+++ b/packages/esm-patient-chart-app/translations/km.json
@@ -102,8 +102,6 @@
   "noDiagnosesFound": "រកមិនឃើញរោគវិនិច្ឆ័យទេ",
   "noEncountersFound": "រកមិនឃើញការជួបគ្នាទេ",
   "noEncountersToDisplay": "ពុំមានព័ត៌មានការពិនិត្យបង្ហាញទេ",
-  "noMedicationsFound": "រកមិនឃើញឱសថព្យាបាលទេ",
-  "noNotesFound": "រកមិនឃើញកំណត់ចំណាំទេ",
   "noObservationsFound": "រកមិនឃើញការសង្កេតទេ",
   "notes": "រកមិនឃើញការកត់ចំណាំទេ",
   "Offline Actions dashboard": "ផ្ទាំងគ្រប់គ្រងសកម្មភាពក្រៅបណ្តាញ",

From 94f3bca9c7a5a02f2be6b2cc5400cc8e17c0c6c9 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Wed, 10 Jan 2024 21:39:17 +0300
Subject: [PATCH 3/3] Lower global timeout to 20000ms

---
 jest.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jest.config.js b/jest.config.js
index 27563237ce..5d7f4b40b6 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -39,5 +39,5 @@ module.exports = {
   testEnvironmentOptions: {
     url: 'http://localhost/',
   },
-  testTimeout: 30000,
+  testTimeout: 20000,
 };