Merge branch 'table_fixes' into 'dev'

table fixes

See merge request spatial/postamates_frontend!86
dev
Anton Vlasov 2 years ago
commit 9f4298e1f8

@ -127,7 +127,7 @@ export const useGetTotalInitialPointsCount = () => {
page: 1, page: 1,
page_size: 1, page_size: 1,
}); });
params.append("status[]", STATUSES.pending); params.append("status[]", [STATUSES.pending, STATUSES.cancelled]);
return await getPoints(params, null, dbTable, signal); return await getPoints(params, null, dbTable, signal);
}, },

@ -10,6 +10,7 @@ import { useColumns } from "../useColumns.jsx";
import { PAGE_SIZE } from "../constants.js"; import { PAGE_SIZE } from "../constants.js";
import { usePopup } from "../../../stores/usePopup.js"; import { usePopup } from "../../../stores/usePopup.js";
import { usePendingTableFields } from "./usePendingTableFields.jsx"; import { usePendingTableFields } from "./usePendingTableFields.jsx";
import { STATUSES } from "../../../config.js";
const tableKey = 'pendingTable'; const tableKey = 'pendingTable';
export const PendingTable = ({ fullWidth }) => { export const PendingTable = ({ fullWidth }) => {
@ -39,7 +40,7 @@ export const PendingTable = ({ fullWidth }) => {
const resetPageSize = () => setPageSize(PAGE_SIZE); const resetPageSize = () => setPageSize(PAGE_SIZE);
const getSelectedRowKeys = useCallback(() => { 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( const clickedPoint = data?.results.find(
(item) => item.id === clickedPointConfig?.id (item) => item.id === clickedPointConfig?.id
); );
@ -68,6 +69,11 @@ export const PendingTable = ({ fullWidth }) => {
exclude(id); exclude(id);
} }
}, },
getCheckboxProps: (record) => {
return {
disabled: record.status !== STATUSES.pending //disable the first 4 rows only
};
},
hideSelectAll: true, hideSelectAll: true,
}; };

Loading…
Cancel
Save