Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0697308

Browse files
jaaydenhjaaydenh
authored
fix: correctly display loading spinner (#16167)
Update the usages of the new spinner component to correctly set the loading prop
1 parent 7f46e3b commit 0697308

File tree

16 files changed

+19
-22
lines changed

16 files changed

+19
-22
lines changed

‎site/src/components/Dialogs/Dialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const DialogActionButtons: FC<DialogActionButtonsProps> = ({
4848
data-testid="confirm-button"
4949
type="submit"
5050
>
51-
{confirmLoading && <Spinner loading />}
51+
<Spinner loading={confirmLoading} />
5252
{confirmText}
5353
</Button>
5454
)}

‎site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = (props) => {
357357
Cancel
358358
</Button>
359359
<Button type="submit" disabled={isSubmitting}>
360-
{isSubmitting && <Spinner />}
360+
<Spinner loading={isSubmitting} />
361361
{jobError ? "Retry" : "Save"}
362362
</Button>
363363
{logs && (

‎site/src/pages/CreateTokenPage/CreateTokenForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
152152
Cancel
153153
</Button>
154154
<Button type="submit" disabled={isCreating}>
155-
{isCreating && <Spinner />}
155+
<Spinner loading={isCreating} />
156156
{creationFailed ? "Retry" : "Create token"}
157157
</Button>
158158
</FormFooter>

‎site/src/pages/CreateUserPage/CreateUserForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ export const CreateUserForm: FC<
210210
Cancel
211211
</Button>
212212
<Button type="submit" disabled={isLoading}>
213-
{isLoading && <Spinner />}
213+
<Spinner loading={isLoading} />
214214
Save
215215
</Button>
216216
</FormFooter>

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
322322
type="submit"
323323
disabled={creatingWorkspace || !hasAllRequiredExternalAuth}
324324
>
325-
{creatingWorkspace && <Spinner />}
325+
<Spinner loading={creatingWorkspace} />
326326
Create workspace
327327
</Button>
328328
</FormFooter>

‎site/src/pages/GroupsPage/SettingsGroupPageView.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const UpdateGroupForm: FC<UpdateGroupFormProps> = ({
113113
</Button>
114114

115115
<Button type="submit" disabled={isLoading}>
116-
{isLoading && <Spinner />}
116+
<Spinner loading={isLoading} />
117117
Save
118118
</Button>
119119
</FormFooter>

‎site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ export const CreateEditRolePageView: FC<CreateEditRolePageViewProps> = ({
9999
form.handleSubmit();
100100
}}
101101
>
102+
<Spinner loading={isLoading} />
102103
{role !== undefined ? "Save" : "Create Role"}
103104
</Button>
104105
</div>
@@ -141,7 +142,7 @@ export const CreateEditRolePageView: FC<CreateEditRolePageViewProps> = ({
141142
</Button>
142143

143144
<Button type="submit" disabled={isLoading}>
144-
{isLoading && <Spinner />}
145+
<Spinner loading={isLoading} />
145146
{role ? "Save role" : "Create Role"}
146147
</Button>
147148
</FormFooter>

‎site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPageView.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export const CreateGroupPageView: FC<CreateGroupPageViewProps> = ({
100100
</Button>
101101

102102
<Button type="submit" disabled={isLoading}>
103-
{isLoading && <Spinner />}
103+
<Spinner loading={isLoading} />
104104
Save
105105
</Button>
106106
</FormFooter>

‎site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const UpdateGroupForm: FC<UpdateGroupFormProps> = ({
124124
</Button>
125125

126126
<Button type="submit" disabled={isLoading}>
127-
{isLoading && <Spinner />}
127+
<Spinner loading={isLoading} />
128128
Save
129129
</Button>
130130
</FormFooter>

‎site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import type { Interpolation, Theme } from "@emotion/react";
2-
import Button from "@mui/material/Button";
32
import TextField from "@mui/material/TextField";
43
import { isApiValidationError } from "api/errors";
54
import type {
65
Organization,
76
UpdateOrganizationRequest,
87
} from "api/typesGenerated";
98
import { ErrorAlert } from "components/Alert/ErrorAlert";
9+
import { Button } from "components/Button/Button";
1010
import { DeleteDialog } from "components/Dialogs/DeleteDialog/DeleteDialog";
1111
import {
1212
FormFields,
@@ -119,7 +119,7 @@ export const OrganizationSettingsPageView: FC<
119119

120120
<FormFooter>
121121
<Button type="submit" disabled={form.isSubmitting}>
122-
{form.isSubmitting && <Spinner />}
122+
<Spinner loading={form.isSubmitting} />
123123
Save
124124
</Button>
125125
</FormFooter>
@@ -133,11 +133,7 @@ export const OrganizationSettingsPageView: FC<
133133
>
134134
<div css={styles.dangerSettings}>
135135
<span>Deleting an organization is irreversible.</span>
136-
<Button
137-
css={styles.dangerButton}
138-
color="warning"
139-
onClick={() => setIsDeleting(true)}
140-
>
136+
<Button variant="destructive" onClick={() => setIsDeleting(true)}>
141137
Delete this organization
142138
</Button>
143139
</div>

‎site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
298298
</Button>
299299

300300
<Button type="submit" disabled={isSubmitting}>
301-
{isSubmitting && <Spinner />}
301+
<Spinner loading={isSubmitting} />
302302
Save
303303
</Button>
304304
</FormFooter>

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
639639
type="submit"
640640
disabled={isSubmitting || !form.isValid || !form.dirty}
641641
>
642-
{isSubmitting && <Spinner />}
642+
<Spinner loading={isSubmitting} />
643643
Save
644644
</Button>
645645
</FormFooter>

‎site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export const TemplateVariablesForm: FC<TemplateVariablesForm> = ({
114114
</Button>
115115

116116
<Button type="submit" disabled={isSubmitting}>
117-
{isSubmitting && <Spinner />}
117+
<Spinner loading={isSubmitting} />
118118
Save
119119
</Button>
120120
</FormFooter>

‎site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export const WorkspaceParametersForm: FC<WorkspaceParameterFormProps> = ({
165165
type="submit"
166166
disabled={isSubmitting || disabled || !form.dirty}
167167
>
168-
{isSubmitting && <Spinner />}
168+
<Spinner loading={isSubmitting} />
169169
Submit and restart
170170
</Button>
171171
</FormFooter>

‎site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceScheduleForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ export const WorkspaceScheduleForm: FC<WorkspaceScheduleFormProps> = ({
456456
(!template.allow_user_autostart && !template.allow_user_autostop)
457457
}
458458
>
459-
{isLoading && <Spinner />}
459+
<Spinner loading={isLoading} />
460460
Save
461461
</Button>
462462
</FormFooter>

‎site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export const WorkspaceSettingsForm: FC<WorkspaceSettingsFormProps> = ({
123123
</Button>
124124

125125
<Button type="submit" disabled={form.isSubmitting}>
126-
{form.isSubmitting && <Spinner />}
126+
<Spinner loading={form.isSubmitting} />
127127
Save
128128
</Button>
129129
</FormFooter>

0 commit comments

Comments
 (0)