Skip to content

chore: replace MUI LoadingButton with Button + Spinner - 2 #17817

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 1 commit into from
May 14, 2025
Merged

chore: replace MUI LoadingButton with Button + Spinner - 2 #17817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 14 additions & 17 deletions site/src/modules/resources/PortForwardButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import { type Interpolation, type Theme, useTheme } from "@emotion/react";
import LockIcon from "@mui/icons-material/Lock";
import LockOpenIcon from "@mui/icons-material/LockOpen";
import SensorsIcon from "@mui/icons-material/Sensors";
import LoadingButton from "@mui/lab/LoadingButton";
import Button from "@mui/material/Button";
import MUIButton from "@mui/material/Button";
import CircularProgress from "@mui/material/CircularProgress";
import FormControl from "@mui/material/FormControl";
import Link from "@mui/material/Link";
Expand All @@ -27,11 +26,13 @@ import {
type WorkspaceAgentPortShareProtocol,
WorkspaceAppSharingLevels,
} from "api/typesGenerated";
import { Button } from "components/Button/Button";
import {
HelpTooltipLink,
HelpTooltipText,
HelpTooltipTitle,
} from "components/HelpTooltip/HelpTooltip";
import { Spinner } from "components/Spinner/Spinner";
import {
Popover,
PopoverContent,
Expand Down Expand Up @@ -76,7 +77,7 @@ export const PortForwardButton: FC<PortForwardButtonProps> = (props) => {
return (
<Popover>
<PopoverTrigger>
<Button
<MUIButton
disabled={!portsQuery.data}
size="small"
variant="text"
Expand All @@ -95,7 +96,7 @@ export const PortForwardButton: FC<PortForwardButtonProps> = (props) => {
}
>
Open ports
</Button>
</MUIButton>
</PopoverTrigger>
<PopoverContent horizontal="right" classes={{ paper }}>
<PortForwardPopoverView
Expand Down Expand Up @@ -296,7 +297,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
required
css={styles.newPortInput}
/>
<Button
<MUIButton
type="submit"
size="small"
variant="text"
Expand All @@ -313,7 +314,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
color: theme.palette.text.primary,
}}
/>
</Button>
</MUIButton>
</form>
</Stack>
</Stack>
Expand Down Expand Up @@ -368,7 +369,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
alignItems="center"
>
{canSharePorts && (
<Button
<MUIButton
size="small"
variant="text"
onClick={async () => {
Expand All @@ -382,7 +383,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
}}
>
Share
</Button>
</MUIButton>
)}
</Stack>
</Stack>
Expand Down Expand Up @@ -482,7 +483,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
)}
</Select>
</FormControl>
<Button
<MUIButton
size="small"
variant="text"
css={styles.deleteButton}
Expand All @@ -501,7 +502,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
color: theme.palette.text.primary,
}}
/>
</Button>
</MUIButton>
</Stack>
</Stack>
);
Expand Down Expand Up @@ -550,14 +551,10 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
disabledPublicMenuItem
)}
</TextField>
<LoadingButton
variant="contained"
type="submit"
loading={isSubmitting}
disabled={!form.isValid}
>
<Button type="submit" disabled={!form.isValid || isSubmitting}>
<Spinner loading={isSubmitting} />
Share Port
</LoadingButton>
</Button>
</Stack>
</form>
</div>
Expand Down
29 changes: 16 additions & 13 deletions site/src/pages/HealthPage/DismissWarningButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import NotificationsOffOutlined from "@mui/icons-material/NotificationsOffOutlined";
import NotificationOutlined from "@mui/icons-material/NotificationsOutlined";
import LoadingButton from "@mui/lab/LoadingButton";
import Skeleton from "@mui/material/Skeleton";
import { healthSettings, updateHealthSettings } from "api/queries/debug";
import type { HealthSection } from "api/typesGenerated";
import { Button } from "components/Button/Button";
import { displaySuccess } from "components/GlobalSnackbar/utils";
import { Spinner } from "components/Spinner/Spinner";
import { useMutation, useQuery, useQueryClient } from "react-query";

export const DismissWarningButton = (props: { healthcheck: HealthSection }) => {
Expand Down Expand Up @@ -33,11 +34,9 @@ export const DismissWarningButton = (props: { healthcheck: HealthSection }) => {

if (isDismissed) {
return (
<LoadingButton
disabled={healthSettingsQuery.isLoading}
loading={enableMutation.isLoading}
loadingPosition="start"
startIcon={<NotificationsOffOutlined />}
<Button
disabled={healthSettingsQuery.isLoading || enableMutation.isLoading}
variant="outline"
onClick={async () => {
const updatedSettings = dismissed_healthchecks.filter(
(dismissedHealthcheck) =>
Expand All @@ -49,17 +48,18 @@ export const DismissWarningButton = (props: { healthcheck: HealthSection }) => {
displaySuccess("Warnings enabled successfully!");
}}
>
<Spinner loading={enableMutation.isLoading}>
<NotificationsOffOutlined />
</Spinner>
Enable warnings
</LoadingButton>
</Button>
);
}

return (
<LoadingButton
disabled={healthSettingsQuery.isLoading}
loading={dismissMutation.isLoading}
loadingPosition="start"
startIcon={<NotificationOutlined />}
<Button
disabled={healthSettingsQuery.isLoading || dismissMutation.isLoading}
variant="outline"
onClick={async () => {
const updatedSettings = [...dismissed_healthchecks, props.healthcheck];
await dismissMutation.mutateAsync({
Expand All @@ -68,7 +68,10 @@ export const DismissWarningButton = (props: { healthcheck: HealthSection }) => {
displaySuccess("Warnings dismissed successfully!");
}}
>
<Spinner loading={dismissMutation.isLoading}>
<NotificationOutlined />
</Spinner>
Dismiss warnings
</LoadingButton>
</Button>
);
};
14 changes: 8 additions & 6 deletions site/src/pages/LoginPage/PasswordSignInForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import LoadingButton from "@mui/lab/LoadingButton";
import Link from "@mui/material/Link";
import TextField from "@mui/material/TextField";
import { Button } from "components/Button/Button";
import { Spinner } from "components/Spinner/Spinner";
import { Stack } from "components/Stack/Stack";
import { useFormik } from "formik";
import type { FC } from "react";
Expand Down Expand Up @@ -59,14 +60,15 @@ export const PasswordSignInForm: FC<PasswordSignInFormProps> = ({
label={Language.passwordLabel}
type="password"
/>
<LoadingButton
size="xlarge"
loading={isSigningIn}
fullWidth
<Button
size="lg"
disabled={isSigningIn}
className="w-full"
type="submit"
>
<Spinner loading={isSigningIn} />
{Language.passwordSignIn}
</LoadingButton>
</Button>
<Link
component={RouterLink}
to="/reset-password"
Expand Down
15 changes: 8 additions & 7 deletions site/src/pages/OrganizationSettingsPage/OrganizationMembersPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import PersonAdd from "@mui/icons-material/PersonAdd";
import LoadingButton from "@mui/lab/LoadingButton";
import { getErrorMessage } from "api/errors";
import type {
Group,
Expand All @@ -24,6 +23,7 @@ import {
SettingsHeader,
SettingsHeaderTitle,
} from "components/SettingsHeader/SettingsHeader";
import { Spinner } from "components/Spinner/Spinner";
import { Stack } from "components/Stack/Stack";
import {
Table,
Expand Down Expand Up @@ -237,15 +237,16 @@ const AddOrganizationMember: FC<AddOrganizationMemberProps> = ({
}}
/>

<LoadingButton
loadingPosition="start"
disabled={!selectedUser}
<Button
disabled={!selectedUser || isLoading}
type="submit"
startIcon={<PersonAdd />}
loading={isLoading}
variant="outline"
>
<Spinner loading={isLoading}>
<PersonAdd />
</Spinner>
Add user
</LoadingButton>
</Button>
</Stack>
</form>
);
Expand Down
21 changes: 11 additions & 10 deletions site/src/pages/ResetPasswordPage/ChangePasswordPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import type { Interpolation, Theme } from "@emotion/react";
import LoadingButton from "@mui/lab/LoadingButton";
import Button from "@mui/material/Button";
import MUIButton from "@mui/material/Button";
import TextField from "@mui/material/TextField";
import { isApiValidationError } from "api/errors";
import { changePasswordWithOTP } from "api/queries/users";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { Button } from "components/Button/Button";
import { CustomLogo } from "components/CustomLogo/CustomLogo";
import { displaySuccess } from "components/GlobalSnackbar/utils";
import { Spinner } from "components/Spinner/Spinner";
import { Stack } from "components/Stack/Stack";
import { useFormik } from "formik";
import type { FC } from "react";
Expand Down Expand Up @@ -115,24 +116,24 @@ const ChangePasswordPage: FC<ChangePasswordChangeProps> = ({ redirect }) => {
/>

<Stack spacing={1}>
<LoadingButton
loading={form.isSubmitting}
<Button
disabled={form.isSubmitting}
type="submit"
size="large"
fullWidth
variant="contained"
size="lg"
className="w-full"
>
<Spinner loading={form.isSubmitting} />
Reset password
</LoadingButton>
<Button
</Button>
<MUIButton
component={RouterLink}
size="large"
fullWidth
variant="text"
to="/login"
>
Back to login
</Button>
</MUIButton>
</Stack>
</Stack>
</fieldset>
Expand Down
Loading