diff --git a/src/api.js b/src/api.js index a8a74d1..7885249 100644 --- a/src/api.js +++ b/src/api.js @@ -127,7 +127,7 @@ export const useGetTotalInitialPointsCount = () => { page: 1, page_size: 1, }); - params.append("status[]", STATUSES.pending); + params.append("status[]", [STATUSES.pending, STATUSES.cancelled]); return await getPoints(params, null, dbTable, signal); }, diff --git a/src/modules/Table/PendingTable/PendingTable.jsx b/src/modules/Table/PendingTable/PendingTable.jsx index 20da9fd..b9d69fb 100644 --- a/src/modules/Table/PendingTable/PendingTable.jsx +++ b/src/modules/Table/PendingTable/PendingTable.jsx @@ -10,6 +10,7 @@ import { useColumns } from "../useColumns.jsx"; import { PAGE_SIZE } from "../constants.js"; import { usePopup } from "../../../stores/usePopup.js"; import { usePendingTableFields } from "./usePendingTableFields.jsx"; +import { STATUSES } from "../../../config.js"; const tableKey = 'pendingTable'; export const PendingTable = ({ fullWidth }) => { @@ -39,7 +40,7 @@ export const PendingTable = ({ fullWidth }) => { const resetPageSize = () => setPageSize(PAGE_SIZE); const getSelectedRowKeys = useCallback(() => { - const ids = data?.results.map((item) => item.id) ?? []; + const ids = data?.results.filter((item) => item.status === STATUSES.pending).map((item) => item.id) ?? []; const clickedPoint = data?.results.find( (item) => item.id === clickedPointConfig?.id ); @@ -68,6 +69,11 @@ export const PendingTable = ({ fullWidth }) => { exclude(id); } }, + getCheckboxProps: (record) => { + return { + disabled: record.status !== STATUSES.pending //disable the first 4 rows only + }; + }, hideSelectAll: true, };