-
Discover.
class="menu__link" href="https://www.epa.gov/home/wwwepagov-snapshots" > - EPA www Web Snapshot + EPA www Web SnapshotsDiscover.
Connect.
@@ -690,11 +715,6 @@Follow.
position: static; } - .external-link__tag { - font-size: 0.75rem; - padding: 0 0.5em; - } - @media (min-width: 64em) { nav.usa-nav--epa { float: none; diff --git a/app/client/src/components/app.tsx b/app/client/src/components/app.tsx index 043eefc5..1884abcc 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, @@ -38,11 +39,12 @@ 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 { 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 */ @@ -238,12 +240,36 @@ export function App() {+ If you haven’t saved the current form, any changes you’ve made will be + lost. +
+ ), + confirmText: "Yes", + dismissText: "Cancel", + confirmedAction: () => navigate(url), + }); + } - if (!csbData || !bapSamData) { + if (!bapSamData || !email) { return
-
-
-
- {rebate?.application.bap?.rebateId && (
+ {rebate?.frf.bap?.rebateId && (
- Rebate ID: {rebate.application.bap.rebateId}
+ Rebate ID: {rebate.frf.bap.rebateId}
+ {content && (
+
+ );
+}
diff --git a/app/client/src/routes/newApplicationForm.tsx b/app/client/src/routes/frfNew.tsx
similarity index 74%
rename from app/client/src/routes/newApplicationForm.tsx
rename to app/client/src/routes/frfNew.tsx
index 58a248e0..48032f8d 100644
--- a/app/client/src/routes/newApplicationForm.tsx
+++ b/app/client/src/routes/frfNew.tsx
@@ -6,10 +6,12 @@ import icons from "uswds/img/sprite.svg";
// ---
import { serverUrl, messages } from "../config";
import {
- FormioApplicationSubmission,
+ BapSamEntity,
+ FormioFRF2022Submission,
+ FormioFRF2023Submission,
postData,
useContentData,
- useCsbData,
+ useConfigData,
useBapSamData,
getUserInfo,
} from "../utilities";
@@ -17,14 +19,77 @@ 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() {
+/**
+ * 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 }>();
const content = useContentData();
- const csbData = useCsbData();
+ const configData = useConfigData();
const bapSamData = useBapSamData();
+ const { rebateYear } = useRebateYearState();
const [errorMessage, setErrorMessage] = useState<{
displayed: boolean;
@@ -37,15 +102,16 @@ 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");
- if (!csbData || !bapSamData) {
+ if (!configData || !bapSamData) {
return -
+
-
+ + +++ Application ID: {submission._id} ++
+
+
+
-
+