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

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

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

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

@@ -58,6 +58,15 @@ export declare function renderSynchronizedWorkflowMessage(templateKey: string, e
 export declare function renderSynchronizedChatMessage(templateKey: string, enParams: Record<string, string>, arParams: 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;
+/** Create/submit step for assign-tasks-emp workflow logs. */
+export declare function buildAssignTasksEmpAssignedWorkflowFields(): BilingualText;
+/** Approval step — pending from assigned employee. */
+export declare function buildAssignTasksEmpPendingFromWorkflowFields(params: {
+    userName: string;
+    userArabicName?: string | null;
+}): BilingualText;
+/** Approval step fallback when assignee name is unavailable. */
+export declare function buildAssignTasksEmpPendingWorkflowFields(): BilingualText;
 export declare function chatTemplate(key: string, params?: Record<string, string>, arParams?: Record<string, string>): BilingualText;
 /**
  * Standard entry point for workflow `content` + `content_ar`.

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

@@ -17,6 +17,9 @@ exports.renderSynchronizedWorkflowMessage = renderSynchronizedWorkflowMessage;
 exports.renderSynchronizedChatMessage = renderSynchronizedChatMessage;
 exports.buildBilingualFromTemplate = buildBilingualFromTemplate;
 exports.workflowTemplate = workflowTemplate;
+exports.buildAssignTasksEmpAssignedWorkflowFields = buildAssignTasksEmpAssignedWorkflowFields;
+exports.buildAssignTasksEmpPendingFromWorkflowFields = buildAssignTasksEmpPendingFromWorkflowFields;
+exports.buildAssignTasksEmpPendingWorkflowFields = buildAssignTasksEmpPendingWorkflowFields;
 exports.chatTemplate = chatTemplate;
 exports.buildSynchronizedWorkflowMessage = buildSynchronizedWorkflowMessage;
 exports.buildSynchronizedChatMessage = buildSynchronizedChatMessage;
@@ -154,6 +157,45 @@ function buildBilingualFromTemplate(templateCatalog, key, params = {}, arParams)
 function workflowTemplate(key, params = {}, arParams) {
     return buildBilingualFromTemplate(WORKFLOW_TEMPLATES, key, params, arParams);
 }
+/** Assign-tasks-emp workflow templates (catalog + runtime fallback when dist JSON is stale). */
+const ASSIGN_TASKS_EMP_WF_FALLBACKS = {
+    request_assigned: { en: 'Request Assigned', ar: 'تم تعيين الطلب' },
+    request_pending_from: { en: 'Request Pending from {{name}}', ar: 'الطلب قيد الانتظار من {{name}}' },
+    request_pending: { en: 'Request Pending', ar: 'الطلب قيد الانتظار' },
+};
+function resolveAssignTasksEmpWorkflowTemplate(key, enParams = {}, arParams) {
+    const tpl = WORKFLOW_TEMPLATES[key] ?? ASSIGN_TASKS_EMP_WF_FALLBACKS[key];
+    const arabicParams = arParams ?? enParams;
+    return {
+        en: interpolate(tpl.en, enParams),
+        ar: interpolate(tpl.ar, arabicParams),
+    };
+}
+/** Create/submit step for assign-tasks-emp workflow logs. */
+function buildAssignTasksEmpAssignedWorkflowFields() {
+    return resolveAssignTasksEmpWorkflowTemplate('request_assigned');
+}
+/** Approval step — pending from assigned employee. */
+function buildAssignTasksEmpPendingFromWorkflowFields(params) {
+    const nameEn = params.userName.trim() || 'Unknown User';
+    const nameAr = resolveBilingualName(nameEn, params.userArabicName);
+    return resolveAssignTasksEmpWorkflowTemplate('request_pending_from', { name: nameEn }, { name: nameAr });
+}
+/** Approval step fallback when assignee name is unavailable. */
+function buildAssignTasksEmpPendingWorkflowFields() {
+    return resolveAssignTasksEmpWorkflowTemplate('request_pending');
+}
+function resolveStoredAssignTasksEmpTemplateKey(content, actors) {
+    const normalized = content?.trim();
+    if (!normalized || !(normalized in ASSIGN_TASKS_EMP_WF_FALLBACKS))
+        return null;
+    if (normalized === 'request_pending_from') {
+        const nameEn = actors?.userName?.trim() || 'Unknown User';
+        const nameAr = resolveArabicWorkflowActorName(actors, nameEn);
+        return resolveAssignTasksEmpWorkflowTemplate('request_pending_from', { name: nameEn }, { name: nameAr });
+    }
+    return resolveAssignTasksEmpWorkflowTemplate(normalized);
+}
 function chatTemplate(key, params = {}, arParams) {
     return buildBilingualFromTemplate(CHAT_TEMPLATES, key, params, arParams);
 }
@@ -326,6 +368,19 @@ function buildRequestApprovedAssignedWorkflowFields(params) {
 }
 /** Standard workflow log UPDATE fields for all CAA module repositories. */
 function buildWorkflowLogUpdateFields(params) {
+    if (params.approvalStatus === 'Closed') {
+        const closed = buildClosedWorkflowMessage({
+            roleName: params.roleName,
+            roleArabicName: params.roleArabicName,
+            comment: params.comment,
+        });
+        return {
+            content: closed.en,
+            content_ar: closed.ar,
+            status: params.workflowStatus,
+            status_ar: resolveWorkflowStatusAr(params.workflowStatus),
+        };
+    }
     const isApprovedLike = params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned';
     if (isApprovedLike) {
         const assignment = tryParseRequestAssignedComment(params.comment);
@@ -1131,6 +1186,9 @@ function resolveWorkflowContentAr(content, actors) {
     if (content == null || content.trim() === '')
         return null;
     const normalized = content.trim();
+    const assignTasksEmpFromKey = resolveStoredAssignTasksEmpTemplateKey(normalized, actors);
+    if (assignTasksEmpFromKey)
+        return assignTasksEmpFromKey.ar;
     const embeddedAssignment = tryParseRequestAssignedComment(normalized);
     if (embeddedAssignment) {
         return buildAssignmentWorkflowFieldsFromActors(embeddedAssignment, actors).ar;
@@ -1206,6 +1264,25 @@ function resolveWorkflowContentAr(content, actors) {
         const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
         return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: nameAr });
     }
+    // Assign Tasks to Employee workflow (legacy EN strings)
+    if (normalized === 'Request Assigned') {
+        return WORKFLOW_TEMPLATES.request_assigned?.ar ?? null;
+    }
+    if (normalized === 'Request Pending') {
+        return WORKFLOW_TEMPLATES.request_pending?.ar ?? null;
+    }
+    const assignTasksPendingPrefix = WORKFLOW_TEMPLATES.request_pending_from?.en.split('{{name}}')[0].trim();
+    if (assignTasksPendingPrefix && normalized.startsWith(assignTasksPendingPrefix)) {
+        const namePartEn = normalized.slice(assignTasksPendingPrefix.length).trim();
+        const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+        return interpolate(WORKFLOW_TEMPLATES.request_pending_from.ar, { name: nameAr });
+    }
+    if (normalized.toLowerCase() === 'notification sent pending') {
+        return WORKFLOW_TEMPLATES.notification_sent_pending?.ar ?? null;
+    }
+    if (normalized.toLowerCase() === 'notification sent successfully') {
+        return WORKFLOW_TEMPLATES.notification_sent_successfully?.ar ?? null;
+    }
     if (normalized === 'Approval Pending from HR Section' ||
         normalized === 'Approval Pending from Records Department') {
         return WORKFLOW_TEMPLATES.request_approval_pending?.ar ?? null;
@@ -1237,9 +1314,11 @@ function isSystemGeneratedChatMessage(message, actors) {
 /** Generic workflow log enricher — use in all module repositories. */
 function enrichWorkflowLog(log) {
     const status = log.status != null ? String(log.status) : null;
-    const content = log.content != null ? String(log.content) : null;
+    const rawContent = log.content != null ? String(log.content) : null;
     const actors = extractBilingualActorsFromRecord(log);
-    const resolvedAr = resolveWorkflowContentAr(content, actors);
+    const assignTasksEmpResolved = resolveStoredAssignTasksEmpTemplateKey(rawContent, actors);
+    const content = assignTasksEmpResolved?.en ?? rawContent;
+    const resolvedAr = assignTasksEmpResolved?.ar ?? resolveWorkflowContentAr(content, actors);
     const existingAr = log.content_ar != null && String(log.content_ar).trim() !== ''
         ? String(log.content_ar)
         : null;
@@ -1257,6 +1336,28 @@ function enrichWorkflowLog(log) {
             content_ar = resolvedAr;
         }
     }
+    const inProgressPrefix = WORKFLOW_TEMPLATES.request_approval_in_progress_from?.en.split('{{name}}')[0].trim();
+    if (content &&
+        inProgressPrefix &&
+        content.startsWith(inProgressPrefix) &&
+        existingAr &&
+        resolvedAr &&
+        existingAr !== resolvedAr) {
+        const namePartEn = content.slice(inProgressPrefix.length).trim();
+        if (namePartEn && existingAr.includes(namePartEn)) {
+            content_ar = resolvedAr;
+        }
+    }
+    if (content &&
+        existingAr &&
+        resolvedAr &&
+        existingAr !== resolvedAr &&
+        /[A-Za-z]/.test(existingAr) &&
+        (actors?.deptArabicName?.trim() ||
+            actors?.sectionArabicName?.trim() ||
+            actors?.roleArabicName?.trim())) {
+        content_ar = resolvedAr;
+    }
     if (content &&
         existingAr &&
         resolvedAr &&
@@ -1287,8 +1388,12 @@ function enrichWorkflowLog(log) {
         if (notificationAr)
             content_ar = notificationAr;
     }
+    if (assignTasksEmpResolved) {
+        content_ar = assignTasksEmpResolved.ar;
+    }
     return {
         ...log,
+        ...(content !== rawContent ? { content } : {}),
         content_ar,
         status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
     };

package/package.json

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

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

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

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

@@ -199,6 +199,70 @@ export function workflowTemplate(
   return buildBilingualFromTemplate(WORKFLOW_TEMPLATES, key, params, arParams);
 }
 
+/** Assign-tasks-emp workflow templates (catalog + runtime fallback when dist JSON is stale). */
+const ASSIGN_TASKS_EMP_WF_FALLBACKS = {
+  request_assigned: { en: 'Request Assigned', ar: 'تم تعيين الطلب' },
+  request_pending_from: { en: 'Request Pending from {{name}}', ar: 'الطلب قيد الانتظار من {{name}}' },
+  request_pending: { en: 'Request Pending', ar: 'الطلب قيد الانتظار' },
+} as const;
+
+type AssignTasksEmpWorkflowTemplateKey = keyof typeof ASSIGN_TASKS_EMP_WF_FALLBACKS;
+
+function resolveAssignTasksEmpWorkflowTemplate(
+  key: AssignTasksEmpWorkflowTemplateKey,
+  enParams: Record<string, string> = {},
+  arParams?: Record<string, string>,
+): BilingualText {
+  const tpl = WORKFLOW_TEMPLATES[key] ?? ASSIGN_TASKS_EMP_WF_FALLBACKS[key];
+  const arabicParams = arParams ?? enParams;
+  return {
+    en: interpolate(tpl.en, enParams),
+    ar: interpolate(tpl.ar, arabicParams),
+  };
+}
+
+/** Create/submit step for assign-tasks-emp workflow logs. */
+export function buildAssignTasksEmpAssignedWorkflowFields(): BilingualText {
+  return resolveAssignTasksEmpWorkflowTemplate('request_assigned');
+}
+
+/** Approval step — pending from assigned employee. */
+export function buildAssignTasksEmpPendingFromWorkflowFields(params: {
+  userName: string;
+  userArabicName?: string | null;
+}): BilingualText {
+  const nameEn = params.userName.trim() || 'Unknown User';
+  const nameAr = resolveBilingualName(nameEn, params.userArabicName);
+  return resolveAssignTasksEmpWorkflowTemplate(
+    'request_pending_from',
+    { name: nameEn },
+    { name: nameAr },
+  );
+}
+
+/** Approval step fallback when assignee name is unavailable. */
+export function buildAssignTasksEmpPendingWorkflowFields(): BilingualText {
+  return resolveAssignTasksEmpWorkflowTemplate('request_pending');
+}
+
+function resolveStoredAssignTasksEmpTemplateKey(
+  content: string | null | undefined,
+  actors?: BilingualActorNames,
+): BilingualText | null {
+  const normalized = content?.trim();
+  if (!normalized || !(normalized in ASSIGN_TASKS_EMP_WF_FALLBACKS)) return null;
+  if (normalized === 'request_pending_from') {
+    const nameEn = actors?.userName?.trim() || 'Unknown User';
+    const nameAr = resolveArabicWorkflowActorName(actors, nameEn);
+    return resolveAssignTasksEmpWorkflowTemplate(
+      'request_pending_from',
+      { name: nameEn },
+      { name: nameAr },
+    );
+  }
+  return resolveAssignTasksEmpWorkflowTemplate(normalized as AssignTasksEmpWorkflowTemplateKey);
+}
+
 export function chatTemplate(
   key: string,
   params: Record<string, string> = {},
@@ -476,6 +540,20 @@ export function buildWorkflowLogUpdateFields(params: {
   roleArabicName?: string | null;
   comment?: string | null;
 }): { content: string; content_ar: string; status: string; status_ar: string | null } {
+  if (params.approvalStatus === 'Closed') {
+    const closed = buildClosedWorkflowMessage({
+      roleName: params.roleName,
+      roleArabicName: params.roleArabicName,
+      comment: params.comment,
+    });
+    return {
+      content: closed.en,
+      content_ar: closed.ar,
+      status: params.workflowStatus,
+      status_ar: resolveWorkflowStatusAr(params.workflowStatus),
+    };
+  }
+
   const isApprovedLike =
     params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned';
 
@@ -1732,6 +1810,9 @@ export function resolveWorkflowContentAr(
   if (content == null || content.trim() === '') return null;
   const normalized = content.trim();
 
+  const assignTasksEmpFromKey = resolveStoredAssignTasksEmpTemplateKey(normalized, actors);
+  if (assignTasksEmpFromKey) return assignTasksEmpFromKey.ar;
+
   const embeddedAssignment = tryParseRequestAssignedComment(normalized);
   if (embeddedAssignment) {
     return buildAssignmentWorkflowFieldsFromActors(embeddedAssignment, actors).ar;
@@ -1808,6 +1889,27 @@ export function resolveWorkflowContentAr(
     const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
     return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: nameAr });
   }
+
+  // Assign Tasks to Employee workflow (legacy EN strings)
+  if (normalized === 'Request Assigned') {
+    return WORKFLOW_TEMPLATES.request_assigned?.ar ?? null;
+  }
+  if (normalized === 'Request Pending') {
+    return WORKFLOW_TEMPLATES.request_pending?.ar ?? null;
+  }
+  const assignTasksPendingPrefix = WORKFLOW_TEMPLATES.request_pending_from?.en.split('{{name}}')[0].trim();
+  if (assignTasksPendingPrefix && normalized.startsWith(assignTasksPendingPrefix)) {
+    const namePartEn = normalized.slice(assignTasksPendingPrefix.length).trim();
+    const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+    return interpolate(WORKFLOW_TEMPLATES.request_pending_from.ar, { name: nameAr });
+  }
+  if (normalized.toLowerCase() === 'notification sent pending') {
+    return WORKFLOW_TEMPLATES.notification_sent_pending?.ar ?? null;
+  }
+  if (normalized.toLowerCase() === 'notification sent successfully') {
+    return WORKFLOW_TEMPLATES.notification_sent_successfully?.ar ?? null;
+  }
+
   if (
     normalized === 'Approval Pending from HR Section' ||
     normalized === 'Approval Pending from Records Department'
@@ -1850,9 +1952,11 @@ export function isSystemGeneratedChatMessage(
 /** Generic workflow log enricher — use in all module repositories. */
 export function enrichWorkflowLog(log: Record<string, unknown>): Record<string, unknown> {
   const status = log.status != null ? String(log.status) : null;
-  const content = log.content != null ? String(log.content) : null;
+  const rawContent = log.content != null ? String(log.content) : null;
   const actors = extractBilingualActorsFromRecord(log);
-  const resolvedAr = resolveWorkflowContentAr(content, actors);
+  const assignTasksEmpResolved = resolveStoredAssignTasksEmpTemplateKey(rawContent, actors);
+  const content = assignTasksEmpResolved?.en ?? rawContent;
+  const resolvedAr = assignTasksEmpResolved?.ar ?? resolveWorkflowContentAr(content, actors);
   const existingAr =
     log.content_ar != null && String(log.content_ar).trim() !== ''
       ? String(log.content_ar)
@@ -1873,6 +1977,32 @@ export function enrichWorkflowLog(log: Record<string, unknown>): Record<string,
       content_ar = resolvedAr;
     }
   }
+  const inProgressPrefix = WORKFLOW_TEMPLATES.request_approval_in_progress_from?.en.split('{{name}}')[0].trim();
+  if (
+    content &&
+    inProgressPrefix &&
+    content.startsWith(inProgressPrefix) &&
+    existingAr &&
+    resolvedAr &&
+    existingAr !== resolvedAr
+  ) {
+    const namePartEn = content.slice(inProgressPrefix.length).trim();
+    if (namePartEn && existingAr.includes(namePartEn)) {
+      content_ar = resolvedAr;
+    }
+  }
+  if (
+    content &&
+    existingAr &&
+    resolvedAr &&
+    existingAr !== resolvedAr &&
+    /[A-Za-z]/.test(existingAr) &&
+    (actors?.deptArabicName?.trim() ||
+      actors?.sectionArabicName?.trim() ||
+      actors?.roleArabicName?.trim())
+  ) {
+    content_ar = resolvedAr;
+  }
   if (
     content &&
     existingAr &&
@@ -1909,8 +2039,12 @@ export function enrichWorkflowLog(log: Record<string, unknown>): Record<string,
     const notificationAr = resolveWorkflowContentAr(content, actors);
     if (notificationAr) content_ar = notificationAr;
   }
+  if (assignTasksEmpResolved) {
+    content_ar = assignTasksEmpResolved.ar;
+  }
   return {
     ...log,
+    ...(content !== rawContent ? { content } : {}),
     content_ar,
     status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
   };