starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-19 15:21:23 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix active environment on workspace change

Browse Source
This commit is contained in:
Gregory Schier
2024-02-13 16:42:07 -08:00
parent f14311d14a
commit 4e1700f8a4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src-web/components/AppRouter.tsx
View File

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