Skip to content

Commit 265cf14

Browse files
committed
feat: display profile name in desktop header if available
1 parent 215450b commit 265cf14

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

src/Header.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const Header = ({
112112
logoAltText: config.SITE_NAME,
113113
logoDestination: `${config.LMS_BASE_URL}/dashboard`,
114114
loggedIn: authenticatedUser !== null,
115+
name: authenticatedUser !== null ? authenticatedUser.name : null,
115116
username: authenticatedUser !== null ? authenticatedUser.username : null,
116117
avatar: authenticatedUser !== null ? authenticatedUser.avatar : null,
117118
mainMenu: getConfig().AUTHN_MINIMAL_HEADER ? [] : mainMenu,

src/desktop-header/DesktopHeader.jsx

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class DesktopHeader extends React.Component {
4141
userMenu,
4242
avatar,
4343
username,
44+
name,
4445
intl,
4546
} = this.props;
4647

@@ -52,7 +53,7 @@ class DesktopHeader extends React.Component {
5253
className="btn btn-outline-primary d-inline-flex align-items-center pl-2 pr-3"
5354
>
5455
<Avatar size="1.5em" src={avatar} alt="" className="mr-2" />
55-
{username} <CaretIcon role="img" aria-hidden focusable="false" />
56+
{name || username} <CaretIcon role="img" aria-hidden focusable="false" />
5657
</MenuTrigger>
5758
<MenuContent className="mb-0 dropdown-menu show dropdown-menu-right pin-right shadow py-2">
5859
<DesktopUserMenuSlot menu={userMenu} />
@@ -117,21 +118,23 @@ export const desktopHeaderDataShape = {
117118
logoAltText: PropTypes.string,
118119
logoDestination: PropTypes.string,
119120
avatar: PropTypes.string,
121+
name: PropTypes.string,
120122
username: PropTypes.string,
121123
loggedIn: PropTypes.bool,
122124
};
123125

124126
DesktopHeader.propTypes = {
125127
mainMenu: desktopHeaderDataShape.mainMenu,
126-
secondaryMenu: desktopHeaderDataShape.secondaryMenumainMenu,
127-
userMenu: desktopHeaderDataShape.userMenumainMenu,
128-
loggedOutItems: desktopHeaderDataShape.loggedOutItemsmainMenu,
129-
logo: desktopHeaderDataShape.logomainMenu,
130-
logoAltText: desktopHeaderDataShape.logoAltTextmainMenu,
131-
logoDestination: desktopHeaderDataShape.logoDestinationmainMenu,
132-
avatar: desktopHeaderDataShape.avatarmainMenu,
133-
username: desktopHeaderDataShape.usernamemainMenu,
134-
loggedIn: desktopHeaderDataShape.loggedInmainMenu,
128+
secondaryMenu: desktopHeaderDataShape.secondaryMenu,
129+
userMenu: desktopHeaderDataShape.userMenu,
130+
loggedOutItems: desktopHeaderDataShape.loggedOutItems,
131+
logo: desktopHeaderDataShape.logo,
132+
logoAltText: desktopHeaderDataShape.logoAltText,
133+
logoDestination: desktopHeaderDataShape.logoDestination,
134+
avatar: desktopHeaderDataShape.avatar,
135+
name: desktopHeaderDataShape.name,
136+
username: desktopHeaderDataShape.username,
137+
loggedIn: desktopHeaderDataShape.loggedIn,
135138

136139
// i18n
137140
intl: intlShape.isRequired,
@@ -146,6 +149,7 @@ DesktopHeader.defaultProps = {
146149
logoAltText: null,
147150
logoDestination: null,
148151
avatar: null,
152+
name: null,
149153
username: null,
150154
loggedIn: false,
151155
};

0 commit comments

Comments
 (0)