Skip to content

Commit 74f17da

Browse files
committed
refactor: use comparison to compare bool var
1 parent 49ec111 commit 74f17da

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.env.development

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ MARKETING_SITE_BASE_URL=http://localhost:18000
1616
ORDER_HISTORY_URL=localhost:1996/orders
1717
REFRESH_ACCESS_TOKEN_ENDPOINT=http://localhost:18000/login_refresh
1818
SEGMENT_KEY=null
19-
SHOW_FULLNAME=false
20-
SHOW_SETTINGS_LABEL=false
19+
SHOW_FULLNAME='false'
20+
SHOW_SETTINGS_LABEL='false'
2121
SITE_NAME=Open edX
2222
USER_INFO_COOKIE_NAME=edx-user-info
2323
LOGO_URL=https://edx-cdn.org/v3/default/logo.svg

package-lock.json

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Header.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const Header = ({ intl }) => {
6666
{
6767
type: 'item',
6868
href: config.ACCOUNT_SETTINGS_URL,
69-
content: config.SHOW_SETTINGS_LABEL ? intl.formatMessage(messages['header.user.menu.settings']) : intl.formatMessage(messages['header.user.menu.account']),
69+
content: config.SHOW_SETTINGS_LABEL === 'true' ? intl.formatMessage(messages['header.user.menu.settings']) : intl.formatMessage(messages['header.user.menu.account']),
7070
},
7171
{
7272
type: 'item',
@@ -94,7 +94,7 @@ const Header = ({ intl }) => {
9494
];
9595

9696
let name = null
97-
if (authenticatedUser !== null && config.SHOW_FULLNAME) {
97+
if (authenticatedUser !== null && config.SHOW_FULLNAME === 'true') {
9898
name = authenticatedUser.name
9999
} else if (authenticatedUser !== null) {
100100
name = authenticatedUser.username

src/learning-header/AuthenticatedUserDropdown.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Dropdown } from '@openedx/paragon';
99

1010
import messages from './messages';
1111

12-
const AuthenticatedUserDropdown = ({ intl, name }) => {
12+
const AuthenticatedUserDropdown = ({ intl, username, name }) => {
1313
const dashboardMenuItem = (
1414
<Dropdown.Item href={`${getConfig().LMS_BASE_URL}/dashboard`}>
1515
{intl.formatMessage(messages.dashboard)}
@@ -23,7 +23,7 @@ const AuthenticatedUserDropdown = ({ intl, name }) => {
2323
<Dropdown.Toggle variant="outline-primary">
2424
<FontAwesomeIcon icon={faUserCircle} className="d-md-none" size="lg" />
2525
<span data-hj-suppress className="d-none d-md-inline">
26-
{name}
26+
{getConfig().SHOW_FULLNAME === 'true' ? name : username}
2727
</span>
2828
</Dropdown.Toggle>
2929
<Dropdown.Menu className="dropdown-menu-right">
@@ -32,7 +32,7 @@ const AuthenticatedUserDropdown = ({ intl, name }) => {
3232
{intl.formatMessage(messages.profile)}
3333
</Dropdown.Item>
3434
<Dropdown.Item href={getConfig().ACCOUNT_SETTINGS_URL}>
35-
{getConfig().SHOW_SETTINGS_LABEL ? intl.formatMessage(messages.settings) : intl.formatMessage(messages.account)}
35+
{getConfig().SHOW_SETTINGS_LABEL === 'true' ? intl.formatMessage(messages.settings) : intl.formatMessage(messages.account)}
3636
</Dropdown.Item>
3737
{ getConfig().ORDER_HISTORY_URL && (
3838
<Dropdown.Item href={getConfig().ORDER_HISTORY_URL}>
@@ -50,6 +50,7 @@ const AuthenticatedUserDropdown = ({ intl, name }) => {
5050

5151
AuthenticatedUserDropdown.propTypes = {
5252
intl: intlShape.isRequired,
53+
username: PropTypes.string.isRequired,
5354
name: PropTypes.string.isRequired,
5455
};
5556

src/learning-header/LearningHeader.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ const LearningHeader = ({
5050
</div>
5151
{showUserDropdown && authenticatedUser && (
5252
<AuthenticatedUserDropdown
53-
name={getConfig().SHOW_FULLNAME ? authenticatedUser.name : authenticatedUser.username}
53+
username={authenticatedUser.username}
54+
name={authenticatedUser.name}
5455
/>
5556
)}
5657
{showUserDropdown && !authenticatedUser && (

src/setupTest.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ process.env.MARKETING_SITE_BASE_URL = 'http://localhost:18000';
3232
process.env.ORDER_HISTORY_URL = 'localhost:1996/orders';
3333
process.env.REFRESH_ACCESS_TOKEN_ENDPOINT = 'http://localhost:18000/login_refresh';
3434
process.env.SEGMENT_KEY = 'segment_whoa';
35+
process.env.SHOW_FULLNAME = false;
3536
process.env.SITE_NAME = 'edX';
3637
process.env.USER_INFO_COOKIE_NAME = 'edx-user-info';
3738
process.env.LOGO_URL = 'https://edx-cdn.org/v3/default/logo.svg';
@@ -48,6 +49,7 @@ class MockLoggingService {
4849
export const authenticatedUser = {
4950
userId: 'abc123',
5051
username: 'Mock User',
52+
name: 'Mock User Name',
5153
roles: [],
5254
administrator: false,
5355
};
@@ -66,10 +68,12 @@ export function initializeMockApp() {
6668
CSRF_TOKEN_API_PATH: process.env.CSRF_TOKEN_API_PATH || null,
6769
LOGO_URL: process.env.LOGO_URL || null,
6870
SITE_NAME: process.env.SITE_NAME || null,
71+
SHOW_FULLNAME: process.env.SHOW_FULLNAME || null,
6972

7073
authenticatedUser: {
7174
userId: 'abc123',
7275
username: 'Mock User',
76+
name: 'Mock User Name',
7377
roles: [],
7478
administrator: false,
7579
},

0 commit comments

Comments
 (0)