From 1506eed20422a1b199b3bd7df478c315cbd19f3e Mon Sep 17 00:00:00 2001
From: jasquat <2487833+jasquat@users.noreply.github.com>
Date: Tue, 6 Jun 2023 21:25:54 -0400
Subject: [PATCH] allow specifying multiple minimum date checks for a field w/
 burnettk (#305)

* allow specifying multiple minimum date checks for a field w/ burnettk

* show title of field to compare minimum date with

---------

Co-authored-by: jasquat <jasquat@users.noreply.github.com>
---
 .../src/routes/TaskShow.tsx                   | 58 +++++++++++++------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/spiffworkflow-frontend/src/routes/TaskShow.tsx b/spiffworkflow-frontend/src/routes/TaskShow.tsx
index 15d9c2d60..75ffa9bfe 100644
--- a/spiffworkflow-frontend/src/routes/TaskShow.tsx
+++ b/spiffworkflow-frontend/src/routes/TaskShow.tsx
@@ -211,11 +211,12 @@ export default function TaskShow() {
   const checkFieldComparisons = (
     formData: any,
     propertyKey: string,
-    propertyMetadata: any,
+    minimumDateCheck: string,
     formattedDateString: string,
-    errors: any
+    errors: any,
+    jsonSchema: any
   ) => {
-    const fieldIdentifierToCompareWith = propertyMetadata.minimumDate.replace(
+    const fieldIdentifierToCompareWith = minimumDateCheck.replace(
       /^field:/,
       ''
     );
@@ -224,8 +225,16 @@ export default function TaskShow() {
       if (dateToCompareWith) {
         const dateStringToCompareWith = formatDateString(dateToCompareWith);
         if (dateStringToCompareWith > formattedDateString) {
+          let fieldToCompareWithTitle = fieldIdentifierToCompareWith;
+          if (
+            fieldIdentifierToCompareWith in jsonSchema.properties &&
+            jsonSchema.properties[fieldIdentifierToCompareWith].title
+          ) {
+            fieldToCompareWithTitle =
+              jsonSchema.properties[fieldIdentifierToCompareWith].title;
+          }
           errors[propertyKey].addError(
-            `must be equal to or greater than '${fieldIdentifierToCompareWith}'`
+            `must be equal to or greater than '${fieldToCompareWithTitle}'`
           );
         }
       } else {
@@ -244,25 +253,30 @@ export default function TaskShow() {
     formData: any,
     propertyKey: string,
     propertyMetadata: any,
-    errors: any
+    errors: any,
+    jsonSchema: any
   ) => {
     const dateString = formData[propertyKey];
     if (dateString) {
       const formattedDateString = formatDateString(dateString);
-      if (propertyMetadata.minimumDate === 'today') {
-        const dateTodayString = formatDateString();
-        if (dateTodayString > formattedDateString) {
-          errors[propertyKey].addError('must be today or after');
+      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(
+            formData,
+            propertyKey,
+            mdc,
+            formattedDateString,
+            errors,
+            jsonSchema
+          );
         }
-      } else if (propertyMetadata.minimumDate.startsWith('field:')) {
-        checkFieldComparisons(
-          formData,
-          propertyKey,
-          propertyMetadata,
-          formattedDateString,
-          errors
-        );
-      }
+      });
     }
   };
 
@@ -281,7 +295,13 @@ export default function TaskShow() {
       Object.keys(jsonSchemaToUse.properties).forEach((propertyKey: string) => {
         const propertyMetadata = jsonSchemaToUse.properties[propertyKey];
         if ('minimumDate' in propertyMetadata) {
-          checkMinimumDate(formData, propertyKey, propertyMetadata, errors);
+          checkMinimumDate(
+            formData,
+            propertyKey,
+            propertyMetadata,
+            errors,
+            jsonSchemaToUse
+          );
         }
 
         // recurse through all nested properties as well