8000 feat: add count endpoint for users, enabling better pagination by presleyp · Pull Request #4848 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat: add count endpoint for users, enabling better pagination #4848

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
merged 18 commits into from
Nov 8, 2022
Merged

feat: add count endpoint for users, enabling better pagination #4848

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5acfb83
Start on backend
presleyp Oct 31, 2022
9b42678
Hook up frontend
presleyp Oct 31, 2022
97027d2
Add to frontend test
presleyp Nov 1, 2022
486839b
Add go test, wip
presleyp Nov 1, 2022
3a8e4bb
Fix some test bugs
presleyp Nov 1, 2022
f083580
Fix test
presleyp Nov 2, 2022
72d4657
Merge branch 'main' into users-count/presleyp
presleyp Nov 2, 2022
424358e
Format
presleyp Nov 2, 2022
6f8ec23
Add to authorize.go
presleyp Nov 3, 2022
5b442b4
copy user array into local variable
f0ssel Nov 4, 2022
3929a00
Authorize route
presleyp Nov 4, 2022
4f9eb6f
Log count error
presleyp Nov 4, 2022
7d8562c
Authorize better
presleyp Nov 4, 2022
b230df1
Tweaks to authorization
presleyp Nov 4, 2022
ca4a82f
More authorization tweaks
presleyp Nov 4, 2022
998725b
Make gen
presleyp Nov 7, 2022
e40949c
Merge branch 'main' into users-count/presleyp
presleyp Nov 7, 2022
4210e28
Fix test
presleyp Nov 7, 2022
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
Prev Previous commit
Next Next commit
Format
  • Loading branch information
@presleyp
presleyp committed Nov 2, 2022
commit 424358ef15d90f37c3343c38953ae43298a8d505
5 changes: 3 additions & 2 deletions site/src/api/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ export const getUser = async (): Promise<TypesGen.User> => {
return response.data
}


export const getAuthMethods = async (): Promise<TypesGen.AuthMethods> => {
const response = await axios.get<TypesGen.AuthMethods>(
"/api/v2/users/authmethods",
Expand Down Expand Up @@ -140,7 +139,9 @@ export const getUsers = async (
return response.data
}

export const getUserCount = async (options: TypesGen.UserCountRequest): Promise<TypesGen.UserCountResponse> => {
export const getUserCount = async (
options: TypesGen.UserCountRequest,
): Promise<TypesGen.UserCountResponse> => {
const url = getURLWithSearchParams("/api/v2/users/count", options)
const response = await axios.get(url.toString())
return response.data
Expand Down
4 changes: 3 additions & 1 deletion site/src/pages/UsersPage/UsersPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,9 @@ describe("UsersPage", () => {
expect(API.getUsers).toBeCalledWith({ offset: 0, limit: 25, q: "" }),
)

const pageButtons = await container.querySelectorAll(`button[name="Page button"]`)
const pageButtons = await container.querySelectorAll(
`button[name="Page button"]`,
)
// count handler says there are 2 pages of results
expect(pageButtons.length).toBe(2)
})
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/UsersPage/UsersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const UsersPage: FC<{ children?: ReactNode }> = () => {
userIdToResetPassword,
newUserPassword,
paginationRef,
count
count,
} = usersState.context

const { updateUsers: canEditUsers } = usePermissions()
Expand Down
2 changes: 1 addition & 1 deletion site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const MockUser: TypesGen.User = {
}

export const MockUserCountResponse: TypesGen.UserCountResponse = {
count: 26
count: 26,
}

export const MockUserAdmin: TypesGen.User = {
Expand Down
Loading
0