Merge branch 'main' into chore/update-transifex

openmrs · Jan 13, 2025 · 1641dde · 1641dde
2 parents 5db19ee + 8d84f6c
commit 1641dde
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 126 deletions.
diff --git a/...registration-app/src/add-patient-link.tsx → ...on-app/src/add-patient-link.extension.tsx b/...registration-app/src/add-patient-link.tsx → ...on-app/src/add-patient-link.extension.tsx
@@ -3,14 +3,16 @@ import { HeaderGlobalAction } from '@carbon/react';
 import { UserFollow } from '@carbon/react/icons';
 import { navigate } from '@openmrs/esm-framework';
 import styles from './add-patient-link.scss';
+import { useTranslation } from 'react-i18next';
 
 export default function Root() {
+  const { t } = useTranslation();
   const addPatient = React.useCallback(() => navigate({ to: '${openmrsSpaBase}/patient-registration' }), []);
 
   return (
     <HeaderGlobalAction
-      aria-label="Add Patient"
-      aria-labelledby="Add Patient"
+      aria-label={t('addPatient', 'Add patient')}
+      aria-labelledby={t('addPatient', 'Add patient')}
       enterDelayMs={500}
       name="AddPatientIcon"
       onClick={addPatient}

diff --git a/packages/esm-patient-registration-app/src/add-patient-link.test.tsx b/packages/esm-patient-registration-app/src/add-patient-link.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
 import { navigate } from '@openmrs/esm-framework';
-import Root from './add-patient-link';
+import Root from './add-patient-link.extension';
 
 const mockNavigate = jest.mocked(navigate);
 

diff --git a/packages/esm-patient-registration-app/src/index.ts b/packages/esm-patient-registration-app/src/index.ts
@@ -3,7 +3,7 @@ import { esmPatientRegistrationSchema } from './config-schema';
 import { moduleName, patientRegistration } from './constants';
 import { setupOffline } from './offline';
 import rootComponent from './root.component';
-import addPatientLinkComponent from './add-patient-link';
+import addPatientLinkComponent from './add-patient-link.extension';
 import editPatientDetailsButtonComponent from './widgets/edit-patient-details-button.component';
 import { PatientPhotoExtension } from './patient-photo.extension';
 

diff --git a/packages/esm-patient-registration-app/translations/en.json b/packages/esm-patient-registration-app/translations/en.json
@@ -1,4 +1,5 @@
 {
+  "addPatient": "Add patient",
   "addRelationshipButtonText": "Add Relationship",
   "addressHeader": "Address",
   "allFieldsRequiredText": "All fields are required unless marked optional",

diff --git a/packages/esm-ward-app/src/routes.json b/packages/esm-ward-app/src/routes.json
@@ -87,22 +87,19 @@
       "component": "admissionRequestWorkspace",
       "title": "admissionRequests",
       "type": "pending-admission-requests",
-      "width": "wider",
-      "groups": ["ward-patient-admission-requests"]
+      "width": "wider"
     },{
       "name": "create-admission-encounter-workspace",
       "component": "createAdmissionEncounterWorkspace",
       "title": "admitPatient",
       "type": "patient-search-workspace",
-      "width": "wider",
-      "groups": ["ward-patient-admission-requests"]
+      "width": "wider"
     },
     {
       "name": "ward-patient-notes-workspace",
       "component": "wardPatientNotesWorkspace",
       "type": "ward-patient-notes",
-      "title": "inpatientNotesWorkspaceTitle",
-      "groups": ["ward-patient"]
+      "title": "inpatientNotesWorkspaceTitle"
 
     },
     {
@@ -116,15 +113,13 @@
       "component": "wardPatientWorkspace",
       "type": "ward",
       "title": "Ward patient",
-      "width": "extra-wide",
-      "groups": ["ward-patient"]
+      "width": "extra-wide"
     },
     {
       "name": "patient-transfer-swap-workspace",
       "component": "patientTransferAndSwapWorkspace",
       "title": "transfers",
-      "type": "transfer-swap-bed-form",
-      "groups": ["ward-patient"]
+      "type": "transfer-swap-bed-form"
 
     },
     {
@@ -137,22 +132,39 @@
       "name": "patient-discharge-workspace",
       "component": "patientDischargeWorkspace",
       "title": "discharge",
-      "type": "ward-patient-discharge",
-      "groups": ["ward-patient"]
+      "type": "ward-patient-discharge"
     },
     {
       "name": "ward-patient-clinical-forms-workspace",
       "component": "patientClinicalFormsWorkspace",
       "title": "clinicalForms",
       "type": "ward-patient-clinical-forms",
-      "width": "wider",
-      "groups": ["ward-patient"]
+      "width": "wider"
     },
     {
       "name": "cancel-admission-request-workspace",
       "component": "cancelAdmissionRequestWorkspace",
       "title": "cancelAdmissionRequest",
       "type": "cancel-admission-request"
     }
+  ],
+  "workspaceGroups": [
+    {
+      "name": "ward-patient",
+      "members": [
+        "ward-patient-workspace",
+        "ward-patient-notes-workspace",
+        "patient-transfer-swap-workspace",
+        "patient-discharge-workspace",
+        "ward-patient-clinical-forms-workspace"
+      ]
+    },
+    {
+      "name": "ward-patient-admission-requests",
+      "members": [
+        "admission-requests-workspace",
+        "create-admission-encounter-workspace"
+      ]
+    }
   ]
 }