From cd204c8e057cc80fdfae8562aafb8fe3e1201627 Mon Sep 17 00:00:00 2001 From: SaadYousaf Date: Mon, 10 Oct 2022 13:46:00 +0500 Subject: [PATCH] fix: fix for reported alert banner --- src/discussions/common/AlertBanner.jsx | 5 ++--- src/discussions/data/hooks.js | 3 +-- src/discussions/posts/post/PostLink.jsx | 7 +------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/discussions/common/AlertBanner.jsx b/src/discussions/common/AlertBanner.jsx index 90987694..75ade68e 100644 --- a/src/discussions/common/AlertBanner.jsx +++ b/src/discussions/common/AlertBanner.jsx @@ -23,12 +23,11 @@ function AlertBanner({ const { reasonCodesEnabled } = useSelector(selectModerationSettings); const userIsContentAuthor = getAuthenticatedUser().username === content.author; const canSeeLastEditOrClosedAlert = (userHasModerationPrivileges || userIsContentAuthor || userIsGroupTa); - const isReportedByCurrentUser = getAuthenticatedUser().username === content?.abuseFlaggedBy; - const canSeeReportedBanner = (userHasModerationPrivileges || userIsGroupTa || isReportedByCurrentUser); + const canSeeReportedBanner = content?.abuseFlagged; return ( <> - {content.abuseFlagged && canSeeReportedBanner && ( + {canSeeReportedBanner && ( {intl.formatMessage(messages.abuseFlaggedMessage)} diff --git a/src/discussions/data/hooks.js b/src/discussions/data/hooks.js index f8711342..1e307d3c 100644 --- a/src/discussions/data/hooks.js +++ b/src/discussions/data/hooks.js @@ -142,8 +142,7 @@ export const useAlertBannerVisible = (content) => { const { reasonCodesEnabled } = useSelector(selectModerationSettings); const userIsContentAuthor = getAuthenticatedUser().username === content.author; const canSeeLastEditOrClosedAlert = (userHasModerationPrivileges || userIsContentAuthor || userIsGroupTa); - const isReportedByCurrentUser = getAuthenticatedUser().username === content?.abuseFlaggedBy; - const canSeeReportedBanner = (userHasModerationPrivileges || userIsGroupTa || isReportedByCurrentUser); + const canSeeReportedBanner = content.abuseFlagged; return ( (reasonCodesEnabled && canSeeLastEditOrClosedAlert && (content.lastEdit?.reason || content.closed)) diff --git a/src/discussions/posts/post/PostLink.jsx b/src/discussions/posts/post/PostLink.jsx index 5b4540c2..167540df 100644 --- a/src/discussions/posts/post/PostLink.jsx +++ b/src/discussions/posts/post/PostLink.jsx @@ -2,7 +2,6 @@ import React, { useContext } from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { useSelector } from 'react-redux'; import { Link } from 'react-router-dom'; import { useIntl } from '@edx/frontend-platform/i18n'; @@ -12,7 +11,6 @@ import { PushPin } from '../../../components/icons'; import { AvatarOutlineAndLabelColors, Routes, ThreadType } from '../../../data/constants'; import AuthorLabel from '../../common/AuthorLabel'; import { DiscussionContext } from '../../common/context'; -import { selectUserHasModerationPrivileges, selectUserIsGroupTa } from '../../data/selectors'; import { discussionsPath, isPostPreviewAvailable } from '../../utils'; import messages from './messages'; import PostFooter from './PostFooter'; @@ -42,12 +40,9 @@ function PostLink({ category, learnerUsername, }); - const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges); - const userIsGroupTa = useSelector(selectUserIsGroupTa); const showAnsweredBadge = post.hasEndorsed && post.type === ThreadType.QUESTION; const authorLabelColor = AvatarOutlineAndLabelColors[post.authorLabel]; - const postReported = post.abuseFlagged || post.abuseFlaggedCount; - const canSeeReportedBadge = postReported && (userHasModerationPrivileges || userIsGroupTa); + const canSeeReportedBadge = post.abuseFlagged; const read = post.read || (!post.read && post.commentCount !== post.unreadCommentCount); return (