8000 feat: Add helpful tooltips for the key features by BrunoQuaresma · Pull Request #2097 · coder/coder · GitHub
[go: up one dir, main page]

Skip to content

feat: Add helpful tooltips for the key features #2097

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.

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
Jun 7, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
feat: Add page header and help tooltips
  • Loading branch information
BrunoQuaresma committed Jun 6, 2022
commit d4539633f24875249bebbf86314d051b7c6c3f01
35 changes: 35 additions & 0 deletions site/src/components/HelpTooltip/HelpTooltip.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { ComponentMeta, Story } from "@storybook/react"
import {
HelpTooltip,
HelpTooltipLink,
HelpTooltipLinksGroup,
HelpTooltipProps,
HelpTooltipText,
HelpTooltipTitle,
} from "./HelpTooltip"

export default {
title: "components/HelpTooltip",
component: HelpTooltip,
} as ComponentMeta<typeof HelpTooltip>

const Template: Story<HelpTooltipProps> = (args) => (
<HelpTooltip {...args}>
<HelpTooltipTitle>What is template?</HelpTooltipTitle>
<HelpTooltipText>
With templates you can create a common configuration for your workspaces using Terraform. So, you and your team
can use the same environment to deliver great software.
</HelpTooltipText>
<HelpTooltipLinksGroup>
<HelpTooltipLink href="https://github.com/coder/coder/">Creating a template</HelpTooltipLink>
<HelpTooltipLink href="https://github.com/coder/coder/">Updating a template</HelpTooltipLink>
Comment on lines +24 to +25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe just one link to the templates doc for now labeled "managing templates"?

https://github.com/coder/coder/blob/main/docs/templates.md#templates

10000
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh, this one is just a sample. I'm already using this link for the templates:

 <HelpTooltipLink href="https://github.com/coder/coder/blob/main/docs/templates.md#manage-templates">
  Manage templates
</HelpTooltipLink>

</HelpTooltipLinksGroup>
</HelpTooltip>
)

export const Close = Template.bind({})

export const Open = Template.bind({})
Open.args = {
open: true,
}
138 changes: 138 additions & 0 deletions site/src/components/HelpTooltip/HelpTooltip.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
import Link from "@material-ui/core/Link"
import Popover from "@material-ui/core/Popover"
import { makeStyles } from "@material-ui/core/styles"
import HelpIcon from "@material-ui/icons/HelpOutline"
import OpenInNewIcon from "@material-ui/icons/OpenInNew"
import { useState } from "react"
import { Stack } from "../Stack/Stack"

export interface HelpTooltipProps {
// Useful to test on storybook
open?: boolean
}

export const HelpTooltip: React.FC<HelpTooltipProps> = ({ children, open }) => {
const styles = useStyles()
const [anchorEl, setAnchorEl] = useState<HTMLButtonElement | null>(null)
open = open ?? Boolean(anchorEl)
const id = open ? "help-popover" : undefined

return (
<>
<button aria-describedby={id} className={styles.button} onClick={(event) => setAnchorEl(event.currentTarget)}>
<HelpIcon className={styles.icon} />
</button>
<Popover
classes={{ paper: styles.popoverPaper }}
id={id}
open={open}
anchorEl={anchorEl}
onClose={() => {
setAnchorEl(null)
}}
anchorOrigin={{
vertical: "bottom",
horizontal: "left",
}}
transformOrigin={{
vertical: "top",
horizontal: "left",
}}
>
{children}
</Popover>
</>
)
}

export const HelpTooltipTitle: React.FC = ({ children }) => {
const styles = useStyles()

return <h4 className={styles.title}>{children}</h4>
}

export const HelpTooltipText: React.FC = ({ children }) => {
const styles = useStyles()

return <p className={styles.text}>{children}</p>
}

export const HelpTooltipLink: React.FC<{ href: string }> = ({ children, href }) => {
const styles = useStyles()

return (
<Link href={href} target="_blank" rel="noreferrer" className={styles.link}>
<OpenInNewIcon className={styles.linkIcon} />
{children}
</Link>
)
}

export const HelpTooltipLinksGroup: React.FC = ({ children }) => {
const styles = useStyles()

return (
<Stack spacing={1} className={styles.linksGroup}>
{children}
</Stack>
)
}

const useStyles = makeStyles((theme) => ({
button: {
display: "flex",
alignItems: "center",
justifyContent: "center",
width: theme.spacing(3),
height: theme.spacing(3),
padding: 0,
border: 0,
background: "transparent",
color: theme.palette.text.secondary,
cursor: "pointer",
marginLeft: theme.spacing(1),

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

icon: {
width: theme.spacing(2),
height: theme.spacing(2),
},

popoverPaper: {
marginTop: theme.spacing(0.5),
width: theme.spacing(38),
padding: theme.spacing(2.5),
color: theme.palette.text.secondary,
},

title: {
marginTop: 0,
marginBottom: theme.spacing(1),
color: theme.palette.text.primary,
},

text: {
marginTop: theme.spacing(0.5),
marginBottom: theme.spacing(0.5),
},

link: {
display: "flex",
alignItems: "center",
},

linkIcon: {
color: "inherit",
width: 14,
height: 14,
marginRight: theme.spacing(1),
},

linksGroup: {
marginTop: theme.spacing(2),
},
}))
15 changes: 15 additions & 0 deletions site/src/components/PageHeader/PageHeader.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { ComponentMeta, Story } from "@storybook/react"
import { PageHeader, PageHeaderTitle } from "./PageHeader"

export default {
title: "components/PageHeader",
component: PageHeader,
} as ComponentMeta<typeof PageHeader>

const Template: Story = () => (
<PageHeader>
<PageHeaderTitle>Templates</PageHeaderTitle>
</PageHeader>
)

export const Example = Template.bind({})
45 changes: 45 additions & 0 deletions site/src/components/PageHeader/PageHeader.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { makeStyles } from "@material-ui/core/styles"
import { Stack } from "../Stack/Stack"

export const PageHeader: React.FC = ({ children }) => {
const styles = useStyles()

return <div className={styles.root}>{children}</div>
}

export const PageHeaderTitle: React.FC = ({ children }) => {
const styles = useStyles()

return <h1 className={styles.title}>{children}</h1>
}

export const PageHeaderActions: React.FC = ({ children }) => {
const styles = useStyles()

return (
<Stack direction="row" className={styles.actions}>
{children}
</Stack>
)
}

const useStyles = makeStyles((theme) => ({
root: {
display: "flex",
alignItems: "center",
paddingTop: theme.spacing(6),
paddingBottom: theme.spacing(5),
},

title: {
fontSize: theme.spacing(4),
fontWeight: 400,
margin: 0,
display: "flex",
alignItems: "center",
},

actions: {
marginLeft: "auto",
},
}))
112 changes: 69 additions & 43 deletions site/src/pages/TemplatesPage/TemplatesPageView.tsx
F438
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,15 @@ import * as TypesGen from "../../api/typesGenerated"
import { AvatarData } from "../../components/AvatarData/AvatarData"
import { CodeExample } from "../../components/CodeExample/CodeExample"
import { EmptyState } from "../../components/EmptyState/EmptyState"
import {
HelpTooltip,
HelpTooltipLink,
HelpTooltipLinksGroup,
HelpTooltipText,
HelpTooltipTitle,
} from "../../components/HelpTooltip/HelpTooltip"
import { Margins } from "../../components/Margins/Margins"
import { Stack } from "../../components/Stack/Stack"
import { PageHeader, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
import { TableLoader } from "../../components/TableLoader/TableLoader"

dayjs.extend(relativeTime)
Expand All @@ -38,6 +45,23 @@ export const Language = {
),
}

const TemplateHelpTooltip: React.FC = () => {
return (
<HelpTooltip>
<HelpTooltipTitle>What is template?</HelpTooltipTitle>
<HelpTooltipText>
With templates you can create a common configuration for your workspaces using Terraform. So, you and your team
can use the same environment to deliver great software.
</HelpTooltipText>
<HelpTooltipLinksGroup>
<HelpTooltipLink href="https://github.com/coder/coder/blob/main/docs/templates.md#manage-templates">
Manage templates
</HelpTooltipLink>
</HelpTooltipLinksGroup>
</HelpTooltip>
)
}

export interface TemplatesPageViewProps {
loading?: boolean
canCreateTemplate?: boolean
Expand All @@ -47,56 +71,58 @@ export interface TemplatesPageViewProps {
export const TemplatesPageView: FC<TemplatesPageViewProps> = (props) => {
const styles = useStyles()
return (
<Stack spacing={4} className={styles.root}>
<Margins>
<Table>
<TableHead>
<Margins>
<PageHeader>
<PageHeaderTitle>
Templates
<TemplateHelpTooltip />
</PageHeaderTitle>
</PageHeader>

<Table>
<TableHead>
<TableRow>
<TableCell>{Language.nameLabel}</TableCell>
<TableCell>{Language.usedByLabel}</TableCell>
<TableCell>{Language.lastUpdatedLabel}</TableCell>
</TableRow>
</TableHead>
<TableBody>
{props.loading && <TableLoader />}
{!props.loading && !props.templates?.length && (
<TableRow>
<TableCell>{Language.nameLabel}</TableCell>
<TableCell>{Language.usedByLabel}</TableCell>
<TableCell>{Language.lastUpdatedLabel}</TableCell>
<TableCell colSpan={999}>
<EmptyState
message={Language.emptyMessage}
description={props.canCreateTemplate ? Language.emptyDescription : Language.emptyViewNoPerms}
descriptionClassName={styles.emptyDescription}
cta={<CodeExample code="coder template init" />}
/>
</TableCell>
</TableRow>
</TableHead>
<TableBody>
{props.loading && <TableLoader />}
{!props.loading && !props.templates?.length && (
<TableRow>
<TableCell colSpan={999}>
<EmptyState
message={Language.emptyMessage}
description={props.canCreateTemplate ? Language.emptyDescription : Language.emptyViewNoPerms}
descriptionClassName={styles.emptyDescription}
cta={<CodeExample code="coder template init" />}
/>
</TableCell>
</TableRow>
)}
{props.templates?.map((template) => (
<TableRow key={template.id}>
<TableCell>
<AvatarData
title={template.name}
subtitle={template.description}
link={`/templates/${template.name}`}
/>
</TableCell>
)}
{props.templates?.map((template) => (
<TableRow key={template.id}>
<TableCell>
<AvatarData
title={template.name}
subtitle={template.description}
link={`/templates/${template.name}`}
/>
</TableCell>

<TableCell>{Language.developerCount(template.workspace_owner_count)}</TableCell>
<TableCell>{Language.developerCount(template.workspace_owner_count)}</TableCell>

<TableCell data-chromatic="ignore">{dayjs().to(dayjs(template.updated_at))}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</Margins>
</Stack>
<TableC 6D93 ell data-chromatic="ignore">{dayjs().to(dayjs(template.updated_at))}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</Margins>
)
}

const useStyles = makeStyles((theme) => ({
root: {
marginTop: theme.spacing(10),
},
emptyDescription: {
maxWidth: theme.spacing(62),
},
Expand Down
Loading
0