From be436bb7061b797da01ac881f3a2db0e215c22c0 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Fri, 31 Mar 2023 22:54:32 -0700
Subject: [PATCH] Fix request duplication

---
 src-tauri/src/models.rs              |  3 ++-
 src-web/hooks/useDuplicateRequest.ts | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src-tauri/src/models.rs b/src-tauri/src/models.rs
index d538d5f8..01653c26 100644
--- a/src-tauri/src/models.rs
+++ b/src-tauri/src/models.rs
@@ -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
diff --git a/src-web/hooks/useDuplicateRequest.ts b/src-web/hooks/useDuplicateRequest.ts
index 5eec515c..b15ab227 100644
--- a/src-web/hooks/useDuplicateRequest.ts
+++ b/src-web/hooks/useDuplicateRequest.ts
@@ -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 });
       }
     },
   });