diff --git a/src/frontend/src/components/views/AdminSubmissionsCard.tsx b/src/frontend/src/components/views/AdminSubmissionsCard.tsx index f270c29..6b94e37 100644 --- a/src/frontend/src/components/views/AdminSubmissionsCard.tsx +++ b/src/frontend/src/components/views/AdminSubmissionsCard.tsx @@ -51,17 +51,13 @@ export default function AdminSubmissionsCard({ onOpenMailto, selectedRowKeys, onSelectedRowKeysChange, - pagedSubmissions, + submissions, deletingId, savingStatusKey, onDeleteSubmission, onUpdateSubmissionStatus, totalEstimatedText, selectedCount, - submissionsPage, - pageSize, - totalCount, - onSubmissionsPageChange, }: { searchQuery: string; selectedSubmissionState: "all" | "pending" | "unpaid" | "paid"; @@ -74,17 +70,13 @@ export default function AdminSubmissionsCard({ onOpenMailto: () => void; selectedRowKeys: Array; onSelectedRowKeysChange: (keys: Array) => void; - pagedSubmissions: any[]; + submissions: any[]; deletingId: string | number | null; savingStatusKey: string | null; onDeleteSubmission: (id: string | number) => void; onUpdateSubmissionStatus: (submission: any, changes: { accepted?: boolean; paid?: boolean }) => void; totalEstimatedText: string | null; selectedCount: number; - submissionsPage: number; - pageSize: number; - totalCount: number; - onSubmissionsPageChange: (page: number) => void; }) { const columns = [ { @@ -224,14 +216,14 @@ export default function AdminSubmissionsCard({ onSelectedRowKeysChange(nextSelectedRowKeys as Array), }} pagination={false} - scroll={{ x: true }} + scroll={{ y: 400, x: true }} /> )} - ); diff --git a/src/frontend/src/views/AdminView.tsx b/src/frontend/src/views/AdminView.tsx index cc25448..6b2afd4 100644 --- a/src/frontend/src/views/AdminView.tsx +++ b/src/frontend/src/views/AdminView.tsx @@ -59,10 +59,8 @@ export default function AdminView({ orderId }: { orderId: string }) { const [savingStatusKey, setSavingStatusKey] = useState(null); const [updatingOrderStatus, setUpdatingOrderStatus] = useState(false); const [deletingOrder, setDeletingOrder] = useState(false); - const [submissionsPage, setSubmissionsPage] = useState(1); const [searchQuery, setSearchQuery] = useState(""); const [selectedSubmissionState, setSelectedSubmissionState] = useState<"all" | "pending" | "unpaid" | "paid">("all"); - const SUBMISSIONS_PAGE_SIZE = 8; const getSubmissionState = (submission: Submission): SubmissionStatus => { if (submission?.paid) { @@ -263,17 +261,6 @@ export default function AdminView({ orderId }: { orderId: string }) { }; }, [refreshSubmissions]); - useEffect(() => { - if (!data) { - return; - } - - const maxPage = Math.max(1, Math.ceil(data.submissions.length / SUBMISSIONS_PAGE_SIZE)); - if (submissionsPage > maxPage) { - setSubmissionsPage(maxPage); - } - }, [data, submissionsPage]); - const filteredSubmissions = useMemo(() => { if (!data?.submissions) { return []; @@ -312,10 +299,6 @@ export default function AdminView({ orderId }: { orderId: string }) { setSelectedRowKeys((previous) => previous.filter((id) => visibleIds.has(id))); }, [filteredSubmissions]); - useEffect(() => { - setSubmissionsPage(1); - }, [searchQuery, selectedSubmissionState]); - const selected = filteredSubmissions.filter((submission: any) => selectedRowKeys.includes(submission.id), ); @@ -357,10 +340,6 @@ export default function AdminView({ orderId }: { orderId: string }) { const totalEstimatedText = hasAnyEstimatedValue ? formatEstimatedTotal(totalEstimatedValue) : null; - const pagedSubmissions = filteredSubmissions.slice( - (submissionsPage - 1) * SUBMISSIONS_PAGE_SIZE, - submissionsPage * SUBMISSIONS_PAGE_SIZE, - ); if (pageError || loading) { return ( @@ -417,6 +396,14 @@ export default function AdminView({ orderId }: { orderId: string }) { onImportConfig={handleImportConfig} /> + + - - );