Skip to content

fix: remove accidental scrollbar from deployment banner #10616

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 3 commits into from
Nov 9, 2023
Merged

fix: remove accidental scrollbar from deployment banner #10616

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f05878
chore: clean up DeploymentBannerView markup
Parkreiner Nov 9, 2023
f773308
fix: remove extra scrollbar
Parkreiner Nov 9, 2023
37c8bf6
refactor: remove needless calc call
Parkreiner Nov 9, 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
12 changes: 10 additions & 2 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 @@ -75,13 +75,14 @@ export interface DeploymentBannerViewProps {
export const DeploymentBannerView: FC<DeploymentBannerViewProps> = (props) => {
const { health, stats, fetchStats } = props;
const theme = useTheme();

const aggregatedMinutes = useMemo(() => {
if (!stats) {
return;
}
return dayjs(stats.collected_at).diff(stats.aggregated_from, "minutes");
}, [stats]);
const displayLatency = stats?.workspaces.connection_latency_ms.P50 || -1;

const [timeUntilRefresh, setTimeUntilRefresh] = useState(0);
useEffect(() => {
if (!stats || !fetchStats) {
Expand Down Expand Up @@ -130,7 +131,7 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = (props) => {
justify-content: center;
background-color: ${unhealthy ? colors.red[10] : undefined};
padding: 0 12px;
height: ${bannerHeight}px;
height: 100%;
color: #fff;

& svg {
Expand All @@ -151,10 +152,13 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = (props) => {
pointer-events: none;
`;

const displayLatency = stats?.workspaces.connection_latency_ms.P50 || -1;

return (
<div
css={{
position: "sticky",
lineHeight: 1,
height: bannerHeight,
bottom: 0,
zIndex: 1,
Expand Down Expand Up @@ -216,6 +220,7 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = (props) => {
</div>
)}
</Tooltip>

<div css={styles.group}>
<div css={styles.category}>Workspaces</div>
<div css={styles.values}>
Expand Down Expand Up @@ -245,6 +250,7 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = (props) => {
/>
</div>
</div>

<div css={styles.group}>
<Tooltip title={`Activity in the last ~${aggregatedMinutes} minutes`}>
<div css={styles.category}>Transmission</div>
Expand Down Expand Up @@ -279,6 +285,7 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = (props) => {
</Tooltip>
</div>
</div>

<div css={styles.group}>
<div css={styles.category}>Active Connections</div>

Expand Down Expand Up @@ -317,6 +324,7 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = (props) => {
</Tooltip>
</div>
</div>

<div
css={{
color: theme.palette.text.primary,
Expand Down