Skip to content
Merged
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@edunext/frontend-component-header",
"version": "6.6.1-nelp.1",
"version": "6.6.1-nelp.2",
"description": "The standard header for Open edX",
"main": "dist/index.js",
"publishConfig": {
Expand Down
11 changes: 11 additions & 0 deletions src/Header.test.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
/* eslint-disable react/prop-types */
import React from 'react';
import { IntlProvider } from '@edx/frontend-platform/i18n';
import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
import TestRenderer from 'react-test-renderer';
import { AppContext } from '@edx/frontend-platform/react';
import { Context as ResponsiveContext } from 'react-responsive';

import Header from './index';

jest.mock('@edx/frontend-platform/auth');

const HeaderComponent = ({ width, contextValue }) => (
<ResponsiveContext.Provider value={width}>
<IntlProvider locale="en" messages={{}}>
Expand All @@ -20,6 +23,12 @@ const HeaderComponent = ({ width, contextValue }) => (
);

describe('<Header />', () => {
afterEach(() => {
TestRenderer.act(() => {
TestRenderer.create(null); // desmount any previos tree
});
});

it('renders correctly for anonymous desktop', () => {
const contextValue = {
authenticatedUser: null,
Expand All @@ -40,6 +49,8 @@ describe('<Header />', () => {
});

it('renders correctly for authenticated desktop', () => {
const get = jest.fn(() => Promise.reject(new Error('not found')));
getAuthenticatedHttpClient.mockReturnValue({ get });
const contextValue = {
authenticatedUser: {
userId: 'abc123',
Expand Down
4 changes: 4 additions & 0 deletions src/desktop-header/DesktopHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { getConfig } from '@edx/frontend-platform';
import { ProfileDataModal } from '@edunext/frontend-essentials';

// Local Components
import DesktopUserMenuToggleSlot
Expand All @@ -15,6 +16,7 @@ import { desktopHeaderMainOrSecondaryMenuDataShape } from './DesktopHeaderMainOr
import DesktopSecondaryMenuSlot from '../plugin-slots/DesktopSecondaryMenuSlot';
import DesktopUserMenuSlot from '../plugin-slots/DesktopUserMenuSlot';
import { desktopUserMenuDataShape } from './DesktopHeaderUserMenu';
import LanguageSelector from '../language-selector';

// i18n
import messages from '../Header.messages';
Expand Down Expand Up @@ -92,11 +94,13 @@ class DesktopHeader extends React.Component {
aria-label={intl.formatMessage(messages['header.label.secondary.nav'])}
className="nav secondary-menu-container align-items-center ml-auto"
>
{getConfig().ENABLE_HEADER_LANG_SELECTOR && (<LanguageSelector />)}
{loggedIn
? (
<>
{this.renderSecondaryMenu()}
{this.renderUserMenu()}
<ProfileDataModal />
</>
) : this.renderLoggedOutItems()}
</nav>
Expand Down