Merge branch 'develop' into merge-v1.9.1-to-develop

Author: Zangetsu101

.github/workflows/publish-to-dockerhub.yml

@@ -69,14 +69,23 @@ jobs:
             echo "version=${GIT_HASH}-amd64" >> $GITHUB_OUTPUT
           fi
 
-      - name: Build and push
+      - name: Build and push countryconfig image
         uses: docker/build-push-action@v6
         with:
           push: true
           context: .
           tags: |
             ${{ secrets.DOCKERHUB_ACCOUNT}}/${{ secrets.DOCKERHUB_REPO }}:${{ steps.country_config.outputs.version }}
 
+      - name: Build and push metabase assets image
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          context: .
+          file: ./Dockerfile.metabase.assets
+          tags: |
+            ${{ secrets.DOCKERHUB_ACCOUNT}}/${{ secrets.DOCKERHUB_REPO }}:${{ steps.country_config.outputs.version }}-assets
+
   merge-manifest:
     needs: [build]
     runs-on: ubuntu-latest
@@ -98,11 +107,17 @@ jobs:
           # Create manifest list based on whether ARM build exists
           if [[ "$BUILD_ARM" == "true" ]]; then
             MANIFEST_LIST="$REPO:$TAG-amd64 $REPO:$TAG-arm64"
+            ASSETS_MANIFEST_LIST="$REPO:$TAG-amd64-assets $REPO:$TAG-arm64-assets"
           else
             MANIFEST_LIST="$REPO:$TAG-amd64"
+            ASSETS_MANIFEST_LIST="$REPO:$TAG-amd64-assets"
           fi
           
           echo "[🔁 pushing ] $REPO:$TAG"
           docker manifest create $REPO:$TAG \
              $MANIFEST_LIST
           docker manifest push $REPO:$TAG
+          echo "[🔁 pushing ] $REPO:$TAG-assets"
+          docker manifest create $REPO:$TAG-assets \
+             $ASSETS_MANIFEST_LIST
+          docker manifest push $REPO:$TAG-assets

.husky/pre-commit

@@ -0,0 +1 @@
+yarn lint-staged

.husky/pre-push

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+branch=$(git rev-parse --abbrev-ref HEAD)
+pattern='^[a-z][a-z0-9\/\-]{1,29}$'
+
+if [[ ! "$branch" =~ $pattern ]]; then
+    echo """
+  ❌ Invalid branch name: '$branch'
+  ➡️  Branch names must match regex: $pattern
+      - Start with a lowercase letter
+      - Can contain lowercase letters, numbers, and hyphens
+      - Length between 2 and 30 characters
+      - Slashes '/' are allowed for hierarchical branch names
+    Example: ocrvs-12345, feature-login, fix-bug123, refactor-api
+    """
+    exit 1
+fi
+
+exit 0

Dockerfile.metabase.assets

@@ -0,0 +1,9 @@
+FROM alpine:3.20
+
+# Directory inside the assets image
+WORKDIR /assets
+
+# Copy assets
+COPY infrastructure/metabase /assets/
+
+RUN chmod +x /assets/*.sh

infrastructure/metabase/run.sh

@@ -8,7 +8,9 @@
 #
 # Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
 
-#!/bin/bash
+SCRIPT_FULL_PATH=$(readlink -f $0)
+SCRIPT_DIR=$(dirname "$SCRIPT_FULL_PATH")
+echo "Running Metabase initialization script from ${SCRIPT_DIR}"
 
 if [ -z "${OPENCRVS_METABASE_SITE_NAME}" ]; then
   echo "Error: OPENCRVS_METABASE_SITE_NAME environment variable is not defined"
@@ -106,8 +108,8 @@ export OPENCRVS_METABASE_ADMIN_PASSWORD_SALT=$(uuidgen)
 SALT_AND_PASSWORD=$OPENCRVS_METABASE_ADMIN_PASSWORD_SALT$OPENCRVS_METABASE_ADMIN_PASSWORD
 export OPENCRVS_METABASE_ADMIN_PASSWORD_HASH=$(java -cp $METABASE_JAR clojure.main -e "(require 'metabase.util.password) (println (metabase.util.password/hash-bcrypt \"$SALT_AND_PASSWORD\"))" 2>/dev/null | tail -n 1)
 
-source /initialize-database.sh
-source /update-database.sh
+source ${SCRIPT_DIR}/initialize-database.sh
+source ${SCRIPT_DIR}/update-database.sh
 
 echo "Starting metabase..."
 

infrastructure/postgres/setup-analytics.sh

@@ -85,6 +85,8 @@ CREATE TABLE IF NOT EXISTS analytics.event_actions (
   UNIQUE (id, event_id)
 );
 
+ALTER TABLE analytics.event_actions ADD COLUMN IF NOT EXISTS custom_action_type TEXT;
+
 CREATE TABLE IF NOT EXISTS analytics.location_levels (
   id text PRIMARY KEY,
   level int NOT NULL,

package.json

@@ -10,14 +10,8 @@
     "node": "22.x.x"
   },
   "license": "MPL-2.0",
-  "husky": {
-    "hooks": {
-      "pre-commit": "yarn precommit"
-    }
-  },
   "scripts": {
     "dev": "yarn start",
-    "precommit": "lint-staged",
     "test": "vitest",
     "test:compilation": "tsc --noEmit",
     "lint": "eslint -c .eslintrc.js",
@@ -50,7 +44,7 @@
     "eslint": "^8.43.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "husky": "1.0.0-rc.13",
+    "husky": "^9.1.7",
     "inquirer": "^9.2.12",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.5",
@@ -69,7 +63,7 @@
     "@hapi/boom": "^9.1.1",
     "@hapi/hapi": "^20.0.1",
     "@hapi/inert": "^6.0.3",
-    "@opencrvs/toolkit": "1.9.0-rc.79b0f42",
+    "@opencrvs/toolkit": "1.9.0-rc.1346624",
     "@types/chalk": "^2.2.0",
     "@types/csv2json": "^1.4.0",
     "@types/fhir": "^0.0.30",
@@ -114,7 +108,7 @@
     "tsconfig-paths": "^3.8.0",
     "typescript": "^5.1.6",
     "uuid": "^11.1.0",
-    "zod": "^3.24.1"
+    "zod": "^4.1.12"
   },
   "lint-staged": {
     "src/**/*.{ts,graphql}": [
@@ -129,5 +123,8 @@
   },
   "resolutions": {
     "acorn": "^6.4.1"
+  },
+  "husky": {
+    "hooks": {}
   }
 }

src/api/custom-event/handler.ts

@@ -24,6 +24,13 @@ export function getCustomEventsHandler(
     .code(200)
 }
 
+export async function onCustomActionHandler(
+  request: ActionConfirmationRequest,
+  h: Hapi.ResponseToolkit
+) {
+  return h.response().code(200)
+}
+
 export async function onAnyActionHandler(
   request: ActionConfirmationRequest,
   h: Hapi.ResponseToolkit
@@ -33,6 +40,7 @@ export async function onAnyActionHandler(
   const token = request.auth.artifacts.token as string
 
   const event = request.payload
+
   await sendInformantNotification({ event, token })
 
   return h.response().code(200)

src/api/notification/informantNotification.ts

@@ -26,8 +26,6 @@ import { InformantType as BirthInformantType } from '@countryconfig/form/v2/birt
 import { InformantTemplateType } from './sms-service'
 import { generateFailureLog, NotificationParams, notify } from './handler'
 import { InformantType as DeathInformantType } from '@countryconfig/form/v2/death/forms/pages/informant'
-import { birthEvent } from '@countryconfig/form/v2/birth'
-import { deathEvent } from '@countryconfig/form/v2/death'
 
 const resolveName = (name: FieldUpdateValue) => {
   const nameObj = {
@@ -77,18 +75,6 @@ function getInformant(eventType: string, declaration: Record<string, any>) {
   throw new Error('Invalid event type')
 }
 
-function getEventConfig(eventType: string) {
-  if (eventType === Event.Birth) {
-    return birthEvent
-  }
-
-  if (eventType === Event.Death) {
-    return deathEvent
-  }
-
-  throw new Error('Invalid event type')
-}
-
 async function getNotificationParams(
   event: EventDocument,
   token: string,

src/api/workqueue/workqueueConfig.ts

@@ -166,7 +166,7 @@ export const Workqueues = defineWorkqueues([
         terms: ['DECLARED', 'NOTIFIED']
       },
       flags: {
-        noneOf: [InherentFlags.REJECTED]
+        noneOf: [InherentFlags.REJECTED, 'validated']
       },
       createdBy: { type: 'exact', term: user('id') }
     },
@@ -194,7 +194,7 @@ export const Workqueues = defineWorkqueues([
     query: {
       status: { type: 'exact', term: EventStatus.enum.DECLARED },
       flags: {
-        noneOf: [InherentFlags.REJECTED]
+        noneOf: [InherentFlags.REJECTED, 'validated']
       },
       updatedAtLocation: { type: 'exact', term: user('primaryOfficeId') }
     },
@@ -230,7 +230,7 @@ export const Workqueues = defineWorkqueues([
         {
           status: {
             type: 'anyOf',
-            terms: ['DECLARED', 'VALIDATED']
+            terms: ['DECLARED']
           },
           flags: {
             noneOf: [InherentFlags.REJECTED]
@@ -341,15 +341,10 @@ export const Workqueues = defineWorkqueues([
       clauses: [
         {
           updatedBy: { type: 'exact', term: user('id') },
-          status: { type: 'exact', term: 'VALIDATED' },
-          flags: {
-            noneOf: [InherentFlags.REJECTED]
-          }
+          flags: { noneOf: [InherentFlags.REJECTED] }
         },
         {
-          flags: {
-            anyOf: [InherentFlags.CORRECTION_REQUESTED]
-          },
+          flags: { anyOf: [InherentFlags.CORRECTION_REQUESTED, 'validated'] },
           updatedBy: { type: 'exact', term: user('id') }
         }
       ]