Skip to content

chore: paginationData not being spread correctly in admin users #37063

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
kodiakhq merged 1 commit into from
Sep 25, 2025
Merged

chore: paginationData not being spread correctly in admin users #37063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion apps/meteor/client/views/admin/users/UsersTable/UsersTable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@ export default {
component: UsersTable,
} satisfies Meta<typeof UsersTable>;

const Template: StoryFn<typeof UsersTable> = (args) => <UsersTable {...args} />;
const mockedPagination = {
current: 0,
setCurrent: () => undefined,
itemsPerPage: 25 as const,
setItemsPerPage: () => undefined,
itemsPerPageLabel: () => 'Items per page:',
showingResultsLabel: () => 'Showing results 1 - 5 of 5',
};

const Template: StoryFn<typeof UsersTable> = (args) => <UsersTable {...args} paginationData={mockedPagination} />;

export const Default = Template.bind({});
Default.args = {
Expand Down
9 changes: 6 additions & 3 deletions apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ const UsersTable = ({
const isLaptop = !breakpoints.includes('xxl');

const canManageVoipExtension = useVoipExtensionPermission();
const { current, itemsPerPage, setCurrent, setItemsPerPage, ...paginationProps } = paginationData;

const isKeyboardEvent = (event: MouseEvent<HTMLElement> | KeyboardEvent<HTMLElement>): event is KeyboardEvent<HTMLElement> => {
return (event as KeyboardEvent<HTMLElement>).key !== undefined;
Expand Down Expand Up @@ -204,10 +205,12 @@ const UsersTable = ({
</GenericTable>
<Pagination
divider
current={current}
itemsPerPage={itemsPerPage}
count={total}
onSetItemsPerPage={paginationData?.setItemsPerPage}
onSetCurrent={paginationData?.setCurrent}
{...paginationData}
onSetItemsPerPage={setItemsPerPage}
onSetCurrent={setCurrent}
{...paginationProps}
/>
</>
)}
Expand Down
Loading