@remoteoss/json-schema-form 0.4.1-dev.20230703082439 → 0.4.1-dev.20230703195833

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703082439
- Generated: Mon, 03 Jul 2023 08:24:57 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703195833
+ Generated: Mon, 03 Jul 2023 19:58:43 GMT
 
  MIT License
 
@@ -441,7 +441,11 @@ var getOptionsAllowed = (field) => {
   if (isOptionalWithNull) {
     return [...optionsBroken, null];
   }
-  return optionsBroken;
+  return [
+    ...optionsBroken,
+    null
+    // [3]
+  ];
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
@@ -661,8 +665,17 @@ function checkIfConditionMatches(node, formValues, formFields) {
     if (currentProperty.enum) {
       return currentProperty.enum.includes(value);
     }
-    const { inputType } = getField(name, formFields);
-    return validateFieldSchema({ ...currentProperty, inputType, required: true }, value);
+    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.
+        ...currentProperty,
+        inputType: field.inputType,
+        required: true
+      },
+      value
+    );
   });
 }
 function isFieldFilled(fieldValue) {

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703082439
- Generated: Mon, 03 Jul 2023 08:24:57 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703195833
+ Generated: Mon, 03 Jul 2023 19:58:43 GMT
 
  MIT License
 
@@ -405,7 +405,11 @@ var getOptionsAllowed = (field) => {
   if (isOptionalWithNull) {
     return [...optionsBroken, null];
   }
-  return optionsBroken;
+  return [
+    ...optionsBroken,
+    null
+    // [3]
+  ];
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
@@ -625,8 +629,17 @@ function checkIfConditionMatches(node, formValues, formFields) {
     if (currentProperty.enum) {
       return currentProperty.enum.includes(value);
     }
-    const { inputType } = getField(name, formFields);
-    return validateFieldSchema({ ...currentProperty, inputType, required: true }, value);
+    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.
+        ...currentProperty,
+        inputType: field.inputType,
+        required: true
+      },
+      value
+    );
   });
 }
 function isFieldFilled(fieldValue) {

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703082439
- Generated: Mon, 03 Jul 2023 08:24:57 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.1-dev.20230703195833
+ Generated: Mon, 03 Jul 2023 19:58:43 GMT
 
  MIT License
 
@@ -11381,7 +11381,11 @@ var getOptionsAllowed = (field) => {
   if (isOptionalWithNull) {
     return [...optionsBroken, null];
   }
-  return optionsBroken;
+  return [
+    ...optionsBroken,
+    null
+    // [3]
+  ];
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
@@ -11601,8 +11605,17 @@ function checkIfConditionMatches(node, formValues, formFields) {
     if (currentProperty.enum) {
       return currentProperty.enum.includes(value);
     }
-    const { inputType } = getField(name, formFields);
-    return validateFieldSchema({ ...currentProperty, inputType, required: true }, value);
+    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.
+        ...currentProperty,
+        inputType: field.inputType,
+        required: true
+      },
+      value
+    );
   });
 }
 function isFieldFilled(fieldValue) {

package/package.json

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

package/src/tests/createHeadlessForm.test.js

@@ -852,26 +852,31 @@ describe('createHeadlessForm', () => {
         expect(validateForm({ has_car: '' })).toBeUndefined();
       }
 
-      it('with null option (as Remote)', () => {
-        const { handleValidation } = createHeadlessForm(schemaInputRadioOptionalNull);
+      it('normal optional (conventional way)', () => {
+        const { handleValidation } = createHeadlessForm(schemaInputRadioOptionalConventional);
         const validateForm = (vals) => friendlyError(handleValidation(vals));
 
         assertCommonBehavior(validateForm);
 
-        // Accepts null value
+        // Accepts null, even though it shoudln't @BUG RMT-518
+        // This is for cases where we (Remote) still have incorrect
+        // JSON Schemas in our Platform.
         expect(validateForm({ has_car: null })).toBeUndefined();
+        // Expected:
+        // // Does NOT accept null value
+        // expect(validateForm({ has_car: null })).toEqual({
+        //   has_car: 'The option null is not valid.',
+        // });
       });
 
-      it('without null option (conventional way)', () => {
-        const { handleValidation } = createHeadlessForm(schemaInputRadioOptionalConventional);
+      it('with null option (as Remote does)', () => {
+        const { handleValidation } = createHeadlessForm(schemaInputRadioOptionalNull);
         const validateForm = (vals) => friendlyError(handleValidation(vals));
 
         assertCommonBehavior(validateForm);
 
-        // Does NOT accept null value
-        expect(validateForm({ has_car: null })).toEqual({
-          has_car: 'The option null is not valid.',
-        });
+        // Accepts null value
+        expect(validateForm({ has_car: null })).toBeUndefined();
       });
     });
 

package/src/tests/helpers.custom.js

@@ -200,7 +200,7 @@ export const schemaInputTypeHidden = {
       ...mockSelectInputSolo,
       title: 'Select hidden',
       'x-jsf-presentation': { inputType: 'hidden' },
-      default: 'Travel Bonus',
+      default: 'chr',
     },
     a_hidden_select_multiple: {
       ...schemaInputTypeCountriesMultiple.properties.nationality,

package/src/tests/helpers.js

@@ -1696,7 +1696,7 @@ export const schemaWithConditionalToFieldset = {
   properties: {
     work_hours_per_week: {
       title: 'Hours per week',
-      type: 'string',
+      type: 'number',
       description: 'Above 30 hours, the Perk>Food options change, and PTO is required.',
       'x-jsf-presentation': {
         inputType: 'number',
@@ -1704,7 +1704,7 @@ export const schemaWithConditionalToFieldset = {
     },
     pto: {
       title: 'Time-off (days)',
-      type: 'string',
+      type: 'number',
       'x-jsf-presentation': {
         inputType: 'number',
       },