Skip to content

chore: use emotion for styling (pt. 2) #9951

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 19 commits into from
Oct 2, 2023
Merged

chore: use emotion for styling (pt. 2) #9951

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
949c010
parent 4da1223a807e50dd9f307c61bcddd4315dd2ad73
aslilac Sep 29, 2023
3934f0e
emotion: `AvatarData`
aslilac Sep 29, 2023
056d867
emotion: `CopyButton`
aslilac Sep 29, 2023
8808da4
emotion: `DeploymentBannerView`
aslilac Sep 29, 2023
23404c6
use `satisfies`
aslilac Sep 29, 2023
d464bb8
Merge branch 'main' into emotional-damage-2
aslilac Sep 29, 2023
4201a56
emotion: `LicenseBannerView`
aslilac Sep 29, 2023
e3e626a
emotion: `NavbarView`
aslilac Sep 29, 2023
4d68033
emotion: `BorderedMenu`
aslilac Sep 29, 2023
f254256
emotion: `UserDropdownContent`
aslilac Sep 29, 2023
af80a93
emotion: `Badges`
aslilac Sep 29, 2023
ea5bb1b
fix storybook
aslilac Sep 29, 2023
48f3bfc
emotion: `DeploySettingsLayout`
aslilac Sep 29, 2023
2eb0c99
emotion: `Fieldset`
aslilac Sep 29, 2023
8fa8a37
hmm
aslilac Sep 29, 2023
f71a979
fix storybook
aslilac Sep 29, 2023
12fc96c
emotion: `DeploymentSettingsLayout/Fieldset`
aslilac Sep 29, 2023
a446e59
oops
aslilac Sep 29, 2023
e4a6477
tricky
aslilac Sep 29, 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
emotion: DeploymentBannerView
  • Loading branch information
@aslilac
aslilac committed Sep 29, 2023
commit 8808da49f872bf4f5b58eefe701caed4e6915074
229 changes: 117 additions & 112 deletions site/src/components/Dashboard/DeploymentBanner/DeploymentBannerView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { DeploymentStats, WorkspaceStatus } from "api/typesGenerated";
import { FC, useMemo, useEffect, useState } from "react";
import prettyBytes from "pretty-bytes";
import BuildingIcon from "@mui/icons-material/Build";
import { makeStyles } from "@mui/styles";
import { RocketIcon } from "components/Icons/RocketIcon";
import { MONOSPACE_FONT_FAMILY } from "theme/constants";
import Tooltip from "@mui/material/Tooltip";
Expand All @@ -19,9 +18,36 @@ import CollectedIcon from "@mui/icons-material/Compare";
import RefreshIcon from "@mui/icons-material/Refresh";
import Button from "@mui/material/Button";
import { getDisplayWorkspaceStatus } from "utils/workspace";
import { css, type Theme, type Interpolation, useTheme } from "@emotion/react";

export const bannerHeight = 36;

const styles = {
group: css`
display: flex;
align-items: center;
`,
category: (theme: Theme) => ({
marginRight: theme.spacing(2),
color: theme.palette.text.primary,
}),
values: (theme: Theme) => ({
display: "flex",
gap: theme.spacing(1),
color: theme.palette.text.secondary,
}),
value: (theme: Theme) => css`
display: flex;
align-items: center;
gap: ${theme.spacing(0.5)};

& svg {
width: 12px;
height: 12px;
}
`,
} satisfies Record<string, Interpolation<Theme>>;

export interface DeploymentBannerViewProps {
fetchStats?: () => void;
stats?: DeploymentStats;
Expand All @@ -31,7 +57,7 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = ({
stats,
fetchStats,
}) => {
const styles = useStyles();
const theme = useTheme();
const aggregatedMinutes = useMemo(() => {
if (!stats) {
return;
Expand Down Expand Up @@ -80,15 +106,46 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = ({
}, [timeUntilRefresh, stats]);

return (
<div className={styles.container}>
<div
css={{
position: "sticky",
height: bannerHeight,
bottom: 0,
zIndex: 1,
padding: theme.spacing(0, 2),
backgroundColor: theme.palette.background.paper,
display: "flex",
alignItems: "center",
fontFamily: MONOSPACE_FONT_FAMILY,
fontSize: 12,
gap: theme.spacing(4),
borderTop: `1px solid ${theme.palette.divider}`,
overflowX: "auto",
whiteSpace: "nowrap",
}}
>
<Tooltip title="Status of your Coder deployment. Only visible for admins!">
<div className={styles.rocket}>
<div
css={css`
display: flex;
align-items: center;

& svg {
width: 16px;
height: 16px;
}

${theme.breakpoints.down("lg")} {
display: none;
}
`}
>
<RocketIcon />
</div>
</Tooltip>
<div className={styles.group}>
<div className={styles.category}>Workspaces</div>
<div className={styles.values}>
<div css={styles.group}>
<div css={styles.category}>Workspaces</div>
<div css={styles.values}>
<WorkspaceBuildValue
status="pending"
count={stats?.workspaces.pending}
Expand All @@ -115,21 +172,21 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = ({
/>
</div>
</div>
<div className={styles.group}>
<div css={styles.group}>
<Tooltip title={`Activity in the last ~${aggregatedMinutes} minutes`}>
<div className={styles.category}>Transmission</div>
<div css={styles.category}>Transmission</div>
</Tooltip>

<div className={styles.values}>
<div css={styles.values}>
<Tooltip title="Data sent to workspaces">
<div className={styles.value}>
<div css={styles.value}>
<DownloadIcon />
{stats ? prettyBytes(stats.workspaces.rx_bytes) : "-"}
</div>
</Tooltip>
<ValueSeparator />
<Tooltip title="Data sent from workspaces">
<div className={styles.value}>
<div css={styles.value}>
<UploadIcon />
{stats ? prettyBytes(stats.workspaces.tx_bytes) : "-"}
</div>
Expand All @@ -142,28 +199,34 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = ({
: "The average latency of user connections to workspaces"
}
>
<div className={styles.value}>
<div css={styles.value}>
<LatencyIcon />
{displayLatency > 0 ? displayLatency?.toFixed(2) + " ms" : "-"}
</div>
</Tooltip>
</div>
</div>
<div className={styles.group}>
<div className={styles.category}>Active Connections</div>
<div css={styles.group}>
<div css={styles.category}>Active Connections</div>

<div className={styles.values}>
<div css={styles.values}>
<Tooltip title="VS Code Editors with the Coder Remote Extension">
<div className={styles.value}>
<VSCodeIcon className={styles.iconStripColor} />
<div css={styles.value}>
<VSCodeIcon
css={css`
& * {
fill: currentColor;
}
`}
/>
{typeof stats?.session_count.vscode === "undefined"
? "-"
: stats?.session_count.vscode}
</div>
</Tooltip>
<ValueSeparator />
<Tooltip title="SSH Sessions">
<div className={styles.value}>
<div css={styles.value}>
<TerminalIcon />
{typeof stats?.session_count.ssh === "undefined"
? "-"
Expand All @@ -172,7 +235,7 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = ({
</Tooltip>
<ValueSeparator />
<Tooltip title="Web Terminal Sessions">
<div className={styles.value}>
<div css={styles.value}>
<WebTerminalIcon />
{typeof stats?.session_count.reconnecting_pty === "undefined"
? "-"
Expand All @@ -181,17 +244,41 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = ({
</Tooltip>
</div>
</div>
<div className={styles.refresh}>
<div
css={{
color: theme.palette.text.primary,
marginLeft: "auto",
display: "flex",
alignItems: "center",
gap: theme.spacing(2),
}}
>
<Tooltip title="The last time stats were aggregated. Workspaces report statistics periodically, so it may take a bit for these to update!">
<div className={styles.value}>
<div css={styles.value}>
<CollectedIcon />
{lastAggregated}
</div>
</Tooltip>

<Tooltip title="A countdown until stats are fetched again. Click to refresh!">
<Button
className={`${styles.value} ${styles.refreshButton}`}
css={css`
${styles.value(theme)}

margin: 0;
padding: 0 8px;
height: unset;
min-height: unset;
font-size: unset;
color: unset;
border: 0;
min-width: unset;
font-family: inherit;

& svg {
margin-right: ${theme.spacing(0.5)};
}
`}
onClick={() => {
if (fetchStats) {
fetchStats();
Expand All @@ -209,15 +296,18 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = ({
};

const ValueSeparator: FC = () => {
const styles = useStyles();
return <div className={styles.valueSeparator}>/</div>;
const theme = useTheme();
const separatorStyles = css`
color: ${theme.palette.text.disabled};
`;

return <div css={separatorStyles}>/</div>;
};

const WorkspaceBuildValue: FC<{
status: WorkspaceStatus;
count?: number;
}> = ({ status, count }) => {
const styles = useStyles();
const displayStatus = getDisplayWorkspaceStatus(status);
let statusText = displayStatus.text;
let icon = displayStatus.icon;
Expand All @@ -232,96 +322,11 @@ const WorkspaceBuildValue: FC<{
component={RouterLink}
to={`/workspaces?filter=${encodeURIComponent("status:" + status)}`}
>
<div className={styles.value}>
<div css={styles.value}>
{icon}
{typeof count === "undefined" ? "-" : count}
</div>
</Link>
</Tooltip>
);
};

const useStyles = makeStyles((theme) => ({
rocket: {
display: "flex",
alignItems: "center",

"& svg": {
width: 16,
height: 16,
},

[theme.breakpoints.down("lg")]: {
display: "none",
},
},
container: {
position: "sticky",
height: bannerHeight,
bottom: 0,
zIndex: 1,
padding: theme.spacing(0, 2),
backgroundColor: theme.palette.background.paper,
display: "flex",
alignItems: "center",
fontFamily: MONOSPACE_FONT_FAMILY,
fontSize: 12,
gap: theme.spacing(4),
borderTop: `1px solid ${theme.palette.divider}`,
overflowX: "auto",
whiteSpace: "nowrap",
},
group: {
display: "flex",
alignItems: "center",
},
category: {
marginRight: theme.spacing(2),
color: theme.palette.text.primary,
},
values: {
display: "flex",
gap: theme.spacing(1),
color: theme.palette.text.secondary,
},
valueSeparator: {
color: theme.palette.text.disabled,
},
value: {
display: "flex",
alignItems: "center",
gap: theme.spacing(0.5),

"& svg": {
width: 12,
height: 12,
},
},
iconStripColor: {
"& *": {
fill: "currentColor",
},
},
refresh: {
color: theme.palette.text.primary,
marginLeft: "auto",
display: "flex",
alignItems: "center",
gap: theme.spacing(2),
},
refreshButton: {
margin: 0,
padding: "0px 8px",
height: "unset",
minHeight: "unset",
fontSize: "unset",
color: "unset",
border: 0,
minWidth: "unset",
fontFamily: "inherit",

"& svg": {
marginRight: theme.spacing(0.5),
},
},
}));