fix(admin-ui): Use correct defaults for nullable custom fields (#2360)

vendure-ecommerce · Aug 29, 2023 · 88430e5 · 88430e5
1 parent 10b1325
commit 88430e5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/packages/admin-ui/src/lib/core/src/common/utilities/create-updated-translatable.spec.ts b/packages/admin-ui/src/lib/core/src/common/utilities/create-updated-translatable.spec.ts
@@ -184,11 +184,13 @@ describe('createUpdatedTranslatable()', () => {
 
     it('coerces empty customFields to correct type', () => {
         const customFieldConfig: CustomFieldConfig[] = [
-            { name: 'a', type: 'boolean', list: false },
-            { name: 'b', type: 'int', list: false },
-            { name: 'c', type: 'float', list: false },
-            { name: 'd', type: 'datetime', list: false },
-            { name: 'e', type: 'string', list: false },
+            { name: 'a', type: 'boolean', list: false, nullable: false },
+            { name: 'b', type: 'int', list: false, nullable: false },
+            { name: 'c', type: 'float', list: false, nullable: false },
+            { name: 'd', type: 'datetime', list: false, nullable: false },
+            { name: 'e', type: 'string', list: false, nullable: false },
+            { name: 'f', type: 'int', list: false, nullable: true },
+            { name: 'g', type: 'datetime', list: false, nullable: true },
         ];
 
         const formValue = {
@@ -198,6 +200,8 @@ describe('createUpdatedTranslatable()', () => {
                 c: '',
                 d: '',
                 e: '',
+                f: '',
+                g: '',
             },
         };
 
@@ -213,5 +217,7 @@ describe('createUpdatedTranslatable()', () => {
         expect(result.customFields.c).toBe(0);
         expect(result.customFields.d instanceof Date).toBe(true);
         expect(result.customFields.e).toBe('');
+        expect(result.customFields.f).toBe(null);
+        expect(result.customFields.g).toBe(null);
     });
 });
diff --git a/packages/admin-ui/src/lib/core/src/common/utilities/create-updated-translatable.ts b/packages/admin-ui/src/lib/core/src/common/utilities/create-updated-translatable.ts
@@ -39,7 +39,9 @@ export function createUpdatedTranslatable<T extends { translations: any[] } & Ma
                 newTranslatedCustomFields[field.name] = value;
             } else {
                 newCustomFields[field.name] =
-                    value === '' ? getDefaultValue(field.type as CustomFieldType) : value;
+                    value === ''
+                        ? getDefaultValue(field.type as CustomFieldType, field.nullable ?? true)
+                        : value;
             }
         }
         newTranslation.customFields = newTranslatedCustomFields;
@@ -59,7 +61,7 @@ export function createUpdatedTranslatable<T extends { translations: any[] } & Ma
     return newTranslatable;
 }
 
-function getDefaultValue(type: CustomFieldType): any {
+function getDefaultValue(type: CustomFieldType, isNullable?: boolean): any {
     switch (type) {
         case 'localeString':
         case 'string':
@@ -70,9 +72,9 @@ function getDefaultValue(type: CustomFieldType): any {
             return false;
         case 'float':
         case 'int':
-            return 0;
+            return isNullable ? null : 0;
         case 'datetime':
-            return new Date();
+            return isNullable ? null : new Date();
         case 'relation':
             return null;
         default: