@remoteoss/json-schema-form 0.7.7-dev.20240129180839 → 0.8.1-beta.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+#### 0.8.1-beta.0 (2024-02-12)
+
+##### Bug Fixes
+
+* **conditionals:**  Certain conditions in a JSON schema were failing. This bugfix adds missing field context to the evaluation to prevent the error. ([#65](https://github.com/remoteoss/json-schema-form/pull/65)) ([6755a2fd](https://github.com/remoteoss/json-schema-form/commit/6755a2fd29f3f806a57ba19e29ad7e21daf9e51b))
+
+#### 0.8.0-beta.0 (2024-02-01)
+
+##### Bug Fixes
+
+* **fieldset:**  Support customProperties with sub-fields clashing with reserved words. ([#64](https://github.com/remoteoss/json-schema-form/pull/64)) ([8340cdea](https://github.com/remoteoss/json-schema-form/commit/8340cdea27b711064079055af939a595d1c38031))
+
 #### 0.7.6-beta.0 (2024-01-23)
 
 ##### Chores

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.7-dev.20240129180839
- Generated: Mon, 29 Jan 2024 18:09:02 GMT
+ NPM Package: @remoteoss/json-schema-form@0.8.1-beta.0
+ Generated: Mon, 12 Feb 2024 12:22:48 GMT
 
  MIT License
 
@@ -130,10 +130,8 @@ function checkIfConditionMatchesProperties(node, formValues, formFields, logic)
     const field = getField(name, formFields);
     return validateFieldSchema(
       {
-        options: field.options,
-        // @TODO/CODE SMELL. We are passing the property (raw field), but buildYupSchema() expected the output field.
+        ...field,
         ...currentProperty,
-        inputType: field.inputType,
         required: true
       },
       value

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.7-dev.20240129180839
- Generated: Mon, 29 Jan 2024 18:09:02 GMT
+ NPM Package: @remoteoss/json-schema-form@0.8.1-beta.0
+ Generated: Mon, 12 Feb 2024 12:22:48 GMT
 
  MIT License
 
@@ -94,10 +94,8 @@ function checkIfConditionMatchesProperties(node, formValues, formFields, logic)
     const field = getField(name, formFields);
     return validateFieldSchema(
       {
-        options: field.options,
-        // @TODO/CODE SMELL. We are passing the property (raw field), but buildYupSchema() expected the output field.
+        ...field,
         ...currentProperty,
-        inputType: field.inputType,
         required: true
       },
       value

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.7-dev.20240129180839
- Generated: Mon, 29 Jan 2024 18:09:02 GMT
+ NPM Package: @remoteoss/json-schema-form@0.8.1-beta.0
+ Generated: Mon, 12 Feb 2024 12:22:48 GMT
 
  MIT License
 
@@ -11449,10 +11449,8 @@ function checkIfConditionMatchesProperties(node, formValues, formFields, logic)
     const field = getField(name, formFields);
     return validateFieldSchema(
       {
-        options: field.options,
-        // @TODO/CODE SMELL. We are passing the property (raw field), but buildYupSchema() expected the output field.
+        ...field,
         ...currentProperty,
-        inputType: field.inputType,
         required: true
       },
       value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.7.7-dev.20240129180839",
+  "version": "0.8.1-beta.0",
   "description": "Headless UI form powered by JSON Schemas",
   "author": "Remote.com <engineering@remote.com> (https://remote.com/)",
   "license": "MIT",

package/src/tests/conditions.test.js

@@ -423,3 +423,59 @@ describe('Conditional attributes updated', () => {
     expect(fields[1].visibilityCondition).toEqual(expect.any(Function));
   });
 });
+
+describe('Conditional with a minimum value check', () => {
+  it('Should handle a maximum as a property field check', () => {
+    const schema = {
+      additionalProperties: false,
+      allOf: [
+        {
+          if: {
+            properties: {
+              salary: {
+                maximum: 119999,
+              },
+            },
+            required: ['salary'],
+          },
+          then: {
+            required: ['reason'],
+          },
+          else: {
+            properties: {
+              reason: false,
+            },
+          },
+        },
+      ],
+      properties: {
+        salary: {
+          type: 'number',
+          'x-jsf-presentation': {
+            inputType: 'money',
+          },
+        },
+        reason: {
+          oneOf: [
+            {
+              const: 'reason_one',
+            },
+            {
+              const: 'reason_two',
+            },
+          ],
+          type: 'string',
+        },
+      },
+      required: ['salary'],
+      type: 'object',
+    };
+
+    const { handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+    expect(handleValidation({ salary: 120000 }).formErrors).toEqual(undefined);
+    expect(handleValidation({ salary: 1000 }).formErrors).toEqual({
+      reason: 'Required field',
+    });
+    expect(handleValidation({ salary: 1000, reason: 'reason_one' }).formErrors).toEqual(undefined);
+  });
+});

package/src/tests/{createHeadlessForm.customValidations.test.jsx → createHeadlessForm.customValidations.test.js}

@@ -357,23 +357,21 @@ describe('createHeadlessForm() - custom validations', () => {
               minimum: 24,
               maximum: 28,
             },
-            second_gen: { 
+            second_gen: {
               customProperties: {
                 cub_age: {
-                minimum: 18,
-                maximum: 21
-              },
-              third_gen: { 
-                customProperties: {
-                  grandcub_age: {
-                    minimum: 10,
-                    maximum: 15,
+                  minimum: 18,
+                  maximum: 21,
+                },
+                third_gen: {
+                  customProperties: {
+                    grandcub_age: {
+                      minimum: 10,
+                      maximum: 15,
+                    },
                   },
-                }
-                
-              },
+                },
               },
-            
             },
           },
         },

package/src/tests/createHeadlessForm.test.js

@@ -3760,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)', () => {