Merge branch 'WorkflowChange' of https://github.com/Tria-plc/emaui into estif-branch-1

apps/portal/src/app/features/certificates/pages/CertificatesPage.tsx

@@ -120,9 +120,7 @@ function formatDate(value: string | null | undefined): string {
   });
 }
 
-const API_BASE =
-  (import.meta as { env?: Record<string, string> }).env?.['VITE_BASE_API_URL'] ??
-  'http://localhost:3000/api';
+import { BASE_API_URL as API_BASE } from '@ema-platform/api';
 
 async function generateCertificate(profileId: string): Promise<Blob> {
   const token = authStorage.getToken();

apps/portal/src/app/features/exam-attempt/hooks/useExamAttempt.ts

@@ -9,6 +9,9 @@ import type {
   SaveState,
 } from '../types/exam-attempt';
 
+/** Mirrors the server's allow-list (ExamAttemptService.MAY_SIT). */
+const MAY_SIT = ['PRESENT', 'LATE'];
+
 const ESSAY_DEBOUNCE_MS = 1500;
 
 type ViewState = 'loading' | 'not-started' | 'taking' | 'completed' | 'error';
@@ -83,6 +86,19 @@ export function useExamAttempt(examId: string | undefined) {
       setErrorMessage('You are not registered for this examination.');
       return;
     }
+    // Attendance gates the sitting, and the exam list already hides "Take
+    // exam" for these — this is the direct-link path. The server refuses
+    // either way (ExamAttemptService.MAY_SIT); this only makes the refusal
+    // legible instead of a raw error key on a Start button that never works.
+    if (!MAY_SIT.includes(registration.attendanceStatus)) {
+      setViewState('error');
+      setErrorMessage(
+        registration.attendanceStatus === 'REGISTERED'
+          ? 'An invigilator must confirm you are present before this exam opens.'
+          : 'Your attendance record does not permit sitting this examination.',
+      );
+      return;
+    }
     if (mineData) {
       seedFrom(mineData);
       return;
@@ -200,7 +216,14 @@ export function useExamAttempt(examId: string | undefined) {
       }).unwrap();
       seedFrom(result);
     } catch (error) {
-      notify.error(extractErrorMessage(error, 'Could not start the exam.'));
+      const key = extractErrorMessage(error, 'Could not start the exam.');
+      notify.error(
+        key === 'attendance_not_confirmed'
+          ? 'An invigilator must confirm you are present before this exam opens.'
+          : key === 'candidate_not_present'
+            ? 'Your attendance record does not permit sitting this examination.'
+            : key,
+      );
     }
   }, [examId, startTrigger, seedFrom]);
 

apps/portal/src/app/features/exams/pages/ExamsPage/columns.tsx

@@ -1,4 +1,4 @@
-import { Badge, Button, Text } from '@mantine/core';
+import { Badge, Button, Text, Tooltip } from '@mantine/core';
 import { IconFileText, IconGavel, IconPlayerPlay } from '@tabler/icons-react';
 import type { TFunction } from 'i18next';
 import type { AdvancedColumn } from '@ema-platform/ui';
@@ -20,7 +20,14 @@ const ATTENDANCE_COLOR: Record<AttendanceStatus, string> = {
   DISQUALIFIED: 'red',
 };
 
-const NOT_SITTING: AttendanceStatus[] = ['ABSENT', 'WITHDRAWN', 'DISQUALIFIED'];
+/**
+ * Attendance rulings that permit sitting the paper — an allow-list mirroring
+ * the server's (ExamAttemptService.MAY_SIT). The deny-list this replaced named
+ * only ABSENT/WITHDRAWN/DISQUALIFIED, so the default REGISTERED fell through
+ * and "Take exam" appeared before any invigilator had confirmed the candidate
+ * was there. LATE counts: a late arrival is present, just not on time.
+ */
+const MAY_SIT: AttendanceStatus[] = ['PRESENT', 'LATE'];
 
 export function registrationColumns(
   t: TFunction,
@@ -115,9 +122,26 @@ export function registrationColumns(
             </Badge>
           );
         }
-        const eligible =
-          exam?.status === 'ACTIVE' && !NOT_SITTING.includes(row.original.attendanceStatus);
-        if (!eligible || !deps.can([PORTAL_PERMISSIONS.APPLY_EXAM])) return null;
+        if (!deps.can([PORTAL_PERMISSIONS.APPLY_EXAM])) return null;
+        // Say why the exam is shut rather than rendering an empty cell: the
+        // candidate is waiting on an invigilator, and silence reads as a bug.
+        if (row.original.attendanceStatus === 'REGISTERED') {
+          return (
+            <Tooltip label={t('exams.columns.awaitingAttendanceHint')} multiline w={240}>
+              <Badge size="sm" variant="light" color="gray">
+                {t('exams.columns.awaitingAttendance')}
+              </Badge>
+            </Tooltip>
+          );
+        }
+        if (!MAY_SIT.includes(row.original.attendanceStatus)) {
+          return (
+            <Badge size="sm" variant="light" color="orange">
+              {t('exams.columns.notSitting')}
+            </Badge>
+          );
+        }
+        if (exam?.status !== 'ACTIVE') return null;
         return (
           <Button
             size="compact-xs"

apps/portal/src/app/i18n/locales/am.ts

@@ -59,6 +59,7 @@ export const am: Translations = {
     seaRecords: 'የባህር መዝገቦቼ',
     seaService: 'የባህር አገልግሎት',
     medical: 'የሕክምና የምስክር ወረቀት',
+    biometrics: 'ባዮሜትሪክ',
     myApplication: 'ማመልከቻዬ',
     certificates: 'የምስክር ወረቀቶች',
     seamanBook: 'የመርከበኛ መጽሐፍ እና BTC',
@@ -603,6 +604,28 @@ export const am: Translations = {
     createOne: "አንድ ይፍጠሩ",
   },
 
+  fayda: {
+    continueWith: "በፋይዳ ይቀጥሉ",
+    orFillManually: "ወይም መረጃዎን ራስዎ ይሙሉ",
+    verifiedTitle: "በፋይዳ ተረጋግጧል",
+    verifiedBody: "ፋይዳ ያረጋገጣቸውን መረጃዎች ሞልተናል። እባክዎ የቀሩትን መስኮች ያሟሉ።",
+    discard: "እነዚህን መረጃዎች አጥፍቼ ቅጹን ራሴ እሞላለሁ",
+    fieldVerified: "ከፋይዳ",
+    fieldConflict: "በሌላ መለያ ተይዟል",
+    conflictBody:
+      "አንዳንድ የተረጋገጡ መረጃዎች አስቀድሞ የሌላ መለያ ናቸው። የተመለከቱትን መስኮች ይቀይሩ ወይም ይግቡ።",
+    brandTitle: "በፋይዳ በማረጋገጥ ላይ",
+    brandSubtitle: "ማንነትዎን እስክናረጋግጥ ድረስ አንድ አፍታ።",
+    verifying: "የፋይዳ ማንነትዎን በማረጋገጥ ላይ…",
+    failedTitle: "ማረጋገጡ አልተጠናቀቀም",
+    backToSignup: "ወደ ምዝገባ ተመለስ",
+    cancelled: "የፋይዳ ማረጋገጫው ተሰርዟል። አሁንም በእጅ መመዝገብ ይችላሉ።",
+    rejected: "ፋይዳ ማንነትዎን ማረጋገጥ አልቻለም። እባክዎ እንደገና ይሞክሩ።",
+    invalidCallback: "ይህ የማረጋገጫ ሊንክ አልተሟላም። እባክዎ እንደገና ይጀምሩ።",
+    sessionLost: "የማረጋገጫ ክፍለ ጊዜዎ አልፏል። እባክዎ እንደገና ይጀምሩ።",
+    stateMismatch: "ይህ ማረጋገጫ ሊታመን አልቻለም። እባክዎ እንደገና ይጀምሩ።",
+  },
+
   signup: {
     usernameMinLength: "የተጠቃሚ ስም ቢያንስ 3 ቁምፊዎች ሊኖረው ይገባል",
     nameEnRequired: "ስም (እንግሊዝኛ) ያስፈልጋል",
@@ -989,6 +1012,10 @@ export const am: Translations = {
       timeExpired: 'ጊዜው አልቋል',
       resumeExam: 'ፈተና ይቀጥሉ',
       takeExam: 'ፈተና ይውሰዱ',
+      awaitingAttendance: 'መገኘት በመጠባበቅ ላይ',
+      awaitingAttendanceHint:
+        'ፈተናው ከመከፈቱ በፊት ተቆጣጣሪ መገኘትዎን ማረጋገጥ አለበት።',
+      notSitting: 'አይፈተኑም',
       attendanceStatus: {
         REGISTERED: 'አልተጠራም',
         PRESENT: 'ተገኝቷል',

apps/portal/src/app/i18n/locales/en.ts

@@ -49,6 +49,7 @@ export const en = {
     seaRecords: 'My Sea Records',
     seaService: 'Sea Service',
     medical: 'Medical Certificate',
+    biometrics: 'Biometrics',
     myApplication: 'My Application',
     vesselRegistration: 'Vessel Registration',
     vesselRegistrationDashboard: 'Vessel Registration Dashboard',
@@ -603,6 +604,28 @@ export const en = {
     createOne: 'Create one',
   },
 
+  fayda: {
+    continueWith: 'Continue with Fayda',
+    orFillManually: 'or fill in your details',
+    verifiedTitle: 'Verified with Fayda',
+    verifiedBody: 'We filled in the details Fayda confirmed. Please complete the remaining fields.',
+    discard: 'Clear these details and fill the form myself',
+    fieldVerified: 'From Fayda',
+    fieldConflict: 'Already used by another account',
+    conflictBody:
+      'Some verified details already belong to another account. Change the highlighted fields, or sign in instead.',
+    brandTitle: 'Verifying with Fayda',
+    brandSubtitle: 'One moment while we confirm your identity.',
+    verifying: 'Verifying your Fayda identity\u2026',
+    failedTitle: 'Verification incomplete',
+    backToSignup: 'Back to sign up',
+    cancelled: 'Fayda verification was cancelled. You can still sign up manually.',
+    rejected: 'Fayda could not verify your identity. Please try again.',
+    invalidCallback: 'This verification link is incomplete. Please start again.',
+    sessionLost: 'Your verification session has expired. Please start again.',
+    stateMismatch: 'This verification could not be trusted. Please start again.',
+  },
+
   signup: {
     usernameMinLength: 'Username must be at least 3 characters',
     nameEnRequired: 'Name (English) is required',
@@ -991,6 +1014,10 @@ export const en = {
       timeExpired: 'Time expired',
       resumeExam: 'Resume exam',
       takeExam: 'Take exam',
+      awaitingAttendance: 'Awaiting attendance',
+      awaitingAttendanceHint:
+        'An invigilator must confirm you are present before the exam opens.',
+      notSitting: 'Not sitting',
       attendanceStatus: {
         REGISTERED: 'Not called',
         PRESENT: 'Present',

apps/portal/src/app/router.tsx

@@ -8,6 +8,7 @@ import { LandingRoute } from "./components/LandingRoute";
 import {
   LoginPage,
   SignupPage,
+  FaydaCallbackPage,
   OTPVerificationPage,
   ForgotPasswordPage,
   SetPasswordPage,
@@ -68,6 +69,16 @@ export const router = createBrowserRouter([
   { path: "/login", element: <LoginPage /> },
   { path: "/signup", element: <SignupPage /> },
 
+  // Where Fayda returns the applicant. Public by necessity — they have no
+  // account yet. It redeems the code and hands control back to /signup.
+  //
+  // Two paths for one page: whichever is registered with Fayda has to match the
+  // API's FAYDA_REDIRECT_URI exactly, and the value being registered first is a
+  // bare /callback. The descriptive path is kept so the route still reads as
+  // part of signup once that can be changed.
+  { path: "/signup/fayda/callback", element: <FaydaCallbackPage /> },
+  { path: "/callback", element: <FaydaCallbackPage /> },
+
   // Completes the forgot-password flow; the reset message links here. The
   // IAM package generates `/reset-password` links, `/set-password` is the
   // first-time-credential variant — one page serves both.