Skip to content

chore(site): replace custom LoadingButton from the one in MUI #10351

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 9 commits into from
Oct 20, 2023
Merged

chore(site): replace custom LoadingButton from the one in MUI #10351

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f9ecaff
Use MUILoading button on Dialog
BrunoQuaresma Oct 19, 2023
016407c
Replace loading button on form footer
BrunoQuaresma Oct 19, 2023
a9ef731
Replace on external auth
BrunoQuaresma Oct 19, 2023
99854ff
Replace on licenses settings page
BrunoQuaresma Oct 19, 2023
9712446
Replace on Group page
BrunoQuaresma Oct 19, 2023
1abc401
Set default variant and color for loading button to match the regular…
BrunoQuaresma Oct 19, 2023
6f883e3
Replace on password signin form
BrunoQuaresma Oct 19, 2023
9e872f5
Replace in more components
BrunoQuaresma Oct 19, 2023
8cdbcdd
Remove custom loading button component
BrunoQuaresma Oct 19, 2023
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
Prev Previous commit
Next Next commit
Replace on Group page
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Oct 19, 2023
commit 97124462cc9fe5dec44af902dc0b0ba4fddfd176
3 changes: 2 additions & 1 deletion site/src/pages/GroupsPage/GroupPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { AvatarData } from "components/AvatarData/AvatarData";
import { DeleteDialog } from "components/Dialogs/DeleteDialog/DeleteDialog";
import { EmptyState } from "components/EmptyState/EmptyState";
import { Loader } from "components/Loader/Loader";
import { LoadingButton } from "components/LoadingButton/LoadingButton";
import { Margins } from "components/Margins/Margins";
import {
PageHeader,
Expand Down Expand Up @@ -44,6 +43,7 @@ import {
} from "api/queries/groups";
import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
import { getErrorMessage } from "api/errors";
import LoadingButton from "@mui/lab/LoadingButton";

export const GroupPage: FC = () => {
const { groupId } = useParams() as { groupId: string };
Expand Down Expand Up @@ -235,6 +235,7 @@ const AddGroupMember: React.FC<{
/>

<LoadingButton
loadingPosition="start"
disabled={!selectedUser}
type="submit"
startIcon={<PersonAdd />}
Expand Down