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

package/.env

@@ -2,7 +2,7 @@ DB_HOST=164.52.222.169
 DB_PORT=5432 
 DB_USER=postgres_admin_user
 DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-DB_NAME=CAA
+DB_NAME=CAA_DEV
 
 
 # DB_HOST=localhost

package/dist/helpers/cancellation-bilingual-persist.helper.d.ts

@@ -0,0 +1,37 @@
+import type { EntityManager } from 'typeorm';
+import { CancellationMessageType } from '../models/CancellationChatModel';
+import { CancellationWorkFlowStatus } from '../models/CancellationWorkflowModel';
+export type CancellationWorkflowRowInput = {
+    request_id: number;
+    service_id?: number | null;
+    sub_service_id?: number | null;
+    content: string;
+    content_ar?: string | null;
+    status: CancellationWorkFlowStatus;
+    status_ar?: string | null;
+    user_id?: number | null;
+    role_id?: number | null;
+    department_id?: number | null;
+    section_id?: number | null;
+    step_order?: number | null;
+    created_by?: number | null;
+};
+export type CancellationChatRowInput = {
+    request_id: number;
+    service_id?: number | null;
+    sub_service_id?: number | null;
+    user_id: number;
+    role_id?: number | null;
+    message: string;
+    message_ar?: string | null;
+    messageType?: CancellationMessageType;
+    status?: string | null;
+    status_ar?: string | null;
+    created_by?: number | string | null;
+};
+/** Force-persist Arabic workflow columns (guards against stale TypeORM entity metadata). */
+export declare function patchCancellationWorkflowArabic(manager: EntityManager, workflowId: number, contentAr: string | null, statusAr: string | null): Promise<void>;
+/** Force-persist Arabic chat columns (guards against stale TypeORM entity metadata). */
+export declare function patchCancellationChatArabic(manager: EntityManager, chatId: number, messageAr: string | null, statusAr: string | null): Promise<void>;
+export declare function insertCancellationWorkflowRow(manager: EntityManager, input: CancellationWorkflowRowInput): Promise<number>;
+export declare function insertCancellationChatRow(manager: EntityManager, input: CancellationChatRowInput): Promise<number>;

package/dist/helpers/cancellation-bilingual-persist.helper.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.patchCancellationWorkflowArabic = patchCancellationWorkflowArabic;
+exports.patchCancellationChatArabic = patchCancellationChatArabic;
+exports.insertCancellationWorkflowRow = insertCancellationWorkflowRow;
+exports.insertCancellationChatRow = insertCancellationChatRow;
+const CancellationChatModel_1 = require("../models/CancellationChatModel");
+const CancellationWorkflowModel_1 = require("../models/CancellationWorkflowModel");
+const workflow_chat_i18n_1 = require("../i18n/workflow-chat-i18n");
+function resolveWorkflowRowId(insertResult) {
+    const id = insertResult.raw?.[0]?.id ?? insertResult.identifiers?.[0]?.id;
+    if (!id) {
+        throw new Error('Failed to insert cancellation workflow row');
+    }
+    return id;
+}
+function resolveChatRowId(insertResult) {
+    const id = insertResult.raw?.[0]?.id ?? insertResult.identifiers?.[0]?.id;
+    if (!id) {
+        throw new Error('Failed to insert cancellation chat row');
+    }
+    return id;
+}
+/** Force-persist Arabic workflow columns (guards against stale TypeORM entity metadata). */
+async function patchCancellationWorkflowArabic(manager, workflowId, contentAr, statusAr) {
+    await manager.query(`UPDATE cancellation_workflows
+     SET content_ar = $1,
+         status_ar = $2,
+         updated_at = CURRENT_TIMESTAMP
+     WHERE id = $3`, [contentAr, statusAr, workflowId]);
+}
+/** Force-persist Arabic chat columns (guards against stale TypeORM entity metadata). */
+async function patchCancellationChatArabic(manager, chatId, messageAr, statusAr) {
+    await manager.query(`UPDATE cancellation_chats
+     SET message_ar = $1,
+         status_ar = $2,
+         updated_at = CURRENT_TIMESTAMP
+     WHERE id = $3`, [messageAr, statusAr, chatId]);
+}
+async function insertCancellationWorkflowRow(manager, input) {
+    const contentAr = input.content_ar ?? null;
+    const statusAr = input.status_ar ?? (0, workflow_chat_i18n_1.resolveWorkflowStatusAr)(input.status);
+    const insertResult = await manager
+        .createQueryBuilder()
+        .insert()
+        .into(CancellationWorkflowModel_1.CancellationWorkFlow)
+        .values({
+        ...input,
+        content_ar: contentAr,
+        status_ar: statusAr,
+    })
+        .returning('id')
+        .execute();
+    const id = resolveWorkflowRowId(insertResult);
+    await patchCancellationWorkflowArabic(manager, id, contentAr, statusAr);
+    return id;
+}
+async function insertCancellationChatRow(manager, input) {
+    const messageAr = input.message_ar ?? null;
+    const statusAr = input.status_ar ?? (0, workflow_chat_i18n_1.resolveChatStatusAr)(input.status ?? null);
+    const messageType = input.messageType ?? CancellationChatModel_1.CancellationMessageType.TEXT;
+    const insertResult = await manager
+        .createQueryBuilder()
+        .insert()
+        .into(CancellationChatModel_1.CancellationRequestChat)
+        .values({
+        ...input,
+        message_ar: messageAr,
+        status_ar: statusAr,
+        messageType,
+    })
+        .returning('id')
+        .execute();
+    const id = resolveChatRowId(insertResult);
+    await patchCancellationChatArabic(manager, id, messageAr, statusAr);
+    return id;
+}

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

@@ -10,14 +10,24 @@ type WorkflowChatI18nCatalog = {
 };
 /** Read-only view of the shared workflow/chat translation catalog. */
 export declare function getWorkflowChatI18nCatalog(): WorkflowChatI18nCatalog;
-export declare function buildBilingualFromTemplate(templateCatalog: Record<string, BilingualText>, key: string, params?: Record<string, string>): BilingualText;
-export declare function workflowTemplate(key: string, params?: Record<string, string>): BilingualText;
-export declare function chatTemplate(key: string, params?: Record<string, string>): BilingualText;
+export declare function buildBilingualFromTemplate(templateCatalog: Record<string, BilingualText>, key: string, params?: Record<string, string>, arParams?: Record<string, string>): BilingualText;
+export declare function workflowTemplate(key: string, params?: Record<string, string>, arParams?: Record<string, string>): BilingualText;
+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;
 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). */
+export declare function joinDeptSectionBilingualLabels(deptEn?: string | null, deptAr?: string | null, sectEn?: string | null, sectAr?: string | null): {
+    en: string;
+    ar: string;
+};
+/** @deprecated Use joinDeptSectionBilingualLabels */
+export declare function joinDeptSectionArabicLabels(deptArabic?: string | null, sectionArabic?: string | null): string;
 export declare function buildApprovalWorkflowContent(params: {
-    status: 'Approved' | 'Rejected' | 'Pending' | string;
+    status: 'Approved' | 'Rejected' | 'Returned for Modification' | 'Pending' | string;
     roleName?: string | null;
     roleArabicName?: string | null;
     comment?: string | null;
@@ -26,15 +36,21 @@ export declare function buildHumanApprovalWorkflowContent(params: {
     isFirst: boolean;
     roleName?: string | null;
     roleArabicName?: string | null;
-    deptSectionEn?: string | null;
-    deptSectionAr?: string | null;
+    deptName?: string | null;
+    deptArabicName?: string | null;
+    sectionName?: string | null;
+    sectionArabicName?: string | null;
 }): BilingualText;
 export declare function buildApprovalChatMessage(params: {
-    status: 'Approved' | 'Rejected' | string;
+    status: 'Approved' | 'Rejected' | 'Returned for Modification' | string;
     roleName?: string | null;
     roleArabicName?: string | null;
     comment?: string | null;
 }): BilingualText;
+/** Resolve Arabic workflow content from a stored English content string (legacy rows). */
+export declare function resolveWorkflowContentAr(content: string | null | undefined): string | null;
+/** Resolve Arabic chat message from a stored English message string (legacy rows). */
+export declare function resolveChatMessageAr(message: string | null | undefined): string | null;
 export declare function enrichCancellationWorkflowLog(log: Record<string, unknown>): Record<string, unknown>;
 export declare function enrichCancellationChatMessage(chat: Record<string, unknown>): Record<string, unknown>;
 export {};

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

@@ -9,10 +9,16 @@ exports.workflowTemplate = workflowTemplate;
 exports.chatTemplate = chatTemplate;
 exports.resolveWorkflowStatusAr = resolveWorkflowStatusAr;
 exports.resolveChatStatusAr = resolveChatStatusAr;
+exports.resolveBilingualName = resolveBilingualName;
+exports.pickArabicName = pickArabicName;
 exports.pickLocalizedName = pickLocalizedName;
+exports.joinDeptSectionBilingualLabels = joinDeptSectionBilingualLabels;
+exports.joinDeptSectionArabicLabels = joinDeptSectionArabicLabels;
 exports.buildApprovalWorkflowContent = buildApprovalWorkflowContent;
 exports.buildHumanApprovalWorkflowContent = buildHumanApprovalWorkflowContent;
 exports.buildApprovalChatMessage = buildApprovalChatMessage;
+exports.resolveWorkflowContentAr = resolveWorkflowContentAr;
+exports.resolveChatMessageAr = resolveChatMessageAr;
 exports.enrichCancellationWorkflowLog = enrichCancellationWorkflowLog;
 exports.enrichCancellationChatMessage = enrichCancellationChatMessage;
 const workflow_chat_i18n_json_1 = __importDefault(require("./workflow-chat-i18n.json"));
@@ -27,21 +33,22 @@ function getWorkflowChatI18nCatalog() {
 function interpolate(template, params = {}) {
     return template.replace(/\{\{(\w+)\}\}/g, (_, key) => params[key] ?? '');
 }
-function buildBilingualFromTemplate(templateCatalog, key, params = {}) {
+function buildBilingualFromTemplate(templateCatalog, key, params = {}, arParams) {
     const tpl = templateCatalog[key];
     if (!tpl) {
         return { en: key, ar: key };
     }
+    const arabicParams = arParams ?? params;
     return {
         en: interpolate(tpl.en, params),
-        ar: interpolate(tpl.ar, params),
+        ar: interpolate(tpl.ar, arabicParams),
     };
 }
-function workflowTemplate(key, params = {}) {
-    return buildBilingualFromTemplate(WORKFLOW_TEMPLATES, key, params);
+function workflowTemplate(key, params = {}, arParams) {
+    return buildBilingualFromTemplate(WORKFLOW_TEMPLATES, key, params, arParams);
 }
-function chatTemplate(key, params = {}) {
-    return buildBilingualFromTemplate(CHAT_TEMPLATES, key, params);
+function chatTemplate(key, params = {}, arParams) {
+    return buildBilingualFromTemplate(CHAT_TEMPLATES, key, params, arParams);
 }
 function resolveWorkflowStatusAr(status) {
     if (status == null || status === '')
@@ -53,6 +60,16 @@ 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;
+}
 function pickLocalizedName(englishName, arabicName, fallback = '') {
     const ar = arabicName?.trim();
     if (ar)
@@ -62,53 +79,69 @@ function pickLocalizedName(englishName, arabicName, fallback = '') {
         return en;
     return 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). */
+function joinDeptSectionBilingualLabels(deptEn, deptAr, sectEn, sectAr) {
+    const en = joinDeptSectionLabels(deptEn, sectEn);
+    const ar = joinDeptSectionLabels(resolveBilingualName(deptEn, deptAr), resolveBilingualName(sectEn, sectAr));
+    return { en, ar };
+}
+/** @deprecated Use joinDeptSectionBilingualLabels */
+function joinDeptSectionArabicLabels(deptArabic, sectionArabic) {
+    return joinDeptSectionLabels(deptArabic, sectionArabic);
+}
+function formatWorkflowCommentSuffix(comment) {
+    const text = comment?.trim();
+    return text ? `: ${text}` : '';
+}
+function formatChatCommentSuffix(comment) {
+    const text = comment?.trim();
+    return text ? ` - ${text}` : '';
+}
+function buildWorkflowApprovalByName(templateKey, nameEn, nameAr, comment) {
+    const commentSuffix = formatWorkflowCommentSuffix(comment);
+    return workflowTemplate(templateKey, { name: nameEn, comment: commentSuffix }, { name: nameAr, comment: commentSuffix });
+}
+function buildWorkflowApprovalWithoutName(templateKey, comment) {
+    const commentSuffix = formatWorkflowCommentSuffix(comment);
+    return workflowTemplate(templateKey, { comment: commentSuffix }, { comment: commentSuffix });
+}
 function buildApprovalWorkflowContent(params) {
     const nameEn = params.roleName?.trim() || '';
-    const nameAr = pickLocalizedName(params.roleName, params.roleArabicName, nameEn || 'Unknown');
-    let base;
+    const nameAr = resolveBilingualName(nameEn, params.roleArabicName);
     if (params.status === 'Approved') {
-        base = nameEn
-            ? workflowTemplate('request_approved_by', { name: nameEn })
-            : workflowTemplate('request_approved');
-        if (nameEn) {
-            base.ar = workflowTemplate('request_approved_by', { name: nameAr }).ar;
-        }
+        return nameEn
+            ? buildWorkflowApprovalByName('request_approved_by', nameEn, nameAr, params.comment)
+            : buildWorkflowApprovalWithoutName('request_approved', params.comment);
     }
-    else if (params.status === 'Rejected') {
-        base = nameEn
-            ? workflowTemplate('request_rejected_by', { name: nameEn })
-            : workflowTemplate('request_rejected');
-        if (nameEn) {
-            base.ar = workflowTemplate('request_rejected_by', { name: nameAr }).ar;
-        }
+    if (params.status === 'Rejected') {
+        return nameEn
+            ? buildWorkflowApprovalByName('request_rejected_by', nameEn, nameAr, params.comment)
+            : buildWorkflowApprovalWithoutName('request_rejected', params.comment);
     }
-    else {
-        base = nameEn
-            ? workflowTemplate('request_approval_pending_from', { name: nameEn })
-            : workflowTemplate('request_approval_pending');
-        if (nameEn) {
-            base.ar = workflowTemplate('request_approval_pending_from', { name: nameAr }).ar;
-        }
+    if (params.status === 'Returned for Modification') {
+        return nameEn
+            ? buildWorkflowApprovalByName('request_returned_for_modification_by', nameEn, nameAr, params.comment)
+            : buildWorkflowApprovalWithoutName('request_returned_for_modification', params.comment);
     }
-    const comment = params.comment?.trim();
-    if (!comment)
-        return base;
-    return {
-        en: `${base.en}: ${comment}`,
-        ar: `${base.ar}: ${comment}`,
-    };
+    const commentSuffix = formatWorkflowCommentSuffix(params.comment);
+    if (nameEn) {
+        return workflowTemplate('request_approval_pending_from', { name: nameEn, comment: commentSuffix }, { name: nameAr, comment: commentSuffix });
+    }
+    return workflowTemplate('request_approval_pending', { comment: commentSuffix }, { comment: commentSuffix });
 }
 function buildHumanApprovalWorkflowContent(params) {
-    const nameEn = params.roleName?.trim() || params.deptSectionEn?.trim() || '';
-    const nameAr = params.roleName
-        ? pickLocalizedName(params.roleName, params.roleArabicName, nameEn)
-        : params.deptSectionAr?.trim() || params.deptSectionEn?.trim() || nameEn;
-    if (nameEn) {
-        const key = params.isFirst ? 'request_approval_in_progress_from' : 'request_approval_pending_from';
-        return {
-            en: workflowTemplate(key, { name: nameEn }).en,
-            ar: workflowTemplate(key, { name: nameAr || nameEn }).ar,
-        };
+    const key = params.isFirst ? 'request_approval_in_progress_from' : 'request_approval_pending_from';
+    if (params.roleName?.trim()) {
+        const nameEn = params.roleName.trim();
+        const nameAr = resolveBilingualName(nameEn, params.roleArabicName);
+        return workflowTemplate(key, { name: nameEn }, { name: nameAr });
+    }
+    const { en, ar } = joinDeptSectionBilingualLabels(params.deptName, params.deptArabicName, params.sectionName, params.sectionArabicName);
+    if (en) {
+        return workflowTemplate(key, { name: en }, { name: ar });
     }
     return params.isFirst
         ? workflowTemplate('request_approval_in_progress')
@@ -116,25 +149,81 @@ function buildHumanApprovalWorkflowContent(params) {
 }
 function buildApprovalChatMessage(params) {
     const roleEn = params.roleName?.trim() || 'Unknown Role';
-    const roleAr = pickLocalizedName(params.roleName, params.roleArabicName, roleEn);
-    const commentSuffix = params.comment?.trim() ? ` - ${params.comment.trim()}` : '';
-    const key = params.status === 'Approved' ? 'request_approved_by_role' : 'request_rejected_by_role';
-    return {
-        en: chatTemplate(key, { roleName: roleEn, comment: commentSuffix }).en,
-        ar: chatTemplate(key, { roleName: roleAr, comment: commentSuffix }).ar,
-    };
+    const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+    const commentSuffix = formatChatCommentSuffix(params.comment);
+    let key;
+    if (params.status === 'Approved') {
+        key = 'request_approved_by_role';
+    }
+    else if (params.status === 'Rejected') {
+        key = 'request_rejected_by_role';
+    }
+    else if (params.status === 'Returned for Modification') {
+        key = 'request_returned_for_modification_by_role';
+    }
+    else {
+        key = 'request_approved_by_role';
+    }
+    return chatTemplate(key, { roleName: roleEn, comment: commentSuffix }, { roleName: roleAr, comment: commentSuffix });
+}
+/** Resolve Arabic workflow content from a stored English content string (legacy rows). */
+function resolveWorkflowContentAr(content) {
+    if (content == null || content.trim() === '')
+        return null;
+    const normalized = content.trim();
+    for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
+        if (tpl.en === normalized)
+            return tpl.ar;
+    }
+    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;
+            const withoutComment = tpl.en.replace('{{comment}}', '');
+            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 });
+                }
+            }
+            else if (withoutComment.trim() === baseEn) {
+                return interpolate(tpl.ar, { comment: commentSuffix });
+            }
+        }
+    }
+    return null;
+}
+/** Resolve Arabic chat message from a stored English message string (legacy rows). */
+function resolveChatMessageAr(message) {
+    if (message == null || message.trim() === '')
+        return null;
+    const normalized = message.trim();
+    for (const tpl of Object.values(CHAT_TEMPLATES)) {
+        if (tpl.en === normalized)
+            return tpl.ar;
+    }
+    return null;
 }
 function enrichCancellationWorkflowLog(log) {
     const status = log.status != null ? String(log.status) : null;
+    const content = log.content != null ? String(log.content) : null;
     return {
         ...log,
+        content_ar: 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;
     return {
         ...chat,
+        message_ar: chat.message_ar ?? resolveChatMessageAr(message),
         status_ar: chat.status_ar ?? resolveChatStatusAr(status),
     };
 }

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

@@ -29,20 +29,28 @@
       "ar": "في انتظار موافقة {{name}}"
     },
     "request_approved_by": {
-      "en": "Request Approved by {{name}}",
-      "ar": "تمت الموافقة على الطلب من قبل {{name}}"
+      "en": "Request Approved by {{name}}{{comment}}",
+      "ar": "تمت الموافقة على الطلب من قبل {{name}}{{comment}}"
     },
     "request_rejected_by": {
-      "en": "Request Rejected by {{name}}",
-      "ar": "تم رفض الطلب من قبل {{name}}"
+      "en": "Request Rejected by {{name}}{{comment}}",
+      "ar": "تم رفض الطلب من قبل {{name}}{{comment}}"
     },
     "request_approved": {
-      "en": "Request Approved",
-      "ar": "تمت الموافقة على الطلب"
+      "en": "Request Approved{{comment}}",
+      "ar": "تمت الموافقة على الطلب{{comment}}"
     },
     "request_rejected": {
-      "en": "Request Rejected",
-      "ar": "تم رفض الطلب"
+      "en": "Request Rejected{{comment}}",
+      "ar": "تم رفض الطلب{{comment}}"
+    },
+    "request_returned_for_modification_by": {
+      "en": "Request Returned for Modification by {{name}}{{comment}}",
+      "ar": "تم إرجاع الطلب للتعديل من قبل {{name}}{{comment}}"
+    },
+    "request_returned_for_modification": {
+      "en": "Request Returned for Modification{{comment}}",
+      "ar": "تم إرجاع الطلب للتعديل{{comment}}"
     }
   },
   "chatTemplates": {
@@ -61,6 +69,10 @@
     "request_rejected_by_role": {
       "en": "Request Rejected by: {{roleName}}{{comment}}",
       "ar": "تم رفض الطلب من قبل: {{roleName}}{{comment}}"
+    },
+    "request_returned_for_modification_by_role": {
+      "en": "Request Returned for Modification by: {{roleName}}{{comment}}",
+      "ar": "تم إرجاع الطلب للتعديل من قبل: {{roleName}}{{comment}}"
     }
   },
   "workflowStatusLabels": {
@@ -73,6 +85,7 @@
     "Received": "تم الاستلام",
     "Approved": "موافق عليه",
     "Rejected": "مرفوض",
-    "Pending": "قيد الانتظار"
+    "Pending": "قيد الانتظار",
+    "Returned for Modification": "أُعيد للتعديل"
   }
 }

package/package.json

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

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

@@ -29,20 +29,28 @@
       "ar": "في انتظار موافقة {{name}}"
     },
     "request_approved_by": {
-      "en": "Request Approved by {{name}}",
-      "ar": "تمت الموافقة على الطلب من قبل {{name}}"
+      "en": "Request Approved by {{name}}{{comment}}",
+      "ar": "تمت الموافقة على الطلب من قبل {{name}}{{comment}}"
     },
     "request_rejected_by": {
-      "en": "Request Rejected by {{name}}",
-      "ar": "تم رفض الطلب من قبل {{name}}"
+      "en": "Request Rejected by {{name}}{{comment}}",
+      "ar": "تم رفض الطلب من قبل {{name}}{{comment}}"
     },
     "request_approved": {
-      "en": "Request Approved",
-      "ar": "تمت الموافقة على الطلب"
+      "en": "Request Approved{{comment}}",
+      "ar": "تمت الموافقة على الطلب{{comment}}"
     },
     "request_rejected": {
-      "en": "Request Rejected",
-      "ar": "تم رفض الطلب"
+      "en": "Request Rejected{{comment}}",
+      "ar": "تم رفض الطلب{{comment}}"
+    },
+    "request_returned_for_modification_by": {
+      "en": "Request Returned for Modification by {{name}}{{comment}}",
+      "ar": "تم إرجاع الطلب للتعديل من قبل {{name}}{{comment}}"
+    },
+    "request_returned_for_modification": {
+      "en": "Request Returned for Modification{{comment}}",
+      "ar": "تم إرجاع الطلب للتعديل{{comment}}"
     }
   },
   "chatTemplates": {
@@ -61,6 +69,10 @@
     "request_rejected_by_role": {
       "en": "Request Rejected by: {{roleName}}{{comment}}",
       "ar": "تم رفض الطلب من قبل: {{roleName}}{{comment}}"
+    },
+    "request_returned_for_modification_by_role": {
+      "en": "Request Returned for Modification by: {{roleName}}{{comment}}",
+      "ar": "تم إرجاع الطلب للتعديل من قبل: {{roleName}}{{comment}}"
     }
   },
   "workflowStatusLabels": {
@@ -73,6 +85,7 @@
     "Received": "تم الاستلام",
     "Approved": "موافق عليه",
     "Rejected": "مرفوض",
-    "Pending": "قيد الانتظار"
+    "Pending": "قيد الانتظار",
+    "Returned for Modification": "أُعيد للتعديل"
   }
 }

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

@@ -26,24 +26,34 @@ function interpolate(template: string, params: Record<string, string> = {}): str
 export function buildBilingualFromTemplate(
   templateCatalog: Record<string, BilingualText>,
   key: string,
-  params: Record<string, string> = {}
+  params: Record<string, string> = {},
+  arParams?: Record<string, string>,
 ): BilingualText {
   const tpl = templateCatalog[key];
   if (!tpl) {
     return { en: key, ar: key };
   }
+  const arabicParams = arParams ?? params;
   return {
     en: interpolate(tpl.en, params),
-    ar: interpolate(tpl.ar, params),
+    ar: interpolate(tpl.ar, arabicParams),
   };
 }
 
-export function workflowTemplate(key: string, params: Record<string, string> = {}): BilingualText {
-  return buildBilingualFromTemplate(WORKFLOW_TEMPLATES, key, params);
+export function workflowTemplate(
+  key: string,
+  params: Record<string, string> = {},
+  arParams?: Record<string, string>,
+): BilingualText {
+  return buildBilingualFromTemplate(WORKFLOW_TEMPLATES, key, params, arParams);
 }
 
-export function chatTemplate(key: string, params: Record<string, string> = {}): BilingualText {
-  return buildBilingualFromTemplate(CHAT_TEMPLATES, key, params);
+export function chatTemplate(
+  key: string,
+  params: Record<string, string> = {},
+  arParams?: Record<string, string>,
+): BilingualText {
+  return buildBilingualFromTemplate(CHAT_TEMPLATES, key, params, arParams);
 }
 
 export function resolveWorkflowStatusAr(status: string | null | undefined): string | null {
@@ -56,6 +66,20 @@ 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;
+}
+
 export function pickLocalizedName(
   englishName?: string | null,
   arabicName?: string | null,
@@ -68,66 +92,140 @@ export function pickLocalizedName(
   return fallback;
 }
 
+function joinDeptSectionLabels(
+  dept?: string | null,
+  section?: string | null,
+): string {
+  return [dept, section].map((s) => s?.trim()).filter(Boolean).join(' - ');
+}
+
+/** Parallel EN/AR dept-section labels (Arabic columns preferred; English fallback per field). */
+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 };
+}
+
+/** @deprecated Use joinDeptSectionBilingualLabels */
+export function joinDeptSectionArabicLabels(
+  deptArabic?: string | null,
+  sectionArabic?: string | null,
+): string {
+  return joinDeptSectionLabels(deptArabic, sectionArabic);
+}
+
+function formatWorkflowCommentSuffix(comment?: string | null): string {
+  const text = comment?.trim();
+  return text ? `: ${text}` : '';
+}
+
+function formatChatCommentSuffix(comment?: string | null): string {
+  const text = comment?.trim();
+  return text ? ` - ${text}` : '';
+}
+
+function buildWorkflowApprovalByName(
+  templateKey: 'request_approved_by' | 'request_rejected_by' | 'request_returned_for_modification_by',
+  nameEn: string,
+  nameAr: string,
+  comment?: string | null,
+): BilingualText {
+  const commentSuffix = formatWorkflowCommentSuffix(comment);
+  return workflowTemplate(
+    templateKey,
+    { name: nameEn, comment: commentSuffix },
+    { name: nameAr, comment: commentSuffix },
+  );
+}
+
+function buildWorkflowApprovalWithoutName(
+  templateKey: 'request_approved' | 'request_rejected' | 'request_returned_for_modification',
+  comment?: string | null,
+): BilingualText {
+  const commentSuffix = formatWorkflowCommentSuffix(comment);
+  return workflowTemplate(
+    templateKey,
+    { comment: commentSuffix },
+    { comment: commentSuffix },
+  );
+}
+
 export function buildApprovalWorkflowContent(params: {
-  status: 'Approved' | 'Rejected' | 'Pending' | string;
+  status: 'Approved' | 'Rejected' | 'Returned for Modification' | 'Pending' | string;
   roleName?: string | null;
   roleArabicName?: string | null;
   comment?: string | null;
 }): BilingualText {
   const nameEn = params.roleName?.trim() || '';
-  const nameAr = pickLocalizedName(params.roleName, params.roleArabicName, nameEn || 'Unknown');
+  const nameAr = resolveBilingualName(nameEn, params.roleArabicName);
 
-  let base: BilingualText;
   if (params.status === 'Approved') {
-    base = nameEn
-      ? workflowTemplate('request_approved_by', { name: nameEn })
-      : workflowTemplate('request_approved');
-    if (nameEn) {
-      base.ar = workflowTemplate('request_approved_by', { name: nameAr }).ar;
-    }
-  } else if (params.status === 'Rejected') {
-    base = nameEn
-      ? workflowTemplate('request_rejected_by', { name: nameEn })
-      : workflowTemplate('request_rejected');
-    if (nameEn) {
-      base.ar = workflowTemplate('request_rejected_by', { name: nameAr }).ar;
-    }
-  } else {
-    base = nameEn
-      ? workflowTemplate('request_approval_pending_from', { name: nameEn })
-      : workflowTemplate('request_approval_pending');
-    if (nameEn) {
-      base.ar = workflowTemplate('request_approval_pending_from', { name: nameAr }).ar;
-    }
+    return nameEn
+      ? buildWorkflowApprovalByName('request_approved_by', nameEn, nameAr, params.comment)
+      : buildWorkflowApprovalWithoutName('request_approved', params.comment);
   }
 
-  const comment = params.comment?.trim();
-  if (!comment) return base;
+  if (params.status === 'Rejected') {
+    return nameEn
+      ? buildWorkflowApprovalByName('request_rejected_by', nameEn, nameAr, params.comment)
+      : buildWorkflowApprovalWithoutName('request_rejected', params.comment);
+  }
 
-  return {
-    en: `${base.en}: ${comment}`,
-    ar: `${base.ar}: ${comment}`,
-  };
+  if (params.status === 'Returned for Modification') {
+    return nameEn
+      ? buildWorkflowApprovalByName('request_returned_for_modification_by', 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 workflowTemplate(
+    'request_approval_pending',
+    { comment: commentSuffix },
+    { comment: commentSuffix },
+  );
 }
 
 export function buildHumanApprovalWorkflowContent(params: {
   isFirst: boolean;
   roleName?: string | null;
   roleArabicName?: string | null;
-  deptSectionEn?: string | null;
-  deptSectionAr?: string | null;
+  deptName?: string | null;
+  deptArabicName?: string | null;
+  sectionName?: string | null;
+  sectionArabicName?: string | null;
 }): BilingualText {
-  const nameEn = params.roleName?.trim() || params.deptSectionEn?.trim() || '';
-  const nameAr = params.roleName
-    ? pickLocalizedName(params.roleName, params.roleArabicName, nameEn)
-    : params.deptSectionAr?.trim() || params.deptSectionEn?.trim() || nameEn;
+  const key = params.isFirst ? 'request_approval_in_progress_from' : 'request_approval_pending_from';
 
-  if (nameEn) {
-    const key = params.isFirst ? 'request_approval_in_progress_from' : 'request_approval_pending_from';
-    return {
-      en: workflowTemplate(key, { name: nameEn }).en,
-      ar: workflowTemplate(key, { name: nameAr || nameEn }).ar,
-    };
+  if (params.roleName?.trim()) {
+    const nameEn = params.roleName.trim();
+    const nameAr = resolveBilingualName(nameEn, params.roleArabicName);
+    return workflowTemplate(key, { name: nameEn }, { name: nameAr });
+  }
+
+  const { en, ar } = joinDeptSectionBilingualLabels(
+    params.deptName,
+    params.deptArabicName,
+    params.sectionName,
+    params.sectionArabicName,
+  );
+  if (en) {
+    return workflowTemplate(key, { name: en }, { name: ar });
   }
 
   return params.isFirst
@@ -136,34 +234,94 @@ export function buildHumanApprovalWorkflowContent(params: {
 }
 
 export function buildApprovalChatMessage(params: {
-  status: 'Approved' | 'Rejected' | string;
+  status: 'Approved' | 'Rejected' | 'Returned for Modification' | string;
   roleName?: string | null;
   roleArabicName?: string | null;
   comment?: string | null;
 }): BilingualText {
   const roleEn = params.roleName?.trim() || 'Unknown Role';
-  const roleAr = pickLocalizedName(params.roleName, params.roleArabicName, roleEn);
-  const commentSuffix = params.comment?.trim() ? ` - ${params.comment.trim()}` : '';
-  const key = params.status === 'Approved' ? 'request_approved_by_role' : 'request_rejected_by_role';
+  const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+  const commentSuffix = formatChatCommentSuffix(params.comment);
 
-  return {
-    en: chatTemplate(key, { roleName: roleEn, comment: commentSuffix }).en,
-    ar: chatTemplate(key, { roleName: roleAr, comment: commentSuffix }).ar,
-  };
+  let key: string;
+  if (params.status === 'Approved') {
+    key = 'request_approved_by_role';
+  } else if (params.status === 'Rejected') {
+    key = 'request_rejected_by_role';
+  } else if (params.status === 'Returned for Modification') {
+    key = 'request_returned_for_modification_by_role';
+  } else {
+    key = 'request_approved_by_role';
+  }
+
+  return chatTemplate(
+    key,
+    { roleName: roleEn, comment: commentSuffix },
+    { roleName: roleAr, comment: commentSuffix },
+  );
+}
+
+/** Resolve Arabic workflow content from a stored English content string (legacy rows). */
+export function resolveWorkflowContentAr(content: string | null | undefined): string | null {
+  if (content == null || content.trim() === '') return null;
+  const normalized = content.trim();
+
+  for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
+    if (tpl.en === normalized) return tpl.ar;
+  }
+
+  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;
+      const withoutComment = tpl.en.replace('{{comment}}', '');
+      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 });
+        }
+      } else if (withoutComment.trim() === baseEn) {
+        return interpolate(tpl.ar, { comment: commentSuffix });
+      }
+    }
+  }
+
+  return null;
+}
+
+/** Resolve Arabic chat message from a stored English message string (legacy rows). */
+export function resolveChatMessageAr(message: string | null | undefined): string | null {
+  if (message == null || message.trim() === '') return null;
+  const normalized = message.trim();
+
+  for (const tpl of Object.values(CHAT_TEMPLATES)) {
+    if (tpl.en === normalized) return tpl.ar;
+  }
+
+  return null;
 }
 
 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;
   return {
     ...log,
+    content_ar: log.content_ar ?? resolveWorkflowContentAr(content),
     status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
   };
 }
 
 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;
   return {
     ...chat,
+    message_ar: chat.message_ar ?? resolveChatMessageAr(message),
     status_ar: chat.status_ar ?? resolveChatStatusAr(status),
   };
 }