Merge branch 'develop' into amol/alert-0-10-0-fix3

This commit is contained in:
Amol Umbark 2022-07-14 17:34:50 +05:30 committed by GitHub
commit 11c352741d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -188,14 +188,14 @@ function AllErrors(): JSX.Element {
sorter,
) => {
if (!Array.isArray(sorter)) {
const { current = 0, pageSize = 0 } = paginations;
const { pageSize = 0, current = 0 } = paginations;
const { columnKey = '', order } = sorter;
const updatedOrder = order === 'ascend' ? 'ascending' : 'descending';
history.replace(
`${pathname}?${createQueryParams({
order: updatedOrder,
offset: current - 1,
offset: (current - 1) * pageSize,
orderParam: columnKey,
pageSize,
})}`,
@ -213,7 +213,7 @@ function AllErrors(): JSX.Element {
pagination={{
pageSize: getUpdatedPageSize,
responsive: true,
current: getUpdatedOffset + 1,
current: getUpdatedOffset / 10 + 1,
position: ['bottomLeft'],
total: errorCountResponse.data?.payload || 0,
}}