sartography
/
spiff-arena
mirror of https://github.com/sartography/spiff-arena.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
jasquat 2024-05-02 18:08:36 +00:00 committed by GitHub
parent fa8f46d04b
commit b9e70d12a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
spiffworkflow-frontend/src/components/CustomForm.tsx
View File

@ -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,43 +266,51 @@ export default function CustomForm({
) {
errors[propertyKey].addError('must have valid Minimum and Maximum');
}
if (
!formDataToCheck[propertyKey].min?.toString().match(matchNumberRegex) ||
!formDataToCheck[propertyKey].max?.toString().match(matchNumberRegex)
) {
errors[propertyKey].addError('must have valid numbers');
if (formDataToCheck[propertyKey].min) {
if (
!formDataToCheck[propertyKey].min.toString().match(matchNumberRegex)
) {
errors[propertyKey].addError('must have valid numbers');
}
if (
formDataToCheck[propertyKey].min <
jsonSchema.properties[propertyKey].minimum
) {
errors[propertyKey].addError(
`must have min greater than or equal to ${jsonSchema.properties[propertyKey].minimum}`
);
}
if (
formDataToCheck[propertyKey].min >
jsonSchema.properties[propertyKey].maximum
) {
errors[propertyKey].addError(
`must have min less than or equal to ${jsonSchema.properties[propertyKey].maximum}`
);
}
}
if (
formDataToCheck[propertyKey].min <
jsonSchema.properties[propertyKey].minimum
) {
errors[propertyKey].addError(
`must have min greater than or equal to ${jsonSchema.properties[propertyKey].minimum}`
);
}
if (
formDataToCheck[propertyKey].min >
jsonSchema.properties[propertyKey].maximum
) {
errors[propertyKey].addError(
`must have min less than or equal to ${jsonSchema.properties[propertyKey].maximum}`
);
}
if (
formDataToCheck[propertyKey].max <
jsonSchema.properties[propertyKey].minimum
) {
errors[propertyKey].addError(
`must have max greater than or equal to ${jsonSchema.properties[propertyKey].minimum}`
);
}
if (
formDataToCheck[propertyKey].max >
jsonSchema.properties[propertyKey].maximum
) {
errors[propertyKey].addError(
`must have max 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
) {
errors[propertyKey].addError(
`must have max greater than or equal to ${jsonSchema.properties[propertyKey].minimum}`
);
}
if (
formDataToCheck[propertyKey].max >
jsonSchema.properties[propertyKey].maximum
) {
errors[propertyKey].addError(
`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`);

3
spiffworkflow-frontend/src/rjsf/custom_widgets/NumericRangeField/NumericRangeField.tsx
View File

@ -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('.')