From 6bdf3455f59f5f5ec3f8416187e691f91766196b Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <daniel@infisical.com>
Date: Sun, 8 Sep 2024 19:27:31 +0400
Subject: [PATCH] Update mutations.tsx

---
 frontend/src/hooks/api/groups/mutations.tsx | 188 +++++++++-----------
 1 file changed, 82 insertions(+), 106 deletions(-)

diff --git a/frontend/src/hooks/api/groups/mutations.tsx b/frontend/src/hooks/api/groups/mutations.tsx
index 32d718e37..878e8b1c7 100644
--- a/frontend/src/hooks/api/groups/mutations.tsx
+++ b/frontend/src/hooks/api/groups/mutations.tsx
@@ -3,128 +3,104 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { apiRequest } from "@app/config/request";
 
 import { organizationKeys } from "../organization/queries";
+import { userKeys } from "../users/queries";
 import { groupKeys } from "./queries";
 import { TGroup } from "./types";
 
 export const useCreateGroup = () => {
-    const queryClient = useQueryClient();
-    return useMutation({
-        mutationFn: async ({ 
-            name,
-            slug,
-            role
-        }: { 
-            name: string;
-            slug: string;
-            organizationId: string;
-            role?: string;
-        }) => {
-                const {
-                    data: group
-                } = await apiRequest.post<TGroup>("/api/v1/groups", {
-                    name,
-                    slug,
-                    role
-                });
-        
-                return group;
-        },
-        onSuccess: (_, { organizationId }) => {
-            queryClient.invalidateQueries(organizationKeys.getOrgGroups(organizationId));
-        }
-    });
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async ({
+      name,
+      slug,
+      role
+    }: {
+      name: string;
+      slug: string;
+      organizationId: string;
+      role?: string;
+    }) => {
+      const { data: group } = await apiRequest.post<TGroup>("/api/v1/groups", {
+        name,
+        slug,
+        role
+      });
+
+      return group;
+    },
+    onSuccess: (_, { organizationId }) => {
+      queryClient.invalidateQueries(organizationKeys.getOrgGroups(organizationId));
+    }
+  });
 };
 
 export const useUpdateGroup = () => {
-    const queryClient = useQueryClient();
-    return useMutation({
-        mutationFn: async ({ 
-            currentSlug,
-            name,
-            slug,
-            role
-        }: { 
-            currentSlug: string;
-            name?: string;
-            slug?: string;
-            role?: string;
-        }) => {
-            const {
-                data: group
-            } = await apiRequest.patch<TGroup>(`/api/v1/groups/${currentSlug}`, {
-                name,
-                slug,
-                role
-            });
-            
-            return group;
-        },
-        onSuccess: ({ orgId }) => {
-            queryClient.invalidateQueries(organizationKeys.getOrgGroups(orgId));
-        }
-    });
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async ({
+      currentSlug,
+      name,
+      slug,
+      role
+    }: {
+      currentSlug: string;
+      name?: string;
+      slug?: string;
+      role?: string;
+    }) => {
+      const { data: group } = await apiRequest.patch<TGroup>(`/api/v1/groups/${currentSlug}`, {
+        name,
+        slug,
+        role
+      });
+
+      return group;
+    },
+    onSuccess: ({ orgId }) => {
+      queryClient.invalidateQueries(organizationKeys.getOrgGroups(orgId));
+    }
+  });
 };
 
 export const useDeleteGroup = () => {
-    const queryClient = useQueryClient();
-    return useMutation({
-        mutationFn: async ({ 
-            slug
-        }: { 
-            slug: string;
-        }) => {
-            const {
-                data: group
-            } = await apiRequest.delete<TGroup>(`/api/v1/groups/${slug}`);
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async ({ slug }: { slug: string }) => {
+      const { data: group } = await apiRequest.delete<TGroup>(`/api/v1/groups/${slug}`);
 
-            return group;
-        },
-        onSuccess: ({ orgId }) => {
-            queryClient.invalidateQueries(organizationKeys.getOrgGroups(orgId));
-        }
-    });
+      return group;
+    },
+    onSuccess: ({ orgId }) => {
+      queryClient.invalidateQueries(organizationKeys.getOrgGroups(orgId));
+    }
+  });
 };
 
 export const useAddUserToGroup = () => {
-    const queryClient = useQueryClient();
-    return useMutation({
-        mutationFn: async ({ 
-            slug,
-            username
-        }: { 
-            slug: string;
-            username: string;
-        }) => {
-            const {
-                data
-            } = await apiRequest.post<TGroup>(`/api/v1/groups/${slug}/users/${username}`);
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async ({ slug, username }: { slug: string; username: string }) => {
+      const { data } = await apiRequest.post<TGroup>(`/api/v1/groups/${slug}/users/${username}`);
 
-            return data;
-        },
-        onSuccess: (_, { slug }) => {
-            queryClient.invalidateQueries(groupKeys.forGroupUserMemberships(slug));
-        }
-    });
+      return data;
+    },
+    onSuccess: (_, { slug }) => {
+      queryClient.invalidateQueries(groupKeys.forGroupUserMemberships(slug));
+    }
+  });
 };
 
 export const useRemoveUserFromGroup = () => {
-    const queryClient = useQueryClient();
-    return useMutation({
-        mutationFn: async ({ 
-            slug,
-            username
-        }: { 
-            slug: string;
-            username: string;
-        }) => {
-            const {
-                data
-            } = await apiRequest.delete<TGroup>(`/api/v1/groups/${slug}/users/${username}`);
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async ({ slug, username }: { slug: string; username: string }) => {
+      const { data } = await apiRequest.delete<TGroup>(`/api/v1/groups/${slug}/users/${username}`);
 
-            return data;
-        },
-        onSuccess: (_, { slug }) => {
-            queryClient.invalidateQueries(groupKeys.forGroupUserMemberships(slug));
-        }
-    });
-};
\ No newline at end of file
+      return data;
+    },
+    onSuccess: (_, { slug, username }) => {
+      queryClient.invalidateQueries(groupKeys.forGroupUserMemberships(slug));
+      queryClient.invalidateQueries(userKeys.listUserGroupMemberships(username));
+    }
+  });
+};