fix: changed username to simple text for incontext view

openedx · Jan 25, 2024 · 8db03af · 8db03af
1 parent db8a513
commit 8db03af
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/src/discussions/common/AuthorLabel.jsx b/src/discussions/common/AuthorLabel.jsx
@@ -2,7 +2,7 @@ import React, { useContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
 
 import classNames from 'classnames';
-import { Link, useLocation } from 'react-router-dom';
+import { generatePath, Link } from 'react-router-dom';
 import * as timeago from 'timeago.js';
 
 import { useIntl } from '@edx/frontend-platform/i18n';
@@ -11,7 +11,6 @@ import { Institution, School } from '@edx/paragon/icons';
 
 import { Routes } from '../../data/constants';
 import messages from '../messages';
-import { discussionsPath } from '../utils';
 import { DiscussionContext } from './context';
 import timeLocale from './time-locale';
 
@@ -110,26 +109,30 @@ const AuthorLabel = ({
     </>
   ), [author, authorLabelMessage, authorToolTip, icon, isRetiredUser, postCreatedAt, showTextPrimary, alert]);
 
-  const { pathname } = discussionsPath(Routes.LEARNERS.POSTS, {
-    0: enableInContextSidebar ? 'in-context' : undefined,
-    learnerUsername: author,
-    courseId,
-  })();
-
-  const { search } = useLocation();
-
   return showUserNameAsLink
     ? (
       <div className={className}>
-        <Link
-          data-testid="learner-posts-link"
-          id="learner-posts-link"
-          to={`${pathname}${enableInContextSidebar ? search : ''}`}
-          className="text-decoration-none"
-          style={{ width: 'fit-content' }}
-        >
-          {!alert && authorName}
-        </Link>
+        { enableInContextSidebar
+          ? (
+            <div
+              id="learner-posts"
+              className="text-decoration-none"
+              style={{ width: 'fit-content' }}
+            >
+              {!alert && authorName}
+            </div>
+          )
+          : (
+            <Link
+              data-testid="learner-posts-link"
+              id="learner-posts-link"
+              to={generatePath(Routes.LEARNERS.POSTS, { learnerUsername: author, courseId })}
+              className="text-decoration-none"
+              style={{ width: 'fit-content' }}
+            >
+              {!alert && authorName}
+            </Link>
+          )}
         {labelContents}
       </div>
     )

diff --git a/src/discussions/learners/learner/LearnerCard.jsx b/src/discussions/learners/learner/LearnerCard.jsx
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 
-import { Link, useLocation } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 
 import { Routes } from '../../../data/constants';
 import { DiscussionContext } from '../../common/context';
@@ -14,18 +14,16 @@ const LearnerCard = ({ learner }) => {
     username, threads, inactiveFlags, activeFlags, responses, replies,
   } = learner;
   const { enableInContextSidebar, learnerUsername, courseId } = useContext(DiscussionContext);
-  const { pathname } = discussionsPath(Routes.LEARNERS.POSTS, {
+  const linkUrl = discussionsPath(Routes.LEARNERS.POSTS, {
     0: enableInContextSidebar ? 'in-context' : undefined,
     learnerUsername: learner.username,
     courseId,
   })();
 
-  const { search } = useLocation();
-
   return (
     <Link
       className="discussion-post p-0 text-decoration-none text-gray-900 border-bottom border-light-400"
-      to={`${pathname}${enableInContextSidebar ? search : ''}`}
+      to={linkUrl}
     >
       <div
         className="d-flex flex-row flex-fill mw-100 py-3 px-4 border-primary-500"

diff --git a/src/index.scss b/src/index.scss
@@ -226,6 +226,10 @@ header {
   }
 }
 
+#learner-posts-text {
+  color: inherit;
+}
+
 #learner-posts-link {
   color: inherit;