starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-30 14:12:07 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Placeholder error and fix env nav

Browse Source
This commit is contained in:
Gregory Schier
2023-10-28 19:08:31 -07:00
parent b1b5d08e89
commit d05ee3ec16
11 changed files with 126 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src-web/hooks/useCreateRequest.ts
View File

@@ -4,9 +4,11 @@ import type { HttpRequest } from '../lib/models';
import { useActiveWorkspaceId } from './useActiveWorkspaceId';
import { useAppRoutes } from './useAppRoutes';
import { requestsQueryKey, useRequests } from './useRequests';
import { useActiveEnvironmentId } from './useActiveEnvironmentId';
export function useCreateRequest({ navigateAfter }: { navigateAfter: boolean }) {
const workspaceId = useActiveWorkspaceId();
const activeEnvironmentId = useActiveEnvironmentId();
const routes = useAppRoutes();
const requests = useRequests();
const queryClient = useQueryClient();
@@ -26,7 +28,11 @@ export function useCreateRequest({ navigateAfter }: { navigateAfter: boolean })
(requests) => [...(requests ?? []), request],
);
if (navigateAfter) {
routes.navigate('request', { workspaceId: request.workspaceId, requestId: request.id });
routes.navigate('request', {
workspaceId: request.workspaceId,
requestId: request.id,
environmentId: activeEnvironmentId ?? undefined,
});
}
},
});

12
src-web/hooks/useDuplicateRequest.ts
View File

@@ -4,6 +4,7 @@ import type { HttpRequest } from '../lib/models';
import { useActiveWorkspaceId } from './useActiveWorkspaceId';
import { useAppRoutes } from './useAppRoutes';
import { requestsQueryKey } from './useRequests';
import { useActiveEnvironmentId } from './useActiveEnvironmentId';
export function useDuplicateRequest({
id,
@@ -12,7 +13,8 @@ export function useDuplicateRequest({
id: string | null;
navigateAfter: boolean;
}) {
const workspaceId = useActiveWorkspaceId();
const activeWorkspaceId = useActiveWorkspaceId();
const activeEnvironmentId = useActiveEnvironmentId();
const routes = useAppRoutes();
const queryClient = useQueryClient();
return useMutation<HttpRequest, string>({
@@ -25,8 +27,12 @@ export function useDuplicateRequest({
requestsQueryKey({ workspaceId: request.workspaceId }),
(requests) => [...(requests ?? []), request],
);
if (navigateAfter && workspaceId !== null) {
routes.navigate('request', { workspaceId, requestId: request.id });
if (navigateAfter && activeWorkspaceId !== null) {
routes.navigate('request', {
workspaceId: activeWorkspaceId,
requestId: request.id,
environmentId: activeEnvironmentId ?? undefined,
});
}
},
});