Merge pull request #415 from USEPA/feature/implement-pre-2023-prf-rel…

…ease Feature/implement pre 2023 prf release
USEPA · Apr 10, 2024 · 55b473c · 55b473c
2 parents 9fc5fe1 + 6a54441
commit 55b473c
Show file tree

Hide file tree

Showing 32 changed files with 1,708 additions and 699 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -58,6 +58,7 @@ jobs:
       FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
       FORMIO_NCES_API_KEY: ${{ secrets.FORMIO_NCES_API_KEY }}
+      FORMIO_DUPLICATES_API_KEY: ${{ secrets.FORMIO_DUPLICATES_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 }}
@@ -72,14 +73,14 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Set up node and npm
       - uses: actions/setup-node@master
 
       # Run front-end processes (install, lint, test, bundle)
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/client/.npm
           key: v1-npm-client-deps-${{ hashFiles('**/client/package-lock.json') }}
@@ -145,6 +146,7 @@ jobs:
           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
           cf set-env $APP_NAME "FORMIO_NCES_API_KEY" "$FORMIO_NCES_API_KEY" > /dev/null
+          cf set-env $APP_NAME "FORMIO_DUPLICATES_API_KEY" "$FORMIO_DUPLICATES_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
           cf set-env $APP_NAME "BAP_URL" "$BAP_URL" > /dev/null

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -58,6 +58,7 @@ jobs:
       FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
       FORMIO_NCES_API_KEY: ${{ secrets.FORMIO_NCES_API_KEY }}
+      FORMIO_DUPLICATES_API_KEY: ${{ secrets.FORMIO_DUPLICATES_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 }}
@@ -72,14 +73,14 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Set up node and npm
       - uses: actions/setup-node@master
 
       # Run front-end processes (install, lint, test, bundle)
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/client/.npm
           key: v1-npm-client-deps-${{ hashFiles('**/client/package-lock.json') }}
@@ -145,6 +146,7 @@ jobs:
           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
           cf set-env $APP_NAME "FORMIO_NCES_API_KEY" "$FORMIO_NCES_API_KEY" > /dev/null
+          cf set-env $APP_NAME "FORMIO_DUPLICATES_API_KEY" "$FORMIO_DUPLICATES_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
           cf set-env $APP_NAME "BAP_URL" "$BAP_URL" > /dev/null

diff --git a/app/client/package-lock.json b/app/client/package-lock.json
diff --git a/app/client/package.json b/app/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "epa-csb-rebate-forms-app-client",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "U.S. EPA CSB Rebate Forms Application (client app)",
   "homepage": ".",
   "license": "CC0-1.0",

diff --git a/app/client/public/404.html b/app/client/public/404.html
@@ -58,85 +58,85 @@
     <link
       rel="icon"
       type="image/x-icon"
-      href="/themes/epa_theme/images/favicon.ico"
+      href="/csb/themes/epa_theme/images/favicon.ico"
     />
     <meta
       name="application-name"
       content="U.S. EPA CSB Rebate Forms Application"
     />
     <meta
       name="msapplication-config"
-      content="/themes/epa_theme/images/ieconfig.xml"
+      content="/csb/themes/epa_theme/images/ieconfig.xml"
     />
     <link
       rel="apple-touch-icon-precomposed"
       sizes="196x196"
-      href="/themes/epa_theme/images/favicon-196.png"
+      href="/csb/themes/epa_theme/images/favicon-196.png"
     />
     <link
       rel="apple-touch-icon-precomposed"
       sizes="152x152"
-      href="/themes/epa_theme/images/favicon-152.png"
+      href="/csb/themes/epa_theme/images/favicon-152.png"
     />
     <link
       rel="apple-touch-icon-precomposed"
       sizes="144x144"
-      href="/themes/epa_theme/images/favicon-144.png"
+      href="/csb/themes/epa_theme/images/favicon-144.png"
     />
     <link
       rel="apple-touch-icon-precomposed"
       sizes="120x120"
-      href="/themes/epa_theme/images/favicon-120.png"
+      href="/csb/themes/epa_theme/images/favicon-120.png"
     />
     <link
       rel="apple-touch-icon-precomposed"
       sizes="114x114"
-      href="/themes/epa_theme/images/favicon-114.png"
+      href="/csb/themes/epa_theme/images/favicon-114.png"
     />
     <link
       rel="apple-touch-icon-precomposed"
       sizes="72x72"
-      href="/themes/epa_theme/images/favicon-72.png"
+      href="/csb/themes/epa_theme/images/favicon-72.png"
     />
     <link
       rel="apple-touch-icon-precomposed"
-      href="/themes/epa_theme/images/favicon-180.png"
+      href="/csb/themes/epa_theme/images/favicon-180.png"
     />
     <link
       rel="icon"
-      href="/themes/epa_theme/images/favicon-32.png"
+      href="/csb/themes/epa_theme/images/favicon-32.png"
       sizes="32x32"
     />
     <link
       rel="preload"
-      href="/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2"
+      href="/csb/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2"
       as="font"
       crossorigin="anonymous"
     />
     <link
       rel="preload"
-      href="/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2"
+      href="/csb/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2"
       as="font"
       crossorigin="anonymous"
     />
     <link
       rel="preload"
-      href="/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff2"
+      href="/csb/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff2"
       as="font"
       crossorigin="anonymous"
     />
     <link
       rel="preload"
-      href="/themes/epa_theme/fonts/merriweather/Latin-Merriweather-Bold.woff2"
+      href="/csb/themes/epa_theme/fonts/merriweather/Latin-Merriweather-Bold.woff2"
       as="font"
       crossorigin="anonymous"
     />
     <link
       rel="stylesheet"
       media="all"
-      href="/themes/epa_theme/css/styles.css"
+      href="/csb/themes/epa_theme/css/styles.css"
     />
-    <link rel="manifest" href="/manifest.json" />
+    <link rel="manifest" href="/csb/manifest.json" />
     <title>CSB Rebate Forms Application | US EPA</title>
     <!-- Google Tag Manager -->
     <script>
@@ -207,7 +207,7 @@
               <img
                 class="usa-banner__header-flag"
                 aria-hidden="true"
-                src="/themes/epa_theme/images/us_flag_small.png"
+                src="/csb/themes/epa_theme/images/us_flag_small.png"
                 alt="U.S. flag"
                 height="11px"
                 width="16px"
@@ -234,7 +234,7 @@
             <div class="usa-banner__guidance tablet:grid-col-6">
               <img
                 class="usa-banner__icon usa-media-block__img"
-                src="/themes/epa_theme/images/icon-dot-gov.svg"
+                src="/csb/themes/epa_theme/images/icon-dot-gov.svg"
                 alt="Dot gov"
               />
               <div class="usa-media-block__body">
@@ -249,7 +249,7 @@
             <div class="usa-banner__guidance tablet:grid-col-6">
               <img
                 class="usa-banner__icon usa-media-block__img"
-                src="/themes/epa_theme/images/icon-https.svg"
+                src="/csb/themes/epa_theme/images/icon-https.svg"
                 alt="HTTPS"
               />
               <div class="usa-media-block__body">
@@ -306,15 +306,15 @@
                 aria-hidden="true"
               >
                 <use
-                  href="/themes/epa_theme/images/sprite.artifact.svg#magnifying-glass"
+                  href="/csb/themes/epa_theme/images/sprite.artifact.svg#magnifying-glass"
                 ></use>
               </svg>
               <svg
                 class="icon l-header__search-button-icon-close"
                 aria-hidden="true"
               >
                 <use
-                  href="/themes/epa_theme/images/sprite.artifact.svg#xmark"
+                  href="/csb/themes/epa_theme/images/sprite.artifact.svg#xmark"
                 ></use>
               </svg>
             </button>
@@ -503,7 +503,7 @@
                 <button class="button" type="submit" aria-label="Search">
                   <svg class="icon usa-search__submit-icon" aria-hidden="true">
                     <use
-                      href="/themes/epa_theme/images/sprite.artifact.svg#magnifying-glass"
+                      href="/csb/themes/epa_theme/images/sprite.artifact.svg#magnifying-glass"
                     ></use>
                   </svg>
                   <span class="usa-search__submit-text">Search</span>
@@ -529,7 +529,7 @@
               <svg class="icon icon--nav-close" aria-hidden="true" role="img">
                 <title>Primary navigation</title>
                 <use
-                  href="/themes/epa_theme/images/sprite.artifact.svg#xmark"
+                  href="/csb/themes/epa_theme/images/sprite.artifact.svg#xmark"
                 ></use>
               </svg>
             </button>
@@ -612,7 +612,7 @@ <h1>Page not found</h1>
             <div class="margin-y-5">
               <ul class="usa-button-group">
                 <li class="usa-button-group__item">
-                  <a href="." class="usa-button">Visit homepage</a>
+                  <a href="/csb" class="usa-button">Visit homepage</a>
                 </li>
                 <li class="usa-button-group__item">
                   <a
@@ -650,7 +650,7 @@ <h1>Page not found</h1>
       <div class="l-constrain">
         <img
           class="footer__epa-seal"
-          src="/themes/epa_theme/images/epa-seal.svg"
+          src="/csb/themes/epa_theme/images/epa-seal.svg"
           alt="United States Environmental Protection Agency"
           height="100"
           width="100"
@@ -817,7 +817,7 @@ <h2>Follow.</h2>
                 >
                   <svg class="icon icon--social" aria-hidden="true">
                     <use
-                      href="/themes/epa_theme/images/sprite.artifact.svg#facebook-square"
+                      href="/csb/themes/epa_theme/images/sprite.artifact.svg#facebook-square"
                     ></use>
                   </svg>
                 </a>
@@ -830,7 +830,7 @@ <h2>Follow.</h2>
                 >
                   <svg class="icon icon--social" aria-hidden="true">
                     <use
-                      href="/themes/epa_theme/images/sprite.artifact.svg#twitter-square"
+                      href="/csb/themes/epa_theme/images/sprite.artifact.svg#twitter-square"
                     ></use>
                   </svg>
                 </a>
@@ -843,7 +843,7 @@ <h2>Follow.</h2>
                 >
                   <svg class="icon icon--social" aria-hidden="true">
                     <use
-                      href="/themes/epa_theme/images/sprite.artifact.svg#youtube-square"
+                      href="/csb/themes/epa_theme/images/sprite.artifact.svg#youtube-square"
                     ></use>
                   </svg>
                 </a>
@@ -856,7 +856,7 @@ <h2>Follow.</h2>
                 >
                   <svg class="icon icon--social" aria-hidden="true">
                     <use
-                      href="/themes/epa_theme/images/sprite.artifact.svg#flickr-square"
+                      href="/csb/themes/epa_theme/images/sprite.artifact.svg#flickr-square"
                     ></use>
                   </svg>
                 </a>
@@ -869,7 +869,7 @@ <h2>Follow.</h2>
                 >
                   <svg class="icon icon--social" aria-hidden="true">
                     <use
-                      href="/themes/epa_theme/images/sprite.artifact.svg#instagram-square"
+                      href="/csb/themes/epa_theme/images/sprite.artifact.svg#instagram-square"
                     ></use>
                   </svg>
                 </a>
@@ -882,13 +882,15 @@ <h2>Follow.</h2>
 
     <a href="#top" class="back-to-top" title="">
       <svg class="back-to-top__icon" role="img" aria-label="">
-        <use href="/themes/epa_theme/images/sprite.artifact.svg#angle"></use>
+        <use
+          href="/csb/themes/epa_theme/images/sprite.artifact.svg#angle"
+        ></use>
       </svg>
     </a>
 
-    <script src="/core/assets/vendor/once/once.min.js"></script>
-    <script src="/themes/epa_theme/js/dist/common.min.js"></script>
-    <script src="/themes/epa_theme/js/dist/scripts.min.js"></script>
+    <script src="/csb/core/assets/vendor/once/once.min.js"></script>
+    <script src="/csb/themes/epa_theme/js/dist/common.min.js"></script>
+    <script src="/csb/themes/epa_theme/js/dist/scripts.min.js"></script>
     <script>
       /*
        * https://github.com/USEPA/webcms/blob/main/services/drupal/web/themes/epa_theme/js/src/header-search.es6.js

diff --git a/app/client/src/components/app.tsx b/app/client/src/components/app.tsx
@@ -38,9 +38,9 @@ import { FRF2022 } from "@/routes/frf2022";
 import { PRF2022 } from "@/routes/prf2022";
 import { CRF2022 } from "@/routes/crf2022";
 import { FRF2023 } from "@/routes/frf2023";
-import { PRF2023 } from "@/routes/prf2023";
+// import { PRF2023 } from "@/routes/prf2023";
 // import { CRF2023 } from "@/routes/crf2023";
-import { Change2023 } from "@/routes/change2023";
+// import { Change2023 } from "@/routes/change2023";
 import { useDialogState, useDialogActions } from "@/contexts/dialog";
 
 /** Custom hook to display a site-wide alert banner */
@@ -253,10 +253,10 @@ export function App() {
         <Route path="crf/2022/:id" element={<CRF2022 />} />
 
         <Route path="frf/2023/:id" element={<FRF2023 />} />
-        <Route path="prf/2023/:id" element={<PRF2023 />} />
+        {/* <Route path="prf/2023/:id" element={<PRF2023 />} /> */}
         {/* <Route path="crf/2023/:id" element={<CRF2023 />} /> */}
 
-        <Route path="/change/2023/:id" element={<Change2023 />} />
+        {/* <Route path="/change/2023/:id" element={<Change2023 />} /> */}
 
         <Route path="*" element={<Navigate to="/" replace />} />
       </Route>

diff --git a/app/client/src/components/change2023New.tsx b/app/client/src/components/change2023New.tsx
@@ -61,7 +61,7 @@ export function ChangeRequest2023Button(props: {
     <>
       <button
         className={clsx(
-          "tw-border-0 tw-border-b-[1.5px] tw-border-transparent tw-p-0 tw-text-sm tw-leading-tight",
+          "tw-border-0 tw-border-b-[1.5px] tw-border-transparent tw-bg-transparent tw-p-0 tw-text-sm tw-leading-tight",
           "enabled:tw-cursor-pointer",
           "hover:enabled:tw-border-b-slate-800",
           "focus:enabled:tw-border-b-slate-800",