From 33c47b55e75f4620191ccc19a6c0c82a2254e8b9 Mon Sep 17 00:00:00 2001 From: pirupius Date: Fri, 8 Dec 2023 08:57:39 +0300 Subject: [PATCH 1/3] (chore) aligns importmap and login config --- config/importmap_dev.json | 3 --- frontend/ohri-config.json | 3 +++ frontend/spa-build-config.json | 13 ++++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 config/importmap_dev.json diff --git a/config/importmap_dev.json b/config/importmap_dev.json deleted file mode 100644 index 3a271bf58..000000000 --- a/config/importmap_dev.json +++ /dev/null @@ -1,3 +0,0 @@ - - -// Test file of config \ No newline at end of file diff --git a/frontend/ohri-config.json b/frontend/ohri-config.json index a34647d8c..971380da4 100644 --- a/frontend/ohri-config.json +++ b/frontend/ohri-config.json @@ -57,6 +57,9 @@ "@openmrs/esm-login-app": { "logo": { "src": "ohri_logo_light.svg" + }, + "links": { + "loginSuccess": "/openmrs/spa/dashboard/home" } }, "@ohri/openmrs-esm-ohri-pmtct": { diff --git a/frontend/spa-build-config.json b/frontend/spa-build-config.json index 678461984..edb49c972 100644 --- a/frontend/spa-build-config.json +++ b/frontend/spa-build-config.json @@ -33,7 +33,18 @@ "@openmrs/esm-patient-registration-app": "next", "@openmrs/esm-devtools-app": "next", "@openmrs/esm-system-admin-app":"next", - "@openmrs/esm-patient-orders-app": "next" + "@openmrs/esm-patient-orders-app": "next", + "@openmrs/esm-patient-lists-app": "next", + "@openmrs/esm-patient-flags-app": "next", + "@openmrs/esm-form-entry-app": "next", + "@openmrs/esm-generic-patient-widgets-app": "next", + "@openmrs/esm-openconceptlab-app": "next", + "@openmrs/esm-patient-list-management-app": "next", + "@openmrs/esm-active-visits-app": "next", + "@openmrs/esm-service-queues-app": "next", + "@openmrs/esm-patient-labs-app": "next", + "@openmrs/esm-cohort-builder-app": "next", + "@openmrs/esm-fast-data-entry-app": "next" }, "spaPath": "$SPA_PATH", "apiUrl": "$API_URL", From ff053d75ef897ce6b6ab64701f3815c3ad7514b7 Mon Sep 17 00:00:00 2001 From: pirupius Date: Fri, 8 Dec 2023 09:21:06 +0300 Subject: [PATCH 2/3] updates loginSuccess url --- frontend/ohri-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/ohri-config.json b/frontend/ohri-config.json index 971380da4..9aacadc1b 100644 --- a/frontend/ohri-config.json +++ b/frontend/ohri-config.json @@ -59,7 +59,7 @@ "src": "ohri_logo_light.svg" }, "links": { - "loginSuccess": "/openmrs/spa/dashboard/home" + "loginSuccess": "${openmrsSpaBase}/dashboard/home" } }, "@ohri/openmrs-esm-ohri-pmtct": { From 9f984c8dad200d2712b10902679235bc4d3cfa79 Mon Sep 17 00:00:00 2001 From: pirupius Date: Fri, 8 Dec 2023 10:15:17 +0300 Subject: [PATCH 3/3] (chore) remove unused packages from importmap --- frontend/spa-build-config.json | 54 ++++++++++++++++------------------ 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/frontend/spa-build-config.json b/frontend/spa-build-config.json index edb49c972..8cb7e8a92 100644 --- a/frontend/spa-build-config.json +++ b/frontend/spa-build-config.json @@ -1,19 +1,12 @@ { "frontendModules": { - "@ohri/openmrs-esm-ohri-cervical-cancer-app": "next", - "@ohri/openmrs-esm-ohri-core-app": "next", - "@ohri/openmrs-esm-ohri-covid-app": "next", - "@ohri/openmrs-esm-ohri-form-render-app": "next", - "@ohri/openmrs-esm-ohri-hiv-app": "next", - "@ohri/openmrs-esm-ohri-pmtct": "next", - "@ohri/openmrs-esm-ohri-tb-app": "next", - "@openmrs/esm-appointments-app": "next", - "@openmrs/esm-dispensing-app": "next", - "@openmrs/esm-form-builder-app": "next", - "@openmrs/esm-home-app": "next", + "@openmrs/esm-devtools-app": "next", "@openmrs/esm-implementer-tools-app": "next", "@openmrs/esm-login-app": "next", - "@openmrs/esm-outpatient-app": "next", + "@openmrs/esm-primary-navigation-app": "next", + "@openmrs/esm-home-app": "next", + "@openmrs/esm-form-entry-app": "next", + "@openmrs/esm-generic-patient-widgets-app": "next", "@openmrs/esm-patient-allergies-app": "next", "@openmrs/esm-patient-appointments-app": "next", "@openmrs/esm-patient-attachments-app": "next", @@ -21,30 +14,33 @@ "@openmrs/esm-patient-chart-app": "next", "@openmrs/esm-patient-conditions-app": "next", "@openmrs/esm-patient-forms-app": "next", - "@openmrs/esm-patient-immunizations-app": "next", - "@openmrs/esm-patient-list-app": "next", + "@openmrs/esm-patient-flags-app": "next", + "@openmrs/esm-patient-labs-app": "next", + "@openmrs/esm-patient-lists-app": "next", "@openmrs/esm-patient-medications-app": "next", "@openmrs/esm-patient-notes-app": "next", + "@openmrs/esm-patient-orders-app": "next", "@openmrs/esm-patient-programs-app": "next", - "@openmrs/esm-patient-search-app": "next", - "@openmrs/esm-patient-test-results-app": "next", "@openmrs/esm-patient-vitals-app": "next", - "@openmrs/esm-primary-navigation-app": "next", - "@openmrs/esm-patient-registration-app": "next", - "@openmrs/esm-devtools-app": "next", - "@openmrs/esm-system-admin-app":"next", - "@openmrs/esm-patient-orders-app": "next", - "@openmrs/esm-patient-lists-app": "next", - "@openmrs/esm-patient-flags-app": "next", - "@openmrs/esm-form-entry-app": "next", - "@openmrs/esm-generic-patient-widgets-app": "next", - "@openmrs/esm-openconceptlab-app": "next", - "@openmrs/esm-patient-list-management-app": "next", "@openmrs/esm-active-visits-app": "next", + "@openmrs/esm-appointments-app": "next", "@openmrs/esm-service-queues-app": "next", - "@openmrs/esm-patient-labs-app": "next", + "@openmrs/esm-patient-list-management-app": "next", + "@openmrs/esm-patient-registration-app": "next", + "@openmrs/esm-patient-search-app": "next", + "@openmrs/esm-openconceptlab-app": "next", + "@openmrs/esm-system-admin-app": "next", + "@openmrs/esm-dispensing-app": "next", + "@openmrs/esm-fast-data-entry-app": "next", "@openmrs/esm-cohort-builder-app": "next", - "@openmrs/esm-fast-data-entry-app": "next" + "@openmrs/esm-form-builder-app": "next", + "@ohri/openmrs-esm-ohri-core-app": "next", + "@ohri/openmrs-esm-ohri-hiv-app": "next", + "@ohri/openmrs-esm-ohri-covid-app": "next", + "@ohri/openmrs-esm-ohri-pmtct": "next", + "@ohri/openmrs-esm-ohri-tb-app": "next", + "@ohri/openmrs-esm-ohri-cervical-cancer-app": "next", + "@ohri/openmrs-esm-ohri-form-render-app": "next" }, "spaPath": "$SPA_PATH", "apiUrl": "$API_URL",