From 7f20b6738000fa4d04e97b8fad322ce92d8b88dc Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Tue, 13 Feb 2024 16:42:07 -0800
Subject: [PATCH] Fix active environment on workspace change

---
 src-web/components/AppRouter.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src-web/components/AppRouter.tsx b/src-web/components/AppRouter.tsx
index 1f01ffd4..8e55d76e 100644
--- a/src-web/components/AppRouter.tsx
+++ b/src-web/components/AppRouter.tsx
@@ -1,4 +1,5 @@
 import { createBrowserRouter, Navigate, Outlet, RouterProvider, useParams } from 'react-router-dom';
+import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
 import { routePaths, useAppRoutes } from '../hooks/useAppRoutes';
 import { useHttpRequests } from '../hooks/useHttpRequests';
 import { useRecentRequests } from '../hooks/useRecentRequests';
@@ -53,6 +54,9 @@ function WorkspaceOrRedirect() {
   const request = requests.find((r) => r.id === recentRequests[0]);
   const routes = useAppRoutes();
 
+  // Keep environment if it's in the query params
+  const environmentId = useActiveEnvironmentId() ?? undefined;
+
   if (request === undefined) {
     return <Workspace />;
   }
@@ -63,6 +67,7 @@ function WorkspaceOrRedirect() {
     <Navigate
       to={routes.paths.request({
         workspaceId,
+        environmentId,
         requestId,
       })}
     />