Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: redirection to learners tab in inContext view #653

Closed
wants to merge 5 commits into from
Closed

fix: redirection to learners tab in inContext view #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db8a513
fix: redirection to learners tab in inContext view
sohailfatima Jan 24, 2024
db8d116
fix: changed username to simple text for incontext view
sohailfatima Jan 25, 2024
f203975
Merge branch 'master' into fatima/INF-1224
sohailfatima Jan 30, 2024
c4b75bf
test: username is not clickable in incontext view
sohailfatima Jan 31, 2024
60aa2b0
Merge branch 'master' into fatima/INF-1224
awais-ansari Jan 31, 2024
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
5 changes: 3 additions & 2 deletions src/discussions/common/AuthorLabel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const AuthorLabel = ({
}) => {
timeago.register('time-locale', timeLocale);
const intl = useIntl();
const { courseId } = useContext(DiscussionContext);
const { courseId, enableInContextSidebar } = useContext(DiscussionContext);
let icon = null;
let authorLabelMessage = null;

Expand All @@ -44,7 +44,8 @@ const AuthorLabel = ({
const showTextPrimary = !authorLabelMessage && !isRetiredUser && !alert;
const className = classNames('d-flex align-items-center', { 'mb-0.5': !postOrComment }, labelColor);

const showUserNameAsLink = linkToProfile && author && author !== intl.formatMessage(messages.anonymous);
const showUserNameAsLink = linkToProfile && author && author !== intl.formatMessage(messages.anonymous)
&& !enableInContextSidebar;

const authorName = useMemo(() => (
<span
Expand Down
17 changes: 13 additions & 4 deletions src/discussions/common/AuthorLabel.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ let store;
let axiosMock;
let container;

function renderComponent(author, authorLabel, linkToProfile, labelColor) {
function renderComponent(author, authorLabel, linkToProfile, labelColor, enableInContextSidebar) {
const wrapper = render(
<IntlProvider locale="en">
<AppProvider store={store}>
<DiscussionContext.Provider value={{ courseId }}>
<DiscussionContext.Provider value={{ courseId, enableInContextSidebar }}>
<AuthorLabel
author={author}
authorLabel={authorLabel}
Expand Down Expand Up @@ -78,9 +78,9 @@ describe('Author label', () => {
);

it(
`it is "${!linkToProfile && 'not'}" clickable when linkToProfile is ${!!linkToProfile}`,
`it is "${(!linkToProfile) && 'not'}" clickable when linkToProfile is ${!!linkToProfile} and enableInContextSidebar is false`,
async () => {
renderComponent(author, authorLabel, linkToProfile, labelColor);
renderComponent(author, authorLabel, linkToProfile, labelColor, false);

if (linkToProfile) {
expect(screen.queryByTestId('learner-posts-link')).toBeInTheDocument();
Expand All @@ -90,6 +90,15 @@ describe('Author label', () => {
},
);

it(
'it is not clickable when enableInContextSidebar is true',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be written in previous line

async () => {
renderComponent(author, authorLabel, linkToProfile, labelColor, true);

expect(screen.queryByTestId('learner-posts-link')).not.toBeInTheDocument();
},
);

it(
`it has "${!linkToProfile && 'not'}" label text and label color when linkToProfile is ${!!linkToProfile}`,
async () => {
Expand Down
Loading