Merge pull request #538 from USEPA/develop

Sync staging with develop
USEPA · Jan 24, 2025 · dbf1802 · dbf1802
2 parents 13d3527 + 5f4efe0
commit dbf1802
Show file tree

Hide file tree

Showing 20 changed files with 469 additions and 12 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -75,6 +75,7 @@ jobs:
       FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
       FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
+      BAP_REST_API_VERSION: ${{ secrets.BAP_REST_API_VERSION }}
       BAP_CLIENT_ID: ${{ secrets.BAP_CLIENT_ID }}
       BAP_CLIENT_SECRET: ${{ secrets.BAP_CLIENT_SECRET }}
       BAP_URL: ${{ secrets.BAP_URL }}
@@ -177,6 +178,7 @@ jobs:
           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
+          cf set-env $APP_NAME "BAP_REST_API_VERSION" "$BAP_REST_API_VERSION" > /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
@@ -75,6 +75,7 @@ jobs:
       FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
       FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
+      BAP_REST_API_VERSION: ${{ secrets.BAP_REST_API_VERSION }}
       BAP_CLIENT_ID: ${{ secrets.BAP_CLIENT_ID }}
       BAP_CLIENT_SECRET: ${{ secrets.BAP_CLIENT_SECRET }}
       BAP_URL: ${{ secrets.BAP_URL }}
@@ -177,6 +178,7 @@ jobs:
           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
+          cf set-env $APP_NAME "BAP_REST_API_VERSION" "$BAP_REST_API_VERSION" > /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/src/routes/crf2022.tsx b/app/client/src/routes/crf2022.tsx
@@ -19,6 +19,7 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
+  useSubmissionPDFQuery,
   useSubmissionsQueries,
   useSubmissions,
   submissionNeedsEdits,
@@ -27,7 +28,7 @@ import {
   entityHasDebtSubjectToOffset,
   getUserInfo,
 } from "@/utilities";
-import { Loading } from "@/components/loading";
+import { Loading, LoadingButtonIcon } from "@/components/loading";
 import { Message } from "@/components/message";
 import { MarkdownContent } from "@/components/markdownContent";
 import { useNotificationsActions } from "@/contexts/notifications";
@@ -40,6 +41,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
 
   useEffect(() => {
     queryClient.resetQueries({ queryKey: ["formio/2022/crf-submission"] });
+    queryClient.resetQueries({ queryKey: ["formio/2022/crf-pdf"] });
   }, [queryClient]);
 
   const url = `${serverUrl}/api/formio/2022/crf-submission/${rebateId}`;
@@ -129,6 +131,12 @@ function CloseOutRequestForm(props: { email: string }) {
   const { query, mutation } = useFormioSubmissionQueryAndMutation(rebateId);
   const { userAccess, formSchema, submission } = query.data ?? {};
 
+  const pdfQuery = useSubmissionPDFQuery({
+    rebateYear: "2022",
+    formType: "crf",
+    mongoId: submission?._id || "",
+  });
+
   /**
    * 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
@@ -243,6 +251,30 @@ function CloseOutRequestForm(props: { email: string }) {
         </li>
       </ul>
 
+      {submission?._id && (
+        <p>
+          <button
+            className="usa-button font-sans-2xs margin-right-0 padding-x-105 padding-y-1"
+            type="button"
+            disabled={pdfQuery.isFetching}
+            onClick={(_ev) => pdfQuery.refetch()}
+          >
+            <span className="display-flex flex-align-center">
+              <svg
+                className="usa-icon"
+                aria-hidden="true"
+                focusable="false"
+                role="img"
+              >
+                <use href={`${icons}#arrow_downward`} />
+              </svg>
+              <span className="margin-left-1">Download PDF</span>
+              {pdfQuery.isFetching && <LoadingButtonIcon position="end" />}
+            </span>
+          </button>
+        </p>
+      )}
+
       <Dialog as="div" open={dataIsPosting.current} onClose={(_value) => {}}>
         <div className={clsx("tw-fixed tw-inset-0 tw-bg-black/30")} />
         <div className={clsx("tw-fixed tw-inset-0 tw-z-20")}>

diff --git a/app/client/src/routes/frf2022.tsx b/app/client/src/routes/frf2022.tsx
@@ -19,6 +19,7 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
+  useSubmissionPDFQuery,
   useSubmissionsQueries,
   useSubmissions,
   submissionNeedsEdits,
@@ -27,7 +28,7 @@ import {
   entityHasDebtSubjectToOffset,
   getUserInfo,
 } from "@/utilities";
-import { Loading } from "@/components/loading";
+import { Loading, LoadingButtonIcon } from "@/components/loading";
 import { Message } from "@/components/message";
 import { MarkdownContent } from "@/components/markdownContent";
 import { useDialogActions } from "@/contexts/dialog";
@@ -41,6 +42,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
 
   useEffect(() => {
     queryClient.resetQueries({ queryKey: ["formio/2022/frf-submission"] });
+    queryClient.resetQueries({ queryKey: ["formio/2022/frf-pdf"] });
   }, [queryClient]);
 
   const url = `${serverUrl}/api/formio/2022/frf-submission/${mongoId}`;
@@ -142,6 +144,12 @@ function FundingRequestForm(props: { email: string }) {
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
   const { userAccess, formSchema, submission } = query.data ?? {};
 
+  const pdfQuery = useSubmissionPDFQuery({
+    rebateYear: "2022",
+    formType: "frf",
+    mongoId,
+  });
+
   /**
    * 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
@@ -391,6 +399,28 @@ function FundingRequestForm(props: { email: string }) {
         )}
       </ul>
 
+      <p>
+        <button
+          className="usa-button font-sans-2xs margin-right-0 padding-x-105 padding-y-1"
+          type="button"
+          disabled={pdfQuery.isFetching}
+          onClick={(_ev) => pdfQuery.refetch()}
+        >
+          <span className="display-flex flex-align-center">
+            <svg
+              className="usa-icon"
+              aria-hidden="true"
+              focusable="false"
+              role="img"
+            >
+              <use href={`${icons}#arrow_downward`} />
+            </svg>
+            <span className="margin-left-1">Download PDF</span>
+            {pdfQuery.isFetching && <LoadingButtonIcon position="end" />}
+          </span>
+        </button>
+      </p>
+
       <Dialog as="div" open={dataIsPosting.current} onClose={(_value) => {}}>
         <div className={clsx("tw-fixed tw-inset-0 tw-bg-black/30")} />
         <div className={clsx("tw-fixed tw-inset-0 tw-z-20")}>

diff --git a/app/client/src/routes/frf2023.tsx b/app/client/src/routes/frf2023.tsx
@@ -19,6 +19,7 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
+  useSubmissionPDFQuery,
   useSubmissionsQueries,
   useSubmissions,
   submissionNeedsEdits,
@@ -27,7 +28,7 @@ import {
   entityHasDebtSubjectToOffset,
   getUserInfo,
 } from "@/utilities";
-import { Loading } from "@/components/loading";
+import { Loading, LoadingButtonIcon } from "@/components/loading";
 import { Message } from "@/components/message";
 import { MarkdownContent } from "@/components/markdownContent";
 import { useDialogActions } from "@/contexts/dialog";
@@ -41,6 +42,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
 
   useEffect(() => {
     queryClient.resetQueries({ queryKey: ["formio/2023/frf-submission"] });
+    queryClient.resetQueries({ queryKey: ["formio/2023/frf-pdf"] });
   }, [queryClient]);
 
   const url = `${serverUrl}/api/formio/2023/frf-submission/${mongoId}`;
@@ -128,6 +130,12 @@ function FundingRequestForm(props: { email: string }) {
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
   const { userAccess, formSchema, submission } = query.data ?? {};
 
+  const pdfQuery = useSubmissionPDFQuery({
+    rebateYear: "2023",
+    formType: "frf",
+    mongoId,
+  });
+
   /**
    * 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
@@ -377,6 +385,28 @@ function FundingRequestForm(props: { email: string }) {
         )}
       </ul>
 
+      <p>
+        <button
+          className="usa-button font-sans-2xs margin-right-0 padding-x-105 padding-y-1"
+          type="button"
+          disabled={pdfQuery.isFetching}
+          onClick={(_ev) => pdfQuery.refetch()}
+        >
+          <span className="display-flex flex-align-center">
+            <svg
+              className="usa-icon"
+              aria-hidden="true"
+              focusable="false"
+              role="img"
+            >
+              <use href={`${icons}#arrow_downward`} />
+            </svg>
+            <span className="margin-left-1">Download PDF</span>
+            {pdfQuery.isFetching && <LoadingButtonIcon position="end" />}
+          </span>
+        </button>
+      </p>
+
       <Dialog as="div" open={dataIsPosting.current} onClose={(_value) => {}}>
         <div className={clsx("tw-fixed tw-inset-0 tw-bg-black/30")} />
         <div className={clsx("tw-fixed tw-inset-0 tw-z-20")}>

diff --git a/app/client/src/routes/frf2024.tsx b/app/client/src/routes/frf2024.tsx
@@ -19,6 +19,7 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
+  useSubmissionPDFQuery,
   useSubmissionsQueries,
   useSubmissions,
   submissionNeedsEdits,
@@ -27,7 +28,7 @@ import {
   entityHasDebtSubjectToOffset,
   getUserInfo,
 } from "@/utilities";
-import { Loading } from "@/components/loading";
+import { Loading, LoadingButtonIcon } from "@/components/loading";
 import { Message } from "@/components/message";
 import { MarkdownContent } from "@/components/markdownContent";
 import { useDialogActions } from "@/contexts/dialog";
@@ -41,6 +42,7 @@ function useFormioSubmissionQueryAndMutation(mongoId: string | undefined) {
 
   useEffect(() => {
     queryClient.resetQueries({ queryKey: ["formio/2024/frf-submission"] });
+    queryClient.resetQueries({ queryKey: ["formio/2024/frf-pdf"] });
   }, [queryClient]);
 
   const url = `${serverUrl}/api/formio/2024/frf-submission/${mongoId}`;
@@ -128,6 +130,12 @@ function FundingRequestForm(props: { email: string }) {
   const { query, mutation } = useFormioSubmissionQueryAndMutation(mongoId);
   const { userAccess, formSchema, submission } = query.data ?? {};
 
+  const pdfQuery = useSubmissionPDFQuery({
+    rebateYear: "2024",
+    formType: "frf",
+    mongoId,
+  });
+
   /**
    * 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
@@ -377,6 +385,28 @@ function FundingRequestForm(props: { email: string }) {
         )}
       </ul>
 
+      <p>
+        <button
+          className="usa-button font-sans-2xs margin-right-0 padding-x-105 padding-y-1"
+          type="button"
+          disabled={pdfQuery.isFetching}
+          onClick={(_ev) => pdfQuery.refetch()}
+        >
+          <span className="display-flex flex-align-center">
+            <svg
+              className="usa-icon"
+              aria-hidden="true"
+              focusable="false"
+              role="img"
+            >
+              <use href={`${icons}#arrow_downward`} />
+            </svg>
+            <span className="margin-left-1">Download PDF</span>
+            {pdfQuery.isFetching && <LoadingButtonIcon position="end" />}
+          </span>
+        </button>
+      </p>
+
       <Dialog as="div" open={dataIsPosting.current} onClose={(_value) => {}}>
         <div className={clsx("tw-fixed tw-inset-0 tw-bg-black/30")} />
         <div className={clsx("tw-fixed tw-inset-0 tw-z-20")}>

diff --git a/app/client/src/routes/prf2022.tsx b/app/client/src/routes/prf2022.tsx
@@ -19,6 +19,7 @@ import {
   useContentData,
   useConfigData,
   useBapSamData,
+  useSubmissionPDFQuery,
   useSubmissionsQueries,
   useSubmissions,
   submissionNeedsEdits,
@@ -27,7 +28,7 @@ import {
   entityHasDebtSubjectToOffset,
   getUserInfo,
 } from "@/utilities";
-import { Loading } from "@/components/loading";
+import { Loading, LoadingButtonIcon } from "@/components/loading";
 import { Message } from "@/components/message";
 import { MarkdownContent } from "@/components/markdownContent";
 import { useNotificationsActions } from "@/contexts/notifications";
@@ -40,6 +41,7 @@ function useFormioSubmissionQueryAndMutation(rebateId: string | undefined) {
 
   useEffect(() => {
     queryClient.resetQueries({ queryKey: ["formio/2022/prf-submission"] });
+    queryClient.resetQueries({ queryKey: ["formio/2022/prf-pdf"] });
   }, [queryClient]);
 
   const url = `${serverUrl}/api/formio/2022/prf-submission/${rebateId}`;
@@ -129,6 +131,12 @@ function PaymentRequestForm(props: { email: string }) {
   const { query, mutation } = useFormioSubmissionQueryAndMutation(rebateId);
   const { userAccess, formSchema, submission } = query.data ?? {};
 
+  const pdfQuery = useSubmissionPDFQuery({
+    rebateYear: "2022",
+    formType: "prf",
+    mongoId: submission?._id || "",
+  });
+
   /**
    * 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
@@ -264,6 +272,30 @@ function PaymentRequestForm(props: { email: string }) {
         </li>
       </ul>
 
+      {submission?._id && (
+        <p>
+          <button
+            className="usa-button font-sans-2xs margin-right-0 padding-x-105 padding-y-1"
+            type="button"
+            disabled={pdfQuery.isFetching}
+            onClick={(_ev) => pdfQuery.refetch()}
+          >
+            <span className="display-flex flex-align-center">
+              <svg
+                className="usa-icon"
+                aria-hidden="true"
+                focusable="false"
+                role="img"
+              >
+                <use href={`${icons}#arrow_downward`} />
+              </svg>
+              <span className="margin-left-1">Download PDF</span>
+              {pdfQuery.isFetching && <LoadingButtonIcon position="end" />}
+            </span>
+          </button>
+        </p>
+      )}
+
       <Dialog as="div" open={dataIsPosting.current} onClose={(_value) => {}}>
         <div className={clsx("tw-fixed tw-inset-0 tw-bg-black/30")} />
         <div className={clsx("tw-fixed tw-inset-0 tw-z-20")}>