Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0697308

Browse files
authored
fix: correctly display loading spinner (#16167)
Update the usages of the new spinner component to correctly set theloading prop
1 parent7f46e3b commit0697308

File tree

16 files changed

+19
-22
lines changed

16 files changed

+19
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
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&&<Spinnerloading/>}
51+
<Spinnerloading={confirmLoading}/>
5252
{confirmText}
5353
</Button>
5454
)}

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

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

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

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

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

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

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

Lines changed: 1 addition & 1 deletion
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+
<Spinnerloading={creatingWorkspace}/>
326326
Create workspace
327327
</Button>
328328
</FormFooter>

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

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

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

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

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

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

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

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

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

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

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

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

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
importtype{Interpolation,Theme}from"@emotion/react";
2-
importButtonfrom"@mui/material/Button";
32
importTextFieldfrom"@mui/material/TextField";
43
import{isApiValidationError}from"api/errors";
54
importtype{
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
<Buttontype="submit"disabled={form.isSubmitting}>
122-
{form.isSubmitting&&<Spinner/>}
122+
<Spinnerloading={form.isSubmitting}/>
123123
Save
124124
</Button>
125125
</FormFooter>
@@ -133,11 +133,7 @@ export const OrganizationSettingsPageView: FC<
133133
>
134134
<divcss={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+
<Buttonvariant="destructive"onClick={()=>setIsDeleting(true)}>
141137
Delete this organization
142138
</Button>
143139
</div>

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

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

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

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

Lines changed: 1 addition & 1 deletion
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+
<Spinnerloading={isSubmitting}/>
643643
Save
644644
</Button>
645645
</FormFooter>

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

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

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

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

Lines changed: 1 addition & 1 deletion
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+
<Spinnerloading={isSubmitting}/>
169169
Submit and restart
170170
</Button>
171171
</FormFooter>

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

Lines changed: 1 addition & 1 deletion
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+
<Spinnerloading={isLoading}/>
460460
Save
461461
</Button>
462462
</FormFooter>

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

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

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp