From 3d96543bc04015e457e9f3396fb355f3f6ff9288 Mon Sep 17 00:00:00 2001
From: Sree <72890349+sree-cfa@users.noreply.github.com>
Date: Wed, 28 Feb 2024 10:58:29 -0800
Subject: [PATCH] Adding skips for pages that havent been implemented. (#82)

This will help us avoid conflicts/confusion around setting next pages
---
 build.gradle                                  |  4 +-
 .../submission/conditions/SkipTemplate.java   | 22 ++++++++
 src/main/resources/flows-config.yaml          | 56 +++++++++++++++++--
 .../fragments/screens/screenWithOneInput.html | 44 ---------------
 .../screens/screenWithYesAndNoButtons.html    | 48 ----------------
 5 files changed, 75 insertions(+), 99 deletions(-)
 create mode 100644 src/main/java/org/ilgcc/app/submission/conditions/SkipTemplate.java
 delete mode 100644 src/main/resources/templates/fragments/screens/screenWithOneInput.html
 delete mode 100644 src/main/resources/templates/fragments/screens/screenWithYesAndNoButtons.html

diff --git a/build.gradle b/build.gradle
index 47df9484f..c4c347e68 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-    id 'org.springframework.boot' version '3.1.5'
+    id 'org.springframework.boot' version '3.2.2'
     id 'io.spring.dependency-management' version '1.1.4'
     id 'java'
     id 'com.adarshr.test-logger' version '4.0.0'
@@ -47,7 +47,7 @@ repositories {
 }
 
 def profile = props.getProperty('SPRING_PROFILES_ACTIVE')
-def formFlowLibraryVersion = '1.1.1'
+def formFlowLibraryVersion = '1.2.0'
 def useLocalLibrary = System.getenv('USE_LOCAL_LIBRARY')
 
 dependencies {
diff --git a/src/main/java/org/ilgcc/app/submission/conditions/SkipTemplate.java b/src/main/java/org/ilgcc/app/submission/conditions/SkipTemplate.java
new file mode 100644
index 000000000..45116264c
--- /dev/null
+++ b/src/main/java/org/ilgcc/app/submission/conditions/SkipTemplate.java
@@ -0,0 +1,22 @@
+package org.ilgcc.app.submission.conditions;
+
+import formflow.library.config.submission.Condition;
+import formflow.library.data.Submission;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is a false-Condition to skip the pages that have not yet been implemented.
+ */
+@Component
+public class SkipTemplate implements Condition {
+
+  @Override
+  public Boolean run(Submission submission) {
+    return false;
+  }
+
+  @Override
+  public Boolean run(Submission submission, String id) {
+    return false;
+  }
+}
diff --git a/src/main/resources/flows-config.yaml b/src/main/resources/flows-config.yaml
index 32010802c..7d38b368f 100644
--- a/src/main/resources/flows-config.yaml
+++ b/src/main/resources/flows-config.yaml
@@ -38,45 +38,59 @@ flow:
     nextScreens:
       - name: parent-home-address
   parent-home-address:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-mailing-address
   parent-mailing-address:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-confirm-address
   parent-confirm-address:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-contact
   parent-contact:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-info-review
   parent-info-review:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-have-a-partner
   parent-have-a-partner:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-qualifying-partner
   parent-qualifying-partner:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-partner-info-basic
   parent-partner-info-basic:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-partner-contact
   parent-partner-contact:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-partner-info-service
   parent-partner-info-service:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-partner-info-disability
   parent-partner-info-disability:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-other-family
   parent-other-family:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-add-adults
   parent-add-adults:
+    condition: SkipTemplate
     nextScreens:
       - name: parent-intro-family-info
   parent-intro-family-info:
+    condition: SkipTemplate
     nextScreens:
       - name: children-info-intro
 
@@ -85,8 +99,7 @@ flow:
       - name: children-add
   children-add:
     nextScreens:
-#      - name: activities-parent-intro
-      - name: activities-add-ed-program # skipping WIP
+      - name: activities-parent-intro
   children-info-basic:
     subflow: children
     nextScreens:
@@ -109,70 +122,88 @@ flow:
   children-childcare-weekly-schedule:
     subflow: children
     nextScreens:
-      - name: children-ccap-child-other-ed # Skip WIP screens
-        condition: IsFiveOrOlder
-      - name: children-add
+      - name: children-childcare-hourly-schedule
   children-childcare-hourly-schedule:
+    condition: SkipTemplate
     subflow: children
     nextScreens:
       - name: children-ccap-child-other-ed
   children-ccap-child-other-ed:
+    condition: IsFiveOrOlder
     subflow: children
     nextScreens:
       - name: children-add
 
   activities-parent-intro:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-parent-type
   activities-parent-type:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-add-jobs
   activities-add-jobs:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-employer-name
   activities-employer-name:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-employer-address
   activities-employer-address:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-self-employment
   activities-self-employment:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-pay-by-hour
   activities-pay-by-hour:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-hourly-wage
   activities-hourly-wage:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-pay-period
   activities-pay-period:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-pay-rate
   activities-pay-rate:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-pay-last-month
   activities-pay-last-month:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-work-schedule-vary
   activities-work-schedule-vary:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-next-work-schedule
   activities-next-work-schedule:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-job-weekly-schedule
   activities-job-weekly-schedule:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-job-hourly-schedule
   activities-job-hourly-schedule:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-work-commute
   activities-work-commute:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-work-commute-time
   activities-work-commute-time:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-add-jobs-list
   activities-add-jobs-list:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-add-ed-program
   activities-add-ed-program:
@@ -205,50 +236,65 @@ flow:
     nextScreens:
       - name: activities-partner-add-job
   activities-partner-add-job:
+    condition: SkipTemplate
     nextScreens:
       - name: activities-partner-add-ed-program
   activities-partner-add-ed-program:
+    condition: SkipTemplate
     nextScreens:
       - name: unearned-income-intro
 
   unearned-income-intro:
+    condition: SkipTemplate
     nextScreens:
       - name: unearned-income-source
   unearned-income-source:
+    condition: SkipTemplate
     nextScreens:
       - name: unearned-income-amount
   unearned-income-amount:
+    condition: SkipTemplate
     nextScreens:
       - name: unearned-income-assets
   unearned-income-assets:
+    condition: SkipTemplate
     nextScreens:
       - name: unearned-income-programs
   unearned-income-programs:
+    condition: SkipTemplate
     nextScreens:
       - name: submit-intro
 
   submit-intro:
+    condition: SkipTemplate
     nextScreens:
       - name: submit-ccap-terms
   submit-ccap-terms:
+    condition: SkipTemplate
     nextScreens:
       - name: submit-sign-name
   submit-sign-name:
+    condition: SkipTemplate
     nextScreens:
       - name: submit-complete
   submit-complete:
+    condition: SkipTemplate
     nextScreens:
       - name: submit-next-steps
   submit-next-steps:
+    condition: SkipTemplate
     nextScreens:
       - name: submit-confirmation
   submit-confirmation:
+    condition: SkipTemplate
     nextScreens:
       - name: doc-upload-list
   doc-upload-list:
+    condition: SkipTemplate
     nextScreens:
       - name: doc-upload-confirm
   doc-upload-confirm:
+    condition: SkipTemplate
     nextScreens: null
 subflows:
   children:
diff --git a/src/main/resources/templates/fragments/screens/screenWithOneInput.html b/src/main/resources/templates/fragments/screens/screenWithOneInput.html
deleted file mode 100644
index 2a8f8e53b..000000000
--- a/src/main/resources/templates/fragments/screens/screenWithOneInput.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<th:block
-    th:fragment="screenWithOneInput"
-    th:with="
-      hasIconFragment=${!#strings.isEmpty(iconFragment)},
-      hasIconName=${!#strings.isEmpty(iconName)}"
-    th:assert="
-      ${!#strings.isEmpty(title)},
-      ${!#strings.isEmpty(header)},
-      ${!#strings.isEmpty(formAction)},
-      ${inputContent != null}">
-  <!DOCTYPE html>
-  <html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
-  <head th:replace="~{fragments/head :: head(title=${title})}"></head>
-  <body>
-  <div class="page-wrapper">
-    <div th:replace="~{fragments/toolbar :: toolbar}"></div>
-    <section class="slab">
-      <div class="grid">
-        <div th:replace="~{fragments/goBack :: goBackLink}"></div>
-        <main id="content" role="main" class="form-card spacing-above-35">
-          <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:block
-              th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
-            <th:block th:ref="formContent">
-              <div class="form-card__content">
-                <th:block th:replace="${inputContent}"/>
-              </div>
-              <div class="form-card__footer">
-                <th:block
-                    th:replace="~{fragments/inputs/submitButton :: submitButton(text=${buttonLabel != null ? buttonLabel : 'Submit'})}"/>
-              </div>
-            </th:block>
-          </th:block>
-        </main>
-      </div>
-    </section>
-  </div>
-  <th:block th:replace="~{fragments/footer :: footer}"/>
-  </body>
-  </html>
-</th:block>
diff --git a/src/main/resources/templates/fragments/screens/screenWithYesAndNoButtons.html b/src/main/resources/templates/fragments/screens/screenWithYesAndNoButtons.html
deleted file mode 100644
index 03fee12b4..000000000
--- a/src/main/resources/templates/fragments/screens/screenWithYesAndNoButtons.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<th:block
-    th:fragment="screenWithYesAndNoButtons"
-    th:with="
-      hasHelpText=${!#strings.isEmpty(helpText)},
-      hasAriaDescribe=${!#strings.isEmpty(ariaDescribe)},
-      hasIconName=${!#strings.isEmpty(iconName)},
-      hasIconFragment=${!#strings.isEmpty(iconFragment)}"
-    th:assert="
-      ${!#strings.isEmpty(title)},
-      ${!#strings.isEmpty(header)},
-      ${!#strings.isEmpty(formAction)},
-      ${!#strings.isEmpty(inputName)},
-      ${inputContent != null}">
-  <!DOCTYPE html>
-  <html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
-  <head th:replace="~{fragments/head :: head(title=${title})}"></head>
-  <body>
-  <div class="page-wrapper">
-    <div th:replace="~{fragments/toolbar :: toolbar}"></div>
-    <section class="slab">
-      <div class="grid">
-        <div th:replace="~{fragments/goBack :: goBackLink}"></div>
-        <main id="content" role="main" class="form-card spacing-above-35">
-          <th:block th:replace="${hasIconName} ? ~{'fragments/icons' :: ${iconName}} : _"/>
-          <th:block th:replace="${hasIconFragment} ? ${iconFragment} : _" />
-          <th:block
-              th:replace="~{fragments/cardHeader :: cardHeader(header=${header})}"/>
-          <th:block
-              th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
-            <th:block th:ref="formContent">
-              <div class="form-card__content">
-                <th:block th:replace="${inputContent}"/>
-              </div>
-              <div class="form-card__footer">
-                <th:block th:replace="~{fragments/inputs/overrides/yesOrNo :: yesOrNo(
-                 inputName=${inputName},
-                 ariaDescribe='header')}"/>
-              </div>
-            </th:block>
-          </th:block>
-        </main>
-      </div>
-    </section>
-  </div>
-  <th:block th:replace="~{fragments/footer :: footer}"/>
-  </body>
-  </html>
-</th:block>