Skip to content

Commit ed74c5a

Browse files
committed
feat: display profile name in studio header if available
1 parent b813085 commit ed74c5a

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

src/studio-header/HeaderBody.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const HeaderBody = ({
2121
org,
2222
title,
2323
username,
24+
name,
2425
isAdmin,
2526
studioBaseUrl,
2627
logoutUrl,
@@ -100,6 +101,7 @@ const HeaderBody = ({
100101
<UserMenu
101102
{...{
102103
username,
104+
name,
103105
studioBaseUrl,
104106
logoutUrl,
105107
authenticatedUserAvatar,
@@ -125,6 +127,7 @@ HeaderBody.propTypes = {
125127
logoAltText: PropTypes.string,
126128
authenticatedUserAvatar: PropTypes.string,
127129
username: PropTypes.string,
130+
name: PropTypes.string,
128131
isAdmin: PropTypes.bool,
129132
isMobile: PropTypes.bool,
130133
isHiddenMainMenu: PropTypes.bool,
@@ -150,6 +153,7 @@ HeaderBody.defaultProps = {
150153
title: '',
151154
authenticatedUserAvatar: null,
152155
username: null,
156+
name: null,
153157
isAdmin: false,
154158
isMobile: false,
155159
isHiddenMainMenu: false,

src/studio-header/MobileHeader.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ MobileHeader.propTypes = {
4545
logoAltText: PropTypes.string,
4646
authenticatedUserAvatar: PropTypes.string,
4747
username: PropTypes.string,
48+
name: PropTypes.string,
4849
isAdmin: PropTypes.bool,
4950
mainMenuDropdowns: PropTypes.arrayOf(PropTypes.shape({
5051
id: PropTypes.string,
@@ -65,6 +66,7 @@ MobileHeader.defaultProps = {
6566
title: null,
6667
authenticatedUserAvatar: null,
6768
username: null,
69+
name: null,
6870
isAdmin: false,
6971
mainMenuDropdowns: [],
7072
outlineLink: null,

src/studio-header/StudioHeader.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const StudioHeader = ({
2626
org,
2727
title,
2828
username: authenticatedUser?.username,
29+
name: authenticatedUser?.name,
2930
isAdmin: authenticatedUser?.administrator,
3031
authenticatedUserAvatar: authenticatedUser?.avatar,
3132
studioBaseUrl: config.STUDIO_BASE_URL,

src/studio-header/UserMenu.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import getUserMenuItems from './utils';
99

1010
const UserMenu = ({
1111
username,
12+
name,
1213
studioBaseUrl,
1314
logoutUrl,
1415
authenticatedUserAvatar,
@@ -32,7 +33,7 @@ const UserMenu = ({
3233
data-testid="avatar-icon"
3334
/>
3435
);
35-
const title = isMobile ? avatar : <>{avatar}{username}</>;
36+
const title = isMobile ? avatar : <>{avatar}{name || username}</>;
3637

3738
return (
3839
<NavDropdownMenu
@@ -50,6 +51,7 @@ const UserMenu = ({
5051

5152
UserMenu.propTypes = {
5253
username: PropTypes.string,
54+
name: PropTypes.string,
5355
studioBaseUrl: PropTypes.string.isRequired,
5456
logoutUrl: PropTypes.string.isRequired,
5557
authenticatedUserAvatar: PropTypes.string,
@@ -64,6 +66,7 @@ UserMenu.defaultProps = {
6466
isAdmin: false,
6567
authenticatedUserAvatar: null,
6668
username: null,
69+
name: null,
6770
};
6871

6972
export default injectIntl(UserMenu);

0 commit comments

Comments
 (0)