CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-30 12:00:31 +12:00
Code Issues Projects Releases Wiki Activity

Fix form constraints not being applied correctly

Browse source
This commit is contained in:
Andrew Kingston 2021-02-04 15:23:26 +00:00
parent 71da755b30
commit 725d13cad3
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/standard-components/src/forms/validation.js
View file

@ -1,5 +1,4 @@
import flatpickr from "flatpickr" import flatpickr from "flatpickr"
import { isEmpty } from "lodash/fp"
export const createValidatorFromConstraints = (constraints, field, table) => { export const createValidatorFromConstraints = (constraints, field, table) => {
let checks = [] let checks = []
@ -14,33 +13,33 @@ export const createValidatorFromConstraints = (constraints, field, table) => {
} }
// String length constraint // String length constraint
if (constraints.length?.maximum) { if (exists(constraints.length?.maximum)) {
const length = constraints.length.maximum const length = constraints.length.maximum
checks.push(lengthConstraint(length)) checks.push(lengthConstraint(length))
} }
// Min / max number constraint // Min / max number constraint
if (!isEmpty(constraints.numericality?.greaterThanOrEqualTo)) { if (exists(constraints.numericality?.greaterThanOrEqualTo)) {
const min = constraints.numericality.greaterThanOrEqualTo const min = constraints.numericality.greaterThanOrEqualTo
checks.push(numericalConstraint(x => x >= min, `Minimum value is ${min}`)) checks.push(numericalConstraint(x => x >= min, `Minimum value is ${min}`))
} }
if (!isEmpty(constraints.numericality?.lessThanOrEqualTo)) { if (exists(constraints.numericality?.lessThanOrEqualTo)) {
const max = constraints.numericality.lessThanOrEqualTo const max = constraints.numericality.lessThanOrEqualTo
checks.push(numericalConstraint(x => x <= max, `Maximum value is ${max}`)) checks.push(numericalConstraint(x => x <= max, `Maximum value is ${max}`))
} }
// Inclusion constraint // Inclusion constraint
if (!isEmpty(constraints.inclusion)) { if (exists(constraints.inclusion)) {
const options = constraints.inclusion const options = constraints.inclusion
checks.push(inclusionConstraint(options)) checks.push(inclusionConstraint(options))
} }
// Date constraint // Date constraint
if (!isEmpty(constraints.datetime?.earliest)) { if (exists(constraints.datetime?.earliest)) {
const limit = constraints.datetime.earliest const limit = constraints.datetime.earliest
checks.push(dateConstraint(limit, true)) checks.push(dateConstraint(limit, true))
} }
if (!isEmpty(constraints.datetime?.latest)) { if (exists(constraints.datetime?.latest)) {
const limit = constraints.datetime.latest const limit = constraints.datetime.latest
checks.push(dateConstraint(limit, false)) checks.push(dateConstraint(limit, false))
} }
@ -58,6 +57,8 @@ export const createValidatorFromConstraints = (constraints, field, table) => {
} }
} }
const exists = value => value != null && value !== ""
const presenceConstraint = value => { const presenceConstraint = value => {
let invalid let invalid
if (Array.isArray(value)) { if (Array.isArray(value)) {