From 9ff40cc288f4334c1c56969e6d8e92a7874a9290 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 3 Feb 2021 10:05:32 +0000
Subject: [PATCH] Fix form validation sometimes being applied erroneously

---
 packages/standard-components/src/forms/validation.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/standard-components/src/forms/validation.js b/packages/standard-components/src/forms/validation.js
index 0bc926efa6..ee21dc69e8 100644
--- a/packages/standard-components/src/forms/validation.js
+++ b/packages/standard-components/src/forms/validation.js
@@ -1,4 +1,5 @@
 import flatpickr from "flatpickr"
+import { isEmpty } from "lodash/fp"
 
 export const createValidatorFromConstraints = (constraints, field, table) => {
   let checks = []
@@ -19,27 +20,27 @@ export const createValidatorFromConstraints = (constraints, field, table) => {
     }
 
     // Min / max number constraint
-    if (constraints.numericality?.greaterThanOrEqualTo != null) {
+    if (!isEmpty(constraints.numericality?.greaterThanOrEqualTo)) {
       const min = constraints.numericality.greaterThanOrEqualTo
       checks.push(numericalConstraint(x => x >= min, `Minimum value is ${min}`))
     }
-    if (constraints.numericality?.lessThanOrEqualTo != null) {
+    if (!isEmpty(constraints.numericality?.lessThanOrEqualTo)) {
       const max = constraints.numericality.lessThanOrEqualTo
       checks.push(numericalConstraint(x => x <= max, `Maximum value is ${max}`))
     }
 
     // Inclusion constraint
-    if (constraints.inclusion != null) {
+    if (!isEmpty(constraints.inclusion)) {
       const options = constraints.inclusion
       checks.push(inclusionConstraint(options))
     }
 
     // Date constraint
-    if (constraints.datetime?.earliest != null) {
+    if (!isEmpty(constraints.datetime?.earliest)) {
       const limit = constraints.datetime.earliest
       checks.push(dateConstraint(limit, true))
     }
-    if (constraints.datetime?.latest != null) {
+    if (!isEmpty(constraints.datetime?.latest)) {
       const limit = constraints.datetime.latest
       checks.push(dateConstraint(limit, false))
     }