fix: verify application errors (#3736)

bloom-housing · Dec 11, 2023 · 48cb352 · 48cb352
1 parent 7bf05c1
commit 48cb352
Show file tree

Hide file tree

Showing 18 changed files with 87 additions and 52 deletions.
diff --git a/sites/public/src/lib/applications/AppSubmissionContext.ts b/sites/public/src/lib/applications/AppSubmissionContext.ts
@@ -109,7 +109,7 @@ export const retrieveApplicationConfig = (listing: Listing) => {
 
 export const AppSubmissionContext = createContext({
   conductor: {} as ApplicationConductor,
-  application: { ...blankApplication },
+  application: JSON.parse(JSON.stringify(blankApplication)),
   listing: null as Listing,
   /* eslint-disable */
   syncApplication: (data) => {},

diff --git a/sites/public/src/lib/applications/ApplicationConductor.ts b/sites/public/src/lib/applications/ApplicationConductor.ts
@@ -15,7 +15,7 @@ import PreferencesAllStep from "./PreferencesAllStep"
 import ProgramsStep from "./ProgramsStep"
 
 export const loadApplicationFromAutosave = () => {
-  if (typeof window != "undefined") {
+  if (typeof window !== "undefined") {
     const autosavedApplication = window.sessionStorage.getItem("bloom-app-autosave")
     if (autosavedApplication) {
       const application = JSON.parse(autosavedApplication)
@@ -28,7 +28,7 @@ export const loadApplicationFromAutosave = () => {
 }
 
 export const loadSavedListing = () => {
-  if (typeof window != "undefined") {
+  if (typeof window !== "undefined") {
     const savedListing = window.sessionStorage.getItem("bloom-app-listing")
     if (savedListing) {
       return JSON.parse(savedListing)
@@ -193,7 +193,7 @@ export default class ApplicationConductor {
   sync() {
     // NOTE: had to remove timeout because of Next doing full-page reloads in
     // some cases. Need to revisit after upgrading to v10
-    if (typeof window != "undefined") {
+    if (typeof window !== "undefined") {
       window.sessionStorage.setItem("bloom-app-autosave", JSON.stringify(this.application))
       if (this.listing) {
         window.sessionStorage.setItem("bloom-app-listing", JSON.stringify(this.listing))
@@ -202,10 +202,10 @@ export default class ApplicationConductor {
   }
 
   reset() {
-    this.application = { ...blankApplication }
+    this.application = JSON.parse(JSON.stringify(blankApplication))
     this.listing = {} as Listing
     this.currentStepIndex = 0
-    if (typeof window != "undefined") {
+    if (typeof window !== "undefined") {
       window.sessionStorage.removeItem("bloom-app-autosave")
       window.sessionStorage.removeItem("bloom-app-listing")
     }

diff --git a/sites/public/src/pages/_app.tsx b/sites/public/src/pages/_app.tsx
@@ -30,7 +30,7 @@ function BloomApp({ Component, router, pageProps }: AppProps) {
   const { locale } = router
   //  const initialized = useState(true)
   const [application, setApplication] = useState(() => {
-    return loadApplicationFromAutosave() || { ...blankApplication }
+    return loadApplicationFromAutosave() || JSON.parse(JSON.stringify(blankApplication))
   })
   const [savedListing, setSavedListing] = useState(() => {
     return loadSavedListing()

diff --git a/sites/public/src/pages/applications/contact/address.tsx b/sites/public/src/pages/applications/contact/address.tsx
@@ -43,21 +43,24 @@ const ApplicationAddress = () => {
   const currentPageSection = 1
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { control, register, handleSubmit, setValue, watch, errors } = useForm<Record<string, any>>(
-    {
-      defaultValues: {
-        "applicant.phoneNumber": application.applicant.phoneNumber,
-        "applicant.noPhone": application.applicant.noPhone,
-        additionalPhone: application.additionalPhone,
-        "applicant.phoneNumberType": application.applicant.phoneNumberType,
-        sendMailToMailingAddress: application.sendMailToMailingAddress,
-        "applicant.workInRegion": application.applicant.workInRegion,
-        "applicant.address.state": application.applicant.address.state,
-      },
-      shouldFocusError: false,
-    }
-  )
-  const onSubmit = (data) => {
+  const { control, register, handleSubmit, setValue, watch, errors, trigger } = useForm<
+    Record<string, any>
+  >({
+    defaultValues: {
+      "applicant.phoneNumber": application.applicant.phoneNumber,
+      "applicant.noPhone": application.applicant.noPhone,
+      additionalPhone: application.additionalPhone,
+      "applicant.phoneNumberType": application.applicant.phoneNumberType,
+      sendMailToMailingAddress: application.sendMailToMailingAddress,
+      "applicant.workInRegion": application.applicant.workInRegion,
+      "applicant.address.state": application.applicant.address.state,
+    },
+    shouldFocusError: false,
+  })
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
+
     if (!verifyAddress) {
       setFoundAddress({})
       setVerifyAddress(true)

diff --git a/sites/public/src/pages/applications/contact/alternate-contact-contact.tsx b/sites/public/src/pages/applications/contact/alternate-contact-contact.tsx
@@ -22,10 +22,13 @@ export default () => {
   const currentPageSection = 1
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { control, register, handleSubmit, errors } = useForm<Record<string, any>>({
+  const { control, register, handleSubmit, errors, trigger } = useForm<Record<string, any>>({
     shouldFocusError: false,
   })
-  const onSubmit = (data) => {
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
+
     application.alternateContact.phoneNumber = data.phoneNumber
     application.alternateContact.emailAddress = data.emailAddress || null
     application.alternateContact.mailingAddress.street = data.mailingAddress.street

diff --git a/sites/public/src/pages/applications/contact/alternate-contact-name.tsx b/sites/public/src/pages/applications/contact/alternate-contact-name.tsx
@@ -16,10 +16,13 @@ export default () => {
   const currentPageSection = 1
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { register, handleSubmit, errors } = useForm<Record<string, any>>({
+  const { register, handleSubmit, errors, trigger } = useForm<Record<string, any>>({
     shouldFocusError: false,
   })
-  const onSubmit = (data) => {
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
+
     application.alternateContact.firstName = data.firstName
     application.alternateContact.lastName = data.lastName
     application.alternateContact.agency = data.agency

diff --git a/sites/public/src/pages/applications/contact/alternate-contact-type.tsx b/sites/public/src/pages/applications/contact/alternate-contact-type.tsx
@@ -22,10 +22,13 @@ const ApplicationAlternateContactType = () => {
   const currentPageSection = 1
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { register, handleSubmit, errors, watch } = useForm<Record<string, any>>({
+  const { register, handleSubmit, errors, watch, trigger } = useForm<Record<string, any>>({
     shouldFocusError: false,
   })
-  const onSubmit = (data) => {
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
+
     application.alternateContact.type = data.type
     application.alternateContact.otherType = data.otherType
 

diff --git a/sites/public/src/pages/applications/contact/name.tsx b/sites/public/src/pages/applications/contact/name.tsx
@@ -26,14 +26,17 @@ const ApplicationName = () => {
   const currentPageSection = 1
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { register, handleSubmit, watch, errors } = useForm<Record<string, any>>({
+  const { register, handleSubmit, watch, errors, trigger } = useForm<Record<string, any>>({
     shouldFocusError: false,
     defaultValues: {
       "applicant.emailAddress": application.applicant.emailAddress,
       "applicant.noEmail": application.applicant.noEmail,
     },
   })
-  const onSubmit = (data) => {
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
+
     if (!autofilled) {
       conductor.currentStep.save({ applicant: { ...application.applicant, ...data.applicant } })
     }

diff --git a/sites/public/src/pages/applications/financial/income.tsx b/sites/public/src/pages/applications/financial/income.tsx
@@ -55,15 +55,18 @@ const ApplicationIncome = () => {
     : 3
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { register, handleSubmit, errors, getValues, setValue } = useForm({
+  const { register, handleSubmit, errors, getValues, setValue, trigger } = useForm({
     defaultValues: {
       income: application.income,
       incomePeriod: application.incomePeriod,
     },
     shouldFocusError: false,
   })
 
-  const onSubmit = (data) => {
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
+
     const { income, incomePeriod } = data
     const incomeValue = income.replaceAll(",", "")
     // Skip validation of total income if the applicant has income vouchers.

diff --git a/sites/public/src/pages/applications/financial/vouchers.tsx b/sites/public/src/pages/applications/financial/vouchers.tsx
@@ -25,12 +25,15 @@ const ApplicationVouchers = () => {
     : 3
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { register, handleSubmit, errors, getValues } = useForm({
+  const { register, handleSubmit, errors, getValues, trigger } = useForm({
     defaultValues: { incomeVouchers: application.incomeVouchers?.toString() },
     shouldFocusError: false,
   })
 
-  const onSubmit = (data) => {
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
+
     const { incomeVouchers } = data
     const toSave = { incomeVouchers: JSON.parse(incomeVouchers) }
 

diff --git a/sites/public/src/pages/applications/household/ada.tsx b/sites/public/src/pages/applications/household/ada.tsx
@@ -22,7 +22,7 @@ const ApplicationAda = () => {
   const currentPageSection = 2
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { register, handleSubmit, setValue, errors, getValues, clearErrors } = useForm<
+  const { register, handleSubmit, setValue, errors, getValues, clearErrors, trigger } = useForm<
     Record<string, any>
   >({
     defaultValues: {
@@ -34,7 +34,9 @@ const ApplicationAda = () => {
     shouldFocusError: false,
   })
 
-  const onSubmit = (data) => {
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
     conductor.currentStep.save({
       accessibility: {
         mobility: !!data["app-accessibility-mobility"],

diff --git a/sites/public/src/pages/applications/household/add-members.tsx b/sites/public/src/pages/applications/household/add-members.tsx
@@ -17,13 +17,13 @@ const ApplicationAddMembers = () => {
   const { conductor, application, listing } = useFormConductor("addMembers")
   const router = useRouter()
   const currentPageSection = 2
-  const householdSize = application.householdMembers.length + 1
+  const householdSize = parseInt(application.householdMembers.length) + 1
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
   const { errors, handleSubmit, register, clearErrors } = useForm()
   const onSubmit = () => {
     conductor.currentStep.save({
-      householdSize: application.householdMembers.length + 1,
+      householdSize: parseInt(application.householdMembers.length) + 1,
     })
     conductor.routeToNextOrReturnUrl()
   }

diff --git a/sites/public/src/pages/applications/household/changes.tsx b/sites/public/src/pages/applications/household/changes.tsx
@@ -16,11 +16,13 @@ const ApplicationHouseholdChanges = () => {
   const currentPageSection = 2
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { register, handleSubmit, errors, getValues } = useForm<Record<string, any>>({
+  const { register, handleSubmit, errors, getValues, trigger } = useForm<Record<string, any>>({
     defaultValues: { householdExpectingChanges: application.householdExpectingChanges?.toString() },
     shouldFocusError: false,
   })
-  const onSubmit = (data) => {
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
     const { householdExpectingChanges } = data
     conductor.currentStep.save({
       householdExpectingChanges: householdExpectingChanges === "true",

diff --git a/sites/public/src/pages/applications/household/live-alone.tsx b/sites/public/src/pages/applications/household/live-alone.tsx
@@ -18,8 +18,11 @@ const ApplicationLiveAlone = () => {
   const currentPageSection = 2
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { handleSubmit, register, errors, clearErrors } = useForm()
-  const onSubmit = () => {
+  const { handleSubmit, register, errors, clearErrors, trigger } = useForm()
+
+  const onSubmit = async () => {
+    const validation = await trigger()
+    if (!validation) return
     conductor.sync()
     conductor.routeToNextOrReturnUrl()
   }

diff --git a/sites/public/src/pages/applications/household/member.tsx b/sites/public/src/pages/applications/household/member.tsx
@@ -47,10 +47,13 @@ const ApplicationMember = () => {
   }
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { register, handleSubmit, errors, watch } = useForm({
+  const { register, handleSubmit, errors, watch, trigger } = useForm({
     shouldFocusError: false,
   })
-  const onSubmit = (data) => {
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
+
     application.householdMembers[memberId] = { ...member, ...data } as HouseholdMember
     conductor.sync()
     void router.push("/applications/household/add-members")

diff --git a/sites/public/src/pages/applications/household/preferred-units.tsx b/sites/public/src/pages/applications/household/preferred-units.tsx
@@ -23,9 +23,11 @@ const ApplicationPreferredUnits = () => {
   const currentPageSection = 2
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { register, handleSubmit, errors } = useForm()
+  const { register, handleSubmit, errors, trigger } = useForm()
 
-  const onSubmit = (data) => {
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
     const { preferredUnit } = data
 
     // save units always as an array (when is only one option, react-hook-form stores an option as string)

diff --git a/sites/public/src/pages/applications/household/student.tsx b/sites/public/src/pages/applications/household/student.tsx
@@ -16,11 +16,14 @@ const ApplicationHouseholdStudent = () => {
   const currentPageSection = 2
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { register, handleSubmit, errors, getValues } = useForm<Record<string, any>>({
+  const { register, handleSubmit, errors, getValues, trigger } = useForm<Record<string, any>>({
     defaultValues: { householdStudent: application.householdStudent?.toString() },
     shouldFocusError: false,
   })
-  const onSubmit = (data) => {
+
+  const onSubmit = async (data) => {
+    const validation = await trigger()
+    if (!validation) return
     const { householdStudent } = data
     conductor.currentStep.save({
       householdStudent: householdStudent === "true",

diff --git a/sites/public/src/pages/applications/start/autofill.tsx b/sites/public/src/pages/applications/start/autofill.tsx
@@ -39,17 +39,16 @@ export default () => {
       setSubmitted(true)
       if (previousApplication && useDetails) {
         const withUpdatedLang = {
-          ...previousApplication,
+          ...JSON.parse(JSON.stringify(previousApplication)),
           language: router.locale,
         }
 
         conductor.application = withUpdatedLang
       } else {
-        const newApplication = {
-          ...blankApplication,
+        conductor.application = {
+          ...JSON.parse(JSON.stringify(blankApplication)),
           language: router.locale,
         }
-        conductor.application = newApplication
       }
 
       context.syncApplication(conductor.application)