Skip to content

feat: add count to get users endpoint #5016

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 17 commits into from
Nov 14, 2022
Merged

feat: add count to get users endpoint #5016

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f771959
feat: add count to queries in window function
f0ssel Nov 10, 2022
ed5a147
make initial tests pass
f0ssel Nov 14, 2022
5da633e
fix more tests
f0ssel Nov 14, 2022
8a00932
idk
f0ssel Nov 14, 2022
206381d
get presleys help
f0ssel Nov 14, 2022
a1b7e4e
rename test
f0ssel Nov 14, 2022
482b59f
remove count endpoint
f0ssel Nov 14, 2022
0d738e8
remove more
f0ssel Nov 14, 2022
d5b5000
fmt
f0ssel Nov 14, 2022
ada3995
fix js tests
f0ssel Nov 14, 2022
bd34b05
keep fixing
f0ssel Nov 14, 2022
6249824
fmt
f0ssel Nov 14, 2022
8a92b2b
fmt
f0ssel Nov 14, 2022
ef32b99
fix all js tests
f0ssel Nov 14, 2022
7f43a6c
fix
f0ssel Nov 14, 2022
991b518
move states
f0ssel Nov 14, 2022
b86e0cb
fmt
f0ssel Nov 14, 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
idk
  • Loading branch information
@f0ssel
f0ssel committed Nov 14, 2022
commit 8a0093225f2fa205380a152c576355d69becbcb4
4 changes: 2 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 @@ -133,9 +133,9 @@ export const getApiKey = async (): Promise<TypesGen.GenerateAPIKeyResponse> => {

export const getUsers = async (
options: TypesGen.UsersRequest,
): Promise<TypesGen.User[]> => {
): Promise<TypesGen.GetUsersResponse> => {
const url = getURLWithSearchParams("/api/v2/users", options)
const response = await axios.get<TypesGen.User[]>(url.toString())
const response = await axios.get<TypesGen.GetUsersResponse>(url.toString())
return response.data
}

Expand Down
54 changes: 6 additions & 48 deletions site/src/xServices/users/usersXService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export const usersMachine =
events: {} as UsersEvent,
services: {} as {
getUsers: {
data: TypesGen.User[]
data: TypesGen.GetUsersResponse
}
createUser: {
data: TypesGen.User
Expand All @@ -132,46 +132,11 @@ export const usersMachine =
updateUserRoles: {
data: TypesGen.User
}
getUserCount: {
data: TypesGen.UserCountResponse
}
},
},
predictableActionArguments: true,
id: "usersState",
type: "parallel",
states: {
count: {
initial: "gettingCount",
states: {
idle: {},
gettingCount: {
entry: "clearGetCountError",
invoke: {
src: "getUserCount",
id: "getUserCount",
onDone: [
{
target: "idle",
actions: "assignCount",
},
],
onError: [
{
target: "idle",
actions: "assignGetCountError",
},
],
},
},
},
on: {
UPDATE_FILTER: {
target: ".gettingCount",
actions: ["assignFilter", "sendResetPage"],
},
},
},
users: {
initial: "startingPagination",
states: {
Expand Down Expand Up @@ -235,6 +200,10 @@ export const usersMachine =
target: "gettingUsers",
actions: "updateURL",
},
UPDATE_FILTER: {
target: "gettingUsers",
actions: ["assignFilter", "sendResetPage"],
},
},
},
confirmUserSuspension: {
Expand Down Expand Up @@ -404,9 +373,6 @@ export const usersMachine =
limit,
})
},
getUserCount: (context) => {
return API.getUserCount(queryToFilter(context.filter))
},
suspendUser: (context) => {
if (!context.userIdToSuspend) {
throw new Error("userIdToSuspend is undefined")
Expand Down Expand Up @@ -462,17 +428,9 @@ export const usersMachine =
userIdToUpdateRoles: (_) => undefined,
}),
assignUsers: assign({
users: (_, event) => event.data,
}),
assignCount: assign({
users: (_, event) => event.data.users,
count: (_, event) => event.data.count,
}),
assignGetCountError: assign({
getCountError: (_, event) => event.data,
}),
clearGetCountError: assign({
getCountError: (_) => undefined,
}),
assignFilter: assign({
filter: (_, event) => event.query,
}),
Expand Down