@platform-modules/civil-aviation-authority 2.3.307 → 2.3.309

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

@@ -1044,7 +1044,9 @@ function matchTemplateMessage(templateEn, message) {
         }
         groupIndex += 1;
         captures.push({ key, groupIndex });
-        regexBody += '(.+?)';
+        const rest = templateEn.slice(tokenMatch.index + tokenMatch[0].length);
+        const isLastPlaceholder = !/\{\{\w+\}\}/.test(rest);
+        regexBody += key === 'modifiers' || isLastPlaceholder ? '(.*)' : '(.+?)';
         cursor = tokenMatch.index + tokenMatch[0].length;
     }
     regexBody += escapeRegexLiteral(templateEn.slice(cursor));
@@ -1103,6 +1105,54 @@ function countTemplatePlaceholders(templateEn) {
 function listWorkflowTemplatesBySpecificity() {
     return Object.entries(WORKFLOW_TEMPLATES).sort(([, a], [, b]) => countTemplatePlaceholders(b.en) - countTemplatePlaceholders(a.en));
 }
+const IT_HELPDESK_REASSIGN_WORKFLOW_KEYS = [
+    'it_helpdesk_wf_reassigned_l3',
+    'it_helpdesk_wf_reassigned_technician',
+    'it_helpdesk_wf_reassigned_generic',
+];
+const IT_HELPDESK_REASSIGN_CHAT_KEYS = [
+    'it_helpdesk_reassigned_to_l3',
+    'it_helpdesk_reassigned_to_role',
+    'it_helpdesk_reassigned_generic',
+];
+/**
+ * IT Helpdesk reassignment templates share placeholder-heavy shapes; the generic
+ * workflow template must not win over "reassigned request to L3/Technician".
+ */
+function tryResolveItHelpdeskReassignmentWorkflowAr(normalized, actors) {
+    for (const key of IT_HELPDESK_REASSIGN_WORKFLOW_KEYS) {
+        const tpl = WORKFLOW_TEMPLATES[key];
+        if (!tpl)
+            continue;
+        const params = matchTemplateMessage(tpl.en, normalized);
+        if (!params)
+            continue;
+        if (key === 'it_helpdesk_wf_reassigned_generic' && !/^\d+$/.test((params.level ?? '').trim())) {
+            continue;
+        }
+        return interpolate(tpl.ar, buildArabicWorkflowTemplateParams(params, actors));
+    }
+    return null;
+}
+function tryResolveItHelpdeskReassignmentChatAr(normalized, actors) {
+    for (const key of IT_HELPDESK_REASSIGN_CHAT_KEYS) {
+        const tpl = CHAT_TEMPLATES[key];
+        if (!tpl)
+            continue;
+        const params = matchTemplateMessage(tpl.en, normalized);
+        if (!params)
+            continue;
+        if (key === 'it_helpdesk_reassigned_generic' && !/^\d+$/.test((params.level ?? '').trim())) {
+            continue;
+        }
+        if (key === 'it_helpdesk_reassigned_to_role' &&
+            (params.reassignedRoleName ?? '').trim().toLowerCase() === 'l3') {
+            continue;
+        }
+        return interpolate(tpl.ar, buildArabicChatTemplateParams(params, actors));
+    }
+    return null;
+}
 /** Parse legacy IT Helpdesk Muscat EN workflow strings before generic template matching. */
 function tryResolveItHelpdeskMuscatLegacyWorkflowAr(content, actors) {
     const { base, comment } = splitWorkflowColonComment(content);
@@ -1298,6 +1348,9 @@ function resolveWorkflowContentAr(content, actors) {
     const itHelpdeskLegacyAr = tryResolveItHelpdeskMuscatLegacyWorkflowAr(normalized, actors);
     if (itHelpdeskLegacyAr)
         return itHelpdeskLegacyAr;
+    const itHelpdeskReassignAr = tryResolveItHelpdeskReassignmentWorkflowAr(normalized, actors);
+    if (itHelpdeskReassignAr)
+        return itHelpdeskReassignAr;
     for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
         if (tpl.en === normalized || tpl.en.toLowerCase() === normalized.toLowerCase())
             return tpl.ar;
@@ -1308,6 +1361,10 @@ function resolveWorkflowContentAr(content, actors) {
         const params = matchTemplateMessage(tpl.en, normalized);
         if (!params)
             continue;
+        if (tpl.en === WORKFLOW_TEMPLATES.it_helpdesk_wf_reassigned_generic?.en &&
+            !/^\d+$/.test((params.level ?? '').trim())) {
+            continue;
+        }
         return interpolate(tpl.ar, buildArabicWorkflowTemplateParams(params, actors));
     }
     const commentIdx = normalized.indexOf(': ');
@@ -1399,12 +1456,23 @@ function resolveChatMessageAr(message, actors) {
         if (tpl.en === normalized)
             return tpl.ar;
     }
+    const itHelpdeskReassignChatAr = tryResolveItHelpdeskReassignmentChatAr(normalized, actors);
+    if (itHelpdeskReassignChatAr)
+        return itHelpdeskReassignChatAr;
     for (const tpl of Object.values(CHAT_TEMPLATES)) {
         if (!/\{\{\w+\}\}/.test(tpl.en))
             continue;
         const params = matchTemplateMessage(tpl.en, normalized);
         if (!params)
             continue;
+        if (tpl.en === CHAT_TEMPLATES.it_helpdesk_reassigned_generic?.en &&
+            !/^\d+$/.test((params.level ?? '').trim())) {
+            continue;
+        }
+        if (tpl.en === CHAT_TEMPLATES.it_helpdesk_reassigned_to_role?.en &&
+            (params.reassignedRoleName ?? '').trim().toLowerCase() === 'l3') {
+            continue;
+        }
         return interpolate(tpl.ar, buildArabicChatTemplateParams(params, actors));
     }
     const receivedByPrefix = 'Request Received by ';
@@ -1484,6 +1552,13 @@ function enrichWorkflowLog(log) {
         existingAr.includes(actors.roleName.trim())) {
         content_ar = resolvedAr;
     }
+    if (content &&
+        existingAr &&
+        resolvedAr &&
+        existingAr !== resolvedAr &&
+        /reassigned request to (L3|Technician)/i.test(content)) {
+        content_ar = resolvedAr;
+    }
     const itHelpdeskMixedEnglish = /routed to L3|assignment path|Workflow decision made|L3 Technical Support approved|L3 assignment not required|HOS notification not required|routing completed/i;
     if (content &&
         existingAr &&

package/dist/models/user.d.ts

@@ -37,6 +37,7 @@ export declare class User extends BaseModel {
     fax_number?: string;
     diplomatic_name?: string;
     avatar?: string;
+    is_selected_lang: "English" | "Arabic";
     father_name?: string;
     spouse_name?: string;
     children1_name?: string;

package/dist/models/user.js

@@ -210,6 +210,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "avatar", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "enum", enum: ["English", "Arabic"], nullable: false, default: "English" }),
+    __metadata("design:type", String)
+], User.prototype, "is_selected_lang", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)

package/package.json

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

package/sql/add_users_is_selected_lang.sql

@@ -0,0 +1,11 @@
+-- Add is_selected_lang column to users table (CAA).
+-- Run once per environment before deploying updated services.
+
+DO $$ BEGIN
+  CREATE TYPE is_selected_lang_enum AS ENUM ('English', 'Arabic');
+EXCEPTION
+  WHEN duplicate_object THEN NULL;
+END $$;
+
+ALTER TABLE IF EXISTS users
+  ADD COLUMN IF NOT EXISTS is_selected_lang is_selected_lang_enum NOT NULL DEFAULT 'English';

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

@@ -1659,7 +1659,9 @@ function matchTemplateMessage(
 
     groupIndex += 1;
     captures.push({ key, groupIndex });
-    regexBody += '(.+?)';
+    const rest = templateEn.slice(tokenMatch.index + tokenMatch[0].length);
+    const isLastPlaceholder = !/\{\{\w+\}\}/.test(rest);
+    regexBody += key === 'modifiers' || isLastPlaceholder ? '(.*)' : '(.+?)';
     cursor = tokenMatch.index + tokenMatch[0].length;
   }
   regexBody += escapeRegexLiteral(templateEn.slice(cursor));
@@ -1733,6 +1735,62 @@ function listWorkflowTemplatesBySpecificity(): Array<[string, BilingualText]> {
   );
 }
 
+const IT_HELPDESK_REASSIGN_WORKFLOW_KEYS = [
+  'it_helpdesk_wf_reassigned_l3',
+  'it_helpdesk_wf_reassigned_technician',
+  'it_helpdesk_wf_reassigned_generic',
+] as const;
+
+const IT_HELPDESK_REASSIGN_CHAT_KEYS = [
+  'it_helpdesk_reassigned_to_l3',
+  'it_helpdesk_reassigned_to_role',
+  'it_helpdesk_reassigned_generic',
+] as const;
+
+/**
+ * IT Helpdesk reassignment templates share placeholder-heavy shapes; the generic
+ * workflow template must not win over "reassigned request to L3/Technician".
+ */
+function tryResolveItHelpdeskReassignmentWorkflowAr(
+  normalized: string,
+  actors?: BilingualActorNames,
+): string | null {
+  for (const key of IT_HELPDESK_REASSIGN_WORKFLOW_KEYS) {
+    const tpl = WORKFLOW_TEMPLATES[key];
+    if (!tpl) continue;
+    const params = matchTemplateMessage(tpl.en, normalized);
+    if (!params) continue;
+    if (key === 'it_helpdesk_wf_reassigned_generic' && !/^\d+$/.test((params.level ?? '').trim())) {
+      continue;
+    }
+    return interpolate(tpl.ar, buildArabicWorkflowTemplateParams(params, actors));
+  }
+  return null;
+}
+
+function tryResolveItHelpdeskReassignmentChatAr(
+  normalized: string,
+  actors?: BilingualActorNames,
+): string | null {
+  for (const key of IT_HELPDESK_REASSIGN_CHAT_KEYS) {
+    const tpl = CHAT_TEMPLATES[key];
+    if (!tpl) continue;
+    const params = matchTemplateMessage(tpl.en, normalized);
+    if (!params) continue;
+    if (key === 'it_helpdesk_reassigned_generic' && !/^\d+$/.test((params.level ?? '').trim())) {
+      continue;
+    }
+    if (
+      key === 'it_helpdesk_reassigned_to_role' &&
+      (params.reassignedRoleName ?? '').trim().toLowerCase() === 'l3'
+    ) {
+      continue;
+    }
+    return interpolate(tpl.ar, buildArabicChatTemplateParams(params, actors));
+  }
+  return null;
+}
+
 /** Parse legacy IT Helpdesk Muscat EN workflow strings before generic template matching. */
 function tryResolveItHelpdeskMuscatLegacyWorkflowAr(
   content: string,
@@ -1957,6 +2015,9 @@ export function resolveWorkflowContentAr(
   const itHelpdeskLegacyAr = tryResolveItHelpdeskMuscatLegacyWorkflowAr(normalized, actors);
   if (itHelpdeskLegacyAr) return itHelpdeskLegacyAr;
 
+  const itHelpdeskReassignAr = tryResolveItHelpdeskReassignmentWorkflowAr(normalized, actors);
+  if (itHelpdeskReassignAr) return itHelpdeskReassignAr;
+
   for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
     if (tpl.en === normalized || tpl.en.toLowerCase() === normalized.toLowerCase()) return tpl.ar;
   }
@@ -1965,6 +2026,12 @@ export function resolveWorkflowContentAr(
     if (!/\{\{\w+\}\}/.test(tpl.en)) continue;
     const params = matchTemplateMessage(tpl.en, normalized);
     if (!params) continue;
+    if (
+      tpl.en === WORKFLOW_TEMPLATES.it_helpdesk_wf_reassigned_generic?.en &&
+      !/^\d+$/.test((params.level ?? '').trim())
+    ) {
+      continue;
+    }
     return interpolate(tpl.ar, buildArabicWorkflowTemplateParams(params, actors));
   }
 
@@ -2067,10 +2134,25 @@ export function resolveChatMessageAr(
     if (tpl.en === normalized) return tpl.ar;
   }
 
+  const itHelpdeskReassignChatAr = tryResolveItHelpdeskReassignmentChatAr(normalized, actors);
+  if (itHelpdeskReassignChatAr) return itHelpdeskReassignChatAr;
+
   for (const tpl of Object.values(CHAT_TEMPLATES)) {
     if (!/\{\{\w+\}\}/.test(tpl.en)) continue;
     const params = matchTemplateMessage(tpl.en, normalized);
     if (!params) continue;
+    if (
+      tpl.en === CHAT_TEMPLATES.it_helpdesk_reassigned_generic?.en &&
+      !/^\d+$/.test((params.level ?? '').trim())
+    ) {
+      continue;
+    }
+    if (
+      tpl.en === CHAT_TEMPLATES.it_helpdesk_reassigned_to_role?.en &&
+      (params.reassignedRoleName ?? '').trim().toLowerCase() === 'l3'
+    ) {
+      continue;
+    }
     return interpolate(tpl.ar, buildArabicChatTemplateParams(params, actors));
   }
 
@@ -2172,6 +2254,15 @@ export function enrichWorkflowLog(log: Record<string, unknown>): Record<string,
   ) {
     content_ar = resolvedAr;
   }
+  if (
+    content &&
+    existingAr &&
+    resolvedAr &&
+    existingAr !== resolvedAr &&
+    /reassigned request to (L3|Technician)/i.test(content)
+  ) {
+    content_ar = resolvedAr;
+  }
   const itHelpdeskMixedEnglish =
     /routed to L3|assignment path|Workflow decision made|L3 Technical Support approved|L3 assignment not required|HOS notification not required|routing completed/i;
   if (

package/src/models/user.ts

@@ -115,6 +115,9 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     avatar?: string;
 
+    @Column({ type: "enum", enum: ["English", "Arabic"], nullable: false, default: "English" })
+    is_selected_lang: "English" | "Arabic";
+
     @Column({ nullable: true })
     father_name?: string;