Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Versions to Frontend Modules #659

Merged
merged 3 commits into from
Nov 1, 2024
Merged

Add Versions to Frontend Modules #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f13742
Add versions to frontend modules
akileng56 Oct 31, 2024
d335ffa
Hide patient actions
akileng56 Nov 1, 2024
238a6bc
Update stock mgt version
akileng56 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 29 additions & 37 deletions api/src/main/resources/openmrs-distro.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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


#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=
Expand Down
8 changes: 3 additions & 5 deletions tools/src/main/resources/frontendconfigs/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,24 @@ 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 \
--target ./frontend
# 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
19 changes: 19 additions & 0 deletions tools/src/main/resources/frontendconfigs/configuration/frontend-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
}
}
57 changes: 29 additions & 28 deletions tools/src/main/resources/frontendconfigs/configuration/spa-build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.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",
"@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/",
Expand Down
Loading