Remove admin view pagination
Build and Push Lunchtime Images (Kaniko) / build-and-push (push) Successful in 2m12s
Build and Push Lunchtime Images (Kaniko) / build-and-push (push) Successful in 2m12s
This commit is contained in:
@@ -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<string | number>;
|
||||
onSelectedRowKeysChange: (keys: Array<string | number>) => 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({
|
||||
<Table
|
||||
rowKey="id"
|
||||
columns={columns}
|
||||
dataSource={pagedSubmissions}
|
||||
dataSource={submissions}
|
||||
rowSelection={{
|
||||
selectedRowKeys,
|
||||
onChange: (nextSelectedRowKeys) =>
|
||||
onSelectedRowKeysChange(nextSelectedRowKeys as Array<string | number>),
|
||||
}}
|
||||
pagination={false}
|
||||
scroll={{ x: true }}
|
||||
scroll={{ y: 400, x: true }}
|
||||
/>
|
||||
<Flex
|
||||
justify="space-between"
|
||||
@@ -249,14 +241,6 @@ export default function AdminSubmissionsCard({
|
||||
) : (
|
||||
<span />
|
||||
)}
|
||||
<Pagination
|
||||
current={submissionsPage}
|
||||
pageSize={pageSize}
|
||||
total={totalCount}
|
||||
showSizeChanger={false}
|
||||
hideOnSinglePage
|
||||
onChange={onSubmissionsPageChange}
|
||||
/>
|
||||
</Flex>
|
||||
</Card>
|
||||
);
|
||||
|
||||
@@ -59,10 +59,8 @@ export default function AdminView({ orderId }: { orderId: string }) {
|
||||
const [savingStatusKey, setSavingStatusKey] = useState<string | null>(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}
|
||||
/>
|
||||
|
||||
<AdminControlCenterCard
|
||||
isClosed={!!data?.closed}
|
||||
updatingOrderStatus={updatingOrderStatus}
|
||||
deletingOrder={deletingOrder}
|
||||
onToggleClosed={updateOrderClosedStatus}
|
||||
onDeleteOrder={deleteOrder}
|
||||
/>
|
||||
|
||||
<AdminSubmissionsCard
|
||||
searchQuery={searchQuery}
|
||||
selectedSubmissionState={selectedSubmissionState}
|
||||
@@ -429,25 +416,13 @@ export default function AdminView({ orderId }: { orderId: string }) {
|
||||
onOpenMailto={openSubmissionEmailDraft}
|
||||
selectedRowKeys={selectedRowKeys}
|
||||
onSelectedRowKeysChange={setSelectedRowKeys}
|
||||
pagedSubmissions={pagedSubmissions}
|
||||
submissions={filteredSubmissions}
|
||||
deletingId={deletingId}
|
||||
savingStatusKey={savingStatusKey}
|
||||
onDeleteSubmission={deleteAsAdmin}
|
||||
onUpdateSubmissionStatus={updateSubmissionStatus}
|
||||
totalEstimatedText={totalEstimatedText}
|
||||
selectedCount={selected.length}
|
||||
submissionsPage={submissionsPage}
|
||||
pageSize={SUBMISSIONS_PAGE_SIZE}
|
||||
totalCount={filteredSubmissions.length}
|
||||
onSubmissionsPageChange={setSubmissionsPage}
|
||||
/>
|
||||
|
||||
<AdminControlCenterCard
|
||||
isClosed={!!data?.closed}
|
||||
updatingOrderStatus={updatingOrderStatus}
|
||||
deletingOrder={deletingOrder}
|
||||
onToggleClosed={updateOrderClosedStatus}
|
||||
onDeleteOrder={deleteOrder}
|
||||
/>
|
||||
</Space>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user