Merge branch 'develop' of github.com:opencrvs/opencrvs-countryconfig into ocrvs-10559

Author: rikukissa

CHANGELOG.md

@@ -28,6 +28,8 @@
 ### Bug fixes
 
 - Allow non-interactive upgrades with apt [#10204](https://github.com/opencrvs/opencrvs-core/issues/10204)
+- Don't restart events service after data cleanup [#10704](https://github.com/opencrvs/opencrvs-core/issues/10704)
+
 
 ## 1.8.1
 

infrastructure/clear-all-data.sh

@@ -156,10 +156,14 @@ echo "🚀 Reinitializing Postgres with on-deploy.sh..."
 
 docker service update --force opencrvs_postgres-on-update
 
+<<<<<<< HEAD
 docker service scale opencrvs_dashboards=0
 docker service scale opencrvs_dashboards=1
 
 # Restart events service
 #-----------------------------
 docker service scale opencrvs_events=0
 docker service scale opencrvs_events=1
+=======
+echo "✅ All data cleared."
+>>>>>>> 96c546252c71fd70097d052974294735919881e5

infrastructure/docker-compose.deploy.yml

@@ -692,6 +692,7 @@ services:
       - jwt-public-key.{{ts}}
     environment:
       - NODE_ENV=production
+      - APN_SERVICE_URL=http://apm-server:8200
       - EVENTS_MONGO_URL=mongodb://events:${EVENTS_MONGODB_PASSWORD}@mongo1/events?replicaSet=rs0
       - USER_MGNT_MONGO_URL=mongodb://user-mgnt:${USER_MGNT_MONGODB_PASSWORD}@mongo1/user-mgnt?replicaSet=rs0
       - ES_URL=http://search-user:${ROTATING_SEARCH_ELASTIC_PASSWORD}@elasticsearch:9200

infrastructure/metabase/README.md

@@ -10,13 +10,24 @@
 
 # OpenCRVS Dashboards
 
+### Requirements
+
+```
+❯ java -version
+openjdk version "21.0.8" 2025-07-15
+```
+
 ### Run in development mode
 
 By default, Metabase is not started as part of the OpenCRVS stack as running it requires quite a bit of resources. You can use the following commands to use metabase in development:
 
 `yarn metabase` – Starts Metabase in port http://localhost:4444
 `yarn db:shell` - In the metabase directory – open a SQL shell for the database Metabase created
+<<<<<<< HEAD
 `yarn db:clear:all` - Clears all analytics databases
+=======
+`yarn db:clear:all` - Clear data from analytics dashboard
+>>>>>>> 96c546252c71fd70097d052974294735919881e5
 
 ### Default credentials
 

infrastructure/metabase/metabase.init.db.sql

@@ -87,14 +87,6 @@
             - docker
       tags:
         - docker
-    
-    - include_tasks:
-        file: tasks/override-docker-startup.yml
-        apply:
-          tags: 
-            - docker
-      tags: 
-        - docker
 
     - include_tasks:
         file: tasks/deployment-user.yml
@@ -170,6 +162,13 @@
   become: yes
   become_method: sudo
   tasks:
+    - include_tasks:
+        file: tasks/override-docker-startup.yml
+        apply:
+          tags:
+            - docker
+      tags:
+        - docker
     - include_tasks:
         file: tasks/elasticsearch.yml
         apply:
@@ -186,4 +185,18 @@
       tags:
         - traefik
 
+# Ensure incorrectly created override of docker daemon (1.9 beta) is removed on workers
+- hosts: docker-workers
+  become: yes
+  become_method: sudo
+  tasks:
+    - name: Remove docker service override directory
+      file:
+        path: /etc/systemd/system/docker.service.d
+        state: absent
+
+    - name: Reload systemd daemon to apply changes
+      systemd:
+        daemon_reload: yes
+
 - import_playbook: backups.yml

infrastructure/server-setup/playbook.yml

@@ -69,7 +69,7 @@
     "@hapi/boom": "^9.1.1",
     "@hapi/hapi": "^20.0.1",
     "@hapi/inert": "^6.0.3",
-    "@opencrvs/toolkit": "1.8.1-rc.a5eecfe",
+    "@opencrvs/toolkit": "1.8.1-rc.4958667",
     "@types/chalk": "^2.2.0",
     "@types/csv2json": "^1.4.0",
     "@types/fhir": "^0.0.30",

letsencrypt-stg-root-x1.pem

@@ -136,11 +136,16 @@ function convertDotKeysToUnderscore(
   return newObj
 }
 
-export async function upsertAnalyticsEventActions(
+async function upsertAnalyticsEventActions(
   event: EventDocument,
   eventConfig: EventConfig,
   trx: Kysely<any>
 ) {
+  await trx
+    .deleteFrom('analytics.event_actions')
+    .where('event_id', '=', event.id)
+    .execute()
+
   for (let i = 0; i < event.actions.length; i++) {
     const actionsFromStartToCurrentPoint = event.actions
       .sort((a, b) => {

package.json

@@ -9,11 +9,9 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 
-import { conditionals } from '@countryconfig/form/common/custom-validation-conditionals/custom-conditionals'
 import { Event } from '@countryconfig/form/types/types'
 import { Request, ResponseToolkit } from '@hapi/hapi'
-import { ActionType, event, field } from '@opencrvs/toolkit/events'
-import { x } from 'joi'
+import { ActionType, event, not } from '@opencrvs/toolkit/events'
 
 type FontFamilyTypes = {
   normal: string
@@ -270,7 +268,7 @@ export async function certificateHandler(request: Request, h: ResponseToolkit) {
       conditionals: [
         {
           type: 'SHOW',
-          conditional: field('child.dob').isAfter().days(365).inPast()
+          conditional: not(event.hasAction(ActionType.PRINT_CERTIFICATE))
         }
       ]
     },