Update API

BrunoQuaresma · BrunoQuaresma · commit cabe38559c2c · 2022-05-06T19:29:38.000Z
diff --git a/site/src/api/index.ts b/site/src/api/index.ts
@@ -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
 }
diff --git a/site/src/components/UsersTable/UsersTable.tsx b/site/src/components/UsersTable/UsersTable.tsx
@@ -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"
@@ -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 }) => {
@@ -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}
diff --git a/site/src/pages/UsersPage/UsersPageView.tsx b/site/src/pages/UsersPage/UsersPageView.tsx
@@ -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"
@@ -16,7 +17,7 @@ export interface UsersPageViewProps {
   openUserCreationDialog: () => void
   onSuspendUser: (user: UserResponse) => void
   onResetUserPassword: (user: UserResponse) => void
-  roles: string[]
+  roles: TypesGen.Role[]
   error?: unknown
 }
 
diff --git a/site/src/xServices/roles/rolesXService.ts b/site/src/xServices/roles/rolesXService.ts
@@ -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
 }
@@ -22,7 +23,7 @@ export const rolesMachine = createMachine(
       events: {} as RolesEvent,
       services: {
         getRoles: {
-          data: {} as string[],
+          data: {} as TypesGen.Role[],
         },
       },
     },

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ export const suspendUser = async (userId: TypesGen.User["id"]): Promise<TypesGen`
`159`	`159`	`export const updateUserPassword = async (password: string, userId: TypesGen.User["id"]): Promise<undefined> =>`
`160`	`160`	axios.put(`/api/v2/users/${userId}/password`, { password })
`161`	`161`
`162`		`-export const getOrganizationRoles = async (organizationId: string): Promise<Array<string>> => {`
`163`		- const response = await axios.get<Array<string>>(`/api/v2/organizations/${organizationId}/members/roles`)
	`162`	`+export const getOrganizationRoles = async (organizationId: string): Promise<Array<TypesGen.Role>> => {`
	`163`	+ const response = await axios.get<Array<TypesGen.Role>>(`/api/v2/organizations/${organizationId}/members/roles`)
`164`	`164`	`return response.data`
`165`	`165`	`}`