Merge pull request #4179 from cds-snc/fix/perf-issues

* Move redirects from server to client on Contact and Support
cds-snc · Aug 8, 2024 · 1c79684 · 1c79684
2 parents b960d03 + 3b53550
commit 1c79684
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/app/(gcforms)/[locale]/(support)/contact/actions.ts b/app/(gcforms)/[locale]/(support)/contact/actions.ts
@@ -2,7 +2,6 @@
 import { serverTranslation } from "@i18n";
 import { createTicket } from "@lib/integration/freshdesk";
 import { logMessage } from "@lib/logger";
-import { redirect } from "next/navigation";
 import { email, minLength, object, safeParse, string, toLowerCase, toTrimmed } from "valibot";
 
 export interface ErrorStates {
@@ -121,6 +120,5 @@ ${description}<br/>
     logMessage.error(`Failed to send contact request: ${(error as Error).message}`);
     return { error: "Internal Service Error: Failed to send request", validationErrors: [] };
   }
-  // The redirect must be outside of the try/catch block to avoid the NEXT_REDIRECT being caught by the error boundary
-  redirect(`/${language}/contact?success`);
+  return { error: "", validationErrors: [] };
 }
diff --git a/app/(gcforms)/[locale]/(support)/contact/components/client/ContactForm.tsx b/app/(gcforms)/[locale]/(support)/contact/components/client/ContactForm.tsx
@@ -15,6 +15,7 @@ import { TextInput } from "../../../components/client/TextInput";
 import { MultipleChoiceGroup } from "../../../components/client/MultipleChoiceGroup";
 import { TextArea } from "../../../components/client/TextArea";
 import { SubmitButton } from "../../../components/client/SubmitButton";
+import { redirect } from "next/navigation";
 
 export const ContactForm = () => {
   const {
@@ -28,6 +29,11 @@ export const ContactForm = () => {
     return state.validationErrors.find((e) => e.fieldKey === fieldKey)?.fieldValue || "";
   };
 
+  if (state.error === "") {
+    //Route through the client.
+    redirect(`/${language}/contact?success`);
+  }
+
   return (
     <>
       {/* @todo  Add general error to show user there was an internal service error */}

diff --git a/app/(gcforms)/[locale]/(support)/support/actions.ts b/app/(gcforms)/[locale]/(support)/support/actions.ts
@@ -2,7 +2,7 @@
 import { serverTranslation } from "@i18n";
 import { createTicket } from "@lib/integration/freshdesk";
 import { logMessage } from "@lib/logger";
-import { redirect } from "next/navigation";
+
 import { email, minLength, object, safeParse, string, toLowerCase, toTrimmed } from "valibot";
 
 export interface ErrorStates {
@@ -97,6 +97,5 @@ ${description}<br/>
     logMessage.error(`Failed to send support request: ${(error as Error).message}`);
     return { error: "Internal Service Error: Failed to send request", validationErrors: [] };
   }
-  // The redirect must be outside of the try/catch block to avoid the NEXT_REDIRECT being caught by the error boundary
-  redirect(`/${language}/support?success`);
+  return { error: "", validationErrors: [] };
 }
diff --git a/app/(gcforms)/[locale]/(support)/support/components/client/SupportForm.tsx b/app/(gcforms)/[locale]/(support)/support/components/client/SupportForm.tsx
@@ -15,6 +15,7 @@ import { TextInput } from "../../../components/client/TextInput";
 import { MultipleChoiceGroup } from "../../../components/client/MultipleChoiceGroup";
 import { TextArea } from "../../../components/client/TextArea";
 import { SubmitButton } from "../../../components/client/SubmitButton";
+import { redirect } from "next/navigation";
 
 export const SupportForm = () => {
   const {
@@ -28,6 +29,11 @@ export const SupportForm = () => {
     return state.validationErrors.find((e) => e.fieldKey === fieldKey)?.fieldValue || "";
   };
 
+  if (state.error === "") {
+    //Route through the client.
+    redirect(`/${language}/support?success`);
+  }
+
   return (
     <>
       {/* @todo  Add general error to show user there was an internal service error */}
@@ -56,7 +62,9 @@ export const SupportForm = () => {
       <h1>{t("support.title")}</h1>
       <p className="mb-6 mt-[-2rem] text-[1.6rem]">
         {t("support.experience")}
-        <Link href={`https://articles.alpha.canada.ca/forms-formulaires/${language}/guidance`}>{t("support.guidanceLink")}</Link>
+        <Link href={`https://articles.alpha.canada.ca/forms-formulaires/${language}/guidance`}>
+          {t("support.guidanceLink")}
+        </Link>
         {t("support.useThisForm")}
       </p>
       <p className="mb-14">