Merge branch 'develop' into feature/single-project-page

CodeForAfrica · Sep 29, 2023 · 306ca7d · 306ca7d
2 parents f5a67a5 + b14ba68
commit 306ca7d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/apps/codeforafrica/src/payload/collections/Projects.js b/apps/codeforafrica/src/payload/collections/Projects.js
@@ -1,4 +1,5 @@
 import image from "../fields/image";
+import link from "../fields/links/link";
 import linkArray from "../fields/links/linkArray";
 import linkGroup from "../fields/links/linkGroup";
 import richText from "../fields/richText";
@@ -82,6 +83,7 @@ const Projects = {
           admin: {
             date: {
               pickerAppearance: "dayOnly",
+              displayFormat: "yyyy-MM-dd",
             },
           },
         },
@@ -91,25 +93,29 @@ const Projects = {
       name: "description",
     }),
     linkArray({
-      linkConfig: {
-        defaultValue: "custom",
-        disableLinkTypeSelection: true,
-        labelFields: [
+      overrides: {
+        fields: [
           {
             name: "type",
-            label: { en: "Type of Link" },
+            label: { en: "Type" },
             type: "select",
             options: [
               {
                 value: "source",
-                label: { en: "Source" },
+                label: { en: "Source code" },
               },
               {
                 value: "data",
                 label: { en: "Data" },
               },
             ],
+            required: true,
           },
+          link({
+            defaultValue: "custom",
+            disableLinkTypeSelection: true,
+            disableOpenInNewTab: true,
+          }),
         ],
       },
     }),

diff --git a/apps/codeforafrica/src/payload/fields/links/link.js b/apps/codeforafrica/src/payload/fields/links/link.js
@@ -31,7 +31,6 @@ const link = ({
   disableOpenInNewTab = false,
   overrides = {},
   required = true,
-  labelFields: fields = [],
 } = {}) => {
   const linkResult = {
     type: "row",
@@ -130,12 +129,7 @@ const link = ({
       },
     ];
   }
-  linkResult.fields = [
-    ...labelFields,
-    ...fields,
-    ...linkResult.fields,
-    ...linkTypes,
-  ];
+  linkResult.fields = [...labelFields, ...linkResult.fields, ...linkTypes];
   if (!disableOpenInNewTab) {
     linkResult.fields.push({
       type: "row",