fix: clearable point fields in both mongo and postgres

payloadcms · Nov 29, 2024 · 702091e · 702091e
1 parent ef875d5
commit 702091e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/packages/payload/src/fields/hooks/beforeValidate/promise.ts b/packages/payload/src/fields/hooks/beforeValidate/promise.ts
@@ -126,6 +126,11 @@ export const promise = async <T>({
 
       case 'point': {
         if (Array.isArray(siblingData[field.name])) {
+          if ((siblingData[field.name] as string[]).some((val) => val === null || val === '')) {
+            siblingData[field.name] = null
+            break
+          }
+
           siblingData[field.name] = (siblingData[field.name] as string[]).map((coordinate, i) => {
             if (typeof coordinate === 'string') {
               const value = siblingData[field.name][i] as string

diff --git a/packages/payload/src/fields/validations.ts b/packages/payload/src/fields/validations.ts
@@ -875,7 +875,12 @@ export type PointFieldValidation = Validate<
   PointField
 >
 
-export const point: PointFieldValidation = (value = ['', ''], { req: { t }, required }) => {
+export const point: PointFieldValidation = (value, { req: { t }, required }) => {
+  // Allow to pass null to clear the field
+  if (!value) {
+    value = ['', '']
+  }
+
   const lng = parseFloat(String(value[0]))
   const lat = parseFloat(String(value[1]))
   if (

diff --git a/test/fields/int.spec.ts b/test/fields/int.spec.ts
@@ -1089,6 +1089,30 @@ describe('Fields', () => {
       expect(doc.localized).toEqual(localized)
       expect(doc.group).toMatchObject(group)
     })
+
+    it('should clear a point field', async () => {
+      if (payload.db.name === 'sqlite') {
+        return
+      }
+
+      const doc = await payload.create({
+        collection: 'point-fields',
+        data: {
+          point: [7, -7],
+          group: {
+            point: [7, -7],
+          },
+        },
+      })
+
+      const res = await payload.update({
+        collection: 'point-fields',
+        id: doc.id,
+        data: { group: { point: null } },
+      })
+
+      expect(res.group.point).toBeFalsy()
+    })
   })
 
   describe('unique indexes', () => {