@platform-modules/civil-aviation-authority 2.3.279 → 2.3.280

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

@@ -15,11 +15,10 @@ export declare function workflowTemplate(key: string, params?: Record<string, st
 export declare function chatTemplate(key: string, params?: Record<string, string>, arParams?: Record<string, string>): BilingualText;
 export declare function resolveWorkflowStatusAr(status: string | null | undefined): string | null;
 export declare function resolveChatStatusAr(status: string | null | undefined): string | null;
-/** Arabic DB value when present; otherwise English so AR text stays structurally complete. */
-export declare function resolveBilingualName(englishName?: string | null, arabicName?: string | null): string;
-export declare function pickArabicName(arabicName?: string | null, fallback?: string): string;
+/** Arabic column value only — never falls back to English (for content_ar / message_ar). */
+export declare function pickArabicName(arabicName?: string | null): string;
 export declare function pickLocalizedName(englishName?: string | null, arabicName?: string | null, fallback?: string): string;
-/** Parallel EN/AR dept-section labels (Arabic columns preferred; English fallback per field). */
+/** EN from English columns; AR from Arabic columns only (no English in ar). */
 export declare function joinDeptSectionBilingualLabels(deptEn?: string | null, deptAr?: string | null, sectEn?: string | null, sectAr?: string | null): {
     en: string;
     ar: string;

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

@@ -9,7 +9,6 @@ exports.workflowTemplate = workflowTemplate;
 exports.chatTemplate = chatTemplate;
 exports.resolveWorkflowStatusAr = resolveWorkflowStatusAr;
 exports.resolveChatStatusAr = resolveChatStatusAr;
-exports.resolveBilingualName = resolveBilingualName;
 exports.pickArabicName = pickArabicName;
 exports.pickLocalizedName = pickLocalizedName;
 exports.joinDeptSectionBilingualLabels = joinDeptSectionBilingualLabels;
@@ -60,15 +59,9 @@ function resolveChatStatusAr(status) {
         return null;
     return CHAT_STATUS_LABELS[status] ?? status;
 }
-/** Arabic DB value when present; otherwise English so AR text stays structurally complete. */
-function resolveBilingualName(englishName, arabicName) {
-    const ar = arabicName?.trim();
-    if (ar)
-        return ar;
-    return englishName?.trim() || '';
-}
-function pickArabicName(arabicName, fallback = '') {
-    return arabicName?.trim() || fallback;
+/** Arabic column value only — never falls back to English (for content_ar / message_ar). */
+function pickArabicName(arabicName) {
+    return arabicName?.trim() || '';
 }
 function pickLocalizedName(englishName, arabicName, fallback = '') {
     const ar = arabicName?.trim();
@@ -82,11 +75,12 @@ function pickLocalizedName(englishName, arabicName, fallback = '') {
 function joinDeptSectionLabels(dept, section) {
     return [dept, section].map((s) => s?.trim()).filter(Boolean).join(' - ');
 }
-/** Parallel EN/AR dept-section labels (Arabic columns preferred; English fallback per field). */
+/** EN from English columns; AR from Arabic columns only (no English in ar). */
 function joinDeptSectionBilingualLabels(deptEn, deptAr, sectEn, sectAr) {
-    const en = joinDeptSectionLabels(deptEn, sectEn);
-    const ar = joinDeptSectionLabels(resolveBilingualName(deptEn, deptAr), resolveBilingualName(sectEn, sectAr));
-    return { en, ar };
+    return {
+        en: joinDeptSectionLabels(deptEn, sectEn),
+        ar: joinDeptSectionLabels(deptAr, sectAr),
+    };
 }
 /** @deprecated Use joinDeptSectionBilingualLabels */
 function joinDeptSectionArabicLabels(deptArabic, sectionArabic) {
@@ -100,48 +94,73 @@ function formatChatCommentSuffix(comment) {
     const text = comment?.trim();
     return text ? ` - ${text}` : '';
 }
-function buildWorkflowApprovalByName(templateKey, nameEn, nameAr, comment) {
+function buildWorkflowApprovalByName(templateKey, fallbackKey, nameEn, nameAr, comment) {
     const commentSuffix = formatWorkflowCommentSuffix(comment);
-    return workflowTemplate(templateKey, { name: nameEn, comment: commentSuffix }, { name: nameAr, comment: commentSuffix });
+    return {
+        en: workflowTemplate(templateKey, { name: nameEn, comment: commentSuffix }).en,
+        ar: nameAr
+            ? workflowTemplate(templateKey, { name: nameAr, comment: '' }).ar
+            : workflowTemplate(fallbackKey, { comment: '' }).ar,
+    };
 }
 function buildWorkflowApprovalWithoutName(templateKey, comment) {
     const commentSuffix = formatWorkflowCommentSuffix(comment);
-    return workflowTemplate(templateKey, { comment: commentSuffix }, { comment: commentSuffix });
+    return {
+        en: workflowTemplate(templateKey, { comment: commentSuffix }).en,
+        ar: workflowTemplate(templateKey, { comment: '' }).ar,
+    };
+}
+function buildWorkflowFromNamePair(templateWithNameKey, templateWithoutNameKey, nameEn, nameAr) {
+    return {
+        en: workflowTemplate(templateWithNameKey, { name: nameEn }).en,
+        ar: nameAr
+            ? workflowTemplate(templateWithNameKey, { name: nameAr }).ar
+            : workflowTemplate(templateWithoutNameKey).ar,
+    };
 }
 function buildApprovalWorkflowContent(params) {
     const nameEn = params.roleName?.trim() || '';
-    const nameAr = resolveBilingualName(nameEn, params.roleArabicName);
+    const nameAr = pickArabicName(params.roleArabicName);
     if (params.status === 'Approved') {
         return nameEn
-            ? buildWorkflowApprovalByName('request_approved_by', nameEn, nameAr, params.comment)
+            ? buildWorkflowApprovalByName('request_approved_by', 'request_approved', nameEn, nameAr, params.comment)
             : buildWorkflowApprovalWithoutName('request_approved', params.comment);
     }
     if (params.status === 'Rejected') {
         return nameEn
-            ? buildWorkflowApprovalByName('request_rejected_by', nameEn, nameAr, params.comment)
+            ? buildWorkflowApprovalByName('request_rejected_by', 'request_rejected', nameEn, nameAr, params.comment)
             : buildWorkflowApprovalWithoutName('request_rejected', params.comment);
     }
     if (params.status === 'Returned for Modification') {
         return nameEn
-            ? buildWorkflowApprovalByName('request_returned_for_modification_by', nameEn, nameAr, params.comment)
+            ? buildWorkflowApprovalByName('request_returned_for_modification_by', 'request_returned_for_modification', nameEn, nameAr, params.comment)
             : buildWorkflowApprovalWithoutName('request_returned_for_modification', params.comment);
     }
     const commentSuffix = formatWorkflowCommentSuffix(params.comment);
     if (nameEn) {
-        return workflowTemplate('request_approval_pending_from', { name: nameEn, comment: commentSuffix }, { name: nameAr, comment: commentSuffix });
+        return {
+            en: workflowTemplate('request_approval_pending_from', { name: nameEn, comment: commentSuffix }).en,
+            ar: nameAr
+                ? workflowTemplate('request_approval_pending_from', { name: nameAr, comment: '' }).ar
+                : workflowTemplate('request_approval_pending', { comment: '' }).ar,
+        };
     }
-    return workflowTemplate('request_approval_pending', { comment: commentSuffix }, { comment: commentSuffix });
+    return {
+        en: workflowTemplate('request_approval_pending', { comment: commentSuffix }).en,
+        ar: workflowTemplate('request_approval_pending', { comment: '' }).ar,
+    };
 }
 function buildHumanApprovalWorkflowContent(params) {
-    const key = params.isFirst ? 'request_approval_in_progress_from' : 'request_approval_pending_from';
+    const withNameKey = params.isFirst ? 'request_approval_in_progress_from' : 'request_approval_pending_from';
+    const withoutNameKey = params.isFirst ? 'request_approval_in_progress' : 'request_approval_pending';
     if (params.roleName?.trim()) {
         const nameEn = params.roleName.trim();
-        const nameAr = resolveBilingualName(nameEn, params.roleArabicName);
-        return workflowTemplate(key, { name: nameEn }, { name: nameAr });
+        const nameAr = pickArabicName(params.roleArabicName);
+        return buildWorkflowFromNamePair(withNameKey, withoutNameKey, nameEn, nameAr);
     }
     const { en, ar } = joinDeptSectionBilingualLabels(params.deptName, params.deptArabicName, params.sectionName, params.sectionArabicName);
     if (en) {
-        return workflowTemplate(key, { name: en }, { name: ar });
+        return buildWorkflowFromNamePair(withNameKey, withoutNameKey, en, ar);
     }
     return params.isFirst
         ? workflowTemplate('request_approval_in_progress')
@@ -149,22 +168,32 @@ function buildHumanApprovalWorkflowContent(params) {
 }
 function buildApprovalChatMessage(params) {
     const roleEn = params.roleName?.trim() || 'Unknown Role';
-    const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+    const roleAr = pickArabicName(params.roleArabicName);
     const commentSuffix = formatChatCommentSuffix(params.comment);
-    let key;
+    let byRoleKey;
+    let withoutRoleKey;
     if (params.status === 'Approved') {
-        key = 'request_approved_by_role';
+        byRoleKey = 'request_approved_by_role';
+        withoutRoleKey = 'request_approved';
     }
     else if (params.status === 'Rejected') {
-        key = 'request_rejected_by_role';
+        byRoleKey = 'request_rejected_by_role';
+        withoutRoleKey = 'request_rejected';
     }
     else if (params.status === 'Returned for Modification') {
-        key = 'request_returned_for_modification_by_role';
+        byRoleKey = 'request_returned_for_modification_by_role';
+        withoutRoleKey = 'request_returned_for_modification';
     }
     else {
-        key = 'request_approved_by_role';
+        byRoleKey = 'request_approved_by_role';
+        withoutRoleKey = 'request_approved';
     }
-    return chatTemplate(key, { roleName: roleEn, comment: commentSuffix }, { roleName: roleAr, comment: commentSuffix });
+    return {
+        en: chatTemplate(byRoleKey, { roleName: roleEn, comment: commentSuffix }).en,
+        ar: roleAr
+            ? chatTemplate(byRoleKey, { roleName: roleAr, comment: '' }).ar
+            : chatTemplate(withoutRoleKey, { comment: '' }).ar,
+    };
 }
 /** Resolve Arabic workflow content from a stored English content string (legacy rows). */
 function resolveWorkflowContentAr(content) {
@@ -178,8 +207,6 @@ function resolveWorkflowContentAr(content) {
     const commentIdx = normalized.indexOf(': ');
     if (commentIdx > 0) {
         const baseEn = normalized.slice(0, commentIdx).trim();
-        const commentText = normalized.slice(commentIdx + 2).trim();
-        const commentSuffix = formatWorkflowCommentSuffix(commentText);
         for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
             if (!tpl.en.includes('{{comment}}'))
                 continue;
@@ -187,15 +214,29 @@ 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 fallbackKey = Object.entries(WORKFLOW_TEMPLATES).find(([, t]) => t === tpl)?.[0] ?? '';
+                    if (fallbackKey.includes('_by')) {
+                        const genericKey = fallbackKey.replace('_by', '');
+                        if (WORKFLOW_TEMPLATES[genericKey]) {
+                            return WORKFLOW_TEMPLATES[genericKey].ar;
+                        }
+                    }
+                    return tpl.ar.split('{{name}}')[0].trim();
                 }
             }
             else if (withoutComment.trim() === baseEn) {
-                return interpolate(tpl.ar, { comment: commentSuffix });
+                return interpolate(tpl.ar, { comment: '' });
             }
         }
     }
+    const inProgressPrefix = WORKFLOW_TEMPLATES.request_approval_in_progress_from?.en.split('{{name}}')[0].trim();
+    if (inProgressPrefix && normalized.startsWith(inProgressPrefix)) {
+        return WORKFLOW_TEMPLATES.request_approval_in_progress.ar;
+    }
+    const pendingPrefix = WORKFLOW_TEMPLATES.request_approval_pending_from?.en.split('{{name}}')[0].trim();
+    if (pendingPrefix && normalized.startsWith(pendingPrefix)) {
+        return WORKFLOW_TEMPLATES.request_approval_pending.ar;
+    }
     return null;
 }
 /** Resolve Arabic chat message from a stored English message string (legacy rows). */
@@ -212,18 +253,26 @@ function resolveChatMessageAr(message) {
 function enrichCancellationWorkflowLog(log) {
     const status = log.status != null ? String(log.status) : null;
     const content = log.content != null ? String(log.content) : null;
+    const storedAr = log.content_ar != null ? String(log.content_ar).trim() : '';
+    const hasEnglishInAr = storedAr && /[A-Za-z]/.test(storedAr);
     return {
         ...log,
-        content_ar: log.content_ar ?? resolveWorkflowContentAr(content),
+        content_ar: hasEnglishInAr
+            ? (resolveWorkflowContentAr(content) ?? storedAr)
+            : (log.content_ar ?? resolveWorkflowContentAr(content)),
         status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
     };
 }
 function enrichCancellationChatMessage(chat) {
     const status = chat.status != null ? String(chat.status) : null;
     const message = chat.message != null ? String(chat.message) : null;
+    const storedAr = chat.message_ar != null ? String(chat.message_ar).trim() : '';
+    const hasEnglishInAr = storedAr && /[A-Za-z]/.test(storedAr);
     return {
         ...chat,
-        message_ar: chat.message_ar ?? resolveChatMessageAr(message),
+        message_ar: hasEnglishInAr
+            ? (resolveChatMessageAr(message) ?? storedAr)
+            : (chat.message_ar ?? resolveChatMessageAr(message)),
         status_ar: chat.status_ar ?? resolveChatStatusAr(status),
     };
 }

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

@@ -58,6 +58,10 @@
       "en": "Cancellation request submitted by {{userName}} ({{employeeId}})",
       "ar": "تم تقديم طلب الإلغاء بواسطة {{userName}} ({{employeeId}})"
     },
+    "cancellation_submitted": {
+      "en": "Cancellation request submitted",
+      "ar": "تم تقديم طلب الإلغاء"
+    },
     "request_received": {
       "en": "Request Received",
       "ar": "تم استلام الطلب"
@@ -73,6 +77,18 @@
     "request_returned_for_modification_by_role": {
       "en": "Request Returned for Modification by: {{roleName}}{{comment}}",
       "ar": "تم إرجاع الطلب للتعديل من قبل: {{roleName}}{{comment}}"
+    },
+    "request_approved": {
+      "en": "Request Approved{{comment}}",
+      "ar": "تمت الموافقة على الطلب{{comment}}"
+    },
+    "request_rejected": {
+      "en": "Request Rejected{{comment}}",
+      "ar": "تم رفض الطلب{{comment}}"
+    },
+    "request_returned_for_modification": {
+      "en": "Request Returned for Modification{{comment}}",
+      "ar": "تم إرجاع الطلب للتعديل{{comment}}"
     }
   },
   "workflowStatusLabels": {

package/package.json

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

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

@@ -58,6 +58,10 @@
       "en": "Cancellation request submitted by {{userName}} ({{employeeId}})",
       "ar": "تم تقديم طلب الإلغاء بواسطة {{userName}} ({{employeeId}})"
     },
+    "cancellation_submitted": {
+      "en": "Cancellation request submitted",
+      "ar": "تم تقديم طلب الإلغاء"
+    },
     "request_received": {
       "en": "Request Received",
       "ar": "تم استلام الطلب"
@@ -73,6 +77,18 @@
     "request_returned_for_modification_by_role": {
       "en": "Request Returned for Modification by: {{roleName}}{{comment}}",
       "ar": "تم إرجاع الطلب للتعديل من قبل: {{roleName}}{{comment}}"
+    },
+    "request_approved": {
+      "en": "Request Approved{{comment}}",
+      "ar": "تمت الموافقة على الطلب{{comment}}"
+    },
+    "request_rejected": {
+      "en": "Request Rejected{{comment}}",
+      "ar": "تم رفض الطلب{{comment}}"
+    },
+    "request_returned_for_modification": {
+      "en": "Request Returned for Modification{{comment}}",
+      "ar": "تم إرجاع الطلب للتعديل{{comment}}"
     }
   },
   "workflowStatusLabels": {

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

@@ -66,18 +66,9 @@ export function resolveChatStatusAr(status: string | null | undefined): string |
   return CHAT_STATUS_LABELS[status] ?? status;
 }
 
-/** Arabic DB value when present; otherwise English so AR text stays structurally complete. */
-export function resolveBilingualName(
-  englishName?: string | null,
-  arabicName?: string | null,
-): string {
-  const ar = arabicName?.trim();
-  if (ar) return ar;
-  return englishName?.trim() || '';
-}
-
-export function pickArabicName(arabicName?: string | null, fallback = ''): string {
-  return arabicName?.trim() || fallback;
+/** Arabic column value only — never falls back to English (for content_ar / message_ar). */
+export function pickArabicName(arabicName?: string | null): string {
+  return arabicName?.trim() || '';
 }
 
 export function pickLocalizedName(
@@ -99,19 +90,17 @@ function joinDeptSectionLabels(
   return [dept, section].map((s) => s?.trim()).filter(Boolean).join(' - ');
 }
 
-/** Parallel EN/AR dept-section labels (Arabic columns preferred; English fallback per field). */
+/** EN from English columns; AR from Arabic columns only (no English in ar). */
 export function joinDeptSectionBilingualLabels(
   deptEn?: string | null,
   deptAr?: string | null,
   sectEn?: string | null,
   sectAr?: string | null,
 ): { en: string; ar: string } {
-  const en = joinDeptSectionLabels(deptEn, sectEn);
-  const ar = joinDeptSectionLabels(
-    resolveBilingualName(deptEn, deptAr),
-    resolveBilingualName(sectEn, sectAr),
-  );
-  return { en, ar };
+  return {
+    en: joinDeptSectionLabels(deptEn, sectEn),
+    ar: joinDeptSectionLabels(deptAr, sectAr),
+  };
 }
 
 /** @deprecated Use joinDeptSectionBilingualLabels */
@@ -132,30 +121,55 @@ function formatChatCommentSuffix(comment?: string | null): string {
   return text ? ` - ${text}` : '';
 }
 
+type WorkflowByNameKey =
+  | 'request_approved_by'
+  | 'request_rejected_by'
+  | 'request_returned_for_modification_by';
+
+type WorkflowWithoutNameKey =
+  | 'request_approved'
+  | 'request_rejected'
+  | 'request_returned_for_modification';
+
 function buildWorkflowApprovalByName(
-  templateKey: 'request_approved_by' | 'request_rejected_by' | 'request_returned_for_modification_by',
+  templateKey: WorkflowByNameKey,
+  fallbackKey: WorkflowWithoutNameKey,
   nameEn: string,
   nameAr: string,
   comment?: string | null,
 ): BilingualText {
   const commentSuffix = formatWorkflowCommentSuffix(comment);
-  return workflowTemplate(
-    templateKey,
-    { name: nameEn, comment: commentSuffix },
-    { name: nameAr, comment: commentSuffix },
-  );
+  return {
+    en: workflowTemplate(templateKey, { name: nameEn, comment: commentSuffix }).en,
+    ar: nameAr
+      ? workflowTemplate(templateKey, { name: nameAr, comment: '' }).ar
+      : workflowTemplate(fallbackKey, { comment: '' }).ar,
+  };
 }
 
 function buildWorkflowApprovalWithoutName(
-  templateKey: 'request_approved' | 'request_rejected' | 'request_returned_for_modification',
+  templateKey: WorkflowWithoutNameKey,
   comment?: string | null,
 ): BilingualText {
   const commentSuffix = formatWorkflowCommentSuffix(comment);
-  return workflowTemplate(
-    templateKey,
-    { comment: commentSuffix },
-    { comment: commentSuffix },
-  );
+  return {
+    en: workflowTemplate(templateKey, { comment: commentSuffix }).en,
+    ar: workflowTemplate(templateKey, { comment: '' }).ar,
+  };
+}
+
+function buildWorkflowFromNamePair(
+  templateWithNameKey: 'request_approval_in_progress_from' | 'request_approval_pending_from',
+  templateWithoutNameKey: 'request_approval_in_progress' | 'request_approval_pending',
+  nameEn: string,
+  nameAr: string,
+): BilingualText {
+  return {
+    en: workflowTemplate(templateWithNameKey, { name: nameEn }).en,
+    ar: nameAr
+      ? workflowTemplate(templateWithNameKey, { name: nameAr }).ar
+      : workflowTemplate(templateWithoutNameKey).ar,
+  };
 }
 
 export function buildApprovalWorkflowContent(params: {
@@ -165,40 +179,46 @@ export function buildApprovalWorkflowContent(params: {
   comment?: string | null;
 }): BilingualText {
   const nameEn = params.roleName?.trim() || '';
-  const nameAr = resolveBilingualName(nameEn, params.roleArabicName);
+  const nameAr = pickArabicName(params.roleArabicName);
 
   if (params.status === 'Approved') {
     return nameEn
-      ? buildWorkflowApprovalByName('request_approved_by', nameEn, nameAr, params.comment)
+      ? buildWorkflowApprovalByName('request_approved_by', 'request_approved', nameEn, nameAr, params.comment)
       : buildWorkflowApprovalWithoutName('request_approved', params.comment);
   }
 
   if (params.status === 'Rejected') {
     return nameEn
-      ? buildWorkflowApprovalByName('request_rejected_by', nameEn, nameAr, params.comment)
+      ? buildWorkflowApprovalByName('request_rejected_by', 'request_rejected', nameEn, nameAr, params.comment)
       : buildWorkflowApprovalWithoutName('request_rejected', params.comment);
   }
 
   if (params.status === 'Returned for Modification') {
     return nameEn
-      ? buildWorkflowApprovalByName('request_returned_for_modification_by', nameEn, nameAr, params.comment)
+      ? buildWorkflowApprovalByName(
+          'request_returned_for_modification_by',
+          'request_returned_for_modification',
+          nameEn,
+          nameAr,
+          params.comment,
+        )
       : buildWorkflowApprovalWithoutName('request_returned_for_modification', params.comment);
   }
 
   const commentSuffix = formatWorkflowCommentSuffix(params.comment);
   if (nameEn) {
-    return workflowTemplate(
-      'request_approval_pending_from',
-      { name: nameEn, comment: commentSuffix },
-      { name: nameAr, comment: commentSuffix },
-    );
+    return {
+      en: workflowTemplate('request_approval_pending_from', { name: nameEn, comment: commentSuffix }).en,
+      ar: nameAr
+        ? workflowTemplate('request_approval_pending_from', { name: nameAr, comment: '' }).ar
+        : workflowTemplate('request_approval_pending', { comment: '' }).ar,
+    };
   }
 
-  return workflowTemplate(
-    'request_approval_pending',
-    { comment: commentSuffix },
-    { comment: commentSuffix },
-  );
+  return {
+    en: workflowTemplate('request_approval_pending', { comment: commentSuffix }).en,
+    ar: workflowTemplate('request_approval_pending', { comment: '' }).ar,
+  };
 }
 
 export function buildHumanApprovalWorkflowContent(params: {
@@ -210,12 +230,13 @@ export function buildHumanApprovalWorkflowContent(params: {
   sectionName?: string | null;
   sectionArabicName?: string | null;
 }): BilingualText {
-  const key = params.isFirst ? 'request_approval_in_progress_from' : 'request_approval_pending_from';
+  const withNameKey = params.isFirst ? 'request_approval_in_progress_from' : 'request_approval_pending_from';
+  const withoutNameKey = params.isFirst ? 'request_approval_in_progress' : 'request_approval_pending';
 
   if (params.roleName?.trim()) {
     const nameEn = params.roleName.trim();
-    const nameAr = resolveBilingualName(nameEn, params.roleArabicName);
-    return workflowTemplate(key, { name: nameEn }, { name: nameAr });
+    const nameAr = pickArabicName(params.roleArabicName);
+    return buildWorkflowFromNamePair(withNameKey, withoutNameKey, nameEn, nameAr);
   }
 
   const { en, ar } = joinDeptSectionBilingualLabels(
@@ -225,7 +246,7 @@ export function buildHumanApprovalWorkflowContent(params: {
     params.sectionArabicName,
   );
   if (en) {
-    return workflowTemplate(key, { name: en }, { name: ar });
+    return buildWorkflowFromNamePair(withNameKey, withoutNameKey, en, ar);
   }
 
   return params.isFirst
@@ -240,25 +261,31 @@ export function buildApprovalChatMessage(params: {
   comment?: string | null;
 }): BilingualText {
   const roleEn = params.roleName?.trim() || 'Unknown Role';
-  const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+  const roleAr = pickArabicName(params.roleArabicName);
   const commentSuffix = formatChatCommentSuffix(params.comment);
 
-  let key: string;
+  let byRoleKey: string;
+  let withoutRoleKey: string;
   if (params.status === 'Approved') {
-    key = 'request_approved_by_role';
+    byRoleKey = 'request_approved_by_role';
+    withoutRoleKey = 'request_approved';
   } else if (params.status === 'Rejected') {
-    key = 'request_rejected_by_role';
+    byRoleKey = 'request_rejected_by_role';
+    withoutRoleKey = 'request_rejected';
   } else if (params.status === 'Returned for Modification') {
-    key = 'request_returned_for_modification_by_role';
+    byRoleKey = 'request_returned_for_modification_by_role';
+    withoutRoleKey = 'request_returned_for_modification';
   } else {
-    key = 'request_approved_by_role';
+    byRoleKey = 'request_approved_by_role';
+    withoutRoleKey = 'request_approved';
   }
 
-  return chatTemplate(
-    key,
-    { roleName: roleEn, comment: commentSuffix },
-    { roleName: roleAr, comment: commentSuffix },
-  );
+  return {
+    en: chatTemplate(byRoleKey, { roleName: roleEn, comment: commentSuffix }).en,
+    ar: roleAr
+      ? chatTemplate(byRoleKey, { roleName: roleAr, comment: '' }).ar
+      : chatTemplate(withoutRoleKey, { comment: '' }).ar,
+  };
 }
 
 /** Resolve Arabic workflow content from a stored English content string (legacy rows). */
@@ -273,8 +300,6 @@ export function resolveWorkflowContentAr(content: string | null | undefined): st
   const commentIdx = normalized.indexOf(': ');
   if (commentIdx > 0) {
     const baseEn = normalized.slice(0, commentIdx).trim();
-    const commentText = normalized.slice(commentIdx + 2).trim();
-    const commentSuffix = formatWorkflowCommentSuffix(commentText);
 
     for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
       if (!tpl.en.includes('{{comment}}')) continue;
@@ -282,15 +307,30 @@ 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 fallbackKey = Object.entries(WORKFLOW_TEMPLATES).find(([, t]) => t === tpl)?.[0] ?? '';
+          if (fallbackKey.includes('_by')) {
+            const genericKey = fallbackKey.replace('_by', '') as WorkflowWithoutNameKey;
+            if (WORKFLOW_TEMPLATES[genericKey]) {
+              return WORKFLOW_TEMPLATES[genericKey].ar;
+            }
+          }
+          return tpl.ar.split('{{name}}')[0].trim();
         }
       } else if (withoutComment.trim() === baseEn) {
-        return interpolate(tpl.ar, { comment: commentSuffix });
+        return interpolate(tpl.ar, { comment: '' });
       }
     }
   }
 
+  const inProgressPrefix = WORKFLOW_TEMPLATES.request_approval_in_progress_from?.en.split('{{name}}')[0].trim();
+  if (inProgressPrefix && normalized.startsWith(inProgressPrefix)) {
+    return WORKFLOW_TEMPLATES.request_approval_in_progress.ar;
+  }
+  const pendingPrefix = WORKFLOW_TEMPLATES.request_approval_pending_from?.en.split('{{name}}')[0].trim();
+  if (pendingPrefix && normalized.startsWith(pendingPrefix)) {
+    return WORKFLOW_TEMPLATES.request_approval_pending.ar;
+  }
+
   return null;
 }
 
@@ -309,9 +349,13 @@ export function resolveChatMessageAr(message: string | null | undefined): string
 export function enrichCancellationWorkflowLog(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 storedAr = log.content_ar != null ? String(log.content_ar).trim() : '';
+  const hasEnglishInAr = storedAr && /[A-Za-z]/.test(storedAr);
   return {
     ...log,
-    content_ar: log.content_ar ?? resolveWorkflowContentAr(content),
+    content_ar: hasEnglishInAr
+      ? (resolveWorkflowContentAr(content) ?? storedAr)
+      : (log.content_ar ?? resolveWorkflowContentAr(content)),
     status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
   };
 }
@@ -319,9 +363,13 @@ export function enrichCancellationWorkflowLog(log: Record<string, unknown>): Rec
 export function enrichCancellationChatMessage(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 storedAr = chat.message_ar != null ? String(chat.message_ar).trim() : '';
+  const hasEnglishInAr = storedAr && /[A-Za-z]/.test(storedAr);
   return {
     ...chat,
-    message_ar: chat.message_ar ?? resolveChatMessageAr(message),
+    message_ar: hasEnglishInAr
+      ? (resolveChatMessageAr(message) ?? storedAr)
+      : (chat.message_ar ?? resolveChatMessageAr(message)),
     status_ar: chat.status_ar ?? resolveChatStatusAr(status),
   };
 }