fix(modify): Customize attrs as Array now overrides the value

remoteoss · Jul 19, 2024 · 751f089 · 751f089
1 parent f09dd3c
commit 751f089
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 10 deletions.
diff --git a/src/modify.js b/src/modify.js
@@ -1,5 +1,5 @@
 import get from 'lodash/get';
-import merge from 'lodash/merge';
+import mergeWith from 'lodash/mergeWith';
 
 /**
  *
@@ -11,6 +11,10 @@ function shortToFullPath(path) {
   return path.replace('.', '.properties.');
 }
 
+function mergeReplaceArray(_, newVal) {
+  return Array.isArray(newVal) ? newVal : undefined;
+}
+
 function standardizeAttrs(attrs) {
   const { errorMessage, properties, ...rest } = attrs;
 
@@ -35,10 +39,14 @@ function rewriteFields(schema, fieldsConfig) {
     const fieldAttrs = get(schema.properties, fieldPath);
     const fieldChanges = typeof mutation === 'function' ? mutation(fieldAttrs) : mutation;
 
-    merge(get(schema.properties, fieldPath), {
-      ...fieldAttrs,
-      ...standardizeAttrs(fieldChanges),
-    });
+    mergeWith(
+      get(schema.properties, fieldPath),
+      {
+        ...fieldAttrs,
+        ...standardizeAttrs(fieldChanges),
+      },
+      mergeReplaceArray
+    );
 
     if (fieldChanges.properties) {
       rewriteFields(get(schema.properties, fieldPath), fieldChanges.properties);
@@ -52,10 +60,14 @@ function rewriteAllFields(schema, configCallback, context) {
 
   Object.entries(schema.properties).forEach(([fieldName, fieldAttrs]) => {
     const fullName = parentName ? `${parentName}.${fieldName}` : fieldName;
-    merge(get(schema.properties, fieldName), {
-      ...fieldAttrs,
-      ...configCallback(fullName, fieldAttrs),
-    });
+    mergeWith(
+      get(schema.properties, fieldName),
+      {
+        ...fieldAttrs,
+        ...configCallback(fullName, fieldAttrs),
+      },
+      mergeReplaceArray
+    );
 
     // Nested fields, go recursive (fieldset)
     if (fieldAttrs.properties) {

diff --git a/src/tests/modify.test.js b/src/tests/modify.test.js
@@ -213,7 +213,7 @@ describe('modify() - basic mutations', () => {
     });
   });
 
-  it('replace field options (radio/select)', () => {
+  it('replace field attrs that are arrays (partial)', () => {
     const result = modify(schemaPet, {
       fields: {
         has_pet: (fieldAttrs) => {
@@ -257,6 +257,29 @@ describe('modify() - basic mutations', () => {
     });
   });
 
+  it('replace field attrs that are arrays (full)', () => {
+    const result = modify(schemaPet, {
+      fields: {
+        has_pet: {
+          oneOf: [{ const: 'yaaas', title: 'YAAS!' }],
+        },
+      },
+    });
+
+    expect(result).toMatchObject({
+      properties: {
+        has_pet: {
+          oneOf: [
+            {
+              const: 'yaaas',
+              title: 'YAAS!',
+            },
+          ],
+        },
+      },
+    });
+  });
+
   it('error message', () => {
     const result = modify(schemaPet, {
       fields: {