Merge pull request #479 from CodeForAfrica/ft/missing-blocks-&-bug-fixes

feat(cms): add Missing Blocks and Fix Bugs

Author: kelvinkipruto

public/cms/faq.png

@@ -369,7 +369,7 @@ export default async function PromiseDetailPage({
                   {descriptionText}
                 </Typography>
               ) : null}
-              {originalArticleUrl ? (
+              {/* {originalArticleUrl ? (
                 <Button
                   component="a"
                   href={originalArticleUrl}
@@ -384,7 +384,7 @@ export default async function PromiseDetailPage({
                 >
                   Read the full report
                 </Button>
-              ) : null}
+              ) : null} */}
             </Grid>
             <Grid size={{ xs: 12, lg: 4 }}>
               {statusDoc ? (

public/cms/partner-details.png

@@ -0,0 +1,47 @@
+import { Block } from "payload";
+
+export const FAQ: Block = {
+  slug: "faq",
+  interfaceName: "FAQBlock",
+  imageURL: "/cms/faq.png",
+  imageAltText: "FAQ",
+  labels: {
+    singular: "FAQS",
+    plural: "FAQS",
+  },
+  fields: [
+    {
+      name: "title",
+      type: "text",
+      required: true,
+    },
+    {
+      name: "faqs",
+      type: "array",
+      required: true,
+      minRows: 1,
+      admin: {
+        components: {
+          RowLabel: {
+            path: "@/components/payload/RowLabel#CustomRowLabel",
+            clientProps: {
+              fieldToUse: "question",
+            },
+          },
+        },
+      },
+      fields: [
+        {
+          name: "question",
+          type: "text",
+          required: true,
+        },
+        {
+          name: "answer",
+          type: "richText",
+          required: true,
+        },
+      ],
+    },
+  ],
+};

src/app/(frontend)/[entitySlug]/promises/[promiseId]/page.tsx

@@ -0,0 +1,27 @@
+import { Block } from "payload";
+
+export const PartnerDetails: Block = {
+  slug: "partner-details",
+  imageURL: "/cms/partner-details.png",
+  imageAltText: "Partner Details",
+  interfaceName: "PartnerDetailsBlock",
+  labels: {
+    singular: {
+      en: "Partner Details",
+      fr: "Détails des partenaires",
+    },
+    plural: {
+      en: "Partner Details",
+      fr: "Détails des partenaires",
+    },
+  },
+  fields: [
+    {
+      name: "partners",
+      type: "relationship",
+      relationTo: "partners",
+      hasMany: true,
+      required: true,
+    },
+  ],
+};

src/blocks/FAQ.ts

@@ -3,6 +3,7 @@ import { Block } from "payload";
 const PromiseList: Block = {
   slug: "promise-list",
   imageURL: "/cms/promises-list.png",
+  interfaceName: "PromiseListBlock",
   labels: {
     singular: "Promise List",
     plural: "Promise Lists",

src/blocks/PartnerDetails.tsx

@@ -9,6 +9,8 @@ import { KeyPromises } from "@/blocks/KeyPromises";
 import { ActNow } from "@/blocks/ActNow";
 import { Hero } from "@/blocks/Hero";
 import PageHeader from "@/blocks/PageHeader";
+import { FAQ } from "@/blocks/FAQ";
+import { PartnerDetails } from "@/blocks/PartnerDetails";
 
 export const Pages: CollectionConfig = {
   slug: "pages",
@@ -45,13 +47,15 @@ export const Pages: CollectionConfig = {
       type: "blocks",
       blocks: [
         ActNow,
+        FAQ,
         Hero,
-        PageHeader,
+        KeyPromises,
+        LatestPromises,
         Newsletter,
+        PageHeader,
         Partners,
-        LatestPromises,
+        PartnerDetails,
         PromiseList,
-        KeyPromises,
       ],
     },
   ],

src/blocks/PromiseList.ts

@@ -1,5 +1,4 @@
 import { CollectionConfig } from "payload";
-import { socialLinks } from "@/fields/socialLinks";
 import { image } from "@/fields/image";
 import { link } from "@/fields/link/link";
 
@@ -27,6 +26,11 @@ export const Partners: CollectionConfig = {
       type: "text",
       required: true,
     },
+    {
+      name: "description",
+      type: "richText",
+      required: true,
+    },
     image({
       name: "image",
       label: {
@@ -35,7 +39,6 @@ export const Partners: CollectionConfig = {
       },
       required: true,
     }),
-    socialLinks(),
     link({
       appearances: false,
       overrides: {

src/collections/Pages/index.ts

@@ -24,6 +24,7 @@ export const PoliticalEntities: CollectionConfig = {
     },
     defaultColumns: [
       "name",
+      "order",
       "image",
       "region",
       "position",
@@ -53,6 +54,23 @@ export const PoliticalEntities: CollectionConfig = {
         },
       },
     }),
+    {
+      name: "order",
+      type: "number",
+      index: true,
+      min: 0,
+      admin: {
+        position: "sidebar",
+        description: {
+          en: "Lower numbers appear first in listings.",
+          fr: "Les nombres les plus bas apparaissent en premier dans les listes.",
+        },
+      },
+      label: {
+        en: "Order",
+        fr: "Ordre",
+      },
+    },
     {
       name: "region",
       type: "text",

src/collections/Partners/index.ts

@@ -10,6 +10,8 @@ import Promises from "./Promises";
 import { TenantList } from "./TenantList";
 import { PoliticalEntityList } from "./PoliticalEntityList";
 import PageHeader from "./PageHeader";
+import PartnerDetails from "./PartnerDetails";
+import FAQ from "./FAQ";
 
 type PageBlocks = NonNullable<Page["blocks"]>;
 type PageBlock = PageBlocks extends Array<infer T> ? T : never;
@@ -41,6 +43,8 @@ const blockComponents: Record<string, ComponentType<any>> = {
   "latest-promises": LatestPromises,
   "promise-list": Promises,
   "key-promises": KeyPromises,
+  faq: FAQ,
+  "partner-details": PartnerDetails,
   "tenant-selection": TenantList,
   "entity-selection": PoliticalEntityList,
   "page-header": PageHeader,