From 5fb806b5e80664dbaba6b04a0410d4f9ac346017 Mon Sep 17 00:00:00 2001
From: Oliver Bryan <ob248@proton.me>
Date: Wed, 28 Jan 2026 08:58:07 +0000
Subject: [PATCH] fix: url params (SelectionProvider) weren't populating in the
 right places and and the right times

---
 .../frontend/src/components/selection-provider.tsx | 14 +++++++++-----
 packages/frontend/src/main.tsx                     | 12 ++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/components/selection-provider.tsx b/packages/frontend/src/components/selection-provider.tsx
index f66d9b4..ff514f0 100644
--- a/packages/frontend/src/components/selection-provider.tsx
+++ b/packages/frontend/src/components/selection-provider.tsx
@@ -1,6 +1,7 @@
 import type { IssueResponse, OrganisationResponse, ProjectResponse } from "@sprint/shared";
 import type { ReactNode } from "react";
 import { createContext, useCallback, useContext, useEffect, useMemo, useState } from "react";
+import { useLocation } from "react-router-dom";
 
 type SelectionContextValue = {
   selectedOrganisationId: number | null;
@@ -69,6 +70,8 @@ const updateUrlParams = (updates: {
 };
 
 export function SelectionProvider({ children }: { children: ReactNode }) {
+  const location = useLocation();
+
   const initialParams = useMemo(() => {
     const params = new URLSearchParams(window.location.search);
     const orgSlug = params.get("o")?.trim().toLowerCase() ?? "";
@@ -153,24 +156,25 @@ export function SelectionProvider({ children }: { children: ReactNode }) {
 
   useEffect(() => {
     const params = new URLSearchParams(window.location.search);
-    const allowIssue = window.location.pathname.startsWith("/issues");
+    const pathname = location.pathname;
+    const allowParams = pathname.startsWith("/issues") || pathname.startsWith("/timeline");
     const updates: {
       orgSlug?: string | null;
       projectKey?: string | null;
       issueNumber?: number | null;
     } = {};
 
-    if (!params.get("o")) {
+    if (allowParams && !params.get("o")) {
       const storedOrgSlug = readStoredString("selectedOrganisationSlug");
       if (storedOrgSlug) updates.orgSlug = storedOrgSlug;
     }
 
-    if (!params.get("p")) {
+    if (allowParams && !params.get("p")) {
       const storedProjectKey = readStoredString("selectedProjectKey");
       if (storedProjectKey) updates.projectKey = storedProjectKey;
     }
 
-    if (allowIssue && !params.get("i")) {
+    if (allowParams && !params.get("i")) {
       const storedIssueNumber = readStoredId("selectedIssueNumber");
       if (storedIssueNumber != null) updates.issueNumber = storedIssueNumber;
     }
@@ -178,7 +182,7 @@ export function SelectionProvider({ children }: { children: ReactNode }) {
     if (Object.keys(updates).length > 0) {
       updateUrlParams(updates);
     }
-  }, []);
+  }, [location.pathname]);
 
   const value = useMemo<SelectionContextValue>(
     () => ({
diff --git a/packages/frontend/src/main.tsx b/packages/frontend/src/main.tsx
index f214187..7f184f4 100644
--- a/packages/frontend/src/main.tsx
+++ b/packages/frontend/src/main.tsx
@@ -21,8 +21,8 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
     <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
       <QueryProvider>
         <SessionProvider>
-          <SelectionProvider>
-            <BrowserRouter>
+          <BrowserRouter>
+            <SelectionProvider>
               <Routes>
                 {/* public routes */}
                 <Route path="/" element={<Landing />} />
@@ -57,10 +57,10 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
 
                 <Route path="*" element={<NotFound />} />
               </Routes>
-            </BrowserRouter>
-            <ActiveTimersOverlay />
-            <Toaster visibleToasts={1} duration={2000} />
-          </SelectionProvider>
+            </SelectionProvider>
+          </BrowserRouter>
+          <ActiveTimersOverlay />
+          <Toaster visibleToasts={1} duration={2000} />
         </SessionProvider>
       </QueryProvider>
     </ThemeProvider>