(chore): Revert to dev

openmrs · Sep 26, 2024 · d11cb63 · d11cb63
1 parent 9904485
commit d11cb63
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 44 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       SPA_PATH: /openmrs/spa
       API_URL: /openmrs
       SPA_CONFIG_URLS: /openmrs/spa/config-core_demo.json
-      SPA_DEFAULT_LOCALE:
+      SPA_DEFAULT_LOCALE: fr
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost/"]
       timeout: 5s
@@ -49,7 +49,7 @@ services:
     restart: "unless-stopped"
     command: "mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci"
     healthcheck:
-      test: "mysql --user=${OMRS_DB_USER:-openmrs} --password=${OMRS_DB_PASSWORD:-openmrs} --execute \"SHOW DATABASES;\""
+      test: 'mysql --user=${OMRS_DB_USER:-openmrs} --password=${OMRS_DB_PASSWORD:-openmrs} --execute "SHOW DATABASES;"'
       interval: 3s
       timeout: 1s
       retries: 5

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -4,7 +4,7 @@
 #--------------------------------------------
 FROM --platform=$BUILDPLATFORM node:18-alpine as dev
 
-ARG APP_SHELL_VERSION=latest
+ARG APP_SHELL_VERSION=next
 
 RUN mkdir -p /app
 WORKDIR /app
@@ -13,8 +13,8 @@ COPY spa-assemble-config.json .
 COPY spa-build-config.json .
 
 ARG CACHE_BUST
-RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-latest} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa
-RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-latest} build --build-config spa-build-config.json --target ./spa
+RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa
+RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} build --build-config spa-build-config.json --target ./spa
 RUN if [ ! -f ./spa/index.html ]; then echo 'Build failed. Please check the logs above for details. This may have happened because of an update to a library that OpenMRS depends on.'; exit 1; fi
 
 #--------------------------------------------

diff --git a/frontend/config-core_demo.json b/frontend/config-core_demo.json
@@ -50,5 +50,15 @@
   },
   "@openmrs/esm-form-builder-app": {
     "showSchemaSaveWarning": false
+  },
+  "@ohri/openmrs-esm-ohri-hiv-care-treatment-app": {
+    "formUuids": {
+      "clinicalVisitFormUuid": "4232f8bd-42c9-498d-8d40-b65f4f1446e8",
+      "serviceEnrolmentFormUuid": "bd1f4e38-61a8-45b5-ae59-6806c855e882"
+    },
+    "formNames": {
+      "ServiceEnrolmentFormName": "DRC HIV Enrolment Form v1.2",
+      "ClinicalVisitFormName": "DRC Clinical Visit Form v2.2"
+    }
   }
 }
diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json
@@ -1,44 +1,44 @@
 {
   "frontendModules": {
-    "@openmrs/esm-active-visits-app": "latest",
-    "@openmrs/esm-appointments-app": "latest",
-    "@openmrs/esm-cohort-builder-app": "latest",
-    "@openmrs/esm-devtools-app": "latest",
-    "@openmrs/esm-dispensing-app": "latest",
-    "@openmrs/esm-fast-data-entry-app": "latest",
-    "@openmrs/esm-form-builder-app": "latest",
-    "@openmrs/esm-form-engine-app": "latest",
-    "@openmrs/esm-generic-patient-widgets-app": "latest",
-    "@openmrs/esm-help-menu-app": "latest",
-    "@openmrs/esm-home-app": "latest",
-    "@openmrs/esm-implementer-tools-app": "latest",
-    "@openmrs/esm-laboratory-app": "latest",
-    "@openmrs/esm-login-app": "latest",
-    "@openmrs/esm-openconceptlab-app": "latest",
-    "@openmrs/esm-patient-allergies-app": "latest",
-    "@openmrs/esm-patient-attachments-app": "latest",
-    "@openmrs/esm-patient-banner-app": "latest",
-    "@openmrs/esm-patient-chart-app": "latest",
-    "@openmrs/esm-patient-conditions-app": "latest",
-    "@openmrs/esm-patient-flags-app": "latest",
-    "@openmrs/esm-patient-forms-app": "latest",
-    "@openmrs/esm-patient-immunizations-app": "latest",
-    "@openmrs/esm-patient-labs-app": "latest",
-    "@openmrs/esm-patient-list-management-app": "latest",
-    "@openmrs/esm-patient-lists-app": "latest",
-    "@openmrs/esm-patient-medications-app": "latest",
-    "@openmrs/esm-patient-notes-app": "latest",
-    "@openmrs/esm-patient-orders-app": "latest",
-    "@openmrs/esm-patient-programs-app": "latest",
-    "@openmrs/esm-patient-registration-app": "latest",
-    "@openmrs/esm-patient-search-app": "latest",
-    "@openmrs/esm-patient-vitals-app": "latest",
-    "@openmrs/esm-primary-navigation-app": "latest",
-    "@openmrs/esm-service-queues-app": "latest",
-    "@openmrs/esm-system-admin-app": "latest",
-    "@openmrs/esm-user-onboarding-app": "latest",
-    "@ohri/openmrs-esm-ohri-hiv-care-treatment-app": "latest",
-    "@ohri/openmrs-esm-ohri-core-app": "latest"
+    "@openmrs/esm-active-visits-app": "next",
+    "@openmrs/esm-appointments-app": "next",
+    "@openmrs/esm-cohort-builder-app": "next",
+    "@openmrs/esm-devtools-app": "next",
+    "@openmrs/esm-dispensing-app": "next",
+    "@openmrs/esm-fast-data-entry-app": "next",
+    "@openmrs/esm-form-builder-app": "next",
+    "@openmrs/esm-form-engine-app": "next",
+    "@openmrs/esm-generic-patient-widgets-app": "next",
+    "@openmrs/esm-help-menu-app": "next",
+    "@openmrs/esm-home-app": "next",
+    "@openmrs/esm-implementer-tools-app": "next",
+    "@openmrs/esm-laboratory-app": "next",
+    "@openmrs/esm-login-app": "next",
+    "@openmrs/esm-openconceptlab-app": "next",
+    "@openmrs/esm-patient-allergies-app": "next",
+    "@openmrs/esm-patient-attachments-app": "next",
+    "@openmrs/esm-patient-banner-app": "next",
+    "@openmrs/esm-patient-chart-app": "next",
+    "@openmrs/esm-patient-conditions-app": "next",
+    "@openmrs/esm-patient-flags-app": "next",
+    "@openmrs/esm-patient-forms-app": "next",
+    "@openmrs/esm-patient-immunizations-app": "next",
+    "@openmrs/esm-patient-labs-app": "next",
+    "@openmrs/esm-patient-list-management-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-registration-app": "next",
+    "@openmrs/esm-patient-search-app": "next",
+    "@openmrs/esm-patient-vitals-app": "next",
+    "@openmrs/esm-primary-navigation-app": "next",
+    "@openmrs/esm-service-queues-app": "next",
+    "@openmrs/esm-system-admin-app": "next",
+    "@openmrs/esm-user-onboarding-app": "next",
+    "@ohri/openmrs-esm-ohri-hiv-care-treatment-app": "next",
+    "@ohri/openmrs-esm-ohri-core-app": "next"
   },
   "excludedFrontendModules": []
 }