From df167caf55d57d1745c179da4fbc8560540f94dc Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Sun, 27 Sep 2026 14:07:44 +0200 Subject: [PATCH] Fixed mismatched endpoint calling --- .../src/pages/BeneficiariesPage.tsx | 62 ++- .../src/pages/ChangeManagementPage.tsx | 522 ++++++++++++++++-- .../src/pages/SiteVisitsPage.tsx | 31 +- .../src/services/api.ts | 65 ++- 4 files changed, 599 insertions(+), 81 deletions(-) diff --git a/PostFundManagement.ConsoleUI/src/pages/BeneficiariesPage.tsx b/PostFundManagement.ConsoleUI/src/pages/BeneficiariesPage.tsx index eb3abea..0bd7122 100644 --- a/PostFundManagement.ConsoleUI/src/pages/BeneficiariesPage.tsx +++ b/PostFundManagement.ConsoleUI/src/pages/BeneficiariesPage.tsx @@ -24,11 +24,13 @@ import { import { getProjects, getProjectBeneficiaries, + getBeneficiary, createBeneficiary, updateBeneficiary, getBeneficiaryOutcomes, createOutcome, getProjectComplianceItems, + getComplianceItem, createComplianceItem, updateComplianceItem, } from '../services/api'; @@ -288,26 +290,50 @@ export const BeneficiariesPage: React.FC = () => { { header: 'Status', key: 'status', format: (val) => (val === ApprovalStatus.Approved ? 'Approved' : 'Pending Review') }, ]; - const handleOpenEditBen = (b: Beneficiary) => { - setEditingBen(b); - benForm.reset({ - name: b.name || '', - category: b.category || 'General', - location: b.location || '', - targetCount: b.targetCount || 0, - reachedCount: b.reachedCount || 0, - }); - setIsBenModalOpen(true); + const handleOpenEditBen = async (b: Beneficiary) => { + try { + const fresh = await getBeneficiary(b.id); + setEditingBen(fresh); + benForm.reset({ + name: fresh.name || '', + category: fresh.category || 'General', + location: fresh.location || '', + targetCount: fresh.targetCount || 0, + reachedCount: fresh.reachedCount || 0, + }); + setIsBenModalOpen(true); + } catch { + setEditingBen(b); + benForm.reset({ + name: b.name || '', + category: b.category || 'General', + location: b.location || '', + targetCount: b.targetCount || 0, + reachedCount: b.reachedCount || 0, + }); + setIsBenModalOpen(true); + } }; - const handleOpenEditComp = (c: ComplianceItem) => { - setEditingComp(c); - compForm.reset({ - title: c.title || '', - requirements: c.requirements || '', - status: c.status ?? ApprovalStatus.Pending, - }); - setIsCompModalOpen(true); + const handleOpenEditComp = async (c: ComplianceItem) => { + try { + const fresh = await getComplianceItem(c.id); + setEditingComp(fresh); + compForm.reset({ + title: fresh.title || '', + requirements: fresh.requirements || '', + status: fresh.status ?? ApprovalStatus.Pending, + }); + setIsCompModalOpen(true); + } catch { + setEditingComp(c); + compForm.reset({ + title: c.title || '', + requirements: c.requirements || '', + status: c.status ?? ApprovalStatus.Pending, + }); + setIsCompModalOpen(true); + } }; return ( diff --git a/PostFundManagement.ConsoleUI/src/pages/ChangeManagementPage.tsx b/PostFundManagement.ConsoleUI/src/pages/ChangeManagementPage.tsx index 51614ab..bbdd318 100644 --- a/PostFundManagement.ConsoleUI/src/pages/ChangeManagementPage.tsx +++ b/PostFundManagement.ConsoleUI/src/pages/ChangeManagementPage.tsx @@ -24,9 +24,11 @@ import { import { getProjects, getProjectIssues, + getIssue, createIssue, updateIssue, getProjectChangeRequests, + getChangeRequest, createChangeRequest, updateChangeRequest, getUsers, @@ -45,6 +47,7 @@ import { formatZAR, getUserEmail, PRIORITY_OPTIONS, + APPROVAL_STATUS_OPTIONS, } from '../lib/formatters'; const issueSchema = z.object({ @@ -54,6 +57,23 @@ const issueSchema = z.object({ assignedTo: z.string().min(1, 'Assignee is required'), }); +const editIssueSchema = z.object({ + title: z.string().min(3, 'Issue title required'), + description: z.string().min(5, 'Description required'), + priority: z.coerce.number().min(1).max(4), + assignedTo: z.string().min(1, 'Assignee is required'), + status: z.coerce.number(), + resolution: z.string().min(1, 'Resolution notes required'), + resolvedAt: z.string().min(1, 'Resolution date and time required'), +}); + +const toDateTimeLocalValue = (dateString?: string | null): string => { + const d = dateString ? new Date(dateString) : new Date(); + const validDate = isNaN(d.getTime()) ? new Date() : d; + const pad = (n: number) => n.toString().padStart(2, '0'); + return `${validDate.getFullYear()}-${pad(validDate.getMonth() + 1)}-${pad(validDate.getDate())}T${pad(validDate.getHours())}:${pad(validDate.getMinutes())}`; +}; + const resolveIssueSchema = z.object({ resolution: z.string().min(5, 'Resolution notes required'), status: z.coerce.number(), @@ -66,14 +86,23 @@ const changeRequestSchema = z.object({ revisionDate: z.string().min(4, 'Revision date required'), }); +const editChangeSchema = z.object({ + title: z.string().min(3, 'Title required'), + justification: z.string().min(5, 'Justification required'), + revisedBudget: z.coerce.number().min(0, 'Revised budget must be non-negative'), + status: z.coerce.number(), +}); + const resolveChangeSchema = z.object({ status: z.coerce.number(), justification: z.string().min(3, 'Decision justification required'), }); type IssueFormValues = z.infer; +type EditIssueFormValues = z.infer; type ResolveIssueFormValues = z.infer; type ChangeRequestFormValues = z.infer; +type EditChangeFormValues = z.infer; type ResolveChangeFormValues = z.infer; export const ChangeManagementPage: React.FC = () => { @@ -89,12 +118,14 @@ export const ChangeManagementPage: React.FC = () => { // Modals const [isIssueModalOpen, setIsIssueModalOpen] = useState(false); + const [isEditIssueModalOpen, setIsEditIssueModalOpen] = useState(false); const [editingIssue, setEditingIssue] = useState(null); const [isResolveIssueModalOpen, setIsResolveIssueModalOpen] = useState(false); const [resolvingIssue, setResolvingIssue] = useState(null); const [isChangeModalOpen, setIsChangeModalOpen] = useState(false); + const [isEditChangeModalOpen, setIsEditChangeModalOpen] = useState(false); const [editingChange, setEditingChange] = useState(null); const [isResolveChangeModalOpen, setIsResolveChangeModalOpen] = useState(false); @@ -141,6 +172,21 @@ export const ChangeManagementPage: React.FC = () => { defaultValues: { title: '', description: '', priority: Priority.Medium, assignedTo: '' }, }); + const editIssueForm = useForm({ + resolver: zodResolver(editIssueSchema), + defaultValues: { + title: '', + description: '', + priority: Priority.Medium, + assignedTo: '', + status: ActivityStatus.Active, + resolution: '', + resolvedAt: toDateTimeLocalValue(), + }, + }); + + const watchedEditStatus = editIssueForm.watch('status'); + const resolveIssueForm = useForm({ resolver: zodResolver(resolveIssueSchema), defaultValues: { resolution: '', status: ActivityStatus.Inactive }, @@ -156,6 +202,16 @@ export const ChangeManagementPage: React.FC = () => { }, }); + const editChangeForm = useForm({ + resolver: zodResolver(editChangeSchema), + defaultValues: { + title: '', + justification: '', + revisedBudget: 0, + status: ApprovalStatus.Pending, + }, + }); + const resolveChangeForm = useForm({ resolver: zodResolver(resolveChangeSchema), defaultValues: { status: ApprovalStatus.Approved, justification: '' }, @@ -183,25 +239,36 @@ export const ChangeManagementPage: React.FC = () => { }); const updateIssueMutation = useMutation({ - mutationFn: (vals: IssueFormValues) => { + mutationFn: (vals: EditIssueFormValues) => { if (!editingIssue) throw new Error('No issue selected'); + let isoResolvedAt: string; + try { + isoResolvedAt = vals.resolvedAt + ? (vals.resolvedAt.includes('T') && vals.resolvedAt.endsWith('Z') + ? vals.resolvedAt + : new Date(vals.resolvedAt).toISOString()) + : new Date().toISOString(); + } catch { + isoResolvedAt = new Date().toISOString(); + } + return updateIssue({ issueId: editingIssue.id, title: vals.title, description: vals.description, priority: vals.priority, assignedTo: vals.assignedTo, - resolution: editingIssue.resolution || '', - resolvedAt: editingIssue.resolvedAt || null, - status: editingIssue.status || ActivityStatus.Active, + resolution: vals.resolution || (Number(vals.status) === ActivityStatus.Inactive ? 'Resolved' : 'Under active investigation'), + resolvedAt: isoResolvedAt, + status: Number(vals.status), }); }, onSuccess: () => { queryClient.invalidateQueries({ queryKey: ['issues'] }); - setIsIssueModalOpen(false); + setIsEditIssueModalOpen(false); setEditingIssue(null); - issueForm.reset(); - success('Issue Updated', 'Issue record saved.'); + editIssueForm.reset(); + success('Issue Updated', 'Issue record and resolution status saved successfully.'); }, onError: (err: any) => toastError('Update Failed', err.message || 'Unable to update issue.'), }); @@ -271,6 +338,27 @@ export const ChangeManagementPage: React.FC = () => { onError: (err: any) => toastError('Decision Failed', err.message || 'Unable to resolve change request.'), }); + const updateChangeMutation = useMutation({ + mutationFn: (vals: EditChangeFormValues) => { + if (!editingChange) throw new Error('No change request selected'); + return updateChangeRequest({ + changeRequestId: editingChange.id, + title: vals.title, + justification: vals.justification, + revisedBudget: vals.revisedBudget, + status: Number(vals.status), + }); + }, + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ['changeRequests'] }); + setIsEditChangeModalOpen(false); + setEditingChange(null); + editChangeForm.reset(); + success('Change Request Updated', 'Change proposal and governance status saved.'); + }, + onError: (err: any) => toastError('Update Failed', err.message || 'Unable to update change request.'), + }); + // Filtered & Sorted Issues const filteredIssues = useMemo(() => { return issues.filter((iss) => { @@ -332,6 +420,88 @@ export const ChangeManagementPage: React.FC = () => { setIsResolveIssueModalOpen(true); }; + const openEditIssue = async (iss: Issue) => { + try { + const fresh = await getIssue(iss.id); + setEditingIssue(fresh); + const initialStatus = + fresh.status !== undefined && fresh.status !== null + ? Number(fresh.status) + : fresh.resolvedAt + ? ActivityStatus.Inactive + : ActivityStatus.Active; + + const initialResolution = + fresh.resolution && fresh.resolution.trim() !== '' + ? fresh.resolution + : initialStatus === ActivityStatus.Inactive + ? 'Resolved and remediated' + : 'Remediation currently in progress'; + + editIssueForm.reset({ + title: fresh.title || '', + description: fresh.description || '', + priority: fresh.priority || Priority.Medium, + assignedTo: fresh.assignedTo || '', + status: initialStatus, + resolution: initialResolution, + resolvedAt: toDateTimeLocalValue(fresh.resolvedAt), + }); + setIsEditIssueModalOpen(true); + } catch { + setEditingIssue(iss); + const initialStatus = + iss.status !== undefined && iss.status !== null + ? Number(iss.status) + : iss.resolvedAt + ? ActivityStatus.Inactive + : ActivityStatus.Active; + + const initialResolution = + iss.resolution && iss.resolution.trim() !== '' + ? iss.resolution + : initialStatus === ActivityStatus.Inactive + ? 'Resolved and remediated' + : 'Remediation currently in progress'; + + editIssueForm.reset({ + title: iss.title || '', + description: iss.description || '', + priority: iss.priority || Priority.Medium, + assignedTo: iss.assignedTo || '', + status: initialStatus, + resolution: initialResolution, + resolvedAt: toDateTimeLocalValue(iss.resolvedAt), + }); + setIsEditIssueModalOpen(true); + } + }; + + const openEditChange = async (cr: ChangeRequest) => { + try { + // 1. Uses GET method (NOT POST) + // 2. Passes ChangeRequestId (NOT ProjectId) + const freshData = await getChangeRequest(cr.id); + setEditingChange(freshData); + editChangeForm.reset({ + title: freshData.title || '', + justification: freshData.justification || '', + revisedBudget: freshData.revisedBudget ?? 0, + status: freshData.status ?? ApprovalStatus.Pending, + }); + setIsEditChangeModalOpen(true); + } catch { + setEditingChange(cr); + editChangeForm.reset({ + title: cr.title || '', + justification: cr.justification || '', + revisedBudget: cr.revisedBudget ?? 0, + status: cr.status ?? ApprovalStatus.Pending, + }); + setIsEditChangeModalOpen(true); + } + }; + const openResolveChange = (cr: ChangeRequest, statusToApply: ApprovalStatus) => { setResolvingChange(cr); resolveChangeForm.reset({ @@ -619,16 +789,7 @@ export const ChangeManagementPage: React.FC = () => { Resolve - - - )} +
+ + {cr.status === ApprovalStatus.Approved ? ( + + Resolved & Enacted + + ) : ( + <> + + + + )} +
)) @@ -823,15 +993,15 @@ export const ChangeManagementPage: React.FC = () => { )} - {/* Modal: Create/Edit Issue */} + {/* Modal: Log Project Issue */} setIsIssueModalOpen(false)} - title={editingIssue ? 'Edit Project Issue' : 'Log Project Issue'} + title="Log Project Issue" size="md" >
(editingIssue ? updateIssueMutation.mutate(d) : createIssueMutation.mutate(d)))} + onSubmit={issueForm.handleSubmit((d) => createIssueMutation.mutate(d))} className="space-y-4" >
@@ -841,6 +1011,9 @@ export const ChangeManagementPage: React.FC = () => { className="w-full bg-slate-900 border border-slate-800 rounded-xl px-3 py-2 text-xs text-white focus:outline-none focus:border-amber-500" placeholder="e.g. Procurement delays for regional solar supplies" /> + {issueForm.formState.errors.title && ( +

{issueForm.formState.errors.title.message}

+ )}
@@ -851,6 +1024,9 @@ export const ChangeManagementPage: React.FC = () => { className="w-full bg-slate-900 border border-slate-800 rounded-xl px-3 py-2 text-xs text-white focus:outline-none focus:border-amber-500" placeholder="Detail root cause and operational impact..." /> + {issueForm.formState.errors.description && ( +

{issueForm.formState.errors.description.message}

+ )}
@@ -880,6 +1056,9 @@ export const ChangeManagementPage: React.FC = () => { ))} + {issueForm.formState.errors.assignedTo && ( +

{issueForm.formState.errors.assignedTo.message}

+ )}
@@ -893,10 +1072,185 @@ export const ChangeManagementPage: React.FC = () => { + +
+ + + {/* Modal: Edit Project Issue */} + { + setIsEditIssueModalOpen(false); + setEditingIssue(null); + }} + title={`Edit Project Issue: ${editingIssue?.title || ''}`} + size="lg" + > +
updateIssueMutation.mutate(d))} + className="space-y-4" + > +
+ + + {editIssueForm.formState.errors.title && ( +

{editIssueForm.formState.errors.title.message}

+ )} +
+ +
+ +