Skip to content

refactor: use TableEmpty in user settings #12389

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
Mar 4, 2024
Merged

refactor: use TableEmpty in user settings #12389

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
13 changes: 4 additions & 9 deletions site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import TableCell from "@mui/material/TableCell";
import TableContainer from "@mui/material/TableContainer";
import TableHead from "@mui/material/TableHead";
import TableRow from "@mui/material/TableRow";
import LoadingButton from "@mui/lab/LoadingButton";
import visuallyHidden from "@mui/utils/visuallyHidden";
import { type FC, useState, useCallback, useEffect } from "react";
import { useQuery } from "react-query";
import { externalAuthProvider } from "api/queries/externalAuth";
Expand All @@ -25,8 +27,7 @@ import {
ThreeDotsButton,
} from "components/MoreMenu/MoreMenu";
import { ExternalAuthPollingState } from "pages/CreateWorkspacePage/CreateWorkspacePage";
import LoadingButton from "@mui/lab/LoadingButton";
import visuallyHidden from "@mui/utils/visuallyHidden";
import { TableEmpty } from "components/TableEmpty/TableEmpty";

export type ExternalAuthPageViewProps = {
isLoading: boolean;
Expand Down Expand Up @@ -71,13 +72,7 @@ export const ExternalAuthPageView: FC<ExternalAuthPageViewProps> = ({
</TableHead>
<TableBody>
{((auths.providers === null || auths.providers?.length === 0) && (
<TableRow>
<TableCell colSpan={999}>
<div css={{ textAlign: "center" }}>
No providers have been configured!
</div>
</TableCell>
</TableRow>
<TableEmpty message="No providers have been configured" />
)) ||
auths.providers?.map((app: ExternalAuthLinkProvider) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/UserSettingsPage/TokensPage/TokensPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const TokensPageView: FC<TokensPageViewProps> = ({
<Cond condition={isLoading}>
<TableLoader />
</Cond>
<Cond condition={hasLoaded && tokens?.length === 0}>
<Cond condition={hasLoaded && (!tokens || tokens.length === 0)}>
<TableEmpty message="No tokens found" />
</Cond>
<Cond>
Expand Down