From 45fea008c2864593a7c3e84aa05b1a195a9cfd1b Mon Sep 17 00:00:00 2001 From: Ivareh Date: Sat, 19 Jul 2025 14:26:28 +0200 Subject: [PATCH 1/2] #777 frontend: Redirect now works after captcha --- src/frontend/src/routes/_layout.tsx | 7 +++++++ src/frontend/src/utils.ts | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/routes/_layout.tsx b/src/frontend/src/routes/_layout.tsx index 79939e35..5fb80f58 100644 --- a/src/frontend/src/routes/_layout.tsx +++ b/src/frontend/src/routes/_layout.tsx @@ -4,12 +4,19 @@ import { Outlet, createFileRoute, redirect } from "@tanstack/react-router"; import useTurnstileValidation, { hasCompletedCaptcha, } from "../hooks/validation/turnstileValidation"; +import { useGraphInputStore } from "../store/GraphInputStore"; const security_ip = localStorage.getItem("security_ip"); export const Route = createFileRoute("/_layout")({ component: Layout, beforeLoad: async () => { + try { + const searchParams = new URLSearchParams(location.hash.slice(1)); + useGraphInputStore.getState().getStoreFromHash(searchParams); + } catch (error) { + console.log("Coulnd't get url hash to store properly") + } if (!hasCompletedCaptcha()) { throw redirect({ to: "/captcha", diff --git a/src/frontend/src/utils.ts b/src/frontend/src/utils.ts index 1aae6368..d1f1860e 100644 --- a/src/frontend/src/utils.ts +++ b/src/frontend/src/utils.ts @@ -105,6 +105,6 @@ export const validateAndSetSearchParams = (searchParams: URLSearchParams) => { graphState.addLeague(DEFAULT_LEAGUES[0]); const searchParams = new URLSearchParams(); searchParams.set("league", DEFAULT_LEAGUES[0]); - location.hash = searchParams.toString(); + graphState.setHashFromStore(); } }; From af6bda76dfd61e209671bb5e94d72a7292475380 Mon Sep 17 00:00:00 2001 From: Ivareh Date: Sat, 19 Jul 2025 15:09:58 +0200 Subject: [PATCH 2/2] #783 frontend: Fixed plot button dead bug --- src/frontend/src/utils.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/frontend/src/utils.ts b/src/frontend/src/utils.ts index d1f1860e..3e28cbdc 100644 --- a/src/frontend/src/utils.ts +++ b/src/frontend/src/utils.ts @@ -97,7 +97,9 @@ const validateLeagues = (searchParams: URLSearchParams) => { }; export const validateAndSetSearchParams = (searchParams: URLSearchParams) => { + const graphState = useGraphInputStore.getState(); try { + graphState.setHashFromStore(); validateLeagues(searchParams); } catch (error) { const graphState = useGraphInputStore.getState(); @@ -106,5 +108,7 @@ export const validateAndSetSearchParams = (searchParams: URLSearchParams) => { const searchParams = new URLSearchParams(); searchParams.set("league", DEFAULT_LEAGUES[0]); graphState.setHashFromStore(); + } finally { + graphState.setStateHash(undefined); } };