@remoteoss/json-schema-form 0.8.1-dev.20240209164254 → 0.8.2-beta.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+#### 0.8.2-beta.0 (2024-02-13)
+
+##### Bug Fixes
+
+* **helpers:**  getFieldOptions - return empty array if oneOf missing in radio ([#67](https://github.com/remoteoss/json-schema-form/pull/67)) ([6511330f](https://github.com/remoteoss/json-schema-form/commit/6511330f55a2accedb1c58a61ff915a3a0186dbb))
+
+#### 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

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.8.1-dev.20240209164254
- Generated: Fri, 09 Feb 2024 16:43:11 GMT
+ NPM Package: @remoteoss/json-schema-form@0.8.2-beta.0
+ Generated: Tue, 13 Feb 2024 11:25:15 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
@@ -1363,8 +1361,8 @@ function getFieldOptions(node, presentation) {
   if (presentation.options) {
     return presentation.options;
   }
-  if (node.oneOf) {
-    return convertToOptions(node.oneOf);
+  if (node.oneOf || presentation.inputType === "radio") {
+    return convertToOptions(node.oneOf || []);
   }
   if (node.items?.anyOf) {
     return convertToOptions(node.items.anyOf);
@@ -1383,7 +1381,7 @@ function extractParametersFromNode(schemaNode) {
   const node = (0, import_omit.default)(schemaNode, ["x-jsf-presentation", "presentation"]);
   const description = presentation?.description || node.description;
   const statementDescription = presentation.statement?.description;
-  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" && node.const === node.default ? { forcedValue: node.const } : {};
+  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" ? { value: node.const } : {};
   return (0, import_omitBy.default)(
     {
       const: node.const,
@@ -1479,10 +1477,9 @@ var handleValuesChange = (fields, jsonSchema, config, logic) => (values) => {
   };
 };
 function getDecoratedComputedAttributes(computedAttributes) {
-  const isEqualConstAndDefault = computedAttributes?.const === computedAttributes?.default;
   return {
     ...computedAttributes ?? {},
-    ...computedAttributes?.const && computedAttributes?.default && isEqualConstAndDefault ? { forcedValue: computedAttributes.const } : {}
+    ...computedAttributes?.const && computedAttributes?.default ? { value: computedAttributes.const } : {}
   };
 }
 

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.8.1-dev.20240209164254
- Generated: Fri, 09 Feb 2024 16:43:11 GMT
+ NPM Package: @remoteoss/json-schema-form@0.8.2-beta.0
+ Generated: Tue, 13 Feb 2024 11:25:15 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
@@ -1327,8 +1325,8 @@ function getFieldOptions(node, presentation) {
   if (presentation.options) {
     return presentation.options;
   }
-  if (node.oneOf) {
-    return convertToOptions(node.oneOf);
+  if (node.oneOf || presentation.inputType === "radio") {
+    return convertToOptions(node.oneOf || []);
   }
   if (node.items?.anyOf) {
     return convertToOptions(node.items.anyOf);
@@ -1347,7 +1345,7 @@ function extractParametersFromNode(schemaNode) {
   const node = omit(schemaNode, ["x-jsf-presentation", "presentation"]);
   const description = presentation?.description || node.description;
   const statementDescription = presentation.statement?.description;
-  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" && node.const === node.default ? { forcedValue: node.const } : {};
+  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" ? { value: node.const } : {};
   return omitBy(
     {
       const: node.const,
@@ -1443,10 +1441,9 @@ var handleValuesChange = (fields, jsonSchema, config, logic) => (values) => {
   };
 };
 function getDecoratedComputedAttributes(computedAttributes) {
-  const isEqualConstAndDefault = computedAttributes?.const === computedAttributes?.default;
   return {
     ...computedAttributes ?? {},
-    ...computedAttributes?.const && computedAttributes?.default && isEqualConstAndDefault ? { forcedValue: computedAttributes.const } : {}
+    ...computedAttributes?.const && computedAttributes?.default ? { value: computedAttributes.const } : {}
   };
 }
 

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.8.1-dev.20240209164254
- Generated: Fri, 09 Feb 2024 16:43:11 GMT
+ NPM Package: @remoteoss/json-schema-form@0.8.2-beta.0
+ Generated: Tue, 13 Feb 2024 11:25:15 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
@@ -12681,8 +12679,8 @@ function getFieldOptions(node, presentation) {
   if (presentation.options) {
     return presentation.options;
   }
-  if (node.oneOf) {
-    return convertToOptions(node.oneOf);
+  if (node.oneOf || presentation.inputType === "radio") {
+    return convertToOptions(node.oneOf || []);
   }
   if (node.items?.anyOf) {
     return convertToOptions(node.items.anyOf);
@@ -12701,7 +12699,7 @@ function extractParametersFromNode(schemaNode) {
   const node = (0, import_omit.default)(schemaNode, ["x-jsf-presentation", "presentation"]);
   const description = presentation?.description || node.description;
   const statementDescription = presentation.statement?.description;
-  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" && node.const === node.default ? { forcedValue: node.const } : {};
+  const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" ? { value: node.const } : {};
   return (0, import_omitBy.default)(
     {
       const: node.const,
@@ -12797,10 +12795,9 @@ var handleValuesChange = (fields, jsonSchema, config, logic) => (values2) => {
   };
 };
 function getDecoratedComputedAttributes(computedAttributes) {
-  const isEqualConstAndDefault = computedAttributes?.const === computedAttributes?.default;
   return {
     ...computedAttributes ?? {},
-    ...computedAttributes?.const && computedAttributes?.default && isEqualConstAndDefault ? { forcedValue: computedAttributes.const } : {}
+    ...computedAttributes?.const && computedAttributes?.default ? { value: computedAttributes.const } : {}
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.8.1-dev.20240209164254",
+  "version": "0.8.2-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/const.test.js

@@ -112,7 +112,7 @@ describe('validations: const', () => {
       },
       { strictInputType: false }
     );
-    expect(fields[0]).toMatchObject({ forcedValue: 10, const: 10, default: 10 });
+    expect(fields[0]).toMatchObject({ value: 10, const: 10, default: 10 });
   });
 });
 
@@ -130,7 +130,7 @@ describe('const/default with forced values', () => {
     expect(handleValidation({ zero_only: 1 }).formErrors).toEqual({
       zero_only: 'The only accepted value is 0.',
     });
-    expect(fields[0]).toMatchObject({ forcedValue: 0, const: 0, default: 0 });
+    expect(fields[0]).toMatchObject({ value: 0, const: 0, default: 0 });
     expect(handleValidation({ zero_only: 0 }).formErrors).toBeUndefined();
     // null is also considered valid until we fix @BUG RMT-518
     // Expectation: To fail with error "The only accepted value is 0."
@@ -151,21 +151,9 @@ describe('const/default with forced values', () => {
       ten_only: 'The only accepted value is 10.',
     });
     expect(handleValidation({ ten_only: 10 }).formErrors).toBeUndefined();
-    expect(fields[0]).toMatchObject({ forcedValue: 10, const: 10, default: 10 });
+    expect(fields[0]).toMatchObject({ value: 10, const: 10, default: 10 });
     // null is also considered valid until we fix @BUG RMT-518
     // Expectation: To fail with error "The only accepted value is 10."
     expect(handleValidation({ ten_only: null }).formErrors).toBeUndefined();
   });
-
-  it('do not set a forced value if const and default do not equal', () => {
-    const { fields } = createHeadlessForm(
-      {
-        properties: {
-          bad_field_for_number: { type: 'number', const: 10, default: 20 },
-        },
-      },
-      { strictInputType: false }
-    );
-    expect(fields[0]).not.toMatchObject({ forcedValue: expect.any(Number) });
-  });
 });

package/src/tests/createHeadlessForm.test.js

@@ -13,6 +13,7 @@ import {
   schemaInputRadioOptionalNull,
   schemaInputRadioOptionalConventional,
   schemaInputTypeRadioOptionsWithDetails,
+  schemaInputTypeRadioWithoutOptions,
   schemaInputTypeSelectSoloDeprecated,
   schemaInputTypeSelectSolo,
   schemaInputTypeSelectMultipleDeprecated,
@@ -902,6 +903,15 @@ describe('createHeadlessForm', () => {
       ]);
     });
 
+    it('support "radio" field type without oneOf options', () => {
+      const result = createHeadlessForm(schemaInputTypeRadioWithoutOptions);
+
+      expect(result.fields).toHaveLength(1);
+
+      const fieldOptions = result.fields[0].options;
+      expect(fieldOptions).toEqual([]);
+    });
+
     it('support "number" field type', () => {
       const result = createHeadlessForm(schemaInputTypeNumber);
       expect(result).toMatchObject({

package/src/tests/helpers.js

@@ -923,6 +923,18 @@ export const schemaInputTypeRadioOptionsWithDetails = {
   },
 };
 
+export const schemaInputTypeRadioWithoutOptions = {
+  properties: {
+    health_perks: {
+      title: 'Health perks',
+      description:
+        'This example contains options with more custom details, under the x-jsf-presentation key',
+      'x-jsf-presentation': { inputType: 'radio' },
+      type: 'string',
+    },
+  },
+};
+
 /** @deprecated */
 export const schemaInputTypeSelectSoloDeprecated = JSONSchemaBuilder()
   .addInput({

package/src/tests/jsonLogic.fixtures.js

@@ -227,35 +227,6 @@ export const schemaWithComputedAttributes = {
   },
 };
 
-export const badSchemaThatWillNotSetAForcedValue = {
-  properties: {
-    field_a: {
-      type: 'number',
-    },
-    field_b: {
-      type: 'number',
-      'x-jsf-logic-computedAttrs': {
-        const: 'a_times_three',
-        default: 'a_times_two',
-      },
-    },
-  },
-  'x-jsf-logic': {
-    computedValues: {
-      a_times_two: {
-        rule: {
-          '*': [{ var: 'field_a' }, 2],
-        },
-      },
-      a_times_three: {
-        rule: {
-          '*': [{ var: 'field_a' }, 3],
-        },
-      },
-    },
-  },
-};
-
 export const schemaWithInlineRuleForComputedAttributeWithoutCopy = {
   properties: {
     field_a: {

package/src/tests/jsonLogic.test.js

@@ -35,7 +35,6 @@ import {
   schemaWithUnknownVariableInComputedValues,
   schemaWithUnknownVariableInValidations,
   schemaWithValidationThatDoesNotExistOnProperty,
-  badSchemaThatWillNotSetAForcedValue,
 } from './jsonLogic.fixtures';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 
@@ -336,21 +335,12 @@ describe('jsonLogic: cross-values validations', () => {
         'This field is 2 times bigger than field_a with value of 4.'
       );
       expect(fieldB.default).toEqual(4);
-      expect(fieldB.forcedValue).toEqual(4);
+      expect(fieldB.value).toEqual(4);
       handleValidation({ field_a: 4 });
       expect(fieldB.default).toEqual(8);
       expect(fieldB.label).toEqual('This is 8!');
     });
 
-    it('A forced value will not be set when const and default are not equal', () => {
-      const { fields } = createHeadlessForm(badSchemaThatWillNotSetAForcedValue, {
-        strictInputType: false,
-        initialValues: { field_a: 2 },
-      });
-      expect(fields[1]).toMatchObject({ const: 6, default: 4 });
-      expect(fields[1]).not.toMatchObject({ forcedValue: expect.any(Number) });
-    });
-
     it('Derived errorMessages and statements work', () => {
       const { fields, handleValidation } = createHeadlessForm(
         schemaWithComputedAttributesAndErrorMessages,