Fix request duplication

This commit is contained in:
Gregory Schier
2023-03-31 22:54:32 -07:00
parent bd48726f44
commit be436bb706
2 changed files with 13 additions and 5 deletions

View File

@@ -192,6 +192,7 @@ pub async fn duplicate_request(id: &str, pool: &Pool<Sqlite>) -> Result<HttpRequ
let existing = get_request(id, pool)
.await
.expect("Failed to get request to duplicate");
// TODO: Figure out how to make this better
let b2;
let body = match existing.body {
@@ -213,7 +214,7 @@ pub async fn duplicate_request(id: &str, pool: &Pool<Sqlite>) -> Result<HttpRequ
existing.authentication_type,
existing.url.as_str(),
existing.headers.0,
existing.sort_priority,
existing.sort_priority + 0.001,
pool,
)
.await

View File

@@ -1,6 +1,8 @@
import { useMutation } from '@tanstack/react-query';
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { invoke } from '@tauri-apps/api';
import type { HttpRequest } from '../lib/models';
import { useActiveWorkspaceId } from './useActiveWorkspaceId';
import { requestsQueryKey } from './useRequests';
import { useRoutes } from './useRoutes';
export function useDuplicateRequest({
@@ -12,14 +14,19 @@ export function useDuplicateRequest({
}) {
const workspaceId = useActiveWorkspaceId();
const routes = useRoutes();
return useMutation<string, string>({
const queryClient = useQueryClient();
return useMutation<HttpRequest, string>({
mutationFn: async () => {
if (id === null) throw new Error("Can't duplicate a null request");
return invoke('duplicate_request', { id });
},
onSuccess: async (newId: string) => {
onSuccess: async (request) => {
queryClient.setQueryData<HttpRequest[]>(
requestsQueryKey({ workspaceId: request.workspaceId }),
(requests) => [...(requests ?? []), request],
);
if (navigateAfter && workspaceId !== null) {
routes.navigate('request', { workspaceId, requestId: newId });
routes.navigate('request', { workspaceId, requestId: request.id });
}
},
});