starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-18 23:43:55 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Active environment in query param

Browse Source
This commit is contained in:
Gregory Schier
2024-02-13 16:32:31 -08:00
parent b0a341b29f
commit a57ad3bd7c
3 changed files with 62 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-web/hooks/useActiveEnvironmentId.ts
View File

@@ -1,9 +1,11 @@
import { useParams } from 'react-router-dom';
import type { RouteParamsRequest } from './useAppRoutes';
import { useSearchParams } from 'react-router-dom';
export const QUERY_ENVIRONMENT_ID = 'environment_id';
export function useActiveEnvironmentId(): string | null {
const { environmentId } = useParams<RouteParamsRequest>();
if (environmentId == null || environmentId === '__default__') {
const [params] = useSearchParams();
const environmentId = params.get(QUERY_ENVIRONMENT_ID);
if (environmentId == null) {
return null;
}

33
src-web/hooks/useAppRoutes.ts
View File

@@ -1,4 +1,5 @@
import { useNavigate } from 'react-router-dom';
import { QUERY_ENVIRONMENT_ID } from './useActiveEnvironmentId';
import { useActiveWorkspaceId } from './useActiveWorkspaceId';
import { useActiveRequestId } from './useActiveRequestId';
import type { Environment } from '../lib/models';
@@ -23,7 +24,11 @@ export const routePaths = {
environmentId: ':environmentId',
} as RouteParamsWorkspace,
) {
return `/workspaces/${workspaceId}/environments/${environmentId ?? '__default__'}`;
let path = `/workspaces/${workspaceId}`;
if (environmentId != null) {
path += `?${QUERY_ENVIRONMENT_ID}=${encodeURIComponent(environmentId)}`;
}
return path;
},
request(
{ workspaceId, environmentId, requestId } = {
@@ -32,7 +37,11 @@ export const routePaths = {
requestId: ':requestId',
} as RouteParamsRequest,
) {
return `${this.workspace({ workspaceId, environmentId })}/requests/${requestId}`;
let path = `/workspaces/${workspaceId}/requests/${requestId}`;
if (environmentId != null) {
path += `?${QUERY_ENVIRONMENT_ID}=${encodeURIComponent(environmentId)}`;
}
return path;
},
};
@@ -41,16 +50,16 @@ export function useAppRoutes() {
const requestId = useActiveRequestId();
const nav = useNavigate();
const navigate = useCallback(<T extends keyof typeof routePaths>(
path: T,
...params: Parameters<(typeof routePaths)[T]>
) => {
// Not sure how to make TS work here, but it's good from the
// outside caller perspective.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const resolvedPath = routePaths[path](...(params as any));
nav(resolvedPath);
}, [nav]);
const navigate = useCallback(
<T extends keyof typeof routePaths>(path: T, ...params: Parameters<(typeof routePaths)[T]>) => {
// Not sure how to make TS work here, but it's good from the
// outside caller perspective.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const resolvedPath = routePaths[path](...(params as any));
nav(resolvedPath);
},
[nav],
);
const setEnvironment = useCallback(
(environment: Environment | null) => {