From d158f51141f54ae4d0e2a4d40598c7b976a4487b Mon Sep 17 00:00:00 2001
From: Oliver Bryan <04oliverbryan@gmail.com>
Date: Thu, 1 Jan 2026 11:36:21 +0000
Subject: [PATCH] save/load selectedOrganisationId and selectedProjectId to/
 localStorage

---
 packages/frontend/src/Index.tsx               | 66 +++++++++++--------
 packages/frontend/src/Organisations.tsx       | 36 ++++++----
 .../frontend/src/components/auth-provider.tsx |  2 +
 .../src/components/log-out-button.tsx         |  2 +
 4 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/packages/frontend/src/Index.tsx b/packages/frontend/src/Index.tsx
index a334bdb..b18e081 100644
--- a/packages/frontend/src/Index.tsx
+++ b/packages/frontend/src/Index.tsx
@@ -31,25 +31,30 @@ function Index() {
                     const organisations = data as OrganisationResponse[];
                     setOrganisations(organisations);
 
-                    // select newly created organisation
+                    let selected: OrganisationResponse | null = null;
+
                     if (options?.selectOrganisationId) {
                         const created = organisations.find(
                             (o) => o.Organisation.id === options.selectOrganisationId,
                         );
                         if (created) {
-                            setSelectedOrganisation(created);
-                            return;
+                            selected = created;
+                        }
+                    } else {
+                        const savedId = localStorage.getItem("selectedOrganisationId");
+                        if (savedId) {
+                            const saved = organisations.find((o) => o.Organisation.id === Number(savedId));
+                            if (saved) {
+                                selected = saved;
+                            }
                         }
                     }
 
-                    // preserve previously selected organisation
-                    setSelectedOrganisation((prev) => {
-                        if (!prev) return organisations[0] || null;
-                        const stillExists = organisations.find(
-                            (o) => o.Organisation.id === prev.Organisation.id,
-                        );
-                        return stillExists || organisations[0] || null;
-                    });
+                    if (!selected) {
+                        selected = organisations[0] || null;
+                    }
+
+                    setSelectedOrganisation(selected);
                 },
                 onError: (error) => {
                     console.error("error fetching organisations:", error);
@@ -66,10 +71,6 @@ function Index() {
         void refetchOrganisations();
     }, [user.id]);
 
-    useEffect(() => {
-        setSelectedOrganisation((prev) => prev || organisations[0] || null);
-    }, [organisations]);
-
     const refetchProjects = async (organisationId: number, options?: { selectProjectId?: number }) => {
         try {
             await project.byOrganisation({
@@ -78,21 +79,28 @@ function Index() {
                     const projects = data as ProjectResponse[];
                     setProjects(projects);
 
-                    // select newly created project
+                    let selected: ProjectResponse | null = null;
+
                     if (options?.selectProjectId) {
                         const created = projects.find((p) => p.Project.id === options.selectProjectId);
                         if (created) {
-                            setSelectedProject(created);
-                            return;
+                            selected = created;
+                        }
+                    } else {
+                        const savedId = localStorage.getItem("selectedProjectId");
+                        if (savedId) {
+                            const saved = projects.find((p) => p.Project.id === Number(savedId));
+                            if (saved) {
+                                selected = saved;
+                            }
                         }
                     }
 
-                    // preserve previously selected project
-                    setSelectedProject((prev) => {
-                        if (!prev) return projects[0] || null;
-                        const stillExists = projects.find((p) => p.Project.id === prev.Project.id);
-                        return stillExists || projects[0] || null;
-                    });
+                    if (!selected) {
+                        selected = projects[0] || null;
+                    }
+
+                    setSelectedProject(selected);
                 },
                 onError: (error) => {
                     console.error("error fetching projects:", error);
@@ -117,10 +125,6 @@ function Index() {
         void refetchProjects(selectedOrganisation.Organisation.id);
     }, [selectedOrganisation]);
 
-    useEffect(() => {
-        setSelectedProject((prev) => prev || projects[0] || null);
-    }, [projects]);
-
     const refetchIssues = async () => {
         try {
             await issue.byProject({
@@ -156,7 +160,10 @@ function Index() {
                     <OrganisationSelect
                         organisations={organisations}
                         selectedOrganisation={selectedOrganisation}
-                        onSelectedOrganisationChange={setSelectedOrganisation}
+                        onSelectedOrganisationChange={(org) => {
+                            setSelectedOrganisation(org);
+                            localStorage.setItem("selectedOrganisationId", `${org?.Organisation.id}`);
+                        }}
                         onCreateOrganisation={async (organisationId) => {
                             await refetchOrganisations({ selectOrganisationId: organisationId });
                         }}
@@ -170,6 +177,7 @@ function Index() {
                             organisationId={selectedOrganisation?.Organisation.id}
                             onSelectedProjectChange={(project) => {
                                 setSelectedProject(project);
+                                localStorage.setItem("selectedProjectId", `${project?.Project.id}`);
                                 setSelectedIssue(null);
                             }}
                             onCreateProject={async (projectId) => {
diff --git a/packages/frontend/src/Organisations.tsx b/packages/frontend/src/Organisations.tsx
index 506f9ac..3395a79 100644
--- a/packages/frontend/src/Organisations.tsx
+++ b/packages/frontend/src/Organisations.tsx
@@ -30,23 +30,32 @@ function Organisations() {
                         const organisations = data as OrganisationResponse[];
                         setOrganisations(organisations);
 
+                        let selected: OrganisationResponse | null = null;
+
                         if (options?.selectOrganisationId) {
                             const created = organisations.find(
                                 (o) => o.Organisation.id === options.selectOrganisationId,
                             );
                             if (created) {
-                                setSelectedOrganisation(created);
-                                return;
+                                selected = created;
+                            }
+                        } else {
+                            const savedId = localStorage.getItem("selectedOrganisationId");
+                            if (savedId) {
+                                const saved = organisations.find(
+                                    (o) => o.Organisation.id === Number(savedId),
+                                );
+                                if (saved) {
+                                    selected = saved;
+                                }
                             }
                         }
 
-                        setSelectedOrganisation((prev) => {
-                            if (!prev) return organisations[0] || null;
-                            const stillExists = organisations.find(
-                                (o) => o.Organisation.id === prev.Organisation.id,
-                            );
-                            return stillExists || organisations[0] || null;
-                        });
+                        if (!selected) {
+                            selected = organisations[0] || null;
+                        }
+
+                        setSelectedOrganisation(selected);
                     },
                     onError: (error) => {
                         console.error(error);
@@ -117,10 +126,6 @@ function Organisations() {
         void refetchOrganisations();
     }, [refetchOrganisations]);
 
-    useEffect(() => {
-        setSelectedOrganisation((prev) => prev || organisations[0] || null);
-    }, [organisations]);
-
     useEffect(() => {
         void refetchMembers();
     }, [refetchMembers]);
@@ -132,7 +137,10 @@ function Organisations() {
                     <OrganisationSelect
                         organisations={organisations}
                         selectedOrganisation={selectedOrganisation}
-                        onSelectedOrganisationChange={setSelectedOrganisation}
+                        onSelectedOrganisationChange={(org) => {
+                            setSelectedOrganisation(org);
+                            localStorage.setItem("selectedOrganisationId", `${org?.Organisation.id}`);
+                        }}
                         onCreateOrganisation={async (organisationId) => {
                             await refetchOrganisations({ selectOrganisationId: organisationId });
                         }}
diff --git a/packages/frontend/src/components/auth-provider.tsx b/packages/frontend/src/components/auth-provider.tsx
index 6298eba..498f86c 100644
--- a/packages/frontend/src/components/auth-provider.tsx
+++ b/packages/frontend/src/components/auth-provider.tsx
@@ -37,6 +37,8 @@ export function Auth({ children }: AuthProviderProps) {
                 setLoggedIn(false);
                 localStorage.removeItem("token");
                 localStorage.removeItem("user");
+                localStorage.removeItem("selectedOrganisationId");
+                localStorage.removeItem("selectedProjectId");
             });
     }, []);
 
diff --git a/packages/frontend/src/components/log-out-button.tsx b/packages/frontend/src/components/log-out-button.tsx
index 30260e2..fd270bd 100644
--- a/packages/frontend/src/components/log-out-button.tsx
+++ b/packages/frontend/src/components/log-out-button.tsx
@@ -15,6 +15,8 @@ export default function LogOutButton({
     const logOut = () => {
         localStorage.removeItem("token");
         localStorage.removeItem("user");
+        localStorage.removeItem("selectedOrganisationId");
+        localStorage.removeItem("selectedProjectId");
 
         navigate(0);
     };