From 1ec95ca2421249bf3679c42973c65ad3fa92d880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Sun, 17 Dec 2023 20:57:06 +0100
Subject: [PATCH] web: better reset

---
 .../[organization]/[project]/reports/index.tsx      | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/web/src/pages/[organization]/[project]/reports/index.tsx b/apps/web/src/pages/[organization]/[project]/reports/index.tsx
index 6cad93de..37d7bc00 100644
--- a/apps/web/src/pages/[organization]/[project]/reports/index.tsx
+++ b/apps/web/src/pages/[organization]/[project]/reports/index.tsx
@@ -12,7 +12,6 @@ import { reset, setName, setReport } from '@/components/report/reportSlice';
 import { ReportSidebar } from '@/components/report/sidebar/ReportSidebar';
 import { Button } from '@/components/ui/button';
 import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet';
-import { useRouterBeforeLeave } from '@/hooks/useRouterBeforeLeave';
 import { popModal, pushModal } from '@/modals';
 import { useDispatch, useSelector } from '@/redux';
 import { createServerSideProps } from '@/server/getServerSideProps';
@@ -32,13 +31,6 @@ export default function Page() {
     }
   );
 
-  // Reset report state before leaving
-  useRouterBeforeLeave(
-    useCallback(() => {
-      dispatch(reset());
-    }, [dispatch])
-  );
-
   // Set report if reportId exists
   useEffect(() => {
     if (reportId && reportQuery.data) {
@@ -48,6 +40,11 @@ export default function Page() {
     if (!reportId) {
       dispatch(reset());
     }
+
+    // Reset report state before leaving
+    return () => {
+      dispatch(reset());
+    };
   }, [reportId, reportQuery.data, dispatch]);
 
   return (