From 3d734a08cbe4ba1edfde8cadc6cc9419017a725d Mon Sep 17 00:00:00 2001
From: Bryan Frimin <bryan@getprobo.com>
Date: Sun, 29 Jun 2025 22:30:52 +0200
Subject: [PATCH] Show last assement date

Signed-off-by: Bryan Frimin <bryan@getprobo.com>
---
 .../pages/organizations/vendors/VendorsPage.tsx   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/console/src/pages/organizations/vendors/VendorsPage.tsx b/apps/console/src/pages/organizations/vendors/VendorsPage.tsx
index 61bd2de8f..e545a212a 100644
--- a/apps/console/src/pages/organizations/vendors/VendorsPage.tsx
+++ b/apps/console/src/pages/organizations/vendors/VendorsPage.tsx
@@ -80,7 +80,7 @@ export default function VendorsPage(props: Props) {
             <Th>{__("Accessed At")}</Th>
             <Th>{__("Data Risk")}</Th>
             <Th>{__("Business Risk")}</Th>
-            <Th>{__("Compliance status")}</Th>
+            <Th>{__("Assessment Date")}</Th>
             <Th></Th>
           </Tr>
         </Thead>
@@ -110,9 +110,7 @@ function VendorRow({
 }) {
   const { __, dateFormat } = useTranslate();
   const latestAssessment = vendor.riskAssessments?.edges[0]?.node;
-  const isExpired = latestAssessment
-    ? new Date(latestAssessment.expiresAt) < new Date()
-    : false;
+  const assessmentDate = latestAssessment?.assessedAt || null;
 
   const deleteVendor = useDeleteVendor(vendor, connectionId);
 
@@ -141,8 +139,13 @@ function VendorRow({
           <RiskBadge level={latestAssessment?.businessImpact ?? "NONE"} />
         </Td>
         <Td>
-          <Badge variant={isExpired ? "danger" : "warning"}>
-            {isExpired ? __("Late") : __("In progress")}
+          <Badge variant={assessmentDate ? "success" : "warning"}>
+            {assessmentDate
+              ? dateFormat(assessmentDate, {
+                  day: "2-digit",
+                  month: "short",
+                })
+              : __("Not assessed")}
           </Badge>
         </Td>
         <Td noLink width={50} className="text-end">