From 6536d36c241470638f20267677e53886765dfece Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Mon, 29 Aug 2022 05:07:07 +0300 Subject: [PATCH] feat(ui): hide user menu on docker extension [EE-4115] (#7563) --- .../components/PageHeader/HeaderTitle.tsx | 85 +----------------- app/react/components/PageHeader/UserMenu.tsx | 88 +++++++++++++++++++ 2 files changed, 90 insertions(+), 83 deletions(-) create mode 100644 app/react/components/PageHeader/UserMenu.tsx diff --git a/app/react/components/PageHeader/HeaderTitle.tsx b/app/react/components/PageHeader/HeaderTitle.tsx index 4ffbaba67..e4bd6cb37 100644 --- a/app/react/components/PageHeader/HeaderTitle.tsx +++ b/app/react/components/PageHeader/HeaderTitle.tsx @@ -1,19 +1,7 @@ import { PropsWithChildren } from 'react'; -import { - Menu, - MenuButton, - MenuList, - MenuLink as ReachMenuLink, -} from '@reach/menu-button'; -import clsx from 'clsx'; -import { User, ChevronDown } from 'react-feather'; -import { UISrefProps, useSref } from '@uirouter/react'; - -import { useUser } from '@/portainer/hooks/useUser'; -import { AutomationTestingProps } from '@/types'; import { useHeaderContext } from './HeaderContainer'; -import styles from './HeaderTitle.module.css'; +import { UserMenu } from './UserMenu'; interface Props { title: string; @@ -21,7 +9,6 @@ interface Props { export function HeaderTitle({ title, children }: PropsWithChildren) { useHeaderContext(); - const { user } = useUser(); return (
@@ -31,75 +18,7 @@ export function HeaderTitle({ title, children }: PropsWithChildren) {
{children && {children}} - - -
- -
- {user && {user.Username}} - -
- - - {!window.ddExtension && ( - - )} - - - -
+ {!window.ddExtension && } ); } - -interface MenuLinkProps extends AutomationTestingProps, UISrefProps { - label: string; -} - -function MenuLink({ - to, - label, - params, - options, - 'data-cy': dataCy, -}: MenuLinkProps) { - const anchorProps = useSref(to, params, options); - - return ( - - {label} - - ); -} diff --git a/app/react/components/PageHeader/UserMenu.tsx b/app/react/components/PageHeader/UserMenu.tsx new file mode 100644 index 000000000..625a17846 --- /dev/null +++ b/app/react/components/PageHeader/UserMenu.tsx @@ -0,0 +1,88 @@ +import { + Menu, + MenuButton, + MenuList, + MenuLink as ReachMenuLink, +} from '@reach/menu-button'; +import { UISrefProps, useSref } from '@uirouter/react'; +import clsx from 'clsx'; +import { User, ChevronDown } from 'react-feather'; + +import { AutomationTestingProps } from '@/types'; +import { useUser } from '@/portainer/hooks/useUser'; + +import styles from './HeaderTitle.module.css'; + +export function UserMenu() { + const { user } = useUser(); + + return ( + + +
+ +
+ {user && {user.Username}} + +
+ + + + + + +
+ ); +} + +interface MenuLinkProps extends AutomationTestingProps, UISrefProps { + label: string; +} + +function MenuLink({ + to, + label, + params, + options, + 'data-cy': dataCy, +}: MenuLinkProps) { + const anchorProps = useSref(to, params, options); + + return ( + + {label} + + ); +}