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

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

@@ -20,11 +20,33 @@ exports.workflowTemplate = workflowTemplate;
 exports.chatTemplate = chatTemplate;
 exports.buildSynchronizedWorkflowMessage = buildSynchronizedWorkflowMessage;
 exports.buildSynchronizedChatMessage = buildSynchronizedChatMessage;
+exports.buildWorkflowLogUpdateFields = buildWorkflowLogUpdateFields;
+exports.toWorkflowPersistFields = toWorkflowPersistFields;
+exports.toChatPersistFields = toChatPersistFields;
 exports.buildApprovalWorkflowContent = buildApprovalWorkflowContent;
 exports.buildHumanApprovalWorkflowContent = buildHumanApprovalWorkflowContent;
 exports.buildApprovalChatMessage = buildApprovalChatMessage;
+exports.buildClosedChatMessage = buildClosedChatMessage;
+exports.buildClosedWorkflowMessage = buildClosedWorkflowMessage;
+exports.buildRequestForChangeChatMessage = buildRequestForChangeChatMessage;
+exports.buildAttachmentUploadedChatMessage = buildAttachmentUploadedChatMessage;
+exports.buildUserOrAttachmentChatMessage = buildUserOrAttachmentChatMessage;
+exports.buildTaskInProgressChatMessage = buildTaskInProgressChatMessage;
+exports.buildTaskCompletedChatMessage = buildTaskCompletedChatMessage;
+exports.buildTaskStatusUpdatedChatMessage = buildTaskStatusUpdatedChatMessage;
+exports.buildItHelpdeskAssignedChatMessage = buildItHelpdeskAssignedChatMessage;
+exports.buildItHelpdeskReassignedChatMessage = buildItHelpdeskReassignedChatMessage;
+exports.buildRequestSubmittedWithRefChatMessage = buildRequestSubmittedWithRefChatMessage;
+exports.buildSecurityAccessApprovalChatMessage = buildSecurityAccessApprovalChatMessage;
+exports.buildItHelpdeskReassignModifiers = buildItHelpdeskReassignModifiers;
+exports.buildItHelpdeskMuscatWorkflowLog = buildItHelpdeskMuscatWorkflowLog;
+exports.buildLogisticsActualReturnChatMessage = buildLogisticsActualReturnChatMessage;
+exports.buildLogisticsActualReturnNotificationBody = buildLogisticsActualReturnNotificationBody;
+exports.buildLogisticsActualReturnNotificationTitle = buildLogisticsActualReturnNotificationTitle;
+exports.buildItHelpdeskCloseNotificationMessage = buildItHelpdeskCloseNotificationMessage;
 exports.resolveWorkflowStatusAr = resolveWorkflowStatusAr;
 exports.resolveChatStatusAr = resolveChatStatusAr;
+exports.extractBilingualActorsFromRecord = extractBilingualActorsFromRecord;
 exports.resolveWorkflowContentAr = resolveWorkflowContentAr;
 exports.resolveChatMessageAr = resolveChatMessageAr;
 exports.enrichWorkflowLog = enrichWorkflowLog;
@@ -38,6 +60,7 @@ exports.enrichChatMessage = enrichChatMessage;
 const workflow_chat_i18n_json_1 = __importDefault(require("./workflow-chat-i18n.json"));
 const WORKFLOW_TEMPLATES = workflow_chat_i18n_json_1.default.workflowTemplates;
 const CHAT_TEMPLATES = workflow_chat_i18n_json_1.default.chatTemplates;
+const NOTIFICATION_TEMPLATES = workflow_chat_i18n_json_1.default.notificationTemplates ?? {};
 const WORKFLOW_STATUS_LABELS = workflow_chat_i18n_json_1.default.workflowStatusLabels;
 const CHAT_STATUS_LABELS = workflow_chat_i18n_json_1.default.chatStatusLabels;
 function getWorkflowChatI18nCatalog() {
@@ -184,6 +207,12 @@ function buildSynchronizedChatMessage(ctx) {
             const employeeId = String(ctx.employeeId ?? 'N/A');
             return chatTemplate('cancellation_submitted_by', { userName: userEn, employeeId }, { userName: userAr, employeeId });
         }
+        case 'request_submitted': {
+            const userEn = ctx.userName?.trim() || 'Unknown User';
+            const userAr = resolveBilingualName(userEn, ctx.userArabicName);
+            const employeeId = String(ctx.employeeId ?? 'N/A');
+            return chatTemplate('request_submitted_by', { userName: userEn, employeeId }, { userName: userAr, employeeId });
+        }
         case 'request_received':
             return chatTemplate('request_received');
         case 'approved':
@@ -203,6 +232,48 @@ function buildSynchronizedChatMessage(ctx) {
     }
 }
 // ─── Backward-compatible aliases used by Cancellation pilot ───────────────────
+/** Standard workflow log UPDATE fields for all CAA module repositories. */
+function buildWorkflowLogUpdateFields(params) {
+    let action;
+    if (params.approvalStatus === 'Approved')
+        action = 'approved';
+    else if (params.approvalStatus === 'Rejected')
+        action = 'rejected';
+    else if (params.approvalStatus === 'Returned for Modification')
+        action = 'returned_for_modification';
+    else
+        action = 'approval_pending_update';
+    const bilingual = buildSynchronizedWorkflowMessage({
+        action,
+        roleName: params.roleName,
+        roleArabicName: params.roleArabicName,
+        comment: params.comment,
+    });
+    return {
+        content: bilingual.en,
+        content_ar: bilingual.ar,
+        status: params.workflowStatus,
+        status_ar: resolveWorkflowStatusAr(params.workflowStatus),
+    };
+}
+/** Bilingual workflow insert fields from builder output. */
+function toWorkflowPersistFields(bilingual, status) {
+    return {
+        content: bilingual.en,
+        content_ar: bilingual.ar,
+        status,
+        status_ar: resolveWorkflowStatusAr(status),
+    };
+}
+/** Bilingual chat insert fields from builder output. */
+function toChatPersistFields(bilingual, status) {
+    return {
+        message: bilingual.en,
+        message_ar: bilingual.ar,
+        status,
+        status_ar: resolveChatStatusAr(status),
+    };
+}
 function buildApprovalWorkflowContent(params) {
     const status = params.status;
     let action;
@@ -233,6 +304,21 @@ function buildHumanApprovalWorkflowContent(params) {
     });
 }
 function buildApprovalChatMessage(params) {
+    if (params.status === 'Closed') {
+        return buildClosedChatMessage({
+            roleName: params.roleName,
+            roleArabicName: params.roleArabicName,
+            comment: params.comment,
+        });
+    }
+    if (params.status === 'Request For Change' || params.status === 'RFC') {
+        return buildRequestForChangeChatMessage({
+            roleName: params.roleName,
+            roleArabicName: params.roleArabicName,
+            comment: params.comment,
+            variant: 'by',
+        });
+    }
     let action = 'approved';
     if (params.status === 'Rejected')
         action = 'rejected';
@@ -245,6 +331,312 @@ function buildApprovalChatMessage(params) {
         comment: params.comment,
     });
 }
+// ─── Specialized chat/workflow builders ─────────────────────────────────────
+function formatDotCommentSuffix(comment) {
+    const text = comment?.trim();
+    return text ? `. Comment: ${text}` : '';
+}
+function formatColonCommentSuffix(comment) {
+    const text = comment?.trim();
+    return text ? `: ${text}` : '';
+}
+function formatReassignCommentSuffix(comment) {
+    const text = comment?.trim();
+    return text ? `:${text}` : '';
+}
+function buildClosedChatMessage(params) {
+    const roleEn = params.roleName?.trim() || 'Unknown Role';
+    const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+    const comment = formatDotCommentSuffix(params.comment);
+    return renderSynchronizedChatMessage('request_closed_by_role', { roleName: roleEn, comment }, { roleName: roleAr, comment });
+}
+function buildClosedWorkflowMessage(params) {
+    const comment = formatWorkflowCommentSuffix(params.comment);
+    const roleEn = params.roleName?.trim();
+    if (roleEn) {
+        const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+        return renderSynchronizedWorkflowMessage('request_closed_by', { name: roleEn, comment }, { name: roleAr, comment });
+    }
+    return renderSynchronizedWorkflowMessage('request_closed', { comment }, { comment });
+}
+function buildRequestForChangeChatMessage(params) {
+    const roleEn = params.roleName?.trim() || 'Unknown Role';
+    const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+    const comment = params.variant === 'requested_by'
+        ? formatChatCommentSuffix(params.comment)
+        : formatColonCommentSuffix(params.comment);
+    const key = params.variant === 'requested_by'
+        ? 'request_for_change_requested_by_role'
+        : 'request_for_change_by_role';
+    return renderSynchronizedChatMessage(key, { roleName: roleEn, comment }, { roleName: roleAr, comment });
+}
+function buildAttachmentUploadedChatMessage(fileName) {
+    const name = fileName?.trim() || 'file';
+    return renderSynchronizedChatMessage('attachment_uploaded', { fileName: name }, { fileName: name });
+}
+/** User-typed chat text, or bilingual [Attachment] placeholder when empty. */
+function buildUserOrAttachmentChatMessage(userMessage) {
+    const text = userMessage?.trim();
+    if (text)
+        return { en: text, ar: text };
+    return chatTemplate('attachment_placeholder');
+}
+function buildTaskInProgressChatMessage(params) {
+    const roleEn = params.roleName?.trim() || 'Employee';
+    const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+    return renderSynchronizedChatMessage('task_status_in_progress_by_role', { roleName: roleEn }, { roleName: roleAr });
+}
+function buildTaskCompletedChatMessage(params) {
+    const roleEn = params.roleName?.trim() || 'Employee';
+    const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+    const comment = formatDotCommentSuffix(params.comment);
+    return renderSynchronizedChatMessage('task_completed_by_role', { roleName: roleEn, comment }, { roleName: roleAr, comment });
+}
+function buildTaskStatusUpdatedChatMessage(status, statusAr) {
+    const statusEn = status?.trim() || 'Updated';
+    const statusArResolved = statusAr?.trim() || resolveChatStatusAr(statusEn) || statusEn;
+    return renderSynchronizedChatMessage('task_status_updated', { status: statusEn }, { status: statusArResolved });
+}
+function buildItHelpdeskAssignedChatMessage(params) {
+    const assignedRoleEn = params.assignedRoleName?.trim() || 'Role';
+    const assignedRoleAr = resolveBilingualName(assignedRoleEn, params.assignedRoleArabicName);
+    const assignedUserEn = params.assignedUserName?.trim() || 'User';
+    const assignedUserAr = resolveBilingualName(assignedUserEn, params.assignedUserArabicName);
+    const comment = params.comment?.trim() ? ` - ${params.comment.trim()}` : '';
+    const templateKey = params.level === 1 ? 'it_helpdesk_hos_assigned' : 'it_helpdesk_technician_assigned';
+    const enParams = {
+        assignedRoleName: assignedRoleEn,
+        assignedUserName: assignedUserEn,
+        comment,
+    };
+    const arParams = {
+        assignedRoleName: assignedRoleAr,
+        assignedUserName: assignedUserAr,
+        comment,
+    };
+    if (params.level !== 1) {
+        enParams.level = String(params.level);
+        arParams.level = String(params.level);
+    }
+    return renderSynchronizedChatMessage(templateKey, enParams, arParams);
+}
+function buildItHelpdeskReassignedChatMessage(params) {
+    const approverEn = params.approverRoleName?.trim() || 'Role';
+    const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
+    const comment = formatReassignCommentSuffix(params.comment);
+    if (params.level === 1) {
+        const reassignedEn = params.reassignedRoleName?.trim() || 'Role';
+        const reassignedAr = resolveBilingualName(reassignedEn, params.reassignedRoleArabicName);
+        return renderSynchronizedChatMessage('it_helpdesk_reassigned_to_role', { approverRoleName: approverEn, reassignedRoleName: reassignedEn, comment }, { approverRoleName: approverAr, reassignedRoleName: reassignedAr, comment });
+    }
+    if (params.level === 2) {
+        return renderSynchronizedChatMessage('it_helpdesk_reassigned_to_l3', { approverRoleName: approverEn, comment }, { approverRoleName: approverAr, comment });
+    }
+    const level = String(params.level);
+    return renderSynchronizedChatMessage('it_helpdesk_reassigned_generic', { approverRoleName: approverEn, level, comment }, { approverRoleName: approverAr, level, comment });
+}
+function buildRequestSubmittedWithRefChatMessage(params) {
+    const userEn = params.userName?.trim() || 'Unknown User';
+    const userAr = resolveBilingualName(userEn, params.userArabicName);
+    const labelEn = params.requestLabel?.trim() || 'Request';
+    const labelAr = params.requestLabelAr?.trim() || labelEn;
+    const requestId = String(params.requestId);
+    const employeeId = String(params.employeeId ?? 'N/A');
+    return renderSynchronizedChatMessage('request_submitted_with_ref', { requestLabel: labelEn, requestId, userName: userEn, employeeId }, { requestLabel: labelAr, requestId, userName: userAr, employeeId });
+}
+function buildSecurityAccessApprovalChatMessage(params) {
+    const statusWord = params.decision === 'approve' ? 'approved' : 'rejected';
+    const statusWordAr = params.decision === 'approve' ? 'الموافقة على' : 'رفض';
+    const comment = params.comment?.trim() ? ` Comment: ${params.comment.trim()}` : '';
+    const labelEn = params.productLabel?.trim() || 'Security Access';
+    const labelAr = params.productLabelAr?.trim() || labelEn;
+    return renderSynchronizedChatMessage('security_access_approval_step', {
+        productLabel: labelEn,
+        requestId: String(params.requestId),
+        statusWord,
+        approvalLevel: String(params.approvalLevel),
+        comment,
+        statusWordAr,
+    }, {
+        productLabel: labelAr,
+        requestId: String(params.requestId),
+        statusWord,
+        approvalLevel: String(params.approvalLevel),
+        comment,
+        statusWordAr,
+    });
+}
+function renderSynchronizedNotificationMessage(templateKey, enParams, arParams) {
+    const tpl = NOTIFICATION_TEMPLATES[templateKey];
+    if (!tpl)
+        return { en: templateKey, ar: templateKey };
+    return {
+        en: interpolate(tpl.en, enParams),
+        ar: interpolate(tpl.ar, arParams),
+    };
+}
+function normalizeDisplayValue(value) {
+    if (value === undefined || value === null || String(value).trim() === '')
+        return 'Not specified';
+    return String(value);
+}
+function normalizeDisplayDate(value) {
+    if (value === undefined || value === null || String(value).trim() === '')
+        return 'Not specified';
+    const d = new Date(value);
+    if (!isNaN(d.getTime()))
+        return d.toISOString().slice(0, 10);
+    return String(value);
+}
+function buildItHelpdeskReassignModifiers(params) {
+    let en = '';
+    let ar = '';
+    if (params.sectionFrom != null &&
+        params.sectionTo != null &&
+        params.sectionFrom !== params.sectionTo) {
+        en += ` (Section modified from ${params.sectionFrom} to ${params.sectionTo})`;
+        ar += ` (تم تعديل القسم من ${params.sectionFrom} إلى ${params.sectionTo})`;
+    }
+    if (params.departmentFrom != null &&
+        params.departmentTo != null &&
+        params.departmentFrom !== params.departmentTo) {
+        en += ` (Department modified from ${params.departmentFrom} to ${params.departmentTo})`;
+        ar += ` (تم تعديل الإدارة من ${params.departmentFrom} إلى ${params.departmentTo})`;
+    }
+    return { en, ar };
+}
+function buildItHelpdeskMuscatWorkflowLog(params) {
+    const comment = formatColonCommentSuffix('comment' in params ? params.comment : undefined);
+    const modifiers = 'modifiers' in params && params.modifiers ? params.modifiers : { en: '', ar: '' };
+    switch (params.variant) {
+        case 'hos_assigned': {
+            const approverEn = params.approverRoleName.trim();
+            const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
+            const assignedEn = params.assignedRoleName.trim();
+            const assignedAr = resolveBilingualName(assignedEn, params.assignedRoleArabicName);
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_hos_assigned', { approverRoleName: approverEn, assignedRoleName: assignedEn, comment }, { approverRoleName: approverAr, assignedRoleName: assignedAr, comment });
+        }
+        case 'technician_assigned': {
+            const approverEn = params.approverRoleName.trim();
+            const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_technician_assigned', { level: String(params.level), approverRoleName: approverEn, comment }, { level: String(params.level), approverRoleName: approverAr, comment });
+        }
+        case 'reassigned_technician': {
+            const approverEn = params.approverRoleName.trim();
+            const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_reassigned_technician', { approverRoleName: approverEn, comment, modifiers: modifiers.en }, { approverRoleName: approverAr, comment, modifiers: modifiers.ar });
+        }
+        case 'reassigned_l3': {
+            const approverEn = params.approverRoleName.trim();
+            const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_reassigned_l3', { approverRoleName: approverEn, comment, modifiers: modifiers.en }, { approverRoleName: approverAr, comment, modifiers: modifiers.ar });
+        }
+        case 'reassigned_generic': {
+            const approverEn = params.approverRoleName.trim();
+            const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
+            const level = String(params.level ?? '');
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_reassigned_generic', { approverRoleName: approverEn, level, comment, modifiers: modifiers.en }, { approverRoleName: approverAr, level, comment, modifiers: modifiers.ar });
+        }
+        case 'closed_level1': {
+            const approverEn = params.approverRoleName.trim();
+            const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_closed_request', { approverRoleName: approverEn, comment }, { approverRoleName: approverAr, comment });
+        }
+        case 'closed_level2': {
+            const approverEn = params.approverRoleName.trim();
+            const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_closed_request_cap', { approverRoleName: approverEn, comment }, { approverRoleName: approverAr, comment });
+        }
+        case 'l3_approved': {
+            const roleEn = params.roleName.trim();
+            const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+            const userEn = params.userName.trim();
+            const userAr = resolveBilingualName(userEn, params.userArabicName);
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_l3_approved_by', { roleName: roleEn, userName: userEn, comment }, { roleName: roleAr, userName: userAr, comment });
+        }
+        case 'l3_rejected': {
+            const roleEn = params.roleName.trim();
+            const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+            const userEn = params.userName.trim();
+            const userAr = resolveBilingualName(userEn, params.userArabicName);
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_l3_rejected_by', { roleName: roleEn, userName: userEn, comment }, { roleName: roleAr, userName: userAr, comment });
+        }
+        case 'level_approved': {
+            const approverEn = params.approverRoleName.trim();
+            const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_level_approved', { level: String(params.level), approverRoleName: approverEn, comment }, { level: String(params.level), approverRoleName: approverAr, comment });
+        }
+        case 'rejected':
+        case 'l3_step_rejected': {
+            const key = params.variant === 'l3_step_rejected'
+                ? 'it_helpdesk_wf_l3_step_rejected'
+                : 'it_helpdesk_wf_rejected';
+            const roleEn = params.approverRoleName.trim();
+            const roleAr = resolveBilingualName(roleEn, params.approverRoleArabicName);
+            return renderSynchronizedWorkflowMessage(key, { approverRoleName: roleEn, roleName: roleEn, comment }, { approverRoleName: roleAr, roleName: roleAr, comment });
+        }
+        case 'generic_status': {
+            const approverEn = params.approverRoleName.trim();
+            const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
+            const statusEn = params.status.toLowerCase();
+            const statusAr = resolveChatStatusAr(params.status) ?? statusEn;
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_status_by_role', { status: statusEn, statusAr, approverRoleName: approverEn, comment }, { status: statusEn, statusAr, approverRoleName: approverAr, comment });
+        }
+        case 'technician_completed': {
+            const roleEn = params.roleName.trim();
+            const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_technician_completed', { roleName: roleEn, comment }, { roleName: roleAr, comment });
+        }
+        case 'routing_rejected':
+            return renderSynchronizedWorkflowMessage('it_helpdesk_wf_routing_rejected', { comment }, { comment });
+        case 'routing_resolved':
+            return workflowTemplate('it_helpdesk_wf_routing_resolved');
+        default:
+            return workflowTemplate('request_submitted');
+    }
+}
+function buildLogisticsActualReturnChatMessage(params) {
+    const roleEn = params.roleName.trim() || 'Unknown Role';
+    const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+    const date = normalizeDisplayDate(params.returnDetails.actual_return_date);
+    const time = normalizeDisplayValue(params.returnDetails.actual_vehicle_return_time);
+    const reason = normalizeDisplayValue(params.returnDetails.reason);
+    return renderSynchronizedChatMessage('logistics_actual_return_updated', { roleName: roleEn, date, time, reason }, { roleName: roleAr, date, time, reason });
+}
+function buildLogisticsActualReturnNotificationBody(params) {
+    const requestLabel = params.requestTypeLabel
+        ? `${params.requestTypeLabel} Request`
+        : 'Vehicle Request';
+    const requestLabelAr = params.requestTypeLabel
+        ? `طلب ${params.requestTypeLabel}`
+        : 'طلب المركبة';
+    const requestId = normalizeDisplayValue(params.requestId);
+    const en = [
+        `${requestLabel} #${requestId}`,
+        `Actual Return Date: ${normalizeDisplayDate(params.actual_return_date)}`,
+        `Actual Return Time: ${normalizeDisplayValue(params.actual_vehicle_return_time)}`,
+        `Reason: ${normalizeDisplayValue(params.reason)}`,
+    ].join('\n');
+    const ar = [
+        `${requestLabelAr} رقم ${requestId}`,
+        `تاريخ الإرجاع الفعلي: ${normalizeDisplayDate(params.actual_return_date)}`,
+        `وقت الإرجاع الفعلي: ${normalizeDisplayValue(params.actual_vehicle_return_time)}`,
+        `السبب: ${normalizeDisplayValue(params.reason)}`,
+    ].join('\n');
+    return { en, ar };
+}
+function buildLogisticsActualReturnNotificationTitle(params) {
+    const requestLabel = params.requestTypeLabel || 'Vehicle';
+    const requestId = String(params.requestId ?? '');
+    return renderSynchronizedNotificationMessage('logistics_actual_return_title', { requestLabel, requestId }, { requestLabel, requestId });
+}
+function buildItHelpdeskCloseNotificationMessage(params) {
+    const requestId = String(params.requestId);
+    const key = params.status === 'Rejected'
+        ? 'it_helpdesk_notif_request_rejected'
+        : 'it_helpdesk_notif_request_closed';
+    return renderSynchronizedNotificationMessage(key, { requestId }, { requestId });
+}
 // ─── Status labels ───────────────────────────────────────────────────────────
 function resolveWorkflowStatusAr(status) {
     if (status == null || status === '')
@@ -257,7 +649,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 +709,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 +721,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 +741,24 @@ function resolveChatMessageAr(message) {
         if (tpl.en === normalized)
             return tpl.ar;
     }
+    for (const tplKey of ['request_submitted_by', 'cancellation_submitted_by']) {
+        const submittedTpl = CHAT_TEMPLATES[tplKey];
+        if (!submittedTpl)
+            continue;
+        const prefix = submittedTpl.en.split('{{userName}}')[0];
+        if (!normalized.startsWith(prefix))
+            continue;
+        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 +767,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 +778,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 +789,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/dist/models/AccessCardChatModel.d.ts

@@ -14,7 +14,9 @@ export declare class AccessCardRequestChat extends BaseModel {
     user_id: number;
     role_id: number;
     message: string;
+    message_ar: string | null;
     messageType: AccessCardMessageType;
     status: string;
+    status_ar: string | null;
     constructor(request_id: number, user_id: number, role_id: number, message: string, service_id?: number, sub_service_id?: number, messageType?: AccessCardMessageType, status?: AccessCardApprovalStatus);
 }

package/dist/models/AccessCardChatModel.js

@@ -59,6 +59,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: false }),
     __metadata("design:type", String)
 ], AccessCardRequestChat.prototype, "message", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], AccessCardRequestChat.prototype, "message_ar", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -72,6 +76,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", String)
 ], AccessCardRequestChat.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], AccessCardRequestChat.prototype, "status_ar", void 0);
 exports.AccessCardRequestChat = AccessCardRequestChat = __decorate([
     (0, typeorm_1.Entity)({ name: "access_card_request_chat" }),
     __metadata("design:paramtypes", [Number, Number, Number, String, Number, Number, String, String])

package/dist/models/AccessCardWorkflowModel.d.ts

@@ -9,7 +9,9 @@ export declare class AccessCardWorkflow extends BaseModel {
     service_id: number | null;
     sub_service_id: number | null;
     content: string;
+    content_ar: string | null;
     status: AccessCardWorkflowStatus;
+    status_ar: string | null;
     user_id: number | null;
     role_id: number | null;
     department_id: number | null;

package/dist/models/AccessCardWorkflowModel.js

@@ -49,6 +49,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: false }),
     __metadata("design:type", String)
 ], AccessCardWorkflow.prototype, "content", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], AccessCardWorkflow.prototype, "content_ar", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -58,6 +62,10 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], AccessCardWorkflow.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], AccessCardWorkflow.prototype, "status_ar", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)

package/dist/models/AccommodationChatModel.d.ts

@@ -12,10 +12,12 @@ export declare class AccommodationChat extends BaseModel {
     sub_service_id: number;
     user_id: number;
     message: string;
+    message_ar: string | null;
     message_type: string;
     is_internal: boolean;
     approver_role_id: number;
     status: string;
+    status_ar: string | null;
     created_by: number;
     constructor();
 }