Skip to content

feat: create idp sync page skeleton #14543

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 14 commits into from
Sep 6, 2024
+550 −68
Merged

feat: create idp sync page skeleton #14543

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b2c3e11
feat: initial commit for idp skeleton page
jaaydenh Aug 30, 2024
2de6bfc
feat: add optional tooltip icon to settings header
jaaydenh Sep 1, 2024
8298346
feat: add help tooltip
jaaydenh Sep 1, 2024
a75ad85
feat: add mock data and update pageview for mock data
jaaydenh Sep 2, 2024
492ca5f
feat: initial stories
jaaydenh Sep 2, 2024
b73ad32
feat: error circle
jaaydenh Sep 2, 2024
6e39fcf
feat: cleanup
jaaydenh Sep 2, 2024
f2281e9
feat: update StatusIndicator for outlined variant
jaaydenh Sep 3, 2024
b83118f
feat: use StatusIndicator instead of Circle
jaaydenh Sep 3, 2024
2c2f677
chore: cleanup
jaaydenh Sep 3, 2024
1eedda8
fix: remove ternaries in css
jaaydenh Sep 4, 2024
3d1fcdb
fix: updates for PR review comments
jaaydenh Sep 4, 2024
2059be8
chore: add story for compact empty state
jaaydenh Sep 5, 2024
1523025
feat: extract IdpField and improve field spacing
jaaydenh Sep 5, 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
feat: use StatusIndicator instead of Circle
  • Loading branch information
@jaaydenh
jaaydenh committed Sep 5, 2024
commit b83118f3f9b11cb1132d1ec239a4004433451d1a
25 changes: 3 additions & 22 deletions site/src/pages/ManagementSettingsPage/IdpSyncPage/IdpSyncPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { ChooseOne, Cond } from "components/Conditionals/ChooseOne";
import { EmptyState } from "components/EmptyState/EmptyState";
import { Paywall } from "components/Paywall/Paywall";
import { Stack } from "components/Stack/Stack";
import { StatusIndicator } from "components/StatusIndicator/StatusIndicator";
import {
TableLoaderSkeleton,
TableRowSkeleton,
Expand All @@ -25,26 +26,6 @@ export type IdpSyncPageViewProps = {
oidcConfig: OIDCConfig | undefined;
};

type CircleProps = {
color: string;
variant?: "solid" | "outlined";
};

const Circle: FC<CircleProps> = ({ color, variant = "solid" }) => {
return (
<div
aria-hidden
css={{
width: 8,
height: 8,
backgroundColor: variant === "solid" ? color : undefined,
border: variant === "outlined" ? `1px solid ${color}` : undefined,
borderRadius: 9999,
}}
/>
);
};

export const IdpSyncPageView: FC<IdpSyncPageViewProps> = ({ oidcConfig }) => {
const theme = useTheme();
const {
Expand Down Expand Up @@ -79,7 +60,7 @@ export const IdpSyncPageView: FC<IdpSyncPageViewProps> = ({ oidcConfig }) => {
spacing={1}
alignItems="center"
>
<Circle color={theme.roles.error.fill.solid} />
<StatusIndicator color="error" />
<p>disabled</p>
</Stack>
)}
Expand All @@ -102,7 +83,7 @@ export const IdpSyncPageView: FC<IdpSyncPageViewProps> = ({ oidcConfig }) => {
spacing={1}
alignItems="center"
>
<Circle color={theme.roles.error.fill.solid} />
<StatusIndicator color="error" />
<p>disabled</p>
</Stack>
)}
Expand Down
34 changes: 6 additions & 28 deletions site/src/pages/WorkspacesPage/LastUsed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,12 @@
import { useTheme } from "@emotion/react";
import { Stack } from "components/Stack/Stack";
import { StatusIndicator } from "components/StatusIndicator/StatusIndicator";
import dayjs from "dayjs";
import relativeTime from "dayjs/plugin/relativeTime";
import { useTime } from "hooks/useTime";
import type { FC } from "react";

dayjs.extend(relativeTime);

type CircleProps = {
color: string;
variant?: "solid" | "outlined";
};

const Circle: FC<CircleProps> = ({ color, variant = "solid" }) => {
return (
<div
aria-hidden
css={{
width: 8,
height: 8,
backgroundColor: variant === "solid" ? color : undefined,
border: variant === "outlined" ? `1px solid ${color}` : undefined,
borderRadius: 9999,
}}
/>
);
};

interface LastUsedProps {
lastUsedAt: string;
}
Expand All @@ -38,21 +18,19 @@ export const LastUsed: FC<LastUsedProps> = ({ lastUsedAt }) => {
const t = dayjs(lastUsedAt);
const now = dayjs();
let message = t.fromNow();
let circle = (
<Circle color={theme.palette.text.secondary} variant="outlined" />
);
let circle = <StatusIndicator color="info" variant="outlined" />;

if (t.isAfter(now.subtract(1, "hour"))) {
circle = <Circle color={theme.roles.success.fill.solid} />;
circle = <StatusIndicator color="success" />;
// Since the agent reports on a 10m interval,
// the last_used_at can be inaccurate when recent.
message = "Now";
} else if (t.isAfter(now.subtract(3, "day"))) {
circle = <Circle color={theme.palette.text.secondary} />;
circle = <StatusIndicator color="info" />;
} else if (t.isAfter(now.subtract(1, "month"))) {
circle = <Circle color={theme.roles.warning.fill.solid} />;
circle = <StatusIndicator color="warning" />;
} else if (t.isAfter(now.subtract(100, "year"))) {
circle = <Circle color={theme.roles.error.fill.solid} />;
circle = <StatusIndicator color="error" />;
} else {
message = "Never";
}
Expand Down