@platform-modules/civil-aviation-authority 2.3.281 → 2.3.282

package/dist/i18n/workflow-chat-message.builder.d.ts

@@ -91,8 +91,10 @@ export declare function buildApprovalChatMessage(params: {
 }): BilingualText;
 export declare function resolveWorkflowStatusAr(status: string | null | undefined): string | null;
 export declare function resolveChatStatusAr(status: string | null | undefined): string | null;
-export declare function resolveWorkflowContentAr(content: string | null | undefined): string | null;
-export declare function resolveChatMessageAr(message: string | null | undefined): string | null;
+/** Pull bilingual actor fields from joined relations on workflow/chat rows. */
+export declare function extractBilingualActorsFromRecord(record: Record<string, unknown>): BilingualActorNames;
+export declare function resolveWorkflowContentAr(content: string | null | undefined, actors?: BilingualActorNames): string | null;
+export declare function resolveChatMessageAr(message: string | null | undefined, actors?: BilingualActorNames): string | null;
 /** Generic workflow log enricher — use in all module repositories. */
 export declare function enrichWorkflowLog(log: Record<string, unknown>): Record<string, unknown>;
 /** Generic chat enricher — use in all module repositories. */

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

@@ -25,6 +25,7 @@ exports.buildHumanApprovalWorkflowContent = buildHumanApprovalWorkflowContent;
 exports.buildApprovalChatMessage = buildApprovalChatMessage;
 exports.resolveWorkflowStatusAr = resolveWorkflowStatusAr;
 exports.resolveChatStatusAr = resolveChatStatusAr;
+exports.extractBilingualActorsFromRecord = extractBilingualActorsFromRecord;
 exports.resolveWorkflowContentAr = resolveWorkflowContentAr;
 exports.resolveChatMessageAr = resolveChatMessageAr;
 exports.enrichWorkflowLog = enrichWorkflowLog;
@@ -257,7 +258,47 @@ function resolveChatStatusAr(status) {
     return CHAT_STATUS_LABELS[status] ?? status;
 }
 // ─── Legacy row enrichment (read API) ────────────────────────────────────────
-function resolveWorkflowContentAr(content) {
+/** Pull bilingual actor fields from joined relations on workflow/chat rows. */
+function extractBilingualActorsFromRecord(record) {
+    const role = (record.approver_role ?? record.role);
+    const user = (record.approver_user ?? record.user);
+    const dept = (record.approver_department ?? record.department);
+    const section = (record.approver_section ?? record.section);
+    return {
+        roleName: role?.name != null ? String(role.name) : null,
+        roleArabicName: role?.arabic_name != null ? String(role.arabic_name) : null,
+        deptName: dept?.department_name != null ? String(dept.department_name) : null,
+        deptArabicName: dept?.department_arabic_name != null ? String(dept.department_arabic_name) : null,
+        sectionName: section?.section_name != null ? String(section.section_name) : null,
+        sectionArabicName: section?.section_arabic_name != null ? String(section.section_arabic_name) : null,
+        userName: user?.employee_name != null ? String(user.employee_name) : null,
+        userArabicName: user?.employee_arabic_name != null ? String(user.employee_arabic_name) : null,
+        employeeId: user?.employee_id != null ? String(user.employee_id) : null,
+    };
+}
+/** Arabic actor label for workflow templates (role, dept+section, or user). */
+function resolveArabicWorkflowActorName(actors, parsedEnglishName) {
+    if (actors) {
+        const { ar } = resolveActorDisplayNames(actors);
+        if (ar)
+            return ar;
+        if (actors.userName?.trim()) {
+            return resolveBilingualName(actors.userName, actors.userArabicName);
+        }
+    }
+    return parsedEnglishName?.trim() || '';
+}
+/** Arabic role/user label for chat templates. */
+function resolveArabicChatRoleName(actors, parsedEnglishRole) {
+    if (actors?.roleName?.trim()) {
+        return resolveBilingualName(actors.roleName, actors.roleArabicName);
+    }
+    if (actors?.userName?.trim()) {
+        return resolveBilingualName(actors.userName, actors.userArabicName);
+    }
+    return resolveBilingualName(parsedEnglishRole, actors?.roleArabicName);
+}
+function resolveWorkflowContentAr(content, actors) {
     if (content == null || content.trim() === '')
         return null;
     const normalized = content.trim();
@@ -277,8 +318,9 @@ function resolveWorkflowContentAr(content) {
             if (withoutComment.includes('{{name}}')) {
                 const staticPrefix = withoutComment.replace('{{name}}', '').trim();
                 if (baseEn.startsWith(staticPrefix)) {
-                    const namePart = baseEn.slice(staticPrefix.length).trim();
-                    return interpolate(tpl.ar, { name: namePart, comment: commentSuffix });
+                    const namePartEn = baseEn.slice(staticPrefix.length).trim();
+                    const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+                    return interpolate(tpl.ar, { name: nameAr, comment: commentSuffix });
                 }
             }
             else if (withoutComment.trim() === baseEn) {
@@ -288,17 +330,19 @@ function resolveWorkflowContentAr(content) {
     }
     const inProgressPrefix = WORKFLOW_TEMPLATES.request_approval_in_progress_from?.en.split('{{name}}')[0].trim();
     if (inProgressPrefix && normalized.startsWith(inProgressPrefix)) {
-        const namePart = normalized.slice(inProgressPrefix.length).trim();
-        return interpolate(WORKFLOW_TEMPLATES.request_approval_in_progress_from.ar, { name: namePart });
+        const namePartEn = normalized.slice(inProgressPrefix.length).trim();
+        const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+        return interpolate(WORKFLOW_TEMPLATES.request_approval_in_progress_from.ar, { name: nameAr });
     }
     const pendingPrefix = WORKFLOW_TEMPLATES.request_approval_pending_from?.en.split('{{name}}')[0].trim();
     if (pendingPrefix && normalized.startsWith(pendingPrefix)) {
-        const namePart = normalized.slice(pendingPrefix.length).trim();
-        return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: namePart });
+        const namePartEn = normalized.slice(pendingPrefix.length).trim();
+        const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+        return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: nameAr });
     }
     return null;
 }
-function resolveChatMessageAr(message) {
+function resolveChatMessageAr(message, actors) {
     if (message == null || message.trim() === '')
         return null;
     const normalized = message.trim();
@@ -306,6 +350,22 @@ function resolveChatMessageAr(message) {
         if (tpl.en === normalized)
             return tpl.ar;
     }
+    const submittedTpl = CHAT_TEMPLATES.cancellation_submitted_by;
+    if (submittedTpl) {
+        const prefix = submittedTpl.en.split('{{userName}}')[0];
+        if (normalized.startsWith(prefix)) {
+            const afterPrefix = normalized.slice(prefix.length);
+            const parenMatch = afterPrefix.match(/^(.+?) \((.+)\)$/);
+            if (parenMatch) {
+                const userEn = parenMatch[1].trim();
+                const employeeId = parenMatch[2].trim();
+                const userAr = actors?.userName?.trim()
+                    ? resolveBilingualName(actors.userName, actors.userArabicName)
+                    : resolveBilingualName(userEn, actors?.userArabicName);
+                return interpolate(submittedTpl.ar, { userName: userAr, employeeId });
+            }
+        }
+    }
     for (const tpl of Object.values(CHAT_TEMPLATES)) {
         if (!tpl.en.includes('{{roleName}}'))
             continue;
@@ -314,13 +374,10 @@ function resolveChatMessageAr(message) {
             continue;
         const rest = normalized.slice(prefix.length);
         const commentIdx = rest.lastIndexOf(' - ');
-        if (commentIdx >= 0) {
-            return interpolate(tpl.ar, {
-                roleName: rest.slice(0, commentIdx),
-                comment: rest.slice(commentIdx),
-            });
-        }
-        return interpolate(tpl.ar, { roleName: rest, comment: '' });
+        const roleNameEn = commentIdx >= 0 ? rest.slice(0, commentIdx) : rest;
+        const commentSuffix = commentIdx >= 0 ? rest.slice(commentIdx) : '';
+        const roleNameAr = resolveArabicChatRoleName(actors, roleNameEn.trim());
+        return interpolate(tpl.ar, { roleName: roleNameAr, comment: commentSuffix });
     }
     return null;
 }
@@ -328,9 +385,10 @@ function resolveChatMessageAr(message) {
 function enrichWorkflowLog(log) {
     const status = log.status != null ? String(log.status) : null;
     const content = log.content != null ? String(log.content) : null;
+    const actors = extractBilingualActorsFromRecord(log);
     return {
         ...log,
-        content_ar: log.content_ar ?? resolveWorkflowContentAr(content),
+        content_ar: log.content_ar ?? resolveWorkflowContentAr(content, actors),
         status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
     };
 }
@@ -338,9 +396,10 @@ function enrichWorkflowLog(log) {
 function enrichChatMessage(chat) {
     const status = chat.status != null ? String(chat.status) : null;
     const message = chat.message != null ? String(chat.message) : null;
+    const actors = extractBilingualActorsFromRecord(chat);
     return {
         ...chat,
-        message_ar: chat.message_ar ?? resolveChatMessageAr(message),
+        message_ar: chat.message_ar ?? resolveChatMessageAr(message, actors),
         status_ar: chat.status_ar ?? resolveChatStatusAr(status),
     };
 }

package/package.json

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

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

@@ -404,7 +404,61 @@ export function resolveChatStatusAr(status: string | null | undefined): string |
 
 // ─── Legacy row enrichment (read API) ────────────────────────────────────────
 
-export function resolveWorkflowContentAr(content: string | null | undefined): string | null {
+/** Pull bilingual actor fields from joined relations on workflow/chat rows. */
+export function extractBilingualActorsFromRecord(
+  record: Record<string, unknown>,
+): BilingualActorNames {
+  const role = (record.approver_role ?? record.role) as Record<string, unknown> | undefined;
+  const user = (record.approver_user ?? record.user) as Record<string, unknown> | undefined;
+  const dept = (record.approver_department ?? record.department) as Record<string, unknown> | undefined;
+  const section = (record.approver_section ?? record.section) as Record<string, unknown> | undefined;
+
+  return {
+    roleName: role?.name != null ? String(role.name) : null,
+    roleArabicName: role?.arabic_name != null ? String(role.arabic_name) : null,
+    deptName: dept?.department_name != null ? String(dept.department_name) : null,
+    deptArabicName: dept?.department_arabic_name != null ? String(dept.department_arabic_name) : null,
+    sectionName: section?.section_name != null ? String(section.section_name) : null,
+    sectionArabicName: section?.section_arabic_name != null ? String(section.section_arabic_name) : null,
+    userName: user?.employee_name != null ? String(user.employee_name) : null,
+    userArabicName: user?.employee_arabic_name != null ? String(user.employee_arabic_name) : null,
+    employeeId: user?.employee_id != null ? String(user.employee_id) : null,
+  };
+}
+
+/** Arabic actor label for workflow templates (role, dept+section, or user). */
+function resolveArabicWorkflowActorName(
+  actors: BilingualActorNames | undefined,
+  parsedEnglishName?: string,
+): string {
+  if (actors) {
+    const { ar } = resolveActorDisplayNames(actors);
+    if (ar) return ar;
+    if (actors.userName?.trim()) {
+      return resolveBilingualName(actors.userName, actors.userArabicName);
+    }
+  }
+  return parsedEnglishName?.trim() || '';
+}
+
+/** Arabic role/user label for chat templates. */
+function resolveArabicChatRoleName(
+  actors: BilingualActorNames | undefined,
+  parsedEnglishRole?: string,
+): string {
+  if (actors?.roleName?.trim()) {
+    return resolveBilingualName(actors.roleName, actors.roleArabicName);
+  }
+  if (actors?.userName?.trim()) {
+    return resolveBilingualName(actors.userName, actors.userArabicName);
+  }
+  return resolveBilingualName(parsedEnglishRole, actors?.roleArabicName);
+}
+
+export function resolveWorkflowContentAr(
+  content: string | null | undefined,
+  actors?: BilingualActorNames,
+): string | null {
   if (content == null || content.trim() === '') return null;
   const normalized = content.trim();
 
@@ -424,8 +478,9 @@ export function resolveWorkflowContentAr(content: string | null | undefined): st
       if (withoutComment.includes('{{name}}')) {
         const staticPrefix = withoutComment.replace('{{name}}', '').trim();
         if (baseEn.startsWith(staticPrefix)) {
-          const namePart = baseEn.slice(staticPrefix.length).trim();
-          return interpolate(tpl.ar, { name: namePart, comment: commentSuffix });
+          const namePartEn = baseEn.slice(staticPrefix.length).trim();
+          const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+          return interpolate(tpl.ar, { name: nameAr, comment: commentSuffix });
         }
       } else if (withoutComment.trim() === baseEn) {
         return interpolate(tpl.ar, { comment: commentSuffix });
@@ -435,19 +490,24 @@ export function resolveWorkflowContentAr(content: string | null | undefined): st
 
   const inProgressPrefix = WORKFLOW_TEMPLATES.request_approval_in_progress_from?.en.split('{{name}}')[0].trim();
   if (inProgressPrefix && normalized.startsWith(inProgressPrefix)) {
-    const namePart = normalized.slice(inProgressPrefix.length).trim();
-    return interpolate(WORKFLOW_TEMPLATES.request_approval_in_progress_from.ar, { name: namePart });
+    const namePartEn = normalized.slice(inProgressPrefix.length).trim();
+    const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+    return interpolate(WORKFLOW_TEMPLATES.request_approval_in_progress_from.ar, { name: nameAr });
   }
   const pendingPrefix = WORKFLOW_TEMPLATES.request_approval_pending_from?.en.split('{{name}}')[0].trim();
   if (pendingPrefix && normalized.startsWith(pendingPrefix)) {
-    const namePart = normalized.slice(pendingPrefix.length).trim();
-    return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: namePart });
+    const namePartEn = normalized.slice(pendingPrefix.length).trim();
+    const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+    return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: nameAr });
   }
 
   return null;
 }
 
-export function resolveChatMessageAr(message: string | null | undefined): string | null {
+export function resolveChatMessageAr(
+  message: string | null | undefined,
+  actors?: BilingualActorNames,
+): string | null {
   if (message == null || message.trim() === '') return null;
   const normalized = message.trim();
 
@@ -455,19 +515,33 @@ export function resolveChatMessageAr(message: string | null | undefined): string
     if (tpl.en === normalized) return tpl.ar;
   }
 
+  const submittedTpl = CHAT_TEMPLATES.cancellation_submitted_by;
+  if (submittedTpl) {
+    const prefix = submittedTpl.en.split('{{userName}}')[0];
+    if (normalized.startsWith(prefix)) {
+      const afterPrefix = normalized.slice(prefix.length);
+      const parenMatch = afterPrefix.match(/^(.+?) \((.+)\)$/);
+      if (parenMatch) {
+        const userEn = parenMatch[1].trim();
+        const employeeId = parenMatch[2].trim();
+        const userAr = actors?.userName?.trim()
+          ? resolveBilingualName(actors.userName, actors.userArabicName)
+          : resolveBilingualName(userEn, actors?.userArabicName);
+        return interpolate(submittedTpl.ar, { userName: userAr, employeeId });
+      }
+    }
+  }
+
   for (const tpl of Object.values(CHAT_TEMPLATES)) {
     if (!tpl.en.includes('{{roleName}}')) continue;
     const prefix = tpl.en.split('{{roleName}}')[0];
     if (!normalized.startsWith(prefix)) continue;
     const rest = normalized.slice(prefix.length);
     const commentIdx = rest.lastIndexOf(' - ');
-    if (commentIdx >= 0) {
-      return interpolate(tpl.ar, {
-        roleName: rest.slice(0, commentIdx),
-        comment: rest.slice(commentIdx),
-      });
-    }
-    return interpolate(tpl.ar, { roleName: rest, comment: '' });
+    const roleNameEn = commentIdx >= 0 ? rest.slice(0, commentIdx) : rest;
+    const commentSuffix = commentIdx >= 0 ? rest.slice(commentIdx) : '';
+    const roleNameAr = resolveArabicChatRoleName(actors, roleNameEn.trim());
+    return interpolate(tpl.ar, { roleName: roleNameAr, comment: commentSuffix });
   }
 
   return null;
@@ -477,9 +551,10 @@ export function resolveChatMessageAr(message: string | null | undefined): string
 export function enrichWorkflowLog(log: Record<string, unknown>): Record<string, unknown> {
   const status = log.status != null ? String(log.status) : null;
   const content = log.content != null ? String(log.content) : null;
+  const actors = extractBilingualActorsFromRecord(log);
   return {
     ...log,
-    content_ar: log.content_ar ?? resolveWorkflowContentAr(content),
+    content_ar: log.content_ar ?? resolveWorkflowContentAr(content, actors),
     status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
   };
 }
@@ -488,9 +563,10 @@ export function enrichWorkflowLog(log: Record<string, unknown>): Record<string,
 export function enrichChatMessage(chat: Record<string, unknown>): Record<string, unknown> {
   const status = chat.status != null ? String(chat.status) : null;
   const message = chat.message != null ? String(chat.message) : null;
+  const actors = extractBilingualActorsFromRecord(chat);
   return {
     ...chat,
-    message_ar: chat.message_ar ?? resolveChatMessageAr(message),
+    message_ar: chat.message_ar ?? resolveChatMessageAr(message, actors),
     status_ar: chat.status_ar ?? resolveChatStatusAr(status),
   };
 }