Skip to content
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

Fix MembersTable duplicate users #2803

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Fix MembersTable duplicate users #2803

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
4649c83
Fix bug with first page being requested repeatedly
spalmurray-codecov Apr 23, 2024
43c7fdb
Merge branch 'main' into spalmurray/fix-members-table-multiple-same-user
spalmurray-codecov Apr 23, 2024
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
1 change: 0 additions & 1 deletion src/pages/MembersPage/MembersList/MembersList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ function MembersList() {
isAdmin: ApiFilterEnum.none, // Default to no filter on isAdmin
ordering: '-name', // Default sort is A-Z Name
search: '', // Default to no search on initial load
page: 1, // Default to first page
pageSize: 50, // Default page size
})

Expand Down
1 change: 0 additions & 1 deletion src/pages/MembersPage/MembersList/MembersTable/MembersTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ interface MembersTableProps {
isAdmin?: boolean
ordering?: string[]
search?: string
page: number
pageSize: number
}
}
Expand Down
3 changes: 1 addition & 2 deletions src/services/users/useInfiniteUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export interface InfiniteUsersQuery {
isAdmin?: boolean
ordering?: string
search?: string
page?: number
pageSize?: number
}
}
Expand All @@ -57,8 +56,8 @@ export const useInfiniteUsers = (
signal,
query: {
pageSize: 25,
page: pageParam,
...query,
page: pageParam,
spalmurray-codecov marked this conversation as resolved.
Show resolved Hide resolved
},
}).then((res) => {
const parsedRes = MemberListSchema.safeParse(res)
Expand Down
Loading