fix(json-schema): unset required pros to array type (#3939)

fix #3914
ngx-formly · Jun 9, 2024 · 32d9fb3 · jma · Jun 10, 2024 · aitboudad
1 parent bdd1299
commit 32d9fb3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/src/core/json-schema/src/formly-json-schema.service.spec.ts b/src/core/json-schema/src/formly-json-schema.service.spec.ts
@@ -981,8 +981,8 @@ describe('Service: FormlyJsonschema', () => {
  const expectedConfig: FormlyFieldConfig = {
  type: 'array',
  defaultValue: undefined,
- props: { ...emmptyFieldProps, required: true },
- templateOptions: { ...emmptyFieldProps, required: true },
+ props: { ...emmptyFieldProps },
+ templateOptions: { ...emmptyFieldProps },
  fieldArray: expect.any(Function),
  validators: expectTypeValidator(['array']),
  };
@@ -2023,6 +2023,25 @@ describe('Service: FormlyJsonschema', () => {
  field.props.required = true;
  expect(parser('', field)).toEqual('');
  });
+ it('should set non required string to undefined when is empty', () => {
+ const { field } = renderComponent({
+ schema: { type: 'string' },
+ });
+
+ const parser = field.parsers[0] as any;
+
+ expect(parser('', field)).toEqual(undefined);
+ field.props.required = true;
+ expect(parser('', field)).toEqual('');
+ });
+
+ it('should set required string when minLength is set', () => {
+ const { field } = renderComponent({
+ schema: { type: 'string', minLength: 1 },
+ });
+
+ expect(field.props.required).toBeTrue();
+ });
  });
 });
 

diff --git a/src/core/json-schema/src/formly-json-schema.service.ts b/src/core/json-schema/src/formly-json-schema.service.ts
@@ -273,6 +273,10 @@ export class FormlyJsonschema {
  break;
  }
  case 'string': {
+ if (!field.props.required && schema.minLength === 1) {
+ field.props.required = true;
+ }
+
  field.parsers = [
  (v, f: FormlyFieldConfig) => {
  if (types.indexOf('null') !== -1) {
@@ -451,8 +455,6 @@ export class FormlyJsonschema {
  f.key = null;
  }
 
- f.props.required = true;
-
  return f;
  }