Merge pull request #1670 from payloadcms/fix/select-field-clear-value

Fix/select field clear value

Author: jmikrut

src/collections/init.ts

@@ -72,6 +72,7 @@ export default function registerCollections(ctx: Payload): void {
         buildVersionCollectionFields(collection),
         {
           disableUnique: true,
+          draftsEnabled: true,
           options: {
             timestamps: true,
           },

src/fields/hooks/beforeChange/promise.ts

@@ -154,14 +154,6 @@ export const promise = async ({
   }
 
   switch (field.type) {
-    case 'select': {
-      if (siblingData[field.name] === null) {
-        siblingData[field.name] = undefined;
-      }
-
-      break;
-    }
-
     case 'point': {
       // Transform point data for storage
       if (Array.isArray(siblingData[field.name]) && siblingData[field.name][0] !== null && siblingData[field.name][1] !== null) {

src/globals/init.ts

@@ -28,6 +28,7 @@ export default function initGlobals(ctx: Payload): void {
           buildVersionGlobalFields(global),
           {
             disableUnique: true,
+            draftsEnabled: true,
             options: {
               timestamps: true,
             },

src/mongoose/buildSchema.ts

@@ -308,6 +308,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
                 id: false,
               },
               disableUnique: buildSchemaOptions.disableUnique,
+              draftsEnabled: buildSchemaOptions.draftsEnabled,
             },
           ),
         };
@@ -336,6 +337,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
           options: { _id: false, id: false },
           allowIDField: true,
           disableUnique: buildSchemaOptions.disableUnique,
+          draftsEnabled: buildSchemaOptions.draftsEnabled,
         },
       )],
     };
@@ -358,6 +360,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
             id: false,
           },
           disableUnique: buildSchemaOptions.disableUnique,
+          draftsEnabled: buildSchemaOptions.draftsEnabled,
         },
       ),
     };
@@ -376,6 +379,10 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
       }),
     };
 
+    if (buildSchemaOptions.draftsEnabled || !field.required) {
+      baseSchema.enum.push(null);
+    }
+
     schema.add({
       [field.name]: localizeSchema(
         field,