From b9106cb124ad3e0b46c07f1461c603cd23ab5796 Mon Sep 17 00:00:00 2001 From: Jaayden Halko Date: Thu, 16 Jan 2025 20:17:56 +0000 Subject: [PATCH 1/2] fix: correctly display loading spinner --- site/src/components/Dialogs/Dialog.tsx | 2 +- site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx | 2 +- site/src/pages/CreateTokenPage/CreateTokenForm.tsx | 2 +- site/src/pages/CreateUserPage/CreateUserForm.tsx | 2 +- .../pages/CreateWorkspacePage/CreateWorkspacePageView.tsx | 2 +- site/src/pages/GroupsPage/SettingsGroupPageView.tsx | 2 +- .../CustomRolesPage/CreateEditRolePageView.tsx | 3 ++- .../GroupsPage/CreateGroupPageView.tsx | 2 +- .../GroupsPage/GroupSettingsPageView.tsx | 2 +- .../OrganizationSettingsPageView.tsx | 7 +++---- .../TemplateGeneralSettingsPage/TemplateSettingsForm.tsx | 2 +- .../TemplateSchedulePage/TemplateScheduleForm.tsx | 2 +- .../TemplateVariablesPage/TemplateVariablesForm.tsx | 2 +- .../WorkspaceParametersPage/WorkspaceParametersForm.tsx | 2 +- .../WorkspaceSchedulePage/WorkspaceScheduleForm.tsx | 2 +- .../pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/site/src/components/Dialogs/Dialog.tsx b/site/src/components/Dialogs/Dialog.tsx index f53274cd62999..cdc271697c680 100644 --- a/site/src/components/Dialogs/Dialog.tsx +++ b/site/src/components/Dialogs/Dialog.tsx @@ -48,7 +48,7 @@ export const DialogActionButtons: FC = ({ data-testid="confirm-button" type="submit" > - {confirmLoading && } + {confirmText} )} diff --git a/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx b/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx index 050f8ab03863e..617b7052a2b73 100644 --- a/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx +++ b/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx @@ -357,7 +357,7 @@ export const CreateTemplateForm: FC = (props) => { Cancel {logs && ( diff --git a/site/src/pages/CreateTokenPage/CreateTokenForm.tsx b/site/src/pages/CreateTokenPage/CreateTokenForm.tsx index ab53af0778f5f..de7c17232a3b7 100644 --- a/site/src/pages/CreateTokenPage/CreateTokenForm.tsx +++ b/site/src/pages/CreateTokenPage/CreateTokenForm.tsx @@ -152,7 +152,7 @@ export const CreateTokenForm: FC = ({ Cancel diff --git a/site/src/pages/CreateUserPage/CreateUserForm.tsx b/site/src/pages/CreateUserPage/CreateUserForm.tsx index 9e40ee18409f9..aebdd36e45adc 100644 --- a/site/src/pages/CreateUserPage/CreateUserForm.tsx +++ b/site/src/pages/CreateUserPage/CreateUserForm.tsx @@ -210,7 +210,7 @@ export const CreateUserForm: FC< Cancel diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx index e657535c0a265..cc912e1f6facf 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx @@ -322,7 +322,7 @@ export const CreateWorkspacePageView: FC = ({ type="submit" disabled={creatingWorkspace || !hasAllRequiredExternalAuth} > - {creatingWorkspace && } + Create workspace diff --git a/site/src/pages/GroupsPage/SettingsGroupPageView.tsx b/site/src/pages/GroupsPage/SettingsGroupPageView.tsx index 652d37a943d57..3877cabc0beb6 100644 --- a/site/src/pages/GroupsPage/SettingsGroupPageView.tsx +++ b/site/src/pages/GroupsPage/SettingsGroupPageView.tsx @@ -113,7 +113,7 @@ const UpdateGroupForm: FC = ({ diff --git a/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx b/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx index 0ee5952acf22e..9e9d7f4e41db9 100644 --- a/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx +++ b/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx @@ -99,6 +99,7 @@ export const CreateEditRolePageView: FC = ({ form.handleSubmit(); }} > + {role !== undefined ? "Save" : "Create Role"} @@ -141,7 +142,7 @@ export const CreateEditRolePageView: FC = ({ diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPageView.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPageView.tsx index 3f695020d21a9..5557abd39dc1f 100644 --- a/site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPageView.tsx +++ b/site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPageView.tsx @@ -100,7 +100,7 @@ export const CreateGroupPageView: FC = ({ diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.tsx index 15a49932c7c3e..9f63b08cfd76d 100644 --- a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.tsx +++ b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.tsx @@ -124,7 +124,7 @@ const UpdateGroupForm: FC = ({ diff --git a/site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx index 06610ce923401..e8da222e459dc 100644 --- a/site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx +++ b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx @@ -1,5 +1,5 @@ import type { Interpolation, Theme } from "@emotion/react"; -import Button from "@mui/material/Button"; +import { Button } from "components/Button/Button"; import TextField from "@mui/material/TextField"; import { isApiValidationError } from "api/errors"; import type { @@ -119,7 +119,7 @@ export const OrganizationSettingsPageView: FC< @@ -134,8 +134,7 @@ export const OrganizationSettingsPageView: FC<
Deleting an organization is irreversible. diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx index 7a3a1a873e33f..c7bdc6d647854 100644 --- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx +++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx @@ -639,7 +639,7 @@ export const TemplateScheduleForm: FC = ({ type="submit" disabled={isSubmitting || !form.isValid || !form.dirty} > - {isSubmitting && } + Save diff --git a/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesForm.tsx index ceb6a11a6878a..49eb38d3c3c4b 100644 --- a/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesForm.tsx +++ b/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesForm.tsx @@ -114,7 +114,7 @@ export const TemplateVariablesForm: FC = ({ diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersForm.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersForm.tsx index 9070ff871bb38..00b8c2ae8464b 100644 --- a/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersForm.tsx +++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersForm.tsx @@ -165,7 +165,7 @@ export const WorkspaceParametersForm: FC = ({ type="submit" disabled={isSubmitting || disabled || !form.dirty} > - {isSubmitting && } + Submit and restart diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceScheduleForm.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceScheduleForm.tsx index 33af37c54845c..aba52611a7122 100644 --- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceScheduleForm.tsx +++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceScheduleForm.tsx @@ -456,7 +456,7 @@ export const WorkspaceScheduleForm: FC = ({ (!template.allow_user_autostart && !template.allow_user_autostop) } > - {isLoading && } + Save diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx index cb91cec317e34..0b388e913ed07 100644 --- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx +++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx @@ -123,7 +123,7 @@ export const WorkspaceSettingsForm: FC = ({ From 15769ce3dfed738d00e2f7a7e5138de9fc52e099 Mon Sep 17 00:00:00 2001 From: Jaayden Halko Date: Thu, 16 Jan 2025 20:27:07 +0000 Subject: [PATCH 2/2] fix: format --- .../OrganizationSettingsPageView.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx index e8da222e459dc..7dcf23bf4a4a6 100644 --- a/site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx +++ b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx @@ -1,5 +1,4 @@ import type { Interpolation, Theme } from "@emotion/react"; -import { Button } from "components/Button/Button"; import TextField from "@mui/material/TextField"; import { isApiValidationError } from "api/errors"; import type { @@ -7,6 +6,7 @@ import type { UpdateOrganizationRequest, } from "api/typesGenerated"; import { ErrorAlert } from "components/Alert/ErrorAlert"; +import { Button } from "components/Button/Button"; import { DeleteDialog } from "components/Dialogs/DeleteDialog/DeleteDialog"; import { FormFields, @@ -133,10 +133,7 @@ export const OrganizationSettingsPageView: FC< >
Deleting an organization is irreversible. -