Skip to content

fix: correctly display loading spinner #16167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 17, 2025
Merged

fix: correctly display loading spinner #16167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9106cb
fix: correctly display loading spinner
jaaydenh Jan 16, 2025
15769ce
fix: format
jaaydenh Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion site/src/components/Dialogs/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const DialogActionButtons: FC<DialogActionButtonsProps> = ({
data-testid="confirm-button"
type="submit"
>
{confirmLoading && <Spinner loading />}
<Spinner loading={confirmLoading} />
{confirmText}
</Button>
)}
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = (props) => {
Cancel
</Button>
<Button type="submit" disabled={isSubmitting}>
{isSubmitting && <Spinner />}
<Spinner loading={isSubmitting} />
{jobError ? "Retry" : "Save"}
</Button>
{logs && (
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/CreateTokenPage/CreateTokenForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
Cancel
</Button>
<Button type="submit" disabled={isCreating}>
{isCreating && <Spinner />}
<Spinner loading={isCreating} />
{creationFailed ? "Retry" : "Create token"}
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/CreateUserPage/CreateUserForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ export const CreateUserForm: FC<
Cancel
</Button>
<Button type="submit" disabled={isLoading}>
{isLoading && <Spinner />}
<Spinner loading={isLoading} />
Save
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
type="submit"
disabled={creatingWorkspace || !hasAllRequiredExternalAuth}
>
{creatingWorkspace && <Spinner />}
<Spinner loading={creatingWorkspace} />
Create workspace
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/GroupsPage/SettingsGroupPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const UpdateGroupForm: FC<UpdateGroupFormProps> = ({
</Button>

<Button type="submit" disabled={isLoading}>
{isLoading && <Spinner />}
<Spinner loading={isLoading} />
Save
</Button>
</FormFooter>
Expand Down
3 changes: 2 additions & 1 deletion site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export const CreateEditRolePageView: FC<CreateEditRolePageViewProps> = ({
form.handleSubmit();
}}
>
<Spinner loading={isLoading} />
{role !== undefined ? "Save" : "Create Role"}
</Button>
</div>
Expand Down Expand Up @@ -141,7 +142,7 @@ export const CreateEditRolePageView: FC<CreateEditRolePageViewProps> = ({
</Button>

<Button type="submit" disabled={isLoading}>
{isLoading && <Spinner />}
<Spinner loading={isLoading} />
{role ? "Save role" : "Create Role"}
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export const CreateGroupPageView: FC<CreateGroupPageViewProps> = ({
</Button>

<Button type="submit" disabled={isLoading}>
{isLoading && <Spinner />}
<Spinner loading={isLoading} />
Save
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const UpdateGroupForm: FC<UpdateGroupFormProps> = ({
</Button>

<Button type="submit" disabled={isLoading}>
{isLoading && <Spinner />}
<Spinner loading={isLoading} />
Save
</Button>
</FormFooter>
Expand Down
10 changes: 3 additions & 7 deletions site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { Interpolation, Theme } from "@emotion/react";
import Button from "@mui/material/Button";
import TextField from "@mui/material/TextField";
import { isApiValidationError } from "api/errors";
import type {
Organization,
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,
Expand Down Expand Up @@ -119,7 +119,7 @@ export const OrganizationSettingsPageView: FC<

<FormFooter>
<Button type="submit" disabled={form.isSubmitting}>
{form.isSubmitting && <Spinner />}
<Spinner loading={form.isSubmitting} />
Save
</Button>
</FormFooter>
Expand All @@ -133,11 +133,7 @@ export const OrganizationSettingsPageView: FC<
>
<div css={styles.dangerSettings}>
<span>Deleting an organization is irreversible.</span>
<Button
css={styles.dangerButton}
color="warning"
onClick={() => setIsDeleting(true)}
>
<Button variant="destructive" onClick={() => setIsDeleting(true)}>
Delete this organization
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
</Button>

<Button type="submit" disabled={isSubmitting}>
{isSubmitting && <Spinner />}
<Spinner loading={isSubmitting} />
Save
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
type="submit"
disabled={isSubmitting || !form.isValid || !form.dirty}
>
{isSubmitting && <Spinner />}
<Spinner loading={isSubmitting} />
Save
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export const TemplateVariablesForm: FC<TemplateVariablesForm> = ({
</Button>

<Button type="submit" disabled={isSubmitting}>
{isSubmitting && <Spinner />}
<Spinner loading={isSubmitting} />
Save
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export const WorkspaceParametersForm: FC<WorkspaceParameterFormProps> = ({
type="submit"
disabled={isSubmitting || disabled || !form.dirty}
>
{isSubmitting && <Spinner />}
<Spinner loading={isSubmitting} />
Submit and restart
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceScheduleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ export const WorkspaceScheduleForm: FC<WorkspaceScheduleFormProps> = ({
(!template.allow_user_autostart && !template.allow_user_autostop)
}
>
{isLoading && <Spinner />}
<Spinner loading={isLoading} />
Save
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export const WorkspaceSettingsForm: FC<WorkspaceSettingsFormProps> = ({
</Button>

<Button type="submit" disabled={form.isSubmitting}>
{form.isSubmitting && <Spinner />}
<Spinner loading={form.isSubmitting} />
Save
</Button>
</FormFooter>
Expand Down
Loading