Fix regforms filters not being persisted

indico · Jun 3, 2024 · 8d2226a · 8d2226a
1 parent 9efa3c9
commit 8d2226a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/pages/participant/ParticipantPage.tsx b/src/pages/participant/ParticipantPage.tsx
@@ -274,22 +274,22 @@ function ParticipantTopNav({
   regform?: Regform;
   participant?: Participant;
 }) {
+  const {state} = useLocation();
   const errorModal = useErrorModal();
 
   if (!event || !regform || !participant) {
     return <TopNav />;
   }
+  const backNavigateTo = state?.fromRegform ? -1 : `/event/${event.id}/${regform.id}`;
 
   if (participant.price === 0 || !participant.isPaid) {
-    return (
-      <TopNav backBtnText={regform.title} backNavigateTo={`/event/${event.id}/${regform.id}`} />
-    );
+    return <TopNav backBtnText={regform.title} backNavigateTo={backNavigateTo} />;
   }
 
   return (
     <TopNav
       backBtnText={regform.title}
-      backNavigateTo={`/event/${event.id}/${regform.id}`}
+      backNavigateTo={backNavigateTo}
       settingsItems={[
         {
           text: 'Mark as unpaid',

diff --git a/src/pages/regform/RegformPage.tsx b/src/pages/regform/RegformPage.tsx
@@ -154,7 +154,7 @@ function RegformPageContent({
             setSearchData={setSearchData}
             onRowClick={async (p: Participant) => {
               await wait(50);
-              navigate(`/event/${event.id}/${regform.id}/${p.id}`);
+              navigate(`/event/${event.id}/${regform.id}/${p.id}`, {state: {fromRegform: true}});
             }}
           />
         </div>