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

Commitb6d72c8

Browse files
chore: replace MUI LoadingButton - 4 (#17834)
- ScheduleForm- SecurityForm- HistorySidebar- WorkspacesPageView
1 parent35a04c7 commitb6d72c8

File tree

4 files changed

+29
-34
lines changed

4 files changed

+29
-34
lines changed

‎site/src/pages/UserSettingsPage/SchedulePage/ScheduleForm.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
importLoadingButtonfrom"@mui/lab/LoadingButton";
21
importMenuItemfrom"@mui/material/MenuItem";
32
importTextFieldfrom"@mui/material/TextField";
43
importtype{
@@ -7,7 +6,9 @@ import type {
76
}from"api/typesGenerated";
87
import{Alert}from"components/Alert/Alert";
98
import{ErrorAlert}from"components/Alert/ErrorAlert";
9+
import{Button}from"components/Button/Button";
1010
import{Form,FormFields}from"components/Form/Form";
11+
import{Spinner}from"components/Spinner/Spinner";
1112
import{Stack}from"components/Stack/Stack";
1213
import{typeFormikContextType,useFormik}from"formik";
1314
import{typeFC,useEffect,useState}from"react";
@@ -137,14 +138,13 @@ export const ScheduleForm: FC<ScheduleFormProps> = ({
137138
/>
138139

139140
<div>
140-
<LoadingButton
141-
loading={isLoading}
141+
<Button
142142
disabled={isLoading||!initialValues.user_can_set}
143143
type="submit"
144-
variant="contained"
145144
>
145+
<Spinnerloading={isLoading}/>
146146
Update schedule
147-
</LoadingButton>
147+
</Button>
148148
</div>
149149
</FormFields>
150150
</Form>

‎site/src/pages/UserSettingsPage/SecurityPage/SecurityForm.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
importLoadingButtonfrom"@mui/lab/LoadingButton";
21
importTextFieldfrom"@mui/material/TextField";
32
import{Alert}from"components/Alert/Alert";
43
import{ErrorAlert}from"components/Alert/ErrorAlert";
4+
import{Button}from"components/Button/Button";
55
import{Form,FormFields}from"components/Form/Form";
66
import{PasswordField}from"components/PasswordField/PasswordField";
7+
import{Spinner}from"components/Spinner/Spinner";
78
import{typeFormikContextType,useFormik}from"formik";
89
importtype{FC}from"react";
910
import{getFormHelpers}from"utils/formUtils";
@@ -98,13 +99,10 @@ export const SecurityForm: FC<SecurityFormProps> = ({
9899
/>
99100

100101
<div>
101-
<LoadingButton
102-
loading={isLoading}
103-
type="submit"
104-
variant="contained"
105-
>
102+
<Buttondisabled={isLoading}type="submit">
103+
<Spinnerloading={isLoading}/>
106104
{Language.updatePassword}
107-
</LoadingButton>
105+
</Button>
108106
</div>
109107
</FormFields>
110108
</Form>

‎site/src/pages/WorkspacePage/HistorySidebar.tsx

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
importArrowDownwardOutlinedfrom"@mui/icons-material/ArrowDownwardOutlined";
2-
importLoadingButtonfrom"@mui/lab/LoadingButton";
32
import{infiniteWorkspaceBuilds}from"api/queries/workspaceBuilds";
43
importtype{Workspace}from"api/typesGenerated";
4+
import{Button}from"components/Button/Button";
55
import{
66
Sidebar,
77
SidebarCaption,
88
SidebarItem,
99
SidebarLink,
1010
}from"components/FullPageLayout/Sidebar";
11+
import{Spinner}from"components/Spinner/Spinner";
1112
import{
1213
WorkspaceBuildData,
1314
WorkspaceBuildDataSkeleton,
@@ -46,22 +47,17 @@ export const HistorySidebar: FC<HistorySidebarProps> = ({ workspace }) => {
4647
))}
4748
{buildsQuery.hasNextPage&&(
4849
<divcss={{padding:16}}>
49-
<LoadingButton
50-
fullWidth
50+
<Button
5151
onClick={()=>buildsQuery.fetchNextPage()}
52-
loading={buildsQuery.isFetchingNextPage}
53-
loadingPosition="start"
54-
variant="outlined"
55-
color="neutral"
56-
startIcon={<ArrowDownwardOutlined/>}
57-
css={{
58-
display:"inline-flex",
59-
borderRadius:"9999px",
60-
fontSize:13,
61-
}}
52+
disabled={buildsQuery.isFetchingNextPage}
53+
variant="outline"
54+
className="w-full"
6255
>
56+
<Spinnerloading={buildsQuery.isFetchingNextPage}>
57+
<ArrowDownwardOutlined/>
58+
</Spinner>
6359
Show more builds
64-
</LoadingButton>
60+
</Button>
6561
</div>
6662
)}
6763
</Sidebar>

‎site/src/pages/WorkspacesPage/WorkspacesPageView.tsx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
importCloudQueuefrom"@mui/icons-material/CloudQueue";
2-
importLoadingButtonfrom"@mui/lab/LoadingButton";
32
import{hasError,isApiValidationError}from"api/errors";
43
importtype{Template,Workspace}from"api/typesGenerated";
54
import{ErrorAlert}from"components/Alert/ErrorAlert";
@@ -16,6 +15,7 @@ import { Margins } from "components/Margins/Margins";
1615
import{PageHeader,PageHeaderTitle}from"components/PageHeader/PageHeader";
1716
import{PaginationHeader}from"components/PaginationWidget/PaginationHeader";
1817
import{PaginationWidgetBase}from"components/PaginationWidget/PaginationWidgetBase";
18+
import{Spinner}from"components/Spinner/Spinner";
1919
import{Stack}from"components/Stack/Stack";
2020
import{TableToolbar}from"components/TableToolbar/TableToolbar";
2121
import{ChevronDownIcon,PlayIcon,SquareIcon,TrashIcon}from"lucide-react";
@@ -135,16 +135,17 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({
135135

136136
<DropdownMenu>
137137
<DropdownMenuTriggerasChild>
138-
<LoadingButton
139-
loading={isRunningBatchAction}
140-
loadingPosition="end"
141-
variant="text"
142-
size="small"
138+
<Button
139+
disabled={isRunningBatchAction}
140+
variant="outline"
141+
size="sm"
143142
css={{borderRadius:9999,marginLeft:"auto"}}
144-
endIcon={<ChevronDownIconclassName="size-4"/>}
145143
>
146144
Bulk actions
147-
</LoadingButton>
145+
<Spinnerloading={isRunningBatchAction}>
146+
<ChevronDownIconclassName="size-4"/>
147+
</Spinner>
148+
</Button>
148149
</DropdownMenuTrigger>
149150
<DropdownMenuContentalign="end">
150151
<DropdownMenuItem

0 commit comments

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