From 7c524cda620dae48165fe22634eb41d10accda97 Mon Sep 17 00:00:00 2001 From: lizerk Date: Mon, 13 Apr 2026 16:38:39 +0300 Subject: [PATCH] refactor(frontend): simplify procurement approval rows --- frontend/src/app/procurement/page.tsx | 2 + .../ProcurementRequestDetailContent.tsx | 53 ++++++++++++++----- 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/frontend/src/app/procurement/page.tsx b/frontend/src/app/procurement/page.tsx index ee4fad88..22836d3c 100644 --- a/frontend/src/app/procurement/page.tsx +++ b/frontend/src/app/procurement/page.tsx @@ -869,6 +869,7 @@ export default function ProcurementPage() { {expanded ? ( .join("") || "?"; export function ProcurementRequestDetailContent({ + currentUserId, request, displayUserName, footer, @@ -106,21 +109,42 @@ export function ProcurementRequestDetailContent({

Согласования

- {request.approvals.map((approval) => ( -
+ {request.approvals.map((approval) => { + const approver = + typeof approval.approver === "object" && approval.approver + ? approval.approver + : null; + const approverName = displayUserName(approval.approver, approval.approver_name); + const approverLink = approver ? userProfileLink(approver, currentUserId) : ""; + + return ( +
{approvalIconByStatus(approval.status)} - - - - {displayUserName(approval.approver, approval.approver_name)} + {approverLink ? ( + + + {approverName} + + ) : ( + + + {approverName} - + )} ({approval.step_label || `Этап ${approval.priority}`}) @@ -131,7 +155,8 @@ export function ProcurementRequestDetailContent({

) : null}
- ))} + ); + })}
) : null}