do not invalidate a numeric range field if it is unset and not required (#1478)
Co-authored-by: jasquat <jasquat@users.noreply.github.com>
This commit is contained in:
parent
fa8f46d04b
commit
b9e70d12a6
|
@ -256,6 +256,7 @@ export default function CustomForm({
|
|||
errors: any,
|
||||
jsonSchema: any,
|
||||
_uiSchemaPassedIn?: any
|
||||
// eslint-disable-next-line sonarjs/cognitive-complexity
|
||||
) => {
|
||||
if (
|
||||
jsonSchema.required &&
|
||||
|
@ -265,9 +266,9 @@ export default function CustomForm({
|
|||
) {
|
||||
errors[propertyKey].addError('must have valid Minimum and Maximum');
|
||||
}
|
||||
if (formDataToCheck[propertyKey].min) {
|
||||
if (
|
||||
!formDataToCheck[propertyKey].min?.toString().match(matchNumberRegex) ||
|
||||
!formDataToCheck[propertyKey].max?.toString().match(matchNumberRegex)
|
||||
!formDataToCheck[propertyKey].min.toString().match(matchNumberRegex)
|
||||
) {
|
||||
errors[propertyKey].addError('must have valid numbers');
|
||||
}
|
||||
|
@ -287,6 +288,13 @@ export default function CustomForm({
|
|||
`must have min less than or equal to ${jsonSchema.properties[propertyKey].maximum}`
|
||||
);
|
||||
}
|
||||
}
|
||||
if (formDataToCheck[propertyKey].max) {
|
||||
if (
|
||||
!formDataToCheck[propertyKey].max.toString().match(matchNumberRegex)
|
||||
) {
|
||||
errors[propertyKey].addError('must have valid numbers');
|
||||
}
|
||||
if (
|
||||
formDataToCheck[propertyKey].max <
|
||||
jsonSchema.properties[propertyKey].minimum
|
||||
|
@ -303,6 +311,7 @@ export default function CustomForm({
|
|||
`must have max less than or equal to ${jsonSchema.properties[propertyKey].maximum}`
|
||||
);
|
||||
}
|
||||
}
|
||||
if (formDataToCheck[propertyKey].min > formDataToCheck[propertyKey].max) {
|
||||
errors[propertyKey].addError(`must have min less than or equal to max`);
|
||||
}
|
||||
|
|
|
@ -83,6 +83,9 @@ export default function NumericRangeField({
|
|||
};
|
||||
|
||||
const parseNumberString = (numberString: string) => {
|
||||
if (!numberString.match(matchNumberRegex)) {
|
||||
return numberString;
|
||||
}
|
||||
if (
|
||||
(numberString === '-' && numberString.length === 1) ||
|
||||
numberString.endsWith('.')
|
||||
|
|
Loading…
Reference in New Issue