From 1389750dddcb2c079edff5a35d426a04bd84422b Mon Sep 17 00:00:00 2001 From: Samandar Turgunboyev Date: Fri, 26 Dec 2025 17:21:40 +0500 Subject: [PATCH] bug fix --- src/features/users/lib/api.ts | 4 ++-- src/features/users/lib/data.ts | 12 +++--------- src/features/users/ui/AddUsers.tsx | 3 +-- src/features/users/ui/DeleteUser.tsx | 2 +- src/shared/config/api/URLs.ts | 4 ++-- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/features/users/lib/api.ts b/src/features/users/lib/api.ts index 39fbba6..669bd07 100644 --- a/src/features/users/lib/api.ts +++ b/src/features/users/lib/api.ts @@ -12,7 +12,7 @@ export const user_api = { return res; }, - async update({ body, id }: { id: string; body: UserCreateReq }) { + async update({ body, id }: { id: string | number; body: UserCreateReq }) { const res = await httpClient.patch(`${API_URLS.UserUpdate(id)}`, body); return res; }, @@ -22,7 +22,7 @@ export const user_api = { return res; }, - async delete({ id }: { id: string }) { + async delete({ id }: { id: string | number }) { const res = await httpClient.delete(`${API_URLS.UserDelete(id)}`); return res; }, diff --git a/src/features/users/lib/data.ts b/src/features/users/lib/data.ts index a59e055..1d3b2e2 100644 --- a/src/features/users/lib/data.ts +++ b/src/features/users/lib/data.ts @@ -1,5 +1,5 @@ export interface UserData { - id: 3; + id: number; username: string; first_name: string; last_name: string; @@ -21,13 +21,7 @@ export interface UserListRes { } export interface UserCreateReq { - id: 3; username: string; - first_name: string; - last_name: string; - middle_name: null | string; - gender: "M" | "F" | null; - region: null | string; - address: null | string; - created_at: string; + password: string; + is_superuser: boolean; } diff --git a/src/features/users/ui/AddUsers.tsx b/src/features/users/ui/AddUsers.tsx index 38e184a..8f7d41b 100644 --- a/src/features/users/ui/AddUsers.tsx +++ b/src/features/users/ui/AddUsers.tsx @@ -35,7 +35,6 @@ const AddUsers = ({ initialData, setDialogOpen }: UserFormProps) => { const form = useForm>({ resolver: zodResolver(AddedUser), defaultValues: { - is_superuser: initialData?.is_superuser ? "true" : "false", password: "", username: initialData?.username || "", }, @@ -43,7 +42,7 @@ const AddUsers = ({ initialData, setDialogOpen }: UserFormProps) => { const queryClient = useQueryClient(); const { mutate: update } = useMutation({ - mutationFn: ({ body, id }: { id: string; body: UserCreateReq }) => + mutationFn: ({ body, id }: { id: string | number; body: UserCreateReq }) => user_api.update({ body, id }), onSuccess: () => { queryClient.refetchQueries({ queryKey: ["user_list"] }); diff --git a/src/features/users/ui/DeleteUser.tsx b/src/features/users/ui/DeleteUser.tsx index 2437341..b1117e3 100644 --- a/src/features/users/ui/DeleteUser.tsx +++ b/src/features/users/ui/DeleteUser.tsx @@ -31,7 +31,7 @@ const DeleteUser = ({ const queryClient = useQueryClient(); const { mutate: deleteUser, isPending } = useMutation({ - mutationFn: ({ id }: { id: string }) => user_api.delete({ id }), + mutationFn: ({ id }: { id: string | number }) => user_api.delete({ id }), onSuccess: () => { queryClient.refetchQueries({ queryKey: ["user_list"] }); diff --git a/src/shared/config/api/URLs.ts b/src/shared/config/api/URLs.ts index 25dbe13..5d27988 100644 --- a/src/shared/config/api/URLs.ts +++ b/src/shared/config/api/URLs.ts @@ -20,8 +20,8 @@ export const API_URLS = { OrdersDelete: (id: string | number) => `${API_V}admin/order/${id}/delete/`, UsesList: `${API_V}admin/user/list/`, UserCreate: `${API_V}admin/user/create/`, - UserUpdate: (id: string) => `${API_V}admin/user/${id}/update/`, - UserDelete: (id: string) => `${API_V}admin/user/${id}/delete/`, + UserUpdate: (id: string | number) => `${API_V}admin/user/${id}/update/`, + UserDelete: (id: string | number) => `${API_V}admin/user/${id}/delete/`, FaqList: `${API_V}admin/faq/`, FaqCreate: `${API_V}admin/faq/`, FaqUpdate: (id: string) => `${API_V}admin/faq/${id}/`,