From 7f13742341c4f9aa371dfedb1f41393dddd6bfbd Mon Sep 17 00:00:00 2001 From: Isaac Akileng Date: Thu, 31 Oct 2024 17:44:07 +0300 Subject: [PATCH 1/3] Add versions to frontend modules --- .../main/resources/openmrs-distro.properties | 66 ++++++++----------- .../main/resources/frontendconfigs/build.sh | 8 +-- .../configuration/spa-build-config.json | 57 ++++++++-------- 3 files changed, 61 insertions(+), 70 deletions(-) diff --git a/api/src/main/resources/openmrs-distro.properties b/api/src/main/resources/openmrs-distro.properties index dad2c958..5a9b724a 100644 --- a/api/src/main/resources/openmrs-distro.properties +++ b/api/src/main/resources/openmrs-distro.properties @@ -67,53 +67,45 @@ omod.attachments=${attachmentsVersion} omod.initializer=${initializerVersion} #Openmrs modules -spa.frontendModules.@openmrs/esm-cohort-builder-app=next -spa.frontendModules.@openmrs/esm-devtools-app=next -spa.frontendModules.@openmrs/esm-dispensing-app=next -spa.frontendModules.@openmrs/esm-home-app=next -spa.frontendModules.@openmrs/esm-implementer-tools-app=next -spa.frontendModules.@openmrs/esm-patient-allergies-app=next -spa.frontendModules.@openmrs/esm-patient-attachments-app=next -spa.frontendModules.@openmrs/esm-patient-banner-app=next -spa.frontendModules.@openmrs/esm-patient-chart-app=next -spa.frontendModules.@openmrs/esm-patient-conditions-app=next -spa.frontendModules.@openmrs/esm-patient-forms-app=next -spa.frontendModules.@openmrs/esm-form-builder-app=next -spa.frontendModules.@openmrs/esm-form-engine-app=next -spa.frontendModules.@openmrs/esm-patient-list-app=next -spa.frontendModules.@openmrs/esm-patient-medications-app=next -spa.frontendModules.@openmrs/esm-patient-orders-app=next -spa.frontendModules.@openmrs/esm-patient-programs-app=next -spa.frontendModules.@openmrs/esm-patient-search-app=next -spa.frontendModules.@openmrs/esm-patient-vitals-app=next -spa.frontendModules.@openmrs/esm-system-admin-app=next -spa.frontendModules.@openmrs/esm-patient-immunizations-app=next -spa.frontendModules.@openmrs/esm-stock-management-app=next -spa.frontendModules.@ohri/openmrs-esm-ohri-form-render-app=next +spa.frontendModules.@openmrs/esm-cohort-builder-app=4.0.0 +spa.frontendModules.@openmrs/esm-devtools-app=5.8.1 +spa.frontendModules.@openmrs/esm-dispensing-app=1.5.0 +spa.frontendModules.@openmrs/esm-home-app=5.5.0 +spa.frontendModules.@openmrs/esm-implementer-tools-app=5.8.1 +spa.frontendModules.@openmrs/esm-patient-allergies-app=8.2.0 +spa.frontendModules.@openmrs/esm-patient-banner-app=8.2.0 +spa.frontendModules.@openmrs/esm-patient-chart-app=8.2.0 +spa.frontendModules.@openmrs/esm-patient-conditions-app=8.2.0 +spa.frontendModules.@openmrs/esm-patient-forms-app=8.2.0 +spa.frontendModules.@openmrs/esm-form-builder-app=2.7.0 +spa.frontendModules.@openmrs/esm-form-engine-app=8.2.0 +spa.frontendModules.@openmrs/esm-patient-list-app=5.1.0 +spa.frontendModules.@openmrs/esm-patient-medications-app=8.2.0 +spa.frontendModules.@openmrs/esm-patient-orders-app=8.2.0 +spa.frontendModules.@openmrs/esm-patient-search-app=8.0.2 +spa.frontendModules.@openmrs/esm-patient-vitals-app=8.2.0 +spa.frontendModules.@openmrs/esm-system-admin-app=4.0.4 +spa.frontendModules.@openmrs/esm-appointments-app=8.0.2 +spa.frontendModules.@openmrs/esm-stock-management-app=1.0.1-pre.327 +spa.frontendModules.@openmrs/esm-help-menu-app=5.8.1 +spa.frontendModules.@openmrs/esm-patient-attachments-app=8.2.0 +spa.frontendModules.@openmrs/esm-patient-programs-app=8.2.0 #Ugandaemr modules -spa.frontendModules.@ugandaemr/esm-data-visualizer-app=next spa.frontendModules.@ugandaemr/esm-login-app=next -spa.frontendModules.@ugandaemr/esm-outpatient-app=next spa.frontendModules.@ugandaemr/esm-patient-queues-app=next -spa.frontendModules.@ugandaemr/esm-radiology-app=next -spa.frontendModules.@ugandaemr/esm-theatre-app=next -spa.frontendModules.@ugandaemr/esm-ugandaemr-app=next +spa.frontendModules.@ugandaemr/esm-laboratory-app=next +spa.frontendModules.@ugandaemr/esm-data-visualizer-app=next +spa.frontendModules.@ugandaemr/esm-ugandaemr-exchange-app=next +spa.frontendModules.@ugandaemr/esm-care-panel-app=next spa.frontendModules.@ugandaemr/esm-patient-registration-app=next -spa.frontendModules.@ugandaemr/esm-inpatient-app=next +spa.frontendModules.@ugandaemr/esm-ugandaemr-app=next spa.frontendModules.@ugandaemr/esm-primary-navigation-app=next -spa.frontendModules.@ugandaemr/esm-ugandaemr-exchange-app=next -spa.frontendModules.@openmrs/esm-appointments-app=next -spa.frontendModules.@openmrs/esm-patient-appointments-app=next spa.frontendModules.@ugandaemr/esm-patient-flags-app=next -spa.frontendModules.@ugandaemr/esm-patient-notes-app=next -spa.frontendModules.@ugandaemr/esm-care-panel-app=next -spa.frontendModules.@ugandaemr/esm-laboratory-app=next - -spa.core=5.5.0 +spa.core=5.8.1 spa.spaPath=/openmrs/spa/ spa.apiUrl=/openmrs/ spa.configUrls= diff --git a/tools/src/main/resources/frontendconfigs/build.sh b/tools/src/main/resources/frontendconfigs/build.sh index fed56e48..ee95939f 100644 --- a/tools/src/main/resources/frontendconfigs/build.sh +++ b/tools/src/main/resources/frontendconfigs/build.sh @@ -5,7 +5,7 @@ echo "Cleaning up previous build artifacts ..." rm -rf frontend # Assemble assets echo "Assembling assets ..." -npx --legacy-peer-deps openmrs@next assemble \ +npx --legacy-peer-deps openmrs@5.8.1 assemble \ --manifest \ --mode config \ --config ./configuration/spa-build-config.json \ @@ -13,18 +13,16 @@ npx --legacy-peer-deps openmrs@next assemble \ # Build assets echo "Building assets for UgandaEMR+..." CWD=$(pwd) -npx --legacy-peer-deps openmrs@next build \ +npx --legacy-peer-deps openmrs@5.8.1 build \ --build-config ./configuration/spa-build-config.json \ --target ./frontend \ --page-title "UgandaEMR+" \ --support-offline false # Copy required files echo "Copying required files ..." -cp -r "${CWD}/assets/*" "${CWD}/frontend" +cp -r "${CWD}/assets/" "${CWD}/frontend" # cp "${CWD}/assets/favicon.ico" "${CWD}/frontend" cp "${CWD}/configuration/frontend-config.json" "${CWD}/frontend" mv "${CWD}/frontend/frontend-config.json" "${CWD}/frontend/config.json" -cp -r assets/* frontend/. -zip -r frontend.zip frontend/* # Exit with success status exit 0 \ No newline at end of file diff --git a/tools/src/main/resources/frontendconfigs/configuration/spa-build-config.json b/tools/src/main/resources/frontendconfigs/configuration/spa-build-config.json index 6a4bc829..46b96303 100644 --- a/tools/src/main/resources/frontendconfigs/configuration/spa-build-config.json +++ b/tools/src/main/resources/frontendconfigs/configuration/spa-build-config.json @@ -1,37 +1,38 @@ { "frontendModules": { - "@openmrs/esm-patient-search-app": "next", - "@openmrs/esm-dispensing-app": "next", - "@openmrs/esm-appointments-app": "next", - "@openmrs/esm-form-engine-app": "next", - "@openmrs/esm-patient-vitals-app": "next", - "@openmrs/esm-cohort-builder-app": "next", + "@openmrs/esm-cohort-builder-app": "4.0.0", + "@openmrs/esm-devtools-app": "5.8.1", + "@openmrs/esm-dispensing-app": "1.5.0", + "@openmrs/esm-home-app": "5.5.0", + "@openmrs/esm-implementer-tools-app": "5.8.1", + "@openmrs/esm-patient-allergies-app": "8.2.0", + "@openmrs/esm-patient-banner-app": "8.2.0", + "@openmrs/esm-patient-chart-app": "8.2.0", + "@openmrs/esm-patient-conditions-app": "8.2.0", + "@openmrs/esm-patient-forms-app": "8.2.0", + "@openmrs/esm-form-builder-app": "2.7.0", + "@openmrs/esm-form-engine-app": "8.2.0", + "@openmrs/esm-patient-list-app": "5.1.0", + "@openmrs/esm-patient-medications-app": "8.2.0", + "@openmrs/esm-patient-orders-app": "8.2.0", + "@openmrs/esm-patient-search-app": "8.0.2", + "@openmrs/esm-patient-vitals-app": "8.2.0", + "@openmrs/esm-system-admin-app": "4.0.4", + "@openmrs/esm-appointments-app": "8.0.2", + "@openmrs/esm-stock-management-app": "1.0.1-pre.327", + "@openmrs/esm-help-menu-app": "5.8.1", + "@openmrs/esm-patient-attachments-app": "8.2.0", + "@openmrs/esm-patient-programs-app": "8.2.0", + "@ugandaemr/esm-login-app": "next", + "@ugandaemr/esm-patient-queues-app": "next", "@ugandaemr/esm-laboratory-app": "next", - "@openmrs/esm-devtools-app": "next", - "@openmrs/esm-system-admin-app": "next", - "@openmrs/esm-patient-allergies-app": "next", - "@ugandaemr/esm-care-panel-app": "next", - "@openmrs/esm-stock-management-app": "next ", - "@openmrs/esm-patient-conditions-app": "next", - "@ugandaemr/esm-ugandaemr-exchange-app": "next", - "@openmrs/esm-patient-orders-app": "next", - "@ugandaemr/esm-patient-flags-app": "next", - "@openmrs/esm-home-app": "next", "@ugandaemr/esm-data-visualizer-app": "next", - "@openmrs/esm-form-builder-app": "next", - "@openmrs/esm-patient-banner-app": "next", - "@ugandaemr/esm-ugandaemr-app": "next", + "@ugandaemr/esm-ugandaemr-exchange-app": "next", + "@ugandaemr/esm-care-panel-app": "next", "@ugandaemr/esm-patient-registration-app": "next", - "@ugandaemr/esm-login-app": "next", - "@openmrs/esm-patient-chart-app": "next", - "@openmrs/esm-implementer-tools-app": "next", - "@openmrs/esm-patient-forms-app": "next", + "@ugandaemr/esm-ugandaemr-app": "next", "@ugandaemr/esm-primary-navigation-app": "next", - "@openmrs/esm-patient-list-app": "next", - "@openmrs/esm-patient-medications-app": "next", - "@ugandaemr/esm-patient-queues-app": "next", - "@openmrs/esm-ward-app": "next", - "@openmrs/esm-help-menu-app": "next" + "@ugandaemr/esm-patient-flags-app": "next" }, "importmap": "/openmrs/spa/importmap.json", "apiUrl": "/openmrs/", From d335ffa290b660b44a11fc5400cba9400d652926 Mon Sep 17 00:00:00 2001 From: Isaac Akileng Date: Fri, 1 Nov 2024 11:29:29 +0300 Subject: [PATCH 2/3] Hide patient actions --- .../configuration/frontend-config.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/src/main/resources/frontendconfigs/configuration/frontend-config.json b/tools/src/main/resources/frontendconfigs/configuration/frontend-config.json index 938083c9..7784fc60 100644 --- a/tools/src/main/resources/frontendconfigs/configuration/frontend-config.json +++ b/tools/src/main/resources/frontendconfigs/configuration/frontend-config.json @@ -752,5 +752,24 @@ }, "enableStockDispense": true, "medicationRequestExpirationPeriodInDays": 1 + }, + "@openmrs/esm-patient-search-app": { + "extensionSlots": { + "patient-actions-slot": { + "remove": [ + "add-past-visit-button", + "cancel-visit-button", + "start-visit-button", + "stop-visit-button", + "mark-alive-button", + "mark-patient-deceased-button" + ] + }, + "start-visit-button-slot": { + "remove": [ + "start-visit-button-patient-search" + ] + } + } } } \ No newline at end of file From 238a6bcd038e74be97732cfb32947851158be894 Mon Sep 17 00:00:00 2001 From: Isaac Akileng Date: Fri, 1 Nov 2024 13:08:44 +0300 Subject: [PATCH 3/3] Update stock mgt version --- api/src/main/resources/openmrs-distro.properties | 2 +- .../frontendconfigs/configuration/spa-build-config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/resources/openmrs-distro.properties b/api/src/main/resources/openmrs-distro.properties index 5a9b724a..e76fe05f 100644 --- a/api/src/main/resources/openmrs-distro.properties +++ b/api/src/main/resources/openmrs-distro.properties @@ -86,7 +86,7 @@ spa.frontendModules.@openmrs/esm-patient-search-app=8.0.2 spa.frontendModules.@openmrs/esm-patient-vitals-app=8.2.0 spa.frontendModules.@openmrs/esm-system-admin-app=4.0.4 spa.frontendModules.@openmrs/esm-appointments-app=8.0.2 -spa.frontendModules.@openmrs/esm-stock-management-app=1.0.1-pre.327 +spa.frontendModules.@openmrs/esm-stock-management-app=1.0.1-pre.694 spa.frontendModules.@openmrs/esm-help-menu-app=5.8.1 spa.frontendModules.@openmrs/esm-patient-attachments-app=8.2.0 spa.frontendModules.@openmrs/esm-patient-programs-app=8.2.0 diff --git a/tools/src/main/resources/frontendconfigs/configuration/spa-build-config.json b/tools/src/main/resources/frontendconfigs/configuration/spa-build-config.json index 46b96303..522de14e 100644 --- a/tools/src/main/resources/frontendconfigs/configuration/spa-build-config.json +++ b/tools/src/main/resources/frontendconfigs/configuration/spa-build-config.json @@ -19,7 +19,7 @@ "@openmrs/esm-patient-vitals-app": "8.2.0", "@openmrs/esm-system-admin-app": "4.0.4", "@openmrs/esm-appointments-app": "8.0.2", - "@openmrs/esm-stock-management-app": "1.0.1-pre.327", + "@openmrs/esm-stock-management-app": "1.0.1-pre.694", "@openmrs/esm-help-menu-app": "5.8.1", "@openmrs/esm-patient-attachments-app": "8.2.0", "@openmrs/esm-patient-programs-app": "8.2.0",