From 454ccf75472d30a07d8463a81f31d29ed53526fb Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Tue, 26 Apr 2022 14:04:57 -0500 Subject: [PATCH] refactor: remove the user name (#1185) --- site/src/api/types.ts | 2 -- .../PreferencesAccountForm/PreferencesAccountForm.tsx | 11 ----------- .../PreferencesPages/AccountPage/AccountPage.test.tsx | 4 +--- .../PreferencesPages/AccountPage/AccountPage.tsx | 2 +- site/src/testHelpers/entities.ts | 2 -- 5 files changed, 2 insertions(+), 19 deletions(-) diff --git a/site/src/api/types.ts b/site/src/api/types.ts index 7b95a64743..c303ffc9d4 100644 --- a/site/src/api/types.ts +++ b/site/src/api/types.ts @@ -15,7 +15,6 @@ export interface UserResponse { readonly username: string readonly email: string readonly created_at: string - readonly name: string } /** @@ -100,5 +99,4 @@ export interface WorkspaceAutostopRequest { export interface UpdateProfileRequest { readonly username: string readonly email: string - readonly name: string } diff --git a/site/src/components/PreferencesAccountForm/PreferencesAccountForm.tsx b/site/src/components/PreferencesAccountForm/PreferencesAccountForm.tsx index b33b75fe9a..5b950e4c6a 100644 --- a/site/src/components/PreferencesAccountForm/PreferencesAccountForm.tsx +++ b/site/src/components/PreferencesAccountForm/PreferencesAccountForm.tsx @@ -8,13 +8,11 @@ import { LoadingButton } from "../LoadingButton/LoadingButton" import { Stack } from "../Stack/Stack" interface AccountFormValues { - name: string email: string username: string } export const Language = { - nameLabel: "Name", usernameLabel: "Username", emailLabel: "Email", emailInvalid: "Please enter a valid email address.", @@ -24,7 +22,6 @@ export const Language = { const validationSchema = Yup.object({ email: Yup.string().trim().email(Language.emailInvalid).required(Language.emailRequired), - name: Yup.string().optional(), username: Yup.string().trim(), }) @@ -55,14 +52,6 @@ export const AccountForm: React.FC = ({ <>
- { } const newData = { - name: "User", email: "user@coder.com", username: "user", } const fillAndSubmitForm = async () => { - await waitFor(() => screen.findByLabelText("Name")) - fireEvent.change(screen.getByLabelText("Name"), { target: { value: newData.name } }) + await waitFor(() => screen.findByLabelText("Email")) fireEvent.change(screen.getByLabelText("Email"), { target: { value: newData.email } }) fireEvent.change(screen.getByLabelText("Username"), { target: { value: newData.username } }) fireEvent.click(screen.getByText(AccountForm.Language.updatePreferences)) diff --git a/site/src/pages/PreferencesPages/AccountPage/AccountPage.tsx b/site/src/pages/PreferencesPages/AccountPage/AccountPage.tsx index a2fab535f5..008c89586b 100644 --- a/site/src/pages/PreferencesPages/AccountPage/AccountPage.tsx +++ b/site/src/pages/PreferencesPages/AccountPage/AccountPage.tsx @@ -30,7 +30,7 @@ export const AccountPage: React.FC = () => { error={hasUnknownError ? Language.unknownError : undefined} formErrors={formErrors} isLoading={authState.matches("signedIn.profile.updatingProfile")} - initialValues={{ name: me.name, username: me.username, email: me.email }} + initialValues={{ username: me.username, email: me.email }} onSubmit={(data) => { authSend({ type: "UPDATE_PROFILE", diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts index dec91f2ae9..ffdd7418f2 100644 --- a/site/src/testHelpers/entities.ts +++ b/site/src/testHelpers/entities.ts @@ -21,7 +21,6 @@ export const MockBuildInfo: BuildInfoResponse = { } export const MockUser: UserResponse = { - name: "Test User", id: "test-user", username: "TestUser", email: "test@coder.com", @@ -30,7 +29,6 @@ export const MockUser: UserResponse = { export const MockUser2: UserResponse = { id: "test-user-2", - name: "Test User 2", username: "TestUser2", email: "test2@coder.com", created_at: "",