@platform-modules/civil-aviation-authority 2.3.295 → 2.3.296

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

@@ -77,7 +77,6 @@ export type RequestApprovedAssignedWorkflowParams = {
     employeeId: string | number;
     assigneeLabel?: 'user' | 'technician';
 };
-/** Parse legacy English-only assignment comments used as workflow log suffixes. */
 export declare function tryParseRequestAssignedComment(comment?: string | null): Omit<RequestApprovedAssignedWorkflowParams, 'roleArabicName'> | null;
 /** Bilingual workflow content for approved assignment steps (HR, IT, Tender, etc.). */
 export declare function buildRequestApprovedAssignedWorkflowFields(params: RequestApprovedAssignedWorkflowParams): BilingualText;

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

@@ -178,10 +178,19 @@ function buildSynchronizedWorkflowMessage(ctx) {
             return actorEn
                 ? renderSynchronizedWorkflowMessage('request_approval_pending_from', { name: actorEn }, { name: actorAr })
                 : workflowTemplate('request_approval_pending');
-        case 'approved':
+        case 'approved': {
+            const assignment = tryParseRequestAssignedComment(ctx.comment);
+            if (assignment) {
+                return buildRequestApprovedAssignedWorkflowFields({
+                    ...assignment,
+                    roleName: ctx.roleName?.trim() || assignment.roleName,
+                    roleArabicName: ctx.roleArabicName,
+                });
+            }
             return actorEn
                 ? renderSynchronizedWorkflowMessage('request_approved_by', { name: actorEn, comment: commentWf }, { name: actorAr, comment: commentWf })
                 : renderSynchronizedWorkflowMessage('request_approved', { comment: commentWf }, { comment: commentWf });
+        }
         case 'rejected':
             return actorEn
                 ? renderSynchronizedWorkflowMessage('request_rejected_by', { name: actorEn, comment: commentWf }, { name: actorAr, comment: commentWf })
@@ -236,11 +245,11 @@ function buildSynchronizedChatMessage(ctx) {
     }
 }
 /** Parse legacy English-only assignment comments used as workflow log suffixes. */
-function tryParseRequestAssignedComment(comment) {
-    const text = comment?.trim();
-    if (!text)
+function parseRequestAssignedCommentText(text) {
+    const normalized = text.trim();
+    if (!normalized)
         return null;
-    const technicianMatch = text.match(/^Request assigned to technician (.+?) by (.+?) \((.+?) - (.+?)\)$/);
+    const technicianMatch = normalized.match(/^request assigned to technician (.+?) by (.+?) \((.+?) - (.+?)\)$/i);
     if (technicianMatch) {
         return {
             assignedUserName: technicianMatch[1].trim(),
@@ -250,7 +259,7 @@ function tryParseRequestAssignedComment(comment) {
             assigneeLabel: 'technician',
         };
     }
-    const userMatch = text.match(/^Request assigned to (.+?) by (.+?) \((.+?) - (.+?)\)$/);
+    const userMatch = normalized.match(/^request assigned to (.+?) by (.+?) \((.+?) - (.+?)\)$/i);
     if (userMatch) {
         return {
             assignedUserName: userMatch[1].trim(),
@@ -262,6 +271,36 @@ function tryParseRequestAssignedComment(comment) {
     }
     return null;
 }
+function tryParseRequestAssignedComment(comment) {
+    let text = comment?.trim();
+    if (!text)
+        return null;
+    if (text.startsWith(':')) {
+        text = text.replace(/^:\s*/, '').trim();
+    }
+    const direct = parseRequestAssignedCommentText(text);
+    if (direct)
+        return direct;
+    const colonIdx = text.indexOf(': ');
+    if (colonIdx >= 0) {
+        const afterColon = text.slice(colonIdx + 2).trim();
+        const parsedAfterColon = parseRequestAssignedCommentText(afterColon);
+        if (parsedAfterColon)
+            return parsedAfterColon;
+    }
+    const assignMatch = text.match(/request assigned to/i);
+    if (assignMatch && assignMatch.index != null && assignMatch.index >= 0) {
+        return parseRequestAssignedCommentText(text.slice(assignMatch.index).trim());
+    }
+    return null;
+}
+function buildAssignmentWorkflowFieldsFromActors(assignment, actors) {
+    return buildRequestApprovedAssignedWorkflowFields({
+        ...assignment,
+        roleName: actors?.roleName?.trim() || assignment.roleName,
+        roleArabicName: actors?.roleArabicName ?? null,
+    });
+}
 /** Bilingual workflow content for approved assignment steps (HR, IT, Tender, etc.). */
 function buildRequestApprovedAssignedWorkflowFields(params) {
     const assignedUserEn = params.assignedUserName?.trim() || 'User';
@@ -286,7 +325,8 @@ function buildRequestApprovedAssignedWorkflowFields(params) {
 }
 /** Standard workflow log UPDATE fields for all CAA module repositories. */
 function buildWorkflowLogUpdateFields(params) {
-    if (params.approvalStatus === 'Approved') {
+    const isApprovedLike = params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned';
+    if (isApprovedLike) {
         const assignment = tryParseRequestAssignedComment(params.comment);
         if (assignment) {
             const bilingual = buildRequestApprovedAssignedWorkflowFields({
@@ -303,7 +343,7 @@ function buildWorkflowLogUpdateFields(params) {
         }
     }
     let action;
-    if (params.approvalStatus === 'Approved')
+    if (params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned')
         action = 'approved';
     else if (params.approvalStatus === 'Rejected')
         action = 'rejected';
@@ -880,6 +920,10 @@ function resolveWorkflowContentAr(content, actors) {
     if (content == null || content.trim() === '')
         return null;
     const normalized = content.trim();
+    const embeddedAssignment = tryParseRequestAssignedComment(normalized);
+    if (embeddedAssignment) {
+        return buildAssignmentWorkflowFieldsFromActors(embeddedAssignment, actors).ar;
+    }
     for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
         if (tpl.en === normalized || tpl.en.toLowerCase() === normalized.toLowerCase())
             return tpl.ar;
@@ -896,6 +940,10 @@ function resolveWorkflowContentAr(content, actors) {
     if (commentIdx > 0) {
         const baseEn = normalized.slice(0, commentIdx).trim();
         const commentText = normalized.slice(commentIdx + 2).trim();
+        const assignment = tryParseRequestAssignedComment(commentText);
+        if (assignment) {
+            return buildAssignmentWorkflowFieldsFromActors(assignment, actors).ar;
+        }
         const commentSuffix = formatWorkflowCommentSuffix(commentText);
         for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
             if (!tpl.en.includes('{{comment}}'))
@@ -999,7 +1047,7 @@ function enrichWorkflowLog(log) {
         existingAr &&
         resolvedAr &&
         existingAr !== resolvedAr &&
-        /Request assigned to/i.test(existingAr)) {
+        (/request assigned to/i.test(content) || /request assigned to/i.test(existingAr))) {
         content_ar = resolvedAr;
     }
     if (content &&

package/package.json

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

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

@@ -237,7 +237,15 @@ export function buildSynchronizedWorkflowMessage(ctx: WorkflowMessageContext): B
             { name: actorAr },
           )
         : workflowTemplate('request_approval_pending');
-    case 'approved':
+    case 'approved': {
+      const assignment = tryParseRequestAssignedComment(ctx.comment);
+      if (assignment) {
+        return buildRequestApprovedAssignedWorkflowFields({
+          ...assignment,
+          roleName: ctx.roleName?.trim() || assignment.roleName,
+          roleArabicName: ctx.roleArabicName,
+        });
+      }
       return actorEn
         ? renderSynchronizedWorkflowMessage(
             'request_approved_by',
@@ -249,6 +257,7 @@ export function buildSynchronizedWorkflowMessage(ctx: WorkflowMessageContext): B
             { comment: commentWf },
             { comment: commentWf },
           );
+    }
     case 'rejected':
       return actorEn
         ? renderSynchronizedWorkflowMessage(
@@ -354,14 +363,14 @@ export type RequestApprovedAssignedWorkflowParams = {
 };
 
 /** Parse legacy English-only assignment comments used as workflow log suffixes. */
-export function tryParseRequestAssignedComment(
-  comment?: string | null,
+function parseRequestAssignedCommentText(
+  text: string,
 ): Omit<RequestApprovedAssignedWorkflowParams, 'roleArabicName'> | null {
-  const text = comment?.trim();
-  if (!text) return null;
+  const normalized = text.trim();
+  if (!normalized) return null;
 
-  const technicianMatch = text.match(
-    /^Request assigned to technician (.+?) by (.+?) \((.+?) - (.+?)\)$/,
+  const technicianMatch = normalized.match(
+    /^request assigned to technician (.+?) by (.+?) \((.+?) - (.+?)\)$/i,
   );
   if (technicianMatch) {
     return {
@@ -373,7 +382,7 @@ export function tryParseRequestAssignedComment(
     };
   }
 
-  const userMatch = text.match(/^Request assigned to (.+?) by (.+?) \((.+?) - (.+?)\)$/);
+  const userMatch = normalized.match(/^request assigned to (.+?) by (.+?) \((.+?) - (.+?)\)$/i);
   if (userMatch) {
     return {
       assignedUserName: userMatch[1].trim(),
@@ -387,6 +396,45 @@ export function tryParseRequestAssignedComment(
   return null;
 }
 
+export function tryParseRequestAssignedComment(
+  comment?: string | null,
+): Omit<RequestApprovedAssignedWorkflowParams, 'roleArabicName'> | null {
+  let text = comment?.trim();
+  if (!text) return null;
+
+  if (text.startsWith(':')) {
+    text = text.replace(/^:\s*/, '').trim();
+  }
+
+  const direct = parseRequestAssignedCommentText(text);
+  if (direct) return direct;
+
+  const colonIdx = text.indexOf(': ');
+  if (colonIdx >= 0) {
+    const afterColon = text.slice(colonIdx + 2).trim();
+    const parsedAfterColon = parseRequestAssignedCommentText(afterColon);
+    if (parsedAfterColon) return parsedAfterColon;
+  }
+
+  const assignMatch = text.match(/request assigned to/i);
+  if (assignMatch && assignMatch.index != null && assignMatch.index >= 0) {
+    return parseRequestAssignedCommentText(text.slice(assignMatch.index).trim());
+  }
+
+  return null;
+}
+
+function buildAssignmentWorkflowFieldsFromActors(
+  assignment: Omit<RequestApprovedAssignedWorkflowParams, 'roleArabicName'>,
+  actors?: BilingualActorNames,
+): BilingualText {
+  return buildRequestApprovedAssignedWorkflowFields({
+    ...assignment,
+    roleName: actors?.roleName?.trim() || assignment.roleName,
+    roleArabicName: actors?.roleArabicName ?? null,
+  });
+}
+
 /** Bilingual workflow content for approved assignment steps (HR, IT, Tender, etc.). */
 export function buildRequestApprovedAssignedWorkflowFields(
   params: RequestApprovedAssignedWorkflowParams,
@@ -427,7 +475,10 @@ export function buildWorkflowLogUpdateFields(params: {
   roleArabicName?: string | null;
   comment?: string | null;
 }): { content: string; content_ar: string; status: string; status_ar: string | null } {
-  if (params.approvalStatus === 'Approved') {
+  const isApprovedLike =
+    params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned';
+
+  if (isApprovedLike) {
     const assignment = tryParseRequestAssignedComment(params.comment);
     if (assignment) {
       const bilingual = buildRequestApprovedAssignedWorkflowFields({
@@ -445,7 +496,7 @@ export function buildWorkflowLogUpdateFields(params: {
   }
 
   let action: WorkflowMessageAction;
-  if (params.approvalStatus === 'Approved') action = 'approved';
+  if (params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned') 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';
@@ -1368,6 +1419,11 @@ export function resolveWorkflowContentAr(
   if (content == null || content.trim() === '') return null;
   const normalized = content.trim();
 
+  const embeddedAssignment = tryParseRequestAssignedComment(normalized);
+  if (embeddedAssignment) {
+    return buildAssignmentWorkflowFieldsFromActors(embeddedAssignment, actors).ar;
+  }
+
   for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
     if (tpl.en === normalized || tpl.en.toLowerCase() === normalized.toLowerCase()) return tpl.ar;
   }
@@ -1383,6 +1439,10 @@ export function resolveWorkflowContentAr(
   if (commentIdx > 0) {
     const baseEn = normalized.slice(0, commentIdx).trim();
     const commentText = normalized.slice(commentIdx + 2).trim();
+    const assignment = tryParseRequestAssignedComment(commentText);
+    if (assignment) {
+      return buildAssignmentWorkflowFieldsFromActors(assignment, actors).ar;
+    }
     const commentSuffix = formatWorkflowCommentSuffix(commentText);
 
     for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
@@ -1502,7 +1562,7 @@ export function enrichWorkflowLog(log: Record<string, unknown>): Record<string,
     existingAr &&
     resolvedAr &&
     existingAr !== resolvedAr &&
-    /Request assigned to/i.test(existingAr)
+    (/request assigned to/i.test(content) || /request assigned to/i.test(existingAr))
   ) {
     content_ar = resolvedAr;
   }