diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx index a253473b3b..031939e44d 100644 --- a/site/src/AppRouter.tsx +++ b/site/src/AppRouter.tsx @@ -77,7 +77,7 @@ export const AppRouter: React.FC = () => ( /> - + { if (usersState.matches("error")) { return } else { - return {navigate("/users/create")}} /> + return ( + { + navigate("/users/create") + }} + /> + ) } } diff --git a/site/src/pages/UsersPage/UsersPageView.tsx b/site/src/pages/UsersPage/UsersPageView.tsx index 515ff4d353..a919ac9f5f 100644 --- a/site/src/pages/UsersPage/UsersPageView.tsx +++ b/site/src/pages/UsersPage/UsersPageView.tsx @@ -7,7 +7,7 @@ import { UsersTable } from "../../components/UsersTable/UsersTable" export const Language = { pageTitle: "Users", pageSubtitle: (pager: Pager | undefined): string => (pager ? `${pager.total} total` : ""), - newUserButton: "New User" + newUserButton: "New User", } export interface UsersPageViewProps { @@ -21,7 +21,11 @@ export const UsersPageView: React.FC = ({ users, pager, open return (
-
+
) diff --git a/site/src/xServices/users/usersXService.ts b/site/src/xServices/users/usersXService.ts index 9277c58b74..39cde6e942 100644 --- a/site/src/xServices/users/usersXService.ts +++ b/site/src/xServices/users/usersXService.ts @@ -6,7 +6,7 @@ import { displayError } from "../../components/GlobalSnackbar/utils" const Language = { createUserError: "Unable to create user", - createUserSuccess: "Successfully created user" + createUserSuccess: "Successfully created user", } export interface UsersContext { @@ -16,7 +16,7 @@ export interface UsersContext { createUserError?: Error | unknown } -export type UsersEvent = { type: "GET_USERS" } | { type: "CREATE", user: GenTypes.CreateUserRequest } +export type UsersEvent = { type: "GET_USERS" } | { type: "CREATE"; user: GenTypes.CreateUserRequest } export const usersMachine = createMachine( { @@ -27,7 +27,7 @@ export const usersMachine = createMachine( services: {} as { getUsers: { data: Types.PagedUsers - }, + } createUser: { data: GenTypes.User } @@ -42,7 +42,7 @@ export const usersMachine = createMachine( idle: { on: { GET_USERS: "gettingUsers", - CREATE: "creatingUser" + CREATE: "creatingUser", }, }, gettingUsers: { @@ -70,14 +70,14 @@ export const usersMachine = createMachine( id: "createUser", onDone: { target: "gettingUsers", - actions: "displayCreateUserSuccess" + actions: "displayCreateUserSuccess", }, onError: { target: "idle", - actions: "displayCreateUserError" - } + actions: "displayCreateUserError", + }, }, - tags: "loading" + tags: "loading", }, error: { on: { @@ -89,9 +89,7 @@ export const usersMachine = createMachine( { services: { getUsers: API.getUsers, - createUser: (_, event) => ( - API.createUser(event.user) - ) + createUser: (_, event) => API.createUser(event.user), }, actions: { assignUsers: assign({ @@ -110,7 +108,7 @@ export const usersMachine = createMachine( }, displayCreateUserSuccess: () => { displayError(Language.createUserSuccess) - } + }, }, }, )