Use factories

BrunoQuaresma · BrunoQuaresma · commit 65cef1934c89 · 2023-09-12T17:26:11.000Z
diff --git a/site/src/api/queries/sshKeys.ts b/site/src/api/queries/sshKeys.ts
@@ -1,25 +1,24 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { QueryClient } from "@tanstack/react-query";
 import * as API from "api/api";
+import { GitSSHKey } from "api/typesGenerated";
 
 const getUserSSHKeyQueryKey = (userId: string) => [userId, "sshKey"];
 
-export const useUserSSHKey = (userId: string) => {
-  return useQuery({
+export const userSSHKey = (userId: string) => {
+  return {
     queryKey: getUserSSHKeyQueryKey(userId),
     queryFn: () => API.getUserSSHKey(userId),
-  });
+  };
 };
 
-export const useRegenerateUserSSHKey = (
+export const regenerateUserSSHKey = (
   userId: string,
-  onSuccess: () => void,
+  queryClient: QueryClient,
 ) => {
-  const queryClient = useQueryClient();
-  return useMutation({
+  return {
     mutationFn: () => API.regenerateUserSSHKey(userId),
-    onSuccess: (newKey) => {
+    onSuccess: (newKey: GitSSHKey) => {
       queryClient.setQueryData(getUserSSHKeyQueryKey(userId), newKey);
-      onSuccess();
     },
-  });
+  };
 };
diff --git a/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.tsx b/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.tsx
@@ -2,8 +2,9 @@ import { PropsWithChildren, FC, useState } from "react";
 import { ConfirmDialog } from "../../../components/Dialogs/ConfirmDialog/ConfirmDialog";
 import { Section } from "../../../components/SettingsLayout/Section";
 import { SSHKeysPageView } from "./SSHKeysPageView";
-import { useRegenerateUserSSHKey, useUserSSHKey } from "api/queries/sshKeys";
+import { regenerateUserSSHKey, userSSHKey } from "api/queries/sshKeys";
 import { displaySuccess } from "components/GlobalSnackbar/utils";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
 export const Language = {
   title: "SSH keys",
@@ -17,10 +18,19 @@ export const Language = {
 export const SSHKeysPage: FC<PropsWithChildren<unknown>> = () => {
   const [isConfirmingRegeneration, setIsConfirmingRegeneration] =
     useState(false);
-  const userSSHKeyQuery = useUserSSHKey("me");
-  const regenerateUserSSHKeyMutation = useRegenerateUserSSHKey("me", () => {
-    displaySuccess("SSH Key regenerated successfully.");
-    setIsConfirmingRegeneration(false);
+  const queryClient = useQueryClient();
+  const userSSHKeyQuery = useQuery(userSSHKey("me"));
+  const regenerateSSHKeyMutationOptions = regenerateUserSSHKey(
+    "me",
+    queryClient,
+  );
+  const regenerateSSHKeyMutation = useMutation({
+    ...regenerateSSHKeyMutationOptions,
+    onSuccess: (newKey) => {
+      regenerateSSHKeyMutationOptions.onSuccess(newKey);
+      displaySuccess("SSH Key regenerated successfully.");
+      setIsConfirmingRegeneration(false);
+    },
   });
 
   return (
@@ -29,7 +39,7 @@ export const SSHKeysPage: FC<PropsWithChildren<unknown>> = () => {
         <SSHKeysPageView
           isLoading={userSSHKeyQuery.isLoading}
           getSSHKeyError={userSSHKeyQuery.error}
-          regenerateSSHKeyError={regenerateUserSSHKeyMutation.error}
+          regenerateSSHKeyError={regenerateSSHKeyMutation.error}
           sshKey={userSSHKeyQuery.data}
           onRegenerateClick={() => {
             setIsConfirmingRegeneration(true);
@@ -41,11 +51,11 @@ export const SSHKeysPage: FC<PropsWithChildren<unknown>> = () => {
         type="delete"
         hideCancel={false}
         open={isConfirmingRegeneration}
-        confirmLoading={regenerateUserSSHKeyMutation.isLoading}
+        confirmLoading={regenerateSSHKeyMutation.isLoading}
         title={Language.regenerateDialogTitle}
         confirmText={Language.confirmLabel}
         onConfirm={() => {
-          regenerateUserSSHKeyMutation.mutate();
+          regenerateSSHKeyMutation.mutate();
         }}
         onClose={() => {
           setIsConfirmingRegeneration(false);
