diff --git a/packages/codegen-ui-react/lib/__tests__/forms/validation.test.ts b/packages/codegen-ui-react/lib/__tests__/forms/validation.test.ts index 2f5b20fb9..0c3308de8 100644 --- a/packages/codegen-ui-react/lib/__tests__/forms/validation.test.ts +++ b/packages/codegen-ui-react/lib/__tests__/forms/validation.test.ts @@ -84,14 +84,14 @@ describe('validateField tests', () => { }); it('should validate LESS_THAN_CHAR_LENGTH type', () => { expect( - validateField('123', [{ type: ValidationTypes.LESS_THAN_CHAR_LENGTH, numValues: [4], validationMessage: '' }]), + validateField('123', [{ type: ValidationTypes.LESS_THAN_CHAR_LENGTH, numValues: [3], validationMessage: '' }]), ).toEqual({ hasError: false }); expect( validateField('', [{ type: ValidationTypes.LESS_THAN_CHAR_LENGTH, numValues: [3], validationMessage: '' }]), ).toEqual({ hasError: false }); expect( validateField('23445', [{ type: ValidationTypes.LESS_THAN_CHAR_LENGTH, numValues: [3], validationMessage: '' }]), - ).toEqual({ hasError: true, errorMessage: 'The value must be shorter than 3' }); + ).toEqual({ hasError: true, errorMessage: 'The value must be 3 characters or fewer' }); }); it('should validate GREATER_THAN_CHAR_LENGTH type', () => { expect( diff --git a/packages/codegen-ui-react/lib/utils/forms/validation.ts b/packages/codegen-ui-react/lib/utils/forms/validation.ts index a2d0d31f2..4c704841d 100644 --- a/packages/codegen-ui-react/lib/utils/forms/validation.ts +++ b/packages/codegen-ui-react/lib/utils/forms/validation.ts @@ -38,13 +38,15 @@ const checkValidation = (value: any, validation: FieldValidationConfiguration) = switch (validation.type) { case 'LessThanChar': return { - hasError: !(value.length < validation.numValues[0]), - errorMessage: validation.validationMessage || `The value must be shorter than ${validation.numValues[0]}`, + hasError: !(value.length <= validation.numValues[0]), + errorMessage: + validation.validationMessage || `The value must be ${validation.numValues[0]} characters or fewer`, }; case 'GreaterThanChar': return { hasError: !(value.length > validation.numValues[0]), - errorMessage: validation.validationMessage || `The value must be longer than ${validation.numValues[0]}`, + errorMessage: + validation.validationMessage || `The value must be at least ${validation.numValues[0]} characters`, }; case 'LessThanNum': return { @@ -459,7 +461,7 @@ export const generateValidationFunction = () => { factory.createIdentifier('value'), factory.createIdentifier('length'), ), - factory.createToken(ts.SyntaxKind.LessThanToken), + factory.createToken(ts.SyntaxKind.LessThanEqualsToken), factory.createElementAccessExpression( factory.createPropertyAccessExpression( factory.createIdentifier('validation'),