web: better reset

This commit is contained in:
Carl-Gerhard Lindesvärd
2023-12-17 20:57:06 +01:00
parent 4845cbf6f8
commit 1ec95ca242

View File

@@ -12,7 +12,6 @@ import { reset, setName, setReport } from '@/components/report/reportSlice';
import { ReportSidebar } from '@/components/report/sidebar/ReportSidebar'; import { ReportSidebar } from '@/components/report/sidebar/ReportSidebar';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet'; import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet';
import { useRouterBeforeLeave } from '@/hooks/useRouterBeforeLeave';
import { popModal, pushModal } from '@/modals'; import { popModal, pushModal } from '@/modals';
import { useDispatch, useSelector } from '@/redux'; import { useDispatch, useSelector } from '@/redux';
import { createServerSideProps } from '@/server/getServerSideProps'; 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 // Set report if reportId exists
useEffect(() => { useEffect(() => {
if (reportId && reportQuery.data) { if (reportId && reportQuery.data) {
@@ -48,6 +40,11 @@ export default function Page() {
if (!reportId) { if (!reportId) {
dispatch(reset()); dispatch(reset());
} }
// Reset report state before leaving
return () => {
dispatch(reset());
};
}, [reportId, reportQuery.data, dispatch]); }, [reportId, reportQuery.data, dispatch]);
return ( return (