diff --git a/apps/frontend/src/pages/admin/panels/WorkOrdersPanel.tsx b/apps/frontend/src/pages/admin/panels/WorkOrdersPanel.tsx index be57a90a..64d79b99 100644 --- a/apps/frontend/src/pages/admin/panels/WorkOrdersPanel.tsx +++ b/apps/frontend/src/pages/admin/panels/WorkOrdersPanel.tsx @@ -137,6 +137,8 @@ export default function WorkOrdersPanel() { const [keyword, setKeyword] = useState('') const [keywordInput, setKeywordInput] = useState('') const [workerId, setWorkerId] = useState() + const [filterWorkerKeyword, setFilterWorkerKeyword] = useState('') + const [assignWorkerKeyword, setAssignWorkerKeyword] = useState('') const [page, setPage] = useState(1) const [pageSize, setPageSize] = useState(ADMIN_DEFAULT_PAGE_SIZE) const [selectedAcceptanceOrderIds, setSelectedAcceptanceOrderIds] = useState([]) @@ -228,8 +230,13 @@ export default function WorkOrdersPanel() { queryFn: () => fetchAdminWorkCategories(), }) const filterWorkersQuery = useQuery({ - queryKey: ['admin-worker-platform-workers', 'order-filter'], - queryFn: () => fetchAdminWorkerUsers({ page: 1, pageSize: 200 }), + queryKey: ['admin-worker-platform-workers', 'order-filter', filterWorkerKeyword], + queryFn: () => + fetchAdminWorkerUsers({ + keyword: filterWorkerKeyword.trim(), + page: 1, + pageSize: 30, + }), }) const sharingQuery = useQuery({ queryKey: ['admin-worker-platform-order-sharing', sharingOrder?.workOrderId], @@ -237,8 +244,14 @@ export default function WorkOrdersPanel() { enabled: Boolean(sharingOrder), }) const assignWorkersQuery = useQuery({ - queryKey: ['admin-worker-platform-workers', 'active', 1, 200], - queryFn: () => fetchAdminWorkerUsers({ status: 'active', page: 1, pageSize: 200 }), + queryKey: ['admin-worker-platform-workers', 'assign', assignWorkerKeyword], + queryFn: () => + fetchAdminWorkerUsers({ + status: 'active', + keyword: assignWorkerKeyword.trim(), + page: 1, + pageSize: 30, + }), enabled: Boolean(assignOrder), }) @@ -249,6 +262,7 @@ export default function WorkOrdersPanel() { function openAssignModal(row: WorkOrder) { setAssignOrder(row) setAssignWorkerId(undefined) + setAssignWorkerKeyword('') } function openCancelModal(row: WorkOrder) { @@ -988,11 +1002,12 @@ export default function WorkOrdersPanel() {