From bf5f4d104388be5f0988910f655e9aa1f34bfe82 Mon Sep 17 00:00:00 2001 From: Donald Kibet Date: Mon, 14 Oct 2024 23:08:13 +0300 Subject: [PATCH] (chore) : update fork with community latest changes --- package.json | 2 +- packages/esm-bed-management-app/package.json | 4 +- .../src/routes.json | 4 +- .../translations/en.json | 26 ++- yarn.lock | 192 +++++++++--------- 5 files changed, 107 insertions(+), 121 deletions(-) diff --git a/package.json b/package.json index 3a09124bb..629397f0b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openmrs/esm-patient-management", - "version": "8.0.2", + "version": "8.1.0", "private": true, "description": "Patient management microfrontend for the OpenMRS 3.x frontend", "workspaces": [ diff --git a/packages/esm-bed-management-app/package.json b/packages/esm-bed-management-app/package.json index fe6cb162f..0d30f3456 100644 --- a/packages/esm-bed-management-app/package.json +++ b/packages/esm-bed-management-app/package.json @@ -1,6 +1,6 @@ { - "name": "@openmrs/esm-bed-management-app", - "version": "8.0.2", + "name": "@kenyaemr/esm-bed-management-app", + "version": "8.1.0", "description": "Bed management app for OpenMRS 3", "browser": "dist/openmrs-esm-bed-management-app.js", "main": "src/index.ts", diff --git a/packages/esm-patient-registration-app/src/routes.json b/packages/esm-patient-registration-app/src/routes.json index 9c878f29e..63f91e9fb 100644 --- a/packages/esm-patient-registration-app/src/routes.json +++ b/packages/esm-patient-registration-app/src/routes.json @@ -63,9 +63,7 @@ { "component": "confirmClientRegistryModal", "name": "confirm-client-registry-modal" - } - ], - "modals": [ + }, { "component": "hieConfirmationModal", "name": "hie-confirmation-modal" diff --git a/packages/esm-patient-registration-app/translations/en.json b/packages/esm-patient-registration-app/translations/en.json index e1509b39f..81a90277d 100644 --- a/packages/esm-patient-registration-app/translations/en.json +++ b/packages/esm-patient-registration-app/translations/en.json @@ -10,6 +10,10 @@ "birthFieldLabelText": "Birth", "cancel": "Cancel", "causeOfDeathInputLabel": "Cause of death", + "clientRegistryEmpty": "Create & Post Patient", + "clientRegistryError": "Error occurred while reaching the client registry", + "clientRegistryErrorSubtitle": "Please proceed with registration contact system admin and try again later", + "clientVerificationWithClientRegistry": "Client verification with client registry", "closeOverlay": "Close overlay", "codedPersonAttributeAnswerSetEmpty": "The coded person attribute field '{{codedPersonAttributeFieldId}}' has been defined with an answer concept set UUID '{{answerConceptSetUuid}}' that does not have any concept answers.", "codedPersonAttributeAnswerSetInvalid": "The coded person attribute field '{{codedPersonAttributeFieldId}}' has been defined with an invalid answer concept set UUID '{{answerConceptSetUuid}}'.", @@ -20,7 +24,9 @@ "confirmDiscardChangesTitle": "Are you sure you want to discard these changes?", "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?", "contactSection": "Contact Details", + "continue": "Continue", "createNewPatient": "Create new patient", + "dateOfBirth": "Date of birth", "dateOfBirthLabelText": "Date of birth", "deathCauseRequired": "Cause of death is required", "deathDateInFuture": "Death date cannot be in future", @@ -29,12 +35,6 @@ "deathdayInvalidDate": "Death date and time cannot be before the birthday", "deathdayIsRequired": "Death date is required when the patient is marked as deceased.", "deathdayNotInTheFuture": "", - "cityVillage": "City", - "clientRegistryEmpty": "Create & Post Patient", - "clientVerificationWithClientRegistry": "Client verification with client registry", - "continue": "Continue", - "createNewPatient": "Create new patient", - "dateOfBirth": "Date of birth", "deathSection": "Death Info", "deathTimeFormatInvalid": "Time format is invalid", "deathTimeFormatRequired": "Time format is required", @@ -51,6 +51,7 @@ "editIdentifierTooltip": "Edit", "editPatientDetails": "Edit patient details", "editPatientDetailsBreadcrumb": "Edit patient details", + "enterIdentifierSearchValue": "Enter identifier search value", "enterNonCodedCauseOfDeath": "Enter non-coded cause of death", "error": "Error", "errorFetchingCodedCausesOfDeath": "Error fetching coded causes of death", @@ -83,11 +84,9 @@ "male": "Male", "maritalStatus": "Marital status", "middleNameLabelText": "Middle Name", + "nationalId": "National ID", "negativeMonths": "Estimated months cannot be negative", "negativeYears": "Estimated years cannot be negative", - "months": "Months", - "nascopNumber": "Nascop facility no", - "nationalId": "National ID", "no": "No", "nonCodedCauseOfDeath": "Non-coded cause of death", "nonCodedCauseOfDeathRequired": "Cause of death is required", @@ -100,13 +99,12 @@ "patientDetailsFound": "Patient information found in the registry, do you want to use the information to continue with registration?", "patientName": "Patient name", "patientNameKnown": "Patient's Name is Known?", - "patientRegistrationBreadcrumb": "Patient Registration", - "refreshOrContactAdmin": "Try refreshing the page or contact your system administrator", - "registerPatient": "Register patient", "patientNotFound": "The patient records could not be found in Client registry, do you want to continue to create and post patient to registry", "patientRegistrationBreadcrumb": "Patient Registration", "patientVerificationFromHIE": "Patient verification from HIE", "postToRegistry": "Post to registry", + "refreshOrContactAdmin": "Try refreshing the page or contact your system administrator", + "registerPatient": "Register patient", "registerPatientSuccessSnackbarSubtitle": "The patient can now be found by searching for them using their name or ID number", "registerPatientSuccessSnackbarTitle": "New Patient Created", "registrationErrorSnackbarTitle": "Patient Registration Failed", @@ -142,9 +140,9 @@ "updatePatientErrorSnackbarTitle": "Patient Details Update Failed", "updatePatientSuccessSnackbarSubtitle": "The patient's information has been successfully updated", "updatePatientSuccessSnackbarTitle": "Patient Details Updated", - "yearsEstimateRequired": "Estimated years required", "useValues": "Use values", "validate": "Validate", - "years": "Years", + "viewFullResponse": "View full response", + "yearsEstimateRequired": "Estimated years required", "yes": "Yes" } diff --git a/yarn.lock b/yarn.lock index f852acda3..b35cea318 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2583,6 +2583,97 @@ __metadata: languageName: node linkType: hard +"@kenyaemr/esm-active-visits-app@workspace:packages/esm-active-visits-app": + version: 0.0.0-use.local + resolution: "@kenyaemr/esm-active-visits-app@workspace:packages/esm-active-visits-app" + dependencies: + "@carbon/react": "npm:~1.37.0" + lodash-es: "npm:^4.17.15" + webpack: "npm:^5.74.0" + peerDependencies: + "@openmrs/esm-framework": 5.x + dayjs: 1.x + react: ^18.1.0 + react-dom: ^18.1.0 + react-i18next: 11.x + swr: 2.x + languageName: unknown + linkType: soft + +"@kenyaemr/esm-appointments-app@workspace:packages/esm-appointments-app": + version: 0.0.0-use.local + resolution: "@kenyaemr/esm-appointments-app@workspace:packages/esm-appointments-app" + dependencies: + "@carbon/react": "npm:~1.37.0" + formik: "npm:^2.2.9" + lodash-es: "npm:^4.17.15" + webpack: "npm:^5.74.0" + yup: "npm:^0.32.11" + peerDependencies: + "@openmrs/esm-framework": 5.x + "@openmrs/esm-patient-common-lib": 8.x + react: 18.x + react-i18next: 11.x + react-router-dom: 6.x + swr: 2.x + languageName: unknown + linkType: soft + +"@kenyaemr/esm-bed-management-app@workspace:packages/esm-bed-management-app": + version: 0.0.0-use.local + resolution: "@kenyaemr/esm-bed-management-app@workspace:packages/esm-bed-management-app" + dependencies: + "@carbon/react": "npm:~1.37.0" + lodash-es: "npm:^4.17.15" + webpack: "npm:^5.74.0" + peerDependencies: + "@openmrs/esm-framework": 5.x + dayjs: 1.x + react: 18.x + react-i18next: 11.x + react-router-dom: 6.x + swr: 2.x + languageName: unknown + linkType: soft + +"@kenyaemr/esm-patient-list-management-app@workspace:packages/esm-patient-list-management-app": + version: 0.0.0-use.local + resolution: "@kenyaemr/esm-patient-list-management-app@workspace:packages/esm-patient-list-management-app" + dependencies: + "@carbon/react": "npm:~1.37.0" + dexie: "npm:^3.0.3" + fuzzy: "npm:^0.1.3" + lodash-es: "npm:^4.17.15" + webpack: "npm:^5.74.0" + peerDependencies: + "@openmrs/esm-framework": 5.x + react: 18.x + react-i18next: 11.x + react-router-dom: 6.x + swr: 2.x + languageName: unknown + linkType: soft + +"@kenyaemr/esm-patient-registration-app@workspace:packages/esm-patient-registration-app": + version: 0.0.0-use.local + resolution: "@kenyaemr/esm-patient-registration-app@workspace:packages/esm-patient-registration-app" + dependencies: + "@carbon/react": "npm:~1.37.0" + formik: "npm:^2.1.5" + lodash-es: "npm:^4.17.15" + uuid: "npm:^8.3.2" + webpack: "npm:^5.74.0" + yup: "npm:^0.29.1" + peerDependencies: + "@openmrs/esm-framework": 5.x + dayjs: 1.x + react: 18.x + react-i18next: 11.x + react-router-dom: 6.x + swr: 2.x + languageName: unknown + linkType: soft + "@kenyaemr/esm-patient-search-app@workspace:packages/esm-patient-search-app": version: 0.0.0-use.local resolution: "@kenyaemr/esm-patient-search-app@workspace:packages/esm-patient-search-app" @@ -2762,23 +2853,6 @@ __metadata: languageName: node linkType: hard -"@openmrs/esm-active-visits-app@workspace:packages/esm-active-visits-app": - version: 0.0.0-use.local - resolution: "@openmrs/esm-active-visits-app@workspace:packages/esm-active-visits-app" - dependencies: - "@carbon/react": "npm:~1.37.0" - lodash-es: "npm:^4.17.15" - webpack: "npm:^5.74.0" - peerDependencies: - "@openmrs/esm-framework": 5.x - dayjs: 1.x - react: ^18.1.0 - react-dom: ^18.1.0 - react-i18next: 11.x - swr: 2.x - languageName: unknown - linkType: soft - "@openmrs/esm-api@npm:5.8.2-pre.2394": version: 5.8.2-pre.2394 resolution: "@openmrs/esm-api@npm:5.8.2-pre.2394" @@ -2829,42 +2903,6 @@ __metadata: languageName: node linkType: hard -"@openmrs/esm-appointments-app@workspace:packages/esm-appointments-app": - version: 0.0.0-use.local - resolution: "@openmrs/esm-appointments-app@workspace:packages/esm-appointments-app" - dependencies: - "@carbon/react": "npm:~1.37.0" - formik: "npm:^2.2.9" - lodash-es: "npm:^4.17.15" - webpack: "npm:^5.74.0" - yup: "npm:^0.32.11" - peerDependencies: - "@openmrs/esm-framework": 5.x - "@openmrs/esm-patient-common-lib": 8.x - react: 18.x - react-i18next: 11.x - react-router-dom: 6.x - swr: 2.x - languageName: unknown - linkType: soft - -"@openmrs/esm-bed-management-app@workspace:packages/esm-bed-management-app": - version: 0.0.0-use.local - resolution: "@openmrs/esm-bed-management-app@workspace:packages/esm-bed-management-app" - dependencies: - "@carbon/react": "npm:~1.37.0" - lodash-es: "npm:^4.17.15" - webpack: "npm:^5.74.0" - peerDependencies: - "@openmrs/esm-framework": 5.x - dayjs: 1.x - react: 18.x - react-i18next: 11.x - react-router-dom: 6.x - swr: 2.x - languageName: unknown - linkType: soft - "@openmrs/esm-config@npm:5.8.2-pre.2394": version: 5.8.2-pre.2394 resolution: "@openmrs/esm-config@npm:5.8.2-pre.2394" @@ -3112,22 +3150,6 @@ __metadata: languageName: unknown linkType: soft -"@openmrs/esm-patient-search-app@workspace:packages/esm-patient-search-app": - version: 0.0.0-use.local - resolution: "@openmrs/esm-patient-search-app@workspace:packages/esm-patient-search-app" - dependencies: - "@carbon/react": "npm:~1.37.0" - lodash-es: "npm:^4.17.15" - webpack: "npm:^5.74.0" - peerDependencies: - "@openmrs/esm-framework": 5.x - react: ^18.1.0 - react-i18next: 11.x - react-router-dom: 6.x - swr: 2.x - languageName: unknown - linkType: soft - "@openmrs/esm-react-utils@npm:5.8.2-pre.2394": version: 5.8.2-pre.2394 resolution: "@openmrs/esm-react-utils@npm:5.8.2-pre.2394" @@ -3170,22 +3192,6 @@ __metadata: languageName: node linkType: hard -"@openmrs/esm-service-queues-app@workspace:packages/esm-service-queues-app": - version: 0.0.0-use.local - resolution: "@openmrs/esm-service-queues-app@workspace:packages/esm-service-queues-app" - dependencies: - "@carbon/react": "npm:~1.37.0" - lodash-es: "npm:^4.17.15" - webpack: "npm:^5.74.0" - peerDependencies: - "@openmrs/esm-framework": 5.x - react: ^18.1.0 - react-i18next: 11.x - react-router-dom: 6.x - swr: 2.x - languageName: unknown - linkType: soft - "@openmrs/esm-state@npm:5.8.2-pre.2394": version: 5.8.2-pre.2394 resolution: "@openmrs/esm-state@npm:5.8.2-pre.2394" @@ -3255,22 +3261,6 @@ __metadata: languageName: node linkType: hard -"@openmrs/esm-ward-app@workspace:packages/esm-ward-app": - version: 0.0.0-use.local - resolution: "@openmrs/esm-ward-app@workspace:packages/esm-ward-app" - dependencies: - "@carbon/react": "npm:~1.37.0" - lodash-es: "npm:^4.17.15" - webpack: "npm:^5.74.0" - peerDependencies: - "@openmrs/esm-framework": 5.x - react: ^18.1.0 - react-i18next: 11.x - react-router-dom: 6.x - swr: 2.x - languageName: unknown - linkType: soft - "@openmrs/webpack-config@npm:5.8.2-pre.2394": version: 5.8.2-pre.2394 resolution: "@openmrs/webpack-config@npm:5.8.2-pre.2394"