diff --git a/apps/admin/src/components/features/univ-apply-infos/tabs/UnivApplyInfoManageTab.tsx b/apps/admin/src/components/features/univ-apply-infos/tabs/UnivApplyInfoManageTab.tsx index 5c313279..29cf32b3 100644 --- a/apps/admin/src/components/features/univ-apply-infos/tabs/UnivApplyInfoManageTab.tsx +++ b/apps/admin/src/components/features/univ-apply-infos/tabs/UnivApplyInfoManageTab.tsx @@ -78,7 +78,12 @@ export function UnivApplyInfoManageTab() { const searchResultQuery = useQuery({ queryKey: ["univ-apply-infos", "search", committedSearch], - queryFn: () => adminApi.searchUnivApplyInfos(committedSearch?.value), + queryFn: () => + adminApi.searchUnivApplyInfos({ + value: committedSearch?.value, + homeUniversityId: committedSearch?.homeUniversityId, + termId: committedSearch?.termId, + }), enabled: committedSearch !== null, }); @@ -210,17 +215,7 @@ export function UnivApplyInfoManageTab() { setCreateModal({ open: true }); }; - const selectedHomeUniversityName = committedSearch?.homeUniversityId - ? homeUniversitiesQuery.data?.find((university) => university.id === committedSearch.homeUniversityId)?.name - : undefined; - const selectedTermLabel = committedSearch?.termId - ? termsQuery.data?.find((term) => term.id === committedSearch.termId)?.label - : undefined; - const results = (searchResultQuery.data?.univApplyInfoPreviews ?? []).filter( - (item) => - (!committedSearch?.homeUniversityId || item.homeUniversityName === selectedHomeUniversityName) && - (!committedSearch?.termId || item.term === selectedTermLabel), - ); + const results = searchResultQuery.data?.univApplyInfoPreviews ?? []; const isMutating = deleteMutation.isPending || updateMutation.isPending || createMutation.isPending; return ( diff --git a/apps/admin/src/lib/api/admin.ts b/apps/admin/src/lib/api/admin.ts index b79fafe2..24f496f3 100644 --- a/apps/admin/src/lib/api/admin.ts +++ b/apps/admin/src/lib/api/admin.ts @@ -370,10 +370,14 @@ export const adminApi = { deleteUnivApplyInfo: (id: number) => axiosInstance.delete(`/admin/univ-apply-infos/${id}`).then((res) => res.data), - searchUnivApplyInfos: (value?: string) => + searchUnivApplyInfos: (params: { value?: string; homeUniversityId?: number; termId?: number }) => axiosInstance .get<{ univApplyInfoPreviews: UnivApplyInfoSearchResult[] }>("/univ-apply-infos/search/text", { - params: { value: value ?? "" }, + params: { + value: params.value ?? "", + homeUniversityId: params.homeUniversityId, + termId: params.termId, + }, }) .then((res) => res.data), };