diff --git a/datahub-web-react/src/app/home/HomePageHeader.tsx b/datahub-web-react/src/app/home/HomePageHeader.tsx index 890fffbb47..ae65745b32 100644 --- a/datahub-web-react/src/app/home/HomePageHeader.tsx +++ b/datahub-web-react/src/app/home/HomePageHeader.tsx @@ -14,7 +14,7 @@ import { } from '../../graphql/search.generated'; import { EntityType } from '../../types.generated'; import analytics, { EventType } from '../analytics'; -import { AdminHeaderLinks } from '../shared/admin/AdminHeaderLinks'; +import { HeaderLinks } from '../shared/admin/HeaderLinks'; import { ANTD_GRAY } from '../entity/shared/constants'; import { useAppConfig } from '../useAppConfig'; import { DEFAULT_APP_CONFIG } from '../../appConfigContext'; @@ -188,7 +188,7 @@ export const HomePageHeader = () => { )} - + - + diff --git a/datahub-web-react/src/app/shared/admin/AdminHeaderLinks.tsx b/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx similarity index 56% rename from datahub-web-react/src/app/shared/admin/AdminHeaderLinks.tsx rename to datahub-web-react/src/app/shared/admin/HeaderLinks.tsx index b931a78b1e..34ae20e1f8 100644 --- a/datahub-web-react/src/app/shared/admin/AdminHeaderLinks.tsx +++ b/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx @@ -14,7 +14,7 @@ import { Button, Dropdown, Menu } from 'antd'; import { useAppConfig } from '../../useAppConfig'; import { useGetAuthenticatedUser } from '../../useGetAuthenticatedUser'; -const AdminLink = styled.span` +const LinkWrapper = styled.span` margin-right: 0px; `; @@ -40,7 +40,7 @@ interface Props { areLinksHidden?: boolean; } -export function AdminHeaderLinks(props: Props) { +export function HeaderLinks(props: Props) { const { areLinksHidden } = props; const me = useGetAuthenticatedUser(); const { config } = useAppConfig(); @@ -52,66 +52,58 @@ export function AdminHeaderLinks(props: Props) { const showSettings = true; const showIngestion = isIngestionEnabled && me && me.platformPrivileges.manageIngestion && me.platformPrivileges.manageSecrets; - const showDomains = me?.platformPrivileges?.manageDomains || false; - const showGlossary = me?.platformPrivileges?.manageGlossaries || false; return ( {showAnalytics && ( - + - + )} {showIngestion && ( - + - - )} - {(showGlossary || showDomains) && ( - - {showGlossary && ( - - - Glossary - - - )} - {showDomains && ( - - - Domains - - - )} - - } - > - - - - + )} + + + + Glossary + + + + + Domains + + + + } + > + + + + {showSettings && ( - + - + )} );