Skip to content
Draft
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
12 changes: 7 additions & 5 deletions src/learning-header/LearningHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ const LearningHeader = ({
<div className="flex-grow-1 course-title-lockup d-flex" style={{ lineHeight: 1 }}>
<CourseInfoSlot courseOrg={courseOrg} courseNumber={courseNumber} courseTitle={courseTitle} />
</div>
{showUserDropdown && authenticatedUser && (
{authenticatedUser && (
<>
<LearningHeaderActionsSlot />
<AuthenticatedUserDropdown
username={authenticatedUser.username}
/>
<LearningHeaderActionsSlot showUserDropdown={showUserDropdown} />
{showUserDropdown && (
<AuthenticatedUserDropdown
username={authenticatedUser.username}
/>
)}
</>
)}
{showUserDropdown && !authenticatedUser && (
Expand Down
7 changes: 7 additions & 0 deletions src/learning-header/LearningHeader.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,11 @@ describe('Header', () => {
expect(screen.getByText(`${courseData.courseOrg} ${courseData.courseNumber}`)).toBeInTheDocument();
expect(screen.getByText(courseData.courseTitle)).toBeInTheDocument();
});

it('hides the user dropdown and the header actions when showUserDropdown is false', () => {
render(<Header showUserDropdown={false} />);

expect(screen.queryByText(authenticatedUser.username)).not.toBeInTheDocument();
expect(screen.queryByText('Help')).not.toBeInTheDocument();
});
});
23 changes: 19 additions & 4 deletions src/plugin-slots/LearningHeaderActionsSlot/index.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
import React from 'react';
import PropTypes from 'prop-types';
import { PluginSlot } from '@openedx/frontend-plugin-framework';
import HeaderNotificationsSlot from '../HeaderNotificationsSlot';
import LearningHelpSlot from '../LearningHelpSlot';

const LearningHeaderActionsSlot = () => (
const LearningHeaderActionsSlot = ({ showUserDropdown }) => (
<PluginSlot
id="org.openedx.frontend.layout.learning_header_actions.v1"
id="org.openedx.frontend.layout.learning_header_actions.v2"
>
<HeaderNotificationsSlot />
<LearningHelpSlot />
{showUserDropdown && (
<PluginSlot
id="org.openedx.frontend.layout.learning_header_actions.v1"
>
<HeaderNotificationsSlot />
<LearningHelpSlot />
</PluginSlot>
)}
</PluginSlot>
);

LearningHeaderActionsSlot.propTypes = {
showUserDropdown: PropTypes.bool,
};

LearningHeaderActionsSlot.defaultProps = {
showUserDropdown: true,
};

export default LearningHeaderActionsSlot;
Loading