From b6cd6e415a393242421d73a18af355c8527459d3 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Fri, 21 Jun 2024 10:01:45 -0700 Subject: [PATCH] Consolidate any* hooks --- package-lock.json | 2 +- package.json | 2 +- src-web/components/BasicAuth.tsx | 52 +++++++++++------- src-web/components/BearerAuth.tsx | 30 ++++++----- src-web/components/GrpcConnectionLayout.tsx | 18 ++++--- .../components/GrpcConnectionSetupPane.tsx | 38 ++++++++----- src-web/components/RequestPane.tsx | 53 ++++++++++--------- src-web/components/Sidebar.tsx | 27 +++++----- ...AnyRequest.ts => useSendAnyHttpRequest.ts} | 2 +- src-web/hooks/useSendFolder.ts | 4 +- src-web/hooks/useSendRequest.ts | 11 ---- src-web/hooks/useUpdateGrpcRequest.ts | 13 ----- src-web/hooks/useUpdateHttpRequest.ts | 11 ---- 13 files changed, 133 insertions(+), 130 deletions(-) rename src-web/hooks/{useSendAnyRequest.ts => useSendAnyHttpRequest.ts} (95%) delete mode 100644 src-web/hooks/useSendRequest.ts delete mode 100644 src-web/hooks/useUpdateGrpcRequest.ts delete mode 100644 src-web/hooks/useUpdateHttpRequest.ts diff --git a/package-lock.json b/package-lock.json index 72b2f8b7..7cdae75f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@lezer/lr": "^1.3.3", "@react-hook/resize-observer": "^1.2.6", "@tailwindcss/container-queries": "^0.1.0", - "@tanstack/react-query": "^5.35.5", + "@tanstack/react-query": "^5.45.1", "@tauri-apps/api": ">=2.0.0-beta.0", "@tauri-apps/plugin-clipboard-manager": "^2.1.0-beta.1", "@tauri-apps/plugin-dialog": ">=2.0.0-beta.0", diff --git a/package.json b/package.json index 9fc8b048..c8abf180 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lezer/lr": "^1.3.3", "@react-hook/resize-observer": "^1.2.6", "@tailwindcss/container-queries": "^0.1.0", - "@tanstack/react-query": "^5.35.5", + "@tanstack/react-query": "^5.45.1", "@tauri-apps/api": ">=2.0.0-beta.0", "@tauri-apps/plugin-clipboard-manager": "^2.1.0-beta.1", "@tauri-apps/plugin-dialog": ">=2.0.0-beta.0", diff --git a/src-web/components/BasicAuth.tsx b/src-web/components/BasicAuth.tsx index 1b2ea334..1f37faae 100644 --- a/src-web/components/BasicAuth.tsx +++ b/src-web/components/BasicAuth.tsx @@ -1,5 +1,5 @@ -import { useUpdateGrpcRequest } from '../hooks/useUpdateGrpcRequest'; -import { useUpdateHttpRequest } from '../hooks/useUpdateHttpRequest'; +import { useUpdateAnyGrpcRequest } from '../hooks/useUpdateAnyGrpcRequest'; +import { useUpdateAnyHttpRequest } from '../hooks/useUpdateAnyHttpRequest'; import type { GrpcRequest, HttpRequest } from '../lib/models'; import { Input } from './core/Input'; import { VStack } from './core/Stacks'; @@ -9,8 +9,8 @@ interface Props { } export function BasicAuth({ request }: Props) { - const updateHttpRequest = useUpdateHttpRequest(request.id); - const updateGrpcRequest = useUpdateGrpcRequest(request.id); + const updateHttpRequest = useUpdateAnyHttpRequest(); + const updateGrpcRequest = useUpdateAnyGrpcRequest(); return ( @@ -25,15 +25,21 @@ export function BasicAuth({ request }: Prop defaultValue={`${request.authentication.username}`} onChange={(username: string) => { if (request.model === 'http_request') { - updateHttpRequest.mutate((r) => ({ - ...r, - authentication: { password: r.authentication.password, username }, - })); + updateHttpRequest.mutate({ + id: request.id, + update: (r) => ({ + ...r, + authentication: { password: r.authentication.password, username }, + }), + }); } else { - updateGrpcRequest.mutate((r) => ({ - ...r, - authentication: { password: r.authentication.password, username }, - })); + updateGrpcRequest.mutate({ + id: request.id, + update: (r) => ({ + ...r, + authentication: { password: r.authentication.password, username }, + }), + }); } }} /> @@ -49,15 +55,21 @@ export function BasicAuth({ request }: Prop defaultValue={`${request.authentication.password}`} onChange={(password: string) => { if (request.model === 'http_request') { - updateHttpRequest.mutate((r) => ({ - ...r, - authentication: { username: r.authentication.username, password }, - })); + updateHttpRequest.mutate({ + id: request.id, + update: (r) => ({ + ...r, + authentication: { username: r.authentication.username, password }, + }), + }); } else { - updateGrpcRequest.mutate((r) => ({ - ...r, - authentication: { username: r.authentication.username, password }, - })); + updateGrpcRequest.mutate({ + id: request.id, + update: (r) => ({ + ...r, + authentication: { username: r.authentication.username, password }, + }), + }); } }} /> diff --git a/src-web/components/BearerAuth.tsx b/src-web/components/BearerAuth.tsx index 2c81c5d9..5043753e 100644 --- a/src-web/components/BearerAuth.tsx +++ b/src-web/components/BearerAuth.tsx @@ -1,5 +1,5 @@ -import { useUpdateGrpcRequest } from '../hooks/useUpdateGrpcRequest'; -import { useUpdateHttpRequest } from '../hooks/useUpdateHttpRequest'; +import { useUpdateAnyGrpcRequest } from '../hooks/useUpdateAnyGrpcRequest'; +import { useUpdateAnyHttpRequest } from '../hooks/useUpdateAnyHttpRequest'; import type { GrpcRequest, HttpRequest } from '../lib/models'; import { Input } from './core/Input'; import { VStack } from './core/Stacks'; @@ -9,8 +9,8 @@ interface Props { } export function BearerAuth({ request }: Props) { - const updateHttpRequest = useUpdateHttpRequest(request?.id ?? null); - const updateGrpcRequest = useUpdateGrpcRequest(request?.id ?? null); + const updateHttpRequest = useUpdateAnyHttpRequest(); + const updateGrpcRequest = useUpdateAnyGrpcRequest(); return ( @@ -25,15 +25,21 @@ export function BearerAuth({ request }: Pro defaultValue={`${request.authentication.token}`} onChange={(token: string) => { if (request.model === 'http_request') { - updateHttpRequest.mutate((r) => ({ - ...r, - authentication: { token }, - })); + updateHttpRequest.mutate({ + id: request.id ?? null, + update: (r) => ({ + ...r, + authentication: { token }, + }), + }); } else { - updateGrpcRequest.mutate((r) => ({ - ...r, - authentication: { token }, - })); + updateGrpcRequest.mutate({ + id: request.id ?? null, + update: (r) => ({ + ...r, + authentication: { token }, + }), + }); } }} /> diff --git a/src-web/components/GrpcConnectionLayout.tsx b/src-web/components/GrpcConnectionLayout.tsx index f0a13181..d4fc8560 100644 --- a/src-web/components/GrpcConnectionLayout.tsx +++ b/src-web/components/GrpcConnectionLayout.tsx @@ -6,7 +6,7 @@ import { useGrpc } from '../hooks/useGrpc'; import { useGrpcConnections } from '../hooks/useGrpcConnections'; import { useGrpcEvents } from '../hooks/useGrpcEvents'; import { useGrpcProtoFiles } from '../hooks/useGrpcProtoFiles'; -import { useUpdateGrpcRequest } from '../hooks/useUpdateGrpcRequest'; +import { useUpdateAnyGrpcRequest } from '../hooks/useUpdateAnyGrpcRequest'; import { Banner } from './core/Banner'; import { HotKeyList } from './core/HotKeyList'; import { SplitLayout } from './core/SplitLayout'; @@ -21,7 +21,7 @@ const emptyArray: string[] = []; export function GrpcConnectionLayout({ style }: Props) { const activeRequest = useActiveRequest('grpc_request'); - const { mutateAsync: updateRequest } = useUpdateGrpcRequest(activeRequest?.id ?? null); + const updateRequest = useUpdateAnyGrpcRequest(); const connections = useGrpcConnections(activeRequest?.id ?? null); const activeConnection = connections[0] ?? null; const messages = useGrpcEvents(activeConnection?.id ?? null); @@ -34,16 +34,22 @@ export function GrpcConnectionLayout({ style }: Props) { if (services == null || activeRequest == null) return; const s = services.find((s) => s.name === activeRequest.service); if (s == null) { - updateRequest({ - service: services[0]?.name ?? null, - method: services[0]?.methods[0]?.name ?? null, + updateRequest.mutate({ + id: activeRequest.id, + update: { + service: services[0]?.name ?? null, + method: services[0]?.methods[0]?.name ?? null, + }, }); return; } const m = s.methods.find((m) => m.name === activeRequest.method); if (m == null) { - updateRequest({ method: s.methods[0]?.name ?? null }); + updateRequest.mutate({ + id: activeRequest.id, + update: { method: s.methods[0]?.name ?? null }, + }); return; } }, [activeRequest, services, updateRequest]); diff --git a/src-web/components/GrpcConnectionSetupPane.tsx b/src-web/components/GrpcConnectionSetupPane.tsx index c08d7050..6c30ef4c 100644 --- a/src-web/components/GrpcConnectionSetupPane.tsx +++ b/src-web/components/GrpcConnectionSetupPane.tsx @@ -5,7 +5,7 @@ import React, { useCallback, useMemo, useRef, useState } from 'react'; import { createGlobalState } from 'react-use'; import type { ReflectResponseService } from '../hooks/useGrpc'; import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey'; -import { useUpdateGrpcRequest } from '../hooks/useUpdateGrpcRequest'; +import { useUpdateAnyGrpcRequest } from '../hooks/useUpdateAnyGrpcRequest'; import type { GrpcMetadataEntry, GrpcRequest } from '../lib/models'; import { AUTH_TYPE_BASIC, AUTH_TYPE_BEARER, AUTH_TYPE_NONE } from '../lib/models'; import { BasicAuth } from './BasicAuth'; @@ -60,7 +60,7 @@ export function GrpcConnectionSetupPane({ onCancel, onSend, }: Props) { - const updateRequest = useUpdateGrpcRequest(activeRequest?.id ?? null); + const updateRequest = useUpdateAnyGrpcRequest(); const [activeTab, setActiveTab] = useActiveTab(); const { updateKey: forceUpdateKey } = useRequestUpdateKey(activeRequest.id ?? null); @@ -71,15 +71,15 @@ export function GrpcConnectionSetupPane({ }); const handleChangeUrl = useCallback( - (url: string) => updateRequest.mutateAsync({ url }), - [updateRequest], + (url: string) => updateRequest.mutateAsync({ id: activeRequest.id, update: { url } }), + [activeRequest.id, updateRequest], ); const handleChangeMessage = useCallback( (message: string) => { - return updateRequest.mutateAsync({ message }); + return updateRequest.mutateAsync({ id: activeRequest.id, update: { message } }); }, - [updateRequest], + [activeRequest.id, updateRequest], ); const select = useMemo(() => { @@ -99,11 +99,14 @@ export function GrpcConnectionSetupPane({ const [serviceName, methodName] = v.split('/', 2); if (serviceName == null || methodName == null) throw new Error('Should never happen'); await updateRequest.mutateAsync({ - service: serviceName, - method: methodName, + id: activeRequest.id, + update: { + service: serviceName, + method: methodName, + }, }); }, - [updateRequest], + [activeRequest.id, updateRequest], ); const handleConnect = useCallback(async () => { @@ -150,18 +153,27 @@ export function GrpcConnectionSetupPane({ token: authentication.token ?? '', }; } - await updateRequest.mutateAsync({ authenticationType, authentication }); + await updateRequest.mutateAsync({ + id: activeRequest.id, + update: { authenticationType, authentication }, + }); }, }, }, { value: 'metadata', label: 'Metadata' }, ], - [activeRequest.authentication, activeRequest.authenticationType, updateRequest], + [ + activeRequest.authentication, + activeRequest.authenticationType, + activeRequest.id, + updateRequest, + ], ); const handleMetadataChange = useCallback( - (metadata: GrpcMetadataEntry[]) => updateRequest.mutate({ metadata }), - [updateRequest], + (metadata: GrpcMetadataEntry[]) => + updateRequest.mutate({ id: activeRequest.id, update: { metadata } }), + [activeRequest.id, updateRequest], ); return ( diff --git a/src-web/components/RequestPane.tsx b/src-web/components/RequestPane.tsx index 1fe8d6c0..3139ee01 100644 --- a/src-web/components/RequestPane.tsx +++ b/src-web/components/RequestPane.tsx @@ -9,8 +9,8 @@ import { useIsResponseLoading } from '../hooks/useIsResponseLoading'; import { usePinnedHttpResponse } from '../hooks/usePinnedHttpResponse'; import { useRequests } from '../hooks/useRequests'; import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey'; -import { useSendRequest } from '../hooks/useSendRequest'; -import { useUpdateHttpRequest } from '../hooks/useUpdateHttpRequest'; +import { useSendAnyHttpRequest } from '../hooks/useSendAnyHttpRequest'; +import { useUpdateAnyHttpRequest } from '../hooks/useUpdateAnyHttpRequest'; import { tryFormatJson } from '../lib/formatters'; import type { HttpHeader, HttpRequest, HttpUrlParameter } from '../lib/models'; import { @@ -59,7 +59,7 @@ export const RequestPane = memo(function RequestPane({ }: Props) { const requests = useRequests(); const activeRequestId = activeRequest.id; - const updateRequest = useUpdateHttpRequest(activeRequestId); + const updateRequest = useUpdateAnyHttpRequest(); const [activeTab, setActiveTab] = useActiveTab(); const [forceUpdateHeaderEditorKey, setForceUpdateHeaderEditorKey] = useState(0); const { updateKey: forceUpdateKey } = useRequestUpdateKey(activeRequest.id ?? null); @@ -76,12 +76,12 @@ export const RequestPane = memo(function RequestPane({ enabled: true, }); } - await updateRequest.mutateAsync({ headers }); + await updateRequest.mutateAsync({ id: activeRequestId, update: { headers } }); // Force update header editor so any changed headers are reflected setTimeout(() => setForceUpdateHeaderEditorKey((u) => u + 1), 100); }, - [activeRequest.headers, updateRequest], + [activeRequest.headers, activeRequestId, updateRequest], ); const tabs: TabItem[] = useMemo( @@ -125,7 +125,7 @@ export const RequestPane = memo(function RequestPane({ newContentType = 'application/json'; } - await updateRequest.mutateAsync(patch); + await updateRequest.mutateAsync({ id: activeRequestId, update: patch }); if (newContentType !== undefined) { await handleContentTypeChange(newContentType); @@ -174,7 +174,10 @@ export const RequestPane = memo(function RequestPane({ token: authentication.token ?? '', }; } - await updateRequest.mutateAsync({ authenticationType, authentication }); + await updateRequest.mutateAsync({ + id: activeRequestId, + update: { authenticationType, authentication }, + }); }, }, }, @@ -186,53 +189,55 @@ export const RequestPane = memo(function RequestPane({ activeRequest.headers, activeRequest.method, activeRequest.urlParameters, + activeRequestId, handleContentTypeChange, updateRequest, ], ); const handleBodyChange = useCallback( - (body: HttpRequest['body']) => updateRequest.mutate({ body }), - [updateRequest], + (body: HttpRequest['body']) => updateRequest.mutate({ id: activeRequestId, update: { body } }), + [activeRequestId, updateRequest], ); const handleBinaryFileChange = useCallback( (body: HttpRequest['body']) => { - updateRequest.mutate({ body }); + updateRequest.mutate({ id: activeRequestId, update: { body } }); }, - [updateRequest], + [activeRequestId, updateRequest], ); const handleBodyTextChange = useCallback( - (text: string) => updateRequest.mutate({ body: { text } }), - [updateRequest], + (text: string) => updateRequest.mutate({ id: activeRequestId, update: { body: { text } } }), + [activeRequestId, updateRequest], ); const handleHeadersChange = useCallback( - (headers: HttpHeader[]) => updateRequest.mutate({ headers }), - [updateRequest], + (headers: HttpHeader[]) => updateRequest.mutate({ id: activeRequestId, update: { headers } }), + [activeRequestId, updateRequest], ); const handleUrlParametersChange = useCallback( - (urlParameters: HttpUrlParameter[]) => updateRequest.mutate({ urlParameters }), - [updateRequest], + (urlParameters: HttpUrlParameter[]) => + updateRequest.mutate({ id: activeRequestId, update: { urlParameters } }), + [activeRequestId, updateRequest], ); - const sendRequest = useSendRequest(activeRequest.id ?? null); + const sendRequest = useSendAnyHttpRequest(); const { activeResponse } = usePinnedHttpResponse(activeRequest); const cancelResponse = useCancelHttpResponse(activeResponse?.id ?? null); const handleSend = useCallback(async () => { - await sendRequest.mutateAsync(); - }, [sendRequest]); + await sendRequest.mutateAsync(activeRequest.id ?? null); + }, [activeRequest.id, sendRequest]); const handleCancel = useCallback(async () => { await cancelResponse.mutateAsync(); }, [cancelResponse]); const handleMethodChange = useCallback( - (method: string) => updateRequest.mutate({ method }), - [updateRequest], + (method: string) => updateRequest.mutate({ id: activeRequestId, update: { method } }), + [activeRequestId, updateRequest], ); const handleUrlChange = useCallback( - (url: string) => updateRequest.mutate({ url }), - [updateRequest], + (url: string) => updateRequest.mutate({ id: activeRequestId, update: { url } }), + [activeRequestId, updateRequest], ); const isLoading = useIsResponseLoading(activeRequestId ?? null); diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx index 7cd63687..513c5b9b 100644 --- a/src-web/components/Sidebar.tsx +++ b/src-web/components/Sidebar.tsx @@ -23,14 +23,12 @@ import { useLatestHttpResponse } from '../hooks/useLatestHttpResponse'; import { useMoveToWorkspace } from '../hooks/useMoveToWorkspace'; import { usePrompt } from '../hooks/usePrompt'; import { useRequests } from '../hooks/useRequests'; +import { useSendAnyHttpRequest } from '../hooks/useSendAnyHttpRequest'; import { useSendManyRequests } from '../hooks/useSendFolder'; -import { useSendRequest } from '../hooks/useSendRequest'; import { useSidebarHidden } from '../hooks/useSidebarHidden'; import { useUpdateAnyFolder } from '../hooks/useUpdateAnyFolder'; import { useUpdateAnyGrpcRequest } from '../hooks/useUpdateAnyGrpcRequest'; import { useUpdateAnyHttpRequest } from '../hooks/useUpdateAnyHttpRequest'; -import { useUpdateGrpcRequest } from '../hooks/useUpdateGrpcRequest'; -import { useUpdateHttpRequest } from '../hooks/useUpdateHttpRequest'; import { useWorkspaces } from '../hooks/useWorkspaces'; import { fallbackRequestName } from '../lib/fallbackRequestName'; import type { Folder, GrpcRequest, HttpRequest, Workspace } from '../lib/models'; @@ -609,14 +607,14 @@ const SidebarItem = forwardRef(function SidebarItem( const duplicateHttpRequest = useDuplicateHttpRequest({ id: itemId, navigateAfter: true }); const duplicateGrpcRequest = useDuplicateGrpcRequest({ id: itemId, navigateAfter: true }); const copyAsCurl = useCopyAsCurl(itemId); - const sendRequest = useSendRequest(itemId); + const sendRequest = useSendAnyHttpRequest(); const moveToWorkspace = useMoveToWorkspace(itemId); const sendManyRequests = useSendManyRequests(); const latestHttpResponse = useLatestHttpResponse(itemId); const latestGrpcConnection = useLatestGrpcConnection(itemId); - const updateHttpRequest = useUpdateHttpRequest(itemId); + const updateHttpRequest = useUpdateAnyHttpRequest(); const workspaces = useWorkspaces(); - const updateGrpcRequest = useUpdateGrpcRequest(itemId); + const updateGrpcRequest = useUpdateAnyGrpcRequest(); const updateAnyFolder = useUpdateAnyFolder(); const prompt = usePrompt(); const [editing, setEditing] = useState(false); @@ -625,15 +623,14 @@ const SidebarItem = forwardRef(function SidebarItem( const handleSubmitNameEdit = useCallback( (el: HTMLInputElement) => { - if (activeRequest == null) return; - if (activeRequest.model === 'http_request') { - updateHttpRequest.mutate((r) => ({ ...r, name: el.value })); - } else if (activeRequest.model === 'grpc_request') { - updateGrpcRequest.mutate((r) => ({ ...r, name: el.value })); + if (itemModel === 'http_request') { + updateHttpRequest.mutate({ id: itemId, update: (r) => ({ ...r, name: el.value }) }); + } else if (itemModel === 'grpc_request') { + updateGrpcRequest.mutate({ id: itemId, update: (r) => ({ ...r, name: el.value }) }); } setEditing(false); }, - [activeRequest, updateGrpcRequest, updateHttpRequest], + [itemId, itemModel, updateGrpcRequest, updateHttpRequest], ); const handleFocus = useCallback((el: HTMLInputElement | null) => { @@ -736,7 +733,7 @@ const SidebarItem = forwardRef(function SidebarItem( hotKeyAction: 'http_request.send', hotKeyLabelOnly: true, // Already bound in URL bar leftSlot: , - onSelect: sendRequest.mutate, + onSelect: () => sendRequest.mutate(itemId), }, { key: 'copyCurl', @@ -769,9 +766,9 @@ const SidebarItem = forwardRef(function SidebarItem( defaultValue: itemName, }); if (itemModel === 'http_request') { - updateHttpRequest.mutate((r) => ({ ...r, name })); + updateHttpRequest.mutate({ id: itemId, update: (r) => ({ ...r, name }) }); } else { - updateGrpcRequest.mutate((r) => ({ ...r, name })); + updateGrpcRequest.mutate({ id: itemId, update: (r) => ({ ...r, name }) }); } }, }, diff --git a/src-web/hooks/useSendAnyRequest.ts b/src-web/hooks/useSendAnyHttpRequest.ts similarity index 95% rename from src-web/hooks/useSendAnyRequest.ts rename to src-web/hooks/useSendAnyHttpRequest.ts index 88490c13..c0ef5885 100644 --- a/src-web/hooks/useSendAnyRequest.ts +++ b/src-web/hooks/useSendAnyHttpRequest.ts @@ -9,7 +9,7 @@ import { useActiveCookieJar } from './useActiveCookieJar'; import { useActiveEnvironment } from './useActiveEnvironment'; import { useAlert } from './useAlert'; -export function useSendAnyRequest(options: { download?: boolean } = {}) { +export function useSendAnyHttpRequest(options: { download?: boolean } = {}) { const environment = useActiveEnvironment(); const alert = useAlert(); const { activeCookieJar } = useActiveCookieJar(); diff --git a/src-web/hooks/useSendFolder.ts b/src-web/hooks/useSendFolder.ts index b4cc80fb..44d0ba7d 100644 --- a/src-web/hooks/useSendFolder.ts +++ b/src-web/hooks/useSendFolder.ts @@ -1,8 +1,8 @@ import { useMutation } from '@tanstack/react-query'; -import { useSendAnyRequest } from './useSendAnyRequest'; +import { useSendAnyHttpRequest } from './useSendAnyHttpRequest'; export function useSendManyRequests() { - const sendAnyRequest = useSendAnyRequest(); + const sendAnyRequest = useSendAnyHttpRequest(); return useMutation({ mutationKey: ['send_many_requests'], mutationFn: async (requestIds: string[]) => { diff --git a/src-web/hooks/useSendRequest.ts b/src-web/hooks/useSendRequest.ts deleted file mode 100644 index 89ecd710..00000000 --- a/src-web/hooks/useSendRequest.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { useMutation } from '@tanstack/react-query'; -import type { HttpResponse } from '../lib/models'; -import { useSendAnyRequest } from './useSendAnyRequest'; - -export function useSendRequest(id: string | null, options: { download?: boolean } = {}) { - const sendAnyRequest = useSendAnyRequest(options); - return useMutation({ - mutationKey: ['send_http_request', id], - mutationFn: () => sendAnyRequest.mutateAsync(id), - }); -} diff --git a/src-web/hooks/useUpdateGrpcRequest.ts b/src-web/hooks/useUpdateGrpcRequest.ts deleted file mode 100644 index 315ad703..00000000 --- a/src-web/hooks/useUpdateGrpcRequest.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { useMutation } from '@tanstack/react-query'; -import type { GrpcRequest } from '../lib/models'; -import { useUpdateAnyGrpcRequest } from './useUpdateAnyGrpcRequest'; - -export function useUpdateGrpcRequest(id: string | null) { - const updateAnyGrpcRequest = useUpdateAnyGrpcRequest(); - return useMutation | ((r: GrpcRequest) => GrpcRequest)>({ - mutationKey: ['update_grpc_request', id], - mutationFn: async (update) => { - return updateAnyGrpcRequest.mutateAsync({ id: id ?? 'n/a', update }); - }, - }); -} diff --git a/src-web/hooks/useUpdateHttpRequest.ts b/src-web/hooks/useUpdateHttpRequest.ts deleted file mode 100644 index dabb49d5..00000000 --- a/src-web/hooks/useUpdateHttpRequest.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { useMutation } from '@tanstack/react-query'; -import type { HttpRequest } from '../lib/models'; -import { useUpdateAnyHttpRequest } from './useUpdateAnyHttpRequest'; - -export function useUpdateHttpRequest(id: string | null) { - const updateAnyRequest = useUpdateAnyHttpRequest(); - return useMutation | ((r: HttpRequest) => HttpRequest)>({ - mutationKey: ['update_http_request', id], - mutationFn: async (update) => updateAnyRequest.mutateAsync({ id: id ?? 'n/a', update }), - }); -}