diff --git a/apps/admin/src/sections/user/index.tsx b/apps/admin/src/sections/user/index.tsx index 35a02ee..ebcc18a 100644 --- a/apps/admin/src/sections/user/index.tsx +++ b/apps/admin/src/sections/user/index.tsx @@ -89,6 +89,21 @@ export default function User() { ref.current?.refresh(); }, []); + const buildSearchParams = () => { + const { type, value } = searchRef.current; + if (!value) return {}; + switch (type) { + case "user_id": + return { user_id: Number(value) }; + case "device": + return { search: value }; + case "subscribe_id": + return { subscribe_id: Number(value) }; + default: + return { search: value }; + } + }; + // const { data: userGroupsData } = useQuery({ // queryKey: ["userGroups"], // queryFn: async () => { @@ -342,39 +357,10 @@ export default function User() { }} initialFilters={initialFilters} key={initialFilters.user_id} - params={[ - { - key: "subscribe_id", - placeholder: t("subscription", "Subscription"), - options: [ - { label: t("all", "All"), value: "" }, - ...(subscribes?.map((item) => ({ - label: item.name!, - value: String(item.id!), - })) || []), - ], - }, - { - key: "search", - placeholder: "Search", - }, - { - key: "user_id", - placeholder: t("userId", "User ID"), - }, - { - key: "user_subscribe_id", - placeholder: t("subscriptionId", "Subscription ID"), - }, - { - key: "short_code", - placeholder: t("shortCode", "Short Code"), - }, - ]} - request={async (pagination, filter) => { + request={async (pagination) => { const { data } = await getUserList({ ...pagination, - ...filter, + ...buildSearchParams(), }); return { list: data.data?.list || [],