Refactor: update all cache removals

packages/web-main/src/components/CopyModuleForm.tsx

@@ -129,7 +129,7 @@ export const CopyModuleForm: FC<CopyModuleFormProps> = ({ moduleId, onSuccess })
         onSuccess && onSuccess(createdModule.id);
       }
     } catch (error) {
-      await removeModule({ id: createdModule.id });
+      await removeModule({ moduleId: createdModule.id });
     }
   };
 

packages/web-main/src/components/cards/GameServerCard/index.tsx

@@ -74,7 +74,7 @@ export const GameServerCard: FC<GameServerOutputDTO> = ({ id, name, type, reacha
   };
 
   const handleOnDelete = () => {
-    mutate({ id });
+    mutate({ gameServerId: id });
   };
 
   const handleOnCopyClick = (e: MouseEvent) => {

packages/web-main/src/components/cards/ModuleDefinitionCard/index.tsx

@@ -56,7 +56,7 @@ export const ModuleDefinitionCard: FC<IModuleCardProps> = ({ mod }) => {
 
   const handleOnDelete = async (e: MouseEvent) => {
     e.stopPropagation();
-    await mutateAsync({ id: mod.id });
+    await mutateAsync({ moduleId: mod.id });
     setOpenDeleteDialog(false);
   };
 

packages/web-main/src/queries/gameserver.tsx

@@ -9,8 +9,6 @@ import {
   GameServerTestReachabilityDTOAPI,
   GameServerTestReachabilityInputDTOTypeEnum,
   GameServerUpdateDTO,
-  IdUuidDTO,
-  IdUuidDTOAPI,
   ImportOutputDTO,
   KickPlayerInputDTO,
   ModuleInstallationOutputDTO,
@@ -132,25 +130,26 @@ export const useGameServerUpdate = () => {
 };
 
 interface GameServerRemove {
-  id: string;
+  gameServerId: string;
 }
 
 export const useGameServerRemove = () => {
   const apiClient = getApiClient();
   const queryClient = useQueryClient();
 
-  return mutationWrapper<IdUuidDTO, GameServerRemove>(
-    useMutation<IdUuidDTO, AxiosError<IdUuidDTOAPI>, GameServerRemove>({
-      mutationFn: async ({ id }) => (await apiClient.gameserver.gameServerControllerRemove(id)).data.data,
-      onSuccess: async (removedGameServer: IdUuidDTO) => {
+  return mutationWrapper<APIOutput, GameServerRemove>(
+    useMutation<APIOutput, AxiosError<APIOutput>, GameServerRemove>({
+      mutationFn: async ({ gameServerId }) =>
+        (await apiClient.gameserver.gameServerControllerRemove(gameServerId)).data,
+      onSuccess: async (_, { gameServerId }) => {
         // remove all cached information of game server list.
         await queryClient.invalidateQueries({ queryKey: gameServerKeys.list() });
         // remove all cached information about specific game server.
         await queryClient.invalidateQueries({
-          queryKey: gameServerKeys.detail(removedGameServer.id),
+          queryKey: gameServerKeys.detail(gameServerId),
         });
         queryClient.removeQueries({
-          queryKey: gameServerKeys.reachability(removedGameServer.id),
+          queryKey: gameServerKeys.reachability(gameServerId),
         });
       },
     }),

packages/web-main/src/queries/module.tsx

@@ -1,6 +1,7 @@
 import { useMutation, useQueryClient, queryOptions, infiniteQueryOptions } from '@tanstack/react-query';
 import { getApiClient } from 'util/getApiClient';
 import {
+  APIOutput,
   BuiltinModule,
   CommandCreateDTO,
   CommandOutputDTO,
@@ -18,8 +19,6 @@ import {
   HookOutputDTO,
   HookOutputDTOAPI,
   HookUpdateDTO,
-  IdUuidDTO,
-  IdUuidDTOAPI,
   ModuleCreateDTO,
   ModuleExportDTOAPI,
   ModuleOutputArrayDTOAPI,
@@ -124,9 +123,9 @@ export const useModuleRemove = () => {
   const apiClient = getApiClient();
   const queryClient = useQueryClient();
 
-  return mutationWrapper<IdUuidDTO, ModuleRemove>(
-    useMutation<IdUuidDTO, AxiosError<IdUuidDTOAPI>, ModuleRemove>({
-      mutationFn: async ({ moduleId }) => (await apiClient.module.moduleControllerRemove(moduleId)).data.data,
+  return mutationWrapper<APIOutput, ModuleRemove>(
+    useMutation<APIOutput, AxiosError<APIOutput>, ModuleRemove>({
+      mutationFn: async ({ moduleId }) => (await apiClient.module.moduleControllerRemove(moduleId)).data,
       onSuccess: async (_, { moduleId }) => {
         await queryClient.invalidateQueries({ queryKey: moduleKeys.list() });
         await queryClient.invalidateQueries({ queryKey: moduleKeys.detail(moduleId) });
@@ -224,10 +223,10 @@ export const useHookRemove = ({ moduleId }) => {
   const apiClient = getApiClient();
   const queryClient = useQueryClient();
 
-  return mutationWrapper<IdUuidDTO, HookRemove>(
-    useMutation<IdUuidDTO, AxiosError<IdUuidDTOAPI>, HookRemove>({
-      mutationFn: async ({ hookId }) => (await apiClient.hook.hookControllerRemove(hookId)).data.data,
-      onSuccess: async (removedHook: IdUuidDTO) => {
+  return mutationWrapper<APIOutput, HookRemove>(
+    useMutation<APIOutput, AxiosError<APIOutput>, HookRemove>({
+      mutationFn: async ({ hookId }) => (await apiClient.hook.hookControllerRemove(hookId)).data,
+      onSuccess: async (_, { hookId }) => {
         await queryClient.invalidateQueries({ queryKey: moduleKeys.hooks.list() });
         await queryClient.invalidateQueries({ queryKey: moduleKeys.export(moduleId) });
         queryClient.setQueryData<ModuleOutputDTO>(moduleKeys.detail(moduleId), (prev) => {
@@ -236,10 +235,10 @@ export const useHookRemove = ({ moduleId }) => {
           }
           return {
             ...prev,
-            hooks: prev.hooks.filter((hook) => hook.id !== removedHook.id),
+            hooks: prev.hooks.filter((hook) => hook.id !== hookId),
           };
         });
-        return queryClient.removeQueries({ queryKey: moduleKeys.hooks.detail(removedHook.id) });
+        return queryClient.removeQueries({ queryKey: moduleKeys.hooks.detail(hookId) });
       },
     }),
     defaultHookErrorMessages
@@ -354,9 +353,9 @@ export const useCommandRemove = ({ moduleId }) => {
   const apiClient = getApiClient();
   const queryClient = useQueryClient();
 
-  return mutationWrapper<IdUuidDTO, CommandRemove>(
-    useMutation<IdUuidDTO, AxiosError<IdUuidDTOAPI>, CommandRemove>({
-      mutationFn: async ({ commandId }) => (await apiClient.command.commandControllerRemove(commandId)).data.data,
+  return mutationWrapper<APIOutput, CommandRemove>(
+    useMutation<APIOutput, AxiosError<APIOutput>, CommandRemove>({
+      mutationFn: async ({ commandId }) => (await apiClient.command.commandControllerRemove(commandId)).data,
       onSuccess: async (_, { commandId }) => {
         // invalidate list of commands
         await queryClient.invalidateQueries({ queryKey: moduleKeys.commands.list() });
@@ -458,10 +457,10 @@ export const useCronJobRemove = ({ moduleId }: { moduleId: string }) => {
   const apiClient = getApiClient();
   const queryClient = useQueryClient();
 
-  return mutationWrapper<IdUuidDTO, CronJobRemove>(
-    useMutation<IdUuidDTO, AxiosError<IdUuidDTOAPI>, CronJobRemove>({
+  return mutationWrapper<APIOutput, CronJobRemove>(
+    useMutation<APIOutput, AxiosError<APIOutput>, CronJobRemove>({
       mutationFn: async ({ cronJobId }: { cronJobId: string }) =>
-        (await apiClient.cronjob.cronJobControllerRemove(cronJobId)).data.data,
+        (await apiClient.cronjob.cronJobControllerRemove(cronJobId)).data,
       onSuccess: async (_, { cronJobId }) => {
         await queryClient.invalidateQueries({ queryKey: moduleKeys.cronJobs.list() });
         await queryClient.invalidateQueries({ queryKey: moduleKeys.export(moduleId) });
@@ -555,9 +554,9 @@ export const useFunctionRemove = ({ moduleId }: { moduleId: string }) => {
   const apiClient = getApiClient();
   const queryClient = useQueryClient();
 
-  return mutationWrapper<IdUuidDTO, FunctionRemove>(
-    useMutation<IdUuidDTO, AxiosError<IdUuidDTOAPI>, FunctionRemove>({
-      mutationFn: async ({ functionId }) => (await apiClient.function.functionControllerRemove(functionId)).data.data,
+  return mutationWrapper<APIOutput, FunctionRemove>(
+    useMutation<APIOutput, AxiosError<APIOutput>, FunctionRemove>({
+      mutationFn: async ({ functionId }) => (await apiClient.function.functionControllerRemove(functionId)).data,
       onSuccess: async (_, { functionId }) => {
         await queryClient.invalidateQueries({ queryKey: moduleKeys.functions.list() });
         queryClient.setQueryData<ModuleOutputDTO>(moduleKeys.detail(moduleId), (prev) => {

packages/web-main/src/queries/role.tsx

@@ -4,8 +4,6 @@ import {
   RoleOutputDTO,
   RoleCreateInputDTO,
   RoleUpdateInputDTO,
-  IdUuidDTO,
-  IdUuidDTOAPI,
   RoleOutputDTOAPI,
   PermissionOutputDTOAPI,
   PermissionOutputDTO,
@@ -104,9 +102,9 @@ export const useRoleRemove = () => {
   const apiClient = getApiClient();
   const queryClient = useQueryClient();
 
-  return mutationWrapper<IdUuidDTO, RoleRemove>(
-    useMutation<IdUuidDTO, AxiosError<IdUuidDTOAPI>, RoleRemove>({
-      mutationFn: async ({ roleId }) => (await apiClient.role.roleControllerRemove(roleId)).data.data,
+  return mutationWrapper<APIOutput, RoleRemove>(
+    useMutation<APIOutput, AxiosError<APIOutput>, RoleRemove>({
+      mutationFn: async ({ roleId }) => (await apiClient.role.roleControllerRemove(roleId)).data,
       onSuccess: (_, { roleId }) => {
         queryClient.invalidateQueries({ queryKey: roleKeys.list() });
         queryClient.removeQueries({ queryKey: roleKeys.detail(roleId) });

packages/web-main/src/queries/shopListing.tsx

@@ -1,5 +1,5 @@
 import {
-  IdUuidDTO,
+  APIOutput,
   ShopListingCreateDTO,
   ShopListingOutputArrayDTOAPI,
   ShopListingOutputDTO,
@@ -55,18 +55,19 @@ export const useShopListingCreate = () => {
 };
 
 interface ShopListingDelete {
-  id: string;
+  shopListingId: string;
 }
 
 export const useShopListingDelete = () => {
   const queryClient = useQueryClient();
 
-  return mutationWrapper<IdUuidDTO, ShopListingDelete>(
-    useMutation<IdUuidDTO, AxiosError<IdUuidDTO>, ShopListingDelete>({
-      mutationFn: async ({ id }) => (await getApiClient().shopListing.shopListingControllerDelete(id)).data,
-      onSuccess: async ({ id: deletedShopListingId }) => {
+  return mutationWrapper<APIOutput, ShopListingDelete>(
+    useMutation<APIOutput, AxiosError<APIOutput>, ShopListingDelete>({
+      mutationFn: async ({ shopListingId }) =>
+        (await getApiClient().shopListing.shopListingControllerDelete(shopListingId)).data,
+      onSuccess: async (_, { shopListingId }) => {
         await queryClient.invalidateQueries({ queryKey: shopListingKeys.list() });
-        queryClient.removeQueries({ queryKey: shopListingKeys.detail(deletedShopListingId) });
+        queryClient.removeQueries({ queryKey: shopListingKeys.detail(shopListingId) });
       },
     }),
     {}

packages/web-main/src/queries/user.tsx

@@ -2,7 +2,6 @@ import { useMutation, useQueryClient, queryOptions } from '@tanstack/react-query
 import { getApiClient } from 'util/getApiClient';
 import {
   APIOutput,
-  IdUuidDTO,
   LinkPlayerUnauthedInputDTO,
   MeOutoutDTO,
   UserOutputArrayDTOAPI,
@@ -134,9 +133,9 @@ export const useUserRemove = () => {
   const queryClient = useQueryClient();
   const { enqueueSnackbar } = useSnackbar();
 
-  return mutationWrapper<IdUuidDTO, UserRemoveInput>(
-    useMutation<IdUuidDTO, AxiosError<IdUuidDTO>, UserRemoveInput>({
-      mutationFn: async ({ userId }) => (await apiClient.user.userControllerRemove(userId)).data.data,
+  return mutationWrapper<APIOutput, UserRemoveInput>(
+    useMutation<APIOutput, AxiosError<APIOutput>, UserRemoveInput>({
+      mutationFn: async ({ userId }) => (await apiClient.user.userControllerRemove(userId)).data,
       onSuccess: async (_, { userId }) => {
         await queryClient.invalidateQueries({ queryKey: userKeys.detail(userId) });
         await queryClient.invalidateQueries({ queryKey: userKeys.list() });

packages/web-main/src/queries/variable.tsx

@@ -1,7 +1,7 @@
 import { useMutation, useQueryClient, queryOptions } from '@tanstack/react-query';
 import { getApiClient } from 'util/getApiClient';
 import {
-  IdUuidDTO,
+  APIOutput,
   VariableCreateDTO,
   VariableOutputArrayDTOAPI,
   VariableOutputDTO,
@@ -83,9 +83,9 @@ export const useVariableDelete = () => {
   const apiClient = getApiClient();
   const queryClient = useQueryClient();
 
-  return mutationWrapper<IdUuidDTO, VariableDeleteInput>(
-    useMutation<IdUuidDTO, AxiosError<VariableOutputDTO>, VariableDeleteInput>({
-      mutationFn: async ({ variableId }) => (await apiClient.variable.variableControllerDelete(variableId)).data.data,
+  return mutationWrapper<APIOutput, VariableDeleteInput>(
+    useMutation<APIOutput, AxiosError<VariableOutputDTO>, VariableDeleteInput>({
+      mutationFn: async ({ variableId }) => (await apiClient.variable.variableControllerDelete(variableId)).data,
       onSuccess: async (_, { variableId }) => {
         await queryClient.invalidateQueries({ queryKey: variableKeys.list() });
         queryClient.removeQueries({ queryKey: variableKeys.detail(variableId) });

packages/web-main/src/routes/_auth/_global/users.tsx

@@ -254,8 +254,7 @@ export const UserDeleteDialog: FC<VariableDeleteProps> = ({ user, openDialog, se
 
   const handleOnDelete = async (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     e.preventDefault();
-
-    await mutateAsync({ id: user.id });
+    await mutateAsync({ userId: user.id });
     setOpenDialog(false);
   };
 

packages/web-main/src/routes/_auth/gameserver.$gameServerId/-components/shop/ShopListingActions.tsx

@@ -44,7 +44,7 @@ export const ShopListingActions: FC<ShopListingActions> = ({ shopListingId, game
 
   const handleOnDeleteConfirmationClick = (e: MouseEvent) => {
     e.stopPropagation();
-    deleteShopListing({ id: shopListingId });
+    deleteShopListing({ shopListingId });
     setOpenDeleteConfirmationDialog(false);
   };
 

packages/web-main/src/routes/_auth/gameserver.$gameServerId/-components/shop/shopOrderTableView.tsx

@@ -67,7 +67,7 @@ export const ShopOrderTableView: FC<ShopOrderTableView> = ({ gameServerId }) =>
           to="/gameserver/$gameServerId/shop/listing/$shopListingId/view"
           params={{ gameServerId, shopListingId: info.getValue() }}
         >
-          View item
+          view item
         </Link>
       ),
       enableColumnFilter: true,