From d088bfb2b9ed0e0215bd47760fa7722211338d8b Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Thu, 6 Jun 2024 14:58:39 +0000 Subject: [PATCH 1/3] fix(site): allow user to update their name --- .../UserSettingsPage/AccountPage/AccountForm.stories.tsx | 7 +++++++ .../src/pages/UserSettingsPage/AccountPage/AccountForm.tsx | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/site/src/pages/UserSettingsPage/AccountPage/AccountForm.stories.tsx b/site/src/pages/UserSettingsPage/AccountPage/AccountForm.stories.tsx index d0e2e425b9a63..2babd4fa5b818 100644 --- a/site/src/pages/UserSettingsPage/AccountPage/AccountForm.stories.tsx +++ b/site/src/pages/UserSettingsPage/AccountPage/AccountForm.stories.tsx @@ -26,6 +26,7 @@ export const Loading: Story = { isLoading: true, }, }; + export const WithError: Story = { args: { updateProfileError: mockApiError({ @@ -42,3 +43,9 @@ export const WithError: Story = { }, }, }; + +export const Editable: Story = { + args: { + editable: true, + }, +}; diff --git a/site/src/pages/UserSettingsPage/AccountPage/AccountForm.tsx b/site/src/pages/UserSettingsPage/AccountPage/AccountForm.tsx index 84cdd04b39144..ce89e3b0ad6f7 100644 --- a/site/src/pages/UserSettingsPage/AccountPage/AccountForm.tsx +++ b/site/src/pages/UserSettingsPage/AccountPage/AccountForm.tsx @@ -21,6 +21,7 @@ export const Language = { const validationSchema = Yup.object({ username: nameValidator(Language.usernameLabel), + name: Yup.string(), }); export interface AccountFormProps { @@ -75,13 +76,11 @@ export const AccountForm: FC = ({ /> { e.target.value = e.target.value.trim(); form.handleChange(e); }} - aria-disabled={!editable} - disabled={!editable} - fullWidth label={Language.nameLabel} helperText='The human-readable name is optional and can be accessed in a template via the "data.coder_workspace_owner.me.full_name" property.' /> From 77a74e2edcfd7a5bac1e76eea3aacbc080dc6049 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Thu, 6 Jun 2024 15:00:20 +0000 Subject: [PATCH 2/3] Allow update submit --- .../src/pages/UserSettingsPage/AccountPage/AccountForm.tsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/site/src/pages/UserSettingsPage/AccountPage/AccountForm.tsx b/site/src/pages/UserSettingsPage/AccountPage/AccountForm.tsx index ce89e3b0ad6f7..d713fbf35bfd8 100644 --- a/site/src/pages/UserSettingsPage/AccountPage/AccountForm.tsx +++ b/site/src/pages/UserSettingsPage/AccountPage/AccountForm.tsx @@ -86,12 +86,7 @@ export const AccountForm: FC = ({ />
- + {Language.updateSettings}
From 15a38795e48f14f1766781c01f0187725613de4d Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Thu, 6 Jun 2024 18:19:38 +0000 Subject: [PATCH 3/3] Fix test --- .../pages/UserSettingsPage/AccountPage/AccountForm.test.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/site/src/pages/UserSettingsPage/AccountPage/AccountForm.test.tsx b/site/src/pages/UserSettingsPage/AccountPage/AccountForm.test.tsx index 253498dc3ef37..649260c347d1e 100644 --- a/site/src/pages/UserSettingsPage/AccountPage/AccountForm.test.tsx +++ b/site/src/pages/UserSettingsPage/AccountPage/AccountForm.test.tsx @@ -63,10 +63,6 @@ describe("AccountForm", () => { // Then const el = await screen.findByLabelText("Username"); expect(el).toBeDisabled(); - const btn = await screen.findByRole("button", { - name: /Update account/i, - }); - expect(btn).toBeDisabled(); }); }); });