refactor: use comparison to compare bool var

openedx · Apr 1, 2024 · 74f17da · 74f17da
1 parent 49ec111
commit 74f17da
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/.env.development b/.env.development
@@ -16,8 +16,8 @@ MARKETING_SITE_BASE_URL=http://localhost:18000
 ORDER_HISTORY_URL=localhost:1996/orders
 REFRESH_ACCESS_TOKEN_ENDPOINT=http://localhost:18000/login_refresh
 SEGMENT_KEY=null
-SHOW_FULLNAME=false
-SHOW_SETTINGS_LABEL=false
+SHOW_FULLNAME='false'
+SHOW_SETTINGS_LABEL='false'
 SITE_NAME=Open edX
 USER_INFO_COOKIE_NAME=edx-user-info
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Header.jsx b/src/Header.jsx
@@ -66,7 +66,7 @@ const Header = ({ intl }) => {
     {
       type: 'item',
       href: config.ACCOUNT_SETTINGS_URL,
-      content: config.SHOW_SETTINGS_LABEL ? intl.formatMessage(messages['header.user.menu.settings']) : intl.formatMessage(messages['header.user.menu.account']),
+      content: config.SHOW_SETTINGS_LABEL === 'true' ? intl.formatMessage(messages['header.user.menu.settings']) : intl.formatMessage(messages['header.user.menu.account']),
     },
     {
       type: 'item',
@@ -94,7 +94,7 @@ const Header = ({ intl }) => {
   ];
 
   let name = null
-  if (authenticatedUser !== null && config.SHOW_FULLNAME) {
+  if (authenticatedUser !== null && config.SHOW_FULLNAME === 'true') {
     name = authenticatedUser.name
   } else if (authenticatedUser !== null) {
     name = authenticatedUser.username

diff --git a/src/learning-header/AuthenticatedUserDropdown.jsx b/src/learning-header/AuthenticatedUserDropdown.jsx
@@ -9,7 +9,7 @@ import { Dropdown } from '@openedx/paragon';
 
 import messages from './messages';
 
-const AuthenticatedUserDropdown = ({ intl, name }) => {
+const AuthenticatedUserDropdown = ({ intl, username, name }) => {
   const dashboardMenuItem = (
     <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/dashboard`}>
       {intl.formatMessage(messages.dashboard)}
@@ -23,7 +23,7 @@ const AuthenticatedUserDropdown = ({ intl, name }) => {
         <Dropdown.Toggle variant="outline-primary">
           <FontAwesomeIcon icon={faUserCircle} className="d-md-none" size="lg" />
           <span data-hj-suppress className="d-none d-md-inline">
-            {name}
+            {getConfig().SHOW_FULLNAME === 'true' ? name : username}
           </span>
         </Dropdown.Toggle>
         <Dropdown.Menu className="dropdown-menu-right">
@@ -32,7 +32,7 @@ const AuthenticatedUserDropdown = ({ intl, name }) => {
             {intl.formatMessage(messages.profile)}
           </Dropdown.Item>
           <Dropdown.Item href={getConfig().ACCOUNT_SETTINGS_URL}>
-            {getConfig().SHOW_SETTINGS_LABEL ? intl.formatMessage(messages.settings) : intl.formatMessage(messages.account)}
+            {getConfig().SHOW_SETTINGS_LABEL === 'true' ? intl.formatMessage(messages.settings) : intl.formatMessage(messages.account)}
           </Dropdown.Item>
           { getConfig().ORDER_HISTORY_URL && (
             <Dropdown.Item href={getConfig().ORDER_HISTORY_URL}>
@@ -50,6 +50,7 @@ const AuthenticatedUserDropdown = ({ intl, name }) => {
 
 AuthenticatedUserDropdown.propTypes = {
   intl: intlShape.isRequired,
+  username: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
 };
 

diff --git a/src/learning-header/LearningHeader.jsx b/src/learning-header/LearningHeader.jsx
@@ -50,7 +50,8 @@ const LearningHeader = ({
         </div>
         {showUserDropdown && authenticatedUser && (
           <AuthenticatedUserDropdown
-            name={getConfig().SHOW_FULLNAME ? authenticatedUser.name : authenticatedUser.username}
+            username={authenticatedUser.username}
+            name={authenticatedUser.name}
           />
         )}
         {showUserDropdown && !authenticatedUser && (

diff --git a/src/setupTest.js b/src/setupTest.js
@@ -32,6 +32,7 @@ process.env.MARKETING_SITE_BASE_URL = 'http://localhost:18000';
 process.env.ORDER_HISTORY_URL = 'localhost:1996/orders';
 process.env.REFRESH_ACCESS_TOKEN_ENDPOINT = 'http://localhost:18000/login_refresh';
 process.env.SEGMENT_KEY = 'segment_whoa';
+process.env.SHOW_FULLNAME = false;
 process.env.SITE_NAME = 'edX';
 process.env.USER_INFO_COOKIE_NAME = 'edx-user-info';
 process.env.LOGO_URL = 'https://edx-cdn.org/v3/default/logo.svg';
@@ -48,6 +49,7 @@ class MockLoggingService {
 export const authenticatedUser = {
   userId: 'abc123',
   username: 'Mock User',
+  name: 'Mock User Name',
   roles: [],
   administrator: false,
 };
@@ -66,10 +68,12 @@ export function initializeMockApp() {
     CSRF_TOKEN_API_PATH: process.env.CSRF_TOKEN_API_PATH || null,
     LOGO_URL: process.env.LOGO_URL || null,
     SITE_NAME: process.env.SITE_NAME || null,
+    SHOW_FULLNAME: process.env.SHOW_FULLNAME || null,
 
     authenticatedUser: {
       userId: 'abc123',
       username: 'Mock User',
+      name: 'Mock User Name',
       roles: [],
       administrator: false,
     },