mirror of https://github.com/Squidex/squidex.git
Sebastian Stehle
5 years ago
committed by
GitHub
GitHub
14 changed files with 868 additions and 1243 deletions
@ -0,0 +1,191 @@ |
|||
/* |
|||
* Squidex Headless CMS |
|||
* |
|||
* @license |
|||
* Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. |
|||
*/ |
|||
|
|||
import { FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'; |
|||
import { LocalizerService } from './../../services/localizer.service'; |
|||
import { formatError } from './error-formatting'; |
|||
import { ValidatorsEx } from './validators'; |
|||
|
|||
describe('formatErrors', () => { |
|||
const localizer = new LocalizerService({ |
|||
'users.passwordConfirmValidationMessage': 'Passwords must be the same.', |
|||
'validation.between': '{field} must be between \'{min}\' and \'{max}\'.', |
|||
'validation.betweenlength': '{field|upper} must have between {minlength} and {maxlength} item(s).', |
|||
'validation.betweenlengthstring': '{field|upper} must have between {minlength} and {maxlength} character(s).', |
|||
'validation.email': '{field|upper} must be an email address.', |
|||
'validation.exactly': '{field|upper} must be exactly \'{expected}\'.', |
|||
'validation.exactlylength': '{field|upper} must have exactly {expected} item(s).', |
|||
'validation.exactlylengthstring': '{field|upper} must have exactly {expected} character(s).', |
|||
'validation.match': '{message}', |
|||
'validation.max': '{field|upper} must be less or equal to \'{max}\'.', |
|||
'validation.maxlength': '{field|upper} must not have more than {requiredlength} item(s).', |
|||
'validation.maxlengthstring': '{field|upper} must not have more than {requiredlength} character(s).', |
|||
'validation.min': '{field|upper} must be greater or equal to \'{min}\'.', |
|||
'validation.minlength': '{field|upper} must have at least {requiredlength} item(s).', |
|||
'validation.minlengthstring': '{field|upper} must have at least {requiredlength} character(s).', |
|||
'validation.pattern': '{field|upper} does not match to the pattern.', |
|||
'validation.patternmessage': '{message}', |
|||
'validation.required': '{field|upper} is required.', |
|||
'validation.requiredTrue': '{field|upper} is required.', |
|||
'validation.uniquestrings': '{field|upper} must not contain duplicate values.', |
|||
'validation.validarrayvalues': '{field|upper} contains an invalid value: {invalidvalue}.', |
|||
'validation.validdatetime': '{field|upper} is not a valid date time.', |
|||
'validation.validvalues': '{field|upper} is not a valid value.' |
|||
}); |
|||
|
|||
it('should format min', () => { |
|||
const error = validate(1, Validators.min(2)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must be greater or equal to \'2\'.'); |
|||
}); |
|||
|
|||
it('should format max', () => { |
|||
const error = validate(3, Validators.max(2)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must be less or equal to \'2\'.'); |
|||
}); |
|||
|
|||
it('should format required', () => { |
|||
const error = validate(undefined, Validators.required); |
|||
|
|||
expect(error).toEqual('MY_FIELD is required.'); |
|||
}); |
|||
|
|||
it('should format requiredTrue', () => { |
|||
const error = validate(undefined, Validators.requiredTrue); |
|||
|
|||
expect(error).toEqual('MY_FIELD is required.'); |
|||
}); |
|||
|
|||
it('should format email', () => { |
|||
const error = validate('invalid', Validators.email); |
|||
|
|||
expect(error).toEqual('MY_FIELD must be an email address.'); |
|||
}); |
|||
|
|||
it('should format minLength string', () => { |
|||
const error = validate('x', Validators.minLength(2)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must have at least 2 character(s).'); |
|||
}); |
|||
|
|||
it('should format maxLength string', () => { |
|||
const error = validate('xxx', Validators.maxLength(2)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must not have more than 2 character(s).'); |
|||
}); |
|||
|
|||
it('should format minLength array', () => { |
|||
const error = validate([1], Validators.minLength(2)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must have at least 2 item(s).'); |
|||
}); |
|||
|
|||
it('should format maxLength array', () => { |
|||
const error = validate([1, 1, 1], Validators.maxLength(2)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must not have more than 2 item(s).'); |
|||
}); |
|||
|
|||
it('should format match', () => { |
|||
const error = validate('123', Validators.pattern('[A-Z]')); |
|||
|
|||
expect(error).toEqual('MY_FIELD does not match to the pattern.'); |
|||
}); |
|||
|
|||
it('should format match with message', () => { |
|||
const error = validate('123', ValidatorsEx.pattern('[A-Z]', 'Custom Message')); |
|||
|
|||
expect(error).toEqual('Custom Message'); |
|||
}); |
|||
|
|||
it('should format between exactly', () => { |
|||
const error = validate(2, ValidatorsEx.between(3, 3)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must be exactly \'3\'.'); |
|||
}); |
|||
|
|||
it('should format between range', () => { |
|||
const error = validate(2, ValidatorsEx.between(3, 5)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must be between \'3\' and \'5\'.'); |
|||
}); |
|||
|
|||
it('should format betweenLength string exactly', () => { |
|||
const error = validate('xx', ValidatorsEx.betweenLength(3, 3)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must have exactly 3 character(s).'); |
|||
}); |
|||
|
|||
it('should format betweenLength string range', () => { |
|||
const error = validate('xx', ValidatorsEx.betweenLength(3, 5)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must have between 3 and 5 character(s).'); |
|||
}); |
|||
|
|||
it('should format betweenLength array exactly', () => { |
|||
const error = validate([1], ValidatorsEx.betweenLength(3, 3)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must have exactly 3 item(s).'); |
|||
}); |
|||
|
|||
it('should format betweenLength array range', () => { |
|||
const error = validate([1, 1], ValidatorsEx.betweenLength(3, 5)); |
|||
|
|||
expect(error).toEqual('MY_FIELD must have between 3 and 5 item(s).'); |
|||
}); |
|||
|
|||
it('should format validDateTime', () => { |
|||
const error = validate('invalid', ValidatorsEx.validDateTime()); |
|||
|
|||
expect(error).toEqual('MY_FIELD is not a valid date time.'); |
|||
}); |
|||
|
|||
it('should format validValues', () => { |
|||
const error = validate(5, ValidatorsEx.validValues([1, 2, 3])); |
|||
|
|||
expect(error).toEqual('MY_FIELD is not a valid value.'); |
|||
}); |
|||
|
|||
it('should format validArrayValues', () => { |
|||
const error = validate([2, 4], ValidatorsEx.validArrayValues([1, 2, 3])); |
|||
|
|||
expect(error).toEqual('MY_FIELD contains an invalid value: 4.'); |
|||
}); |
|||
|
|||
it('should format uniqueStrings', () => { |
|||
const error = validate(['1', '2', '2', '3'], ValidatorsEx.uniqueStrings()); |
|||
|
|||
expect(error).toEqual('MY_FIELD must not contain duplicate values.'); |
|||
}); |
|||
|
|||
it('should format match', () => { |
|||
const formControl1 = new FormControl(1); |
|||
const formControl2 = new FormControl(2); |
|||
|
|||
const formGroup = new FormGroup({ |
|||
field1: formControl1, |
|||
field2: formControl2 |
|||
}); |
|||
|
|||
const formError = ValidatorsEx.match('field2', 'i18n:users.passwordConfirmValidationMessage')!(formControl1)!; |
|||
const formMessage = formatError(localizer, 'MY_FIELD', Object.keys(formError)[0], Object.values(formError)[0], undefined); |
|||
|
|||
expect(formMessage).toEqual('Passwords must be the same.'); |
|||
|
|||
formGroup.reset(); |
|||
}); |
|||
|
|||
function validate(value: any, validator: ValidatorFn) { |
|||
const formControl = new FormControl(value); |
|||
|
|||
const formError = validator(formControl)!; |
|||
const formMessage = formatError(localizer, 'MY_FIELD', Object.keys(formError)[0], Object.values(formError)[0], value); |
|||
|
|||
return formMessage; |
|||
} |
|||
}); |
|||
@ -0,0 +1,47 @@ |
|||
/* |
|||
* Squidex Headless CMS |
|||
* |
|||
* @license |
|||
* Copyright (c) Sebastian Stehle. All rights r vbeserved |
|||
*/ |
|||
|
|||
import { Types } from '@app/framework/internal'; |
|||
import { LocalizerService } from '@app/shared'; |
|||
|
|||
export function formatError(localizer: LocalizerService, field: string, type: string, properties: any, value: any, errors?: any) { |
|||
type = type.toLowerCase(); |
|||
|
|||
if (Types.isString(value)) { |
|||
if (type === 'minlength') { |
|||
type = 'minlengthstring'; |
|||
} |
|||
|
|||
if (type === 'maxlength') { |
|||
type = 'maxlengthstring'; |
|||
} |
|||
|
|||
if (type === 'exactlylength') { |
|||
type = 'exactlylengthstring'; |
|||
} |
|||
|
|||
if (type === 'betweenlength') { |
|||
type = 'betweenlengthstring'; |
|||
} |
|||
} |
|||
|
|||
let message: string | null = properties['message']; |
|||
|
|||
if (!Types.isString(message) && errors) { |
|||
message = errors[type]; |
|||
} |
|||
|
|||
if (!Types.isString(message)) { |
|||
message = `validation.${type}`; |
|||
} |
|||
|
|||
const args = { ...properties, field }; |
|||
|
|||
message = localizer.getOrKey(message, args); |
|||
|
|||
return message; |
|||
} |
|||
File diff suppressed because it is too large
Loading…
Reference in new issue