Skip to content
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

feat: add functionality to remove username from header #298

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ ENABLE_NOTICES=''
# IDP_SLUG=''
# uncomment the line below to host the site at /{HOSTNAME}/
# ENABLE_PATH_PREFIX = true
HIDE_USERNAME_FROM_HEADER=''
12 changes: 10 additions & 2 deletions src/components/site-header/DesktopHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,22 @@ class DesktopHeader extends React.Component {
userMenu,
avatar,
username,
name,
hideUsername,
intl,
} = this.props;

const usernameOrName = hideUsername ? name : username;

return (
<Menu transitionClassName="menu-dropdown" transitionTimeout={250}>
<MenuTrigger
tag="button"
aria-label={intl.formatMessage(messages['header.label.account.menu.for'], { username })}
aria-label={intl.formatMessage(messages['header.label.account.menu.for'], { usernameOrName })}
className="btn btn-outline-primary d-inline-flex align-items-center pl-2 pr-3"
>
<Avatar size="1.5em" src={avatar} alt="" className="mr-2" />
{username} <CaretIcon role="img" aria-hidden focusable="false" />
{!hideUsername && username} <CaretIcon role="img" aria-hidden focusable="false" />
</MenuTrigger>
<MenuContent className="mb-0 dropdown-menu show dropdown-menu-right pin-right shadow py-2">
{userMenu.map(({ type, href, content }) => (
Expand Down Expand Up @@ -151,7 +155,9 @@ DesktopHeader.propTypes = {
logoDestination: PropTypes.string,
avatar: PropTypes.string,
username: PropTypes.string,
name: PropTypes.string,
loggedIn: PropTypes.bool,
hideUsername: PropTypes.bool,

// i18n
intl: intlShape.isRequired,
Expand All @@ -166,7 +172,9 @@ DesktopHeader.defaultProps = {
logoDestination: null,
avatar: null,
username: null,
name: null,
loggedIn: false,
hideUsername: false,
};

export default injectIntl(DesktopHeader);
2 changes: 2 additions & 0 deletions src/components/site-header/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ function Header({
logoDestination,
loggedIn: authenticatedUser !== null,
username: authenticatedUser ? authenticatedUser.username : null,
name: authenticatedUser ? authenticatedUser.name : null,
avatar: authenticatedUser && authenticatedUser.profileImage
? authenticatedUser.profileImage.imageUrlMedium
: null,
hideUsername: !!process.env.HIDE_USERNAME_FROM_HEADER,
mainMenu,
userMenu,
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/site-header/Header.messages.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const messages = defineMessages({
},
'header.label.account.menu.for': {
id: 'header.label.account.menu.for',
defaultMessage: 'Account menu for {username}',
defaultMessage: 'Account menu for {usernameOrName}',
description: 'The aria label for the account menu trigger when the username is displayed in it',
},
'header.label.main.nav': {
Expand Down
10 changes: 8 additions & 2 deletions src/components/site-header/MobileHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,18 @@ class MobileHeader extends React.Component {
loggedIn,
avatar,
username,
name,
stickyOnMobile,
intl,
mainMenu,
userMenu,
loggedOutItems,
hideUsername,
} = this.props;
const logoProps = { src: logo, alt: logoAltText, href: logoDestination };
const stickyClassName = stickyOnMobile ? 'sticky-top' : '';
const logoClasses = getConfig().AUTHN_MINIMAL_HEADER ? 'justify-content-left pl-3' : 'justify-content-center';
const avatarAltText = hideUsername ? name : username;

return (
<header
Expand Down Expand Up @@ -139,7 +142,7 @@ class MobileHeader extends React.Component {
aria-label={intl.formatMessage(messages['header.label.account.menu'])}
title={intl.formatMessage(messages['header.label.account.menu'])}
>
<Avatar size="1.5rem" src={avatar} alt={username} />
<Avatar size="1.5rem" src={avatar} alt={avatarAltText} />
</MenuTrigger>
<MenuContent tag="ul" className="nav flex-column pin-left pin-right border-top shadow py-2">
{loggedIn ? this.renderUserMenuItems() : this.renderLoggedOutItems()}
Expand Down Expand Up @@ -173,8 +176,10 @@ MobileHeader.propTypes = {
logoDestination: PropTypes.string,
avatar: PropTypes.string,
username: PropTypes.string,
name: PropTypes.string,
loggedIn: PropTypes.bool,
stickyOnMobile: PropTypes.bool,
hideUsername: PropTypes.bool,

// i18n
intl: intlShape.isRequired,
Expand All @@ -189,9 +194,10 @@ MobileHeader.defaultProps = {
logoDestination: null,
avatar: null,
username: null,
name: null,
loggedIn: false,
stickyOnMobile: true,

hideUsername: false,
};

export default injectIntl(MobileHeader);
Loading