Fix validations for fields in charter Africa

CodeForAfrica · Sep 11, 2024 · d78354b · d78354b
1 parent b10d351
commit d78354b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 33 deletions.
diff --git a/apps/charterafrica/next-env.d.ts b/apps/charterafrica/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
diff --git a/apps/charterafrica/src/payload/globals/FocalCountries.js b/apps/charterafrica/src/payload/globals/FocalCountries.js
@@ -1,5 +1,5 @@
 import { slateEditor } from "@payloadcms/richtext-slate";
-import { array } from "payload/dist/fields/validations";
+import { text } from "payload/dist/fields/validations";
 
 import linkGroup from "../fields/linkGroup";
 import richText from "../fields/richText";
@@ -67,7 +67,7 @@ const FocalCountries = {
                 ) {
                   return t("charterafrica.site:uniqueCountries");
                 }
-                return array(val, options);
+                return text(val, options);
               },
               admin: {
                 width: "50%",

diff --git a/apps/charterafrica/src/payload/globals/Footer.js b/apps/charterafrica/src/payload/globals/Footer.js
@@ -1,9 +1,36 @@
 import { slateEditor } from "@payloadcms/richtext-slate";
-import { text, array } from "payload/dist/fields/validations";
+import { text, select } from "payload/dist/fields/validations";
 
 import linkArray from "../fields/linkArray";
 import richText from "../fields/richText";
 
+const socialMediaOptions = [
+  {
+    value: "facebook",
+    label: "Facebook",
+  },
+  {
+    value: "github",
+    label: "Github",
+  },
+  {
+    value: "instagram",
+    label: "Instagram",
+  },
+  {
+    value: "linkedin",
+    label: "LinkedIn",
+  },
+  {
+    value: "slack",
+    label: "Slack",
+  },
+  {
+    value: "twitter",
+    label: "Twitter",
+  },
+];
+
 const Footer = {
   slug: "footer",
   access: {
@@ -120,32 +147,7 @@ const Footer = {
                 pt: "Media",
               },
               type: "select",
-              options: [
-                {
-                  value: "facebook",
-                  label: "Facebook",
-                },
-                {
-                  value: "github",
-                  label: "Github",
-                },
-                {
-                  value: "instagram",
-                  label: "Instagram",
-                },
-                {
-                  value: "linkedin",
-                  label: "LinkedIn",
-                },
-                {
-                  value: "slack",
-                  label: "Slack",
-                },
-                {
-                  value: "twitter",
-                  label: "Twitter",
-                },
-              ],
+              options: socialMediaOptions,
               unique: true,
               required: true,
               admin: {
@@ -160,7 +162,10 @@ const Footer = {
                 ) {
                   return t("charterafrica.site:uniqueMedia");
                 }
-                return array(val, options);
+                return select(val, {
+                  ...options,
+                  options: socialMediaOptions,
+                });
               },
             },
             {

diff --git a/apps/charterafrica/src/payload/globals/Settings.js b/apps/charterafrica/src/payload/globals/Settings.js
@@ -1,4 +1,4 @@
-import { array } from "payload/dist/fields/validations";
+import { select } from "payload/dist/fields/validations";
 
 import { locales } from "../utils/locales";
 
@@ -85,7 +85,7 @@ const Settings = {
                 ) {
                   return t("charterafrica.site:uniqueLocales");
                 }
-                return array(val, options);
+                return select(val, { ...options, options: locales });
               },
             },
             {