feat: renamed old frontend and fixed some minor bugs

frontend/src/hooks/api/accessApproval/mutation.tsx

@@ -15,7 +15,7 @@ import {
 export const useCreateAccessApprovalPolicy = () => {
   const queryClient = useQueryClient();
 
-  return useMutation<{}, {}, TCreateAccessPolicyDTO>({
+  return useMutation<object, object, TCreateAccessPolicyDTO>({
     mutationFn: async ({
       environment,
       projectSlug,
@@ -37,7 +37,9 @@ export const useCreateAccessApprovalPolicy = () => {
       return data;
     },
     onSuccess: (_, { projectSlug }) => {
-      queryClient.invalidateQueries(accessApprovalKeys.getAccessApprovalPolicies(projectSlug));
+      queryClient.invalidateQueries({
+        queryKey: accessApprovalKeys.getAccessApprovalPolicies(projectSlug)
+      });
     }
   });
 };
@@ -45,7 +47,7 @@ export const useCreateAccessApprovalPolicy = () => {
 export const useUpdateAccessApprovalPolicy = () => {
   const queryClient = useQueryClient();
 
-  return useMutation<{}, {}, TUpdateAccessPolicyDTO>({
+  return useMutation<object, object, TUpdateAccessPolicyDTO>({
     mutationFn: async ({ id, approvers, approvals, name, secretPath, enforcementLevel }) => {
       const { data } = await apiRequest.patch(`/api/v1/access-approvals/policies/${id}`, {
         approvals,
@@ -57,7 +59,9 @@ export const useUpdateAccessApprovalPolicy = () => {
       return data;
     },
     onSuccess: (_, { projectSlug }) => {
-      queryClient.invalidateQueries(accessApprovalKeys.getAccessApprovalPolicies(projectSlug));
+      queryClient.invalidateQueries({
+        queryKey: accessApprovalKeys.getAccessApprovalPolicies(projectSlug)
+      });
     }
   });
 };
@@ -65,20 +69,22 @@ export const useUpdateAccessApprovalPolicy = () => {
 export const useDeleteAccessApprovalPolicy = () => {
   const queryClient = useQueryClient();
 
-  return useMutation<{}, {}, TDeleteSecretPolicyDTO>({
+  return useMutation<object, object, TDeleteSecretPolicyDTO>({
     mutationFn: async ({ id }) => {
       const { data } = await apiRequest.delete(`/api/v1/access-approvals/policies/${id}`);
       return data;
     },
     onSuccess: (_, { projectSlug }) => {
-      queryClient.invalidateQueries(accessApprovalKeys.getAccessApprovalPolicies(projectSlug));
+      queryClient.invalidateQueries({
+        queryKey: accessApprovalKeys.getAccessApprovalPolicies(projectSlug)
+      });
     }
   });
 };
 
 export const useCreateAccessRequest = () => {
   const queryClient = useQueryClient();
-  return useMutation<{}, {}, TCreateAccessRequestDTO>({
+  return useMutation<object, object, TCreateAccessRequestDTO>({
     mutationFn: async ({ projectSlug, ...request }) => {
       const { data } = await apiRequest.post<TAccessApproval>(
         "/api/v1/access-approvals/requests",
@@ -96,7 +102,9 @@ export const useCreateAccessRequest = () => {
       return data;
     },
     onSuccess: (_, { projectSlug }) => {
-      queryClient.invalidateQueries(accessApprovalKeys.getAccessApprovalRequestCount(projectSlug));
+      queryClient.invalidateQueries({
+        queryKey: accessApprovalKeys.getAccessApprovalRequestCount(projectSlug)
+      });
     }
   });
 };
@@ -104,8 +112,8 @@ export const useCreateAccessRequest = () => {
 export const useReviewAccessRequest = () => {
   const queryClient = useQueryClient();
   return useMutation<
-    {},
-    {},
+    object,
+    object,
     {
       requestId: string;
       status: "approved" | "rejected";
@@ -124,10 +132,12 @@ export const useReviewAccessRequest = () => {
       return data;
     },
     onSuccess: (_, { projectSlug, envSlug, requestedBy }) => {
-      queryClient.invalidateQueries(
-        accessApprovalKeys.getAccessApprovalRequests(projectSlug, envSlug, requestedBy)
-      );
-      queryClient.invalidateQueries(accessApprovalKeys.getAccessApprovalRequestCount(projectSlug));
+      queryClient.invalidateQueries({
+        queryKey: accessApprovalKeys.getAccessApprovalRequests(projectSlug, envSlug, requestedBy)
+      });
+      queryClient.invalidateQueries({
+        queryKey: accessApprovalKeys.getAccessApprovalRequestCount(projectSlug)
+      });
     }
   });
 };

frontend/src/hooks/api/accessApproval/queries.tsx

@@ -1,7 +1,8 @@
 import { PackRule, unpackRules } from "@casl/ability/extra";
-import { useQuery, UseQueryOptions } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 
 import { apiRequest } from "@app/config/request";
+import { TReactQueryOptions } from "@app/types/reactQuery";
 
 import { TProjectPermission } from "../roles/types";
 import {
@@ -41,15 +42,9 @@ export const useGetAccessPolicyApprovalCount = ({
   projectSlug,
   envSlug,
   options = {}
-}: TGetAccessPolicyApprovalCountDTO & {
-  options?: UseQueryOptions<
-    number,
-    unknown,
-    number,
-    ReturnType<typeof accessApprovalKeys.getAccessApprovalPolicies>
-  >;
-}) =>
+}: TGetAccessPolicyApprovalCountDTO & TReactQueryOptions) =>
   useQuery({
+    queryKey: accessApprovalKeys.getAccessApprovalRequestCount(projectSlug),
     queryFn: () => fetchPolicyApprovalCount({ projectSlug, envSlug }),
     ...options,
     enabled: Boolean(projectSlug) && (options?.enabled ?? true)
@@ -99,14 +94,7 @@ const fetchAccessRequestsCount = async (projectSlug: string) => {
 export const useGetAccessRequestsCount = ({
   projectSlug,
   options = {}
-}: TGetAccessApprovalRequestsDTO & {
-  options?: UseQueryOptions<
-    TAccessRequestCount,
-    unknown,
-    { pendingCount: number; finalizedCount: number },
-    ReturnType<typeof accessApprovalKeys.getAccessApprovalRequestCount>
-  >;
-}) =>
+}: TGetAccessApprovalRequestsDTO & TReactQueryOptions) =>
   useQuery({
     queryKey: accessApprovalKeys.getAccessApprovalRequestCount(projectSlug),
     queryFn: () => fetchAccessRequestsCount(projectSlug),
@@ -119,14 +107,7 @@ export const useGetAccessApprovalPolicies = ({
   envSlug,
   authorProjectMembershipId,
   options = {}
-}: TGetAccessApprovalRequestsDTO & {
-  options?: UseQueryOptions<
-    TAccessApprovalPolicy[],
-    unknown,
-    TAccessApprovalPolicy[],
-    ReturnType<typeof accessApprovalKeys.getAccessApprovalPolicies>
-  >;
-}) =>
+}: TGetAccessApprovalRequestsDTO & TReactQueryOptions) =>
   useQuery({
     queryKey: accessApprovalKeys.getAccessApprovalPolicies(projectSlug),
     queryFn: () => fetchApprovalPolicies({ projectSlug, envSlug, authorProjectMembershipId }),
@@ -139,14 +120,7 @@ export const useGetAccessApprovalRequests = ({
   envSlug,
   authorProjectMembershipId,
   options = {}
-}: TGetAccessApprovalRequestsDTO & {
-  options?: UseQueryOptions<
-    TAccessApprovalRequest[],
-    unknown,
-    TAccessApprovalRequest[],
-    ReturnType<typeof accessApprovalKeys.getAccessApprovalRequests>
-  >;
-}) =>
+}: TGetAccessApprovalRequestsDTO & TReactQueryOptions) =>
   useQuery({
     queryKey: accessApprovalKeys.getAccessApprovalRequests(
       projectSlug,