From 247ff1837e3783b0795b5d6cf90980891c7133bb Mon Sep 17 00:00:00 2001
From: atrincas <atrincas@gmail.com>
Date: Tue, 7 Jan 2025 16:02:38 +0100
Subject: [PATCH] fix: redirect preview onsubmit

---
 client/src/containers/projects/new/header.tsx |  3 +--
 client/src/containers/projects/new/index.tsx  | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/client/src/containers/projects/new/header.tsx b/client/src/containers/projects/new/header.tsx
index a92a6705..c9e95445 100644
--- a/client/src/containers/projects/new/header.tsx
+++ b/client/src/containers/projects/new/header.tsx
@@ -26,8 +26,7 @@ export default function Header() {
         <Button
           disabled={!methods.formState.isValid}
           onClick={() => {
-            methods.handleSubmit((data) => onSubmit(data))();
-            router.push("/projects/preview");
+            methods.handleSubmit((data) => onSubmit(data, router))();
           }}
         >
           Continue
diff --git a/client/src/containers/projects/new/index.tsx b/client/src/containers/projects/new/index.tsx
index 6692ce1a..d93d201a 100644
--- a/client/src/containers/projects/new/index.tsx
+++ b/client/src/containers/projects/new/index.tsx
@@ -4,6 +4,9 @@ import { useEffect, useRef } from "react";
 
 import { FormProvider, useForm } from "react-hook-form";
 
+import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
+import { useRouter } from "next/navigation";
+
 import { zodResolver } from "@hookform/resolvers/zod";
 import { ACTIVITY } from "@shared/entities/activity.enum";
 import { EMISSION_FACTORS_TIER_TYPES } from "@shared/entities/carbon-inputs/emission-factors.entity";
@@ -32,7 +35,10 @@ import { formStepAtom } from "@/containers/projects/store";
 
 import { ScrollArea } from "@/components/ui/scroll-area";
 
-export const onSubmit = async (data: CreateCustomProjectForm) => {
+export const onSubmit = async (
+  data: CreateCustomProjectForm,
+  router: AppRouterInstance,
+) => {
   const queryClient = getQueryClient();
 
   const originalValues = { ...data };
@@ -143,13 +149,14 @@ export const onSubmit = async (data: CreateCustomProjectForm) => {
 
   if (status === 201) {
     queryClient.setQueryData(queryKeys.customProjects.cached.queryKey, body);
+    router.push("/projects/preview");
   }
 };
 
 export default function CreateCustomProject() {
   const ref = useRef<HTMLDivElement>(null);
   const setIntersecting = useSetAtom(formStepAtom);
-
+  const router = useRouter();
   const { queryKey } = queryKeys.customProjects.countries;
   const { data: countryOptions } =
     client.customProjects.getAvailableCountries.useQuery(
@@ -238,7 +245,11 @@ export default function CreateCustomProject() {
           <ProjectSidebar />
           <div className="mb-4 flex-1">
             <ScrollArea className="flex h-full gap-3 pr-6">
-              <ProjectForm onSubmit={methods.handleSubmit(onSubmit)} />
+              <ProjectForm
+                onSubmit={methods.handleSubmit((data) =>
+                  onSubmit(data, router),
+                )}
+              />
             </ScrollArea>
           </div>
         </div>