= ({
)}
- {/* Single error or fallback message displayed directly */}
- {(!parsed.errorsList || parsed.errorsList.length <= 1) && parsed.message && (
+ {/* Direct error message or error list from ProblemDetails */}
+ {parsed.errorsList && parsed.errorsList.length > 0 ? (
+
+ {parsed.message && !parsed.errorsList.includes(parsed.message) && (
+
+ {parsed.message}
+
+ )}
+
+ {parsed.errorsList.map((err, idx) => (
+
+ •
+ {err}
+
+ ))}
+
+
{parsed.message}
- )}
-
- {/* Multiple errors from ProblemDetails displayed directly */}
- {parsed.errorsList && parsed.errorsList.length > 1 && (
-
- {parsed.errorsList.map((err, idx) => (
-
- •
- {err}
-
- ))}
-
- )}
+ ) : null}
{parsed.technicalDetails && (
diff --git a/PostFundManagement.ConsoleUI/src/components/ui/Toast.tsx b/PostFundManagement.ConsoleUI/src/components/ui/Toast.tsx
index e4a741c..55ea192 100644
--- a/PostFundManagement.ConsoleUI/src/components/ui/Toast.tsx
+++ b/PostFundManagement.ConsoleUI/src/components/ui/Toast.tsx
@@ -155,16 +155,21 @@ const ToastCard: React.FC<{
)}
- {/* Display errors directly if multiple, or single message directly */}
- {toast.errorsList && toast.errorsList.length > 1 ? (
-
- {toast.errorsList.map((err, idx) => (
-
- •
- {err}
-
- ))}
-
+ {/* Display errors from ProblemDetails errors member */}
+ {toast.errorsList && toast.errorsList.length > 0 ? (
+
+ {toast.message && !toast.errorsList.includes(toast.message) && (
+
{toast.message}
+ )}
+
+ {toast.errorsList.map((err, idx) => (
+
+ •
+ {err}
+
+ ))}
+
+
{toast.message}
diff --git a/PostFundManagement.ConsoleUI/src/lib/formatters.ts b/PostFundManagement.ConsoleUI/src/lib/formatters.ts
index 07fef42..349551e 100644
--- a/PostFundManagement.ConsoleUI/src/lib/formatters.ts
+++ b/PostFundManagement.ConsoleUI/src/lib/formatters.ts
@@ -512,6 +512,7 @@ export const getRiskScoreColor = (likelihood: RiskLikelihood | number, impact: R
// ==========================================
const USER_EMAIL_CACHE: Record = {};
+const EMAIL_TO_USER_ID_CACHE: Record = {};
export const registerUserEmail = (userId: string | number, email: string) => {
if (userId && email && typeof email === 'string' && email.trim()) {
@@ -519,6 +520,7 @@ export const registerUserEmail = (userId: string | number, email: string) => {
const cleanEmail = email.trim();
USER_EMAIL_CACHE[cleanId] = cleanEmail;
USER_EMAIL_CACHE[cleanId.toLowerCase()] = cleanEmail;
+ EMAIL_TO_USER_ID_CACHE[cleanEmail.toLowerCase()] = cleanId;
}
};
@@ -531,6 +533,11 @@ export const registerUserEmails = (users: Array<{ id: string | number; email?: s
}
};
+export const getUserIdByEmail = (email?: string | null): string | undefined => {
+ if (!email || typeof email !== 'string') return undefined;
+ return EMAIL_TO_USER_ID_CACHE[email.trim().toLowerCase()];
+};
+
export const getUserEmail = (userIdOrEmail?: string | number | null): string => {
if (!userIdOrEmail) return '—';
const str = String(userIdOrEmail).trim();
@@ -538,5 +545,28 @@ export const getUserEmail = (userIdOrEmail?: string | number | null): string =>
if (str.includes('@')) return str;
if (USER_EMAIL_CACHE[str]) return USER_EMAIL_CACHE[str];
if (USER_EMAIL_CACHE[str.toLowerCase()]) return USER_EMAIL_CACHE[str.toLowerCase()];
+
+ // Synchronous fallback from stored auth session in browser
+ try {
+ const storedUserJson = localStorage.getItem('pfm_auth_user');
+ const storedSub = localStorage.getItem('pfm_user_sub');
+ if (storedUserJson) {
+ const parsed = JSON.parse(storedUserJson);
+ if (parsed?.email) {
+ const email = String(parsed.email).trim();
+ if (
+ (parsed.id && String(parsed.id).toLowerCase() === str.toLowerCase()) ||
+ (parsed.sub && String(parsed.sub).toLowerCase() === str.toLowerCase()) ||
+ (storedSub && String(storedSub).toLowerCase() === str.toLowerCase())
+ ) {
+ registerUserEmail(str, email);
+ return email;
+ }
+ }
+ }
+ } catch {
+ // Ignore storage parse errors
+ }
+
return str;
};
diff --git a/PostFundManagement.ConsoleUI/src/pages/ExecutiveDashboard.tsx b/PostFundManagement.ConsoleUI/src/pages/ExecutiveDashboard.tsx
index 18b6db2..9520164 100644
--- a/PostFundManagement.ConsoleUI/src/pages/ExecutiveDashboard.tsx
+++ b/PostFundManagement.ConsoleUI/src/pages/ExecutiveDashboard.tsx
@@ -13,6 +13,7 @@ import {
RefreshCw,
Clock,
ShieldAlert,
+ RotateCcw,
} from 'lucide-react';
import {
getDashboard,
@@ -36,6 +37,18 @@ export const ExecutiveDashboard: React.FC = () => {
const [selectedSector, setSelectedSector] = useState('All');
const [selectedPeriod, setSelectedPeriod] = useState('FY 2026/27');
+ const isFiltered = selectedProgramme !== 'All' || selectedSector !== 'All' || selectedPeriod !== 'FY 2026/27';
+ const activeFilterCount =
+ (selectedProgramme !== 'All' ? 1 : 0) +
+ (selectedSector !== 'All' ? 1 : 0) +
+ (selectedPeriod !== 'FY 2026/27' ? 1 : 0);
+
+ const resetFilters = () => {
+ setSelectedProgramme('All');
+ setSelectedSector('All');
+ setSelectedPeriod('FY 2026/27');
+ };
+
// Data queries
const { data: dashboard, isLoading: loadingDashboard, refetch: refetchDashboard, isFetching } = useQuery({
queryKey: ['dashboard'],
@@ -318,41 +331,79 @@ export const ExecutiveDashboard: React.FC = () => {
return (
{/* Page Title & Filter Bar */}
-
-
-
-
- Executive Portfolio Dashboard
-
-
-
- Live Portfolio Feed
-
+
+ {/* Top Tier: Title, Status Badge, and Primary Actions */}
+
+
+
+
+ Executive Portfolio Dashboard
+
+
+
+
+
+ Real-time portfolio overview, disbursement tracking, risk heatmap, and projects requiring governance action.
+
+
+
+
+ {isFiltered && (
+
+ Reset Filters
+
+ )}
+
+
+ {isFetching ? 'Refreshing...' : 'Refresh'}
+
-
- Real-time portfolio overview, disbursement tracking, risk heatmap, and projects requiring governance action.
-
- {/* Filters */}
-
-
-
-
Filter:
+ {/* Dedicated Filter Toolbar */}
+
+
+ Filters:
+ {activeFilterCount > 0 && (
+
+ {activeFilterCount} Active
+
+ )}
-
+ {/* Programme Filter */}
+
+
+ Programme
+
setSelectedProgramme(e.target.value)}
- className="text-xs font-medium bg-[#090d16] border border-slate-700/80 rounded-xl px-3 py-1.5 text-slate-200 focus:outline-none focus:ring-1 focus:ring-blue-500 transition cursor-pointer"
+ className="bg-transparent text-xs font-medium text-slate-100 focus:outline-none cursor-pointer pr-1 [&>option]:bg-slate-900 [&>option]:text-white max-w-[200px] truncate"
>
- Programme: All
+ All
{programmes.map((pr) => (
{pr.name}
@@ -367,13 +418,17 @@ export const ExecutiveDashboard: React.FC = () => {
/>
-
+ {/* Sector Filter */}
+
+
+ Sector
+
setSelectedSector(e.target.value)}
- className="text-xs font-medium bg-[#090d16] border border-slate-700/80 rounded-xl px-3 py-1.5 text-slate-200 focus:outline-none focus:ring-1 focus:ring-blue-500 transition cursor-pointer"
+ className="bg-transparent text-xs font-medium text-slate-100 focus:outline-none cursor-pointer pr-1 [&>option]:bg-slate-900 [&>option]:text-white max-w-[170px] truncate"
>
- Sector: All
+ All
{sectorData.map((s) => (
{s.name}
@@ -388,14 +443,18 @@ export const ExecutiveDashboard: React.FC = () => {
/>
-
+ {/* Financial Period Filter */}
+
+
+ Period
+
setSelectedPeriod(e.target.value)}
- className="text-xs font-medium bg-[#090d16] border border-slate-700/80 rounded-xl px-3 py-1.5 text-slate-200 focus:outline-none focus:ring-1 focus:ring-blue-500 transition cursor-pointer"
+ className="bg-transparent text-xs font-medium text-slate-100 focus:outline-none cursor-pointer pr-1 [&>option]:bg-slate-900 [&>option]:text-white"
>
- Period: FY 2026/27
- Period: FY 2025/26
+ FY 2026/27
+ FY 2025/26
All-Time Cumulative
{
placement="bottom"
/>
-
-
-
@@ -612,7 +662,7 @@ export const ExecutiveDashboard: React.FC = () => {
Primary Focus: {sectorData[0]?.name || 'All Sectors'}
-
+
View Portfolios
diff --git a/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx b/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx
index 796a4e7..018c996 100644
--- a/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx
+++ b/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx
@@ -1,4 +1,5 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
+import { useSearchParams } from 'react-router-dom';
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
@@ -16,6 +17,7 @@ import {
Coins,
Eye,
RefreshCw,
+ ArrowRight,
} from 'lucide-react';
import {
getOrganisations,
@@ -34,6 +36,8 @@ import {
updateProgramme,
getInstruments,
getPortfolioProgrammes,
+ getUsers,
+ getUser,
} from '../services/api';
import { Modal } from '../components/ui/Modal';
import { HelpTooltip } from '../components/ui/HelpTooltip';
@@ -58,6 +62,8 @@ import {
getApprovalStatusBadge,
formatDate,
getUserEmail,
+ registerUserEmail,
+ getUserIdByEmail,
ORGANISATION_TYPE_OPTIONS,
ACTIVITY_STATUS_OPTIONS,
APPROVAL_STATUS_OPTIONS,
@@ -76,14 +82,14 @@ const portfolioSchema = z.object({
name: z.string().min(3, 'Portfolio name is required'),
description: z.string().min(5, 'Description is required'),
organisationId: z.coerce.number().min(1, 'Select a parent organisation'),
- ownerId: z.string().min(1, 'Owner ID is required'),
+ ownerEmail: z.string().min(1, 'Owner email is required'),
});
const programmeSchema = z.object({
name: z.string().min(3, 'Programme name is required'),
portfolioId: z.coerce.number().min(1, 'Select a parent portfolio'),
status: z.coerce.number().optional(),
- ownerId: z.string().min(1, 'Owner ID is required'),
+ ownerEmail: z.string().min(1, 'Owner email is required'),
});
type OrganisationFormValues = z.infer
;
@@ -92,11 +98,72 @@ type ProgrammeFormValues = z.infer;
export const GovernancePage: React.FC = () => {
const queryClient = useQueryClient();
- const { sub, user } = useAuth();
+ const { sub, user, claims } = useAuth();
const currentUserId = sub || user?.id || '';
const { success, error: toastError } = useToast();
- const [activeTab, setActiveTab] = useState<'organisations' | 'portfolios' | 'programmes'>('organisations');
+
+ const effectiveUserEmail =
+ user?.email ||
+ (claims?.email as string) ||
+ (claims?.['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'] as string) ||
+ (claims?.upn as string) ||
+ (sub ? getUserEmail(sub) : '') ||
+ '';
+
+ useEffect(() => {
+ if (effectiveUserEmail) {
+ if (sub) registerUserEmail(sub, effectiveUserEmail);
+ if (user?.id) registerUserEmail(user.id, effectiveUserEmail);
+ }
+ }, [sub, user, effectiveUserEmail]);
+
+ const [searchParams, setSearchParams] = useSearchParams();
+ const tabParam = searchParams.get('tab');
+
+ const getValidTab = (val: string | null): 'organisations' | 'portfolios' | 'programmes' => {
+ if (val === 'portfolios' || val === 'programmes' || val === 'organisations') {
+ return val;
+ }
+ return 'organisations';
+ };
+
+ const [activeTab, setActiveTab] = useState<'organisations' | 'portfolios' | 'programmes'>(() => getValidTab(tabParam));
+
+ useEffect(() => {
+ if (tabParam && (tabParam === 'organisations' || tabParam === 'portfolios' || tabParam === 'programmes')) {
+ setActiveTab(tabParam);
+ }
+ }, [tabParam]);
+
+ const handleTabChange = (tab: 'organisations' | 'portfolios' | 'programmes') => {
+ setActiveTab(tab);
+ setSearchParams((prev) => {
+ const next = new URLSearchParams(prev);
+ next.set('tab', tab);
+ return next;
+ });
+ };
+
const [searchTerm, setSearchTerm] = useState('');
+ const [highlightedPortfolioId, setHighlightedPortfolioId] = useState(null);
+
+ const handleNavigateToPortfolioTab = (portfolioId?: number | string) => {
+ setIsOrgDetailModalOpen(false);
+ setSelectedOrgForDetail(null);
+ handleTabChange('portfolios');
+ if (portfolioId != null) {
+ setHighlightedPortfolioId(portfolioId);
+ setTimeout(() => {
+ const el = document.getElementById(`portfolio-card-${portfolioId}`);
+ if (el) {
+ el.scrollIntoView({ behavior: 'smooth', block: 'center' });
+ }
+ }, 150);
+ setTimeout(() => {
+ setHighlightedPortfolioId(null);
+ }, 3500);
+ }
+ };
// Modals & Editing State
const [isOrgModalOpen, setIsOrgModalOpen] = useState(false);
@@ -125,6 +192,12 @@ export const GovernancePage: React.FC = () => {
const [isProgrammeDetailModalOpen, setIsProgrammeDetailModalOpen] = useState(false);
// Queries
+ const { data: usersDirectory = [] } = useQuery({
+ queryKey: ['users-directory'],
+ queryFn: () => getUsers(1, 200),
+ staleTime: 5 * 60 * 1000,
+ });
+
const { data: organisations = [], isLoading: loadingOrgs } = useQuery({
queryKey: ['organisations'],
queryFn: () => getOrganisations(),
@@ -182,6 +255,92 @@ export const GovernancePage: React.FC = () => {
enabled: !!selectedProgrammeForDetail && isProgrammeDetailModalOpen,
});
+ // Owner resolution helpers
+ const resolveOwnerId = (emailOrId: string, fallbackOwnerId?: string | number | null): string => {
+ const trimmed = (emailOrId || '').trim();
+ if (!trimmed) {
+ return fallbackOwnerId ? String(fallbackOwnerId) : currentUserId;
+ }
+
+ // If already a valid UUID
+ if (/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(trimmed)) {
+ return trimmed;
+ }
+
+ const cleanEmail = trimmed.toLowerCase();
+
+ // 1. Current logged-in user match
+ if (effectiveUserEmail && cleanEmail === effectiveUserEmail.toLowerCase()) {
+ return sub || user?.id || (fallbackOwnerId ? String(fallbackOwnerId) : currentUserId);
+ }
+
+ // 2. Reverse cache lookup
+ const cachedId = getUserIdByEmail(cleanEmail);
+ if (cachedId) return cachedId;
+
+ // 3. Search loaded users directory
+ const matchedUser = usersDirectory.find(
+ (u) => u.email && u.email.trim().toLowerCase() === cleanEmail
+ );
+ if (matchedUser?.id) return String(matchedUser.id);
+
+ // 4. Fallback ID match check
+ if (fallbackOwnerId) {
+ const origEmail = getUserEmail(fallbackOwnerId);
+ if (origEmail && origEmail.toLowerCase() === cleanEmail) {
+ return String(fallbackOwnerId);
+ }
+ }
+
+ // 5. Default fallback
+ return fallbackOwnerId ? String(fallbackOwnerId) : currentUserId;
+ };
+
+ const resolveOwnerEmailForDisplay = async (rawOwnerId?: string | number | null): Promise => {
+ if (!rawOwnerId) {
+ return effectiveUserEmail;
+ }
+ const raw = String(rawOwnerId).trim();
+ if (raw.includes('@')) {
+ return raw;
+ }
+
+ // Check if it's the current user
+ if (
+ (sub && raw.toLowerCase() === sub.toLowerCase()) ||
+ (user?.id && raw.toLowerCase() === user.id.toLowerCase())
+ ) {
+ return effectiveUserEmail;
+ }
+
+ // Check cached email
+ const cached = getUserEmail(raw);
+ if (cached && cached.includes('@')) {
+ return cached;
+ }
+
+ // Check users directory
+ const found = usersDirectory.find((u) => String(u.id).toLowerCase() === raw.toLowerCase());
+ if (found?.email) {
+ return found.email;
+ }
+
+ // If it's a UUID, fetch user canonical record from API
+ if (/^[0-9a-fA-F-]{36}$/.test(raw)) {
+ try {
+ const u = await getUser(raw);
+ if (u?.email) {
+ registerUserEmail(u.id, u.email);
+ return u.email;
+ }
+ } catch {
+ // Fetch failed
+ }
+ }
+
+ return effectiveUserEmail;
+ };
+
// Forms
const orgForm = useForm({
resolver: zodResolver(organisationSchema) as any,
@@ -200,7 +359,7 @@ export const GovernancePage: React.FC = () => {
name: '',
description: '',
organisationId: organisations[0]?.id ? Number(organisations[0].id) : 101,
- ownerId: currentUserId,
+ ownerEmail: effectiveUserEmail,
},
});
@@ -210,7 +369,7 @@ export const GovernancePage: React.FC = () => {
name: '',
portfolioId: portfolios[0]?.id ? Number(portfolios[0].id) : 201,
status: ApprovalStatus.Approved,
- ownerId: currentUserId,
+ ownerEmail: effectiveUserEmail,
},
});
@@ -243,16 +402,22 @@ export const GovernancePage: React.FC = () => {
const portfolioMutation = useMutation({
mutationFn: (data: PortfolioFormValues) => {
+ const resolvedOwnerId = resolveOwnerId(data.ownerEmail, editingPortfolio?.ownedBy);
if (editingPortfolio) {
return updatePortfolio({
portfolioId: editingPortfolio.id,
name: data.name,
description: data.description,
organisationId: Number(data.organisationId),
- ownerId: data.ownerId,
+ ownerId: resolvedOwnerId,
});
}
- return createPortfolio(data as CreatePortfolioRequest);
+ return createPortfolio({
+ name: data.name,
+ description: data.description,
+ organisationId: Number(data.organisationId),
+ ownerId: resolvedOwnerId,
+ });
},
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['portfolios'] });
@@ -268,16 +433,21 @@ export const GovernancePage: React.FC = () => {
const programmeMutation = useMutation({
mutationFn: (data: ProgrammeFormValues) => {
+ const resolvedOwnerId = resolveOwnerId(data.ownerEmail, editingProgramme?.ownedBy);
if (editingProgramme) {
return updateProgramme({
programmeId: editingProgramme.id,
name: data.name,
portfolioId: Number(data.portfolioId),
status: data.status !== undefined ? Number(data.status) : undefined,
- ownerId: data.ownerId,
+ ownerId: resolvedOwnerId,
});
}
- return createProgramme(data as CreateProgrammeRequest);
+ return createProgramme({
+ name: data.name,
+ portfolioId: Number(data.portfolioId),
+ ownerId: resolvedOwnerId,
+ });
},
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['programmes'] });
@@ -321,18 +491,19 @@ export const GovernancePage: React.FC = () => {
name: '',
description: '',
organisationId: organisations[0]?.id ? Number(organisations[0].id) : 101,
- ownerId: currentUserId,
+ ownerEmail: effectiveUserEmail,
});
setIsPortfolioModalOpen(true);
};
- const openEditPortfolio = (p: Portfolio) => {
+ const openEditPortfolio = async (p: Portfolio) => {
setEditingPortfolio(p);
+ const email = await resolveOwnerEmailForDisplay(p.ownedBy);
portfolioForm.reset({
name: p.name || '',
description: p.description || '',
organisationId: Number(p.organisationId) || 101,
- ownerId: p.ownedBy || currentUserId,
+ ownerEmail: email,
});
setIsPortfolioModalOpen(true);
};
@@ -343,18 +514,19 @@ export const GovernancePage: React.FC = () => {
name: '',
portfolioId: portfolios[0]?.id ? Number(portfolios[0].id) : 201,
status: ApprovalStatus.Approved,
- ownerId: currentUserId,
+ ownerEmail: effectiveUserEmail,
});
setIsProgrammeModalOpen(true);
};
- const openEditProgramme = (pr: Programme) => {
+ const openEditProgramme = async (pr: Programme) => {
setEditingProgramme(pr);
+ const email = await resolveOwnerEmailForDisplay(pr.ownedBy);
programmeForm.reset({
name: pr.name || '',
portfolioId: Number(pr.portfolioId) || 201,
status: pr.status ?? ApprovalStatus.Approved,
- ownerId: pr.ownedBy || currentUserId,
+ ownerEmail: email,
});
setIsProgrammeModalOpen(true);
};
@@ -425,7 +597,7 @@ export const GovernancePage: React.FC = () => {
{/* Tabs */}
setActiveTab('organisations')}
+ onClick={() => handleTabChange('organisations')}
className={`py-3.5 px-4 text-xs font-semibold border-b-2 transition-colors flex items-center gap-2 cursor-pointer ${
activeTab === 'organisations'
? 'border-blue-500 text-blue-400'
@@ -442,7 +614,7 @@ export const GovernancePage: React.FC = () => {
/>
setActiveTab('portfolios')}
+ onClick={() => handleTabChange('portfolios')}
className={`py-3.5 px-4 text-xs font-semibold border-b-2 transition-colors flex items-center gap-2 cursor-pointer ${
activeTab === 'portfolios'
? 'border-blue-500 text-blue-400'
@@ -459,7 +631,7 @@ export const GovernancePage: React.FC = () => {
/>
setActiveTab('programmes')}
+ onClick={() => handleTabChange('programmes')}
className={`py-3.5 px-4 text-xs font-semibold border-b-2 transition-colors flex items-center gap-2 cursor-pointer ${
activeTab === 'programmes'
? 'border-blue-500 text-blue-400'
@@ -568,7 +740,7 @@ export const GovernancePage: React.FC = () => {
setIsOrgDetailModalOpen(true);
}}
className="inline-flex items-center gap-1 text-xs font-semibold text-blue-400 hover:text-white bg-blue-500/10 hover:bg-blue-500/20 border border-blue-500/30 px-2.5 py-1.5 rounded-lg transition shadow-xs cursor-pointer"
- title="Inspect Organisation (GET /v1/api/governance/organisations/{id})"
+ title="Inspect Organisation"
>
+
@@ -614,48 +795,53 @@ export const GovernancePage: React.FC = () => {
{p.description}
-
+
- {org ? org.name : `Org #${p.organisationId}`}
- {formatDate(p.createdAt)}
-
-
-
- Owner: {getUserEmail(p.ownedBy)}
+
+ {org ? org.name : `Org #${p.organisationId}`}
-
- {
- setSelectedPortfolioForDetail(p);
- setIsPortfolioDetailModalOpen(true);
- }}
- className="inline-flex items-center gap-1 text-xs font-semibold text-cyan-400 hover:text-white bg-cyan-500/10 hover:bg-cyan-500/20 border border-cyan-500/30 px-2.5 py-1 rounded-lg transition shadow-xs cursor-pointer"
- title="Inspect Portfolio (GET /v1/api/governance/portfolios/{id})"
- >
-
- {
- setSelectedPortfolioForProgrammes(p);
- setIsPortfolioProgrammesModalOpen(true);
- }}
- className="inline-flex items-center gap-1 text-xs font-semibold text-blue-400 hover:text-white bg-blue-500/10 hover:bg-blue-500/20 border border-blue-500/30 px-2.5 py-1 rounded-lg transition shadow-xs cursor-pointer"
- >
-
- openEditPortfolio(p)}
- className="inline-flex items-center gap-1 text-xs font-semibold text-slate-200 hover:text-white bg-slate-900/80 hover:bg-slate-800 border border-slate-700/80 px-2.5 py-1 rounded-lg transition shadow-xs cursor-pointer"
- >
-
-
+ {formatDate(p.createdAt)}
+
+
+
+ Owner:
+
+ {getUserEmail(p.ownedBy)}
+
+
+
+
+ {
+ setSelectedPortfolioForDetail(p);
+ setIsPortfolioDetailModalOpen(true);
+ }}
+ className="inline-flex items-center gap-1 text-xs font-semibold text-cyan-400 hover:text-white bg-cyan-500/10 hover:bg-cyan-500/20 border border-cyan-500/30 px-2.5 py-1 rounded-lg transition shadow-xs cursor-pointer"
+ title="Inspect Portfolio"
+ >
+
+ {
+ setSelectedPortfolioForProgrammes(p);
+ setIsPortfolioProgrammesModalOpen(true);
+ }}
+ className="inline-flex items-center gap-1 text-xs font-semibold text-blue-400 hover:text-white bg-blue-500/10 hover:bg-blue-500/20 border border-blue-500/30 px-2.5 py-1 rounded-lg transition shadow-xs cursor-pointer"
+ >
+
+ openEditPortfolio(p)}
+ className="inline-flex items-center gap-1 text-xs font-semibold text-slate-200 hover:text-white bg-slate-900/80 hover:bg-slate-800 border border-slate-700/80 px-2.5 py-1 rounded-lg transition shadow-xs cursor-pointer"
+ >
+
@@ -718,7 +904,7 @@ export const GovernancePage: React.FC = () => {
setIsProgrammeDetailModalOpen(true);
}}
className="inline-flex items-center gap-1 text-xs font-semibold text-cyan-400 hover:text-white bg-cyan-500/10 hover:bg-cyan-500/20 border border-cyan-500/30 px-2.5 py-1 rounded-lg transition shadow-xs cursor-pointer"
- title="Inspect Programme (GET /v1/api/projects/programme/{id})"
+ title="Inspect Programme"
>
Inspect
@@ -972,11 +1158,22 @@ export const GovernancePage: React.FC = () => {
/>
+
+ {usersDirectory.filter((u) => u.email).map((u) => (
+
+ {u.name ? `${u.name} (${u.email})` : u.email!}
+
+ ))}
+
+ {portfolioForm.formState.errors.ownerEmail && (
+
{portfolioForm.formState.errors.ownerEmail.message}
+ )}
@@ -1111,11 +1308,22 @@ export const GovernancePage: React.FC = () => {
/>
+
+ {usersDirectory.filter((u) => u.email).map((u) => (
+
+ {u.name ? `${u.name} (${u.email})` : u.email!}
+
+ ))}
+
+ {programmeForm.formState.errors.ownerEmail && (
+
{programmeForm.formState.errors.ownerEmail.message}
+ )}
@@ -1260,7 +1468,7 @@ export const GovernancePage: React.FC = () => {
- {/* Modal: View Organisation Details (GET /v1/api/governance/organisations/{id} & /portfolio) */}
+ {/* Modal: View Organisation Details & Linked Portfolio */}
{
@@ -1274,51 +1482,89 @@ export const GovernancePage: React.FC = () => {
{loadingOrgFreshDetail ? (
) : (
<>
-
-
-
-
Legal Name:
-
{orgFreshDetail?.name || selectedOrgForDetail?.name}
+
+
+
+ Legal Name:
+ {orgFreshDetail?.name || selectedOrgForDetail?.name}
-
-
Reg Number:
+
+ Reg Number:
{orgFreshDetail?.registrationNo || selectedOrgForDetail?.registrationNo || '—'}
-
-
Official Email:
-
{orgFreshDetail?.email || selectedOrgForDetail?.email}
+
+ Official Email:
+ {orgFreshDetail?.email || selectedOrgForDetail?.email}
-
-
Entity Type:
+
+ Entity Type:
{getOrganisationTypeLabel(orgFreshDetail?.type ?? selectedOrgForDetail?.type ?? OrganisationType.Enterprise)}
-
- Linked Portfolios (GET /v1/api/governance/organisations/{selectedOrgForDetail?.id}/portfolio)
- {orgPortfolios.length} linked
-
+
+
+
Linked Portfolios
+
+ {orgPortfolios.length} linked
+
+
+ {orgPortfolios.length > 0 && (
+
handleNavigateToPortfolioTab()}
+ className="inline-flex items-center gap-1 text-[11px] font-semibold text-blue-400 hover:text-blue-300 transition cursor-pointer"
+ >
+ View Portfolios tab
+
+ )}
+
+
{loadingOrgPortfolios ? (
-
Loading portfolios...
+
Loading portfolios...
) : orgPortfolios.length === 0 ? (
-
No portfolios directly linked to this organisation.
+
+
No portfolios directly linked to this organisation.
+
) : (
-
+
{orgPortfolios.map((port) => (
-
-
-
{port.name}
-
ID: {port.id}
+
handleNavigateToPortfolioTab(port.id)}
+ className="p-3 bg-slate-900/60 hover:bg-slate-900 rounded-xl border border-slate-800 hover:border-blue-500/40 flex items-center justify-between gap-3 transition cursor-pointer group"
+ >
+
+
+
+ {port.name}
+
+
+ Portfolio #{port.id}
+
+
+ {port.description && (
+
{port.description}
+ )}
-
- Portfolio
-
+
{
+ e.stopPropagation();
+ handleNavigateToPortfolioTab(port.id);
+ }}
+ className="inline-flex items-center gap-1 text-[11px] font-semibold text-blue-400 hover:text-white bg-blue-500/10 hover:bg-blue-500/20 border border-blue-500/30 px-2.5 py-1 rounded-lg transition shadow-xs shrink-0 cursor-pointer"
+ >
+ Open
+
))}
@@ -1342,7 +1588,7 @@ export const GovernancePage: React.FC = () => {
- {/* Modal: View Portfolio Details (GET /v1/api/governance/portfolios/{id}) */}
+ {/* Modal: View Portfolio Details */}
{
@@ -1356,7 +1602,7 @@ export const GovernancePage: React.FC = () => {
{loadingPortfolioFreshDetail ? (
) : (
@@ -1368,14 +1614,16 @@ export const GovernancePage: React.FC = () => {
Description:
{portfolioFreshDetail?.description || selectedPortfolioForDetail?.description || 'None provided'}
-
-
Owner:
-
{getUserEmail(portfolioFreshDetail?.ownedBy || selectedPortfolioForDetail?.ownedBy)}
+
+
+ Owner:
+
+ {getUserEmail(portfolioFreshDetail?.ownedBy || selectedPortfolioForDetail?.ownedBy)}
+
-
-
Created:
-
+
+ Created:
+
{formatDate(portfolioFreshDetail?.createdAt || selectedPortfolioForDetail?.createdAt || '')}
@@ -1398,7 +1646,7 @@ export const GovernancePage: React.FC = () => {
- {/* Modal: View Programme Details (GET /v1/api/projects/programme/{id}) */}
+ {/* Modal: View Programme Details */}
{
@@ -1412,24 +1660,26 @@ export const GovernancePage: React.FC = () => {
{loadingProgrammeFreshDetail ? (
) : (
-
-
-
Programme Name:
-
{programmeFreshDetail?.name || selectedProgrammeForDetail?.name}
+
+
+ Programme Name
+ {programmeFreshDetail?.name || selectedProgrammeForDetail?.name}
-
-
-
Approval Status:
-
+
+
+ Approval Status:
+
{getApprovalStatusBadge(programmeFreshDetail?.status ?? selectedProgrammeForDetail?.status ?? ApprovalStatus.Approved).label}
-
-
Owner:
-
{getUserEmail(programmeFreshDetail?.ownedBy || selectedProgrammeForDetail?.ownedBy)}
+
+ Owner:
+
+ {getUserEmail(programmeFreshDetail?.ownedBy || selectedProgrammeForDetail?.ownedBy)}
+
;
type RiskFormValues = z.infer;
+export const WORKFLOW_STAGES = [
+ { id: 'planned', label: 'Planned', step: 1, description: 'Milestone scope agreed and deliverables planned' },
+ { id: 'in_progress', label: 'In Progress', step: 2, description: 'Activity underway by recipient organisation' },
+ { id: 'submitted', label: 'Submitted', step: 3, description: 'Evidence and deliverables submitted by recipient' },
+ { id: 'under_review', label: 'Under Review', step: 4, description: 'Programme Manager verifying evidence against criteria' },
+ { id: 'verified_paid', label: 'Verified & Paid', step: 5, description: 'Milestone verified and disbursement authorized' },
+] as const;
+
export const MonitoringPage: React.FC = () => {
const queryClient = useQueryClient();
const { success, error: toastError } = useToast();
+ const [searchParams, setSearchParams] = useSearchParams();
- const [activeTab, setActiveTab] = useState<'contracts' | 'evidence' | 'indicators' | 'risks'>('contracts');
+ const tabParam = searchParams.get('tab');
+ const [activeTab, setActiveTab] = useState<'contracts' | 'evidence' | 'indicators' | 'risks'>(
+ tabParam === 'evidence' || tabParam === 'indicators' || tabParam === 'risks' ? tabParam : 'contracts'
+ );
const [isCreateContractModalOpen, setIsCreateContractModalOpen] = useState(false);
- const fileInputRef = useRef(null);
+
+ useEffect(() => {
+ const t = searchParams.get('tab');
+ if (t === 'evidence' || t === 'indicators' || t === 'risks' || t === 'contracts') {
+ setActiveTab(t);
+ }
+ }, [searchParams]);
+
+ const handleTabChange = (tab: 'contracts' | 'evidence' | 'indicators' | 'risks') => {
+ setActiveTab(tab);
+ setSearchParams((prev) => {
+ const next = new URLSearchParams(prev);
+ next.set('tab', tab);
+ return next;
+ });
+ };
// Modals & States
const [isIndicatorModalOpen, setIsIndicatorModalOpen] = useState(false);
@@ -99,11 +123,6 @@ export const MonitoringPage: React.FC = () => {
const [editingRisk, setEditingRisk] = useState(null);
const [selectedIndicatorForActual, setSelectedIndicatorForActual] = useState(null);
const [actualInput, setActualInput] = useState(0);
- const [uploadEvidenceType, setUploadEvidenceType] = useState(EvidenceType.CompletionCertificate);
-
- // Reviewer commentary
- const [reviewerComment, setReviewerComment] = useState('');
- const [selectedMilestoneEvidenceFilter, setSelectedMilestoneEvidenceFilter] = useState('all');
// Queries
const { data: indicators = [], isLoading: loadingIndicators } = useQuery({
@@ -111,14 +130,6 @@ export const MonitoringPage: React.FC = () => {
queryFn: () => getAllIndicators(),
});
- const { data: evidenceList = [], isLoading: loadingEvidence } = useQuery({
- queryKey: ['evidence', selectedMilestoneEvidenceFilter],
- queryFn: () =>
- selectedMilestoneEvidenceFilter !== 'all'
- ? getMilestoneEvidence(selectedMilestoneEvidenceFilter)
- : getAllEvidence(),
- });
-
const { data: risks = [], isLoading: loadingRisks } = useQuery({
queryKey: ['risks'],
queryFn: () => getAllRisks(),
@@ -184,42 +195,6 @@ export const MonitoringPage: React.FC = () => {
},
});
- const uploadMutation = useMutation({
- mutationFn: (formData: FormData) => uploadEvidenceFile(formData),
- onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: ['evidence'] });
- success('Evidence uploaded', 'Supporting file registered for reviewer inspection.');
- },
- onError: (err: unknown) => {
- toastError('Upload failed', err);
- },
- });
-
- const reviewEvidenceMutation = useMutation({
- mutationFn: ({ id, status }: { id: string | number; status: ApprovalStatus }) =>
- updateEvidence({
- evidenceId: id,
- version: 2,
- evidenceType: EvidenceType.DeliverableProof,
- status,
- }),
- onSuccess: (_, variables) => {
- queryClient.invalidateQueries({ queryKey: ['evidence'] });
- if (variables.status === ApprovalStatus.Approved) {
- success(
- 'Evidence Approved & Verified',
- 'Approval recorded. Auto-triggers payment eligibility check in Disbursements.'
- );
- } else {
- success('Rework Requested', 'Evidence returned to recipient for correction.');
- }
- setReviewerComment('');
- },
- onError: (err: unknown) => {
- toastError('Review update failed', err);
- },
- });
-
const openCreateRisk = () => {
setEditingRisk(null);
riskForm.reset({
@@ -279,40 +254,14 @@ export const MonitoringPage: React.FC = () => {
},
});
- const handleFileUpload = (e: React.ChangeEvent) => {
- const file = e.target.files?.[0];
- if (file) {
- const formData = new FormData();
- formData.append('file', file);
- formData.append('projectId', '401');
- formData.append('milestoneId', '803');
- formData.append('evidenceType', String(uploadEvidenceType));
- uploadMutation.mutate(formData);
- }
- };
-
- const handleGetEvidenceSecureLink = async (evidenceId: string | number) => {
- try {
- const url = await getEvidenceSecureLink(evidenceId);
- if (url) {
- window.open(url, '_blank', 'noopener,noreferrer');
- success('Secure URL Retrieved', 'Signed evidence download link opened.');
- } else {
- toastError('Download Error', 'No active secure download link generated.');
- }
- } catch (err: any) {
- toastError('Link Error', err);
- }
- };
-
// Performance indicator thresholds:
// Green >= 90%, Amber 70-89%, Red < 70%
const getIndicatorStatus = (actual: number, target: number) => {
if (!target) return { label: 'Pending', badge: 'bg-slate-800/60 text-slate-400 border-slate-700/60' };
const pct = (actual / target) * 100;
- if (pct >= 90) return { label: 'Green (≥90%)', badge: 'bg-emerald-500/10 text-emerald-400 border-emerald-500/20' };
- if (pct >= 70) return { label: 'Amber (70–89%)', badge: 'bg-amber-500/10 text-amber-400 border-amber-500/20' };
- return { label: 'Red (<70%)', badge: 'bg-rose-500/10 text-rose-400 border-rose-500/20' };
+ if (pct >= 90) return { label: '≥90%', badge: 'bg-emerald-500/10 text-emerald-400 border-emerald-500/20' };
+ if (pct >= 70) return { label: '70–89%', badge: 'bg-amber-500/10 text-amber-400 border-amber-500/20' };
+ return { label: '<70%', badge: 'bg-rose-500/10 text-rose-400 border-rose-500/20' };
};
return (
@@ -367,8 +316,8 @@ export const MonitoringPage: React.FC = () => {
{/* Tabs */}
setActiveTab('contracts')}
- className={`px-4 py-2 text-xs font-medium rounded-xl transition flex items-center gap-2 ${
+ onClick={() => handleTabChange('contracts')}
+ className={`px-4 py-2 text-xs font-medium rounded-xl transition flex items-center gap-2 cursor-pointer ${
activeTab === 'contracts'
? 'bg-blue-600 text-white shadow-lg shadow-blue-600/30'
: 'text-slate-400 hover:text-slate-200 hover:bg-slate-800/50'
@@ -384,25 +333,25 @@ export const MonitoringPage: React.FC = () => {
/>
setActiveTab('evidence')}
- className={`px-4 py-2 text-xs font-medium rounded-xl transition flex items-center gap-2 ${
+ onClick={() => handleTabChange('evidence')}
+ className={`px-4 py-2 text-xs font-medium rounded-xl transition flex items-center gap-2 cursor-pointer ${
activeTab === 'evidence'
? 'bg-blue-600 text-white shadow-lg shadow-blue-600/30'
: 'text-slate-400 hover:text-slate-200 hover:bg-slate-800/50'
}`}
>
- Milestone Evidence & Review Queue
+ Evidence Review & Verification
setActiveTab('indicators')}
- className={`px-4 py-2 text-xs font-medium rounded-xl transition flex items-center gap-2 ${
+ onClick={() => handleTabChange('indicators')}
+ className={`px-4 py-2 text-xs font-medium rounded-xl transition flex items-center gap-2 cursor-pointer ${
activeTab === 'indicators'
? 'bg-blue-600 text-white shadow-lg shadow-blue-600/30'
: 'text-slate-400 hover:text-slate-200 hover:bg-slate-800/50'
@@ -418,8 +367,8 @@ export const MonitoringPage: React.FC = () => {
/>
setActiveTab('risks')}
- className={`px-4 py-2 text-xs font-medium rounded-xl transition flex items-center gap-2 ${
+ onClick={() => handleTabChange('risks')}
+ className={`px-4 py-2 text-xs font-medium rounded-xl transition flex items-center gap-2 cursor-pointer ${
activeTab === 'risks'
? 'bg-blue-600 text-white shadow-lg shadow-blue-600/30'
: 'text-slate-400 hover:text-slate-200 hover:bg-slate-800/50'
@@ -444,220 +393,14 @@ export const MonitoringPage: React.FC = () => {
/>
)}
- {/* Tab 1: Milestone Evidence Submission & Review */}
+ {/* Tab 1: Project & Milestone Evidence Review Hub */}
{activeTab === 'evidence' && (
-
- {/* Milestone Evidence Review Container */}
-
- {/* Header Bar */}
-
-
- RECIPIENT PORTAL • Project XYZ • Milestone 3: Prototype Delivery
-
- Milestone Evidence Submission
-
-
- {/* Workflow Progress Steps */}
-
-
-
Planned
-
In Progress
-
- Submitted
-
-
- Under Review
-
-
- Verified & Paid
-
-
-
-
-
- Current status:
-
- SUBMITTED — awaiting Programme Manager review
-
-
-
-
-
- {/* Upload Evidence & Attached Evidence Panels */}
-
- {/* Upload Box */}
-
-
-
Upload Evidence
-
- Type:
- setUploadEvidenceType(Number(e.target.value))}
- className="text-xs bg-slate-900/80 border border-slate-700/80 rounded-xl px-2.5 py-1.5 text-white focus:outline-none focus:ring-2 focus:ring-blue-500/50 max-w-[180px] [&>option]:bg-slate-900 [&>option]:text-white"
- >
- {EVIDENCE_TYPE_OPTIONS.map((opt) => (
-
- {opt.label}
-
- ))}
-
-
-
-
- Drag & drop or browse files. Accepted formats: PDF, JPG, DOCX, XLSX (Max 25MB).
-
-
-
fileInputRef.current?.click()}
- className="border-2 border-dashed border-slate-700/80 hover:border-blue-500/80 bg-slate-900/40 hover:bg-blue-500/5 rounded-2xl p-8 text-center cursor-pointer transition flex flex-col items-center justify-center space-y-3"
- >
-
-
- Click to Browse or Drag Files Here
- Automated SHA-256 hash stamp applied on intake
-
-
- Browse Files
-
-
-
-
-
- {/* Attached Evidence List */}
-
-
-
-
Attached Evidence (v2)
- {evidenceList.length} files loaded
-
-
- Milestone:
- setSelectedMilestoneEvidenceFilter(e.target.value === 'all' ? 'all' : e.target.value)}
- className="text-xs bg-slate-900 border border-slate-700/80 rounded-xl px-2.5 py-1 text-white focus:outline-none focus:ring-1 focus:ring-blue-500 max-w-[200px] [&>option]:bg-slate-900 [&>option]:text-white"
- >
- All Milestones
- {milestones.map((m) => (
-
- {m.name || `Milestone #${m.id}`}
-
- ))}
-
-
-
-
-
- {evidenceList.map((ev) => (
-
-
-
-
-
- {ev.fileName || `evidence_file_${ev.id}.pdf`}
-
-
- {ev.fileSize || '3.2 MB'} • v{ev.version} • {getEvidenceTypeLabel(ev.type)}
-
-
-
-
-
-
- Under Review
-
-
handleGetEvidenceSecureLink(ev.id)}
- className="p-1 rounded text-slate-400 hover:text-white hover:bg-slate-800 transition cursor-pointer"
- title="Fetch Secure Signed Link"
- >
-
- {ev.documentUrl && (
-
-
- )}
-
-
- ))}
-
-
-
-
- {/* Programme Manager Review Section */}
-
-
Programme Manager Review
-
-
-
- Reviewer comment / rejection reason
-
-
-
-
-
-
- reviewEvidenceMutation.mutate({
- id: evidenceList[0]?.id || 1201,
- status: ApprovalStatus.Rejected,
- })
- }
- disabled={reviewEvidenceMutation.isPending}
- className="px-4 py-2 text-xs font-semibold text-white bg-rose-600/90 hover:bg-rose-600 rounded-xl shadow-lg shadow-rose-600/20 transition"
- >
- Reject / Rework
-
-
-
- reviewEvidenceMutation.mutate({
- id: evidenceList[0]?.id || 1201,
- status: ApprovalStatus.Approved,
- })
- }
- disabled={reviewEvidenceMutation.isPending}
- className="px-4 py-2 text-xs font-semibold text-white bg-gradient-to-r from-blue-600 to-indigo-600 hover:from-blue-500 hover:to-indigo-500 rounded-xl shadow-lg shadow-blue-500/20 transition"
- >
- Approve & Verify
-
-
-
-
- Approval auto-triggers payment eligibility check.
-
-
-
-
-
Actual Value to Record *
-
openEditProject(selectedProject)}
- className="inline-flex items-center gap-1.5 px-3 py-1.5 text-xs font-semibold text-slate-200 bg-slate-800 hover:bg-slate-700 border border-slate-700/80 rounded-xl transition cursor-pointer"
- title="Edit project details"
- >
-
+
+ openEditProject(selectedProject)}
+ className="inline-flex items-center gap-1.5 px-3 py-1.5 text-xs font-semibold text-slate-200 bg-slate-800 hover:bg-slate-700 border border-slate-700/80 rounded-xl transition cursor-pointer"
+ title="Edit project details"
+ >
+
+
Approval Status
@@ -684,6 +695,14 @@ export const ProjectsPage: React.FC = () => {
{formatZAR(a.amount)}
+
+
+ Evidence
+
openEditActivity(a)}
className="p-1.5 rounded-lg text-slate-400 hover:text-blue-400 hover:bg-slate-800 transition cursor-pointer"
@@ -736,16 +755,29 @@ export const ProjectsPage: React.FC = () => {
const statusBadge = getApprovalStatusBadge(m.status);
const priBadge = getPriorityBadge(m.priority);
return (
-
-
+
+
{m.name}
Milestone #{m.id}
-
- {statusBadge.label}
-
+
+
+ {statusBadge.label}
+
+
+ {priBadge.label}
+
+
+
+
+ Evidence
+
openEditMilestone(m)}
className="p-1.5 rounded-lg text-slate-400 hover:text-blue-400 hover:bg-slate-800 transition cursor-pointer"
@@ -755,14 +787,11 @@ export const ProjectsPage: React.FC = () => {
-
-
-
+
+
-
- {priBadge.label}
-
);
diff --git a/PostFundManagement.ConsoleUI/src/pages/SettingsPage.tsx b/PostFundManagement.ConsoleUI/src/pages/SettingsPage.tsx
index 6737a0c..f4555f0 100644
--- a/PostFundManagement.ConsoleUI/src/pages/SettingsPage.tsx
+++ b/PostFundManagement.ConsoleUI/src/pages/SettingsPage.tsx
@@ -121,7 +121,7 @@ export const SettingsPage: React.FC = () => {
const syncIntegrationMutation = useMutation({
mutationFn: () => syncIntegration(true),
onSuccess: () => {
- success('Backend Integration Synced', 'Direct POST /v1/api/integration/sync executed successfully.');
+ success('Backend Integration Synced', 'System records and telemetry successfully synchronized.');
queryClient.invalidateQueries({ queryKey: ['users'] });
},
onError: (err: any) => {
@@ -260,7 +260,7 @@ export const SettingsPage: React.FC = () => {
- The integration sync endpoint provisions and synchronizes authenticated accounts with the backend security directory. To avoid hotspotting the backend during frequent navigation, synchronizations are locally persisted in the browser and refreshed on demand or when roles update.
+ The integration sync service provisions and synchronizes authenticated accounts with the backend security directory. To avoid hotspotting the backend during frequent navigation, synchronizations are locally persisted in the browser and refreshed on demand or when roles update.
@@ -734,7 +734,7 @@ export const SettingsPage: React.FC = () => {
onClick={() => syncIntegrationMutation.mutate()}
disabled={syncIntegrationMutation.isPending}
className="inline-flex items-center gap-2 px-4 py-2 text-xs font-semibold text-white bg-blue-600 hover:bg-blue-500 rounded-xl shadow-lg shadow-blue-500/20 transition cursor-pointer disabled:opacity-50"
- title="Direct POST /v1/api/integration/sync call"
+ title="Trigger synchronization with directory"
>
- OpenAPI Target Route
+ Synchronization Service Profile
- HTTP Method: POST
+ Service Mode: Secure Directory Handshake
- Endpoint Path: {' '}
- /v1/api/integration/sync
+ Sync Scope: {' '}
+ Authoritative User Directory & Security Claims
- Execution Target: {' '}
- Authoritative User Directory Synchronization
+ Service Status: {' '}
+ Operational & Connected
@@ -1129,7 +1129,7 @@ export const SettingsPage: React.FC = () => {
{loadingUserFreshDetail ? (
) : (
diff --git a/PostFundManagement.ConsoleUI/src/services/api.ts b/PostFundManagement.ConsoleUI/src/services/api.ts
index 0aa479c..fc423e8 100644
--- a/PostFundManagement.ConsoleUI/src/services/api.ts
+++ b/PostFundManagement.ConsoleUI/src/services/api.ts
@@ -54,7 +54,7 @@ import {
} from '../types';
import { parseFriendlyError, FriendlyError } from '../utils/apiErrorParser';
-import { registerUserEmail, registerUserEmails } from '../lib/formatters';
+import { registerUserEmail, registerUserEmails, getUserIdByEmail } from '../lib/formatters';
// Helper to extract ProblemDetails from Axios error or unknown error
export function parseApiError(error: unknown): ProblemDetails {
@@ -88,6 +88,20 @@ export const getDashboard = async (): Promise
=> {
// 2. Governance & Structure APIs
// ==========================================
+/**
+ * Ensures an ID is converted to a canonical int64 integer number.
+ * Decodes HashIDs if a HashID string is passed, ensuring request body schemas
+ * (pattern: ^-?(?:0|[1-9]\d*)$) receive numeric integers, never raw HashIDs.
+ */
+export const toIntegerId = (id: number | string | null | undefined): number => {
+ return toolsService.decodeToNumberSync(id);
+};
+
+export const toNullableIntegerId = (id: number | string | null | undefined): number | null => {
+ if (id === null || id === undefined || id === '') return null;
+ return toolsService.decodeToNumberSync(id);
+};
+
/**
* Normalizes an Organisation object from backend responses.
* Robustly maps status across variations (status, Status, activityStatus, approvalStatus, statusId, isActive).
@@ -137,19 +151,22 @@ export const getOrganisation = async (organisationId: string | number): Promise<
};
export const createOrganisation = async (payload: CreateOrganisationRequest): Promise => {
- const userSub = getCurrentUserSub();
const res = await apiClient.post('/v1/api/governance/organisations', {
- ...payload,
- createdBy: userSub || undefined,
+ name: payload.name,
+ registrationNo: payload.registrationNo,
+ email: payload.email,
+ type: payload.type !== undefined ? Number(payload.type) : 5,
});
return res.data;
};
export const updateOrganisation = async (payload: UpdateOrganisationRequest): Promise => {
- const userSub = getCurrentUserSub();
const res = await apiClient.put('/v1/api/governance/organisations', {
- ...payload,
- updatedBy: userSub || undefined,
+ organisationId: toIntegerId(payload.organisationId),
+ name: payload.name,
+ registrationNo: payload.registrationNo,
+ email: payload.email,
+ type: Number(payload.type),
});
return res.data;
};
@@ -193,20 +210,30 @@ export const getPortfolioProgrammes = async (portfolioId: string | number): Prom
export const createPortfolio = async (payload: CreatePortfolioRequest): Promise => {
const userSub = getCurrentUserSub();
+ let ownerId = payload.ownerId;
+ if (ownerId && typeof ownerId === 'string' && ownerId.includes('@')) {
+ ownerId = getUserIdByEmail(ownerId) || userSub || ownerId;
+ }
const res = await apiClient.post('/v1/api/governance/organisations/portfolio', {
- ...payload,
- ownerId: payload.ownerId || userSub || undefined,
- createdBy: userSub || undefined,
+ name: payload.name,
+ description: payload.description,
+ organisationId: toIntegerId(payload.organisationId),
+ ownerId: ownerId || userSub || '00000000-0000-0000-0000-000000000000',
});
return res.data;
};
export const updatePortfolio = async (payload: UpdatePortfolioRequest): Promise => {
const userSub = getCurrentUserSub();
+ let ownerId = payload.ownerId;
+ if (ownerId && typeof ownerId === 'string' && ownerId.includes('@')) {
+ ownerId = getUserIdByEmail(ownerId) || userSub || ownerId;
+ }
const res = await apiClient.put('/v1/api/governance/organisations/portfolio', {
- ...payload,
- ownerId: payload.ownerId || userSub || undefined,
- updatedBy: userSub || undefined,
+ portfolioId: toIntegerId(payload.portfolioId),
+ name: payload.name,
+ description: payload.description,
+ ownerId: ownerId || userSub || '00000000-0000-0000-0000-000000000000',
});
return res.data;
};
@@ -245,20 +272,29 @@ export const getProgrammeProjects = async (programmeId: string | number): Promis
export const createProgramme = async (payload: CreateProgrammeRequest): Promise => {
const userSub = getCurrentUserSub();
+ let ownerId = payload.ownerId;
+ if (ownerId && typeof ownerId === 'string' && ownerId.includes('@')) {
+ ownerId = getUserIdByEmail(ownerId) || userSub || ownerId;
+ }
const res = await apiClient.post('/v1/api/projects/programme', {
- ...payload,
- ownerId: payload.ownerId || userSub || undefined,
- createdBy: userSub || undefined,
+ portfolioId: toIntegerId(payload.portfolioId),
+ name: payload.name,
+ ownerId: ownerId || userSub || '00000000-0000-0000-0000-000000000000',
});
return res.data;
};
export const updateProgramme = async (payload: UpdateProgrammeRequest): Promise => {
const userSub = getCurrentUserSub();
+ let ownerId = payload.ownerId;
+ if (ownerId && typeof ownerId === 'string' && ownerId.includes('@')) {
+ ownerId = getUserIdByEmail(ownerId) || userSub || ownerId;
+ }
const res = await apiClient.put('/v1/api/projects/programme', {
- ...payload,
- ownerId: payload.ownerId || userSub || undefined,
- updatedBy: userSub || undefined,
+ programmeId: toIntegerId(payload.programmeId),
+ name: payload.name,
+ ownerId: ownerId || userSub || '00000000-0000-0000-0000-000000000000',
+ status: Number(payload.status) || 1,
});
return res.data;
};
@@ -277,28 +313,40 @@ export const getProject = async (projectId: string | number): Promise =
};
export const createProject = async (payload: CreateProjectRequest): Promise => {
- const userSub = getCurrentUserSub();
const res = await apiClient.post('/v1/api/projects', {
- ...payload,
- createdBy: userSub || undefined,
+ programmeId: toIntegerId(payload.programmeId),
+ name: payload.name,
+ description: payload.description,
+ sector: Number(payload.sector),
+ projectType: Number(payload.projectType),
});
return res.data;
};
export const updateProject = async (payload: UpdateProjectRequest): Promise => {
- const userSub = getCurrentUserSub();
+ const startedAt = payload.startedAt
+ ? (payload.startedAt.includes('T') ? payload.startedAt : new Date(payload.startedAt).toISOString())
+ : null;
+ const endedAt = payload.endedAt
+ ? (payload.endedAt.includes('T') ? payload.endedAt : new Date(payload.endedAt).toISOString())
+ : null;
+
const res = await apiClient.put('/v1/api/projects', {
- ...payload,
- updatedBy: userSub || undefined,
+ projectId: toIntegerId(payload.projectId),
+ name: payload.name,
+ description: payload.description,
+ startedAt,
+ endedAt,
+ sector: Number(payload.sector),
+ projectType: Number(payload.projectType),
});
return res.data;
};
export const updateProjectStatus = async (payload: UpdateProjectStatusRequest): Promise => {
- const userSub = getCurrentUserSub();
await apiClient.put('/v1/api/projects/status', {
- ...payload,
- updatedBy: userSub || undefined,
+ projectId: toIntegerId(payload.projectId),
+ status: Number(payload.status),
});
};
@@ -315,36 +363,36 @@ export const getActivity = async (activityId: string | number): Promise => {
- const userSub = getCurrentUserSub();
- const body: any = {
- ...payload,
- milestoneId:
- payload.milestoneId !== undefined && payload.milestoneId !== null && payload.milestoneId !== ''
- ? Number(payload.milestoneId)
- : null,
- createdBy: userSub || undefined,
+ const performedAt = payload.performedAt
+ ? (payload.performedAt.includes('T') ? payload.performedAt : new Date(payload.performedAt).toISOString())
+ : null;
+
+ const body = {
+ projectId: toIntegerId(payload.projectId),
+ milestoneId: toNullableIntegerId(payload.milestoneId),
+ category: payload.category || 'Operations',
+ amount: Number(payload.amount) || 0,
+ title: payload.title,
+ description: payload.description || '',
+ performedAt,
};
- try {
- const res = await apiClient.post('/v1/api/projects/activities', body);
- return res.data;
- } catch (err: any) {
- if (err?.response?.status === 405) {
- const res = await apiClient.put('/v1/api/projects/activities', body);
- return res.data;
- }
- throw err;
- }
+ const res = await apiClient.post('/v1/api/projects/activities', body);
+ return res.data;
};
export const updateActivity = async (payload: UpdateActivityRequest): Promise => {
- const userSub = getCurrentUserSub();
- const body: any = {
- ...payload,
- milestoneId:
- payload.milestoneId !== undefined && payload.milestoneId !== null && payload.milestoneId !== ''
- ? Number(payload.milestoneId)
- : null,
- updatedBy: userSub || undefined,
+ const performedAt = payload.performedAt
+ ? (payload.performedAt.includes('T') ? payload.performedAt : new Date(payload.performedAt).toISOString())
+ : null;
+
+ const body = {
+ projectId: toIntegerId(payload.projectId),
+ milestoneId: toNullableIntegerId(payload.milestoneId),
+ category: payload.category || 'Operations',
+ amount: Number(payload.amount) || 0,
+ title: payload.title,
+ description: payload.description || '',
+ performedAt,
};
try {
const res = await apiClient.put('/v1/api/projects/activities', body);
@@ -376,19 +424,30 @@ export const getMilestone = async (milestoneId: string | number): Promise => {
- const userSub = getCurrentUserSub();
+ const dueAtIso = payload.dueAt.includes('T')
+ ? payload.dueAt
+ : new Date(payload.dueAt).toISOString();
+
const res = await apiClient.post('/v1/api/evidence/milestones', {
- ...payload,
- createdBy: userSub || undefined,
+ projectId: toIntegerId(payload.projectId),
+ dueAt: dueAtIso,
+ name: payload.name,
+ priority: Number(payload.priority) || 1,
});
return res.data;
};
export const updateMilestone = async (payload: UpdateMilestoneRequest): Promise => {
- const userSub = getCurrentUserSub();
+ const dueAtIso = payload.dueAt.includes('T')
+ ? payload.dueAt
+ : new Date(payload.dueAt).toISOString();
+
await apiClient.put('/v1/api/projects/milestone', {
- ...payload,
- updatedBy: userSub || undefined,
+ milestoneId: toIntegerId(payload.milestoneId),
+ dueAt: dueAtIso,
+ name: payload.name,
+ priority: Number(payload.priority) || 1,
+ status: Number(payload.status) || 1,
});
};
@@ -422,10 +481,10 @@ export const getAward = async (awardId: string | number): Promise => {
};
export const createAward = async (payload: CreateAwardRequest): Promise => {
- const userSub = getCurrentUserSub();
const res = await apiClient.post('/v1/api/grants/awards', {
- ...payload,
- createdBy: userSub || undefined,
+ organisationId: toIntegerId(payload.organisationId),
+ programmeId: toIntegerId(payload.programmeId),
+ amount: Number(payload.amount),
});
return res.data;
};
@@ -456,12 +515,27 @@ export const getContract = async (contractId: string | number): Promise => {
- const userSub = getCurrentUserSub();
- const hashedAwardId = await toolsService.resolveAwardId(payload.awardId);
+ // Ensure awardId is numeric int64 as required by OpenAPI schema (pattern: ^-?(?:0|[1-9]\d*)$)
+ let numericAwardId: number = Number(payload.awardId);
+ if (isNaN(numericAwardId) || !/^-?\d+$/.test(String(payload.awardId))) {
+ const decoded = toolsService.decodeIdSync(String(payload.awardId));
+ if (decoded && /^-?\d+$/.test(String(decoded))) {
+ numericAwardId = Number(decoded);
+ }
+ }
+
+ const effectiveAtIso = payload.effectiveAt.includes('T')
+ ? payload.effectiveAt
+ : new Date(payload.effectiveAt).toISOString();
+ const expiresAtIso = payload.expiresAt.includes('T')
+ ? payload.expiresAt
+ : new Date(payload.expiresAt).toISOString();
+
const res = await apiClient.post('/v1/api/grants/contracts', {
- ...payload,
- awardId: hashedAwardId,
- createdBy: userSub || undefined,
+ awardId: !isNaN(numericAwardId) ? numericAwardId : payload.awardId,
+ totalValue: Number(payload.totalValue),
+ effectiveAt: effectiveAtIso,
+ expiresAt: expiresAtIso,
});
// Extract ID from headers (e.g. Location or Content-Location) if present
@@ -472,6 +546,8 @@ export const createContract = async (payload: CreateContractRequest): Promise 0) {
const rawStr = res.data.trim();
@@ -479,9 +555,9 @@ export const createContract = async (payload: CreateContractRequest): Promise
String(c.awardId) === String(hashedAwardId) ||
+ String(c.awardId) === String(numericAwardId) ||
String(c.awardId) === String(payload.awardId)
);
if (matched) return matched;
@@ -532,18 +609,17 @@ export const createContract = async (payload: CreateContractRequest): Promise => {
- const hashedContractId = await toolsService.resolveContractId(payload.contractId);
await apiClient.put('/v1/api/grants/contracts', {
- ...payload,
- contractId: hashedContractId,
+ contractId: toIntegerId(payload.contractId),
+ status: Number(payload.status),
});
};
@@ -571,12 +647,10 @@ export const getContractSecureLink = async (contractId: string | number): Promis
};
export const executeContract = async (payload: ExecuteContractRequest): Promise => {
- const userSub = getCurrentUserSub();
- const hashedContractId = await toolsService.resolveContractId(payload.contractId);
await apiClient.post('/v1/api/grants/contracts/execute', {
- ...payload,
- contractId: hashedContractId,
- executedBy: userSub || undefined,
+ contractId: toIntegerId(payload.contractId),
+ externalSignatureId: payload.externalSignatureId,
+ signedDocumentUrl: payload.signedDocumentUrl,
});
};
@@ -594,10 +668,10 @@ export const getBudget = async (budgetId: string | number): Promise => {
};
export const createBudget = async (payload: CreateBudgetRequest): Promise => {
- const userSub = getCurrentUserSub();
const res = await apiClient.post('/v1/api/grants/budgets', {
- ...payload,
- createdBy: userSub || undefined,
+ projectId: toIntegerId(payload.projectId),
+ name: payload.name,
+ amount: Number(payload.amount),
});
return res.data;
};
@@ -619,28 +693,25 @@ export const getDisbursement = async (disbursementId: string | number): Promise<
};
export const createDisbursement = async (payload: CreateDisbursementRequest): Promise => {
- const userSub = getCurrentUserSub();
const res = await apiClient.post('/v1/api/execution/disbursements', {
- ...payload,
- createdBy: userSub || undefined,
+ projectId: toIntegerId(payload.projectId),
+ milestoneId: toNullableIntegerId(payload.milestoneId),
+ amount: Number(payload.amount),
});
return res.data;
};
export const updateDisbursement = async (payload: UpdateDisbursementRequest): Promise => {
- const userSub = getCurrentUserSub();
await apiClient.put('/v1/api/execution/disbursements', {
- ...payload,
- updatedBy: userSub || undefined,
+ disbursementId: toIntegerId(payload.disbursementId),
+ milestoneId: toNullableIntegerId(payload.milestoneId),
+ amount: Number(payload.amount),
});
};
export const approveDisbursement = async (disbursementId: string | number): Promise => {
const hashedDisbId = await toolsService.encodeId(disbursementId);
- const userSub = getCurrentUserSub();
- await apiClient.post(`/v1/api/execution/disbursements/${hashedDisbId}/approve`, {
- approvedBy: userSub || undefined,
- });
+ await apiClient.post(`/v1/api/execution/disbursements/${hashedDisbId}/approve`, {});
};
/**
@@ -706,23 +777,23 @@ export const getRisk = async (riskId: string | number): Promise => {
};
export const createRisk = async (payload: CreateRiskRequest): Promise => {
- const userSub = getCurrentUserSub();
const res = await apiClient.post('/v1/api/execution/risks', {
- ...payload,
+ projectId: toIntegerId(payload.projectId),
likelihood: Number(payload.likelihood),
impact: Number(payload.impact),
- createdBy: userSub || undefined,
+ name: payload.name,
+ description: payload.description || '',
});
return normalizeRisk(res.data);
};
export const updateRisk = async (payload: UpdateRiskRequest): Promise => {
- const userSub = getCurrentUserSub();
await apiClient.put('/v1/api/execution/risks', {
- ...payload,
+ riskId: toIntegerId(payload.riskId),
likelihood: Number(payload.likelihood),
impact: Number(payload.impact),
- updatedBy: userSub || undefined,
+ name: payload.name,
+ description: payload.description || '',
});
};
@@ -741,20 +812,19 @@ export const getIndicator = async (indicatorId: string | number): Promise => {
- const userSub = getCurrentUserSub();
const res = await apiClient.post('/v1/api/evidence/indicators', {
- ...payload,
- createdBy: userSub || undefined,
+ projectId: toIntegerId(payload.projectId),
+ name: payload.name,
+ unitOfMeasure: Number(payload.unitOfMeasure) || 1,
+ baselineAmount: Number(payload.baselineAmount) || 0,
+ targetAmount: Number(payload.targetAmount) || 0,
});
return res.data;
};
export const recordIndicatorActual = async (indicatorId: string | number, actualAmount: number): Promise => {
const hashedIndId = await toolsService.encodeId(indicatorId);
- const userSub = getCurrentUserSub();
- await apiClient.post(`/v1/api/evidence/indicators/${hashedIndId}/actuals/${actualAmount}`, {
- recordedBy: userSub || undefined,
- });
+ await apiClient.post(`/v1/api/evidence/indicators/${hashedIndId}/actuals/${actualAmount}`, {});
};
export const getEvidenceFiles = async (page = 1, pageSize = 100): Promise => {
@@ -802,10 +872,11 @@ export const uploadEvidenceFile = async (formData: FormData): Promise
};
export const updateEvidence = async (payload: UpdateEvidenceRequest): Promise => {
- const userSub = getCurrentUserSub();
await apiClient.put('/v1/api/evidence', {
- ...payload,
- updatedBy: userSub || undefined,
+ evidenceId: toIntegerId(payload.evidenceId),
+ version: Number(payload.version) || 1,
+ evidenceType: Number(payload.evidenceType),
+ status: Number(payload.status),
});
};
@@ -910,10 +981,14 @@ export const syncIntegration = async (force = true): Promise => {
// 8. Communications & Invites APIs
// ==========================================
export const sendInvite = async (payload: InviteRequest): Promise => {
- const userSub = getCurrentUserSub();
const res = await apiClient.post('/v1/api/communications/invite', {
- ...payload,
- createdBy: userSub || undefined,
+ organisationId: toIntegerId(payload.organisationId),
+ invitedOrganisationId: toIntegerId(payload.invitedOrganisationId),
+ awardId: toIntegerId(payload.awardId),
+ contractId: toIntegerId(payload.contractId),
+ recipient: payload.recipient,
+ message: payload.message,
+ platform: payload.platform !== undefined ? Number(payload.platform) : 1,
});
return res.data;
};
diff --git a/PostFundManagement.ConsoleUI/src/services/toolsService.ts b/PostFundManagement.ConsoleUI/src/services/toolsService.ts
index 238a364..0bbc4b0 100644
--- a/PostFundManagement.ConsoleUI/src/services/toolsService.ts
+++ b/PostFundManagement.ConsoleUI/src/services/toolsService.ts
@@ -99,11 +99,19 @@ export function encodeHashIdSync(id: number | string | null | undefined): string
* Deterministically decodes a HashID string back to original numeric ID or string.
* Synchronous and does not perform HTTP network round trips.
*/
-export function decodeHashIdSync(hashId: string | null | undefined): number | string {
- if (!hashId) return '';
+export function decodeHashIdSync(hashId: string | number | null | undefined): number | string {
+ if (hashId === undefined || hashId === null || hashId === '') return '';
+ if (typeof hashId === 'number') return hashId;
+
const str = String(hashId).trim();
if (!str) return '';
+ // If already pure integer string
+ if (/^-?\d+$/.test(str)) {
+ const parsed = parseInt(str, 10);
+ return isNaN(parsed) ? str : parsed;
+ }
+
try {
const decoded = hasher.decode(str);
if (Array.isArray(decoded) && decoded.length > 0) {
@@ -116,6 +124,30 @@ export function decodeHashIdSync(hashId: string | null | undefined): number | st
return str;
}
+/**
+ * Decodes a HashID or numeric value strictly to a canonical integer.
+ * Useful for request payloads expecting int64 integers.
+ */
+export function decodeToNumberSync(hashId: number | string | null | undefined): number {
+ if (hashId === null || hashId === undefined || hashId === '') return 0;
+ if (typeof hashId === 'number') {
+ return isNaN(hashId) ? 0 : Math.trunc(hashId);
+ }
+ const str = String(hashId).trim();
+ if (/^-?\d+$/.test(str)) {
+ const parsed = parseInt(str, 10);
+ return isNaN(parsed) ? 0 : parsed;
+ }
+ try {
+ const decoded = hasher.decode(str);
+ if (Array.isArray(decoded) && decoded.length > 0) {
+ return Number(decoded[0]);
+ }
+ } catch {}
+ const fallback = Number(str);
+ return isNaN(fallback) ? 0 : Math.trunc(fallback);
+}
+
export const toolsService = {
/**
* Synchronous encoding
@@ -127,10 +159,17 @@ export const toolsService = {
/**
* Synchronous decoding
*/
- decodeIdSync(hashId: string | null | undefined): number | string {
+ decodeIdSync(hashId: string | number | null | undefined): number | string {
return decodeHashIdSync(hashId);
},
+ /**
+ * Synchronous decoding strictly to canonical integer
+ */
+ decodeToNumberSync(hashId: number | string | null | undefined): number {
+ return decodeToNumberSync(hashId);
+ },
+
/**
* Encodes a raw ID to a HashID (returns Promise for backward compatibility with existing callers)
*/
diff --git a/PostFundManagement.ConsoleUI/src/utils/apiErrorParser.ts b/PostFundManagement.ConsoleUI/src/utils/apiErrorParser.ts
index d744093..3f79eb3 100644
--- a/PostFundManagement.ConsoleUI/src/utils/apiErrorParser.ts
+++ b/PostFundManagement.ConsoleUI/src/utils/apiErrorParser.ts
@@ -75,12 +75,53 @@ function humanizeFieldName(field: string): string {
return spaced.charAt(0).toUpperCase() + spaced.slice(1);
}
+/**
+ * Checks if a string contains raw HTTP request/response headers or dump.
+ */
+export function isRawHttpOutput(text: string): boolean {
+ if (!text || typeof text !== 'string') return false;
+ // If it has multiple header-like lines or standard HTTP request/response signatures
+ const headerPatterns = [
+ /^(?:accept|authorization|content-type|content-length|origin|referer|user-agent|sec-ch-ua|sec-fetch|x-forwarded|x-real-ip|host):/im,
+ /(?:authorization:\s*bearer|content-type:\s*application\/)/i,
+ /HTTP\/\d(?:\.\d)?\s+\d{3}/i,
+ ];
+
+ let matches = 0;
+ const lines = text.split('\n');
+ for (const line of lines) {
+ const trimmed = line.trim();
+ if (/^[A-Za-z0-9-]+:\s*.+$/.test(trimmed)) {
+ if (headerPatterns.some((p) => p.test(trimmed))) {
+ matches++;
+ }
+ }
+ }
+ return matches >= 2 || (matches >= 1 && /(?:authorization:\s*bearer|content-type:\s*application)/i.test(text));
+}
+
+/**
+ * Redacts sensitive tokens and credentials from technical traces.
+ */
+export function sanitizeTechnicalDetails(text: string): string {
+ if (!text) return '';
+ return text
+ .replace(/(authorization:\s*bearer\s+)[a-zA-Z0-9._-]+/gi, '$1[REDACTED_TOKEN]')
+ .replace(/(bearer\s+)[a-zA-Z0-9._-]+/gi, '$1[REDACTED_TOKEN]')
+ .replace(/("?(?:token|access_token|password|secret|apiKey)"?\s*[:=]\s*)"[^"]+"/gi, '$1"[REDACTED]"');
+}
+
/**
* Cleans technical jargon, stack traces, and framework namespaces from text strings.
*/
function cleanTechnicalJargon(text: string): string {
if (!text) return '';
+ // If text is a raw HTTP dump, do not return it as clean user text
+ if (isRawHttpOutput(text)) {
+ return '';
+ }
+
const cleaned = text
.replace(/^AxiosError:\s*/i, '')
.replace(/^Error:\s*/i, '')
@@ -205,23 +246,28 @@ export function parseFriendlyError(
rawErrors = dataObj;
}
} else if (typeof rawResponseData === 'string') {
- // Check if response data is stringified JSON containing ProblemDetails
- try {
- const parsed = JSON.parse(rawResponseData) as any;
- if (isProblemDetailsObject(parsed)) {
- isProblemDetails = true;
- rawTitle = parsed.title || parsed.Title || undefined;
- rawDetail = parsed.detail || parsed.Detail || undefined;
- statusCode = parsed.status || parsed.Status || statusCode;
- rawErrors = parsed.errors ?? parsed.Errors ?? parsed.errorList ?? parsed.ErrorList;
- } else if (Array.isArray(parsed)) {
- rawErrors = parsed;
- } else {
- rawDetail = cleanTechnicalJargon(rawResponseData);
- }
- } catch {
- if (!rawResponseData.includes(' 0 ? fieldErrors : undefined,
errorsList: errorsList.length > 0 ? errorsList : undefined,
- technicalDetails: technicalSummary || (statusCode ? `HTTP Status ${statusCode}` : undefined),
+ technicalDetails: technicalSummary ? sanitizeTechnicalDetails(technicalSummary) : (statusCode ? `HTTP Status ${statusCode}` : undefined),
};
}