Skip to content

[UI] ADH-6484: Fix pagination on Actions and Audit page #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KuzminIA merged 2 commits into from
Feb 10, 2026
Merged

[UI] ADH-6484: Fix pagination on Actions and Audit page #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7837b3
ADH-6484: Fix pagination on Actions and Audit page
alatunov Dec 26, 2025
479247a
Merge branch 'develop' into bugfix/ADH-6484
olegjohn Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions smart-frontend/app/src/components/pages/ActionsPage/ActionsToolbar/ActionsToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -43,8 +44,8 @@ const ActionsToolbar: React.FC = () => {
<FlexGroup gap="20px" className={s.actionsToolbar}>
<ActionsResetFilter />
<Pagination
isNextBtn={actions.length === paginationParams.perPage}
pageData={paginationParams}
totalItems={totalCount}
onChangeData={handlePaginationChange}
frequencyComponent={<FrequencySelect value={requestFrequency} onChange={handleFrequencyChange} />}
/>
Expand Down
5 changes: 3 additions & 2 deletions smart-frontend/app/src/components/pages/AuditPage/AuditEventsToolbar/AuditEventsToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -43,8 +44,8 @@ const AuditEventsToolbar: React.FC = () => {
<FlexGroup gap="20px" className={s.auditEventsToolbar}>
<AuditEventsResetFilter />
<Pagination
isNextBtn={auditEvents.length === paginationParams.perPage}
pageData={paginationParams}
totalItems={totalCount}
onChangeData={handlePaginationChange}
frequencyComponent={<FrequencySelect value={requestFrequency} onChange={handleFrequencyChange} />}
/>
Expand Down
14 changes: 7 additions & 7 deletions smart-frontend/app/src/components/uikit/Pagination/Pagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,30 +110,30 @@ const Pagination = ({
<RenderNumberButtons setPageNumber={setPageNumber} items={pageItems} currentPageNumber={pageNumber} />
{totalPages === 0 && (
<PaginationStepButton
arrowVariant={'arrowDouble'}
variant={'prev'}
arrowVariant="arrowDouble"
variant="prev"
onClick={() => setPageNumber(0)}
disabled={!hasPrev}
/>
)}
<PaginationStepButton
arrowVariant={'arrowSingle'}
arrowVariant="arrowSingle"
onClick={() => setPageNumber(pageNumber - 1)}
disabled={!hasPrev}
dataTest="pagination-prev-page"
/>
<PaginationStepButton
arrowVariant={'arrowSingle'}
arrowVariant="arrowSingle"
onClick={() => setPageNumber(pageNumber + 1)}
variant={'next'}
variant="next"
disabled={!hasNext}
dataTest="pagination-next-page"
/>
{totalItems !== 0 && (
<PaginationStepButton
arrowVariant={'arrowDouble'}
arrowVariant="arrowDouble"
onClick={() => setPageNumber(totalItems)}
variant={'next'}
variant="next"
disabled={!hasNext}
dataTest="pagination-last-page"
/>
Expand Down