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

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.

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

Already on GitHub?Sign in to your account

Merged
jaaydenh merged 2 commits intomainfromjaaydenh/spinner-fix
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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 deletionsite/src/components/Dialogs/Dialog.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = (props) => {
Cancel
</Button>
<Button type="submit" disabled={isSubmitting}>
{isSubmitting &&<Spinner/>}
<Spinnerloading={isSubmitting} />
{jobError ? "Retry" : "Save"}
</Button>
{logs && (
Expand Down
2 changes: 1 addition & 1 deletionsite/src/pages/CreateTokenPage/CreateTokenForm.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
Cancel
</Button>
<Button type="submit" disabled={isCreating}>
{isCreating &&<Spinner/>}
<Spinnerloading={isCreating} />
{creationFailed ? "Retry" : "Create token"}
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletionsite/src/pages/CreateUserPage/CreateUserForm.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ export const CreateUserForm: FC<
Cancel
</Button>
<Button type="submit" disabled={isLoading}>
{isLoading &&<Spinner/>}
<Spinnerloading={isLoading} />
Save
</Button>
</FormFooter>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -322,7 +322,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
type="submit"
disabled={creatingWorkspace || !hasAllRequiredExternalAuth}
>
{creatingWorkspace &&<Spinner/>}
<Spinnerloading={creatingWorkspace} />
Create workspace
</Button>
</FormFooter>
Expand Down
2 changes: 1 addition & 1 deletionsite/src/pages/GroupsPage/SettingsGroupPageView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ const UpdateGroupForm: FC<UpdateGroupFormProps> = ({
</Button>

<Button type="submit" disabled={isLoading}>
{isLoading &&<Spinner/>}
<Spinnerloading={isLoading} />
Save
</Button>
</FormFooter>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand Up@@ -141,7 +142,7 @@ export const CreateEditRolePageView: FC<CreateEditRolePageViewProps> = ({
</Button>

<Button type="submit" disabled={isLoading}>
{isLoading &&<Spinner/>}
<Spinnerloading={isLoading} />
{role ? "Save role" : "Create Role"}
</Button>
</FormFooter>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ export const CreateGroupPageView: FC<CreateGroupPageViewProps> = ({
</Button>

<Button type="submit" disabled={isLoading}>
{isLoading &&<Spinner/>}
<Spinnerloading={isLoading} />
Save
</Button>
</FormFooter>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,7 +124,7 @@ const UpdateGroupForm: FC<UpdateGroupFormProps> = ({
</Button>

<Button type="submit" disabled={isLoading}>
{isLoading &&<Spinner/>}
<Spinnerloading={isLoading} />
Save
</Button>
</FormFooter>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
</Button>

<Button type="submit" disabled={isSubmitting}>
{isSubmitting &&<Spinner/>}
<Spinnerloading={isSubmitting} />
Save
</Button>
</FormFooter>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -639,7 +639,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
type="submit"
disabled={isSubmitting || !form.isValid || !form.dirty}
>
{isSubmitting &&<Spinner/>}
<Spinnerloading={isSubmitting} />
Save
</Button>
</FormFooter>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ export const TemplateVariablesForm: FC<TemplateVariablesForm> = ({
</Button>

<Button type="submit" disabled={isSubmitting}>
{isSubmitting &&<Spinner/>}
<Spinnerloading={isSubmitting} />
Save
</Button>
</FormFooter>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,7 +165,7 @@ export const WorkspaceParametersForm: FC<WorkspaceParameterFormProps> = ({
type="submit"
disabled={isSubmitting || disabled || !form.dirty}
>
{isSubmitting &&<Spinner/>}
<Spinnerloading={isSubmitting} />
Submit and restart
</Button>
</FormFooter>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -456,7 +456,7 @@ export const WorkspaceScheduleForm: FC<WorkspaceScheduleFormProps> = ({
(!template.allow_user_autostart && !template.allow_user_autostop)
}
>
{isLoading &&<Spinner/>}
<Spinnerloading={isLoading} />
Save
</Button>
</FormFooter>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff 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
[8]ページ先頭
©2009-2025 Movatter.jp