Merge pull request #4103 from marmelab/fix-json-input-parsing-bug

Fix form values sanitization messes with JSON values
marmelab · Dec 3, 2019 · d73cdb5 · d73cdb5
2 parents 72f7f0c + c03b376
commit d73cdb5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/packages/ra-core/src/form/sanitizeEmptyValues.spec.ts b/packages/ra-core/src/form/sanitizeEmptyValues.spec.ts
@@ -45,4 +45,14 @@ describe('sanitizeEmptyValues', () => {
             sanitizeEmptyValues({ obj: { foo: null, foo2: 2 } }, { obj })
         ).toEqual({ obj: { foo: { bar: 1 }, foo2: null } });
     });
+    it("should not ignore initial value when it's not of the same type", () => {
+        const initialValues = { a: 'foobar' };
+        const values = { a: { hello: 'world' } };
+        expect(sanitizeEmptyValues(initialValues, values)).toEqual({
+            a: { hello: 'world' },
+        });
+        expect(sanitizeEmptyValues(values, initialValues)).toEqual({
+            a: 'foobar',
+        });
+    });
 });
diff --git a/packages/ra-core/src/form/sanitizeEmptyValues.ts b/packages/ra-core/src/form/sanitizeEmptyValues.ts
@@ -20,6 +20,7 @@ const sanitizeEmptyValues = (initialValues: object, values: object) => {
                 acc[key] = values[key];
             } else if (
                 typeof values[key] === 'object' &&
+                typeof initialValues[key] === 'object' &&
                 values[key] !== null
             ) {
                 acc[key] = sanitizeEmptyValues(initialValues[key], values[key]);