Skip to content

Commit 6f6165b

Browse files
committed
Format
1 parent 797bb34 commit 6f6165b

File tree

6 files changed

+19
-9
lines changed

6 files changed

+19
-9
lines changed

site/src/components/CreateUserForm/CreateUserForm.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,20 @@ const validationSchema = Yup.object({
3535
username: Yup.string().required(Language.usernameRequired),
3636
})
3737

38-
export const CreateUserForm: React.FC<CreateUserFormProps> = ({ onSubmit, onCancel, formErrors, isLoading, error, myOrgId }) => {
38+
export const CreateUserForm: React.FC<CreateUserFormProps> = ({
39+
onSubmit,
40+
onCancel,
41+
formErrors,
42+
isLoading,
43+
error,
44+
myOrgId,
45+
}) => {
3946
const form: FormikContextType<CreateUserRequest> = useFormik<CreateUserRequest>({
4047
initialValues: {
4148
email: "",
4249
password: "",
4350
username: "",
44-
organization_id: myOrgId
51+
organization_id: myOrgId,
4552
},
4653
validationSchema,
4754
onSubmit,

site/src/pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import { screen } from "@testing-library/react"
22
import userEvent from "@testing-library/user-event"
33
import { rest } from "msw"
44
import React from "react"
5+
import * as API from "../../../api"
56
import { Language as FormLanguage } from "../../../components/CreateUserForm/CreateUserForm"
67
import { Language as FooterLanguage } from "../../../components/FormFooter/FormFooter"
78
import { history, render } from "../../../testHelpers"
89
import { server } from "../../../testHelpers/server"
910
import { Language as UserLanguage } from "../../../xServices/users/usersXService"
1011
import { CreateUserPage, Language } from "./CreateUserPage"
11-
import * as API from "../../../api"
1212

1313
const fillForm = async ({
1414
username = "someuser",

site/src/pages/UsersPage/CreateUserPage/CreateUserPage.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ export const CreateUserPage: React.FC = () => {
1717
const { createUserError, createUserFormErrors } = usersState.context
1818
const navigate = useNavigate()
1919
// There is no field for organization id in Community Edition, so handle its field error like a generic error
20-
const genericError = (createUserError || createUserFormErrors?.organization_id || !myOrgId) ? Language.unknownError : undefined
20+
const genericError =
21+
createUserError || createUserFormErrors?.organization_id || !myOrgId ? Language.unknownError : undefined
2122

2223
return (
2324
<CreateUserForm

site/src/testHelpers/entities.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const MockUser: UserResponse = {
2626
email: "test@coder.com",
2727
created_at: "",
2828
status: "active",
29-
organization_id: "123"
29+
organization_id: "123",
3030
}
3131

3232
export const MockUser2: UserResponse = {
@@ -35,7 +35,7 @@ export const MockUser2: UserResponse = {
3535
email: "test2@coder.com",
3636
created_at: "",
3737
status: "active",
38-
organization_id: "123"
38+
organization_id: "123",
3939
}
4040

4141
export const MockPager: Pager = {

site/src/xServices/StateContext.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ export const XServiceContext = createContext({} as XServiceContextType)
2424

2525
export const XServiceProvider: React.FC = ({ children }) => {
2626
const navigate = useNavigate()
27-
const redirectToUsersPage = () => { navigate("users") }
27+
const redirectToUsersPage = () => {
28+
navigate("users")
29+
}
2830

2931
return (
3032
<XServiceContext.Provider

site/src/xServices/users/usersXService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export const usersMachine = createMachine(
100100
createUser: (_, event) => API.createUser(event.user),
101101
},
102102
guards: {
103-
isFormError: (_, event) => isApiError(event.data)
103+
isFormError: (_, event) => isApiError(event.data),
104104
},
105105
actions: {
106106
assignUsers: assign({
@@ -119,7 +119,7 @@ export const usersMachine = createMachine(
119119
}),
120120
assignCreateUserFormErrors: assign({
121121
// the guard ensures it is ApiError
122-
createUserFormErrors: (_, event) => mapApiErrorToFieldErrors((event.data as ApiError).response.data)
122+
createUserFormErrors: (_, event) => mapApiErrorToFieldErrors((event.data as ApiError).response.data),
123123
}),
124124
clearCreateUserError: assign((context: UsersContext) => ({
125125
...context,

0 commit comments

Comments
 (0)