From fc864174446417b2eb3c3e319e17f04cbdd79b52 Mon Sep 17 00:00:00 2001 From: Muhammad Adeel Tajamul <77053848+muhammadadeeltajamul@users.noreply.github.com> Date: Tue, 4 Oct 2022 18:07:36 +0500 Subject: [PATCH] fix: added hover to stats (#313) Co-authored-by: adeel.tajamul --- .../learners/learner/LearnerFooter.jsx | 52 ++++++++++++++----- .../learners/learner/LearnerFooter.test.jsx | 2 +- src/discussions/learners/messages.js | 10 ++++ 3 files changed, 50 insertions(+), 14 deletions(-) diff --git a/src/discussions/learners/learner/LearnerFooter.jsx b/src/discussions/learners/learner/LearnerFooter.jsx index b17db276..abd6d1a2 100644 --- a/src/discussions/learners/learner/LearnerFooter.jsx +++ b/src/discussions/learners/learner/LearnerFooter.jsx @@ -4,7 +4,7 @@ import { useSelector } from 'react-redux'; import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; import { Icon, OverlayTrigger, Tooltip } from '@edx/paragon'; -import { Edit, Report } from '@edx/paragon/icons'; +import { Edit, Report, ReportGmailerrorred } from '@edx/paragon/icons'; import { QuestionAnswerOutline } from '../../../components/icons'; import { selectUserHasModerationPrivileges, selectUserIsGroupTa } from '../../data/selectors'; @@ -23,22 +23,48 @@ function LearnerFooter({ return (
-
- - {learner.threads} -
-
- - {learner.replies + learner.responses} -
+ +
+ {intl.formatMessage(messages.allActivity)} +
+ + )} + > +
+ + {learner.threads + learner.responses + learner.replies} +
+
+ +
+ {intl.formatMessage(messages.posts)} +
+ + )} + > +
+ + {learner.threads} +
+
{Boolean(canSeeLearnerReportedStats) && (
- - {intl.formatMessage(messages.reported, { reported: activeFlags })} - + {Boolean(activeFlags) + && ( + + {intl.formatMessage(messages.reported, { reported: activeFlags })} + + )} {Boolean(inactiveFlags) && ( @@ -50,7 +76,7 @@ function LearnerFooter({ )} >
- + {activeFlags} {Boolean(inactiveFlags) && `/ ${inactiveFlags}`}
diff --git a/src/discussions/learners/learner/LearnerFooter.test.jsx b/src/discussions/learners/learner/LearnerFooter.test.jsx index 1d1ca51c..61d16747 100644 --- a/src/discussions/learners/learner/LearnerFooter.test.jsx +++ b/src/discussions/learners/learner/LearnerFooter.test.jsx @@ -56,7 +56,7 @@ describe('LearnerFooter', () => { it('Always shows threads and replies icons', () => { renderComponent(mockLearner); expect(screen.getByText(mockLearner.threads)).toBeTruthy(); - expect(screen.getByText(mockLearner.replies + mockLearner.responses)).toBeTruthy(); + expect(screen.getByText(mockLearner.replies + mockLearner.responses + mockLearner.threads)).toBeTruthy(); }); it('shows flags when the learner have ones', () => { diff --git a/src/discussions/learners/messages.js b/src/discussions/learners/messages.js index 9a291ca5..b10bec7b 100644 --- a/src/discussions/learners/messages.js +++ b/src/discussions/learners/messages.js @@ -47,6 +47,16 @@ const messages = defineMessages({ }`, description: 'Text for current selected learners filter', }, + allActivity: { + id: 'discussion.learner.allActivity', + defaultMessage: 'All activity', + description: 'Tooltip text for all activity icon', + }, + posts: { + id: 'discussion.learner.posts', + defaultMessage: 'Posts', + description: 'Tooltip text for all posts icon', + }, }); export default messages;