From 4b1254d2fb22e04a5e4e69af0ca765cda79a7063 Mon Sep 17 00:00:00 2001
From: Kevin Koech <kevin@kevinkoech.com>
Date: Wed, 19 Nov 2025 13:08:22 +0300
Subject: [PATCH 1/5] refactor: Update layout and styling in ReportCard and
 ReportFilters components; enhance report type filtering logic

---
 .../components/PageOverview/PageOverview.js   |  4 ++++
 .../src/components/ReportCard/ReportCard.js   | 13 +++++++---
 .../components/ReportCard/ReportCard.snap.js  | 24 +++++++++----------
 .../components/ReportFilters/ReportFilters.js |  2 +-
 .../ReportFilters/ReportFilters.snap.js       |  2 +-
 .../src/components/ReportsList/ReportsList.js |  2 +-
 .../src/pages/api/v1/reports/index.page.js    |  2 +-
 7 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/apps/trustlab/src/components/PageOverview/PageOverview.js b/apps/trustlab/src/components/PageOverview/PageOverview.js
index f012ac40f..568e86afd 100644
--- a/apps/trustlab/src/components/PageOverview/PageOverview.js
+++ b/apps/trustlab/src/components/PageOverview/PageOverview.js
@@ -136,6 +136,9 @@ const PostImageOverview = forwardRef(function PostImageOverview(
               ImageProps={{
                 alt,
                 src: url,
+                sx: {
+                  objectPosition: { xs: "left top", sm: "center top" },
+                },
               }}
               sx={{
                 height: { xs: "260px", sm: "300px", md: "366px" },
@@ -144,6 +147,7 @@ const PostImageOverview = forwardRef(function PostImageOverview(
                 width: { xs: "220px", sm: "100%" },
                 maxWidth: { sm: "280px", md: "360px" },
                 mx: { xs: 0, sm: "auto" },
+
                 "& span img": {
                   objectPosition: { xs: "left top", sm: "center top" },
                 },
diff --git a/apps/trustlab/src/components/ReportCard/ReportCard.js b/apps/trustlab/src/components/ReportCard/ReportCard.js
index 8fa8eb9c6..af31aae01 100644
--- a/apps/trustlab/src/components/ReportCard/ReportCard.js
+++ b/apps/trustlab/src/components/ReportCard/ReportCard.js
@@ -61,7 +61,14 @@ const ReportCard = forwardRef(function ReportCard(props, ref) {
           <CardContent
             sx={{ pb: "0px !important", px: image?.src && !condensed ? 0 : 2 }}
           >
-            <Typography variant="h3" gutterBottom>
+            <Typography
+              variant="h3"
+              sx={{
+                whiteSpace: "nowrap",
+                overflow: "hidden",
+                textOverflow: "ellipsis",
+              }}
+            >
               {title}
             </Typography>
 
@@ -70,7 +77,7 @@ const ReportCard = forwardRef(function ReportCard(props, ref) {
               component="div"
               sx={{
                 color: "#828499",
-                my: 2,
+                my: 1.25,
               }}
             >
               {date}
@@ -132,11 +139,11 @@ const ReportCard = forwardRef(function ReportCard(props, ref) {
         <Box
           href={file?.url}
           component={file?.url ? Link : "div"}
-          download={file?.url ? file.url : undefined}
           sx={{
             textDecoration: "none",
             lineHeight: "16px",
             cursor: file?.url ? "pointer" : "default",
+            mt: condensed ? 1 : 0,
           }}
         >
           <Typography
diff --git a/apps/trustlab/src/components/ReportCard/ReportCard.snap.js b/apps/trustlab/src/components/ReportCard/ReportCard.snap.js
index 4aa5fc646..82e408908 100644
--- a/apps/trustlab/src/components/ReportCard/ReportCard.snap.js
+++ b/apps/trustlab/src/components/ReportCard/ReportCard.snap.js
@@ -15,12 +15,12 @@ exports[`<ReportCard /> renders in condensed mode 1`] = `
         class="MuiCardContent-root css-3p3r5n-MuiCardContent-root"
       >
         <h3
-          class="MuiTypography-root MuiTypography-h3 MuiTypography-gutterBottom css-geacmp-MuiTypography-root"
+          class="MuiTypography-root MuiTypography-h3 css-isx17q-MuiTypography-root"
         >
           Test Report
         </h3>
         <div
-          class="MuiTypography-root MuiTypography-caption css-uzvwmk-MuiTypography-root"
+          class="MuiTypography-root MuiTypography-caption css-1i6wbmn-MuiTypography-root"
         />
         <div
           class="MuiBox-root css-w7thh7"
@@ -42,7 +42,7 @@ exports[`<ReportCard /> renders in condensed mode 1`] = `
     class="MuiCardActions-root MuiCardActions-spacing css-11bzvph-MuiCardActions-root"
   >
     <div
-      class="MuiBox-root css-1u1lzaw"
+      class="MuiBox-root css-ropfi3"
     >
       <span
         class="MuiTypography-root MuiTypography-caption css-1p9k16f-MuiTypography-root"
@@ -75,12 +75,12 @@ exports[`<ReportCard /> renders unchanged 1`] = `
         class="MuiCardContent-root css-9bakwa-MuiCardContent-root"
       >
         <h3
-          class="MuiTypography-root MuiTypography-h3 MuiTypography-gutterBottom css-geacmp-MuiTypography-root"
+          class="MuiTypography-root MuiTypography-h3 css-isx17q-MuiTypography-root"
         >
           Test Report
         </h3>
         <div
-          class="MuiTypography-root MuiTypography-caption css-uzvwmk-MuiTypography-root"
+          class="MuiTypography-root MuiTypography-caption css-1i6wbmn-MuiTypography-root"
         />
         <div
           class="MuiBox-root css-bo3k24"
@@ -105,7 +105,7 @@ exports[`<ReportCard /> renders unchanged 1`] = `
     class="MuiCardActions-root MuiCardActions-spacing css-brej4a-MuiCardActions-root"
   >
     <div
-      class="MuiBox-root css-1u1lzaw"
+      class="MuiBox-root css-1rwwe69"
     >
       <span
         class="MuiTypography-root MuiTypography-caption css-1p9k16f-MuiTypography-root"
@@ -132,12 +132,12 @@ exports[`<ReportCard /> renders without image 1`] = `
         class="MuiCardContent-root css-3p3r5n-MuiCardContent-root"
       >
         <h3
-          class="MuiTypography-root MuiTypography-h3 MuiTypography-gutterBottom css-geacmp-MuiTypography-root"
+          class="MuiTypography-root MuiTypography-h3 css-isx17q-MuiTypography-root"
         >
           Test Report
         </h3>
         <div
-          class="MuiTypography-root MuiTypography-caption css-uzvwmk-MuiTypography-root"
+          class="MuiTypography-root MuiTypography-caption css-1i6wbmn-MuiTypography-root"
         />
         <div
           class="MuiBox-root css-bo3k24"
@@ -162,7 +162,7 @@ exports[`<ReportCard /> renders without image 1`] = `
     class="MuiCardActions-root MuiCardActions-spacing css-11bzvph-MuiCardActions-root"
   >
     <div
-      class="MuiBox-root css-1u1lzaw"
+      class="MuiBox-root css-1rwwe69"
     >
       <span
         class="MuiTypography-root MuiTypography-caption css-1p9k16f-MuiTypography-root"
@@ -194,12 +194,12 @@ exports[`<ReportCard /> renders without link 1`] = `
         class="MuiCardContent-root css-9bakwa-MuiCardContent-root"
       >
         <h3
-          class="MuiTypography-root MuiTypography-h3 MuiTypography-gutterBottom css-geacmp-MuiTypography-root"
+          class="MuiTypography-root MuiTypography-h3 css-isx17q-MuiTypography-root"
         >
           Test Report
         </h3>
         <div
-          class="MuiTypography-root MuiTypography-caption css-uzvwmk-MuiTypography-root"
+          class="MuiTypography-root MuiTypography-caption css-1i6wbmn-MuiTypography-root"
         />
         <div
           class="MuiBox-root css-bo3k24"
@@ -224,7 +224,7 @@ exports[`<ReportCard /> renders without link 1`] = `
     class="MuiCardActions-root MuiCardActions-spacing css-brej4a-MuiCardActions-root"
   >
     <div
-      class="MuiBox-root css-1u1lzaw"
+      class="MuiBox-root css-1rwwe69"
     >
       <span
         class="MuiTypography-root MuiTypography-caption css-1p9k16f-MuiTypography-root"
diff --git a/apps/trustlab/src/components/ReportFilters/ReportFilters.js b/apps/trustlab/src/components/ReportFilters/ReportFilters.js
index 79149c3ff..c368a19b0 100644
--- a/apps/trustlab/src/components/ReportFilters/ReportFilters.js
+++ b/apps/trustlab/src/components/ReportFilters/ReportFilters.js
@@ -140,7 +140,7 @@ const ReportFilters = React.forwardRef(function ReportFilters(
     <Box ref={ref} display="flex" flexDirection="column" gap={2} {...rest}>
       {/* Row 1: Filter By Label */}
       {filterByLabel && (
-        <Typography variant="subtitle1" fontWeight={500}>
+        <Typography variant="subtitle1" fontWeight={700}>
           {filterByLabel}
         </Typography>
       )}
diff --git a/apps/trustlab/src/components/ReportFilters/ReportFilters.snap.js b/apps/trustlab/src/components/ReportFilters/ReportFilters.snap.js
index bbd72cfd5..01179db79 100644
--- a/apps/trustlab/src/components/ReportFilters/ReportFilters.snap.js
+++ b/apps/trustlab/src/components/ReportFilters/ReportFilters.snap.js
@@ -6,7 +6,7 @@ exports[`ReportFilters renders unchanged 1`] = `
     class="MuiBox-root css-yd8sa2"
   >
     <h6
-      class="MuiTypography-root MuiTypography-subtitle1 css-fupvoa-MuiTypography-root"
+      class="MuiTypography-root MuiTypography-subtitle1 css-1dte1p5-MuiTypography-root"
     >
       Filter By
     </h6>
diff --git a/apps/trustlab/src/components/ReportsList/ReportsList.js b/apps/trustlab/src/components/ReportsList/ReportsList.js
index 99d9c76c8..c6c6311a8 100644
--- a/apps/trustlab/src/components/ReportsList/ReportsList.js
+++ b/apps/trustlab/src/components/ReportsList/ReportsList.js
@@ -97,7 +97,7 @@ const ReportsList = forwardRef(function ReportsList(props, ref) {
   return (
     <Box>
       {hasFilters ? (
-        <Section sx={{ py: 8, px: { xs: 2.5, md: 0 } }}>
+        <Section sx={{ py: 2.5, px: { xs: 2.5, md: 0 } }}>
           <ReportFilters
             {...other}
             onApply={(filterParams) => handleApplyFilters(filterParams)}
diff --git a/apps/trustlab/src/pages/api/v1/reports/index.page.js b/apps/trustlab/src/pages/api/v1/reports/index.page.js
index 8dd31bc70..a87482aae 100644
--- a/apps/trustlab/src/pages/api/v1/reports/index.page.js
+++ b/apps/trustlab/src/pages/api/v1/reports/index.page.js
@@ -36,7 +36,7 @@ export default async function handler(req, res) {
     // Build filters
     const andConditions = [];
     if (reportsType) {
-      andConditions.push({ reportType: reportsType });
+      andConditions.push({ reportType: { equals: reportsType } });
     }
 
     // Reports (slug) filter

From dd2ecfcca0e7d5917d45c18886b133c0d091af9f Mon Sep 17 00:00:00 2001
From: Kevin Koech <kevin@kevinkoech.com>
Date: Wed, 19 Nov 2025 13:52:24 +0300
Subject: [PATCH 2/5] refactor: Simplify ReportsList component rendering logic
 and update snapshot for consistency

---
 .../src/components/ReportsList/ReportsList.js | 56 ++++++++++---------
 .../ReportsList/ReportsList.snap.js           | 15 +----
 2 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/apps/trustlab/src/components/ReportsList/ReportsList.js b/apps/trustlab/src/components/ReportsList/ReportsList.js
index c6c6311a8..8c8f8c9bf 100644
--- a/apps/trustlab/src/components/ReportsList/ReportsList.js
+++ b/apps/trustlab/src/components/ReportsList/ReportsList.js
@@ -104,35 +104,37 @@ const ReportsList = forwardRef(function ReportsList(props, ref) {
           />
         </Section>
       ) : null}
-      <Box sx={{ background: "#fff" }}>
-        <Section sx={{ py: 8, px: { xs: 2.5, md: 0 } }}>
-          <Grid container spacing={3} ref={ref} {...other}>
-            {reports.map((report, index) => (
-              <Grid key={report.id ?? index} size={{ xs: 12, sm: 4 }}>
-                <ReportCard
-                  condensed={condensed}
-                  actionLabel={cardActionLabel}
-                  {...report}
-                  sx={
-                    condensed && {
-                      background: index % 2 === 0 ? "#E7E9FF" : "#F0F0F5",
+      {reports.length ? (
+        <Box sx={{ background: "#fff" }}>
+          <Section sx={{ py: 8, px: { xs: 2.5, md: 0 } }}>
+            <Grid container spacing={3} ref={ref} {...other}>
+              {reports.map((report, index) => (
+                <Grid key={report.id ?? index} size={{ xs: 12, sm: 4 }}>
+                  <ReportCard
+                    condensed={condensed}
+                    actionLabel={cardActionLabel}
+                    {...report}
+                    sx={
+                      condensed && {
+                        background: index % 2 === 0 ? "#E7E9FF" : "#F0F0F5",
+                      }
                     }
-                  }
+                  />
+                </Grid>
+              ))}
+            </Grid>
+            {hasPagination ? (
+              <Box display="flex" justifyContent="flex-end" mt={4}>
+                <ReportsPagination
+                  page={pagination?.page ?? 1}
+                  count={pagination?.count ?? 1}
+                  onChange={handlePageChange}
                 />
-              </Grid>
-            ))}
-          </Grid>
-          {hasPagination ? (
-            <Box display="flex" justifyContent="flex-end" mt={4}>
-              <ReportsPagination
-                page={pagination?.page ?? 1}
-                count={pagination?.count ?? 1}
-                onChange={handlePageChange}
-              />
-            </Box>
-          ) : null}
-        </Section>
-      </Box>
+              </Box>
+            ) : null}
+          </Section>
+        </Box>
+      ) : null}
     </Box>
   );
 });
diff --git a/apps/trustlab/src/components/ReportsList/ReportsList.snap.js b/apps/trustlab/src/components/ReportsList/ReportsList.snap.js
index 322c81416..4db25ecd2 100644
--- a/apps/trustlab/src/components/ReportsList/ReportsList.snap.js
+++ b/apps/trustlab/src/components/ReportsList/ReportsList.snap.js
@@ -3,18 +3,5 @@
 exports[`<ReportsList /> renders unchanged 1`] = `
 <div
   class="MuiBox-root css-0"
->
-  <div
-    class="MuiBox-root css-c3vlm2"
-  >
-    <div
-      class="MuiContainer-root MuiContainer-maxWidthLg MuiContainer-fixed MuiContainer-disableGutters css-1be4fpk-MuiContainer-root"
-    >
-      <div
-        categories="[object Object],[object Object],[object Object]"
-        class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-3 css-ipzchf-MuiGrid2-root"
-      />
-    </div>
-  </div>
-</div>
+/>
 `;

From a0fe31327875baeb7dae08a30087f57d0b4d0dfc Mon Sep 17 00:00:00 2001
From: Kevin Koech <kevin@kevinkoech.com>
Date: Wed, 19 Nov 2025 14:44:14 +0300
Subject: [PATCH 3/5] refactor: Add grayscale effect on images in ReportCard
 and ResearchCategoryCard components; update snapshots for consistency

---
 apps/trustlab/src/components/ReportCard/ReportCard.js |  8 +++++++-
 .../src/components/ReportCard/ReportCard.snap.js      |  8 ++++----
 .../ResearchCategoryCard/ResearchCategoryCard.js      | 11 ++++++++++-
 .../ResearchCategoryCard/ResearchCategoryCard.snap.js |  6 +++---
 .../ResearchCategoryList/ResearchCategoryList.snap.js |  6 +++---
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/apps/trustlab/src/components/ReportCard/ReportCard.js b/apps/trustlab/src/components/ReportCard/ReportCard.js
index af31aae01..e5bb5fa22 100644
--- a/apps/trustlab/src/components/ReportCard/ReportCard.js
+++ b/apps/trustlab/src/components/ReportCard/ReportCard.js
@@ -7,7 +7,7 @@ import {
   CardMedia,
   Divider,
   Typography,
-  CardActions, // added
+  CardActions,
 } from "@mui/material";
 import { forwardRef } from "react";
 
@@ -30,6 +30,12 @@ const ReportCard = forwardRef(function ReportCard(props, ref) {
       sx={[
         {
           borderRadius: "5px",
+          img: {
+            filter: "grayscale(100%)",
+          },
+          "&:hover img": {
+            filter: "grayscale(0%)",
+          },
         },
         ...(Array.isArray(sx) ? sx : [sx]),
       ]}
diff --git a/apps/trustlab/src/components/ReportCard/ReportCard.snap.js b/apps/trustlab/src/components/ReportCard/ReportCard.snap.js
index 82e408908..c3e9f714a 100644
--- a/apps/trustlab/src/components/ReportCard/ReportCard.snap.js
+++ b/apps/trustlab/src/components/ReportCard/ReportCard.snap.js
@@ -2,7 +2,7 @@
 
 exports[`<ReportCard /> renders in condensed mode 1`] = `
 <div
-  class="MuiBox-root css-nx089"
+  class="MuiBox-root css-ztm1u"
 >
   <div
     class="MuiBox-root css-15ooa9"
@@ -56,7 +56,7 @@ exports[`<ReportCard /> renders in condensed mode 1`] = `
 
 exports[`<ReportCard /> renders unchanged 1`] = `
 <div
-  class="MuiBox-root css-nx089"
+  class="MuiBox-root css-ztm1u"
 >
   <a
     class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiBox-root css-1fhreme-MuiTypography-root-MuiLink-root"
@@ -119,7 +119,7 @@ exports[`<ReportCard /> renders unchanged 1`] = `
 
 exports[`<ReportCard /> renders without image 1`] = `
 <div
-  class="MuiBox-root css-nx089"
+  class="MuiBox-root css-ztm1u"
 >
   <div
     class="MuiBox-root css-15ooa9"
@@ -176,7 +176,7 @@ exports[`<ReportCard /> renders without image 1`] = `
 
 exports[`<ReportCard /> renders without link 1`] = `
 <div
-  class="MuiBox-root css-nx089"
+  class="MuiBox-root css-ztm1u"
 >
   <div
     class="MuiBox-root css-15ooa9"
diff --git a/apps/trustlab/src/components/ResearchCategoryCard/ResearchCategoryCard.js b/apps/trustlab/src/components/ResearchCategoryCard/ResearchCategoryCard.js
index 777158d5e..9ca00a445 100644
--- a/apps/trustlab/src/components/ResearchCategoryCard/ResearchCategoryCard.js
+++ b/apps/trustlab/src/components/ResearchCategoryCard/ResearchCategoryCard.js
@@ -20,7 +20,16 @@ const ResearchCategoryCard = forwardRef(
         ref={ref}
         elevation={0}
         href={link?.href}
-        sx={{ textDecoration: "none", backgroundColor: "transparent" }}
+        sx={{
+          textDecoration: "none",
+          backgroundColor: "transparent",
+          img: {
+            filter: "grayscale(100%)",
+          },
+          "&:hover img": {
+            filter: "grayscale(0%)",
+          },
+        }}
         {...other}
       >
         {image?.src && (
diff --git a/apps/trustlab/src/components/ResearchCategoryCard/ResearchCategoryCard.snap.js b/apps/trustlab/src/components/ResearchCategoryCard/ResearchCategoryCard.snap.js
index 8ec9d316a..eee927e27 100644
--- a/apps/trustlab/src/components/ResearchCategoryCard/ResearchCategoryCard.snap.js
+++ b/apps/trustlab/src/components/ResearchCategoryCard/ResearchCategoryCard.snap.js
@@ -2,7 +2,7 @@
 
 exports[`<ResearchCategoryCard /> renders unchanged 1`] = `
 <a
-  class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-10ccbxm-MuiTypography-root-MuiLink-root-MuiPaper-root-MuiCard-root"
+  class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-neeamg-MuiTypography-root-MuiLink-root-MuiPaper-root-MuiCard-root"
   href="/test-link"
   style="--Paper-shadow: none;"
 >
@@ -49,7 +49,7 @@ exports[`<ResearchCategoryCard /> renders unchanged 1`] = `
 
 exports[`<ResearchCategoryCard /> renders without image 1`] = `
 <div
-  class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-ezhwr5-MuiPaper-root-MuiCard-root"
+  class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-167r1gz-MuiPaper-root-MuiCard-root"
   style="--Paper-shadow: none;"
 >
   <div
@@ -79,7 +79,7 @@ exports[`<ResearchCategoryCard /> renders without image 1`] = `
 
 exports[`<ResearchCategoryCard /> renders without link 1`] = `
 <div
-  class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-ezhwr5-MuiPaper-root-MuiCard-root"
+  class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-167r1gz-MuiPaper-root-MuiCard-root"
   style="--Paper-shadow: none;"
 >
   <img
diff --git a/apps/trustlab/src/components/ResearchCategoryList/ResearchCategoryList.snap.js b/apps/trustlab/src/components/ResearchCategoryList/ResearchCategoryList.snap.js
index 2d5c1c719..8829e0d10 100644
--- a/apps/trustlab/src/components/ResearchCategoryList/ResearchCategoryList.snap.js
+++ b/apps/trustlab/src/components/ResearchCategoryList/ResearchCategoryList.snap.js
@@ -11,7 +11,7 @@ exports[`<ResearchCategoryList /> renders unchanged 1`] = `
       class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-12 MuiGrid2-grid-sm-4 css-8o12w-MuiGrid2-root"
     >
       <a
-        class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-10ccbxm-MuiTypography-root-MuiLink-root-MuiPaper-root-MuiCard-root"
+        class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-neeamg-MuiTypography-root-MuiLink-root-MuiPaper-root-MuiCard-root"
         href="/category-1"
         id="1"
         style="--Paper-shadow: none;"
@@ -60,7 +60,7 @@ exports[`<ResearchCategoryList /> renders unchanged 1`] = `
       class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-12 MuiGrid2-grid-sm-4 css-8o12w-MuiGrid2-root"
     >
       <a
-        class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-10ccbxm-MuiTypography-root-MuiLink-root-MuiPaper-root-MuiCard-root"
+        class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-neeamg-MuiTypography-root-MuiLink-root-MuiPaper-root-MuiCard-root"
         href="/category-2"
         id="2"
         style="--Paper-shadow: none;"
@@ -109,7 +109,7 @@ exports[`<ResearchCategoryList /> renders unchanged 1`] = `
       class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-12 MuiGrid2-grid-sm-4 css-8o12w-MuiGrid2-root"
     >
       <a
-        class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-10ccbxm-MuiTypography-root-MuiLink-root-MuiPaper-root-MuiCard-root"
+        class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiCard-root css-neeamg-MuiTypography-root-MuiLink-root-MuiPaper-root-MuiCard-root"
         href="/category-3"
         id="3"
         style="--Paper-shadow: none;"

From a13f7d343909b0956a92edc9e22922ecf51b6e13 Mon Sep 17 00:00:00 2001
From: Kevin Koech <kevin@kevinkoech.com>
Date: Thu, 20 Nov 2025 11:00:53 +0300
Subject: [PATCH 4/5] Remove unused research category logic and simplify report
 link generation in blockify and reports utility

---
 .../src/app/(payload)/admin/importMap.js      | 162 +++++++-----------
 apps/trustlab/src/lib/data/blockify/index.js  |   2 -
 .../lib/data/blockify/researchCategories.js   |  31 ----
 .../src/payload/blocks/ResearchCategory.js    |  15 --
 apps/trustlab/src/utils/reports.js            |   6 -
 5 files changed, 65 insertions(+), 151 deletions(-)
 delete mode 100644 apps/trustlab/src/lib/data/blockify/researchCategories.js

diff --git a/apps/trustlab/src/app/(payload)/admin/importMap.js b/apps/trustlab/src/app/(payload)/admin/importMap.js
index bd6babeed..62de021e1 100644
--- a/apps/trustlab/src/app/(payload)/admin/importMap.js
+++ b/apps/trustlab/src/app/(payload)/admin/importMap.js
@@ -1,99 +1,67 @@
-import { RscEntryLexicalCell as RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e } from "@payloadcms/richtext-lexical/rsc";
-import { RscEntryLexicalField as RscEntryLexicalField_44fe37237e0ebf4470c9990d8cb7b07e } from "@payloadcms/richtext-lexical/rsc";
-import { LexicalDiffComponent as LexicalDiffComponent_44fe37237e0ebf4470c9990d8cb7b07e } from "@payloadcms/richtext-lexical/rsc";
-import { InlineToolbarFeatureClient as InlineToolbarFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { HorizontalRuleFeatureClient as HorizontalRuleFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { UploadFeatureClient as UploadFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { BlockquoteFeatureClient as BlockquoteFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { RelationshipFeatureClient as RelationshipFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { LinkFeatureClient as LinkFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { ChecklistFeatureClient as ChecklistFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { OrderedListFeatureClient as OrderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { UnorderedListFeatureClient as UnorderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { IndentFeatureClient as IndentFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { AlignFeatureClient as AlignFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { HeadingFeatureClient as HeadingFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { ParagraphFeatureClient as ParagraphFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { InlineCodeFeatureClient as InlineCodeFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { SuperscriptFeatureClient as SuperscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { SubscriptFeatureClient as SubscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { StrikethroughFeatureClient as StrikethroughFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { UnderlineFeatureClient as UnderlineFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { BoldFeatureClient as BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { ItalicFeatureClient as ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
-import { ColourTextComponent as ColourTextComponent_5eca6d89486e7fecc5e5204e28af0de5 } from "@nouance/payload-better-fields-plugin/ColourText/client";
-import { OverviewComponent as OverviewComponent_a8a977ebc872c5d5ea7ee689724c0860 } from "@payloadcms/plugin-seo/client";
-import { MetaTitleComponent as MetaTitleComponent_a8a977ebc872c5d5ea7ee689724c0860 } from "@payloadcms/plugin-seo/client";
-import { MetaDescriptionComponent as MetaDescriptionComponent_a8a977ebc872c5d5ea7ee689724c0860 } from "@payloadcms/plugin-seo/client";
-import { MetaImageComponent as MetaImageComponent_a8a977ebc872c5d5ea7ee689724c0860 } from "@payloadcms/plugin-seo/client";
-import { PreviewComponent as PreviewComponent_a8a977ebc872c5d5ea7ee689724c0860 } from "@payloadcms/plugin-seo/client";
-import { default as default_f5238f1b70ea6cf94e5a15e7dfec6dac } from "@/trustlab/payload/components/RowLabel";
-import { S3ClientUploadHandler as S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24 } from "@payloadcms/storage-s3/client";
-import { AdminErrorBoundary as AdminErrorBoundary_e5a9e14bdbe97e70ba60697217fe7688 } from "@payloadcms/plugin-sentry/client";
+import { RscEntryLexicalCell as RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e } from '@payloadcms/richtext-lexical/rsc'
+import { RscEntryLexicalField as RscEntryLexicalField_44fe37237e0ebf4470c9990d8cb7b07e } from '@payloadcms/richtext-lexical/rsc'
+import { LexicalDiffComponent as LexicalDiffComponent_44fe37237e0ebf4470c9990d8cb7b07e } from '@payloadcms/richtext-lexical/rsc'
+import { InlineToolbarFeatureClient as InlineToolbarFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { HorizontalRuleFeatureClient as HorizontalRuleFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { UploadFeatureClient as UploadFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { BlockquoteFeatureClient as BlockquoteFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { RelationshipFeatureClient as RelationshipFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { LinkFeatureClient as LinkFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { ChecklistFeatureClient as ChecklistFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { OrderedListFeatureClient as OrderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { UnorderedListFeatureClient as UnorderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { IndentFeatureClient as IndentFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { AlignFeatureClient as AlignFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { HeadingFeatureClient as HeadingFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { ParagraphFeatureClient as ParagraphFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { InlineCodeFeatureClient as InlineCodeFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { SuperscriptFeatureClient as SuperscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { SubscriptFeatureClient as SubscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { StrikethroughFeatureClient as StrikethroughFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { UnderlineFeatureClient as UnderlineFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { BoldFeatureClient as BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { ItalicFeatureClient as ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
+import { ColourTextComponent as ColourTextComponent_5eca6d89486e7fecc5e5204e28af0de5 } from '@nouance/payload-better-fields-plugin/ColourText/client'
+import { OverviewComponent as OverviewComponent_a8a977ebc872c5d5ea7ee689724c0860 } from '@payloadcms/plugin-seo/client'
+import { MetaTitleComponent as MetaTitleComponent_a8a977ebc872c5d5ea7ee689724c0860 } from '@payloadcms/plugin-seo/client'
+import { MetaDescriptionComponent as MetaDescriptionComponent_a8a977ebc872c5d5ea7ee689724c0860 } from '@payloadcms/plugin-seo/client'
+import { MetaImageComponent as MetaImageComponent_a8a977ebc872c5d5ea7ee689724c0860 } from '@payloadcms/plugin-seo/client'
+import { PreviewComponent as PreviewComponent_a8a977ebc872c5d5ea7ee689724c0860 } from '@payloadcms/plugin-seo/client'
+import { default as default_f5238f1b70ea6cf94e5a15e7dfec6dac } from '@/trustlab/payload/components/RowLabel'
+import { S3ClientUploadHandler as S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24 } from '@payloadcms/storage-s3/client'
+import { AdminErrorBoundary as AdminErrorBoundary_e5a9e14bdbe97e70ba60697217fe7688 } from '@payloadcms/plugin-sentry/client'
 
 export const importMap = {
-  "@payloadcms/richtext-lexical/rsc#RscEntryLexicalCell":
-    RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e,
-  "@payloadcms/richtext-lexical/rsc#RscEntryLexicalField":
-    RscEntryLexicalField_44fe37237e0ebf4470c9990d8cb7b07e,
-  "@payloadcms/richtext-lexical/rsc#LexicalDiffComponent":
-    LexicalDiffComponent_44fe37237e0ebf4470c9990d8cb7b07e,
-  "@payloadcms/richtext-lexical/client#InlineToolbarFeatureClient":
-    InlineToolbarFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#HorizontalRuleFeatureClient":
-    HorizontalRuleFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#UploadFeatureClient":
-    UploadFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#BlockquoteFeatureClient":
-    BlockquoteFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#RelationshipFeatureClient":
-    RelationshipFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#LinkFeatureClient":
-    LinkFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#ChecklistFeatureClient":
-    ChecklistFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#OrderedListFeatureClient":
-    OrderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#UnorderedListFeatureClient":
-    UnorderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#IndentFeatureClient":
-    IndentFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#AlignFeatureClient":
-    AlignFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#HeadingFeatureClient":
-    HeadingFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#ParagraphFeatureClient":
-    ParagraphFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#InlineCodeFeatureClient":
-    InlineCodeFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#SuperscriptFeatureClient":
-    SuperscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#SubscriptFeatureClient":
-    SubscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#StrikethroughFeatureClient":
-    StrikethroughFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#UnderlineFeatureClient":
-    UnderlineFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#BoldFeatureClient":
-    BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#ItalicFeatureClient":
-    ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@nouance/payload-better-fields-plugin/ColourText/client#ColourTextComponent":
-    ColourTextComponent_5eca6d89486e7fecc5e5204e28af0de5,
-  "@payloadcms/plugin-seo/client#OverviewComponent":
-    OverviewComponent_a8a977ebc872c5d5ea7ee689724c0860,
-  "@payloadcms/plugin-seo/client#MetaTitleComponent":
-    MetaTitleComponent_a8a977ebc872c5d5ea7ee689724c0860,
-  "@payloadcms/plugin-seo/client#MetaDescriptionComponent":
-    MetaDescriptionComponent_a8a977ebc872c5d5ea7ee689724c0860,
-  "@payloadcms/plugin-seo/client#MetaImageComponent":
-    MetaImageComponent_a8a977ebc872c5d5ea7ee689724c0860,
-  "@payloadcms/plugin-seo/client#PreviewComponent":
-    PreviewComponent_a8a977ebc872c5d5ea7ee689724c0860,
-  "@/trustlab/payload/components/RowLabel#default":
-    default_f5238f1b70ea6cf94e5a15e7dfec6dac,
-  "@payloadcms/storage-s3/client#S3ClientUploadHandler":
-    S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24,
-  "@payloadcms/plugin-sentry/client#AdminErrorBoundary":
-    AdminErrorBoundary_e5a9e14bdbe97e70ba60697217fe7688,
-};
+  "@payloadcms/richtext-lexical/rsc#RscEntryLexicalCell": RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e,
+  "@payloadcms/richtext-lexical/rsc#RscEntryLexicalField": RscEntryLexicalField_44fe37237e0ebf4470c9990d8cb7b07e,
+  "@payloadcms/richtext-lexical/rsc#LexicalDiffComponent": LexicalDiffComponent_44fe37237e0ebf4470c9990d8cb7b07e,
+  "@payloadcms/richtext-lexical/client#InlineToolbarFeatureClient": InlineToolbarFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#HorizontalRuleFeatureClient": HorizontalRuleFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#UploadFeatureClient": UploadFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#BlockquoteFeatureClient": BlockquoteFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#RelationshipFeatureClient": RelationshipFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#LinkFeatureClient": LinkFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#ChecklistFeatureClient": ChecklistFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#OrderedListFeatureClient": OrderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#UnorderedListFeatureClient": UnorderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#IndentFeatureClient": IndentFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#AlignFeatureClient": AlignFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#HeadingFeatureClient": HeadingFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#ParagraphFeatureClient": ParagraphFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#InlineCodeFeatureClient": InlineCodeFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#SuperscriptFeatureClient": SuperscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#SubscriptFeatureClient": SubscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#StrikethroughFeatureClient": StrikethroughFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#UnderlineFeatureClient": UnderlineFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#BoldFeatureClient": BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#ItalicFeatureClient": ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@nouance/payload-better-fields-plugin/ColourText/client#ColourTextComponent": ColourTextComponent_5eca6d89486e7fecc5e5204e28af0de5,
+  "@payloadcms/plugin-seo/client#OverviewComponent": OverviewComponent_a8a977ebc872c5d5ea7ee689724c0860,
+  "@payloadcms/plugin-seo/client#MetaTitleComponent": MetaTitleComponent_a8a977ebc872c5d5ea7ee689724c0860,
+  "@payloadcms/plugin-seo/client#MetaDescriptionComponent": MetaDescriptionComponent_a8a977ebc872c5d5ea7ee689724c0860,
+  "@payloadcms/plugin-seo/client#MetaImageComponent": MetaImageComponent_a8a977ebc872c5d5ea7ee689724c0860,
+  "@payloadcms/plugin-seo/client#PreviewComponent": PreviewComponent_a8a977ebc872c5d5ea7ee689724c0860,
+  "@/trustlab/payload/components/RowLabel#default": default_f5238f1b70ea6cf94e5a15e7dfec6dac,
+  "@payloadcms/storage-s3/client#S3ClientUploadHandler": S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24,
+  "@payloadcms/plugin-sentry/client#AdminErrorBoundary": AdminErrorBoundary_e5a9e14bdbe97e70ba60697217fe7688
+}
diff --git a/apps/trustlab/src/lib/data/blockify/index.js b/apps/trustlab/src/lib/data/blockify/index.js
index 9c34196b4..c41426fda 100644
--- a/apps/trustlab/src/lib/data/blockify/index.js
+++ b/apps/trustlab/src/lib/data/blockify/index.js
@@ -1,7 +1,6 @@
 import collectionOverview from "./collectionOverview";
 import postList from "./postList";
 import reportsList from "./reportsList";
-import researchCategoryList from "./researchCategories";
 import spotlightOverview from "./spotlightOverview";
 
 const propsifyBlockBySlug = {
@@ -9,7 +8,6 @@ const propsifyBlockBySlug = {
   "resources-overview-list": collectionOverview,
   "post-list": postList,
   spotlight: spotlightOverview,
-  "research-category": researchCategoryList,
   "reports-list": reportsList,
 };
 
diff --git a/apps/trustlab/src/lib/data/blockify/researchCategories.js b/apps/trustlab/src/lib/data/blockify/researchCategories.js
deleted file mode 100644
index 18bdcfba9..000000000
--- a/apps/trustlab/src/lib/data/blockify/researchCategories.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { formatPagePath } from "@commons-ui/payload";
-
-async function researchCategoryList(block, _, context) {
-  const {
-    blockType: slug,
-    categories: originalCategories,
-    readMoreLabel = "Read More",
-  } = block;
-  const categories = originalCategories.map((category) => {
-    if (category.report) {
-      const parentPage = context?.params?.slugs?.[0] || "research";
-      const link = formatPagePath(parentPage, category.report);
-      return {
-        ...category,
-        link: {
-          href: link
-            ? `${link}/${category.report.slug}`
-            : `/${category.report.slug}`,
-          label: readMoreLabel,
-        },
-      };
-    }
-    return category;
-  });
-  return {
-    ...block,
-    slug,
-    categories,
-  };
-}
-export default researchCategoryList;
diff --git a/apps/trustlab/src/payload/blocks/ResearchCategory.js b/apps/trustlab/src/payload/blocks/ResearchCategory.js
index c6194b586..860fab0be 100644
--- a/apps/trustlab/src/payload/blocks/ResearchCategory.js
+++ b/apps/trustlab/src/payload/blocks/ResearchCategory.js
@@ -35,23 +35,8 @@ const ResearchCategory = {
         linkGroup({
           overrides: {
             name: "link",
-            admin: {
-              condition: (_, siblingData) =>
-                siblingData?.reportType !== "baseline",
-            },
           },
         }),
-        {
-          name: "report",
-          type: "relationship",
-          relationTo: "reports",
-          admin: {
-            condition: (_, siblingData) =>
-              siblingData?.reportType === "baseline",
-            description:
-              "Select the baseline report (only when Baseline is chosen)",
-          },
-        },
       ],
     },
     {
diff --git a/apps/trustlab/src/utils/reports.js b/apps/trustlab/src/utils/reports.js
index c576af610..1493ccebb 100644
--- a/apps/trustlab/src/utils/reports.js
+++ b/apps/trustlab/src/utils/reports.js
@@ -1,18 +1,12 @@
-import { formatPagePath } from "@commons-ui/payload";
-
 export async function getReports(api, options) {
   const { docs, totalPages, page } = await api.getCollection("reports", {
     ...options,
   });
 
   const reports = docs.map((doc) => {
-    const link = formatPagePath("research", doc);
     return {
       ...doc,
       date: new Date(doc.date).toISOString().split("T")[0],
-      link: {
-        href: link ? `${link}/${doc.slug}` : `/${doc.slug}`,
-      },
     };
   });
   return {

From 60b245bc1cf2d6aefc8aca5f229e1a01658384ee Mon Sep 17 00:00:00 2001
From: Kevin Koech <kevin@kevinkoech.com>
Date: Thu, 20 Nov 2025 11:17:26 +0300
Subject: [PATCH 5/5] refactor: Update import statements for consistency and
 improve formatting in importMap.js

---
 .../src/app/(payload)/admin/importMap.js      | 162 +++++++++++-------
 1 file changed, 97 insertions(+), 65 deletions(-)

diff --git a/apps/trustlab/src/app/(payload)/admin/importMap.js b/apps/trustlab/src/app/(payload)/admin/importMap.js
index 62de021e1..bd6babeed 100644
--- a/apps/trustlab/src/app/(payload)/admin/importMap.js
+++ b/apps/trustlab/src/app/(payload)/admin/importMap.js
@@ -1,67 +1,99 @@
-import { RscEntryLexicalCell as RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e } from '@payloadcms/richtext-lexical/rsc'
-import { RscEntryLexicalField as RscEntryLexicalField_44fe37237e0ebf4470c9990d8cb7b07e } from '@payloadcms/richtext-lexical/rsc'
-import { LexicalDiffComponent as LexicalDiffComponent_44fe37237e0ebf4470c9990d8cb7b07e } from '@payloadcms/richtext-lexical/rsc'
-import { InlineToolbarFeatureClient as InlineToolbarFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { HorizontalRuleFeatureClient as HorizontalRuleFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { UploadFeatureClient as UploadFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { BlockquoteFeatureClient as BlockquoteFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { RelationshipFeatureClient as RelationshipFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { LinkFeatureClient as LinkFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { ChecklistFeatureClient as ChecklistFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { OrderedListFeatureClient as OrderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { UnorderedListFeatureClient as UnorderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { IndentFeatureClient as IndentFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { AlignFeatureClient as AlignFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { HeadingFeatureClient as HeadingFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { ParagraphFeatureClient as ParagraphFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { InlineCodeFeatureClient as InlineCodeFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { SuperscriptFeatureClient as SuperscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { SubscriptFeatureClient as SubscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { StrikethroughFeatureClient as StrikethroughFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { UnderlineFeatureClient as UnderlineFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { BoldFeatureClient as BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { ItalicFeatureClient as ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
-import { ColourTextComponent as ColourTextComponent_5eca6d89486e7fecc5e5204e28af0de5 } from '@nouance/payload-better-fields-plugin/ColourText/client'
-import { OverviewComponent as OverviewComponent_a8a977ebc872c5d5ea7ee689724c0860 } from '@payloadcms/plugin-seo/client'
-import { MetaTitleComponent as MetaTitleComponent_a8a977ebc872c5d5ea7ee689724c0860 } from '@payloadcms/plugin-seo/client'
-import { MetaDescriptionComponent as MetaDescriptionComponent_a8a977ebc872c5d5ea7ee689724c0860 } from '@payloadcms/plugin-seo/client'
-import { MetaImageComponent as MetaImageComponent_a8a977ebc872c5d5ea7ee689724c0860 } from '@payloadcms/plugin-seo/client'
-import { PreviewComponent as PreviewComponent_a8a977ebc872c5d5ea7ee689724c0860 } from '@payloadcms/plugin-seo/client'
-import { default as default_f5238f1b70ea6cf94e5a15e7dfec6dac } from '@/trustlab/payload/components/RowLabel'
-import { S3ClientUploadHandler as S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24 } from '@payloadcms/storage-s3/client'
-import { AdminErrorBoundary as AdminErrorBoundary_e5a9e14bdbe97e70ba60697217fe7688 } from '@payloadcms/plugin-sentry/client'
+import { RscEntryLexicalCell as RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e } from "@payloadcms/richtext-lexical/rsc";
+import { RscEntryLexicalField as RscEntryLexicalField_44fe37237e0ebf4470c9990d8cb7b07e } from "@payloadcms/richtext-lexical/rsc";
+import { LexicalDiffComponent as LexicalDiffComponent_44fe37237e0ebf4470c9990d8cb7b07e } from "@payloadcms/richtext-lexical/rsc";
+import { InlineToolbarFeatureClient as InlineToolbarFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { HorizontalRuleFeatureClient as HorizontalRuleFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { UploadFeatureClient as UploadFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { BlockquoteFeatureClient as BlockquoteFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { RelationshipFeatureClient as RelationshipFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { LinkFeatureClient as LinkFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { ChecklistFeatureClient as ChecklistFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { OrderedListFeatureClient as OrderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { UnorderedListFeatureClient as UnorderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { IndentFeatureClient as IndentFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { AlignFeatureClient as AlignFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { HeadingFeatureClient as HeadingFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { ParagraphFeatureClient as ParagraphFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { InlineCodeFeatureClient as InlineCodeFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { SuperscriptFeatureClient as SuperscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { SubscriptFeatureClient as SubscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { StrikethroughFeatureClient as StrikethroughFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { UnderlineFeatureClient as UnderlineFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { BoldFeatureClient as BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { ItalicFeatureClient as ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from "@payloadcms/richtext-lexical/client";
+import { ColourTextComponent as ColourTextComponent_5eca6d89486e7fecc5e5204e28af0de5 } from "@nouance/payload-better-fields-plugin/ColourText/client";
+import { OverviewComponent as OverviewComponent_a8a977ebc872c5d5ea7ee689724c0860 } from "@payloadcms/plugin-seo/client";
+import { MetaTitleComponent as MetaTitleComponent_a8a977ebc872c5d5ea7ee689724c0860 } from "@payloadcms/plugin-seo/client";
+import { MetaDescriptionComponent as MetaDescriptionComponent_a8a977ebc872c5d5ea7ee689724c0860 } from "@payloadcms/plugin-seo/client";
+import { MetaImageComponent as MetaImageComponent_a8a977ebc872c5d5ea7ee689724c0860 } from "@payloadcms/plugin-seo/client";
+import { PreviewComponent as PreviewComponent_a8a977ebc872c5d5ea7ee689724c0860 } from "@payloadcms/plugin-seo/client";
+import { default as default_f5238f1b70ea6cf94e5a15e7dfec6dac } from "@/trustlab/payload/components/RowLabel";
+import { S3ClientUploadHandler as S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24 } from "@payloadcms/storage-s3/client";
+import { AdminErrorBoundary as AdminErrorBoundary_e5a9e14bdbe97e70ba60697217fe7688 } from "@payloadcms/plugin-sentry/client";
 
 export const importMap = {
-  "@payloadcms/richtext-lexical/rsc#RscEntryLexicalCell": RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e,
-  "@payloadcms/richtext-lexical/rsc#RscEntryLexicalField": RscEntryLexicalField_44fe37237e0ebf4470c9990d8cb7b07e,
-  "@payloadcms/richtext-lexical/rsc#LexicalDiffComponent": LexicalDiffComponent_44fe37237e0ebf4470c9990d8cb7b07e,
-  "@payloadcms/richtext-lexical/client#InlineToolbarFeatureClient": InlineToolbarFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#HorizontalRuleFeatureClient": HorizontalRuleFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#UploadFeatureClient": UploadFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#BlockquoteFeatureClient": BlockquoteFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#RelationshipFeatureClient": RelationshipFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#LinkFeatureClient": LinkFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#ChecklistFeatureClient": ChecklistFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#OrderedListFeatureClient": OrderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#UnorderedListFeatureClient": UnorderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#IndentFeatureClient": IndentFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#AlignFeatureClient": AlignFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#HeadingFeatureClient": HeadingFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#ParagraphFeatureClient": ParagraphFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#InlineCodeFeatureClient": InlineCodeFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#SuperscriptFeatureClient": SuperscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#SubscriptFeatureClient": SubscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#StrikethroughFeatureClient": StrikethroughFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#UnderlineFeatureClient": UnderlineFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#BoldFeatureClient": BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@payloadcms/richtext-lexical/client#ItalicFeatureClient": ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
-  "@nouance/payload-better-fields-plugin/ColourText/client#ColourTextComponent": ColourTextComponent_5eca6d89486e7fecc5e5204e28af0de5,
-  "@payloadcms/plugin-seo/client#OverviewComponent": OverviewComponent_a8a977ebc872c5d5ea7ee689724c0860,
-  "@payloadcms/plugin-seo/client#MetaTitleComponent": MetaTitleComponent_a8a977ebc872c5d5ea7ee689724c0860,
-  "@payloadcms/plugin-seo/client#MetaDescriptionComponent": MetaDescriptionComponent_a8a977ebc872c5d5ea7ee689724c0860,
-  "@payloadcms/plugin-seo/client#MetaImageComponent": MetaImageComponent_a8a977ebc872c5d5ea7ee689724c0860,
-  "@payloadcms/plugin-seo/client#PreviewComponent": PreviewComponent_a8a977ebc872c5d5ea7ee689724c0860,
-  "@/trustlab/payload/components/RowLabel#default": default_f5238f1b70ea6cf94e5a15e7dfec6dac,
-  "@payloadcms/storage-s3/client#S3ClientUploadHandler": S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24,
-  "@payloadcms/plugin-sentry/client#AdminErrorBoundary": AdminErrorBoundary_e5a9e14bdbe97e70ba60697217fe7688
-}
+  "@payloadcms/richtext-lexical/rsc#RscEntryLexicalCell":
+    RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e,
+  "@payloadcms/richtext-lexical/rsc#RscEntryLexicalField":
+    RscEntryLexicalField_44fe37237e0ebf4470c9990d8cb7b07e,
+  "@payloadcms/richtext-lexical/rsc#LexicalDiffComponent":
+    LexicalDiffComponent_44fe37237e0ebf4470c9990d8cb7b07e,
+  "@payloadcms/richtext-lexical/client#InlineToolbarFeatureClient":
+    InlineToolbarFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#HorizontalRuleFeatureClient":
+    HorizontalRuleFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#UploadFeatureClient":
+    UploadFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#BlockquoteFeatureClient":
+    BlockquoteFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#RelationshipFeatureClient":
+    RelationshipFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#LinkFeatureClient":
+    LinkFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#ChecklistFeatureClient":
+    ChecklistFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#OrderedListFeatureClient":
+    OrderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#UnorderedListFeatureClient":
+    UnorderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#IndentFeatureClient":
+    IndentFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#AlignFeatureClient":
+    AlignFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#HeadingFeatureClient":
+    HeadingFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#ParagraphFeatureClient":
+    ParagraphFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#InlineCodeFeatureClient":
+    InlineCodeFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#SuperscriptFeatureClient":
+    SuperscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#SubscriptFeatureClient":
+    SubscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#StrikethroughFeatureClient":
+    StrikethroughFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#UnderlineFeatureClient":
+    UnderlineFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#BoldFeatureClient":
+    BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@payloadcms/richtext-lexical/client#ItalicFeatureClient":
+    ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
+  "@nouance/payload-better-fields-plugin/ColourText/client#ColourTextComponent":
+    ColourTextComponent_5eca6d89486e7fecc5e5204e28af0de5,
+  "@payloadcms/plugin-seo/client#OverviewComponent":
+    OverviewComponent_a8a977ebc872c5d5ea7ee689724c0860,
+  "@payloadcms/plugin-seo/client#MetaTitleComponent":
+    MetaTitleComponent_a8a977ebc872c5d5ea7ee689724c0860,
+  "@payloadcms/plugin-seo/client#MetaDescriptionComponent":
+    MetaDescriptionComponent_a8a977ebc872c5d5ea7ee689724c0860,
+  "@payloadcms/plugin-seo/client#MetaImageComponent":
+    MetaImageComponent_a8a977ebc872c5d5ea7ee689724c0860,
+  "@payloadcms/plugin-seo/client#PreviewComponent":
+    PreviewComponent_a8a977ebc872c5d5ea7ee689724c0860,
+  "@/trustlab/payload/components/RowLabel#default":
+    default_f5238f1b70ea6cf94e5a15e7dfec6dac,
+  "@payloadcms/storage-s3/client#S3ClientUploadHandler":
+    S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24,
+  "@payloadcms/plugin-sentry/client#AdminErrorBoundary":
+    AdminErrorBoundary_e5a9e14bdbe97e70ba60697217fe7688,
+};