Merge pull request #1400 from CodeForAfrica/chore/fix-research-page-setting

feat: enhance ReportFilters and Reports components with new properties

Author: koechkevin

apps/trustlab/next.config.mjs

@@ -58,6 +58,14 @@ const nextConfig = {
     "@commons-ui/next",
     "@commons-ui/payload",
   ],
+  async rewrites() {
+    return [
+      {
+        source: "/robots.txt",
+        destination: "/api/v1/robots",
+      },
+    ];
+  },
 };
 
 export default withPayload(

apps/trustlab/src/app/robots.js

@@ -219,7 +219,13 @@ const ReportFilters = React.forwardRef(function ReportFilters(
         alignItems="center"
         justifyContent="space-between"
       >
-        <Box display="flex" flexWrap="wrap" gap={2} flex={1}>
+        <Box
+          display="flex"
+          alignItems="center"
+          flexWrap="wrap"
+          gap={2}
+          flex={1}
+        >
           {selectedYears.map((y) => (
             <Chip
               key={`year-${y}`}
@@ -292,7 +298,7 @@ const ReportFilters = React.forwardRef(function ReportFilters(
                 }}
                 component={CloseIcon}
               />
-              {clearFiltersLabel || "Clear Filters"}
+              {clearFiltersLabel || "Clear Filter(s)"}
             </Button>
           )}
         </Box>

apps/trustlab/src/components/ReportFilters/ReportFilters.js

@@ -96,7 +96,7 @@ exports[`ReportFilters renders unchanged 1`] = `
       class="MuiStack-root css-1x34icn-MuiStack-root"
     >
       <div
-        class="MuiBox-root css-3772j1"
+        class="MuiBox-root css-1sl536g"
       />
     </div>
   </div>

apps/trustlab/src/components/ReportFilters/ReportFilters.snap.js

@@ -1,5 +1,4 @@
 import { getPageProps, getPagePaths } from "@/trustlab/lib/data/common";
-import { parseRobotsTxt } from "@/trustlab/lib/data/common/seo";
 import api from "@/trustlab/lib/payload";
 
 export async function getPageStaticPaths() {
@@ -19,7 +18,7 @@ export async function getPageStaticProps(context) {
 
 export async function getRobotsTxt() {
   const siteSettings = await api.findGlobal("site-settings");
-  return parseRobotsTxt(siteSettings?.robotsTxt);
+  return siteSettings?.robotsTxt;
 }
 
 export default undefined;

apps/trustlab/src/lib/data/local/index.js

@@ -0,0 +1,7 @@
+import { getRobotsTxt } from "@/trustlab/lib/data";
+
+export default async function handler(_req, res) {
+  const robotsTxt = await getRobotsTxt();
+  res.setHeader("Content-Type", "text/plain; charset=utf-8");
+  res.send(robotsTxt);
+}

apps/trustlab/src/pages/api/v1/robots.page.js

@@ -53,6 +53,25 @@ const Reports = {
         position: "sidebar",
       },
     },
+    image({
+      overrides: {
+        name: "pageHeaderImage",
+        label: "Page Header Image",
+        description: "Image displayed at the top of the report page",
+        admin: {
+          position: "sidebar",
+        },
+      },
+    }),
+    richText({
+      name: "pageHeaderDescription",
+      label: "Page Header Description",
+      description: "Rich text content displayed below the page header image",
+      localized: true,
+      admin: {
+        position: "sidebar",
+      },
+    }),
   ],
   timestamps: true,
 };

apps/trustlab/src/payload/collections/Reports.js

@@ -60,6 +60,8 @@ export async function getReport(api, slug) {
           backgroundColor: "#010101",
           textColor: "#FFFFFF",
           id: report.id,
+          description: report.pageHeaderDescription || "",
+          image: report.pageHeaderImage || null,
         },
         {
           blockType: "page-overview",