From 0f331481563e9d10d982675078b675c348b91ef7 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 11 Jul 2023 10:50:35 -0400
Subject: [PATCH 01/71] Add @tailwindscss/forms

---
 app/client/package-lock.json  | 33 +++++++++++++++++++++++++++++++++
 app/client/package.json       |  1 +
 app/client/tailwind.config.js |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/client/package-lock.json b/app/client/package-lock.json
index c505d145..f4757f0c 100644
--- a/app/client/package-lock.json
+++ b/app/client/package-lock.json
@@ -15,6 +15,7 @@
         "@headlessui/react": "1.7.14",
         "@heroicons/react": "2.0.18",
         "@radix-ui/react-tooltip": "1.0.5",
+        "@tailwindcss/forms": "0.5.3",
         "@tanstack/react-query": "4.29.7",
         "@tanstack/react-query-devtools": "4.29.7",
         "@testing-library/jest-dom": "5.16.5",
@@ -3624,6 +3625,17 @@
         "url": "https://github.com/sponsors/gregberge"
       }
     },
+    "node_modules/@tailwindcss/forms": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.3.tgz",
+      "integrity": "sha512-y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q==",
+      "dependencies": {
+        "mini-svg-data-uri": "^1.2.3"
+      },
+      "peerDependencies": {
+        "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1"
+      }
+    },
     "node_modules/@tanstack/match-sorter-utils": {
       "version": "8.7.6",
       "resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.7.6.tgz",
@@ -13148,6 +13160,14 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/mini-svg-data-uri": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz",
+      "integrity": "sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==",
+      "bin": {
+        "mini-svg-data-uri": "cli.js"
+      }
+    },
     "node_modules/minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -21307,6 +21327,14 @@
         "loader-utils": "^2.0.0"
       }
     },
+    "@tailwindcss/forms": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.3.tgz",
+      "integrity": "sha512-y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q==",
+      "requires": {
+        "mini-svg-data-uri": "^1.2.3"
+      }
+    },
     "@tanstack/match-sorter-utils": {
       "version": "8.7.6",
       "resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.7.6.tgz",
@@ -28214,6 +28242,11 @@
         }
       }
     },
+    "mini-svg-data-uri": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz",
+      "integrity": "sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="
+    },
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
diff --git a/app/client/package.json b/app/client/package.json
index a678008b..44fe22d5 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -23,6 +23,7 @@
     "@headlessui/react": "1.7.14",
     "@heroicons/react": "2.0.18",
     "@radix-ui/react-tooltip": "1.0.5",
+    "@tailwindcss/forms": "0.5.3",
     "@tanstack/react-query": "4.29.7",
     "@tanstack/react-query-devtools": "4.29.7",
     "@testing-library/jest-dom": "5.16.5",
diff --git a/app/client/tailwind.config.js b/app/client/tailwind.config.js
index 85954397..bc04a801 100644
--- a/app/client/tailwind.config.js
+++ b/app/client/tailwind.config.js
@@ -4,7 +4,7 @@ module.exports = {
   theme: {
     extend: {},
   },
-  plugins: [],
+  plugins: [require("@tailwindcss/forms")],
   prefix: "tw-",
   corePlugins: {
     preflight: false,

From f63c10fdb5dc1b1326337edf67f69404261cf43e Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 11 Jul 2023 10:51:26 -0400
Subject: [PATCH 02/71] Add updated header to userDashboard (commented out for
 now)

---
 app/client/src/components/userDashboard.tsx | 104 ++++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/app/client/src/components/userDashboard.tsx b/app/client/src/components/userDashboard.tsx
index dc078136..aaf9eec6 100644
--- a/app/client/src/components/userDashboard.tsx
+++ b/app/client/src/components/userDashboard.tsx
@@ -109,6 +109,110 @@ export function UserDashboard(props: { email: string }) {
         </li>
       </ul>
 
+      {/*
+      <div className="border-bottom desktop:display-flex">
+        <div className="margin-bottom-1 desktop:margin-right-1">
+          <label htmlFor="rebate-year" className="margin-right-1 font-sans-2xs">
+            Rebate Year:
+          </label>
+          <select
+            id="rebate-year"
+            name="rebate-year"
+            className="tw-rounded-md tw-border-0 tw-text-sm tw-font-bold tw-leading-4 tw-ring-1 tw-ring-inset tw-ring-gray-300"
+          >
+            <option>2022</option>
+            <option>2023</option>
+          </select>
+        </div>
+
+        <div className="flex-align-center tablet:display-flex">
+          <div className="margin-bottom-1 tablet:margin-right-1">
+            <a
+              className="usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs"
+              href="/"
+            >
+              <span className="display-flex flex-align-center">
+                <svg
+                  className="usa-icon"
+                  aria-hidden="true"
+                  focusable="false"
+                  role="img"
+                >
+                  <use href={`${icons}#list`} />
+                </svg>
+                <span className="margin-left-1 text-left">
+                  Your Rebate Forms
+                </span>
+              </span>
+            </a>
+          </div>
+
+          <div className="margin-bottom-1 tablet:margin-right-1">
+            <a
+              className="usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs"
+              href="/helpdesk"
+            >
+              <span className="display-flex flex-align-center">
+                <svg
+                  className="usa-icon"
+                  aria-hidden="true"
+                  focusable="false"
+                  role="img"
+                >
+                  <use href={`${icons}#add_circle`} />
+                </svg>
+                <span className="margin-left-1 text-left">New Application</span>
+              </span>
+            </a>
+          </div>
+
+          <div className="margin-bottom-1 tablet:margin-right-1">
+            <a
+              className="usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs"
+              href="/helpdesk"
+            >
+              <span className="display-flex flex-align-center">
+                <svg
+                  className="usa-icon"
+                  aria-hidden="true"
+                  focusable="false"
+                  role="img"
+                >
+                  <use href={`${icons}#people`} />
+                </svg>
+                <span className="margin-left-1 text-left">Helpdesk</span>
+              </span>
+            </a>
+          </div>
+        </div>
+
+        <div className="flex-align-center flex-1 tablet:display-flex desktop:flex-justify-end">
+          <div className="margin-bottom-1">
+            <span className="font-sans-xs">{email}</span>
+          </div>
+
+          <div className="margin-bottom-1 tablet:margin-left-1">
+            <a
+              className="usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs"
+              href={`${serverUrlForHrefs}/logout`}
+            >
+              <span className="display-flex flex-align-center">
+                <span className="margin-right-1">Sign out</span>
+                <svg
+                  className="usa-icon"
+                  aria-hidden="true"
+                  focusable="false"
+                  role="img"
+                >
+                  <use href={`${icons}#logout`} />
+                </svg>
+              </span>
+            </a>
+          </div>
+        </div>
+      </div>
+      */}
+
       <div className="desktop:display-flex flex-justify border-bottom">
         <nav className="desktop:order-last mobile-lg:display-flex flex-align-center flex-justify-end">
           <p className="margin-bottom-1 margin-right-1">

From f9833c0137496b26f302a314ea89259c8c9c9ecb Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 11 Jul 2023 12:40:46 -0400
Subject: [PATCH 03/71] Move new application button out of dashboard component
 (will go on all rebates page) and update styles (shrink buttons, update small
 screen layout)

---
 app/client/src/components/userDashboard.tsx | 199 +++++++-------------
 1 file changed, 67 insertions(+), 132 deletions(-)

diff --git a/app/client/src/components/userDashboard.tsx b/app/client/src/components/userDashboard.tsx
index aaf9eec6..7b209bfe 100644
--- a/app/client/src/components/userDashboard.tsx
+++ b/app/client/src/components/userDashboard.tsx
@@ -5,12 +5,7 @@ import uswds from "@formio/uswds";
 import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrlForHrefs, formioBaseUrl, formioProjectUrl } from "../config";
-import {
-  useCsbQuery,
-  useBapSamQuery,
-  useCsbData,
-  useBapSamData,
-} from "../utilities";
+import { useCsbQuery, useBapSamQuery, useBapSamData } from "../utilities";
 import { useHelpdeskAccess } from "components/app";
 import { Loading } from "components/loading";
 import { useDialogActions } from "contexts/dialog";
@@ -27,6 +22,8 @@ function IconText(props: {
 }) {
   const { order, icon, text } = props;
 
+  const alignment = order === "icon-text" ? "left" : "right";
+
   const Icon = (
     <svg
       key="icon"
@@ -40,10 +37,7 @@ function IconText(props: {
   );
 
   const Text = (
-    <span
-      key="text"
-      className={`margin-${order === "icon-text" ? "left" : "right"}-1`}
-    >
+    <span key="text" className={`margin-${alignment}-1 text-${alignment}`}>
       {text}
     </span>
   );
@@ -64,7 +58,6 @@ export function UserDashboard(props: { email: string }) {
   useCsbQuery();
   useBapSamQuery();
 
-  const csbData = useCsbData();
   const bapSamData = useBapSamData();
 
   const { displayDialog } = useDialogActions();
@@ -72,15 +65,34 @@ export function UserDashboard(props: { email: string }) {
 
   const onAllRebatesPage = pathname === "/";
   const onHelpdeskPage = pathname === "/helpdesk";
+
   const onApplicationFormPage = pathname.startsWith("/rebate");
   const onPaymentRequestFormPage = pathname.startsWith("/payment-request");
   const onCloseOutFormPage = pathname.startsWith("/close-out");
 
-  const applicationFormOpen = csbData
-    ? csbData.submissionPeriodOpen.application
-    : false;
+  const onFormPage =
+    onApplicationFormPage || onPaymentRequestFormPage || onCloseOutFormPage;
+
+  const btnClassNames =
+    "usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs";
 
-  if (!csbData || !bapSamData) {
+  function confirmationNavigation(destination: string) {
+    displayDialog({
+      dismissable: true,
+      heading: "Are you sure you want to navigate away from this page?",
+      description: (
+        <p>
+          If you haven’t saved the current form, any changes you’ve made will be
+          lost.
+        </p>
+      ),
+      confirmText: "Yes",
+      dismissText: "Cancel",
+      confirmedAction: () => navigate(destination),
+    });
+  }
+
+  if (!bapSamData) {
     return <Loading />;
   }
 
@@ -213,141 +225,64 @@ export function UserDashboard(props: { email: string }) {
       </div>
       */}
 
-      <div className="desktop:display-flex flex-justify border-bottom">
-        <nav className="desktop:order-last mobile-lg:display-flex flex-align-center flex-justify-end">
-          <p className="margin-bottom-1 margin-right-1">
-            <span>{email}</span>
-          </p>
-
-          <a
-            className="margin-bottom-1 usa-button font-sans-2xs margin-right-0"
-            href={`${serverUrlForHrefs}/logout`}
-          >
-            <IconText order="text-icon" icon="logout" text="Sign out" />
-          </a>
-        </nav>
-
-        <nav>
-          {/* --- Your Rebate Forms --- */}
-          {onAllRebatesPage ? (
-            <button
-              className="margin-bottom-1 usa-button font-sans-2xs"
-              disabled
-            >
-              <IconText
-                order="icon-text"
-                icon="list"
-                text="Your Rebate Forms"
-              />
-            </button>
-          ) : (
-            <Link
-              to="/"
-              className="margin-bottom-1 usa-button font-sans-2xs"
-              onClick={(ev) => {
-                if (
-                  onApplicationFormPage ||
-                  onPaymentRequestFormPage ||
-                  onCloseOutFormPage
-                ) {
-                  ev.preventDefault();
-                  displayDialog({
-                    dismissable: true,
-                    heading:
-                      "Are you sure you want to navigate away from this page?",
-                    description: (
-                      <p>
-                        If you haven’t saved the current form, any changes
-                        you’ve made will be lost.
-                      </p>
-                    ),
-                    confirmText: "Yes",
-                    dismissText: "Cancel",
-                    confirmedAction: () => navigate("/"),
-                  });
-                }
-              }}
-            >
-              <IconText
-                order="icon-text"
-                icon="list"
-                text="Your Rebate Forms"
-              />
-            </Link>
-          )}
-
-          {/* --- New Application --- */}
-          {onApplicationFormPage ||
-          onPaymentRequestFormPage ||
-          onCloseOutFormPage ||
-          !applicationFormOpen ? (
-            <button
-              className="margin-bottom-1 usa-button font-sans-2xs"
-              disabled
-            >
-              <IconText
-                order="icon-text"
-                icon="add_circle"
-                text="New Application"
-              />
-            </button>
-          ) : (
-            <Link
-              to="/rebate/new"
-              className="margin-bottom-1 usa-button font-sans-2xs"
-            >
-              <IconText
-                order="icon-text"
-                icon="add_circle"
-                text="New Application"
-              />
-            </Link>
-          )}
+      <div className="flex-justify border-bottom tablet:display-flex ">
+        <nav className="flex-align-center mobile-lg:display-flex">
+          <div className="margin-bottom-1 mobile-lg:margin-right-1">
+            {onAllRebatesPage ? (
+              <button className={btnClassNames} disabled>
+                <IconText order="icon-text" icon="list" text="Dashboard" />
+              </button>
+            ) : (
+              <Link
+                to="/"
+                className={btnClassNames}
+                onClick={(ev) => {
+                  if (onFormPage) {
+                    ev.preventDefault();
+                    confirmationNavigation("/");
+                  }
+                }}
+              >
+                <IconText order="icon-text" icon="list" text="Dashboard" />
+              </Link>
+            )}
+          </div>
 
-          {/* --- Helpdesk --- */}
           {helpdeskAccess === "success" && (
-            <>
+            <div className="margin-bottom-1 mobile-lg:margin-right-1">
               {onHelpdeskPage ? (
-                <button
-                  className="margin-bottom-1 usa-button font-sans-2xs"
-                  disabled
-                >
+                <button className={btnClassNames} disabled>
                   <IconText order="icon-text" icon="people" text="Helpdesk" />
                 </button>
               ) : (
                 <Link
                   to="/helpdesk"
-                  className="margin-bottom-1 usa-button font-sans-2xs"
+                  className={btnClassNames}
                   onClick={(ev) => {
-                    if (
-                      onApplicationFormPage ||
-                      onPaymentRequestFormPage ||
-                      onCloseOutFormPage
-                    ) {
+                    if (onFormPage) {
                       ev.preventDefault();
-                      displayDialog({
-                        dismissable: true,
-                        heading:
-                          "Are you sure you want to navigate away from this page?",
-                        description: (
-                          <p>
-                            If you haven’t saved the current form, any changes
-                            you’ve made will be lost.
-                          </p>
-                        ),
-                        confirmText: "Yes",
-                        dismissText: "Cancel",
-                        confirmedAction: () => navigate("/helpdesk"),
-                      });
+                      confirmationNavigation("/helpdesk");
                     }
                   }}
                 >
                   <IconText order="icon-text" icon="people" text="Helpdesk" />
                 </Link>
               )}
-            </>
+            </div>
           )}
         </nav>
+
+        <nav className="flex-align-center mobile-lg:display-flex tablet:flex-justify-end">
+          <div className="margin-bottom-1">
+            <span className="font-sans-xs">{email}</span>
+          </div>
+
+          <div className="margin-bottom-1 mobile-lg:margin-left-1">
+            <a className={btnClassNames} href={`${serverUrlForHrefs}/logout`}>
+              <IconText order="text-icon" icon="logout" text="Sign out" />
+            </a>
+          </div>
+        </nav>
       </div>
 
       <Outlet context={{ email }} />

From 23461a397267a161c7634c33e99da0d798aa862e Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 11 Jul 2023 14:09:13 -0400
Subject: [PATCH 04/71] Add rebate year select to allRebates and move new
 application button/link to the right of the new rebate year select

---
 app/client/src/routes/allRebates.tsx | 52 ++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index b041cc90..7563569b 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -770,12 +770,31 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
   );
 }
 
+function NewApplicationIconText() {
+  return (
+    <span className="display-flex flex-align-center">
+      <svg className="usa-icon" aria-hidden="true" focusable="false" role="img">
+        <use href={`${icons}#add_circle`} />
+      </svg>
+      <span className="margin-left-1 text-left">New Application</span>
+    </span>
+  );
+}
+
 export function AllRebates() {
   const content = useContentData();
+  const csbData = useCsbData();
   const bapSamData = useBapSamData();
   const submissionsQueries = useSubmissionsQueries();
   const rebates = useRebates();
 
+  const applicationFormOpen = csbData
+    ? csbData.submissionPeriodOpen.application
+    : false;
+
+  const btnClassNames =
+    "usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs";
+
   if (!bapSamData) return null;
 
   if (submissionsQueries.some((query) => query.isFetching)) {
@@ -795,6 +814,39 @@ export function AllRebates() {
         />
       )}
 
+      <div className="margin-top-1 padding-top-1 padding-x-1 border-1px border-base-lighter bg-base-lightest">
+        <nav className="flex-align-center mobile-lg:display-flex">
+          <div className="margin-bottom-1 mobile-lg:margin-right-1">
+            <label
+              htmlFor="rebate-year"
+              className="margin-right-1 font-sans-2xs"
+            >
+              Rebate Year:
+            </label>
+            <select
+              id="rebate-year"
+              name="rebate-year"
+              className="tw-rounded-md tw-border-0 tw-text-sm tw-font-bold tw-leading-4 tw-ring-1 tw-ring-inset tw-ring-gray-300"
+            >
+              <option>2022</option>
+              <option>2023</option>
+            </select>
+          </div>
+
+          <div className="margin-bottom-1 mobile-lg:margin-right-1">
+            {!applicationFormOpen ? (
+              <button className={btnClassNames} disabled>
+                <NewApplicationIconText />
+              </button>
+            ) : (
+              <Link to="/rebate/new" className={btnClassNames}>
+                <NewApplicationIconText />
+              </Link>
+            )}
+          </div>
+        </nav>
+      </div>
+
       {rebates.length === 0 ? (
         <div className="margin-top-4">
           <Message type="info" text={messages.newApplication} />

From 3c047ff999b97ec8e7eb715d64d32f487d0e06e8 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 11 Jul 2023 14:16:05 -0400
Subject: [PATCH 05/71] Remove IconText component from userDashboard and create
 indivitual icon text components for dashboard, helpdesk, and signout (less
 dry but also less indirection)

---
 app/client/src/components/userDashboard.tsx | 55 ++++++++++-----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/app/client/src/components/userDashboard.tsx b/app/client/src/components/userDashboard.tsx
index 7b209bfe..fd31ddd1 100644
--- a/app/client/src/components/userDashboard.tsx
+++ b/app/client/src/components/userDashboard.tsx
@@ -15,36 +15,35 @@ Formio.setProjectUrl(formioProjectUrl);
 Formio.use(premium);
 Formio.use(uswds);
 
-function IconText(props: {
-  order: "icon-text" | "text-icon";
-  icon: string;
-  text: string;
-}) {
-  const { order, icon, text } = props;
-
-  const alignment = order === "icon-text" ? "left" : "right";
-
-  const Icon = (
-    <svg
-      key="icon"
-      className="usa-icon"
-      aria-hidden="true"
-      focusable="false"
-      role="img"
-    >
-      <use href={`${icons}#${icon}`} />
-    </svg>
+function DashboardIconText() {
+  return (
+    <span className="display-flex flex-align-center">
+      <svg className="usa-icon" aria-hidden="true" focusable="false" role="img">
+        <use href={`${icons}#list`} />
+      </svg>
+      <span className="margin-left-1 text-left">Dashboard</span>
+    </span>
   );
+}
 
-  const Text = (
-    <span key="text" className={`margin-${alignment}-1 text-${alignment}`}>
-      {text}
+function HelpdeskIconText() {
+  return (
+    <span className="display-flex flex-align-center">
+      <svg className="usa-icon" aria-hidden="true" focusable="false" role="img">
+        <use href={`${icons}#people`} />
+      </svg>
+      <span className="margin-left-1 text-left">Helpdesk</span>
     </span>
   );
+}
 
+function SignOutIconText() {
   return (
     <span className="display-flex flex-align-center">
-      {order === "icon-text" ? [Icon, Text] : [Text, Icon]}
+      <span className="margin-right-1 text-right">Sign out</span>
+      <svg className="usa-icon" aria-hidden="true" focusable="false" role="img">
+        <use href={`${icons}#logout`} />
+      </svg>
     </span>
   );
 }
@@ -230,7 +229,7 @@ export function UserDashboard(props: { email: string }) {
           <div className="margin-bottom-1 mobile-lg:margin-right-1">
             {onAllRebatesPage ? (
               <button className={btnClassNames} disabled>
-                <IconText order="icon-text" icon="list" text="Dashboard" />
+                <DashboardIconText />
               </button>
             ) : (
               <Link
@@ -243,7 +242,7 @@ export function UserDashboard(props: { email: string }) {
                   }
                 }}
               >
-                <IconText order="icon-text" icon="list" text="Dashboard" />
+                <DashboardIconText />
               </Link>
             )}
           </div>
@@ -252,7 +251,7 @@ export function UserDashboard(props: { email: string }) {
             <div className="margin-bottom-1 mobile-lg:margin-right-1">
               {onHelpdeskPage ? (
                 <button className={btnClassNames} disabled>
-                  <IconText order="icon-text" icon="people" text="Helpdesk" />
+                  <HelpdeskIconText />
                 </button>
               ) : (
                 <Link
@@ -265,7 +264,7 @@ export function UserDashboard(props: { email: string }) {
                     }
                   }}
                 >
-                  <IconText order="icon-text" icon="people" text="Helpdesk" />
+                  <HelpdeskIconText />
                 </Link>
               )}
             </div>
@@ -279,7 +278,7 @@ export function UserDashboard(props: { email: string }) {
 
           <div className="margin-bottom-1 mobile-lg:margin-left-1">
             <a className={btnClassNames} href={`${serverUrlForHrefs}/logout`}>
-              <IconText order="text-icon" icon="logout" text="Sign out" />
+              <SignOutIconText />
             </a>
           </div>
         </nav>

From 497588031bfc21fa6e56b7a358267f3ea9eb0547 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 11 Jul 2023 14:31:27 -0400
Subject: [PATCH 06/71] Remove commented out 'new' dashboard bar/menu, as the
 old one has now been updated

---
 app/client/src/components/userDashboard.tsx | 104 --------------------
 1 file changed, 104 deletions(-)

diff --git a/app/client/src/components/userDashboard.tsx b/app/client/src/components/userDashboard.tsx
index fd31ddd1..b1b8d02e 100644
--- a/app/client/src/components/userDashboard.tsx
+++ b/app/client/src/components/userDashboard.tsx
@@ -120,110 +120,6 @@ export function UserDashboard(props: { email: string }) {
         </li>
       </ul>
 
-      {/*
-      <div className="border-bottom desktop:display-flex">
-        <div className="margin-bottom-1 desktop:margin-right-1">
-          <label htmlFor="rebate-year" className="margin-right-1 font-sans-2xs">
-            Rebate Year:
-          </label>
-          <select
-            id="rebate-year"
-            name="rebate-year"
-            className="tw-rounded-md tw-border-0 tw-text-sm tw-font-bold tw-leading-4 tw-ring-1 tw-ring-inset tw-ring-gray-300"
-          >
-            <option>2022</option>
-            <option>2023</option>
-          </select>
-        </div>
-
-        <div className="flex-align-center tablet:display-flex">
-          <div className="margin-bottom-1 tablet:margin-right-1">
-            <a
-              className="usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs"
-              href="/"
-            >
-              <span className="display-flex flex-align-center">
-                <svg
-                  className="usa-icon"
-                  aria-hidden="true"
-                  focusable="false"
-                  role="img"
-                >
-                  <use href={`${icons}#list`} />
-                </svg>
-                <span className="margin-left-1 text-left">
-                  Your Rebate Forms
-                </span>
-              </span>
-            </a>
-          </div>
-
-          <div className="margin-bottom-1 tablet:margin-right-1">
-            <a
-              className="usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs"
-              href="/helpdesk"
-            >
-              <span className="display-flex flex-align-center">
-                <svg
-                  className="usa-icon"
-                  aria-hidden="true"
-                  focusable="false"
-                  role="img"
-                >
-                  <use href={`${icons}#add_circle`} />
-                </svg>
-                <span className="margin-left-1 text-left">New Application</span>
-              </span>
-            </a>
-          </div>
-
-          <div className="margin-bottom-1 tablet:margin-right-1">
-            <a
-              className="usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs"
-              href="/helpdesk"
-            >
-              <span className="display-flex flex-align-center">
-                <svg
-                  className="usa-icon"
-                  aria-hidden="true"
-                  focusable="false"
-                  role="img"
-                >
-                  <use href={`${icons}#people`} />
-                </svg>
-                <span className="margin-left-1 text-left">Helpdesk</span>
-              </span>
-            </a>
-          </div>
-        </div>
-
-        <div className="flex-align-center flex-1 tablet:display-flex desktop:flex-justify-end">
-          <div className="margin-bottom-1">
-            <span className="font-sans-xs">{email}</span>
-          </div>
-
-          <div className="margin-bottom-1 tablet:margin-left-1">
-            <a
-              className="usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs"
-              href={`${serverUrlForHrefs}/logout`}
-            >
-              <span className="display-flex flex-align-center">
-                <span className="margin-right-1">Sign out</span>
-                <svg
-                  className="usa-icon"
-                  aria-hidden="true"
-                  focusable="false"
-                  role="img"
-                >
-                  <use href={`${icons}#logout`} />
-                </svg>
-              </span>
-            </a>
-          </div>
-        </div>
-      </div>
-      */}
-
       <div className="flex-justify border-bottom tablet:display-flex ">
         <nav className="flex-align-center mobile-lg:display-flex">
           <div className="margin-bottom-1 mobile-lg:margin-right-1">

From 8ada8ba3f24a1e1405bd1d5bf205599e1ffba9be Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 12 Jul 2023 12:10:16 -0400
Subject: [PATCH 07/71] Add year context component for storing selected rebate
 year globally, and update rebate year select in allRebates component to use
 it

---
 app/client/src/contexts/year.tsx     | 100 +++++++++++++++++++++++++++
 app/client/src/index.tsx             |   5 +-
 app/client/src/routes/allRebates.tsx |   8 ++-
 3 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 app/client/src/contexts/year.tsx

diff --git a/app/client/src/contexts/year.tsx b/app/client/src/contexts/year.tsx
new file mode 100644
index 00000000..327d5044
--- /dev/null
+++ b/app/client/src/contexts/year.tsx
@@ -0,0 +1,100 @@
+import {
+  Dispatch,
+  ReactNode,
+  createContext,
+  useContext,
+  useReducer,
+} from "react";
+
+type Props = {
+  children: ReactNode;
+};
+
+export type RebateYear = "2022" | "2023";
+
+type State = {
+  rebateYear: RebateYear;
+};
+
+type Action = {
+  type: "SET_REBATE_YEAR";
+  payload: { rebateYear: RebateYear };
+};
+
+const StateContext = createContext<State | undefined>(undefined);
+const DispatchContext = createContext<Dispatch<Action> | undefined>(undefined);
+
+function reducer(state: State, action: Action): State {
+  switch (action.type) {
+    case "SET_REBATE_YEAR": {
+      const { rebateYear } = action.payload;
+
+      return {
+        ...state,
+        rebateYear,
+      };
+    }
+
+    default: {
+      const message = `Unhandled action type: ${action}`;
+      throw new Error(message);
+    }
+  }
+}
+
+export function YearProvider({ children }: Props) {
+  const initialState: State = {
+    rebateYear: "2022",
+  };
+
+  const [state, dispatch] = useReducer(reducer, initialState);
+
+  return (
+    <StateContext.Provider value={state}>
+      <DispatchContext.Provider value={dispatch}>
+        {children}
+      </DispatchContext.Provider>
+    </StateContext.Provider>
+  );
+}
+
+/**
+ * Returns state stored in `YearProvider` context component.
+ */
+export function useYearState() {
+  const context = useContext(StateContext);
+  if (context === undefined) {
+    throw new Error("useYearState must be called within an YearProvider");
+  }
+  return context;
+}
+
+/**
+ * Custom hook that returns `dispatch` method for dispatching actions to update
+ * state stored in `DialogProvider` context component.
+ */
+function useYearDispatch() {
+  const context = useContext(DispatchContext);
+  if (context === undefined) {
+    const message = `useYearDispatch must be used within a YearProvider`;
+    throw new Error(message);
+  }
+  return context;
+}
+
+/**
+ * Custom hook that returns a function to dispatch an action to set the rebate
+ * year.
+ */
+export function useYearActions() {
+  const dispatch = useYearDispatch();
+
+  return {
+    setRebateYear(rebateYear: RebateYear) {
+      dispatch({
+        type: "SET_REBATE_YEAR",
+        payload: { rebateYear },
+      });
+    },
+  };
+}
diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx
index dc5e14a8..f7151b8e 100644
--- a/app/client/src/index.tsx
+++ b/app/client/src/index.tsx
@@ -7,6 +7,7 @@ import { ErrorBoundary } from "components/errorBoundary";
 import { App } from "components/app";
 import { DialogProvider } from "contexts/dialog";
 import { NotificationsProvider } from "contexts/notifications";
+import { YearProvider } from "contexts/year";
 import "./tailwind-preflight.css";
 import "./styles.css";
 
@@ -40,7 +41,9 @@ function Index() {
         <ErrorBoundary>
           <DialogProvider>
             <NotificationsProvider>
-              <App />
+              <YearProvider>
+                <App />
+              </YearProvider>
             </NotificationsProvider>
           </DialogProvider>
         </ErrorBoundary>
diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index 7563569b..14f0120d 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -20,6 +20,7 @@ import { Message } from "components/message";
 import { MarkdownContent } from "components/markdownContent";
 import { TextWithTooltip } from "components/tooltip";
 import { useNotificationsActions } from "contexts/notifications";
+import { RebateYear, useYearState, useYearActions } from "contexts/year";
 
 const defaultTableRowClassNames = "bg-gray-5";
 const highlightedTableRowClassNames = "bg-primary-lighter";
@@ -788,6 +789,9 @@ export function AllRebates() {
   const submissionsQueries = useSubmissionsQueries();
   const rebates = useRebates();
 
+  const { rebateYear } = useYearState();
+  const { setRebateYear } = useYearActions();
+
   const applicationFormOpen = csbData
     ? csbData.submissionPeriodOpen.application
     : false;
@@ -815,7 +819,7 @@ export function AllRebates() {
       )}
 
       <div className="margin-top-1 padding-top-1 padding-x-1 border-1px border-base-lighter bg-base-lightest">
-        <nav className="flex-align-center mobile-lg:display-flex">
+        <nav className="flex-align-center mobile-lg:display-flex mobile-lg:padding-x-1">
           <div className="margin-bottom-1 mobile-lg:margin-right-1">
             <label
               htmlFor="rebate-year"
@@ -827,6 +831,8 @@ export function AllRebates() {
               id="rebate-year"
               name="rebate-year"
               className="tw-rounded-md tw-border-0 tw-text-sm tw-font-bold tw-leading-4 tw-ring-1 tw-ring-inset tw-ring-gray-300"
+              onChange={(ev) => setRebateYear(ev.target.value as RebateYear)}
+              defaultValue={rebateYear}
             >
               <option>2022</option>
               <option>2023</option>

From 05fe85229afe651fe339df032afb602c0829cc81 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 20 Jul 2023 15:35:15 -0400
Subject: [PATCH 08/71] Add yearly env variables for controlling each form's
 open enrollment status, and update API to return those values and code to
 reflect they're now each stored at the year level too

---
 app/client/src/routes/allRebates.tsx         |  8 ++--
 app/client/src/routes/applicationForm.tsx    |  2 +-
 app/client/src/routes/closeOutForm.tsx       |  2 +-
 app/client/src/routes/newApplicationForm.tsx |  4 +-
 app/client/src/routes/paymentRequestForm.tsx |  2 +-
 app/client/src/utilities.tsx                 |  5 +--
 app/server/.env.example                      |  9 ++--
 app/server/app/index.js                      |  9 ++--
 app/server/app/routes/api.js                 | 44 +++++++++++++-------
 9 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index 14f0120d..0e8da131 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -58,7 +58,7 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
 
   if (!csbData) return null;
 
-  const applicationFormOpen = csbData.submissionPeriodOpen.application;
+  const applicationFormOpen = csbData.submissionPeriodOpen["2022"].frf; // TODO
 
   const {
     applicantUEI,
@@ -322,7 +322,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
 
   if (!csbData || !bapSamData) return null;
 
-  const paymentRequestFormOpen = csbData.submissionPeriodOpen.paymentRequest;
+  const paymentRequestFormOpen = csbData.submissionPeriodOpen["2022"].prf; // TODO
 
   const applicationSelected = application.bap?.status === "Accepted";
 
@@ -561,7 +561,7 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
 
   if (!csbData || !bapSamData) return null;
 
-  const closeOutFormOpen = csbData.submissionPeriodOpen.closeOut;
+  const closeOutFormOpen = csbData.submissionPeriodOpen["2022"].cof; // TODO
 
   const paymentRequestFundingApproved =
     paymentRequest.bap?.status === "Accepted";
@@ -793,7 +793,7 @@ export function AllRebates() {
   const { setRebateYear } = useYearActions();
 
   const applicationFormOpen = csbData
-    ? csbData.submissionPeriodOpen.application
+    ? csbData.submissionPeriodOpen["2022"].frf // TODO
     : false;
 
   const btnClassNames =
diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index fd8b1e3c..271e747a 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -314,7 +314,7 @@ function UserApplicationForm(props: { email: string }) {
     return null;
   }
 
-  const applicationFormOpen = csbData.submissionPeriodOpen.application;
+  const applicationFormOpen = csbData.submissionPeriodOpen["2022"].frf; // TODO
 
   const formIsReadOnly =
     (submission.state === "submitted" || !applicationFormOpen) &&
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index 55bf6835..d11f8b69 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -189,7 +189,7 @@ function UserCloseOutForm(props: { email: string }) {
         bap: rebate.closeOut.bap,
       });
 
-  const closeOutFormOpen = csbData.submissionPeriodOpen.closeOut;
+  const closeOutFormOpen = csbData.submissionPeriodOpen["2022"].cof; // TODO
 
   const formIsReadOnly =
     (submission.state === "submitted" || !closeOutFormOpen) &&
diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/newApplicationForm.tsx
index 58a248e0..45759601 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/newApplicationForm.tsx
@@ -45,7 +45,7 @@ export function NewApplicationForm() {
     return <Loading />;
   }
 
-  const applicationFormOpen = csbData.submissionPeriodOpen.application;
+  const applicationFormOpen = csbData.submissionPeriodOpen["2022"].frf; // TODO
 
   const activeSamEntities = bapSamData.entities.filter((entity) => {
     return entity.ENTITY_STATUS__c === "Active";
@@ -83,7 +83,7 @@ export function NewApplicationForm() {
             >
               <Dialog.Panel className="tw-relative tw-transform tw-overflow-hidden tw-rounded-lg tw-bg-white tw-p-4 tw-shadow-xl tw-transition-all sm:tw-w-full sm:tw-max-w-4xl sm:tw-p-6">
                 <div className="twpf">
-                  <div className="tw-absolute tw-top-0 tw-right-0 tw-pt-4 tw-pr-4">
+                  <div className="tw-absolute tw-right-0 tw-top-0 tw-pr-4 tw-pt-4">
                     <button
                       type="button"
                       className="tw-rounded-md tw-bg-white tw-text-gray-400 tw-transition-none hover:tw-text-gray-700 focus:tw-text-gray-700"
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index d2bbdefd..7484f8d3 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -196,7 +196,7 @@ function UserPaymentRequestForm(props: { email: string }) {
         bap: rebate.paymentRequest.bap,
       });
 
-  const paymentRequestFormOpen = csbData.submissionPeriodOpen.paymentRequest;
+  const paymentRequestFormOpen = csbData.submissionPeriodOpen["2022"].prf; // TODO
 
   const formIsReadOnly =
     applicationNeedsEdits ||
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 42826fe0..d2dd4a3c 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -26,9 +26,8 @@ type UserData = {
 
 export type CsbData = {
   submissionPeriodOpen: {
-    application: boolean;
-    paymentRequest: boolean;
-    closeOut: boolean;
+    2022: { frf: boolean; prf: boolean; cof: boolean };
+    2023: { frf: boolean; prf: boolean; cof: boolean };
   };
 };
 
diff --git a/app/server/.env.example b/app/server/.env.example
index 7c47ade4..885e7a70 100644
--- a/app/server/.env.example
+++ b/app/server/.env.example
@@ -10,9 +10,12 @@ SAML_IDP_CERT=
 SAML_PUBLIC_KEY=publickey
 JWT_PRIVATE_KEY=secret
 JWT_PUBLIC_KEY=secret
-CSB_APPLICATION_FORM_OPEN=true
-CSB_PAYMENT_REQUEST_FORM_OPEN=true
-CSB_CLOSE_OUT_FORM_OPEN=true
+CSB_FRF_2022_OPEN=true
+CSB_PRF_2022_OPEN=true
+CSB_COF_2022_OPEN=true
+CSB_FRF_2023_OPEN=true
+CSB_PRF_2023_OPEN=true
+CSB_COF_2023_OPEN=true
 FORMIO_BASE_URL=
 FORMIO_PROJECT_NAME=
 FORMIO_APPLICATION_FORM_PATH=
diff --git a/app/server/app/index.js b/app/server/app/index.js
index cee70d6f..912553c6 100644
--- a/app/server/app/index.js
+++ b/app/server/app/index.js
@@ -36,9 +36,12 @@ const requiredEnvironmentVariables = [
   "SAML_PUBLIC_KEY",
   "JWT_PRIVATE_KEY",
   "JWT_PUBLIC_KEY",
-  "CSB_APPLICATION_FORM_OPEN",
-  "CSB_PAYMENT_REQUEST_FORM_OPEN",
-  "CSB_CLOSE_OUT_FORM_OPEN",
+  "CSB_FRF_2022_OPEN",
+  "CSB_PRF_2022_OPEN",
+  "CSB_COF_2022_OPEN",
+  "CSB_FRF_2023_OPEN",
+  "CSB_PRF_2023_OPEN",
+  "CSB_COF_2023_OPEN",
   "FORMIO_BASE_URL",
   "FORMIO_PROJECT_NAME",
   "FORMIO_APPLICATION_FORM_PATH",
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index ef976530..70eab91b 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -26,16 +26,23 @@ const log = require("../utilities/logger");
 
 const {
   NODE_ENV,
-  CSB_APPLICATION_FORM_OPEN,
-  CSB_PAYMENT_REQUEST_FORM_OPEN,
-  CSB_CLOSE_OUT_FORM_OPEN,
+  CSB_FRF_2022_OPEN,
+  CSB_PRF_2022_OPEN,
+  CSB_COF_2022_OPEN,
+  CSB_FRF_2023_OPEN,
+  CSB_PRF_2023_OPEN,
+  CSB_COF_2023_OPEN,
   S3_PUBLIC_BUCKET,
   S3_PUBLIC_REGION,
 } = process.env;
 
-const applicationFormOpen = CSB_APPLICATION_FORM_OPEN === "true";
-const paymentRequestFormOpen = CSB_PAYMENT_REQUEST_FORM_OPEN === "true";
-const closeOutFormOpen = CSB_CLOSE_OUT_FORM_OPEN === "true";
+const frf2022Open = CSB_FRF_2022_OPEN === "true";
+const prf2022Open = CSB_PRF_2022_OPEN === "true";
+const cof2022Open = CSB_COF_2022_OPEN === "true";
+
+const frf2023Open = CSB_FRF_2023_OPEN === "true";
+const prf2023Open = CSB_PRF_2023_OPEN === "true";
+const cof2023Open = CSB_COF_2023_OPEN === "true";
 
 /**
  * Returns a resolved or rejected promise, depending on if the given form's
@@ -57,9 +64,9 @@ function checkFormSubmissionPeriodAndBapStatus({
 }) {
   /** Form submission period is open, so continue. */
   if (
-    (formType === "application" && applicationFormOpen) ||
-    (formType === "payment-request" && paymentRequestFormOpen) ||
-    (formType === "close-out" && closeOutFormOpen)
+    (formType === "application" && frf2022Open) ||
+    (formType === "payment-request" && prf2022Open) ||
+    (formType === "close-out" && cof2023Open)
   ) {
     return Promise.resolve();
   }
@@ -169,9 +176,16 @@ router.get("/user", (req, res) => {
 router.get("/csb-data", (req, res) => {
   return res.json({
     submissionPeriodOpen: {
-      application: applicationFormOpen,
-      paymentRequest: paymentRequestFormOpen,
-      closeOut: closeOutFormOpen,
+      2022: {
+        frf: frf2022Open,
+        prf: prf2022Open,
+        cof: cof2022Open,
+      },
+      2023: {
+        frf: frf2023Open,
+        prf: prf2023Open,
+        cof: cof2023Open,
+      },
     },
   });
 });
@@ -348,7 +362,7 @@ router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
   const { mail } = req.user;
   const comboKey = body.data?.bap_hidden_entity_combo_key;
 
-  if (!applicationFormOpen) {
+  if (!frf2022Open) {
     const errorStatus = 400;
     const errorMessage = `CSB Application form enrollment period is closed.`;
     return res.status(errorStatus).json({ message: errorMessage });
@@ -520,7 +534,7 @@ router.post(
       applicationFormModified,
     } = body;
 
-    if (!paymentRequestFormOpen) {
+    if (!prf2022Open) {
       const errorStatus = 400;
       const errorMessage = `CSB Payment Request form enrollment period is closed.`;
       return res.status(errorStatus).json({ message: errorMessage });
@@ -870,7 +884,7 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
     paymentRequestFormModified,
   } = body;
 
-  if (!closeOutFormOpen) {
+  if (!cof2022Open) {
     const errorStatus = 400;
     const errorMessage = `CSB Close Out form enrollment period is closed.`;
     return res.status(errorStatus).json({ message: errorMessage });

From 14518f213c113fa8061f08f73edb03a4852f5628 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 20 Jul 2023 16:24:59 -0400
Subject: [PATCH 09/71] Rename year context to rebateYear

---
 .../src/contexts/{year.tsx => rebateYear.tsx} | 19 ++++++++++---------
 app/client/src/index.tsx                      |  6 +++---
 app/client/src/routes/allRebates.tsx          | 10 +++++++---
 3 files changed, 20 insertions(+), 15 deletions(-)
 rename app/client/src/contexts/{year.tsx => rebateYear.tsx} (75%)

diff --git a/app/client/src/contexts/year.tsx b/app/client/src/contexts/rebateYear.tsx
similarity index 75%
rename from app/client/src/contexts/year.tsx
rename to app/client/src/contexts/rebateYear.tsx
index 327d5044..151d2fdf 100644
--- a/app/client/src/contexts/year.tsx
+++ b/app/client/src/contexts/rebateYear.tsx
@@ -42,7 +42,7 @@ function reducer(state: State, action: Action): State {
   }
 }
 
-export function YearProvider({ children }: Props) {
+export function RebateYearProvider({ children }: Props) {
   const initialState: State = {
     rebateYear: "2022",
   };
@@ -59,24 +59,25 @@ export function YearProvider({ children }: Props) {
 }
 
 /**
- * Returns state stored in `YearProvider` context component.
+ * Returns state stored in `RebateYearProvider` context component.
  */
-export function useYearState() {
+export function useRebateYearState() {
   const context = useContext(StateContext);
   if (context === undefined) {
-    throw new Error("useYearState must be called within an YearProvider");
+    const message = `useRebateYearState must be called within an RebateYearProvider`;
+    throw new Error(message);
   }
   return context;
 }
 
 /**
  * Custom hook that returns `dispatch` method for dispatching actions to update
- * state stored in `DialogProvider` context component.
+ * state stored in `RebateYearProvider` context component.
  */
-function useYearDispatch() {
+function useRebateYearDispatch() {
   const context = useContext(DispatchContext);
   if (context === undefined) {
-    const message = `useYearDispatch must be used within a YearProvider`;
+    const message = `useRebateYearDispatch must be used within a RebateYearProvider`;
     throw new Error(message);
   }
   return context;
@@ -86,8 +87,8 @@ function useYearDispatch() {
  * Custom hook that returns a function to dispatch an action to set the rebate
  * year.
  */
-export function useYearActions() {
-  const dispatch = useYearDispatch();
+export function useRebateYearActions() {
+  const dispatch = useRebateYearDispatch();
 
   return {
     setRebateYear(rebateYear: RebateYear) {
diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx
index f7151b8e..4fba5dc1 100644
--- a/app/client/src/index.tsx
+++ b/app/client/src/index.tsx
@@ -7,7 +7,7 @@ import { ErrorBoundary } from "components/errorBoundary";
 import { App } from "components/app";
 import { DialogProvider } from "contexts/dialog";
 import { NotificationsProvider } from "contexts/notifications";
-import { YearProvider } from "contexts/year";
+import { RebateYearProvider } from "contexts/rebateYear";
 import "./tailwind-preflight.css";
 import "./styles.css";
 
@@ -41,9 +41,9 @@ function Index() {
         <ErrorBoundary>
           <DialogProvider>
             <NotificationsProvider>
-              <YearProvider>
+              <RebateYearProvider>
                 <App />
-              </YearProvider>
+              </RebateYearProvider>
             </NotificationsProvider>
           </DialogProvider>
         </ErrorBoundary>
diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index 0e8da131..d475344e 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -20,7 +20,11 @@ import { Message } from "components/message";
 import { MarkdownContent } from "components/markdownContent";
 import { TextWithTooltip } from "components/tooltip";
 import { useNotificationsActions } from "contexts/notifications";
-import { RebateYear, useYearState, useYearActions } from "contexts/year";
+import {
+  RebateYear,
+  useRebateYearState,
+  useRebateYearActions,
+} from "contexts/rebateYear";
 
 const defaultTableRowClassNames = "bg-gray-5";
 const highlightedTableRowClassNames = "bg-primary-lighter";
@@ -789,8 +793,8 @@ export function AllRebates() {
   const submissionsQueries = useSubmissionsQueries();
   const rebates = useRebates();
 
-  const { rebateYear } = useYearState();
-  const { setRebateYear } = useYearActions();
+  const { rebateYear } = useRebateYearState();
+  const { setRebateYear } = useRebateYearActions();
 
   const applicationFormOpen = csbData
     ? csbData.submissionPeriodOpen["2022"].frf // TODO

From 59889a76eae2242ecf52f714330725163e3ace78 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 20 Jul 2023 16:44:39 -0400
Subject: [PATCH 10/71] Update allRebates to use rebateYear to determine
 whether each form's enrollment period is open or closed

---
 app/client/src/routes/allRebates.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index d475344e..76e70991 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -59,10 +59,11 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
   const { application, paymentRequest, closeOut } = rebate;
 
   const csbData = useCsbData();
+  const { rebateYear } = useRebateYearState();
 
   if (!csbData) return null;
 
-  const applicationFormOpen = csbData.submissionPeriodOpen["2022"].frf; // TODO
+  const applicationFormOpen = csbData.submissionPeriodOpen[rebateYear].frf;
 
   const {
     applicantUEI,
@@ -316,6 +317,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
   const csbData = useCsbData();
   const bapSamData = useBapSamData();
   const { displayErrorNotification } = useNotificationsActions();
+  const { rebateYear } = useRebateYearState();
 
   /**
    * Stores when data is being posted to the server, so a loading indicator can
@@ -326,7 +328,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
 
   if (!csbData || !bapSamData) return null;
 
-  const paymentRequestFormOpen = csbData.submissionPeriodOpen["2022"].prf; // TODO
+  const paymentRequestFormOpen = csbData.submissionPeriodOpen[rebateYear].prf;
 
   const applicationSelected = application.bap?.status === "Accepted";
 
@@ -555,6 +557,7 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
   const csbData = useCsbData();
   const bapSamData = useBapSamData();
   const { displayErrorNotification } = useNotificationsActions();
+  const { rebateYear } = useRebateYearState();
 
   /**
    * Stores when data is being posted to the server, so a loading indicator can
@@ -565,7 +568,7 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
 
   if (!csbData || !bapSamData) return null;
 
-  const closeOutFormOpen = csbData.submissionPeriodOpen["2022"].cof; // TODO
+  const closeOutFormOpen = csbData.submissionPeriodOpen[rebateYear].cof;
 
   const paymentRequestFundingApproved =
     paymentRequest.bap?.status === "Accepted";
@@ -792,12 +795,11 @@ export function AllRebates() {
   const bapSamData = useBapSamData();
   const submissionsQueries = useSubmissionsQueries();
   const rebates = useRebates();
-
   const { rebateYear } = useRebateYearState();
   const { setRebateYear } = useRebateYearActions();
 
   const applicationFormOpen = csbData
-    ? csbData.submissionPeriodOpen["2022"].frf // TODO
+    ? csbData.submissionPeriodOpen[rebateYear].frf
     : false;
 
   const btnClassNames =

From 78d33a8309b5313d13b90cc0a6ba9b7aa0bb5a2a Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 20 Jul 2023 16:56:38 -0400
Subject: [PATCH 11/71] Update form components to use rebate year in
 determining if form's open enrollment is open or closed

---
 app/client/src/routes/applicationForm.tsx    | 4 +++-
 app/client/src/routes/closeOutForm.tsx       | 4 +++-
 app/client/src/routes/newApplicationForm.tsx | 4 +++-
 app/client/src/routes/paymentRequestForm.tsx | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index 271e747a..f007dd8f 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -25,6 +25,7 @@ import { Message } from "components/message";
 import { MarkdownContent } from "components/markdownContent";
 import { useDialogActions } from "contexts/dialog";
 import { useNotificationsActions } from "contexts/notifications";
+import { useRebateYearState } from "contexts/rebateYear";
 
 type ServerResponse =
   | {
@@ -129,6 +130,7 @@ function UserApplicationForm(props: { email: string }) {
     displayErrorNotification,
     dismissNotification,
   } = useNotificationsActions();
+  const { rebateYear } = useRebateYearState();
 
   const submissionsQueries = useSubmissionsQueries();
   const rebates = useRebates();
@@ -314,7 +316,7 @@ function UserApplicationForm(props: { email: string }) {
     return null;
   }
 
-  const applicationFormOpen = csbData.submissionPeriodOpen["2022"].frf; // TODO
+  const applicationFormOpen = csbData.submissionPeriodOpen[rebateYear].frf;
 
   const formIsReadOnly =
     (submission.state === "submitted" || !applicationFormOpen) &&
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index d11f8b69..d773e2ec 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -24,6 +24,7 @@ import { Loading } from "components/loading";
 import { Message } from "components/message";
 import { MarkdownContent } from "components/markdownContent";
 import { useNotificationsActions } from "contexts/notifications";
+import { useRebateYearState } from "contexts/rebateYear";
 
 type ServerResponse =
   | {
@@ -122,6 +123,7 @@ function UserCloseOutForm(props: { email: string }) {
     displayErrorNotification,
     dismissNotification,
   } = useNotificationsActions();
+  const { rebateYear } = useRebateYearState();
 
   const submissionsQueries = useSubmissionsQueries();
   const rebates = useRebates();
@@ -189,7 +191,7 @@ function UserCloseOutForm(props: { email: string }) {
         bap: rebate.closeOut.bap,
       });
 
-  const closeOutFormOpen = csbData.submissionPeriodOpen["2022"].cof; // TODO
+  const closeOutFormOpen = csbData.submissionPeriodOpen[rebateYear].cof;
 
   const formIsReadOnly =
     (submission.state === "submitted" || !closeOutFormOpen) &&
diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/newApplicationForm.tsx
index 45759601..29a2dc90 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/newApplicationForm.tsx
@@ -17,6 +17,7 @@ import { Loading, LoadingButtonIcon } from "components/loading";
 import { Message } from "components/message";
 import { MarkdownContent } from "components/markdownContent";
 import { TextWithTooltip } from "components/tooltip";
+import { useRebateYearState } from "contexts/rebateYear";
 
 export function NewApplicationForm() {
   const navigate = useNavigate();
@@ -25,6 +26,7 @@ export function NewApplicationForm() {
   const content = useContentData();
   const csbData = useCsbData();
   const bapSamData = useBapSamData();
+  const { rebateYear } = useRebateYearState();
 
   const [errorMessage, setErrorMessage] = useState<{
     displayed: boolean;
@@ -45,7 +47,7 @@ export function NewApplicationForm() {
     return <Loading />;
   }
 
-  const applicationFormOpen = csbData.submissionPeriodOpen["2022"].frf; // TODO
+  const applicationFormOpen = csbData.submissionPeriodOpen[rebateYear].frf;
 
   const activeSamEntities = bapSamData.entities.filter((entity) => {
     return entity.ENTITY_STATUS__c === "Active";
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index 7484f8d3..3df9868f 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -24,6 +24,7 @@ import { Loading } from "components/loading";
 import { Message } from "components/message";
 import { MarkdownContent } from "components/markdownContent";
 import { useNotificationsActions } from "contexts/notifications";
+import { useRebateYearState } from "contexts/rebateYear";
 
 type ServerResponse =
   | {
@@ -122,6 +123,7 @@ function UserPaymentRequestForm(props: { email: string }) {
     displayErrorNotification,
     dismissNotification,
   } = useNotificationsActions();
+  const { rebateYear } = useRebateYearState();
 
   const submissionsQueries = useSubmissionsQueries();
   const rebates = useRebates();
@@ -196,7 +198,7 @@ function UserPaymentRequestForm(props: { email: string }) {
         bap: rebate.paymentRequest.bap,
       });
 
-  const paymentRequestFormOpen = csbData.submissionPeriodOpen["2022"].prf; // TODO
+  const paymentRequestFormOpen = csbData.submissionPeriodOpen[rebateYear].prf;
 
   const formIsReadOnly =
     applicationNeedsEdits ||

From 712ebe3f2f51285a309438bdfc51c4944fbfa5c8 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 27 Jul 2023 10:32:10 -0400
Subject: [PATCH 12/71] Move submissionPeriodOpen into shared config object in
 api file and use it in checkFormSubmissionPeriodAndBapStatus() function

---
 app/client/src/routes/applicationForm.tsx    |  2 +-
 app/client/src/routes/closeOutForm.tsx       |  2 +-
 app/client/src/routes/paymentRequestForm.tsx |  9 +-
 app/server/app/routes/api.js                 | 91 +++++++++++++-------
 4 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index f007dd8f..e2be527e 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -65,7 +65,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
          */
         Formio.Providers.providers.storage.s3 = function (formio: any) {
           const s3Formio = cloneDeep(formio);
-          s3Formio.formUrl = `${serverUrl}/api/s3/application/${mongoId}/${comboKey}`;
+          s3Formio.formUrl = `${serverUrl}/api/s3/frf/${mongoId}/${comboKey}`;
           return s3(s3Formio);
         };
 
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index d773e2ec..617c395f 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -65,7 +65,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
          */
         Formio.Providers.providers.storage.s3 = function (formio: any) {
           const s3Formio = cloneDeep(formio);
-          s3Formio.formUrl = `${serverUrl}/api/s3/close-out/${mongoId}/${comboKey}`;
+          s3Formio.formUrl = `${serverUrl}/api/s3/cof/${mongoId}/${comboKey}`;
           return s3(s3Formio);
         };
 
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index 3df9868f..ed775383 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -65,7 +65,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
          */
         Formio.Providers.providers.storage.s3 = function (formio: any) {
           const s3Formio = cloneDeep(formio);
-          s3Formio.formUrl = `${serverUrl}/api/s3/payment-request/${mongoId}/${comboKey}`;
+          s3Formio.formUrl = `${serverUrl}/api/s3/prf/${mongoId}/${comboKey}`;
           return s3(s3Formio);
         };
 
@@ -398,6 +398,13 @@ function UserPaymentRequestForm(props: { email: string }) {
             // to the form (ignoring current user fields)
             const currentData = { ...data };
             const submittedData = { ...lastSuccesfullySubmittedData.current };
+
+            // NOTE: `newBusDeliveryDate` is causing the dirty check to fail
+            console.log({
+              current: (currentData.busInfo as unknown[])[0], // newBusDeliveryDate: ""
+              submitted: (submittedData.busInfo as unknown[])[0], // newBusDeliveryDate: null
+            });
+
             delete currentData.hidden_current_user_email;
             delete currentData.hidden_current_user_title;
             delete currentData.hidden_current_user_name;
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 70eab91b..ad67a6a0 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -40,9 +40,21 @@ const frf2022Open = CSB_FRF_2022_OPEN === "true";
 const prf2022Open = CSB_PRF_2022_OPEN === "true";
 const cof2022Open = CSB_COF_2022_OPEN === "true";
 
-const frf2023Open = CSB_FRF_2023_OPEN === "true";
-const prf2023Open = CSB_PRF_2023_OPEN === "true";
-const cof2023Open = CSB_COF_2023_OPEN === "true";
+/**
+ * Stores whether the submission period is open for each form by rebate year.
+ */
+const submissionPeriodOpen = {
+  2022: {
+    frf: CSB_FRF_2022_OPEN === "true",
+    prf: CSB_PRF_2022_OPEN === "true",
+    cof: CSB_COF_2022_OPEN === "true",
+  },
+  2023: {
+    frf: CSB_FRF_2023_OPEN === "true",
+    prf: CSB_PRF_2023_OPEN === "true",
+    cof: CSB_COF_2023_OPEN === "true",
+  },
+};
 
 /**
  * Returns a resolved or rejected promise, depending on if the given form's
@@ -51,23 +63,21 @@ const cof2023Open = CSB_COF_2023_OPEN === "true";
  * returned from the BAP).
  *
  * @param {Object} param
- * @param {'application' | 'payment-request' | 'close-out'} param.formType
+ * @param {'2022' | '2023'} param.rebateYear
+ * @param {'frf' | 'prf' | 'cof'} param.formType
  * @param {string} param.mongoId
  * @param {string} param.comboKey
  * @param {express.Request} param.req
  */
 function checkFormSubmissionPeriodAndBapStatus({
+  rebateYear,
   formType,
   mongoId,
   comboKey,
   req,
 }) {
   /** Form submission period is open, so continue. */
-  if (
-    (formType === "application" && frf2022Open) ||
-    (formType === "payment-request" && prf2022Open) ||
-    (formType === "close-out" && cof2023Open)
-  ) {
+  if (submissionPeriodOpen[rebateYear][formType]) {
     return Promise.resolve();
   }
 
@@ -76,11 +86,11 @@ function checkFormSubmissionPeriodAndBapStatus({
     const submission = submissions.find((s) => s.CSB_Form_ID__c === mongoId);
 
     const statusField =
-      formType === "application"
+      formType === "frf"
         ? "CSB_Funding_Request_Status__c"
-        : formType === "payment-request"
+        : formType === "prf"
         ? "CSB_Payment_Request_Status__c"
-        : formType === "close-out"
+        : formType === "cof"
         ? "CSB_Closeout_Request_Status__c"
         : null;
 
@@ -174,20 +184,7 @@ router.get("/user", (req, res) => {
 
 // --- get CSB app specific data (open enrollment status, etc.)
 router.get("/csb-data", (req, res) => {
-  return res.json({
-    submissionPeriodOpen: {
-      2022: {
-        frf: frf2022Open,
-        prf: prf2022Open,
-        cof: cof2022Open,
-      },
-      2023: {
-        frf: frf2023Open,
-        prf: prf2023Open,
-        cof: cof2023Open,
-      },
-    },
-  });
+  return res.json({ submissionPeriodOpen });
 });
 
 // --- get user's SAM.gov data from EPA's Business Automation Platform (BAP)
@@ -279,8 +276,15 @@ router.post(
     const { bapComboKeys, body } = req;
     const { mail } = req.user;
     const { formType, mongoId, comboKey } = req.params;
+    const rebateYear = "2022"; // TODO
 
-    checkFormSubmissionPeriodAndBapStatus({ formType, mongoId, comboKey, req })
+    checkFormSubmissionPeriodAndBapStatus({
+      rebateYear,
+      formType,
+      mongoId,
+      comboKey,
+      req,
+    })
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
           const logMessage = `User with email '${mail}' attempted to upload a file without a matching BAP combo key.`;
@@ -447,9 +451,16 @@ router.post(
     const { mongoId } = req.params;
     const submission = req.body;
     const comboKey = submission.data?.bap_hidden_entity_combo_key;
-    const formType = "application";
+    const formType = "frf";
+    const rebateYear = "2022"; // TODO
 
-    checkFormSubmissionPeriodAndBapStatus({ formType, mongoId, comboKey, req })
+    checkFormSubmissionPeriodAndBapStatus({
+      rebateYear,
+      formType,
+      mongoId,
+      comboKey,
+      req,
+    })
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
           const logMessage = `User with email '${mail}' attempted to update Application form submission '${mongoId}' without a matching BAP combo key.`;
@@ -725,9 +736,16 @@ router.post(
     const { rebateId } = req.params; // CSB Rebate ID (6 digits)
     const { mongoId, submission } = body;
     const comboKey = submission.data?.bap_hidden_entity_combo_key;
-    const formType = "payment-request";
+    const formType = "prf";
+    const rebateYear = "2022"; // TODO
 
-    checkFormSubmissionPeriodAndBapStatus({ formType, mongoId, comboKey, req })
+    checkFormSubmissionPeriodAndBapStatus({
+      rebateYear,
+      formType,
+      mongoId,
+      comboKey,
+      req,
+    })
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
           const logMessage = `User with email '${mail}' attempted to update Payment Request form submission '${rebateId}' without a matching BAP combo key.`;
@@ -1138,9 +1156,16 @@ router.post(
     const { rebateId } = req.params; // CSB Rebate ID (6 digits)
     const { mongoId, submission } = body;
     const comboKey = submission.data?.bap_hidden_entity_combo_key;
-    const formType = "close-out";
+    const formType = "cof";
+    const rebateYear = "2022"; // TODO
 
-    checkFormSubmissionPeriodAndBapStatus({ formType, mongoId, comboKey, req })
+    checkFormSubmissionPeriodAndBapStatus({
+      rebateYear,
+      formType,
+      mongoId,
+      comboKey,
+      req,
+    })
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
           const logMessage = `User with email '${mail}' attempted to update Close Out form submission '${rebateId}' without a matching BAP combo key.`;

From 50fb1364e73feae95fce8596f6cf4d3769713dde Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 27 Jul 2023 11:26:07 -0400
Subject: [PATCH 13/71] Rename csb-data api route (and react-query related
 code) to config

---
 app/client/src/components/userDashboard.tsx  |  4 +--
 app/client/src/routes/allRebates.tsx         | 27 ++++++++++----------
 app/client/src/routes/applicationForm.tsx    |  8 +++---
 app/client/src/routes/closeOutForm.tsx       |  8 +++---
 app/client/src/routes/newApplicationForm.tsx |  8 +++---
 app/client/src/routes/paymentRequestForm.tsx |  9 ++++---
 app/client/src/utilities.tsx                 | 14 +++++-----
 app/server/app/routes/api.js                 |  4 +--
 docs/csb-openapi.json                        |  4 +--
 9 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/app/client/src/components/userDashboard.tsx b/app/client/src/components/userDashboard.tsx
index b1b8d02e..873715e8 100644
--- a/app/client/src/components/userDashboard.tsx
+++ b/app/client/src/components/userDashboard.tsx
@@ -5,7 +5,7 @@ import uswds from "@formio/uswds";
 import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrlForHrefs, formioBaseUrl, formioProjectUrl } from "../config";
-import { useCsbQuery, useBapSamQuery, useBapSamData } from "../utilities";
+import { useConfigQuery, useBapSamQuery, useBapSamData } from "../utilities";
 import { useHelpdeskAccess } from "components/app";
 import { Loading } from "components/loading";
 import { useDialogActions } from "contexts/dialog";
@@ -54,7 +54,7 @@ export function UserDashboard(props: { email: string }) {
   const { pathname } = useLocation();
   const navigate = useNavigate();
 
-  useCsbQuery();
+  useConfigQuery();
   useBapSamQuery();
 
   const bapSamData = useBapSamData();
diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index 76e70991..7d76cb4b 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -8,7 +8,7 @@ import {
   Rebate,
   postData,
   useContentData,
-  useCsbData,
+  useConfigData,
   useBapSamData,
   useSubmissionsQueries,
   useRebates,
@@ -58,12 +58,12 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
   const { rebate } = props;
   const { application, paymentRequest, closeOut } = rebate;
 
-  const csbData = useCsbData();
+  const configData = useConfigData();
   const { rebateYear } = useRebateYearState();
 
-  if (!csbData) return null;
+  if (!configData) return null;
 
-  const applicationFormOpen = csbData.submissionPeriodOpen[rebateYear].frf;
+  const applicationFormOpen = configData.submissionPeriodOpen[rebateYear].frf;
 
   const {
     applicantUEI,
@@ -314,7 +314,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
   const navigate = useNavigate();
   const { email } = useOutletContext<{ email: string }>();
 
-  const csbData = useCsbData();
+  const configData = useConfigData();
   const bapSamData = useBapSamData();
   const { displayErrorNotification } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
@@ -326,9 +326,10 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
    */
   const [dataIsPosting, setDataIsPosting] = useState(false);
 
-  if (!csbData || !bapSamData) return null;
+  if (!configData || !bapSamData) return null;
 
-  const paymentRequestFormOpen = csbData.submissionPeriodOpen[rebateYear].prf;
+  const paymentRequestFormOpen =
+    configData.submissionPeriodOpen[rebateYear].prf;
 
   const applicationSelected = application.bap?.status === "Accepted";
 
@@ -554,7 +555,7 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
   const navigate = useNavigate();
   const { email } = useOutletContext<{ email: string }>();
 
-  const csbData = useCsbData();
+  const configData = useConfigData();
   const bapSamData = useBapSamData();
   const { displayErrorNotification } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
@@ -566,9 +567,9 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
    */
   const [dataIsPosting, setDataIsPosting] = useState(false);
 
-  if (!csbData || !bapSamData) return null;
+  if (!configData || !bapSamData) return null;
 
-  const closeOutFormOpen = csbData.submissionPeriodOpen[rebateYear].cof;
+  const closeOutFormOpen = configData.submissionPeriodOpen[rebateYear].cof;
 
   const paymentRequestFundingApproved =
     paymentRequest.bap?.status === "Accepted";
@@ -791,15 +792,15 @@ function NewApplicationIconText() {
 
 export function AllRebates() {
   const content = useContentData();
-  const csbData = useCsbData();
+  const configData = useConfigData();
   const bapSamData = useBapSamData();
   const submissionsQueries = useSubmissionsQueries();
   const rebates = useRebates();
   const { rebateYear } = useRebateYearState();
   const { setRebateYear } = useRebateYearActions();
 
-  const applicationFormOpen = csbData
-    ? csbData.submissionPeriodOpen[rebateYear].frf
+  const applicationFormOpen = configData
+    ? configData.submissionPeriodOpen[rebateYear].frf
     : false;
 
   const btnClassNames =
diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index e2be527e..54f70978 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -13,7 +13,7 @@ import {
   getData,
   postData,
   useContentData,
-  useCsbData,
+  useConfigData,
   useBapSamData,
   useSubmissionsQueries,
   useRebates,
@@ -121,7 +121,7 @@ function UserApplicationForm(props: { email: string }) {
   const { id: mongoId } = useParams<"id">(); // MongoDB ObjectId string
 
   const content = useContentData();
-  const csbData = useCsbData();
+  const configData = useConfigData();
   const bapSamData = useBapSamData();
   const { displayDialog } = useDialogActions();
   const {
@@ -169,7 +169,7 @@ function UserApplicationForm(props: { email: string }) {
    */
   const lastSuccesfullySubmittedData = useRef<{ [field: string]: unknown }>({});
 
-  if (!csbData || !bapSamData) {
+  if (!configData || !bapSamData) {
     return <Loading />;
   }
 
@@ -316,7 +316,7 @@ function UserApplicationForm(props: { email: string }) {
     return null;
   }
 
-  const applicationFormOpen = csbData.submissionPeriodOpen[rebateYear].frf;
+  const applicationFormOpen = configData.submissionPeriodOpen[rebateYear].frf;
 
   const formIsReadOnly =
     (submission.state === "submitted" || !applicationFormOpen) &&
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index 617c395f..f9491893 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -13,7 +13,7 @@ import {
   getData,
   postData,
   useContentData,
-  useCsbData,
+  useConfigData,
   useBapSamData,
   useSubmissionsQueries,
   useRebates,
@@ -116,7 +116,7 @@ function UserCloseOutForm(props: { email: string }) {
   const { id: rebateId } = useParams<"id">(); // CSB Rebate ID (6 digits)
 
   const content = useContentData();
-  const csbData = useCsbData();
+  const configData = useConfigData();
   const bapSamData = useBapSamData();
   const {
     displaySuccessNotification,
@@ -162,7 +162,7 @@ function UserCloseOutForm(props: { email: string }) {
    */
   const lastSuccesfullySubmittedData = useRef<{ [field: string]: unknown }>({});
 
-  if (!csbData || !bapSamData) {
+  if (!configData || !bapSamData) {
     return <Loading />;
   }
 
@@ -191,7 +191,7 @@ function UserCloseOutForm(props: { email: string }) {
         bap: rebate.closeOut.bap,
       });
 
-  const closeOutFormOpen = csbData.submissionPeriodOpen[rebateYear].cof;
+  const closeOutFormOpen = configData.submissionPeriodOpen[rebateYear].cof;
 
   const formIsReadOnly =
     (submission.state === "submitted" || !closeOutFormOpen) &&
diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/newApplicationForm.tsx
index 29a2dc90..13b12684 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/newApplicationForm.tsx
@@ -9,7 +9,7 @@ import {
   FormioApplicationSubmission,
   postData,
   useContentData,
-  useCsbData,
+  useConfigData,
   useBapSamData,
   getUserInfo,
 } from "../utilities";
@@ -24,7 +24,7 @@ export function NewApplicationForm() {
   const { email } = useOutletContext<{ email: string }>();
 
   const content = useContentData();
-  const csbData = useCsbData();
+  const configData = useConfigData();
   const bapSamData = useBapSamData();
   const { rebateYear } = useRebateYearState();
 
@@ -43,11 +43,11 @@ export function NewApplicationForm() {
    */
   const [postingDataId, setPostingDataId] = useState("0");
 
-  if (!csbData || !bapSamData) {
+  if (!configData || !bapSamData) {
     return <Loading />;
   }
 
-  const applicationFormOpen = csbData.submissionPeriodOpen[rebateYear].frf;
+  const applicationFormOpen = configData.submissionPeriodOpen[rebateYear].frf;
 
   const activeSamEntities = bapSamData.entities.filter((entity) => {
     return entity.ENTITY_STATUS__c === "Active";
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index ed775383..975d4c2f 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -13,7 +13,7 @@ import {
   getData,
   postData,
   useContentData,
-  useCsbData,
+  useConfigData,
   useBapSamData,
   useSubmissionsQueries,
   useRebates,
@@ -116,7 +116,7 @@ function UserPaymentRequestForm(props: { email: string }) {
   const { id: rebateId } = useParams<"id">(); // CSB Rebate ID (6 digits)
 
   const content = useContentData();
-  const csbData = useCsbData();
+  const configData = useConfigData();
   const bapSamData = useBapSamData();
   const {
     displaySuccessNotification,
@@ -162,7 +162,7 @@ function UserPaymentRequestForm(props: { email: string }) {
    */
   const lastSuccesfullySubmittedData = useRef<{ [field: string]: unknown }>({});
 
-  if (!csbData || !bapSamData) {
+  if (!configData || !bapSamData) {
     return <Loading />;
   }
 
@@ -198,7 +198,8 @@ function UserPaymentRequestForm(props: { email: string }) {
         bap: rebate.paymentRequest.bap,
       });
 
-  const paymentRequestFormOpen = csbData.submissionPeriodOpen[rebateYear].prf;
+  const paymentRequestFormOpen =
+    configData.submissionPeriodOpen[rebateYear].prf;
 
   const formIsReadOnly =
     applicationNeedsEdits ||
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index d2dd4a3c..3214f0d4 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -254,19 +254,19 @@ export function useUserData() {
   return queryClient.getQueryData<UserData>(["user"]);
 }
 
-/** Custom hook to fetch CSB data */
-export function useCsbQuery() {
+/** Custom hook to fetch CSB config */
+export function useConfigQuery() {
   return useQuery({
-    queryKey: ["csb-data"],
-    queryFn: () => getData<CsbData>(`${serverUrl}/api/csb-data`),
+    queryKey: ["config"],
+    queryFn: () => getData<CsbData>(`${serverUrl}/api/config`),
     refetchOnWindowFocus: false,
   });
 }
 
-/** Custom hook that returns cached fetched CSB data */
-export function useCsbData() {
+/** Custom hook that returns cached fetched CSB config */
+export function useConfigData() {
   const queryClient = useQueryClient();
-  return queryClient.getQueryData<CsbData>(["csb-data"]);
+  return queryClient.getQueryData<CsbData>(["config"]);
 }
 
 /** Custom hook to fetch BAP SAM.gov data */
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index ad67a6a0..c35cf108 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -182,8 +182,8 @@ router.get("/user", (req, res) => {
   return res.json({ mail, memberof, exp });
 });
 
-// --- get CSB app specific data (open enrollment status, etc.)
-router.get("/csb-data", (req, res) => {
+// --- get CSB app specific configuration (form open enrollment status, etc.)
+router.get("/config", (req, res) => {
   return res.json({ submissionPeriodOpen });
 });
 
diff --git a/docs/csb-openapi.json b/docs/csb-openapi.json
index 529e478c..eb4d0dc6 100644
--- a/docs/csb-openapi.json
+++ b/docs/csb-openapi.json
@@ -308,9 +308,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/csb-data": {
+    "/api/config": {
       "get": {
-        "summary": "/api/csb-data",
+        "summary": "/api/config",
         "responses": {
           "200": {
             "description": "OK",

From 334996868da801e2576ed74467028a1ac78bf878 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Fri, 28 Jul 2023 11:51:35 -0400
Subject: [PATCH 14/71] Update s3 endpoint to include rebateYear as well (for
 determining if the post should be allowed or not)

---
 app/client/src/routes/applicationForm.tsx    |  2 +-
 app/client/src/routes/closeOutForm.tsx       |  2 +-
 app/client/src/routes/paymentRequestForm.tsx |  2 +-
 app/server/app/routes/api.js                 | 27 ++++++++++++--------
 docs/csb-openapi.json                        | 22 +++++++++++++---
 5 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index 54f70978..f13f09b1 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -65,7 +65,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
          */
         Formio.Providers.providers.storage.s3 = function (formio: any) {
           const s3Formio = cloneDeep(formio);
-          s3Formio.formUrl = `${serverUrl}/api/s3/frf/${mongoId}/${comboKey}`;
+          s3Formio.formUrl = `${serverUrl}/api/s3/2022/frf/${mongoId}/${comboKey}`;
           return s3(s3Formio);
         };
 
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index f9491893..b87d12c0 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -65,7 +65,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
          */
         Formio.Providers.providers.storage.s3 = function (formio: any) {
           const s3Formio = cloneDeep(formio);
-          s3Formio.formUrl = `${serverUrl}/api/s3/cof/${mongoId}/${comboKey}`;
+          s3Formio.formUrl = `${serverUrl}/api/s3/2022/cof/${mongoId}/${comboKey}`;
           return s3(s3Formio);
         };
 
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index 975d4c2f..2f524b95 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -65,7 +65,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
          */
         Formio.Providers.providers.storage.s3 = function (formio: any) {
           const s3Formio = cloneDeep(formio);
-          s3Formio.formUrl = `${serverUrl}/api/s3/prf/${mongoId}/${comboKey}`;
+          s3Formio.formUrl = `${serverUrl}/api/s3/2022/prf/${mongoId}/${comboKey}`;
           return s3(s3Formio);
         };
 
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index c35cf108..768ec951 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -239,7 +239,7 @@ router.get("/bap-form-submissions", storeBapComboKeys, (req, res) => {
 
 // --- download Formio S3 file metadata
 router.get(
-  "/s3/:formType/:mongoId/:comboKey/storage/s3",
+  "/s3/:rebateYear/:formType/:mongoId/:comboKey/storage/s3",
   storeBapComboKeys,
   (req, res) => {
     const { bapComboKeys, query } = req;
@@ -247,7 +247,9 @@ router.get(
     const { comboKey } = req.params;
 
     if (!bapComboKeys.includes(comboKey)) {
-      const logMessage = `User with email '${mail}' attempted to download a file without a matching BAP combo key.`;
+      const logMessage =
+        `User with email '${mail}' attempted to download a file ` +
+        `without a matching BAP combo key.`;
       log({ level: "error", message: logMessage, req });
 
       const errorStatus = 401;
@@ -270,13 +272,12 @@ router.get(
 
 // --- upload Formio S3 file metadata
 router.post(
-  "/s3/:formType/:mongoId/:comboKey/storage/s3",
+  "/s3/:rebateYear/:formType/:mongoId/:comboKey/storage/s3",
   storeBapComboKeys,
   (req, res) => {
     const { bapComboKeys, body } = req;
     const { mail } = req.user;
-    const { formType, mongoId, comboKey } = req.params;
-    const rebateYear = "2022"; // TODO
+    const { rebateYear, formType, mongoId, comboKey } = req.params;
 
     checkFormSubmissionPeriodAndBapStatus({
       rebateYear,
@@ -287,7 +288,9 @@ router.post(
     })
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
-          const logMessage = `User with email '${mail}' attempted to upload a file without a matching BAP combo key.`;
+          const logMessage =
+            `User with email '${mail}' attempted to upload a file ` +
+            `without a matching BAP combo key.`;
           log({ level: "error", message: logMessage, req });
 
           const errorStatus = 401;
@@ -308,19 +311,21 @@ router.post(
       })
       .catch((error) => {
         const formName =
-          formType === "application"
+          formType === "frf"
             ? "CSB Application"
-            : formType === "payment-request"
+            : formType === "prf"
             ? "CSB Payment Request"
-            : formType === "close-out"
+            : formType === "cof"
             ? "CSB Close Out"
             : "CSB";
 
-        const logMessage = `User with email '${mail}' attempted to upload a file when the ${formName} form enrollment period was closed.`;
+        const logMessage =
+          `User with email '${mail}' attempted to upload a file when the ` +
+          `${rebateYear} ${formName} form enrollment period was closed.`;
         log({ level: "error", message: logMessage, req });
 
         const errorStatus = 400;
-        const errorMessage = `${formName} form enrollment period is closed.`;
+        const errorMessage = `${rebateYear} ${formName} form enrollment period is closed.`;
         return res.status(errorStatus).json({ message: errorMessage });
       });
   }
diff --git a/docs/csb-openapi.json b/docs/csb-openapi.json
index eb4d0dc6..1046cc3c 100644
--- a/docs/csb-openapi.json
+++ b/docs/csb-openapi.json
@@ -402,9 +402,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/s3/{formType}/{mongoId}/{comboKey}/storage/s3": {
+    "/api/s3/{rebateYear}/{formType}/{mongoId}/{comboKey}/storage/s3": {
       "get": {
-        "summary": "/api/s3/{formType}/{mongoId}/{comboKey}/storage/s3",
+        "summary": "/api/s3/{rebateYear}/{formType}/{mongoId}/{comboKey}/storage/s3",
         "responses": {
           "200": {
             "description": "OK"
@@ -412,6 +412,14 @@
         },
         "tags": [],
         "parameters": [
+          {
+            "name": "rebateYear",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
           {
             "name": "formType",
             "in": "path",
@@ -440,7 +448,7 @@
         ]
       },
       "post": {
-        "summary": "/api/s3/{formType}/{mongoId}/{comboKey}/storage/s3",
+        "summary": "/api/s3/{rebateYear}/{formType}/{mongoId}/{comboKey}/storage/s3",
         "responses": {
           "200": {
             "description": "OK"
@@ -448,6 +456,14 @@
         },
         "tags": [],
         "parameters": [
+          {
+            "name": "rebateYear",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
           {
             "name": "formType",
             "in": "path",

From f32257a0cf78c18165a6ea263a597e6b2b2f4bbd Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Mon, 31 Jul 2023 09:19:56 -0400
Subject: [PATCH 15/71] Format logged messages in api file

---
 app/server/app/routes/api.js | 56 +++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 768ec951..6add7b05 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -201,7 +201,9 @@ router.get("/bap-sam-data", (req, res) => {
        * SAM.gov data.
        */
       if (!adminOrHelpdeskUser && entities?.length === 0) {
-        const logMessage = `User with email '${mail}' tried to use app without any associated SAM records.`;
+        const logMessage =
+          `User with email '${mail}' tried to use app ` +
+          `without any associated SAM.gov records.`;
         log({ level: "error", message: logMessage, req });
 
         return res.json({
@@ -378,7 +380,9 @@ router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
   }
 
   if (!bapComboKeys.includes(comboKey)) {
-    const logMessage = `User with email '${mail}' attempted to post a new Application form submission without a matching BAP combo key.`;
+    const logMessage =
+      `User with email '${mail}' attempted to post a new Application form submission ` +
+      `without a matching BAP combo key.`;
     log({ level: "error", message: logMessage, req });
 
     const errorStatus = 401;
@@ -420,7 +424,9 @@ router.get(
         const comboKey = submission.data.bap_hidden_entity_combo_key;
 
         if (!bapComboKeys.includes(comboKey)) {
-          const logMessage = `User with email '${mail}' attempted to access Application form submission '${mongoId}' that they do not have access to.`;
+          const logMessage =
+            `User with email '${mail}' attempted to access Application form submission '${mongoId}' ` +
+            `that they do not have access to.`;
           log({ level: "warn", message: logMessage, req });
 
           return res.json({
@@ -468,7 +474,9 @@ router.post(
     })
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
-          const logMessage = `User with email '${mail}' attempted to update Application form submission '${mongoId}' without a matching BAP combo key.`;
+          const logMessage =
+            `User with email '${mail}' attempted to update Application form submission '${mongoId}' ` +
+            `without a matching BAP combo key.`;
           log({ level: "error", message: logMessage, req });
 
           const errorStatus = 401;
@@ -494,7 +502,9 @@ router.post(
           });
       })
       .catch((error) => {
-        const logMessage = `User with email '${mail}' attempted to update Application form submission '${mongoId}' when the CSB Application form enrollment period was closed.`;
+        const logMessage =
+          `User with email '${mail}' attempted to update Application form submission '${mongoId}' ` +
+          `when the CSB Application form enrollment period was closed.`;
         log({ level: "error", message: logMessage, req });
 
         const errorStatus = 400;
@@ -557,7 +567,9 @@ router.post(
     }
 
     if (!bapComboKeys.includes(comboKey)) {
-      const logMessage = `User with email '${mail}' attempted to post a new Payment Request form submission without a matching BAP combo key.`;
+      const logMessage =
+        `User with email '${mail}' attempted to post a new Payment Request form submission ` +
+        `without a matching BAP combo key.`;
       log({ level: "error", message: logMessage, req });
 
       const errorStatus = 401;
@@ -686,7 +698,9 @@ router.get(
         const comboKey = submission.data.bap_hidden_entity_combo_key;
 
         if (!bapComboKeys.includes(comboKey)) {
-          const logMessage = `User with email '${mail}' attempted to access Payment Request form submission '${rebateId}' that they do not have access to.`;
+          const logMessage =
+            `User with email '${mail}' attempted to access Payment Request form submission '${rebateId}' ` +
+            `that they do not have access to.`;
           log({ level: "warn", message: logMessage, req });
 
           return res.json({
@@ -753,7 +767,9 @@ router.post(
     })
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
-          const logMessage = `User with email '${mail}' attempted to update Payment Request form submission '${rebateId}' without a matching BAP combo key.`;
+          const logMessage =
+            `User with email '${mail}' attempted to update Payment Request form submission '${rebateId}' ` +
+            `without a matching BAP combo key.`;
           log({ level: "error", message: logMessage, req });
 
           const errorStatus = 401;
@@ -789,7 +805,9 @@ router.post(
           });
       })
       .catch((error) => {
-        const logMessage = `User with email '${mail}' attempted to update Payment Request form submission '${rebateId}' when the CSB Payment Request form enrollment period was closed.`;
+        const logMessage =
+          `User with email '${mail}' attempted to update Payment Request form submission '${rebateId}' ` +
+          `when the CSB Payment Request form enrollment period was closed.`;
         log({ level: "error", message: logMessage, req });
 
         const errorStatus = 400;
@@ -810,7 +828,9 @@ router.post(
 
     // verify post data includes one of user's BAP combo keys
     if (!bapComboKeys.includes(comboKey)) {
-      const logMessage = `User with email '${mail}' attempted to delete Payment Request form submission '${rebateId}' without a matching BAP combo key.`;
+      const logMessage =
+        `User with email '${mail}' attempted to delete Payment Request form submission '${rebateId}' ` +
+        `without a matching BAP combo key.`;
       log({ level: "error", message: logMessage, req });
 
       const errorStatus = 401;
@@ -914,7 +934,9 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
   }
 
   if (!bapComboKeys.includes(comboKey)) {
-    const logMessage = `User with email '${mail}' attempted to post a new Close Out form submission without a matching BAP combo key.`;
+    const logMessage =
+      `User with email '${mail}' attempted to post a new Close Out form submission ` +
+      `without a matching BAP combo key.`;
     log({ level: "error", message: logMessage, req });
 
     const errorStatus = 401;
@@ -1106,7 +1128,9 @@ router.get(
         const comboKey = submission.data.bap_hidden_entity_combo_key;
 
         if (!bapComboKeys.includes(comboKey)) {
-          const logMessage = `User with email '${mail}' attempted to access Close Out form submission '${rebateId}' that they do not have access to.`;
+          const logMessage =
+            `User with email '${mail}' attempted to access Close Out form submission '${rebateId}' ` +
+            `that they do not have access to.`;
           log({ level: "warn", message: logMessage, req });
 
           return res.json({
@@ -1173,7 +1197,9 @@ router.post(
     })
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
-          const logMessage = `User with email '${mail}' attempted to update Close Out form submission '${rebateId}' without a matching BAP combo key.`;
+          const logMessage =
+            `User with email '${mail}' attempted to update Close Out form submission '${rebateId}' ` +
+            `without a matching BAP combo key.`;
           log({ level: "error", message: logMessage, req });
 
           const errorStatus = 401;
@@ -1206,7 +1232,9 @@ router.post(
           });
       })
       .catch((error) => {
-        const logMessage = `User with email '${mail}' attempted to update Close Out form submission '${rebateId}' when the CSB Close Out form enrollment period was closed.`;
+        const logMessage =
+          `User with email '${mail}' attempted to update Close Out form submission '${rebateId}' ` +
+          `when the CSB Close Out form enrollment period was closed.`;
         log({ level: "error", message: logMessage, req });
 
         const errorStatus = 400;

From 468517e26e0f3d9ef8bf8dd921d7a6debc83ddb4 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Mon, 31 Jul 2023 16:25:08 -0400
Subject: [PATCH 16/71] Rename markdown files to reflect new form naming
 convention (FRF, PRF, COF)

---
 app/client/src/routes/applicationForm.tsx     |  4 +--
 app/client/src/routes/closeOutForm.tsx        |  4 +--
 app/client/src/routes/newApplicationForm.tsx  |  2 +-
 app/client/src/routes/paymentRequestForm.tsx  |  4 +--
 app/client/src/utilities.tsx                  | 14 +++++-----
 ...-close-out-intro.md => draft-cof-intro.md} |  0
 ...pplication-intro.md => draft-frf-intro.md} |  0
 ...nt-request-intro.md => draft-prf-intro.md} |  0
 ...pplication-dialog.md => new-frf-dialog.md} |  0
 ...se-out-intro.md => submitted-cof-intro.md} |  0
 ...cation-intro.md => submitted-frf-intro.md} |  0
 ...equest-intro.md => submitted-prf-intro.md} |  0
 app/server/app/routes/api.js                  | 28 +++++++++----------
 13 files changed, 28 insertions(+), 28 deletions(-)
 rename app/server/app/content/{draft-close-out-intro.md => draft-cof-intro.md} (100%)
 rename app/server/app/content/{draft-application-intro.md => draft-frf-intro.md} (100%)
 rename app/server/app/content/{draft-payment-request-intro.md => draft-prf-intro.md} (100%)
 rename app/server/app/content/{new-application-dialog.md => new-frf-dialog.md} (100%)
 rename app/server/app/content/{submitted-close-out-intro.md => submitted-cof-intro.md} (100%)
 rename app/server/app/content/{submitted-application-intro.md => submitted-frf-intro.md} (100%)
 rename app/server/app/content/{submitted-payment-request-intro.md => submitted-prf-intro.md} (100%)

diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index f13f09b1..0726ed31 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -345,9 +345,9 @@ function UserApplicationForm(props: { email: string }) {
           className="margin-top-4"
           children={
             submission.state === "draft"
-              ? content.draftApplicationIntro
+              ? content.draftFRFIntro
               : submission.state === "submitted"
-              ? content.submittedApplicationIntro
+              ? content.submittedFRFIntro
               : ""
           }
         />
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index b87d12c0..807506e9 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -220,9 +220,9 @@ function UserCloseOutForm(props: { email: string }) {
           className="margin-top-4"
           children={
             submission.state === "draft"
-              ? content.draftCloseOutIntro
+              ? content.draftCOFIntro
               : submission.state === "submitted"
-              ? content.submittedCloseOutIntro
+              ? content.submittedCOFIntro
               : ""
           }
         />
diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/newApplicationForm.tsx
index 13b12684..d8ef5965 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/newApplicationForm.tsx
@@ -117,7 +117,7 @@ export function NewApplicationForm() {
                       {content && (
                         <MarkdownContent
                           className="tw-mt-4 tw-text-center"
-                          children={content.newApplicationDialog}
+                          children={content.newFRFDialog}
                           components={{
                             h2: (props) => (
                               <h2 className="tw-text-xl sm:tw-text-2xl md:tw-text-3xl">
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index 2f524b95..a94a39c5 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -238,9 +238,9 @@ function UserPaymentRequestForm(props: { email: string }) {
           className="margin-top-4"
           children={
             submission.state === "draft"
-              ? content.draftPaymentRequestIntro
+              ? content.draftPRFIntro
               : submission.state === "submitted"
-              ? content.submittedPaymentRequestIntro
+              ? content.submittedPRFIntro
               : ""
           }
         />
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 3214f0d4..5e5ed468 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -9,13 +9,13 @@ type Content = {
   helpdeskIntro: string;
   allRebatesIntro: string;
   allRebatesOutro: string;
-  newApplicationDialog: string;
-  draftApplicationIntro: string;
-  submittedApplicationIntro: string;
-  draftPaymentRequestIntro: string;
-  submittedPaymentRequestIntro: string;
-  draftCloseOutIntro: string;
-  submittedCloseOutIntro: string;
+  newFRFDialog: string;
+  draftFRFIntro: string;
+  submittedFRFIntro: string;
+  draftPRFIntro: string;
+  submittedPRFIntro: string;
+  draftCOFIntro: string;
+  submittedCOFIntro: string;
 };
 
 type UserData = {
diff --git a/app/server/app/content/draft-close-out-intro.md b/app/server/app/content/draft-cof-intro.md
similarity index 100%
rename from app/server/app/content/draft-close-out-intro.md
rename to app/server/app/content/draft-cof-intro.md
diff --git a/app/server/app/content/draft-application-intro.md b/app/server/app/content/draft-frf-intro.md
similarity index 100%
rename from app/server/app/content/draft-application-intro.md
rename to app/server/app/content/draft-frf-intro.md
diff --git a/app/server/app/content/draft-payment-request-intro.md b/app/server/app/content/draft-prf-intro.md
similarity index 100%
rename from app/server/app/content/draft-payment-request-intro.md
rename to app/server/app/content/draft-prf-intro.md
diff --git a/app/server/app/content/new-application-dialog.md b/app/server/app/content/new-frf-dialog.md
similarity index 100%
rename from app/server/app/content/new-application-dialog.md
rename to app/server/app/content/new-frf-dialog.md
diff --git a/app/server/app/content/submitted-close-out-intro.md b/app/server/app/content/submitted-cof-intro.md
similarity index 100%
rename from app/server/app/content/submitted-close-out-intro.md
rename to app/server/app/content/submitted-cof-intro.md
diff --git a/app/server/app/content/submitted-application-intro.md b/app/server/app/content/submitted-frf-intro.md
similarity index 100%
rename from app/server/app/content/submitted-application-intro.md
rename to app/server/app/content/submitted-frf-intro.md
diff --git a/app/server/app/content/submitted-payment-request-intro.md b/app/server/app/content/submitted-prf-intro.md
similarity index 100%
rename from app/server/app/content/submitted-payment-request-intro.md
rename to app/server/app/content/submitted-prf-intro.md
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 6add7b05..6f45614f 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -110,13 +110,13 @@ router.get("/content", (req, res) => {
     "helpdesk-intro.md",
     "all-rebates-intro.md",
     "all-rebates-outro.md",
-    "new-application-dialog.md",
-    "draft-application-intro.md",
-    "submitted-application-intro.md",
-    "draft-payment-request-intro.md",
-    "submitted-payment-request-intro.md",
-    "draft-close-out-intro.md",
-    "submitted-close-out-intro.md",
+    "new-frf-dialog.md",
+    "draft-frf-intro.md",
+    "submitted-frf-intro.md",
+    "draft-prf-intro.md",
+    "submitted-prf-intro.md",
+    "draft-cof-intro.md",
+    "submitted-cof-intro.md",
   ];
 
   const s3BucketUrl = `https://${S3_PUBLIC_BUCKET}.s3-${S3_PUBLIC_REGION}.amazonaws.com`;
@@ -147,13 +147,13 @@ router.get("/content", (req, res) => {
         helpdeskIntro: data[1],
         allRebatesIntro: data[2],
         allRebatesOutro: data[3],
-        newApplicationDialog: data[4],
-        draftApplicationIntro: data[5],
-        submittedApplicationIntro: data[6],
-        draftPaymentRequestIntro: data[7],
-        submittedPaymentRequestIntro: data[8],
-        draftCloseOutIntro: data[9],
-        submittedCloseOutIntro: data[10],
+        newFRFDialog: data[4],
+        draftFRFIntro: data[5],
+        submittedFRFIntro: data[6],
+        draftPRFIntro: data[7],
+        submittedPRFIntro: data[8],
+        draftCOFIntro: data[9],
+        submittedCOFIntro: data[10],
       });
     })
     .catch((error) => {

From 49427b7071645939aa0a3a04349f63fda75003be Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Mon, 31 Jul 2023 17:21:55 -0400
Subject: [PATCH 17/71] Fix spelling of close out form abbreviation (CRF not
 COF)

---
 app/client/src/routes/allRebates.tsx          |  2 +-
 app/client/src/routes/closeOutForm.tsx        |  8 +++---
 app/client/src/utilities.tsx                  | 14 +++++-----
 app/server/.env.example                       | 13 ++++++----
 ...{draft-cof-intro.md => draft-crf-intro.md} |  0
 ...ed-cof-intro.md => submitted-crf-intro.md} |  0
 app/server/app/routes/api.js                  | 26 +++++++++----------
 7 files changed, 33 insertions(+), 30 deletions(-)
 rename app/server/app/content/{draft-cof-intro.md => draft-crf-intro.md} (100%)
 rename app/server/app/content/{submitted-cof-intro.md => submitted-crf-intro.md} (100%)

diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index 7d76cb4b..8b0cc74f 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -569,7 +569,7 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
 
   if (!configData || !bapSamData) return null;
 
-  const closeOutFormOpen = configData.submissionPeriodOpen[rebateYear].cof;
+  const closeOutFormOpen = configData.submissionPeriodOpen[rebateYear].crf;
 
   const paymentRequestFundingApproved =
     paymentRequest.bap?.status === "Accepted";
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index 807506e9..1739b8cd 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -65,7 +65,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
          */
         Formio.Providers.providers.storage.s3 = function (formio: any) {
           const s3Formio = cloneDeep(formio);
-          s3Formio.formUrl = `${serverUrl}/api/s3/2022/cof/${mongoId}/${comboKey}`;
+          s3Formio.formUrl = `${serverUrl}/api/s3/2022/crf/${mongoId}/${comboKey}`;
           return s3(s3Formio);
         };
 
@@ -191,7 +191,7 @@ function UserCloseOutForm(props: { email: string }) {
         bap: rebate.closeOut.bap,
       });
 
-  const closeOutFormOpen = configData.submissionPeriodOpen[rebateYear].cof;
+  const closeOutFormOpen = configData.submissionPeriodOpen[rebateYear].crf;
 
   const formIsReadOnly =
     (submission.state === "submitted" || !closeOutFormOpen) &&
@@ -220,9 +220,9 @@ function UserCloseOutForm(props: { email: string }) {
           className="margin-top-4"
           children={
             submission.state === "draft"
-              ? content.draftCOFIntro
+              ? content.draftCRFIntro
               : submission.state === "submitted"
-              ? content.submittedCOFIntro
+              ? content.submittedCRFIntro
               : ""
           }
         />
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 5e5ed468..706e5862 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -14,8 +14,8 @@ type Content = {
   submittedFRFIntro: string;
   draftPRFIntro: string;
   submittedPRFIntro: string;
-  draftCOFIntro: string;
-  submittedCOFIntro: string;
+  draftCRFIntro: string;
+  submittedCRFIntro: string;
 };
 
 type UserData = {
@@ -24,10 +24,10 @@ type UserData = {
   exp: number;
 };
 
-export type CsbData = {
+type ConfigData = {
   submissionPeriodOpen: {
-    2022: { frf: boolean; prf: boolean; cof: boolean };
-    2023: { frf: boolean; prf: boolean; cof: boolean };
+    2022: { frf: boolean; prf: boolean; crf: boolean };
+    2023: { frf: boolean; prf: boolean; crf: boolean };
   };
 };
 
@@ -258,7 +258,7 @@ export function useUserData() {
 export function useConfigQuery() {
   return useQuery({
     queryKey: ["config"],
-    queryFn: () => getData<CsbData>(`${serverUrl}/api/config`),
+    queryFn: () => getData<ConfigData>(`${serverUrl}/api/config`),
     refetchOnWindowFocus: false,
   });
 }
@@ -266,7 +266,7 @@ export function useConfigQuery() {
 /** Custom hook that returns cached fetched CSB config */
 export function useConfigData() {
   const queryClient = useQueryClient();
-  return queryClient.getQueryData<CsbData>(["config"]);
+  return queryClient.getQueryData<ConfigData>(["config"]);
 }
 
 /** Custom hook to fetch BAP SAM.gov data */
diff --git a/app/server/.env.example b/app/server/.env.example
index 885e7a70..ec863e77 100644
--- a/app/server/.env.example
+++ b/app/server/.env.example
@@ -12,15 +12,18 @@ JWT_PRIVATE_KEY=secret
 JWT_PUBLIC_KEY=secret
 CSB_FRF_2022_OPEN=true
 CSB_PRF_2022_OPEN=true
-CSB_COF_2022_OPEN=true
+CSB_CRF_2022_OPEN=true
 CSB_FRF_2023_OPEN=true
 CSB_PRF_2023_OPEN=true
-CSB_COF_2023_OPEN=true
+CSB_CRF_2023_OPEN=true
+FORMIO_FRF_2022_PATH=
+FORMIO_PRF_2022_PATH=
+FORMIO_CRF_2022_PATH=
+FORMIO_FRF_2023_PATH=
+FORMIO_PRF_2023_PATH=
+FORMIO_CRF_2023_PATH=
 FORMIO_BASE_URL=
 FORMIO_PROJECT_NAME=
-FORMIO_APPLICATION_FORM_PATH=
-FORMIO_PAYMENT_REQUEST_FORM_PATH=
-FORMIO_CLOSE_OUT_FORM_PATH=
 FORMIO_API_KEY=
 BAP_CLIENT_ID=
 BAP_CLIENT_SECRET=
diff --git a/app/server/app/content/draft-cof-intro.md b/app/server/app/content/draft-crf-intro.md
similarity index 100%
rename from app/server/app/content/draft-cof-intro.md
rename to app/server/app/content/draft-crf-intro.md
diff --git a/app/server/app/content/submitted-cof-intro.md b/app/server/app/content/submitted-crf-intro.md
similarity index 100%
rename from app/server/app/content/submitted-cof-intro.md
rename to app/server/app/content/submitted-crf-intro.md
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 6f45614f..3931e2d7 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -28,17 +28,17 @@ const {
   NODE_ENV,
   CSB_FRF_2022_OPEN,
   CSB_PRF_2022_OPEN,
-  CSB_COF_2022_OPEN,
+  CSB_CRF_2022_OPEN,
   CSB_FRF_2023_OPEN,
   CSB_PRF_2023_OPEN,
-  CSB_COF_2023_OPEN,
+  CSB_CRF_2023_OPEN,
   S3_PUBLIC_BUCKET,
   S3_PUBLIC_REGION,
 } = process.env;
 
 const frf2022Open = CSB_FRF_2022_OPEN === "true";
 const prf2022Open = CSB_PRF_2022_OPEN === "true";
-const cof2022Open = CSB_COF_2022_OPEN === "true";
+const crf2022Open = CSB_CRF_2022_OPEN === "true";
 
 /**
  * Stores whether the submission period is open for each form by rebate year.
@@ -47,12 +47,12 @@ const submissionPeriodOpen = {
   2022: {
     frf: CSB_FRF_2022_OPEN === "true",
     prf: CSB_PRF_2022_OPEN === "true",
-    cof: CSB_COF_2022_OPEN === "true",
+    crf: CSB_CRF_2022_OPEN === "true",
   },
   2023: {
     frf: CSB_FRF_2023_OPEN === "true",
     prf: CSB_PRF_2023_OPEN === "true",
-    cof: CSB_COF_2023_OPEN === "true",
+    crf: CSB_CRF_2023_OPEN === "true",
   },
 };
 
@@ -64,7 +64,7 @@ const submissionPeriodOpen = {
  *
  * @param {Object} param
  * @param {'2022' | '2023'} param.rebateYear
- * @param {'frf' | 'prf' | 'cof'} param.formType
+ * @param {'frf' | 'prf' | 'crf'} param.formType
  * @param {string} param.mongoId
  * @param {string} param.comboKey
  * @param {express.Request} param.req
@@ -90,7 +90,7 @@ function checkFormSubmissionPeriodAndBapStatus({
         ? "CSB_Funding_Request_Status__c"
         : formType === "prf"
         ? "CSB_Payment_Request_Status__c"
-        : formType === "cof"
+        : formType === "crf"
         ? "CSB_Closeout_Request_Status__c"
         : null;
 
@@ -115,8 +115,8 @@ router.get("/content", (req, res) => {
     "submitted-frf-intro.md",
     "draft-prf-intro.md",
     "submitted-prf-intro.md",
-    "draft-cof-intro.md",
-    "submitted-cof-intro.md",
+    "draft-crf-intro.md",
+    "submitted-crf-intro.md",
   ];
 
   const s3BucketUrl = `https://${S3_PUBLIC_BUCKET}.s3-${S3_PUBLIC_REGION}.amazonaws.com`;
@@ -152,8 +152,8 @@ router.get("/content", (req, res) => {
         submittedFRFIntro: data[6],
         draftPRFIntro: data[7],
         submittedPRFIntro: data[8],
-        draftCOFIntro: data[9],
-        submittedCOFIntro: data[10],
+        draftCRFIntro: data[9],
+        submittedCRFIntro: data[10],
       });
     })
     .catch((error) => {
@@ -927,7 +927,7 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
     paymentRequestFormModified,
   } = body;
 
-  if (!cof2022Open) {
+  if (!crf2022Open) {
     const errorStatus = 400;
     const errorMessage = `CSB Close Out form enrollment period is closed.`;
     return res.status(errorStatus).json({ message: errorMessage });
@@ -1185,7 +1185,7 @@ router.post(
     const { rebateId } = req.params; // CSB Rebate ID (6 digits)
     const { mongoId, submission } = body;
     const comboKey = submission.data?.bap_hidden_entity_combo_key;
-    const formType = "cof";
+    const formType = "crf";
     const rebateYear = "2022"; // TODO
 
     checkFormSubmissionPeriodAndBapStatus({

From 0b89742f676329b4e4f923504225cb50ebad3fb5 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Mon, 31 Jul 2023 17:36:27 -0400
Subject: [PATCH 18/71] Update use of env variables for form paths for each
 rebate year

---
 .github/workflows/dev.yml       | 38 ++++++++++++++++++++++-----------
 .github/workflows/staging.yml   | 38 ++++++++++++++++++++++-----------
 app/server/app/config/formio.js | 15 +++++++------
 app/server/app/index.js         | 13 ++++++-----
 4 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 35659125..27f94fbe 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -41,16 +41,22 @@ jobs:
       # SAML_PRIVATE_KEY: ${{ secrets.SAML_PRIVATE_KEY }}
       JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
       JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
-      CSB_APPLICATION_FORM_OPEN: true
-      CSB_PAYMENT_REQUEST_FORM_OPEN: true
-      CSB_CLOSE_OUT_FORM_OPEN: true
-      FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
+      CSB_FRF_2022_OPEN: true
+      CSB_PRF_2022_OPEN: true
+      CSB_CRF_2022_OPEN: true
+      CSB_FRF_2023_OPEN: true
+      CSB_PRF_2023_OPEN: true
+      CSB_CRF_2023_OPEN: true
+      FORMIO_FRF_2022_PATH: ${{ secrets.FORMIO_FRF_2022_PATH }}
+      FORMIO_PRF_2022_PATH: ${{ secrets.FORMIO_PRF_2022_PATH }}
+      FORMIO_CRF_2022_PATH: ${{ secrets.FORMIO_CRF_2022_PATH }}
+      FORMIO_FRF_2023_PATH: ${{ secrets.FORMIO_FRF_2023_PATH }}
+      FORMIO_PRF_2023_PATH: ${{ secrets.FORMIO_PRF_2023_PATH }}
+      FORMIO_CRF_2023_PATH: ${{ secrets.FORMIO_CRF_2023_PATH }}
       FORMIO_BASE_URL: ${{ secrets.FORMIO_BASE_URL }}
       FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
-      FORMIO_APPLICATION_FORM_PATH: ${{ secrets.FORMIO_APPLICATION_FORM_PATH }}
-      FORMIO_PAYMENT_REQUEST_FORM_PATH: ${{ secrets.FORMIO_PAYMENT_REQUEST_FORM_PATH }}
-      FORMIO_CLOSE_OUT_FORM_PATH: ${{ secrets.FORMIO_CLOSE_OUT_FORM_PATH }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
+      FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
       BAP_CLIENT_ID: ${{ secrets.BAP_CLIENT_ID }}
       BAP_CLIENT_SECRET: ${{ secrets.BAP_CLIENT_SECRET }}
       BAP_URL: ${{ secrets.BAP_URL }}
@@ -124,14 +130,20 @@ jobs:
           # cf set-env $APP_NAME "SAML_PRIVATE_KEY" "$SAML_PRIVATE_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PUBLIC_KEY" "$JWT_PUBLIC_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PRIVATE_KEY" "$JWT_PRIVATE_KEY" > /dev/null
-          cf set-env $APP_NAME "CSB_APPLICATION_FORM_OPEN" "$CSB_APPLICATION_FORM_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_PAYMENT_REQUEST_FORM_OPEN" "$CSB_PAYMENT_REQUEST_FORM_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_CLOSE_OUT_FORM_OPEN" "$CSB_CLOSE_OUT_FORM_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_FRF_2022_OPEN" "$CSB_FRF_2022_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_PRF_2022_OPEN" "$CSB_PRF_2022_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_CRF_2022_OPEN" "$CSB_CRF_2022_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_FRF_2023_OPEN" "$CSB_FRF_2023_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_PRF_2023_OPEN" "$CSB_PRF_2023_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_CRF_2023_OPEN" "$CSB_CRF_2023_OPEN" > /dev/null
+          cf set-env $APP_NAME "FORMIO_FRF_2022_PATH" "$FORMIO_FRF_2022_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_PRF_2022_PATH" "$FORMIO_PRF_2022_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_CRF_2022_PATH" "$FORMIO_CRF_2022_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_FRF_2023_PATH" "$FORMIO_FRF_2023_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_PRF_2023_PATH" "$FORMIO_PRF_2023_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_CRF_2023_PATH" "$FORMIO_CRF_2023_PATH" > /dev/null
           cf set-env $APP_NAME "FORMIO_BASE_URL" "$FORMIO_BASE_URL" > /dev/null
           cf set-env $APP_NAME "FORMIO_PROJECT_NAME" "$FORMIO_PROJECT_NAME" > /dev/null
-          cf set-env $APP_NAME "FORMIO_APPLICATION_FORM_PATH" "$FORMIO_APPLICATION_FORM_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_PAYMENT_REQUEST_FORM_PATH" "$FORMIO_PAYMENT_REQUEST_FORM_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_CLOSE_OUT_FORM_PATH" "$FORMIO_CLOSE_OUT_FORM_PATH" > /dev/null
           cf set-env $APP_NAME "FORMIO_API_KEY" "$FORMIO_API_KEY" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_ID" "$BAP_CLIENT_ID" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_SECRET" "$BAP_CLIENT_SECRET" > /dev/null
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 2b64d44f..d3c9978c 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -41,16 +41,22 @@ jobs:
       SAML_PRIVATE_KEY: ${{ secrets.SAML_PRIVATE_KEY }}
       JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
       JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
-      CSB_APPLICATION_FORM_OPEN: true
-      CSB_PAYMENT_REQUEST_FORM_OPEN: true
-      CSB_CLOSE_OUT_FORM_OPEN: true
-      FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
+      CSB_FRF_2022_OPEN: true
+      CSB_PRF_2022_OPEN: true
+      CSB_CRF_2022_OPEN: true
+      CSB_FRF_2023_OPEN: true
+      CSB_PRF_2023_OPEN: true
+      CSB_CRF_2023_OPEN: true
+      FORMIO_FRF_2022_PATH: ${{ secrets.FORMIO_FRF_2022_PATH }}
+      FORMIO_PRF_2022_PATH: ${{ secrets.FORMIO_PRF_2022_PATH }}
+      FORMIO_CRF_2022_PATH: ${{ secrets.FORMIO_CRF_2022_PATH }}
+      FORMIO_FRF_2023_PATH: ${{ secrets.FORMIO_FRF_2023_PATH }}
+      FORMIO_PRF_2023_PATH: ${{ secrets.FORMIO_PRF_2023_PATH }}
+      FORMIO_CRF_2023_PATH: ${{ secrets.FORMIO_CRF_2023_PATH }}
       FORMIO_BASE_URL: ${{ secrets.FORMIO_BASE_URL }}
       FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
-      FORMIO_APPLICATION_FORM_PATH: ${{ secrets.FORMIO_APPLICATION_FORM_PATH }}
-      FORMIO_PAYMENT_REQUEST_FORM_PATH: ${{ secrets.FORMIO_PAYMENT_REQUEST_FORM_PATH }}
-      FORMIO_CLOSE_OUT_FORM_PATH: ${{ secrets.FORMIO_CLOSE_OUT_FORM_PATH }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
+      FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
       BAP_CLIENT_ID: ${{ secrets.BAP_CLIENT_ID }}
       BAP_CLIENT_SECRET: ${{ secrets.BAP_CLIENT_SECRET }}
       BAP_URL: ${{ secrets.BAP_URL }}
@@ -124,14 +130,20 @@ jobs:
           cf set-env $APP_NAME "SAML_PRIVATE_KEY" "$SAML_PRIVATE_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PUBLIC_KEY" "$JWT_PUBLIC_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PRIVATE_KEY" "$JWT_PRIVATE_KEY" > /dev/null
-          cf set-env $APP_NAME "CSB_APPLICATION_FORM_OPEN" "$CSB_APPLICATION_FORM_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_PAYMENT_REQUEST_FORM_OPEN" "$CSB_PAYMENT_REQUEST_FORM_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_CLOSE_OUT_FORM_OPEN" "$CSB_CLOSE_OUT_FORM_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_FRF_2022_OPEN" "$CSB_FRF_2022_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_PRF_2022_OPEN" "$CSB_PRF_2022_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_CRF_2022_OPEN" "$CSB_CRF_2022_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_FRF_2023_OPEN" "$CSB_FRF_2023_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_PRF_2023_OPEN" "$CSB_PRF_2023_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_CRF_2023_OPEN" "$CSB_CRF_2023_OPEN" > /dev/null
+          cf set-env $APP_NAME "FORMIO_FRF_2022_PATH" "$FORMIO_FRF_2022_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_PRF_2022_PATH" "$FORMIO_PRF_2022_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_CRF_2022_PATH" "$FORMIO_CRF_2022_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_FRF_2023_PATH" "$FORMIO_FRF_2023_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_PRF_2023_PATH" "$FORMIO_PRF_2023_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_CRF_2023_PATH" "$FORMIO_CRF_2023_PATH" > /dev/null
           cf set-env $APP_NAME "FORMIO_BASE_URL" "$FORMIO_BASE_URL" > /dev/null
           cf set-env $APP_NAME "FORMIO_PROJECT_NAME" "$FORMIO_PROJECT_NAME" > /dev/null
-          cf set-env $APP_NAME "FORMIO_APPLICATION_FORM_PATH" "$FORMIO_APPLICATION_FORM_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_PAYMENT_REQUEST_FORM_PATH" "$FORMIO_PAYMENT_REQUEST_FORM_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_CLOSE_OUT_FORM_PATH" "$FORMIO_CLOSE_OUT_FORM_PATH" > /dev/null
           cf set-env $APP_NAME "FORMIO_API_KEY" "$FORMIO_API_KEY" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_ID" "$BAP_CLIENT_ID" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_SECRET" "$BAP_CLIENT_SECRET" > /dev/null
diff --git a/app/server/app/config/formio.js b/app/server/app/config/formio.js
index 7bf1a588..c1a2aa36 100644
--- a/app/server/app/config/formio.js
+++ b/app/server/app/config/formio.js
@@ -8,16 +8,19 @@ const {
   SERVER_URL,
   FORMIO_BASE_URL,
   FORMIO_PROJECT_NAME,
-  FORMIO_APPLICATION_FORM_PATH,
-  FORMIO_PAYMENT_REQUEST_FORM_PATH,
-  FORMIO_CLOSE_OUT_FORM_PATH,
   FORMIO_API_KEY,
+  FORMIO_FRF_2022_PATH,
+  FORMIO_PRF_2022_PATH,
+  FORMIO_CRF_2022_PATH,
+  FORMIO_FRF_2023_PATH,
+  FORMIO_PRF_2023_PATH,
+  FORMIO_CRF_2023_PATH,
 } = process.env;
 
 const formioProjectUrl = `${FORMIO_BASE_URL}/${FORMIO_PROJECT_NAME}`;
-const formioApplicationFormUrl = `${formioProjectUrl}/${FORMIO_APPLICATION_FORM_PATH}`;
-const formioPaymentRequestFormUrl = `${formioProjectUrl}/${FORMIO_PAYMENT_REQUEST_FORM_PATH}`;
-const formioCloseOutFormUrl = `${formioProjectUrl}/${FORMIO_CLOSE_OUT_FORM_PATH}`;
+const formioApplicationFormUrl = `${formioProjectUrl}/${FORMIO_FRF_2022_PATH}`;
+const formioPaymentRequestFormUrl = `${formioProjectUrl}/${FORMIO_PRF_2022_PATH}`;
+const formioCloseOutFormUrl = `${formioProjectUrl}/${FORMIO_CRF_2022_PATH}`;
 
 /** @param {express.Request} req */
 function axiosFormio(req) {
diff --git a/app/server/app/index.js b/app/server/app/index.js
index 912553c6..ded4baf3 100644
--- a/app/server/app/index.js
+++ b/app/server/app/index.js
@@ -38,15 +38,18 @@ const requiredEnvironmentVariables = [
   "JWT_PUBLIC_KEY",
   "CSB_FRF_2022_OPEN",
   "CSB_PRF_2022_OPEN",
-  "CSB_COF_2022_OPEN",
+  "CSB_CRF_2022_OPEN",
   "CSB_FRF_2023_OPEN",
   "CSB_PRF_2023_OPEN",
-  "CSB_COF_2023_OPEN",
+  "CSB_CRF_2023_OPEN",
+  "FORMIO_FRF_2022_PATH",
+  "FORMIO_PRF_2022_PATH",
+  "FORMIO_CRF_2022_PATH",
+  "FORMIO_FRF_2023_PATH",
+  "FORMIO_PRF_2023_PATH",
+  "FORMIO_CRF_2023_PATH",
   "FORMIO_BASE_URL",
   "FORMIO_PROJECT_NAME",
-  "FORMIO_APPLICATION_FORM_PATH",
-  "FORMIO_PAYMENT_REQUEST_FORM_PATH",
-  "FORMIO_CLOSE_OUT_FORM_PATH",
   "FORMIO_API_KEY",
   "S3_PUBLIC_BUCKET",
   "S3_PUBLIC_REGION",

From feba5b4c6aec9b16d97dae4534b9d6354f0bb1dd Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 1 Aug 2023 11:29:13 -0400
Subject: [PATCH 19/71] Rename 2022 form urls appropriately, to set stage for
 future form urls (e.g formioFRF2023Url)

---
 app/server/app/config/formio.js | 12 +++----
 app/server/app/routes/api.js    | 55 ++++++++++++++++-----------------
 app/server/app/routes/help.js   | 12 +++----
 app/server/app/routes/status.js | 12 +++----
 4 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/app/server/app/config/formio.js b/app/server/app/config/formio.js
index c1a2aa36..fda2059c 100644
--- a/app/server/app/config/formio.js
+++ b/app/server/app/config/formio.js
@@ -18,9 +18,9 @@ const {
 } = process.env;
 
 const formioProjectUrl = `${FORMIO_BASE_URL}/${FORMIO_PROJECT_NAME}`;
-const formioApplicationFormUrl = `${formioProjectUrl}/${FORMIO_FRF_2022_PATH}`;
-const formioPaymentRequestFormUrl = `${formioProjectUrl}/${FORMIO_PRF_2022_PATH}`;
-const formioCloseOutFormUrl = `${formioProjectUrl}/${FORMIO_CRF_2022_PATH}`;
+const formioFRF2022Url = `${formioProjectUrl}/${FORMIO_FRF_2022_PATH}`;
+const formioPRF2022Url = `${formioProjectUrl}/${FORMIO_PRF_2022_PATH}`;
+const formioCRF2022Url = `${formioProjectUrl}/${FORMIO_CRF_2022_PATH}`;
 
 /** @param {express.Request} req */
 function axiosFormio(req) {
@@ -85,8 +85,8 @@ const formioCsbMetadata = {
 
 module.exports = {
   axiosFormio,
-  formioApplicationFormUrl,
-  formioPaymentRequestFormUrl,
-  formioCloseOutFormUrl,
+  formioFRF2022Url,
+  formioPRF2022Url,
+  formioCRF2022Url,
   formioCsbMetadata,
 };
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 3931e2d7..9082832b 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -6,9 +6,9 @@ const ObjectId = require("mongodb").ObjectId;
 // ---
 const {
   axiosFormio,
-  formioApplicationFormUrl,
-  formioPaymentRequestFormUrl,
-  formioCloseOutFormUrl,
+  formioFRF2022Url,
+  formioPRF2022Url,
+  formioCRF2022Url,
   formioCsbMetadata,
 } = require("../config/formio");
 const {
@@ -260,7 +260,7 @@ router.get(
     }
 
     axiosFormio(req)
-      .get(`${formioApplicationFormUrl}/storage/s3`, { params: query })
+      .get(`${formioFRF2022Url}/storage/s3`, { params: query })
       .then((axiosRes) => axiosRes.data)
       .then((fileMetadata) => res.json(fileMetadata))
       .catch((error) => {
@@ -301,7 +301,7 @@ router.post(
         }
 
         axiosFormio(req)
-          .post(`${formioApplicationFormUrl}/storage/s3`, body)
+          .post(`${formioFRF2022Url}/storage/s3`, body)
           .then((axiosRes) => axiosRes.data)
           .then((fileMetadata) => res.json(fileMetadata))
           .catch((error) => {
@@ -349,7 +349,7 @@ router.get("/formio-application-submissions", storeBapComboKeys, (req, res) => {
   if (bapComboKeys.length === 0) return res.json([]);
 
   const userSubmissionsUrl =
-    `${formioApplicationFormUrl}/submission` +
+    `${formioFRF2022Url}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
     `&data.bap_hidden_entity_combo_key=` +
@@ -394,7 +394,7 @@ router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
   body.metadata = { ...formioCsbMetadata };
 
   axiosFormio(req)
-    .post(`${formioApplicationFormUrl}/submission`, body)
+    .post(`${formioFRF2022Url}/submission`, body)
     .then((axiosRes) => axiosRes.data)
     .then((submission) => res.json(submission))
     .catch((error) => {
@@ -416,8 +416,8 @@ router.get(
     const { mongoId } = req.params;
 
     Promise.all([
-      axiosFormio(req).get(`${formioApplicationFormUrl}/submission/${mongoId}`),
-      axiosFormio(req).get(formioApplicationFormUrl),
+      axiosFormio(req).get(`${formioFRF2022Url}/submission/${mongoId}`),
+      axiosFormio(req).get(formioFRF2022Url),
     ])
       .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
       .then(([submission, schema]) => {
@@ -438,7 +438,7 @@ router.get(
 
         return res.json({
           userAccess: true,
-          formSchema: { url: formioApplicationFormUrl, json: schema },
+          formSchema: { url: formioFRF2022Url, json: schema },
           submission,
         });
       })
@@ -491,7 +491,7 @@ router.post(
         };
 
         axiosFormio(req)
-          .put(`${formioApplicationFormUrl}/submission/${mongoId}`, submission)
+          .put(`${formioFRF2022Url}/submission/${mongoId}`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
@@ -522,7 +522,7 @@ router.get(
     const { bapComboKeys } = req;
 
     const userSubmissionsUrl =
-      `${formioPaymentRequestFormUrl}/submission` +
+      `${formioPRF2022Url}/submission` +
       `?sort=-modified` +
       `&limit=1000000` +
       `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
@@ -654,7 +654,7 @@ router.post(
         };
 
         axiosFormio(req)
-          .post(`${formioPaymentRequestFormUrl}/submission`, submission)
+          .post(`${formioPRF2022Url}/submission`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
@@ -683,13 +683,13 @@ router.get(
     const { rebateId } = req.params; // CSB Rebate ID (6 digits)
 
     const matchedPaymentRequestFormSubmissions =
-      `${formioPaymentRequestFormUrl}/submission` +
+      `${formioPRF2022Url}/submission` +
       `?data.hidden_bap_rebate_id=${rebateId}` +
       `&select=_id,data.bap_hidden_entity_combo_key`;
 
     Promise.all([
       axiosFormio(req).get(matchedPaymentRequestFormSubmissions),
-      axiosFormio(req).get(formioPaymentRequestFormUrl),
+      axiosFormio(req).get(formioPRF2022Url),
     ])
       .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
       .then(([submissions, schema]) => {
@@ -726,12 +726,12 @@ router.get(
          * to have Formio return the correct signature field data.
          */
         axiosFormio(req)
-          .get(`${formioPaymentRequestFormUrl}/submission/${mongoId}`)
+          .get(`${formioPRF2022Url}/submission/${mongoId}`)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => {
             return res.json({
               userAccess: true,
-              formSchema: { url: formioPaymentRequestFormUrl, json: schema },
+              formSchema: { url: formioPRF2022Url, json: schema },
               submission,
             });
           });
@@ -791,10 +791,7 @@ router.post(
         };
 
         axiosFormio(req)
-          .put(
-            `${formioPaymentRequestFormUrl}/submission/${mongoId}`,
-            submission
-          )
+          .put(`${formioPRF2022Url}/submission/${mongoId}`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
@@ -863,7 +860,7 @@ router.post(
         }
 
         axiosFormio(req)
-          .delete(`${formioPaymentRequestFormUrl}/submission/${mongoId}`)
+          .delete(`${formioPRF2022Url}/submission/${mongoId}`)
           .then((axiosRes) => axiosRes.data)
           .then((response) => {
             const logMessage = `User with email '${mail}' successfully deleted Payment Request form submission '${rebateId}'.`;
@@ -892,7 +889,7 @@ router.get("/formio-close-out-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
   const userSubmissionsUrl =
-    `${formioCloseOutFormUrl}/submission` +
+    `${formioCRF2022Url}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
     `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
@@ -1084,7 +1081,7 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
         };
 
         axiosFormio(req)
-          .post(`${formioCloseOutFormUrl}/submission`, submission)
+          .post(`${formioCRF2022Url}/submission`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
@@ -1113,13 +1110,13 @@ router.get(
     const { rebateId } = req.params; // CSB Rebate ID (6 digits)
 
     const matchedCloseOutFormSubmissions =
-      `${formioCloseOutFormUrl}/submission` +
+      `${formioCRF2022Url}/submission` +
       `?data.hidden_bap_rebate_id=${rebateId}` +
       `&select=_id,data.bap_hidden_entity_combo_key`;
 
     Promise.all([
       axiosFormio(req).get(matchedCloseOutFormSubmissions),
-      axiosFormio(req).get(formioCloseOutFormUrl),
+      axiosFormio(req).get(formioCRF2022Url),
     ])
       .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
       .then(([submissions, schema]) => {
@@ -1156,12 +1153,12 @@ router.get(
          * to have Formio return the correct signature field data.
          */
         axiosFormio(req)
-          .get(`${formioCloseOutFormUrl}/submission/${mongoId}`)
+          .get(`${formioCRF2022Url}/submission/${mongoId}`)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => {
             return res.json({
               userAccess: true,
-              formSchema: { url: formioCloseOutFormUrl, json: schema },
+              formSchema: { url: formioCRF2022Url, json: schema },
               submission,
             });
           });
@@ -1221,7 +1218,7 @@ router.post(
         };
 
         axiosFormio(req)
-          .put(`${formioCloseOutFormUrl}/submission/${mongoId}`, submission)
+          .put(`${formioCRF2022Url}/submission/${mongoId}`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
diff --git a/app/server/app/routes/help.js b/app/server/app/routes/help.js
index a501a58b..ffd990d5 100644
--- a/app/server/app/routes/help.js
+++ b/app/server/app/routes/help.js
@@ -3,9 +3,9 @@ const ObjectId = require("mongodb").ObjectId;
 // ---
 const {
   axiosFormio,
-  formioApplicationFormUrl,
-  formioPaymentRequestFormUrl,
-  formioCloseOutFormUrl,
+  formioFRF2022Url,
+  formioPRF2022Url,
+  formioCRF2022Url,
 } = require("../config/formio");
 const { ensureAuthenticated, ensureHelpdesk } = require("../middleware");
 const { getBapFormSubmissionData } = require("../utilities/bap");
@@ -41,11 +41,11 @@ router.get("/formio-submission/:formType/:id", (req, res) => {
 
   const formUrl =
     formType === "application"
-      ? formioApplicationFormUrl
+      ? formioFRF2022Url
       : formType === "payment-request"
-      ? formioPaymentRequestFormUrl
+      ? formioPRF2022Url
       : formType === "close-out"
-      ? formioCloseOutFormUrl
+      ? formioCRF2022Url
       : null; // fallback
 
   return getBapFormSubmissionData(req, formType, rebateId, mongoId).then(
diff --git a/app/server/app/routes/status.js b/app/server/app/routes/status.js
index 195f70fd..3416258c 100644
--- a/app/server/app/routes/status.js
+++ b/app/server/app/routes/status.js
@@ -2,9 +2,9 @@ const express = require("express");
 // ---
 const {
   axiosFormio,
-  formioApplicationFormUrl,
-  formioPaymentRequestFormUrl,
-  formioCloseOutFormUrl,
+  formioFRF2022Url,
+  formioPRF2022Url,
+  formioCRF2022Url,
 } = require("../config/formio");
 const { getSamEntities } = require("../utilities/bap");
 
@@ -31,7 +31,7 @@ router.get("/bap-sam-data", (req, res) => {
 
 router.get("/formio-application-schema", (req, res) => {
   axiosFormio(req)
-    .get(formioApplicationFormUrl)
+    .get(formioFRF2022Url)
     .then((axiosRes) => axiosRes.data)
     .then((schema) => {
       /**
@@ -48,7 +48,7 @@ router.get("/formio-application-schema", (req, res) => {
 
 router.get("/formio-payment-request-schema", (req, res) => {
   axiosFormio(req)
-    .get(formioPaymentRequestFormUrl)
+    .get(formioPRF2022Url)
     .then((axiosRes) => axiosRes.data)
     .then((schema) => {
       /**
@@ -65,7 +65,7 @@ router.get("/formio-payment-request-schema", (req, res) => {
 
 router.get("/formio-close-out-schema", (req, res) => {
   axiosFormio(req)
-    .get(formioCloseOutFormUrl)
+    .get(formioCRF2022Url)
     .then((axiosRes) => axiosRes.data)
     .then((schema) => {
       /**

From 914068a226e903d7cdb3af655fdad174b606c5a8 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 1 Aug 2023 14:25:15 -0400
Subject: [PATCH 20/71] Update references to form names in api to use
 abbreviations (excluding error messages returned to the client)

---
 app/server/app/routes/api.js | 65 ++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 9082832b..e0536a00 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -333,7 +333,7 @@ router.post(
   }
 );
 
-// --- get user's Application form submissions from Formio
+// --- get user's FRF submissions from Formio
 router.get("/formio-application-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
@@ -367,7 +367,7 @@ router.get("/formio-application-submissions", storeBapComboKeys, (req, res) => {
     });
 });
 
-// --- post a new Application form submission to Formio
+// --- post a new FRF submission to Formio
 router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
   const { bapComboKeys, body } = req;
   const { mail } = req.user;
@@ -381,7 +381,7 @@ router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
 
   if (!bapComboKeys.includes(comboKey)) {
     const logMessage =
-      `User with email '${mail}' attempted to post a new Application form submission ` +
+      `User with email '${mail}' attempted to post a new FRF submission ` +
       `without a matching BAP combo key.`;
     log({ level: "error", message: logMessage, req });
 
@@ -405,7 +405,7 @@ router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
     });
 });
 
-// --- get an existing Application form's schema and submission data from Formio
+// --- get an existing FRF's schema and submission data from Formio
 router.get(
   "/formio-application-submission/:mongoId",
   verifyMongoObjectId,
@@ -425,7 +425,7 @@ router.get(
 
         if (!bapComboKeys.includes(comboKey)) {
           const logMessage =
-            `User with email '${mail}' attempted to access Application form submission '${mongoId}' ` +
+            `User with email '${mail}' attempted to access FRF submission '${mongoId}' ` +
             `that they do not have access to.`;
           log({ level: "warn", message: logMessage, req });
 
@@ -451,7 +451,7 @@ router.get(
   }
 );
 
-// --- post an update to an existing draft Application form submission to Formio
+// --- post an update to an existing draft FRF submission to Formio
 router.post(
   "/formio-application-submission/:mongoId",
   verifyMongoObjectId,
@@ -475,7 +475,7 @@ router.post(
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
           const logMessage =
-            `User with email '${mail}' attempted to update Application form submission '${mongoId}' ` +
+            `User with email '${mail}' attempted to update FRF submission '${mongoId}' ` +
             `without a matching BAP combo key.`;
           log({ level: "error", message: logMessage, req });
 
@@ -503,8 +503,8 @@ router.post(
       })
       .catch((error) => {
         const logMessage =
-          `User with email '${mail}' attempted to update Application form submission '${mongoId}' ` +
-          `when the CSB Application form enrollment period was closed.`;
+          `User with email '${mail}' attempted to update FRF submission '${mongoId}' ` +
+          `when the CSB FRF enrollment period was closed.`;
         log({ level: "error", message: logMessage, req });
 
         const errorStatus = 400;
@@ -514,7 +514,7 @@ router.post(
   }
 );
 
-// --- get user's Payment Request form submissions from Formio
+// --- get user's PRF submissions from Formio
 router.get(
   "/formio-payment-request-submissions",
   storeBapComboKeys,
@@ -542,7 +542,7 @@ router.get(
   }
 );
 
-// --- post a new Payment Request form submission to Formio
+// --- post a new PRF submission to Formio
 router.post(
   "/formio-payment-request-submission",
   storeBapComboKeys,
@@ -568,7 +568,7 @@ router.post(
 
     if (!bapComboKeys.includes(comboKey)) {
       const logMessage =
-        `User with email '${mail}' attempted to post a new Payment Request form submission ` +
+        `User with email '${mail}' attempted to post a new PRF submission ` +
         `without a matching BAP combo key.`;
       log({ level: "error", message: logMessage, req });
 
@@ -673,7 +673,7 @@ router.post(
   }
 );
 
-// --- get an existing Payment Request form's schema and submission data from Formio
+// --- get an existing PRF's schema and submission data from Formio
 router.get(
   "/formio-payment-request-submission/:rebateId",
   storeBapComboKeys,
@@ -699,7 +699,7 @@ router.get(
 
         if (!bapComboKeys.includes(comboKey)) {
           const logMessage =
-            `User with email '${mail}' attempted to access Payment Request form submission '${rebateId}' ` +
+            `User with email '${mail}' attempted to access PRF submission '${rebateId}' ` +
             `that they do not have access to.`;
           log({ level: "warn", message: logMessage, req });
 
@@ -745,7 +745,7 @@ router.get(
   }
 );
 
-// --- post an update to an existing draft Payment Request form submission to Formio
+// --- post an update to an existing draft PRF submission to Formio
 router.post(
   "/formio-payment-request-submission/:rebateId",
   storeBapComboKeys,
@@ -768,7 +768,7 @@ router.post(
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
           const logMessage =
-            `User with email '${mail}' attempted to update Payment Request form submission '${rebateId}' ` +
+            `User with email '${mail}' attempted to update PRF submission '${rebateId}' ` +
             `without a matching BAP combo key.`;
           log({ level: "error", message: logMessage, req });
 
@@ -803,8 +803,8 @@ router.post(
       })
       .catch((error) => {
         const logMessage =
-          `User with email '${mail}' attempted to update Payment Request form submission '${rebateId}' ` +
-          `when the CSB Payment Request form enrollment period was closed.`;
+          `User with email '${mail}' attempted to update PRF submission '${rebateId}' ` +
+          `when the CSB PRF enrollment period was closed.`;
         log({ level: "error", message: logMessage, req });
 
         const errorStatus = 400;
@@ -814,7 +814,7 @@ router.post(
   }
 );
 
-// --- delete an existing Payment Request form submission from Formio
+// --- delete an existing PRF submission from Formio
 router.post(
   "/delete-formio-payment-request-submission",
   storeBapComboKeys,
@@ -826,7 +826,7 @@ router.post(
     // verify post data includes one of user's BAP combo keys
     if (!bapComboKeys.includes(comboKey)) {
       const logMessage =
-        `User with email '${mail}' attempted to delete Payment Request form submission '${rebateId}' ` +
+        `User with email '${mail}' attempted to delete PRF submission '${rebateId}' ` +
         `without a matching BAP combo key.`;
       log({ level: "error", message: logMessage, req });
 
@@ -836,9 +836,8 @@ router.post(
     }
 
     /**
-     * ensure the BAP status of the corresponding Application form submission
-     * is "Edits Requested" before deleting the Payment Request form submission
-     * from Formio
+     * ensure the BAP status of the corresponding FRF submission is "Edits
+     * Requested" before deleting the FRF submission from Formio
      */
     getBapFormSubmissionsStatuses(req, req.bapComboKeys)
       .then((submissions) => {
@@ -863,7 +862,7 @@ router.post(
           .delete(`${formioPRF2022Url}/submission/${mongoId}`)
           .then((axiosRes) => axiosRes.data)
           .then((response) => {
-            const logMessage = `User with email '${mail}' successfully deleted Payment Request form submission '${rebateId}'.`;
+            const logMessage = `User with email '${mail}' successfully deleted PRF submission '${rebateId}'.`;
             log({ level: "info", message: logMessage, req });
 
             res.json(response);
@@ -884,7 +883,7 @@ router.post(
   }
 );
 
-// --- get user's Close Out form submissions from Formio
+// --- get user's CRF submissions from Formio
 router.get("/formio-close-out-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
@@ -908,7 +907,7 @@ router.get("/formio-close-out-submissions", storeBapComboKeys, (req, res) => {
     });
 });
 
-// --- post a new Close Out form submission to Formio
+// --- post a new CRF submission to Formio
 router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
   const { bapComboKeys, body } = req;
   const { mail } = req.user;
@@ -932,7 +931,7 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
 
   if (!bapComboKeys.includes(comboKey)) {
     const logMessage =
-      `User with email '${mail}' attempted to post a new Close Out form submission ` +
+      `User with email '${mail}' attempted to post a new CRF submission ` +
       `without a matching BAP combo key.`;
     log({ level: "error", message: logMessage, req });
 
@@ -1100,7 +1099,7 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
     });
 });
 
-// --- get an existing Close Out form's schema and submission data from Formio
+// --- get an existing CRF's schema and submission data from Formio
 router.get(
   "/formio-close-out-submission/:rebateId",
   storeBapComboKeys,
@@ -1126,7 +1125,7 @@ router.get(
 
         if (!bapComboKeys.includes(comboKey)) {
           const logMessage =
-            `User with email '${mail}' attempted to access Close Out form submission '${rebateId}' ` +
+            `User with email '${mail}' attempted to access CRF submission '${rebateId}' ` +
             `that they do not have access to.`;
           log({ level: "warn", message: logMessage, req });
 
@@ -1172,7 +1171,7 @@ router.get(
   }
 );
 
-// --- post an update to an existing draft Close Out form submission to Formio
+// --- post an update to an existing draft CRF submission to Formio
 router.post(
   "/formio-close-out-submission/:rebateId",
   storeBapComboKeys,
@@ -1195,7 +1194,7 @@ router.post(
       .then(() => {
         if (!bapComboKeys.includes(comboKey)) {
           const logMessage =
-            `User with email '${mail}' attempted to update Close Out form submission '${rebateId}' ` +
+            `User with email '${mail}' attempted to update CRF submission '${rebateId}' ` +
             `without a matching BAP combo key.`;
           log({ level: "error", message: logMessage, req });
 
@@ -1230,8 +1229,8 @@ router.post(
       })
       .catch((error) => {
         const logMessage =
-          `User with email '${mail}' attempted to update Close Out form submission '${rebateId}' ` +
-          `when the CSB Close Out form enrollment period was closed.`;
+          `User with email '${mail}' attempted to update CRF submission '${rebateId}' ` +
+          `when the CSB CRF enrollment period was closed.`;
         log({ level: "error", message: logMessage, req });
 
         const errorStatus = 400;

From bc534cab6342f362620e8703ff1daa3c9e979049 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 1 Aug 2023 16:45:31 -0400
Subject: [PATCH 21/71] Update references to form names in helpdesk api to use
 abbreviations

---
 app/client/src/routes/helpdesk.tsx | 46 +++++++++++++++---------------
 app/server/app/routes/help.js      | 16 +++++------
 app/server/app/utilities/bap.js    | 19 ++++--------
 3 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/app/client/src/routes/helpdesk.tsx b/app/client/src/routes/helpdesk.tsx
index 7fb47e80..ec89c70b 100644
--- a/app/client/src/routes/helpdesk.tsx
+++ b/app/client/src/routes/helpdesk.tsx
@@ -29,7 +29,7 @@ import { Message } from "components/message";
 import { MarkdownContent } from "components/markdownContent";
 import { TextWithTooltip } from "components/tooltip";
 
-type FormType = "application" | "payment-request" | "close-out";
+type FormType = "frf" | "prf" | "crf";
 
 type ServerResponse =
   | {
@@ -75,11 +75,11 @@ function getStatus(options: {
 
   return submissionNeedsEdits({ formio, bap })
     ? "Edits Requested"
-    : formType === "application"
+    : formType === "frf"
     ? bapApplicationStatusMap.get(bapInternalStatus) || formioStatus
-    : formType === "payment-request"
+    : formType === "prf"
     ? bapPaymentRequestStatusMap.get(bapInternalStatus) || formioStatus
-    : formType === "close-out"
+    : formType === "crf"
     ? bapCloseOutStatusMap.get(bapInternalStatus) || formioStatus
     : "";
 }
@@ -91,7 +91,7 @@ export function Helpdesk() {
   const content = useContentData();
   const helpdeskAccess = useHelpdeskAccess();
 
-  const [formType, setFormType] = useState<FormType>("application");
+  const [formType, setFormType] = useState<FormType>("frf");
   const [searchText, setSearchText] = useState("");
   const [lastSearchedText, setLastSearchedText] = useState("");
   const [resultDisplayed, setResultDisplayed] = useState(false);
@@ -138,12 +138,12 @@ export function Helpdesk() {
         <fieldset className="usa-fieldset mobile-lg:display-flex">
           <div className="usa-radio">
             <input
-              id="form-type-application"
+              id="form-type-frf"
               className="usa-radio__input"
               type="radio"
               name="form-type"
-              value="application"
-              checked={formType === "application"}
+              value="frf"
+              checked={formType === "frf"}
               onChange={(ev) => {
                 setFormType(ev.target.value as FormType);
                 setResultDisplayed(false);
@@ -152,7 +152,7 @@ export function Helpdesk() {
             />
             <label
               className="usa-radio__label margin-top-0"
-              htmlFor="form-type-application"
+              htmlFor="form-type-frf"
             >
               Application
             </label>
@@ -160,12 +160,12 @@ export function Helpdesk() {
 
           <div className="usa-radio mobile-lg:margin-left-3">
             <input
-              id="form-type-payment-request"
+              id="form-type-prf"
               className="usa-radio__input"
               type="radio"
               name="form-type"
-              value="payment-request"
-              checked={formType === "payment-request"}
+              value="prf"
+              checked={formType === "prf"}
               onChange={(ev) => {
                 setFormType(ev.target.value as FormType);
                 setResultDisplayed(false);
@@ -174,7 +174,7 @@ export function Helpdesk() {
             />
             <label
               className="usa-radio__label mobile-lg:margin-top-0"
-              htmlFor="form-type-payment-request"
+              htmlFor="form-type-prf"
             >
               Payment Request
             </label>
@@ -182,12 +182,12 @@ export function Helpdesk() {
 
           <div className="usa-radio mobile-lg:margin-left-3">
             <input
-              id="form-type-close-out"
+              id="form-type-crf"
               className="usa-radio__input"
               type="radio"
               name="form-type"
-              value="close-out"
-              checked={formType === "close-out"}
+              value="crf"
+              checked={formType === "crf"}
               onChange={(ev) => {
                 setFormType(ev.target.value as FormType);
                 setResultDisplayed(false);
@@ -196,7 +196,7 @@ export function Helpdesk() {
             />
             <label
               className="usa-radio__label mobile-lg:margin-top-0"
-              htmlFor="form-type-close-out"
+              htmlFor="form-type-crf"
             >
               Close Out
             </label>
@@ -324,21 +324,21 @@ export function Helpdesk() {
 
                   <td>{getStatus({ formType, formio, bap })}</td>
 
-                  {formType === "application" ? (
+                  {formType === "frf" ? (
                     <td>{formio.data.sam_hidden_applicant_name as string}</td>
-                  ) : formType === "payment-request" ? (
+                  ) : formType === "prf" ? (
                     <td>{formio.data.applicantName as string}</td>
-                  ) : formType === "close-out" ? (
+                  ) : formType === "crf" ? (
                     <td>{formio.data.signatureName as string}</td>
                   ) : (
                     <td>&nbsp;</td>
                   )}
 
-                  {formType === "application" ? (
+                  {formType === "frf" ? (
                     <td>{formio.data.last_updated_by as string}</td>
-                  ) : formType === "payment-request" ? (
+                  ) : formType === "prf" ? (
                     <td>{formio.data.hidden_current_user_email as string}</td>
-                  ) : formType === "close-out" ? (
+                  ) : formType === "crf" ? (
                     <td>{formio.data.hidden_current_user_email as string}</td>
                   ) : (
                     <td>&nbsp;</td>
diff --git a/app/server/app/routes/help.js b/app/server/app/routes/help.js
index ffd990d5..99933f84 100644
--- a/app/server/app/routes/help.js
+++ b/app/server/app/routes/help.js
@@ -31,20 +31,20 @@ router.get("/formio-submission/:formType/:id", (req, res) => {
   }
 
   const formName =
-    formType === "application"
+    formType === "frf"
       ? "CSB Application"
-      : formType === "payment-request"
+      : formType === "prf"
       ? "CSB Payment Request"
-      : formType === "close-out"
+      : formType === "crf"
       ? "CSB Close Out"
       : "CSB";
 
   const formUrl =
-    formType === "application"
+    formType === "frf"
       ? formioFRF2022Url
-      : formType === "payment-request"
+      : formType === "prf"
       ? formioPRF2022Url
-      : formType === "close-out"
+      : formType === "crf"
       ? formioCRF2022Url
       : null; // fallback
 
@@ -53,7 +53,7 @@ router.get("/formio-submission/:formType/:id", (req, res) => {
       if (!bapSubmission || !formUrl) {
         const logId = rebateId || mongoId;
         const errorStatus = 500;
-        const errorMessage = `Error getting ${formName} form submission '${logId}' from the BAP.`;
+        const errorMessage = `Error getting ${formName} submission '${logId}' from the BAP.`;
         return res.status(errorStatus).json({ message: errorMessage });
       }
 
@@ -96,7 +96,7 @@ router.get("/formio-submission/:formType/:id", (req, res) => {
         .catch((error) => {
           // NOTE: logged in axiosFormio response interceptor
           const errorStatus = error.response?.status || 500;
-          const errorMessage = `Error getting ${formName} form submission '${CSB_Form_ID__c}'.`;
+          const errorMessage = `Error getting ${formName} submission '${CSB_Form_ID__c}'.`;
           return res.status(errorStatus).json({ message: errorMessage });
         });
     }
diff --git a/app/server/app/utilities/bap.js b/app/server/app/utilities/bap.js
index 1070e82f..d02cdefa 100644
--- a/app/server/app/utilities/bap.js
+++ b/app/server/app/utilities/bap.js
@@ -313,34 +313,25 @@ async function queryForSamEntities(req, email) {
  * statuses and related metadata.
  *
  * @param {express.Request} req
- * @param {'application' | 'payment-request' | 'close-out'} formType
+ * @param {'frf' | 'prf' | 'crf'} formType
  * @param {string | null} rebateId
  * @param {string | null} mongoId
  * @returns {Promise<BapFormSubmission | null>} fields associated a form submission
  */
 async function queryForBapFormSubmissionData(req, formType, rebateId, mongoId) {
-  const formName =
-    formType === "application"
-      ? "CSB Application"
-      : formType === "payment-request"
-      ? "CSB Payment Request"
-      : formType === "close-out"
-      ? "CSB Close Out"
-      : "CSB";
-
   const logId = rebateId ? `rebateId: '${rebateId}'` : `mongoId: '${mongoId}'`;
-  const logMessage = `Querying the BAP for ${formName} form submission data associated with ${logId}.`;
+  const logMessage = `Querying the BAP for ${formType.toUpperCase()} submission data associated with ${logId}.`;
   log({ level: "info", message: logMessage });
 
   /** @type {jsforce.Connection} */
   const { bapConnection } = req.app.locals;
 
   const developername =
-    formType === "application"
+    formType === "frf"
       ? "CSB_Funding_Request"
-      : formType === "payment-request"
+      : formType === "prf"
       ? "CSB_Payment_Request"
-      : formType === "close-out"
+      : formType === "crf"
       ? "CSB_Closeout_Request"
       : null; // fallback
 

From 088f041c355fbd125149c06ffbb9aa1b28f04ea1 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 1 Aug 2023 17:18:02 -0400
Subject: [PATCH 22/71] Update client app to begin using form acronyms for form
 types

---
 app/client/src/routes/allRebates.tsx         | 181 +++++++--------
 app/client/src/routes/applicationForm.tsx    |  20 +-
 app/client/src/routes/closeOutForm.tsx       |  10 +-
 app/client/src/routes/helpdesk.tsx           |  16 +-
 app/client/src/routes/newApplicationForm.tsx |   4 +-
 app/client/src/routes/paymentRequestForm.tsx |  14 +-
 app/client/src/utilities.tsx                 | 226 +++++++++----------
 7 files changed, 222 insertions(+), 249 deletions(-)

diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index 8b0cc74f..a03c4333 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -56,7 +56,7 @@ function ButtonLink(props: { type: "edit" | "view"; to: LinkProps["to"] }) {
 
 function ApplicationSubmission(props: { rebate: Rebate }) {
   const { rebate } = props;
-  const { application, paymentRequest, closeOut } = rebate;
+  const { frf, prf, crf } = rebate;
 
   const configData = useConfigData();
   const { rebateYear } = useRebateYearState();
@@ -72,37 +72,35 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
     applicantOrganizationName,
     schoolDistrictName,
     last_updated_by,
-  } = application.formio.data;
+  } = frf.formio.data;
 
-  const date = new Date(application.formio.modified).toLocaleDateString();
-  const time = new Date(application.formio.modified).toLocaleTimeString();
+  const date = new Date(frf.formio.modified).toLocaleDateString();
+  const time = new Date(frf.formio.modified).toLocaleTimeString();
 
   const applicationNeedsEdits = submissionNeedsEdits({
-    formio: application.formio,
-    bap: application.bap,
+    formio: frf.formio,
+    bap: frf.bap,
   });
 
   const applicationNeedsClarification =
-    application.bap?.status === "Needs Clarification";
+    frf.bap?.status === "Needs Clarification";
 
-  const applicationHasBeenWithdrawn = application.bap?.status === "Withdrawn";
+  const applicationHasBeenWithdrawn = frf.bap?.status === "Withdrawn";
 
-  const applicationNotSelected =
-    application.bap?.status === "Coordinator Denied";
+  const applicationNotSelected = frf.bap?.status === "Coordinator Denied";
 
-  const applicationSelected = application.bap?.status === "Accepted";
+  const applicationSelected = frf.bap?.status === "Accepted";
 
   const applicationSelectedButNoPaymentRequest =
-    applicationSelected && !Boolean(paymentRequest.formio);
+    applicationSelected && !Boolean(prf.formio);
 
-  const paymentRequestFundingApproved =
-    paymentRequest.bap?.status === "Accepted";
+  const paymentRequestFundingApproved = prf.bap?.status === "Accepted";
 
   const paymentRequestFundingApprovedButNoCloseOut =
-    paymentRequestFundingApproved && !Boolean(closeOut.formio);
+    paymentRequestFundingApproved && !Boolean(crf.formio);
 
   const statusTableCellClassNames =
-    application.formio.state === "submitted" || !applicationFormOpen
+    frf.formio.state === "submitted" || !applicationFormOpen
       ? "text-italic"
       : "";
 
@@ -118,9 +116,9 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
     ? `${icons}#cancel` // x inside a circle
     : applicationSelected
     ? `${icons}#check_circle` // check inside a circle
-    : application.formio.state === "draft"
+    : frf.formio.state === "draft"
     ? `${icons}#more_horiz` // three horizontal dots
-    : application.formio.state === "submitted"
+    : frf.formio.state === "submitted"
     ? `${icons}#check` // check
     : `${icons}#remove`; // — (fallback, not used)
 
@@ -132,13 +130,13 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
     ? "Not Selected"
     : applicationSelected
     ? "Selected"
-    : application.formio.state === "draft"
+    : frf.formio.state === "draft"
     ? "Draft"
-    : application.formio.state === "submitted"
+    : frf.formio.state === "submitted"
     ? "Submitted"
     : ""; // fallback, not used
 
-  const applicationFormUrl = `/rebate/${application.formio._id}`;
+  const applicationFormUrl = `/rebate/${frf.formio._id}`;
 
   /**
    * NOTE on the usage of `TextWithTooltip` below:
@@ -167,17 +165,17 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
       <th scope="row" className={statusTableCellClassNames}>
         {applicationNeedsEdits ? (
           <ButtonLink type="edit" to={applicationFormUrl} />
-        ) : application.formio.state === "submitted" || !applicationFormOpen ? (
+        ) : frf.formio.state === "submitted" || !applicationFormOpen ? (
           <ButtonLink type="view" to={applicationFormUrl} />
-        ) : application.formio.state === "draft" ? (
+        ) : frf.formio.state === "draft" ? (
           <ButtonLink type="edit" to={applicationFormUrl} />
         ) : null}
       </th>
 
       <td className={statusTableCellClassNames}>
-        {application.bap?.rebateId ? (
-          <span title={`Application ID: ${application.formio._id}`}>
-            {application.bap.rebateId}
+        {frf.bap?.rebateId ? (
+          <span title={`Application ID: ${frf.formio._id}`}>
+            {frf.bap.rebateId}
           </span>
         ) : (
           <TextWithTooltip
@@ -309,7 +307,7 @@ save the form for the EFT indicator to be displayed. */
 
 function PaymentRequestSubmission(props: { rebate: Rebate }) {
   const { rebate } = props;
-  const { application, paymentRequest, closeOut } = rebate;
+  const { frf, prf, crf } = rebate;
 
   const navigate = useNavigate();
   const { email } = useOutletContext<{ email: string }>();
@@ -331,17 +329,16 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
   const paymentRequestFormOpen =
     configData.submissionPeriodOpen[rebateYear].prf;
 
-  const applicationSelected = application.bap?.status === "Accepted";
+  const applicationSelected = frf.bap?.status === "Accepted";
 
   const applicationSelectedButNoPaymentRequest =
-    applicationSelected && !Boolean(paymentRequest.formio);
+    applicationSelected && !Boolean(prf.formio);
 
   /** matched SAM.gov entity for the Application submission */
   const entity = bapSamData.entities.find((entity) => {
     return (
       entity.ENTITY_STATUS__c === "Active" &&
-      entity.ENTITY_COMBO_KEY__c ===
-        application.formio.data.bap_hidden_entity_combo_key
+      entity.ENTITY_COMBO_KEY__c === frf.formio.data.bap_hidden_entity_combo_key
     );
   });
 
@@ -352,7 +349,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
           <button
             className="usa-button font-sans-2xs margin-right-0 padding-x-105 padding-y-1"
             onClick={(ev) => {
-              if (!application.bap || !entity) return;
+              if (!frf.bap || !entity) return;
 
               // account for when data is posting to prevent double submits
               if (dataIsPosting) return;
@@ -366,13 +363,13 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
                 title,
                 name,
                 entity,
-                comboKey: application.bap.comboKey,
-                rebateId: application.bap.rebateId, // CSB Rebate ID (6 digits)
-                applicationReviewItemId: application.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
-                applicationFormModified: application.bap.modified,
+                comboKey: frf.bap.comboKey,
+                rebateId: frf.bap.rebateId, // CSB Rebate ID (6 digits)
+                applicationReviewItemId: frf.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
+                applicationFormModified: frf.bap.modified,
               })
                 .then((res) => {
-                  navigate(`/payment-request/${application.bap?.rebateId}`);
+                  navigate(`/payment-request/${frf.bap?.rebateId}`);
                 })
                 .catch((err) => {
                   displayErrorNotification({
@@ -381,7 +378,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
                       <>
                         <p className="tw-text-sm tw-font-medium tw-text-gray-900">
                           Error creating Payment Request{" "}
-                          <em>{application.bap?.rebateId}</em>.
+                          <em>{frf.bap?.rebateId}</em>.
                         </p>
                         <p className="tw-mt-1 tw-text-sm tw-text-gray-500">
                           Please try again.
@@ -414,41 +411,38 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
   }
 
   // return if a Payment Request submission has not been created for this rebate
-  if (!paymentRequest.formio) return null;
+  if (!prf.formio) return null;
 
-  const { hidden_current_user_email, hidden_bap_rebate_id } =
-    paymentRequest.formio.data;
+  const { hidden_current_user_email, hidden_bap_rebate_id } = prf.formio.data;
 
-  const date = new Date(paymentRequest.formio.modified).toLocaleDateString();
-  const time = new Date(paymentRequest.formio.modified).toLocaleTimeString();
+  const date = new Date(prf.formio.modified).toLocaleDateString();
+  const time = new Date(prf.formio.modified).toLocaleTimeString();
 
   const applicationNeedsEdits = submissionNeedsEdits({
-    formio: application.formio,
-    bap: application.bap,
+    formio: frf.formio,
+    bap: frf.bap,
   });
 
   const paymentRequestNeedsEdits = submissionNeedsEdits({
-    formio: paymentRequest.formio,
-    bap: paymentRequest.bap,
+    formio: prf.formio,
+    bap: prf.bap,
   });
 
   const paymentRequestNeedsClarification =
-    paymentRequest.bap?.status === "Needs Clarification";
+    prf.bap?.status === "Needs Clarification";
 
-  const paymentRequestHasBeenWithdrawn =
-    paymentRequest.bap?.status === "Withdrawn";
+  const paymentRequestHasBeenWithdrawn = prf.bap?.status === "Withdrawn";
 
   const paymentRequestFundingNotApproved =
-    paymentRequest.bap?.status === "Coordinator Denied";
+    prf.bap?.status === "Coordinator Denied";
 
-  const paymentRequestFundingApproved =
-    paymentRequest.bap?.status === "Accepted";
+  const paymentRequestFundingApproved = prf.bap?.status === "Accepted";
 
   const paymentRequestFundingApprovedButNoCloseOut =
-    paymentRequestFundingApproved && !Boolean(closeOut.formio);
+    paymentRequestFundingApproved && !Boolean(crf.formio);
 
   const statusTableCellClassNames =
-    paymentRequest.formio.state === "submitted" || !paymentRequestFormOpen
+    prf.formio.state === "submitted" || !paymentRequestFormOpen
       ? "text-italic"
       : "";
 
@@ -464,9 +458,9 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
     ? `${icons}#cancel` // ✕ inside a circle
     : paymentRequestFundingApproved
     ? `${icons}#check_circle` // check inside a circle
-    : paymentRequest.formio.state === "draft"
+    : prf.formio.state === "draft"
     ? `${icons}#more_horiz` // three horizontal dots
-    : paymentRequest.formio.state === "submitted"
+    : prf.formio.state === "submitted"
     ? `${icons}#check` // check
     : `${icons}#remove`; // — (fallback, not used)
 
@@ -478,9 +472,9 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
     ? "Funding Not Approved"
     : paymentRequestFundingApproved
     ? "Funding Approved"
-    : paymentRequest.formio.state === "draft"
+    : prf.formio.state === "draft"
     ? "Draft"
-    : paymentRequest.formio.state === "submitted"
+    : prf.formio.state === "submitted"
     ? "Submitted"
     : ""; // fallback, not used
 
@@ -499,10 +493,9 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
           <ButtonLink type="view" to={paymentRequestFormUrl} />
         ) : paymentRequestNeedsEdits ? (
           <ButtonLink type="edit" to={paymentRequestFormUrl} />
-        ) : paymentRequest.formio.state === "submitted" ||
-          !paymentRequestFormOpen ? (
+        ) : prf.formio.state === "submitted" || !paymentRequestFormOpen ? (
           <ButtonLink type="view" to={paymentRequestFormUrl} />
-        ) : paymentRequest.formio.state === "draft" ? (
+        ) : prf.formio.state === "draft" ? (
           <ButtonLink type="edit" to={paymentRequestFormUrl} />
         ) : null}
       </th>
@@ -550,7 +543,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
 
 function CloseOutSubmission(props: { rebate: Rebate }) {
   const { rebate } = props;
-  const { application, paymentRequest, closeOut } = rebate;
+  const { frf, prf, crf } = rebate;
 
   const navigate = useNavigate();
   const { email } = useOutletContext<{ email: string }>();
@@ -571,18 +564,17 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
 
   const closeOutFormOpen = configData.submissionPeriodOpen[rebateYear].crf;
 
-  const paymentRequestFundingApproved =
-    paymentRequest.bap?.status === "Accepted";
+  const paymentRequestFundingApproved = prf.bap?.status === "Accepted";
 
   const paymentRequestFundingApprovedButNoCloseOut =
-    paymentRequestFundingApproved && !Boolean(closeOut.formio);
+    paymentRequestFundingApproved && !Boolean(crf.formio);
 
   /** matched SAM.gov entity for the Payment Request submission */
   const entity = bapSamData.entities.find((entity) => {
     return (
       entity.ENTITY_STATUS__c === "Active" &&
       entity.ENTITY_COMBO_KEY__c ===
-        paymentRequest.formio?.data.bap_hidden_entity_combo_key
+        prf.formio?.data.bap_hidden_entity_combo_key
     );
   });
 
@@ -593,7 +585,7 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
           <button
             className="usa-button font-sans-2xs margin-right-0 padding-x-105 padding-y-1"
             onClick={(ev) => {
-              if (!application.bap || !paymentRequest.bap || !entity) return;
+              if (!frf.bap || !prf.bap || !entity) return;
 
               // account for when data is posting to prevent double submits
               if (dataIsPosting) return;
@@ -607,14 +599,14 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
                 title,
                 name,
                 entity,
-                comboKey: paymentRequest.bap.comboKey,
-                rebateId: paymentRequest.bap.rebateId, // CSB Rebate ID (6 digits)
-                applicationReviewItemId: application.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
-                paymentRequestReviewItemId: paymentRequest.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
-                paymentRequestFormModified: paymentRequest.bap.modified,
+                comboKey: prf.bap.comboKey,
+                rebateId: prf.bap.rebateId, // CSB Rebate ID (6 digits)
+                applicationReviewItemId: frf.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
+                paymentRequestReviewItemId: prf.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
+                paymentRequestFormModified: prf.bap.modified,
               })
                 .then((res) => {
-                  navigate(`/close-out/${paymentRequest.bap?.rebateId}`);
+                  navigate(`/close-out/${prf.bap?.rebateId}`);
                 })
                 .catch((err) => {
                   displayErrorNotification({
@@ -622,8 +614,7 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
                     body: (
                       <>
                         <p className="tw-text-sm tw-font-medium tw-text-gray-900">
-                          Error creating Close Out{" "}
-                          <em>{paymentRequest.bap?.rebateId}</em>.
+                          Error creating Close Out <em>{prf.bap?.rebateId}</em>.
                         </p>
                         <p className="tw-mt-1 tw-text-sm tw-text-gray-500">
                           Please try again.
@@ -656,33 +647,29 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
   }
 
   // return if a Close Out submission has not been created for this rebate
-  if (!closeOut.formio) return null;
+  if (!crf.formio) return null;
 
-  const { hidden_current_user_email, hidden_bap_rebate_id } =
-    closeOut.formio.data;
+  const { hidden_current_user_email, hidden_bap_rebate_id } = crf.formio.data;
 
-  const date = new Date(closeOut.formio.modified).toLocaleDateString();
-  const time = new Date(closeOut.formio.modified).toLocaleTimeString();
+  const date = new Date(crf.formio.modified).toLocaleDateString();
+  const time = new Date(crf.formio.modified).toLocaleTimeString();
 
   const closeOutNeedsEdits = submissionNeedsEdits({
-    formio: closeOut.formio,
-    bap: closeOut.bap,
+    formio: crf.formio,
+    bap: crf.bap,
   });
 
-  const closeOutNeedsClarification =
-    closeOut.bap?.status === "Needs Clarification";
+  const closeOutNeedsClarification = crf.bap?.status === "Needs Clarification";
 
   const closeOutReimbursementNeeded =
-    closeOut.bap?.status === "Reimbursement Needed";
+    crf.bap?.status === "Reimbursement Needed";
 
-  const closeOutNotApproved = closeOut.bap?.status === "Branch Director Denied";
+  const closeOutNotApproved = crf.bap?.status === "Branch Director Denied";
 
-  const closeOutApproved = closeOut.bap?.status === "Branch Director Approved";
+  const closeOutApproved = crf.bap?.status === "Branch Director Approved";
 
   const statusTableCellClassNames =
-    closeOut.formio.state === "submitted" || !closeOutFormOpen
-      ? "text-italic"
-      : "";
+    crf.formio.state === "submitted" || !closeOutFormOpen ? "text-italic" : "";
 
   const statusIconClassNames = closeOutApproved
     ? "usa-icon text-primary" // blue
@@ -694,9 +681,9 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
     ? `${icons}#cancel` // ✕ inside a circle
     : closeOutApproved
     ? `${icons}#check_circle` // check inside a circle
-    : closeOut.formio.state === "draft"
+    : crf.formio.state === "draft"
     ? `${icons}#more_horiz` // three horizontal dots
-    : closeOut.formio.state === "submitted"
+    : crf.formio.state === "submitted"
     ? `${icons}#check` // check
     : `${icons}#remove`; // — (fallback, not used)
 
@@ -706,9 +693,9 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
     ? "Close Out Not Approved"
     : closeOutApproved
     ? "Close Out Approved"
-    : closeOut.formio.state === "draft"
+    : crf.formio.state === "draft"
     ? "Draft"
-    : closeOut.formio.state === "submitted"
+    : crf.formio.state === "submitted"
     ? "Submitted"
     : ""; // fallback, not used
 
@@ -725,9 +712,9 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
       <th scope="row" className={statusTableCellClassNames}>
         {closeOutNeedsEdits ? (
           <ButtonLink type="edit" to={closeOutFormUrl} />
-        ) : closeOut.formio.state === "submitted" || !closeOutFormOpen ? (
+        ) : crf.formio.state === "submitted" || !closeOutFormOpen ? (
           <ButtonLink type="view" to={closeOutFormUrl} />
-        ) : closeOut.formio.state === "draft" ? (
+        ) : crf.formio.state === "draft" ? (
           <ButtonLink type="edit" to={closeOutFormUrl} />
         ) : null}
       </th>
diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index 0726ed31..1684618f 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -9,7 +9,7 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  FormioApplicationSubmission,
+  FormioFRFSubmission,
   getData,
   postData,
   useContentData,
@@ -36,7 +36,7 @@ type ServerResponse =
   | {
       userAccess: true;
       formSchema: { url: string; json: object };
-      submission: FormioApplicationSubmission;
+      submission: FormioFRFSubmission;
     };
 
 /** Custom hook to fetch Formio submission data */
@@ -89,7 +89,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
       metadata: { [field: string]: unknown };
       state: "submitted" | "draft";
     }) => {
-      return postData<FormioApplicationSubmission>(url, updatedSubmission);
+      return postData<FormioFRFSubmission>(url, updatedSubmission);
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
@@ -189,17 +189,17 @@ function UserApplicationForm(props: { email: string }) {
     return <Message type="error" text={messages.formSubmissionError} />;
   }
 
-  const rebate = rebates.find((r) => r.application.formio._id === mongoId);
+  const rebate = rebates.find((r) => r.frf.formio._id === mongoId);
 
   const applicationNeedsEdits = !rebate
     ? false
     : submissionNeedsEdits({
-        formio: rebate.application.formio,
-        bap: rebate.application.bap,
+        formio: rebate.frf.formio,
+        bap: rebate.frf.bap,
       });
 
   const applicationNeedsEditsAndPaymentRequestExists =
-    applicationNeedsEdits && !!rebate?.paymentRequest.formio;
+    applicationNeedsEdits && !!rebate?.prf.formio;
 
   /**
    * NOTE: If the Application form submission needs edits and there's a
@@ -250,7 +250,7 @@ function UserApplicationForm(props: { email: string }) {
       ),
       confirmText: "Delete Payment Request Form Submission",
       confirmedAction: () => {
-        const paymentRequest = rebate.paymentRequest.formio;
+        const paymentRequest = rebate.prf.formio;
 
         if (!paymentRequest) {
           displayErrorNotification({
@@ -365,7 +365,7 @@ function UserApplicationForm(props: { email: string }) {
           </div>
         </li>
 
-        {rebate?.application.bap?.rebateId && (
+        {rebate?.frf.bap?.rebateId && (
           <li className="usa-icon-list__item">
             <div className="usa-icon-list__icon text-primary">
               <svg className="usa-icon" aria-hidden="true" role="img">
@@ -373,7 +373,7 @@ function UserApplicationForm(props: { email: string }) {
               </svg>
             </div>
             <div className="usa-icon-list__content">
-              <strong>Rebate ID:</strong> {rebate.application.bap.rebateId}
+              <strong>Rebate ID:</strong> {rebate.frf.bap.rebateId}
             </div>
           </li>
         )}
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index 1739b8cd..37c0780d 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -9,7 +9,7 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  FormioCloseOutSubmission,
+  FormioCRFSubmission,
   getData,
   postData,
   useContentData,
@@ -35,7 +35,7 @@ type ServerResponse =
   | {
       userAccess: true;
       formSchema: { url: string; json: object };
-      submission: FormioCloseOutSubmission;
+      submission: FormioCRFSubmission;
     };
 
 /** Custom hook to fetch Formio submission data */
@@ -84,7 +84,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
         state: "submitted" | "draft";
       };
     }) => {
-      return postData<FormioCloseOutSubmission>(url, updatedSubmission);
+      return postData<FormioCRFSubmission>(url, updatedSubmission);
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
@@ -187,8 +187,8 @@ function UserCloseOutForm(props: { email: string }) {
   const closeOutNeedsEdits = !rebate
     ? false
     : submissionNeedsEdits({
-        formio: rebate.closeOut.formio,
-        bap: rebate.closeOut.bap,
+        formio: rebate.crf.formio,
+        bap: rebate.crf.bap,
       });
 
   const closeOutFormOpen = configData.submissionPeriodOpen[rebateYear].crf;
diff --git a/app/client/src/routes/helpdesk.tsx b/app/client/src/routes/helpdesk.tsx
index ec89c70b..5f1ffc3d 100644
--- a/app/client/src/routes/helpdesk.tsx
+++ b/app/client/src/routes/helpdesk.tsx
@@ -14,9 +14,9 @@ import {
   bapCloseOutStatusMap,
 } from "../config";
 import {
-  FormioApplicationSubmission,
-  FormioPaymentRequestSubmission,
-  FormioCloseOutSubmission,
+  FormioFRFSubmission,
+  FormioPRFSubmission,
+  FormioCRFSubmission,
   BapSubmission,
   getData,
   postData,
@@ -39,10 +39,7 @@ type ServerResponse =
     }
   | {
       formSchema: { url: string; json: object };
-      formio:
-        | FormioApplicationSubmission
-        | FormioPaymentRequestSubmission
-        | FormioCloseOutSubmission;
+      formio: FormioFRFSubmission | FormioPRFSubmission | FormioCRFSubmission;
       bap: BapSubmission;
     };
 
@@ -61,10 +58,7 @@ function formatTime(dateTimeString: string | null) {
  */
 function getStatus(options: {
   formType: FormType;
-  formio:
-    | FormioApplicationSubmission
-    | FormioPaymentRequestSubmission
-    | FormioCloseOutSubmission;
+  formio: FormioFRFSubmission | FormioPRFSubmission | FormioCRFSubmission;
   bap: BapSubmission;
 }) {
   const { formType, formio, bap } = options;
diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/newApplicationForm.tsx
index d8ef5965..54c6af05 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/newApplicationForm.tsx
@@ -6,7 +6,7 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  FormioApplicationSubmission,
+  FormioFRFSubmission,
   postData,
   useContentData,
   useConfigData,
@@ -195,7 +195,7 @@ export function NewApplicationForm() {
                                           entity
                                         );
 
-                                        postData<FormioApplicationSubmission>(
+                                        postData<FormioFRFSubmission>(
                                           `${serverUrl}/api/formio-application-submission/`,
                                           {
                                             data: {
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index a94a39c5..84a2d184 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -9,7 +9,7 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  FormioPaymentRequestSubmission,
+  FormioPRFSubmission,
   getData,
   postData,
   useContentData,
@@ -35,7 +35,7 @@ type ServerResponse =
   | {
       userAccess: true;
       formSchema: { url: string; json: object };
-      submission: FormioPaymentRequestSubmission;
+      submission: FormioPRFSubmission;
     };
 
 /** Custom hook to fetch Formio submission data */
@@ -84,7 +84,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
         state: "submitted" | "draft";
       };
     }) => {
-      return postData<FormioPaymentRequestSubmission>(url, updatedSubmission);
+      return postData<FormioPRFSubmission>(url, updatedSubmission);
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
@@ -187,15 +187,15 @@ function UserPaymentRequestForm(props: { email: string }) {
   const applicationNeedsEdits = !rebate
     ? false
     : submissionNeedsEdits({
-        formio: rebate.application.formio,
-        bap: rebate.application.bap,
+        formio: rebate.frf.formio,
+        bap: rebate.frf.bap,
       });
 
   const paymentRequestNeedsEdits = !rebate
     ? false
     : submissionNeedsEdits({
-        formio: rebate.paymentRequest.formio,
-        bap: rebate.paymentRequest.bap,
+        formio: rebate.prf.formio,
+        bap: rebate.prf.bap,
       });
 
   const paymentRequestFormOpen =
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 706e5862..46cc8285 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -86,7 +86,7 @@ type BapFormSubmission = {
   attributes: { type: string; url: string };
 };
 
-export type FormioApplicationSubmission = {
+export type FormioFRFSubmission = {
   [field: string]: unknown;
   _id: string; // MongoDB ObjectId string
   state: "submitted" | "draft";
@@ -122,7 +122,7 @@ export type FormioApplicationSubmission = {
   };
 };
 
-export type FormioPaymentRequestSubmission = {
+export type FormioPRFSubmission = {
   [field: string]: unknown;
   _id: string; // MongoDB ObjectId string
   state: "submitted" | "draft";
@@ -142,7 +142,7 @@ export type FormioPaymentRequestSubmission = {
   };
 };
 
-export type FormioCloseOutSubmission = {
+export type FormioCRFSubmission = {
   [field: string]: unknown;
   _id: string; // MongoDB ObjectId string
   state: "submitted" | "draft";
@@ -172,16 +172,16 @@ export type BapSubmission = {
 };
 
 export type Rebate = {
-  application: {
-    formio: FormioApplicationSubmission;
+  frf: {
+    formio: FormioFRFSubmission;
     bap: BapSubmission | null;
   };
-  paymentRequest: {
-    formio: FormioPaymentRequestSubmission | null;
+  prf: {
+    formio: FormioPRFSubmission | null;
     bap: BapSubmission | null;
   };
-  closeOut: {
-    formio: FormioCloseOutSubmission | null;
+  crf: {
+    formio: FormioCRFSubmission | null;
     bap: BapSubmission | null;
   };
 };
@@ -305,11 +305,11 @@ export function useSubmissionsQueries() {
               (object, submission) => {
                 const formType =
                   submission.Record_Type_Name__c === "CSB Funding Request"
-                    ? "applications"
+                    ? "frfs"
                     : submission.Record_Type_Name__c === "CSB Payment Request"
-                    ? "paymentRequests"
+                    ? "prfs"
                     : submission.Record_Type_Name__c === "CSB Closeout Request"
-                    ? "closeOuts"
+                    ? "crfs"
                     : null;
 
                 if (formType) object[formType].push(submission);
@@ -317,9 +317,9 @@ export function useSubmissionsQueries() {
                 return object;
               },
               {
-                applications: [] as BapFormSubmission[],
-                paymentRequests: [] as BapFormSubmission[],
-                closeOuts: [] as BapFormSubmission[],
+                frfs: [] as BapFormSubmission[],
+                prfs: [] as BapFormSubmission[],
+                crfs: [] as BapFormSubmission[],
               }
             );
 
@@ -329,26 +329,26 @@ export function useSubmissionsQueries() {
         refetchOnWindowFocus: false,
       },
       {
-        queryKey: ["formio-application-submissions"],
+        queryKey: ["formio-frf-submissions"],
         queryFn: () => {
           const url = `${serverUrl}/api/formio-application-submissions`;
-          return getData<FormioApplicationSubmission[]>(url);
+          return getData<FormioFRFSubmission[]>(url);
         },
         refetchOnWindowFocus: false,
       },
       {
-        queryKey: ["formio-payment-request-submissions"],
+        queryKey: ["formio-prf-submissions"],
         queryFn: () => {
           const url = `${serverUrl}/api/formio-payment-request-submissions`;
-          return getData<FormioPaymentRequestSubmission[]>(url);
+          return getData<FormioPRFSubmission[]>(url);
         },
         refetchOnWindowFocus: false,
       },
       {
-        queryKey: ["formio-close-out-submissions"],
+        queryKey: ["formio-crf-submissions"],
         queryFn: () => {
           const url = `${serverUrl}/api/formio-close-out-submissions`;
-          return getData<FormioCloseOutSubmission[]>(url);
+          return getData<FormioCRFSubmission[]>(url);
         },
         refetchOnWindowFocus: false,
       },
@@ -357,7 +357,7 @@ export function useSubmissionsQueries() {
 }
 
 /**
- * Custom hook to combine Application form submissions data, Payment Request
+ * Custom hook to combine FRF submissions data, Payment Request
  * form submissions data, and Close Out form submissions data from both the BAP
  * and Formio into a single `submissions` object, with the BAP assigned
  * `rebateId` as the keys.
@@ -366,29 +366,29 @@ function useCombinedRebates() {
   const queryClient = useQueryClient();
 
   const bapFormSubmissions = queryClient.getQueryData<{
-    applications: BapFormSubmission[];
-    paymentRequests: BapFormSubmission[];
-    closeOuts: BapFormSubmission[];
+    frfs: BapFormSubmission[];
+    prfs: BapFormSubmission[];
+    crfs: BapFormSubmission[];
   }>(["bap-form-submissions"]);
 
-  const formioApplicationSubmissions = queryClient.getQueryData<
-    FormioApplicationSubmission[]
-  >(["formio-application-submissions"]);
+  const formioFRFSubmissions = queryClient.getQueryData<FormioFRFSubmission[]>([
+    "formio-frf-submissions",
+  ]);
 
-  const formioPaymentRequestSubmissions = queryClient.getQueryData<
-    FormioPaymentRequestSubmission[]
-  >(["formio-payment-request-submissions"]);
+  const formioPRFSubmissions = queryClient.getQueryData<FormioPRFSubmission[]>([
+    "formio-prf-submissions",
+  ]);
 
-  const formioCloseOutSubmissions = queryClient.getQueryData<
-    FormioCloseOutSubmission[]
-  >(["formio-close-out-submissions"]);
+  const formioCRFSubmissions = queryClient.getQueryData<FormioCRFSubmission[]>([
+    "formio-crf-submissions",
+  ]);
 
   // ensure form submissions data has been fetched from both the BAP and Formio
   if (
     !bapFormSubmissions ||
-    !formioApplicationSubmissions ||
-    !formioPaymentRequestSubmissions ||
-    !formioCloseOutSubmissions
+    !formioFRFSubmissions ||
+    !formioPRFSubmissions ||
+    !formioCRFSubmissions
   ) {
     return {};
   }
@@ -396,14 +396,14 @@ function useCombinedRebates() {
   const rebates: { [rebateId: string]: Rebate } = {};
 
   /**
-   * Iterate over Formio Application form submissions, matching them with
-   * submissions returned from the BAP, so we can build up each rebate object
-   * with the Application form submission data and initialize Payment Request
-   * form and Close-out Form submission data structure (both to be updated).
+   * Iterate over Formio FRF submissions, matching them with submissions
+   * returned from the BAP, so we can build up each rebate object with the FRF
+   * submission data and initialize PRF and CRF submission data structure (both
+   * to be updated).
    */
-  for (const formioSubmission of formioApplicationSubmissions) {
-    const bapMatch = bapFormSubmissions.applications.find((bapSub) => {
-      return bapSub.CSB_Form_ID__c === formioSubmission._id;
+  for (const formioFRFSubmission of formioFRFSubmissions) {
+    const bapMatch = bapFormSubmissions.frfs.find((bapFRFSubmission) => {
+      return bapFRFSubmission.CSB_Form_ID__c === formioFRFSubmission._id;
     });
 
     const modified = bapMatch?.CSB_Modified_Full_String__c || null;
@@ -414,43 +414,42 @@ function useCombinedRebates() {
     const status = bapMatch?.Parent_CSB_Rebate__r?.CSB_Funding_Request_Status__c || null; // prettier-ignore
 
     /**
-     * NOTE: If new Application form submissions have been reciently created in
-     * Formio and the BAP's ETL process has not yet run to pickup those new
-     * Formio submissions, all of the fields above will be null, so instead of
+     * NOTE: If new FRF submissions have been reciently created in Formio and
+     * the BAP's ETL process has not yet run to pickup those new Formio
+     * submissions, all of the fields above will be null, so instead of
      * assigning the submission's key as `rebateId` (which will be null), we'll
      * assign it to be an underscore concatenated with the Formio submission's
      * mongoDB ObjectID – just so each submission object still has a unique ID.
      */
-    rebates[rebateId || `_${formioSubmission._id}`] = {
-      application: {
-        formio: { ...formioSubmission },
+    rebates[rebateId || `_${formioFRFSubmission._id}`] = {
+      frf: {
+        formio: { ...formioFRFSubmission },
         bap: { modified, comboKey, mongoId, rebateId, reviewItemId, status },
       },
-      paymentRequest: { formio: null, bap: null },
-      closeOut: { formio: null, bap: null },
+      prf: { formio: null, bap: null },
+      crf: { formio: null, bap: null },
     };
   }
 
   /**
-   * Iterate over Formio Payment Request form submissions, matching them with
-   * submissions returned from the BAP, so we can set the Payment Request form
-   * submission data.
+   * Iterate over Formio PRF submissions, matching them with submissions
+   * returned from the BAP, so we can set the PRF submission data.
    *
-   * NOTE: For there to be any Formio Payment Request form submissions at all,
-   * the BAP's ETL process must be running, as the `hidden_bap_rebate_id` field
-   * of a Payment Request form submission is injected in the creation of a brand
-   * new submission in the `/api/formio-payment-request-submission` POST request
-   * where he BAP Rebate ID (along with other fields) are fetched from the BAP
-   * and then posted to Formio in a new Payment Request form submission.
+   * NOTE: For there to be any Formio PRF submissions at all, the BAP's ETL
+   * process must be running, as the `hidden_bap_rebate_id` field of a PRF
+   * submission is injected in the creation of a brand new submission in the
+   * `/api/formio-payment-request-submission` POST request where he BAP Rebate
+   * ID (along with other fields) are fetched from the BAP and then posted to
+   * Formio in a new PRF submission.
    *
    * That said, if the BAP ETL isn't returning data, we should make sure we
    * handle that situation gracefully (see NOTE below).
    */
-  for (const formioSubmission of formioPaymentRequestSubmissions) {
-    const formioBapRebateId = formioSubmission.data.hidden_bap_rebate_id;
+  for (const formioPRFSubmission of formioPRFSubmissions) {
+    const formioBapRebateId = formioPRFSubmission.data.hidden_bap_rebate_id;
 
-    const bapMatch = bapFormSubmissions.paymentRequests.find((bapSub) => {
-      return bapSub.Parent_Rebate_ID__c === formioBapRebateId;
+    const bapMatch = bapFormSubmissions.prfs.find((bapPRFSubmission) => {
+      return bapPRFSubmission.Parent_Rebate_ID__c === formioBapRebateId;
     });
 
     const modified = bapMatch?.CSB_Modified_Full_String__c || null;
@@ -462,30 +461,28 @@ function useCombinedRebates() {
 
     /**
      * NOTE: If the BAP ETL is running, there should be a submission with a
-     * `formioBapRebateId` key for each Formio Payment Request form submission
-     * (as it would have been set in the `formioApplicationSubmissions` loop
-     * above). That said, we should first check that it exists before assigning
-     * the Payment Request data to it, so if the BAP ETL process isn't returning
-     * data, it won't break our app.
+     * `formioBapRebateId` key for each Formio PRF submission (as it would have
+     * been set in the `formioFRFSubmissions` loop above). That said, we should
+     * first check that it exists before assigning the PRF data to it, so if the
+     * BAP ETL process isn't returning data, it won't break our app.
      */
     if (rebates[formioBapRebateId]) {
-      rebates[formioBapRebateId].paymentRequest = {
-        formio: { ...formioSubmission },
+      rebates[formioBapRebateId].prf = {
+        formio: { ...formioPRFSubmission },
         bap: { modified, comboKey, mongoId, rebateId, reviewItemId, status },
       };
     }
   }
 
   /**
-   * Iterate over Formio Close Out form submissions, matching them with
-   * submissions returned from the BAP, so we can set the Close Out form
-   * submission data.
+   * Iterate over Formio CRF submissions, matching them with submissions
+   * returned from the BAP, so we can set the CRF submission data.
    */
-  for (const formioSubmission of formioCloseOutSubmissions) {
-    const formioBapRebateId = formioSubmission.data.hidden_bap_rebate_id;
+  for (const formioCRFSubmission of formioCRFSubmissions) {
+    const formioBapRebateId = formioCRFSubmission.data.hidden_bap_rebate_id;
 
-    const bapMatch = bapFormSubmissions.closeOuts.find((bapSub) => {
-      return bapSub.Parent_Rebate_ID__c === formioBapRebateId;
+    const bapMatch = bapFormSubmissions.crfs.find((bapCRFSubmission) => {
+      return bapCRFSubmission.Parent_Rebate_ID__c === formioBapRebateId;
     });
 
     const modified = bapMatch?.CSB_Modified_Full_String__c || null;
@@ -496,8 +493,8 @@ function useCombinedRebates() {
     const status = bapMatch?.Parent_CSB_Rebate__r?.CSB_Closeout_Request_Status__c || null; // prettier-ignore
 
     if (rebates[formioBapRebateId]) {
-      rebates[formioBapRebateId].closeOut = {
-        formio: { ...formioSubmission },
+      rebates[formioBapRebateId].crf = {
+        formio: { ...formioCRFSubmission },
         bap: { modified, comboKey, mongoId, rebateId, reviewItemId, status },
       };
     }
@@ -508,30 +505,27 @@ function useCombinedRebates() {
 
 /**
  * Custom hook that sorts rebates by:
- * - Most recient Formio modified date, regardless of form type
- *   (Application, Payment Request, or Close Out)
+ * - Most recient Formio modified date, regardless of form type (FRF, PRF, CRF)
  * - Submissions needing edits, regardless of form type
- * - Selected Application form submissions without a corresponding Payment
- *   Request form submission
- * - Funding Approved Payment Request form submissions without a corresponding
- *   Close Out form submission
+ * - Selected FRF submissions without a corresponding PRF submission
+ * - Funding Approved PRF submissions without a corresponding CRF submission
  **/
 function useSortedRebates(rebates: { [rebateId: string]: Rebate }) {
   return Object.entries(rebates)
     .map(([rebateId, rebate]) => ({ rebateId, ...rebate }))
     .sort((r1, r2) => {
       const mostRecientR1Modified = [
-        Date.parse(r1.application.formio.modified),
-        Date.parse(r1.paymentRequest.formio?.modified || ""),
-        Date.parse(r1.closeOut.formio?.modified || ""),
+        Date.parse(r1.frf.formio.modified),
+        Date.parse(r1.prf.formio?.modified || ""),
+        Date.parse(r1.crf.formio?.modified || ""),
       ].reduce((previous, current) => {
         return current > previous ? current : previous;
       });
 
       const mostRecientR2Modified = [
-        Date.parse(r2.application.formio.modified),
-        Date.parse(r2.paymentRequest.formio?.modified || ""),
-        Date.parse(r2.closeOut.formio?.modified || ""),
+        Date.parse(r2.frf.formio.modified),
+        Date.parse(r2.prf.formio?.modified || ""),
+        Date.parse(r2.crf.formio?.modified || ""),
       ].reduce((previous, current) => {
         return current > previous ? current : previous;
       });
@@ -539,37 +533,35 @@ function useSortedRebates(rebates: { [rebateId: string]: Rebate }) {
       return mostRecientR2Modified - mostRecientR1Modified;
     })
     .sort((r1, _r2) => {
-      const r1ApplicationNeedsEdits = submissionNeedsEdits({
-        formio: r1.application.formio,
-        bap: r1.application.bap,
+      const r1FRFNeedsEdits = submissionNeedsEdits({
+        formio: r1.frf.formio,
+        bap: r1.frf.bap,
       });
 
-      const r1PaymentRequestNeedsEdits = submissionNeedsEdits({
-        formio: r1.paymentRequest.formio,
-        bap: r1.paymentRequest.bap,
+      const r1PRFNeedsEdits = submissionNeedsEdits({
+        formio: r1.prf.formio,
+        bap: r1.prf.bap,
       });
 
-      const r1CloseOutNeedsEdits = submissionNeedsEdits({
-        formio: r1.closeOut.formio,
-        bap: r1.closeOut.bap,
+      const r1CRFNeedsEdits = submissionNeedsEdits({
+        formio: r1.crf.formio,
+        bap: r1.crf.bap,
       });
 
-      const r1ApplicationSelected = r1.application.bap?.status === "Accepted";
+      const r1FRFSelected = r1.frf.bap?.status === "Accepted";
 
-      const r1ApplicationSelectedButNoPaymentRequest =
-        r1ApplicationSelected && !Boolean(r1.paymentRequest.formio);
+      const r1FRFSelectedButNoPRF = r1FRFSelected && !Boolean(r1.prf.formio);
 
-      const r1PaymentRequestFundingApproved =
-        r1.paymentRequest.bap?.status === "Accepted";
+      const r1PRFFundingApproved = r1.prf.bap?.status === "Accepted";
 
-      const r1PaymentRequestFundingApprovedButNoCloseOut =
-        r1PaymentRequestFundingApproved && !Boolean(r1.closeOut.formio);
+      const r1PRFFundingApprovedButNoCRF =
+        r1PRFFundingApproved && !Boolean(r1.crf.formio);
 
-      return r1ApplicationNeedsEdits ||
-        r1PaymentRequestNeedsEdits ||
-        r1CloseOutNeedsEdits ||
-        r1ApplicationSelectedButNoPaymentRequest ||
-        r1PaymentRequestFundingApprovedButNoCloseOut
+      return r1FRFNeedsEdits ||
+        r1PRFNeedsEdits ||
+        r1CRFNeedsEdits ||
+        r1FRFSelectedButNoPRF ||
+        r1PRFFundingApprovedButNoCRF
         ? -1
         : 0;
     });
@@ -604,9 +596,9 @@ export function useRebates() {
  */
 export function submissionNeedsEdits(options: {
   formio:
-    | FormioApplicationSubmission
-    | FormioPaymentRequestSubmission
-    | FormioCloseOutSubmission
+    | FormioFRFSubmission
+    | FormioPRFSubmission
+    | FormioCRFSubmission
     | null;
   bap: BapSubmission | null;
 }) {

From a3e59c52368064e6c363c28f7f0d3875818a61d7 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 1 Aug 2023 17:46:31 -0400
Subject: [PATCH 23/71] Continue updating client app code to use new form
 abbreviations

---
 app/client/src/config.tsx                    |  22 +-
 app/client/src/routes/allRebates.tsx         | 209 +++++++++----------
 app/client/src/routes/applicationForm.tsx    |  31 ++-
 app/client/src/routes/closeOutForm.tsx       |   9 +-
 app/client/src/routes/helpdesk.tsx           |  12 +-
 app/client/src/routes/newApplicationForm.tsx |   7 +-
 app/client/src/routes/paymentRequestForm.tsx |  26 +--
 app/client/src/utilities.tsx                 |   7 +-
 app/server/app/routes/api.js                 |   8 +-
 9 files changed, 156 insertions(+), 175 deletions(-)

diff --git a/app/client/src/config.tsx b/app/client/src/config.tsx
index 2cc4f4a9..90f9a152 100644
--- a/app/client/src/config.tsx
+++ b/app/client/src/config.tsx
@@ -69,12 +69,10 @@ export const messages = {
   timeout:
     "For security reasons, you have been logged out due to 15 minutes of inactivity.",
   logout: "You have successfully logged out.",
-  applicationFormClosed:
-    "The CSB Application form enrollment period is closed.",
-  paymentRequestFormClosed:
-    "The CSB Payment Request form enrollment period is closed.",
-  closeOutFormClosed: "The CSB Close Out form enrollment period is closed.",
-  paymentRequestFormWillBeDeleted:
+  frfClosed: "The CSB Application form enrollment period is closed.",
+  prfClosed: "The CSB Payment Request form enrollment period is closed.",
+  crfClosed: "The CSB Close Out form enrollment period is closed.",
+  prfWillBeDeleted:
     "A request to edit the Application form associated with this draft or submitted Payment Request form has been made, so this form has been set to read-only mode. Visit your dashboard to make edits to the associated Application form submission.",
 };
 
@@ -87,27 +85,27 @@ export const formioStatusMap = new Map<string, string>()
   .set("submitted", "Submitted");
 
 /**
- * BAP internal to external status mapping for Application form submissions.
+ * BAP internal to external status mapping for FRF submissions.
  */
-export const bapApplicationStatusMap = new Map<string, string>()
+export const bapFRFStatusMap = new Map<string, string>()
   .set("Needs Clarification", "Needs Clarification")
   .set("Withdrawn", "Withdrawn")
   .set("Coordinator Denied", "Not Selected")
   .set("Accepted", "Selected");
 
 /**
- * BAP internal to external status mapping for Payment Request form submissions.
+ * BAP internal to external status mapping for PRF submissions.
  */
-export const bapPaymentRequestStatusMap = new Map<string, string>()
+export const bapPRFStatusMap = new Map<string, string>()
   .set("Needs Clarification", "Needs Clarification")
   .set("Withdrawn", "Withdrawn")
   .set("Coordinator Denied", "Funding Not Approved")
   .set("Accepted", "Funding Approved");
 
 /**
- * BAP internal to external status mapping for Close Out form submissions.
+ * BAP internal to external status mapping for CRF submissions.
  */
-export const bapCloseOutStatusMap = new Map<string, string>()
+export const bapCRFStatusMap = new Map<string, string>()
   .set("Needs Clarification", "Needs Clarification")
   .set("Reimbursement Needed", "Reimbursement Needed")
   .set("Branch Director Denied", "Close Out Not Approved")
diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index a03c4333..5e6b1433 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -54,7 +54,7 @@ function ButtonLink(props: { type: "edit" | "view"; to: LinkProps["to"] }) {
   );
 }
 
-function ApplicationSubmission(props: { rebate: Rebate }) {
+function FRFSubmission(props: { rebate: Rebate }) {
   const { rebate } = props;
   const { frf, prf, crf } = rebate;
 
@@ -63,7 +63,8 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
 
   if (!configData) return null;
 
-  const applicationFormOpen = configData.submissionPeriodOpen[rebateYear].frf;
+  const frfSubmissionPeriodOpen =
+    configData.submissionPeriodOpen[rebateYear].frf;
 
   const {
     applicantUEI,
@@ -77,44 +78,41 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
   const date = new Date(frf.formio.modified).toLocaleDateString();
   const time = new Date(frf.formio.modified).toLocaleTimeString();
 
-  const applicationNeedsEdits = submissionNeedsEdits({
+  const frfNeedsEdits = submissionNeedsEdits({
     formio: frf.formio,
     bap: frf.bap,
   });
 
-  const applicationNeedsClarification =
-    frf.bap?.status === "Needs Clarification";
+  const frfNeedsClarification = frf.bap?.status === "Needs Clarification";
 
-  const applicationHasBeenWithdrawn = frf.bap?.status === "Withdrawn";
+  const frfHasBeenWithdrawn = frf.bap?.status === "Withdrawn";
 
-  const applicationNotSelected = frf.bap?.status === "Coordinator Denied";
+  const frfNotSelected = frf.bap?.status === "Coordinator Denied";
 
-  const applicationSelected = frf.bap?.status === "Accepted";
+  const frfSelected = frf.bap?.status === "Accepted";
 
-  const applicationSelectedButNoPaymentRequest =
-    applicationSelected && !Boolean(prf.formio);
+  const frfSelectedButNoPRF = frfSelected && !Boolean(prf.formio);
 
-  const paymentRequestFundingApproved = prf.bap?.status === "Accepted";
+  const prfFundingApproved = prf.bap?.status === "Accepted";
 
-  const paymentRequestFundingApprovedButNoCloseOut =
-    paymentRequestFundingApproved && !Boolean(crf.formio);
+  const prfFundingApprovedButNoCRF = prfFundingApproved && !Boolean(crf.formio);
 
   const statusTableCellClassNames =
-    frf.formio.state === "submitted" || !applicationFormOpen
+    frf.formio.state === "submitted" || !frfSubmissionPeriodOpen
       ? "text-italic"
       : "";
 
-  const statusIconClassNames = applicationSelected
+  const statusIconClassNames = frfSelected
     ? "usa-icon text-primary" // blue
     : "usa-icon";
 
-  const statusIcon = applicationNeedsEdits
+  const statusIcon = frfNeedsEdits
     ? `${icons}#priority_high` // !
-    : applicationHasBeenWithdrawn
+    : frfHasBeenWithdrawn
     ? `${icons}#close` // ✕
-    : applicationNotSelected
+    : frfNotSelected
     ? `${icons}#cancel` // x inside a circle
-    : applicationSelected
+    : frfSelected
     ? `${icons}#check_circle` // check inside a circle
     : frf.formio.state === "draft"
     ? `${icons}#more_horiz` // three horizontal dots
@@ -122,13 +120,13 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
     ? `${icons}#check` // check
     : `${icons}#remove`; // — (fallback, not used)
 
-  const statusText = applicationNeedsEdits
+  const statusText = frfNeedsEdits
     ? "Edits Requested"
-    : applicationHasBeenWithdrawn
+    : frfHasBeenWithdrawn
     ? "Withdrawn"
-    : applicationNotSelected
+    : frfNotSelected
     ? "Not Selected"
-    : applicationSelected
+    : frfSelected
     ? "Selected"
     : frf.formio.state === "draft"
     ? "Draft"
@@ -136,7 +134,7 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
     ? "Submitted"
     : ""; // fallback, not used
 
-  const applicationFormUrl = `/rebate/${frf.formio._id}`;
+  const frfUrl = `/rebate/${frf.formio._id}`;
 
   /**
    * NOTE on the usage of `TextWithTooltip` below:
@@ -155,20 +153,18 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
   return (
     <tr
       className={
-        applicationNeedsEdits ||
-        applicationSelectedButNoPaymentRequest ||
-        paymentRequestFundingApprovedButNoCloseOut
+        frfNeedsEdits || frfSelectedButNoPRF || prfFundingApprovedButNoCRF
           ? highlightedTableRowClassNames
           : defaultTableRowClassNames
       }
     >
       <th scope="row" className={statusTableCellClassNames}>
-        {applicationNeedsEdits ? (
-          <ButtonLink type="edit" to={applicationFormUrl} />
-        ) : frf.formio.state === "submitted" || !applicationFormOpen ? (
-          <ButtonLink type="view" to={applicationFormUrl} />
+        {frfNeedsEdits ? (
+          <ButtonLink type="edit" to={frfUrl} />
+        ) : frf.formio.state === "submitted" || !frfSubmissionPeriodOpen ? (
+          <ButtonLink type="view" to={frfUrl} />
         ) : frf.formio.state === "draft" ? (
-          <ButtonLink type="edit" to={applicationFormUrl} />
+          <ButtonLink type="edit" to={frfUrl} />
         ) : null}
       </th>
 
@@ -189,7 +185,7 @@ function ApplicationSubmission(props: { rebate: Rebate }) {
         <span>Application</span>
         <br />
         <span className="display-flex flex-align-center font-sans-2xs">
-          {applicationNeedsClarification ? (
+          {frfNeedsClarification ? (
             <TextWithTooltip
               text="Needs Clarification"
               tooltip="Check your email for instructions on what needs clarification"
@@ -305,7 +301,7 @@ save the form for the EFT indicator to be displayed. */
   );
 }
 
-function PaymentRequestSubmission(props: { rebate: Rebate }) {
+function PRFSubmission(props: { rebate: Rebate }) {
   const { rebate } = props;
   const { frf, prf, crf } = rebate;
 
@@ -320,21 +316,20 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
   /**
    * Stores when data is being posted to the server, so a loading indicator can
    * be rendered inside the "New Payment Request" button, and we can prevent
-   * double submits/creations of new Payment Request form submissions.
+   * double submits/creations of new PRF submissions.
    */
   const [dataIsPosting, setDataIsPosting] = useState(false);
 
   if (!configData || !bapSamData) return null;
 
-  const paymentRequestFormOpen =
+  const prfSubmissionPeriodOpen =
     configData.submissionPeriodOpen[rebateYear].prf;
 
-  const applicationSelected = frf.bap?.status === "Accepted";
+  const frfSelected = frf.bap?.status === "Accepted";
 
-  const applicationSelectedButNoPaymentRequest =
-    applicationSelected && !Boolean(prf.formio);
+  const frfSelectedButNoPRF = frfSelected && !Boolean(prf.formio);
 
-  /** matched SAM.gov entity for the Application submission */
+  /** matched SAM.gov entity for the FRF submission */
   const entity = bapSamData.entities.find((entity) => {
     return (
       entity.ENTITY_STATUS__c === "Active" &&
@@ -342,7 +337,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
     );
   });
 
-  if (applicationSelectedButNoPaymentRequest) {
+  if (frfSelectedButNoPRF) {
     return (
       <tr className={highlightedTableRowClassNames}>
         <th scope="row" colSpan={6}>
@@ -357,7 +352,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
 
               const { title, name } = getUserInfo(email, entity);
 
-              // create a new draft Payment Request form submission
+              // create a new draft PRF submission
               postData(`${serverUrl}/api/formio-payment-request-submission/`, {
                 email,
                 title,
@@ -418,45 +413,42 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
   const date = new Date(prf.formio.modified).toLocaleDateString();
   const time = new Date(prf.formio.modified).toLocaleTimeString();
 
-  const applicationNeedsEdits = submissionNeedsEdits({
+  const frfNeedsEdits = submissionNeedsEdits({
     formio: frf.formio,
     bap: frf.bap,
   });
 
-  const paymentRequestNeedsEdits = submissionNeedsEdits({
+  const prfNeedsEdits = submissionNeedsEdits({
     formio: prf.formio,
     bap: prf.bap,
   });
 
-  const paymentRequestNeedsClarification =
-    prf.bap?.status === "Needs Clarification";
+  const prfNeedsClarification = prf.bap?.status === "Needs Clarification";
 
-  const paymentRequestHasBeenWithdrawn = prf.bap?.status === "Withdrawn";
+  const prfHasBeenWithdrawn = prf.bap?.status === "Withdrawn";
 
-  const paymentRequestFundingNotApproved =
-    prf.bap?.status === "Coordinator Denied";
+  const prfFundingNotApproved = prf.bap?.status === "Coordinator Denied";
 
-  const paymentRequestFundingApproved = prf.bap?.status === "Accepted";
+  const prfFundingApproved = prf.bap?.status === "Accepted";
 
-  const paymentRequestFundingApprovedButNoCloseOut =
-    paymentRequestFundingApproved && !Boolean(crf.formio);
+  const prfFundingApprovedButNoCRF = prfFundingApproved && !Boolean(crf.formio);
 
   const statusTableCellClassNames =
-    prf.formio.state === "submitted" || !paymentRequestFormOpen
+    prf.formio.state === "submitted" || !prfSubmissionPeriodOpen
       ? "text-italic"
       : "";
 
-  const statusIconClassNames = paymentRequestFundingApproved
+  const statusIconClassNames = prfFundingApproved
     ? "usa-icon text-primary" // blue
     : "usa-icon";
 
-  const statusIcon = paymentRequestNeedsEdits
+  const statusIcon = prfNeedsEdits
     ? `${icons}#priority_high` // !
-    : paymentRequestHasBeenWithdrawn
+    : prfHasBeenWithdrawn
     ? `${icons}#close` // ✕
-    : paymentRequestFundingNotApproved
+    : prfFundingNotApproved
     ? `${icons}#cancel` // ✕ inside a circle
-    : paymentRequestFundingApproved
+    : prfFundingApproved
     ? `${icons}#check_circle` // check inside a circle
     : prf.formio.state === "draft"
     ? `${icons}#more_horiz` // three horizontal dots
@@ -464,13 +456,13 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
     ? `${icons}#check` // check
     : `${icons}#remove`; // — (fallback, not used)
 
-  const statusText = paymentRequestNeedsEdits
+  const statusText = prfNeedsEdits
     ? "Edits Requested"
-    : paymentRequestHasBeenWithdrawn
+    : prfHasBeenWithdrawn
     ? "Withdrawn"
-    : paymentRequestFundingNotApproved
+    : prfFundingNotApproved
     ? "Funding Not Approved"
-    : paymentRequestFundingApproved
+    : prfFundingApproved
     ? "Funding Approved"
     : prf.formio.state === "draft"
     ? "Draft"
@@ -478,25 +470,25 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
     ? "Submitted"
     : ""; // fallback, not used
 
-  const paymentRequestFormUrl = `/payment-request/${hidden_bap_rebate_id}`;
+  const prfUrl = `/payment-request/${hidden_bap_rebate_id}`;
 
   return (
     <tr
       className={
-        paymentRequestNeedsEdits || paymentRequestFundingApprovedButNoCloseOut
+        prfNeedsEdits || prfFundingApprovedButNoCRF
           ? highlightedTableRowClassNames
           : defaultTableRowClassNames
       }
     >
       <th scope="row" className={statusTableCellClassNames}>
-        {applicationNeedsEdits ? (
-          <ButtonLink type="view" to={paymentRequestFormUrl} />
-        ) : paymentRequestNeedsEdits ? (
-          <ButtonLink type="edit" to={paymentRequestFormUrl} />
-        ) : prf.formio.state === "submitted" || !paymentRequestFormOpen ? (
-          <ButtonLink type="view" to={paymentRequestFormUrl} />
+        {frfNeedsEdits ? (
+          <ButtonLink type="view" to={prfUrl} />
+        ) : prfNeedsEdits ? (
+          <ButtonLink type="edit" to={prfUrl} />
+        ) : prf.formio.state === "submitted" || !prfSubmissionPeriodOpen ? (
+          <ButtonLink type="view" to={prfUrl} />
         ) : prf.formio.state === "draft" ? (
-          <ButtonLink type="edit" to={paymentRequestFormUrl} />
+          <ButtonLink type="edit" to={prfUrl} />
         ) : null}
       </th>
 
@@ -506,7 +498,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
         <span>Payment Request</span>
         <br />
         <span className="display-flex flex-align-center font-sans-2xs">
-          {paymentRequestNeedsClarification ? (
+          {prfNeedsClarification ? (
             <TextWithTooltip
               text="Needs Clarification"
               tooltip="Check your email for instructions on what needs clarification"
@@ -541,7 +533,7 @@ function PaymentRequestSubmission(props: { rebate: Rebate }) {
   );
 }
 
-function CloseOutSubmission(props: { rebate: Rebate }) {
+function CRFSubmission(props: { rebate: Rebate }) {
   const { rebate } = props;
   const { frf, prf, crf } = rebate;
 
@@ -562,14 +554,14 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
 
   if (!configData || !bapSamData) return null;
 
-  const closeOutFormOpen = configData.submissionPeriodOpen[rebateYear].crf;
+  const crfSubmissionPeriodOpen =
+    configData.submissionPeriodOpen[rebateYear].crf;
 
-  const paymentRequestFundingApproved = prf.bap?.status === "Accepted";
+  const prfFundingApproved = prf.bap?.status === "Accepted";
 
-  const paymentRequestFundingApprovedButNoCloseOut =
-    paymentRequestFundingApproved && !Boolean(crf.formio);
+  const prfFundingApprovedButNoCRF = prfFundingApproved && !Boolean(crf.formio);
 
-  /** matched SAM.gov entity for the Payment Request submission */
+  /** matched SAM.gov entity for the PRF submission */
   const entity = bapSamData.entities.find((entity) => {
     return (
       entity.ENTITY_STATUS__c === "Active" &&
@@ -578,7 +570,7 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
     );
   });
 
-  if (paymentRequestFundingApprovedButNoCloseOut) {
+  if (prfFundingApprovedButNoCRF) {
     return (
       <tr className={highlightedTableRowClassNames}>
         <th scope="row" colSpan={6}>
@@ -593,7 +585,7 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
 
               const { title, name } = getUserInfo(email, entity);
 
-              // create a new draft Close Out form submission
+              // create a new draft CRF submission
               postData(`${serverUrl}/api/formio-close-out-submission/`, {
                 email,
                 title,
@@ -654,32 +646,33 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
   const date = new Date(crf.formio.modified).toLocaleDateString();
   const time = new Date(crf.formio.modified).toLocaleTimeString();
 
-  const closeOutNeedsEdits = submissionNeedsEdits({
+  const crfNeedsEdits = submissionNeedsEdits({
     formio: crf.formio,
     bap: crf.bap,
   });
 
-  const closeOutNeedsClarification = crf.bap?.status === "Needs Clarification";
+  const crfNeedsClarification = crf.bap?.status === "Needs Clarification";
 
-  const closeOutReimbursementNeeded =
-    crf.bap?.status === "Reimbursement Needed";
+  const crfReimbursementNeeded = crf.bap?.status === "Reimbursement Needed";
 
-  const closeOutNotApproved = crf.bap?.status === "Branch Director Denied";
+  const crfNotApproved = crf.bap?.status === "Branch Director Denied";
 
-  const closeOutApproved = crf.bap?.status === "Branch Director Approved";
+  const crfApproved = crf.bap?.status === "Branch Director Approved";
 
   const statusTableCellClassNames =
-    crf.formio.state === "submitted" || !closeOutFormOpen ? "text-italic" : "";
+    crf.formio.state === "submitted" || !crfSubmissionPeriodOpen
+      ? "text-italic"
+      : "";
 
-  const statusIconClassNames = closeOutApproved
+  const statusIconClassNames = crfApproved
     ? "usa-icon text-primary" // blue
     : "usa-icon";
 
-  const statusIcon = closeOutNeedsEdits
+  const statusIcon = crfNeedsEdits
     ? `${icons}#priority_high` // !
-    : closeOutNotApproved
+    : crfNotApproved
     ? `${icons}#cancel` // ✕ inside a circle
-    : closeOutApproved
+    : crfApproved
     ? `${icons}#check_circle` // check inside a circle
     : crf.formio.state === "draft"
     ? `${icons}#more_horiz` // three horizontal dots
@@ -687,11 +680,11 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
     ? `${icons}#check` // check
     : `${icons}#remove`; // — (fallback, not used)
 
-  const statusText = closeOutNeedsEdits
+  const statusText = crfNeedsEdits
     ? "Edits Requested"
-    : closeOutNotApproved
+    : crfNotApproved
     ? "Close Out Not Approved"
-    : closeOutApproved
+    : crfApproved
     ? "Close Out Approved"
     : crf.formio.state === "draft"
     ? "Draft"
@@ -699,23 +692,23 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
     ? "Submitted"
     : ""; // fallback, not used
 
-  const closeOutFormUrl = `/close-out/${hidden_bap_rebate_id}`;
+  const crfUrl = `/close-out/${hidden_bap_rebate_id}`;
 
   return (
     <tr
       className={
-        closeOutNeedsEdits || paymentRequestFundingApprovedButNoCloseOut
+        crfNeedsEdits || prfFundingApprovedButNoCRF
           ? highlightedTableRowClassNames
           : defaultTableRowClassNames
       }
     >
       <th scope="row" className={statusTableCellClassNames}>
-        {closeOutNeedsEdits ? (
-          <ButtonLink type="edit" to={closeOutFormUrl} />
-        ) : crf.formio.state === "submitted" || !closeOutFormOpen ? (
-          <ButtonLink type="view" to={closeOutFormUrl} />
+        {crfNeedsEdits ? (
+          <ButtonLink type="edit" to={crfUrl} />
+        ) : crf.formio.state === "submitted" || !crfSubmissionPeriodOpen ? (
+          <ButtonLink type="view" to={crfUrl} />
         ) : crf.formio.state === "draft" ? (
-          <ButtonLink type="edit" to={closeOutFormUrl} />
+          <ButtonLink type="edit" to={crfUrl} />
         ) : null}
       </th>
 
@@ -725,13 +718,13 @@ function CloseOutSubmission(props: { rebate: Rebate }) {
         <span>Close Out</span>
         <br />
         <span className="display-flex flex-align-center font-sans-2xs">
-          {closeOutNeedsClarification ? (
+          {crfNeedsClarification ? (
             <TextWithTooltip
               text="Needs Clarification"
               tooltip="Check your email for instructions on what needs clarification"
               iconClassNames="text-base-darkest"
             />
-          ) : closeOutReimbursementNeeded ? (
+          ) : crfReimbursementNeeded ? (
             <TextWithTooltip
               text="Reimbursement Needed"
               tooltip="Check your email for information on reimbursement needed"
@@ -786,7 +779,7 @@ export function AllRebates() {
   const { rebateYear } = useRebateYearState();
   const { setRebateYear } = useRebateYearActions();
 
-  const applicationFormOpen = configData
+  const frfSubmissionPeriodOpen = configData
     ? configData.submissionPeriodOpen[rebateYear].frf
     : false;
 
@@ -834,7 +827,7 @@ export function AllRebates() {
           </div>
 
           <div className="margin-bottom-1 mobile-lg:margin-right-1">
-            {!applicationFormOpen ? (
+            {!frfSubmissionPeriodOpen ? (
               <button className={btnClassNames} disabled>
                 <NewApplicationIconText />
               </button>
@@ -931,9 +924,9 @@ export function AllRebates() {
               <tbody>
                 {rebates.map((rebate, index) => (
                   <Fragment key={rebate.rebateId}>
-                    <ApplicationSubmission rebate={rebate} />
-                    <PaymentRequestSubmission rebate={rebate} />
-                    <CloseOutSubmission rebate={rebate} />
+                    <FRFSubmission rebate={rebate} />
+                    <PRFSubmission rebate={rebate} />
+                    <CRFSubmission rebate={rebate} />
                     {/* blank row after all rebates but the last one */}
                     {index !== rebates.length - 1 && (
                       <tr className="bg-white">
diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index 1684618f..5ab03ce4 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -191,24 +191,22 @@ function UserApplicationForm(props: { email: string }) {
 
   const rebate = rebates.find((r) => r.frf.formio._id === mongoId);
 
-  const applicationNeedsEdits = !rebate
+  const frfNeedsEdits = !rebate
     ? false
     : submissionNeedsEdits({
         formio: rebate.frf.formio,
         bap: rebate.frf.bap,
       });
 
-  const applicationNeedsEditsAndPaymentRequestExists =
-    applicationNeedsEdits && !!rebate?.prf.formio;
+  const frfNeedsEditsAndPRFExists = frfNeedsEdits && !!rebate?.prf.formio;
 
   /**
-   * NOTE: If the Application form submission needs edits and there's a
-   * corresponding Payment Request form submission, display a confirmation
-   * dialog prompting the user to delete the Payment Request form submission,
-   * as it's data will no longer valid when the Application form submission's
+   * NOTE: If the FRF submission needs edits and there's a corresponding PRF
+   * submission, display a confirmation dialog prompting the user to delete the
+   * PRF submission, as it's data will no longer valid when the FRF submission's
    * data is changed.
    */
-  if (applicationNeedsEditsAndPaymentRequestExists) {
+  if (frfNeedsEditsAndPRFExists) {
     displayDialog({
       dismissable: true,
       heading: "Submission Edits Requested",
@@ -250,9 +248,9 @@ function UserApplicationForm(props: { email: string }) {
       ),
       confirmText: "Delete Payment Request Form Submission",
       confirmedAction: () => {
-        const paymentRequest = rebate.prf.formio;
+        const prf = rebate.prf.formio;
 
-        if (!paymentRequest) {
+        if (!prf) {
           displayErrorNotification({
             id: Date.now(),
             body: (
@@ -286,9 +284,9 @@ function UserApplicationForm(props: { email: string }) {
         const url = `${serverUrl}/api/delete-formio-payment-request-submission`;
 
         postData(url, {
-          mongoId: paymentRequest._id,
-          rebateId: paymentRequest.data.hidden_bap_rebate_id,
-          comboKey: paymentRequest.data.bap_hidden_entity_combo_key,
+          mongoId: prf._id,
+          rebateId: prf.data.hidden_bap_rebate_id,
+          comboKey: prf.data.bap_hidden_entity_combo_key,
         })
           .then((res) => {
             window.location.reload();
@@ -316,11 +314,12 @@ function UserApplicationForm(props: { email: string }) {
     return null;
   }
 
-  const applicationFormOpen = configData.submissionPeriodOpen[rebateYear].frf;
+  const frfSubmissionPeriodOpen =
+    configData.submissionPeriodOpen[rebateYear].frf;
 
   const formIsReadOnly =
-    (submission.state === "submitted" || !applicationFormOpen) &&
-    !applicationNeedsEdits;
+    (submission.state === "submitted" || !frfSubmissionPeriodOpen) &&
+    !frfNeedsEdits;
 
   /** matched SAM.gov entity for the Application submission */
   const entity = bapSamData.entities.find((entity) => {
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index 37c0780d..b2a6d56c 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -184,18 +184,19 @@ function UserCloseOutForm(props: { email: string }) {
 
   const rebate = rebates.find((r) => r.rebateId === rebateId);
 
-  const closeOutNeedsEdits = !rebate
+  const crfNeedsEdits = !rebate
     ? false
     : submissionNeedsEdits({
         formio: rebate.crf.formio,
         bap: rebate.crf.bap,
       });
 
-  const closeOutFormOpen = configData.submissionPeriodOpen[rebateYear].crf;
+  const crfSubmissionPeriodOpen =
+    configData.submissionPeriodOpen[rebateYear].crf;
 
   const formIsReadOnly =
-    (submission.state === "submitted" || !closeOutFormOpen) &&
-    !closeOutNeedsEdits;
+    (submission.state === "submitted" || !crfSubmissionPeriodOpen) &&
+    !crfNeedsEdits;
 
   /** matched SAM.gov entity for the Close Out submission */
   const entity = bapSamData.entities.find((entity) => {
diff --git a/app/client/src/routes/helpdesk.tsx b/app/client/src/routes/helpdesk.tsx
index 5f1ffc3d..5982fe9f 100644
--- a/app/client/src/routes/helpdesk.tsx
+++ b/app/client/src/routes/helpdesk.tsx
@@ -9,9 +9,9 @@ import {
   serverUrl,
   messages,
   formioStatusMap,
-  bapApplicationStatusMap,
-  bapPaymentRequestStatusMap,
-  bapCloseOutStatusMap,
+  bapFRFStatusMap,
+  bapPRFStatusMap,
+  bapCRFStatusMap,
 } from "../config";
 import {
   FormioFRFSubmission,
@@ -70,11 +70,11 @@ function getStatus(options: {
   return submissionNeedsEdits({ formio, bap })
     ? "Edits Requested"
     : formType === "frf"
-    ? bapApplicationStatusMap.get(bapInternalStatus) || formioStatus
+    ? bapFRFStatusMap.get(bapInternalStatus) || formioStatus
     : formType === "prf"
-    ? bapPaymentRequestStatusMap.get(bapInternalStatus) || formioStatus
+    ? bapPRFStatusMap.get(bapInternalStatus) || formioStatus
     : formType === "crf"
-    ? bapCloseOutStatusMap.get(bapInternalStatus) || formioStatus
+    ? bapCRFStatusMap.get(bapInternalStatus) || formioStatus
     : "";
 }
 
diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/newApplicationForm.tsx
index 54c6af05..ab2cff16 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/newApplicationForm.tsx
@@ -39,7 +39,7 @@ export function NewApplicationForm() {
   /**
    * Stores when data is being posted to the server, so a loading indicator can
    * be rendered inside the new application button, and we can prevent double
-   * submits/creations of new Application form submissions.
+   * submits/creations of new FRF submissions.
    */
   const [postingDataId, setPostingDataId] = useState("0");
 
@@ -103,10 +103,7 @@ export function NewApplicationForm() {
                 <div className="tw-m-auto tw-max-w-3xl tw-p-4 sm:tw-p-8">
                   {!applicationFormOpen ? (
                     <div className="-tw-mb-4">
-                      <Message
-                        type="info"
-                        text={messages.applicationFormClosed}
-                      />
+                      <Message type="info" text={messages.frfClosed} />
                     </div>
                   ) : activeSamEntities.length <= 0 ? (
                     <div className="-tw-mb-4">
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index 84a2d184..59be7c70 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -184,27 +184,27 @@ function UserPaymentRequestForm(props: { email: string }) {
 
   const rebate = rebates.find((r) => r.rebateId === rebateId);
 
-  const applicationNeedsEdits = !rebate
+  const frfNeedsEdits = !rebate
     ? false
     : submissionNeedsEdits({
         formio: rebate.frf.formio,
         bap: rebate.frf.bap,
       });
 
-  const paymentRequestNeedsEdits = !rebate
+  const prfNeedsEdits = !rebate
     ? false
     : submissionNeedsEdits({
         formio: rebate.prf.formio,
         bap: rebate.prf.bap,
       });
 
-  const paymentRequestFormOpen =
+  const prfSubmissionPeriodOpen =
     configData.submissionPeriodOpen[rebateYear].prf;
 
   const formIsReadOnly =
-    applicationNeedsEdits ||
-    ((submission.state === "submitted" || !paymentRequestFormOpen) &&
-      !paymentRequestNeedsEdits);
+    frfNeedsEdits ||
+    ((submission.state === "submitted" || !prfSubmissionPeriodOpen) &&
+      !prfNeedsEdits);
 
   /** matched SAM.gov entity for the Payment Request submission */
   const entity = bapSamData.entities.find((entity) => {
@@ -246,11 +246,8 @@ function UserPaymentRequestForm(props: { email: string }) {
         />
       )}
 
-      {applicationNeedsEdits && (
-        <Message
-          type="warning"
-          text={messages.paymentRequestFormWillBeDeleted}
-        />
+      {frfNeedsEdits && (
+        <Message type="warning" text={messages.prfWillBeDeleted} />
       )}
 
       <ul className="usa-icon-list">
@@ -464,11 +461,8 @@ function UserPaymentRequestForm(props: { email: string }) {
         />
       </div>
 
-      {applicationNeedsEdits && (
-        <Message
-          type="warning"
-          text={messages.paymentRequestFormWillBeDeleted}
-        />
+      {frfNeedsEdits && (
+        <Message type="warning" text={messages.prfWillBeDeleted} />
       )}
     </div>
   );
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 46cc8285..5e2beab1 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -357,10 +357,9 @@ export function useSubmissionsQueries() {
 }
 
 /**
- * Custom hook to combine FRF submissions data, Payment Request
- * form submissions data, and Close Out form submissions data from both the BAP
- * and Formio into a single `submissions` object, with the BAP assigned
- * `rebateId` as the keys.
+ * Custom hook to combine FRF submissions data, PRF submissions data, and CRF
+ * submissions data from both the BAP and Formio into a single `submissions`
+ * object, with the BAP assigned `rebateId` as the keys.
  **/
 function useCombinedRebates() {
   const queryClient = useQueryClient();
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index e0536a00..e39febd2 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -841,18 +841,18 @@ router.post(
      */
     getBapFormSubmissionsStatuses(req, req.bapComboKeys)
       .then((submissions) => {
-        const application = submissions.find((submission) => {
+        const frf = submissions.find((submission) => {
           return (
             submission.Parent_Rebate_ID__c === rebateId &&
             submission.Record_Type_Name__c === "CSB Funding Request"
           );
         });
 
-        const applicationNeedsEdits =
-          application?.Parent_CSB_Rebate__r.CSB_Funding_Request_Status__c ===
+        const frfNeedsEdits =
+          frf?.Parent_CSB_Rebate__r.CSB_Funding_Request_Status__c ===
           "Edits Requested";
 
-        if (!applicationNeedsEdits) {
+        if (!frfNeedsEdits) {
           const errorStatus = 400;
           const errorMessage = `Application form submission '${mongoId}' does not need edits.`;
           return res.status(errorStatus).json({ message: errorMessage });

From eee85b43e1a3d8b51dcf3b4254168fe11d571e72 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 2 Aug 2023 10:00:29 -0400
Subject: [PATCH 24/71] Update variables used for frf and prf's review item ids
 and modified timestamps to use new form abbreviations

---
 app/client/src/routes/allRebates.tsx | 10 ++--
 app/server/app/routes/api.js         | 22 ++++----
 app/server/app/utilities/bap.js      | 76 ++++++++++++----------------
 3 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index 5e6b1433..81d05025 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -360,8 +360,8 @@ function PRFSubmission(props: { rebate: Rebate }) {
                 entity,
                 comboKey: frf.bap.comboKey,
                 rebateId: frf.bap.rebateId, // CSB Rebate ID (6 digits)
-                applicationReviewItemId: frf.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
-                applicationFormModified: frf.bap.modified,
+                frfReviewItemId: frf.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
+                frfFormModified: frf.bap.modified,
               })
                 .then((res) => {
                   navigate(`/payment-request/${frf.bap?.rebateId}`);
@@ -593,9 +593,9 @@ function CRFSubmission(props: { rebate: Rebate }) {
                 entity,
                 comboKey: prf.bap.comboKey,
                 rebateId: prf.bap.rebateId, // CSB Rebate ID (6 digits)
-                applicationReviewItemId: frf.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
-                paymentRequestReviewItemId: prf.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
-                paymentRequestFormModified: prf.bap.modified,
+                frfReviewItemId: frf.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
+                prfReviewItemId: prf.bap.reviewItemId, // CSB Rebate ID with form/version ID (9 digits)
+                prfModified: prf.bap.modified,
               })
                 .then((res) => {
                   navigate(`/close-out/${prf.bap?.rebateId}`);
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index e39febd2..2f3370ba 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -556,8 +556,8 @@ router.post(
       entity,
       comboKey,
       rebateId,
-      applicationReviewItemId,
-      applicationFormModified,
+      frfReviewItemId,
+      frfFormModified,
     } = body;
 
     if (!prf2022Open) {
@@ -586,7 +586,7 @@ router.post(
       ALT_GOVT_BUS_POC_EMAIL__c,
     } = entity;
 
-    return getBapDataForPaymentRequest(req, applicationReviewItemId)
+    return getBapDataForPaymentRequest(req, frfReviewItemId)
       .then(({ applicationRecordQuery, busRecordsQuery }) => {
         const {
           CSB_NCES_ID__c,
@@ -617,7 +617,7 @@ router.post(
         const submission = {
           data: {
             bap_hidden_entity_combo_key: comboKey,
-            hidden_application_form_modified: applicationFormModified,
+            hidden_application_form_modified: frfFormModified,
             hidden_current_user_email: email,
             hidden_current_user_title: title,
             hidden_current_user_name: name,
@@ -918,9 +918,9 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
     entity,
     comboKey,
     rebateId,
-    applicationReviewItemId,
-    paymentRequestReviewItemId,
-    paymentRequestFormModified,
+    frfReviewItemId,
+    prfReviewItemId,
+    prfModified,
   } = body;
 
   if (!crf2022Open) {
@@ -949,11 +949,7 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
     ALT_GOVT_BUS_POC_EMAIL__c,
   } = entity;
 
-  return getBapDataForCloseOut(
-    req,
-    applicationReviewItemId,
-    paymentRequestReviewItemId
-  )
+  return getBapDataForCloseOut(req, frfReviewItemId, prfReviewItemId)
     .then(
       ({
         applicationRecordQuery,
@@ -1023,7 +1019,7 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
         const submission = {
           data: {
             bap_hidden_entity_combo_key: comboKey,
-            hidden_prf_modified: paymentRequestFormModified,
+            hidden_prf_modified: prfModified,
             hidden_current_user_email: email,
             hidden_current_user_title: title,
             hidden_current_user_name: name,
diff --git a/app/server/app/utilities/bap.js b/app/server/app/utilities/bap.js
index d02cdefa..f554c2fc 100644
--- a/app/server/app/utilities/bap.js
+++ b/app/server/app/utilities/bap.js
@@ -498,17 +498,17 @@ async function queryForBapFormSubmissionsStatuses(req, comboKeys) {
 }
 
 /**
- * Uses cached JSforce connection to query the BAP for Application form
- * submission data, for use in a brand new Payment Request form submission.
+ * Uses cached JSforce connection to query the BAP for FRF submission data, for
+ * use in a brand new PRF submission.
  *
  * @param {express.Request} req
- * @param {string} applicationReviewItemId CSB Rebate ID with the form/version ID (9 digits)
- * @returns {Promise<BapDataForPaymentRequest>} Application form submission fields
+ * @param {string} frfReviewItemId CSB Rebate ID with the form/version ID (9 digits)
+ * @returns {Promise<BapDataForPaymentRequest>} FRF submission fields
  */
-async function queryBapForPaymentRequestData(req, applicationReviewItemId) {
+async function queryBapForPaymentRequestData(req, frfReviewItemId) {
   const logMessage =
-    `Querying the BAP for Application form submission associated with ` +
-    `Application Review Item ID: '${applicationReviewItemId}'.`;
+    `Querying the BAP for FRF submission associated with ` +
+    `FRF Review Item ID: '${frfReviewItemId}'.`;
   log({ level: "info", message: logMessage });
 
   /** @type {jsforce.Connection} */
@@ -562,7 +562,7 @@ async function queryBapForPaymentRequestData(req, applicationReviewItemId) {
   //   ${BAP_FORMS_TABLE}
   // WHERE
   //   recordtypeid = '${applicationRecordTypeId}' AND
-  //   CSB_Review_Item_ID__c = '${applicationReviewItemId}' AND
+  //   CSB_Review_Item_ID__c = '${frfReviewItemId}' AND
   //   Latest_Version__c = TRUE`
 
   const applicationRecordQuery = await bapConnection
@@ -570,7 +570,7 @@ async function queryBapForPaymentRequestData(req, applicationReviewItemId) {
     .find(
       {
         recordtypeid: applicationRecordTypeId,
-        CSB_Review_Item_ID__c: applicationReviewItemId,
+        CSB_Review_Item_ID__c: frfReviewItemId,
         Latest_Version__c: true,
       },
       {
@@ -662,25 +662,19 @@ async function queryBapForPaymentRequestData(req, applicationReviewItemId) {
 }
 
 /**
- * Uses cached JSforce connection to query the BAP for Application form
- * submission data and Payment Request form submission data, for use in a brand
- * new Close-out form submission.
+ * Uses cached JSforce connection to query the BAP for FRF submission data and
+ * PRF submission data, for use in a brand new CRF submission.
  *
  * @param {express.Request} req
- * @param {string} applicationReviewItemId CSB Rebate ID with the form/version ID (9 digits)
- * @param {string} paymentRequestReviewItemId CSB Rebate ID with the form/version ID (9 digits)
- * @returns {Promise<BapDataForForCloseOut>} Application form and Payment Request form submission fields
+ * @param {string} frfReviewItemId CSB Rebate ID with the form/version ID (9 digits)
+ * @param {string} prfReviewItemId CSB Rebate ID with the form/version ID (9 digits)
+ * @returns {Promise<BapDataForForCloseOut>} FRF and PRF submission fields
  */
-async function queryBapForCloseOutData(
-  req,
-  applicationReviewItemId,
-  paymentRequestReviewItemId
-) {
+async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
   const logMessage =
-    `Querying the BAP for Application form submission associated with ` +
-    `Application Review Item ID: '${applicationReviewItemId}' and ` +
-    `Payment Request form submission associated with ` +
-    `Payment Request Review Item ID: '${paymentRequestReviewItemId}'.`;
+    `Querying the BAP for FRF submission associated with ` +
+    `FRF Review Item ID: '${frfReviewItemId}' and PRF submission associated with ` +
+    `PRF Review Item ID: '${prfReviewItemId}'.`;
   log({ level: "info", message: logMessage });
 
   /** @type {jsforce.Connection} */
@@ -728,7 +722,7 @@ async function queryBapForCloseOutData(
   //   ${BAP_FORMS_TABLE}
   // WHERE
   //   recordtypeid = '${applicationRecordTypeId}' AND
-  //   CSB_Review_Item_ID__c = '${applicationReviewItemId}' AND
+  //   CSB_Review_Item_ID__c = '${frfReviewItemId}' AND
   //   Latest_Version__c = TRUE`
 
   const applicationRecordQuery = await bapConnection
@@ -736,7 +730,7 @@ async function queryBapForCloseOutData(
     .find(
       {
         recordtypeid: applicationRecordTypeId,
-        CSB_Review_Item_ID__c: applicationReviewItemId,
+        CSB_Review_Item_ID__c: frfReviewItemId,
         Latest_Version__c: true,
       },
       {
@@ -814,7 +808,7 @@ async function queryBapForCloseOutData(
   //   ${BAP_FORMS_TABLE}
   // WHERE
   //   recordtypeid = '${paymentRequestRecordTypeId}' AND
-  //   CSB_Review_Item_ID__c = '${paymentRequestReviewItemId}' AND
+  //   CSB_Review_Item_ID__c = '${prfReviewItemId}' AND
   //   Latest_Version__c = TRUE`
 
   const paymentRequestRecordQuery = await bapConnection
@@ -822,7 +816,7 @@ async function queryBapForCloseOutData(
     .find(
       {
         recordtypeid: paymentRequestRecordTypeId,
-        CSB_Review_Item_ID__c: paymentRequestReviewItemId,
+        CSB_Review_Item_ID__c: prfReviewItemId,
         Latest_Version__c: true,
       },
       {
@@ -1043,38 +1037,32 @@ function getBapFormSubmissionsStatuses(req, comboKeys) {
 }
 
 /**
- * Fetches Application form submission data associated with an Application
- * Review Item ID.
+ * Fetches FRF submission data associated with a FRF Review Item ID.
  *
  * @param {express.Request} req
- * @param {string} applicationReviewItemId
+ * @param {string} frfReviewItemId
  * @returns {ReturnType<queryBapForPaymentRequestData>}
  */
-function getBapDataForPaymentRequest(req, applicationReviewItemId) {
+function getBapDataForPaymentRequest(req, frfReviewItemId) {
   return verifyBapConnection(req, {
     name: queryBapForPaymentRequestData,
-    args: [req, applicationReviewItemId],
+    args: [req, frfReviewItemId],
   });
 }
 
 /**
- * Fetches Application form submission data and Payment Request form submission
- * data associated with an Application Review Item ID and a Payment Request
- * Review Item ID.
+ * Fetches FRF submission data and PRF submission data associated with a FRF
+ * Review Item ID and a PRF Review Item ID.
  *
  * @param {express.Request} req
- * @param {string} applicationReviewItemId
- * @param {string} paymentRequestReviewItemId
+ * @param {string} frfReviewItemId
+ * @param {string} prfReviewItemId
  * @returns {ReturnType<queryBapForCloseOutData>}
  */
-function getBapDataForCloseOut(
-  req,
-  applicationReviewItemId,
-  paymentRequestReviewItemId
-) {
+function getBapDataForCloseOut(req, frfReviewItemId, prfReviewItemId) {
   return verifyBapConnection(req, {
     name: queryBapForCloseOutData,
-    args: [req, applicationReviewItemId, paymentRequestReviewItemId],
+    args: [req, frfReviewItemId, prfReviewItemId],
   });
 }
 

From b55fc280414f417464386674ac9519aa6ec23789 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 2 Aug 2023 10:14:03 -0400
Subject: [PATCH 25/71] Update bap query functions to use new form
 abbreviations

---
 app/server/app/routes/api.js    | 280 ++++++++++++++++----------------
 app/server/app/utilities/bap.js |  88 +++++-----
 2 files changed, 183 insertions(+), 185 deletions(-)

diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 2f3370ba..372ed8e8 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -19,8 +19,8 @@ const {
 const {
   getSamEntities,
   getBapFormSubmissionsStatuses,
-  getBapDataForPaymentRequest,
-  getBapDataForCloseOut,
+  getBapDataForPRF,
+  getBapDataForCRF,
 } = require("../utilities/bap");
 const log = require("../utilities/logger");
 
@@ -586,8 +586,8 @@ router.post(
       ALT_GOVT_BUS_POC_EMAIL__c,
     } = entity;
 
-    return getBapDataForPaymentRequest(req, frfReviewItemId)
-      .then(({ applicationRecordQuery, busRecordsQuery }) => {
+    return getBapDataForPRF(req, frfReviewItemId)
+      .then(({ frfRecordQuery, busRecordsQuery }) => {
         const {
           CSB_NCES_ID__c,
           Primary_Applicant__r,
@@ -598,7 +598,7 @@ router.post(
           School_District_Prioritized__c,
           Total_Rebate_Funds_Requested__c,
           Total_Infrastructure_Funds__c,
-        } = applicationRecordQuery[0];
+        } = frfRecordQuery[0];
 
         const busInfo = busRecordsQuery.map((record) => ({
           busNum: record.Rebate_Item_num__c,
@@ -949,144 +949,138 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
     ALT_GOVT_BUS_POC_EMAIL__c,
   } = entity;
 
-  return getBapDataForCloseOut(req, frfReviewItemId, prfReviewItemId)
-    .then(
-      ({
-        applicationRecordQuery,
-        paymentRequestRecordQuery,
-        busRecordsQuery,
-      }) => {
-        const {
-          Fleet_Name__c,
-          Fleet_Street_Address__c,
-          Fleet_City__c,
-          Fleet_State__c,
-          Fleet_Zip__c,
-          Fleet_Contact_Name__c,
-          Fleet_Contact_Title__c,
-          Fleet_Contact_Phone__c,
-          Fleet_Contact_Email__c,
-          School_District_Contact__r,
-        } = applicationRecordQuery[0];
-
-        const {
-          CSB_NCES_ID__c,
-          Primary_Applicant__r,
-          Alternate_Applicant__r,
-          Applicant_Organization__r,
-          CSB_School_District__r,
-          School_District_Prioritized__c,
-          Total_Rebate_Funds_Requested_PO__c,
-          Total_Bus_And_Infrastructure_Rebate__c,
-          Total_Infrastructure_Funds__c,
-          Num_Of_Buses_Requested_From_Application__c,
-          Total_Price_All_Buses__c,
-          Total_Bus_Rebate_Amount__c,
-          Total_All_Eligible_Infrastructure_Costs__c,
-          Total_Infrastructure_Rebate__c,
-          Total_Level_2_Charger_Costs__c,
-          Total_DC_Fast_Charger_Costs__c,
-          Total_Other_Infrastructure_Costs__c,
-        } = paymentRequestRecordQuery[0];
-
-        const busInfo = busRecordsQuery.map((record) => ({
-          busNum: record.Rebate_Item_num__c,
-          oldBusNcesDistrictId: CSB_NCES_ID__c,
-          oldBusVin: record.CSB_VIN__c,
-          oldBusModelYear: record.CSB_Model_Year__c,
-          oldBusFuelType: record.CSB_Fuel_Type__c,
-          oldBusEstimatedRemainingLife: record.Old_Bus_Estimated_Remaining_Life__c, // prettier-ignore
-          oldBusExclude: record.Old_Bus_Exclude__c,
-          hidden_prf_oldBusExclude: record.Old_Bus_Exclude__c,
-          newBusDealer: record.Related_Line_Item__r?.Vendor_Name__c,
-          newBusFuelType: record.New_Bus_Fuel_Type__c,
-          hidden_prf_newBusFuelType: record.New_Bus_Fuel_Type__c,
-          newBusMake: record.New_Bus_Make__c,
-          hidden_prf_newBusMake: record.New_Bus_Make__c,
-          newBusMakeOther: record.CSB_Manufacturer_if_Other__c,
-          hidden_prf_newBusMakeOther: record.CSB_Manufacturer_if_Other__c,
-          newBusModel: record.New_Bus_Model__c,
-          hidden_prf_newBusModel: record.New_Bus_Model__c,
-          newBusModelYear: record.New_Bus_Model_Year__c,
-          hidden_prf_newBusModelYear: record.New_Bus_Model_Year__c,
-          newBusGvwr: record.New_Bus_GVWR__c,
-          hidden_prf_newBusGvwr: record.New_Bus_GVWR__c,
-          newBusPurchasePrice: record.New_Bus_Purchase_Price__c,
-          hidden_prf_newBusPurchasePrice: record.New_Bus_Purchase_Price__c,
-          hidden_prf_rebate: record.New_Bus_Rebate_Amount__c,
-        }));
-
-        const submission = {
-          data: {
-            bap_hidden_entity_combo_key: comboKey,
-            hidden_prf_modified: prfModified,
-            hidden_current_user_email: email,
-            hidden_current_user_title: title,
-            hidden_current_user_name: name,
-            hidden_bap_rebate_id: rebateId,
-            hidden_sam_uei: UNIQUE_ENTITY_ID__c,
-            hidden_sam_efti: ENTITY_EFT_INDICATOR__c || "0000",
-            hidden_sam_elec_bus_poc_email: ELEC_BUS_POC_EMAIL__c,
-            hidden_sam_alt_elec_bus_poc_email: ALT_ELEC_BUS_POC_EMAIL__c,
-            hidden_sam_govt_bus_poc_email: GOVT_BUS_POC_EMAIL__c,
-            hidden_sam_alt_govt_bus_poc_email: ALT_GOVT_BUS_POC_EMAIL__c,
-            hidden_bap_district_id: CSB_NCES_ID__c,
-            hidden_bap_district_name: CSB_School_District__r?.Name,
-            hidden_bap_primary_fname: Primary_Applicant__r?.FirstName,
-            hidden_bap_primary_lname: Primary_Applicant__r?.LastName,
-            hidden_bap_primary_title: Primary_Applicant__r?.Title,
-            hidden_bap_primary_phone_number: Primary_Applicant__r?.Phone,
-            hidden_bap_primary_email: Primary_Applicant__r?.Email,
-            hidden_bap_alternate_fname: Alternate_Applicant__r?.FirstName || "",
-            hidden_bap_alternate_lname: Alternate_Applicant__r?.LastName || "",
-            hidden_bap_alternate_title: Alternate_Applicant__r?.Title || "",
-            hidden_bap_alternate_phone_number: Alternate_Applicant__r?.Phone || "", // prettier-ignore
-            hidden_bap_alternate_email: Alternate_Applicant__r?.Email || "",
-            hidden_bap_org_name: Applicant_Organization__r?.Name,
-            hidden_bap_fleet_name: Fleet_Name__c,
-            hidden_bap_fleet_address: Fleet_Street_Address__c,
-            hidden_bap_fleet_city: Fleet_City__c,
-            hidden_bap_fleet_state: Fleet_State__c,
-            hidden_bap_fleet_zip: Fleet_Zip__c,
-            hidden_bap_fleet_contact_name: Fleet_Contact_Name__c,
-            hidden_bap_fleet_contact_title: Fleet_Contact_Title__c,
-            hidden_bap_fleet_phone: Fleet_Contact_Phone__c,
-            hidden_bap_fleet_email: Fleet_Contact_Email__c,
-            hidden_bap_prioritized: School_District_Prioritized__c,
-            hidden_bap_requested_funds: Total_Rebate_Funds_Requested_PO__c,
-            hidden_bap_received_funds: Total_Bus_And_Infrastructure_Rebate__c,
-            hidden_bap_prf_infra_max_rebate: Total_Infrastructure_Funds__c,
-            hidden_bap_buses_requested_app: Num_Of_Buses_Requested_From_Application__c, // prettier-ignore
-            hidden_bap_total_bus_costs_prf: Total_Price_All_Buses__c,
-            hidden_bap_total_bus_rebate_received: Total_Bus_Rebate_Amount__c,
-            hidden_bap_total_infra_costs_prf: Total_All_Eligible_Infrastructure_Costs__c, // prettier-ignore
-            hidden_bap_total_infra_rebate_received: Total_Infrastructure_Rebate__c, // prettier-ignore
-            hidden_bap_total_infra_level2_charger: Total_Level_2_Charger_Costs__c, // prettier-ignore
-            hidden_bap_total_infra_dc_fast_charger: Total_DC_Fast_Charger_Costs__c, // prettier-ignore
-            hidden_bap_total_infra_other_costs: Total_Other_Infrastructure_Costs__c, // prettier-ignore
-            hidden_bap_district_contact_fname: School_District_Contact__r?.FirstName, // prettier-ignore
-            hidden_bap_district_contact_lname: School_District_Contact__r?.LastName, // prettier-ignore
-            busInfo,
-          },
-          /** Add custom metadata to track formio submissions from wrapper. */
-          metadata: {
-            ...formioCsbMetadata,
-          },
-          state: "draft",
-        };
-
-        axiosFormio(req)
-          .post(`${formioCRF2022Url}/submission`, submission)
-          .then((axiosRes) => axiosRes.data)
-          .then((submission) => res.json(submission))
-          .catch((error) => {
-            // NOTE: logged in axiosFormio response interceptor
-            const errorStatus = error.response?.status || 500;
-            const errorMessage = `Error posting Formio Close Out form submission.`;
-            return res.status(errorStatus).json({ message: errorMessage });
-          });
-      }
-    )
+  return getBapDataForCRF(req, frfReviewItemId, prfReviewItemId)
+    .then(({ frfRecordQuery, prfRecordQuery, busRecordsQuery }) => {
+      const {
+        Fleet_Name__c,
+        Fleet_Street_Address__c,
+        Fleet_City__c,
+        Fleet_State__c,
+        Fleet_Zip__c,
+        Fleet_Contact_Name__c,
+        Fleet_Contact_Title__c,
+        Fleet_Contact_Phone__c,
+        Fleet_Contact_Email__c,
+        School_District_Contact__r,
+      } = frfRecordQuery[0];
+
+      const {
+        CSB_NCES_ID__c,
+        Primary_Applicant__r,
+        Alternate_Applicant__r,
+        Applicant_Organization__r,
+        CSB_School_District__r,
+        School_District_Prioritized__c,
+        Total_Rebate_Funds_Requested_PO__c,
+        Total_Bus_And_Infrastructure_Rebate__c,
+        Total_Infrastructure_Funds__c,
+        Num_Of_Buses_Requested_From_Application__c,
+        Total_Price_All_Buses__c,
+        Total_Bus_Rebate_Amount__c,
+        Total_All_Eligible_Infrastructure_Costs__c,
+        Total_Infrastructure_Rebate__c,
+        Total_Level_2_Charger_Costs__c,
+        Total_DC_Fast_Charger_Costs__c,
+        Total_Other_Infrastructure_Costs__c,
+      } = prfRecordQuery[0];
+
+      const busInfo = busRecordsQuery.map((record) => ({
+        busNum: record.Rebate_Item_num__c,
+        oldBusNcesDistrictId: CSB_NCES_ID__c,
+        oldBusVin: record.CSB_VIN__c,
+        oldBusModelYear: record.CSB_Model_Year__c,
+        oldBusFuelType: record.CSB_Fuel_Type__c,
+        oldBusEstimatedRemainingLife: record.Old_Bus_Estimated_Remaining_Life__c, // prettier-ignore
+        oldBusExclude: record.Old_Bus_Exclude__c,
+        hidden_prf_oldBusExclude: record.Old_Bus_Exclude__c,
+        newBusDealer: record.Related_Line_Item__r?.Vendor_Name__c,
+        newBusFuelType: record.New_Bus_Fuel_Type__c,
+        hidden_prf_newBusFuelType: record.New_Bus_Fuel_Type__c,
+        newBusMake: record.New_Bus_Make__c,
+        hidden_prf_newBusMake: record.New_Bus_Make__c,
+        newBusMakeOther: record.CSB_Manufacturer_if_Other__c,
+        hidden_prf_newBusMakeOther: record.CSB_Manufacturer_if_Other__c,
+        newBusModel: record.New_Bus_Model__c,
+        hidden_prf_newBusModel: record.New_Bus_Model__c,
+        newBusModelYear: record.New_Bus_Model_Year__c,
+        hidden_prf_newBusModelYear: record.New_Bus_Model_Year__c,
+        newBusGvwr: record.New_Bus_GVWR__c,
+        hidden_prf_newBusGvwr: record.New_Bus_GVWR__c,
+        newBusPurchasePrice: record.New_Bus_Purchase_Price__c,
+        hidden_prf_newBusPurchasePrice: record.New_Bus_Purchase_Price__c,
+        hidden_prf_rebate: record.New_Bus_Rebate_Amount__c,
+      }));
+
+      const submission = {
+        data: {
+          bap_hidden_entity_combo_key: comboKey,
+          hidden_prf_modified: prfModified,
+          hidden_current_user_email: email,
+          hidden_current_user_title: title,
+          hidden_current_user_name: name,
+          hidden_bap_rebate_id: rebateId,
+          hidden_sam_uei: UNIQUE_ENTITY_ID__c,
+          hidden_sam_efti: ENTITY_EFT_INDICATOR__c || "0000",
+          hidden_sam_elec_bus_poc_email: ELEC_BUS_POC_EMAIL__c,
+          hidden_sam_alt_elec_bus_poc_email: ALT_ELEC_BUS_POC_EMAIL__c,
+          hidden_sam_govt_bus_poc_email: GOVT_BUS_POC_EMAIL__c,
+          hidden_sam_alt_govt_bus_poc_email: ALT_GOVT_BUS_POC_EMAIL__c,
+          hidden_bap_district_id: CSB_NCES_ID__c,
+          hidden_bap_district_name: CSB_School_District__r?.Name,
+          hidden_bap_primary_fname: Primary_Applicant__r?.FirstName,
+          hidden_bap_primary_lname: Primary_Applicant__r?.LastName,
+          hidden_bap_primary_title: Primary_Applicant__r?.Title,
+          hidden_bap_primary_phone_number: Primary_Applicant__r?.Phone,
+          hidden_bap_primary_email: Primary_Applicant__r?.Email,
+          hidden_bap_alternate_fname: Alternate_Applicant__r?.FirstName || "",
+          hidden_bap_alternate_lname: Alternate_Applicant__r?.LastName || "",
+          hidden_bap_alternate_title: Alternate_Applicant__r?.Title || "",
+          hidden_bap_alternate_phone_number: Alternate_Applicant__r?.Phone || "", // prettier-ignore
+          hidden_bap_alternate_email: Alternate_Applicant__r?.Email || "",
+          hidden_bap_org_name: Applicant_Organization__r?.Name,
+          hidden_bap_fleet_name: Fleet_Name__c,
+          hidden_bap_fleet_address: Fleet_Street_Address__c,
+          hidden_bap_fleet_city: Fleet_City__c,
+          hidden_bap_fleet_state: Fleet_State__c,
+          hidden_bap_fleet_zip: Fleet_Zip__c,
+          hidden_bap_fleet_contact_name: Fleet_Contact_Name__c,
+          hidden_bap_fleet_contact_title: Fleet_Contact_Title__c,
+          hidden_bap_fleet_phone: Fleet_Contact_Phone__c,
+          hidden_bap_fleet_email: Fleet_Contact_Email__c,
+          hidden_bap_prioritized: School_District_Prioritized__c,
+          hidden_bap_requested_funds: Total_Rebate_Funds_Requested_PO__c,
+          hidden_bap_received_funds: Total_Bus_And_Infrastructure_Rebate__c,
+          hidden_bap_prf_infra_max_rebate: Total_Infrastructure_Funds__c,
+          hidden_bap_buses_requested_app: Num_Of_Buses_Requested_From_Application__c, // prettier-ignore
+          hidden_bap_total_bus_costs_prf: Total_Price_All_Buses__c,
+          hidden_bap_total_bus_rebate_received: Total_Bus_Rebate_Amount__c,
+          hidden_bap_total_infra_costs_prf: Total_All_Eligible_Infrastructure_Costs__c, // prettier-ignore
+          hidden_bap_total_infra_rebate_received: Total_Infrastructure_Rebate__c, // prettier-ignore
+          hidden_bap_total_infra_level2_charger: Total_Level_2_Charger_Costs__c, // prettier-ignore
+          hidden_bap_total_infra_dc_fast_charger: Total_DC_Fast_Charger_Costs__c, // prettier-ignore
+          hidden_bap_total_infra_other_costs: Total_Other_Infrastructure_Costs__c, // prettier-ignore
+          hidden_bap_district_contact_fname: School_District_Contact__r?.FirstName, // prettier-ignore
+          hidden_bap_district_contact_lname: School_District_Contact__r?.LastName, // prettier-ignore
+          busInfo,
+        },
+        /** Add custom metadata to track formio submissions from wrapper. */
+        metadata: {
+          ...formioCsbMetadata,
+        },
+        state: "draft",
+      };
+
+      axiosFormio(req)
+        .post(`${formioCRF2022Url}/submission`, submission)
+        .then((axiosRes) => axiosRes.data)
+        .then((submission) => res.json(submission))
+        .catch((error) => {
+          // NOTE: logged in axiosFormio response interceptor
+          const errorStatus = error.response?.status || 500;
+          const errorMessage = `Error posting Formio Close Out form submission.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        });
+    })
     .catch((error) => {
       // NOTE: logged in bap verifyBapConnection
       const errorStatus = 500;
diff --git a/app/server/app/utilities/bap.js b/app/server/app/utilities/bap.js
index f554c2fc..7ac32657 100644
--- a/app/server/app/utilities/bap.js
+++ b/app/server/app/utilities/bap.js
@@ -55,7 +55,7 @@ const log = require("../utilities/logger");
  */
 
 /**
- * @typedef {Object} BapDataForPaymentRequest
+ * @typedef {Object} BapDataForPRF
  * @property {{
  *  Id: string
  *  UEI_EFTI_Combo_Key__c: string
@@ -82,7 +82,7 @@ const log = require("../utilities/logger");
  *  School_District_Prioritized__c: string
  *  Total_Rebate_Funds_Requested__c: string
  *  Total_Infrastructure_Funds__c: string
- * }[]} applicationRecordQuery
+ * }[]} frfRecordQuery
  * @property {{
  *  Rebate_Item_num__c: string
  *  CSB_VIN__c: string
@@ -98,7 +98,7 @@ const log = require("../utilities/logger");
  */
 
 /**
- * @typedef {Object} BapDataForForCloseOut
+ * @typedef {Object} BapDataForForCRF
  * @property {{
  *  Fleet_Name__c: string
  *  Fleet_Street_Address__c: string
@@ -113,7 +113,7 @@ const log = require("../utilities/logger");
  *    FirstName: string
  *    LastName: string
  *  }
- * }[]} applicationRecordQuery
+ * }[]} frfRecordQuery
  * @property {{
  *  Id: string
  *  UEI_EFTI_Combo_Key__c: string
@@ -150,7 +150,7 @@ const log = require("../utilities/logger");
  *  Total_Level_2_Charger_Costs__c: string
  *  Total_DC_Fast_Charger_Costs__c: string
  *  Total_Other_Infrastructure_Costs__c: string
- * }[]} paymentRequestRecordQuery
+ * }[]} prfRecordQuery
  * @property {{
  *  Rebate_Item_num__c: string
  *  CSB_VIN__c: string
@@ -320,7 +320,9 @@ async function queryForSamEntities(req, email) {
  */
 async function queryForBapFormSubmissionData(req, formType, rebateId, mongoId) {
   const logId = rebateId ? `rebateId: '${rebateId}'` : `mongoId: '${mongoId}'`;
-  const logMessage = `Querying the BAP for ${formType.toUpperCase()} submission data associated with ${logId}.`;
+  const logMessage =
+    `Querying the BAP for ${formType.toUpperCase()} submission data ` +
+    `associated with ${logId}.`;
   log({ level: "info", message: logMessage });
 
   /** @type {jsforce.Connection} */
@@ -414,7 +416,9 @@ async function queryForBapFormSubmissionData(req, formType, rebateId, mongoId) {
  * @returns {Promise<BapFormSubmission[]>} collection of fields associated with each form submission
  */
 async function queryForBapFormSubmissionsStatuses(req, comboKeys) {
-  const logMessage = `Querying the BAP for form submissions statuses associated with combokeys: '${comboKeys}'.`;
+  const logMessage =
+    `Querying the BAP for form submissions statuses associated with ` +
+    `combokeys: '${comboKeys}'.`;
   log({ level: "info", message: logMessage });
 
   /** @type {jsforce.Connection} */
@@ -503,9 +507,9 @@ async function queryForBapFormSubmissionsStatuses(req, comboKeys) {
  *
  * @param {express.Request} req
  * @param {string} frfReviewItemId CSB Rebate ID with the form/version ID (9 digits)
- * @returns {Promise<BapDataForPaymentRequest>} FRF submission fields
+ * @returns {Promise<BapDataForPRF>} FRF submission fields
  */
-async function queryBapForPaymentRequestData(req, frfReviewItemId) {
+async function queryBapForPRFData(req, frfReviewItemId) {
   const logMessage =
     `Querying the BAP for FRF submission associated with ` +
     `FRF Review Item ID: '${frfReviewItemId}'.`;
@@ -523,7 +527,7 @@ async function queryBapForPaymentRequestData(req, frfReviewItemId) {
   //   sobjecttype = '${BAP_FORMS_TABLE}'
   // LIMIT 1`
 
-  const applicationRecordTypeIdQuery = await bapConnection
+  const frfRecordTypeIdQuery = await bapConnection
     .sobject("recordtype")
     .find(
       {
@@ -538,7 +542,7 @@ async function queryBapForPaymentRequestData(req, frfReviewItemId) {
     .limit(1)
     .execute(async (err, records) => ((await err) ? err : records));
 
-  const applicationRecordTypeId = applicationRecordTypeIdQuery["0"].Id;
+  const frfRecordTypeId = frfRecordTypeIdQuery["0"].Id;
 
   // `SELECT
   //   Id,
@@ -561,15 +565,15 @@ async function queryBapForPaymentRequestData(req, frfReviewItemId) {
   // FROM
   //   ${BAP_FORMS_TABLE}
   // WHERE
-  //   recordtypeid = '${applicationRecordTypeId}' AND
+  //   recordtypeid = '${frfRecordTypeId}' AND
   //   CSB_Review_Item_ID__c = '${frfReviewItemId}' AND
   //   Latest_Version__c = TRUE`
 
-  const applicationRecordQuery = await bapConnection
+  const frfRecordQuery = await bapConnection
     .sobject(BAP_FORMS_TABLE)
     .find(
       {
-        recordtypeid: applicationRecordTypeId,
+        recordtypeid: frfRecordTypeId,
         CSB_Review_Item_ID__c: frfReviewItemId,
         Latest_Version__c: true,
       },
@@ -596,7 +600,7 @@ async function queryBapForPaymentRequestData(req, frfReviewItemId) {
     )
     .execute(async (err, records) => ((await err) ? err : records));
 
-  const applicationRecordId = applicationRecordQuery["0"].Id;
+  const frfRecordId = frfRecordQuery["0"].Id;
 
   // `SELECT
   //   Id
@@ -635,7 +639,7 @@ async function queryBapForPaymentRequestData(req, frfReviewItemId) {
   //   ${BAP_BUS_TABLE}
   // WHERE
   //   recordtypeid = '${busRecordTypeId}' AND
-  //   Related_Order_Request__c = '${applicationRecordId}' AND
+  //   Related_Order_Request__c = '${frfRecordId}' AND
   //   CSB_Rebate_Item_Type__c = 'Old Bus'`
 
   const busRecordsQuery = await bapConnection
@@ -643,7 +647,7 @@ async function queryBapForPaymentRequestData(req, frfReviewItemId) {
     .find(
       {
         recordtypeid: busRecordTypeId,
-        Related_Order_Request__c: applicationRecordId,
+        Related_Order_Request__c: frfRecordId,
         CSB_Rebate_Item_Type__c: "Old Bus",
       },
       {
@@ -658,7 +662,7 @@ async function queryBapForPaymentRequestData(req, frfReviewItemId) {
     )
     .execute(async (err, records) => ((await err) ? err : records));
 
-  return { applicationRecordQuery, busRecordsQuery };
+  return { frfRecordQuery, busRecordsQuery };
 }
 
 /**
@@ -668,9 +672,9 @@ async function queryBapForPaymentRequestData(req, frfReviewItemId) {
  * @param {express.Request} req
  * @param {string} frfReviewItemId CSB Rebate ID with the form/version ID (9 digits)
  * @param {string} prfReviewItemId CSB Rebate ID with the form/version ID (9 digits)
- * @returns {Promise<BapDataForForCloseOut>} FRF and PRF submission fields
+ * @returns {Promise<BapDataForForCRF>} FRF and PRF submission fields
  */
-async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
+async function queryBapForCRFData(req, frfReviewItemId, prfReviewItemId) {
   const logMessage =
     `Querying the BAP for FRF submission associated with ` +
     `FRF Review Item ID: '${frfReviewItemId}' and PRF submission associated with ` +
@@ -689,7 +693,7 @@ async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
   //   sobjecttype = '${BAP_FORMS_TABLE}'
   // LIMIT 1`
 
-  const applicationRecordTypeIdQuery = await bapConnection
+  const frfRecordTypeIdQuery = await bapConnection
     .sobject("recordtype")
     .find(
       {
@@ -704,7 +708,7 @@ async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
     .limit(1)
     .execute(async (err, records) => ((await err) ? err : records));
 
-  const applicationRecordTypeId = applicationRecordTypeIdQuery["0"].Id;
+  const frfRecordTypeId = frfRecordTypeIdQuery["0"].Id;
 
   // `SELECT
   //   Fleet_Name__c,
@@ -721,15 +725,15 @@ async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
   // FROM
   //   ${BAP_FORMS_TABLE}
   // WHERE
-  //   recordtypeid = '${applicationRecordTypeId}' AND
+  //   recordtypeid = '${frfRecordTypeId}' AND
   //   CSB_Review_Item_ID__c = '${frfReviewItemId}' AND
   //   Latest_Version__c = TRUE`
 
-  const applicationRecordQuery = await bapConnection
+  const frfRecordQuery = await bapConnection
     .sobject(BAP_FORMS_TABLE)
     .find(
       {
-        recordtypeid: applicationRecordTypeId,
+        recordtypeid: frfRecordTypeId,
         CSB_Review_Item_ID__c: frfReviewItemId,
         Latest_Version__c: true,
       },
@@ -759,7 +763,7 @@ async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
   //   sobjecttype = '${BAP_FORMS_TABLE}'
   // LIMIT 1`
 
-  const paymentRequestRecordTypeIdQuery = await bapConnection
+  const prfRecordTypeIdQuery = await bapConnection
     .sobject("recordtype")
     .find(
       {
@@ -774,7 +778,7 @@ async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
     .limit(1)
     .execute(async (err, records) => ((await err) ? err : records));
 
-  const paymentRequestRecordTypeId = paymentRequestRecordTypeIdQuery["0"].Id;
+  const prfRecordTypeId = prfRecordTypeIdQuery["0"].Id;
 
   // `SELECT
   //   Id,
@@ -807,15 +811,15 @@ async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
   // FROM
   //   ${BAP_FORMS_TABLE}
   // WHERE
-  //   recordtypeid = '${paymentRequestRecordTypeId}' AND
+  //   recordtypeid = '${prfRecordTypeId}' AND
   //   CSB_Review_Item_ID__c = '${prfReviewItemId}' AND
   //   Latest_Version__c = TRUE`
 
-  const paymentRequestRecordQuery = await bapConnection
+  const prfRecordQuery = await bapConnection
     .sobject(BAP_FORMS_TABLE)
     .find(
       {
-        recordtypeid: paymentRequestRecordTypeId,
+        recordtypeid: prfRecordTypeId,
         CSB_Review_Item_ID__c: prfReviewItemId,
         Latest_Version__c: true,
       },
@@ -852,7 +856,7 @@ async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
     )
     .execute(async (err, records) => ((await err) ? err : records));
 
-  const paymentRequestRecordId = paymentRequestRecordQuery["0"].Id;
+  const prfRecordId = prfRecordQuery["0"].Id;
 
   // `SELECT
   //   Id
@@ -901,7 +905,7 @@ async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
   //   ${BAP_BUS_TABLE}
   // WHERE
   //   recordtypeid = '${busRecordTypeId}' AND
-  //   Related_Order_Request__c = '${paymentRequestRecordId}' AND
+  //   Related_Order_Request__c = '${prfRecordId}' AND
   //   CSB_Rebate_Item_Type__c = 'New Bus'`
 
   const busRecordsQuery = await bapConnection
@@ -909,7 +913,7 @@ async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
     .find(
       {
         recordtypeid: busRecordTypeId,
-        Related_Order_Request__c: paymentRequestRecordId,
+        Related_Order_Request__c: prfRecordId,
         CSB_Rebate_Item_Type__c: "New Bus",
       },
       {
@@ -934,7 +938,7 @@ async function queryBapForCloseOutData(req, frfReviewItemId, prfReviewItemId) {
     )
     .execute(async (err, records) => ((await err) ? err : records));
 
-  return { applicationRecordQuery, paymentRequestRecordQuery, busRecordsQuery };
+  return { frfRecordQuery, prfRecordQuery, busRecordsQuery };
 }
 
 /**
@@ -1041,11 +1045,11 @@ function getBapFormSubmissionsStatuses(req, comboKeys) {
  *
  * @param {express.Request} req
  * @param {string} frfReviewItemId
- * @returns {ReturnType<queryBapForPaymentRequestData>}
+ * @returns {ReturnType<queryBapForPRFData>}
  */
-function getBapDataForPaymentRequest(req, frfReviewItemId) {
+function getBapDataForPRF(req, frfReviewItemId) {
   return verifyBapConnection(req, {
-    name: queryBapForPaymentRequestData,
+    name: queryBapForPRFData,
     args: [req, frfReviewItemId],
   });
 }
@@ -1057,11 +1061,11 @@ function getBapDataForPaymentRequest(req, frfReviewItemId) {
  * @param {express.Request} req
  * @param {string} frfReviewItemId
  * @param {string} prfReviewItemId
- * @returns {ReturnType<queryBapForCloseOutData>}
+ * @returns {ReturnType<queryBapForCRFData>}
  */
-function getBapDataForCloseOut(req, frfReviewItemId, prfReviewItemId) {
+function getBapDataForCRF(req, frfReviewItemId, prfReviewItemId) {
   return verifyBapConnection(req, {
-    name: queryBapForCloseOutData,
+    name: queryBapForCRFData,
     args: [req, frfReviewItemId, prfReviewItemId],
   });
 }
@@ -1071,6 +1075,6 @@ module.exports = {
   getBapComboKeys,
   getBapFormSubmissionData,
   getBapFormSubmissionsStatuses,
-  getBapDataForPaymentRequest,
-  getBapDataForCloseOut,
+  getBapDataForPRF,
+  getBapDataForCRF,
 };

From 3b02dd91b38a832120e123ea56eab84335bcdefe Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 2 Aug 2023 10:16:33 -0400
Subject: [PATCH 26/71] Update formioCSBMetadata variable name

---
 app/server/app/config/formio.js |  4 ++--
 app/server/app/routes/api.js    | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/server/app/config/formio.js b/app/server/app/config/formio.js
index fda2059c..375bbd8a 100644
--- a/app/server/app/config/formio.js
+++ b/app/server/app/config/formio.js
@@ -78,7 +78,7 @@ function axiosFormio(req) {
   return instance;
 }
 
-const formioCsbMetadata = {
+const formioCSBMetadata = {
   "csb-app-cloud-space": `env-${CLOUD_SPACE || "local"}`,
   "csb-app-cloud-origin": SERVER_URL || "localhost",
 };
@@ -88,5 +88,5 @@ module.exports = {
   formioFRF2022Url,
   formioPRF2022Url,
   formioCRF2022Url,
-  formioCsbMetadata,
+  formioCSBMetadata,
 };
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 372ed8e8..812a286c 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -9,7 +9,7 @@ const {
   formioFRF2022Url,
   formioPRF2022Url,
   formioCRF2022Url,
-  formioCsbMetadata,
+  formioCSBMetadata,
 } = require("../config/formio");
 const {
   ensureAuthenticated,
@@ -391,7 +391,7 @@ router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
   }
 
   /** Add custom metadata to track formio submissions from wrapper. */
-  body.metadata = { ...formioCsbMetadata };
+  body.metadata = { ...formioCSBMetadata };
 
   axiosFormio(req)
     .post(`${formioFRF2022Url}/submission`, body)
@@ -487,7 +487,7 @@ router.post(
         /** Add custom metadata to track formio submissions from wrapper. */
         submission.metadata = {
           ...submission.metadata,
-          ...formioCsbMetadata,
+          ...formioCSBMetadata,
         };
 
         axiosFormio(req)
@@ -648,7 +648,7 @@ router.post(
           },
           /** Add custom metadata to track formio submissions from wrapper. */
           metadata: {
-            ...formioCsbMetadata,
+            ...formioCSBMetadata,
           },
           state: "draft",
         };
@@ -787,7 +787,7 @@ router.post(
         /** Add custom metadata to track formio submissions from wrapper. */
         submission.metadata = {
           ...submission.metadata,
-          ...formioCsbMetadata,
+          ...formioCSBMetadata,
         };
 
         axiosFormio(req)
@@ -1065,7 +1065,7 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
         },
         /** Add custom metadata to track formio submissions from wrapper. */
         metadata: {
-          ...formioCsbMetadata,
+          ...formioCSBMetadata,
         },
         state: "draft",
       };
@@ -1203,7 +1203,7 @@ router.post(
         /**  Add custom metadata to track formio submissions from wrapper. */
         submission.metadata = {
           ...submission.metadata,
-          ...formioCsbMetadata,
+          ...formioCSBMetadata,
         };
 
         axiosFormio(req)

From 8937fa46fbdfb52c891d65c8a961963ef9cd64fa Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 2 Aug 2023 10:48:00 -0400
Subject: [PATCH 27/71] Rename frfSubmissionPeriodOpen in newApplicationForm

---
 app/client/src/routes/newApplicationForm.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/newApplicationForm.tsx
index ab2cff16..e155325e 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/newApplicationForm.tsx
@@ -47,7 +47,8 @@ export function NewApplicationForm() {
     return <Loading />;
   }
 
-  const applicationFormOpen = configData.submissionPeriodOpen[rebateYear].frf;
+  const frfSubmissionPeriodOpen =
+    configData.submissionPeriodOpen[rebateYear].frf;
 
   const activeSamEntities = bapSamData.entities.filter((entity) => {
     return entity.ENTITY_STATUS__c === "Active";
@@ -101,7 +102,7 @@ export function NewApplicationForm() {
                 </div>
 
                 <div className="tw-m-auto tw-max-w-3xl tw-p-4 sm:tw-p-8">
-                  {!applicationFormOpen ? (
+                  {!frfSubmissionPeriodOpen ? (
                     <div className="-tw-mb-4">
                       <Message type="info" text={messages.frfClosed} />
                     </div>

From 60e6b86e62746ed1a369af94f2cdbe50469f2809 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 2 Aug 2023 10:50:56 -0400
Subject: [PATCH 28/71] Update api to use submissionPeriodOpen instead of
 individual variables for controlling each form's open enrollment status

---
 app/server/app/routes/api.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 812a286c..05927dcb 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -36,10 +36,6 @@ const {
   S3_PUBLIC_REGION,
 } = process.env;
 
-const frf2022Open = CSB_FRF_2022_OPEN === "true";
-const prf2022Open = CSB_PRF_2022_OPEN === "true";
-const crf2022Open = CSB_CRF_2022_OPEN === "true";
-
 /**
  * Stores whether the submission period is open for each form by rebate year.
  */
@@ -373,7 +369,7 @@ router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
   const { mail } = req.user;
   const comboKey = body.data?.bap_hidden_entity_combo_key;
 
-  if (!frf2022Open) {
+  if (!submissionPeriodOpen["2022"].frf) {
     const errorStatus = 400;
     const errorMessage = `CSB Application form enrollment period is closed.`;
     return res.status(errorStatus).json({ message: errorMessage });
@@ -560,7 +556,7 @@ router.post(
       frfFormModified,
     } = body;
 
-    if (!prf2022Open) {
+    if (!submissionPeriodOpen["2022"].prf) {
       const errorStatus = 400;
       const errorMessage = `CSB Payment Request form enrollment period is closed.`;
       return res.status(errorStatus).json({ message: errorMessage });
@@ -923,7 +919,7 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
     prfModified,
   } = body;
 
-  if (!crf2022Open) {
+  if (!submissionPeriodOpen["2022"].crf) {
     const errorStatus = 400;
     const errorMessage = `CSB Close Out form enrollment period is closed.`;
     return res.status(errorStatus).json({ message: errorMessage });

From 7bb2abf7159cdc5a04c065b5d2e049d758fcb470 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 2 Aug 2023 11:02:52 -0400
Subject: [PATCH 29/71] Rename env variables to use rebate year before form
 abbreviation

---
 .github/workflows/dev.yml       | 48 ++++++++++-----------
 .github/workflows/staging.yml   | 48 ++++++++++-----------
 app/server/.env.example         | 24 +++++------
 app/server/app/config/formio.js | 24 +++++------
 app/server/app/index.js         | 24 +++++------
 app/server/app/routes/api.js    | 76 ++++++++++++++++-----------------
 app/server/app/routes/help.js   | 12 +++---
 app/server/app/routes/status.js | 12 +++---
 8 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 27f94fbe..14c389df 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -41,18 +41,18 @@ jobs:
       # SAML_PRIVATE_KEY: ${{ secrets.SAML_PRIVATE_KEY }}
       JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
       JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
-      CSB_FRF_2022_OPEN: true
-      CSB_PRF_2022_OPEN: true
-      CSB_CRF_2022_OPEN: true
-      CSB_FRF_2023_OPEN: true
-      CSB_PRF_2023_OPEN: true
-      CSB_CRF_2023_OPEN: true
-      FORMIO_FRF_2022_PATH: ${{ secrets.FORMIO_FRF_2022_PATH }}
-      FORMIO_PRF_2022_PATH: ${{ secrets.FORMIO_PRF_2022_PATH }}
-      FORMIO_CRF_2022_PATH: ${{ secrets.FORMIO_CRF_2022_PATH }}
-      FORMIO_FRF_2023_PATH: ${{ secrets.FORMIO_FRF_2023_PATH }}
-      FORMIO_PRF_2023_PATH: ${{ secrets.FORMIO_PRF_2023_PATH }}
-      FORMIO_CRF_2023_PATH: ${{ secrets.FORMIO_CRF_2023_PATH }}
+      CSB_2022_FRF_OPEN: true
+      CSB_2022_PRF_OPEN: true
+      CSB_2022_CRF_OPEN: true
+      CSB_2023_FRF_OPEN: true
+      CSB_2023_PRF_OPEN: true
+      CSB_2023_CRF_OPEN: true
+      FORMIO_2022_FRF_PATH: ${{ secrets.FORMIO_2022_FRF_PATH }}
+      FORMIO_2022_PRF_PATH: ${{ secrets.FORMIO_2022_PRF_PATH }}
+      FORMIO_2022_CRF_PATH: ${{ secrets.FORMIO_2022_CRF_PATH }}
+      FORMIO_2023_FRF_PATH: ${{ secrets.FORMIO_2023_FRF_PATH }}
+      FORMIO_2023_PRF_PATH: ${{ secrets.FORMIO_2023_PRF_PATH }}
+      FORMIO_2023_CRF_PATH: ${{ secrets.FORMIO_2023_CRF_PATH }}
       FORMIO_BASE_URL: ${{ secrets.FORMIO_BASE_URL }}
       FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
@@ -130,18 +130,18 @@ jobs:
           # cf set-env $APP_NAME "SAML_PRIVATE_KEY" "$SAML_PRIVATE_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PUBLIC_KEY" "$JWT_PUBLIC_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PRIVATE_KEY" "$JWT_PRIVATE_KEY" > /dev/null
-          cf set-env $APP_NAME "CSB_FRF_2022_OPEN" "$CSB_FRF_2022_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_PRF_2022_OPEN" "$CSB_PRF_2022_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_CRF_2022_OPEN" "$CSB_CRF_2022_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_FRF_2023_OPEN" "$CSB_FRF_2023_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_PRF_2023_OPEN" "$CSB_PRF_2023_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_CRF_2023_OPEN" "$CSB_CRF_2023_OPEN" > /dev/null
-          cf set-env $APP_NAME "FORMIO_FRF_2022_PATH" "$FORMIO_FRF_2022_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_PRF_2022_PATH" "$FORMIO_PRF_2022_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_CRF_2022_PATH" "$FORMIO_CRF_2022_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_FRF_2023_PATH" "$FORMIO_FRF_2023_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_PRF_2023_PATH" "$FORMIO_PRF_2023_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_CRF_2023_PATH" "$FORMIO_CRF_2023_PATH" > /dev/null
+          cf set-env $APP_NAME "CSB_2022_FRF_OPEN" "$CSB_2022_FRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_2022_PRF_OPEN" "$CSB_2022_PRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_2022_CRF_OPEN" "$CSB_2022_CRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_2023_FRF_OPEN" "$CSB_2023_FRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_2023_PRF_OPEN" "$CSB_2023_PRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_2023_CRF_OPEN" "$CSB_2023_CRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2022_FRF_PATH" "$FORMIO_2022_FRF_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2022_PRF_PATH" "$FORMIO_2022_PRF_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2022_CRF_PATH" "$FORMIO_2022_CRF_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2023_FRF_PATH" "$FORMIO_2023_FRF_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2023_PRF_PATH" "$FORMIO_2023_PRF_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2023_CRF_PATH" "$FORMIO_2023_CRF_PATH" > /dev/null
           cf set-env $APP_NAME "FORMIO_BASE_URL" "$FORMIO_BASE_URL" > /dev/null
           cf set-env $APP_NAME "FORMIO_PROJECT_NAME" "$FORMIO_PROJECT_NAME" > /dev/null
           cf set-env $APP_NAME "FORMIO_API_KEY" "$FORMIO_API_KEY" > /dev/null
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index d3c9978c..d9b69ee0 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -41,18 +41,18 @@ jobs:
       SAML_PRIVATE_KEY: ${{ secrets.SAML_PRIVATE_KEY }}
       JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
       JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
-      CSB_FRF_2022_OPEN: true
-      CSB_PRF_2022_OPEN: true
-      CSB_CRF_2022_OPEN: true
-      CSB_FRF_2023_OPEN: true
-      CSB_PRF_2023_OPEN: true
-      CSB_CRF_2023_OPEN: true
-      FORMIO_FRF_2022_PATH: ${{ secrets.FORMIO_FRF_2022_PATH }}
-      FORMIO_PRF_2022_PATH: ${{ secrets.FORMIO_PRF_2022_PATH }}
-      FORMIO_CRF_2022_PATH: ${{ secrets.FORMIO_CRF_2022_PATH }}
-      FORMIO_FRF_2023_PATH: ${{ secrets.FORMIO_FRF_2023_PATH }}
-      FORMIO_PRF_2023_PATH: ${{ secrets.FORMIO_PRF_2023_PATH }}
-      FORMIO_CRF_2023_PATH: ${{ secrets.FORMIO_CRF_2023_PATH }}
+      CSB_2022_FRF_OPEN: true
+      CSB_2022_PRF_OPEN: true
+      CSB_2022_CRF_OPEN: true
+      CSB_2023_FRF_OPEN: true
+      CSB_2023_PRF_OPEN: true
+      CSB_2023_CRF_OPEN: true
+      FORMIO_2022_FRF_PATH: ${{ secrets.FORMIO_2022_FRF_PATH }}
+      FORMIO_2022_PRF_PATH: ${{ secrets.FORMIO_2022_PRF_PATH }}
+      FORMIO_2022_CRF_PATH: ${{ secrets.FORMIO_2022_CRF_PATH }}
+      FORMIO_2023_FRF_PATH: ${{ secrets.FORMIO_2023_FRF_PATH }}
+      FORMIO_2023_PRF_PATH: ${{ secrets.FORMIO_2023_PRF_PATH }}
+      FORMIO_2023_CRF_PATH: ${{ secrets.FORMIO_2023_CRF_PATH }}
       FORMIO_BASE_URL: ${{ secrets.FORMIO_BASE_URL }}
       FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
@@ -130,18 +130,18 @@ jobs:
           cf set-env $APP_NAME "SAML_PRIVATE_KEY" "$SAML_PRIVATE_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PUBLIC_KEY" "$JWT_PUBLIC_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PRIVATE_KEY" "$JWT_PRIVATE_KEY" > /dev/null
-          cf set-env $APP_NAME "CSB_FRF_2022_OPEN" "$CSB_FRF_2022_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_PRF_2022_OPEN" "$CSB_PRF_2022_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_CRF_2022_OPEN" "$CSB_CRF_2022_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_FRF_2023_OPEN" "$CSB_FRF_2023_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_PRF_2023_OPEN" "$CSB_PRF_2023_OPEN" > /dev/null
-          cf set-env $APP_NAME "CSB_CRF_2023_OPEN" "$CSB_CRF_2023_OPEN" > /dev/null
-          cf set-env $APP_NAME "FORMIO_FRF_2022_PATH" "$FORMIO_FRF_2022_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_PRF_2022_PATH" "$FORMIO_PRF_2022_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_CRF_2022_PATH" "$FORMIO_CRF_2022_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_FRF_2023_PATH" "$FORMIO_FRF_2023_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_PRF_2023_PATH" "$FORMIO_PRF_2023_PATH" > /dev/null
-          cf set-env $APP_NAME "FORMIO_CRF_2023_PATH" "$FORMIO_CRF_2023_PATH" > /dev/null
+          cf set-env $APP_NAME "CSB_2022_FRF_OPEN" "$CSB_2022_FRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_2022_PRF_OPEN" "$CSB_2022_PRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_2022_CRF_OPEN" "$CSB_2022_CRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_2023_FRF_OPEN" "$CSB_2023_FRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_2023_PRF_OPEN" "$CSB_2023_PRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "CSB_2023_CRF_OPEN" "$CSB_2023_CRF_OPEN" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2022_FRF_PATH" "$FORMIO_2022_FRF_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2022_PRF_PATH" "$FORMIO_2022_PRF_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2022_CRF_PATH" "$FORMIO_2022_CRF_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2023_FRF_PATH" "$FORMIO_2023_FRF_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2023_PRF_PATH" "$FORMIO_2023_PRF_PATH" > /dev/null
+          cf set-env $APP_NAME "FORMIO_2023_CRF_PATH" "$FORMIO_2023_CRF_PATH" > /dev/null
           cf set-env $APP_NAME "FORMIO_BASE_URL" "$FORMIO_BASE_URL" > /dev/null
           cf set-env $APP_NAME "FORMIO_PROJECT_NAME" "$FORMIO_PROJECT_NAME" > /dev/null
           cf set-env $APP_NAME "FORMIO_API_KEY" "$FORMIO_API_KEY" > /dev/null
diff --git a/app/server/.env.example b/app/server/.env.example
index ec863e77..f6eeeb2c 100644
--- a/app/server/.env.example
+++ b/app/server/.env.example
@@ -10,18 +10,18 @@ SAML_IDP_CERT=
 SAML_PUBLIC_KEY=publickey
 JWT_PRIVATE_KEY=secret
 JWT_PUBLIC_KEY=secret
-CSB_FRF_2022_OPEN=true
-CSB_PRF_2022_OPEN=true
-CSB_CRF_2022_OPEN=true
-CSB_FRF_2023_OPEN=true
-CSB_PRF_2023_OPEN=true
-CSB_CRF_2023_OPEN=true
-FORMIO_FRF_2022_PATH=
-FORMIO_PRF_2022_PATH=
-FORMIO_CRF_2022_PATH=
-FORMIO_FRF_2023_PATH=
-FORMIO_PRF_2023_PATH=
-FORMIO_CRF_2023_PATH=
+CSB_2022_FRF_OPEN=true
+CSB_2022_PRF_OPEN=true
+CSB_2022_CRF_OPEN=true
+CSB_2023_FRF_OPEN=true
+CSB_2023_PRF_OPEN=true
+CSB_2023_CRF_OPEN=true
+FORMIO_2022_FRF_PATH=
+FORMIO_2022_PRF_PATH=
+FORMIO_2022_CRF_PATH=
+FORMIO_2023_FRF_PATH=
+FORMIO_2023_PRF_PATH=
+FORMIO_2023_CRF_PATH=
 FORMIO_BASE_URL=
 FORMIO_PROJECT_NAME=
 FORMIO_API_KEY=
diff --git a/app/server/app/config/formio.js b/app/server/app/config/formio.js
index 375bbd8a..0cc97a66 100644
--- a/app/server/app/config/formio.js
+++ b/app/server/app/config/formio.js
@@ -9,18 +9,18 @@ const {
   FORMIO_BASE_URL,
   FORMIO_PROJECT_NAME,
   FORMIO_API_KEY,
-  FORMIO_FRF_2022_PATH,
-  FORMIO_PRF_2022_PATH,
-  FORMIO_CRF_2022_PATH,
-  FORMIO_FRF_2023_PATH,
-  FORMIO_PRF_2023_PATH,
-  FORMIO_CRF_2023_PATH,
+  FORMIO_2022_FRF_PATH,
+  FORMIO_2022_PRF_PATH,
+  FORMIO_2022_CRF_PATH,
+  FORMIO_2023_FRF_PATH,
+  FORMIO_2023_PRF_PATH,
+  FORMIO_2023_CRF_PATH,
 } = process.env;
 
 const formioProjectUrl = `${FORMIO_BASE_URL}/${FORMIO_PROJECT_NAME}`;
-const formioFRF2022Url = `${formioProjectUrl}/${FORMIO_FRF_2022_PATH}`;
-const formioPRF2022Url = `${formioProjectUrl}/${FORMIO_PRF_2022_PATH}`;
-const formioCRF2022Url = `${formioProjectUrl}/${FORMIO_CRF_2022_PATH}`;
+const formio2022FRFUrl = `${formioProjectUrl}/${FORMIO_2022_FRF_PATH}`;
+const formio2022PRFUrl = `${formioProjectUrl}/${FORMIO_2022_PRF_PATH}`;
+const formio2022CRFUrl = `${formioProjectUrl}/${FORMIO_2022_CRF_PATH}`;
 
 /** @param {express.Request} req */
 function axiosFormio(req) {
@@ -85,8 +85,8 @@ const formioCSBMetadata = {
 
 module.exports = {
   axiosFormio,
-  formioFRF2022Url,
-  formioPRF2022Url,
-  formioCRF2022Url,
+  formio2022FRFUrl,
+  formio2022PRFUrl,
+  formio2022CRFUrl,
   formioCSBMetadata,
 };
diff --git a/app/server/app/index.js b/app/server/app/index.js
index ded4baf3..f42418bb 100644
--- a/app/server/app/index.js
+++ b/app/server/app/index.js
@@ -36,18 +36,18 @@ const requiredEnvironmentVariables = [
   "SAML_PUBLIC_KEY",
   "JWT_PRIVATE_KEY",
   "JWT_PUBLIC_KEY",
-  "CSB_FRF_2022_OPEN",
-  "CSB_PRF_2022_OPEN",
-  "CSB_CRF_2022_OPEN",
-  "CSB_FRF_2023_OPEN",
-  "CSB_PRF_2023_OPEN",
-  "CSB_CRF_2023_OPEN",
-  "FORMIO_FRF_2022_PATH",
-  "FORMIO_PRF_2022_PATH",
-  "FORMIO_CRF_2022_PATH",
-  "FORMIO_FRF_2023_PATH",
-  "FORMIO_PRF_2023_PATH",
-  "FORMIO_CRF_2023_PATH",
+  "CSB_2022_FRF_OPEN",
+  "CSB_2022_PRF_OPEN",
+  "CSB_2022_CRF_OPEN",
+  "CSB_2023_FRF_OPEN",
+  "CSB_2023_PRF_OPEN",
+  "CSB_2023_CRF_OPEN",
+  "FORMIO_2022_FRF_PATH",
+  "FORMIO_2022_PRF_PATH",
+  "FORMIO_2022_CRF_PATH",
+  "FORMIO_2023_FRF_PATH",
+  "FORMIO_2023_PRF_PATH",
+  "FORMIO_2023_CRF_PATH",
   "FORMIO_BASE_URL",
   "FORMIO_PROJECT_NAME",
   "FORMIO_API_KEY",
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 05927dcb..73a3a707 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -6,9 +6,9 @@ const ObjectId = require("mongodb").ObjectId;
 // ---
 const {
   axiosFormio,
-  formioFRF2022Url,
-  formioPRF2022Url,
-  formioCRF2022Url,
+  formio2022FRFUrl,
+  formio2022PRFUrl,
+  formio2022CRFUrl,
   formioCSBMetadata,
 } = require("../config/formio");
 const {
@@ -26,12 +26,12 @@ const log = require("../utilities/logger");
 
 const {
   NODE_ENV,
-  CSB_FRF_2022_OPEN,
-  CSB_PRF_2022_OPEN,
-  CSB_CRF_2022_OPEN,
-  CSB_FRF_2023_OPEN,
-  CSB_PRF_2023_OPEN,
-  CSB_CRF_2023_OPEN,
+  CSB_2022_FRF_OPEN,
+  CSB_2022_PRF_OPEN,
+  CSB_2022_CRF_OPEN,
+  CSB_2023_FRF_OPEN,
+  CSB_2023_PRF_OPEN,
+  CSB_2023_CRF_OPEN,
   S3_PUBLIC_BUCKET,
   S3_PUBLIC_REGION,
 } = process.env;
@@ -41,14 +41,14 @@ const {
  */
 const submissionPeriodOpen = {
   2022: {
-    frf: CSB_FRF_2022_OPEN === "true",
-    prf: CSB_PRF_2022_OPEN === "true",
-    crf: CSB_CRF_2022_OPEN === "true",
+    frf: CSB_2022_FRF_OPEN === "true",
+    prf: CSB_2022_PRF_OPEN === "true",
+    crf: CSB_2022_CRF_OPEN === "true",
   },
   2023: {
-    frf: CSB_FRF_2023_OPEN === "true",
-    prf: CSB_PRF_2023_OPEN === "true",
-    crf: CSB_CRF_2023_OPEN === "true",
+    frf: CSB_2023_FRF_OPEN === "true",
+    prf: CSB_2023_PRF_OPEN === "true",
+    crf: CSB_2023_CRF_OPEN === "true",
   },
 };
 
@@ -256,7 +256,7 @@ router.get(
     }
 
     axiosFormio(req)
-      .get(`${formioFRF2022Url}/storage/s3`, { params: query })
+      .get(`${formio2022FRFUrl}/storage/s3`, { params: query })
       .then((axiosRes) => axiosRes.data)
       .then((fileMetadata) => res.json(fileMetadata))
       .catch((error) => {
@@ -297,7 +297,7 @@ router.post(
         }
 
         axiosFormio(req)
-          .post(`${formioFRF2022Url}/storage/s3`, body)
+          .post(`${formio2022FRFUrl}/storage/s3`, body)
           .then((axiosRes) => axiosRes.data)
           .then((fileMetadata) => res.json(fileMetadata))
           .catch((error) => {
@@ -345,7 +345,7 @@ router.get("/formio-application-submissions", storeBapComboKeys, (req, res) => {
   if (bapComboKeys.length === 0) return res.json([]);
 
   const userSubmissionsUrl =
-    `${formioFRF2022Url}/submission` +
+    `${formio2022FRFUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
     `&data.bap_hidden_entity_combo_key=` +
@@ -390,7 +390,7 @@ router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
   body.metadata = { ...formioCSBMetadata };
 
   axiosFormio(req)
-    .post(`${formioFRF2022Url}/submission`, body)
+    .post(`${formio2022FRFUrl}/submission`, body)
     .then((axiosRes) => axiosRes.data)
     .then((submission) => res.json(submission))
     .catch((error) => {
@@ -412,8 +412,8 @@ router.get(
     const { mongoId } = req.params;
 
     Promise.all([
-      axiosFormio(req).get(`${formioFRF2022Url}/submission/${mongoId}`),
-      axiosFormio(req).get(formioFRF2022Url),
+      axiosFormio(req).get(`${formio2022FRFUrl}/submission/${mongoId}`),
+      axiosFormio(req).get(formio2022FRFUrl),
     ])
       .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
       .then(([submission, schema]) => {
@@ -434,7 +434,7 @@ router.get(
 
         return res.json({
           userAccess: true,
-          formSchema: { url: formioFRF2022Url, json: schema },
+          formSchema: { url: formio2022FRFUrl, json: schema },
           submission,
         });
       })
@@ -487,7 +487,7 @@ router.post(
         };
 
         axiosFormio(req)
-          .put(`${formioFRF2022Url}/submission/${mongoId}`, submission)
+          .put(`${formio2022FRFUrl}/submission/${mongoId}`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
@@ -518,7 +518,7 @@ router.get(
     const { bapComboKeys } = req;
 
     const userSubmissionsUrl =
-      `${formioPRF2022Url}/submission` +
+      `${formio2022PRFUrl}/submission` +
       `?sort=-modified` +
       `&limit=1000000` +
       `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
@@ -650,7 +650,7 @@ router.post(
         };
 
         axiosFormio(req)
-          .post(`${formioPRF2022Url}/submission`, submission)
+          .post(`${formio2022PRFUrl}/submission`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
@@ -679,13 +679,13 @@ router.get(
     const { rebateId } = req.params; // CSB Rebate ID (6 digits)
 
     const matchedPaymentRequestFormSubmissions =
-      `${formioPRF2022Url}/submission` +
+      `${formio2022PRFUrl}/submission` +
       `?data.hidden_bap_rebate_id=${rebateId}` +
       `&select=_id,data.bap_hidden_entity_combo_key`;
 
     Promise.all([
       axiosFormio(req).get(matchedPaymentRequestFormSubmissions),
-      axiosFormio(req).get(formioPRF2022Url),
+      axiosFormio(req).get(formio2022PRFUrl),
     ])
       .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
       .then(([submissions, schema]) => {
@@ -722,12 +722,12 @@ router.get(
          * to have Formio return the correct signature field data.
          */
         axiosFormio(req)
-          .get(`${formioPRF2022Url}/submission/${mongoId}`)
+          .get(`${formio2022PRFUrl}/submission/${mongoId}`)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => {
             return res.json({
               userAccess: true,
-              formSchema: { url: formioPRF2022Url, json: schema },
+              formSchema: { url: formio2022PRFUrl, json: schema },
               submission,
             });
           });
@@ -787,7 +787,7 @@ router.post(
         };
 
         axiosFormio(req)
-          .put(`${formioPRF2022Url}/submission/${mongoId}`, submission)
+          .put(`${formio2022PRFUrl}/submission/${mongoId}`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
@@ -855,7 +855,7 @@ router.post(
         }
 
         axiosFormio(req)
-          .delete(`${formioPRF2022Url}/submission/${mongoId}`)
+          .delete(`${formio2022PRFUrl}/submission/${mongoId}`)
           .then((axiosRes) => axiosRes.data)
           .then((response) => {
             const logMessage = `User with email '${mail}' successfully deleted PRF submission '${rebateId}'.`;
@@ -884,7 +884,7 @@ router.get("/formio-close-out-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
   const userSubmissionsUrl =
-    `${formioCRF2022Url}/submission` +
+    `${formio2022CRFUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
     `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
@@ -1067,7 +1067,7 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
       };
 
       axiosFormio(req)
-        .post(`${formioCRF2022Url}/submission`, submission)
+        .post(`${formio2022CRFUrl}/submission`, submission)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
@@ -1095,13 +1095,13 @@ router.get(
     const { rebateId } = req.params; // CSB Rebate ID (6 digits)
 
     const matchedCloseOutFormSubmissions =
-      `${formioCRF2022Url}/submission` +
+      `${formio2022CRFUrl}/submission` +
       `?data.hidden_bap_rebate_id=${rebateId}` +
       `&select=_id,data.bap_hidden_entity_combo_key`;
 
     Promise.all([
       axiosFormio(req).get(matchedCloseOutFormSubmissions),
-      axiosFormio(req).get(formioCRF2022Url),
+      axiosFormio(req).get(formio2022CRFUrl),
     ])
       .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
       .then(([submissions, schema]) => {
@@ -1138,12 +1138,12 @@ router.get(
          * to have Formio return the correct signature field data.
          */
         axiosFormio(req)
-          .get(`${formioCRF2022Url}/submission/${mongoId}`)
+          .get(`${formio2022CRFUrl}/submission/${mongoId}`)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => {
             return res.json({
               userAccess: true,
-              formSchema: { url: formioCRF2022Url, json: schema },
+              formSchema: { url: formio2022CRFUrl, json: schema },
               submission,
             });
           });
@@ -1203,7 +1203,7 @@ router.post(
         };
 
         axiosFormio(req)
-          .put(`${formioCRF2022Url}/submission/${mongoId}`, submission)
+          .put(`${formio2022CRFUrl}/submission/${mongoId}`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
diff --git a/app/server/app/routes/help.js b/app/server/app/routes/help.js
index 99933f84..3310975c 100644
--- a/app/server/app/routes/help.js
+++ b/app/server/app/routes/help.js
@@ -3,9 +3,9 @@ const ObjectId = require("mongodb").ObjectId;
 // ---
 const {
   axiosFormio,
-  formioFRF2022Url,
-  formioPRF2022Url,
-  formioCRF2022Url,
+  formio2022FRFUrl,
+  formio2022PRFUrl,
+  formio2022CRFUrl,
 } = require("../config/formio");
 const { ensureAuthenticated, ensureHelpdesk } = require("../middleware");
 const { getBapFormSubmissionData } = require("../utilities/bap");
@@ -41,11 +41,11 @@ router.get("/formio-submission/:formType/:id", (req, res) => {
 
   const formUrl =
     formType === "frf"
-      ? formioFRF2022Url
+      ? formio2022FRFUrl
       : formType === "prf"
-      ? formioPRF2022Url
+      ? formio2022PRFUrl
       : formType === "crf"
-      ? formioCRF2022Url
+      ? formio2022CRFUrl
       : null; // fallback
 
   return getBapFormSubmissionData(req, formType, rebateId, mongoId).then(
diff --git a/app/server/app/routes/status.js b/app/server/app/routes/status.js
index 3416258c..a508993b 100644
--- a/app/server/app/routes/status.js
+++ b/app/server/app/routes/status.js
@@ -2,9 +2,9 @@ const express = require("express");
 // ---
 const {
   axiosFormio,
-  formioFRF2022Url,
-  formioPRF2022Url,
-  formioCRF2022Url,
+  formio2022FRFUrl,
+  formio2022PRFUrl,
+  formio2022CRFUrl,
 } = require("../config/formio");
 const { getSamEntities } = require("../utilities/bap");
 
@@ -31,7 +31,7 @@ router.get("/bap-sam-data", (req, res) => {
 
 router.get("/formio-application-schema", (req, res) => {
   axiosFormio(req)
-    .get(formioFRF2022Url)
+    .get(formio2022FRFUrl)
     .then((axiosRes) => axiosRes.data)
     .then((schema) => {
       /**
@@ -48,7 +48,7 @@ router.get("/formio-application-schema", (req, res) => {
 
 router.get("/formio-payment-request-schema", (req, res) => {
   axiosFormio(req)
-    .get(formioPRF2022Url)
+    .get(formio2022PRFUrl)
     .then((axiosRes) => axiosRes.data)
     .then((schema) => {
       /**
@@ -65,7 +65,7 @@ router.get("/formio-payment-request-schema", (req, res) => {
 
 router.get("/formio-close-out-schema", (req, res) => {
   axiosFormio(req)
-    .get(formioCRF2022Url)
+    .get(formio2022CRFUrl)
     .then((axiosRes) => axiosRes.data)
     .then((schema) => {
       /**

From 63c51c22a6d08cf8f909a9d64248fa6a31b98066 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 2 Aug 2023 11:11:59 -0400
Subject: [PATCH 30/71] Update api routes for fetching user's submissions from
 formio for each 2022 form

---
 app/client/src/utilities.tsx | 18 ++++++------
 app/server/app/routes/api.js | 54 +++++++++++++++++-------------------
 docs/csb-openapi.json        | 12 ++++----
 3 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 5e2beab1..1e1838a9 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -329,25 +329,25 @@ export function useSubmissionsQueries() {
         refetchOnWindowFocus: false,
       },
       {
-        queryKey: ["formio-frf-submissions"],
+        queryKey: ["formio-2022-frf-submissions"],
         queryFn: () => {
-          const url = `${serverUrl}/api/formio-application-submissions`;
+          const url = `${serverUrl}/api/formio-2022-frf-submissions`;
           return getData<FormioFRFSubmission[]>(url);
         },
         refetchOnWindowFocus: false,
       },
       {
-        queryKey: ["formio-prf-submissions"],
+        queryKey: ["formio-2022-prf-submissions"],
         queryFn: () => {
-          const url = `${serverUrl}/api/formio-payment-request-submissions`;
+          const url = `${serverUrl}/api/formio-2022-prf-submissions`;
           return getData<FormioPRFSubmission[]>(url);
         },
         refetchOnWindowFocus: false,
       },
       {
-        queryKey: ["formio-crf-submissions"],
+        queryKey: ["formio-2022-crf-submissions"],
         queryFn: () => {
-          const url = `${serverUrl}/api/formio-close-out-submissions`;
+          const url = `${serverUrl}/api/formio-2022-crf-submissions`;
           return getData<FormioCRFSubmission[]>(url);
         },
         refetchOnWindowFocus: false,
@@ -371,15 +371,15 @@ function useCombinedRebates() {
   }>(["bap-form-submissions"]);
 
   const formioFRFSubmissions = queryClient.getQueryData<FormioFRFSubmission[]>([
-    "formio-frf-submissions",
+    "formio-2022-frf-submissions",
   ]);
 
   const formioPRFSubmissions = queryClient.getQueryData<FormioPRFSubmission[]>([
-    "formio-prf-submissions",
+    "formio-2022-prf-submissions",
   ]);
 
   const formioCRFSubmissions = queryClient.getQueryData<FormioCRFSubmission[]>([
-    "formio-crf-submissions",
+    "formio-2022-crf-submissions",
   ]);
 
   // ensure form submissions data has been fetched from both the BAP and Formio
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 73a3a707..1b71ab94 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -329,8 +329,8 @@ router.post(
   }
 );
 
-// --- get user's FRF submissions from Formio
-router.get("/formio-application-submissions", storeBapComboKeys, (req, res) => {
+// --- get user's 2022 FRF submissions from Formio
+router.get("/formio-2022-frf-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
   /**
@@ -510,33 +510,29 @@ router.post(
   }
 );
 
-// --- get user's PRF submissions from Formio
-router.get(
-  "/formio-payment-request-submissions",
-  storeBapComboKeys,
-  (req, res) => {
-    const { bapComboKeys } = req;
+// --- get user's 2022 PRF submissions from Formio
+router.get("/formio-2022-prf-submissions", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys } = req;
 
-    const userSubmissionsUrl =
-      `${formio2022PRFUrl}/submission` +
-      `?sort=-modified` +
-      `&limit=1000000` +
-      `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
-        "&data.bap_hidden_entity_combo_key="
-      )}`;
+  const userSubmissionsUrl =
+    `${formio2022PRFUrl}/submission` +
+    `?sort=-modified` +
+    `&limit=1000000` +
+    `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
+      "&data.bap_hidden_entity_combo_key="
+    )}`;
 
-    axiosFormio(req)
-      .get(userSubmissionsUrl)
-      .then((axiosRes) => axiosRes.data)
-      .then((submissions) => res.json(submissions))
-      .catch((error) => {
-        // NOTE: logged in axiosFormio response interceptor
-        const errorStatus = error.response?.status || 500;
-        const errorMessage = `Error getting Formio Payment Request form submissions.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
+  axiosFormio(req)
+    .get(userSubmissionsUrl)
+    .then((axiosRes) => axiosRes.data)
+    .then((submissions) => res.json(submissions))
+    .catch((error) => {
+      // NOTE: logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error getting Formio Payment Request form submissions.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
 
 // --- post a new PRF submission to Formio
 router.post(
@@ -879,8 +875,8 @@ router.post(
   }
 );
 
-// --- get user's CRF submissions from Formio
-router.get("/formio-close-out-submissions", storeBapComboKeys, (req, res) => {
+// --- get user's 2022 CRF submissions from Formio
+router.get("/formio-2022-crf-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
   const userSubmissionsUrl =
diff --git a/docs/csb-openapi.json b/docs/csb-openapi.json
index 1046cc3c..ebfcc82b 100644
--- a/docs/csb-openapi.json
+++ b/docs/csb-openapi.json
@@ -492,9 +492,9 @@
         ]
       }
     },
-    "/api/formio-application-submissions": {
+    "/api/formio-2022-frf-submissions": {
       "get": {
-        "summary": "/api/formio-application-submissions",
+        "summary": "/api/formio-2022-frf-submissions",
         "responses": {
           "200": {
             "description": "OK",
@@ -613,9 +613,9 @@
         "tags": []
       }
     },
-    "/api/formio-payment-request-submissions": {
+    "/api/formio-2022-prf-submissions": {
       "get": {
-        "summary": "/api/formio-payment-request-submissions",
+        "summary": "/api/formio-2022-prf-submissions",
         "responses": {
           "200": {
             "description": "OK",
@@ -753,9 +753,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-close-out-submissions": {
+    "/api/formio-2022-crf-submissions": {
       "get": {
-        "summary": "/api/formio-close-out-submissions",
+        "summary": "/api/formio-2022-crf-submissions",
         "responses": {
           "200": {
             "description": "OK",

From 2789c374093cfceab651aa063d312a1736a3e5ca Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 2 Aug 2023 11:33:26 -0400
Subject: [PATCH 31/71] Update remaining formio routes to include rebate year
 and form abbreviation in url

---
 app/client/src/routes/allRebates.tsx         |   4 +-
 app/client/src/routes/applicationForm.tsx    |   4 +-
 app/client/src/routes/closeOutForm.tsx       |   2 +-
 app/client/src/routes/newApplicationForm.tsx |   2 +-
 app/client/src/routes/paymentRequestForm.tsx |   2 +-
 app/client/src/utilities.tsx                 |   4 +-
 app/server/app/routes/api.js                 | 300 +++++++++----------
 docs/csb-openapi.json                        |  34 +--
 8 files changed, 171 insertions(+), 181 deletions(-)

diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index 81d05025..67b50147 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -353,7 +353,7 @@ function PRFSubmission(props: { rebate: Rebate }) {
               const { title, name } = getUserInfo(email, entity);
 
               // create a new draft PRF submission
-              postData(`${serverUrl}/api/formio-payment-request-submission/`, {
+              postData(`${serverUrl}/api/formio-2022-prf-submission/`, {
                 email,
                 title,
                 name,
@@ -586,7 +586,7 @@ function CRFSubmission(props: { rebate: Rebate }) {
               const { title, name } = getUserInfo(email, entity);
 
               // create a new draft CRF submission
-              postData(`${serverUrl}/api/formio-close-out-submission/`, {
+              postData(`${serverUrl}/api/formio-2022-crf-submission/`, {
                 email,
                 title,
                 name,
diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index 5ab03ce4..340e0001 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -47,7 +47,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
     queryClient.resetQueries({ queryKey: ["application"] });
   }, [queryClient]);
 
-  const url = `${serverUrl}/api/formio-application-submission/${mongoId}`;
+  const url = `${serverUrl}/api/formio-2022-frf-submission/${mongoId}`;
 
   const query = useQuery({
     queryKey: ["application", { id: mongoId }],
@@ -281,7 +281,7 @@ function UserApplicationForm(props: { email: string }) {
           ),
         });
 
-        const url = `${serverUrl}/api/delete-formio-payment-request-submission`;
+        const url = `${serverUrl}/api/delete-formio-2022-prf-submission`;
 
         postData(url, {
           mongoId: prf._id,
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index b2a6d56c..485f7db5 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -46,7 +46,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
     queryClient.resetQueries({ queryKey: ["close-out"] });
   }, [queryClient]);
 
-  const url = `${serverUrl}/api/formio-close-out-submission/${rebateId}`;
+  const url = `${serverUrl}/api/formio-2022-crf-submission/${rebateId}`;
 
   const query = useQuery({
     queryKey: ["close-out", { id: rebateId }],
diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/newApplicationForm.tsx
index e155325e..a2179596 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/newApplicationForm.tsx
@@ -194,7 +194,7 @@ export function NewApplicationForm() {
                                         );
 
                                         postData<FormioFRFSubmission>(
-                                          `${serverUrl}/api/formio-application-submission/`,
+                                          `${serverUrl}/api/formio-2022-frf-submission/`,
                                           {
                                             data: {
                                               last_updated_by: email,
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index 59be7c70..91c4d235 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -46,7 +46,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
     queryClient.resetQueries({ queryKey: ["payment-request"] });
   }, [queryClient]);
 
-  const url = `${serverUrl}/api/formio-payment-request-submission/${rebateId}`;
+  const url = `${serverUrl}/api/formio-2022-prf-submission/${rebateId}`;
 
   const query = useQuery({
     queryKey: ["payment-request", { id: rebateId }],
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 1e1838a9..dfeab2e8 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -437,8 +437,8 @@ function useCombinedRebates() {
    * NOTE: For there to be any Formio PRF submissions at all, the BAP's ETL
    * process must be running, as the `hidden_bap_rebate_id` field of a PRF
    * submission is injected in the creation of a brand new submission in the
-   * `/api/formio-payment-request-submission` POST request where he BAP Rebate
-   * ID (along with other fields) are fetched from the BAP and then posted to
+   * `/api/formio-2022-prf-submission` POST request where he BAP Rebate ID
+   * (along with other fields) are fetched from the BAP and then posted to
    * Formio in a new PRF submission.
    *
    * That said, if the BAP ETL isn't returning data, we should make sure we
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 1b71ab94..766bb868 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -363,8 +363,8 @@ router.get("/formio-2022-frf-submissions", storeBapComboKeys, (req, res) => {
     });
 });
 
-// --- post a new FRF submission to Formio
-router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
+// --- post a new 2022 FRF submission to Formio
+router.post("/formio-2022-frf-submission", storeBapComboKeys, (req, res) => {
   const { bapComboKeys, body } = req;
   const { mail } = req.user;
   const comboKey = body.data?.bap_hidden_entity_combo_key;
@@ -401,9 +401,9 @@ router.post("/formio-application-submission", storeBapComboKeys, (req, res) => {
     });
 });
 
-// --- get an existing FRF's schema and submission data from Formio
+// --- get an existing 2022 FRF's schema and submission data from Formio
 router.get(
-  "/formio-application-submission/:mongoId",
+  "/formio-2022-frf-submission/:mongoId",
   verifyMongoObjectId,
   storeBapComboKeys,
   (req, res) => {
@@ -447,9 +447,9 @@ router.get(
   }
 );
 
-// --- post an update to an existing draft FRF submission to Formio
+// --- post an update to an existing draft 2022 FRF submission to Formio
 router.post(
-  "/formio-application-submission/:mongoId",
+  "/formio-2022-frf-submission/:mongoId",
   verifyMongoObjectId,
   storeBapComboKeys,
   (req, res) => {
@@ -458,12 +458,10 @@ router.post(
     const { mongoId } = req.params;
     const submission = req.body;
     const comboKey = submission.data?.bap_hidden_entity_combo_key;
-    const formType = "frf";
-    const rebateYear = "2022"; // TODO
 
     checkFormSubmissionPeriodAndBapStatus({
-      rebateYear,
-      formType,
+      rebateYear: "2022",
+      formType: "frf",
       mongoId,
       comboKey,
       req,
@@ -534,140 +532,136 @@ router.get("/formio-2022-prf-submissions", storeBapComboKeys, (req, res) => {
     });
 });
 
-// --- post a new PRF submission to Formio
-router.post(
-  "/formio-payment-request-submission",
-  storeBapComboKeys,
-  (req, res) => {
-    const { bapComboKeys, body } = req;
-    const { mail } = req.user;
-    const {
-      email,
-      title,
-      name,
-      entity,
-      comboKey,
-      rebateId,
-      frfReviewItemId,
-      frfFormModified,
-    } = body;
-
-    if (!submissionPeriodOpen["2022"].prf) {
-      const errorStatus = 400;
-      const errorMessage = `CSB Payment Request form enrollment period is closed.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    }
+// --- post a new 2022 PRF submission to Formio
+router.post("/formio-2022-prf-submission", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys, body } = req;
+  const { mail } = req.user;
+  const {
+    email,
+    title,
+    name,
+    entity,
+    comboKey,
+    rebateId,
+    frfReviewItemId,
+    frfFormModified,
+  } = body;
 
-    if (!bapComboKeys.includes(comboKey)) {
-      const logMessage =
-        `User with email '${mail}' attempted to post a new PRF submission ` +
-        `without a matching BAP combo key.`;
-      log({ level: "error", message: logMessage, req });
+  if (!submissionPeriodOpen["2022"].prf) {
+    const errorStatus = 400;
+    const errorMessage = `CSB Payment Request form enrollment period is closed.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
 
-      const errorStatus = 401;
-      const errorMessage = `Unauthorized.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    }
+  if (!bapComboKeys.includes(comboKey)) {
+    const logMessage =
+      `User with email '${mail}' attempted to post a new PRF submission ` +
+      `without a matching BAP combo key.`;
+    log({ level: "error", message: logMessage, req });
 
-    const {
-      UNIQUE_ENTITY_ID__c,
-      ENTITY_EFT_INDICATOR__c,
-      ELEC_BUS_POC_EMAIL__c,
-      ALT_ELEC_BUS_POC_EMAIL__c,
-      GOVT_BUS_POC_EMAIL__c,
-      ALT_GOVT_BUS_POC_EMAIL__c,
-    } = entity;
-
-    return getBapDataForPRF(req, frfReviewItemId)
-      .then(({ frfRecordQuery, busRecordsQuery }) => {
-        const {
-          CSB_NCES_ID__c,
-          Primary_Applicant__r,
-          Alternate_Applicant__r,
-          Applicant_Organization__r,
-          CSB_School_District__r,
-          Fleet_Name__c,
-          School_District_Prioritized__c,
-          Total_Rebate_Funds_Requested__c,
-          Total_Infrastructure_Funds__c,
-        } = frfRecordQuery[0];
-
-        const busInfo = busRecordsQuery.map((record) => ({
-          busNum: record.Rebate_Item_num__c,
-          oldBusNcesDistrictId: CSB_NCES_ID__c,
-          oldBusVin: record.CSB_VIN__c,
-          oldBusModelYear: record.CSB_Model_Year__c,
-          oldBusFuelType: record.CSB_Fuel_Type__c,
-          newBusFuelType: record.CSB_Replacement_Fuel_Type__c,
-          hidden_bap_max_rebate: record.CSB_Funds_Requested__c,
-        }));
+    const errorStatus = 401;
+    const errorMessage = `Unauthorized.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
 
-        /**
-         * NOTE: `purchaseOrders` is initialized as an empty array to fix some
-         * issue with the field being changed to an object when the form loads
-         */
-        const submission = {
-          data: {
-            bap_hidden_entity_combo_key: comboKey,
-            hidden_application_form_modified: frfFormModified,
-            hidden_current_user_email: email,
-            hidden_current_user_title: title,
-            hidden_current_user_name: name,
-            hidden_sam_uei: UNIQUE_ENTITY_ID__c,
-            hidden_sam_efti: ENTITY_EFT_INDICATOR__c || "0000",
-            hidden_sam_elec_bus_poc_email: ELEC_BUS_POC_EMAIL__c,
-            hidden_sam_alt_elec_bus_poc_email: ALT_ELEC_BUS_POC_EMAIL__c,
-            hidden_sam_govt_bus_poc_email: GOVT_BUS_POC_EMAIL__c,
-            hidden_sam_alt_govt_bus_poc_email: ALT_GOVT_BUS_POC_EMAIL__c,
-            hidden_bap_rebate_id: rebateId,
-            hidden_bap_district_id: CSB_NCES_ID__c,
-            hidden_bap_primary_name: Primary_Applicant__r?.Name,
-            hidden_bap_primary_title: Primary_Applicant__r?.Title,
-            hidden_bap_primary_phone_number: Primary_Applicant__r?.Phone,
-            hidden_bap_primary_email: Primary_Applicant__r?.Email,
-            hidden_bap_alternate_name: Alternate_Applicant__r?.Name || "",
-            hidden_bap_alternate_title: Alternate_Applicant__r?.Title || "",
-            hidden_bap_alternate_phone_number: Alternate_Applicant__r?.Phone || "", // prettier-ignore
-            hidden_bap_alternate_email: Alternate_Applicant__r?.Email || "",
-            hidden_bap_org_name: Applicant_Organization__r?.Name,
-            hidden_bap_district_name: CSB_School_District__r?.Name,
-            hidden_bap_fleet_name: Fleet_Name__c,
-            hidden_bap_prioritized: School_District_Prioritized__c,
-            hidden_bap_requested_funds: Total_Rebate_Funds_Requested__c,
-            hidden_bap_infra_max_rebate: Total_Infrastructure_Funds__c,
-            busInfo,
-            purchaseOrders: [],
-          },
-          /** Add custom metadata to track formio submissions from wrapper. */
-          metadata: {
-            ...formioCSBMetadata,
-          },
-          state: "draft",
-        };
+  const {
+    UNIQUE_ENTITY_ID__c,
+    ENTITY_EFT_INDICATOR__c,
+    ELEC_BUS_POC_EMAIL__c,
+    ALT_ELEC_BUS_POC_EMAIL__c,
+    GOVT_BUS_POC_EMAIL__c,
+    ALT_GOVT_BUS_POC_EMAIL__c,
+  } = entity;
 
-        axiosFormio(req)
-          .post(`${formio2022PRFUrl}/submission`, submission)
-          .then((axiosRes) => axiosRes.data)
-          .then((submission) => res.json(submission))
-          .catch((error) => {
-            // NOTE: logged in axiosFormio response interceptor
-            const errorStatus = error.response?.status || 500;
-            const errorMessage = `Error posting Formio Payment Request form submission.`;
-            return res.status(errorStatus).json({ message: errorMessage });
-          });
-      })
-      .catch((error) => {
-        // NOTE: logged in bap verifyBapConnection
-        const errorStatus = 500;
-        const errorMessage = `Error getting data for a new Payment Request form submission from the BAP.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
+  return getBapDataForPRF(req, frfReviewItemId)
+    .then(({ frfRecordQuery, busRecordsQuery }) => {
+      const {
+        CSB_NCES_ID__c,
+        Primary_Applicant__r,
+        Alternate_Applicant__r,
+        Applicant_Organization__r,
+        CSB_School_District__r,
+        Fleet_Name__c,
+        School_District_Prioritized__c,
+        Total_Rebate_Funds_Requested__c,
+        Total_Infrastructure_Funds__c,
+      } = frfRecordQuery[0];
+
+      const busInfo = busRecordsQuery.map((record) => ({
+        busNum: record.Rebate_Item_num__c,
+        oldBusNcesDistrictId: CSB_NCES_ID__c,
+        oldBusVin: record.CSB_VIN__c,
+        oldBusModelYear: record.CSB_Model_Year__c,
+        oldBusFuelType: record.CSB_Fuel_Type__c,
+        newBusFuelType: record.CSB_Replacement_Fuel_Type__c,
+        hidden_bap_max_rebate: record.CSB_Funds_Requested__c,
+      }));
+
+      /**
+       * NOTE: `purchaseOrders` is initialized as an empty array to fix some
+       * issue with the field being changed to an object when the form loads
+       */
+      const submission = {
+        data: {
+          bap_hidden_entity_combo_key: comboKey,
+          hidden_application_form_modified: frfFormModified,
+          hidden_current_user_email: email,
+          hidden_current_user_title: title,
+          hidden_current_user_name: name,
+          hidden_sam_uei: UNIQUE_ENTITY_ID__c,
+          hidden_sam_efti: ENTITY_EFT_INDICATOR__c || "0000",
+          hidden_sam_elec_bus_poc_email: ELEC_BUS_POC_EMAIL__c,
+          hidden_sam_alt_elec_bus_poc_email: ALT_ELEC_BUS_POC_EMAIL__c,
+          hidden_sam_govt_bus_poc_email: GOVT_BUS_POC_EMAIL__c,
+          hidden_sam_alt_govt_bus_poc_email: ALT_GOVT_BUS_POC_EMAIL__c,
+          hidden_bap_rebate_id: rebateId,
+          hidden_bap_district_id: CSB_NCES_ID__c,
+          hidden_bap_primary_name: Primary_Applicant__r?.Name,
+          hidden_bap_primary_title: Primary_Applicant__r?.Title,
+          hidden_bap_primary_phone_number: Primary_Applicant__r?.Phone,
+          hidden_bap_primary_email: Primary_Applicant__r?.Email,
+          hidden_bap_alternate_name: Alternate_Applicant__r?.Name || "",
+          hidden_bap_alternate_title: Alternate_Applicant__r?.Title || "",
+          hidden_bap_alternate_phone_number: Alternate_Applicant__r?.Phone || "", // prettier-ignore
+          hidden_bap_alternate_email: Alternate_Applicant__r?.Email || "",
+          hidden_bap_org_name: Applicant_Organization__r?.Name,
+          hidden_bap_district_name: CSB_School_District__r?.Name,
+          hidden_bap_fleet_name: Fleet_Name__c,
+          hidden_bap_prioritized: School_District_Prioritized__c,
+          hidden_bap_requested_funds: Total_Rebate_Funds_Requested__c,
+          hidden_bap_infra_max_rebate: Total_Infrastructure_Funds__c,
+          busInfo,
+          purchaseOrders: [],
+        },
+        /** Add custom metadata to track formio submissions from wrapper. */
+        metadata: {
+          ...formioCSBMetadata,
+        },
+        state: "draft",
+      };
 
-// --- get an existing PRF's schema and submission data from Formio
+      axiosFormio(req)
+        .post(`${formio2022PRFUrl}/submission`, submission)
+        .then((axiosRes) => axiosRes.data)
+        .then((submission) => res.json(submission))
+        .catch((error) => {
+          // NOTE: logged in axiosFormio response interceptor
+          const errorStatus = error.response?.status || 500;
+          const errorMessage = `Error posting Formio Payment Request form submission.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        });
+    })
+    .catch((error) => {
+      // NOTE: logged in bap verifyBapConnection
+      const errorStatus = 500;
+      const errorMessage = `Error getting data for a new Payment Request form submission from the BAP.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- get an existing 2022 PRF's schema and submission data from Formio
 router.get(
-  "/formio-payment-request-submission/:rebateId",
+  "/formio-2022-prf-submission/:rebateId",
   storeBapComboKeys,
   async (req, res) => {
     const { bapComboKeys } = req;
@@ -737,9 +731,9 @@ router.get(
   }
 );
 
-// --- post an update to an existing draft PRF submission to Formio
+// --- post an update to an existing draft 2022 PRF submission to Formio
 router.post(
-  "/formio-payment-request-submission/:rebateId",
+  "/formio-2022-prf-submission/:rebateId",
   storeBapComboKeys,
   (req, res) => {
     const { bapComboKeys, body } = req;
@@ -747,12 +741,10 @@ router.post(
     const { rebateId } = req.params; // CSB Rebate ID (6 digits)
     const { mongoId, submission } = body;
     const comboKey = submission.data?.bap_hidden_entity_combo_key;
-    const formType = "prf";
-    const rebateYear = "2022"; // TODO
 
     checkFormSubmissionPeriodAndBapStatus({
-      rebateYear,
-      formType,
+      rebateYear: "2022",
+      formType: "prf",
       mongoId,
       comboKey,
       req,
@@ -806,9 +798,9 @@ router.post(
   }
 );
 
-// --- delete an existing PRF submission from Formio
+// --- delete an existing 2022 PRF submission from Formio
 router.post(
-  "/delete-formio-payment-request-submission",
+  "/delete-formio-2022-prf-submission",
   storeBapComboKeys,
   (req, res) => {
     const { bapComboKeys, body } = req;
@@ -899,8 +891,8 @@ router.get("/formio-2022-crf-submissions", storeBapComboKeys, (req, res) => {
     });
 });
 
-// --- post a new CRF submission to Formio
-router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
+// --- post a new 2022 CRF submission to Formio
+router.post("/formio-2022-crf-submission", storeBapComboKeys, (req, res) => {
   const { bapComboKeys, body } = req;
   const { mail } = req.user;
   const {
@@ -1081,9 +1073,9 @@ router.post("/formio-close-out-submission", storeBapComboKeys, (req, res) => {
     });
 });
 
-// --- get an existing CRF's schema and submission data from Formio
+// --- get an existing 2022 CRF's schema and submission data from Formio
 router.get(
-  "/formio-close-out-submission/:rebateId",
+  "/formio-2022-crf-submission/:rebateId",
   storeBapComboKeys,
   async (req, res) => {
     const { bapComboKeys } = req;
@@ -1153,9 +1145,9 @@ router.get(
   }
 );
 
-// --- post an update to an existing draft CRF submission to Formio
+// --- post an update to an existing draft 2022 CRF submission to Formio
 router.post(
-  "/formio-close-out-submission/:rebateId",
+  "/formio-2022-crf-submission/:rebateId",
   storeBapComboKeys,
   (req, res) => {
     const { bapComboKeys, body } = req;
@@ -1163,12 +1155,10 @@ router.post(
     const { rebateId } = req.params; // CSB Rebate ID (6 digits)
     const { mongoId, submission } = body;
     const comboKey = submission.data?.bap_hidden_entity_combo_key;
-    const formType = "crf";
-    const rebateYear = "2022"; // TODO
 
     checkFormSubmissionPeriodAndBapStatus({
-      rebateYear,
-      formType,
+      rebateYear: "2022",
+      formType: "crf",
       mongoId,
       comboKey,
       req,
diff --git a/docs/csb-openapi.json b/docs/csb-openapi.json
index ebfcc82b..87be05fc 100644
--- a/docs/csb-openapi.json
+++ b/docs/csb-openapi.json
@@ -514,9 +514,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-application-submission": {
+    "/api/formio-2022-frf-submission": {
       "post": {
-        "summary": "/api/formio-application-submission",
+        "summary": "/api/formio-2022-frf-submission",
         "responses": {
           "200": {
             "description": "OK",
@@ -536,9 +536,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-application-submission/{mongoId}": {
+    "/api/formio-2022-frf-submission/{mongoId}": {
       "get": {
-        "summary": "/api/formio-application-submission/{mongoId}",
+        "summary": "/api/formio-2022-frf-submission/{mongoId}",
         "parameters": [
           {
             "name": "mongoId",
@@ -586,7 +586,7 @@
         "tags": []
       },
       "post": {
-        "summary": "/api/formio-application-submission/{mongoId}",
+        "summary": "/api/formio-2022-frf-submission/{mongoId}",
         "parameters": [
           {
             "name": "mongoId",
@@ -635,9 +635,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-payment-request-submission": {
+    "/api/formio-2022-prf-submission": {
       "post": {
-        "summary": "/api/formio-payment-request-submission",
+        "summary": "/api/formio-2022-prf-submission",
         "responses": {
           "200": {
             "description": "OK",
@@ -657,9 +657,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-payment-request-submission/{rebateId}": {
+    "/api/formio-2022-prf-submission/{rebateId}": {
       "get": {
-        "summary": "/api/formio-payment-request-submission/{rebateId}",
+        "summary": "/api/formio-2022-prf-submission/{rebateId}",
         "parameters": [
           {
             "name": "rebateId",
@@ -707,7 +707,7 @@
         "tags": []
       },
       "post": {
-        "summary": "/api/formio-payment-request-submission/{rebateId}",
+        "summary": "/api/formio-2022-prf-submission/{rebateId}",
         "parameters": [
           {
             "name": "rebateId",
@@ -734,9 +734,9 @@
         "tags": []
       }
     },
-    "/api/delete-formio-payment-request-submission": {
+    "/api/delete-formio-2022-prf-submission": {
       "post": {
-        "summary": "/api/delete-formio-payment-request-submission",
+        "summary": "/api/delete-formio-2022-prf-submission",
         "responses": {
           "200": {
             "description": "OK",
@@ -775,9 +775,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-close-out-submission": {
+    "/api/formio-2022-crf-submission": {
       "post": {
-        "summary": "/api/formio-close-out-submission",
+        "summary": "/api/formio-2022-crf-submission",
         "responses": {
           "200": {
             "description": "OK",
@@ -797,9 +797,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-close-out-submission/{rebateId}": {
+    "/api/formio-2022-crf-submission/{rebateId}": {
       "get": {
-        "summary": "/api/formio-close-out-submission/{rebateId}",
+        "summary": "/api/formio-2022-crf-submission/{rebateId}",
         "parameters": [
           {
             "name": "rebateId",
@@ -847,7 +847,7 @@
         "tags": []
       },
       "post": {
-        "summary": "/api/formio-close-out-submission/{rebateId}",
+        "summary": "/api/formio-2022-crf-submission/{rebateId}",
         "parameters": [
           {
             "name": "rebateId",

From f18222d995cab92194ee28b88d4d78644d6af27e Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 10:08:42 -0400
Subject: [PATCH 32/71] Move formio api routes to a new formio2022.js file, for
 easier maintainability with new 2023 formio routes

---
 app/client/src/routes/allRebates.tsx         |    4 +-
 app/client/src/routes/applicationForm.tsx    |    8 +-
 app/client/src/routes/closeOutForm.tsx       |    6 +-
 app/client/src/routes/newApplicationForm.tsx |    2 +-
 app/client/src/routes/paymentRequestForm.tsx |    6 +-
 app/client/src/utilities.tsx                 |   20 +-
 app/server/app/config/formio.js              |   23 +
 app/server/app/routes/api.js                 | 1066 +-----------------
 app/server/app/routes/formio2022.js          | 1029 +++++++++++++++++
 app/server/app/routes/index.js               |    1 +
 docs/csb-openapi.json                        |   46 +-
 11 files changed, 1102 insertions(+), 1109 deletions(-)
 create mode 100644 app/server/app/routes/formio2022.js

diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/allRebates.tsx
index 67b50147..7ee3c8f3 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/allRebates.tsx
@@ -353,7 +353,7 @@ function PRFSubmission(props: { rebate: Rebate }) {
               const { title, name } = getUserInfo(email, entity);
 
               // create a new draft PRF submission
-              postData(`${serverUrl}/api/formio-2022-prf-submission/`, {
+              postData(`${serverUrl}/api/formio/2022/prf-submission/`, {
                 email,
                 title,
                 name,
@@ -586,7 +586,7 @@ function CRFSubmission(props: { rebate: Rebate }) {
               const { title, name } = getUserInfo(email, entity);
 
               // create a new draft CRF submission
-              postData(`${serverUrl}/api/formio-2022-crf-submission/`, {
+              postData(`${serverUrl}/api/formio/2022/crf-submission/`, {
                 email,
                 title,
                 name,
diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index 340e0001..dca91d9e 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -44,13 +44,13 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
   const queryClient = useQueryClient();
 
   useEffect(() => {
-    queryClient.resetQueries({ queryKey: ["application"] });
+    queryClient.resetQueries({ queryKey: ["formio/2022/frf-submission"] });
   }, [queryClient]);
 
-  const url = `${serverUrl}/api/formio-2022-frf-submission/${mongoId}`;
+  const url = `${serverUrl}/api/formio/2022/frf-submission/${mongoId}`;
 
   const query = useQuery({
-    queryKey: ["application", { id: mongoId }],
+    queryKey: ["formio/2022/frf-submission", { id: mongoId }],
     queryFn: () => {
       return getData<ServerResponse>(url).then((res) => {
         const comboKey = res.submission?.data.bap_hidden_entity_combo_key;
@@ -281,7 +281,7 @@ function UserApplicationForm(props: { email: string }) {
           ),
         });
 
-        const url = `${serverUrl}/api/delete-formio-2022-prf-submission`;
+        const url = `${serverUrl}/api/formio/2022/delete-prf-submission`;
 
         postData(url, {
           mongoId: prf._id,
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index 485f7db5..624e69f5 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -43,13 +43,13 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
   const queryClient = useQueryClient();
 
   useEffect(() => {
-    queryClient.resetQueries({ queryKey: ["close-out"] });
+    queryClient.resetQueries({ queryKey: ["formio/2022/crf-submission"] });
   }, [queryClient]);
 
-  const url = `${serverUrl}/api/formio-2022-crf-submission/${rebateId}`;
+  const url = `${serverUrl}/api/formio/2022/crf-submission/${rebateId}`;
 
   const query = useQuery({
-    queryKey: ["close-out", { id: rebateId }],
+    queryKey: ["formio/2022/crf-submission", { id: rebateId }],
     queryFn: () => {
       return getData<ServerResponse>(url).then((res) => {
         const mongoId = res.submission?._id;
diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/newApplicationForm.tsx
index a2179596..4b0ffb71 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/newApplicationForm.tsx
@@ -194,7 +194,7 @@ export function NewApplicationForm() {
                                         );
 
                                         postData<FormioFRFSubmission>(
-                                          `${serverUrl}/api/formio-2022-frf-submission/`,
+                                          `${serverUrl}/api/formio/2022/frf-submission/`,
                                           {
                                             data: {
                                               last_updated_by: email,
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index 91c4d235..acfb07ef 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -43,13 +43,13 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
   const queryClient = useQueryClient();
 
   useEffect(() => {
-    queryClient.resetQueries({ queryKey: ["payment-request"] });
+    queryClient.resetQueries({ queryKey: ["formio/2022/prf-submission"] });
   }, [queryClient]);
 
-  const url = `${serverUrl}/api/formio-2022-prf-submission/${rebateId}`;
+  const url = `${serverUrl}/api/formio/2022/prf-submission/${rebateId}`;
 
   const query = useQuery({
-    queryKey: ["payment-request", { id: rebateId }],
+    queryKey: ["formio/2022/prf-submission", { id: rebateId }],
     queryFn: () => {
       return getData<ServerResponse>(url).then((res) => {
         const mongoId = res.submission?._id;
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index dfeab2e8..c65ba7bf 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -329,25 +329,25 @@ export function useSubmissionsQueries() {
         refetchOnWindowFocus: false,
       },
       {
-        queryKey: ["formio-2022-frf-submissions"],
+        queryKey: ["formio/2022/frf-submissions"],
         queryFn: () => {
-          const url = `${serverUrl}/api/formio-2022-frf-submissions`;
+          const url = `${serverUrl}/api/formio/2022/frf-submissions`;
           return getData<FormioFRFSubmission[]>(url);
         },
         refetchOnWindowFocus: false,
       },
       {
-        queryKey: ["formio-2022-prf-submissions"],
+        queryKey: ["formio/2022/prf-submissions"],
         queryFn: () => {
-          const url = `${serverUrl}/api/formio-2022-prf-submissions`;
+          const url = `${serverUrl}/api/formio/2022/prf-submissions`;
           return getData<FormioPRFSubmission[]>(url);
         },
         refetchOnWindowFocus: false,
       },
       {
-        queryKey: ["formio-2022-crf-submissions"],
+        queryKey: ["formio/2022/crf-submissions"],
         queryFn: () => {
-          const url = `${serverUrl}/api/formio-2022-crf-submissions`;
+          const url = `${serverUrl}/api/formio/2022/crf-submissions`;
           return getData<FormioCRFSubmission[]>(url);
         },
         refetchOnWindowFocus: false,
@@ -371,15 +371,15 @@ function useCombinedRebates() {
   }>(["bap-form-submissions"]);
 
   const formioFRFSubmissions = queryClient.getQueryData<FormioFRFSubmission[]>([
-    "formio-2022-frf-submissions",
+    "formio/2022/frf-submissions",
   ]);
 
   const formioPRFSubmissions = queryClient.getQueryData<FormioPRFSubmission[]>([
-    "formio-2022-prf-submissions",
+    "formio/2022/prf-submissions",
   ]);
 
   const formioCRFSubmissions = queryClient.getQueryData<FormioCRFSubmission[]>([
-    "formio-2022-crf-submissions",
+    "formio/2022/crf-submissions",
   ]);
 
   // ensure form submissions data has been fetched from both the BAP and Formio
@@ -437,7 +437,7 @@ function useCombinedRebates() {
    * NOTE: For there to be any Formio PRF submissions at all, the BAP's ETL
    * process must be running, as the `hidden_bap_rebate_id` field of a PRF
    * submission is injected in the creation of a brand new submission in the
-   * `/api/formio-2022-prf-submission` POST request where he BAP Rebate ID
+   * `/api/formio/2022/prf-submission` POST request where he BAP Rebate ID
    * (along with other fields) are fetched from the BAP and then posted to
    * Formio in a new PRF submission.
    *
diff --git a/app/server/app/config/formio.js b/app/server/app/config/formio.js
index 0cc97a66..6abd107e 100644
--- a/app/server/app/config/formio.js
+++ b/app/server/app/config/formio.js
@@ -6,6 +6,12 @@ const log = require("../utilities/logger");
 const {
   CLOUD_SPACE,
   SERVER_URL,
+  CSB_2022_FRF_OPEN,
+  CSB_2022_PRF_OPEN,
+  CSB_2022_CRF_OPEN,
+  CSB_2023_FRF_OPEN,
+  CSB_2023_PRF_OPEN,
+  CSB_2023_CRF_OPEN,
   FORMIO_BASE_URL,
   FORMIO_PROJECT_NAME,
   FORMIO_API_KEY,
@@ -17,6 +23,22 @@ const {
   FORMIO_2023_CRF_PATH,
 } = process.env;
 
+/**
+ * Stores whether the submission period is open for each form by rebate year.
+ */
+const submissionPeriodOpen = {
+  2022: {
+    frf: CSB_2022_FRF_OPEN === "true",
+    prf: CSB_2022_PRF_OPEN === "true",
+    crf: CSB_2022_CRF_OPEN === "true",
+  },
+  2023: {
+    frf: CSB_2023_FRF_OPEN === "true",
+    prf: CSB_2023_PRF_OPEN === "true",
+    crf: CSB_2023_CRF_OPEN === "true",
+  },
+};
+
 const formioProjectUrl = `${FORMIO_BASE_URL}/${FORMIO_PROJECT_NAME}`;
 const formio2022FRFUrl = `${formioProjectUrl}/${FORMIO_2022_FRF_PATH}`;
 const formio2022PRFUrl = `${formioProjectUrl}/${FORMIO_2022_PRF_PATH}`;
@@ -85,6 +107,7 @@ const formioCSBMetadata = {
 
 module.exports = {
   axiosFormio,
+  submissionPeriodOpen,
   formio2022FRFUrl,
   formio2022PRFUrl,
   formio2022CRFUrl,
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 766bb868..d35b4811 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -2,99 +2,16 @@ const { resolve } = require("node:path");
 const { readFile } = require("node:fs/promises");
 const express = require("express");
 const axios = require("axios").default || require("axios"); // TODO: https://github.com/axios/axios/issues/5011
-const ObjectId = require("mongodb").ObjectId;
 // ---
-const {
-  axiosFormio,
-  formio2022FRFUrl,
-  formio2022PRFUrl,
-  formio2022CRFUrl,
-  formioCSBMetadata,
-} = require("../config/formio");
-const {
-  ensureAuthenticated,
-  storeBapComboKeys,
-  verifyMongoObjectId,
-} = require("../middleware");
+const { submissionPeriodOpen } = require("../config/formio");
+const { ensureAuthenticated, storeBapComboKeys } = require("../middleware");
 const {
   getSamEntities,
   getBapFormSubmissionsStatuses,
-  getBapDataForPRF,
-  getBapDataForCRF,
 } = require("../utilities/bap");
 const log = require("../utilities/logger");
 
-const {
-  NODE_ENV,
-  CSB_2022_FRF_OPEN,
-  CSB_2022_PRF_OPEN,
-  CSB_2022_CRF_OPEN,
-  CSB_2023_FRF_OPEN,
-  CSB_2023_PRF_OPEN,
-  CSB_2023_CRF_OPEN,
-  S3_PUBLIC_BUCKET,
-  S3_PUBLIC_REGION,
-} = process.env;
-
-/**
- * Stores whether the submission period is open for each form by rebate year.
- */
-const submissionPeriodOpen = {
-  2022: {
-    frf: CSB_2022_FRF_OPEN === "true",
-    prf: CSB_2022_PRF_OPEN === "true",
-    crf: CSB_2022_CRF_OPEN === "true",
-  },
-  2023: {
-    frf: CSB_2023_FRF_OPEN === "true",
-    prf: CSB_2023_PRF_OPEN === "true",
-    crf: CSB_2023_CRF_OPEN === "true",
-  },
-};
-
-/**
- * Returns a resolved or rejected promise, depending on if the given form's
- * submission period is open (as set via environment variables), and if the form
- * submission has the status of "Edits Requested" or not (as stored in and
- * returned from the BAP).
- *
- * @param {Object} param
- * @param {'2022' | '2023'} param.rebateYear
- * @param {'frf' | 'prf' | 'crf'} param.formType
- * @param {string} param.mongoId
- * @param {string} param.comboKey
- * @param {express.Request} param.req
- */
-function checkFormSubmissionPeriodAndBapStatus({
-  rebateYear,
-  formType,
-  mongoId,
-  comboKey,
-  req,
-}) {
-  /** Form submission period is open, so continue. */
-  if (submissionPeriodOpen[rebateYear][formType]) {
-    return Promise.resolve();
-  }
-
-  /** Form submission period is closed, so only continue if edits are requested. */
-  return getBapFormSubmissionsStatuses(req, [comboKey]).then((submissions) => {
-    const submission = submissions.find((s) => s.CSB_Form_ID__c === mongoId);
-
-    const statusField =
-      formType === "frf"
-        ? "CSB_Funding_Request_Status__c"
-        : formType === "prf"
-        ? "CSB_Payment_Request_Status__c"
-        : formType === "crf"
-        ? "CSB_Closeout_Request_Status__c"
-        : null;
-
-    return submission?.Parent_CSB_Rebate__r?.[statusField] === "Edits Requested"
-      ? Promise.resolve()
-      : Promise.reject();
-  });
-}
+const { NODE_ENV, S3_PUBLIC_BUCKET, S3_PUBLIC_REGION } = process.env;
 
 const router = express.Router();
 
@@ -235,981 +152,4 @@ router.get("/bap-form-submissions", storeBapComboKeys, (req, res) => {
     });
 });
 
-// --- download Formio S3 file metadata
-router.get(
-  "/s3/:rebateYear/:formType/:mongoId/:comboKey/storage/s3",
-  storeBapComboKeys,
-  (req, res) => {
-    const { bapComboKeys, query } = req;
-    const { mail } = req.user;
-    const { comboKey } = req.params;
-
-    if (!bapComboKeys.includes(comboKey)) {
-      const logMessage =
-        `User with email '${mail}' attempted to download a file ` +
-        `without a matching BAP combo key.`;
-      log({ level: "error", message: logMessage, req });
-
-      const errorStatus = 401;
-      const errorMessage = `Unauthorized.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    }
-
-    axiosFormio(req)
-      .get(`${formio2022FRFUrl}/storage/s3`, { params: query })
-      .then((axiosRes) => axiosRes.data)
-      .then((fileMetadata) => res.json(fileMetadata))
-      .catch((error) => {
-        // NOTE: logged in axiosFormio response interceptor
-        const errorStatus = error.response?.status || 500;
-        const errorMessage = `Error downloading file from S3.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
-
-// --- upload Formio S3 file metadata
-router.post(
-  "/s3/:rebateYear/:formType/:mongoId/:comboKey/storage/s3",
-  storeBapComboKeys,
-  (req, res) => {
-    const { bapComboKeys, body } = req;
-    const { mail } = req.user;
-    const { rebateYear, formType, mongoId, comboKey } = req.params;
-
-    checkFormSubmissionPeriodAndBapStatus({
-      rebateYear,
-      formType,
-      mongoId,
-      comboKey,
-      req,
-    })
-      .then(() => {
-        if (!bapComboKeys.includes(comboKey)) {
-          const logMessage =
-            `User with email '${mail}' attempted to upload a file ` +
-            `without a matching BAP combo key.`;
-          log({ level: "error", message: logMessage, req });
-
-          const errorStatus = 401;
-          const errorMessage = `Unauthorized.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        axiosFormio(req)
-          .post(`${formio2022FRFUrl}/storage/s3`, body)
-          .then((axiosRes) => axiosRes.data)
-          .then((fileMetadata) => res.json(fileMetadata))
-          .catch((error) => {
-            // NOTE: logged in axiosFormio response interceptor
-            const errorStatus = error.response?.status || 500;
-            const errorMessage = `Error uploading file to S3.`;
-            return res.status(errorStatus).json({ message: errorMessage });
-          });
-      })
-      .catch((error) => {
-        const formName =
-          formType === "frf"
-            ? "CSB Application"
-            : formType === "prf"
-            ? "CSB Payment Request"
-            : formType === "cof"
-            ? "CSB Close Out"
-            : "CSB";
-
-        const logMessage =
-          `User with email '${mail}' attempted to upload a file when the ` +
-          `${rebateYear} ${formName} form enrollment period was closed.`;
-        log({ level: "error", message: logMessage, req });
-
-        const errorStatus = 400;
-        const errorMessage = `${rebateYear} ${formName} form enrollment period is closed.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
-
-// --- get user's 2022 FRF submissions from Formio
-router.get("/formio-2022-frf-submissions", storeBapComboKeys, (req, res) => {
-  const { bapComboKeys } = req;
-
-  /**
-   * NOTE: Helpdesk users might not have any SAM.gov records associated with
-   * their email address so we should not return any submissions to those users.
-   * The only reason we explicitly need to do this is because there could be
-   * some submissions without `bap_hidden_entity_combo_key` field values in the
-   * Formio database – that will never be the case for submissions created from
-   * this app, but there could be submissions created externally if someone is
-   * testing posting data (e.g. from a REST client, or the Formio Viewer).
-   */
-  if (bapComboKeys.length === 0) return res.json([]);
-
-  const userSubmissionsUrl =
-    `${formio2022FRFUrl}/submission` +
-    `?sort=-modified` +
-    `&limit=1000000` +
-    `&data.bap_hidden_entity_combo_key=` +
-    `${bapComboKeys.join("&data.bap_hidden_entity_combo_key=")}`;
-
-  axiosFormio(req)
-    .get(userSubmissionsUrl)
-    .then((axiosRes) => axiosRes.data)
-    .then((submissions) => res.json(submissions))
-    .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
-      const errorStatus = error.response?.status || 500;
-      const errorMessage = `Error getting Formio Application form submissions.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    });
-});
-
-// --- post a new 2022 FRF submission to Formio
-router.post("/formio-2022-frf-submission", storeBapComboKeys, (req, res) => {
-  const { bapComboKeys, body } = req;
-  const { mail } = req.user;
-  const comboKey = body.data?.bap_hidden_entity_combo_key;
-
-  if (!submissionPeriodOpen["2022"].frf) {
-    const errorStatus = 400;
-    const errorMessage = `CSB Application form enrollment period is closed.`;
-    return res.status(errorStatus).json({ message: errorMessage });
-  }
-
-  if (!bapComboKeys.includes(comboKey)) {
-    const logMessage =
-      `User with email '${mail}' attempted to post a new FRF submission ` +
-      `without a matching BAP combo key.`;
-    log({ level: "error", message: logMessage, req });
-
-    const errorStatus = 401;
-    const errorMessage = `Unauthorized.`;
-    return res.status(errorStatus).json({ message: errorMessage });
-  }
-
-  /** Add custom metadata to track formio submissions from wrapper. */
-  body.metadata = { ...formioCSBMetadata };
-
-  axiosFormio(req)
-    .post(`${formio2022FRFUrl}/submission`, body)
-    .then((axiosRes) => axiosRes.data)
-    .then((submission) => res.json(submission))
-    .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
-      const errorStatus = error.response?.status || 500;
-      const errorMessage = `Error posting Formio Application form submission.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    });
-});
-
-// --- get an existing 2022 FRF's schema and submission data from Formio
-router.get(
-  "/formio-2022-frf-submission/:mongoId",
-  verifyMongoObjectId,
-  storeBapComboKeys,
-  (req, res) => {
-    const { bapComboKeys } = req;
-    const { mail } = req.user;
-    const { mongoId } = req.params;
-
-    Promise.all([
-      axiosFormio(req).get(`${formio2022FRFUrl}/submission/${mongoId}`),
-      axiosFormio(req).get(formio2022FRFUrl),
-    ])
-      .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
-      .then(([submission, schema]) => {
-        const comboKey = submission.data.bap_hidden_entity_combo_key;
-
-        if (!bapComboKeys.includes(comboKey)) {
-          const logMessage =
-            `User with email '${mail}' attempted to access FRF submission '${mongoId}' ` +
-            `that they do not have access to.`;
-          log({ level: "warn", message: logMessage, req });
-
-          return res.json({
-            userAccess: false,
-            formSchema: null,
-            submission: null,
-          });
-        }
-
-        return res.json({
-          userAccess: true,
-          formSchema: { url: formio2022FRFUrl, json: schema },
-          submission,
-        });
-      })
-      .catch((error) => {
-        // NOTE: logged in axiosFormio response interceptor
-        const errorStatus = error.response?.status || 500;
-        const errorMessage = `Error getting Formio Application form submission '${mongoId}'.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
-
-// --- post an update to an existing draft 2022 FRF submission to Formio
-router.post(
-  "/formio-2022-frf-submission/:mongoId",
-  verifyMongoObjectId,
-  storeBapComboKeys,
-  (req, res) => {
-    const { bapComboKeys } = req;
-    const { mail } = req.user;
-    const { mongoId } = req.params;
-    const submission = req.body;
-    const comboKey = submission.data?.bap_hidden_entity_combo_key;
-
-    checkFormSubmissionPeriodAndBapStatus({
-      rebateYear: "2022",
-      formType: "frf",
-      mongoId,
-      comboKey,
-      req,
-    })
-      .then(() => {
-        if (!bapComboKeys.includes(comboKey)) {
-          const logMessage =
-            `User with email '${mail}' attempted to update FRF submission '${mongoId}' ` +
-            `without a matching BAP combo key.`;
-          log({ level: "error", message: logMessage, req });
-
-          const errorStatus = 401;
-          const errorMessage = `Unauthorized.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        /** Add custom metadata to track formio submissions from wrapper. */
-        submission.metadata = {
-          ...submission.metadata,
-          ...formioCSBMetadata,
-        };
-
-        axiosFormio(req)
-          .put(`${formio2022FRFUrl}/submission/${mongoId}`, submission)
-          .then((axiosRes) => axiosRes.data)
-          .then((submission) => res.json(submission))
-          .catch((error) => {
-            // NOTE: logged in axiosFormio response interceptor
-            const errorStatus = error.response?.status || 500;
-            const errorMessage = `Error updating Formio Application form submission '${mongoId}'.`;
-            return res.status(errorStatus).json({ message: errorMessage });
-          });
-      })
-      .catch((error) => {
-        const logMessage =
-          `User with email '${mail}' attempted to update FRF submission '${mongoId}' ` +
-          `when the CSB FRF enrollment period was closed.`;
-        log({ level: "error", message: logMessage, req });
-
-        const errorStatus = 400;
-        const errorMessage = `CSB Application form enrollment period is closed.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
-
-// --- get user's 2022 PRF submissions from Formio
-router.get("/formio-2022-prf-submissions", storeBapComboKeys, (req, res) => {
-  const { bapComboKeys } = req;
-
-  const userSubmissionsUrl =
-    `${formio2022PRFUrl}/submission` +
-    `?sort=-modified` +
-    `&limit=1000000` +
-    `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
-      "&data.bap_hidden_entity_combo_key="
-    )}`;
-
-  axiosFormio(req)
-    .get(userSubmissionsUrl)
-    .then((axiosRes) => axiosRes.data)
-    .then((submissions) => res.json(submissions))
-    .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
-      const errorStatus = error.response?.status || 500;
-      const errorMessage = `Error getting Formio Payment Request form submissions.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    });
-});
-
-// --- post a new 2022 PRF submission to Formio
-router.post("/formio-2022-prf-submission", storeBapComboKeys, (req, res) => {
-  const { bapComboKeys, body } = req;
-  const { mail } = req.user;
-  const {
-    email,
-    title,
-    name,
-    entity,
-    comboKey,
-    rebateId,
-    frfReviewItemId,
-    frfFormModified,
-  } = body;
-
-  if (!submissionPeriodOpen["2022"].prf) {
-    const errorStatus = 400;
-    const errorMessage = `CSB Payment Request form enrollment period is closed.`;
-    return res.status(errorStatus).json({ message: errorMessage });
-  }
-
-  if (!bapComboKeys.includes(comboKey)) {
-    const logMessage =
-      `User with email '${mail}' attempted to post a new PRF submission ` +
-      `without a matching BAP combo key.`;
-    log({ level: "error", message: logMessage, req });
-
-    const errorStatus = 401;
-    const errorMessage = `Unauthorized.`;
-    return res.status(errorStatus).json({ message: errorMessage });
-  }
-
-  const {
-    UNIQUE_ENTITY_ID__c,
-    ENTITY_EFT_INDICATOR__c,
-    ELEC_BUS_POC_EMAIL__c,
-    ALT_ELEC_BUS_POC_EMAIL__c,
-    GOVT_BUS_POC_EMAIL__c,
-    ALT_GOVT_BUS_POC_EMAIL__c,
-  } = entity;
-
-  return getBapDataForPRF(req, frfReviewItemId)
-    .then(({ frfRecordQuery, busRecordsQuery }) => {
-      const {
-        CSB_NCES_ID__c,
-        Primary_Applicant__r,
-        Alternate_Applicant__r,
-        Applicant_Organization__r,
-        CSB_School_District__r,
-        Fleet_Name__c,
-        School_District_Prioritized__c,
-        Total_Rebate_Funds_Requested__c,
-        Total_Infrastructure_Funds__c,
-      } = frfRecordQuery[0];
-
-      const busInfo = busRecordsQuery.map((record) => ({
-        busNum: record.Rebate_Item_num__c,
-        oldBusNcesDistrictId: CSB_NCES_ID__c,
-        oldBusVin: record.CSB_VIN__c,
-        oldBusModelYear: record.CSB_Model_Year__c,
-        oldBusFuelType: record.CSB_Fuel_Type__c,
-        newBusFuelType: record.CSB_Replacement_Fuel_Type__c,
-        hidden_bap_max_rebate: record.CSB_Funds_Requested__c,
-      }));
-
-      /**
-       * NOTE: `purchaseOrders` is initialized as an empty array to fix some
-       * issue with the field being changed to an object when the form loads
-       */
-      const submission = {
-        data: {
-          bap_hidden_entity_combo_key: comboKey,
-          hidden_application_form_modified: frfFormModified,
-          hidden_current_user_email: email,
-          hidden_current_user_title: title,
-          hidden_current_user_name: name,
-          hidden_sam_uei: UNIQUE_ENTITY_ID__c,
-          hidden_sam_efti: ENTITY_EFT_INDICATOR__c || "0000",
-          hidden_sam_elec_bus_poc_email: ELEC_BUS_POC_EMAIL__c,
-          hidden_sam_alt_elec_bus_poc_email: ALT_ELEC_BUS_POC_EMAIL__c,
-          hidden_sam_govt_bus_poc_email: GOVT_BUS_POC_EMAIL__c,
-          hidden_sam_alt_govt_bus_poc_email: ALT_GOVT_BUS_POC_EMAIL__c,
-          hidden_bap_rebate_id: rebateId,
-          hidden_bap_district_id: CSB_NCES_ID__c,
-          hidden_bap_primary_name: Primary_Applicant__r?.Name,
-          hidden_bap_primary_title: Primary_Applicant__r?.Title,
-          hidden_bap_primary_phone_number: Primary_Applicant__r?.Phone,
-          hidden_bap_primary_email: Primary_Applicant__r?.Email,
-          hidden_bap_alternate_name: Alternate_Applicant__r?.Name || "",
-          hidden_bap_alternate_title: Alternate_Applicant__r?.Title || "",
-          hidden_bap_alternate_phone_number: Alternate_Applicant__r?.Phone || "", // prettier-ignore
-          hidden_bap_alternate_email: Alternate_Applicant__r?.Email || "",
-          hidden_bap_org_name: Applicant_Organization__r?.Name,
-          hidden_bap_district_name: CSB_School_District__r?.Name,
-          hidden_bap_fleet_name: Fleet_Name__c,
-          hidden_bap_prioritized: School_District_Prioritized__c,
-          hidden_bap_requested_funds: Total_Rebate_Funds_Requested__c,
-          hidden_bap_infra_max_rebate: Total_Infrastructure_Funds__c,
-          busInfo,
-          purchaseOrders: [],
-        },
-        /** Add custom metadata to track formio submissions from wrapper. */
-        metadata: {
-          ...formioCSBMetadata,
-        },
-        state: "draft",
-      };
-
-      axiosFormio(req)
-        .post(`${formio2022PRFUrl}/submission`, submission)
-        .then((axiosRes) => axiosRes.data)
-        .then((submission) => res.json(submission))
-        .catch((error) => {
-          // NOTE: logged in axiosFormio response interceptor
-          const errorStatus = error.response?.status || 500;
-          const errorMessage = `Error posting Formio Payment Request form submission.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        });
-    })
-    .catch((error) => {
-      // NOTE: logged in bap verifyBapConnection
-      const errorStatus = 500;
-      const errorMessage = `Error getting data for a new Payment Request form submission from the BAP.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    });
-});
-
-// --- get an existing 2022 PRF's schema and submission data from Formio
-router.get(
-  "/formio-2022-prf-submission/:rebateId",
-  storeBapComboKeys,
-  async (req, res) => {
-    const { bapComboKeys } = req;
-    const { mail } = req.user;
-    const { rebateId } = req.params; // CSB Rebate ID (6 digits)
-
-    const matchedPaymentRequestFormSubmissions =
-      `${formio2022PRFUrl}/submission` +
-      `?data.hidden_bap_rebate_id=${rebateId}` +
-      `&select=_id,data.bap_hidden_entity_combo_key`;
-
-    Promise.all([
-      axiosFormio(req).get(matchedPaymentRequestFormSubmissions),
-      axiosFormio(req).get(formio2022PRFUrl),
-    ])
-      .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
-      .then(([submissions, schema]) => {
-        const submission = submissions[0];
-        const mongoId = submission._id;
-        const comboKey = submission.data.bap_hidden_entity_combo_key;
-
-        if (!bapComboKeys.includes(comboKey)) {
-          const logMessage =
-            `User with email '${mail}' attempted to access PRF submission '${rebateId}' ` +
-            `that they do not have access to.`;
-          log({ level: "warn", message: logMessage, req });
-
-          return res.json({
-            userAccess: false,
-            formSchema: null,
-            submission: null,
-          });
-        }
-
-        /** NOTE: verifyMongoObjectId */
-        if (mongoId && !ObjectId.isValid(mongoId)) {
-          const errorStatus = 400;
-          const errorMessage = `MongoDB ObjectId validation error for: '${mongoId}'.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        /**
-         * NOTE: We can't just use the returned submission data here because
-         * Formio returns the string literal 'YES' instead of a base64 encoded
-         * image string for signature fields when you query for all submissions
-         * matching on a field's value (`/submission?data.hidden_bap_rebate_id=${rebateId}`).
-         * We need to query for a specific submission (e.g. `/submission/${mongoId}`),
-         * to have Formio return the correct signature field data.
-         */
-        axiosFormio(req)
-          .get(`${formio2022PRFUrl}/submission/${mongoId}`)
-          .then((axiosRes) => axiosRes.data)
-          .then((submission) => {
-            return res.json({
-              userAccess: true,
-              formSchema: { url: formio2022PRFUrl, json: schema },
-              submission,
-            });
-          });
-      })
-      .catch((error) => {
-        // NOTE: logged in axiosFormio response interceptor
-        const errorStatus = error.response?.status || 500;
-        const errorMessage = `Error getting Formio Payment Request form submission '${rebateId}'.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
-
-// --- post an update to an existing draft 2022 PRF submission to Formio
-router.post(
-  "/formio-2022-prf-submission/:rebateId",
-  storeBapComboKeys,
-  (req, res) => {
-    const { bapComboKeys, body } = req;
-    const { mail } = req.user;
-    const { rebateId } = req.params; // CSB Rebate ID (6 digits)
-    const { mongoId, submission } = body;
-    const comboKey = submission.data?.bap_hidden_entity_combo_key;
-
-    checkFormSubmissionPeriodAndBapStatus({
-      rebateYear: "2022",
-      formType: "prf",
-      mongoId,
-      comboKey,
-      req,
-    })
-      .then(() => {
-        if (!bapComboKeys.includes(comboKey)) {
-          const logMessage =
-            `User with email '${mail}' attempted to update PRF submission '${rebateId}' ` +
-            `without a matching BAP combo key.`;
-          log({ level: "error", message: logMessage, req });
-
-          const errorStatus = 401;
-          const errorMessage = `Unauthorized.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        /** NOTE: verifyMongoObjectId */
-        if (mongoId && !ObjectId.isValid(mongoId)) {
-          const errorStatus = 400;
-          const errorMessage = `MongoDB ObjectId validation error for: '${mongoId}'.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        /** Add custom metadata to track formio submissions from wrapper. */
-        submission.metadata = {
-          ...submission.metadata,
-          ...formioCSBMetadata,
-        };
-
-        axiosFormio(req)
-          .put(`${formio2022PRFUrl}/submission/${mongoId}`, submission)
-          .then((axiosRes) => axiosRes.data)
-          .then((submission) => res.json(submission))
-          .catch((error) => {
-            // NOTE: logged in axiosFormio response interceptor
-            const errorStatus = error.response?.status || 500;
-            const errorMessage = `Error updating Formio Payment Request form submission '${rebateId}'.`;
-            return res.status(errorStatus).json({ message: errorMessage });
-          });
-      })
-      .catch((error) => {
-        const logMessage =
-          `User with email '${mail}' attempted to update PRF submission '${rebateId}' ` +
-          `when the CSB PRF enrollment period was closed.`;
-        log({ level: "error", message: logMessage, req });
-
-        const errorStatus = 400;
-        const errorMessage = `CSB Payment Request form enrollment period is closed.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
-
-// --- delete an existing 2022 PRF submission from Formio
-router.post(
-  "/delete-formio-2022-prf-submission",
-  storeBapComboKeys,
-  (req, res) => {
-    const { bapComboKeys, body } = req;
-    const { mail } = req.user;
-    const { mongoId, rebateId, comboKey } = body;
-
-    // verify post data includes one of user's BAP combo keys
-    if (!bapComboKeys.includes(comboKey)) {
-      const logMessage =
-        `User with email '${mail}' attempted to delete PRF submission '${rebateId}' ` +
-        `without a matching BAP combo key.`;
-      log({ level: "error", message: logMessage, req });
-
-      const errorStatus = 401;
-      const errorMessage = `Unauthorized.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    }
-
-    /**
-     * ensure the BAP status of the corresponding FRF submission is "Edits
-     * Requested" before deleting the FRF submission from Formio
-     */
-    getBapFormSubmissionsStatuses(req, req.bapComboKeys)
-      .then((submissions) => {
-        const frf = submissions.find((submission) => {
-          return (
-            submission.Parent_Rebate_ID__c === rebateId &&
-            submission.Record_Type_Name__c === "CSB Funding Request"
-          );
-        });
-
-        const frfNeedsEdits =
-          frf?.Parent_CSB_Rebate__r.CSB_Funding_Request_Status__c ===
-          "Edits Requested";
-
-        if (!frfNeedsEdits) {
-          const errorStatus = 400;
-          const errorMessage = `Application form submission '${mongoId}' does not need edits.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        axiosFormio(req)
-          .delete(`${formio2022PRFUrl}/submission/${mongoId}`)
-          .then((axiosRes) => axiosRes.data)
-          .then((response) => {
-            const logMessage = `User with email '${mail}' successfully deleted PRF submission '${rebateId}'.`;
-            log({ level: "info", message: logMessage, req });
-
-            res.json(response);
-          })
-          .catch((error) => {
-            // NOTE: logged in axiosFormio response interceptor
-            const errorStatus = error.response?.status || 500;
-            const errorMessage = `Error deleting Formio Payment Request form submission '${rebateId}'.`;
-            return res.status(errorStatus).json({ message: errorMessage });
-          });
-      })
-      .catch((error) => {
-        // NOTE: logged in bap verifyBapConnection
-        const errorStatus = 500;
-        const errorMessage = `Error getting form submissions statuses from the BAP.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
-
-// --- get user's 2022 CRF submissions from Formio
-router.get("/formio-2022-crf-submissions", storeBapComboKeys, (req, res) => {
-  const { bapComboKeys } = req;
-
-  const userSubmissionsUrl =
-    `${formio2022CRFUrl}/submission` +
-    `?sort=-modified` +
-    `&limit=1000000` +
-    `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
-      "&data.bap_hidden_entity_combo_key="
-    )}`;
-
-  axiosFormio(req)
-    .get(userSubmissionsUrl)
-    .then((axiosRes) => axiosRes.data)
-    .then((submissions) => res.json(submissions))
-    .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
-      const errorStatus = error.response?.status || 500;
-      const errorMessage = `Error getting Formio Close Out form submissions.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    });
-});
-
-// --- post a new 2022 CRF submission to Formio
-router.post("/formio-2022-crf-submission", storeBapComboKeys, (req, res) => {
-  const { bapComboKeys, body } = req;
-  const { mail } = req.user;
-  const {
-    email,
-    title,
-    name,
-    entity,
-    comboKey,
-    rebateId,
-    frfReviewItemId,
-    prfReviewItemId,
-    prfModified,
-  } = body;
-
-  if (!submissionPeriodOpen["2022"].crf) {
-    const errorStatus = 400;
-    const errorMessage = `CSB Close Out form enrollment period is closed.`;
-    return res.status(errorStatus).json({ message: errorMessage });
-  }
-
-  if (!bapComboKeys.includes(comboKey)) {
-    const logMessage =
-      `User with email '${mail}' attempted to post a new CRF submission ` +
-      `without a matching BAP combo key.`;
-    log({ level: "error", message: logMessage, req });
-
-    const errorStatus = 401;
-    const errorMessage = `Unauthorized.`;
-    return res.status(errorStatus).json({ message: errorMessage });
-  }
-
-  const {
-    UNIQUE_ENTITY_ID__c,
-    ENTITY_EFT_INDICATOR__c,
-    ELEC_BUS_POC_EMAIL__c,
-    ALT_ELEC_BUS_POC_EMAIL__c,
-    GOVT_BUS_POC_EMAIL__c,
-    ALT_GOVT_BUS_POC_EMAIL__c,
-  } = entity;
-
-  return getBapDataForCRF(req, frfReviewItemId, prfReviewItemId)
-    .then(({ frfRecordQuery, prfRecordQuery, busRecordsQuery }) => {
-      const {
-        Fleet_Name__c,
-        Fleet_Street_Address__c,
-        Fleet_City__c,
-        Fleet_State__c,
-        Fleet_Zip__c,
-        Fleet_Contact_Name__c,
-        Fleet_Contact_Title__c,
-        Fleet_Contact_Phone__c,
-        Fleet_Contact_Email__c,
-        School_District_Contact__r,
-      } = frfRecordQuery[0];
-
-      const {
-        CSB_NCES_ID__c,
-        Primary_Applicant__r,
-        Alternate_Applicant__r,
-        Applicant_Organization__r,
-        CSB_School_District__r,
-        School_District_Prioritized__c,
-        Total_Rebate_Funds_Requested_PO__c,
-        Total_Bus_And_Infrastructure_Rebate__c,
-        Total_Infrastructure_Funds__c,
-        Num_Of_Buses_Requested_From_Application__c,
-        Total_Price_All_Buses__c,
-        Total_Bus_Rebate_Amount__c,
-        Total_All_Eligible_Infrastructure_Costs__c,
-        Total_Infrastructure_Rebate__c,
-        Total_Level_2_Charger_Costs__c,
-        Total_DC_Fast_Charger_Costs__c,
-        Total_Other_Infrastructure_Costs__c,
-      } = prfRecordQuery[0];
-
-      const busInfo = busRecordsQuery.map((record) => ({
-        busNum: record.Rebate_Item_num__c,
-        oldBusNcesDistrictId: CSB_NCES_ID__c,
-        oldBusVin: record.CSB_VIN__c,
-        oldBusModelYear: record.CSB_Model_Year__c,
-        oldBusFuelType: record.CSB_Fuel_Type__c,
-        oldBusEstimatedRemainingLife: record.Old_Bus_Estimated_Remaining_Life__c, // prettier-ignore
-        oldBusExclude: record.Old_Bus_Exclude__c,
-        hidden_prf_oldBusExclude: record.Old_Bus_Exclude__c,
-        newBusDealer: record.Related_Line_Item__r?.Vendor_Name__c,
-        newBusFuelType: record.New_Bus_Fuel_Type__c,
-        hidden_prf_newBusFuelType: record.New_Bus_Fuel_Type__c,
-        newBusMake: record.New_Bus_Make__c,
-        hidden_prf_newBusMake: record.New_Bus_Make__c,
-        newBusMakeOther: record.CSB_Manufacturer_if_Other__c,
-        hidden_prf_newBusMakeOther: record.CSB_Manufacturer_if_Other__c,
-        newBusModel: record.New_Bus_Model__c,
-        hidden_prf_newBusModel: record.New_Bus_Model__c,
-        newBusModelYear: record.New_Bus_Model_Year__c,
-        hidden_prf_newBusModelYear: record.New_Bus_Model_Year__c,
-        newBusGvwr: record.New_Bus_GVWR__c,
-        hidden_prf_newBusGvwr: record.New_Bus_GVWR__c,
-        newBusPurchasePrice: record.New_Bus_Purchase_Price__c,
-        hidden_prf_newBusPurchasePrice: record.New_Bus_Purchase_Price__c,
-        hidden_prf_rebate: record.New_Bus_Rebate_Amount__c,
-      }));
-
-      const submission = {
-        data: {
-          bap_hidden_entity_combo_key: comboKey,
-          hidden_prf_modified: prfModified,
-          hidden_current_user_email: email,
-          hidden_current_user_title: title,
-          hidden_current_user_name: name,
-          hidden_bap_rebate_id: rebateId,
-          hidden_sam_uei: UNIQUE_ENTITY_ID__c,
-          hidden_sam_efti: ENTITY_EFT_INDICATOR__c || "0000",
-          hidden_sam_elec_bus_poc_email: ELEC_BUS_POC_EMAIL__c,
-          hidden_sam_alt_elec_bus_poc_email: ALT_ELEC_BUS_POC_EMAIL__c,
-          hidden_sam_govt_bus_poc_email: GOVT_BUS_POC_EMAIL__c,
-          hidden_sam_alt_govt_bus_poc_email: ALT_GOVT_BUS_POC_EMAIL__c,
-          hidden_bap_district_id: CSB_NCES_ID__c,
-          hidden_bap_district_name: CSB_School_District__r?.Name,
-          hidden_bap_primary_fname: Primary_Applicant__r?.FirstName,
-          hidden_bap_primary_lname: Primary_Applicant__r?.LastName,
-          hidden_bap_primary_title: Primary_Applicant__r?.Title,
-          hidden_bap_primary_phone_number: Primary_Applicant__r?.Phone,
-          hidden_bap_primary_email: Primary_Applicant__r?.Email,
-          hidden_bap_alternate_fname: Alternate_Applicant__r?.FirstName || "",
-          hidden_bap_alternate_lname: Alternate_Applicant__r?.LastName || "",
-          hidden_bap_alternate_title: Alternate_Applicant__r?.Title || "",
-          hidden_bap_alternate_phone_number: Alternate_Applicant__r?.Phone || "", // prettier-ignore
-          hidden_bap_alternate_email: Alternate_Applicant__r?.Email || "",
-          hidden_bap_org_name: Applicant_Organization__r?.Name,
-          hidden_bap_fleet_name: Fleet_Name__c,
-          hidden_bap_fleet_address: Fleet_Street_Address__c,
-          hidden_bap_fleet_city: Fleet_City__c,
-          hidden_bap_fleet_state: Fleet_State__c,
-          hidden_bap_fleet_zip: Fleet_Zip__c,
-          hidden_bap_fleet_contact_name: Fleet_Contact_Name__c,
-          hidden_bap_fleet_contact_title: Fleet_Contact_Title__c,
-          hidden_bap_fleet_phone: Fleet_Contact_Phone__c,
-          hidden_bap_fleet_email: Fleet_Contact_Email__c,
-          hidden_bap_prioritized: School_District_Prioritized__c,
-          hidden_bap_requested_funds: Total_Rebate_Funds_Requested_PO__c,
-          hidden_bap_received_funds: Total_Bus_And_Infrastructure_Rebate__c,
-          hidden_bap_prf_infra_max_rebate: Total_Infrastructure_Funds__c,
-          hidden_bap_buses_requested_app: Num_Of_Buses_Requested_From_Application__c, // prettier-ignore
-          hidden_bap_total_bus_costs_prf: Total_Price_All_Buses__c,
-          hidden_bap_total_bus_rebate_received: Total_Bus_Rebate_Amount__c,
-          hidden_bap_total_infra_costs_prf: Total_All_Eligible_Infrastructure_Costs__c, // prettier-ignore
-          hidden_bap_total_infra_rebate_received: Total_Infrastructure_Rebate__c, // prettier-ignore
-          hidden_bap_total_infra_level2_charger: Total_Level_2_Charger_Costs__c, // prettier-ignore
-          hidden_bap_total_infra_dc_fast_charger: Total_DC_Fast_Charger_Costs__c, // prettier-ignore
-          hidden_bap_total_infra_other_costs: Total_Other_Infrastructure_Costs__c, // prettier-ignore
-          hidden_bap_district_contact_fname: School_District_Contact__r?.FirstName, // prettier-ignore
-          hidden_bap_district_contact_lname: School_District_Contact__r?.LastName, // prettier-ignore
-          busInfo,
-        },
-        /** Add custom metadata to track formio submissions from wrapper. */
-        metadata: {
-          ...formioCSBMetadata,
-        },
-        state: "draft",
-      };
-
-      axiosFormio(req)
-        .post(`${formio2022CRFUrl}/submission`, submission)
-        .then((axiosRes) => axiosRes.data)
-        .then((submission) => res.json(submission))
-        .catch((error) => {
-          // NOTE: logged in axiosFormio response interceptor
-          const errorStatus = error.response?.status || 500;
-          const errorMessage = `Error posting Formio Close Out form submission.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        });
-    })
-    .catch((error) => {
-      // NOTE: logged in bap verifyBapConnection
-      const errorStatus = 500;
-      const errorMessage = `Error getting data for a new Close Out form submission from the BAP.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    });
-});
-
-// --- get an existing 2022 CRF's schema and submission data from Formio
-router.get(
-  "/formio-2022-crf-submission/:rebateId",
-  storeBapComboKeys,
-  async (req, res) => {
-    const { bapComboKeys } = req;
-    const { mail } = req.user;
-    const { rebateId } = req.params; // CSB Rebate ID (6 digits)
-
-    const matchedCloseOutFormSubmissions =
-      `${formio2022CRFUrl}/submission` +
-      `?data.hidden_bap_rebate_id=${rebateId}` +
-      `&select=_id,data.bap_hidden_entity_combo_key`;
-
-    Promise.all([
-      axiosFormio(req).get(matchedCloseOutFormSubmissions),
-      axiosFormio(req).get(formio2022CRFUrl),
-    ])
-      .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
-      .then(([submissions, schema]) => {
-        const submission = submissions[0];
-        const mongoId = submission._id;
-        const comboKey = submission.data.bap_hidden_entity_combo_key;
-
-        if (!bapComboKeys.includes(comboKey)) {
-          const logMessage =
-            `User with email '${mail}' attempted to access CRF submission '${rebateId}' ` +
-            `that they do not have access to.`;
-          log({ level: "warn", message: logMessage, req });
-
-          return res.json({
-            userAccess: false,
-            formSchema: null,
-            submission: null,
-          });
-        }
-
-        /** NOTE: verifyMongoObjectId */
-        if (mongoId && !ObjectId.isValid(mongoId)) {
-          const errorStatus = 400;
-          const errorMessage = `MongoDB ObjectId validation error for: '${mongoId}'.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        /**
-         * NOTE: We can't just use the returned submission data here because
-         * Formio returns the string literal 'YES' instead of a base64 encoded
-         * image string for signature fields when you query for all submissions
-         * matching on a field's value (`/submission?data.hidden_bap_rebate_id=${rebateId}`).
-         * We need to query for a specific submission (e.g. `/submission/${mongoId}`),
-         * to have Formio return the correct signature field data.
-         */
-        axiosFormio(req)
-          .get(`${formio2022CRFUrl}/submission/${mongoId}`)
-          .then((axiosRes) => axiosRes.data)
-          .then((submission) => {
-            return res.json({
-              userAccess: true,
-              formSchema: { url: formio2022CRFUrl, json: schema },
-              submission,
-            });
-          });
-      })
-      .catch((error) => {
-        // NOTE: logged in axiosFormio response interceptor
-        const errorStatus = error.response?.status || 500;
-        const errorMessage = `Error getting Formio Close Out form submission '${rebateId}'.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
-
-// --- post an update to an existing draft 2022 CRF submission to Formio
-router.post(
-  "/formio-2022-crf-submission/:rebateId",
-  storeBapComboKeys,
-  (req, res) => {
-    const { bapComboKeys, body } = req;
-    const { mail } = req.user;
-    const { rebateId } = req.params; // CSB Rebate ID (6 digits)
-    const { mongoId, submission } = body;
-    const comboKey = submission.data?.bap_hidden_entity_combo_key;
-
-    checkFormSubmissionPeriodAndBapStatus({
-      rebateYear: "2022",
-      formType: "crf",
-      mongoId,
-      comboKey,
-      req,
-    })
-      .then(() => {
-        if (!bapComboKeys.includes(comboKey)) {
-          const logMessage =
-            `User with email '${mail}' attempted to update CRF submission '${rebateId}' ` +
-            `without a matching BAP combo key.`;
-          log({ level: "error", message: logMessage, req });
-
-          const errorStatus = 401;
-          const errorMessage = `Unauthorized.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        /** NOTE: verifyMongoObjectId */
-        if (mongoId && !ObjectId.isValid(mongoId)) {
-          const errorStatus = 400;
-          const errorMessage = `MongoDB ObjectId validation error for: '${mongoId}'.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        /**  Add custom metadata to track formio submissions from wrapper. */
-        submission.metadata = {
-          ...submission.metadata,
-          ...formioCSBMetadata,
-        };
-
-        axiosFormio(req)
-          .put(`${formio2022CRFUrl}/submission/${mongoId}`, submission)
-          .then((axiosRes) => axiosRes.data)
-          .then((submission) => res.json(submission))
-          .catch((error) => {
-            // NOTE: logged in axiosFormio response interceptor
-            const errorStatus = error.response?.status || 500;
-            const errorMessage = `Error updating Formio Close Out form submission '${rebateId}'.`;
-            return res.status(errorStatus).json({ message: errorMessage });
-          });
-      })
-      .catch((error) => {
-        const logMessage =
-          `User with email '${mail}' attempted to update CRF submission '${rebateId}' ` +
-          `when the CSB CRF enrollment period was closed.`;
-        log({ level: "error", message: logMessage, req });
-
-        const errorStatus = 400;
-        const errorMessage = `CSB Close Out form enrollment period is closed.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
-  }
-);
-
 module.exports = router;
diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
new file mode 100644
index 00000000..fab531c3
--- /dev/null
+++ b/app/server/app/routes/formio2022.js
@@ -0,0 +1,1029 @@
+const express = require("express");
+const ObjectId = require("mongodb").ObjectId;
+// ---
+const {
+  axiosFormio,
+  submissionPeriodOpen,
+  formio2022FRFUrl,
+  formio2022PRFUrl,
+  formio2022CRFUrl,
+  formioCSBMetadata,
+} = require("../config/formio");
+const {
+  ensureAuthenticated,
+  storeBapComboKeys,
+  verifyMongoObjectId,
+} = require("../middleware");
+const {
+  getBapFormSubmissionsStatuses,
+  getBapDataForPRF,
+  getBapDataForCRF,
+} = require("../utilities/bap");
+const log = require("../utilities/logger");
+
+/**
+ * Returns a resolved or rejected promise, depending on if the given form's
+ * submission period is open (as set via environment variables), and if the form
+ * submission has the status of "Edits Requested" or not (as stored in and
+ * returned from the BAP).
+ *
+ * @param {Object} param
+ * @param {'2022' | '2023'} param.rebateYear
+ * @param {'frf' | 'prf' | 'crf'} param.formType
+ * @param {string} param.mongoId
+ * @param {string} param.comboKey
+ * @param {express.Request} param.req
+ */
+function checkFormSubmissionPeriodAndBapStatus({
+  rebateYear,
+  formType,
+  mongoId,
+  comboKey,
+  req,
+}) {
+  /** Form submission period is open, so continue. */
+  if (submissionPeriodOpen[rebateYear][formType]) {
+    return Promise.resolve();
+  }
+
+  /** Form submission period is closed, so only continue if edits are requested. */
+  return getBapFormSubmissionsStatuses(req, [comboKey]).then((submissions) => {
+    const submission = submissions.find((s) => s.CSB_Form_ID__c === mongoId);
+
+    const statusField =
+      formType === "frf"
+        ? "CSB_Funding_Request_Status__c"
+        : formType === "prf"
+        ? "CSB_Payment_Request_Status__c"
+        : formType === "crf"
+        ? "CSB_Closeout_Request_Status__c"
+        : null;
+
+    return submission?.Parent_CSB_Rebate__r?.[statusField] === "Edits Requested"
+      ? Promise.resolve()
+      : Promise.reject();
+  });
+}
+
+const router = express.Router();
+
+router.use(ensureAuthenticated);
+
+// --- download Formio S3 file metadata
+router.get(
+  "/s3/:rebateYear/:formType/:mongoId/:comboKey/storage/s3",
+  storeBapComboKeys,
+  (req, res) => {
+    const { bapComboKeys, query } = req;
+    const { mail } = req.user;
+    const { comboKey } = req.params;
+
+    if (!bapComboKeys.includes(comboKey)) {
+      const logMessage =
+        `User with email '${mail}' attempted to download a file ` +
+        `without a matching BAP combo key.`;
+      log({ level: "error", message: logMessage, req });
+
+      const errorStatus = 401;
+      const errorMessage = `Unauthorized.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    }
+
+    axiosFormio(req)
+      .get(`${formio2022FRFUrl}/storage/s3`, { params: query })
+      .then((axiosRes) => axiosRes.data)
+      .then((fileMetadata) => res.json(fileMetadata))
+      .catch((error) => {
+        // NOTE: logged in axiosFormio response interceptor
+        const errorStatus = error.response?.status || 500;
+        const errorMessage = `Error downloading file from S3.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      });
+  }
+);
+
+// --- upload Formio S3 file metadata
+router.post(
+  "/s3/:rebateYear/:formType/:mongoId/:comboKey/storage/s3",
+  storeBapComboKeys,
+  (req, res) => {
+    const { bapComboKeys, body } = req;
+    const { mail } = req.user;
+    const { rebateYear, formType, mongoId, comboKey } = req.params;
+
+    checkFormSubmissionPeriodAndBapStatus({
+      rebateYear,
+      formType,
+      mongoId,
+      comboKey,
+      req,
+    })
+      .then(() => {
+        if (!bapComboKeys.includes(comboKey)) {
+          const logMessage =
+            `User with email '${mail}' attempted to upload a file ` +
+            `without a matching BAP combo key.`;
+          log({ level: "error", message: logMessage, req });
+
+          const errorStatus = 401;
+          const errorMessage = `Unauthorized.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        }
+
+        axiosFormio(req)
+          .post(`${formio2022FRFUrl}/storage/s3`, body)
+          .then((axiosRes) => axiosRes.data)
+          .then((fileMetadata) => res.json(fileMetadata))
+          .catch((error) => {
+            // NOTE: logged in axiosFormio response interceptor
+            const errorStatus = error.response?.status || 500;
+            const errorMessage = `Error uploading file to S3.`;
+            return res.status(errorStatus).json({ message: errorMessage });
+          });
+      })
+      .catch((error) => {
+        const formName =
+          formType === "frf"
+            ? "CSB Application"
+            : formType === "prf"
+            ? "CSB Payment Request"
+            : formType === "cof"
+            ? "CSB Close Out"
+            : "CSB";
+
+        const logMessage =
+          `User with email '${mail}' attempted to upload a file when the ` +
+          `${rebateYear} ${formName} form enrollment period was closed.`;
+        log({ level: "error", message: logMessage, req });
+
+        const errorStatus = 400;
+        const errorMessage = `${rebateYear} ${formName} form enrollment period is closed.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      });
+  }
+);
+
+// --- get user's 2022 FRF submissions from Formio
+router.get("/frf-submissions", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys } = req;
+
+  /**
+   * NOTE: Helpdesk users might not have any SAM.gov records associated with
+   * their email address so we should not return any submissions to those users.
+   * The only reason we explicitly need to do this is because there could be
+   * some submissions without `bap_hidden_entity_combo_key` field values in the
+   * Formio database – that will never be the case for submissions created from
+   * this app, but there could be submissions created externally if someone is
+   * testing posting data (e.g. from a REST client, or the Formio Viewer).
+   */
+  if (bapComboKeys.length === 0) return res.json([]);
+
+  const userSubmissionsUrl =
+    `${formio2022FRFUrl}/submission` +
+    `?sort=-modified` +
+    `&limit=1000000` +
+    `&data.bap_hidden_entity_combo_key=` +
+    `${bapComboKeys.join("&data.bap_hidden_entity_combo_key=")}`;
+
+  axiosFormio(req)
+    .get(userSubmissionsUrl)
+    .then((axiosRes) => axiosRes.data)
+    .then((submissions) => res.json(submissions))
+    .catch((error) => {
+      // NOTE: logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error getting Formio Application form submissions.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- post a new 2022 FRF submission to Formio
+router.post("/frf-submission", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys, body } = req;
+  const { mail } = req.user;
+  const comboKey = body.data?.bap_hidden_entity_combo_key;
+
+  if (!submissionPeriodOpen["2022"].frf) {
+    const errorStatus = 400;
+    const errorMessage = `CSB Application form enrollment period is closed.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  if (!bapComboKeys.includes(comboKey)) {
+    const logMessage =
+      `User with email '${mail}' attempted to post a new FRF submission ` +
+      `without a matching BAP combo key.`;
+    log({ level: "error", message: logMessage, req });
+
+    const errorStatus = 401;
+    const errorMessage = `Unauthorized.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  /** Add custom metadata to track formio submissions from wrapper. */
+  body.metadata = { ...formioCSBMetadata };
+
+  axiosFormio(req)
+    .post(`${formio2022FRFUrl}/submission`, body)
+    .then((axiosRes) => axiosRes.data)
+    .then((submission) => res.json(submission))
+    .catch((error) => {
+      // NOTE: logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error posting Formio Application form submission.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- get an existing 2022 FRF's schema and submission data from Formio
+router.get(
+  "/frf-submission/:mongoId",
+  verifyMongoObjectId,
+  storeBapComboKeys,
+  (req, res) => {
+    const { bapComboKeys } = req;
+    const { mail } = req.user;
+    const { mongoId } = req.params;
+
+    Promise.all([
+      axiosFormio(req).get(`${formio2022FRFUrl}/submission/${mongoId}`),
+      axiosFormio(req).get(formio2022FRFUrl),
+    ])
+      .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
+      .then(([submission, schema]) => {
+        const comboKey = submission.data.bap_hidden_entity_combo_key;
+
+        if (!bapComboKeys.includes(comboKey)) {
+          const logMessage =
+            `User with email '${mail}' attempted to access FRF submission '${mongoId}' ` +
+            `that they do not have access to.`;
+          log({ level: "warn", message: logMessage, req });
+
+          return res.json({
+            userAccess: false,
+            formSchema: null,
+            submission: null,
+          });
+        }
+
+        return res.json({
+          userAccess: true,
+          formSchema: { url: formio2022FRFUrl, json: schema },
+          submission,
+        });
+      })
+      .catch((error) => {
+        // NOTE: logged in axiosFormio response interceptor
+        const errorStatus = error.response?.status || 500;
+        const errorMessage = `Error getting Formio Application form submission '${mongoId}'.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      });
+  }
+);
+
+// --- post an update to an existing draft 2022 FRF submission to Formio
+router.post(
+  "/frf-submission/:mongoId",
+  verifyMongoObjectId,
+  storeBapComboKeys,
+  (req, res) => {
+    const { bapComboKeys } = req;
+    const { mail } = req.user;
+    const { mongoId } = req.params;
+    const submission = req.body;
+    const comboKey = submission.data?.bap_hidden_entity_combo_key;
+
+    checkFormSubmissionPeriodAndBapStatus({
+      rebateYear: "2022",
+      formType: "frf",
+      mongoId,
+      comboKey,
+      req,
+    })
+      .then(() => {
+        if (!bapComboKeys.includes(comboKey)) {
+          const logMessage =
+            `User with email '${mail}' attempted to update FRF submission '${mongoId}' ` +
+            `without a matching BAP combo key.`;
+          log({ level: "error", message: logMessage, req });
+
+          const errorStatus = 401;
+          const errorMessage = `Unauthorized.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        }
+
+        /** Add custom metadata to track formio submissions from wrapper. */
+        submission.metadata = {
+          ...submission.metadata,
+          ...formioCSBMetadata,
+        };
+
+        axiosFormio(req)
+          .put(`${formio2022FRFUrl}/submission/${mongoId}`, submission)
+          .then((axiosRes) => axiosRes.data)
+          .then((submission) => res.json(submission))
+          .catch((error) => {
+            // NOTE: logged in axiosFormio response interceptor
+            const errorStatus = error.response?.status || 500;
+            const errorMessage = `Error updating Formio Application form submission '${mongoId}'.`;
+            return res.status(errorStatus).json({ message: errorMessage });
+          });
+      })
+      .catch((error) => {
+        const logMessage =
+          `User with email '${mail}' attempted to update FRF submission '${mongoId}' ` +
+          `when the CSB FRF enrollment period was closed.`;
+        log({ level: "error", message: logMessage, req });
+
+        const errorStatus = 400;
+        const errorMessage = `CSB Application form enrollment period is closed.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      });
+  }
+);
+
+// --- get user's 2022 PRF submissions from Formio
+router.get("/prf-submissions", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys } = req;
+
+  const userSubmissionsUrl =
+    `${formio2022PRFUrl}/submission` +
+    `?sort=-modified` +
+    `&limit=1000000` +
+    `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
+      "&data.bap_hidden_entity_combo_key="
+    )}`;
+
+  axiosFormio(req)
+    .get(userSubmissionsUrl)
+    .then((axiosRes) => axiosRes.data)
+    .then((submissions) => res.json(submissions))
+    .catch((error) => {
+      // NOTE: logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error getting Formio Payment Request form submissions.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- post a new 2022 PRF submission to Formio
+router.post("/prf-submission", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys, body } = req;
+  const { mail } = req.user;
+  const {
+    email,
+    title,
+    name,
+    entity,
+    comboKey,
+    rebateId,
+    frfReviewItemId,
+    frfFormModified,
+  } = body;
+
+  if (!submissionPeriodOpen["2022"].prf) {
+    const errorStatus = 400;
+    const errorMessage = `CSB Payment Request form enrollment period is closed.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  if (!bapComboKeys.includes(comboKey)) {
+    const logMessage =
+      `User with email '${mail}' attempted to post a new PRF submission ` +
+      `without a matching BAP combo key.`;
+    log({ level: "error", message: logMessage, req });
+
+    const errorStatus = 401;
+    const errorMessage = `Unauthorized.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  const {
+    UNIQUE_ENTITY_ID__c,
+    ENTITY_EFT_INDICATOR__c,
+    ELEC_BUS_POC_EMAIL__c,
+    ALT_ELEC_BUS_POC_EMAIL__c,
+    GOVT_BUS_POC_EMAIL__c,
+    ALT_GOVT_BUS_POC_EMAIL__c,
+  } = entity;
+
+  return getBapDataForPRF(req, frfReviewItemId)
+    .then(({ frfRecordQuery, busRecordsQuery }) => {
+      const {
+        CSB_NCES_ID__c,
+        Primary_Applicant__r,
+        Alternate_Applicant__r,
+        Applicant_Organization__r,
+        CSB_School_District__r,
+        Fleet_Name__c,
+        School_District_Prioritized__c,
+        Total_Rebate_Funds_Requested__c,
+        Total_Infrastructure_Funds__c,
+      } = frfRecordQuery[0];
+
+      const busInfo = busRecordsQuery.map((record) => ({
+        busNum: record.Rebate_Item_num__c,
+        oldBusNcesDistrictId: CSB_NCES_ID__c,
+        oldBusVin: record.CSB_VIN__c,
+        oldBusModelYear: record.CSB_Model_Year__c,
+        oldBusFuelType: record.CSB_Fuel_Type__c,
+        newBusFuelType: record.CSB_Replacement_Fuel_Type__c,
+        hidden_bap_max_rebate: record.CSB_Funds_Requested__c,
+      }));
+
+      /**
+       * NOTE: `purchaseOrders` is initialized as an empty array to fix some
+       * issue with the field being changed to an object when the form loads
+       */
+      const submission = {
+        data: {
+          bap_hidden_entity_combo_key: comboKey,
+          hidden_application_form_modified: frfFormModified,
+          hidden_current_user_email: email,
+          hidden_current_user_title: title,
+          hidden_current_user_name: name,
+          hidden_sam_uei: UNIQUE_ENTITY_ID__c,
+          hidden_sam_efti: ENTITY_EFT_INDICATOR__c || "0000",
+          hidden_sam_elec_bus_poc_email: ELEC_BUS_POC_EMAIL__c,
+          hidden_sam_alt_elec_bus_poc_email: ALT_ELEC_BUS_POC_EMAIL__c,
+          hidden_sam_govt_bus_poc_email: GOVT_BUS_POC_EMAIL__c,
+          hidden_sam_alt_govt_bus_poc_email: ALT_GOVT_BUS_POC_EMAIL__c,
+          hidden_bap_rebate_id: rebateId,
+          hidden_bap_district_id: CSB_NCES_ID__c,
+          hidden_bap_primary_name: Primary_Applicant__r?.Name,
+          hidden_bap_primary_title: Primary_Applicant__r?.Title,
+          hidden_bap_primary_phone_number: Primary_Applicant__r?.Phone,
+          hidden_bap_primary_email: Primary_Applicant__r?.Email,
+          hidden_bap_alternate_name: Alternate_Applicant__r?.Name || "",
+          hidden_bap_alternate_title: Alternate_Applicant__r?.Title || "",
+          hidden_bap_alternate_phone_number: Alternate_Applicant__r?.Phone || "", // prettier-ignore
+          hidden_bap_alternate_email: Alternate_Applicant__r?.Email || "",
+          hidden_bap_org_name: Applicant_Organization__r?.Name,
+          hidden_bap_district_name: CSB_School_District__r?.Name,
+          hidden_bap_fleet_name: Fleet_Name__c,
+          hidden_bap_prioritized: School_District_Prioritized__c,
+          hidden_bap_requested_funds: Total_Rebate_Funds_Requested__c,
+          hidden_bap_infra_max_rebate: Total_Infrastructure_Funds__c,
+          busInfo,
+          purchaseOrders: [],
+        },
+        /** Add custom metadata to track formio submissions from wrapper. */
+        metadata: {
+          ...formioCSBMetadata,
+        },
+        state: "draft",
+      };
+
+      axiosFormio(req)
+        .post(`${formio2022PRFUrl}/submission`, submission)
+        .then((axiosRes) => axiosRes.data)
+        .then((submission) => res.json(submission))
+        .catch((error) => {
+          // NOTE: logged in axiosFormio response interceptor
+          const errorStatus = error.response?.status || 500;
+          const errorMessage = `Error posting Formio Payment Request form submission.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        });
+    })
+    .catch((error) => {
+      // NOTE: logged in bap verifyBapConnection
+      const errorStatus = 500;
+      const errorMessage = `Error getting data for a new Payment Request form submission from the BAP.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- get an existing 2022 PRF's schema and submission data from Formio
+router.get("/prf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
+  const { bapComboKeys } = req;
+  const { mail } = req.user;
+  const { rebateId } = req.params; // CSB Rebate ID (6 digits)
+
+  const matchedPaymentRequestFormSubmissions =
+    `${formio2022PRFUrl}/submission` +
+    `?data.hidden_bap_rebate_id=${rebateId}` +
+    `&select=_id,data.bap_hidden_entity_combo_key`;
+
+  Promise.all([
+    axiosFormio(req).get(matchedPaymentRequestFormSubmissions),
+    axiosFormio(req).get(formio2022PRFUrl),
+  ])
+    .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
+    .then(([submissions, schema]) => {
+      const submission = submissions[0];
+      const mongoId = submission._id;
+      const comboKey = submission.data.bap_hidden_entity_combo_key;
+
+      if (!bapComboKeys.includes(comboKey)) {
+        const logMessage =
+          `User with email '${mail}' attempted to access PRF submission '${rebateId}' ` +
+          `that they do not have access to.`;
+        log({ level: "warn", message: logMessage, req });
+
+        return res.json({
+          userAccess: false,
+          formSchema: null,
+          submission: null,
+        });
+      }
+
+      /** NOTE: verifyMongoObjectId */
+      if (mongoId && !ObjectId.isValid(mongoId)) {
+        const errorStatus = 400;
+        const errorMessage = `MongoDB ObjectId validation error for: '${mongoId}'.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      }
+
+      /**
+       * NOTE: We can't just use the returned submission data here because
+       * Formio returns the string literal 'YES' instead of a base64 encoded
+       * image string for signature fields when you query for all submissions
+       * matching on a field's value (`/submission?data.hidden_bap_rebate_id=${rebateId}`).
+       * We need to query for a specific submission (e.g. `/submission/${mongoId}`),
+       * to have Formio return the correct signature field data.
+       */
+      axiosFormio(req)
+        .get(`${formio2022PRFUrl}/submission/${mongoId}`)
+        .then((axiosRes) => axiosRes.data)
+        .then((submission) => {
+          return res.json({
+            userAccess: true,
+            formSchema: { url: formio2022PRFUrl, json: schema },
+            submission,
+          });
+        });
+    })
+    .catch((error) => {
+      // NOTE: logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error getting Formio Payment Request form submission '${rebateId}'.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- post an update to an existing draft 2022 PRF submission to Formio
+router.post("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys, body } = req;
+  const { mail } = req.user;
+  const { rebateId } = req.params; // CSB Rebate ID (6 digits)
+  const { mongoId, submission } = body;
+  const comboKey = submission.data?.bap_hidden_entity_combo_key;
+
+  checkFormSubmissionPeriodAndBapStatus({
+    rebateYear: "2022",
+    formType: "prf",
+    mongoId,
+    comboKey,
+    req,
+  })
+    .then(() => {
+      if (!bapComboKeys.includes(comboKey)) {
+        const logMessage =
+          `User with email '${mail}' attempted to update PRF submission '${rebateId}' ` +
+          `without a matching BAP combo key.`;
+        log({ level: "error", message: logMessage, req });
+
+        const errorStatus = 401;
+        const errorMessage = `Unauthorized.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      }
+
+      /** NOTE: verifyMongoObjectId */
+      if (mongoId && !ObjectId.isValid(mongoId)) {
+        const errorStatus = 400;
+        const errorMessage = `MongoDB ObjectId validation error for: '${mongoId}'.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      }
+
+      /** Add custom metadata to track formio submissions from wrapper. */
+      submission.metadata = {
+        ...submission.metadata,
+        ...formioCSBMetadata,
+      };
+
+      axiosFormio(req)
+        .put(`${formio2022PRFUrl}/submission/${mongoId}`, submission)
+        .then((axiosRes) => axiosRes.data)
+        .then((submission) => res.json(submission))
+        .catch((error) => {
+          // NOTE: logged in axiosFormio response interceptor
+          const errorStatus = error.response?.status || 500;
+          const errorMessage = `Error updating Formio Payment Request form submission '${rebateId}'.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        });
+    })
+    .catch((error) => {
+      const logMessage =
+        `User with email '${mail}' attempted to update PRF submission '${rebateId}' ` +
+        `when the CSB PRF enrollment period was closed.`;
+      log({ level: "error", message: logMessage, req });
+
+      const errorStatus = 400;
+      const errorMessage = `CSB Payment Request form enrollment period is closed.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- delete an existing 2022 PRF submission from Formio
+router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys, body } = req;
+  const { mail } = req.user;
+  const { mongoId, rebateId, comboKey } = body;
+
+  // verify post data includes one of user's BAP combo keys
+  if (!bapComboKeys.includes(comboKey)) {
+    const logMessage =
+      `User with email '${mail}' attempted to delete PRF submission '${rebateId}' ` +
+      `without a matching BAP combo key.`;
+    log({ level: "error", message: logMessage, req });
+
+    const errorStatus = 401;
+    const errorMessage = `Unauthorized.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  /**
+   * ensure the BAP status of the corresponding FRF submission is "Edits
+   * Requested" before deleting the FRF submission from Formio
+   */
+  getBapFormSubmissionsStatuses(req, req.bapComboKeys)
+    .then((submissions) => {
+      const frf = submissions.find((submission) => {
+        return (
+          submission.Parent_Rebate_ID__c === rebateId &&
+          submission.Record_Type_Name__c === "CSB Funding Request"
+        );
+      });
+
+      const frfNeedsEdits =
+        frf?.Parent_CSB_Rebate__r.CSB_Funding_Request_Status__c ===
+        "Edits Requested";
+
+      if (!frfNeedsEdits) {
+        const errorStatus = 400;
+        const errorMessage = `Application form submission '${mongoId}' does not need edits.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      }
+
+      axiosFormio(req)
+        .delete(`${formio2022PRFUrl}/submission/${mongoId}`)
+        .then((axiosRes) => axiosRes.data)
+        .then((response) => {
+          const logMessage = `User with email '${mail}' successfully deleted PRF submission '${rebateId}'.`;
+          log({ level: "info", message: logMessage, req });
+
+          res.json(response);
+        })
+        .catch((error) => {
+          // NOTE: logged in axiosFormio response interceptor
+          const errorStatus = error.response?.status || 500;
+          const errorMessage = `Error deleting Formio Payment Request form submission '${rebateId}'.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        });
+    })
+    .catch((error) => {
+      // NOTE: logged in bap verifyBapConnection
+      const errorStatus = 500;
+      const errorMessage = `Error getting form submissions statuses from the BAP.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- get user's 2022 CRF submissions from Formio
+router.get("/crf-submissions", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys } = req;
+
+  const userSubmissionsUrl =
+    `${formio2022CRFUrl}/submission` +
+    `?sort=-modified` +
+    `&limit=1000000` +
+    `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
+      "&data.bap_hidden_entity_combo_key="
+    )}`;
+
+  axiosFormio(req)
+    .get(userSubmissionsUrl)
+    .then((axiosRes) => axiosRes.data)
+    .then((submissions) => res.json(submissions))
+    .catch((error) => {
+      // NOTE: logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error getting Formio Close Out form submissions.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- post a new 2022 CRF submission to Formio
+router.post("/crf-submission", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys, body } = req;
+  const { mail } = req.user;
+  const {
+    email,
+    title,
+    name,
+    entity,
+    comboKey,
+    rebateId,
+    frfReviewItemId,
+    prfReviewItemId,
+    prfModified,
+  } = body;
+
+  if (!submissionPeriodOpen["2022"].crf) {
+    const errorStatus = 400;
+    const errorMessage = `CSB Close Out form enrollment period is closed.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  if (!bapComboKeys.includes(comboKey)) {
+    const logMessage =
+      `User with email '${mail}' attempted to post a new CRF submission ` +
+      `without a matching BAP combo key.`;
+    log({ level: "error", message: logMessage, req });
+
+    const errorStatus = 401;
+    const errorMessage = `Unauthorized.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  const {
+    UNIQUE_ENTITY_ID__c,
+    ENTITY_EFT_INDICATOR__c,
+    ELEC_BUS_POC_EMAIL__c,
+    ALT_ELEC_BUS_POC_EMAIL__c,
+    GOVT_BUS_POC_EMAIL__c,
+    ALT_GOVT_BUS_POC_EMAIL__c,
+  } = entity;
+
+  return getBapDataForCRF(req, frfReviewItemId, prfReviewItemId)
+    .then(({ frfRecordQuery, prfRecordQuery, busRecordsQuery }) => {
+      const {
+        Fleet_Name__c,
+        Fleet_Street_Address__c,
+        Fleet_City__c,
+        Fleet_State__c,
+        Fleet_Zip__c,
+        Fleet_Contact_Name__c,
+        Fleet_Contact_Title__c,
+        Fleet_Contact_Phone__c,
+        Fleet_Contact_Email__c,
+        School_District_Contact__r,
+      } = frfRecordQuery[0];
+
+      const {
+        CSB_NCES_ID__c,
+        Primary_Applicant__r,
+        Alternate_Applicant__r,
+        Applicant_Organization__r,
+        CSB_School_District__r,
+        School_District_Prioritized__c,
+        Total_Rebate_Funds_Requested_PO__c,
+        Total_Bus_And_Infrastructure_Rebate__c,
+        Total_Infrastructure_Funds__c,
+        Num_Of_Buses_Requested_From_Application__c,
+        Total_Price_All_Buses__c,
+        Total_Bus_Rebate_Amount__c,
+        Total_All_Eligible_Infrastructure_Costs__c,
+        Total_Infrastructure_Rebate__c,
+        Total_Level_2_Charger_Costs__c,
+        Total_DC_Fast_Charger_Costs__c,
+        Total_Other_Infrastructure_Costs__c,
+      } = prfRecordQuery[0];
+
+      const busInfo = busRecordsQuery.map((record) => ({
+        busNum: record.Rebate_Item_num__c,
+        oldBusNcesDistrictId: CSB_NCES_ID__c,
+        oldBusVin: record.CSB_VIN__c,
+        oldBusModelYear: record.CSB_Model_Year__c,
+        oldBusFuelType: record.CSB_Fuel_Type__c,
+        oldBusEstimatedRemainingLife: record.Old_Bus_Estimated_Remaining_Life__c, // prettier-ignore
+        oldBusExclude: record.Old_Bus_Exclude__c,
+        hidden_prf_oldBusExclude: record.Old_Bus_Exclude__c,
+        newBusDealer: record.Related_Line_Item__r?.Vendor_Name__c,
+        newBusFuelType: record.New_Bus_Fuel_Type__c,
+        hidden_prf_newBusFuelType: record.New_Bus_Fuel_Type__c,
+        newBusMake: record.New_Bus_Make__c,
+        hidden_prf_newBusMake: record.New_Bus_Make__c,
+        newBusMakeOther: record.CSB_Manufacturer_if_Other__c,
+        hidden_prf_newBusMakeOther: record.CSB_Manufacturer_if_Other__c,
+        newBusModel: record.New_Bus_Model__c,
+        hidden_prf_newBusModel: record.New_Bus_Model__c,
+        newBusModelYear: record.New_Bus_Model_Year__c,
+        hidden_prf_newBusModelYear: record.New_Bus_Model_Year__c,
+        newBusGvwr: record.New_Bus_GVWR__c,
+        hidden_prf_newBusGvwr: record.New_Bus_GVWR__c,
+        newBusPurchasePrice: record.New_Bus_Purchase_Price__c,
+        hidden_prf_newBusPurchasePrice: record.New_Bus_Purchase_Price__c,
+        hidden_prf_rebate: record.New_Bus_Rebate_Amount__c,
+      }));
+
+      const submission = {
+        data: {
+          bap_hidden_entity_combo_key: comboKey,
+          hidden_prf_modified: prfModified,
+          hidden_current_user_email: email,
+          hidden_current_user_title: title,
+          hidden_current_user_name: name,
+          hidden_bap_rebate_id: rebateId,
+          hidden_sam_uei: UNIQUE_ENTITY_ID__c,
+          hidden_sam_efti: ENTITY_EFT_INDICATOR__c || "0000",
+          hidden_sam_elec_bus_poc_email: ELEC_BUS_POC_EMAIL__c,
+          hidden_sam_alt_elec_bus_poc_email: ALT_ELEC_BUS_POC_EMAIL__c,
+          hidden_sam_govt_bus_poc_email: GOVT_BUS_POC_EMAIL__c,
+          hidden_sam_alt_govt_bus_poc_email: ALT_GOVT_BUS_POC_EMAIL__c,
+          hidden_bap_district_id: CSB_NCES_ID__c,
+          hidden_bap_district_name: CSB_School_District__r?.Name,
+          hidden_bap_primary_fname: Primary_Applicant__r?.FirstName,
+          hidden_bap_primary_lname: Primary_Applicant__r?.LastName,
+          hidden_bap_primary_title: Primary_Applicant__r?.Title,
+          hidden_bap_primary_phone_number: Primary_Applicant__r?.Phone,
+          hidden_bap_primary_email: Primary_Applicant__r?.Email,
+          hidden_bap_alternate_fname: Alternate_Applicant__r?.FirstName || "",
+          hidden_bap_alternate_lname: Alternate_Applicant__r?.LastName || "",
+          hidden_bap_alternate_title: Alternate_Applicant__r?.Title || "",
+          hidden_bap_alternate_phone_number: Alternate_Applicant__r?.Phone || "", // prettier-ignore
+          hidden_bap_alternate_email: Alternate_Applicant__r?.Email || "",
+          hidden_bap_org_name: Applicant_Organization__r?.Name,
+          hidden_bap_fleet_name: Fleet_Name__c,
+          hidden_bap_fleet_address: Fleet_Street_Address__c,
+          hidden_bap_fleet_city: Fleet_City__c,
+          hidden_bap_fleet_state: Fleet_State__c,
+          hidden_bap_fleet_zip: Fleet_Zip__c,
+          hidden_bap_fleet_contact_name: Fleet_Contact_Name__c,
+          hidden_bap_fleet_contact_title: Fleet_Contact_Title__c,
+          hidden_bap_fleet_phone: Fleet_Contact_Phone__c,
+          hidden_bap_fleet_email: Fleet_Contact_Email__c,
+          hidden_bap_prioritized: School_District_Prioritized__c,
+          hidden_bap_requested_funds: Total_Rebate_Funds_Requested_PO__c,
+          hidden_bap_received_funds: Total_Bus_And_Infrastructure_Rebate__c,
+          hidden_bap_prf_infra_max_rebate: Total_Infrastructure_Funds__c,
+          hidden_bap_buses_requested_app: Num_Of_Buses_Requested_From_Application__c, // prettier-ignore
+          hidden_bap_total_bus_costs_prf: Total_Price_All_Buses__c,
+          hidden_bap_total_bus_rebate_received: Total_Bus_Rebate_Amount__c,
+          hidden_bap_total_infra_costs_prf: Total_All_Eligible_Infrastructure_Costs__c, // prettier-ignore
+          hidden_bap_total_infra_rebate_received: Total_Infrastructure_Rebate__c, // prettier-ignore
+          hidden_bap_total_infra_level2_charger: Total_Level_2_Charger_Costs__c,
+          hidden_bap_total_infra_dc_fast_charger: Total_DC_Fast_Charger_Costs__c, // prettier-ignore
+          hidden_bap_total_infra_other_costs: Total_Other_Infrastructure_Costs__c, // prettier-ignore
+          hidden_bap_district_contact_fname: School_District_Contact__r?.FirstName, // prettier-ignore
+          hidden_bap_district_contact_lname: School_District_Contact__r?.LastName, // prettier-ignore
+          busInfo,
+        },
+        /** Add custom metadata to track formio submissions from wrapper. */
+        metadata: {
+          ...formioCSBMetadata,
+        },
+        state: "draft",
+      };
+
+      axiosFormio(req)
+        .post(`${formio2022CRFUrl}/submission`, submission)
+        .then((axiosRes) => axiosRes.data)
+        .then((submission) => res.json(submission))
+        .catch((error) => {
+          // NOTE: logged in axiosFormio response interceptor
+          const errorStatus = error.response?.status || 500;
+          const errorMessage = `Error posting Formio Close Out form submission.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        });
+    })
+    .catch((error) => {
+      // NOTE: logged in bap verifyBapConnection
+      const errorStatus = 500;
+      const errorMessage = `Error getting data for a new Close Out form submission from the BAP.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- get an existing 2022 CRF's schema and submission data from Formio
+router.get("/crf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
+  const { bapComboKeys } = req;
+  const { mail } = req.user;
+  const { rebateId } = req.params; // CSB Rebate ID (6 digits)
+
+  const matchedCloseOutFormSubmissions =
+    `${formio2022CRFUrl}/submission` +
+    `?data.hidden_bap_rebate_id=${rebateId}` +
+    `&select=_id,data.bap_hidden_entity_combo_key`;
+
+  Promise.all([
+    axiosFormio(req).get(matchedCloseOutFormSubmissions),
+    axiosFormio(req).get(formio2022CRFUrl),
+  ])
+    .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
+    .then(([submissions, schema]) => {
+      const submission = submissions[0];
+      const mongoId = submission._id;
+      const comboKey = submission.data.bap_hidden_entity_combo_key;
+
+      if (!bapComboKeys.includes(comboKey)) {
+        const logMessage =
+          `User with email '${mail}' attempted to access CRF submission '${rebateId}' ` +
+          `that they do not have access to.`;
+        log({ level: "warn", message: logMessage, req });
+
+        return res.json({
+          userAccess: false,
+          formSchema: null,
+          submission: null,
+        });
+      }
+
+      /** NOTE: verifyMongoObjectId */
+      if (mongoId && !ObjectId.isValid(mongoId)) {
+        const errorStatus = 400;
+        const errorMessage = `MongoDB ObjectId validation error for: '${mongoId}'.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      }
+
+      /**
+       * NOTE: We can't just use the returned submission data here because
+       * Formio returns the string literal 'YES' instead of a base64 encoded
+       * image string for signature fields when you query for all submissions
+       * matching on a field's value (`/submission?data.hidden_bap_rebate_id=${rebateId}`).
+       * We need to query for a specific submission (e.g. `/submission/${mongoId}`),
+       * to have Formio return the correct signature field data.
+       */
+      axiosFormio(req)
+        .get(`${formio2022CRFUrl}/submission/${mongoId}`)
+        .then((axiosRes) => axiosRes.data)
+        .then((submission) => {
+          return res.json({
+            userAccess: true,
+            formSchema: { url: formio2022CRFUrl, json: schema },
+            submission,
+          });
+        });
+    })
+    .catch((error) => {
+      // NOTE: logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error getting Formio Close Out form submission '${rebateId}'.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+// --- post an update to an existing draft 2022 CRF submission to Formio
+router.post("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => {
+  const { bapComboKeys, body } = req;
+  const { mail } = req.user;
+  const { rebateId } = req.params; // CSB Rebate ID (6 digits)
+  const { mongoId, submission } = body;
+  const comboKey = submission.data?.bap_hidden_entity_combo_key;
+
+  checkFormSubmissionPeriodAndBapStatus({
+    rebateYear: "2022",
+    formType: "crf",
+    mongoId,
+    comboKey,
+    req,
+  })
+    .then(() => {
+      if (!bapComboKeys.includes(comboKey)) {
+        const logMessage =
+          `User with email '${mail}' attempted to update CRF submission '${rebateId}' ` +
+          `without a matching BAP combo key.`;
+        log({ level: "error", message: logMessage, req });
+
+        const errorStatus = 401;
+        const errorMessage = `Unauthorized.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      }
+
+      /** NOTE: verifyMongoObjectId */
+      if (mongoId && !ObjectId.isValid(mongoId)) {
+        const errorStatus = 400;
+        const errorMessage = `MongoDB ObjectId validation error for: '${mongoId}'.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      }
+
+      /**  Add custom metadata to track formio submissions from wrapper. */
+      submission.metadata = {
+        ...submission.metadata,
+        ...formioCSBMetadata,
+      };
+
+      axiosFormio(req)
+        .put(`${formio2022CRFUrl}/submission/${mongoId}`, submission)
+        .then((axiosRes) => axiosRes.data)
+        .then((submission) => res.json(submission))
+        .catch((error) => {
+          // NOTE: logged in axiosFormio response interceptor
+          const errorStatus = error.response?.status || 500;
+          const errorMessage = `Error updating Formio Close Out form submission '${rebateId}'.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        });
+    })
+    .catch((error) => {
+      const logMessage =
+        `User with email '${mail}' attempted to update CRF submission '${rebateId}' ` +
+        `when the CSB CRF enrollment period was closed.`;
+      log({ level: "error", message: logMessage, req });
+
+      const errorStatus = 400;
+      const errorMessage = `CSB Close Out form enrollment period is closed.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+module.exports = router;
diff --git a/app/server/app/routes/index.js b/app/server/app/routes/index.js
index 1390620d..51fcf50d 100644
--- a/app/server/app/routes/index.js
+++ b/app/server/app/routes/index.js
@@ -4,6 +4,7 @@ const router = express.Router();
 
 router.use("/", require("./auth"));
 router.use("/api", require("./api"));
+router.use("/api/formio/2022", require("./formio2022"));
 router.use("/help", require("./help"));
 router.use("/status", require("./status"));
 
diff --git a/docs/csb-openapi.json b/docs/csb-openapi.json
index 87be05fc..14c99178 100644
--- a/docs/csb-openapi.json
+++ b/docs/csb-openapi.json
@@ -492,9 +492,9 @@
         ]
       }
     },
-    "/api/formio-2022-frf-submissions": {
+    "/api/formio/2022/frf-submissions": {
       "get": {
-        "summary": "/api/formio-2022-frf-submissions",
+        "summary": "/api/formio/2022/frf-submissions",
         "responses": {
           "200": {
             "description": "OK",
@@ -514,9 +514,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-2022-frf-submission": {
+    "/api/formio/2022/frf-submission": {
       "post": {
-        "summary": "/api/formio-2022-frf-submission",
+        "summary": "/api/formio/2022/frf-submission",
         "responses": {
           "200": {
             "description": "OK",
@@ -536,9 +536,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-2022-frf-submission/{mongoId}": {
+    "/api/formio/2022/frf-submission/{mongoId}": {
       "get": {
-        "summary": "/api/formio-2022-frf-submission/{mongoId}",
+        "summary": "/api/formio/2022/frf-submission/{mongoId}",
         "parameters": [
           {
             "name": "mongoId",
@@ -586,7 +586,7 @@
         "tags": []
       },
       "post": {
-        "summary": "/api/formio-2022-frf-submission/{mongoId}",
+        "summary": "/api/formio/2022/frf-submission/{mongoId}",
         "parameters": [
           {
             "name": "mongoId",
@@ -613,9 +613,9 @@
         "tags": []
       }
     },
-    "/api/formio-2022-prf-submissions": {
+    "/api/formio/2022/prf-submissions": {
       "get": {
-        "summary": "/api/formio-2022-prf-submissions",
+        "summary": "/api/formio/2022/prf-submissions",
         "responses": {
           "200": {
             "description": "OK",
@@ -635,9 +635,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-2022-prf-submission": {
+    "/api/formio/2022/prf-submission": {
       "post": {
-        "summary": "/api/formio-2022-prf-submission",
+        "summary": "/api/formio/2022/prf-submission",
         "responses": {
           "200": {
             "description": "OK",
@@ -657,9 +657,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-2022-prf-submission/{rebateId}": {
+    "/api/formio/2022/prf-submission/{rebateId}": {
       "get": {
-        "summary": "/api/formio-2022-prf-submission/{rebateId}",
+        "summary": "/api/formio/2022/prf-submission/{rebateId}",
         "parameters": [
           {
             "name": "rebateId",
@@ -707,7 +707,7 @@
         "tags": []
       },
       "post": {
-        "summary": "/api/formio-2022-prf-submission/{rebateId}",
+        "summary": "/api/formio/2022/prf-submission/{rebateId}",
         "parameters": [
           {
             "name": "rebateId",
@@ -734,9 +734,9 @@
         "tags": []
       }
     },
-    "/api/delete-formio-2022-prf-submission": {
+    "/api/formio/2022/delete-prf-submission": {
       "post": {
-        "summary": "/api/delete-formio-2022-prf-submission",
+        "summary": "/api/formio/2022/delete-prf-submission",
         "responses": {
           "200": {
             "description": "OK",
@@ -753,9 +753,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-2022-crf-submissions": {
+    "/api/formio/2022/crf-submissions": {
       "get": {
-        "summary": "/api/formio-2022-crf-submissions",
+        "summary": "/api/formio/2022/crf-submissions",
         "responses": {
           "200": {
             "description": "OK",
@@ -775,9 +775,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-2022-crf-submission": {
+    "/api/formio/2022/crf-submission": {
       "post": {
-        "summary": "/api/formio-2022-crf-submission",
+        "summary": "/api/formio/2022/crf-submission",
         "responses": {
           "200": {
             "description": "OK",
@@ -797,9 +797,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/formio-2022-crf-submission/{rebateId}": {
+    "/api/formio/2022/crf-submission/{rebateId}": {
       "get": {
-        "summary": "/api/formio-2022-crf-submission/{rebateId}",
+        "summary": "/api/formio/2022/crf-submission/{rebateId}",
         "parameters": [
           {
             "name": "rebateId",
@@ -847,7 +847,7 @@
         "tags": []
       },
       "post": {
-        "summary": "/api/formio-2022-crf-submission/{rebateId}",
+        "summary": "/api/formio/2022/crf-submission/{rebateId}",
         "parameters": [
           {
             "name": "rebateId",

From 2361e887e19d4f30637f5a20616251a9791f35bd Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 10:45:01 -0400
Subject: [PATCH 33/71] Update formio s3 endpoint to reflect /api/formio/2022
 api path prefix

---
 app/client/src/routes/applicationForm.tsx    |  2 +-
 app/client/src/routes/closeOutForm.tsx       |  2 +-
 app/client/src/routes/paymentRequestForm.tsx |  2 +-
 app/server/app/routes/formio2022.js          |  8 +++----
 docs/csb-openapi.json                        | 22 +++-----------------
 5 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/applicationForm.tsx
index dca91d9e..4235dfc2 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/applicationForm.tsx
@@ -65,7 +65,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
          */
         Formio.Providers.providers.storage.s3 = function (formio: any) {
           const s3Formio = cloneDeep(formio);
-          s3Formio.formUrl = `${serverUrl}/api/s3/2022/frf/${mongoId}/${comboKey}`;
+          s3Formio.formUrl = `${serverUrl}/api/formio/2022/s3/frf/${mongoId}/${comboKey}`;
           return s3(s3Formio);
         };
 
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/closeOutForm.tsx
index 624e69f5..ce13736d 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/closeOutForm.tsx
@@ -65,7 +65,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
          */
         Formio.Providers.providers.storage.s3 = function (formio: any) {
           const s3Formio = cloneDeep(formio);
-          s3Formio.formUrl = `${serverUrl}/api/s3/2022/crf/${mongoId}/${comboKey}`;
+          s3Formio.formUrl = `${serverUrl}/api/formio/2022/s3/crf/${mongoId}/${comboKey}`;
           return s3(s3Formio);
         };
 
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/paymentRequestForm.tsx
index acfb07ef..f6bf0a7c 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/paymentRequestForm.tsx
@@ -65,7 +65,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
          */
         Formio.Providers.providers.storage.s3 = function (formio: any) {
           const s3Formio = cloneDeep(formio);
-          s3Formio.formUrl = `${serverUrl}/api/s3/2022/prf/${mongoId}/${comboKey}`;
+          s3Formio.formUrl = `${serverUrl}/api/formio/2022/s3/prf/${mongoId}/${comboKey}`;
           return s3(s3Formio);
         };
 
diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index fab531c3..49f90d90 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -71,7 +71,7 @@ router.use(ensureAuthenticated);
 
 // --- download Formio S3 file metadata
 router.get(
-  "/s3/:rebateYear/:formType/:mongoId/:comboKey/storage/s3",
+  "/s3/:formType/:mongoId/:comboKey/storage/s3",
   storeBapComboKeys,
   (req, res) => {
     const { bapComboKeys, query } = req;
@@ -104,15 +104,15 @@ router.get(
 
 // --- upload Formio S3 file metadata
 router.post(
-  "/s3/:rebateYear/:formType/:mongoId/:comboKey/storage/s3",
+  "/s3/:formType/:mongoId/:comboKey/storage/s3",
   storeBapComboKeys,
   (req, res) => {
     const { bapComboKeys, body } = req;
     const { mail } = req.user;
-    const { rebateYear, formType, mongoId, comboKey } = req.params;
+    const { formType, mongoId, comboKey } = req.params;
 
     checkFormSubmissionPeriodAndBapStatus({
-      rebateYear,
+      rebateYear: "2022",
       formType,
       mongoId,
       comboKey,
diff --git a/docs/csb-openapi.json b/docs/csb-openapi.json
index 14c99178..f6ab2ed4 100644
--- a/docs/csb-openapi.json
+++ b/docs/csb-openapi.json
@@ -402,9 +402,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/s3/{rebateYear}/{formType}/{mongoId}/{comboKey}/storage/s3": {
+    "/api/formio/2022/s3/{formType}/{mongoId}/{comboKey}/storage/s3": {
       "get": {
-        "summary": "/api/s3/{rebateYear}/{formType}/{mongoId}/{comboKey}/storage/s3",
+        "summary": "/api/formio/2022/s3/{formType}/{mongoId}/{comboKey}/storage/s3",
         "responses": {
           "200": {
             "description": "OK"
@@ -412,14 +412,6 @@
         },
         "tags": [],
         "parameters": [
-          {
-            "name": "rebateYear",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
           {
             "name": "formType",
             "in": "path",
@@ -448,7 +440,7 @@
         ]
       },
       "post": {
-        "summary": "/api/s3/{rebateYear}/{formType}/{mongoId}/{comboKey}/storage/s3",
+        "summary": "/api/formio/2022/s3/{formType}/{mongoId}/{comboKey}/storage/s3",
         "responses": {
           "200": {
             "description": "OK"
@@ -456,14 +448,6 @@
         },
         "tags": [],
         "parameters": [
-          {
-            "name": "rebateYear",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
           {
             "name": "formType",
             "in": "path",

From fb3e1d5c0c3f90c0ddc7cb026887b6ea9c9e753c Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 10:48:01 -0400
Subject: [PATCH 34/71] Move content api route into its own file

---
 app/server/app/routes/api.js     | 77 -----------------------------
 app/server/app/routes/content.js | 84 ++++++++++++++++++++++++++++++++
 app/server/app/routes/index.js   |  1 +
 3 files changed, 85 insertions(+), 77 deletions(-)
 create mode 100644 app/server/app/routes/content.js

diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index d35b4811..8b3d842d 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -1,7 +1,4 @@
-const { resolve } = require("node:path");
-const { readFile } = require("node:fs/promises");
 const express = require("express");
-const axios = require("axios").default || require("axios"); // TODO: https://github.com/axios/axios/issues/5011
 // ---
 const { submissionPeriodOpen } = require("../config/formio");
 const { ensureAuthenticated, storeBapComboKeys } = require("../middleware");
@@ -11,82 +8,8 @@ const {
 } = require("../utilities/bap");
 const log = require("../utilities/logger");
 
-const { NODE_ENV, S3_PUBLIC_BUCKET, S3_PUBLIC_REGION } = process.env;
-
 const router = express.Router();
 
-// --- get static content from S3
-router.get("/content", (req, res) => {
-  /** NOTE: static content files found in `app/server/app/content/` directory. */
-  const filenames = [
-    "site-alert.md",
-    "helpdesk-intro.md",
-    "all-rebates-intro.md",
-    "all-rebates-outro.md",
-    "new-frf-dialog.md",
-    "draft-frf-intro.md",
-    "submitted-frf-intro.md",
-    "draft-prf-intro.md",
-    "submitted-prf-intro.md",
-    "draft-crf-intro.md",
-    "submitted-crf-intro.md",
-  ];
-
-  const s3BucketUrl = `https://${S3_PUBLIC_BUCKET}.s3-${S3_PUBLIC_REGION}.amazonaws.com`;
-
-  Promise.all(
-    filenames.map((filename) => {
-      /**
-       * local development: read files directly from disk
-       * Cloud.gov: fetch files from the public s3 bucket
-       */
-      return NODE_ENV === "development"
-        ? readFile(resolve(__dirname, "../content", filename), "utf8")
-        : axios.get(`${s3BucketUrl}/content/${filename}`);
-    })
-  )
-    .then((stringsOrResponses) => {
-      /**
-       * local development: no further processing of strings needed
-       * Cloud.gov: get data from responses
-       */
-      return NODE_ENV === "development"
-        ? stringsOrResponses
-        : stringsOrResponses.map((axiosRes) => axiosRes.data);
-    })
-    .then((data) => {
-      return res.json({
-        siteAlert: data[0],
-        helpdeskIntro: data[1],
-        allRebatesIntro: data[2],
-        allRebatesOutro: data[3],
-        newFRFDialog: data[4],
-        draftFRFIntro: data[5],
-        submittedFRFIntro: data[6],
-        draftPRFIntro: data[7],
-        submittedPRFIntro: data[8],
-        draftCRFIntro: data[9],
-        submittedCRFIntro: data[10],
-      });
-    })
-    .catch((error) => {
-      if (typeof error.toJSON === "function") {
-        const logMessage = error.toJSON();
-        log({ level: "debug", message: logMessage, req });
-      }
-
-      const errorStatus = error.response?.status || 500;
-      const errorMethod = error.response?.config?.method?.toUpperCase();
-      const errorUrl = error.response?.config?.url;
-
-      const logMessage = `S3 Error: ${errorStatus} ${errorMethod} ${errorUrl}`;
-      log({ level: "error", message: logMessage, req });
-
-      const errorMessage = `Error getting static content from S3 bucket.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    });
-});
-
 router.use(ensureAuthenticated);
 
 // --- get user data from EPA Gateway/Login.gov
diff --git a/app/server/app/routes/content.js b/app/server/app/routes/content.js
new file mode 100644
index 00000000..162492f5
--- /dev/null
+++ b/app/server/app/routes/content.js
@@ -0,0 +1,84 @@
+const { resolve } = require("node:path");
+const { readFile } = require("node:fs/promises");
+const express = require("express");
+const axios = require("axios").default || require("axios"); // TODO: https://github.com/axios/axios/issues/5011
+// ---
+const log = require("../utilities/logger");
+
+const { NODE_ENV, S3_PUBLIC_BUCKET, S3_PUBLIC_REGION } = process.env;
+
+const router = express.Router();
+
+// --- get static content from S3
+router.get("/", (req, res) => {
+  /** NOTE: static content files found in `app/server/app/content/` directory. */
+  const filenames = [
+    "site-alert.md",
+    "helpdesk-intro.md",
+    "all-rebates-intro.md",
+    "all-rebates-outro.md",
+    "new-frf-dialog.md",
+    "draft-frf-intro.md",
+    "submitted-frf-intro.md",
+    "draft-prf-intro.md",
+    "submitted-prf-intro.md",
+    "draft-crf-intro.md",
+    "submitted-crf-intro.md",
+  ];
+
+  const s3BucketUrl = `https://${S3_PUBLIC_BUCKET}.s3-${S3_PUBLIC_REGION}.amazonaws.com`;
+
+  Promise.all(
+    filenames.map((filename) => {
+      /**
+       * local development: read files directly from disk
+       * Cloud.gov: fetch files from the public s3 bucket
+       */
+      return NODE_ENV === "development"
+        ? readFile(resolve(__dirname, "../content", filename), "utf8")
+        : axios.get(`${s3BucketUrl}/content/${filename}`);
+    })
+  )
+    .then((stringsOrResponses) => {
+      /**
+       * local development: no further processing of strings needed
+       * Cloud.gov: get data from responses
+       */
+      return NODE_ENV === "development"
+        ? stringsOrResponses
+        : stringsOrResponses.map((axiosRes) => axiosRes.data);
+    })
+    .then((data) => {
+      return res.json({
+        siteAlert: data[0],
+        helpdeskIntro: data[1],
+        allRebatesIntro: data[2],
+        allRebatesOutro: data[3],
+        newFRFDialog: data[4],
+        draftFRFIntro: data[5],
+        submittedFRFIntro: data[6],
+        draftPRFIntro: data[7],
+        submittedPRFIntro: data[8],
+        draftCRFIntro: data[9],
+        submittedCRFIntro: data[10],
+      });
+    })
+    .catch((error) => {
+      if (typeof error.toJSON === "function") {
+        const logMessage = error.toJSON();
+        log({ level: "debug", message: logMessage, req });
+      }
+
+      const errorStatus = error.response?.status || 500;
+      const errorMethod = error.response?.config?.method?.toUpperCase();
+      const errorUrl = error.response?.config?.url;
+
+      const logMessage = `S3 Error: ${errorStatus} ${errorMethod} ${errorUrl}`;
+      log({ level: "error", message: logMessage, req });
+
+      const errorMessage = `Error getting static content from S3 bucket.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+});
+
+module.exports = router;
diff --git a/app/server/app/routes/index.js b/app/server/app/routes/index.js
index 51fcf50d..d590e14d 100644
--- a/app/server/app/routes/index.js
+++ b/app/server/app/routes/index.js
@@ -4,6 +4,7 @@ const router = express.Router();
 
 router.use("/", require("./auth"));
 router.use("/api", require("./api"));
+router.use("/api/content", require("./content"));
 router.use("/api/formio/2022", require("./formio2022"));
 router.use("/help", require("./help"));
 router.use("/status", require("./status"));

From 83c9a3c102da42bb2ef36274f0c23cb9811e8b84 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 13:08:16 -0400
Subject: [PATCH 35/71] Move user and config api routes into discrete files

---
 app/server/app/routes/api.js    | 12 ------------
 app/server/app/routes/config.js | 15 +++++++++++++++
 app/server/app/routes/index.js  |  4 +++-
 app/server/app/routes/user.js   | 15 +++++++++++++++
 4 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 app/server/app/routes/config.js
 create mode 100644 app/server/app/routes/user.js

diff --git a/app/server/app/routes/api.js b/app/server/app/routes/api.js
index 8b3d842d..4b032a5f 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/api.js
@@ -1,6 +1,5 @@
 const express = require("express");
 // ---
-const { submissionPeriodOpen } = require("../config/formio");
 const { ensureAuthenticated, storeBapComboKeys } = require("../middleware");
 const {
   getSamEntities,
@@ -12,17 +11,6 @@ const router = express.Router();
 
 router.use(ensureAuthenticated);
 
-// --- get user data from EPA Gateway/Login.gov
-router.get("/user", (req, res) => {
-  const { mail, memberof, exp } = req.user;
-  return res.json({ mail, memberof, exp });
-});
-
-// --- get CSB app specific configuration (form open enrollment status, etc.)
-router.get("/config", (req, res) => {
-  return res.json({ submissionPeriodOpen });
-});
-
 // --- get user's SAM.gov data from EPA's Business Automation Platform (BAP)
 router.get("/bap-sam-data", (req, res) => {
   const { mail, memberof } = req.user;
diff --git a/app/server/app/routes/config.js b/app/server/app/routes/config.js
new file mode 100644
index 00000000..aa710ca6
--- /dev/null
+++ b/app/server/app/routes/config.js
@@ -0,0 +1,15 @@
+const express = require("express");
+// ---
+const { submissionPeriodOpen } = require("../config/formio");
+const { ensureAuthenticated } = require("../middleware");
+
+const router = express.Router();
+
+router.use(ensureAuthenticated);
+
+// --- get CSB app specific configuration (form open enrollment status, etc.)
+router.get("/", (req, res) => {
+  return res.json({ submissionPeriodOpen });
+});
+
+module.exports = router;
diff --git a/app/server/app/routes/index.js b/app/server/app/routes/index.js
index d590e14d..49a05a8c 100644
--- a/app/server/app/routes/index.js
+++ b/app/server/app/routes/index.js
@@ -3,8 +3,10 @@ const express = require("express");
 const router = express.Router();
 
 router.use("/", require("./auth"));
-router.use("/api", require("./api"));
 router.use("/api/content", require("./content"));
+router.use("/api/user", require("./user"));
+router.use("/api/config", require("./config"));
+router.use("/api", require("./api"));
 router.use("/api/formio/2022", require("./formio2022"));
 router.use("/help", require("./help"));
 router.use("/status", require("./status"));
diff --git a/app/server/app/routes/user.js b/app/server/app/routes/user.js
new file mode 100644
index 00000000..561ad247
--- /dev/null
+++ b/app/server/app/routes/user.js
@@ -0,0 +1,15 @@
+const express = require("express");
+// ---
+const { ensureAuthenticated } = require("../middleware");
+
+const router = express.Router();
+
+router.use(ensureAuthenticated);
+
+// --- get user data from EPA Gateway/Login.gov
+router.get("/", (req, res) => {
+  const { mail, memberof, exp } = req.user;
+  return res.json({ mail, memberof, exp });
+});
+
+module.exports = router;

From e8f357f7b869b53fa2072644740ceb45707fbcac Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 13:39:57 -0400
Subject: [PATCH 36/71] Move bap api into discrete file and update bap api
 endpoints

---
 app/client/src/utilities.tsx             | 12 ++++++------
 app/server/app/routes/{api.js => bap.js} |  4 ++--
 app/server/app/routes/index.js           |  2 +-
 docs/csb-openapi.json                    |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename app/server/app/routes/{api.js => bap.js} (94%)

diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index c65ba7bf..5e333dfa 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -272,8 +272,8 @@ export function useConfigData() {
 /** Custom hook to fetch BAP SAM.gov data */
 export function useBapSamQuery() {
   return useQuery({
-    queryKey: ["bap-sam-data"],
-    queryFn: () => getData<BapSamData>(`${serverUrl}/api/bap-sam-data`),
+    queryKey: ["bap/sam"],
+    queryFn: () => getData<BapSamData>(`${serverUrl}/api/bap/sam`),
     onSuccess: (res) => {
       if (!res.results) {
         window.location.href = `${serverUrlForHrefs}/logout?RelayState=/welcome?info=bap-sam-results`;
@@ -289,7 +289,7 @@ export function useBapSamQuery() {
 /** Custom hook that returns cached fetched BAP SAM.gov data */
 export function useBapSamData() {
   const queryClient = useQueryClient();
-  return queryClient.getQueryData<BapSamData>(["bap-sam-data"]);
+  return queryClient.getQueryData<BapSamData>(["bap/sam"]);
 }
 
 /** Custom hook to fetch submissions from the BAP and Formio */
@@ -297,9 +297,9 @@ export function useSubmissionsQueries() {
   return useQueries({
     queries: [
       {
-        queryKey: ["bap-form-submissions"],
+        queryKey: ["bap/submissions"],
         queryFn: () => {
-          const url = `${serverUrl}/api/bap-form-submissions`;
+          const url = `${serverUrl}/api/bap/submissions`;
           return getData<BapFormSubmission[]>(url).then((res) => {
             const submissions = res.reduce(
               (object, submission) => {
@@ -368,7 +368,7 @@ function useCombinedRebates() {
     frfs: BapFormSubmission[];
     prfs: BapFormSubmission[];
     crfs: BapFormSubmission[];
-  }>(["bap-form-submissions"]);
+  }>(["bap/submissions"]);
 
   const formioFRFSubmissions = queryClient.getQueryData<FormioFRFSubmission[]>([
     "formio/2022/frf-submissions",
diff --git a/app/server/app/routes/api.js b/app/server/app/routes/bap.js
similarity index 94%
rename from app/server/app/routes/api.js
rename to app/server/app/routes/bap.js
index 4b032a5f..44c41bdf 100644
--- a/app/server/app/routes/api.js
+++ b/app/server/app/routes/bap.js
@@ -12,7 +12,7 @@ const router = express.Router();
 router.use(ensureAuthenticated);
 
 // --- get user's SAM.gov data from EPA's Business Automation Platform (BAP)
-router.get("/bap-sam-data", (req, res) => {
+router.get("/sam", (req, res) => {
   const { mail, memberof } = req.user;
   const userRoles = memberof.split(",");
   const adminOrHelpdeskUser =
@@ -50,7 +50,7 @@ router.get("/bap-sam-data", (req, res) => {
 });
 
 // --- get user's form submissions statuses from EPA's BAP
-router.get("/bap-form-submissions", storeBapComboKeys, (req, res) => {
+router.get("/submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
   return getBapFormSubmissionsStatuses(req, bapComboKeys)
diff --git a/app/server/app/routes/index.js b/app/server/app/routes/index.js
index 49a05a8c..0df21e56 100644
--- a/app/server/app/routes/index.js
+++ b/app/server/app/routes/index.js
@@ -6,7 +6,7 @@ router.use("/", require("./auth"));
 router.use("/api/content", require("./content"));
 router.use("/api/user", require("./user"));
 router.use("/api/config", require("./config"));
-router.use("/api", require("./api"));
+router.use("/api/bap", require("./bap"));
 router.use("/api/formio/2022", require("./formio2022"));
 router.use("/help", require("./help"));
 router.use("/status", require("./status"));
diff --git a/docs/csb-openapi.json b/docs/csb-openapi.json
index f6ab2ed4..4c8c0c6c 100644
--- a/docs/csb-openapi.json
+++ b/docs/csb-openapi.json
@@ -349,9 +349,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/bap-sam-data": {
+    "/api/bap/sam": {
       "get": {
-        "summary": "/api/bap-sam-data",
+        "summary": "/api/bap/sam",
         "responses": {
           "200": {
             "description": "OK",
@@ -380,9 +380,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/api/bap-form-submissions": {
+    "/api/bap/submissions": {
       "get": {
-        "summary": "/api/bap-form-submissions",
+        "summary": "/api/bap/submissions",
         "responses": {
           "200": {
             "description": "OK",

From 3c6582b60f756722ec68f3740bf071205545d6e9 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 14:18:00 -0400
Subject: [PATCH 37/71] Update helpdesk api endpoint

---
 app/client/src/routes/helpdesk.tsx | 2 +-
 app/server/app/routes/help.js      | 2 +-
 app/server/app/routes/index.js     | 2 +-
 docs/csb-openapi.json              | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/client/src/routes/helpdesk.tsx b/app/client/src/routes/helpdesk.tsx
index 5982fe9f..dbc7b16a 100644
--- a/app/client/src/routes/helpdesk.tsx
+++ b/app/client/src/routes/helpdesk.tsx
@@ -95,7 +95,7 @@ export function Helpdesk() {
     queryClient.resetQueries({ queryKey: ["helpdesk"] });
   }, [queryClient]);
 
-  const url = `${serverUrl}/help/formio-submission/${formType}/${searchText}`;
+  const url = `${serverUrl}/api/help/formio/submission/${formType}/${searchText}`;
 
   const query = useQuery({
     queryKey: ["helpdesk"],
diff --git a/app/server/app/routes/help.js b/app/server/app/routes/help.js
index 3310975c..7737f5bd 100644
--- a/app/server/app/routes/help.js
+++ b/app/server/app/routes/help.js
@@ -17,7 +17,7 @@ router.use(ensureAuthenticated);
 router.use(ensureHelpdesk);
 
 // --- get an existing form's submission data from Formio
-router.get("/formio-submission/:formType/:id", (req, res) => {
+router.get("/formio/submission/:formType/:id", (req, res) => {
   const { formType, id } = req.params;
 
   const rebateId = id.length === 6 ? id : null;
diff --git a/app/server/app/routes/index.js b/app/server/app/routes/index.js
index 0df21e56..fe2b5c70 100644
--- a/app/server/app/routes/index.js
+++ b/app/server/app/routes/index.js
@@ -8,7 +8,7 @@ router.use("/api/user", require("./user"));
 router.use("/api/config", require("./config"));
 router.use("/api/bap", require("./bap"));
 router.use("/api/formio/2022", require("./formio2022"));
-router.use("/help", require("./help"));
+router.use("/api/help", require("./help"));
 router.use("/status", require("./status"));
 
 module.exports = router;
diff --git a/docs/csb-openapi.json b/docs/csb-openapi.json
index 4c8c0c6c..ed4eba42 100644
--- a/docs/csb-openapi.json
+++ b/docs/csb-openapi.json
@@ -166,9 +166,9 @@
         "parameters": [{ "$ref": "#/components/parameters/scan" }]
       }
     },
-    "/help/formio-submission/{formType}/{id}": {
+    "/api/help/formio/submission/{formType}/{id}": {
       "get": {
-        "summary": "/help/formio-submission/{formType}/{id}",
+        "summary": "/api/help/formio/submission/{formType}/{id}",
         "parameters": [
           {
             "name": "formType",

From 4aac351ff3ff17f907e4ee6520cbca9d51aa0698 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 15:28:30 -0400
Subject: [PATCH 38/71] Rename client route components with new form
 abbreviations

---
 app/client/src/components/app.tsx             | 20 +++++++++----------
 app/client/src/components/userDashboard.tsx   |  4 ++--
 .../src/routes/{closeOutForm.tsx => crf.tsx}  |  6 +++---
 .../routes/{applicationForm.tsx => frf.tsx}   |  6 +++---
 .../{newApplicationForm.tsx => newFRF.tsx}    |  2 +-
 .../{paymentRequestForm.tsx => prf.tsx}       |  6 +++---
 .../{allRebates.tsx => submissions.tsx}       |  2 +-
 7 files changed, 23 insertions(+), 23 deletions(-)
 rename app/client/src/routes/{closeOutForm.tsx => crf.tsx} (99%)
 rename app/client/src/routes/{applicationForm.tsx => frf.tsx} (99%)
 rename app/client/src/routes/{newApplicationForm.tsx => newFRF.tsx} (99%)
 rename app/client/src/routes/{paymentRequestForm.tsx => prf.tsx} (99%)
 rename app/client/src/routes/{allRebates.tsx => submissions.tsx} (99%)

diff --git a/app/client/src/components/app.tsx b/app/client/src/components/app.tsx
index 043eefc5..9e135051 100644
--- a/app/client/src/components/app.tsx
+++ b/app/client/src/components/app.tsx
@@ -38,11 +38,11 @@ import { UserDashboard } from "components/userDashboard";
 import { ConfirmationDialog } from "components/confirmationDialog";
 import { Notifications } from "components/notifications";
 import { Helpdesk } from "routes/helpdesk";
-import { AllRebates } from "routes/allRebates";
-import { NewApplicationForm } from "routes/newApplicationForm";
-import { ApplicationForm } from "routes/applicationForm";
-import { PaymentRequestForm } from "routes/paymentRequestForm";
-import { CloseOutForm } from "routes/closeOutForm";
+import { Submissions } from "routes/submissions";
+import { NewFRF } from "routes/newFRF";
+import { FRF } from "routes/frf";
+import { PRF } from "routes/prf";
+import { CRF } from "routes/crf";
 import { useDialogState, useDialogActions } from "contexts/dialog";
 
 /** Custom hook to display a site-wide alert banner */
@@ -238,12 +238,12 @@ export function App() {
     <Route errorElement={<Message type="error" text={messages.genericError} />}>
       <Route path="/welcome" element={<Welcome />} />
       <Route path="/" element={<ProtectedRoute />}>
-        <Route index element={<AllRebates />} />
+        <Route index element={<Submissions />} />
         <Route path="helpdesk" element={<Helpdesk />} />
-        <Route path="rebate/new" element={<NewApplicationForm />} />
-        <Route path="rebate/:id" element={<ApplicationForm />} />
-        <Route path="payment-request/:id" element={<PaymentRequestForm />} />
-        <Route path="close-out/:id" element={<CloseOutForm />} />
+        <Route path="rebate/new" element={<NewFRF />} />
+        <Route path="rebate/:id" element={<FRF />} />
+        <Route path="payment-request/:id" element={<PRF />} />
+        <Route path="close-out/:id" element={<CRF />} />
         <Route path="*" element={<Navigate to="/" replace />} />
       </Route>
     </Route>
diff --git a/app/client/src/components/userDashboard.tsx b/app/client/src/components/userDashboard.tsx
index 873715e8..ed116fe0 100644
--- a/app/client/src/components/userDashboard.tsx
+++ b/app/client/src/components/userDashboard.tsx
@@ -62,7 +62,7 @@ export function UserDashboard(props: { email: string }) {
   const { displayDialog } = useDialogActions();
   const helpdeskAccess = useHelpdeskAccess();
 
-  const onAllRebatesPage = pathname === "/";
+  const onSubmissionsPage = pathname === "/";
   const onHelpdeskPage = pathname === "/helpdesk";
 
   const onApplicationFormPage = pathname.startsWith("/rebate");
@@ -123,7 +123,7 @@ export function UserDashboard(props: { email: string }) {
       <div className="flex-justify border-bottom tablet:display-flex ">
         <nav className="flex-align-center mobile-lg:display-flex">
           <div className="margin-bottom-1 mobile-lg:margin-right-1">
-            {onAllRebatesPage ? (
+            {onSubmissionsPage ? (
               <button className={btnClassNames} disabled>
                 <DashboardIconText />
               </button>
diff --git a/app/client/src/routes/closeOutForm.tsx b/app/client/src/routes/crf.tsx
similarity index 99%
rename from app/client/src/routes/closeOutForm.tsx
rename to app/client/src/routes/crf.tsx
index ce13736d..57064a86 100644
--- a/app/client/src/routes/closeOutForm.tsx
+++ b/app/client/src/routes/crf.tsx
@@ -101,15 +101,15 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
   return { query, mutation };
 }
 
-export function CloseOutForm() {
+export function CRF() {
   const { email } = useOutletContext<{ email: string }>();
   /* ensure user verification (JWT refresh) doesn't cause form to re-render */
   return useMemo(() => {
-    return <UserCloseOutForm email={email} />;
+    return <CloseOutRequestForm email={email} />;
   }, [email]);
 }
 
-function UserCloseOutForm(props: { email: string }) {
+function CloseOutRequestForm(props: { email: string }) {
   const { email } = props;
 
   const navigate = useNavigate();
diff --git a/app/client/src/routes/applicationForm.tsx b/app/client/src/routes/frf.tsx
similarity index 99%
rename from app/client/src/routes/applicationForm.tsx
rename to app/client/src/routes/frf.tsx
index 4235dfc2..acc0f019 100644
--- a/app/client/src/routes/applicationForm.tsx
+++ b/app/client/src/routes/frf.tsx
@@ -106,15 +106,15 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
   return { query, mutation };
 }
 
-export function ApplicationForm() {
+export function FRF() {
   const { email } = useOutletContext<{ email: string }>();
   /* ensure user verification (JWT refresh) doesn't cause form to re-render */
   return useMemo(() => {
-    return <UserApplicationForm email={email} />;
+    return <FundingRequestForm email={email} />;
   }, [email]);
 }
 
-function UserApplicationForm(props: { email: string }) {
+function FundingRequestForm(props: { email: string }) {
   const { email } = props;
 
   const navigate = useNavigate();
diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/newFRF.tsx
similarity index 99%
rename from app/client/src/routes/newApplicationForm.tsx
rename to app/client/src/routes/newFRF.tsx
index 4b0ffb71..e74b5b8d 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/newFRF.tsx
@@ -19,7 +19,7 @@ import { MarkdownContent } from "components/markdownContent";
 import { TextWithTooltip } from "components/tooltip";
 import { useRebateYearState } from "contexts/rebateYear";
 
-export function NewApplicationForm() {
+export function NewFRF() {
   const navigate = useNavigate();
   const { email } = useOutletContext<{ email: string }>();
 
diff --git a/app/client/src/routes/paymentRequestForm.tsx b/app/client/src/routes/prf.tsx
similarity index 99%
rename from app/client/src/routes/paymentRequestForm.tsx
rename to app/client/src/routes/prf.tsx
index f6bf0a7c..649d72d3 100644
--- a/app/client/src/routes/paymentRequestForm.tsx
+++ b/app/client/src/routes/prf.tsx
@@ -101,15 +101,15 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
   return { query, mutation };
 }
 
-export function PaymentRequestForm() {
+export function PRF() {
   const { email } = useOutletContext<{ email: string }>();
   /* ensure user verification (JWT refresh) doesn't cause form to re-render */
   return useMemo(() => {
-    return <UserPaymentRequestForm email={email} />;
+    return <PaymentRequestForm email={email} />;
   }, [email]);
 }
 
-function UserPaymentRequestForm(props: { email: string }) {
+function PaymentRequestForm(props: { email: string }) {
   const { email } = props;
 
   const navigate = useNavigate();
diff --git a/app/client/src/routes/allRebates.tsx b/app/client/src/routes/submissions.tsx
similarity index 99%
rename from app/client/src/routes/allRebates.tsx
rename to app/client/src/routes/submissions.tsx
index 7ee3c8f3..cd71c1d7 100644
--- a/app/client/src/routes/allRebates.tsx
+++ b/app/client/src/routes/submissions.tsx
@@ -770,7 +770,7 @@ function NewApplicationIconText() {
   );
 }
 
-export function AllRebates() {
+export function Submissions() {
   const content = useContentData();
   const configData = useConfigData();
   const bapSamData = useBapSamData();

From 923ba938da4110e8be9ae1204892228c27f4b7bf Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 16:57:48 -0400
Subject: [PATCH 39/71] Update routes to 2022 form pages and add redirects from
 out urls to new ones

---
 app/client/src/components/app.tsx | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/client/src/components/app.tsx b/app/client/src/components/app.tsx
index 9e135051..f56a28c1 100644
--- a/app/client/src/components/app.tsx
+++ b/app/client/src/components/app.tsx
@@ -3,6 +3,7 @@ import { render } from "react-dom";
 import {
   createBrowserRouter,
   createRoutesFromElements,
+  redirect,
   Navigate,
   Route,
   RouterProvider,
@@ -240,10 +241,27 @@ export function App() {
       <Route path="/" element={<ProtectedRoute />}>
         <Route index element={<Submissions />} />
         <Route path="helpdesk" element={<Helpdesk />} />
-        <Route path="rebate/new" element={<NewFRF />} />
-        <Route path="rebate/:id" element={<FRF />} />
-        <Route path="payment-request/:id" element={<PRF />} />
-        <Route path="close-out/:id" element={<CRF />} />
+        {/* Redirect pre-v4 routes to use post-v4 routes */}
+        <Route
+          path="rebate/new"
+          loader={({ params }) => redirect(`/frf/new`)}
+        />
+        <Route
+          path="rebate/:id"
+          loader={({ params }) => redirect(`/frf/2022/${params.id}`)}
+        />
+        <Route
+          path="payment-request/:id"
+          loader={({ params }) => redirect(`/prf/2022/${params.id}`)}
+        />
+        <Route
+          path="close-out/:id"
+          loader={({ params }) => redirect(`/crf/2022/${params.id}`)}
+        />
+        <Route path="frf/new" element={<NewFRF />} />
+        <Route path="frf/2022/:id" element={<FRF />} />
+        <Route path="prf/2022/:id" element={<PRF />} />
+        <Route path="crf/2022/:id" element={<CRF />} />
         <Route path="*" element={<Navigate to="/" replace />} />
       </Route>
     </Route>

From 552b60eb6a4329f8c8519ae5cb20ca9976e08f66 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 17:12:05 -0400
Subject: [PATCH 40/71] Update form components to include 2022 in filename and
 component name

---
 app/client/src/components/app.tsx                | 16 ++++++++--------
 app/client/src/routes/{crf.tsx => crf2022.tsx}   |  2 +-
 app/client/src/routes/{frf.tsx => frf2022.tsx}   |  2 +-
 app/client/src/routes/{newFRF.tsx => frfNew.tsx} |  2 +-
 app/client/src/routes/{prf.tsx => prf2022.tsx}   |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename app/client/src/routes/{crf.tsx => crf2022.tsx} (99%)
 rename app/client/src/routes/{frf.tsx => frf2022.tsx} (99%)
 rename app/client/src/routes/{newFRF.tsx => frfNew.tsx} (99%)
 rename app/client/src/routes/{prf.tsx => prf2022.tsx} (99%)

diff --git a/app/client/src/components/app.tsx b/app/client/src/components/app.tsx
index f56a28c1..a2e645ce 100644
--- a/app/client/src/components/app.tsx
+++ b/app/client/src/components/app.tsx
@@ -40,10 +40,10 @@ import { ConfirmationDialog } from "components/confirmationDialog";
 import { Notifications } from "components/notifications";
 import { Helpdesk } from "routes/helpdesk";
 import { Submissions } from "routes/submissions";
-import { NewFRF } from "routes/newFRF";
-import { FRF } from "routes/frf";
-import { PRF } from "routes/prf";
-import { CRF } from "routes/crf";
+import { FRFNew } from "routes/frfNew";
+import { FRF2022 } from "routes/frf2022";
+import { PRF2022 } from "routes/prf2022";
+import { CRF2022 } from "routes/crf2022";
 import { useDialogState, useDialogActions } from "contexts/dialog";
 
 /** Custom hook to display a site-wide alert banner */
@@ -258,10 +258,10 @@ export function App() {
           path="close-out/:id"
           loader={({ params }) => redirect(`/crf/2022/${params.id}`)}
         />
-        <Route path="frf/new" element={<NewFRF />} />
-        <Route path="frf/2022/:id" element={<FRF />} />
-        <Route path="prf/2022/:id" element={<PRF />} />
-        <Route path="crf/2022/:id" element={<CRF />} />
+        <Route path="frf/new" element={<FRFNew />} />
+        <Route path="frf/2022/:id" element={<FRF2022 />} />
+        <Route path="prf/2022/:id" element={<PRF2022 />} />
+        <Route path="crf/2022/:id" element={<CRF2022 />} />
         <Route path="*" element={<Navigate to="/" replace />} />
       </Route>
     </Route>
diff --git a/app/client/src/routes/crf.tsx b/app/client/src/routes/crf2022.tsx
similarity index 99%
rename from app/client/src/routes/crf.tsx
rename to app/client/src/routes/crf2022.tsx
index 57064a86..a5f38225 100644
--- a/app/client/src/routes/crf.tsx
+++ b/app/client/src/routes/crf2022.tsx
@@ -101,7 +101,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
   return { query, mutation };
 }
 
-export function CRF() {
+export function CRF2022() {
   const { email } = useOutletContext<{ email: string }>();
   /* ensure user verification (JWT refresh) doesn't cause form to re-render */
   return useMemo(() => {
diff --git a/app/client/src/routes/frf.tsx b/app/client/src/routes/frf2022.tsx
similarity index 99%
rename from app/client/src/routes/frf.tsx
rename to app/client/src/routes/frf2022.tsx
index acc0f019..62dd5c8c 100644
--- a/app/client/src/routes/frf.tsx
+++ b/app/client/src/routes/frf2022.tsx
@@ -106,7 +106,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
   return { query, mutation };
 }
 
-export function FRF() {
+export function FRF2022() {
   const { email } = useOutletContext<{ email: string }>();
   /* ensure user verification (JWT refresh) doesn't cause form to re-render */
   return useMemo(() => {
diff --git a/app/client/src/routes/newFRF.tsx b/app/client/src/routes/frfNew.tsx
similarity index 99%
rename from app/client/src/routes/newFRF.tsx
rename to app/client/src/routes/frfNew.tsx
index e74b5b8d..7d1cc7a7 100644
--- a/app/client/src/routes/newFRF.tsx
+++ b/app/client/src/routes/frfNew.tsx
@@ -19,7 +19,7 @@ import { MarkdownContent } from "components/markdownContent";
 import { TextWithTooltip } from "components/tooltip";
 import { useRebateYearState } from "contexts/rebateYear";
 
-export function NewFRF() {
+export function FRFNew() {
   const navigate = useNavigate();
   const { email } = useOutletContext<{ email: string }>();
 
diff --git a/app/client/src/routes/prf.tsx b/app/client/src/routes/prf2022.tsx
similarity index 99%
rename from app/client/src/routes/prf.tsx
rename to app/client/src/routes/prf2022.tsx
index 649d72d3..7a319202 100644
--- a/app/client/src/routes/prf.tsx
+++ b/app/client/src/routes/prf2022.tsx
@@ -101,7 +101,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
   return { query, mutation };
 }
 
-export function PRF() {
+export function PRF2022() {
   const { email } = useOutletContext<{ email: string }>();
   /* ensure user verification (JWT refresh) doesn't cause form to re-render */
   return useMemo(() => {

From 12eb9e3fc0a8666cadd94003168436852341a0ce Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 17:16:11 -0400
Subject: [PATCH 41/71] Update urls navigated to in 2022 components to use new
 urls

---
 app/client/src/routes/frf2022.tsx     | 2 +-
 app/client/src/routes/frfNew.tsx      | 2 +-
 app/client/src/routes/submissions.tsx | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/client/src/routes/frf2022.tsx b/app/client/src/routes/frf2022.tsx
index 62dd5c8c..3abbbfdb 100644
--- a/app/client/src/routes/frf2022.tsx
+++ b/app/client/src/routes/frf2022.tsx
@@ -308,7 +308,7 @@ function FundingRequestForm(props: { email: string }) {
             });
           });
       },
-      dismissedAction: () => navigate(`/payment-request/${rebate.rebateId}`),
+      dismissedAction: () => navigate(`/prf/2022/${rebate.rebateId}`),
     });
 
     return null;
diff --git a/app/client/src/routes/frfNew.tsx b/app/client/src/routes/frfNew.tsx
index 7d1cc7a7..d08f88ee 100644
--- a/app/client/src/routes/frfNew.tsx
+++ b/app/client/src/routes/frfNew.tsx
@@ -218,7 +218,7 @@ export function FRFNew() {
                                           }
                                         )
                                           .then((res) => {
-                                            navigate(`/rebate/${res._id}`);
+                                            navigate(`/frf/2022/${res._id}`);
                                           })
                                           .catch((err) => {
                                             setErrorMessage({
diff --git a/app/client/src/routes/submissions.tsx b/app/client/src/routes/submissions.tsx
index cd71c1d7..18fa8b24 100644
--- a/app/client/src/routes/submissions.tsx
+++ b/app/client/src/routes/submissions.tsx
@@ -364,7 +364,7 @@ function PRFSubmission(props: { rebate: Rebate }) {
                 frfFormModified: frf.bap.modified,
               })
                 .then((res) => {
-                  navigate(`/payment-request/${frf.bap?.rebateId}`);
+                  navigate(`/prf/2022/${frf.bap?.rebateId}`);
                 })
                 .catch((err) => {
                   displayErrorNotification({
@@ -598,7 +598,7 @@ function CRFSubmission(props: { rebate: Rebate }) {
                 prfModified: prf.bap.modified,
               })
                 .then((res) => {
-                  navigate(`/close-out/${prf.bap?.rebateId}`);
+                  navigate(`/crf/2022/${prf.bap?.rebateId}`);
                 })
                 .catch((err) => {
                   displayErrorNotification({

From e406fe1480ddfd787bbdcf59ad95b373ae11eec2 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 17:24:43 -0400
Subject: [PATCH 42/71] Add initial FRF 2023 component

---
 app/client/src/components/app.tsx |  8 ++++++++
 app/client/src/routes/frf2023.tsx | 23 +++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 app/client/src/routes/frf2023.tsx

diff --git a/app/client/src/components/app.tsx b/app/client/src/components/app.tsx
index a2e645ce..1884abcc 100644
--- a/app/client/src/components/app.tsx
+++ b/app/client/src/components/app.tsx
@@ -44,6 +44,7 @@ import { FRFNew } from "routes/frfNew";
 import { FRF2022 } from "routes/frf2022";
 import { PRF2022 } from "routes/prf2022";
 import { CRF2022 } from "routes/crf2022";
+import { FRF2023 } from "routes/frf2023";
 import { useDialogState, useDialogActions } from "contexts/dialog";
 
 /** Custom hook to display a site-wide alert banner */
@@ -240,7 +241,9 @@ export function App() {
       <Route path="/welcome" element={<Welcome />} />
       <Route path="/" element={<ProtectedRoute />}>
         <Route index element={<Submissions />} />
+
         <Route path="helpdesk" element={<Helpdesk />} />
+
         {/* Redirect pre-v4 routes to use post-v4 routes */}
         <Route
           path="rebate/new"
@@ -258,10 +261,15 @@ export function App() {
           path="close-out/:id"
           loader={({ params }) => redirect(`/crf/2022/${params.id}`)}
         />
+
         <Route path="frf/new" element={<FRFNew />} />
+
         <Route path="frf/2022/:id" element={<FRF2022 />} />
         <Route path="prf/2022/:id" element={<PRF2022 />} />
         <Route path="crf/2022/:id" element={<CRF2022 />} />
+
+        <Route path="frf/2023/:id" element={<FRF2023 />} />
+
         <Route path="*" element={<Navigate to="/" replace />} />
       </Route>
     </Route>
diff --git a/app/client/src/routes/frf2023.tsx b/app/client/src/routes/frf2023.tsx
new file mode 100644
index 00000000..c8bfdf4f
--- /dev/null
+++ b/app/client/src/routes/frf2023.tsx
@@ -0,0 +1,23 @@
+import { useMemo } from "react";
+import { useNavigate, useOutletContext, useParams } from "react-router-dom";
+
+export function FRF2023() {
+  const { email } = useOutletContext<{ email: string }>();
+  /* ensure user verification (JWT refresh) doesn't cause form to re-render */
+  return useMemo(() => {
+    return <FundingRequestForm email={email} />;
+  }, [email]);
+}
+
+function FundingRequestForm(props: { email: string }) {
+  const { email } = props;
+
+  const navigate = useNavigate();
+  const { id: mongoId } = useParams<"id">(); // MongoDB ObjectId string
+
+  return (
+    <>
+      <p>(Placeholder for 2023 Funding Request form)</p>
+    </>
+  );
+}

From a9fce584c88245dda894698c215f79880929e68c Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 18:40:27 -0400
Subject: [PATCH 43/71] Move checkFormSubmissionPeriodAndBapStatus() out of
 formio2022.js file and into bap.js utility file

---
 app/server/app/routes/formio2022.js | 45 +--------------------------
 app/server/app/utilities/bap.js     | 47 +++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index 49f90d90..ee1bdd07 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -18,53 +18,10 @@ const {
   getBapFormSubmissionsStatuses,
   getBapDataForPRF,
   getBapDataForCRF,
+  checkFormSubmissionPeriodAndBapStatus,
 } = require("../utilities/bap");
 const log = require("../utilities/logger");
 
-/**
- * Returns a resolved or rejected promise, depending on if the given form's
- * submission period is open (as set via environment variables), and if the form
- * submission has the status of "Edits Requested" or not (as stored in and
- * returned from the BAP).
- *
- * @param {Object} param
- * @param {'2022' | '2023'} param.rebateYear
- * @param {'frf' | 'prf' | 'crf'} param.formType
- * @param {string} param.mongoId
- * @param {string} param.comboKey
- * @param {express.Request} param.req
- */
-function checkFormSubmissionPeriodAndBapStatus({
-  rebateYear,
-  formType,
-  mongoId,
-  comboKey,
-  req,
-}) {
-  /** Form submission period is open, so continue. */
-  if (submissionPeriodOpen[rebateYear][formType]) {
-    return Promise.resolve();
-  }
-
-  /** Form submission period is closed, so only continue if edits are requested. */
-  return getBapFormSubmissionsStatuses(req, [comboKey]).then((submissions) => {
-    const submission = submissions.find((s) => s.CSB_Form_ID__c === mongoId);
-
-    const statusField =
-      formType === "frf"
-        ? "CSB_Funding_Request_Status__c"
-        : formType === "prf"
-        ? "CSB_Payment_Request_Status__c"
-        : formType === "crf"
-        ? "CSB_Closeout_Request_Status__c"
-        : null;
-
-    return submission?.Parent_CSB_Rebate__r?.[statusField] === "Edits Requested"
-      ? Promise.resolve()
-      : Promise.reject();
-  });
-}
-
 const router = express.Router();
 
 router.use(ensureAuthenticated);
diff --git a/app/server/app/utilities/bap.js b/app/server/app/utilities/bap.js
index 7ac32657..24c12f5f 100644
--- a/app/server/app/utilities/bap.js
+++ b/app/server/app/utilities/bap.js
@@ -3,6 +3,8 @@
 const jsforce = require("jsforce");
 const express = require("express");
 const log = require("../utilities/logger");
+// ---
+const { submissionPeriodOpen } = require("../config/formio");
 
 /**
  * @typedef {Object} BapSamEntity
@@ -1070,6 +1072,50 @@ function getBapDataForCRF(req, frfReviewItemId, prfReviewItemId) {
   });
 }
 
+/**
+ * Returns a resolved or rejected promise, depending on if the given form's
+ * submission period is open (as set via environment variables), and if the form
+ * submission has the status of "Edits Requested" or not (as stored in and
+ * returned from the BAP).
+ *
+ * @param {Object} param
+ * @param {'2022' | '2023'} param.rebateYear
+ * @param {'frf' | 'prf' | 'crf'} param.formType
+ * @param {string} param.mongoId
+ * @param {string} param.comboKey
+ * @param {express.Request} param.req
+ */
+function checkFormSubmissionPeriodAndBapStatus({
+  rebateYear,
+  formType,
+  mongoId,
+  comboKey,
+  req,
+}) {
+  /** Form submission period is open, so continue. */
+  if (submissionPeriodOpen[rebateYear][formType]) {
+    return Promise.resolve();
+  }
+
+  /** Form submission period is closed, so only continue if edits are requested. */
+  return getBapFormSubmissionsStatuses(req, [comboKey]).then((submissions) => {
+    const submission = submissions.find((s) => s.CSB_Form_ID__c === mongoId);
+
+    const statusField =
+      formType === "frf"
+        ? "CSB_Funding_Request_Status__c"
+        : formType === "prf"
+        ? "CSB_Payment_Request_Status__c"
+        : formType === "crf"
+        ? "CSB_Closeout_Request_Status__c"
+        : null;
+
+    return submission?.Parent_CSB_Rebate__r?.[statusField] === "Edits Requested"
+      ? Promise.resolve()
+      : Promise.reject();
+  });
+}
+
 module.exports = {
   getSamEntities,
   getBapComboKeys,
@@ -1077,4 +1123,5 @@ module.exports = {
   getBapFormSubmissionsStatuses,
   getBapDataForPRF,
   getBapDataForCRF,
+  checkFormSubmissionPeriodAndBapStatus,
 };

From 7da42473f9ce782678564e8b83aa0e645361cc54 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 19:00:05 -0400
Subject: [PATCH 44/71] Update forms' react-query mutation's onSuccess to use
 the updated query key in upating cached data in the queryClient

---
 app/client/src/routes/crf2022.tsx | 2 +-
 app/client/src/routes/frf2022.tsx | 2 +-
 app/client/src/routes/prf2022.tsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/client/src/routes/crf2022.tsx b/app/client/src/routes/crf2022.tsx
index a5f38225..b94e4040 100644
--- a/app/client/src/routes/crf2022.tsx
+++ b/app/client/src/routes/crf2022.tsx
@@ -88,7 +88,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
-        ["close-out", { id: rebateId }],
+        ["formio/2022/crf-submission", { id: rebateId }],
         (prevData) => {
           return prevData?.submission
             ? { ...prevData, submission: res }
diff --git a/app/client/src/routes/frf2022.tsx b/app/client/src/routes/frf2022.tsx
index 3abbbfdb..75b9e5ea 100644
--- a/app/client/src/routes/frf2022.tsx
+++ b/app/client/src/routes/frf2022.tsx
@@ -93,7 +93,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
-        ["application", { id: mongoId }],
+        ["formio/2022/frf-submission", { id: mongoId }],
         (prevData) => {
           return prevData?.submission
             ? { ...prevData, submission: res }
diff --git a/app/client/src/routes/prf2022.tsx b/app/client/src/routes/prf2022.tsx
index 7a319202..c8c6d408 100644
--- a/app/client/src/routes/prf2022.tsx
+++ b/app/client/src/routes/prf2022.tsx
@@ -88,7 +88,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
-        ["payment-request", { id: rebateId }],
+        ["formio/2022/prf-submission", { id: rebateId }],
         (prevData) => {
           return prevData?.submission
             ? { ...prevData, submission: res }

From 442463a31ad3938137de682ad265f37d2fe1fcef Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 19:03:43 -0400
Subject: [PATCH 45/71] Move formio upload and download of s3 file metadata
 functions out of formio2022.js route file and into a new formio.js utility
 file (for use in a new formio2023.js route file)

---
 app/server/app/routes/formio2022.js |  89 ++++-------------------
 app/server/app/utilities/formio.js  | 107 ++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 76 deletions(-)
 create mode 100644 app/server/app/utilities/formio.js

diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index ee1bdd07..8a8bd932 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -20,6 +20,10 @@ const {
   getBapDataForCRF,
   checkFormSubmissionPeriodAndBapStatus,
 } = require("../utilities/bap");
+const {
+  uploadS3FileMetadata,
+  downloadS3FileMetadata,
+} = require("../utilities/formio");
 const log = require("../utilities/logger");
 
 const router = express.Router();
@@ -31,31 +35,11 @@ router.get(
   "/s3/:formType/:mongoId/:comboKey/storage/s3",
   storeBapComboKeys,
   (req, res) => {
-    const { bapComboKeys, query } = req;
-    const { mail } = req.user;
-    const { comboKey } = req.params;
-
-    if (!bapComboKeys.includes(comboKey)) {
-      const logMessage =
-        `User with email '${mail}' attempted to download a file ` +
-        `without a matching BAP combo key.`;
-      log({ level: "error", message: logMessage, req });
-
-      const errorStatus = 401;
-      const errorMessage = `Unauthorized.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    }
-
-    axiosFormio(req)
-      .get(`${formio2022FRFUrl}/storage/s3`, { params: query })
-      .then((axiosRes) => axiosRes.data)
-      .then((fileMetadata) => res.json(fileMetadata))
-      .catch((error) => {
-        // NOTE: logged in axiosFormio response interceptor
-        const errorStatus = error.response?.status || 500;
-        const errorMessage = `Error downloading file from S3.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
+    downloadS3FileMetadata({
+      formioFormUrl: formio2022FRFUrl,
+      req,
+      res,
+    });
   }
 );
 
@@ -64,59 +48,12 @@ router.post(
   "/s3/:formType/:mongoId/:comboKey/storage/s3",
   storeBapComboKeys,
   (req, res) => {
-    const { bapComboKeys, body } = req;
-    const { mail } = req.user;
-    const { formType, mongoId, comboKey } = req.params;
-
-    checkFormSubmissionPeriodAndBapStatus({
+    uploadS3FileMetadata({
       rebateYear: "2022",
-      formType,
-      mongoId,
-      comboKey,
+      formioFormUrl: formio2022FRFUrl,
       req,
-    })
-      .then(() => {
-        if (!bapComboKeys.includes(comboKey)) {
-          const logMessage =
-            `User with email '${mail}' attempted to upload a file ` +
-            `without a matching BAP combo key.`;
-          log({ level: "error", message: logMessage, req });
-
-          const errorStatus = 401;
-          const errorMessage = `Unauthorized.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        axiosFormio(req)
-          .post(`${formio2022FRFUrl}/storage/s3`, body)
-          .then((axiosRes) => axiosRes.data)
-          .then((fileMetadata) => res.json(fileMetadata))
-          .catch((error) => {
-            // NOTE: logged in axiosFormio response interceptor
-            const errorStatus = error.response?.status || 500;
-            const errorMessage = `Error uploading file to S3.`;
-            return res.status(errorStatus).json({ message: errorMessage });
-          });
-      })
-      .catch((error) => {
-        const formName =
-          formType === "frf"
-            ? "CSB Application"
-            : formType === "prf"
-            ? "CSB Payment Request"
-            : formType === "cof"
-            ? "CSB Close Out"
-            : "CSB";
-
-        const logMessage =
-          `User with email '${mail}' attempted to upload a file when the ` +
-          `${rebateYear} ${formName} form enrollment period was closed.`;
-        log({ level: "error", message: logMessage, req });
-
-        const errorStatus = 400;
-        const errorMessage = `${rebateYear} ${formName} form enrollment period is closed.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
+      res,
+    });
   }
 );
 
diff --git a/app/server/app/utilities/formio.js b/app/server/app/utilities/formio.js
new file mode 100644
index 00000000..1276fbcd
--- /dev/null
+++ b/app/server/app/utilities/formio.js
@@ -0,0 +1,107 @@
+const express = require("express");
+// ---
+const { axiosFormio } = require("../config/formio");
+const { checkFormSubmissionPeriodAndBapStatus } = require("./bap");
+const log = require("./logger");
+
+/**
+ * @param {Object} param
+ * @param {'2022' | '2023'} param.rebateYear
+ * @param {string} param.formioFormUrl
+ * @param {express.Request} param.req
+ * @param {express.Response} param.res
+ */
+function uploadS3FileMetadata({ rebateYear, formioFormUrl, req, res }) {
+  const { bapComboKeys, body } = req;
+  const { mail } = req.user;
+  const { formType, mongoId, comboKey } = req.params;
+
+  checkFormSubmissionPeriodAndBapStatus({
+    rebateYear,
+    formType,
+    mongoId,
+    comboKey,
+    req,
+  })
+    .then(() => {
+      if (!bapComboKeys.includes(comboKey)) {
+        const logMessage =
+          `User with email '${mail}' attempted to upload a file ` +
+          `without a matching BAP combo key.`;
+        log({ level: "error", message: logMessage, req });
+
+        const errorStatus = 401;
+        const errorMessage = `Unauthorized.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      }
+
+      axiosFormio(req)
+        .post(`${formioFormUrl}/storage/s3`, body)
+        .then((axiosRes) => axiosRes.data)
+        .then((fileMetadata) => res.json(fileMetadata))
+        .catch((error) => {
+          // NOTE: logged in axiosFormio response interceptor
+          const errorStatus = error.response?.status || 500;
+          const errorMessage = `Error uploading file to S3.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        });
+    })
+    .catch((error) => {
+      const formName =
+        formType === "frf"
+          ? "CSB Application"
+          : formType === "prf"
+          ? "CSB Payment Request"
+          : formType === "cof"
+          ? "CSB Close Out"
+          : "CSB";
+
+      const logMessage =
+        `User with email '${mail}' attempted to upload a file when the ` +
+        `${rebateYear} ${formName} form enrollment period was closed.`;
+      log({ level: "error", message: logMessage, req });
+
+      const errorStatus = 400;
+      const errorMessage = `${rebateYear} ${formName} form enrollment period is closed.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+}
+
+/**
+ * @param {Object} param
+ * @param {string} param.formioFormUrl
+ * @param {express.Request} param.req
+ * @param {express.Response} param.res
+ */
+function downloadS3FileMetadata({ formioFormUrl, req, res }) {
+  const { bapComboKeys, query } = req;
+  const { mail } = req.user;
+  const { comboKey } = req.params;
+
+  if (!bapComboKeys.includes(comboKey)) {
+    const logMessage =
+      `User with email '${mail}' attempted to download a file ` +
+      `without a matching BAP combo key.`;
+    log({ level: "error", message: logMessage, req });
+
+    const errorStatus = 401;
+    const errorMessage = `Unauthorized.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  axiosFormio(req)
+    .get(`${formioFormUrl}/storage/s3`, { params: query })
+    .then((axiosRes) => axiosRes.data)
+    .then((fileMetadata) => res.json(fileMetadata))
+    .catch((error) => {
+      // NOTE: logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error downloading file from S3.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+}
+
+module.exports = {
+  uploadS3FileMetadata,
+  downloadS3FileMetadata,
+};

From daf46328dcdafcd0453d4ca2bf9a1a38b42d6746 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 19:07:26 -0400
Subject: [PATCH 46/71] Add initial formio2023.js routes file

---
 app/server/app/routes/formio2023.js | 60 +++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 app/server/app/routes/formio2023.js

diff --git a/app/server/app/routes/formio2023.js b/app/server/app/routes/formio2023.js
new file mode 100644
index 00000000..23ea389a
--- /dev/null
+++ b/app/server/app/routes/formio2023.js
@@ -0,0 +1,60 @@
+const express = require("express");
+const ObjectId = require("mongodb").ObjectId;
+// ---
+const {
+  axiosFormio,
+  submissionPeriodOpen,
+  formio2023FRFUrl,
+  formio2023PRFUrl,
+  formio2023CRFUrl,
+  formioCSBMetadata,
+} = require("../config/formio");
+const {
+  ensureAuthenticated,
+  storeBapComboKeys,
+  verifyMongoObjectId,
+} = require("../middleware");
+const {
+  getBapFormSubmissionsStatuses,
+  getBapDataForPRF,
+  getBapDataForCRF,
+  checkFormSubmissionPeriodAndBapStatus,
+} = require("../utilities/bap");
+const {
+  uploadS3FileMetadata,
+  downloadS3FileMetadata,
+} = require("../utilities/formio");
+const log = require("../utilities/logger");
+
+const router = express.Router();
+
+router.use(ensureAuthenticated);
+
+// --- download Formio S3 file metadata
+router.get(
+  "/s3/:formType/:mongoId/:comboKey/storage/s3",
+  storeBapComboKeys,
+  (req, res) => {
+    downloadS3FileMetadata({
+      formioFormUrl: formio2023FRFUrl,
+      req,
+      res,
+    });
+  }
+);
+
+// --- upload Formio S3 file metadata
+router.post(
+  "/s3/:formType/:mongoId/:comboKey/storage/s3",
+  storeBapComboKeys,
+  (req, res) => {
+    uploadS3FileMetadata({
+      rebateYear: "2023",
+      formioFormUrl: formio2023FRFUrl,
+      req,
+      res,
+    });
+  }
+);
+
+module.exports = router;

From f480de989250a3132876b97690ac0c80bc8c1b02 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 19:08:19 -0400
Subject: [PATCH 47/71] Fix formType type signature for
 getBapFormSubmissionData to reflect new form abbreviations

---
 app/server/app/utilities/bap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/server/app/utilities/bap.js b/app/server/app/utilities/bap.js
index 24c12f5f..a53b9573 100644
--- a/app/server/app/utilities/bap.js
+++ b/app/server/app/utilities/bap.js
@@ -1016,7 +1016,7 @@ function getBapComboKeys(req, email) {
  * Fetches data associated with a provided form submission.
  *
  * @param {express.Request} req
- * @param {'application' | 'payment-request' | 'close-out'} formType
+ * @param {'frf' | 'prf' | 'crf'} formType
  * @param {string | null} rebateId
  * @param {string | null} mongoId
  * @returns {ReturnType<queryForBapFormSubmissionData>}

From 3d698fe9232153e761914ff2d296cba0a5441f9c Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 19:08:59 -0400
Subject: [PATCH 48/71] Update formio config to include 2023 form urls

---
 app/server/app/config/formio.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/server/app/config/formio.js b/app/server/app/config/formio.js
index 6abd107e..2c187688 100644
--- a/app/server/app/config/formio.js
+++ b/app/server/app/config/formio.js
@@ -40,10 +40,15 @@ const submissionPeriodOpen = {
 };
 
 const formioProjectUrl = `${FORMIO_BASE_URL}/${FORMIO_PROJECT_NAME}`;
+
 const formio2022FRFUrl = `${formioProjectUrl}/${FORMIO_2022_FRF_PATH}`;
 const formio2022PRFUrl = `${formioProjectUrl}/${FORMIO_2022_PRF_PATH}`;
 const formio2022CRFUrl = `${formioProjectUrl}/${FORMIO_2022_CRF_PATH}`;
 
+const formio2023FRFUrl = `${formioProjectUrl}/${FORMIO_2023_FRF_PATH}`;
+const formio2023PRFUrl = `${formioProjectUrl}/${FORMIO_2023_PRF_PATH}`;
+const formio2023CRFUrl = `${formioProjectUrl}/${FORMIO_2023_CRF_PATH}`;
+
 /** @param {express.Request} req */
 function axiosFormio(req) {
   const instance = axios.create();
@@ -111,5 +116,8 @@ module.exports = {
   formio2022FRFUrl,
   formio2022PRFUrl,
   formio2022CRFUrl,
+  formio2023FRFUrl,
+  formio2023PRFUrl,
+  formio2023CRFUrl,
   formioCSBMetadata,
 };

From 97780ebeae8824de4f3ebf7b564a6025dd34ec86 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 20:20:17 -0400
Subject: [PATCH 49/71] Update userDashboard to properly set onFormPage, now
 that the form route paths have changed

---
 app/client/src/components/userDashboard.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/client/src/components/userDashboard.tsx b/app/client/src/components/userDashboard.tsx
index ed116fe0..4dd41311 100644
--- a/app/client/src/components/userDashboard.tsx
+++ b/app/client/src/components/userDashboard.tsx
@@ -64,13 +64,10 @@ export function UserDashboard(props: { email: string }) {
 
   const onSubmissionsPage = pathname === "/";
   const onHelpdeskPage = pathname === "/helpdesk";
-
-  const onApplicationFormPage = pathname.startsWith("/rebate");
-  const onPaymentRequestFormPage = pathname.startsWith("/payment-request");
-  const onCloseOutFormPage = pathname.startsWith("/close-out");
-
   const onFormPage =
-    onApplicationFormPage || onPaymentRequestFormPage || onCloseOutFormPage;
+    pathname.startsWith("/frf") ||
+    pathname.startsWith("/prf") ||
+    pathname.startsWith("/crf");
 
   const btnClassNames =
     "usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs";

From 3d2e55d73e8c645ba3abfcaa18068764fb07b7f1 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 3 Aug 2023 20:25:25 -0400
Subject: [PATCH 50/71] Update submissions component and
 checkClientRouteExists() middleware to use new route paths

---
 app/client/src/routes/submissions.tsx | 8 ++++----
 app/server/app/middleware.js          | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/client/src/routes/submissions.tsx b/app/client/src/routes/submissions.tsx
index 18fa8b24..1a6edc94 100644
--- a/app/client/src/routes/submissions.tsx
+++ b/app/client/src/routes/submissions.tsx
@@ -134,7 +134,7 @@ function FRFSubmission(props: { rebate: Rebate }) {
     ? "Submitted"
     : ""; // fallback, not used
 
-  const frfUrl = `/rebate/${frf.formio._id}`;
+  const frfUrl = `/frf/2022/${frf.formio._id}`;
 
   /**
    * NOTE on the usage of `TextWithTooltip` below:
@@ -470,7 +470,7 @@ function PRFSubmission(props: { rebate: Rebate }) {
     ? "Submitted"
     : ""; // fallback, not used
 
-  const prfUrl = `/payment-request/${hidden_bap_rebate_id}`;
+  const prfUrl = `/prf/2022/${hidden_bap_rebate_id}`;
 
   return (
     <tr
@@ -692,7 +692,7 @@ function CRFSubmission(props: { rebate: Rebate }) {
     ? "Submitted"
     : ""; // fallback, not used
 
-  const crfUrl = `/close-out/${hidden_bap_rebate_id}`;
+  const crfUrl = `/crf/2022/${hidden_bap_rebate_id}`;
 
   return (
     <tr
@@ -832,7 +832,7 @@ export function Submissions() {
                 <NewApplicationIconText />
               </button>
             ) : (
-              <Link to="/rebate/new" className={btnClassNames}>
+              <Link to="/frf/new" className={btnClassNames}>
                 <NewApplicationIconText />
               </Link>
             )}
diff --git a/app/server/app/middleware.js b/app/server/app/middleware.js
index 5e8b2233..d8e3c16b 100644
--- a/app/server/app/middleware.js
+++ b/app/server/app/middleware.js
@@ -164,15 +164,16 @@ function protectClientRoutes(req, res, next) {
  */
 function checkClientRouteExists(req, res, next) {
   const subPath = SERVER_BASE_PATH || "";
-  const clientRoutes = ["/", "/welcome", "/helpdesk", "/rebate/new"].map(
+
+  const clientRoutes = ["/", "/welcome", "/helpdesk", "/frf/new"].map(
     (route) => `${subPath}${route}`
   );
 
   if (
     !clientRoutes.includes(req.path) &&
-    !req.path.includes("/rebate/") &&
-    !req.path.includes("/payment-request/") &&
-    !req.path.includes("/close-out/")
+    !req.path.includes("/frf/") &&
+    !req.path.includes("/prf/") &&
+    !req.path.includes("/crf/")
   ) {
     const errorStatus = 404;
     return res

From 158f2e2667589c2961f8e2a4d1ef57fd51ace3a0 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 8 Aug 2023 18:19:20 -0400
Subject: [PATCH 51/71] Create formUrl object storing rebate year and form type
 in formio config and update formio s3 functions to use it in determining the
 formio form url

---
 app/server/app/config/formio.js     | 21 +++++++++++++++++++--
 app/server/app/routes/formio2022.js | 13 ++-----------
 app/server/app/routes/formio2023.js | 13 ++-----------
 app/server/app/utilities/formio.js  | 27 +++++++++++++++++++++------
 4 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/app/server/app/config/formio.js b/app/server/app/config/formio.js
index 2c187688..d6a4a2db 100644
--- a/app/server/app/config/formio.js
+++ b/app/server/app/config/formio.js
@@ -23,6 +23,24 @@ const {
   FORMIO_2023_CRF_PATH,
 } = process.env;
 
+const formioProjectUrl = `${FORMIO_BASE_URL}/${FORMIO_PROJECT_NAME}`;
+
+/**
+ * Stores form url for each form by rebate year.
+ */
+const formUrl = {
+  2022: {
+    frf: `${formioProjectUrl}/${FORMIO_2022_FRF_PATH}`,
+    prf: `${formioProjectUrl}/${FORMIO_2022_PRF_PATH}`,
+    crf: `${formioProjectUrl}/${FORMIO_2022_CRF_PATH}`,
+  },
+  2023: {
+    frf: `${formioProjectUrl}/${FORMIO_2023_FRF_PATH}`,
+    prf: `${formioProjectUrl}/${FORMIO_2023_PRF_PATH}`,
+    crf: `${formioProjectUrl}/${FORMIO_2023_CRF_PATH}`,
+  },
+};
+
 /**
  * Stores whether the submission period is open for each form by rebate year.
  */
@@ -39,8 +57,6 @@ const submissionPeriodOpen = {
   },
 };
 
-const formioProjectUrl = `${FORMIO_BASE_URL}/${FORMIO_PROJECT_NAME}`;
-
 const formio2022FRFUrl = `${formioProjectUrl}/${FORMIO_2022_FRF_PATH}`;
 const formio2022PRFUrl = `${formioProjectUrl}/${FORMIO_2022_PRF_PATH}`;
 const formio2022CRFUrl = `${formioProjectUrl}/${FORMIO_2022_CRF_PATH}`;
@@ -112,6 +128,7 @@ const formioCSBMetadata = {
 
 module.exports = {
   axiosFormio,
+  formUrl,
   submissionPeriodOpen,
   formio2022FRFUrl,
   formio2022PRFUrl,
diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index 8a8bd932..66c57b79 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -35,11 +35,7 @@ router.get(
   "/s3/:formType/:mongoId/:comboKey/storage/s3",
   storeBapComboKeys,
   (req, res) => {
-    downloadS3FileMetadata({
-      formioFormUrl: formio2022FRFUrl,
-      req,
-      res,
-    });
+    downloadS3FileMetadata({ rebateYear: "2022", req, res });
   }
 );
 
@@ -48,12 +44,7 @@ router.post(
   "/s3/:formType/:mongoId/:comboKey/storage/s3",
   storeBapComboKeys,
   (req, res) => {
-    uploadS3FileMetadata({
-      rebateYear: "2022",
-      formioFormUrl: formio2022FRFUrl,
-      req,
-      res,
-    });
+    uploadS3FileMetadata({ rebateYear: "2022", req, res });
   }
 );
 
diff --git a/app/server/app/routes/formio2023.js b/app/server/app/routes/formio2023.js
index 23ea389a..e65df3a0 100644
--- a/app/server/app/routes/formio2023.js
+++ b/app/server/app/routes/formio2023.js
@@ -35,11 +35,7 @@ router.get(
   "/s3/:formType/:mongoId/:comboKey/storage/s3",
   storeBapComboKeys,
   (req, res) => {
-    downloadS3FileMetadata({
-      formioFormUrl: formio2023FRFUrl,
-      req,
-      res,
-    });
+    downloadS3FileMetadata({ rebateYear: "2023", req, res });
   }
 );
 
@@ -48,12 +44,7 @@ router.post(
   "/s3/:formType/:mongoId/:comboKey/storage/s3",
   storeBapComboKeys,
   (req, res) => {
-    uploadS3FileMetadata({
-      rebateYear: "2023",
-      formioFormUrl: formio2023FRFUrl,
-      req,
-      res,
-    });
+    uploadS3FileMetadata({ rebateYear: "2023", req, res });
   }
 );
 
diff --git a/app/server/app/utilities/formio.js b/app/server/app/utilities/formio.js
index 1276fbcd..e6cf742b 100644
--- a/app/server/app/utilities/formio.js
+++ b/app/server/app/utilities/formio.js
@@ -1,21 +1,28 @@
 const express = require("express");
 // ---
-const { axiosFormio } = require("../config/formio");
+const { axiosFormio, formUrl } = require("../config/formio");
 const { checkFormSubmissionPeriodAndBapStatus } = require("./bap");
 const log = require("./logger");
 
 /**
  * @param {Object} param
  * @param {'2022' | '2023'} param.rebateYear
- * @param {string} param.formioFormUrl
  * @param {express.Request} param.req
  * @param {express.Response} param.res
  */
-function uploadS3FileMetadata({ rebateYear, formioFormUrl, req, res }) {
+function uploadS3FileMetadata({ rebateYear, req, res }) {
   const { bapComboKeys, body } = req;
   const { mail } = req.user;
   const { formType, mongoId, comboKey } = req.params;
 
+  const formioFormUrl = formUrl[rebateYear][formType];
+
+  if (!formioFormUrl) {
+    const errorStatus = 400;
+    const errorMessage = `Formio form URL does not exist for ${rebateYear} ${formType}.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
   checkFormSubmissionPeriodAndBapStatus({
     rebateYear,
     formType,
@@ -69,14 +76,22 @@ function uploadS3FileMetadata({ rebateYear, formioFormUrl, req, res }) {
 
 /**
  * @param {Object} param
- * @param {string} param.formioFormUrl
+ * @param {'2022' | '2023'} param.rebateYear
  * @param {express.Request} param.req
  * @param {express.Response} param.res
  */
-function downloadS3FileMetadata({ formioFormUrl, req, res }) {
+function downloadS3FileMetadata({ rebateYear, req, res }) {
   const { bapComboKeys, query } = req;
   const { mail } = req.user;
-  const { comboKey } = req.params;
+  const { formType, comboKey } = req.params;
+
+  const formioFormUrl = formUrl[rebateYear][formType];
+
+  if (!formioFormUrl) {
+    const errorStatus = 400;
+    const errorMessage = `Formio form URL does not exist for ${rebateYear} ${formType}.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
 
   if (!bapComboKeys.includes(comboKey)) {
     const logMessage =

From ffdf5eb9139cd6ec049bd9d5812e5eec2e7ddf73 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 8 Aug 2023 18:46:20 -0400
Subject: [PATCH 52/71] Update server api routes to use formio config's formUrl
 object instead of individual form url variables, and remove no longer used
 individual form url variables

---
 app/server/app/config/formio.js     | 14 ------
 app/server/app/routes/formio2022.js | 72 +++++++++++++++++++----------
 app/server/app/routes/formio2023.js |  4 +-
 app/server/app/routes/help.js       | 24 +++-------
 app/server/app/routes/status.js     | 13 ++----
 5 files changed, 59 insertions(+), 68 deletions(-)

diff --git a/app/server/app/config/formio.js b/app/server/app/config/formio.js
index d6a4a2db..68f90b47 100644
--- a/app/server/app/config/formio.js
+++ b/app/server/app/config/formio.js
@@ -57,14 +57,6 @@ const submissionPeriodOpen = {
   },
 };
 
-const formio2022FRFUrl = `${formioProjectUrl}/${FORMIO_2022_FRF_PATH}`;
-const formio2022PRFUrl = `${formioProjectUrl}/${FORMIO_2022_PRF_PATH}`;
-const formio2022CRFUrl = `${formioProjectUrl}/${FORMIO_2022_CRF_PATH}`;
-
-const formio2023FRFUrl = `${formioProjectUrl}/${FORMIO_2023_FRF_PATH}`;
-const formio2023PRFUrl = `${formioProjectUrl}/${FORMIO_2023_PRF_PATH}`;
-const formio2023CRFUrl = `${formioProjectUrl}/${FORMIO_2023_CRF_PATH}`;
-
 /** @param {express.Request} req */
 function axiosFormio(req) {
   const instance = axios.create();
@@ -130,11 +122,5 @@ module.exports = {
   axiosFormio,
   formUrl,
   submissionPeriodOpen,
-  formio2022FRFUrl,
-  formio2022PRFUrl,
-  formio2022CRFUrl,
-  formio2023FRFUrl,
-  formio2023PRFUrl,
-  formio2023CRFUrl,
   formioCSBMetadata,
 };
diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index 66c57b79..0257a705 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -3,10 +3,8 @@ const ObjectId = require("mongodb").ObjectId;
 // ---
 const {
   axiosFormio,
+  formUrl,
   submissionPeriodOpen,
-  formio2022FRFUrl,
-  formio2022PRFUrl,
-  formio2022CRFUrl,
   formioCSBMetadata,
 } = require("../config/formio");
 const {
@@ -52,6 +50,8 @@ router.post(
 router.get("/frf-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
+  const formioFormUrl = formUrl["2022"].frf;
+
   /**
    * NOTE: Helpdesk users might not have any SAM.gov records associated with
    * their email address so we should not return any submissions to those users.
@@ -64,7 +64,7 @@ router.get("/frf-submissions", storeBapComboKeys, (req, res) => {
   if (bapComboKeys.length === 0) return res.json([]);
 
   const userSubmissionsUrl =
-    `${formio2022FRFUrl}/submission` +
+    `${formioFormUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
     `&data.bap_hidden_entity_combo_key=` +
@@ -88,6 +88,8 @@ router.post("/frf-submission", storeBapComboKeys, (req, res) => {
   const { mail } = req.user;
   const comboKey = body.data?.bap_hidden_entity_combo_key;
 
+  const formioFormUrl = formUrl["2022"].frf;
+
   if (!submissionPeriodOpen["2022"].frf) {
     const errorStatus = 400;
     const errorMessage = `CSB Application form enrollment period is closed.`;
@@ -109,7 +111,7 @@ router.post("/frf-submission", storeBapComboKeys, (req, res) => {
   body.metadata = { ...formioCSBMetadata };
 
   axiosFormio(req)
-    .post(`${formio2022FRFUrl}/submission`, body)
+    .post(`${formioFormUrl}/submission`, body)
     .then((axiosRes) => axiosRes.data)
     .then((submission) => res.json(submission))
     .catch((error) => {
@@ -130,9 +132,11 @@ router.get(
     const { mail } = req.user;
     const { mongoId } = req.params;
 
+    const formioFormUrl = formUrl["2022"].frf;
+
     Promise.all([
-      axiosFormio(req).get(`${formio2022FRFUrl}/submission/${mongoId}`),
-      axiosFormio(req).get(formio2022FRFUrl),
+      axiosFormio(req).get(`${formioFormUrl}/submission/${mongoId}`),
+      axiosFormio(req).get(formioFormUrl),
     ])
       .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
       .then(([submission, schema]) => {
@@ -153,7 +157,7 @@ router.get(
 
         return res.json({
           userAccess: true,
-          formSchema: { url: formio2022FRFUrl, json: schema },
+          formSchema: { url: formioFormUrl, json: schema },
           submission,
         });
       })
@@ -178,6 +182,8 @@ router.post(
     const submission = req.body;
     const comboKey = submission.data?.bap_hidden_entity_combo_key;
 
+    const formioFormUrl = formUrl["2022"].frf;
+
     checkFormSubmissionPeriodAndBapStatus({
       rebateYear: "2022",
       formType: "frf",
@@ -204,7 +210,7 @@ router.post(
         };
 
         axiosFormio(req)
-          .put(`${formio2022FRFUrl}/submission/${mongoId}`, submission)
+          .put(`${formioFormUrl}/submission/${mongoId}`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
@@ -231,8 +237,10 @@ router.post(
 router.get("/prf-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
+  const formioFormUrl = formUrl["2022"].prf;
+
   const userSubmissionsUrl =
-    `${formio2022PRFUrl}/submission` +
+    `${formioFormUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
     `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
@@ -266,6 +274,8 @@ router.post("/prf-submission", storeBapComboKeys, (req, res) => {
     frfFormModified,
   } = body;
 
+  const formioFormUrl = formUrl["2022"].prf;
+
   if (!submissionPeriodOpen["2022"].prf) {
     const errorStatus = 400;
     const errorMessage = `CSB Payment Request form enrollment period is closed.`;
@@ -360,7 +370,7 @@ router.post("/prf-submission", storeBapComboKeys, (req, res) => {
       };
 
       axiosFormio(req)
-        .post(`${formio2022PRFUrl}/submission`, submission)
+        .post(`${formioFormUrl}/submission`, submission)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
@@ -384,14 +394,16 @@ router.get("/prf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
   const { mail } = req.user;
   const { rebateId } = req.params; // CSB Rebate ID (6 digits)
 
+  const formioFormUrl = formUrl["2022"].prf;
+
   const matchedPaymentRequestFormSubmissions =
-    `${formio2022PRFUrl}/submission` +
+    `${formioFormUrl}/submission` +
     `?data.hidden_bap_rebate_id=${rebateId}` +
     `&select=_id,data.bap_hidden_entity_combo_key`;
 
   Promise.all([
     axiosFormio(req).get(matchedPaymentRequestFormSubmissions),
-    axiosFormio(req).get(formio2022PRFUrl),
+    axiosFormio(req).get(formioFormUrl),
   ])
     .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
     .then(([submissions, schema]) => {
@@ -428,12 +440,12 @@ router.get("/prf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
        * to have Formio return the correct signature field data.
        */
       axiosFormio(req)
-        .get(`${formio2022PRFUrl}/submission/${mongoId}`)
+        .get(`${formioFormUrl}/submission/${mongoId}`)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => {
           return res.json({
             userAccess: true,
-            formSchema: { url: formio2022PRFUrl, json: schema },
+            formSchema: { url: formioFormUrl, json: schema },
             submission,
           });
         });
@@ -454,6 +466,8 @@ router.post("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => {
   const { mongoId, submission } = body;
   const comboKey = submission.data?.bap_hidden_entity_combo_key;
 
+  const formioFormUrl = formUrl["2022"].prf;
+
   checkFormSubmissionPeriodAndBapStatus({
     rebateYear: "2022",
     formType: "prf",
@@ -487,7 +501,7 @@ router.post("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => {
       };
 
       axiosFormio(req)
-        .put(`${formio2022PRFUrl}/submission/${mongoId}`, submission)
+        .put(`${formioFormUrl}/submission/${mongoId}`, submission)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
@@ -515,6 +529,8 @@ router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => {
   const { mail } = req.user;
   const { mongoId, rebateId, comboKey } = body;
 
+  const formioFormUrl = formUrl["2022"].prf;
+
   // verify post data includes one of user's BAP combo keys
   if (!bapComboKeys.includes(comboKey)) {
     const logMessage =
@@ -551,7 +567,7 @@ router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => {
       }
 
       axiosFormio(req)
-        .delete(`${formio2022PRFUrl}/submission/${mongoId}`)
+        .delete(`${formioFormUrl}/submission/${mongoId}`)
         .then((axiosRes) => axiosRes.data)
         .then((response) => {
           const logMessage = `User with email '${mail}' successfully deleted PRF submission '${rebateId}'.`;
@@ -578,8 +594,10 @@ router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => {
 router.get("/crf-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
+  const formioFormUrl = formUrl["2022"].crf;
+
   const userSubmissionsUrl =
-    `${formio2022CRFUrl}/submission` +
+    `${formioFormUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
     `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
@@ -614,6 +632,8 @@ router.post("/crf-submission", storeBapComboKeys, (req, res) => {
     prfModified,
   } = body;
 
+  const formioFormUrl = formUrl["2022"].crf;
+
   if (!submissionPeriodOpen["2022"].crf) {
     const errorStatus = 400;
     const errorMessage = `CSB Close Out form enrollment period is closed.`;
@@ -762,7 +782,7 @@ router.post("/crf-submission", storeBapComboKeys, (req, res) => {
       };
 
       axiosFormio(req)
-        .post(`${formio2022CRFUrl}/submission`, submission)
+        .post(`${formioFormUrl}/submission`, submission)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
@@ -786,14 +806,16 @@ router.get("/crf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
   const { mail } = req.user;
   const { rebateId } = req.params; // CSB Rebate ID (6 digits)
 
+  const formioFormUrl = formUrl["2022"].crf;
+
   const matchedCloseOutFormSubmissions =
-    `${formio2022CRFUrl}/submission` +
+    `${formioFormUrl}/submission` +
     `?data.hidden_bap_rebate_id=${rebateId}` +
     `&select=_id,data.bap_hidden_entity_combo_key`;
 
   Promise.all([
     axiosFormio(req).get(matchedCloseOutFormSubmissions),
-    axiosFormio(req).get(formio2022CRFUrl),
+    axiosFormio(req).get(formioFormUrl),
   ])
     .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
     .then(([submissions, schema]) => {
@@ -830,12 +852,12 @@ router.get("/crf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
        * to have Formio return the correct signature field data.
        */
       axiosFormio(req)
-        .get(`${formio2022CRFUrl}/submission/${mongoId}`)
+        .get(`${formioFormUrl}/submission/${mongoId}`)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => {
           return res.json({
             userAccess: true,
-            formSchema: { url: formio2022CRFUrl, json: schema },
+            formSchema: { url: formioFormUrl, json: schema },
             submission,
           });
         });
@@ -856,6 +878,8 @@ router.post("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => {
   const { mongoId, submission } = body;
   const comboKey = submission.data?.bap_hidden_entity_combo_key;
 
+  const formioFormUrl = formUrl["2022"].crf;
+
   checkFormSubmissionPeriodAndBapStatus({
     rebateYear: "2022",
     formType: "crf",
@@ -889,7 +913,7 @@ router.post("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => {
       };
 
       axiosFormio(req)
-        .put(`${formio2022CRFUrl}/submission/${mongoId}`, submission)
+        .put(`${formioFormUrl}/submission/${mongoId}`, submission)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
diff --git a/app/server/app/routes/formio2023.js b/app/server/app/routes/formio2023.js
index e65df3a0..248efbdb 100644
--- a/app/server/app/routes/formio2023.js
+++ b/app/server/app/routes/formio2023.js
@@ -3,10 +3,8 @@ const ObjectId = require("mongodb").ObjectId;
 // ---
 const {
   axiosFormio,
+  formUrl,
   submissionPeriodOpen,
-  formio2023FRFUrl,
-  formio2023PRFUrl,
-  formio2023CRFUrl,
   formioCSBMetadata,
 } = require("../config/formio");
 const {
diff --git a/app/server/app/routes/help.js b/app/server/app/routes/help.js
index 7737f5bd..ca9055ce 100644
--- a/app/server/app/routes/help.js
+++ b/app/server/app/routes/help.js
@@ -1,12 +1,7 @@
 const express = require("express");
 const ObjectId = require("mongodb").ObjectId;
 // ---
-const {
-  axiosFormio,
-  formio2022FRFUrl,
-  formio2022PRFUrl,
-  formio2022CRFUrl,
-} = require("../config/formio");
+const { axiosFormio, formUrl } = require("../config/formio");
 const { ensureAuthenticated, ensureHelpdesk } = require("../middleware");
 const { getBapFormSubmissionData } = require("../utilities/bap");
 
@@ -39,18 +34,11 @@ router.get("/formio/submission/:formType/:id", (req, res) => {
       ? "CSB Close Out"
       : "CSB";
 
-  const formUrl =
-    formType === "frf"
-      ? formio2022FRFUrl
-      : formType === "prf"
-      ? formio2022PRFUrl
-      : formType === "crf"
-      ? formio2022CRFUrl
-      : null; // fallback
+  const formioFormUrl = formUrl["2022"][formType];
 
   return getBapFormSubmissionData(req, formType, rebateId, mongoId).then(
     (bapSubmission) => {
-      if (!bapSubmission || !formUrl) {
+      if (!bapSubmission || !formioFormUrl) {
         const logId = rebateId || mongoId;
         const errorStatus = 500;
         const errorMessage = `Error getting ${formName} submission '${logId}' from the BAP.`;
@@ -68,13 +56,13 @@ router.get("/formio/submission/:formType/:id", (req, res) => {
       } = bapSubmission;
 
       return Promise.all([
-        axiosFormio(req).get(`${formUrl}/submission/${CSB_Form_ID__c}`),
-        axiosFormio(req).get(formUrl),
+        axiosFormio(req).get(`${formioFormUrl}/submission/${CSB_Form_ID__c}`),
+        axiosFormio(req).get(formioFormUrl),
       ])
         .then((responses) => responses.map((axiosRes) => axiosRes.data))
         .then(([formioSubmission, schema]) => {
           return res.json({
-            formSchema: { url: formUrl, json: schema },
+            formSchema: { url: formioFormUrl, json: schema },
             formio: formioSubmission,
             bap: {
               modified: CSB_Modified_Full_String__c, // ISO 8601 date time string
diff --git a/app/server/app/routes/status.js b/app/server/app/routes/status.js
index a508993b..bde9950a 100644
--- a/app/server/app/routes/status.js
+++ b/app/server/app/routes/status.js
@@ -1,11 +1,6 @@
 const express = require("express");
 // ---
-const {
-  axiosFormio,
-  formio2022FRFUrl,
-  formio2022PRFUrl,
-  formio2022CRFUrl,
-} = require("../config/formio");
+const { axiosFormio, formUrl } = require("../config/formio");
 const { getSamEntities } = require("../utilities/bap");
 
 const router = express.Router();
@@ -31,7 +26,7 @@ router.get("/bap-sam-data", (req, res) => {
 
 router.get("/formio-application-schema", (req, res) => {
   axiosFormio(req)
-    .get(formio2022FRFUrl)
+    .get(formUrl["2022"].frf)
     .then((axiosRes) => axiosRes.data)
     .then((schema) => {
       /**
@@ -48,7 +43,7 @@ router.get("/formio-application-schema", (req, res) => {
 
 router.get("/formio-payment-request-schema", (req, res) => {
   axiosFormio(req)
-    .get(formio2022PRFUrl)
+    .get(formUrl["2022"].prf)
     .then((axiosRes) => axiosRes.data)
     .then((schema) => {
       /**
@@ -65,7 +60,7 @@ router.get("/formio-payment-request-schema", (req, res) => {
 
 router.get("/formio-close-out-schema", (req, res) => {
   axiosFormio(req)
-    .get(formio2022CRFUrl)
+    .get(formUrl["2022"].crf)
     .then((axiosRes) => axiosRes.data)
     .then((schema) => {
       /**

From 48d90764adb61a848a1baa3a164e9e147bf5f77a Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 8 Aug 2023 18:57:20 -0400
Subject: [PATCH 53/71] Update formio2022 route to store urls for each form for
 2022, instead of referencing the formio formUrl object every time

---
 app/server/app/routes/formio2022.js | 80 +++++++++++------------------
 1 file changed, 29 insertions(+), 51 deletions(-)

diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index 0257a705..c2347ab5 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -24,6 +24,10 @@ const {
 } = require("../utilities/formio");
 const log = require("../utilities/logger");
 
+const formioFRFUrl = formUrl["2022"].frf;
+const formioPRFUrl = formUrl["2022"].prf;
+const formioCRFUrl = formUrl["2022"].crf;
+
 const router = express.Router();
 
 router.use(ensureAuthenticated);
@@ -50,8 +54,6 @@ router.post(
 router.get("/frf-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
-  const formioFormUrl = formUrl["2022"].frf;
-
   /**
    * NOTE: Helpdesk users might not have any SAM.gov records associated with
    * their email address so we should not return any submissions to those users.
@@ -64,7 +66,7 @@ router.get("/frf-submissions", storeBapComboKeys, (req, res) => {
   if (bapComboKeys.length === 0) return res.json([]);
 
   const userSubmissionsUrl =
-    `${formioFormUrl}/submission` +
+    `${formioFRFUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
     `&data.bap_hidden_entity_combo_key=` +
@@ -88,8 +90,6 @@ router.post("/frf-submission", storeBapComboKeys, (req, res) => {
   const { mail } = req.user;
   const comboKey = body.data?.bap_hidden_entity_combo_key;
 
-  const formioFormUrl = formUrl["2022"].frf;
-
   if (!submissionPeriodOpen["2022"].frf) {
     const errorStatus = 400;
     const errorMessage = `CSB Application form enrollment period is closed.`;
@@ -111,7 +111,7 @@ router.post("/frf-submission", storeBapComboKeys, (req, res) => {
   body.metadata = { ...formioCSBMetadata };
 
   axiosFormio(req)
-    .post(`${formioFormUrl}/submission`, body)
+    .post(`${formioFRFUrl}/submission`, body)
     .then((axiosRes) => axiosRes.data)
     .then((submission) => res.json(submission))
     .catch((error) => {
@@ -132,11 +132,9 @@ router.get(
     const { mail } = req.user;
     const { mongoId } = req.params;
 
-    const formioFormUrl = formUrl["2022"].frf;
-
     Promise.all([
-      axiosFormio(req).get(`${formioFormUrl}/submission/${mongoId}`),
-      axiosFormio(req).get(formioFormUrl),
+      axiosFormio(req).get(`${formioFRFUrl}/submission/${mongoId}`),
+      axiosFormio(req).get(formioFRFUrl),
     ])
       .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
       .then(([submission, schema]) => {
@@ -157,7 +155,7 @@ router.get(
 
         return res.json({
           userAccess: true,
-          formSchema: { url: formioFormUrl, json: schema },
+          formSchema: { url: formioFRFUrl, json: schema },
           submission,
         });
       })
@@ -182,8 +180,6 @@ router.post(
     const submission = req.body;
     const comboKey = submission.data?.bap_hidden_entity_combo_key;
 
-    const formioFormUrl = formUrl["2022"].frf;
-
     checkFormSubmissionPeriodAndBapStatus({
       rebateYear: "2022",
       formType: "frf",
@@ -210,7 +206,7 @@ router.post(
         };
 
         axiosFormio(req)
-          .put(`${formioFormUrl}/submission/${mongoId}`, submission)
+          .put(`${formioFRFUrl}/submission/${mongoId}`, submission)
           .then((axiosRes) => axiosRes.data)
           .then((submission) => res.json(submission))
           .catch((error) => {
@@ -237,10 +233,8 @@ router.post(
 router.get("/prf-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
-  const formioFormUrl = formUrl["2022"].prf;
-
   const userSubmissionsUrl =
-    `${formioFormUrl}/submission` +
+    `${formioPRFUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
     `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
@@ -274,8 +268,6 @@ router.post("/prf-submission", storeBapComboKeys, (req, res) => {
     frfFormModified,
   } = body;
 
-  const formioFormUrl = formUrl["2022"].prf;
-
   if (!submissionPeriodOpen["2022"].prf) {
     const errorStatus = 400;
     const errorMessage = `CSB Payment Request form enrollment period is closed.`;
@@ -370,7 +362,7 @@ router.post("/prf-submission", storeBapComboKeys, (req, res) => {
       };
 
       axiosFormio(req)
-        .post(`${formioFormUrl}/submission`, submission)
+        .post(`${formioPRFUrl}/submission`, submission)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
@@ -394,16 +386,14 @@ router.get("/prf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
   const { mail } = req.user;
   const { rebateId } = req.params; // CSB Rebate ID (6 digits)
 
-  const formioFormUrl = formUrl["2022"].prf;
-
-  const matchedPaymentRequestFormSubmissions =
-    `${formioFormUrl}/submission` +
+  const matchedPRFSubmissions =
+    `${formioPRFUrl}/submission` +
     `?data.hidden_bap_rebate_id=${rebateId}` +
     `&select=_id,data.bap_hidden_entity_combo_key`;
 
   Promise.all([
-    axiosFormio(req).get(matchedPaymentRequestFormSubmissions),
-    axiosFormio(req).get(formioFormUrl),
+    axiosFormio(req).get(matchedPRFSubmissions),
+    axiosFormio(req).get(formioPRFUrl),
   ])
     .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
     .then(([submissions, schema]) => {
@@ -440,12 +430,12 @@ router.get("/prf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
        * to have Formio return the correct signature field data.
        */
       axiosFormio(req)
-        .get(`${formioFormUrl}/submission/${mongoId}`)
+        .get(`${formioPRFUrl}/submission/${mongoId}`)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => {
           return res.json({
             userAccess: true,
-            formSchema: { url: formioFormUrl, json: schema },
+            formSchema: { url: formioPRFUrl, json: schema },
             submission,
           });
         });
@@ -466,8 +456,6 @@ router.post("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => {
   const { mongoId, submission } = body;
   const comboKey = submission.data?.bap_hidden_entity_combo_key;
 
-  const formioFormUrl = formUrl["2022"].prf;
-
   checkFormSubmissionPeriodAndBapStatus({
     rebateYear: "2022",
     formType: "prf",
@@ -501,7 +489,7 @@ router.post("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => {
       };
 
       axiosFormio(req)
-        .put(`${formioFormUrl}/submission/${mongoId}`, submission)
+        .put(`${formioPRFUrl}/submission/${mongoId}`, submission)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
@@ -529,8 +517,6 @@ router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => {
   const { mail } = req.user;
   const { mongoId, rebateId, comboKey } = body;
 
-  const formioFormUrl = formUrl["2022"].prf;
-
   // verify post data includes one of user's BAP combo keys
   if (!bapComboKeys.includes(comboKey)) {
     const logMessage =
@@ -567,7 +553,7 @@ router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => {
       }
 
       axiosFormio(req)
-        .delete(`${formioFormUrl}/submission/${mongoId}`)
+        .delete(`${formioPRFUrl}/submission/${mongoId}`)
         .then((axiosRes) => axiosRes.data)
         .then((response) => {
           const logMessage = `User with email '${mail}' successfully deleted PRF submission '${rebateId}'.`;
@@ -594,10 +580,8 @@ router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => {
 router.get("/crf-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
-  const formioFormUrl = formUrl["2022"].crf;
-
   const userSubmissionsUrl =
-    `${formioFormUrl}/submission` +
+    `${formioCRFUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
     `&data.bap_hidden_entity_combo_key=${bapComboKeys.join(
@@ -632,8 +616,6 @@ router.post("/crf-submission", storeBapComboKeys, (req, res) => {
     prfModified,
   } = body;
 
-  const formioFormUrl = formUrl["2022"].crf;
-
   if (!submissionPeriodOpen["2022"].crf) {
     const errorStatus = 400;
     const errorMessage = `CSB Close Out form enrollment period is closed.`;
@@ -782,7 +764,7 @@ router.post("/crf-submission", storeBapComboKeys, (req, res) => {
       };
 
       axiosFormio(req)
-        .post(`${formioFormUrl}/submission`, submission)
+        .post(`${formioCRFUrl}/submission`, submission)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
@@ -806,16 +788,14 @@ router.get("/crf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
   const { mail } = req.user;
   const { rebateId } = req.params; // CSB Rebate ID (6 digits)
 
-  const formioFormUrl = formUrl["2022"].crf;
-
-  const matchedCloseOutFormSubmissions =
-    `${formioFormUrl}/submission` +
+  const matchedCRFSubmissions =
+    `${formioCRFUrl}/submission` +
     `?data.hidden_bap_rebate_id=${rebateId}` +
     `&select=_id,data.bap_hidden_entity_combo_key`;
 
   Promise.all([
-    axiosFormio(req).get(matchedCloseOutFormSubmissions),
-    axiosFormio(req).get(formioFormUrl),
+    axiosFormio(req).get(matchedCRFSubmissions),
+    axiosFormio(req).get(formioCRFUrl),
   ])
     .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
     .then(([submissions, schema]) => {
@@ -852,12 +832,12 @@ router.get("/crf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
        * to have Formio return the correct signature field data.
        */
       axiosFormio(req)
-        .get(`${formioFormUrl}/submission/${mongoId}`)
+        .get(`${formioCRFUrl}/submission/${mongoId}`)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => {
           return res.json({
             userAccess: true,
-            formSchema: { url: formioFormUrl, json: schema },
+            formSchema: { url: formioCRFUrl, json: schema },
             submission,
           });
         });
@@ -878,8 +858,6 @@ router.post("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => {
   const { mongoId, submission } = body;
   const comboKey = submission.data?.bap_hidden_entity_combo_key;
 
-  const formioFormUrl = formUrl["2022"].crf;
-
   checkFormSubmissionPeriodAndBapStatus({
     rebateYear: "2022",
     formType: "crf",
@@ -913,7 +891,7 @@ router.post("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => {
       };
 
       axiosFormio(req)
-        .put(`${formioFormUrl}/submission/${mongoId}`, submission)
+        .put(`${formioCRFUrl}/submission/${mongoId}`, submission)
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {

From 326e2197227f2454b224954a2fd63910e777f300 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 9 Aug 2023 17:10:48 -0400
Subject: [PATCH 54/71] Update frfNew component to support creating new frf
 submissions for 2023 (and update initial submission data fields to reflect
 changes made to 2023 FRF)

---
 app/client/src/routes/frfNew.tsx | 99 +++++++++++++++++++++++---------
 1 file changed, 72 insertions(+), 27 deletions(-)

diff --git a/app/client/src/routes/frfNew.tsx b/app/client/src/routes/frfNew.tsx
index d08f88ee..46963451 100644
--- a/app/client/src/routes/frfNew.tsx
+++ b/app/client/src/routes/frfNew.tsx
@@ -6,6 +6,7 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
+  BapSamEntity,
   FormioFRFSubmission,
   postData,
   useContentData,
@@ -19,6 +20,67 @@ import { MarkdownContent } from "components/markdownContent";
 import { TextWithTooltip } from "components/tooltip";
 import { useRebateYearState } from "contexts/rebateYear";
 
+/**
+ * Creates the initial FRF submission data for a given rebate year
+ */
+function createInitialSubmissionData(options: {
+  rebateYear: "2022" | "2023";
+  email: string;
+  entity: BapSamEntity;
+}) {
+  const { rebateYear, email, entity } = options;
+
+  const { title, name } = getUserInfo(email, entity);
+  const comboKey = entity.ENTITY_COMBO_KEY__c;
+  const uei = entity.UNIQUE_ENTITY_ID__c;
+  const efti = entity.ENTITY_EFT_INDICATOR__c;
+  const orgName = entity.LEGAL_BUSINESS_NAME__c;
+  const address1 = entity.PHYSICAL_ADDRESS_LINE_1__c;
+  const address2 = entity.PHYSICAL_ADDRESS_LINE_2__c;
+  const city = entity.PHYSICAL_ADDRESS_CITY__c;
+  const state = entity.PHYSICAL_ADDRESS_PROVINCE_OR_STATE__c;
+  const zip = entity.PHYSICAL_ADDRESS_ZIPPOSTAL_CODE__c;
+
+  return rebateYear === "2022"
+    ? {
+        last_updated_by: email,
+        hidden_current_user_email: email,
+        hidden_current_user_title: title,
+        hidden_current_user_name: name,
+        bap_hidden_entity_combo_key: comboKey,
+        sam_hidden_applicant_email: email,
+        sam_hidden_applicant_title: title,
+        sam_hidden_applicant_name: name,
+        sam_hidden_applicant_efti: efti,
+        sam_hidden_applicant_uei: uei,
+        sam_hidden_applicant_organization_name: orgName,
+        sam_hidden_applicant_street_address_1: address1,
+        sam_hidden_applicant_street_address_2: address2,
+        sam_hidden_applicant_city: city,
+        sam_hidden_applicant_state: state,
+        sam_hidden_applicant_zip_code: zip,
+      }
+    : rebateYear === "2023"
+    ? {
+        _user_email: email,
+        _user_title: title,
+        _user_name: name,
+        _bap_entity_combo_key: comboKey,
+        _bap_applicant_email: email,
+        _bap_applicant_title: title,
+        _bap_applicant_name: name,
+        _bap_applicant_efti: efti,
+        _bap_applicant_uei: uei,
+        _bap_applicant_organization_name: orgName,
+        _bap_applicant_street_address_1: address1,
+        _bap_applicant_street_address_2: address2,
+        _bap_applicant_city: city,
+        _bap_applicant_state: state,
+        _bap_applicant_zip: zip,
+      }
+    : null;
+}
+
 export function FRFNew() {
   const navigate = useNavigate();
   const { email } = useOutletContext<{ email: string }>();
@@ -188,37 +250,20 @@ export function FRFNew() {
                                         if (postingDataId !== "0") return;
                                         setPostingDataId(comboKey);
 
-                                        const { title, name } = getUserInfo(
-                                          email,
-                                          entity
-                                        );
+                                        const data =
+                                          createInitialSubmissionData({
+                                            rebateYear,
+                                            email,
+                                            entity,
+                                          });
 
                                         postData<FormioFRFSubmission>(
-                                          `${serverUrl}/api/formio/2022/frf-submission/`,
-                                          {
-                                            data: {
-                                              last_updated_by: email,
-                                              hidden_current_user_email: email,
-                                              hidden_current_user_title: title,
-                                              hidden_current_user_name: name,
-                                              bap_hidden_entity_combo_key: comboKey, // prettier-ignore
-                                              sam_hidden_applicant_email: email,
-                                              sam_hidden_applicant_title: title,
-                                              sam_hidden_applicant_name: name,
-                                              sam_hidden_applicant_efti: efti,
-                                              sam_hidden_applicant_uei: uei,
-                                              sam_hidden_applicant_organization_name: orgName, // prettier-ignore
-                                              sam_hidden_applicant_street_address_1: entity.PHYSICAL_ADDRESS_LINE_1__c, // prettier-ignore
-                                              sam_hidden_applicant_street_address_2: entity.PHYSICAL_ADDRESS_LINE_2__c, // prettier-ignore
-                                              sam_hidden_applicant_city: entity.PHYSICAL_ADDRESS_CITY__c, // prettier-ignore
-                                              sam_hidden_applicant_state: entity.PHYSICAL_ADDRESS_PROVINCE_OR_STATE__c, // prettier-ignore
-                                              sam_hidden_applicant_zip_code: entity.PHYSICAL_ADDRESS_ZIPPOSTAL_CODE__c, // prettier-ignore
-                                            },
-                                            state: "draft",
-                                          }
+                                          `${serverUrl}/api/formio/${rebateYear}/frf-submission/`,
+                                          { data, state: "draft" }
                                         )
                                           .then((res) => {
-                                            navigate(`/frf/2022/${res._id}`);
+                                            const url = `/frf/${rebateYear}/${res._id}`;
+                                            navigate(url);
                                           })
                                           .catch((err) => {
                                             setErrorMessage({

From faeb140c0cbb37b7191f31f634184a4a00aa83b0 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 9 Aug 2023 17:16:39 -0400
Subject: [PATCH 55/71] Move fetching of frf submissions in formio utility
 function for use across rebate years

---
 app/server/app/routes/formio2022.js | 32 ++--------------------
 app/server/app/routes/formio2023.js |  6 +++++
 app/server/app/utilities/formio.js  | 41 +++++++++++++++++++++++++++--
 3 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index c2347ab5..0adc3a43 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -21,6 +21,7 @@ const {
 const {
   uploadS3FileMetadata,
   downloadS3FileMetadata,
+  fetchFRFSubmissions,
 } = require("../utilities/formio");
 const log = require("../utilities/logger");
 
@@ -52,36 +53,7 @@ router.post(
 
 // --- get user's 2022 FRF submissions from Formio
 router.get("/frf-submissions", storeBapComboKeys, (req, res) => {
-  const { bapComboKeys } = req;
-
-  /**
-   * NOTE: Helpdesk users might not have any SAM.gov records associated with
-   * their email address so we should not return any submissions to those users.
-   * The only reason we explicitly need to do this is because there could be
-   * some submissions without `bap_hidden_entity_combo_key` field values in the
-   * Formio database – that will never be the case for submissions created from
-   * this app, but there could be submissions created externally if someone is
-   * testing posting data (e.g. from a REST client, or the Formio Viewer).
-   */
-  if (bapComboKeys.length === 0) return res.json([]);
-
-  const userSubmissionsUrl =
-    `${formioFRFUrl}/submission` +
-    `?sort=-modified` +
-    `&limit=1000000` +
-    `&data.bap_hidden_entity_combo_key=` +
-    `${bapComboKeys.join("&data.bap_hidden_entity_combo_key=")}`;
-
-  axiosFormio(req)
-    .get(userSubmissionsUrl)
-    .then((axiosRes) => axiosRes.data)
-    .then((submissions) => res.json(submissions))
-    .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
-      const errorStatus = error.response?.status || 500;
-      const errorMessage = `Error getting Formio Application form submissions.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    });
+  fetchFRFSubmissions({ rebateYear: "2022", req, res });
 });
 
 // --- post a new 2022 FRF submission to Formio
diff --git a/app/server/app/routes/formio2023.js b/app/server/app/routes/formio2023.js
index 248efbdb..89fa1f7c 100644
--- a/app/server/app/routes/formio2023.js
+++ b/app/server/app/routes/formio2023.js
@@ -21,6 +21,7 @@ const {
 const {
   uploadS3FileMetadata,
   downloadS3FileMetadata,
+  fetchFRFSubmissions,
 } = require("../utilities/formio");
 const log = require("../utilities/logger");
 
@@ -46,4 +47,9 @@ router.post(
   }
 );
 
+// --- get user's 2023 FRF submissions from Formio
+router.get("/frf-submissions", storeBapComboKeys, (req, res) => {
+  fetchFRFSubmissions({ rebateYear: "2023", req, res });
+});
+
 module.exports = router;
diff --git a/app/server/app/utilities/formio.js b/app/server/app/utilities/formio.js
index e6cf742b..ef9129e7 100644
--- a/app/server/app/utilities/formio.js
+++ b/app/server/app/utilities/formio.js
@@ -19,7 +19,7 @@ function uploadS3FileMetadata({ rebateYear, req, res }) {
 
   if (!formioFormUrl) {
     const errorStatus = 400;
-    const errorMessage = `Formio form URL does not exist for ${rebateYear} ${formType}.`;
+    const errorMessage = `Formio form URL does not exist for ${rebateYear} ${formType.toUpperCase()}.`;
     return res.status(errorStatus).json({ message: errorMessage });
   }
 
@@ -89,7 +89,7 @@ function downloadS3FileMetadata({ rebateYear, req, res }) {
 
   if (!formioFormUrl) {
     const errorStatus = 400;
-    const errorMessage = `Formio form URL does not exist for ${rebateYear} ${formType}.`;
+    const errorMessage = `Formio form URL does not exist for ${rebateYear} ${formType.toUpperCase()}.`;
     return res.status(errorStatus).json({ message: errorMessage });
   }
 
@@ -116,7 +116,44 @@ function downloadS3FileMetadata({ rebateYear, req, res }) {
     });
 }
 
+/**
+ * @param {Object} param
+ * @param {'2022' | '2023'} param.rebateYear
+ * @param {express.Request} param.req
+ * @param {express.Response} param.res
+ */
+function fetchFRFSubmissions({ rebateYear, req, res }) {
+  const { bapComboKeys } = req;
+
+  const formioFormUrl = formUrl[rebateYear].frf;
+
+  if (!formioFormUrl) {
+    const errorStatus = 400;
+    const errorMessage = `Formio form URL does not exist for ${rebateYear} FRF.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  const submissionsUrl =
+    `${formioFormUrl}/submission` +
+    `?sort=-modified` +
+    `&limit=1000000` +
+    `&data.bap_hidden_entity_combo_key=` +
+    `${bapComboKeys.join("&data.bap_hidden_entity_combo_key=")}`;
+
+  axiosFormio(req)
+    .get(submissionsUrl)
+    .then((axiosRes) => axiosRes.data)
+    .then((submissions) => res.json(submissions))
+    .catch((error) => {
+      // NOTE: error is logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error getting Formio ${rebateYear} Application form submissions.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+}
+
 module.exports = {
   uploadS3FileMetadata,
   downloadS3FileMetadata,
+  fetchFRFSubmissions,
 };

From e27e45fcc34ea3c9f90c37f197884510362809f7 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 9 Aug 2023 17:39:50 -0400
Subject: [PATCH 56/71] Move creation of a new frf submissions to a formio
 utility function for use across rebate years

---
 app/server/app/routes/formio2022.js | 36 +---------------
 app/server/app/routes/formio2023.js |  6 +++
 app/server/app/utilities/formio.js  | 64 ++++++++++++++++++++++++++++-
 3 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index 0adc3a43..8b9689e4 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -22,6 +22,7 @@ const {
   uploadS3FileMetadata,
   downloadS3FileMetadata,
   fetchFRFSubmissions,
+  createFRFSubmission,
 } = require("../utilities/formio");
 const log = require("../utilities/logger");
 
@@ -58,40 +59,7 @@ router.get("/frf-submissions", storeBapComboKeys, (req, res) => {
 
 // --- post a new 2022 FRF submission to Formio
 router.post("/frf-submission", storeBapComboKeys, (req, res) => {
-  const { bapComboKeys, body } = req;
-  const { mail } = req.user;
-  const comboKey = body.data?.bap_hidden_entity_combo_key;
-
-  if (!submissionPeriodOpen["2022"].frf) {
-    const errorStatus = 400;
-    const errorMessage = `CSB Application form enrollment period is closed.`;
-    return res.status(errorStatus).json({ message: errorMessage });
-  }
-
-  if (!bapComboKeys.includes(comboKey)) {
-    const logMessage =
-      `User with email '${mail}' attempted to post a new FRF submission ` +
-      `without a matching BAP combo key.`;
-    log({ level: "error", message: logMessage, req });
-
-    const errorStatus = 401;
-    const errorMessage = `Unauthorized.`;
-    return res.status(errorStatus).json({ message: errorMessage });
-  }
-
-  /** Add custom metadata to track formio submissions from wrapper. */
-  body.metadata = { ...formioCSBMetadata };
-
-  axiosFormio(req)
-    .post(`${formioFRFUrl}/submission`, body)
-    .then((axiosRes) => axiosRes.data)
-    .then((submission) => res.json(submission))
-    .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
-      const errorStatus = error.response?.status || 500;
-      const errorMessage = `Error posting Formio Application form submission.`;
-      return res.status(errorStatus).json({ message: errorMessage });
-    });
+  createFRFSubmission({ rebateYear: "2022", req, res });
 });
 
 // --- get an existing 2022 FRF's schema and submission data from Formio
diff --git a/app/server/app/routes/formio2023.js b/app/server/app/routes/formio2023.js
index 89fa1f7c..c0152130 100644
--- a/app/server/app/routes/formio2023.js
+++ b/app/server/app/routes/formio2023.js
@@ -22,6 +22,7 @@ const {
   uploadS3FileMetadata,
   downloadS3FileMetadata,
   fetchFRFSubmissions,
+  createFRFSubmission,
 } = require("../utilities/formio");
 const log = require("../utilities/logger");
 
@@ -52,4 +53,9 @@ router.get("/frf-submissions", storeBapComboKeys, (req, res) => {
   fetchFRFSubmissions({ rebateYear: "2023", req, res });
 });
 
+// --- post a new 2023 FRF submission to Formio
+router.post("/frf-submission", storeBapComboKeys, (req, res) => {
+  createFRFSubmission({ rebateYear: "2023", req, res });
+});
+
 module.exports = router;
diff --git a/app/server/app/utilities/formio.js b/app/server/app/utilities/formio.js
index ef9129e7..bb0c7f10 100644
--- a/app/server/app/utilities/formio.js
+++ b/app/server/app/utilities/formio.js
@@ -1,6 +1,11 @@
 const express = require("express");
 // ---
-const { axiosFormio, formUrl } = require("../config/formio");
+const {
+  axiosFormio,
+  formUrl,
+  submissionPeriodOpen,
+  formioCSBMetadata,
+} = require("../config/formio");
 const { checkFormSubmissionPeriodAndBapStatus } = require("./bap");
 const log = require("./logger");
 
@@ -152,8 +157,65 @@ function fetchFRFSubmissions({ rebateYear, req, res }) {
     });
 }
 
+/**
+ * @param {Object} param
+ * @param {'2022' | '2023'} param.rebateYear
+ * @param {express.Request} param.req
+ * @param {express.Response} param.res
+ */
+function createFRFSubmission({ rebateYear, req, res }) {
+  const { bapComboKeys, body } = req;
+  const { mail } = req.user;
+  const comboKey =
+    rebateYear === "2022"
+      ? body.data?.bap_hidden_entity_combo_key
+      : rebateYear === "2023"
+      ? body.data?._bap_entity_combo_key
+      : null;
+
+  const formioFormUrl = formUrl[rebateYear].frf;
+
+  if (!formioFormUrl) {
+    const errorStatus = 400;
+    const errorMessage = `Formio form URL does not exist for ${rebateYear} FRF.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  if (!submissionPeriodOpen[rebateYear].frf) {
+    const errorStatus = 400;
+    const errorMessage = `CSB Application form enrollment period is closed.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  if (!bapComboKeys.includes(comboKey)) {
+    const logMessage =
+      `User with email '${mail}' attempted to post a new ${rebateYear} ` +
+      `FRF submission without a matching BAP combo key.`;
+    log({ level: "error", message: logMessage, req });
+
+    const errorStatus = 401;
+    const errorMessage = `Unauthorized.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  /** Add custom metadata to track formio submissions from wrapper. */
+  body.metadata = { ...formioCSBMetadata };
+
+  axiosFormio(req)
+    .post(`${formioFormUrl}/submission`, body)
+    .then((axiosRes) => axiosRes.data)
+    .then((submission) => res.json(submission))
+    .catch((error) => {
+      // NOTE: error is logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error posting Formio ${rebateYear} Application form submission.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+}
+
 module.exports = {
   uploadS3FileMetadata,
   downloadS3FileMetadata,
   fetchFRFSubmissions,
+  createFRFSubmission,
 };

From db3def5a0775c464ba415c9a66b5fe497256d6e8 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 10 Aug 2023 14:35:53 -0400
Subject: [PATCH 57/71] Move fetching of existing frf submission to a formio
 utility function for use across rebate years

---
 app/server/app/routes/formio2022.js | 39 +------------------
 app/server/app/routes/formio2023.js | 11 ++++++
 app/server/app/utilities/formio.js  | 60 +++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 37 deletions(-)

diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index 8b9689e4..a56d8e5e 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -23,6 +23,7 @@ const {
   downloadS3FileMetadata,
   fetchFRFSubmissions,
   createFRFSubmission,
+  fetchFRFSubmission,
 } = require("../utilities/formio");
 const log = require("../utilities/logger");
 
@@ -68,43 +69,7 @@ router.get(
   verifyMongoObjectId,
   storeBapComboKeys,
   (req, res) => {
-    const { bapComboKeys } = req;
-    const { mail } = req.user;
-    const { mongoId } = req.params;
-
-    Promise.all([
-      axiosFormio(req).get(`${formioFRFUrl}/submission/${mongoId}`),
-      axiosFormio(req).get(formioFRFUrl),
-    ])
-      .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
-      .then(([submission, schema]) => {
-        const comboKey = submission.data.bap_hidden_entity_combo_key;
-
-        if (!bapComboKeys.includes(comboKey)) {
-          const logMessage =
-            `User with email '${mail}' attempted to access FRF submission '${mongoId}' ` +
-            `that they do not have access to.`;
-          log({ level: "warn", message: logMessage, req });
-
-          return res.json({
-            userAccess: false,
-            formSchema: null,
-            submission: null,
-          });
-        }
-
-        return res.json({
-          userAccess: true,
-          formSchema: { url: formioFRFUrl, json: schema },
-          submission,
-        });
-      })
-      .catch((error) => {
-        // NOTE: logged in axiosFormio response interceptor
-        const errorStatus = error.response?.status || 500;
-        const errorMessage = `Error getting Formio Application form submission '${mongoId}'.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
+    fetchFRFSubmission({ rebateYear: "2022", req, res });
   }
 );
 
diff --git a/app/server/app/routes/formio2023.js b/app/server/app/routes/formio2023.js
index c0152130..67fc19d0 100644
--- a/app/server/app/routes/formio2023.js
+++ b/app/server/app/routes/formio2023.js
@@ -23,6 +23,7 @@ const {
   downloadS3FileMetadata,
   fetchFRFSubmissions,
   createFRFSubmission,
+  fetchFRFSubmission,
 } = require("../utilities/formio");
 const log = require("../utilities/logger");
 
@@ -58,4 +59,14 @@ router.post("/frf-submission", storeBapComboKeys, (req, res) => {
   createFRFSubmission({ rebateYear: "2023", req, res });
 });
 
+// --- get an existing 2023 FRF's schema and submission data from Formio
+router.get(
+  "/frf-submission/:mongoId",
+  verifyMongoObjectId,
+  storeBapComboKeys,
+  (req, res) => {
+    fetchFRFSubmission({ rebateYear: "2023", req, res });
+  }
+);
+
 module.exports = router;
diff --git a/app/server/app/utilities/formio.js b/app/server/app/utilities/formio.js
index bb0c7f10..229d1fdf 100644
--- a/app/server/app/utilities/formio.js
+++ b/app/server/app/utilities/formio.js
@@ -213,9 +213,69 @@ function createFRFSubmission({ rebateYear, req, res }) {
     });
 }
 
+/**
+ * @param {Object} param
+ * @param {'2022' | '2023'} param.rebateYear
+ * @param {express.Request} param.req
+ * @param {express.Response} param.res
+ */
+function fetchFRFSubmission({ rebateYear, req, res }) {
+  const { bapComboKeys } = req;
+  const { mail } = req.user;
+  const { mongoId } = req.params;
+
+  const formioFormUrl = formUrl[rebateYear].frf;
+
+  if (!formioFormUrl) {
+    const errorStatus = 400;
+    const errorMessage = `Formio form URL does not exist for ${rebateYear} FRF.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  Promise.all([
+    axiosFormio(req).get(`${formioFormUrl}/submission/${mongoId}`),
+    axiosFormio(req).get(formioFormUrl),
+  ])
+    .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
+    .then(([submission, schema]) => {
+      const comboKey =
+        rebateYear === "2022"
+          ? submission.data.bap_hidden_entity_combo_key
+          : rebateYear === "2023"
+          ? submission.data._bap_entity_combo_key
+          : null;
+
+      if (!bapComboKeys.includes(comboKey)) {
+        const logMessage =
+          `User with email '${mail}' attempted to access ${rebateYear} ` +
+          `FRF submission '${mongoId}' that they do not have access to.`;
+        log({ level: "warn", message: logMessage, req });
+
+        return res.json({
+          userAccess: false,
+          formSchema: null,
+          submission: null,
+        });
+      }
+
+      return res.json({
+        userAccess: true,
+        formSchema: { url: formioFormUrl, json: schema },
+        submission,
+      });
+    })
+    .catch((error) => {
+      // NOTE: error is logged in axiosFormio response interceptor
+      const errorStatus = error.response?.status || 500;
+      const errorMessage = `Error getting Formio ${rebateYear} Application form submission '${mongoId}'.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+}
+
 module.exports = {
   uploadS3FileMetadata,
   downloadS3FileMetadata,
   fetchFRFSubmissions,
   createFRFSubmission,
+  fetchFRFSubmission,
 };

From 8d39242715bead7fa8d66f4ca26b8c332f7ca934 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 10 Aug 2023 15:04:57 -0400
Subject: [PATCH 58/71] Move updating of existing frf submission to a formio
 utility function for use across rebate years

---
 app/server/app/routes/formio2022.js | 55 +--------------------
 app/server/app/routes/formio2023.js | 11 +++++
 app/server/app/utilities/formio.js  | 77 ++++++++++++++++++++++++++++-
 3 files changed, 89 insertions(+), 54 deletions(-)

diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index a56d8e5e..f0aa9e21 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -24,10 +24,10 @@ const {
   fetchFRFSubmissions,
   createFRFSubmission,
   fetchFRFSubmission,
+  updateFRFSubmission,
 } = require("../utilities/formio");
 const log = require("../utilities/logger");
 
-const formioFRFUrl = formUrl["2022"].frf;
 const formioPRFUrl = formUrl["2022"].prf;
 const formioCRFUrl = formUrl["2022"].crf;
 
@@ -79,58 +79,7 @@ router.post(
   verifyMongoObjectId,
   storeBapComboKeys,
   (req, res) => {
-    const { bapComboKeys } = req;
-    const { mail } = req.user;
-    const { mongoId } = req.params;
-    const submission = req.body;
-    const comboKey = submission.data?.bap_hidden_entity_combo_key;
-
-    checkFormSubmissionPeriodAndBapStatus({
-      rebateYear: "2022",
-      formType: "frf",
-      mongoId,
-      comboKey,
-      req,
-    })
-      .then(() => {
-        if (!bapComboKeys.includes(comboKey)) {
-          const logMessage =
-            `User with email '${mail}' attempted to update FRF submission '${mongoId}' ` +
-            `without a matching BAP combo key.`;
-          log({ level: "error", message: logMessage, req });
-
-          const errorStatus = 401;
-          const errorMessage = `Unauthorized.`;
-          return res.status(errorStatus).json({ message: errorMessage });
-        }
-
-        /** Add custom metadata to track formio submissions from wrapper. */
-        submission.metadata = {
-          ...submission.metadata,
-          ...formioCSBMetadata,
-        };
-
-        axiosFormio(req)
-          .put(`${formioFRFUrl}/submission/${mongoId}`, submission)
-          .then((axiosRes) => axiosRes.data)
-          .then((submission) => res.json(submission))
-          .catch((error) => {
-            // NOTE: logged in axiosFormio response interceptor
-            const errorStatus = error.response?.status || 500;
-            const errorMessage = `Error updating Formio Application form submission '${mongoId}'.`;
-            return res.status(errorStatus).json({ message: errorMessage });
-          });
-      })
-      .catch((error) => {
-        const logMessage =
-          `User with email '${mail}' attempted to update FRF submission '${mongoId}' ` +
-          `when the CSB FRF enrollment period was closed.`;
-        log({ level: "error", message: logMessage, req });
-
-        const errorStatus = 400;
-        const errorMessage = `CSB Application form enrollment period is closed.`;
-        return res.status(errorStatus).json({ message: errorMessage });
-      });
+    updateFRFSubmission({ rebateYear: "2022", req, res });
   }
 );
 
diff --git a/app/server/app/routes/formio2023.js b/app/server/app/routes/formio2023.js
index 67fc19d0..7c5b442f 100644
--- a/app/server/app/routes/formio2023.js
+++ b/app/server/app/routes/formio2023.js
@@ -24,6 +24,7 @@ const {
   fetchFRFSubmissions,
   createFRFSubmission,
   fetchFRFSubmission,
+  updateFRFSubmission,
 } = require("../utilities/formio");
 const log = require("../utilities/logger");
 
@@ -69,4 +70,14 @@ router.get(
   }
 );
 
+// --- post an update to an existing draft 2023 FRF submission to Formio
+router.post(
+  "/frf-submission/:mongoId",
+  verifyMongoObjectId,
+  storeBapComboKeys,
+  (req, res) => {
+    updateFRFSubmission({ rebateYear: "2023", req, res });
+  }
+);
+
 module.exports = router;
diff --git a/app/server/app/utilities/formio.js b/app/server/app/utilities/formio.js
index 229d1fdf..e01da510 100644
--- a/app/server/app/utilities/formio.js
+++ b/app/server/app/utilities/formio.js
@@ -183,7 +183,7 @@ function createFRFSubmission({ rebateYear, req, res }) {
 
   if (!submissionPeriodOpen[rebateYear].frf) {
     const errorStatus = 400;
-    const errorMessage = `CSB Application form enrollment period is closed.`;
+    const errorMessage = `${rebateYear} CSB Application form enrollment period is closed.`;
     return res.status(errorStatus).json({ message: errorMessage });
   }
 
@@ -272,10 +272,85 @@ function fetchFRFSubmission({ rebateYear, req, res }) {
     });
 }
 
+/**
+ * @param {Object} param
+ * @param {'2022' | '2023'} param.rebateYear
+ * @param {express.Request} param.req
+ * @param {express.Response} param.res
+ */
+function updateFRFSubmission({ rebateYear, req, res }) {
+  const { bapComboKeys } = req;
+  const { mail } = req.user;
+  const { mongoId } = req.params;
+  const submission = req.body;
+  const comboKey =
+    rebateYear === "2022"
+      ? submission.data?.bap_hidden_entity_combo_key
+      : rebateYear === "2023"
+      ? submission.data?._bap_entity_combo_key
+      : null;
+
+  const formioFormUrl = formUrl[rebateYear].frf;
+
+  if (!formioFormUrl) {
+    const errorStatus = 400;
+    const errorMessage = `Formio form URL does not exist for ${rebateYear} FRF.`;
+    return res.status(errorStatus).json({ message: errorMessage });
+  }
+
+  checkFormSubmissionPeriodAndBapStatus({
+    rebateYear,
+    formType: "frf",
+    mongoId,
+    comboKey,
+    req,
+  })
+    .then(() => {
+      if (!bapComboKeys.includes(comboKey)) {
+        const logMessage =
+          `User with email '${mail}' attempted to update ${rebateYear} FRF ` +
+          `submission '${mongoId}' without a matching BAP combo key.`;
+        log({ level: "error", message: logMessage, req });
+
+        const errorStatus = 401;
+        const errorMessage = `Unauthorized.`;
+        return res.status(errorStatus).json({ message: errorMessage });
+      }
+
+      /** Add custom metadata to track formio submissions from wrapper. */
+      submission.metadata = {
+        ...submission.metadata,
+        ...formioCSBMetadata,
+      };
+
+      axiosFormio(req)
+        .put(`${formioFormUrl}/submission/${mongoId}`, submission)
+        .then((axiosRes) => axiosRes.data)
+        .then((submission) => res.json(submission))
+        .catch((error) => {
+          // NOTE: error is logged in axiosFormio response interceptor
+          const errorStatus = error.response?.status || 500;
+          const errorMessage = `Error updating Formio ${rebateYear} Application form submission '${mongoId}'.`;
+          return res.status(errorStatus).json({ message: errorMessage });
+        });
+    })
+    .catch((error) => {
+      const logMessage =
+        `User with email '${mail}' attempted to update ${rebateYear} FRF ` +
+        `submission '${mongoId}' when the CSB FRF enrollment period was closed.`;
+      log({ level: "error", message: logMessage, req });
+
+      const errorStatus = 400;
+      const errorMessage = `${rebateYear} CSB Application form enrollment period is closed.`;
+      return res.status(errorStatus).json({ message: errorMessage });
+    });
+}
+
 module.exports = {
   uploadS3FileMetadata,
   downloadS3FileMetadata,
   fetchFRFSubmissions,
   createFRFSubmission,
   fetchFRFSubmission,
+  updateFRFSubmission,
 };

From 57c2dc5e287c701ec3609715307e375c548380b8 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 10 Aug 2023 15:06:06 -0400
Subject: [PATCH 59/71] Mount formio2023 server routes to express app

---
 app/server/app/routes/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/server/app/routes/index.js b/app/server/app/routes/index.js
index fe2b5c70..edb1585b 100644
--- a/app/server/app/routes/index.js
+++ b/app/server/app/routes/index.js
@@ -8,6 +8,7 @@ router.use("/api/user", require("./user"));
 router.use("/api/config", require("./config"));
 router.use("/api/bap", require("./bap"));
 router.use("/api/formio/2022", require("./formio2022"));
+router.use("/api/formio/2023", require("./formio2023"));
 router.use("/api/help", require("./help"));
 router.use("/status", require("./status"));
 

From 577da41cc4c73305ae88a4fe1680a5d3fe4e3fbb Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 10 Aug 2023 16:36:43 -0400
Subject: [PATCH 60/71] Update frf2023 component to load and render submission

---
 app/client/src/routes/frf2023.tsx | 404 +++++++++++++++++++++++++++++-
 1 file changed, 400 insertions(+), 4 deletions(-)

diff --git a/app/client/src/routes/frf2023.tsx b/app/client/src/routes/frf2023.tsx
index c8bfdf4f..49773ba4 100644
--- a/app/client/src/routes/frf2023.tsx
+++ b/app/client/src/routes/frf2023.tsx
@@ -1,5 +1,101 @@
-import { useMemo } from "react";
+import { useEffect, useMemo, useRef } from "react";
 import { useNavigate, useOutletContext, useParams } from "react-router-dom";
+import { useQueryClient, useQuery, useMutation } from "@tanstack/react-query";
+import { Dialog } from "@headlessui/react";
+import { Formio, Form } from "@formio/react";
+import s3 from "formiojs/providers/storage/s3";
+import { cloneDeep, isEqual } from "lodash";
+import icons from "uswds/img/sprite.svg";
+// ---
+import { serverUrl, messages } from "../config";
+import {
+  FormioFRFSubmission,
+  getData,
+  postData,
+  useContentData,
+  useConfigData,
+  useBapSamData,
+  useSubmissionsQueries,
+  useRebates,
+  submissionNeedsEdits,
+  getUserInfo,
+} from "../utilities";
+import { Loading } from "components/loading";
+import { Message } from "components/message";
+import { MarkdownContent } from "components/markdownContent";
+import { useNotificationsActions } from "contexts/notifications";
+import { useRebateYearState } from "contexts/rebateYear";
+
+type ServerResponse =
+  | {
+      userAccess: false;
+      formSchema: null;
+      submission: null;
+    }
+  | {
+      userAccess: true;
+      formSchema: { url: string; json: object };
+      submission: FormioFRFSubmission; // TODO: account for differences between 2022 and 2023 forms
+    };
+
+/** Custom hook to fetch Formio submission data */
+function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
+  const queryClient = useQueryClient();
+
+  useEffect(() => {
+    queryClient.resetQueries({ queryKey: ["formio/2023/frf-submission"] });
+  }, [queryClient]);
+
+  const url = `${serverUrl}/api/formio/2023/frf-submission/${mongoId}`;
+
+  const query = useQuery({
+    queryKey: ["formio/2023/frf-submission", { id: mongoId }],
+    queryFn: () => {
+      return getData<ServerResponse>(url).then((res) => {
+        const comboKey = res.submission?.data._bap_entity_combo_key;
+
+        /**
+         * Change the formUrl the File component's `uploadFile` uses, so the s3
+         * upload PUT request is routed through the server app.
+         *
+         * https://github.com/formio/formio.js/blob/master/src/components/file/File.js#L760
+         * https://github.com/formio/formio.js/blob/master/src/providers/storage/s3.js#L5
+         * https://github.com/formio/formio.js/blob/master/src/providers/storage/xhr.js#L90
+         */
+        Formio.Providers.providers.storage.s3 = function (formio: any) {
+          const s3Formio = cloneDeep(formio);
+          s3Formio.formUrl = `${serverUrl}/api/formio/2023/s3/frf/${mongoId}/${comboKey}`;
+          return s3(s3Formio);
+        };
+
+        return Promise.resolve(res);
+      });
+    },
+    refetchOnWindowFocus: false,
+  });
+
+  const mutation = useMutation({
+    mutationFn: (updatedSubmission: {
+      data: { [field: string]: unknown };
+      metadata: { [field: string]: unknown };
+      state: "submitted" | "draft";
+    }) => {
+      return postData<FormioFRFSubmission>(url, updatedSubmission);
+    },
+    onSuccess: (res) => {
+      return queryClient.setQueryData<ServerResponse>(
+        ["formio/2023/frf-submission", { id: mongoId }],
+        (prevData) => {
+          return prevData?.submission
+            ? { ...prevData, submission: res }
+            : prevData;
+        }
+      );
+    },
+  });
+
+  return { query, mutation };
+}
 
 export function FRF2023() {
   const { email } = useOutletContext<{ email: string }>();
@@ -15,9 +111,309 @@ function FundingRequestForm(props: { email: string }) {
   const navigate = useNavigate();
   const { id: mongoId } = useParams<"id">(); // MongoDB ObjectId string
 
+  const content = useContentData();
+  const configData = useConfigData();
+  const bapSamData = useBapSamData();
+  const {
+    displaySuccessNotification,
+    displayErrorNotification,
+    dismissNotification,
+  } = useNotificationsActions();
+  const { rebateYear } = useRebateYearState();
+
+  const submissionsQueries = useSubmissionsQueries();
+  const rebates = useRebates();
+
+  const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
+  const { userAccess, formSchema, submission } = query.data ?? {};
+
+  /**
+   * Stores when data is being posted to the server, so a loading overlay can
+   * be rendered over the form, preventing the user from losing input data when
+   * the form is re-rendered with data returned from the server's successful
+   * post response.
+   */
+  const dataIsPosting = useRef(false);
+
+  /**
+   * Stores when the form is being submitted, so it can be referenced in the
+   * Form component's `onSubmit` event prop to prevent double submits.
+   */
+  const formIsBeingSubmitted = useRef(false);
+
+  /**
+   * Stores the form data's state right after the user clicks the Save, Submit,
+   * or Next button. As soon as a post request to update the data succeeds, this
+   * pending submission data is reset to an empty object. This pending data,
+   * along with the submission data returned from the server is passed into the
+   * Form component's `submission` prop.
+   */
+  const pendingSubmissionData = useRef<{ [field: string]: unknown }>({});
+
+  /**
+   * Stores the last succesfully submitted data, so it can be used in the Form
+   * component's `onNextPage` event prop's "dirty check" which determines if
+   * posting of updated data is needed (so we don't make needless requests if no
+   * field data in the form has changed).
+   */
+  const lastSuccesfullySubmittedData = useRef<{ [field: string]: unknown }>({});
+
+  if (!configData || !bapSamData) {
+    return <Loading />;
+  }
+
+  if (submissionsQueries.some((query) => query.isFetching)) {
+    return <Loading />;
+  }
+
+  if (submissionsQueries.some((query) => query.isError)) {
+    return <Message type="error" text={messages.formSubmissionsError} />;
+  }
+
+  if (query.isInitialLoading) {
+    return <Loading />;
+  }
+
+  if (query.isError || !userAccess || !formSchema || !submission) {
+    return <Message type="error" text={messages.formSubmissionError} />;
+  }
+
+  const rebate = rebates.find((r) => r.frf.formio._id === mongoId);
+
+  const frfNeedsEdits = !rebate
+    ? false
+    : submissionNeedsEdits({
+        formio: rebate.frf.formio,
+        bap: rebate.frf.bap,
+      });
+
+  const frfSubmissionPeriodOpen =
+    configData.submissionPeriodOpen[rebateYear].frf;
+
+  const formIsReadOnly =
+    (submission.state === "submitted" || !frfSubmissionPeriodOpen) &&
+    !frfNeedsEdits;
+
+  /** matched SAM.gov entity for the Application submission */
+  const entity = bapSamData.entities.find((entity) => {
+    const { ENTITY_COMBO_KEY__c } = entity;
+    return ENTITY_COMBO_KEY__c === submission.data._bap_entity_combo_key;
+  });
+
+  if (!entity) {
+    return <Message type="error" text={messages.formSubmissionError} />;
+  }
+
+  if (entity.ENTITY_STATUS__c !== "Active") {
+    return <Message type="error" text={messages.bapSamEntityNotActive} />;
+  }
+
+  const { title, name } = getUserInfo(email, entity);
+
   return (
-    <>
-      <p>(Placeholder for 2023 Funding Request form)</p>
-    </>
+    <div className="margin-top-2">
+      {content && (
+        <MarkdownContent
+          className="margin-top-4"
+          children={
+            submission.state === "draft"
+              ? content.draftFRFIntro
+              : submission.state === "submitted"
+              ? content.submittedFRFIntro
+              : ""
+          }
+        />
+      )}
+
+      <ul className="usa-icon-list">
+        <li className="usa-icon-list__item">
+          <div className="usa-icon-list__icon text-primary">
+            <svg className="usa-icon" aria-hidden="true" role="img">
+              <use href={`${icons}#local_offer`} />
+            </svg>
+          </div>
+          <div className="usa-icon-list__content">
+            <strong>Application ID:</strong> {submission._id}
+          </div>
+        </li>
+      </ul>
+
+      <Dialog as="div" open={dataIsPosting.current} onClose={(ev) => {}}>
+        <div className="tw-fixed tw-inset-0 tw-bg-black/30" />
+        <div className="tw-fixed tw-inset-0 tw-z-20">
+          <div className="tw-flex tw-min-h-full tw-items-center tw-justify-center">
+            <Dialog.Panel className="tw-rounded-lg tw-bg-white tw-px-4 tw-pb-4 tw-shadow-xl">
+              <Loading />
+            </Dialog.Panel>
+          </div>
+        </div>
+      </Dialog>
+
+      <div className="csb-form">
+        <Form
+          form={formSchema.json}
+          url={formSchema.url} // NOTE: used for file uploads
+          submission={{
+            data: {
+              ...submission.data,
+              _user_email: email,
+              _user_title: title,
+              _user_name: name,
+              ...pendingSubmissionData.current,
+            },
+          }}
+          options={{
+            readOnly: formIsReadOnly,
+            noAlerts: true,
+          }}
+          onSubmit={(onSubmitSubmission: {
+            data: { [field: string]: unknown };
+            metadata: { [field: string]: unknown };
+            state: "submitted" | "draft";
+          }) => {
+            if (formIsReadOnly) return;
+
+            // account for when form is being submitted to prevent double submits
+            if (formIsBeingSubmitted.current) return;
+            if (onSubmitSubmission.state === "submitted") {
+              formIsBeingSubmitted.current = true;
+            }
+
+            const data = { ...onSubmitSubmission.data };
+
+            const updatedSubmission = {
+              ...onSubmitSubmission,
+              data,
+            };
+
+            dismissNotification({ id: 0 });
+            dataIsPosting.current = true;
+            pendingSubmissionData.current = data;
+
+            mutation.mutate(updatedSubmission, {
+              onSuccess: (res, payload, context) => {
+                pendingSubmissionData.current = {};
+                lastSuccesfullySubmittedData.current = cloneDeep(res.data);
+
+                /** success notification id */
+                const id = Date.now();
+
+                displaySuccessNotification({
+                  id,
+                  body: (
+                    <p className="tw-text-sm tw-font-medium tw-text-gray-900">
+                      {onSubmitSubmission.state === "submitted" ? (
+                        <>
+                          Application <em>{mongoId}</em> submitted successfully.
+                        </>
+                      ) : (
+                        <>Draft saved successfully.</>
+                      )}
+                    </p>
+                  ),
+                });
+
+                if (onSubmitSubmission.state === "submitted") {
+                  /**
+                   * NOTE: we'll keep the success notification displayed and
+                   * redirect the user to their dashboard
+                   */
+                  navigate("/");
+                }
+
+                if (onSubmitSubmission.state === "draft") {
+                  setTimeout(() => dismissNotification({ id }), 5000);
+                }
+              },
+              onError: (error, payload, context) => {
+                displayErrorNotification({
+                  id: Date.now(),
+                  body: (
+                    <p className="tw-text-sm tw-font-medium tw-text-gray-900">
+                      {onSubmitSubmission.state === "submitted" ? (
+                        <>Error submitting Application form.</>
+                      ) : (
+                        <>Error saving draft.</>
+                      )}
+                    </p>
+                  ),
+                });
+              },
+              onSettled: (data, error, payload, context) => {
+                dataIsPosting.current = false;
+                formIsBeingSubmitted.current = false;
+              },
+            });
+          }}
+          onNextPage={(onNextPageParam: {
+            page: number;
+            submission: {
+              data: { [field: string]: unknown };
+              metadata: { [field: string]: unknown };
+            };
+          }) => {
+            if (formIsReadOnly) return;
+
+            const data = { ...onNextPageParam.submission.data };
+
+            // "dirty check" – don't post an update if no changes have been made
+            // to the form (ignoring current user fields)
+            const currentData = { ...data };
+            const submittedData = { ...lastSuccesfullySubmittedData.current };
+            delete currentData._user_email;
+            delete currentData._user_title;
+            delete currentData._user_name;
+            delete submittedData._user_email;
+            delete submittedData._user_title;
+            delete submittedData._user_name;
+            if (isEqual(currentData, submittedData)) return;
+
+            const updatedSubmission = {
+              ...onNextPageParam.submission,
+              data,
+              state: "draft" as const,
+            };
+
+            dismissNotification({ id: 0 });
+            dataIsPosting.current = true;
+            pendingSubmissionData.current = data;
+
+            mutation.mutate(updatedSubmission, {
+              onSuccess: (res, payload, context) => {
+                pendingSubmissionData.current = {};
+                lastSuccesfullySubmittedData.current = cloneDeep(res.data);
+
+                /** success notification id */
+                const id = Date.now();
+
+                displaySuccessNotification({
+                  id,
+                  body: (
+                    <p className="tw-text-sm tw-font-medium tw-text-gray-900">
+                      Draft saved successfully.
+                    </p>
+                  ),
+                });
+
+                setTimeout(() => dismissNotification({ id }), 5000);
+              },
+              onError: (error, payload, context) => {
+                displayErrorNotification({
+                  id: Date.now(),
+                  body: (
+                    <p className="tw-text-sm tw-font-medium tw-text-gray-900">
+                      Error saving draft.
+                    </p>
+                  ),
+                });
+              },
+              onSettled: (data, error, payload, context) => {
+                dataIsPosting.current = false;
+              },
+            });
+          }}
+        />
+      </div>
+    </div>
   );
 }

From 5c2a38295b6711e9c157726e81aa277fabf64302 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Thu, 10 Aug 2023 16:41:02 -0400
Subject: [PATCH 61/71] Comment out all BAP data related fields from frf2023
 component until BAP has implemented their 2023 FRF features

---
 app/client/src/routes/frf2023.tsx | 38 ++++++++++++++++---------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/client/src/routes/frf2023.tsx b/app/client/src/routes/frf2023.tsx
index 49773ba4..0a0f9a24 100644
--- a/app/client/src/routes/frf2023.tsx
+++ b/app/client/src/routes/frf2023.tsx
@@ -15,9 +15,9 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
-  useSubmissionsQueries,
-  useRebates,
-  submissionNeedsEdits,
+  // useSubmissionsQueries,
+  // useRebates,
+  // submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
 import { Loading } from "components/loading";
@@ -121,8 +121,8 @@ function FundingRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  const submissionsQueries = useSubmissionsQueries();
-  const rebates = useRebates();
+  // const submissionsQueries = useSubmissionsQueries();
+  // const rebates = useRebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
   const { userAccess, formSchema, submission } = query.data ?? {};
@@ -162,13 +162,13 @@ function FundingRequestForm(props: { email: string }) {
     return <Loading />;
   }
 
-  if (submissionsQueries.some((query) => query.isFetching)) {
-    return <Loading />;
-  }
+  // if (submissionsQueries.some((query) => query.isFetching)) {
+  //   return <Loading />;
+  // }
 
-  if (submissionsQueries.some((query) => query.isError)) {
-    return <Message type="error" text={messages.formSubmissionsError} />;
-  }
+  // if (submissionsQueries.some((query) => query.isError)) {
+  //   return <Message type="error" text={messages.formSubmissionsError} />;
+  // }
 
   if (query.isInitialLoading) {
     return <Loading />;
@@ -178,14 +178,16 @@ function FundingRequestForm(props: { email: string }) {
     return <Message type="error" text={messages.formSubmissionError} />;
   }
 
-  const rebate = rebates.find((r) => r.frf.formio._id === mongoId);
+  // const rebate = rebates.find((r) => r.frf.formio._id === mongoId);
 
-  const frfNeedsEdits = !rebate
-    ? false
-    : submissionNeedsEdits({
-        formio: rebate.frf.formio,
-        bap: rebate.frf.bap,
-      });
+  // const frfNeedsEdits = !rebate
+  //   ? false
+  //   : submissionNeedsEdits({
+  //       formio: rebate.frf.formio,
+  //       bap: rebate.frf.bap,
+  //     });
+
+  const frfNeedsEdits = false; // TODO: update when BAP FRF work is completed
 
   const frfSubmissionPeriodOpen =
     configData.submissionPeriodOpen[rebateYear].frf;

From 9f5b8ef5e24fce9ab0b0ef5f84a713628d95e842 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Fri, 11 Aug 2023 11:33:13 -0400
Subject: [PATCH 62/71] Update Formio form submission types to explicitly
 identify them as 2022 form submissions, and add Formio 2023 FRF submission
 type

---
 app/client/src/components/userDashboard.tsx |   4 +-
 app/client/src/routes/crf2022.tsx           |   6 +-
 app/client/src/routes/frf2022.tsx           |   6 +-
 app/client/src/routes/frf2023.tsx           |   6 +-
 app/client/src/routes/frfNew.tsx            |   8 +-
 app/client/src/routes/helpdesk.tsx          |  16 +-
 app/client/src/routes/prf2022.tsx           |   6 +-
 app/client/src/utilities.tsx                | 176 +++++++++++---------
 8 files changed, 130 insertions(+), 98 deletions(-)

diff --git a/app/client/src/components/userDashboard.tsx b/app/client/src/components/userDashboard.tsx
index 4dd41311..6b3f0fcc 100644
--- a/app/client/src/components/userDashboard.tsx
+++ b/app/client/src/components/userDashboard.tsx
@@ -72,7 +72,7 @@ export function UserDashboard(props: { email: string }) {
   const btnClassNames =
     "usa-button margin-0 padding-x-2 padding-y-1 width-full font-sans-2xs";
 
-  function confirmationNavigation(destination: string) {
+  function confirmationNavigation(url: string) {
     displayDialog({
       dismissable: true,
       heading: "Are you sure you want to navigate away from this page?",
@@ -84,7 +84,7 @@ export function UserDashboard(props: { email: string }) {
       ),
       confirmText: "Yes",
       dismissText: "Cancel",
-      confirmedAction: () => navigate(destination),
+      confirmedAction: () => navigate(url),
     });
   }
 
diff --git a/app/client/src/routes/crf2022.tsx b/app/client/src/routes/crf2022.tsx
index b94e4040..b55ab901 100644
--- a/app/client/src/routes/crf2022.tsx
+++ b/app/client/src/routes/crf2022.tsx
@@ -9,7 +9,7 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  FormioCRFSubmission,
+  FormioCRF2022Submission,
   getData,
   postData,
   useContentData,
@@ -35,7 +35,7 @@ type ServerResponse =
   | {
       userAccess: true;
       formSchema: { url: string; json: object };
-      submission: FormioCRFSubmission;
+      submission: FormioCRF2022Submission;
     };
 
 /** Custom hook to fetch Formio submission data */
@@ -84,7 +84,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
         state: "submitted" | "draft";
       };
     }) => {
-      return postData<FormioCRFSubmission>(url, updatedSubmission);
+      return postData<FormioCRF2022Submission>(url, updatedSubmission);
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
diff --git a/app/client/src/routes/frf2022.tsx b/app/client/src/routes/frf2022.tsx
index 75b9e5ea..bff3a7a4 100644
--- a/app/client/src/routes/frf2022.tsx
+++ b/app/client/src/routes/frf2022.tsx
@@ -9,7 +9,7 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  FormioFRFSubmission,
+  FormioFRF2022Submission,
   getData,
   postData,
   useContentData,
@@ -36,7 +36,7 @@ type ServerResponse =
   | {
       userAccess: true;
       formSchema: { url: string; json: object };
-      submission: FormioFRFSubmission;
+      submission: FormioFRF2022Submission;
     };
 
 /** Custom hook to fetch Formio submission data */
@@ -89,7 +89,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
       metadata: { [field: string]: unknown };
       state: "submitted" | "draft";
     }) => {
-      return postData<FormioFRFSubmission>(url, updatedSubmission);
+      return postData<FormioFRF2022Submission>(url, updatedSubmission);
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
diff --git a/app/client/src/routes/frf2023.tsx b/app/client/src/routes/frf2023.tsx
index 0a0f9a24..24b6965e 100644
--- a/app/client/src/routes/frf2023.tsx
+++ b/app/client/src/routes/frf2023.tsx
@@ -9,7 +9,7 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  FormioFRFSubmission,
+  FormioFRF2022Submission,
   getData,
   postData,
   useContentData,
@@ -35,7 +35,7 @@ type ServerResponse =
   | {
       userAccess: true;
       formSchema: { url: string; json: object };
-      submission: FormioFRFSubmission; // TODO: account for differences between 2022 and 2023 forms
+      submission: FormioFRF2022Submission; // TODO: account for differences between 2022 and 2023 forms
     };
 
 /** Custom hook to fetch Formio submission data */
@@ -80,7 +80,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
       metadata: { [field: string]: unknown };
       state: "submitted" | "draft";
     }) => {
-      return postData<FormioFRFSubmission>(url, updatedSubmission);
+      return postData<FormioFRF2022Submission>(url, updatedSubmission);
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
diff --git a/app/client/src/routes/frfNew.tsx b/app/client/src/routes/frfNew.tsx
index 46963451..48032f8d 100644
--- a/app/client/src/routes/frfNew.tsx
+++ b/app/client/src/routes/frfNew.tsx
@@ -7,7 +7,8 @@ import icons from "uswds/img/sprite.svg";
 import { serverUrl, messages } from "../config";
 import {
   BapSamEntity,
-  FormioFRFSubmission,
+  FormioFRF2022Submission,
+  FormioFRF2023Submission,
   postData,
   useContentData,
   useConfigData,
@@ -257,7 +258,10 @@ export function FRFNew() {
                                             entity,
                                           });
 
-                                        postData<FormioFRFSubmission>(
+                                        postData<
+                                          | FormioFRF2022Submission
+                                          | FormioFRF2023Submission
+                                        >(
                                           `${serverUrl}/api/formio/${rebateYear}/frf-submission/`,
                                           { data, state: "draft" }
                                         )
diff --git a/app/client/src/routes/helpdesk.tsx b/app/client/src/routes/helpdesk.tsx
index dbc7b16a..f5d3fcf4 100644
--- a/app/client/src/routes/helpdesk.tsx
+++ b/app/client/src/routes/helpdesk.tsx
@@ -14,9 +14,9 @@ import {
   bapCRFStatusMap,
 } from "../config";
 import {
-  FormioFRFSubmission,
-  FormioPRFSubmission,
-  FormioCRFSubmission,
+  FormioFRF2022Submission,
+  FormioPRF2022Submission,
+  FormioCRF2022Submission,
   BapSubmission,
   getData,
   postData,
@@ -39,7 +39,10 @@ type ServerResponse =
     }
   | {
       formSchema: { url: string; json: object };
-      formio: FormioFRFSubmission | FormioPRFSubmission | FormioCRFSubmission;
+      formio:
+        | FormioFRF2022Submission
+        | FormioPRF2022Submission
+        | FormioCRF2022Submission;
       bap: BapSubmission;
     };
 
@@ -58,7 +61,10 @@ function formatTime(dateTimeString: string | null) {
  */
 function getStatus(options: {
   formType: FormType;
-  formio: FormioFRFSubmission | FormioPRFSubmission | FormioCRFSubmission;
+  formio:
+    | FormioFRF2022Submission
+    | FormioPRF2022Submission
+    | FormioCRF2022Submission;
   bap: BapSubmission;
 }) {
   const { formType, formio, bap } = options;
diff --git a/app/client/src/routes/prf2022.tsx b/app/client/src/routes/prf2022.tsx
index c8c6d408..517dd171 100644
--- a/app/client/src/routes/prf2022.tsx
+++ b/app/client/src/routes/prf2022.tsx
@@ -9,7 +9,7 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  FormioPRFSubmission,
+  FormioPRF2022Submission,
   getData,
   postData,
   useContentData,
@@ -35,7 +35,7 @@ type ServerResponse =
   | {
       userAccess: true;
       formSchema: { url: string; json: object };
-      submission: FormioPRFSubmission;
+      submission: FormioPRF2022Submission;
     };
 
 /** Custom hook to fetch Formio submission data */
@@ -84,7 +84,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
         state: "submitted" | "draft";
       };
     }) => {
-      return postData<FormioPRFSubmission>(url, updatedSubmission);
+      return postData<FormioPRF2022Submission>(url, updatedSubmission);
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 5e333dfa..13ae7f1d 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -31,7 +31,7 @@ type ConfigData = {
   };
 };
 
-type BapSamEntity = {
+export type BapSamEntity = {
   ENTITY_COMBO_KEY__c: string;
   UNIQUE_ENTITY_ID__c: string;
   ENTITY_EFT_INDICATOR__c: string;
@@ -86,7 +86,7 @@ type BapFormSubmission = {
   attributes: { type: string; url: string };
 };
 
-export type FormioFRFSubmission = {
+type FormioSubmission = {
   [field: string]: unknown;
   _id: string; // MongoDB ObjectId string
   state: "submitted" | "draft";
@@ -96,70 +96,92 @@ export type FormioFRFSubmission = {
   };
   data: {
     [field: string]: unknown;
-    // fields injected upon new draft Application submission creation:
-    last_updated_by: string;
-    hidden_current_user_email: string;
-    hidden_current_user_title: string;
-    hidden_current_user_name: string;
-    bap_hidden_entity_combo_key: string;
-    sam_hidden_applicant_email: string;
-    sam_hidden_applicant_title: string;
-    sam_hidden_applicant_name: string;
-    sam_hidden_applicant_efti: string;
-    sam_hidden_applicant_uei: string;
-    sam_hidden_applicant_organization_name: string;
-    sam_hidden_applicant_street_address_1: string;
-    sam_hidden_applicant_street_address_2: string;
-    sam_hidden_applicant_city: string;
-    sam_hidden_applicant_state: string;
-    sam_hidden_applicant_zip_code: string;
-    // fields set by form definition (among others):
-    applicantUEI: string;
-    applicantEfti: string;
-    applicantEfti_display: string;
-    applicantOrganizationName: string;
-    schoolDistrictName: string;
   };
 };
 
-export type FormioPRFSubmission = {
+type FormioFRF2022Data = {
   [field: string]: unknown;
-  _id: string; // MongoDB ObjectId string
-  state: "submitted" | "draft";
-  modified: string; // ISO 8601 date time string
-  metadata: {
-    [field: string]: unknown;
-  };
-  data: {
-    [field: string]: unknown;
-    // fields injected upon new draft Payment Request submission creation:
-    bap_hidden_entity_combo_key: string;
-    hidden_application_form_modified: string; // ISO 8601 date time string
-    hidden_current_user_email: string;
-    hidden_current_user_title: string;
-    hidden_current_user_name: string;
-    hidden_bap_rebate_id: string;
-  };
+  // fields injected upon a new draft FRF submission creation:
+  last_updated_by: string;
+  hidden_current_user_email: string;
+  hidden_current_user_title: string;
+  hidden_current_user_name: string;
+  bap_hidden_entity_combo_key: string;
+  sam_hidden_applicant_email: string;
+  sam_hidden_applicant_title: string;
+  sam_hidden_applicant_name: string;
+  sam_hidden_applicant_efti: string;
+  sam_hidden_applicant_uei: string;
+  sam_hidden_applicant_organization_name: string;
+  sam_hidden_applicant_street_address_1: string;
+  sam_hidden_applicant_street_address_2: string;
+  sam_hidden_applicant_city: string;
+  sam_hidden_applicant_state: string;
+  sam_hidden_applicant_zip_code: string;
+  // fields set by form definition (among others):
+  applicantUEI: string;
+  applicantEfti: string;
+  applicantEfti_display: string;
+  applicantOrganizationName: string;
+  schoolDistrictName: string;
 };
 
-export type FormioCRFSubmission = {
+type FormioPRF2022Data = {
   [field: string]: unknown;
-  _id: string; // MongoDB ObjectId string
-  state: "submitted" | "draft";
-  modified: string; // ISO 8601 date time string
-  metadata: {
-    [field: string]: unknown;
-  };
-  data: {
-    [field: string]: unknown;
-    // fields injected upon new draft Payment Request submission creation:
-    bap_hidden_entity_combo_key: string;
-    hidden_prf_modified: string; // ISO 8601 date time string
-    hidden_current_user_email: string;
-    hidden_current_user_title: string;
-    hidden_current_user_name: string;
-    hidden_bap_rebate_id: string;
-  };
+  // fields injected upon a new draft PRF submission creation:
+  bap_hidden_entity_combo_key: string;
+  hidden_application_form_modified: string; // ISO 8601 date time string
+  hidden_current_user_email: string;
+  hidden_current_user_title: string;
+  hidden_current_user_name: string;
+  hidden_bap_rebate_id: string;
+};
+
+type FormioCRF2022Data = {
+  [field: string]: unknown;
+  // fields injected upon a new draft CRF submission creation:
+  bap_hidden_entity_combo_key: string;
+  hidden_prf_modified: string; // ISO 8601 date time string
+  hidden_current_user_email: string;
+  hidden_current_user_title: string;
+  hidden_current_user_name: string;
+  hidden_bap_rebate_id: string;
+};
+
+type FormioFRF2023Data = {
+  [field: string]: unknown;
+  // fields injected upon a new draft FRF submission creation:
+  _user_email: string;
+  _user_title: string;
+  _user_name: string;
+  _bap_entity_combo_key: string;
+  _bap_applicant_email: string;
+  _bap_applicant_title: string;
+  _bap_applicant_name: string;
+  _bap_applicant_efti: string;
+  _bap_applicant_uei: string;
+  _bap_applicant_organization_name: string;
+  _bap_applicant_street_address_1: string;
+  _bap_applicant_street_address_2: string;
+  _bap_applicant_city: string;
+  _bap_applicant_state: string;
+  _bap_applicant_zip: string;
+};
+
+export type FormioFRF2022Submission = FormioSubmission & {
+  data: FormioFRF2022Data;
+};
+
+export type FormioPRF2022Submission = FormioSubmission & {
+  data: FormioPRF2022Data;
+};
+
+export type FormioCRF2022Submission = FormioSubmission & {
+  data: FormioCRF2022Data;
+};
+
+export type FormioFRF2023Submission = FormioSubmission & {
+  data: FormioFRF2023Data;
 };
 
 export type BapSubmission = {
@@ -173,15 +195,15 @@ export type BapSubmission = {
 
 export type Rebate = {
   frf: {
-    formio: FormioFRFSubmission;
+    formio: FormioFRF2022Submission;
     bap: BapSubmission | null;
   };
   prf: {
-    formio: FormioPRFSubmission | null;
+    formio: FormioPRF2022Submission | null;
     bap: BapSubmission | null;
   };
   crf: {
-    formio: FormioCRFSubmission | null;
+    formio: FormioCRF2022Submission | null;
     bap: BapSubmission | null;
   };
 };
@@ -332,7 +354,7 @@ export function useSubmissionsQueries() {
         queryKey: ["formio/2022/frf-submissions"],
         queryFn: () => {
           const url = `${serverUrl}/api/formio/2022/frf-submissions`;
-          return getData<FormioFRFSubmission[]>(url);
+          return getData<FormioFRF2022Submission[]>(url);
         },
         refetchOnWindowFocus: false,
       },
@@ -340,7 +362,7 @@ export function useSubmissionsQueries() {
         queryKey: ["formio/2022/prf-submissions"],
         queryFn: () => {
           const url = `${serverUrl}/api/formio/2022/prf-submissions`;
-          return getData<FormioPRFSubmission[]>(url);
+          return getData<FormioPRF2022Submission[]>(url);
         },
         refetchOnWindowFocus: false,
       },
@@ -348,7 +370,7 @@ export function useSubmissionsQueries() {
         queryKey: ["formio/2022/crf-submissions"],
         queryFn: () => {
           const url = `${serverUrl}/api/formio/2022/crf-submissions`;
-          return getData<FormioCRFSubmission[]>(url);
+          return getData<FormioCRF2022Submission[]>(url);
         },
         refetchOnWindowFocus: false,
       },
@@ -370,17 +392,17 @@ function useCombinedRebates() {
     crfs: BapFormSubmission[];
   }>(["bap/submissions"]);
 
-  const formioFRFSubmissions = queryClient.getQueryData<FormioFRFSubmission[]>([
-    "formio/2022/frf-submissions",
-  ]);
+  const formioFRFSubmissions = queryClient.getQueryData<
+    FormioFRF2022Submission[]
+  >(["formio/2022/frf-submissions"]);
 
-  const formioPRFSubmissions = queryClient.getQueryData<FormioPRFSubmission[]>([
-    "formio/2022/prf-submissions",
-  ]);
+  const formioPRFSubmissions = queryClient.getQueryData<
+    FormioPRF2022Submission[]
+  >(["formio/2022/prf-submissions"]);
 
-  const formioCRFSubmissions = queryClient.getQueryData<FormioCRFSubmission[]>([
-    "formio/2022/crf-submissions",
-  ]);
+  const formioCRFSubmissions = queryClient.getQueryData<
+    FormioCRF2022Submission[]
+  >(["formio/2022/crf-submissions"]);
 
   // ensure form submissions data has been fetched from both the BAP and Formio
   if (
@@ -595,9 +617,9 @@ export function useRebates() {
  */
 export function submissionNeedsEdits(options: {
   formio:
-    | FormioFRFSubmission
-    | FormioPRFSubmission
-    | FormioCRFSubmission
+    | FormioFRF2022Submission
+    | FormioPRF2022Submission
+    | FormioCRF2022Submission
     | null;
   bap: BapSubmission | null;
 }) {

From e664a7f607179fc337bf23dc7fbb16ce0731ea0a Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Fri, 11 Aug 2023 14:49:35 -0400
Subject: [PATCH 63/71] Update PRF 2022 form component's dirty check to account
 for newBusDeliveryDate field's value discrepancy between the returned data of
 null and the rendered value of any empty string

---
 app/client/src/routes/prf2022.tsx | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/client/src/routes/prf2022.tsx b/app/client/src/routes/prf2022.tsx
index 517dd171..28edd513 100644
--- a/app/client/src/routes/prf2022.tsx
+++ b/app/client/src/routes/prf2022.tsx
@@ -397,10 +397,26 @@ function PaymentRequestForm(props: { email: string }) {
             const currentData = { ...data };
             const submittedData = { ...lastSuccesfullySubmittedData.current };
 
-            // NOTE: `newBusDeliveryDate` is causing the dirty check to fail
-            console.log({
-              current: (currentData.busInfo as unknown[])[0], // newBusDeliveryDate: ""
-              submitted: (submittedData.busInfo as unknown[])[0], // newBusDeliveryDate: null
+            /**
+             * NOTE: if a user hasn't yet filled out the bus info fields, the
+             * `newBusDeliveryDate` field is returned as null from Formio, but
+             * is converted to an empty string when rendered by the Formio Form
+             * component, so we need to account for that in the dirty check by
+             * omitting that field from being checked.
+             */
+            type BusInfo = Record<string, unknown>[] | undefined;
+
+            const currentDataBusInfo = currentData?.busInfo as BusInfo;
+            const submittedDataBusInfo = submittedData?.busInfo as BusInfo;
+
+            currentDataBusInfo?.forEach((currentDataBusFields, index) => {
+              if (
+                currentDataBusFields?.newBusDeliveryDate === "" &&
+                submittedDataBusInfo?.[index]?.newBusDeliveryDate === null
+              ) {
+                delete currentDataBusFields.newBusDeliveryDate;
+                delete submittedDataBusInfo[index].newBusDeliveryDate;
+              }
             });
 
             delete currentData.hidden_current_user_email;

From bb753f1d56c5becebec3b6163b740b6d563b5f00 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Fri, 11 Aug 2023 16:00:42 -0400
Subject: [PATCH 64/71] Add getComboKeyFieldName() to server app's formio
 utilities, so the correct combo key field can be used, based on the rebate
 year

---
 app/server/app/utilities/formio.js | 46 +++++++++++++++++-------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/app/server/app/utilities/formio.js b/app/server/app/utilities/formio.js
index e01da510..4f509c88 100644
--- a/app/server/app/utilities/formio.js
+++ b/app/server/app/utilities/formio.js
@@ -9,6 +9,18 @@ const {
 const { checkFormSubmissionPeriodAndBapStatus } = require("./bap");
 const log = require("./logger");
 
+/**
+ * @param {Object} param
+ * @param {'2022' | '2023'} param.rebateYear
+ */
+function getComboKeyFieldName({ rebateYear }) {
+  return rebateYear === "2022"
+    ? "bap_hidden_entity_combo_key"
+    : rebateYear === "2023"
+    ? "_bap_entity_combo_key"
+    : "";
+}
+
 /**
  * @param {Object} param
  * @param {'2022' | '2023'} param.rebateYear
@@ -130,6 +142,9 @@ function downloadS3FileMetadata({ rebateYear, req, res }) {
 function fetchFRFSubmissions({ rebateYear, req, res }) {
   const { bapComboKeys } = req;
 
+  const comboKeyFieldName = getComboKeyFieldName({ rebateYear });
+  const comboKeySearchParam = `&data.${comboKeyFieldName}=`;
+
   const formioFormUrl = formUrl[rebateYear].frf;
 
   if (!formioFormUrl) {
@@ -142,8 +157,8 @@ function fetchFRFSubmissions({ rebateYear, req, res }) {
     `${formioFormUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
-    `&data.bap_hidden_entity_combo_key=` +
-    `${bapComboKeys.join("&data.bap_hidden_entity_combo_key=")}`;
+    comboKeySearchParam +
+    `${bapComboKeys.join(comboKeySearchParam)}`;
 
   axiosFormio(req)
     .get(submissionsUrl)
@@ -166,12 +181,9 @@ function fetchFRFSubmissions({ rebateYear, req, res }) {
 function createFRFSubmission({ rebateYear, req, res }) {
   const { bapComboKeys, body } = req;
   const { mail } = req.user;
-  const comboKey =
-    rebateYear === "2022"
-      ? body.data?.bap_hidden_entity_combo_key
-      : rebateYear === "2023"
-      ? body.data?._bap_entity_combo_key
-      : null;
+
+  const comboKeyFieldName = getComboKeyFieldName({ rebateYear });
+  const comboKey = body.data?.[comboKeyFieldName];
 
   const formioFormUrl = formUrl[rebateYear].frf;
 
@@ -224,6 +236,8 @@ function fetchFRFSubmission({ rebateYear, req, res }) {
   const { mail } = req.user;
   const { mongoId } = req.params;
 
+  const comboKeyFieldName = getComboKeyFieldName({ rebateYear });
+
   const formioFormUrl = formUrl[rebateYear].frf;
 
   if (!formioFormUrl) {
@@ -238,12 +252,7 @@ function fetchFRFSubmission({ rebateYear, req, res }) {
   ])
     .then((axiosResponses) => axiosResponses.map((axiosRes) => axiosRes.data))
     .then(([submission, schema]) => {
-      const comboKey =
-        rebateYear === "2022"
-          ? submission.data.bap_hidden_entity_combo_key
-          : rebateYear === "2023"
-          ? submission.data._bap_entity_combo_key
-          : null;
+      const comboKey = submission.data?.[comboKeyFieldName];
 
       if (!bapComboKeys.includes(comboKey)) {
         const logMessage =
@@ -283,12 +292,9 @@ function updateFRFSubmission({ rebateYear, req, res }) {
   const { mail } = req.user;
   const { mongoId } = req.params;
   const submission = req.body;
-  const comboKey =
-    rebateYear === "2022"
-      ? submission.data?.bap_hidden_entity_combo_key
-      : rebateYear === "2023"
-      ? submission.data?._bap_entity_combo_key
-      : null;
+
+  const comboKeyFieldName = getComboKeyFieldName({ rebateYear });
+  const comboKey = submission.data?.[comboKeyFieldName];
 
   const formioFormUrl = formUrl[rebateYear].frf;
 

From 7cb0e1ef17638b96ac08391deb19fecdde24d91d Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Fri, 11 Aug 2023 17:21:01 -0400
Subject: [PATCH 65/71] Add use2023SubmissionsQueries() custom hook to fetch
 2023 submission data, and rename 2022 queries and hooks to reflect 2022
 rebate year

---
 app/client/src/routes/crf2022.tsx     |  8 ++---
 app/client/src/routes/frf2022.tsx     |  8 ++---
 app/client/src/routes/frf2023.tsx     |  8 ++---
 app/client/src/routes/prf2022.tsx     |  8 ++---
 app/client/src/routes/submissions.tsx | 22 ++++++------
 app/client/src/utilities.tsx          | 52 +++++++++++++++++----------
 6 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/app/client/src/routes/crf2022.tsx b/app/client/src/routes/crf2022.tsx
index b55ab901..01ac51b9 100644
--- a/app/client/src/routes/crf2022.tsx
+++ b/app/client/src/routes/crf2022.tsx
@@ -15,8 +15,8 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
-  useSubmissionsQueries,
-  useRebates,
+  use2022SubmissionsQueries,
+  use2022Rebates,
   submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
@@ -125,8 +125,8 @@ function CloseOutRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  const submissionsQueries = useSubmissionsQueries();
-  const rebates = useRebates();
+  const submissionsQueries = use2022SubmissionsQueries();
+  const rebates = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(rebateId);
   const { userAccess, formSchema, submission } = query.data ?? {};
diff --git a/app/client/src/routes/frf2022.tsx b/app/client/src/routes/frf2022.tsx
index bff3a7a4..4aace206 100644
--- a/app/client/src/routes/frf2022.tsx
+++ b/app/client/src/routes/frf2022.tsx
@@ -15,8 +15,8 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
-  useSubmissionsQueries,
-  useRebates,
+  use2022SubmissionsQueries,
+  use2022Rebates,
   submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
@@ -132,8 +132,8 @@ function FundingRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  const submissionsQueries = useSubmissionsQueries();
-  const rebates = useRebates();
+  const submissionsQueries = use2022SubmissionsQueries();
+  const rebates = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
   const { userAccess, formSchema, submission } = query.data ?? {};
diff --git a/app/client/src/routes/frf2023.tsx b/app/client/src/routes/frf2023.tsx
index 24b6965e..04f61c9a 100644
--- a/app/client/src/routes/frf2023.tsx
+++ b/app/client/src/routes/frf2023.tsx
@@ -15,8 +15,8 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
-  // useSubmissionsQueries,
-  // useRebates,
+  // use2022SubmissionsQueries,
+  // use2022Rebates,
   // submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
@@ -121,8 +121,8 @@ function FundingRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  // const submissionsQueries = useSubmissionsQueries();
-  // const rebates = useRebates();
+  // const submissionsQueries = use2022SubmissionsQueries();
+  // const rebates = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
   const { userAccess, formSchema, submission } = query.data ?? {};
diff --git a/app/client/src/routes/prf2022.tsx b/app/client/src/routes/prf2022.tsx
index 28edd513..b331bcea 100644
--- a/app/client/src/routes/prf2022.tsx
+++ b/app/client/src/routes/prf2022.tsx
@@ -15,8 +15,8 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
-  useSubmissionsQueries,
-  useRebates,
+  use2022SubmissionsQueries,
+  use2022Rebates,
   submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
@@ -125,8 +125,8 @@ function PaymentRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  const submissionsQueries = useSubmissionsQueries();
-  const rebates = useRebates();
+  const submissionsQueries = use2022SubmissionsQueries();
+  const rebates = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(rebateId);
   const { userAccess, formSchema, submission } = query.data ?? {};
diff --git a/app/client/src/routes/submissions.tsx b/app/client/src/routes/submissions.tsx
index 1a6edc94..ab2a3547 100644
--- a/app/client/src/routes/submissions.tsx
+++ b/app/client/src/routes/submissions.tsx
@@ -5,13 +5,13 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  Rebate,
+  Rebate2022,
   postData,
   useContentData,
   useConfigData,
   useBapSamData,
-  useSubmissionsQueries,
-  useRebates,
+  use2022SubmissionsQueries,
+  use2022Rebates,
   submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
@@ -54,7 +54,7 @@ function ButtonLink(props: { type: "edit" | "view"; to: LinkProps["to"] }) {
   );
 }
 
-function FRFSubmission(props: { rebate: Rebate }) {
+function FRF2022Submission(props: { rebate: Rebate2022 }) {
   const { rebate } = props;
   const { frf, prf, crf } = rebate;
 
@@ -301,7 +301,7 @@ save the form for the EFT indicator to be displayed. */
   );
 }
 
-function PRFSubmission(props: { rebate: Rebate }) {
+function PRF2022Submission(props: { rebate: Rebate2022 }) {
   const { rebate } = props;
   const { frf, prf, crf } = rebate;
 
@@ -533,7 +533,7 @@ function PRFSubmission(props: { rebate: Rebate }) {
   );
 }
 
-function CRFSubmission(props: { rebate: Rebate }) {
+function CRF2022Submission(props: { rebate: Rebate2022 }) {
   const { rebate } = props;
   const { frf, prf, crf } = rebate;
 
@@ -774,8 +774,8 @@ export function Submissions() {
   const content = useContentData();
   const configData = useConfigData();
   const bapSamData = useBapSamData();
-  const submissionsQueries = useSubmissionsQueries();
-  const rebates = useRebates();
+  const submissionsQueries = use2022SubmissionsQueries();
+  const rebates = use2022Rebates();
   const { rebateYear } = useRebateYearState();
   const { setRebateYear } = useRebateYearActions();
 
@@ -924,9 +924,9 @@ export function Submissions() {
               <tbody>
                 {rebates.map((rebate, index) => (
                   <Fragment key={rebate.rebateId}>
-                    <FRFSubmission rebate={rebate} />
-                    <PRFSubmission rebate={rebate} />
-                    <CRFSubmission rebate={rebate} />
+                    <FRF2022Submission rebate={rebate} />
+                    <PRF2022Submission rebate={rebate} />
+                    <CRF2022Submission rebate={rebate} />
                     {/* blank row after all rebates but the last one */}
                     {index !== rebates.length - 1 && (
                       <tr className="bg-white">
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 13ae7f1d..7a502a0d 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -193,7 +193,7 @@ export type BapSubmission = {
   status: string | null;
 };
 
-export type Rebate = {
+export type Rebate2022 = {
   frf: {
     formio: FormioFRF2022Submission;
     bap: BapSubmission | null;
@@ -314,8 +314,8 @@ export function useBapSamData() {
   return queryClient.getQueryData<BapSamData>(["bap/sam"]);
 }
 
-/** Custom hook to fetch submissions from the BAP and Formio */
-export function useSubmissionsQueries() {
+/** Custom hook to fetch all 2022 submissions from the BAP and Formio */
+export function use2022SubmissionsQueries() {
   return useQueries({
     queries: [
       {
@@ -378,12 +378,28 @@ export function useSubmissionsQueries() {
   });
 }
 
+/** Custom hook to fetch all 2023 submissions from Formio */
+export function use2023SubmissionsQueries() {
+  return useQueries({
+    queries: [
+      {
+        queryKey: ["formio/2023/frf-submissions"],
+        queryFn: () => {
+          const url = `${serverUrl}/api/formio/2023/frf-submissions`;
+          return getData<FormioFRF2023Submission[]>(url);
+        },
+        refetchOnWindowFocus: false,
+      },
+    ],
+  });
+}
+
 /**
- * Custom hook to combine FRF submissions data, PRF submissions data, and CRF
- * submissions data from both the BAP and Formio into a single `submissions`
- * object, with the BAP assigned `rebateId` as the keys.
+ * Custom hook to combine 2022 FRF submissions data, PRF submissions data, and
+ * CRF submissions data from both the BAP and Formio into a single object, with
+ * the BAP assigned `rebateId` as the keys.
  **/
-function useCombinedRebates() {
+function useCombined2022Rebates() {
   const queryClient = useQueryClient();
 
   const bapFormSubmissions = queryClient.getQueryData<{
@@ -414,7 +430,7 @@ function useCombinedRebates() {
     return {};
   }
 
-  const rebates: { [rebateId: string]: Rebate } = {};
+  const rebates: { [rebateId: string]: Rebate2022 } = {};
 
   /**
    * Iterate over Formio FRF submissions, matching them with submissions
@@ -531,7 +547,7 @@ function useCombinedRebates() {
  * - Selected FRF submissions without a corresponding PRF submission
  * - Funding Approved PRF submissions without a corresponding CRF submission
  **/
-function useSortedRebates(rebates: { [rebateId: string]: Rebate }) {
+function useSortedRebates(rebates: { [rebateId: string]: Rebate2022 }) {
   return Object.entries(rebates)
     .map(([rebateId, rebate]) => ({ rebateId, ...rebate }))
     .sort((r1, r2) => {
@@ -589,23 +605,23 @@ function useSortedRebates(rebates: { [rebateId: string]: Rebate }) {
 }
 
 /**
- * Custom hook that returns sorted rebates, and logs them if 'debug' search
+ * Custom hook that returns sorted 2022 rebates, and logs them if 'debug' search
  * parameter exists.
  */
-export function useRebates() {
+export function use2022Rebates() {
   const [searchParams] = useSearchParams();
 
-  const combinedRebates = useCombinedRebates();
-  const sortedRebates = useSortedRebates(combinedRebates);
+  const combined2022Rebates = useCombined2022Rebates();
+  const sorted2022Rebates = useSortedRebates(combined2022Rebates);
 
-  // log combined 'sortedRebates' array if 'debug' search parameter exists
+  // log combined 'sorted2022Rebates' array if 'debug' search parameter exists
   useEffect(() => {
-    if (searchParams.has("debug") && sortedRebates.length > 0) {
-      console.log(sortedRebates);
+    if (searchParams.has("debug") && sorted2022Rebates.length > 0) {
+      console.log(sorted2022Rebates);
     }
-  }, [searchParams, sortedRebates]);
+  }, [searchParams, sorted2022Rebates]);
 
-  return sortedRebates;
+  return sorted2022Rebates;
 }
 
 /**

From c00391a87b98f19f283c0480917985edca4bbaec Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Fri, 11 Aug 2023 17:26:32 -0400
Subject: [PATCH 66/71] Rename stored 2022 submissionQueries and rebates
 variables with the 2022 rebate year

---
 app/client/src/routes/crf2022.tsx     | 10 +++++-----
 app/client/src/routes/frf2022.tsx     | 10 +++++-----
 app/client/src/routes/frf2023.tsx     | 10 +++++-----
 app/client/src/routes/prf2022.tsx     | 10 +++++-----
 app/client/src/routes/submissions.tsx | 14 +++++++-------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/client/src/routes/crf2022.tsx b/app/client/src/routes/crf2022.tsx
index 01ac51b9..51a1e2c1 100644
--- a/app/client/src/routes/crf2022.tsx
+++ b/app/client/src/routes/crf2022.tsx
@@ -125,8 +125,8 @@ function CloseOutRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  const submissionsQueries = use2022SubmissionsQueries();
-  const rebates = use2022Rebates();
+  const submissions2022Queries = use2022SubmissionsQueries();
+  const rebates2022 = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(rebateId);
   const { userAccess, formSchema, submission } = query.data ?? {};
@@ -166,11 +166,11 @@ function CloseOutRequestForm(props: { email: string }) {
     return <Loading />;
   }
 
-  if (submissionsQueries.some((query) => query.isFetching)) {
+  if (submissions2022Queries.some((query) => query.isFetching)) {
     return <Loading />;
   }
 
-  if (submissionsQueries.some((query) => query.isError)) {
+  if (submissions2022Queries.some((query) => query.isError)) {
     return <Message type="error" text={messages.formSubmissionsError} />;
   }
 
@@ -182,7 +182,7 @@ function CloseOutRequestForm(props: { email: string }) {
     return <Message type="error" text={messages.formSubmissionError} />;
   }
 
-  const rebate = rebates.find((r) => r.rebateId === rebateId);
+  const rebate = rebates2022.find((r) => r.rebateId === rebateId);
 
   const crfNeedsEdits = !rebate
     ? false
diff --git a/app/client/src/routes/frf2022.tsx b/app/client/src/routes/frf2022.tsx
index 4aace206..7443e35e 100644
--- a/app/client/src/routes/frf2022.tsx
+++ b/app/client/src/routes/frf2022.tsx
@@ -132,8 +132,8 @@ function FundingRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  const submissionsQueries = use2022SubmissionsQueries();
-  const rebates = use2022Rebates();
+  const submissions2022Queries = use2022SubmissionsQueries();
+  const rebates2022 = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
   const { userAccess, formSchema, submission } = query.data ?? {};
@@ -173,11 +173,11 @@ function FundingRequestForm(props: { email: string }) {
     return <Loading />;
   }
 
-  if (submissionsQueries.some((query) => query.isFetching)) {
+  if (submissions2022Queries.some((query) => query.isFetching)) {
     return <Loading />;
   }
 
-  if (submissionsQueries.some((query) => query.isError)) {
+  if (submissions2022Queries.some((query) => query.isError)) {
     return <Message type="error" text={messages.formSubmissionsError} />;
   }
 
@@ -189,7 +189,7 @@ function FundingRequestForm(props: { email: string }) {
     return <Message type="error" text={messages.formSubmissionError} />;
   }
 
-  const rebate = rebates.find((r) => r.frf.formio._id === mongoId);
+  const rebate = rebates2022.find((r) => r.frf.formio._id === mongoId);
 
   const frfNeedsEdits = !rebate
     ? false
diff --git a/app/client/src/routes/frf2023.tsx b/app/client/src/routes/frf2023.tsx
index 04f61c9a..3f4c258c 100644
--- a/app/client/src/routes/frf2023.tsx
+++ b/app/client/src/routes/frf2023.tsx
@@ -121,8 +121,8 @@ function FundingRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  // const submissionsQueries = use2022SubmissionsQueries();
-  // const rebates = use2022Rebates();
+  // const submissions2022Queries = use2022SubmissionsQueries();
+  // const rebates2022 = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
   const { userAccess, formSchema, submission } = query.data ?? {};
@@ -162,11 +162,11 @@ function FundingRequestForm(props: { email: string }) {
     return <Loading />;
   }
 
-  // if (submissionsQueries.some((query) => query.isFetching)) {
+  // if (submissions2022Queries.some((query) => query.isFetching)) {
   //   return <Loading />;
   // }
 
-  // if (submissionsQueries.some((query) => query.isError)) {
+  // if (submissions2022Queries.some((query) => query.isError)) {
   //   return <Message type="error" text={messages.formSubmissionsError} />;
   // }
 
@@ -178,7 +178,7 @@ function FundingRequestForm(props: { email: string }) {
     return <Message type="error" text={messages.formSubmissionError} />;
   }
 
-  // const rebate = rebates.find((r) => r.frf.formio._id === mongoId);
+  // const rebate = rebates2022.find((r) => r.frf.formio._id === mongoId);
 
   // const frfNeedsEdits = !rebate
   //   ? false
diff --git a/app/client/src/routes/prf2022.tsx b/app/client/src/routes/prf2022.tsx
index b331bcea..9ee67200 100644
--- a/app/client/src/routes/prf2022.tsx
+++ b/app/client/src/routes/prf2022.tsx
@@ -125,8 +125,8 @@ function PaymentRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  const submissionsQueries = use2022SubmissionsQueries();
-  const rebates = use2022Rebates();
+  const submissions2022Queries = use2022SubmissionsQueries();
+  const rebates2022 = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(rebateId);
   const { userAccess, formSchema, submission } = query.data ?? {};
@@ -166,11 +166,11 @@ function PaymentRequestForm(props: { email: string }) {
     return <Loading />;
   }
 
-  if (submissionsQueries.some((query) => query.isFetching)) {
+  if (submissions2022Queries.some((query) => query.isFetching)) {
     return <Loading />;
   }
 
-  if (submissionsQueries.some((query) => query.isError)) {
+  if (submissions2022Queries.some((query) => query.isError)) {
     return <Message type="error" text={messages.formSubmissionsError} />;
   }
 
@@ -182,7 +182,7 @@ function PaymentRequestForm(props: { email: string }) {
     return <Message type="error" text={messages.formSubmissionError} />;
   }
 
-  const rebate = rebates.find((r) => r.rebateId === rebateId);
+  const rebate = rebates2022.find((r) => r.rebateId === rebateId);
 
   const frfNeedsEdits = !rebate
     ? false
diff --git a/app/client/src/routes/submissions.tsx b/app/client/src/routes/submissions.tsx
index ab2a3547..608d51db 100644
--- a/app/client/src/routes/submissions.tsx
+++ b/app/client/src/routes/submissions.tsx
@@ -774,8 +774,8 @@ export function Submissions() {
   const content = useContentData();
   const configData = useConfigData();
   const bapSamData = useBapSamData();
-  const submissionsQueries = use2022SubmissionsQueries();
-  const rebates = use2022Rebates();
+  const submissions2022Queries = use2022SubmissionsQueries();
+  const rebates2022 = use2022Rebates();
   const { rebateYear } = useRebateYearState();
   const { setRebateYear } = useRebateYearActions();
 
@@ -788,11 +788,11 @@ export function Submissions() {
 
   if (!bapSamData) return null;
 
-  if (submissionsQueries.some((query) => query.isFetching)) {
+  if (submissions2022Queries.some((query) => query.isFetching)) {
     return <Loading />;
   }
 
-  if (submissionsQueries.some((query) => query.isError)) {
+  if (submissions2022Queries.some((query) => query.isError)) {
     return <Message type="error" text={messages.formSubmissionsError} />;
   }
 
@@ -840,7 +840,7 @@ export function Submissions() {
         </nav>
       </div>
 
-      {rebates.length === 0 ? (
+      {rebates2022.length === 0 ? (
         <div className="margin-top-4">
           <Message type="info" text={messages.newApplication} />
         </div>
@@ -922,13 +922,13 @@ export function Submissions() {
               </thead>
 
               <tbody>
-                {rebates.map((rebate, index) => (
+                {rebates2022.map((rebate, index) => (
                   <Fragment key={rebate.rebateId}>
                     <FRF2022Submission rebate={rebate} />
                     <PRF2022Submission rebate={rebate} />
                     <CRF2022Submission rebate={rebate} />
                     {/* blank row after all rebates but the last one */}
-                    {index !== rebates.length - 1 && (
+                    {index !== rebates2022.length - 1 && (
                       <tr className="bg-white">
                         <th className="p-0" scope="row" colSpan={6}>
                           &nbsp;

From ee1ca946a66cca18a8a9a711aba89d3c255cb00e Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Fri, 11 Aug 2023 17:49:32 -0400
Subject: [PATCH 67/71] Update Submissions route component to split up 2022 and
 2023 logic for fetching data and rendering content, based on rebate year

---
 app/client/src/routes/submissions.tsx | 283 +++++++++++++++-----------
 1 file changed, 162 insertions(+), 121 deletions(-)

diff --git a/app/client/src/routes/submissions.tsx b/app/client/src/routes/submissions.tsx
index 608d51db..a02631c1 100644
--- a/app/client/src/routes/submissions.tsx
+++ b/app/client/src/routes/submissions.tsx
@@ -11,6 +11,7 @@ import {
   useConfigData,
   useBapSamData,
   use2022SubmissionsQueries,
+  use2023SubmissionsQueries,
   use2022Rebates,
   submissionNeedsEdits,
   getUserInfo,
@@ -59,12 +60,10 @@ function FRF2022Submission(props: { rebate: Rebate2022 }) {
   const { frf, prf, crf } = rebate;
 
   const configData = useConfigData();
-  const { rebateYear } = useRebateYearState();
 
   if (!configData) return null;
 
-  const frfSubmissionPeriodOpen =
-    configData.submissionPeriodOpen[rebateYear].frf;
+  const frfSubmissionPeriodOpen = configData.submissionPeriodOpen["2022"].frf;
 
   const {
     applicantUEI,
@@ -311,7 +310,6 @@ function PRF2022Submission(props: { rebate: Rebate2022 }) {
   const configData = useConfigData();
   const bapSamData = useBapSamData();
   const { displayErrorNotification } = useNotificationsActions();
-  const { rebateYear } = useRebateYearState();
 
   /**
    * Stores when data is being posted to the server, so a loading indicator can
@@ -322,8 +320,7 @@ function PRF2022Submission(props: { rebate: Rebate2022 }) {
 
   if (!configData || !bapSamData) return null;
 
-  const prfSubmissionPeriodOpen =
-    configData.submissionPeriodOpen[rebateYear].prf;
+  const prfSubmissionPeriodOpen = configData.submissionPeriodOpen["2022"].prf;
 
   const frfSelected = frf.bap?.status === "Accepted";
 
@@ -543,7 +540,6 @@ function CRF2022Submission(props: { rebate: Rebate2022 }) {
   const configData = useConfigData();
   const bapSamData = useBapSamData();
   const { displayErrorNotification } = useNotificationsActions();
-  const { rebateYear } = useRebateYearState();
 
   /**
    * Stores when data is being posted to the server, so a loading indicator can
@@ -554,8 +550,7 @@ function CRF2022Submission(props: { rebate: Rebate2022 }) {
 
   if (!configData || !bapSamData) return null;
 
-  const crfSubmissionPeriodOpen =
-    configData.submissionPeriodOpen[rebateYear].crf;
+  const crfSubmissionPeriodOpen = configData.submissionPeriodOpen["2022"].crf;
 
   const prfFundingApproved = prf.bap?.status === "Accepted";
 
@@ -770,12 +765,166 @@ function NewApplicationIconText() {
   );
 }
 
+function Submissions2022() {
+  const content = useContentData();
+  const submissionsQueries = use2022SubmissionsQueries();
+  const rebates = use2022Rebates();
+
+  if (submissionsQueries.some((query) => query.isFetching)) {
+    return <Loading />;
+  }
+
+  if (submissionsQueries.some((query) => query.isError)) {
+    return <Message type="error" text={messages.formSubmissionsError} />;
+  }
+
+  if (rebates.length === 0) {
+    return (
+      <div className="margin-top-4">
+        <Message type="info" text={messages.newApplication} />
+      </div>
+    );
+  }
+
+  return (
+    <>
+      {content && (
+        <MarkdownContent
+          className="margin-top-4"
+          children={content.allRebatesIntro}
+        />
+      )}
+
+      <div className="usa-table-container--scrollable" tabIndex={0}>
+        <table
+          aria-label="Your Rebate Forms"
+          className="usa-table usa-table--stacked usa-table--borderless width-full"
+        >
+          <thead>
+            <tr className="font-sans-2xs text-no-wrap text-bottom">
+              <th scope="col">
+                <span className="usa-sr-only">Open</span>
+              </th>
+
+              <th scope="col">
+                <TextWithTooltip
+                  text="Rebate ID"
+                  tooltip="Unique Clean School Bus Rebate ID"
+                />
+              </th>
+
+              <th scope="col">
+                <TextWithTooltip
+                  text="Form Type"
+                  tooltip="Application, Payment Request, or Close Out form"
+                />
+                <br />
+                <TextWithTooltip
+                  text="Form Status"
+                  tooltip="Draft, Edits Requested, Submitted, Withdrawn, Selected, or Not Selected" // TODO: update to reflect other statuses
+                />
+              </th>
+
+              <th scope="col">
+                <TextWithTooltip
+                  text="UEI"
+                  tooltip="Unique Entity ID from SAM.gov"
+                />
+                <br />
+                <TextWithTooltip
+                  text="EFT Indicator"
+                  tooltip="Electronic Funds Transfer Indicator listing the associated bank account from SAM.gov"
+                />
+              </th>
+
+              <th scope="col">
+                <TextWithTooltip
+                  text="Applicant"
+                  tooltip="Legal Business Name from SAM.gov for this UEI"
+                />
+                <br />
+                <TextWithTooltip
+                  text="School District"
+                  tooltip="School district represented by applicant"
+                />
+              </th>
+
+              <th scope="col">
+                <TextWithTooltip
+                  text="Updated By"
+                  tooltip="Last person that updated this form"
+                />
+                <br />
+                <TextWithTooltip
+                  text="Date Updated"
+                  tooltip="Last date this form was updated"
+                />
+              </th>
+            </tr>
+          </thead>
+
+          <tbody>
+            {rebates.map((rebate, index) => (
+              <Fragment key={rebate.rebateId}>
+                <FRF2022Submission rebate={rebate} />
+                <PRF2022Submission rebate={rebate} />
+                <CRF2022Submission rebate={rebate} />
+                {/* blank row after all rebates but the last one */}
+                {index !== rebates.length - 1 && (
+                  <tr className="bg-white">
+                    <th className="p-0" scope="row" colSpan={6}>
+                      &nbsp;
+                    </th>
+                  </tr>
+                )}
+              </Fragment>
+            ))}
+          </tbody>
+        </table>
+      </div>
+    </>
+  );
+}
+
+function Submissions2023() {
+  // const content = useContentData();
+  const submissionsQueries = use2023SubmissionsQueries();
+  // const rebates = use2022Rebates();
+
+  if (submissionsQueries.some((query) => query.isFetching)) {
+    return <Loading />;
+  }
+
+  if (submissionsQueries.some((query) => query.isError)) {
+    return <Message type="error" text={messages.formSubmissionsError} />;
+  }
+
+  // if (rebates.length === 0) {
+  //   return (
+  //     <div className="margin-top-4">
+  //       <Message type="info" text={messages.newApplication} />
+  //     </div>
+  //   );
+  // }
+
+  return (
+    <>
+      {/* {content && (
+        <MarkdownContent
+          className="margin-top-4"
+          children={content.allRebatesIntro}
+        />
+      )} */}
+
+      <p>(2023 submissions)</p>
+    </>
+  );
+}
+
 export function Submissions() {
   const content = useContentData();
   const configData = useConfigData();
   const bapSamData = useBapSamData();
-  const submissions2022Queries = use2022SubmissionsQueries();
-  const rebates2022 = use2022Rebates();
   const { rebateYear } = useRebateYearState();
   const { setRebateYear } = useRebateYearActions();
 
@@ -788,14 +937,6 @@ export function Submissions() {
 
   if (!bapSamData) return null;
 
-  if (submissions2022Queries.some((query) => query.isFetching)) {
-    return <Loading />;
-  }
-
-  if (submissions2022Queries.some((query) => query.isError)) {
-    return <Message type="error" text={messages.formSubmissionsError} />;
-  }
-
   return (
     <>
       {bapSamData.entities.some((e) => e.ENTITY_STATUS__c !== "Active") && (
@@ -840,108 +981,8 @@ export function Submissions() {
         </nav>
       </div>
 
-      {rebates2022.length === 0 ? (
-        <div className="margin-top-4">
-          <Message type="info" text={messages.newApplication} />
-        </div>
-      ) : (
-        <>
-          {content && (
-            <MarkdownContent
-              className="margin-top-4"
-              children={content.allRebatesIntro}
-            />
-          )}
-
-          <div className="usa-table-container--scrollable" tabIndex={0}>
-            <table
-              aria-label="Your Rebate Forms"
-              className="usa-table usa-table--stacked usa-table--borderless width-full"
-            >
-              <thead>
-                <tr className="font-sans-2xs text-no-wrap text-bottom">
-                  <th scope="col">
-                    <span className="usa-sr-only">Open</span>
-                  </th>
-
-                  <th scope="col">
-                    <TextWithTooltip
-                      text="Rebate ID"
-                      tooltip="Unique Clean School Bus Rebate ID"
-                    />
-                  </th>
-
-                  <th scope="col">
-                    <TextWithTooltip
-                      text="Form Type"
-                      tooltip="Application, Payment Request, or Close Out form"
-                    />
-                    <br />
-                    <TextWithTooltip
-                      text="Form Status"
-                      tooltip="Draft, Edits Requested, Submitted, Withdrawn, Selected, or Not Selected" // TODO: update to reflect other statuses
-                    />
-                  </th>
-
-                  <th scope="col">
-                    <TextWithTooltip
-                      text="UEI"
-                      tooltip="Unique Entity ID from SAM.gov"
-                    />
-                    <br />
-                    <TextWithTooltip
-                      text="EFT Indicator"
-                      tooltip="Electronic Funds Transfer Indicator listing the associated bank account from SAM.gov"
-                    />
-                  </th>
-
-                  <th scope="col">
-                    <TextWithTooltip
-                      text="Applicant"
-                      tooltip="Legal Business Name from SAM.gov for this UEI"
-                    />
-                    <br />
-                    <TextWithTooltip
-                      text="School District"
-                      tooltip="School district represented by applicant"
-                    />
-                  </th>
-
-                  <th scope="col">
-                    <TextWithTooltip
-                      text="Updated By"
-                      tooltip="Last person that updated this form"
-                    />
-                    <br />
-                    <TextWithTooltip
-                      text="Date Updated"
-                      tooltip="Last date this form was updated"
-                    />
-                  </th>
-                </tr>
-              </thead>
-
-              <tbody>
-                {rebates2022.map((rebate, index) => (
-                  <Fragment key={rebate.rebateId}>
-                    <FRF2022Submission rebate={rebate} />
-                    <PRF2022Submission rebate={rebate} />
-                    <CRF2022Submission rebate={rebate} />
-                    {/* blank row after all rebates but the last one */}
-                    {index !== rebates2022.length - 1 && (
-                      <tr className="bg-white">
-                        <th className="p-0" scope="row" colSpan={6}>
-                          &nbsp;
-                        </th>
-                      </tr>
-                    )}
-                  </Fragment>
-                ))}
-              </tbody>
-            </table>
-          </div>
-        </>
-      )}
+      {rebateYear === "2022" && <Submissions2022 />}
+      {rebateYear === "2023" && <Submissions2023 />}
 
       {content && (
         <MarkdownContent

From b3fd0cccfc339d56e4ed7b99e38934f8c63f58d7 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Fri, 11 Aug 2023 17:50:32 -0400
Subject: [PATCH 68/71] Update server app comments and variables in api routes
 to be consistent

---
 app/server/app/routes/formio2022.js | 26 +++++++++++++-------------
 app/server/app/routes/help.js       |  2 +-
 app/server/app/routes/status.js     |  6 +++---
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js
index f0aa9e21..af1052d1 100644
--- a/app/server/app/routes/formio2022.js
+++ b/app/server/app/routes/formio2022.js
@@ -87,7 +87,7 @@ router.post(
 router.get("/prf-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
-  const userSubmissionsUrl =
+  const submissionsUrl =
     `${formioPRFUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
@@ -96,11 +96,11 @@ router.get("/prf-submissions", storeBapComboKeys, (req, res) => {
     )}`;
 
   axiosFormio(req)
-    .get(userSubmissionsUrl)
+    .get(submissionsUrl)
     .then((axiosRes) => axiosRes.data)
     .then((submissions) => res.json(submissions))
     .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
+      // NOTE: error is logged in axiosFormio response interceptor
       const errorStatus = error.response?.status || 500;
       const errorMessage = `Error getting Formio Payment Request form submissions.`;
       return res.status(errorStatus).json({ message: errorMessage });
@@ -220,7 +220,7 @@ router.post("/prf-submission", storeBapComboKeys, (req, res) => {
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
-          // NOTE: logged in axiosFormio response interceptor
+          // NOTE: error is logged in axiosFormio response interceptor
           const errorStatus = error.response?.status || 500;
           const errorMessage = `Error posting Formio Payment Request form submission.`;
           return res.status(errorStatus).json({ message: errorMessage });
@@ -295,7 +295,7 @@ router.get("/prf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
         });
     })
     .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
+      // NOTE: error is logged in axiosFormio response interceptor
       const errorStatus = error.response?.status || 500;
       const errorMessage = `Error getting Formio Payment Request form submission '${rebateId}'.`;
       return res.status(errorStatus).json({ message: errorMessage });
@@ -347,7 +347,7 @@ router.post("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => {
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
-          // NOTE: logged in axiosFormio response interceptor
+          // NOTE: error is logged in axiosFormio response interceptor
           const errorStatus = error.response?.status || 500;
           const errorMessage = `Error updating Formio Payment Request form submission '${rebateId}'.`;
           return res.status(errorStatus).json({ message: errorMessage });
@@ -416,7 +416,7 @@ router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => {
           res.json(response);
         })
         .catch((error) => {
-          // NOTE: logged in axiosFormio response interceptor
+          // NOTE: error is logged in axiosFormio response interceptor
           const errorStatus = error.response?.status || 500;
           const errorMessage = `Error deleting Formio Payment Request form submission '${rebateId}'.`;
           return res.status(errorStatus).json({ message: errorMessage });
@@ -434,7 +434,7 @@ router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => {
 router.get("/crf-submissions", storeBapComboKeys, (req, res) => {
   const { bapComboKeys } = req;
 
-  const userSubmissionsUrl =
+  const submissionsUrl =
     `${formioCRFUrl}/submission` +
     `?sort=-modified` +
     `&limit=1000000` +
@@ -443,11 +443,11 @@ router.get("/crf-submissions", storeBapComboKeys, (req, res) => {
     )}`;
 
   axiosFormio(req)
-    .get(userSubmissionsUrl)
+    .get(submissionsUrl)
     .then((axiosRes) => axiosRes.data)
     .then((submissions) => res.json(submissions))
     .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
+      // NOTE: error is logged in axiosFormio response interceptor
       const errorStatus = error.response?.status || 500;
       const errorMessage = `Error getting Formio Close Out form submissions.`;
       return res.status(errorStatus).json({ message: errorMessage });
@@ -622,7 +622,7 @@ router.post("/crf-submission", storeBapComboKeys, (req, res) => {
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
-          // NOTE: logged in axiosFormio response interceptor
+          // NOTE: error is logged in axiosFormio response interceptor
           const errorStatus = error.response?.status || 500;
           const errorMessage = `Error posting Formio Close Out form submission.`;
           return res.status(errorStatus).json({ message: errorMessage });
@@ -697,7 +697,7 @@ router.get("/crf-submission/:rebateId", storeBapComboKeys, async (req, res) => {
         });
     })
     .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
+      // NOTE: error is logged in axiosFormio response interceptor
       const errorStatus = error.response?.status || 500;
       const errorMessage = `Error getting Formio Close Out form submission '${rebateId}'.`;
       return res.status(errorStatus).json({ message: errorMessage });
@@ -749,7 +749,7 @@ router.post("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => {
         .then((axiosRes) => axiosRes.data)
         .then((submission) => res.json(submission))
         .catch((error) => {
-          // NOTE: logged in axiosFormio response interceptor
+          // NOTE: error is logged in axiosFormio response interceptor
           const errorStatus = error.response?.status || 500;
           const errorMessage = `Error updating Formio Close Out form submission '${rebateId}'.`;
           return res.status(errorStatus).json({ message: errorMessage });
diff --git a/app/server/app/routes/help.js b/app/server/app/routes/help.js
index ca9055ce..79793c49 100644
--- a/app/server/app/routes/help.js
+++ b/app/server/app/routes/help.js
@@ -82,7 +82,7 @@ router.get("/formio/submission/:formType/:id", (req, res) => {
           });
         })
         .catch((error) => {
-          // NOTE: logged in axiosFormio response interceptor
+          // NOTE: error is logged in axiosFormio response interceptor
           const errorStatus = error.response?.status || 500;
           const errorMessage = `Error getting ${formName} submission '${CSB_Form_ID__c}'.`;
           return res.status(errorStatus).json({ message: errorMessage });
diff --git a/app/server/app/routes/status.js b/app/server/app/routes/status.js
index bde9950a..cb1f0ffd 100644
--- a/app/server/app/routes/status.js
+++ b/app/server/app/routes/status.js
@@ -36,7 +36,7 @@ router.get("/formio-application-schema", (req, res) => {
       return res.json({ status: schema.type === "form" && !!schema.title });
     })
     .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
+      // NOTE: error is logged in axiosFormio response interceptor
       return res.json({ status: false });
     });
 });
@@ -53,7 +53,7 @@ router.get("/formio-payment-request-schema", (req, res) => {
       return res.json({ status: schema.type === "form" && !!schema.title });
     })
     .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
+      // NOTE: error is logged in axiosFormio response interceptor
       return res.json({ status: false });
     });
 });
@@ -70,7 +70,7 @@ router.get("/formio-close-out-schema", (req, res) => {
       return res.json({ status: schema.type === "form" && !!schema.title });
     })
     .catch((error) => {
-      // NOTE: logged in axiosFormio response interceptor
+      // NOTE: error is logged in axiosFormio response interceptor
       return res.json({ status: false });
     });
 });

From d836799266f739a0e5824a90feae09a96884a236 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 15 Aug 2023 11:18:35 -0400
Subject: [PATCH 69/71] Combine use2022SubmissionsQueries() and
 use2023SubmissionsQueries()

---
 app/client/src/routes/crf2022.tsx     |   8 +-
 app/client/src/routes/frf2022.tsx     |   8 +-
 app/client/src/routes/frf2023.tsx     |  16 +--
 app/client/src/routes/prf2022.tsx     |   8 +-
 app/client/src/routes/submissions.tsx |   7 +-
 app/client/src/utilities.tsx          | 170 ++++++++++++++------------
 6 files changed, 116 insertions(+), 101 deletions(-)

diff --git a/app/client/src/routes/crf2022.tsx b/app/client/src/routes/crf2022.tsx
index 51a1e2c1..670ebf3b 100644
--- a/app/client/src/routes/crf2022.tsx
+++ b/app/client/src/routes/crf2022.tsx
@@ -15,7 +15,7 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
-  use2022SubmissionsQueries,
+  useSubmissionsQueries,
   use2022Rebates,
   submissionNeedsEdits,
   getUserInfo,
@@ -125,7 +125,7 @@ function CloseOutRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  const submissions2022Queries = use2022SubmissionsQueries();
+  const submissionsQueries = useSubmissionsQueries("2022");
   const rebates2022 = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(rebateId);
@@ -166,11 +166,11 @@ function CloseOutRequestForm(props: { email: string }) {
     return <Loading />;
   }
 
-  if (submissions2022Queries.some((query) => query.isFetching)) {
+  if (submissionsQueries.some((query) => query.isFetching)) {
     return <Loading />;
   }
 
-  if (submissions2022Queries.some((query) => query.isError)) {
+  if (submissionsQueries.some((query) => query.isError)) {
     return <Message type="error" text={messages.formSubmissionsError} />;
   }
 
diff --git a/app/client/src/routes/frf2022.tsx b/app/client/src/routes/frf2022.tsx
index 7443e35e..19fe5842 100644
--- a/app/client/src/routes/frf2022.tsx
+++ b/app/client/src/routes/frf2022.tsx
@@ -15,7 +15,7 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
-  use2022SubmissionsQueries,
+  useSubmissionsQueries,
   use2022Rebates,
   submissionNeedsEdits,
   getUserInfo,
@@ -132,7 +132,7 @@ function FundingRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  const submissions2022Queries = use2022SubmissionsQueries();
+  const submissionsQueries = useSubmissionsQueries("2022");
   const rebates2022 = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
@@ -173,11 +173,11 @@ function FundingRequestForm(props: { email: string }) {
     return <Loading />;
   }
 
-  if (submissions2022Queries.some((query) => query.isFetching)) {
+  if (submissionsQueries.some((query) => query.isFetching)) {
     return <Loading />;
   }
 
-  if (submissions2022Queries.some((query) => query.isError)) {
+  if (submissionsQueries.some((query) => query.isError)) {
     return <Message type="error" text={messages.formSubmissionsError} />;
   }
 
diff --git a/app/client/src/routes/frf2023.tsx b/app/client/src/routes/frf2023.tsx
index 3f4c258c..b0fc84d1 100644
--- a/app/client/src/routes/frf2023.tsx
+++ b/app/client/src/routes/frf2023.tsx
@@ -15,7 +15,7 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
-  // use2022SubmissionsQueries,
+  useSubmissionsQueries,
   // use2022Rebates,
   // submissionNeedsEdits,
   getUserInfo,
@@ -121,7 +121,7 @@ function FundingRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  // const submissions2022Queries = use2022SubmissionsQueries();
+  const submissionsQueries = useSubmissionsQueries("2023");
   // const rebates2022 = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
@@ -162,13 +162,13 @@ function FundingRequestForm(props: { email: string }) {
     return <Loading />;
   }
 
-  // if (submissions2022Queries.some((query) => query.isFetching)) {
-  //   return <Loading />;
-  // }
+  if (submissionsQueries.some((query) => query.isFetching)) {
+    return <Loading />;
+  }
 
-  // if (submissions2022Queries.some((query) => query.isError)) {
-  //   return <Message type="error" text={messages.formSubmissionsError} />;
-  // }
+  if (submissionsQueries.some((query) => query.isError)) {
+    return <Message type="error" text={messages.formSubmissionsError} />;
+  }
 
   if (query.isInitialLoading) {
     return <Loading />;
diff --git a/app/client/src/routes/prf2022.tsx b/app/client/src/routes/prf2022.tsx
index 9ee67200..7e9f1cdd 100644
--- a/app/client/src/routes/prf2022.tsx
+++ b/app/client/src/routes/prf2022.tsx
@@ -15,7 +15,7 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
-  use2022SubmissionsQueries,
+  useSubmissionsQueries,
   use2022Rebates,
   submissionNeedsEdits,
   getUserInfo,
@@ -125,7 +125,7 @@ function PaymentRequestForm(props: { email: string }) {
   } = useNotificationsActions();
   const { rebateYear } = useRebateYearState();
 
-  const submissions2022Queries = use2022SubmissionsQueries();
+  const submissionsQueries = useSubmissionsQueries("2022");
   const rebates2022 = use2022Rebates();
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(rebateId);
@@ -166,11 +166,11 @@ function PaymentRequestForm(props: { email: string }) {
     return <Loading />;
   }
 
-  if (submissions2022Queries.some((query) => query.isFetching)) {
+  if (submissionsQueries.some((query) => query.isFetching)) {
     return <Loading />;
   }
 
-  if (submissions2022Queries.some((query) => query.isError)) {
+  if (submissionsQueries.some((query) => query.isError)) {
     return <Message type="error" text={messages.formSubmissionsError} />;
   }
 
diff --git a/app/client/src/routes/submissions.tsx b/app/client/src/routes/submissions.tsx
index a02631c1..764a2a67 100644
--- a/app/client/src/routes/submissions.tsx
+++ b/app/client/src/routes/submissions.tsx
@@ -10,8 +10,7 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
-  use2022SubmissionsQueries,
-  use2023SubmissionsQueries,
+  useSubmissionsQueries,
   use2022Rebates,
   submissionNeedsEdits,
   getUserInfo,
@@ -767,7 +766,7 @@ function NewApplicationIconText() {
 
 function Submissions2022() {
   const content = useContentData();
-  const submissionsQueries = use2022SubmissionsQueries();
+  const submissionsQueries = useSubmissionsQueries("2022");
   const rebates = use2022Rebates();
 
   if (submissionsQueries.some((query) => query.isFetching)) {
@@ -888,7 +887,7 @@ function Submissions2022() {
 
 function Submissions2023() {
   // const content = useContentData();
-  const submissionsQueries = use2023SubmissionsQueries();
+  const submissionsQueries = useSubmissionsQueries("2023");
   // const rebates = use2022Rebates();
 
   if (submissionsQueries.some((query) => query.isFetching)) {
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 7a502a0d..a2a29827 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -314,84 +314,100 @@ export function useBapSamData() {
   return queryClient.getQueryData<BapSamData>(["bap/sam"]);
 }
 
-/** Custom hook to fetch all 2022 submissions from the BAP and Formio */
-export function use2022SubmissionsQueries() {
-  return useQueries({
-    queries: [
-      {
-        queryKey: ["bap/submissions"],
-        queryFn: () => {
-          const url = `${serverUrl}/api/bap/submissions`;
-          return getData<BapFormSubmission[]>(url).then((res) => {
-            const submissions = res.reduce(
-              (object, submission) => {
-                const formType =
-                  submission.Record_Type_Name__c === "CSB Funding Request"
-                    ? "frfs"
-                    : submission.Record_Type_Name__c === "CSB Payment Request"
-                    ? "prfs"
-                    : submission.Record_Type_Name__c === "CSB Closeout Request"
-                    ? "crfs"
-                    : null;
-
-                if (formType) object[formType].push(submission);
-
-                return object;
-              },
-              {
-                frfs: [] as BapFormSubmission[],
-                prfs: [] as BapFormSubmission[],
-                crfs: [] as BapFormSubmission[],
-              }
-            );
-
-            return Promise.resolve(submissions);
-          });
-        },
-        refetchOnWindowFocus: false,
-      },
-      {
-        queryKey: ["formio/2022/frf-submissions"],
-        queryFn: () => {
-          const url = `${serverUrl}/api/formio/2022/frf-submissions`;
-          return getData<FormioFRF2022Submission[]>(url);
-        },
-        refetchOnWindowFocus: false,
-      },
-      {
-        queryKey: ["formio/2022/prf-submissions"],
-        queryFn: () => {
-          const url = `${serverUrl}/api/formio/2022/prf-submissions`;
-          return getData<FormioPRF2022Submission[]>(url);
-        },
-        refetchOnWindowFocus: false,
-      },
-      {
-        queryKey: ["formio/2022/crf-submissions"],
-        queryFn: () => {
-          const url = `${serverUrl}/api/formio/2022/crf-submissions`;
-          return getData<FormioCRF2022Submission[]>(url);
-        },
-        refetchOnWindowFocus: false,
-      },
-    ],
-  });
-}
+/** Custom hook to fetch submissions from the BAP and Formio */
+export function useSubmissionsQueries(rebateYear: RebateYear) {
+  const bapQuery = {
+    queryKey: ["bap/submissions"],
+    queryFn: () => {
+      const url = `${serverUrl}/api/bap/submissions`;
+      return getData<BapFormSubmission[]>(url).then((res) => {
+        const submissions = res.reduce(
+          (object, submission) => {
+            const formType =
+              submission.Record_Type_Name__c === "CSB Funding Request"
+                ? "frfs"
+                : submission.Record_Type_Name__c === "CSB Payment Request"
+                ? "prfs"
+                : submission.Record_Type_Name__c === "CSB Closeout Request"
+                ? "crfs"
+                : null;
+
+            if (formType) object[formType].push(submission);
+
+            return object;
+          },
+          {
+            frfs: [] as BapFormSubmission[],
+            prfs: [] as BapFormSubmission[],
+            crfs: [] as BapFormSubmission[],
+          }
+        );
+
+        return Promise.resolve(submissions);
+      });
+    },
+    refetchOnWindowFocus: false,
+  };
 
-/** Custom hook to fetch all 2023 submissions from Formio */
-export function use2023SubmissionsQueries() {
-  return useQueries({
-    queries: [
-      {
-        queryKey: ["formio/2023/frf-submissions"],
-        queryFn: () => {
-          const url = `${serverUrl}/api/formio/2023/frf-submissions`;
-          return getData<FormioFRF2023Submission[]>(url);
-        },
-        refetchOnWindowFocus: false,
-      },
-    ],
-  });
+  const formioFRF2022Query = {
+    queryKey: ["formio/2022/frf-submissions"],
+    queryFn: () => {
+      const url = `${serverUrl}/api/formio/2022/frf-submissions`;
+      return getData<FormioFRF2022Submission[]>(url);
+    },
+    refetchOnWindowFocus: false,
+  };
+
+  const formioPRF2022Query = {
+    queryKey: ["formio/2022/prf-submissions"],
+    queryFn: () => {
+      const url = `${serverUrl}/api/formio/2022/prf-submissions`;
+      return getData<FormioPRF2022Submission[]>(url);
+    },
+    refetchOnWindowFocus: false,
+  };
+
+  const formioCRF2022Query = {
+    queryKey: ["formio/2022/crf-submissions"],
+    queryFn: () => {
+      const url = `${serverUrl}/api/formio/2022/crf-submissions`;
+      return getData<FormioCRF2022Submission[]>(url);
+    },
+    refetchOnWindowFocus: false,
+  };
+
+  const formioFRF2023Query = {
+    queryKey: ["formio/2023/frf-submissions"],
+    queryFn: () => {
+      const url = `${serverUrl}/api/formio/2023/frf-submissions`;
+      return getData<FormioFRF2023Submission[]>(url);
+    },
+    refetchOnWindowFocus: false,
+  };
+
+  type Query = {
+    queryKey: string[];
+    queryFn: () =>
+      | Promise<{
+          frfs: BapFormSubmission[];
+          prfs: BapFormSubmission[];
+          crfs: BapFormSubmission[];
+        }>
+      | Promise<FormioFRF2022Submission[]>
+      | Promise<FormioPRF2022Submission[]>
+      | Promise<FormioCRF2022Submission[]>
+      | Promise<FormioFRF2023Submission[]>;
+    refetchOnWindowFocus: boolean;
+  };
+
+  const queries: Query[] =
+    rebateYear === "2022"
+      ? [bapQuery, formioFRF2022Query, formioPRF2022Query, formioCRF2022Query]
+      : rebateYear === "2023"
+      ? [formioFRF2023Query]
+      : [];
+
+  return useQueries({ queries });
 }
 
 /**

From 6e99b5d6504e7c5048b1cecc1a149f835a15c552 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Tue, 15 Aug 2023 14:14:06 -0400
Subject: [PATCH 70/71] Begin updating hooks and functions that combine rebates
 to work across multiple years

---
 app/client/src/routes/crf2022.tsx     |   6 +-
 app/client/src/routes/frf2022.tsx     |   6 +-
 app/client/src/routes/frf2023.tsx     |   6 +-
 app/client/src/routes/prf2022.tsx     |   6 +-
 app/client/src/routes/submissions.tsx |  74 ++++++-----
 app/client/src/utilities.tsx          | 184 +++++++++++++++++++-------
 6 files changed, 186 insertions(+), 96 deletions(-)

diff --git a/app/client/src/routes/crf2022.tsx b/app/client/src/routes/crf2022.tsx
index 670ebf3b..472c4efc 100644
--- a/app/client/src/routes/crf2022.tsx
+++ b/app/client/src/routes/crf2022.tsx
@@ -16,7 +16,7 @@ import {
   useConfigData,
   useBapSamData,
   useSubmissionsQueries,
-  use2022Rebates,
+  useSubmissions,
   submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
@@ -126,7 +126,7 @@ function CloseOutRequestForm(props: { email: string }) {
   const { rebateYear } = useRebateYearState();
 
   const submissionsQueries = useSubmissionsQueries("2022");
-  const rebates2022 = use2022Rebates();
+  const submissions = useSubmissions("2022");
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(rebateId);
   const { userAccess, formSchema, submission } = query.data ?? {};
@@ -182,7 +182,7 @@ function CloseOutRequestForm(props: { email: string }) {
     return <Message type="error" text={messages.formSubmissionError} />;
   }
 
-  const rebate = rebates2022.find((r) => r.rebateId === rebateId);
+  const rebate = submissions.find((r) => r.rebateId === rebateId);
 
   const crfNeedsEdits = !rebate
     ? false
diff --git a/app/client/src/routes/frf2022.tsx b/app/client/src/routes/frf2022.tsx
index 19fe5842..8e41dcad 100644
--- a/app/client/src/routes/frf2022.tsx
+++ b/app/client/src/routes/frf2022.tsx
@@ -16,7 +16,7 @@ import {
   useConfigData,
   useBapSamData,
   useSubmissionsQueries,
-  use2022Rebates,
+  useSubmissions,
   submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
@@ -133,7 +133,7 @@ function FundingRequestForm(props: { email: string }) {
   const { rebateYear } = useRebateYearState();
 
   const submissionsQueries = useSubmissionsQueries("2022");
-  const rebates2022 = use2022Rebates();
+  const submissions = useSubmissions("2022");
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
   const { userAccess, formSchema, submission } = query.data ?? {};
@@ -189,7 +189,7 @@ function FundingRequestForm(props: { email: string }) {
     return <Message type="error" text={messages.formSubmissionError} />;
   }
 
-  const rebate = rebates2022.find((r) => r.frf.formio._id === mongoId);
+  const rebate = submissions.find((r) => r.frf.formio._id === mongoId);
 
   const frfNeedsEdits = !rebate
     ? false
diff --git a/app/client/src/routes/frf2023.tsx b/app/client/src/routes/frf2023.tsx
index b0fc84d1..029846eb 100644
--- a/app/client/src/routes/frf2023.tsx
+++ b/app/client/src/routes/frf2023.tsx
@@ -16,7 +16,7 @@ import {
   useConfigData,
   useBapSamData,
   useSubmissionsQueries,
-  // use2022Rebates,
+  // useSubmissions,
   // submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
@@ -122,7 +122,7 @@ function FundingRequestForm(props: { email: string }) {
   const { rebateYear } = useRebateYearState();
 
   const submissionsQueries = useSubmissionsQueries("2023");
-  // const rebates2022 = use2022Rebates();
+  // const submissions = useSubmissions("2023");
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
   const { userAccess, formSchema, submission } = query.data ?? {};
@@ -178,7 +178,7 @@ function FundingRequestForm(props: { email: string }) {
     return <Message type="error" text={messages.formSubmissionError} />;
   }
 
-  // const rebate = rebates2022.find((r) => r.frf.formio._id === mongoId);
+  // const rebate = submissions.find((r) => r.frf.formio._id === mongoId);
 
   // const frfNeedsEdits = !rebate
   //   ? false
diff --git a/app/client/src/routes/prf2022.tsx b/app/client/src/routes/prf2022.tsx
index 7e9f1cdd..8644cf0c 100644
--- a/app/client/src/routes/prf2022.tsx
+++ b/app/client/src/routes/prf2022.tsx
@@ -16,7 +16,7 @@ import {
   useConfigData,
   useBapSamData,
   useSubmissionsQueries,
-  use2022Rebates,
+  useSubmissions,
   submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
@@ -126,7 +126,7 @@ function PaymentRequestForm(props: { email: string }) {
   const { rebateYear } = useRebateYearState();
 
   const submissionsQueries = useSubmissionsQueries("2022");
-  const rebates2022 = use2022Rebates();
+  const submissions = useSubmissions("2022");
 
   const { query, mutation } = useFormioSubmissionQueryAndMutation(rebateId);
   const { userAccess, formSchema, submission } = query.data ?? {};
@@ -182,7 +182,7 @@ function PaymentRequestForm(props: { email: string }) {
     return <Message type="error" text={messages.formSubmissionError} />;
   }
 
-  const rebate = rebates2022.find((r) => r.rebateId === rebateId);
+  const rebate = submissions.find((r) => r.rebateId === rebateId);
 
   const frfNeedsEdits = !rebate
     ? false
diff --git a/app/client/src/routes/submissions.tsx b/app/client/src/routes/submissions.tsx
index 764a2a67..c6357a95 100644
--- a/app/client/src/routes/submissions.tsx
+++ b/app/client/src/routes/submissions.tsx
@@ -5,13 +5,13 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  Rebate2022,
+  Rebate,
   postData,
   useContentData,
   useConfigData,
   useBapSamData,
   useSubmissionsQueries,
-  use2022Rebates,
+  useSubmissions,
   submissionNeedsEdits,
   getUserInfo,
 } from "../utilities";
@@ -54,7 +54,9 @@ function ButtonLink(props: { type: "edit" | "view"; to: LinkProps["to"] }) {
   );
 }
 
-function FRF2022Submission(props: { rebate: Rebate2022 }) {
+function FRF2022Submission(props: {
+  rebate: Extract<Rebate, { rebateYear: "2022" }>;
+}) {
   const { rebate } = props;
   const { frf, prf, crf } = rebate;
 
@@ -299,7 +301,9 @@ save the form for the EFT indicator to be displayed. */
   );
 }
 
-function PRF2022Submission(props: { rebate: Rebate2022 }) {
+function PRF2022Submission(props: {
+  rebate: Extract<Rebate, { rebateYear: "2022" }>;
+}) {
   const { rebate } = props;
   const { frf, prf, crf } = rebate;
 
@@ -529,7 +533,9 @@ function PRF2022Submission(props: { rebate: Rebate2022 }) {
   );
 }
 
-function CRF2022Submission(props: { rebate: Rebate2022 }) {
+function CRF2022Submission(props: {
+  rebate: Extract<Rebate, { rebateYear: "2022" }>;
+}) {
   const { rebate } = props;
   const { frf, prf, crf } = rebate;
 
@@ -767,7 +773,7 @@ function NewApplicationIconText() {
 function Submissions2022() {
   const content = useContentData();
   const submissionsQueries = useSubmissionsQueries("2022");
-  const rebates = use2022Rebates();
+  const submissions = useSubmissions("2022");
 
   if (submissionsQueries.some((query) => query.isFetching)) {
     return <Loading />;
@@ -777,7 +783,7 @@ function Submissions2022() {
     return <Message type="error" text={messages.formSubmissionsError} />;
   }
 
-  if (rebates.length === 0) {
+  if (submissions.length === 0) {
     return (
       <div className="margin-top-4">
         <Message type="info" text={messages.newApplication} />
@@ -863,21 +869,23 @@ function Submissions2022() {
           </thead>
 
           <tbody>
-            {rebates.map((rebate, index) => (
-              <Fragment key={rebate.rebateId}>
-                <FRF2022Submission rebate={rebate} />
-                <PRF2022Submission rebate={rebate} />
-                <CRF2022Submission rebate={rebate} />
-                {/* blank row after all rebates but the last one */}
-                {index !== rebates.length - 1 && (
-                  <tr className="bg-white">
-                    <th className="p-0" scope="row" colSpan={6}>
-                      &nbsp;
-                    </th>
-                  </tr>
-                )}
-              </Fragment>
-            ))}
+            {submissions.map((rebate, index) => {
+              return rebate.rebateYear === "2022" ? (
+                <Fragment key={rebate.rebateId}>
+                  <FRF2022Submission rebate={rebate} />
+                  <PRF2022Submission rebate={rebate} />
+                  <CRF2022Submission rebate={rebate} />
+                  {/* blank row after all submissions but the last one */}
+                  {index !== submissions.length - 1 && (
+                    <tr className="bg-white">
+                      <th className="p-0" scope="row" colSpan={6}>
+                        &nbsp;
+                      </th>
+                    </tr>
+                  )}
+                </Fragment>
+              ) : null;
+            })}
           </tbody>
         </table>
       </div>
@@ -886,9 +894,9 @@ function Submissions2022() {
 }
 
 function Submissions2023() {
-  // const content = useContentData();
+  const content = useContentData();
   const submissionsQueries = useSubmissionsQueries("2023");
-  // const rebates = use2022Rebates();
+  const submissions = useSubmissions("2023");
 
   if (submissionsQueries.some((query) => query.isFetching)) {
     return <Loading />;
@@ -898,22 +906,22 @@ function Submissions2023() {
     return <Message type="error" text={messages.formSubmissionsError} />;
   }
 
-  // if (rebates.length === 0) {
-  //   return (
-  //     <div className="margin-top-4">
-  //       <Message type="info" text={messages.newApplication} />
-  //     </div>
-  //   );
-  // }
+  if (submissions.length === 0) {
+    return (
+      <div className="margin-top-4">
+        <Message type="info" text={messages.newApplication} />
+      </div>
+    );
+  }
 
   return (
     <>
-      {/* {content && (
+      {content && (
         <MarkdownContent
           className="margin-top-4"
           children={content.allRebatesIntro}
         />
-      )} */}
+      )}
 
       <p>(2023 submissions)</p>
     </>
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index a2a29827..9b07467f 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -4,6 +4,8 @@ import { useSearchParams } from "react-router-dom";
 // ---
 import { serverUrl, serverUrlForHrefs } from "./config";
 
+type RebateYear = "2022" | "2023";
+
 type Content = {
   siteAlert: string;
   helpdeskIntro: string;
@@ -193,20 +195,37 @@ export type BapSubmission = {
   status: string | null;
 };
 
-export type Rebate2022 = {
-  frf: {
-    formio: FormioFRF2022Submission;
-    bap: BapSubmission | null;
-  };
-  prf: {
-    formio: FormioPRF2022Submission | null;
-    bap: BapSubmission | null;
-  };
-  crf: {
-    formio: FormioCRF2022Submission | null;
-    bap: BapSubmission | null;
-  };
-};
+export type Rebate =
+  | {
+      rebateYear: "2022";
+      frf: {
+        formio: FormioFRF2022Submission;
+        bap: BapSubmission | null;
+      };
+      prf: {
+        formio: FormioPRF2022Submission | null;
+        bap: BapSubmission | null;
+      };
+      crf: {
+        formio: FormioCRF2022Submission | null;
+        bap: BapSubmission | null;
+      };
+    }
+  | {
+      rebateYear: "2023";
+      frf: {
+        formio: FormioFRF2023Submission;
+        bap: null;
+      };
+      prf: {
+        formio: null;
+        bap: null;
+      };
+      crf: {
+        formio: null;
+        bap: null;
+      };
+    };
 
 async function fetchData<T = any>(url: string, options: RequestInit) {
   try {
@@ -410,31 +429,24 @@ export function useSubmissionsQueries(rebateYear: RebateYear) {
   return useQueries({ queries });
 }
 
-/**
- * Custom hook to combine 2022 FRF submissions data, PRF submissions data, and
- * CRF submissions data from both the BAP and Formio into a single object, with
- * the BAP assigned `rebateId` as the keys.
- **/
-function useCombined2022Rebates() {
-  const queryClient = useQueryClient();
-
-  const bapFormSubmissions = queryClient.getQueryData<{
-    frfs: BapFormSubmission[];
-    prfs: BapFormSubmission[];
-    crfs: BapFormSubmission[];
-  }>(["bap/submissions"]);
-
-  const formioFRFSubmissions = queryClient.getQueryData<
-    FormioFRF2022Submission[]
-  >(["formio/2022/frf-submissions"]);
-
-  const formioPRFSubmissions = queryClient.getQueryData<
-    FormioPRF2022Submission[]
-  >(["formio/2022/prf-submissions"]);
-
-  const formioCRFSubmissions = queryClient.getQueryData<
-    FormioCRF2022Submission[]
-  >(["formio/2022/crf-submissions"]);
+function combine2022Submissions(options: {
+  bapFormSubmissions:
+    | {
+        frfs: BapFormSubmission[];
+        prfs: BapFormSubmission[];
+        crfs: BapFormSubmission[];
+      }
+    | undefined;
+  formioFRFSubmissions: FormioFRF2022Submission[] | undefined;
+  formioPRFSubmissions: FormioPRF2022Submission[] | undefined;
+  formioCRFSubmissions: FormioCRF2022Submission[] | undefined;
+}) {
+  const {
+    bapFormSubmissions,
+    formioFRFSubmissions,
+    formioPRFSubmissions,
+    formioCRFSubmissions,
+  } = options;
 
   // ensure form submissions data has been fetched from both the BAP and Formio
   if (
@@ -446,7 +458,9 @@ function useCombined2022Rebates() {
     return {};
   }
 
-  const rebates: { [rebateId: string]: Rebate2022 } = {};
+  const rebates: {
+    [rebateId: string]: Extract<Rebate, { rebateYear: "2022" }>;
+  } = {};
 
   /**
    * Iterate over Formio FRF submissions, matching them with submissions
@@ -475,6 +489,7 @@ function useCombined2022Rebates() {
      * mongoDB ObjectID – just so each submission object still has a unique ID.
      */
     rebates[rebateId || `_${formioFRFSubmission._id}`] = {
+      rebateYear: "2022",
       frf: {
         formio: { ...formioFRFSubmission },
         bap: { modified, comboKey, mongoId, rebateId, reviewItemId, status },
@@ -556,14 +571,80 @@ function useCombined2022Rebates() {
   return rebates;
 }
 
+function combine2023Submissions(options: {
+  formioFRFSubmissions: FormioFRF2023Submission[] | undefined;
+}) {
+  const { formioFRFSubmissions } = options;
+
+  // ensure form submissions data has been fetched from Formio
+  if (!formioFRFSubmissions) {
+    return {};
+  }
+
+  const rebates: {
+    [rebateId: string]: Extract<Rebate, { rebateYear: "2023" }>;
+  } = {};
+
+  // TODO
+
+  return rebates;
+}
+
+/**
+ * Custom hook to combine FRF submissions, PRF submissions, and CRF submissions
+ * from both the BAP and Formio into a single object, with the BAP assigned
+ * rebateId as the object's keys.
+ **/
+function useCombinedSubmissions(rebateYear: RebateYear) {
+  const queryClient = useQueryClient();
+
+  const bapFormSubmissions = queryClient.getQueryData<{
+    frfs: BapFormSubmission[];
+    prfs: BapFormSubmission[];
+    crfs: BapFormSubmission[];
+  }>(["bap/submissions"]);
+
+  const formioFRF2022Submissions = queryClient.getQueryData<
+    FormioFRF2022Submission[]
+  >(["formio/2022/frf-submissions"]);
+
+  const formioPRF2022Submissions = queryClient.getQueryData<
+    FormioPRF2022Submission[]
+  >(["formio/2022/prf-submissions"]);
+
+  const formioCRF2022Submissions = queryClient.getQueryData<
+    FormioCRF2022Submission[]
+  >(["formio/2022/crf-submissions"]);
+
+  const formioFRF2023Submissions = queryClient.getQueryData<
+    FormioFRF2023Submission[]
+  >(["formio/2023/frf-submissions"]);
+
+  const submissions =
+    rebateYear === "2022"
+      ? combine2022Submissions({
+          bapFormSubmissions,
+          formioFRFSubmissions: formioFRF2022Submissions,
+          formioPRFSubmissions: formioPRF2022Submissions,
+          formioCRFSubmissions: formioCRF2022Submissions,
+        })
+      : rebateYear === "2023"
+      ? combine2023Submissions({
+          formioFRFSubmissions: formioFRF2023Submissions,
+        })
+      : {};
+
+  return submissions;
+}
+
 /**
- * Custom hook that sorts rebates by:
+ * Custom hook that sorts submissions by:
  * - Most recient Formio modified date, regardless of form type (FRF, PRF, CRF)
  * - Submissions needing edits, regardless of form type
  * - Selected FRF submissions without a corresponding PRF submission
  * - Funding Approved PRF submissions without a corresponding CRF submission
  **/
-function useSortedRebates(rebates: { [rebateId: string]: Rebate2022 }) {
+function useSortedSubmissions(rebates: { [rebateId: string]: Rebate }) {
   return Object.entries(rebates)
     .map(([rebateId, rebate]) => ({ rebateId, ...rebate }))
     .sort((r1, r2) => {
@@ -621,23 +702,23 @@ function useSortedRebates(rebates: { [rebateId: string]: Rebate2022 }) {
 }
 
 /**
- * Custom hook that returns sorted 2022 rebates, and logs them if 'debug' search
+ * Custom hook that returns sorted submissions, and logs them if 'debug' search
  * parameter exists.
  */
-export function use2022Rebates() {
+export function useSubmissions(rebateYear: RebateYear) {
   const [searchParams] = useSearchParams();
 
-  const combined2022Rebates = useCombined2022Rebates();
-  const sorted2022Rebates = useSortedRebates(combined2022Rebates);
+  const combinedSubmissions = useCombinedSubmissions(rebateYear);
+  const sortedSubmissions = useSortedSubmissions(combinedSubmissions);
 
-  // log combined 'sorted2022Rebates' array if 'debug' search parameter exists
+  // log combined 'sortedSubmissions' array if 'debug' search parameter exists
   useEffect(() => {
-    if (searchParams.has("debug") && sorted2022Rebates.length > 0) {
-      console.log(sorted2022Rebates);
+    if (searchParams.has("debug") && sortedSubmissions.length > 0) {
+      console.log(sortedSubmissions);
     }
-  }, [searchParams, sorted2022Rebates]);
+  }, [searchParams, sortedSubmissions]);
 
-  return sorted2022Rebates;
+  return sortedSubmissions;
 }
 
 /**
@@ -652,6 +733,7 @@ export function submissionNeedsEdits(options: {
     | FormioFRF2022Submission
     | FormioPRF2022Submission
     | FormioCRF2022Submission
+    | FormioFRF2023Submission
     | null;
   bap: BapSubmission | null;
 }) {

From e57e93c3950bcce8f6fd048afc2f2a16ca0d9660 Mon Sep 17 00:00:00 2001
From: Courtney Myers <courtney.myers@erg.com>
Date: Wed, 16 Aug 2023 11:06:39 -0400
Subject: [PATCH 71/71] Update combine2023Submissions() utility function to set
 structure of 2023 rebates, and update Submissions2023 component to render
 2023 FRF submissions in the table

---
 app/client/src/routes/frf2023.tsx     |   6 +-
 app/client/src/routes/submissions.tsx | 377 +++++++++++++++++++++-----
 app/client/src/utilities.tsx          |  21 +-
 3 files changed, 328 insertions(+), 76 deletions(-)

diff --git a/app/client/src/routes/frf2023.tsx b/app/client/src/routes/frf2023.tsx
index 029846eb..ef426de0 100644
--- a/app/client/src/routes/frf2023.tsx
+++ b/app/client/src/routes/frf2023.tsx
@@ -9,7 +9,7 @@ import icons from "uswds/img/sprite.svg";
 // ---
 import { serverUrl, messages } from "../config";
 import {
-  FormioFRF2022Submission,
+  FormioFRF2023Submission,
   getData,
   postData,
   useContentData,
@@ -35,7 +35,7 @@ type ServerResponse =
   | {
       userAccess: true;
       formSchema: { url: string; json: object };
-      submission: FormioFRF2022Submission; // TODO: account for differences between 2022 and 2023 forms
+      submission: FormioFRF2023Submission;
     };
 
 /** Custom hook to fetch Formio submission data */
@@ -80,7 +80,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
       metadata: { [field: string]: unknown };
       state: "submitted" | "draft";
     }) => {
-      return postData<FormioFRF2022Submission>(url, updatedSubmission);
+      return postData<FormioFRF2023Submission>(url, updatedSubmission);
     },
     onSuccess: (res) => {
       return queryClient.setQueryData<ServerResponse>(
diff --git a/app/client/src/routes/submissions.tsx b/app/client/src/routes/submissions.tsx
index c6357a95..323cd932 100644
--- a/app/client/src/routes/submissions.tsx
+++ b/app/client/src/routes/submissions.tsx
@@ -54,6 +54,81 @@ function ButtonLink(props: { type: "edit" | "view"; to: LinkProps["to"] }) {
   );
 }
 
+function NewApplicationIconText() {
+  return (
+    <span className="display-flex flex-align-center">
+      <svg className="usa-icon" aria-hidden="true" focusable="false" role="img">
+        <use href={`${icons}#add_circle`} />
+      </svg>
+      <span className="margin-left-1 text-left">New Application</span>
+    </span>
+  );
+}
+
+function SubmissionsTableHeader() {
+  return (
+    <thead>
+      <tr className="font-sans-2xs text-no-wrap text-bottom">
+        <th scope="col">
+          <span className="usa-sr-only">Open</span>
+        </th>
+
+        <th scope="col">
+          <TextWithTooltip
+            text="Rebate ID"
+            tooltip="Unique Clean School Bus Rebate ID"
+          />
+        </th>
+
+        <th scope="col">
+          <TextWithTooltip
+            text="Form Type"
+            tooltip="Application, Payment Request, or Close Out form"
+          />
+          <br />
+          <TextWithTooltip
+            text="Form Status"
+            tooltip="Draft, Edits Requested, Submitted, Withdrawn, Selected, or Not Selected" // TODO: update to reflect other statuses
+          />
+        </th>
+
+        <th scope="col">
+          <TextWithTooltip text="UEI" tooltip="Unique Entity ID from SAM.gov" />
+          <br />
+          <TextWithTooltip
+            text="EFT Indicator"
+            tooltip="Electronic Funds Transfer Indicator listing the associated bank account from SAM.gov"
+          />
+        </th>
+
+        <th scope="col">
+          <TextWithTooltip
+            text="Applicant"
+            tooltip="Legal Business Name from SAM.gov for this UEI"
+          />
+          <br />
+          <TextWithTooltip
+            text="School District"
+            tooltip="School district represented by applicant"
+          />
+        </th>
+
+        <th scope="col">
+          <TextWithTooltip
+            text="Updated By"
+            tooltip="Last person that updated this form"
+          />
+          <br />
+          <TextWithTooltip
+            text="Date Updated"
+            tooltip="Last date this form was updated"
+          />
+        </th>
+      </tr>
+    </thead>
+  );
+}
+
 function FRF2022Submission(props: {
   rebate: Extract<Rebate, { rebateYear: "2022" }>;
 }) {
@@ -759,14 +834,210 @@ function CRF2022Submission(props: {
   );
 }
 
-function NewApplicationIconText() {
+function FRF2023Submission(props: {
+  rebate: Extract<Rebate, { rebateYear: "2023" }>;
+}) {
+  const { rebate } = props;
+  const { frf } = rebate;
+
+  const configData = useConfigData();
+
+  if (!configData) return null;
+
+  const frfSubmissionPeriodOpen = configData.submissionPeriodOpen["2023"].frf;
+
+  const {
+    appInfo_uei,
+    appInfo_efti,
+    appInfo_orgName,
+    // TODO: (school district name field)
+    _user_email,
+  } = frf.formio.data;
+
+  const appInfo_schoolDistrictName = null; // TODO: temporary
+
+  const date = new Date(frf.formio.modified).toLocaleDateString();
+  const time = new Date(frf.formio.modified).toLocaleTimeString();
+
+  const frfNeedsEdits = submissionNeedsEdits({
+    formio: frf.formio,
+    bap: frf.bap,
+  });
+
+  /**
+   * NOTE:
+   * Setting of the statuses below will occur once the BAP's 2023 FRF work has
+   * been completed, so the code below will be updated in the future.
+   */
+
+  const frfNeedsClarification = false; // frf.bap?.status === "Needs Clarification";
+
+  const frfHasBeenWithdrawn = false; // frf.bap?.status === "Withdrawn";
+
+  const frfNotSelected = false; // frf.bap?.status === "Coordinator Denied";
+
+  const frfSelected = false; // frf.bap?.status === "Accepted";
+
+  const frfSelectedButNoPRF = false; // frfSelected && !Boolean(prf.formio);
+
+  const prfFundingApproved = false; // prf.bap?.status === "Accepted";
+
+  const prfFundingApprovedButNoCRF = prfFundingApproved; // prfFundingApproved && !Boolean(crf.formio);
+
+  const statusTableCellClassNames =
+    frf.formio.state === "submitted" || !frfSubmissionPeriodOpen
+      ? "text-italic"
+      : "";
+
+  const statusIconClassNames = frfSelected
+    ? "usa-icon text-primary" // blue
+    : "usa-icon";
+
+  const statusIcon = frfNeedsEdits
+    ? `${icons}#priority_high` // !
+    : frfHasBeenWithdrawn
+    ? `${icons}#close` // ✕
+    : frfNotSelected
+    ? `${icons}#cancel` // x inside a circle
+    : frfSelected
+    ? `${icons}#check_circle` // check inside a circle
+    : frf.formio.state === "draft"
+    ? `${icons}#more_horiz` // three horizontal dots
+    : frf.formio.state === "submitted"
+    ? `${icons}#check` // check
+    : `${icons}#remove`; // — (fallback, not used)
+
+  const statusText = frfNeedsEdits
+    ? "Edits Requested"
+    : frfHasBeenWithdrawn
+    ? "Withdrawn"
+    : frfNotSelected
+    ? "Not Selected"
+    : frfSelected
+    ? "Selected"
+    : frf.formio.state === "draft"
+    ? "Draft"
+    : frf.formio.state === "submitted"
+    ? "Submitted"
+    : ""; // fallback, not used
+
+  const frfUrl = `/frf/2023/${frf.formio._id}`;
+
+  /**
+   * NOTE on the usage of `TextWithTooltip` below:
+   * When a form is first initially created, and the user has not yet clicked
+   * the "Next" or "Save" buttons, any fields that the Formio form definition
+   * sets automatically (based on hidden fields we inject on form creation) will
+   * not yet be part of the form submission data. As soon as the user clicks the
+   * "Next" or "Save" buttons the first time, those fields will be set and
+   * stored in the submission. Since we display some of those fields in the
+   * table below, we need to check if their values exist, and if they don't (for
+   * cases where the user has not yet advanced past the first screen of the
+   * form...which we believe is a bit of an edge case, as most users will likely
+   * do that after starting a new application), indicate to the user they need
+   * to first save the form for the fields to be displayed.
+   */
   return (
-    <span className="display-flex flex-align-center">
-      <svg className="usa-icon" aria-hidden="true" focusable="false" role="img">
-        <use href={`${icons}#add_circle`} />
-      </svg>
-      <span className="margin-left-1 text-left">New Application</span>
-    </span>
+    <tr
+      className={
+        frfNeedsEdits || frfSelectedButNoPRF || prfFundingApprovedButNoCRF
+          ? highlightedTableRowClassNames
+          : defaultTableRowClassNames
+      }
+    >
+      <th scope="row" className={statusTableCellClassNames}>
+        {frfNeedsEdits ? (
+          <ButtonLink type="edit" to={frfUrl} />
+        ) : frf.formio.state === "submitted" || !frfSubmissionPeriodOpen ? (
+          <ButtonLink type="view" to={frfUrl} />
+        ) : frf.formio.state === "draft" ? (
+          <ButtonLink type="edit" to={frfUrl} />
+        ) : null}
+      </th>
+
+      <td className={statusTableCellClassNames}>
+        <TextWithTooltip
+          text=" "
+          tooltip="Rebate ID will be displayed at a later date"
+        />
+      </td>
+
+      <td className={statusTableCellClassNames}>
+        <span>Application</span>
+        <br />
+        <span className="display-flex flex-align-center font-sans-2xs">
+          {frfNeedsClarification ? (
+            <TextWithTooltip
+              text="Needs Clarification"
+              tooltip="Check your email for instructions on what needs clarification"
+              iconClassNames="text-base-darkest"
+            />
+          ) : (
+            <>
+              <svg
+                className={statusIconClassNames}
+                aria-hidden="true"
+                focusable="false"
+                role="img"
+              >
+                <use href={statusIcon} />
+              </svg>
+              <span className="margin-left-05">{statusText}</span>
+            </>
+          )}
+        </span>
+      </td>
+
+      <td className={statusTableCellClassNames}>
+        <>
+          {Boolean(appInfo_uei) ? (
+            appInfo_uei
+          ) : (
+            <TextWithTooltip
+              text=" "
+              tooltip="Please edit and save the form and the UEI will be displayed"
+            />
+          )}
+          <br />
+          {Boolean(appInfo_efti) ? (
+            appInfo_efti
+          ) : (
+            <TextWithTooltip
+              text=" "
+              tooltip="Please edit and save the form and the EFT Indicator will be displayed"
+            />
+          )}
+        </>
+      </td>
+
+      <td className={statusTableCellClassNames}>
+        <>
+          {Boolean(appInfo_orgName) ? (
+            appInfo_orgName
+          ) : (
+            <TextWithTooltip
+              text=" "
+              tooltip="Please edit and save the form and the Applicant will be displayed"
+            />
+          )}
+          <br />
+          {Boolean(appInfo_schoolDistrictName) ? (
+            appInfo_schoolDistrictName
+          ) : (
+            <TextWithTooltip
+              text=" "
+              tooltip="School District will be displayed after that field has been entered in the form"
+            />
+          )}
+        </>
+      </td>
+
+      <td className={statusTableCellClassNames}>
+        {_user_email}
+        <br />
+        <span title={`${date} ${time}`}>{date}</span>
+      </td>
+    </tr>
   );
 }
 
@@ -802,72 +1073,10 @@ function Submissions2022() {
 
       <div className="usa-table-container--scrollable" tabIndex={0}>
         <table
-          aria-label="Your Rebate Forms"
+          aria-label="Your 2022 Rebate Forms"
           className="usa-table usa-table--stacked usa-table--borderless width-full"
         >
-          <thead>
-            <tr className="font-sans-2xs text-no-wrap text-bottom">
-              <th scope="col">
-                <span className="usa-sr-only">Open</span>
-              </th>
-
-              <th scope="col">
-                <TextWithTooltip
-                  text="Rebate ID"
-                  tooltip="Unique Clean School Bus Rebate ID"
-                />
-              </th>
-
-              <th scope="col">
-                <TextWithTooltip
-                  text="Form Type"
-                  tooltip="Application, Payment Request, or Close Out form"
-                />
-                <br />
-                <TextWithTooltip
-                  text="Form Status"
-                  tooltip="Draft, Edits Requested, Submitted, Withdrawn, Selected, or Not Selected" // TODO: update to reflect other statuses
-                />
-              </th>
-
-              <th scope="col">
-                <TextWithTooltip
-                  text="UEI"
-                  tooltip="Unique Entity ID from SAM.gov"
-                />
-                <br />
-                <TextWithTooltip
-                  text="EFT Indicator"
-                  tooltip="Electronic Funds Transfer Indicator listing the associated bank account from SAM.gov"
-                />
-              </th>
-
-              <th scope="col">
-                <TextWithTooltip
-                  text="Applicant"
-                  tooltip="Legal Business Name from SAM.gov for this UEI"
-                />
-                <br />
-                <TextWithTooltip
-                  text="School District"
-                  tooltip="School district represented by applicant"
-                />
-              </th>
-
-              <th scope="col">
-                <TextWithTooltip
-                  text="Updated By"
-                  tooltip="Last person that updated this form"
-                />
-                <br />
-                <TextWithTooltip
-                  text="Date Updated"
-                  tooltip="Last date this form was updated"
-                />
-              </th>
-            </tr>
-          </thead>
-
+          <SubmissionsTableHeader />
           <tbody>
             {submissions.map((rebate, index) => {
               return rebate.rebateYear === "2022" ? (
@@ -923,7 +1132,31 @@ function Submissions2023() {
         />
       )}
 
-      <p>(2023 submissions)</p>
+      <div className="usa-table-container--scrollable" tabIndex={0}>
+        <table
+          aria-label="Your 2023 Rebate Forms"
+          className="usa-table usa-table--stacked usa-table--borderless width-full"
+        >
+          <SubmissionsTableHeader />
+          <tbody>
+            {submissions.map((rebate, index) => {
+              return rebate.rebateYear === "2023" ? (
+                <Fragment key={rebate.rebateId}>
+                  <FRF2023Submission rebate={rebate} />
+                  {/* blank row after all submissions but the last one */}
+                  {index !== submissions.length - 1 && (
+                    <tr className="bg-white">
+                      <th className="p-0" scope="row" colSpan={6}>
+                        &nbsp;
+                      </th>
+                    </tr>
+                  )}
+                </Fragment>
+              ) : null;
+            })}
+          </tbody>
+        </table>
+      </div>
     </>
   );
 }
diff --git a/app/client/src/utilities.tsx b/app/client/src/utilities.tsx
index 9b07467f..202a8d20 100644
--- a/app/client/src/utilities.tsx
+++ b/app/client/src/utilities.tsx
@@ -168,6 +168,10 @@ type FormioFRF2023Data = {
   _bap_applicant_city: string;
   _bap_applicant_state: string;
   _bap_applicant_zip: string;
+  // fields set by form definition (among others):
+  appInfo_uei: string;
+  appInfo_efti: string;
+  appInfo_orgName: string;
 };
 
 export type FormioFRF2022Submission = FormioSubmission & {
@@ -585,7 +589,22 @@ function combine2023Submissions(options: {
     [rebateId: string]: Extract<Rebate, { rebateYear: "2023" }>;
   } = {};
 
-  // TODO
+  /**
+   * Iterate over Formio FRF submissions so we can build up each rebate object
+   * with the FRF submission data and initialize PRF and CRF submission data
+   * structure (both to be updated).
+   */
+  for (const formioFRFSubmission of formioFRFSubmissions) {
+    rebates[`_${formioFRFSubmission._id}`] = {
+      rebateYear: "2023",
+      frf: {
+        formio: { ...formioFRFSubmission },
+        bap: null,
+      },
+      prf: { formio: null, bap: null },
+      crf: { formio: null, bap: null },
+    };
+  }
 
   return rebates;
 }