@platform-modules/civil-aviation-authority 2.3.297 → 2.3.298

package/dist/i18n/workflow-chat-i18n.json

@@ -183,6 +183,18 @@
     "it_helpdesk_wf_l3_not_required_closed": {
       "en": "L3 assignment not required, request closed by {{userName}}{{comment}}",
       "ar": "تعيين المستوى الثالث (L3) غير مطلوب، تم إغلاق الطلب بواسطة {{userName}}{{comment}}"
+    },
+    "request_assigned": {
+      "en": "Request Assigned",
+      "ar": "تم تعيين الطلب"
+    },
+    "request_pending_from": {
+      "en": "Request Pending from {{name}}",
+      "ar": "الطلب قيد الانتظار من {{name}}"
+    },
+    "request_pending": {
+      "en": "Request Pending",
+      "ar": "الطلب قيد الانتظار"
     }
   },
   "chatTemplates": {

package/dist/i18n/workflow-chat-message.builder.js

@@ -326,6 +326,19 @@ function buildRequestApprovedAssignedWorkflowFields(params) {
 }
 /** Standard workflow log UPDATE fields for all CAA module repositories. */
 function buildWorkflowLogUpdateFields(params) {
+    if (params.approvalStatus === 'Closed') {
+        const closed = buildClosedWorkflowMessage({
+            roleName: params.roleName,
+            roleArabicName: params.roleArabicName,
+            comment: params.comment,
+        });
+        return {
+            content: closed.en,
+            content_ar: closed.ar,
+            status: params.workflowStatus,
+            status_ar: resolveWorkflowStatusAr(params.workflowStatus),
+        };
+    }
     const isApprovedLike = params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned';
     if (isApprovedLike) {
         const assignment = tryParseRequestAssignedComment(params.comment);
@@ -1206,6 +1219,25 @@ function resolveWorkflowContentAr(content, actors) {
         const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
         return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: nameAr });
     }
+    // Assign Tasks to Employee workflow (legacy EN strings)
+    if (normalized === 'Request Assigned') {
+        return WORKFLOW_TEMPLATES.request_assigned?.ar ?? null;
+    }
+    if (normalized === 'Request Pending') {
+        return WORKFLOW_TEMPLATES.request_pending?.ar ?? null;
+    }
+    const assignTasksPendingPrefix = WORKFLOW_TEMPLATES.request_pending_from?.en.split('{{name}}')[0].trim();
+    if (assignTasksPendingPrefix && normalized.startsWith(assignTasksPendingPrefix)) {
+        const namePartEn = normalized.slice(assignTasksPendingPrefix.length).trim();
+        const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+        return interpolate(WORKFLOW_TEMPLATES.request_pending_from.ar, { name: nameAr });
+    }
+    if (normalized.toLowerCase() === 'notification sent pending') {
+        return WORKFLOW_TEMPLATES.notification_sent_pending?.ar ?? null;
+    }
+    if (normalized.toLowerCase() === 'notification sent successfully') {
+        return WORKFLOW_TEMPLATES.notification_sent_successfully?.ar ?? null;
+    }
     if (normalized === 'Approval Pending from HR Section' ||
         normalized === 'Approval Pending from Records Department') {
         return WORKFLOW_TEMPLATES.request_approval_pending?.ar ?? null;
@@ -1257,6 +1289,28 @@ function enrichWorkflowLog(log) {
             content_ar = resolvedAr;
         }
     }
+    const inProgressPrefix = WORKFLOW_TEMPLATES.request_approval_in_progress_from?.en.split('{{name}}')[0].trim();
+    if (content &&
+        inProgressPrefix &&
+        content.startsWith(inProgressPrefix) &&
+        existingAr &&
+        resolvedAr &&
+        existingAr !== resolvedAr) {
+        const namePartEn = content.slice(inProgressPrefix.length).trim();
+        if (namePartEn && existingAr.includes(namePartEn)) {
+            content_ar = resolvedAr;
+        }
+    }
+    if (content &&
+        existingAr &&
+        resolvedAr &&
+        existingAr !== resolvedAr &&
+        /[A-Za-z]/.test(existingAr) &&
+        (actors?.deptArabicName?.trim() ||
+            actors?.sectionArabicName?.trim() ||
+            actors?.roleArabicName?.trim())) {
+        content_ar = resolvedAr;
+    }
     if (content &&
         existingAr &&
         resolvedAr &&

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.297",
+  "version": "2.3.298",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
   "scripts": {

package/src/i18n/workflow-chat-i18n.json

@@ -183,6 +183,18 @@
     "it_helpdesk_wf_l3_not_required_closed": {
       "en": "L3 assignment not required, request closed by {{userName}}{{comment}}",
       "ar": "تعيين المستوى الثالث (L3) غير مطلوب، تم إغلاق الطلب بواسطة {{userName}}{{comment}}"
+    },
+    "request_assigned": {
+      "en": "Request Assigned",
+      "ar": "تم تعيين الطلب"
+    },
+    "request_pending_from": {
+      "en": "Request Pending from {{name}}",
+      "ar": "الطلب قيد الانتظار من {{name}}"
+    },
+    "request_pending": {
+      "en": "Request Pending",
+      "ar": "الطلب قيد الانتظار"
     }
   },
   "chatTemplates": {

package/src/i18n/workflow-chat-message.builder.ts

@@ -476,6 +476,20 @@ export function buildWorkflowLogUpdateFields(params: {
   roleArabicName?: string | null;
   comment?: string | null;
 }): { content: string; content_ar: string; status: string; status_ar: string | null } {
+  if (params.approvalStatus === 'Closed') {
+    const closed = buildClosedWorkflowMessage({
+      roleName: params.roleName,
+      roleArabicName: params.roleArabicName,
+      comment: params.comment,
+    });
+    return {
+      content: closed.en,
+      content_ar: closed.ar,
+      status: params.workflowStatus,
+      status_ar: resolveWorkflowStatusAr(params.workflowStatus),
+    };
+  }
+
   const isApprovedLike =
     params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned';
 
@@ -1808,6 +1822,27 @@ export function resolveWorkflowContentAr(
     const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
     return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: nameAr });
   }
+
+  // Assign Tasks to Employee workflow (legacy EN strings)
+  if (normalized === 'Request Assigned') {
+    return WORKFLOW_TEMPLATES.request_assigned?.ar ?? null;
+  }
+  if (normalized === 'Request Pending') {
+    return WORKFLOW_TEMPLATES.request_pending?.ar ?? null;
+  }
+  const assignTasksPendingPrefix = WORKFLOW_TEMPLATES.request_pending_from?.en.split('{{name}}')[0].trim();
+  if (assignTasksPendingPrefix && normalized.startsWith(assignTasksPendingPrefix)) {
+    const namePartEn = normalized.slice(assignTasksPendingPrefix.length).trim();
+    const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+    return interpolate(WORKFLOW_TEMPLATES.request_pending_from.ar, { name: nameAr });
+  }
+  if (normalized.toLowerCase() === 'notification sent pending') {
+    return WORKFLOW_TEMPLATES.notification_sent_pending?.ar ?? null;
+  }
+  if (normalized.toLowerCase() === 'notification sent successfully') {
+    return WORKFLOW_TEMPLATES.notification_sent_successfully?.ar ?? null;
+  }
+
   if (
     normalized === 'Approval Pending from HR Section' ||
     normalized === 'Approval Pending from Records Department'
@@ -1873,6 +1908,32 @@ export function enrichWorkflowLog(log: Record<string, unknown>): Record<string,
       content_ar = resolvedAr;
     }
   }
+  const inProgressPrefix = WORKFLOW_TEMPLATES.request_approval_in_progress_from?.en.split('{{name}}')[0].trim();
+  if (
+    content &&
+    inProgressPrefix &&
+    content.startsWith(inProgressPrefix) &&
+    existingAr &&
+    resolvedAr &&
+    existingAr !== resolvedAr
+  ) {
+    const namePartEn = content.slice(inProgressPrefix.length).trim();
+    if (namePartEn && existingAr.includes(namePartEn)) {
+      content_ar = resolvedAr;
+    }
+  }
+  if (
+    content &&
+    existingAr &&
+    resolvedAr &&
+    existingAr !== resolvedAr &&
+    /[A-Za-z]/.test(existingAr) &&
+    (actors?.deptArabicName?.trim() ||
+      actors?.sectionArabicName?.trim() ||
+      actors?.roleArabicName?.trim())
+  ) {
+    content_ar = resolvedAr;
+  }
   if (
     content &&
     existingAr &&