Skip to content

fix(site): fix tabs in the template layout #10334

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
Oct 19, 2023
Merged

fix(site): fix tabs in the template layout #10334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efdae99
Extract tabs from users layout
BrunoQuaresma Oct 18, 2023
57a8f59
Use tabs on template layout
BrunoQuaresma Oct 18, 2023
9b221c6
Merge branch 'main' of https://github.com/coder/coder into bq/refacto…
BrunoQuaresma Oct 19, 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
71 changes: 71 additions & 0 deletions site/src/components/Tabs/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import { ReactNode } from "react";
import { NavLink, NavLinkProps } from "react-router-dom";
import { combineClasses } from "utils/combineClasses";
import { Margins } from "components/Margins/Margins";
import { css } from "@emotion/css";
import { useTheme } from "@mui/material/styles";

export const Tabs = ({ children }: { children: ReactNode }) => {
return (
<div
css={(theme) => ({
borderBottom: `1px solid ${theme.palette.divider}`,
marginBottom: theme.spacing(5),
})}
>
<Margins
css={(theme) => ({
display: "flex",
alignItems: "center",
gap: theme.spacing(0.25),
})}
>
{children}
</Margins>
</div>
);
};

export const TabLink = (props: NavLinkProps) => {
const theme = useTheme();

const baseTabLink = css`
text-decoration: none;
color: ${theme.palette.text.secondary};
font-size: 14px;
display: block;
padding: ${theme.spacing(0, 2, 2)};

&:hover {
color: ${theme.palette.text.primary};
}
`;

const activeTabLink = css`
color: ${theme.palette.text.primary};
position: relative;

&:before {
content: "";
left: 0;
bottom: 0;
height: 2px;
width: 100%;
background: ${theme.palette.secondary.dark};
position: absolute;
}
`;

return (
<NavLink
className={({ isActive }) =>
combineClasses([
baseTabLink,
isActive ? activeTabLink : undefined,
props.className as string,
])
}
{...props}
/>
);
};
81 changes: 6 additions & 75 deletions site/src/components/UsersLayout/UsersLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
import Button from "@mui/material/Button";
import Link from "@mui/material/Link";
import { makeStyles } from "@mui/styles";
import GroupAdd from "@mui/icons-material/GroupAddOutlined";
import PersonAdd from "@mui/icons-material/PersonAddOutlined";
import { USERS_LINK } from "components/Dashboard/Navbar/NavbarView";
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
import { useFeatureVisibility } from "hooks/useFeatureVisibility";
import { usePermissions } from "hooks/usePermissions";
import { FC } from "react";
import {
Link as RouterLink,
NavLink,
Outlet,
useNavigate,
} from "react-router-dom";
import { combineClasses } from "utils/combineClasses";
import { Link as RouterLink, Outlet, useNavigate } from "react-router-dom";
import { Margins } from "components/Margins/Margins";
import { Stack } from "components/Stack/Stack";
import { TabLink, Tabs } from "components/Tabs/Tabs";

export const UsersLayout: FC = () => {
const styles = useStyles();
const { createUser: canCreateUser, createGroup: canCreateGroup } =
usePermissions();
const navigate = useNavigate();
Expand Down Expand Up @@ -53,75 +45,14 @@ export const UsersLayout: FC = () => {
</PageHeader>
</Margins>

<div className={styles.tabs}>
<Margins>
<Stack direction="row" spacing={0.25}>
<NavLink
end
to={USERS_LINK}
className={({ isActive }) =>
combineClasses([
styles.tabItem,
isActive ? styles.tabItemActive : undefined,
])
}
>
Users
</NavLink>
<NavLink
to="/groups"
className={({ isActive }) =>
combineClasses([
styles.tabItem,
isActive ? styles.tabItemActive : undefined,
])
}
>
Groups
</NavLink>
</Stack>
</Margins>
</div>
<Tabs>
<TabLink to={USERS_LINK}>Users</TabLink>
<TabLink to="/groups">Groups</TabLink>
</Tabs>

<Margins>
<Outlet />
</Margins>
</>
);
};

export const useStyles = makeStyles((theme) => {
return {
tabs: {
borderBottom: `1px solid ${theme.palette.divider}`,
marginBottom: theme.spacing(5),
},

tabItem: {
textDecoration: "none",
color: theme.palette.text.secondary,
fontSize: 14,
display: "block",
padding: theme.spacing(0, 2, 2),

"&:hover": {
color: theme.palette.text.primary,
},
},

tabItemActive: {
color: theme.palette.text.primary,
position: "relative",

"&:before": {
content: `""`,
left: 0,
bottom: 0,
height: 2,
width: "100%",
background: theme.palette.secondary.dark,
position: "absolute",
},
},
};
});
112 changes: 16 additions & 96 deletions site/src/pages/TemplatePage/TemplateLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { css } from "@emotion/css";
import { useTheme } from "@emotion/react";
import { createContext, type FC, Suspense, useContext } from "react";
import { useQuery } from "react-query";
import { NavLink, Outlet, useNavigate, useParams } from "react-router-dom";
import { Outlet, useNavigate, useParams } from "react-router-dom";
import type { AuthorizationRequest } from "api/typesGenerated";
import {
checkAuthorization,
Expand All @@ -11,10 +10,10 @@ import {
} from "api/api";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { Margins } from "components/Margins/Margins";
import { Stack } from "components/Stack/Stack";
import { Loader } from "components/Loader/Loader";
import { useOrganizationId } from "hooks/useOrganizationId";
import { TemplatePageHeader } from "./TemplatePageHeader";
import { TabLink, Tabs } from "components/Tabs/Tabs";

const templatePermissions = (
templateId: string,
Expand Down Expand Up @@ -85,34 +84,6 @@ export const TemplateLayout: FC<{ children?: JSX.Element }> = ({
return <Loader />;
}

const itemStyles = css`
text-decoration: none;
color: ${theme.palette.text.secondary};
font-size: 14;
display: block;
padding: ${theme.spacing(0, 2, 2)};

&:hover {
color: ${theme.palette.text.primary};
}
`;

const activeItemStyles = css`
${itemStyles}
color: ${theme.palette.text.primary};
position: relative;

&:before {
content: "";
left: 0;
bottom: 0;
height: 2;
width: 100%;
background: ${theme.palette.secondary.dark};
position: absolute;
}
`;

return (
<>
<TemplatePageHeader
Expand All @@ -124,71 +95,20 @@ export const TemplateLayout: FC<{ children?: JSX.Element }> = ({
}}
/>

<div
css={{
borderBottom: `1px solid ${theme.palette.divider}`,
marginBottom: theme.spacing(5),
}}
>
<Margins>
<Stack direction="row" spacing={0.25}>
<NavLink
end
to={`/templates/${templateName}`}
className={({ isActive }) =>
isActive ? activeItemStyles : itemStyles
}
>
Summary
</NavLink>
<NavLink
end
to={`/templates/${templateName}/docs`}
className={({ isActive }) =>
isActive ? activeItemStyles : itemStyles
}
>
Docs
</NavLink>
{data.permissions.canUpdateTemplate && (
<NavLink
to={`/templates/${templateName}/files`}
className={({ isActive }) =>
isActive ? activeItemStyles : itemStyles
}
>
Source Code
</NavLink>
)}
<NavLink
to={`/templates/${templateName}/versions`}
className={({ isActive }) =>
isActive ? activeItemStyles : itemStyles
}
>
Versions
</NavLink>
<NavLink
to={`/templates/${templateName}/embed`}
className={({ isActive }) =>
isActive ? activeItemStyles : itemStyles
}
>
Embed
</NavLink>
{shouldShowInsights && (
<NavLink
to={`/templates/${templateName}/insights`}
className={({ isActive }) =>
isActive ? activeItemStyles : itemStyles
}
>
Insights
</NavLink>
)}
</Stack>
</Margins>
</div>
<Tabs>
<TabLink end to={`/templates/${templateName}`}>
Summary
</TabLink>
<TabLink to={`/templates/${templateName}/docs`}>Docs</TabLink>
{data.permissions.canUpdateTemplate && (
<TabLink to={`/templates/${templateName}/files`}>Source Code</TabLink>
)}
<TabLink to={`/templates/${templateName}/versions`}>Versions</TabLink>
<TabLink to={`/templates/${templateName}/embed`}>Embed</TabLink>
{shouldShowInsights && (
<TabLink to={`/templates/${templateName}/insights`}>Insights</TabLink>
)}
</Tabs>

<Margins>
<TemplateLayoutContext.Provider value={data}>
Expand Down