From e7837b3c9fdb1a89289d0587cb1a3f4b0642a519 Mon Sep 17 00:00:00 2001 From: Aleksei Latunov <139361138+alatunov@users.noreply.github.com> Date: Fri, 26 Dec 2025 17:08:57 +0300 Subject: [PATCH] ADH-6484: Fix pagination on Actions and Audit page --- .../ActionsPage/ActionsToolbar/ActionsToolbar.tsx | 5 +++-- .../AuditEventsToolbar/AuditEventsToolbar.tsx | 5 +++-- .../src/components/uikit/Pagination/Pagination.tsx | 14 +++++++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/smart-frontend/app/src/components/pages/ActionsPage/ActionsToolbar/ActionsToolbar.tsx b/smart-frontend/app/src/components/pages/ActionsPage/ActionsToolbar/ActionsToolbar.tsx index 2d4a451306c..72ae92157c9 100644 --- a/smart-frontend/app/src/components/pages/ActionsPage/ActionsToolbar/ActionsToolbar.tsx +++ b/smart-frontend/app/src/components/pages/ActionsPage/ActionsToolbar/ActionsToolbar.tsx @@ -27,7 +27,8 @@ import FrequencySelect from '@uikit/Table/FrequencySelect/FrequencySelect'; const ActionsToolbar: React.FC = () => { const dispatch = useDispatch(); - const actions = useStore(({ adh }) => adh.actions.actions); + + const totalCount = useStore(({ adh }) => adh.actions.totalCount); const paginationParams = useStore(({ adh }) => adh.actionsTable.paginationParams); const requestFrequency = useStore(({ adh }) => adh.actionsTable.requestFrequency); @@ -43,8 +44,8 @@ const ActionsToolbar: React.FC = () => { } /> diff --git a/smart-frontend/app/src/components/pages/AuditPage/AuditEventsToolbar/AuditEventsToolbar.tsx b/smart-frontend/app/src/components/pages/AuditPage/AuditEventsToolbar/AuditEventsToolbar.tsx index bda7c7cb3a4..40b10d39441 100644 --- a/smart-frontend/app/src/components/pages/AuditPage/AuditEventsToolbar/AuditEventsToolbar.tsx +++ b/smart-frontend/app/src/components/pages/AuditPage/AuditEventsToolbar/AuditEventsToolbar.tsx @@ -27,7 +27,8 @@ import FrequencySelect from '@uikit/Table/FrequencySelect/FrequencySelect'; const AuditEventsToolbar: React.FC = () => { const dispatch = useDispatch(); - const auditEvents = useStore(({ adh }) => adh.auditEvents.auditEvents); + + const totalCount = useStore(({ adh }) => adh.auditEvents.totalCount); const paginationParams = useStore(({ adh }) => adh.auditEventsTable.paginationParams); const requestFrequency = useStore(({ adh }) => adh.auditEventsTable.requestFrequency); @@ -43,8 +44,8 @@ const AuditEventsToolbar: React.FC = () => { } /> diff --git a/smart-frontend/app/src/components/uikit/Pagination/Pagination.tsx b/smart-frontend/app/src/components/uikit/Pagination/Pagination.tsx index 9b6d864ea41..6659fe13896 100644 --- a/smart-frontend/app/src/components/uikit/Pagination/Pagination.tsx +++ b/smart-frontend/app/src/components/uikit/Pagination/Pagination.tsx @@ -110,30 +110,30 @@ const Pagination = ({ {totalPages === 0 && ( setPageNumber(0)} disabled={!hasPrev} /> )} setPageNumber(pageNumber - 1)} disabled={!hasPrev} dataTest="pagination-prev-page" /> setPageNumber(pageNumber + 1)} - variant={'next'} + variant="next" disabled={!hasNext} dataTest="pagination-next-page" /> {totalItems !== 0 && ( setPageNumber(totalItems)} - variant={'next'} + variant="next" disabled={!hasNext} dataTest="pagination-last-page" />