From 0b296f4c461be17e4ed3064ea10e9eab5d150616 Mon Sep 17 00:00:00 2001
From: jasquat <2487833+jasquat@users.noreply.github.com>
Date: Wed, 3 Jan 2024 14:37:29 -0500
Subject: [PATCH] added validation for maximum date w/ burnettk (#851)

* added validation for maximum date w/ burnettk

* Update spiffworkflow-frontend/src/components/CustomForm.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update spiffworkflow-frontend/src/components/CustomForm.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: jasquat <jasquat@users.noreply.github.com>
Co-authored-by: Kevin Burnett <18027+burnettk@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .../src/components/CustomForm.tsx             | 130 +++++++++++++-----
 1 file changed, 96 insertions(+), 34 deletions(-)

diff --git a/spiffworkflow-frontend/src/components/CustomForm.tsx b/spiffworkflow-frontend/src/components/CustomForm.tsx
index 14102e509..de6feda6c 100644
--- a/spiffworkflow-frontend/src/components/CustomForm.tsx
+++ b/spiffworkflow-frontend/src/components/CustomForm.tsx
@@ -8,6 +8,11 @@ import TypeaheadWidget from '../rjsf/custom_widgets/TypeaheadWidget/TypeaheadWid
 import MarkDownFieldWidget from '../rjsf/custom_widgets/MarkDownFieldWidget/MarkDownFieldWidget';
 import NumericRangeField from '../rjsf/custom_widgets/NumericRangeField/NumericRangeField';
 
+enum DateCheckType {
+  minimum = 'minimum',
+  maximum = 'maximum',
+}
+
 type OwnProps = {
   id: string;
   formData: any;
@@ -53,9 +58,10 @@ export default function CustomForm({
   };
 
   const checkFieldComparisons = (
+    checkType: DateCheckType,
     formDataToCheck: any,
     propertyKey: string,
-    minimumDateCheck: string,
+    dateCheck: string,
     formattedDateString: string,
     errors: any,
     jsonSchema: any
@@ -67,8 +73,7 @@ export default function CustomForm({
     //    field:[field_name_to_use]:[start or end]
     //
     // defaults to "start" in all cases
-    const [_, fieldIdentifierToCompareWith, startOrEnd] =
-      minimumDateCheck.split(':');
+    const [_, fieldIdentifierToCompareWith, startOrEnd] = dateCheck.split(':');
     if (!(fieldIdentifierToCompareWith in formDataToCheck)) {
       errors[propertyKey].addError(
         `was supposed to be compared against '${fieldIdentifierToCompareWith}' but it either doesn't have a value or does not exist`
@@ -100,23 +105,72 @@ export default function CustomForm({
       return;
     }
 
+    let fieldToCompareWithTitle = fieldIdentifierToCompareWith;
+    if (
+      fieldIdentifierToCompareWith in jsonSchema.properties &&
+      jsonSchema.properties[fieldIdentifierToCompareWith].title
+    ) {
+      fieldToCompareWithTitle =
+        jsonSchema.properties[fieldIdentifierToCompareWith].title;
+    }
+
     const dateStringToCompareWith = formatDateString(dateToCompareWith);
-    if (dateStringToCompareWith > formattedDateString) {
-      let fieldToCompareWithTitle = fieldIdentifierToCompareWith;
-      if (
-        fieldIdentifierToCompareWith in jsonSchema.properties &&
-        jsonSchema.properties[fieldIdentifierToCompareWith].title
-      ) {
-        fieldToCompareWithTitle =
-          jsonSchema.properties[fieldIdentifierToCompareWith].title;
+    if (checkType === 'minimum') {
+      if (dateStringToCompareWith > formattedDateString) {
+        errors[propertyKey].addError(
+          `must be equal to or greater than '${fieldToCompareWithTitle}'`
+        );
+      }
+      // best NOT to merge this with nested if statement in case we add more or move code around
+      // eslint-disable-next-line sonarjs/no-collapsible-if
+    } else if (checkType === 'maximum') {
+      if (dateStringToCompareWith < formattedDateString) {
+        errors[propertyKey].addError(
+          `must be equal to or less than '${fieldToCompareWithTitle}'`
+        );
       }
-      errors[propertyKey].addError(
-        `must be equal to or greater than '${fieldToCompareWithTitle}'`
-      );
     }
   };
 
-  const checkMinimumDate = (
+  const runDateChecks = (
+    checkType: DateCheckType,
+    dateChecks: string[],
+    formDataToCheck: any,
+    propertyKey: string,
+    formattedDateString: string,
+    errors: any,
+    jsonSchema: any
+  ) => {
+    dateChecks.forEach((mdc: string) => {
+      if (mdc === 'today') {
+        const dateTodayString = formatDateString();
+        if (checkType === 'minimum') {
+          if (dateTodayString > formattedDateString) {
+            errors[propertyKey].addError('must be today or after');
+          }
+          // best NOT to merge this with nested if statement in case we add more or move code around
+          // eslint-disable-next-line sonarjs/no-collapsible-if
+        } else if (checkType === 'maximum') {
+          if (dateTodayString < formattedDateString) {
+            errors[propertyKey].addError('must be today or before');
+          }
+        }
+      } else if (mdc.startsWith('field:')) {
+        checkFieldComparisons(
+          checkType,
+          formDataToCheck,
+          propertyKey,
+          mdc,
+          formattedDateString,
+          errors,
+          jsonSchema
+        );
+      }
+    });
+  };
+
+  const checkDateValidations = (
+    checkType: DateCheckType,
     formDataToCheck: any,
     propertyKey: string,
     propertyMetadata: any,
@@ -131,24 +185,21 @@ export default function CustomForm({
         [dateString] = dateString.split(DATE_RANGE_DELIMITER);
       }
       const formattedDateString = formatDateString(dateString);
-      const minimumDateChecks = propertyMetadata.minimumDate.split(',');
-      minimumDateChecks.forEach((mdc: string) => {
-        if (mdc === 'today') {
-          const dateTodayString = formatDateString();
-          if (dateTodayString > formattedDateString) {
-            errors[propertyKey].addError('must be today or after');
-          }
-        } else if (mdc.startsWith('field:')) {
-          checkFieldComparisons(
-            formDataToCheck,
-            propertyKey,
-            mdc,
-            formattedDateString,
-            errors,
-            jsonSchema
-          );
-        }
-      });
+      let dateChecks = null;
+      if (checkType === 'minimum') {
+        dateChecks = propertyMetadata.minimumDate.split(',');
+      } else if (checkType === 'maximum') {
+        dateChecks = propertyMetadata.maximumDate.split(',');
+      }
+      runDateChecks(
+        checkType,
+        dateChecks,
+        formDataToCheck,
+        propertyKey,
+        formattedDateString,
+        errors,
+        jsonSchema
+      );
     }
   };
 
@@ -226,7 +277,18 @@ export default function CustomForm({
           currentUiSchema = uiSchemaToUse[propertyKey];
         }
         if ('minimumDate' in propertyMetadata) {
-          checkMinimumDate(
+          checkDateValidations(
+            DateCheckType.minimum,
+            formDataToCheck,
+            propertyKey,
+            propertyMetadata,
+            errors,
+            jsonSchemaToUse
+          );
+        }
+        if ('maximumDate' in propertyMetadata) {
+          checkDateValidations(
+            DateCheckType.maximum,
             formDataToCheck,
             propertyKey,
             propertyMetadata,