-
Notifications
You must be signed in to change notification settings - Fork 11
feat: Page template updates. #8
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,18 @@ | ||
| import * as React from 'react' | ||
| import { useState } from 'react' | ||
| import { | ||
| Avatar, | ||
| Button, | ||
| ButtonVariant, | ||
| Divider, | ||
| Dropdown, | ||
| DropdownGroup, | ||
| DropdownList, | ||
| MenuToggle, | ||
| type MenuToggleElement, | ||
| Toolbar as PFToolbar, | ||
| ToolbarContent, | ||
| ToolbarGroup, | ||
| ToolbarItem, | ||
| } from '@patternfly/react-core' | ||
| import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon' | ||
| import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon' | ||
| import QuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/question-circle-icon' | ||
| import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon' | ||
|
|
||
| import imgAvatar from '/avatarImg.svg?url' | ||
| import { ToggleThemeSwitcher } from './toolbar/ToogleThemeSwitcher' | ||
| import { SearchComponent } from './toolbar/SearchComponent' | ||
| import { DocumentReleaseDropdown } from './toolbar/DocumentReleaseDropdown'; | ||
| import GithubIcon from '@patternfly/react-icons/dist/esm/icons/github-icon'; | ||
|
|
||
| import { KebabDropdownItems } from './KebabDropdownItems' | ||
| import { UserDropdownItems } from './UserDropdownItems' | ||
|
|
||
| export const Toolbar: React.FunctionComponent = () => { | ||
| const [isDropdownOpen, setIsDropdownOpen] = useState(false) | ||
| const [isKebabDropdownOpen, setIsKebabDropdownOpen] = useState(false) | ||
| const [isFullKebabDropdownOpen, setIsFullKebabDropdownOpen] = useState(false) | ||
|
|
||
| const onDropdownToggle = () => { | ||
| setIsDropdownOpen(!isDropdownOpen) | ||
| } | ||
|
|
||
| const onDropdownSelect = () => { | ||
| setIsDropdownOpen(false) | ||
| } | ||
|
|
||
| const onKebabDropdownToggle = () => { | ||
| setIsKebabDropdownOpen(!isKebabDropdownOpen) | ||
| } | ||
|
|
||
| const onKebabDropdownSelect = () => { | ||
| setIsKebabDropdownOpen(false) | ||
| } | ||
|
|
||
| const onFullKebabDropdownToggle = () => { | ||
| setIsFullKebabDropdownOpen(!isFullKebabDropdownOpen) | ||
| } | ||
|
|
||
| const onFullKebabDropdownSelect = () => { | ||
| setIsFullKebabDropdownOpen(false) | ||
| } | ||
|
|
||
| return ( | ||
| export const Toolbar: React.FunctionComponent = () => ( | ||
| <PFToolbar id="toolbar" isStatic> | ||
| <ToolbarContent> | ||
| <ToolbarGroup | ||
|
|
@@ -63,111 +21,26 @@ export const Toolbar: React.FunctionComponent = () => { | |
| gap={{ default: 'gapNone', md: 'gapMd' }} | ||
| > | ||
| <ToolbarItem> | ||
| <Button | ||
| aria-label="Notifications" | ||
| variant={ButtonVariant.plain} | ||
| icon={<BellIcon />} | ||
| /> | ||
| <ToggleThemeSwitcher/> | ||
| </ToolbarItem> | ||
| <ToolbarGroup | ||
| variant="action-group-plain" | ||
| visibility={{ default: 'hidden', lg: 'visible' }} | ||
| > | ||
| <ToolbarItem> | ||
| <Button | ||
| aria-label="Settings" | ||
| variant={ButtonVariant.plain} | ||
| icon={<CogIcon />} | ||
| /> | ||
| </ToolbarItem> | ||
| <ToolbarItem> | ||
| <Button | ||
| aria-label="Help" | ||
| variant={ButtonVariant.plain} | ||
| icon={<QuestionCircleIcon />} | ||
| /> | ||
| </ToolbarItem> | ||
| </ToolbarGroup> | ||
| <ToolbarItem | ||
| visibility={{ default: 'hidden', md: 'visible', lg: 'hidden' }} | ||
| > | ||
| <Dropdown | ||
| isOpen={isKebabDropdownOpen} | ||
| onSelect={onKebabDropdownSelect} | ||
| onOpenChange={(isOpen: boolean) => setIsKebabDropdownOpen(isOpen)} | ||
| popperProps={{ position: 'right' }} | ||
| toggle={(toggleRef: React.Ref<MenuToggleElement>) => ( | ||
| <MenuToggle | ||
| ref={toggleRef} | ||
| onClick={onKebabDropdownToggle} | ||
| isExpanded={isKebabDropdownOpen} | ||
| variant="plain" | ||
| aria-label="Settings and help" | ||
| > | ||
| <EllipsisVIcon aria-hidden="true" /> | ||
| </MenuToggle> | ||
| )} | ||
| > | ||
| <DropdownList> | ||
| <KebabDropdownItems /> | ||
| </DropdownList> | ||
| </Dropdown> | ||
| <ToolbarItem> | ||
| <SearchComponent/> | ||
| </ToolbarItem> | ||
| <ToolbarItem visibility={{ md: 'hidden' }}> | ||
| <Dropdown | ||
| isOpen={isFullKebabDropdownOpen} | ||
| onSelect={onFullKebabDropdownSelect} | ||
| onOpenChange={(isOpen: boolean) => | ||
| setIsFullKebabDropdownOpen(isOpen) | ||
| } | ||
| popperProps={{ position: 'right' }} | ||
| toggle={(toggleRef: React.Ref<MenuToggleElement>) => ( | ||
| <MenuToggle | ||
| ref={toggleRef} | ||
| onClick={onFullKebabDropdownToggle} | ||
| isExpanded={isFullKebabDropdownOpen} | ||
| variant="plain" | ||
| aria-label="Toolbar menu" | ||
| > | ||
| <EllipsisVIcon aria-hidden="true" /> | ||
| </MenuToggle> | ||
| )} | ||
| <ToolbarItem> | ||
| <Button | ||
| component="a" | ||
| variant="plain" | ||
| href="//github.com/patternfly" | ||
| target="top" | ||
| aria-label="PatternFly GitHub page" | ||
| > | ||
| <DropdownGroup key="group 2" aria-label="User actions"> | ||
| <DropdownList> | ||
| <UserDropdownItems /> | ||
| </DropdownList> | ||
| </DropdownGroup> | ||
| <Divider /> | ||
| <DropdownList> | ||
| <KebabDropdownItems /> | ||
| </DropdownList> | ||
| </Dropdown> | ||
| <GithubIcon /> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: I think the icon should be passed to an icon prop rather than as a child |
||
| </Button> | ||
| </ToolbarItem> | ||
| <ToolbarItem> | ||
| <DocumentReleaseDropdown/> | ||
| </ToolbarItem> | ||
| </ToolbarGroup> | ||
| <ToolbarItem visibility={{ default: 'hidden', md: 'visible' }}> | ||
| <Dropdown | ||
| isOpen={isDropdownOpen} | ||
| onSelect={onDropdownSelect} | ||
| onOpenChange={(isOpen: boolean) => setIsDropdownOpen(isOpen)} | ||
| popperProps={{ position: 'right' }} | ||
| toggle={(toggleRef: React.Ref<MenuToggleElement>) => ( | ||
| <MenuToggle | ||
| ref={toggleRef} | ||
| onClick={onDropdownToggle} | ||
| isExpanded={isDropdownOpen} | ||
| icon={<Avatar src={imgAvatar} alt="" size="sm" />} | ||
| > | ||
| Ned Username | ||
| </MenuToggle> | ||
| )} | ||
| > | ||
| <DropdownList> | ||
| <UserDropdownItems /> | ||
| </DropdownList> | ||
| </Dropdown> | ||
| </ToolbarItem> | ||
| </ToolbarContent> | ||
| </PFToolbar> | ||
| ) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we add tests for the Toolbar component itself? |
||
| } | ||
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| import React from 'react' | ||
| import { | ||
| Dropdown, | ||
| DropdownList, | ||
| MenuToggle, | ||
| DropdownGroup, | ||
| DropdownItem, | ||
| Divider, | ||
| } from '@patternfly/react-core' | ||
| import { Release } from '../../types' | ||
| import versions from '../../versions.json' | ||
|
|
||
| export const DocumentReleaseDropdown: React.FunctionComponent = () => { | ||
| const latestRelease = versions.Releases.find( | ||
| (release) => release.latest, | ||
| ) as Release | ||
| const previousReleases = Object.values(versions.Releases).filter( | ||
| (release) => !release.hidden && !release.latest, | ||
| ) as Release [] | ||
|
|
||
| const previousVersions = Object.values(versions.ArchivedReleases) as Release[]; | ||
|
Comment on lines
+14
to
+21
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: is there a way we could avoid all these type casts? |
||
|
|
||
| const [isDropdownOpen, setDropdownOpen] = React.useState(false) | ||
|
|
||
| const getDropdownItem = (version: Release, isLatest = false) => ( | ||
| <DropdownItem | ||
| itemId={`${version.name}-latest-release`} | ||
| key={`${version.name}-latest`} | ||
| // eslint-disable-next-line no-nested-ternary | ||
| to={isLatest ? '/' : version.href ? version.href : `/${version.name}`} | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: I don't love this nested ternary either |
||
| isExternalLink = {version.href ? true : false} | ||
| > | ||
| {`Release ${version.name}`} | ||
| </DropdownItem> | ||
| ) | ||
| return ( | ||
| <Dropdown | ||
| onSelect={() => setDropdownOpen(!isDropdownOpen)} | ||
| onOpenChange={(isOpen) => setDropdownOpen(isOpen)} | ||
| isOpen={isDropdownOpen} | ||
| toggle={(toggleRef) => ( | ||
| <MenuToggle | ||
| ref={toggleRef} | ||
| onClick={() => setDropdownOpen(!isDropdownOpen)} | ||
| isExpanded={isDropdownOpen} | ||
| > | ||
| {`Release ${latestRelease.name}`} | ||
| </MenuToggle> | ||
| )} | ||
| popperProps={{ position: 'right' }} | ||
| > | ||
| <DropdownGroup key="Latest" label="Latest"> | ||
| <DropdownList>{getDropdownItem(latestRelease, true)}</DropdownList> | ||
| </DropdownGroup> | ||
| {previousReleases.length > 0 && ( | ||
| <DropdownGroup key="Previous releases" label="Previous releases"> | ||
| <DropdownList> | ||
| {previousReleases | ||
| .slice(0, 3) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: is this slice just a magic number sort of thing where we're grabbing the last three versions just because 3, 4 and 5 are the only previous versions we care about? If so I don't love that. |
||
| .map((version) => getDropdownItem(version))} | ||
| </DropdownList> | ||
| </DropdownGroup> | ||
| )} | ||
| {previousVersions.length > 0 && ( | ||
| <><Divider key="divider1" /><DropdownGroup key="Previous versions" label="Previous versions"> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: the formatting is kind of funky here, seems like prettier just needs to be ran. |
||
| <DropdownList> | ||
| {previousVersions.map((version) => getDropdownItem(version))} | ||
| </DropdownList> | ||
| </DropdownGroup></>)} | ||
| </Dropdown> | ||
| ) | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just curious on the "why" behind this eslint config change