Skip to content

feat: Add update user roles action #1361

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
May 10, 2022
Merged

feat: Add update user roles action #1361

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
32cba83
Load roles and show them in the table
BrunoQuaresma May 6, 2022
b167995
Update types
BrunoQuaresma May 6, 2022
cabe385
Update API
BrunoQuaresma May 6, 2022
b71ede5
Update roles to fetch the site roles
BrunoQuaresma May 6, 2022
d5e749f
Merge branch 'main' of github.com:coder/coder into bq/fe/update-user-…
BrunoQuaresma May 9, 2022
1e99a04
Add UI for update user roles
BrunoQuaresma May 9, 2022
46add41
Set fixed RoleSelect width
BrunoQuaresma May 9, 2022
16d1e7b
Fix UI to update user roles
BrunoQuaresma May 9, 2022
1e93bd2
Do not display the success notification
BrunoQuaresma May 9, 2022
82a60f8
Add role select storybook
BrunoQuaresma May 10, 2022
9c0587e
Add missing tests
BrunoQuaresma May 10, 2022
c7c7b95
Add fail test case
BrunoQuaresma May 10, 2022
a01cb87
Update site/src/components/RoleSelect/RoleSelect.tsx
BrunoQuaresma May 10, 2022
f402da0
Update site/src/components/RoleSelect/RoleSelect.tsx
BrunoQuaresma May 10, 2022
9f47873
Update site/src/pages/UsersPage/UsersPage.test.tsx
BrunoQuaresma May 10, 2022
6cf12b5
Clear get roles error
BrunoQuaresma May 10, 2022
16c3fe3
Fix storybook
BrunoQuaresma May 10, 2022
9bd6ca5
Add comment about fetch the roles
BrunoQuaresma May 10, 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
Update API
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed May 6, 2022
commit cabe38559c2c8390fd8b7230f7e7a371e72ed0f7
4 changes: 2 additions & 2 deletions site/src/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export const suspendUser = async (userId: TypesGen.User["id"]): Promise<TypesGen
export const updateUserPassword = async (password: string, userId: TypesGen.User["id"]): Promise<undefined> =>
axios.put(`/api/v2/users/${userId}/password`, { password })

export const getOrganizationRoles = async (organizationId: string): Promise<Array<string>> => {
const response = await axios.get<Array<string>>(`/api/v2/organizations/${organizationId}/members/roles`)
export const getOrganizationRoles = async (organizationId: string): Promise<Array<TypesGen.Role>> => {
const response = await axios.get<Array<TypesGen.Role>>(`/api/v2/organizations/${organizationId}/members/roles`)
return response.data
}
5 changes: 3 additions & 2 deletions site/src/components/UsersTable/UsersTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import TableHead from "@material-ui/core/TableHead"
import TableRow from "@material-ui/core/TableRow"
import React from "react"
import { UserResponse } from "../../api/types"
import * as TypesGen from "../../api/typesGenerated"
import { EmptyState } from "../EmptyState/EmptyState"
import { TableHeaderRow } from "../TableHeaders/TableHeaders"
import { TableRowMenu } from "../TableRowMenu/TableRowMenu"
Expand All @@ -26,7 +27,7 @@ export interface UsersTableProps {
users: UserResponse[]
onSuspendUser: (user: UserResponse) => void
onResetUserPassword: (user: UserResponse) => void
roles: string[]
roles: TypesGen.Role[]
}

export const UsersTable: React.FC<UsersTableProps> = ({ users, roles, onSuspendUser, onResetUserPassword }) => {
Expand All @@ -47,7 +48,7 @@ export const UsersTable: React.FC<UsersTableProps> = ({ users, roles, onSuspendU
<TableCell>
<UserCell Avatar={{ username: u.username }} primaryText={u.username} caption={u.email} />{" "}
</TableCell>
<TableCell>{roles}</TableCell>
<TableCell>{roles.map((r) => r.display_name)}</TableCell>
<TableCell>
<TableRowMenu
data={u}
Expand Down
3 changes: 2 additions & 1 deletion site/src/pages/UsersPage/UsersPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react"
import { UserResponse } from "../../api/types"
import * as TypesGen from "../../api/typesGenerated"
import { ErrorSummary } from "../../components/ErrorSummary/ErrorSummary"
import { Header } from "../../components/Header/Header"
import { Margins } from "../../components/Margins/Margins"
Expand All @@ -16,7 +17,7 @@ export interface UsersPageViewProps {
openUserCreationDialog: () => void
onSuspendUser: (user: UserResponse) => void
onResetUserPassword: (user: UserResponse) => void
roles: string[]
roles: TypesGen.Role[]
error?: unknown
}

Expand Down
5 changes: 3 additions & 2 deletions site/src/xServices/roles/rolesXService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { assign, createMachine } from "xstate"
import * as API from "../../api"
import * as TypesGen from "../../api/typesGenerated"
import { displayError } from "../../components/GlobalSnackbar/utils"

type RolesContext = {
roles?: string[]
roles?: TypesGen.Role[]
getRolesError: Error | unknown
organizationId?: string
}
Expand All @@ -22,7 +23,7 @@ export const rolesMachine = createMachine(
events: {} as RolesEvent,
services: {
getRoles: {
data: {} as string[],
data: {} as TypesGen.Role[],
},
},
},
Expand Down