feat: implement applicant name fallback logic in licensing helpers and update MyApplicationsPage

apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage.tsx

@@ -33,8 +33,10 @@ import {
 import { notifications } from "@mantine/notifications";
 import { useTranslation } from "react-i18next";
 import {
+  APPLICANT_NAME_TYPE_KEYS,
   STATUS_COLORS,
   STATUS_LABELS,
+  applicantOrCompanyName,
   extractErrorMessage,
   useClaimApplicationMutation,
   useGetAllApplicationsQuery,
@@ -89,27 +91,6 @@ const ALL_STATUSES: LicenseStatus[] = [
   "REJECTED",
 ];
 
-/** Licence types with no `companyName` — the queue's "company" column falls
- * back to the applicant name captured in the form instead. */
-const APPLICANT_NAME_TYPE_KEYS = [
-  "SEAFARER_REGISTRATION",
-  "CERTIFICATE_OF_COMPETENCY",
-  "CERTIFICATE_OF_PROFICIENCY",
-  "VESSEL_REGISTRATION",
-  "VESSEL_OWNERSHIP_TRANSFER",
-  "ENDORSEMENT_COC",
-  "ENDORSEMENT_GOC",
-];
-
-function applicantOrCompanyName(app: LicenseApplication): string | undefined {
-  if (!app.licenseType?.key || !APPLICANT_NAME_TYPE_KEYS.includes(app.licenseType.key)) {
-    return app.companyName ?? undefined;
-  }
-  const applicantName = (app.formData?.account as Record<string, unknown> | undefined)
-    ?.applicantName;
-  return typeof applicantName === "string" && applicantName ? applicantName : undefined;
-}
-
 /**
  * The officer work pool.
  *

apps/portal/src/app/features/licensing/pages/MyApplicationsPage.tsx

@@ -21,6 +21,7 @@ import { notifications } from '@mantine/notifications';
 import {
   STATUS_COLORS,
   STATUS_LABELS,
+  applicantOrCompanyName,
   extractErrorMessage,
   localized,
   useBypassPaymentMutation,
@@ -120,7 +121,7 @@ export function MyApplicationsPage() {
     const q = search.trim().toLowerCase();
     return allItems.filter((app) => {
       if (q) {
-        const haystack = `${app.applicationNumber} ${app.companyName ?? ''}`.toLowerCase();
+        const haystack = `${app.applicationNumber} ${applicantOrCompanyName(app) ?? ''}`.toLowerCase();
         if (!haystack.includes(q)) return false;
       }
       if (statusFilter && app.status !== statusFilter) return false;
@@ -201,7 +202,7 @@ export function MyApplicationsPage() {
     },
     {
       header: 'Company',
-      cell: ({ row }) => <Text size="sm">{row.original.companyName ?? '—'}</Text>,
+      cell: ({ row }) => <Text size="sm">{applicantOrCompanyName(row.original) ?? '—'}</Text>,
     },
     {
       header: 'Status',

libs/api/src/lib/features/licensing/licensing.helpers.ts

@@ -2,6 +2,7 @@ import { resolveTokenFromStorage } from '../../session';
 import type {
   Bilingual,
   FormSectionConfig,
+  LicenseApplication,
   LicenseStatus,
   ValidationIssue,
 } from './licensing.types';
@@ -129,6 +130,28 @@ export const TERMINAL_STATUSES: LicenseStatus[] = [
   'REJECTED',
 ];
 
+/** Licence types with no `companyName` — these are filed by a person, not a
+ * business, so display falls back to the applicant name captured in the form. */
+export const APPLICANT_NAME_TYPE_KEYS = [
+  'SEAFARER_REGISTRATION',
+  'CERTIFICATE_OF_COMPETENCY',
+  'CERTIFICATE_OF_PROFICIENCY',
+  'VESSEL_REGISTRATION',
+  'VESSEL_OWNERSHIP_TRANSFER',
+  'ENDORSEMENT_COC',
+  'ENDORSEMENT_GOC',
+];
+
+/** Company name, or applicant name for licence types that have no company. */
+export function applicantOrCompanyName(app: LicenseApplication): string | undefined {
+  if (!app.licenseType?.key || !APPLICANT_NAME_TYPE_KEYS.includes(app.licenseType.key)) {
+    return app.companyName ?? undefined;
+  }
+  const applicantName = (app.formData?.account as Record<string, unknown> | undefined)
+    ?.applicantName;
+  return typeof applicantName === 'string' && applicantName ? applicantName : undefined;
+}
+
 /** Reads a bilingual value for the active language, falling back to English. */
 export function localized(value: Bilingual | undefined, language = 'en'): string {
   if (!value) return '';