From cc095d483801f4a48ccce780100a68efdcdf65e7 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Thu, 1 Feb 2024 16:50:08 -0800
Subject: [PATCH 01/41] Automatically indicate required text fields

---
 .../formflow/library/ScreenController.java    |  2 ++
 .../formflow/library/ValidationService.java   | 27 ++++++++++++++++---
 .../form-flow/0.0.1/css/libraryStyles.css     |  5 ++++
 .../templates/fragments/inputs/text.html      |  9 +++++--
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/main/java/formflow/library/ScreenController.java b/src/main/java/formflow/library/ScreenController.java
index ec7a6e329..7dd8e38e1 100644
--- a/src/main/java/formflow/library/ScreenController.java
+++ b/src/main/java/formflow/library/ScreenController.java
@@ -868,6 +868,8 @@ private Map<String, Object> createModel(String flow, String screen, HttpSession
     if (RequestContextUtils.getInputFlashMap(request) != null) {
       model.put("lockedSubmissionMessage", RequestContextUtils.getInputFlashMap(request).get("lockedSubmissionMessage"));
     }
+    
+    model.put("requiredInputs", ValidationService.getRequiredInputs(flow));
 
     return model;
   }
diff --git a/src/main/java/formflow/library/ValidationService.java b/src/main/java/formflow/library/ValidationService.java
index 1fbdad732..f573e6e52 100644
--- a/src/main/java/formflow/library/ValidationService.java
+++ b/src/main/java/formflow/library/ValidationService.java
@@ -9,6 +9,7 @@
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -38,8 +39,8 @@ public class ValidationService {
 
   private final Validator validator;
   private final ActionManager actionManager;
-  private final String inputConfigPath;
-  private final List<String> requiredAnnotationsList = List.of(
+  private static String inputConfigPath;
+  private static final List<String> requiredAnnotationsList = List.of(
       NotNull.class.getName(),
       NotEmpty.class.getName(),
       NotBlank.class.getName()
@@ -56,7 +57,7 @@ public ValidationService(Validator validator, ActionManager actionManager,
       @Value("${form-flow.inputs: 'formflow.library.inputs.'}") String inputConfigPath) {
     this.validator = validator;
     this.actionManager = actionManager;
-    this.inputConfigPath = inputConfigPath;
+    ValidationService.inputConfigPath = inputConfigPath;
   }
 
   /**
@@ -158,4 +159,24 @@ private Map<String, List<String>> performFieldLevelValidation(String flowName, F
 
     return validationMessages;
   }
+
+  public static List<String> getRequiredInputs(String flowName) {
+    Class<?> flowClass;
+    List<String> requiredInputs = new ArrayList<>();
+
+    try {
+      flowClass = Class.forName(inputConfigPath + StringUtils.capitalize(flowName));
+    } catch (ReflectiveOperationException e) {
+      throw new RuntimeException(e);
+    }
+
+    Field[] declaredFields = flowClass.getDeclaredFields();
+    for (Field field : declaredFields) {
+      if (Arrays.stream(field.getAnnotations())
+          .anyMatch(annotation -> requiredAnnotationsList.contains(annotation.annotationType().getName()))) {
+        requiredInputs.add(field.getName());
+      }
+    }
+    return requiredInputs;
+  }
 }
diff --git a/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css b/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
index 1f68c7db0..e840d580c 100644
--- a/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
+++ b/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
@@ -741,3 +741,8 @@ body,
   display: inline-flex;
   align-items: center;
 }
+
+.required-input {
+  color: #a72f10;
+  margin-left: 0.5rem;
+}
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index b21e869c4..889015f78 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -4,13 +4,17 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      hasError=${
+      isRequiredInput=${requiredInputs.contains(inputName)},
+    hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
         (#arrays.length(errorMessages.get(inputName)) > 0) }"
     th:assert="${!#strings.isEmpty(inputName)}, ${hasLabel || hasAriaLabel}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
-    <label th:if="${hasLabel}" th:for="${inputName}" th:text="${label}" class="form-question"/>
+    <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
+      <span th:text="${label}"></span>
+      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+    </label>
     <p class="text--help"
        th:if="${hasHelpText}"
        th:id="${inputName + '-help-text'}"
@@ -22,6 +26,7 @@
            th:attr="
             aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
             aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
+            aria-required=${isRequiredInput},
             aria-invalid=${hasError}"
            th:value="${fieldData.getOrDefault(inputName, '')}">
     <th:block

From 56392be236e779d723ec6ddbcb66d78aa9d7f61e Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Fri, 2 Feb 2024 16:37:16 -0800
Subject: [PATCH 02/41] Adds error handling changes for the date input

---
 .../form-flow/0.0.1/css/libraryStyles.css     |  1 -
 .../resources/templates/fragments/form.html   |  1 +
 .../templates/fragments/inputs/date.html      | 34 ++++++++++++++-----
 .../templates/fragments/inputs/text.html      |  8 ++---
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css b/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
index e840d580c..2b2fc3b23 100644
--- a/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
+++ b/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
@@ -744,5 +744,4 @@ body,
 
 .required-input {
   color: #a72f10;
-  margin-left: 0.5rem;
 }
diff --git a/src/main/resources/templates/fragments/form.html b/src/main/resources/templates/fragments/form.html
index 6e9b66952..ae52b5a25 100644
--- a/src/main/resources/templates/fragments/form.html
+++ b/src/main/resources/templates/fragments/form.html
@@ -3,6 +3,7 @@
       th:action="@{${action}}"
       th:enctype="${enctype}"
       th:id="${formId}"
+      novalidate="true"
       autocomplete="off"
       method="post">
   <th:block th:replace="${content}"/>
diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index d444826f5..83f0dad3b 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -3,6 +3,7 @@
     th:with="
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
+      isRequiredInput=${requiredInputs.contains(inputName + 'Month') || requiredInputs.contains(inputName + 'Day') || requiredInputs.contains(inputName + 'Year')},
       hasErrorMonth=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Month'))},
       hasErrorDay=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Day'))},
       hasErrorYear=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Year'))},
@@ -10,7 +11,11 @@
     th:assert="${hasLabel || hasAriaLabel}">
   <div th:class="'form-group' + ${hasErrorGroup ? ' form-group--error' : ''}">
     <fieldset th:id="${groupName}" class="input-group input-group--inline">
-      <legend th:if="${hasLabel}" th:for="${inputName}" th:text="${label}" class="form-question"/>
+      <legend th:if="${hasLabel}" th:for="${inputName}"
+             class="form-question">
+        <span th:text="${label}"></span>
+        <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+      </legend>
       <p class="text--help">
         <label th:for="${inputName}+'-month'"
                th:id="${inputName}+'-month-label'"
@@ -24,6 +29,14 @@
                th:id="${inputName}+'-year-label'"
                th:text="#{general.year}"></label>
       </p>
+      <th:block
+          th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Month')}"></th:block>
+      <th:block
+          th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Day')}"></th:block>
+      <th:block
+          th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Year')}"></th:block>
+      <th:block
+          th:replace="~{fragments/inputError :: validationError(inputName=${groupName})}"></th:block>
       <input type="text" inputmode="numeric" maxlength="2"
              class="text-input text-input--inline form-width--month"
              th:id="${inputName}+'-month'"
@@ -32,6 +45,7 @@
              th:attr="
               aria-describedby=${inputName + '-month-label'},
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
+              aria-required=${requiredInputs.contains(inputName + 'Month')},
               aria-invalid=${hasErrorMonth}"
              th:value="${fieldData.getOrDefault(inputName + 'Month', '')}"/>
       /
@@ -43,6 +57,7 @@
              th:attr="
               aria-describedby=${inputName}+'-day-label',
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
+              aria-required=${requiredInputs.contains(inputName + 'Day')},
               aria-invalid=${hasErrorDay}"
              th:value="${fieldData.getOrDefault(inputName + 'Day', '')}"/>
       /
@@ -54,16 +69,17 @@
              th:attr="
               aria-describedby=${inputName}+'-year-label',
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
+              aria-required=${requiredInputs.contains(inputName + 'Year')},
               aria-invalid=${hasErrorYear}"
              th:value="${fieldData.getOrDefault(inputName + 'Year', '')}"/>
     </fieldset>
-    <th:block th:if="${hasErrorMonth}"
-              th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Month')}"></th:block>
-    <th:block th:if="${hasErrorDay}"
-              th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Day')}"></th:block>
-    <th:block th:if="${hasErrorYear}"
-              th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Year')}"></th:block>
-    <th:block th:if="${hasErrorGroup}"
-              th:replace="~{fragments/inputError :: validationError(inputName=${groupName})}"></th:block>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Month')}"></th:block>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Day')}"></th:block>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Year')}"></th:block>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${groupName})}"></th:block>
   </div>
 </th:block>
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index 889015f78..62c13f237 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -19,6 +19,8 @@
        th:if="${hasHelpText}"
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <input type="text" class="text-input"
            th:id="${inputName}"
            th:name="${inputName}"
@@ -26,10 +28,8 @@
            th:attr="
             aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
             aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-            aria-required=${isRequiredInput},
-            aria-invalid=${hasError}"
+            aria-invalid=${hasError},
+            aria-required=${isRequiredInput}"
            th:value="${fieldData.getOrDefault(inputName, '')}">
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
   </div>
 </th:block>
\ No newline at end of file

From d5140ac5ce3d4eb528528916365cbd4065ab00a9 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Mon, 5 Feb 2024 16:02:37 -0800
Subject: [PATCH 03/41] Update money input to show required attribute

---
 src/main/resources/templates/fragments/form.html    |  1 -
 .../resources/templates/fragments/inputs/money.html | 13 +++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/templates/fragments/form.html b/src/main/resources/templates/fragments/form.html
index ae52b5a25..6e9b66952 100644
--- a/src/main/resources/templates/fragments/form.html
+++ b/src/main/resources/templates/fragments/form.html
@@ -3,7 +3,6 @@
       th:action="@{${action}}"
       th:enctype="${enctype}"
       th:id="${formId}"
-      novalidate="true"
       autocomplete="off"
       method="post">
   <th:block th:replace="${content}"/>
diff --git a/src/main/resources/templates/fragments/inputs/money.html b/src/main/resources/templates/fragments/inputs/money.html
index e1f8b2bfb..38f43d2aa 100644
--- a/src/main/resources/templates/fragments/inputs/money.html
+++ b/src/main/resources/templates/fragments/inputs/money.html
@@ -4,17 +4,23 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
+      isRequiredInput=${requiredInputs.contains(inputName)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
         (#arrays.length(errorMessages.get(inputName)) > 0) }"
     th:assert="${!#strings.isEmpty(inputName)}, ${hasLabel || hasAriaLabel}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
-    <label th:if="${hasLabel}" th:for="${inputName}" th:text="${label}" class="form-question"/>
+    <label th:if="${hasLabel}" th:for="${inputName}"  class="form-question">
+      <span th:text="${label}"></span>
+      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+    </label>
     <p class="text--help"
        th:if="${hasHelpText}"
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <div class="text-input-group form-width--med">
       <div class="text-input-group__prefix">$</div>
       <input type="text" class="text-input"
@@ -24,11 +30,10 @@
              th:attr="
               aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-invalid=${hasError}"
+              aria-invalid=${hasError},
+              aria-required=${isRequiredInput}"
              th:value="${fieldData.getOrDefault(inputName, '')}">
       <div th:if="${postfix != null}" th:text="${postfix}" class="text-input-group__postfix"></div>
     </div>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
   </div>
 </th:block>

From 7759557231baf8272bd6586708f904049a6c0f8e Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Mon, 5 Feb 2024 16:23:01 -0800
Subject: [PATCH 04/41] Update number, phone and ssn inputs to show required
 attribute

---
 .../templates/fragments/inputs/number.html        | 13 +++++++++----
 .../templates/fragments/inputs/phone.html         | 13 +++++++++----
 .../resources/templates/fragments/inputs/ssn.html | 15 +++++++++++----
 .../templates/fragments/inputs/text.html          |  2 +-
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/number.html b/src/main/resources/templates/fragments/inputs/number.html
index a7ef0f4d9..2cdd5d4af 100644
--- a/src/main/resources/templates/fragments/inputs/number.html
+++ b/src/main/resources/templates/fragments/inputs/number.html
@@ -6,17 +6,23 @@
       hasPattern=${!#strings.isEmpty(pattern)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
+      isRequiredInput=${requiredInputs.contains(inputName)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
         (#arrays.length(errorMessages.get(inputName)) > 0) }"
     th:assert="${!#strings.isEmpty(inputName)}, ${hasLabel || hasAriaLabel}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
-    <label th:if="${hasLabel}" th:for="${inputName}" th:text="${label}" class="form-question"/>
+    <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
+      <span th:text="${label}"></span>
+      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+    </label>
     <p class="text--help"
        th:if="${hasHelpText}"
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <div class="text-input-group form-width--med">
       <input type="text" inputmode="numeric"
              class="text-input form-width--med"
@@ -28,11 +34,10 @@
               pattern=${hasPattern ? pattern : '^\d*(\.\d{0,2})?$'},
               aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-invalid=${hasError}"
+              aria-invalid=${hasError},
+              aria-required=${isRequiredInput}"
              th:value="${fieldData.getOrDefault(inputName, '')}">
       <div th:if="${postfix != null}" th:text="${postfix}" class="text-input-group__postfix"></div>
     </div>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
   </div>
 </th:block>
diff --git a/src/main/resources/templates/fragments/inputs/phone.html b/src/main/resources/templates/fragments/inputs/phone.html
index 971e8fca7..807fb392a 100644
--- a/src/main/resources/templates/fragments/inputs/phone.html
+++ b/src/main/resources/templates/fragments/inputs/phone.html
@@ -4,17 +4,23 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
+      isRequiredInput=${requiredInputs.contains(inputName)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
         (#arrays.length(errorMessages.get(inputName)) > 0) }"
     th:assert="${!#strings.isEmpty(inputName)}, ${hasLabel || hasAriaLabel}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
-    <label th:if="${hasLabel}" th:for="${inputName}" th:text="${label}" class="form-question"/>
+    <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
+      <span th:text="${label}"></span>
+      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+    </label>
     <p class="text--help"
        th:if="${hasHelpText}"
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <input type="tel" class="text-input form-width--med phone-input"
            th:id="${inputName}"
            th:name="${inputName}"
@@ -22,9 +28,8 @@
            th:attr="
             aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
             aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-            aria-invalid=${hasError}"
+            aria-invalid=${hasError},
+            aria-required=${isRequiredInput}"
            th:value="${fieldData.getOrDefault(inputName, '')}">
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
   </div>
 </th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index 99091d070..8ab7626bc 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -4,17 +4,25 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
+      isRequiredInput=${requiredInputs.contains(inputName)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
         (#arrays.length(errorMessages.get(inputName)) > 0) }"
     th:assert="${!#strings.isEmpty(inputName)}, ${hasLabel || hasAriaLabel}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
-    <label th:if="${hasLabel}" th:for="${inputName}" th:text="${label}" class="form-question"/>
+    <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
+      <span th:text="${label}"></span>
+      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+    </label>
     <p class="text--help"
        th:if="${hasHelpText}"
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <input type="text" class="text-input form-width--med ssn-input"
            th:id="${inputName}"
            th:name="${inputName}"
@@ -22,10 +30,9 @@
            th:attr="
             aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
             aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-            aria-invalid=${hasError}"
+            aria-invalid=${hasError},
+            aria-required=${isRequiredInput}"
            th:value="${fieldData.getOrDefault(inputName, '')}"
            inputmode="numeric">
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
   </div>
 </th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index 62c13f237..f11fdac12 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -5,7 +5,7 @@
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
       isRequiredInput=${requiredInputs.contains(inputName)},
-    hasError=${
+      hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
         (#arrays.length(errorMessages.get(inputName)) > 0) }"

From 7f14ae9cf541a945eca470c039ec3b804e05447a Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 13 Feb 2024 15:10:51 -0800
Subject: [PATCH 05/41] Update select input to show required attribute

---
 .../resources/templates/fragments/inputs/select.html  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/select.html b/src/main/resources/templates/fragments/inputs/select.html
index 86bb0e5a7..ff2f26549 100644
--- a/src/main/resources/templates/fragments/inputs/select.html
+++ b/src/main/resources/templates/fragments/inputs/select.html
@@ -4,6 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
+      isRequiredInput=${requiredInputs.contains(inputName)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
@@ -13,11 +14,16 @@
       ${hasLabel || hasAriaLabel},
       ${content != null}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
-    <label th:if="${hasLabel}" th:for="${inputName}" th:text="${label}" class="form-question"/>
+    <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
+      <span th:text="${label}"></span>
+      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+    </label>
     <p class="text--help"
        th:if="${hasHelpText}"
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
+    <th:block
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <div class="select">
       <select class="select__element"
               th:id="${inputName}"
@@ -25,11 +31,10 @@
               th:attr="
                 aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
                 aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
+                aria-required=${isRequiredInput},
                 aria-invalid=${hasError}">
         <th:block th:replace="${content}"/>
       </select>
     </div>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
   </div>
 </th:block>
\ No newline at end of file

From be34480dbb3e1693f882c137e0d4bbb5032c6dee Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 13 Feb 2024 15:58:54 -0800
Subject: [PATCH 06/41] Update radio input to show required attribute in
 fieldset

---
 src/main/resources/templates/fragments/inputs/radio.html  | 1 +
 .../templates/fragments/inputs/radioFieldset.html         | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/radio.html b/src/main/resources/templates/fragments/inputs/radio.html
index 8893b2aea..0031be999 100644
--- a/src/main/resources/templates/fragments/inputs/radio.html
+++ b/src/main/resources/templates/fragments/inputs/radio.html
@@ -18,6 +18,7 @@
            th:aria-disabled="${disabled}"
            th:attr="
             aria-invalid=${hasError},
+            aria-required=${isRequiredInput},
             data-follow-up=${followUpId}">
     <span th:text="${label}"></span>
     <p th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index 585708da7..c0efa478a 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -4,6 +4,7 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
+      isRequiredInput=${requiredInputs.contains(inputName)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
@@ -19,16 +20,17 @@
       <legend class="form-question"
               th:id="${inputName + '-legend'}"
               th:inline="text">
-        [[${label}]]
+        <span th:text="${label}"></span>
+        <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
         <p class="text--help spacing-below-0 text--normal"
            th:if="${hasHelpText}"
            th:id="${inputName + '-help-text'}"
            th:text="${fieldsetHelpText}"></p>
+        <th:block
+            th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
       </legend>
       <input type="hidden" th:id="${inputName} + 'Hidden'" th:name="${inputName}" value="">
       <th:block th:replace="${content}"/>
     </fieldset>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
   </div>
 </th:block>
\ No newline at end of file

From 086265f6c63f24d33cdb69f244b45435929cd10e Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 13 Feb 2024 17:16:46 -0800
Subject: [PATCH 07/41] Only render error element if errors are present and add
 appropriate margin

---
 .../webjars/form-flow/0.0.1/css/libraryStyles.css    |  4 ++++
 .../resources/templates/fragments/inputs/money.html  |  1 +
 .../resources/templates/fragments/inputs/number.html |  1 +
 .../resources/templates/fragments/inputs/phone.html  |  1 +
 .../templates/fragments/inputs/radioFieldset.html    |  1 +
 .../resources/templates/fragments/inputs/select.html |  1 +
 .../resources/templates/fragments/inputs/ssn.html    |  3 +--
 .../resources/templates/fragments/inputs/text.html   |  1 +
 .../templates/fragments/inputs/textArea.html         | 12 +++++++++---
 9 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css b/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
index 2b2fc3b23..83ae92d8b 100644
--- a/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
+++ b/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
@@ -745,3 +745,7 @@ body,
 .required-input {
   color: #a72f10;
 }
+
+.form-group .text--help+.text--error {
+  margin-top: -2.5rem;
+}
diff --git a/src/main/resources/templates/fragments/inputs/money.html b/src/main/resources/templates/fragments/inputs/money.html
index 38f43d2aa..afda45402 100644
--- a/src/main/resources/templates/fragments/inputs/money.html
+++ b/src/main/resources/templates/fragments/inputs/money.html
@@ -20,6 +20,7 @@
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
     <th:block
+        th:if="${hasError}"
         th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <div class="text-input-group form-width--med">
       <div class="text-input-group__prefix">$</div>
diff --git a/src/main/resources/templates/fragments/inputs/number.html b/src/main/resources/templates/fragments/inputs/number.html
index 2cdd5d4af..ff31ac4ce 100644
--- a/src/main/resources/templates/fragments/inputs/number.html
+++ b/src/main/resources/templates/fragments/inputs/number.html
@@ -22,6 +22,7 @@
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
     <th:block
+        th:if="${hasError}"
         th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <div class="text-input-group form-width--med">
       <input type="text" inputmode="numeric"
diff --git a/src/main/resources/templates/fragments/inputs/phone.html b/src/main/resources/templates/fragments/inputs/phone.html
index 807fb392a..c9bbbe549 100644
--- a/src/main/resources/templates/fragments/inputs/phone.html
+++ b/src/main/resources/templates/fragments/inputs/phone.html
@@ -20,6 +20,7 @@
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
     <th:block
+        th:if="${hasError}"
         th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <input type="tel" class="text-input form-width--med phone-input"
            th:id="${inputName}"
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index c0efa478a..a5c1cd3a7 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -27,6 +27,7 @@
            th:id="${inputName + '-help-text'}"
            th:text="${fieldsetHelpText}"></p>
         <th:block
+            th:if="${hasError}"
             th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
       </legend>
       <input type="hidden" th:id="${inputName} + 'Hidden'" th:name="${inputName}" value="">
diff --git a/src/main/resources/templates/fragments/inputs/select.html b/src/main/resources/templates/fragments/inputs/select.html
index ff2f26549..092f440b3 100644
--- a/src/main/resources/templates/fragments/inputs/select.html
+++ b/src/main/resources/templates/fragments/inputs/select.html
@@ -23,6 +23,7 @@
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
     <th:block
+        th:if="${hasError}"
         th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <div class="select">
       <select class="select__element"
diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index 8ab7626bc..75a7c5605 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -20,8 +20,7 @@
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
     <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
-    <th:block
+        th:if="${hasError}"
         th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <input type="text" class="text-input form-width--med ssn-input"
            th:id="${inputName}"
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index f11fdac12..dd44a18f4 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -20,6 +20,7 @@
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
     <th:block
+        th:if="${hasError}"
         th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <input type="text" class="text-input"
            th:id="${inputName}"
diff --git a/src/main/resources/templates/fragments/inputs/textArea.html b/src/main/resources/templates/fragments/inputs/textArea.html
index 6f6694e6c..f422c55fa 100644
--- a/src/main/resources/templates/fragments/inputs/textArea.html
+++ b/src/main/resources/templates/fragments/inputs/textArea.html
@@ -6,29 +6,35 @@
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
       rows=${!#strings.isEmpty(rows)} ? ${rows} : '6',
       maxLength=${!#strings.isEmpty(maxLength)} ? ${maxLength} : '500',
+      isRequiredInput=${requiredInputs.contains(inputName)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
         (#arrays.length(errorMessages.get(inputName)) > 0) }"
     th:assert="${!#strings.isEmpty(inputName)}, ${hasLabel || hasAriaLabel}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
-    <label th:if="${hasLabel}" th:for="${inputName}" th:text="${label}" class="form-question"/>
+    <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
+      <span th:text="${label}"></span>
+      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+    </label>
     <p class="text--help"
        th:if="${hasHelpText}"
        th:id="${inputName + '-help-text'}"
        th:text="${helpText}"></p>
+    <th:block
+        th:if="${hasError}"
+        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
     <textarea th:fragment="textArea"
               type="textarea"
               class="textarea spacing-below-0"
               th:attr="
                 aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
                 aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
+                aria-required=${isRequiredInput},
                 rows=${rows},
                 maxlength=${maxLength},
                 aria-invalid=${hasError}"
               th:id="${inputName}"
               th:name="${inputName}">[[${fieldData.getOrDefault(inputName, '')}]]</textarea>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
   </div>
 </th:block>
\ No newline at end of file

From 1662c1586c54f2fa194acd152a1e2fb37b1427df Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 13 Feb 2024 17:29:54 -0800
Subject: [PATCH 08/41] Indidcate required attribute on fieldset not individual
 input

---
 .../templates/fragments/inputs/checkboxFieldset.html         | 5 ++++-
 src/main/resources/templates/fragments/inputs/radio.html     | 1 -
 .../resources/templates/fragments/inputs/radioFieldset.html  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
index 64a2dfea7..09ba54a4a 100644
--- a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
@@ -4,6 +4,7 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
+      isRequiredInput=${requiredInputs.contains(inputName)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
@@ -14,13 +15,15 @@
       ${content != null}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <fieldset th:attr="
+      aria-required=${isRequiredInput},
       aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
       aria-labelledby=${hasAriaLabel ? ariaLabel : ''}">
       <legend class="form-question"
               th:if="${hasLabel}"
               th:id="${inputName + '-legend'}"
               th:inline="text">
-        [[${label}]]
+        <span th:text="${label}"></span>
+        <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
         <p class="text--help spacing-below-0 text--normal"
            th:if="${hasHelpText}"
            th:id="${inputName + '-help-text'}"
diff --git a/src/main/resources/templates/fragments/inputs/radio.html b/src/main/resources/templates/fragments/inputs/radio.html
index 0031be999..8893b2aea 100644
--- a/src/main/resources/templates/fragments/inputs/radio.html
+++ b/src/main/resources/templates/fragments/inputs/radio.html
@@ -18,7 +18,6 @@
            th:aria-disabled="${disabled}"
            th:attr="
             aria-invalid=${hasError},
-            aria-required=${isRequiredInput},
             data-follow-up=${followUpId}">
     <span th:text="${label}"></span>
     <p th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index a5c1cd3a7..dc50ed2fc 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -16,6 +16,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <fieldset th:attr="
       aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
+      aria-required=${isRequiredInput},
       aria-labelledby=${hasAriaLabel ? ariaLabel : ''}">
       <legend class="form-question"
               th:id="${inputName + '-legend'}"

From 61987fcd5f60fca22ed752fbed29792d12b7a5c2 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 13 Feb 2024 18:41:11 -0800
Subject: [PATCH 09/41] Add tests

---
 .../library/framework/RequiredInputsTest.java |  68 ++++++++++++
 .../library/inputs/RequiredInputs.java        |  47 ++++++++
 .../test-required-inputs-flow.yaml            |   5 +
 .../templates/requiredInputs/inputs.html      | 101 ++++++++++++++++++
 4 files changed, 221 insertions(+)
 create mode 100644 src/test/java/formflow/library/framework/RequiredInputsTest.java
 create mode 100644 src/test/java/formflow/library/inputs/RequiredInputs.java
 create mode 100644 src/test/resources/flows-config/test-required-inputs-flow.yaml
 create mode 100644 src/test/resources/templates/requiredInputs/inputs.html

diff --git a/src/test/java/formflow/library/framework/RequiredInputsTest.java b/src/test/java/formflow/library/framework/RequiredInputsTest.java
new file mode 100644
index 000000000..55652b973
--- /dev/null
+++ b/src/test/java/formflow/library/framework/RequiredInputsTest.java
@@ -0,0 +1,68 @@
+package formflow.library.framework;
+
+import static formflow.library.inputs.FieldNameMarkers.UNVALIDATED_FIELD_MARKER_VALIDATE_ADDRESS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+
+import formflow.library.address_validation.AddressValidationService;
+import formflow.library.address_validation.ValidatedAddress;
+import formflow.library.utilities.AbstractMockMvcTest;
+import formflow.library.utilities.FormScreen;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.annotation.DirtiesContext;
+
+@SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"})
+@DirtiesContext()
+public class RequiredInputsTest extends AbstractMockMvcTest {
+
+  @MockBean
+  AddressValidationService addressValidationService;
+
+  @Test
+  void shouldIndicateRequiredFields() throws Exception {
+    FormScreen inputsScreen = new FormScreen(mockMvc.perform(get("/flow/requiredInputs/inputs").session(session)));
+    assertThat(inputsScreen.getElementByCssSelector("label[for=textInput]").text())
+        .contains("*");
+    assertThat(inputsScreen.getElementById("textInput").attr("aria-required"))
+        .isEqualTo("true");
+    assertThat(inputsScreen.getElementByCssSelector("label[for=areaInput]").text())
+        .contains("*");
+    assertThat(inputsScreen.getElementById("areaInput").attr("aria-required")).isEqualTo("true");
+    assertThat(inputsScreen.getElementByCssSelector("legend[for=date]").text())
+        .contains("*");
+    assertThat(inputsScreen.getElementById("date-day").attr("aria-required")).isEqualTo("true");
+    assertThat(inputsScreen.getElementByCssSelector("label[for=numberInput]").text())
+        .contains("*");
+    assertThat(inputsScreen.getElementById("numberInput").attr("aria-required")).isEqualTo("true");
+    assertThat(inputsScreen.getElementById("checkboxSet-legend").text())
+        .contains("*");
+    assertThat(Objects.requireNonNull(inputsScreen.getElementById("checkboxSet-legend").parent()).attr("aria-required")).isEqualTo("true");
+    assertThat(inputsScreen.getElementById("radioInput-legend").text())
+        .contains("*");
+    assertThat(Objects.requireNonNull(inputsScreen.getElementById("radioInput-legend").parent()).attr("aria-required")).isEqualTo("true");
+    assertThat(inputsScreen.getElementByCssSelector("label[for=selectInput]").text())
+        .contains("*");
+    assertThat(inputsScreen.getElementById("selectInput").attr("aria-required")).isEqualTo("true");
+    assertThat(inputsScreen.getElementByCssSelector("label[for=moneyInput]").text())
+        .contains("*");
+    assertThat(inputsScreen.getElementById("moneyInput").attr("aria-required")).isEqualTo("true");
+    assertThat(inputsScreen.getElementByCssSelector("label[for=phoneInput]").text())
+        .contains("*");
+    assertThat(inputsScreen.getElementById("phoneInput").attr("aria-required")).isEqualTo("true");
+    assertThat(inputsScreen.getElementByCssSelector("label[for=ssnInput]").text())
+        .contains("*");
+    assertThat(inputsScreen.getElementById("ssnInput").attr("aria-required")).isEqualTo("true");
+  }
+}
diff --git a/src/test/java/formflow/library/inputs/RequiredInputs.java b/src/test/java/formflow/library/inputs/RequiredInputs.java
new file mode 100644
index 000000000..fb11326a9
--- /dev/null
+++ b/src/test/java/formflow/library/inputs/RequiredInputs.java
@@ -0,0 +1,47 @@
+package formflow.library.inputs;
+
+import formflow.library.data.FlowInputs;
+import formflow.library.data.annotations.Money;
+import formflow.library.data.annotations.Phone;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.web.multipart.MultipartFile;
+
+@TestConfiguration
+@SuppressWarnings("unused")
+public class RequiredInputs extends FlowInputs {
+  
+  @NotBlank
+  String textInput;
+  @NotBlank
+  String areaInput;
+  @NotBlank
+  String dateDay;
+  String dateMonth;
+  String dateYear;
+  @NotBlank(message = "Date may not be empty")
+  @Pattern(regexp = "\\d/\\d/\\d\\d\\d\\d", message = "Date must be in the format of mm/dd/yyyy")
+  String dateFull;
+  @NotBlank
+  String numberInput;
+  @NotEmpty
+  ArrayList<String> checkboxSet;
+  @NotBlank
+  String radioInput;
+  @NotBlank
+  String selectInput;
+  @NotBlank
+  String moneyInput;
+  @NotBlank
+  String phoneInput;
+  @NotBlank
+  String ssnInput;
+}
diff --git a/src/test/resources/flows-config/test-required-inputs-flow.yaml b/src/test/resources/flows-config/test-required-inputs-flow.yaml
new file mode 100644
index 000000000..f4af7ee92
--- /dev/null
+++ b/src/test/resources/flows-config/test-required-inputs-flow.yaml
@@ -0,0 +1,5 @@
+name: requiredInputs
+flow:
+  inputs:
+    nextScreens:
+      - name: null
diff --git a/src/test/resources/templates/requiredInputs/inputs.html b/src/test/resources/templates/requiredInputs/inputs.html
new file mode 100644
index 000000000..aa2b7e1a7
--- /dev/null
+++ b/src/test/resources/templates/requiredInputs/inputs.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/head :: head(title='Inputs Screen')}"></head>
+<body>
+<div class="page-wrapper">
+  <div th:replace="~{fragments/toolbar :: toolbar}"></div>
+  <section class="slab">
+    <div class="grid">
+      <main id="content" role="main" class="form-card spacing-above-35">
+        <th:block
+            th:replace="~{fragments/cardHeader :: cardHeader(header='Inputs Screen', subtext='This is the inputs screen!')}"/>
+        <th:block
+            th:replace="~{fragments/form :: form(action='/flow/otherTestFlow/inputs', content=~{::formContent})}">
+          <th:block th:ref="formContent">
+            <div class="form-card__content">
+              <th:block
+                  th:replace="~{fragments/inputs/text ::
+                            text(inputName='textInput',
+                            label='textInput')}"/>
+              <th:block th:replace="~{fragments/inputs/textArea ::
+                          textArea(inputName='areaInput',
+                          label='areaInput')}"/>
+              <th:block th:replace="~{fragments/inputs/date ::
+                          date(inputName='date',
+                          label='dateInput',
+                          groupName='dateFull')}"/>
+              <th:block th:replace="~{fragments/inputs/number ::
+                          number(inputName='numberInput',
+                          label='numberInput')}"/>
+              <th:block th:replace="~{fragments/inputs/checkboxFieldset ::
+                          checkboxFieldset(inputName='checkboxSet',
+                          label='checkboxSet',
+                          content=~{::checkboxContent})}">
+                <th:block th:ref="checkboxContent">
+                  <th:block
+                      th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='checkboxSet', value='Checkbox-A', label='Checkbox A')}"/>
+                  <th:block
+                      th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='checkboxSet', value='Checkbox-B', label='Checkbox B')}"/>
+                </th:block>
+              </th:block>
+              <th:block
+                  th:replace="~{fragments/inputs/checkbox :: checkbox(inputName='checkboxInput', value='checkbox-value', label='Single checkbox')}"/>
+              <th:block th:replace="~{fragments/inputs/radioFieldset ::
+                          radioFieldset(inputName='radioInput',
+                          label='radioInput',
+                          content=~{::radioContent})}">
+                <th:block th:ref="radioContent">
+                  <th:block
+                      th:replace="~{fragments/inputs/radio :: radio(inputName='radioInput',value='Radio A', label='Radio A')}"/>
+                  <th:block
+                      th:replace="~{fragments/inputs/radio :: radio(inputName='radioInput',value='Radio B', label='Radio B')}"/>
+                  <th:block
+                      th:replace="~{fragments/inputs/radio :: radio(inputName='radioInput',value='Radio C', label='Radio C')}"/>
+                </th:block>
+              </th:block>
+              <th:block
+                  th:replace="~{fragments/inputs/select ::
+                          select(inputName='selectInput',
+                                 label='selectInput',
+                                 content=~{::selectContent})}">
+                <th:block th:ref="selectContent">
+                  <th:block
+                      th:replace="~{fragments/inputs/selectOption :: selectOption(value='', optionText='Choose one')}"/>
+                  <th:block
+                      th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select A', optionText='Select A')}"/>
+                  <th:block
+                      th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select B', optionText='Select B')}"/>
+                  <th:block
+                      th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select C', optionText='Select C')}"/>
+                </th:block>
+              </th:block>
+              <th:block
+                  th:replace="~{fragments/inputs/money :: money(
+                            inputName='moneyInput',
+                            label='moneyInput')}"/>
+              <th:block
+                  th:replace="~{fragments/inputs/phone :: phone(
+                            inputName='phoneInput',
+                            label='phoneInput')}"/>
+              <th:block
+                  th:replace="~{fragments/inputs/ssn :: ssn(
+                            inputName='ssnInput',
+                            label='ssnInput')}"/>
+              <th:block th:replace="~{fragments/inputs/state ::
+                          state(inputName='stateInput',
+                          label='stateInput',
+                          placeholderText='State')}"/>
+            </div>
+            <div class="form-card__footer">
+              <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
+                  text=#{general.inputs.continue})}"/>
+            </div>
+          </th:block>
+        </th:block>
+      </main>
+    </div>
+  </section>
+</div>
+<th:block th:replace="~{fragments/footer :: footer}"/>
+</body>
+</html>

From 31d7717f66941d58aea578b40146f9aff2f25612 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 13 Feb 2024 19:12:11 -0800
Subject: [PATCH 10/41] Do not show required asterisk if single input screen

---
 src/main/resources/templates/fragments/inputs/date.html         | 2 +-
 src/main/resources/templates/fragments/inputs/money.html        | 2 +-
 src/main/resources/templates/fragments/inputs/number.html       | 2 +-
 src/main/resources/templates/fragments/inputs/phone.html        | 2 +-
 .../resources/templates/fragments/inputs/radioFieldset.html     | 2 +-
 src/main/resources/templates/fragments/inputs/select.html       | 2 +-
 src/main/resources/templates/fragments/inputs/ssn.html          | 2 +-
 src/main/resources/templates/fragments/inputs/text.html         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index 83f0dad3b..924768598 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -14,7 +14,7 @@
       <legend th:if="${hasLabel}" th:for="${inputName}"
              class="form-question">
         <span th:text="${label}"></span>
-        <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+        <span th:if="${isRequiredInput && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
       </legend>
       <p class="text--help">
         <label th:for="${inputName}+'-month'"
diff --git a/src/main/resources/templates/fragments/inputs/money.html b/src/main/resources/templates/fragments/inputs/money.html
index afda45402..fed6c7d58 100644
--- a/src/main/resources/templates/fragments/inputs/money.html
+++ b/src/main/resources/templates/fragments/inputs/money.html
@@ -13,7 +13,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}"  class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/number.html b/src/main/resources/templates/fragments/inputs/number.html
index ff31ac4ce..5f4509b81 100644
--- a/src/main/resources/templates/fragments/inputs/number.html
+++ b/src/main/resources/templates/fragments/inputs/number.html
@@ -15,7 +15,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/phone.html b/src/main/resources/templates/fragments/inputs/phone.html
index c9bbbe549..58fd4184e 100644
--- a/src/main/resources/templates/fragments/inputs/phone.html
+++ b/src/main/resources/templates/fragments/inputs/phone.html
@@ -13,7 +13,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index dc50ed2fc..2c8313b7a 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -22,7 +22,7 @@
               th:id="${inputName + '-legend'}"
               th:inline="text">
         <span th:text="${label}"></span>
-        <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+        <span th:if="${isRequiredInput && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
         <p class="text--help spacing-below-0 text--normal"
            th:if="${hasHelpText}"
            th:id="${inputName + '-help-text'}"
diff --git a/src/main/resources/templates/fragments/inputs/select.html b/src/main/resources/templates/fragments/inputs/select.html
index 092f440b3..e6dfae823 100644
--- a/src/main/resources/templates/fragments/inputs/select.html
+++ b/src/main/resources/templates/fragments/inputs/select.html
@@ -16,7 +16,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index 75a7c5605..1daf7b4b7 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -13,7 +13,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index dd44a18f4..cee2f73e8 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -13,7 +13,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"

From d07c290339a088e1e6683d0fd4c1450446e338ed Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 13 Feb 2024 19:43:45 -0800
Subject: [PATCH 11/41] Fix broken check on date errors in test

---
 .../templates/fragments/inputs/date.html      |  16 +--
 .../library/utilities/FormScreen.java         |   5 +-
 .../testFlow/subflowAddItemPage2.html         | 126 +++++++++---------
 3 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index 924768598..3dbf51389 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -16,6 +16,14 @@
         <span th:text="${label}"></span>
         <span th:if="${isRequiredInput && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
       </legend>
+      <th:block
+          th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Month')}"></th:block>
+      <th:block
+          th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Day')}"></th:block>
+      <th:block
+          th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Year')}"></th:block>
+      <th:block
+          th:replace="~{fragments/inputError :: validationError(inputName=${groupName})}"></th:block>
       <p class="text--help">
         <label th:for="${inputName}+'-month'"
                th:id="${inputName}+'-month-label'"
@@ -29,14 +37,6 @@
                th:id="${inputName}+'-year-label'"
                th:text="#{general.year}"></label>
       </p>
-      <th:block
-          th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Month')}"></th:block>
-      <th:block
-          th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Day')}"></th:block>
-      <th:block
-          th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Year')}"></th:block>
-      <th:block
-          th:replace="~{fragments/inputError :: validationError(inputName=${groupName})}"></th:block>
       <input type="text" inputmode="numeric" maxlength="2"
              class="text-input text-input--inline form-width--month"
              th:id="${inputName}+'-month'"
diff --git a/src/test/java/formflow/library/utilities/FormScreen.java b/src/test/java/formflow/library/utilities/FormScreen.java
index 916ea9624..9fea48a7b 100644
--- a/src/test/java/formflow/library/utilities/FormScreen.java
+++ b/src/test/java/formflow/library/utilities/FormScreen.java
@@ -34,8 +34,9 @@ public boolean hasInputError(String inputName) {
   }
 
   public boolean hasDateInputError() {
-    Element element = html.select("fieldset ~ p.text--error").first();
-    return element != null;
+    // Selects span elements with class containing Day-error, Month-error, or Year-error
+    Elements elements = html.select("p[id*='Month-error'], p[id*='Day-error'], p[id*='Year-error']");
+    return !elements.isEmpty();
   }
 
   public Elements getInputErrors(String inputName) {
diff --git a/src/test/resources/templates/testFlow/subflowAddItemPage2.html b/src/test/resources/templates/testFlow/subflowAddItemPage2.html
index dc69e22b4..2c58e60f0 100644
--- a/src/test/resources/templates/testFlow/subflowAddItemPage2.html
+++ b/src/test/resources/templates/testFlow/subflowAddItemPage2.html
@@ -14,67 +14,71 @@
                         th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formDetails})}">
                     <th:block th:ref="formDetails">
                         <div class="form-card__content">
-                            <th:block
-                                    th:replace="~{fragments/inputs/text ::
-                                      text(inputName='textInputSubflowPage2',
-                                      label='textInput')}"/>
-                            <th:block th:replace="~{fragments/inputs/textArea ::
-                                    textArea(inputName='areaInputSubflowPage2',
-                                    label='areaInput')}"/>
-                            <th:block th:replace="~{fragments/inputs/number ::
-                                    number(inputName='numberInputSubflowPage2',
-                                    label='numberInput')}"/>
-                            <th:block th:replace="~{fragments/inputs/checkboxFieldset ::
-                                    checkboxFieldset(inputName='checkboxSetSubflowPage2',
-                                    label='checkboxSet',
-                                    content=~{::checkboxContent})}">
-                                <th:block th:ref="checkboxContent">
-                                    <th:block
-                                            th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='checkboxSetSubflowPage2', value='Checkbox-A', label='Checkbox A')}"/>
-                                    <th:block
-                                            th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='checkboxSetSubflowPage2', value='Checkbox-B', label='Checkbox B')}"/>
-                                </th:block>
-                            </th:block>
-                            <th:block
-                                    th:replace="~{fragments/inputs/checkbox :: checkbox(inputName='checkboxInputSubflowPage2', value='checkbox-value', label='Single checkbox')}"/>
-                            <th:block th:replace="~{fragments/inputs/radioFieldset ::
-                                    radioFieldset(inputName='radioInputSubflowPage2',
-                                    label='radioInput',
-                                    content=~{::radioContent})}">
-                                <th:block th:ref="radioContent">
-                                    <th:block
-                                            th:replace="~{fragments/inputs/radio :: radio(inputName='radioInputSubflowPage2',value='Radio A', label='Radio A')}"/>
-                                    <th:block
-                                            th:replace="~{fragments/inputs/radio :: radio(inputName='radioInputSubflowPage2',value='Radio B', label='Radio B')}"/>
-                                    <th:block
-                                            th:replace="~{fragments/inputs/radio :: radio(inputName='radioInputSubflowPage2',value='Radio C', label='Radio C')}"/>
-                                </th:block>
-                            </th:block>
-                            <th:block
-                                    th:replace="~{fragments/inputs/select ::
-                                    select(inputName='selectInputSubflowPage2',
-                                           label='selectInput',
-                                           content=~{::selectContent})}">
-                                <th:block th:ref="selectContent">
-                                    <th:block
-                                            th:replace="~{fragments/inputs/selectOption :: selectOption(value='', optionText='Choose one')}"/>
-                                    <th:block
-                                            th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select A', optionText='Select A')}"/>
-                                    <th:block
-                                            th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select B', optionText='Select B')}"/>
-                                    <th:block
-                                            th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select C', optionText='Select C')}"/>
-                                </th:block>
-                            </th:block>
-                            <th:block
-                                    th:replace="~{fragments/inputs/money :: money(
-                                      inputName='moneyInputSubflowPage2',
-                                      label='moneyInput')}"/>
-                            <th:block
-                                    th:replace="~{fragments/inputs/phone :: phone(
-                                      inputName='phoneInputSubflowPage2',
-                                      label='phoneInput')}"/>
-                        </div>
+          <th:block
+              th:replace="~{fragments/inputs/text ::
+                                  text(inputName='textInputSubflowPage2',
+                                  label='textInput')}"/>
+          <th:block th:replace="~{fragments/inputs/textArea ::
+                                textArea(inputName='areaInputSubflowPage2',
+                                label='areaInput')}"/>
+          <th:block th:replace="~{fragments/inputs/number ::
+                                number(inputName='numberInputSubflowPage2',
+                                label='numberInput')}"/>
+          <th:block th:replace="~{fragments/inputs/checkboxFieldset ::
+                                checkboxFieldset(inputName='checkboxSetSubflowPage2',
+                                label='checkboxSet',
+                                content=~{::checkboxContent})}">
+            <th:block th:ref="checkboxContent">
+              <th:block
+                  th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='checkboxSetSubflowPage2', value='Checkbox-A', label='Checkbox A')}"/>
+              <th:block
+                  th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='checkboxSetSubflowPage2', value='Checkbox-B', label='Checkbox B')}"/>
+            </th:block>
+          </th:block>
+          <th:block
+              th:replace="~{fragments/inputs/checkbox :: checkbox(inputName='checkboxInputSubflowPage2', value='checkbox-value', label='Single checkbox')}"/>
+          <th:block th:replace="~{fragments/inputs/radioFieldset ::
+                                radioFieldset(inputName='radioInputSubflowPage2',
+                                label='radioInput',
+                                content=~{::radioContent})}">
+            <th:block th:ref="radioContent">
+              <th:block
+                  th:replace="~{fragments/inputs/radio :: radio(inputName='radioInputSubflowPage2',value='Radio A', label='Radio A')}"/>
+              <th:block
+                  th:replace="~{fragments/inputs/radio :: radio(inputName='radioInputSubflowPage2',value='Radio B', label='Radio B')}"/>
+              <th:block
+                  th:replace="~{fragments/inputs/radio :: radio(inputName='radioInputSubflowPage2',value='Radio C', label='Radio C')}"/>
+            </th:block>
+          </th:block>
+          <th:block
+              th:replace="~{fragments/inputs/select ::
+                                select(inputName='selectInputSubflowPage2',
+                                       label='selectInput',
+                                       content=~{::selectContent})}">
+            <th:block th:ref="selectContent">
+              <th:block
+                  th:replace="~{fragments/inputs/selectOption :: selectOption(value='', optionText='Choose one')}"/>
+              <th:block
+                  th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select A', optionText='Select A')}"/>
+              <th:block
+                  th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select B', optionText='Select B')}"/>
+              <th:block
+                  th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select C', optionText='Select C')}"/>
+            </th:block>
+          </th:block>
+          <th:block
+              th:replace="~{fragments/inputs/money :: money(
+                                  inputName='moneyInputSubflowPage2',
+                                  label='moneyInput')}"/>
+          <th:block
+              th:replace="~{fragments/inputs/phone :: phone(
+                                  inputName='phoneInputSubflowPage2',
+                                  label='phoneInput')}"/>
+          <th:block th:replace="~{fragments/inputs/date ::
+            date(inputName='dateSubflowPage2Day',
+            label='dateInputSubflowPage2',
+            groupName='dateInputSubflowPage2')}"/>
+        </div>
                         <div class="form-card__footer">
                             <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
                     text='Continue')}"/>

From ccdcd2e9db88279d77b0bb56aa8e8cba5aebf43b Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Wed, 14 Feb 2024 09:28:39 -0800
Subject: [PATCH 12/41] Initialize required inputs list once in
 ValidationService

---
 .../formflow/library/ValidationService.java   | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/formflow/library/ValidationService.java b/src/main/java/formflow/library/ValidationService.java
index f573e6e52..894c522ee 100644
--- a/src/main/java/formflow/library/ValidationService.java
+++ b/src/main/java/formflow/library/ValidationService.java
@@ -40,6 +40,9 @@ public class ValidationService {
   private final Validator validator;
   private final ActionManager actionManager;
   private static String inputConfigPath;
+  
+  public static List<String> requiredInputs = new ArrayList<>();
+  
   private static final List<String> requiredAnnotationsList = List.of(
       NotNull.class.getName(),
       NotEmpty.class.getName(),
@@ -161,20 +164,21 @@ private Map<String, List<String>> performFieldLevelValidation(String flowName, F
   }
 
   public static List<String> getRequiredInputs(String flowName) {
-    Class<?> flowClass;
-    List<String> requiredInputs = new ArrayList<>();
+    if (requiredInputs.isEmpty()) {
+      Class<?> flowClass;
 
-    try {
-      flowClass = Class.forName(inputConfigPath + StringUtils.capitalize(flowName));
-    } catch (ReflectiveOperationException e) {
-      throw new RuntimeException(e);
-    }
+      try {
+        flowClass = Class.forName(inputConfigPath + StringUtils.capitalize(flowName));
+      } catch (ReflectiveOperationException e) {
+        throw new RuntimeException(e);
+      }
 
-    Field[] declaredFields = flowClass.getDeclaredFields();
-    for (Field field : declaredFields) {
-      if (Arrays.stream(field.getAnnotations())
-          .anyMatch(annotation -> requiredAnnotationsList.contains(annotation.annotationType().getName()))) {
-        requiredInputs.add(field.getName());
+      Field[] declaredFields = flowClass.getDeclaredFields();
+      for (Field field : declaredFields) {
+        if (Arrays.stream(field.getAnnotations())
+            .anyMatch(annotation -> requiredAnnotationsList.contains(annotation.annotationType().getName()))) {
+          requiredInputs.add(field.getName());
+        }
       }
     }
     return requiredInputs;

From a812a8718367c38f0310024abe5825549785dd6c Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Wed, 14 Feb 2024 15:30:50 -0800
Subject: [PATCH 13/41] Use map for instant lookup of required inputs

---
 src/main/java/formflow/library/ValidationService.java     | 7 ++++---
 .../templates/fragments/inputs/checkboxFieldset.html      | 2 +-
 src/main/resources/templates/fragments/inputs/date.html   | 8 ++++----
 src/main/resources/templates/fragments/inputs/money.html  | 2 +-
 src/main/resources/templates/fragments/inputs/number.html | 2 +-
 src/main/resources/templates/fragments/inputs/phone.html  | 2 +-
 .../templates/fragments/inputs/radioFieldset.html         | 2 +-
 src/main/resources/templates/fragments/inputs/select.html | 2 +-
 src/main/resources/templates/fragments/inputs/ssn.html    | 2 +-
 src/main/resources/templates/fragments/inputs/text.html   | 2 +-
 .../resources/templates/fragments/inputs/textArea.html    | 2 +-
 11 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/formflow/library/ValidationService.java b/src/main/java/formflow/library/ValidationService.java
index 894c522ee..62e219e0c 100644
--- a/src/main/java/formflow/library/ValidationService.java
+++ b/src/main/java/formflow/library/ValidationService.java
@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
@@ -41,7 +42,7 @@ public class ValidationService {
   private final ActionManager actionManager;
   private static String inputConfigPath;
   
-  public static List<String> requiredInputs = new ArrayList<>();
+  private static final Map<String, Boolean> requiredInputs = new HashMap<>();
   
   private static final List<String> requiredAnnotationsList = List.of(
       NotNull.class.getName(),
@@ -163,7 +164,7 @@ private Map<String, List<String>> performFieldLevelValidation(String flowName, F
     return validationMessages;
   }
 
-  public static List<String> getRequiredInputs(String flowName) {
+  public static Map<String, Boolean> getRequiredInputs(String flowName) {
     if (requiredInputs.isEmpty()) {
       Class<?> flowClass;
 
@@ -177,7 +178,7 @@ public static List<String> getRequiredInputs(String flowName) {
       for (Field field : declaredFields) {
         if (Arrays.stream(field.getAnnotations())
             .anyMatch(annotation -> requiredAnnotationsList.contains(annotation.annotationType().getName()))) {
-          requiredInputs.add(field.getName());
+          requiredInputs.put(field.getName(), true);
         }
       }
     }
diff --git a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
index 09ba54a4a..290a1c3a4 100644
--- a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.contains(inputName)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index 3dbf51389..ac212df72 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -3,7 +3,7 @@
     th:with="
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.contains(inputName + 'Month') || requiredInputs.contains(inputName + 'Day') || requiredInputs.contains(inputName + 'Year')},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName + 'Month', false) || requiredInputs.getOrDefault(inputName + 'Day', false) || requiredInputs.getOrDefault(inputName + 'Year', false)},
       hasErrorMonth=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Month'))},
       hasErrorDay=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Day'))},
       hasErrorYear=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Year'))},
@@ -45,7 +45,7 @@
              th:attr="
               aria-describedby=${inputName + '-month-label'},
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-required=${requiredInputs.contains(inputName + 'Month')},
+              aria-required=${requiredInputs.getOrDefault(inputName + 'Month', false)},
               aria-invalid=${hasErrorMonth}"
              th:value="${fieldData.getOrDefault(inputName + 'Month', '')}"/>
       /
@@ -57,7 +57,7 @@
              th:attr="
               aria-describedby=${inputName}+'-day-label',
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-required=${requiredInputs.contains(inputName + 'Day')},
+              aria-required=${requiredInputs.getOrDefault(inputName + 'Day', false)},
               aria-invalid=${hasErrorDay}"
              th:value="${fieldData.getOrDefault(inputName + 'Day', '')}"/>
       /
@@ -69,7 +69,7 @@
              th:attr="
               aria-describedby=${inputName}+'-year-label',
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-required=${requiredInputs.contains(inputName + 'Year')},
+              aria-required=${requiredInputs.getOrDefault(inputName + 'Year', false)},
               aria-invalid=${hasErrorYear}"
              th:value="${fieldData.getOrDefault(inputName + 'Year', '')}"/>
     </fieldset>
diff --git a/src/main/resources/templates/fragments/inputs/money.html b/src/main/resources/templates/fragments/inputs/money.html
index fed6c7d58..6ebaaffc3 100644
--- a/src/main/resources/templates/fragments/inputs/money.html
+++ b/src/main/resources/templates/fragments/inputs/money.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.contains(inputName)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/number.html b/src/main/resources/templates/fragments/inputs/number.html
index 5f4509b81..ea633e9be 100644
--- a/src/main/resources/templates/fragments/inputs/number.html
+++ b/src/main/resources/templates/fragments/inputs/number.html
@@ -6,7 +6,7 @@
       hasPattern=${!#strings.isEmpty(pattern)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.contains(inputName)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/phone.html b/src/main/resources/templates/fragments/inputs/phone.html
index 58fd4184e..beddcf507 100644
--- a/src/main/resources/templates/fragments/inputs/phone.html
+++ b/src/main/resources/templates/fragments/inputs/phone.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.contains(inputName)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index 2c8313b7a..e7ee5e4fc 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.contains(inputName)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/select.html b/src/main/resources/templates/fragments/inputs/select.html
index e6dfae823..35a4a517b 100644
--- a/src/main/resources/templates/fragments/inputs/select.html
+++ b/src/main/resources/templates/fragments/inputs/select.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.contains(inputName)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index 1daf7b4b7..16ff2ee68 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.contains(inputName)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index cee2f73e8..89489f848 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.contains(inputName)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/textArea.html b/src/main/resources/templates/fragments/inputs/textArea.html
index f422c55fa..40bc24ee1 100644
--- a/src/main/resources/templates/fragments/inputs/textArea.html
+++ b/src/main/resources/templates/fragments/inputs/textArea.html
@@ -6,7 +6,7 @@
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
       rows=${!#strings.isEmpty(rows)} ? ${rows} : '6',
       maxLength=${!#strings.isEmpty(maxLength)} ? ${maxLength} : '500',
-      isRequiredInput=${requiredInputs.contains(inputName)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&

From 93e301c2bc0665979ae2035ca77866b3a07e6f97 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Wed, 14 Feb 2024 16:04:59 -0800
Subject: [PATCH 14/41] Add required input check for screenWithOneInput

---
 intellij-settings/LiveTemplates.xml               | 13 +++++++++++--
 .../fragments/cardHeaderForSingleInputScreen.html | 15 +++++++++++++++
 .../fragments/screens/screenWithOneInput.html     |  3 ++-
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html

diff --git a/intellij-settings/LiveTemplates.xml b/intellij-settings/LiveTemplates.xml
index 9ace61ca4..e5b54f696 100644
--- a/intellij-settings/LiveTemplates.xml
+++ b/intellij-settings/LiveTemplates.xml
@@ -20,6 +20,15 @@
   <option name="HTML" value="true" />
 </context>
 </template>
+<template name="cfa:checkbox" value="&lt;th:block th:replace=&quot;~{fragments/inputs/checkbox ::&#10;  checkbox(inputName='$INPUT_NAME$',&#10;  label=#{$LABEL$},&#10; value=#{$VALUE$},&#10; helpText=#{$CHECKBOX_HELP_TEXT$})}&quot;/&gt;" description="A field checkbox with label, name, optional help text and optional icon" toReformat="false" toShortenFQNames="true">
+<variable name="INPUT_NAME" expression="" defaultValue="" alwaysStopAt="true" />
+<variable name="VALUE" expression="" defaultValue="" alwaysStopAt="true" />
+<variable name="LABEL" expression="" defaultValue="" alwaysStopAt="true" />
+<variable name="CHECKBOX_HELP_TEXT" expression="" defaultValue="" alwaysStopAt="true" />
+<context>
+  <option name="HTML" value="true" />
+</context>
+</template>
 <template name="cfa:conditionMethod" value="public static Boolean $METHOD_NAME$(Submission submission) {&#10;  if (submission.getInputData().containsKey(&quot;$FIELD_NAME$&quot;)) {&#10;    // Change logic to suit your needs&#10;    return submission.getInputData().get(&quot;$FIELD_NAME$&quot;)$CURSOR$;&#10;  }&#10;  return false;&#10;}" description="Create a condition method that first check for db field existance then your conditional logic" toReformat="false" toShortenFQNames="true">
 <variable name="METHOD_NAME" expression="" defaultValue="" alwaysStopAt="true" />
 <variable name="FIELD_NAME" expression="" defaultValue="" alwaysStopAt="true" />
@@ -241,7 +250,7 @@
   <option name="HTML" value="true" />
 </context>
 </template>
-<template name="cfa:screenWithOneInput" value="&lt;th:block&#10;  th:replace=&quot;~{fragments/screens/screenWithOneInput ::&#10;  screenWithOneInput(&#10;    title=#{$TITLE$},&#10;    iconFragment=~{fragments/icons :: $ICON_NAME$},&#10;    header=#{$HEADER$},&#10;    subtext=#{$SUBTEXT$},&#10;    formAction=${formAction},&#10;    inputContent=~{::inputContent})}&quot;&gt;&#10;  &lt;th:block th:ref=&quot;inputContent&quot;&gt;&#10;    &lt;!-- Be sure to have `ariaLabel='header'` to label the input with the header --&gt;&#10;    &lt;th:block th:replace=&quot;~{fragments/inputs/text ::&#10;      text(inputName='$INPUT_NAME$',&#10;      ariaLabel='header')}&quot;/&gt;&#10;  &lt;/th:block&gt;&#10;&lt;/th:block&gt;" description="An entire screen that has one input and is labelled by the page header." toReformat="false" toShortenFQNames="true">
+<template name="cfa:screenWithOneInput" value="&lt;th:block&#10;  th:replace=&quot;~{fragments/screens/screenWithOneInput ::&#10;  screenWithOneInput(&#10;    title=#{$TITLE$},&#10;    iconFragment=~{fragments/icons :: $ICON_NAME$},&#10;    header=#{$HEADER$},&#10;    inputName='$INPUT_NAME$',&#10;    subtext=#{$SUBTEXT$},&#10;    formAction=${formAction},&#10;    inputContent=~{::inputContent})}&quot;&gt;&#10;  &lt;th:block th:ref=&quot;inputContent&quot;&gt;&#10;    &lt;!-- Be sure to have `ariaLabel='header'` to label the input with the header --&gt;&#10;    &lt;th:block th:replace=&quot;~{fragments/inputs/text ::&#10;      text(inputName='$INPUT_NAME$',&#10;      ariaLabel='header')}&quot;/&gt;&#10;  &lt;/th:block&gt;&#10;&lt;/th:block&gt;" description="An entire screen that has one input and is labelled by the page header." toReformat="false" toShortenFQNames="true">
 <variable name="TITLE" expression="" defaultValue="" alwaysStopAt="true" />
 <variable name="ICON_NAME" expression="" defaultValue="" alwaysStopAt="true" />
 <variable name="HEADER" expression="" defaultValue="" alwaysStopAt="true" />
@@ -317,4 +326,4 @@
 <context>
   <option name="HTML" value="true" />
 </context>
-</template>
+</template>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
new file mode 100644
index 000000000..bb784d02b
--- /dev/null
+++ b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
@@ -0,0 +1,15 @@
+<header
+    th:fragment="cardHeaderForSingleInputScreen"
+    th:with="
+    hasSubtext=${!#strings.isEmpty(subtext)},
+    isRequiredInput=${requiredInputs.getOrDefault(inputName, false)}"
+    th:assert="${!#strings.isEmpty(header)}"
+    class="form-card__header">
+  <h1 id="header" class="h2" >
+    <span th:text="${header}"></span>
+    <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+  </h1>
+  <p id="header-help-message"
+     th:if="${hasSubtext}"
+     th:utext="${subtext}"></p>
+</header>
diff --git a/src/main/resources/templates/fragments/screens/screenWithOneInput.html b/src/main/resources/templates/fragments/screens/screenWithOneInput.html
index 28d40a107..ce8d66aed 100644
--- a/src/main/resources/templates/fragments/screens/screenWithOneInput.html
+++ b/src/main/resources/templates/fragments/screens/screenWithOneInput.html
@@ -21,7 +21,8 @@
           <th:block th:replace="${hasIconName} ? ~{'fragments/icons' :: ${iconName}} : _"/>
           <th:block th:replace="${hasIconFragment} ? ${iconFragment} : _"/>
           <th:block
-              th:replace="~{fragments/cardHeader :: cardHeader(header=${header}, subtext=${subtext})}"/>
+              th:replace="~{fragments/cardHeaderForSingleInputScreen :: 
+              cardHeaderForSingleInputScreen(header=${header}, subtext=${subtext}, inputName=${inputName})}"/>
           <th:block
               th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
             <th:block th:ref="formContent">

From 775133f999f34347fd0906827bc919b9ae5eee8f Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Wed, 14 Feb 2024 16:20:40 -0800
Subject: [PATCH 15/41] Add documentation for screen with one input

---
 README.md                                     | 44 ++++++++++++++++++-
 .../fragments/screens/screenWithOneInput.html | 17 +++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6e36cfa6e..d9530c0ce 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ Table of Contents
     * [Submission Object](#submission-object)
     * [Inputs Class](#inputs-class)
         * [Validating Inputs](#validating-inputs)
+        * [Required Inputs](#required-inputs)
     * [Dynamic Input Fields](#dynamic-input-fields)
     * [Custom Annotations](#custom-annotations)
         * [Validation Annotations](#validation-annotations)
@@ -596,6 +597,13 @@ use `@Email` and `@NotBlank` together, that causes both validations to run even
 enter a value, validating both that they need to enter a value due to `@NotBlank` and because the
 blank value needs to be a validly formatted email address due to `@Email`.
 
+### Required Inputs
+
+As mentioned above in the [Validating Inputs](#validating-inputs) section, the annotations `@NotEmpty`,
+`@NotBlank`, and `@NotNull` are used to make a field required. The library will automatically
+add the necessary `aria-required` attribute to the input field in your HTML and add a red asterisk to 
+labels for required inputs where applicable.
+
 ## Dynamic Input Fields
 
 A field is dynamic if it is unknown exactly how many of them will be submitted on a given form
@@ -1034,7 +1042,7 @@ page is labeled by the page header. In this case we recommend using the `cfa:scr
 live
 template which we have provided. This template makes use of an `aria-label` referencing the header
 of
-the page instead of a traditional label.
+the page instead of a traditional label. For more information on see [Screen with One Input](#screen-with-one-input).
 
 #### Text
 
@@ -1505,6 +1513,40 @@ There is an optional field called `isHidden` available on both buttons. If set t
 the `display-none` class will be added to the widget's classes resulting in the button being hidden
 when the page loads.
 
+### Screen with One Input
+
+Screens with a single input are tricky because all inputs need a label, but for this screen pattern
+the label is the header of the page. To handle this, we have a special fragment called `screenWithOneInput`.
+You can use the `cfa:screenWithOneInput` live template to quickly create a screen with a single input
+that utilizes this fragment.
+
+Note that the live template will ask you for a `title`, `header`, and `inputName`. This input name should
+match the input name you give the actual input you use. There is also an optional `subtext` which can
+display optional text below the header.
+
+The live template looks like this:
+```html
+<th:block
+  th:replace="~{fragments/screens/screenWithOneInput ::
+  screenWithOneInput(
+    title=#{},
+    header=#{},
+    inputName='',
+    subtext=#{},
+    formAction=${formAction},
+    inputContent=~{::inputContent})}">
+  <th:block th:ref="inputContent">
+    <!-- Be sure to have `ariaLabel='header'` to label the input with the header -->
+    <th:block th:replace="~{fragments/inputs/text ::
+      text(inputName='',
+      ariaLabel='header')}"/>
+  </th:block>
+</th:block>
+```
+
+Note in this example we use a text input, but you can use any input type you like. Just make sure the
+input name matches the `inputName` you give the `screenWithOneInput` fragment.
+
 ## Document Upload
 
 The library provides a file upload feature using the client side JavaScript
diff --git a/src/main/resources/templates/fragments/screens/screenWithOneInput.html b/src/main/resources/templates/fragments/screens/screenWithOneInput.html
index ce8d66aed..67035f8d8 100644
--- a/src/main/resources/templates/fragments/screens/screenWithOneInput.html
+++ b/src/main/resources/templates/fragments/screens/screenWithOneInput.html
@@ -43,3 +43,20 @@
   </body>
   </html>
 </th:block>
+
+<th:block
+  th:replace="~{fragments/screens/screenWithOneInput ::
+  screenWithOneInput(
+    title=#{},
+    header=#{},
+    inputName='',
+    subtext=#{},
+    formAction=${formAction},
+    inputContent=~{::inputContent})}">
+  <th:block th:ref="inputContent">
+    <!-- Be sure to have `ariaLabel='header'` to label the input with the header -->
+    <th:block th:replace="~{fragments/inputs/text ::
+      text(inputName='',
+      ariaLabel='header')}"/>
+  </th:block>
+</th:block>

From 7c6e739f2920c37b0c846dcd2325f2c2c6319a32 Mon Sep 17 00:00:00 2001
From: Sree P <sprasad@codeforamerica.org>
Date: Thu, 22 Feb 2024 14:55:36 -0800
Subject: [PATCH 16/41] Fix path

---
 src/test/resources/templates/requiredInputs/inputs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/resources/templates/requiredInputs/inputs.html b/src/test/resources/templates/requiredInputs/inputs.html
index aa2b7e1a7..144d1ca08 100644
--- a/src/test/resources/templates/requiredInputs/inputs.html
+++ b/src/test/resources/templates/requiredInputs/inputs.html
@@ -10,7 +10,7 @@
         <th:block
             th:replace="~{fragments/cardHeader :: cardHeader(header='Inputs Screen', subtext='This is the inputs screen!')}"/>
         <th:block
-            th:replace="~{fragments/form :: form(action='/flow/otherTestFlow/inputs', content=~{::formContent})}">
+            th:replace="~{fragments/form :: form(action='/flow/requiredInputs/inputs', content=~{::formContent})}">
           <th:block th:ref="formContent">
             <div class="form-card__content">
               <th:block

From db296c3adb443ffbbbceea029dffb6f54201e473 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Wed, 1 May 2024 17:03:44 -0700
Subject: [PATCH 17/41] Update required fields to use message properties and
 (required) language

---
 .../resources/webjars/form-flow/0.0.1/css/libraryStyles.css | 1 +
 src/main/resources/messages-form-flow.properties            | 1 +
 src/main/resources/messages-form-flow_es.properties         | 1 +
 src/main/resources/messages-form-flow_vi.properties         | 1 +
 .../templates/fragments/cardHeaderForSingleInputScreen.html | 2 +-
 .../templates/fragments/inputs/checkboxFieldset.html        | 2 +-
 src/main/resources/templates/fragments/inputs/date.html     | 6 ++++--
 src/main/resources/templates/fragments/inputs/money.html    | 2 +-
 src/main/resources/templates/fragments/inputs/number.html   | 2 +-
 src/main/resources/templates/fragments/inputs/phone.html    | 2 +-
 .../resources/templates/fragments/inputs/radioFieldset.html | 2 +-
 src/main/resources/templates/fragments/inputs/select.html   | 2 +-
 src/main/resources/templates/fragments/inputs/ssn.html      | 2 +-
 src/main/resources/templates/fragments/inputs/text.html     | 2 +-
 src/main/resources/templates/fragments/inputs/textArea.html | 2 +-
 15 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css b/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
index 83ae92d8b..d052e8ae2 100644
--- a/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
+++ b/src/main/resources/META-INF/resources/webjars/form-flow/0.0.1/css/libraryStyles.css
@@ -744,6 +744,7 @@ body,
 
 .required-input {
   color: #a72f10;
+  font-weight: normal;
 }
 
 .form-group .text--help+.text--error {
diff --git a/src/main/resources/messages-form-flow.properties b/src/main/resources/messages-form-flow.properties
index 08d5994dc..07f877218 100644
--- a/src/main/resources/messages-form-flow.properties
+++ b/src/main/resources/messages-form-flow.properties
@@ -29,6 +29,7 @@ general.files.file-added.one=1 file added
 general.files.file-added.other=files added
 general.files.uploaded-documents=Uploaded documents
 general.locked-submission=You've already submitted this application. To protect your data, we can't let you go back at this time.
+general.required-field=(required)
 #
 address-validation.check-your-address=Check your address
 address-validation.header.make-sure-your-address-is-correct=Make sure your address is correct
diff --git a/src/main/resources/messages-form-flow_es.properties b/src/main/resources/messages-form-flow_es.properties
index d496f88dd..503e4d737 100644
--- a/src/main/resources/messages-form-flow_es.properties
+++ b/src/main/resources/messages-form-flow_es.properties
@@ -28,6 +28,7 @@ general.files.add-your-files=Agregue sus archivos
 general.files.file-added.one=1 archivo agregado
 general.files.file-added.other=archivos agregados
 general.files.uploaded-documents=Documentos subidos
+general.required-field=(requerido)
 #
 address-validation.check-your-address=Verifique su dirección
 address-validation.header.make-sure-your-address-is-correct=Asegúrese de que su dirección sea correcta
diff --git a/src/main/resources/messages-form-flow_vi.properties b/src/main/resources/messages-form-flow_vi.properties
index 7e4e6f504..c171adef6 100644
--- a/src/main/resources/messages-form-flow_vi.properties
+++ b/src/main/resources/messages-form-flow_vi.properties
@@ -25,6 +25,7 @@ general.files.file-added.one=\u0110\u00E3 th\u00EAm 1 t\u1EC7p
 general.files.file-added.other=\u0111\u00E3 th\u00EAm t\u1EADp tin
 general.files.uploaded-documents=T\u00E0i li\u1EC7u \u0111\u00E3 t\u1EA3i l\u00EAn
 general.locked-submission=Qu\u00FD v\u1ECB \u0111\u00E3 g\u1EEDi \u0111\u01A1n \u0111\u0103ng k\u00FD n\u00E0y. \u0110\u1EC3 b\u1EA3o v\u1EC7 d\u1EEF li\u1EC7u, hi\u1EC7n qu\u00FD v\u1ECB kh\u00F4ng \u0111\u01B0\u1EE3c ph\u00E9p quay l\u1EA1i.
+general.required-field=(b\u1EAFt bu\u1ED9c)
 #
 address-validation.check-your-address=Ki\u1EC3m tra \u0111\u1ECBa ch\u1EC9 c\u1EE7a qu\u00FD v\u1ECB
 address-validation.header.make-sure-your-address-is-correct=H\u00E3y ch\u1EAFc ch\u1EAFn \u0111\u1ECBa ch\u1EC9 \u0111\u00E3 \u0111\u01B0\u1EE3c nh\u1EADp \u0111\u00FAng
diff --git a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
index bb784d02b..880c39579 100644
--- a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
+++ b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
@@ -7,7 +7,7 @@
     class="form-card__header">
   <h1 id="header" class="h2" >
     <span th:text="${header}"></span>
-    <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+    <span th:if="${isRequiredInput}" class="required-input" th:text="#{general.required-field}"></span>
   </h1>
   <p id="header-help-message"
      th:if="${hasSubtext}"
diff --git a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
index 290a1c3a4..8323821f3 100644
--- a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
@@ -23,7 +23,7 @@
               th:id="${inputName + '-legend'}"
               th:inline="text">
         <span th:text="${label}"></span>
-        <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+        <span th:if="${isRequiredInput}" class="required-input" th:text="#{general.required-field}"></span>
         <p class="text--help spacing-below-0 text--normal"
            th:if="${hasHelpText}"
            th:id="${inputName + '-help-text'}"
diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index ac212df72..5fed458a2 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -3,7 +3,9 @@
     th:with="
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName + 'Month', false) || requiredInputs.getOrDefault(inputName + 'Day', false) || requiredInputs.getOrDefault(inputName + 'Year', false)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName + 'Month', false) || 
+        requiredInputs.getOrDefault(inputName + 'Day', false) || 
+        requiredInputs.getOrDefault(inputName + 'Year', false)},
       hasErrorMonth=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Month'))},
       hasErrorDay=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Day'))},
       hasErrorYear=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Year'))},
@@ -14,7 +16,7 @@
       <legend th:if="${hasLabel}" th:for="${inputName}"
              class="form-question">
         <span th:text="${label}"></span>
-        <span th:if="${isRequiredInput && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
+        <span th:if="${isRequiredInput && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
       </legend>
       <th:block
           th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Month')}"></th:block>
diff --git a/src/main/resources/templates/fragments/inputs/money.html b/src/main/resources/templates/fragments/inputs/money.html
index 6ebaaffc3..e22236ad3 100644
--- a/src/main/resources/templates/fragments/inputs/money.html
+++ b/src/main/resources/templates/fragments/inputs/money.html
@@ -13,7 +13,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}"  class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/number.html b/src/main/resources/templates/fragments/inputs/number.html
index ea633e9be..aa7e620e7 100644
--- a/src/main/resources/templates/fragments/inputs/number.html
+++ b/src/main/resources/templates/fragments/inputs/number.html
@@ -15,7 +15,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/phone.html b/src/main/resources/templates/fragments/inputs/phone.html
index beddcf507..1b008e3e5 100644
--- a/src/main/resources/templates/fragments/inputs/phone.html
+++ b/src/main/resources/templates/fragments/inputs/phone.html
@@ -13,7 +13,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index e7ee5e4fc..51257dce9 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -22,7 +22,7 @@
               th:id="${inputName + '-legend'}"
               th:inline="text">
         <span th:text="${label}"></span>
-        <span th:if="${isRequiredInput && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
+        <span th:if="${isRequiredInput && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
         <p class="text--help spacing-below-0 text--normal"
            th:if="${hasHelpText}"
            th:id="${inputName + '-help-text'}"
diff --git a/src/main/resources/templates/fragments/inputs/select.html b/src/main/resources/templates/fragments/inputs/select.html
index 35a4a517b..f5d119227 100644
--- a/src/main/resources/templates/fragments/inputs/select.html
+++ b/src/main/resources/templates/fragments/inputs/select.html
@@ -16,7 +16,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index 16ff2ee68..27d0302c0 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -13,7 +13,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index 89489f848..fdfbb4944 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -13,7 +13,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/textArea.html b/src/main/resources/templates/fragments/inputs/textArea.html
index 40bc24ee1..e211abb76 100644
--- a/src/main/resources/templates/fragments/inputs/textArea.html
+++ b/src/main/resources/templates/fragments/inputs/textArea.html
@@ -15,7 +15,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput}" class="required-input" aria-hidden="true">*</span>
+      <span th:if="${isRequiredInput}" class="required-input" th:text="#{general.required-field}"></span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"

From 2d5eb2cd223a4bdef8ac2c478bdbace28b1c219f Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Thu, 2 May 2024 16:25:56 -0700
Subject: [PATCH 18/41] Add optional required field to all input types

---
 src/main/resources/templates/fragments/inputs/checkbox.html   | 2 ++
 .../templates/fragments/inputs/checkboxFieldset.html          | 2 +-
 src/main/resources/templates/fragments/inputs/date.html       | 3 ++-
 src/main/resources/templates/fragments/inputs/money.html      | 4 ++--
 src/main/resources/templates/fragments/inputs/number.html     | 2 +-
 src/main/resources/templates/fragments/inputs/phone.html      | 2 +-
 .../resources/templates/fragments/inputs/radioFieldset.html   | 2 +-
 src/main/resources/templates/fragments/inputs/select.html     | 2 +-
 src/main/resources/templates/fragments/inputs/ssn.html        | 3 ++-
 src/main/resources/templates/fragments/inputs/text.html       | 4 ++--
 src/main/resources/templates/fragments/inputs/textArea.html   | 4 ++--
 11 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/checkbox.html b/src/main/resources/templates/fragments/inputs/checkbox.html
index 0189ef6dc..f6e0dc300 100644
--- a/src/main/resources/templates/fragments/inputs/checkbox.html
+++ b/src/main/resources/templates/fragments/inputs/checkbox.html
@@ -3,6 +3,7 @@
     th:with="
       hasHelpText=${!#strings.isEmpty(checkboxHelpText)},
       hasIcon=${!#strings.isEmpty(checkboxIcon)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
       name=${inputName} + '[]',
       hasError=${
         errorMessages != null &&
@@ -31,6 +32,7 @@
       </div>
       <div>
         <span th:text="${label}"></span>
+        <span th:if="${isRequiredInput}" class="required-input" th:text="#{general.required-field}"></span>
         <p th:if="${hasHelpText}"
            th:id="${name} + '-' + ${value} + '-help-text'"
            th:text="${checkboxHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
index 8323821f3..a6469bf8c 100644
--- a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index 5fed458a2..e076291b0 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -5,7 +5,8 @@
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
       isRequiredInput=${requiredInputs.getOrDefault(inputName + 'Month', false) || 
         requiredInputs.getOrDefault(inputName + 'Day', false) || 
-        requiredInputs.getOrDefault(inputName + 'Year', false)},
+        requiredInputs.getOrDefault(inputName + 'Year', false) ||
+        required != null && required},
       hasErrorMonth=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Month'))},
       hasErrorDay=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Day'))},
       hasErrorYear=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Year'))},
diff --git a/src/main/resources/templates/fragments/inputs/money.html b/src/main/resources/templates/fragments/inputs/money.html
index e22236ad3..005e2933c 100644
--- a/src/main/resources/templates/fragments/inputs/money.html
+++ b/src/main/resources/templates/fragments/inputs/money.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
@@ -13,7 +13,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}"  class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
+      <span th:if="${isRequiredInput && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/number.html b/src/main/resources/templates/fragments/inputs/number.html
index aa7e620e7..3ac855c24 100644
--- a/src/main/resources/templates/fragments/inputs/number.html
+++ b/src/main/resources/templates/fragments/inputs/number.html
@@ -6,7 +6,7 @@
       hasPattern=${!#strings.isEmpty(pattern)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/phone.html b/src/main/resources/templates/fragments/inputs/phone.html
index 1b008e3e5..abb296a7f 100644
--- a/src/main/resources/templates/fragments/inputs/phone.html
+++ b/src/main/resources/templates/fragments/inputs/phone.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index 51257dce9..4b51994ec 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/select.html b/src/main/resources/templates/fragments/inputs/select.html
index f5d119227..f7a4bb521 100644
--- a/src/main/resources/templates/fragments/inputs/select.html
+++ b/src/main/resources/templates/fragments/inputs/select.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index 27d0302c0..be8d42960 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -4,7 +4,8 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
+      isRequiredInput=${      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+.getOrDefault(inputName, false)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index fdfbb4944..de49363f5 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
@@ -13,7 +13,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput  && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
+      <span th:if="${isRequiredInput && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"
diff --git a/src/main/resources/templates/fragments/inputs/textArea.html b/src/main/resources/templates/fragments/inputs/textArea.html
index e211abb76..45d827e1c 100644
--- a/src/main/resources/templates/fragments/inputs/textArea.html
+++ b/src/main/resources/templates/fragments/inputs/textArea.html
@@ -6,7 +6,7 @@
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
       rows=${!#strings.isEmpty(rows)} ? ${rows} : '6',
       maxLength=${!#strings.isEmpty(maxLength)} ? ${maxLength} : '500',
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
@@ -15,7 +15,7 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <label th:if="${hasLabel}" th:for="${inputName}" class="form-question">
       <span th:text="${label}"></span>
-      <span th:if="${isRequiredInput}" class="required-input" th:text="#{general.required-field}"></span>
+      <span th:if="${isRequiredInput && !hasAriaLabel}" class="required-input" th:text="#{general.required-field}"></span>
     </label>
     <p class="text--help"
        th:if="${hasHelpText}"

From 815b6d3690f66467a169b9e93950c0cf95fc6c23 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Fri, 3 May 2024 15:47:34 -0700
Subject: [PATCH 19/41] Add required indication to screen with one input
 pattern

---
 intellij-settings/LiveTemplates.xml                   | 11 +----------
 .../fragments/cardHeaderForSingleInputScreen.html     |  5 ++---
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/intellij-settings/LiveTemplates.xml b/intellij-settings/LiveTemplates.xml
index e5b54f696..758e01a4e 100644
--- a/intellij-settings/LiveTemplates.xml
+++ b/intellij-settings/LiveTemplates.xml
@@ -117,15 +117,6 @@
   <option name="HTML" value="true" />
 </context>
 </template>
-<template name="cfa:checkbox" value="&lt;th:block th:replace=&quot;~{fragments/inputs/checkbox ::&#10;  checkbox(inputName='$INPUT_NAME$',&#10;  label=#{$LABEL$},&#10; value=#{$VALUE$},&#10; helpText=#{$CHECKBOX_HELP_TEXT$})}&quot;/&gt;" description="A field checkbox with label, name, optional help text and optional icon" toReformat="false" toShortenFQNames="true">
-<variable name="INPUT_NAME" expression="" defaultValue="" alwaysStopAt="true" />
-<variable name="VALUE" expression="" defaultValue="" alwaysStopAt="true" />
-<variable name="LABEL" expression="" defaultValue="" alwaysStopAt="true" />
-<variable name="CHECKBOX_HELP_TEXT" expression="" defaultValue="" alwaysStopAt="true" />
-<context>
-  <option name="HTML" value="true" />
-</context>
-</template>
 <template name="cfa:inputFieldsetWithRadio" value="&lt;th:block th:replace=&quot;~{fragments/inputs/radioFieldset ::&#10;              radioFieldset(inputName='$INPUT_NAME$',&#10;              label=#{$LABEL$},&#10;              fieldsetHelpText=#{$OPTIONAL_HELP_TEXT$},&#10;              content=~{::$CONTENTREF$})}&quot;&gt;&#10;              &lt;th:block th:ref=&quot;$CONTENTREF$&quot;&gt;&#10;                &lt;!-- Copy the below input if you want to add more --&gt;&#10;                &lt;th:block&#10;                    th:replace=&quot;~{fragments/inputs/radio :: radio(inputName='$INPUT_NAME$',value='$VALUE$', label=#{$VALUE_LABEL$})}&quot;/&gt;&#10;              &lt;/th:block&gt;&#10;            &lt;/th:block&gt;" description="A fieldset with legend and radio input(s) with optional help text." toReformat="false" toShortenFQNames="true">
 <variable name="INPUT_NAME" expression="" defaultValue="" alwaysStopAt="true" />
 <variable name="LABEL" expression="" defaultValue="" alwaysStopAt="true" />
@@ -250,7 +241,7 @@
   <option name="HTML" value="true" />
 </context>
 </template>
-<template name="cfa:screenWithOneInput" value="&lt;th:block&#10;  th:replace=&quot;~{fragments/screens/screenWithOneInput ::&#10;  screenWithOneInput(&#10;    title=#{$TITLE$},&#10;    iconFragment=~{fragments/icons :: $ICON_NAME$},&#10;    header=#{$HEADER$},&#10;    inputName='$INPUT_NAME$',&#10;    subtext=#{$SUBTEXT$},&#10;    formAction=${formAction},&#10;    inputContent=~{::inputContent})}&quot;&gt;&#10;  &lt;th:block th:ref=&quot;inputContent&quot;&gt;&#10;    &lt;!-- Be sure to have `ariaLabel='header'` to label the input with the header --&gt;&#10;    &lt;th:block th:replace=&quot;~{fragments/inputs/text ::&#10;      text(inputName='$INPUT_NAME$',&#10;      ariaLabel='header')}&quot;/&gt;&#10;  &lt;/th:block&gt;&#10;&lt;/th:block&gt;" description="An entire screen that has one input and is labelled by the page header." toReformat="false" toShortenFQNames="true">
+<template name="cfa:screenWithOneInput" value="&lt;th:block&#10;  th:replace=&quot;~{fragments/screens/screenWithOneInput ::&#10;  screenWithOneInput(&#10;    title=#{$TITLE$},&#10;    iconFragment=~{fragments/icons :: $ICON_NAME$},&#10;    header=#{$HEADER$},&#10;    subtext=#{$SUBTEXT$},&#10;    inputName='$INPUT_NAME$',&#10;    formAction=${formAction},&#10;    inputContent=~{::inputContent})}&quot;&gt;&#10;  &lt;th:block th:ref=&quot;inputContent&quot;&gt;&#10;    &lt;!-- Be sure to have `ariaLabel='header'` to label the input with the header --&gt;&#10;    &lt;th:block th:replace=&quot;~{fragments/inputs/text ::&#10;      text(inputName='$INPUT_NAME$',&#10;      ariaLabel='header')}&quot;/&gt;&#10;  &lt;/th:block&gt;&#10;&lt;/th:block&gt;" description="An entire screen that has one input and is labelled by the page header." toReformat="false" toShortenFQNames="true">
 <variable name="TITLE" expression="" defaultValue="" alwaysStopAt="true" />
 <variable name="ICON_NAME" expression="" defaultValue="" alwaysStopAt="true" />
 <variable name="HEADER" expression="" defaultValue="" alwaysStopAt="true" />
diff --git a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
index 880c39579..8672ed8ae 100644
--- a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
+++ b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
@@ -2,12 +2,11 @@
     th:fragment="cardHeaderForSingleInputScreen"
     th:with="
     hasSubtext=${!#strings.isEmpty(subtext)},
-    isRequiredInput=${requiredInputs.getOrDefault(inputName, false)}"
+    isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required}"
     th:assert="${!#strings.isEmpty(header)}"
     class="form-card__header">
   <h1 id="header" class="h2" >
-    <span th:text="${header}"></span>
-    <span th:if="${isRequiredInput}" class="required-input" th:text="#{general.required-field}"></span>
+    <span th:text="${header + ' '}"></span><span th:if="${isRequiredInput}" class="required-input" th:text="#{general.required-field}"></span>
   </h1>
   <p id="header-help-message"
      th:if="${hasSubtext}"

From 4c2f7145a22ae2eda5f622f87ecd5fbb1ce6b01d Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Fri, 3 May 2024 16:27:50 -0700
Subject: [PATCH 20/41] Update README

---
 README.md | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d9530c0ce..7fadbe5aa 100644
--- a/README.md
+++ b/README.md
@@ -601,8 +601,73 @@ blank value needs to be a validly formatted email address due to `@Email`.
 
 As mentioned above in the [Validating Inputs](#validating-inputs) section, the annotations `@NotEmpty`,
 `@NotBlank`, and `@NotNull` are used to make a field required. The library will automatically
-add the necessary `aria-required` attribute to the input field in your HTML and add a red asterisk to 
-labels for required inputs where applicable.
+append a red '(required)' to the end of your input labels.
+
+#### Special Required Field Situations
+
+Sometimes you may have a field that is required, but not through an annotation such as those mentioned above.
+Specific scenarios where this might be the case include:
+- A field is validated through an action in the flows-config file and that validation makes it required
+- A field uses cross validtation int he flows-config file and that validation makes it required
+
+In these cases, we have provided an attribute which can be added to inputs `required` which is a boolean
+that defaults to false. If set to true, the library will treat the field as required and append the 
+red `(required)`. 
+
+For example:
+```html
+<th:block th:replace="~{fragments/inputs/text ::
+      text(inputName='firstName',
+      label=#{personal-info.first-name-label},
+      required=true,
+      helpText=#{personal-info.first-name-help})}"/>
+```
+
+Note that this attribute is optional and intended to be used in these special situations.
+
+#### Required Fields on Single Input Screens
+The library provides a convenience template fragment for single input screens that will make such 
+screens accessible to screen readers. 
+
+When using this template and you want a field to be indicated as required, you need to provide the 
+input name when defining the fragment so that Thymeleaf can access the field name when checking required
+field annotations.
+
+Example:
+```html
+<th:block>
+  <th:block
+      th:replace="~{fragments/screens/screenWithOneInput ::
+  screenWithOneInput(
+    title=#{economic-hardship.title},
+    header=#{economic-hardship.header},
+    subtext=#{economic-hardship.subheader},
+    formAction=${formAction},
+    inputName='economicHardshipTypes',
+    inputContent=~{::inputContent})}">
+... more content
+```
+Note the `inputName='economicHardshipTypes'` attribute. This is the name of the input field in the
+which will appear below `more content` above. This name is used to check for required field annotations
+so that the template will know the field is required.
+
+We've also provided the same `required` attribute for this template fragment as well. Again this is
+an optional attribute for situations where the field is required but not through an annotation.
+Here is an example of using it with the `screenWithOneInput` fragment:
+```html
+<th:block
+    th:replace="~{fragments/screens/screenWithOneInput ::
+    screenWithOneInput(
+    title=#{economic-hardship.title},
+    required=true,
+    header=#{economic-hardship.header},
+    subtext=#{economic-hardship.subheader},
+    formAction=${formAction},
+    inputName='economicHardshipTypes',
+    inputContent=~{::inputContent})}">
+```
+
+Note that passing `required=true` here will append the red `(required)` to the label.
 
 ## Dynamic Input Fields
 

From 10e397a4211799e0753ceda6d9695d298c7c8fe7 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Fri, 3 May 2024 16:28:01 -0700
Subject: [PATCH 21/41] Fix failing tests

---
 .../templates/fragments/inputs/ssn.html       |  3 +--
 .../fragments/screens/screenWithOneInput.html |  2 +-
 .../library/framework/RequiredInputsTest.java | 20 +++++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index be8d42960..7f5a635b6 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -4,8 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
-.getOrDefault(inputName, false)},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/screens/screenWithOneInput.html b/src/main/resources/templates/fragments/screens/screenWithOneInput.html
index 67035f8d8..f792390fe 100644
--- a/src/main/resources/templates/fragments/screens/screenWithOneInput.html
+++ b/src/main/resources/templates/fragments/screens/screenWithOneInput.html
@@ -22,7 +22,7 @@
           <th:block th:replace="${hasIconFragment} ? ${iconFragment} : _"/>
           <th:block
               th:replace="~{fragments/cardHeaderForSingleInputScreen :: 
-              cardHeaderForSingleInputScreen(header=${header}, subtext=${subtext}, inputName=${inputName})}"/>
+              cardHeaderForSingleInputScreen(header=${header}, subtext=${subtext}, inputName=${inputName}, required=${required})}"/>
           <th:block
               th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
             <th:block th:ref="formContent">
diff --git a/src/test/java/formflow/library/framework/RequiredInputsTest.java b/src/test/java/formflow/library/framework/RequiredInputsTest.java
index 55652b973..b77714ee3 100644
--- a/src/test/java/formflow/library/framework/RequiredInputsTest.java
+++ b/src/test/java/formflow/library/framework/RequiredInputsTest.java
@@ -34,35 +34,35 @@ public class RequiredInputsTest extends AbstractMockMvcTest {
   void shouldIndicateRequiredFields() throws Exception {
     FormScreen inputsScreen = new FormScreen(mockMvc.perform(get("/flow/requiredInputs/inputs").session(session)));
     assertThat(inputsScreen.getElementByCssSelector("label[for=textInput]").text())
-        .contains("*");
+        .contains("(required)");
     assertThat(inputsScreen.getElementById("textInput").attr("aria-required"))
         .isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=areaInput]").text())
-        .contains("*");
+        .contains("(required)");
     assertThat(inputsScreen.getElementById("areaInput").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("legend[for=date]").text())
-        .contains("*");
+        .contains("(required)");
     assertThat(inputsScreen.getElementById("date-day").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=numberInput]").text())
-        .contains("*");
+        .contains("(required)");
     assertThat(inputsScreen.getElementById("numberInput").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementById("checkboxSet-legend").text())
-        .contains("*");
+        .contains("(required)");
     assertThat(Objects.requireNonNull(inputsScreen.getElementById("checkboxSet-legend").parent()).attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementById("radioInput-legend").text())
-        .contains("*");
+        .contains("(required)");
     assertThat(Objects.requireNonNull(inputsScreen.getElementById("radioInput-legend").parent()).attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=selectInput]").text())
-        .contains("*");
+        .contains("(required)");
     assertThat(inputsScreen.getElementById("selectInput").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=moneyInput]").text())
-        .contains("*");
+        .contains("(required)");
     assertThat(inputsScreen.getElementById("moneyInput").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=phoneInput]").text())
-        .contains("*");
+        .contains("(required)");
     assertThat(inputsScreen.getElementById("phoneInput").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=ssnInput]").text())
-        .contains("*");
+        .contains("(required)");
     assertThat(inputsScreen.getElementById("ssnInput").attr("aria-required")).isEqualTo("true");
   }
 }

From f9c3b4e2cbbb3ef3bbf16d89c255395455ad5eff Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Mon, 6 May 2024 10:51:56 -0700
Subject: [PATCH 22/41] Fix failing tests

---
 src/main/resources/templates/fragments/inputs/date.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index e076291b0..bef12a946 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -76,13 +76,5 @@
               aria-invalid=${hasErrorYear}"
              th:value="${fieldData.getOrDefault(inputName + 'Year', '')}"/>
     </fieldset>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Month')}"></th:block>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Day')}"></th:block>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName} + 'Year')}"></th:block>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${groupName})}"></th:block>
   </div>
 </th:block>

From 1104f60165ba1549da5c43187eaba19905dff224 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Mon, 6 May 2024 12:08:49 -0700
Subject: [PATCH 23/41] Fix failing tests and remove aria-required attribute

---
 .../templates/fragments/inputs/checkboxFieldset.html  |  1 -
 .../resources/templates/fragments/inputs/date.html    |  3 ---
 .../resources/templates/fragments/inputs/money.html   |  3 +--
 .../resources/templates/fragments/inputs/number.html  |  3 +--
 .../resources/templates/fragments/inputs/phone.html   |  3 +--
 .../templates/fragments/inputs/radioFieldset.html     |  1 -
 .../resources/templates/fragments/inputs/select.html  |  1 -
 .../resources/templates/fragments/inputs/ssn.html     |  3 +--
 .../resources/templates/fragments/inputs/text.html    |  3 +--
 .../templates/fragments/inputs/textArea.html          |  1 -
 .../controllers/ScreenControllerJourneyTest.java      |  3 +++
 .../library/framework/RequiredInputsTest.java         | 11 -----------
 .../templates/testFlow/subflowAddItemPage2.html       |  2 +-
 13 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
index a6469bf8c..c1d042c21 100644
--- a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
@@ -15,7 +15,6 @@
       ${content != null}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <fieldset th:attr="
-      aria-required=${isRequiredInput},
       aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
       aria-labelledby=${hasAriaLabel ? ariaLabel : ''}">
       <legend class="form-question"
diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index bef12a946..172e956fd 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -48,7 +48,6 @@
              th:attr="
               aria-describedby=${inputName + '-month-label'},
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-required=${requiredInputs.getOrDefault(inputName + 'Month', false)},
               aria-invalid=${hasErrorMonth}"
              th:value="${fieldData.getOrDefault(inputName + 'Month', '')}"/>
       /
@@ -60,7 +59,6 @@
              th:attr="
               aria-describedby=${inputName}+'-day-label',
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-required=${requiredInputs.getOrDefault(inputName + 'Day', false)},
               aria-invalid=${hasErrorDay}"
              th:value="${fieldData.getOrDefault(inputName + 'Day', '')}"/>
       /
@@ -72,7 +70,6 @@
              th:attr="
               aria-describedby=${inputName}+'-year-label',
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-required=${requiredInputs.getOrDefault(inputName + 'Year', false)},
               aria-invalid=${hasErrorYear}"
              th:value="${fieldData.getOrDefault(inputName + 'Year', '')}"/>
     </fieldset>
diff --git a/src/main/resources/templates/fragments/inputs/money.html b/src/main/resources/templates/fragments/inputs/money.html
index 005e2933c..bc4477fa6 100644
--- a/src/main/resources/templates/fragments/inputs/money.html
+++ b/src/main/resources/templates/fragments/inputs/money.html
@@ -31,8 +31,7 @@
              th:attr="
               aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-invalid=${hasError},
-              aria-required=${isRequiredInput}"
+              aria-invalid=${hasError}"
              th:value="${fieldData.getOrDefault(inputName, '')}">
       <div th:if="${postfix != null}" th:text="${postfix}" class="text-input-group__postfix"></div>
     </div>
diff --git a/src/main/resources/templates/fragments/inputs/number.html b/src/main/resources/templates/fragments/inputs/number.html
index 3ac855c24..d929f4e7d 100644
--- a/src/main/resources/templates/fragments/inputs/number.html
+++ b/src/main/resources/templates/fragments/inputs/number.html
@@ -35,8 +35,7 @@
               pattern=${hasPattern ? pattern : '^\d*(\.\d{0,2})?$'},
               aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
               aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-invalid=${hasError},
-              aria-required=${isRequiredInput}"
+              aria-invalid=${hasError}"
              th:value="${fieldData.getOrDefault(inputName, '')}">
       <div th:if="${postfix != null}" th:text="${postfix}" class="text-input-group__postfix"></div>
     </div>
diff --git a/src/main/resources/templates/fragments/inputs/phone.html b/src/main/resources/templates/fragments/inputs/phone.html
index abb296a7f..fe0bfeeda 100644
--- a/src/main/resources/templates/fragments/inputs/phone.html
+++ b/src/main/resources/templates/fragments/inputs/phone.html
@@ -29,8 +29,7 @@
            th:attr="
             aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
             aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-            aria-invalid=${hasError},
-            aria-required=${isRequiredInput}"
+            aria-invalid=${hasError}"
            th:value="${fieldData.getOrDefault(inputName, '')}">
   </div>
 </th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index 4b51994ec..b4ef2c282 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -16,7 +16,6 @@
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <fieldset th:attr="
       aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
-      aria-required=${isRequiredInput},
       aria-labelledby=${hasAriaLabel ? ariaLabel : ''}">
       <legend class="form-question"
               th:id="${inputName + '-legend'}"
diff --git a/src/main/resources/templates/fragments/inputs/select.html b/src/main/resources/templates/fragments/inputs/select.html
index f7a4bb521..0d0d417cf 100644
--- a/src/main/resources/templates/fragments/inputs/select.html
+++ b/src/main/resources/templates/fragments/inputs/select.html
@@ -32,7 +32,6 @@
               th:attr="
                 aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
                 aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-                aria-required=${isRequiredInput},
                 aria-invalid=${hasError}">
         <th:block th:replace="${content}"/>
       </select>
diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index 7f5a635b6..5b148efec 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -29,8 +29,7 @@
            th:attr="
             aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
             aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-            aria-invalid=${hasError},
-            aria-required=${isRequiredInput}"
+            aria-invalid=${hasError}"
            th:value="${fieldData.getOrDefault(inputName, '')}"
            inputmode="numeric">
   </div>
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index de49363f5..c03fa9b2a 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -29,8 +29,7 @@
            th:attr="
             aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
             aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-            aria-invalid=${hasError},
-            aria-required=${isRequiredInput}"
+            aria-invalid=${hasError}"
            th:value="${fieldData.getOrDefault(inputName, '')}">
   </div>
 </th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/inputs/textArea.html b/src/main/resources/templates/fragments/inputs/textArea.html
index 45d827e1c..ba2e18453 100644
--- a/src/main/resources/templates/fragments/inputs/textArea.html
+++ b/src/main/resources/templates/fragments/inputs/textArea.html
@@ -30,7 +30,6 @@
               th:attr="
                 aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
                 aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-                aria-required=${isRequiredInput},
                 rows=${rows},
                 maxlength=${maxLength},
                 aria-invalid=${hasError}"
diff --git a/src/test/java/formflow/library/controllers/ScreenControllerJourneyTest.java b/src/test/java/formflow/library/controllers/ScreenControllerJourneyTest.java
index c66fda616..499a0b9eb 100644
--- a/src/test/java/formflow/library/controllers/ScreenControllerJourneyTest.java
+++ b/src/test/java/formflow/library/controllers/ScreenControllerJourneyTest.java
@@ -177,6 +177,9 @@ private void runTestSubflowIterations(int numberToRun) {
       assertThat(testPage.getTitle()).isEqualTo("Subflow Page2");
       testPage.enter("textInputSubflowPage2", "testFlow: textInput");
       testPage.enter("areaInputSubflowPage2", "testFlow: areaInput");
+      testPage.enter("dateSubflowPage2Day", "10");
+      testPage.enter("dateSubflowPage2Month", "10");
+      testPage.enter("dateSubflowPage2Year", "2010");
       testPage.enter("numberInputSubflowPage2", "10");
       testPage.clickElementById("checkboxSetSubflowPage2-Checkbox-A-label");
       testPage.clickElementById("checkboxInputSubflowPage2-checkbox-value");
diff --git a/src/test/java/formflow/library/framework/RequiredInputsTest.java b/src/test/java/formflow/library/framework/RequiredInputsTest.java
index b77714ee3..027fdd3f7 100644
--- a/src/test/java/formflow/library/framework/RequiredInputsTest.java
+++ b/src/test/java/formflow/library/framework/RequiredInputsTest.java
@@ -35,34 +35,23 @@ void shouldIndicateRequiredFields() throws Exception {
     FormScreen inputsScreen = new FormScreen(mockMvc.perform(get("/flow/requiredInputs/inputs").session(session)));
     assertThat(inputsScreen.getElementByCssSelector("label[for=textInput]").text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementById("textInput").attr("aria-required"))
-        .isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=areaInput]").text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementById("areaInput").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("legend[for=date]").text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementById("date-day").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=numberInput]").text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementById("numberInput").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementById("checkboxSet-legend").text())
         .contains("(required)");
-    assertThat(Objects.requireNonNull(inputsScreen.getElementById("checkboxSet-legend").parent()).attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementById("radioInput-legend").text())
         .contains("(required)");
-    assertThat(Objects.requireNonNull(inputsScreen.getElementById("radioInput-legend").parent()).attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=selectInput]").text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementById("selectInput").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=moneyInput]").text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementById("moneyInput").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=phoneInput]").text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementById("phoneInput").attr("aria-required")).isEqualTo("true");
     assertThat(inputsScreen.getElementByCssSelector("label[for=ssnInput]").text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementById("ssnInput").attr("aria-required")).isEqualTo("true");
   }
 }
diff --git a/src/test/resources/templates/testFlow/subflowAddItemPage2.html b/src/test/resources/templates/testFlow/subflowAddItemPage2.html
index 2c58e60f0..5af5e6b73 100644
--- a/src/test/resources/templates/testFlow/subflowAddItemPage2.html
+++ b/src/test/resources/templates/testFlow/subflowAddItemPage2.html
@@ -75,7 +75,7 @@
                                   inputName='phoneInputSubflowPage2',
                                   label='phoneInput')}"/>
           <th:block th:replace="~{fragments/inputs/date ::
-            date(inputName='dateSubflowPage2Day',
+            date(inputName='dateSubflowPage2',
             label='dateInputSubflowPage2',
             groupName='dateInputSubflowPage2')}"/>
         </div>

From 82d14adfbe4054070b6e2a47051a2334009a245e Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Mon, 6 May 2024 14:42:42 -0700
Subject: [PATCH 24/41] Hopefully fix tests failing in CI

---
 src/test/java/formflow/library/framework/RequiredInputsTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/formflow/library/framework/RequiredInputsTest.java b/src/test/java/formflow/library/framework/RequiredInputsTest.java
index 027fdd3f7..c5ac7e908 100644
--- a/src/test/java/formflow/library/framework/RequiredInputsTest.java
+++ b/src/test/java/formflow/library/framework/RequiredInputsTest.java
@@ -24,7 +24,6 @@
 import org.springframework.test.annotation.DirtiesContext;
 
 @SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"})
-@DirtiesContext()
 public class RequiredInputsTest extends AbstractMockMvcTest {
 
   @MockBean

From c3f88005ee223131f28197b2c11ff8eec5a663f8 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Mon, 6 May 2024 14:59:10 -0700
Subject: [PATCH 25/41] Hopefully fix tests failing in CI Part 2

---
 .../java/formflow/library/framework/RequiredInputsTest.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/test/java/formflow/library/framework/RequiredInputsTest.java b/src/test/java/formflow/library/framework/RequiredInputsTest.java
index c5ac7e908..7de446f5e 100644
--- a/src/test/java/formflow/library/framework/RequiredInputsTest.java
+++ b/src/test/java/formflow/library/framework/RequiredInputsTest.java
@@ -25,13 +25,10 @@
 
 @SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"})
 public class RequiredInputsTest extends AbstractMockMvcTest {
-
-  @MockBean
-  AddressValidationService addressValidationService;
-
   @Test
   void shouldIndicateRequiredFields() throws Exception {
     FormScreen inputsScreen = new FormScreen(mockMvc.perform(get("/flow/requiredInputs/inputs").session(session)));
+    
     assertThat(inputsScreen.getElementByCssSelector("label[for=textInput]").text())
         .contains("(required)");
     assertThat(inputsScreen.getElementByCssSelector("label[for=areaInput]").text())

From e6ba57ea1e322e372d255ed331e5e68b7b43809a Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Mon, 6 May 2024 15:18:43 -0700
Subject: [PATCH 26/41] Hopefully fix tests failing in CI Part 3

---
 .../library/framework/RequiredInputsTest.java | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/test/java/formflow/library/framework/RequiredInputsTest.java b/src/test/java/formflow/library/framework/RequiredInputsTest.java
index 7de446f5e..3eaf219a6 100644
--- a/src/test/java/formflow/library/framework/RequiredInputsTest.java
+++ b/src/test/java/formflow/library/framework/RequiredInputsTest.java
@@ -29,25 +29,25 @@ public class RequiredInputsTest extends AbstractMockMvcTest {
   void shouldIndicateRequiredFields() throws Exception {
     FormScreen inputsScreen = new FormScreen(mockMvc.perform(get("/flow/requiredInputs/inputs").session(session)));
     
-    assertThat(inputsScreen.getElementByCssSelector("label[for=textInput]").text())
+    assertThat(inputsScreen.getElementByCssSelector("label[for=textInput]").getElementsByClass("required-input").get(0).text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=areaInput]").text())
+    assertThat(inputsScreen.getElementByCssSelector("label[for=areaInput]").getElementsByClass("required-input").get(0).text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("legend[for=date]").text())
+    assertThat(inputsScreen.getElementByCssSelector("legend[for=date]").getElementsByClass("required-input").get(0).text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=numberInput]").text())
+    assertThat(inputsScreen.getElementByCssSelector("label[for=numberInput]").getElementsByClass("required-input").get(0).text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementById("checkboxSet-legend").text())
+    assertThat(inputsScreen.getElementById("checkboxSet-legend").getElementsByClass("required-input").get(0).text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementById("radioInput-legend").text())
+    assertThat(inputsScreen.getElementById("radioInput-legend").getElementsByClass("required-input").get(0).text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=selectInput]").text())
+    assertThat(inputsScreen.getElementByCssSelector("label[for=selectInput]").getElementsByClass("required-input").get(0).text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=moneyInput]").text())
+    assertThat(inputsScreen.getElementByCssSelector("label[for=moneyInput]").getElementsByClass("required-input").get(0).text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=phoneInput]").text())
+    assertThat(inputsScreen.getElementByCssSelector("label[for=phoneInput]").getElementsByClass("required-input").get(0).text())
         .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=ssnInput]").text())
+    assertThat(inputsScreen.getElementByCssSelector("label[for=ssnInput]").getElementsByClass("required-input").get(0).text())
         .contains("(required)");
   }
 }

From a78249f6301872f3186eddf3e7c8038c2b7ab7d7 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Mon, 6 May 2024 15:23:32 -0700
Subject: [PATCH 27/41] Hopefully fix tests failing in CI Part 4

---
 .../formflow/library/framework/RequiredInputsTest.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/test/java/formflow/library/framework/RequiredInputsTest.java b/src/test/java/formflow/library/framework/RequiredInputsTest.java
index 3eaf219a6..fd4ad62d0 100644
--- a/src/test/java/formflow/library/framework/RequiredInputsTest.java
+++ b/src/test/java/formflow/library/framework/RequiredInputsTest.java
@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import org.junit.Before;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -25,6 +26,12 @@
 
 @SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"})
 public class RequiredInputsTest extends AbstractMockMvcTest {
+  
+  @BeforeEach
+    public void setUp() throws Exception {
+        super.setUp();
+    }
+  
   @Test
   void shouldIndicateRequiredFields() throws Exception {
     FormScreen inputsScreen = new FormScreen(mockMvc.perform(get("/flow/requiredInputs/inputs").session(session)));

From 872648bf84d49b4c1abf5249a5e996e78b3bbe67 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Mon, 6 May 2024 15:36:39 -0700
Subject: [PATCH 28/41] Hopefully fix tests failing in CI Part 5

---
 .../java/formflow/library/framework/RequiredInputsTest.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/formflow/library/framework/RequiredInputsTest.java b/src/test/java/formflow/library/framework/RequiredInputsTest.java
index fd4ad62d0..ca068a10d 100644
--- a/src/test/java/formflow/library/framework/RequiredInputsTest.java
+++ b/src/test/java/formflow/library/framework/RequiredInputsTest.java
@@ -25,6 +25,7 @@
 import org.springframework.test.annotation.DirtiesContext;
 
 @SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"})
+@DirtiesContext
 public class RequiredInputsTest extends AbstractMockMvcTest {
   
   @BeforeEach
@@ -34,7 +35,7 @@ public void setUp() throws Exception {
   
   @Test
   void shouldIndicateRequiredFields() throws Exception {
-    FormScreen inputsScreen = new FormScreen(mockMvc.perform(get("/flow/requiredInputs/inputs").session(session)));
+    FormScreen inputsScreen = new FormScreen(mockMvc.perform(get("/flow/requiredInputs/inputs")));
     
     assertThat(inputsScreen.getElementByCssSelector("label[for=textInput]").getElementsByClass("required-input").get(0).text())
         .contains("(required)");

From 788d45435f5c748669ea74a1d8b1db40f21d30dc Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Mon, 6 May 2024 16:04:07 -0700
Subject: [PATCH 29/41] Hopefully fix tests failing in CI Part 6

---
 .../library/framework/RequiredInputsTest.java | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/test/java/formflow/library/framework/RequiredInputsTest.java b/src/test/java/formflow/library/framework/RequiredInputsTest.java
index ca068a10d..6cdf0ac36 100644
--- a/src/test/java/formflow/library/framework/RequiredInputsTest.java
+++ b/src/test/java/formflow/library/framework/RequiredInputsTest.java
@@ -2,6 +2,7 @@
 
 import static formflow.library.inputs.FieldNameMarkers.UNVALIDATED_FIELD_MARKER_VALIDATE_ADDRESS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -16,6 +17,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -37,25 +39,25 @@ public void setUp() throws Exception {
   void shouldIndicateRequiredFields() throws Exception {
     FormScreen inputsScreen = new FormScreen(mockMvc.perform(get("/flow/requiredInputs/inputs")));
     
-    assertThat(inputsScreen.getElementByCssSelector("label[for=textInput]").getElementsByClass("required-input").get(0).text())
-        .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=areaInput]").getElementsByClass("required-input").get(0).text())
-        .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("legend[for=date]").getElementsByClass("required-input").get(0).text())
-        .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=numberInput]").getElementsByClass("required-input").get(0).text())
-        .contains("(required)");
-    assertThat(inputsScreen.getElementById("checkboxSet-legend").getElementsByClass("required-input").get(0).text())
-        .contains("(required)");
-    assertThat(inputsScreen.getElementById("radioInput-legend").getElementsByClass("required-input").get(0).text())
-        .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=selectInput]").getElementsByClass("required-input").get(0).text())
-        .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=moneyInput]").getElementsByClass("required-input").get(0).text())
-        .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=phoneInput]").getElementsByClass("required-input").get(0).text())
-        .contains("(required)");
-    assertThat(inputsScreen.getElementByCssSelector("label[for=ssnInput]").getElementsByClass("required-input").get(0).text())
-        .contains("(required)");
+    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=textInput]").getElementsByClass("required-input").get(0).text()
+        .contains("(required)"));
+    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=areaInput]").getElementsByClass("required-input").get(0).text()
+        .contains("(required)"));
+    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("legend[for=date]").getElementsByClass("required-input").get(0).text()
+        .contains("(required)"));
+    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=numberInput]").getElementsByClass("required-input").get(0).text()
+        .contains("(required)"));
+    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementById("checkboxSet-legend").getElementsByClass("required-input").get(0).text()
+        .contains("(required)"));
+    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementById("radioInput-legend").getElementsByClass("required-input").get(0).text()
+        .contains("(required)"));
+    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=selectInput]").getElementsByClass("required-input").get(0).text()
+        .contains("(required)"));
+    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=moneyInput]").getElementsByClass("required-input").get(0).text()
+        .contains("(required)"));
+    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=phoneInput]").getElementsByClass("required-input").get(0).text()
+        .contains("(required)"));
+    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=ssnInput]").getElementsByClass("required-input").get(0).text()
+        .contains("(required)"));
   }
 }

From c627343b15e9c6d78edf3a46170476a3fe3a582b Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 12:35:24 -0700
Subject: [PATCH 30/41] Convert failing test to use Selenium instead

---
 .../RequiredInputsJourneyTest.java            | 39 ++++++++++++
 .../library/framework/RequiredInputsTest.java | 63 -------------------
 2 files changed, 39 insertions(+), 63 deletions(-)
 create mode 100644 src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
 delete mode 100644 src/test/java/formflow/library/framework/RequiredInputsTest.java

diff --git a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
new file mode 100644
index 000000000..b0e054ed4
--- /dev/null
+++ b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
@@ -0,0 +1,39 @@
+package formflow.library.controllers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+import formflow.library.utilities.AbstractBasePageTest;
+import java.io.IOException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"},
+    webEnvironment = RANDOM_PORT)
+public class RequiredInputsJourneyTest extends AbstractBasePageTest {
+
+
+    @Override
+  @BeforeEach
+  public void setUp() throws IOException {
+        String testFlow = "requiredInputs";
+        startingPage = "flow/" + testFlow + "/inputs";
+    super.setUp();
+  }
+
+  @Test
+  public void automaticallyAppendsRequiredToAppropriateFields() {
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='textInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='areaInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='numberInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='selectInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='moneyInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='phoneInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='ssnInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("legend[for='date']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.id("checkboxSet-legend")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.id("radioInput-legend")).getText()).contains("(required)");
+  }
+}
diff --git a/src/test/java/formflow/library/framework/RequiredInputsTest.java b/src/test/java/formflow/library/framework/RequiredInputsTest.java
deleted file mode 100644
index 6cdf0ac36..000000000
--- a/src/test/java/formflow/library/framework/RequiredInputsTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package formflow.library.framework;
-
-import static formflow.library.inputs.FieldNameMarkers.UNVALIDATED_FIELD_MARKER_VALIDATE_ADDRESS;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-
-import formflow.library.address_validation.AddressValidationService;
-import formflow.library.address_validation.ValidatedAddress;
-import formflow.library.utilities.AbstractMockMvcTest;
-import formflow.library.utilities.FormScreen;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import org.junit.Before;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.annotation.DirtiesContext;
-
-@SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"})
-@DirtiesContext
-public class RequiredInputsTest extends AbstractMockMvcTest {
-  
-  @BeforeEach
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-  
-  @Test
-  void shouldIndicateRequiredFields() throws Exception {
-    FormScreen inputsScreen = new FormScreen(mockMvc.perform(get("/flow/requiredInputs/inputs")));
-    
-    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=textInput]").getElementsByClass("required-input").get(0).text()
-        .contains("(required)"));
-    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=areaInput]").getElementsByClass("required-input").get(0).text()
-        .contains("(required)"));
-    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("legend[for=date]").getElementsByClass("required-input").get(0).text()
-        .contains("(required)"));
-    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=numberInput]").getElementsByClass("required-input").get(0).text()
-        .contains("(required)"));
-    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementById("checkboxSet-legend").getElementsByClass("required-input").get(0).text()
-        .contains("(required)"));
-    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementById("radioInput-legend").getElementsByClass("required-input").get(0).text()
-        .contains("(required)"));
-    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=selectInput]").getElementsByClass("required-input").get(0).text()
-        .contains("(required)"));
-    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=moneyInput]").getElementsByClass("required-input").get(0).text()
-        .contains("(required)"));
-    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=phoneInput]").getElementsByClass("required-input").get(0).text()
-        .contains("(required)"));
-    await().atMost(2, TimeUnit.SECONDS).until(() -> inputsScreen.getElementByCssSelector("label[for=ssnInput]").getElementsByClass("required-input").get(0).text()
-        .contains("(required)"));
-  }
-}

From 467b39748a9f04e4a5c6f50f2004bb3788b8a026 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 12:36:46 -0700
Subject: [PATCH 31/41] Fix screenWithOneInput.html

---
 .../fragments/screens/screenWithOneInput.html   | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/main/resources/templates/fragments/screens/screenWithOneInput.html b/src/main/resources/templates/fragments/screens/screenWithOneInput.html
index f792390fe..95bd1b787 100644
--- a/src/main/resources/templates/fragments/screens/screenWithOneInput.html
+++ b/src/main/resources/templates/fragments/screens/screenWithOneInput.html
@@ -43,20 +43,3 @@
   </body>
   </html>
 </th:block>
-
-<th:block
-  th:replace="~{fragments/screens/screenWithOneInput ::
-  screenWithOneInput(
-    title=#{},
-    header=#{},
-    inputName='',
-    subtext=#{},
-    formAction=${formAction},
-    inputContent=~{::inputContent})}">
-  <th:block th:ref="inputContent">
-    <!-- Be sure to have `ariaLabel='header'` to label the input with the header -->
-    <th:block th:replace="~{fragments/inputs/text ::
-      text(inputName='',
-      ariaLabel='header')}"/>
-  </th:block>
-</th:block>

From 04a22d606dcb76ad2ae6ede3e563fe8a701bb89f Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 12:52:11 -0700
Subject: [PATCH 32/41] PR Review changes

---
 README.md                                              | 10 +++++-----
 src/main/java/formflow/library/ValidationService.java  |  2 +-
 .../fragments/cardHeaderForSingleInputScreen.html      |  2 +-
 .../resources/templates/fragments/inputs/checkbox.html |  2 +-
 .../templates/fragments/inputs/checkboxFieldset.html   |  2 +-
 .../resources/templates/fragments/inputs/date.html     |  2 +-
 .../resources/templates/fragments/inputs/money.html    |  2 +-
 .../resources/templates/fragments/inputs/number.html   |  2 +-
 .../resources/templates/fragments/inputs/phone.html    |  2 +-
 .../templates/fragments/inputs/radioFieldset.html      |  2 +-
 .../resources/templates/fragments/inputs/select.html   |  2 +-
 src/main/resources/templates/fragments/inputs/ssn.html |  2 +-
 .../resources/templates/fragments/inputs/text.html     |  2 +-
 .../resources/templates/fragments/inputs/textArea.html |  2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 7fadbe5aa..d4ea450bb 100644
--- a/README.md
+++ b/README.md
@@ -606,11 +606,10 @@ append a red '(required)' to the end of your input labels.
 #### Special Required Field Situations
 
 Sometimes you may have a field that is required, but not through an annotation such as those mentioned above.
-Specific scenarios where this might be the case include:
-- A field is validated through an action in the flows-config file and that validation makes it required
-- A field uses cross validtation int he flows-config file and that validation makes it required
+The specific scenario where this might be the case include is when A field uses cross validation in 
+the flows-config file and that validation makes it required.
 
-In these cases, we have provided an attribute which can be added to inputs `required` which is a boolean
+For this situation, we have provided an attribute which can be added to inputs, `required` which is a boolean
 that defaults to false. If set to true, the library will treat the field as required and append the 
 red `(required)`. 
 
@@ -623,7 +622,8 @@ For example:
       helpText=#{personal-info.first-name-help})}"/>
 ```
 
-Note that this attribute is optional and intended to be used in these special situations.
+Note that this attribute is optional and intended to be used in these special situations. It will only
+add append the red `(required)` to the appropriate place but will not actually validate the field as required.
 
 #### Required Fields on Single Input Screens
 The library provides a convenience template fragment for single input screens that will make such 
diff --git a/src/main/java/formflow/library/ValidationService.java b/src/main/java/formflow/library/ValidationService.java
index 62e219e0c..2ef4e34a1 100644
--- a/src/main/java/formflow/library/ValidationService.java
+++ b/src/main/java/formflow/library/ValidationService.java
@@ -17,7 +17,6 @@
 import java.util.List;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
@@ -171,6 +170,7 @@ public static Map<String, Boolean> getRequiredInputs(String flowName) {
       try {
         flowClass = Class.forName(inputConfigPath + StringUtils.capitalize(flowName));
       } catch (ReflectiveOperationException e) {
+        log.error("Error while trying to get the inputs class for flow {}. Does the inputs file for your application use the same name as it's flow?", flowName, e);
         throw new RuntimeException(e);
       }
 
diff --git a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
index 8672ed8ae..4fbe7566d 100644
--- a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
+++ b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
@@ -2,7 +2,7 @@
     th:fragment="cardHeaderForSingleInputScreen"
     th:with="
     hasSubtext=${!#strings.isEmpty(subtext)},
-    isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required}"
+    isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)}"
     th:assert="${!#strings.isEmpty(header)}"
     class="form-card__header">
   <h1 id="header" class="h2" >
diff --git a/src/main/resources/templates/fragments/inputs/checkbox.html b/src/main/resources/templates/fragments/inputs/checkbox.html
index f6e0dc300..52cec91d6 100644
--- a/src/main/resources/templates/fragments/inputs/checkbox.html
+++ b/src/main/resources/templates/fragments/inputs/checkbox.html
@@ -3,7 +3,7 @@
     th:with="
       hasHelpText=${!#strings.isEmpty(checkboxHelpText)},
       hasIcon=${!#strings.isEmpty(checkboxIcon)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
       name=${inputName} + '[]',
       hasError=${
         errorMessages != null &&
diff --git a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
index c1d042c21..e68b7e2ff 100644
--- a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index 172e956fd..f788f5b3c 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -6,7 +6,7 @@
       isRequiredInput=${requiredInputs.getOrDefault(inputName + 'Month', false) || 
         requiredInputs.getOrDefault(inputName + 'Day', false) || 
         requiredInputs.getOrDefault(inputName + 'Year', false) ||
-        required != null && required},
+        (required != null && required)},
       hasErrorMonth=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Month'))},
       hasErrorDay=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Day'))},
       hasErrorYear=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Year'))},
diff --git a/src/main/resources/templates/fragments/inputs/money.html b/src/main/resources/templates/fragments/inputs/money.html
index bc4477fa6..13a6edb92 100644
--- a/src/main/resources/templates/fragments/inputs/money.html
+++ b/src/main/resources/templates/fragments/inputs/money.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/number.html b/src/main/resources/templates/fragments/inputs/number.html
index d929f4e7d..b6407f79b 100644
--- a/src/main/resources/templates/fragments/inputs/number.html
+++ b/src/main/resources/templates/fragments/inputs/number.html
@@ -6,7 +6,7 @@
       hasPattern=${!#strings.isEmpty(pattern)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/phone.html b/src/main/resources/templates/fragments/inputs/phone.html
index fe0bfeeda..89c1e2092 100644
--- a/src/main/resources/templates/fragments/inputs/phone.html
+++ b/src/main/resources/templates/fragments/inputs/phone.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index b4ef2c282..798ae5d33 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/select.html b/src/main/resources/templates/fragments/inputs/select.html
index 0d0d417cf..9bb250aec 100644
--- a/src/main/resources/templates/fragments/inputs/select.html
+++ b/src/main/resources/templates/fragments/inputs/select.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index 5b148efec..7e0175e78 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index c03fa9b2a..42173f22d 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/textArea.html b/src/main/resources/templates/fragments/inputs/textArea.html
index ba2e18453..e0a2f302f 100644
--- a/src/main/resources/templates/fragments/inputs/textArea.html
+++ b/src/main/resources/templates/fragments/inputs/textArea.html
@@ -6,7 +6,7 @@
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
       rows=${!#strings.isEmpty(rows)} ? ${rows} : '6',
       maxLength=${!#strings.isEmpty(maxLength)} ? ${maxLength} : '500',
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || required != null && required},
+      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&

From 807638287b542ee2291e108cf11787a37505ee3f Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 12:59:59 -0700
Subject: [PATCH 33/41] Await client to see if it fixes CI

---
 .../RequiredInputsJourneyTest.java            | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
index b0e054ed4..09c07b6ea 100644
--- a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
+++ b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
@@ -1,39 +1,43 @@
 package formflow.library.controllers;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 import formflow.library.utilities.AbstractBasePageTest;
 import java.io.IOException;
+import java.time.Duration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"},
-    webEnvironment = RANDOM_PORT)
+        webEnvironment = RANDOM_PORT)
 public class RequiredInputsJourneyTest extends AbstractBasePageTest {
 
+  private WebDriverWait wait;
 
-    @Override
+  @Override
   @BeforeEach
   public void setUp() throws IOException {
-        String testFlow = "requiredInputs";
-        startingPage = "flow/" + testFlow + "/inputs";
+    String testFlow = "requiredInputs";
+    startingPage = "flow/" + testFlow + "/inputs";
     super.setUp();
+    wait = new WebDriverWait(driver, Duration.ofSeconds(3));  // setting up a wait of 3 seconds
   }
 
   @Test
   public void automaticallyAppendsRequiredToAppropriateFields() {
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='textInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='areaInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='numberInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='selectInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='moneyInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='phoneInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='ssnInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("legend[for='date']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.id("checkboxSet-legend")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.id("radioInput-legend")).getText()).contains("(required)");
+    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='textInput']"), "(required)"));
+    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='areaInput']"), "(required)"));
+    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='numberInput']"), "(required)"));
+    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='selectInput']"), "(required)"));
+    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='moneyInput']"), "(required)"));
+    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='phoneInput']"), "(required)"));
+    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='ssnInput']"), "(required)"));
+    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("legend[for='date']"), "(required)"));
+    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("checkboxSet-legend"), "(required)"));
+    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("radioInput-legend"), "(required)"));
   }
 }

From cf17a28d13ce19c00cee12a7e515a07a9e5fa9ab Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 14:12:26 -0700
Subject: [PATCH 34/41] Try a different CI Fix

---
 .../RequiredInputsJourneyTest.java            | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
index 09c07b6ea..8c65e94e1 100644
--- a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
+++ b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
@@ -1,10 +1,13 @@
 package formflow.library.controllers;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.awaitility.Awaitility.await;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 import formflow.library.utilities.AbstractBasePageTest;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
@@ -24,20 +27,23 @@ public void setUp() throws IOException {
     String testFlow = "requiredInputs";
     startingPage = "flow/" + testFlow + "/inputs";
     super.setUp();
-    wait = new WebDriverWait(driver, Duration.ofSeconds(3));  // setting up a wait of 3 seconds
   }
 
   @Test
   public void automaticallyAppendsRequiredToAppropriateFields() {
-    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='textInput']"), "(required)"));
-    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='areaInput']"), "(required)"));
-    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='numberInput']"), "(required)"));
-    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='selectInput']"), "(required)"));
-    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='moneyInput']"), "(required)"));
-    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='phoneInput']"), "(required)"));
-    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("label[for='ssnInput']"), "(required)"));
-    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("legend[for='date']"), "(required)"));
-    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("checkboxSet-legend"), "(required)"));
-    wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("radioInput-legend"), "(required)"));
+    await().until(
+            () -> !driver.findElements(By.className("main-footer")).get(0).getAttribute("innerHTML")
+                    .isBlank());
+
+    List<String> inputs = List.of(
+            "textInput",
+            "areaInput",
+            "selectInput",
+            "moneyInput",
+            "phoneInput",
+            "ssnInput");
+    inputs.forEach(inputName -> {
+      assertThat(driver.findElement(By.cssSelector(String.format("label[for='%s']", inputName))).getText()).contains("(required)");
+    });
   }
 }

From be1ed9e6307f3e980d34ed64f020fc851572294d Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 14:34:12 -0700
Subject: [PATCH 35/41] Try yet anothing thing

---
 .../RequiredInputsJourneyTest.java            | 41 ++++++++-----------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
index 8c65e94e1..af9f08eb3 100644
--- a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
+++ b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
@@ -1,49 +1,40 @@
 package formflow.library.controllers;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.awaitility.Awaitility.await;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 import formflow.library.utilities.AbstractBasePageTest;
 import java.io.IOException;
-import java.time.Duration;
-import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"},
-        webEnvironment = RANDOM_PORT)
+    webEnvironment = RANDOM_PORT)
 public class RequiredInputsJourneyTest extends AbstractBasePageTest {
 
-  private WebDriverWait wait;
 
-  @Override
+    @Override
   @BeforeEach
   public void setUp() throws IOException {
-    String testFlow = "requiredInputs";
-    startingPage = "flow/" + testFlow + "/inputs";
+        String testFlow = "requiredInputs";
+        startingPage = "flow/" + testFlow + "/inputs";
     super.setUp();
   }
 
   @Test
   public void automaticallyAppendsRequiredToAppropriateFields() {
-    await().until(
-            () -> !driver.findElements(By.className("main-footer")).get(0).getAttribute("innerHTML")
-                    .isBlank());
-
-    List<String> inputs = List.of(
-            "textInput",
-            "areaInput",
-            "selectInput",
-            "moneyInput",
-            "phoneInput",
-            "ssnInput");
-    inputs.forEach(inputName -> {
-      assertThat(driver.findElement(By.cssSelector(String.format("label[for='%s']", inputName))).getText()).contains("(required)");
-    });
+    assertThat(driver.findElement(By.cssSelector("label[for='textInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.cssSelector("label[for='areaInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.cssSelector("label[for='numberInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.cssSelector("label[for='selectInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.cssSelector("label[for='moneyInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.cssSelector("label[for='phoneInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.cssSelector("label[for='ssnInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.cssSelector("legend[for='date']")).findElement(By.className("required-input")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.id("checkboxSet-legend")).findElement(By.className("required-input")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.id("radioInput-legend")).findElement(By.className("required-input")).getText()).contains("(required)");
   }
+
 }

From c9373f45ae4d12b65c9e0551e144322c7160fb2a Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 15:10:23 -0700
Subject: [PATCH 36/41] Try specifying test profile

---
 src/main/java/formflow/library/ValidationService.java          | 3 +++
 .../library/controllers/RequiredInputsJourneyTest.java         | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/formflow/library/ValidationService.java b/src/main/java/formflow/library/ValidationService.java
index 2ef4e34a1..56526bd13 100644
--- a/src/main/java/formflow/library/ValidationService.java
+++ b/src/main/java/formflow/library/ValidationService.java
@@ -169,12 +169,14 @@ public static Map<String, Boolean> getRequiredInputs(String flowName) {
 
       try {
         flowClass = Class.forName(inputConfigPath + StringUtils.capitalize(flowName));
+        log.info("flowClass: {} instantiated.", flowClass.getName());
       } catch (ReflectiveOperationException e) {
         log.error("Error while trying to get the inputs class for flow {}. Does the inputs file for your application use the same name as it's flow?", flowName, e);
         throw new RuntimeException(e);
       }
 
       Field[] declaredFields = flowClass.getDeclaredFields();
+      log.info("Declared fields: {}", Arrays.toString(declaredFields));
       for (Field field : declaredFields) {
         if (Arrays.stream(field.getAnnotations())
             .anyMatch(annotation -> requiredAnnotationsList.contains(annotation.annotationType().getName()))) {
@@ -182,6 +184,7 @@ public static Map<String, Boolean> getRequiredInputs(String flowName) {
         }
       }
     }
+    log.info("Required inputs: {}", requiredInputs);
     return requiredInputs;
   }
 }
diff --git a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
index af9f08eb3..6ff4b9202 100644
--- a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
+++ b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
@@ -9,9 +9,11 @@
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"},
     webEnvironment = RANDOM_PORT)
+@ActiveProfiles("test")
 public class RequiredInputsJourneyTest extends AbstractBasePageTest {
 
 

From 8ffc1fe5efb1c7c79ee23597cc31753d0413a27e Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 15:14:56 -0700
Subject: [PATCH 37/41] Try specifying test profile 2

---
 .../RequiredInputsJourneyTest.java            | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
index 6ff4b9202..2c6b27a21 100644
--- a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
+++ b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
@@ -27,16 +27,15 @@ public void setUp() throws IOException {
 
   @Test
   public void automaticallyAppendsRequiredToAppropriateFields() {
-    assertThat(driver.findElement(By.cssSelector("label[for='textInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.cssSelector("label[for='areaInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.cssSelector("label[for='numberInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.cssSelector("label[for='selectInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.cssSelector("label[for='moneyInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.cssSelector("label[for='phoneInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.cssSelector("label[for='ssnInput']")).findElement(By.className("required-input")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.cssSelector("legend[for='date']")).findElement(By.className("required-input")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.id("checkboxSet-legend")).findElement(By.className("required-input")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.id("radioInput-legend")).findElement(By.className("required-input")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='textInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='areaInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='numberInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='selectInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='moneyInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='phoneInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='ssnInput']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.ByCssSelector.cssSelector("legend[for='date']")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.id("checkboxSet-legend")).getText()).contains("(required)");
+    assertThat(driver.findElement(By.id("radioInput-legend")).getText()).contains("(required)");
   }
-
 }

From 06d66262af62ee380ca613eb103ce906e81ecb98 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 15:32:45 -0700
Subject: [PATCH 38/41] Dont test -- will do in starter-app instead

---
 .../RequiredInputsJourneyTest.java            | 41 -------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java

diff --git a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java b/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
deleted file mode 100644
index 2c6b27a21..000000000
--- a/src/test/java/formflow/library/controllers/RequiredInputsJourneyTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package formflow.library.controllers;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-import formflow.library.utilities.AbstractBasePageTest;
-import java.io.IOException;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.openqa.selenium.By;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-
-@SpringBootTest(properties = {"form-flow.path=flows-config/test-required-inputs-flow.yaml"},
-    webEnvironment = RANDOM_PORT)
-@ActiveProfiles("test")
-public class RequiredInputsJourneyTest extends AbstractBasePageTest {
-
-
-    @Override
-  @BeforeEach
-  public void setUp() throws IOException {
-        String testFlow = "requiredInputs";
-        startingPage = "flow/" + testFlow + "/inputs";
-    super.setUp();
-  }
-
-  @Test
-  public void automaticallyAppendsRequiredToAppropriateFields() {
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='textInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='areaInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='numberInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='selectInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='moneyInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='phoneInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("label[for='ssnInput']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.ByCssSelector.cssSelector("legend[for='date']")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.id("checkboxSet-legend")).getText()).contains("(required)");
-    assertThat(driver.findElement(By.id("radioInput-legend")).getText()).contains("(required)");
-  }
-}

From 4682c5a835592de24043684ac985766fcf55810f Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 15:48:55 -0700
Subject: [PATCH 39/41] Account for multiple flows when generating required
 inputs map

---
 src/main/java/formflow/library/ValidationService.java  | 10 +++++++---
 .../fragments/cardHeaderForSingleInputScreen.html      |  2 +-
 .../resources/templates/fragments/inputs/checkbox.html |  2 +-
 .../templates/fragments/inputs/checkboxFieldset.html   |  2 +-
 .../resources/templates/fragments/inputs/date.html     |  6 +++---
 .../resources/templates/fragments/inputs/money.html    |  2 +-
 .../resources/templates/fragments/inputs/number.html   |  2 +-
 .../resources/templates/fragments/inputs/phone.html    |  2 +-
 .../templates/fragments/inputs/radioFieldset.html      |  2 +-
 .../resources/templates/fragments/inputs/select.html   |  2 +-
 src/main/resources/templates/fragments/inputs/ssn.html |  2 +-
 .../resources/templates/fragments/inputs/text.html     |  2 +-
 .../resources/templates/fragments/inputs/textArea.html |  2 +-
 13 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/java/formflow/library/ValidationService.java b/src/main/java/formflow/library/ValidationService.java
index 56526bd13..84726e561 100644
--- a/src/main/java/formflow/library/ValidationService.java
+++ b/src/main/java/formflow/library/ValidationService.java
@@ -41,7 +41,7 @@ public class ValidationService {
   private final ActionManager actionManager;
   private static String inputConfigPath;
   
-  private static final Map<String, Boolean> requiredInputs = new HashMap<>();
+  private static final Map<String, Map<String, Boolean>> requiredInputs = new HashMap<>();
   
   private static final List<String> requiredAnnotationsList = List.of(
       NotNull.class.getName(),
@@ -163,7 +163,7 @@ private Map<String, List<String>> performFieldLevelValidation(String flowName, F
     return validationMessages;
   }
 
-  public static Map<String, Boolean> getRequiredInputs(String flowName) {
+  public static Map<String, Map<String, Boolean>> getRequiredInputs(String flowName) {
     if (requiredInputs.isEmpty()) {
       Class<?> flowClass;
 
@@ -180,7 +180,11 @@ public static Map<String, Boolean> getRequiredInputs(String flowName) {
       for (Field field : declaredFields) {
         if (Arrays.stream(field.getAnnotations())
             .anyMatch(annotation -> requiredAnnotationsList.contains(annotation.annotationType().getName()))) {
-          requiredInputs.put(field.getName(), true);
+          if (requiredInputs.containsKey(flowName)) {
+            requiredInputs.get(flowName).put(field.getName(), true);
+          } else {
+            requiredInputs.put(flowName, new HashMap<>(Map.of(field.getName(), true)));
+          }
         }
       }
     }
diff --git a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
index 4fbe7566d..93ed7f3ea 100644
--- a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
+++ b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
@@ -2,7 +2,7 @@
     th:fragment="cardHeaderForSingleInputScreen"
     th:with="
     hasSubtext=${!#strings.isEmpty(subtext)},
-    isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)}"
+    isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)}"
     th:assert="${!#strings.isEmpty(header)}"
     class="form-card__header">
   <h1 id="header" class="h2" >
diff --git a/src/main/resources/templates/fragments/inputs/checkbox.html b/src/main/resources/templates/fragments/inputs/checkbox.html
index 52cec91d6..2fd6aea83 100644
--- a/src/main/resources/templates/fragments/inputs/checkbox.html
+++ b/src/main/resources/templates/fragments/inputs/checkbox.html
@@ -3,7 +3,7 @@
     th:with="
       hasHelpText=${!#strings.isEmpty(checkboxHelpText)},
       hasIcon=${!#strings.isEmpty(checkboxIcon)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
       name=${inputName} + '[]',
       hasError=${
         errorMessages != null &&
diff --git a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
index e68b7e2ff..8a346ec14 100644
--- a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index f788f5b3c..ecac09852 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -3,9 +3,9 @@
     th:with="
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName + 'Month', false) || 
-        requiredInputs.getOrDefault(inputName + 'Day', false) || 
-        requiredInputs.getOrDefault(inputName + 'Year', false) ||
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName + 'Month', false) || 
+        requiredInputs.get(flow).getOrDefault(inputName + 'Day', false) || 
+        requiredInputs.get(flow).getOrDefault(inputName + 'Year', false) ||
         (required != null && required)},
       hasErrorMonth=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Month'))},
       hasErrorDay=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Day'))},
diff --git a/src/main/resources/templates/fragments/inputs/money.html b/src/main/resources/templates/fragments/inputs/money.html
index 13a6edb92..605dc712b 100644
--- a/src/main/resources/templates/fragments/inputs/money.html
+++ b/src/main/resources/templates/fragments/inputs/money.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/number.html b/src/main/resources/templates/fragments/inputs/number.html
index b6407f79b..e7647f7e7 100644
--- a/src/main/resources/templates/fragments/inputs/number.html
+++ b/src/main/resources/templates/fragments/inputs/number.html
@@ -6,7 +6,7 @@
       hasPattern=${!#strings.isEmpty(pattern)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/phone.html b/src/main/resources/templates/fragments/inputs/phone.html
index 89c1e2092..009fe05c4 100644
--- a/src/main/resources/templates/fragments/inputs/phone.html
+++ b/src/main/resources/templates/fragments/inputs/phone.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index 798ae5d33..2c02d7edc 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/select.html b/src/main/resources/templates/fragments/inputs/select.html
index 9bb250aec..70c109312 100644
--- a/src/main/resources/templates/fragments/inputs/select.html
+++ b/src/main/resources/templates/fragments/inputs/select.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index 7e0175e78..b657afa39 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index 42173f22d..d7c45305a 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -4,7 +4,7 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/textArea.html b/src/main/resources/templates/fragments/inputs/textArea.html
index e0a2f302f..0bfd0ea68 100644
--- a/src/main/resources/templates/fragments/inputs/textArea.html
+++ b/src/main/resources/templates/fragments/inputs/textArea.html
@@ -6,7 +6,7 @@
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
       rows=${!#strings.isEmpty(rows)} ? ${rows} : '6',
       maxLength=${!#strings.isEmpty(maxLength)} ? ${maxLength} : '500',
-      isRequiredInput=${requiredInputs.getOrDefault(inputName, false) || (required != null && required)},
+      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&

From b5805b8608d58072c99a1ed00315492b6e2cb176 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 7 May 2024 16:17:39 -0700
Subject: [PATCH 40/41] Fix null issue

---
 .../fragments/cardHeaderForSingleInputScreen.html          | 3 ++-
 .../resources/templates/fragments/inputs/checkbox.html     | 3 ++-
 .../templates/fragments/inputs/checkboxFieldset.html       | 3 ++-
 src/main/resources/templates/fragments/inputs/date.html    | 7 ++++---
 src/main/resources/templates/fragments/inputs/money.html   | 3 ++-
 src/main/resources/templates/fragments/inputs/number.html  | 3 ++-
 src/main/resources/templates/fragments/inputs/phone.html   | 3 ++-
 .../templates/fragments/inputs/radioFieldset.html          | 3 ++-
 src/main/resources/templates/fragments/inputs/select.html  | 3 ++-
 src/main/resources/templates/fragments/inputs/ssn.html     | 3 ++-
 src/main/resources/templates/fragments/inputs/text.html    | 3 ++-
 .../resources/templates/fragments/inputs/textArea.html     | 3 ++-
 12 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
index 93ed7f3ea..eeea0f341 100644
--- a/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
+++ b/src/main/resources/templates/fragments/cardHeaderForSingleInputScreen.html
@@ -2,7 +2,8 @@
     th:fragment="cardHeaderForSingleInputScreen"
     th:with="
     hasSubtext=${!#strings.isEmpty(subtext)},
-    isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)}"
+    requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)}"
     th:assert="${!#strings.isEmpty(header)}"
     class="form-card__header">
   <h1 id="header" class="h2" >
diff --git a/src/main/resources/templates/fragments/inputs/checkbox.html b/src/main/resources/templates/fragments/inputs/checkbox.html
index 2fd6aea83..ec8e3971f 100644
--- a/src/main/resources/templates/fragments/inputs/checkbox.html
+++ b/src/main/resources/templates/fragments/inputs/checkbox.html
@@ -3,7 +3,8 @@
     th:with="
       hasHelpText=${!#strings.isEmpty(checkboxHelpText)},
       hasIcon=${!#strings.isEmpty(checkboxIcon)},
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)},
       name=${inputName} + '[]',
       hasError=${
         errorMessages != null &&
diff --git a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
index 8a346ec14..4e779cf8e 100644
--- a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
@@ -4,7 +4,8 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/date.html b/src/main/resources/templates/fragments/inputs/date.html
index ecac09852..0533b9859 100644
--- a/src/main/resources/templates/fragments/inputs/date.html
+++ b/src/main/resources/templates/fragments/inputs/date.html
@@ -3,9 +3,10 @@
     th:with="
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName + 'Month', false) || 
-        requiredInputs.get(flow).getOrDefault(inputName + 'Day', false) || 
-        requiredInputs.get(flow).getOrDefault(inputName + 'Year', false) ||
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputs != null && requiredInputs.getOrDefault(inputName + 'Month', false)) || 
+        (requiredInputs != null && requiredInputs.getOrDefault(inputName + 'Day', false)) || 
+        (requiredInputs != null && requiredInputs.getOrDefault(inputName + 'Year', false)) ||
         (required != null && required)},
       hasErrorMonth=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Month'))},
       hasErrorDay=${errorMessages != null && !#arrays.isEmpty(errorMessages.get(inputName + 'Day'))},
diff --git a/src/main/resources/templates/fragments/inputs/money.html b/src/main/resources/templates/fragments/inputs/money.html
index 605dc712b..0936ea906 100644
--- a/src/main/resources/templates/fragments/inputs/money.html
+++ b/src/main/resources/templates/fragments/inputs/money.html
@@ -4,7 +4,8 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/number.html b/src/main/resources/templates/fragments/inputs/number.html
index e7647f7e7..b42fb3a57 100644
--- a/src/main/resources/templates/fragments/inputs/number.html
+++ b/src/main/resources/templates/fragments/inputs/number.html
@@ -6,7 +6,8 @@
       hasPattern=${!#strings.isEmpty(pattern)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/phone.html b/src/main/resources/templates/fragments/inputs/phone.html
index 009fe05c4..37d56ad48 100644
--- a/src/main/resources/templates/fragments/inputs/phone.html
+++ b/src/main/resources/templates/fragments/inputs/phone.html
@@ -4,7 +4,8 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index 2c02d7edc..fa52e0a72 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -4,7 +4,8 @@
       hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/select.html b/src/main/resources/templates/fragments/inputs/select.html
index 70c109312..43a63951e 100644
--- a/src/main/resources/templates/fragments/inputs/select.html
+++ b/src/main/resources/templates/fragments/inputs/select.html
@@ -4,7 +4,8 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/ssn.html b/src/main/resources/templates/fragments/inputs/ssn.html
index b657afa39..bef1c083e 100644
--- a/src/main/resources/templates/fragments/inputs/ssn.html
+++ b/src/main/resources/templates/fragments/inputs/ssn.html
@@ -4,7 +4,8 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
index d7c45305a..9b6435de5 100644
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ b/src/main/resources/templates/fragments/inputs/text.html
@@ -4,7 +4,8 @@
       hasHelpText=${!#strings.isEmpty(helpText)},
       hasLabel=${!#strings.isEmpty(label)},
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&
diff --git a/src/main/resources/templates/fragments/inputs/textArea.html b/src/main/resources/templates/fragments/inputs/textArea.html
index 0bfd0ea68..263fdbef2 100644
--- a/src/main/resources/templates/fragments/inputs/textArea.html
+++ b/src/main/resources/templates/fragments/inputs/textArea.html
@@ -6,7 +6,8 @@
       hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
       rows=${!#strings.isEmpty(rows)} ? ${rows} : '6',
       maxLength=${!#strings.isEmpty(maxLength)} ? ${maxLength} : '500',
-      isRequiredInput=${requiredInputs.get(flow).getOrDefault(inputName, false) || (required != null && required)},
+      requiredInputsForFlow=${requiredInputs.get(flow)},
+      isRequiredInput=${(requiredInputsForFlow != null && requiredInputsForFlow.getOrDefault(inputName, false)) || (required != null && required)},
       hasError=${
         errorMessages != null &&
         errorMessages.get(inputName) != null &&

From 1146b5a4b155433c88335551264cf69aedbdb80a Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Thu, 9 May 2024 11:20:12 -0700
Subject: [PATCH 41/41] Changes from PR review

---
 README.md                                     |  16 +--
 .../formflow/library/ValidationService.java   |   5 +-
 .../library/inputs/RequiredInputs.java        |  47 --------
 .../test-required-inputs-flow.yaml            |   5 -
 .../templates/requiredInputs/inputs.html      | 101 ------------------
 5 files changed, 10 insertions(+), 164 deletions(-)
 delete mode 100644 src/test/java/formflow/library/inputs/RequiredInputs.java
 delete mode 100644 src/test/resources/flows-config/test-required-inputs-flow.yaml
 delete mode 100644 src/test/resources/templates/requiredInputs/inputs.html

diff --git a/README.md b/README.md
index d4ea450bb..ecc725fd3 100644
--- a/README.md
+++ b/README.md
@@ -606,12 +606,12 @@ append a red '(required)' to the end of your input labels.
 #### Special Required Field Situations
 
 Sometimes you may have a field that is required, but not through an annotation such as those mentioned above.
-The specific scenario where this might be the case include is when A field uses cross validation in 
+The specific scenario where this might be the case is when a field uses cross validation in 
 the flows-config file and that validation makes it required.
 
 For this situation, we have provided an attribute which can be added to inputs, `required` which is a boolean
-that defaults to false. If set to true, the library will treat the field as required and append the 
-red `(required)`. 
+that defaults to false. If set to true, the field will be marked as required in the UI and append the 
+red `(required)` text.
 
 For example:
 ```html
@@ -623,7 +623,7 @@ For example:
 ```
 
 Note that this attribute is optional and intended to be used in these special situations. It will only
-add append the red `(required)` to the appropriate place but will not actually validate the field as required.
+append the red `(required)` to the appropriate place but will not actually validate the field as required.
 
 #### Required Fields on Single Input Screens
 The library provides a convenience template fragment for single input screens that will make such 
@@ -647,7 +647,7 @@ Example:
     inputContent=~{::inputContent})}">
 ... more content
 ```
-Note the `inputName='economicHardshipTypes'` attribute. This is the name of the input field in the
+Note the `inputName='economicHardshipTypes'` attribute. This is the name of the input field
 which will appear below `more content` above. This name is used to check for required field annotations
 so that the template will know the field is required.
 
@@ -1580,8 +1580,10 @@ when the page loads.
 
 ### Screen with One Input
 
-Screens with a single input are tricky because all inputs need a label, but for this screen pattern
-the label is the header of the page. To handle this, we have a special fragment called `screenWithOneInput`.
+Screens with a single input are tricky because all inputs need a label associated with them so that
+screen readers and other assistive technologies can identify those elements on a screen that label an input.
+For this screen pattern the label is the header of the page, which needs to be programmatically 
+associated with the input. To handle this, we have a special fragment called `screenWithOneInput`.
 You can use the `cfa:screenWithOneInput` live template to quickly create a screen with a single input
 that utilizes this fragment.
 
diff --git a/src/main/java/formflow/library/ValidationService.java b/src/main/java/formflow/library/ValidationService.java
index 84726e561..a7d97d52a 100644
--- a/src/main/java/formflow/library/ValidationService.java
+++ b/src/main/java/formflow/library/ValidationService.java
@@ -169,14 +169,12 @@ public static Map<String, Map<String, Boolean>> getRequiredInputs(String flowNam
 
       try {
         flowClass = Class.forName(inputConfigPath + StringUtils.capitalize(flowName));
-        log.info("flowClass: {} instantiated.", flowClass.getName());
       } catch (ReflectiveOperationException e) {
-        log.error("Error while trying to get the inputs class for flow {}. Does the inputs file for your application use the same name as it's flow?", flowName, e);
+        log.error("Error while trying to get the inputs class for flow {}. Make sure the inputs file for your application uses the same name as it's flow.", flowName, e);
         throw new RuntimeException(e);
       }
 
       Field[] declaredFields = flowClass.getDeclaredFields();
-      log.info("Declared fields: {}", Arrays.toString(declaredFields));
       for (Field field : declaredFields) {
         if (Arrays.stream(field.getAnnotations())
             .anyMatch(annotation -> requiredAnnotationsList.contains(annotation.annotationType().getName()))) {
@@ -188,7 +186,6 @@ public static Map<String, Map<String, Boolean>> getRequiredInputs(String flowNam
         }
       }
     }
-    log.info("Required inputs: {}", requiredInputs);
     return requiredInputs;
   }
 }
diff --git a/src/test/java/formflow/library/inputs/RequiredInputs.java b/src/test/java/formflow/library/inputs/RequiredInputs.java
deleted file mode 100644
index fb11326a9..000000000
--- a/src/test/java/formflow/library/inputs/RequiredInputs.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package formflow.library.inputs;
-
-import formflow.library.data.FlowInputs;
-import formflow.library.data.annotations.Money;
-import formflow.library.data.annotations.Phone;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Positive;
-import jakarta.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.web.multipart.MultipartFile;
-
-@TestConfiguration
-@SuppressWarnings("unused")
-public class RequiredInputs extends FlowInputs {
-  
-  @NotBlank
-  String textInput;
-  @NotBlank
-  String areaInput;
-  @NotBlank
-  String dateDay;
-  String dateMonth;
-  String dateYear;
-  @NotBlank(message = "Date may not be empty")
-  @Pattern(regexp = "\\d/\\d/\\d\\d\\d\\d", message = "Date must be in the format of mm/dd/yyyy")
-  String dateFull;
-  @NotBlank
-  String numberInput;
-  @NotEmpty
-  ArrayList<String> checkboxSet;
-  @NotBlank
-  String radioInput;
-  @NotBlank
-  String selectInput;
-  @NotBlank
-  String moneyInput;
-  @NotBlank
-  String phoneInput;
-  @NotBlank
-  String ssnInput;
-}
diff --git a/src/test/resources/flows-config/test-required-inputs-flow.yaml b/src/test/resources/flows-config/test-required-inputs-flow.yaml
deleted file mode 100644
index f4af7ee92..000000000
--- a/src/test/resources/flows-config/test-required-inputs-flow.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: requiredInputs
-flow:
-  inputs:
-    nextScreens:
-      - name: null
diff --git a/src/test/resources/templates/requiredInputs/inputs.html b/src/test/resources/templates/requiredInputs/inputs.html
deleted file mode 100644
index 144d1ca08..000000000
--- a/src/test/resources/templates/requiredInputs/inputs.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/head :: head(title='Inputs Screen')}"></head>
-<body>
-<div class="page-wrapper">
-  <div th:replace="~{fragments/toolbar :: toolbar}"></div>
-  <section class="slab">
-    <div class="grid">
-      <main id="content" role="main" class="form-card spacing-above-35">
-        <th:block
-            th:replace="~{fragments/cardHeader :: cardHeader(header='Inputs Screen', subtext='This is the inputs screen!')}"/>
-        <th:block
-            th:replace="~{fragments/form :: form(action='/flow/requiredInputs/inputs', content=~{::formContent})}">
-          <th:block th:ref="formContent">
-            <div class="form-card__content">
-              <th:block
-                  th:replace="~{fragments/inputs/text ::
-                            text(inputName='textInput',
-                            label='textInput')}"/>
-              <th:block th:replace="~{fragments/inputs/textArea ::
-                          textArea(inputName='areaInput',
-                          label='areaInput')}"/>
-              <th:block th:replace="~{fragments/inputs/date ::
-                          date(inputName='date',
-                          label='dateInput',
-                          groupName='dateFull')}"/>
-              <th:block th:replace="~{fragments/inputs/number ::
-                          number(inputName='numberInput',
-                          label='numberInput')}"/>
-              <th:block th:replace="~{fragments/inputs/checkboxFieldset ::
-                          checkboxFieldset(inputName='checkboxSet',
-                          label='checkboxSet',
-                          content=~{::checkboxContent})}">
-                <th:block th:ref="checkboxContent">
-                  <th:block
-                      th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='checkboxSet', value='Checkbox-A', label='Checkbox A')}"/>
-                  <th:block
-                      th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='checkboxSet', value='Checkbox-B', label='Checkbox B')}"/>
-                </th:block>
-              </th:block>
-              <th:block
-                  th:replace="~{fragments/inputs/checkbox :: checkbox(inputName='checkboxInput', value='checkbox-value', label='Single checkbox')}"/>
-              <th:block th:replace="~{fragments/inputs/radioFieldset ::
-                          radioFieldset(inputName='radioInput',
-                          label='radioInput',
-                          content=~{::radioContent})}">
-                <th:block th:ref="radioContent">
-                  <th:block
-                      th:replace="~{fragments/inputs/radio :: radio(inputName='radioInput',value='Radio A', label='Radio A')}"/>
-                  <th:block
-                      th:replace="~{fragments/inputs/radio :: radio(inputName='radioInput',value='Radio B', label='Radio B')}"/>
-                  <th:block
-                      th:replace="~{fragments/inputs/radio :: radio(inputName='radioInput',value='Radio C', label='Radio C')}"/>
-                </th:block>
-              </th:block>
-              <th:block
-                  th:replace="~{fragments/inputs/select ::
-                          select(inputName='selectInput',
-                                 label='selectInput',
-                                 content=~{::selectContent})}">
-                <th:block th:ref="selectContent">
-                  <th:block
-                      th:replace="~{fragments/inputs/selectOption :: selectOption(value='', optionText='Choose one')}"/>
-                  <th:block
-                      th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select A', optionText='Select A')}"/>
-                  <th:block
-                      th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select B', optionText='Select B')}"/>
-                  <th:block
-                      th:replace="~{fragments/inputs/selectOption :: selectOption(value='Select C', optionText='Select C')}"/>
-                </th:block>
-              </th:block>
-              <th:block
-                  th:replace="~{fragments/inputs/money :: money(
-                            inputName='moneyInput',
-                            label='moneyInput')}"/>
-              <th:block
-                  th:replace="~{fragments/inputs/phone :: phone(
-                            inputName='phoneInput',
-                            label='phoneInput')}"/>
-              <th:block
-                  th:replace="~{fragments/inputs/ssn :: ssn(
-                            inputName='ssnInput',
-                            label='ssnInput')}"/>
-              <th:block th:replace="~{fragments/inputs/state ::
-                          state(inputName='stateInput',
-                          label='stateInput',
-                          placeholderText='State')}"/>
-            </div>
-            <div class="form-card__footer">
-              <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
-                  text=#{general.inputs.continue})}"/>
-            </div>
-          </th:block>
-        </th:block>
-      </main>
-    </div>
-  </section>
-</div>
-<th:block th:replace="~{fragments/footer :: footer}"/>
-</body>
-</html>