Skip to content

chore: add refresh token and error to user's external auth page #13380

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 7 commits into from
May 28, 2024
Merged

chore: add refresh token and error to user's external auth page #13380

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
788a7b2
chore: add story for failed refresh error
Emyrk May 28, 2024
4b2558b
add terrible ui element to show the validate error
Emyrk May 28, 2024
fe72d04
chore: add refresh icon to tokens that can refresh
Emyrk May 28, 2024
855e8b8
Add styled error
Emyrk May 28, 2024
5793eec
Fixup styling of the badge
Emyrk May 28, 2024
b39bfa4
add padding instead of fixed sizes
Emyrk May 28, 2024
9639a94
remove import
Emyrk May 28, 2024
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
add padding instead of fixed sizes
  • Loading branch information
@Emyrk
Emyrk committed May 28, 2024
commit b39bfa4709bde7bf00645d95feae0e85583d4d16
16 changes: 6 additions & 10 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 @@ -11,7 +11,7 @@
import TableHead from "@mui/material/TableHead";
import TableRow from "@mui/material/TableRow";
import Tooltip from "@mui/material/Tooltip";
import visuallyHidden from "@mui/utils/visuallyHidden";

Check failure on line 14 in site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx

View workflow job for this annotation

GitHub Actions / fmt 

'margin' is defined but never used. Allowed unused vars must match /^_/u

Check failure on line 14 in site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx

View workflow job for this annotation

GitHub Actions / fmt 

'minWidth' is defined but never used. Allowed unused vars must match /^_/u

Check failure on line 14 in site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx

View workflow job for this annotation

GitHub Actions / fmt 

'padding' is defined but never used. Allowed unused vars must match /^_/u

Check failure on line 14 in site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx

View workflow job for this annotation

GitHub Actions / fmt 

'width' is defined but never used. Allowed unused vars must match /^_/u
import { type FC, useState, useCallback, useEffect } from "react";
import { useQuery } from "react-query";
import { externalAuthProvider } from "api/queries/externalAuth";
Expand All @@ -33,7 +33,7 @@
} from "components/MoreMenu/MoreMenu";
import { TableEmpty } from "components/TableEmpty/TableEmpty";
import type { ExternalAuthPollingState } from "pages/CreateWorkspacePage/CreateWorkspacePage";
import { minWidth, padding, width } from "@mui/system";
import { margin, minWidth, padding, width } from "@mui/system";

export type ExternalAuthPageViewProps = {
isLoading: boolean;
Expand Down Expand Up @@ -119,17 +119,13 @@
borderColor: `${theme.palette.secondary.main}`,
borderWidth: "thin",

// The size of the badge content should be small, and should perfectly encapsulate the icon.
// By default, the style has padding and a fixed size, which is too large.
// Remove all default padding, and base the size off of the icon size. All based around text
// sizing.
// Ideally, we could use padding to accomplis this, but you have to override the default 'height' and
// 'width' properties.
padding: "0px",
// Override the default minimum sizes, as they are larger than what we want.
minHeight: "0px",
minWidth: "0px",
height: "1.4em",
width: "1.4em",
// Override the default "height", which is usually set to some constant value.
height: "auto",
// Padding adds some room for the icon to live in.
padding: "0.1em",
},
}));

Expand Down
Loading