fix(fieldset): Support customProperties with sub-fields clashing with…

… reserved words. (#64) fix(fieldset): Support customProperties with sub-fields clashing with reserved words.
remoteoss · Feb 1, 2024 · 8340cde · 8340cde
1 parent aa008c2
commit 8340cde
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 12 deletions.
diff --git a/src/createHeadlessForm.js b/src/createHeadlessForm.js
@@ -111,7 +111,7 @@ function buildFieldParameters(name, fieldProperties, required = [], config = {},
     fields = getFieldsFromJSONSchema(
       fieldProperties,
       {
-        customProperties: get(config, `customProperties.${name}`, {}),
+        customProperties: get(config, `customProperties.${name}.customProperties`, {}),
         parentID: name,
       },
       logic

diff --git a/...teHeadlessForm.customValidations.test.jsx → ...ateHeadlessForm.customValidations.test.js b/...teHeadlessForm.customValidations.test.jsx → ...ateHeadlessForm.customValidations.test.js
@@ -358,14 +358,18 @@ describe('createHeadlessForm() - custom validations', () => {
               maximum: 28,
             },
             second_gen: {
-              cub_age: {
-                minimum: 18,
-                maximum: 21,
-              },
-              third_gen: {
-                grandcub_age: {
-                  minimum: 10,
-                  maximum: 15,
+              customProperties: {
+                cub_age: {
+                  minimum: 18,
+                  maximum: 21,
+                },
+                third_gen: {
+                  customProperties: {
+                    grandcub_age: {
+                      minimum: 10,
+                      maximum: 15,
+                    },
+                  },
                 },
               },
             },

diff --git a/src/tests/createHeadlessForm.test.js b/src/tests/createHeadlessForm.test.js
@@ -3677,11 +3677,17 @@ describe('createHeadlessForm', () => {
           customProperties: {
             id_number: { 'data-field': 'field' },
             fieldset: {
-              id_number: { 'data-fieldset': 'fieldset' },
+              customProperties: {
+                id_number: { 'data-fieldset': 'fieldset' },
+              },
             },
             nestedFieldset: {
-              innerFieldset: {
-                id_number: { 'data-nested-fieldset': 'nested-fieldset' },
+              customProperties: {
+                innerFieldset: {
+                  customProperties: {
+                    id_number: { 'data-nested-fieldset': 'nested-fieldset' },
+                  },
+                },
               },
             },
           },
@@ -3754,6 +3760,58 @@ describe('createHeadlessForm', () => {
       expect(nestedFieldsetResult.fields[0].fields[1]).not.toHaveProperty('data-field');
       expect(nestedFieldsetResult.fields[0].fields[1]).not.toHaveProperty('data-fieldset');
     });
+    it('should handle custom properties when inside fieldsets for fields name clashing with reserved words', () => {
+      const { fields } = createHeadlessForm(
+        {
+          properties: {
+            dog: {
+              title: 'Dog details',
+              description: 'Fieldset description',
+              'x-jsf-presentation': {
+                inputType: 'fieldset',
+              },
+              properties: {
+                name: {
+                  // This fieldName (name) clashs with the field specs "name"
+                  title: 'Dogs name',
+                  'x-jsf-presentation': {
+                    inputType: 'text',
+                  },
+                  type: 'string',
+                },
+                type: {
+                  // This field name (type) clashs with the field specs "type"
+                  title: 'Breed type',
+                  'x-jsf-presentation': {
+                    inputType: 'number',
+                  },
+                  type: 'string',
+                },
+              },
+              required: ['name'],
+              type: 'object',
+            },
+          },
+          required: ['dog'],
+        },
+        {
+          customProperties: {
+            dog: {
+              customProperties: {
+                name: {
+                  description: "What's your dogs name",
+                },
+              },
+            },
+          },
+        }
+      );
+
+      expect(fields.length).toBe(1);
+      expect(fields[0].fields.length).toBe(2);
+      expect(fields[0].fields[0].name).toBe('name');
+      expect(fields[0].fields[0].description).toBe("What's your dogs name");
+    });
   });
 
   describe('presentation (deprecated in favor of x-jsf-presentation)', () => {