diff --git a/src/discussions/posts/PostsList.jsx b/src/discussions/posts/PostsList.jsx
index 056db78f..134557ae 100644
--- a/src/discussions/posts/PostsList.jsx
+++ b/src/discussions/posts/PostsList.jsx
@@ -10,7 +10,7 @@ import { Button, Spinner } from '@edx/paragon';
import { RequestStatus } from '../../data/constants';
import { DiscussionContext } from '../common/context';
-import { selectconfigLoadingStatus, selectUserIsPrivileged, selectUserIsStaff } from '../data/selectors';
+import { selectconfigLoadingStatus, selectUserHasModerationPrivileges, selectUserIsStaff } from '../data/selectors';
import messages from '../messages';
import {
selectThreadFilters, selectThreadNextPage, selectThreadSorting, threadsLoadingStatus,
@@ -31,7 +31,7 @@ function PostsList({ posts, topics, intl }) {
const filters = useSelector(selectThreadFilters());
const nextPage = useSelector(selectThreadNextPage());
const showOwnPosts = page === 'my-posts';
- const userIsPrivileged = useSelector(selectUserIsPrivileged);
+ const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
const userIsStaff = useSelector(selectUserIsStaff);
const configStatus = useSelector(selectconfigLoadingStatus);
@@ -42,7 +42,7 @@ function PostsList({ posts, topics, intl }) {
filters,
page: pageNum,
author: showOwnPosts ? authenticatedUser.username : null,
- countFlagged: userIsPrivileged || userIsStaff,
+ countFlagged: userHasModerationPrivileges || userIsStaff,
}))
);
diff --git a/src/discussions/posts/PostsView.test.jsx b/src/discussions/posts/PostsView.test.jsx
index 9962e824..0e46726f 100644
--- a/src/discussions/posts/PostsView.test.jsx
+++ b/src/discussions/posts/PostsView.test.jsx
@@ -88,7 +88,7 @@ describe('PostsView', () => {
store = initializeStore({
blocks: { blocks: { 'test-usage-key': { topics: ['some-topic-2', 'some-topic-0'] } } },
- config: { userIsPrivileged: true },
+ config: { hasModerationPrivileges: true },
});
store.dispatch(fetchConfigSuccess({}));
Factory.resetAll();
diff --git a/src/discussions/posts/post-editor/PostEditor.jsx b/src/discussions/posts/post-editor/PostEditor.jsx
index 5910a555..fd78dd82 100644
--- a/src/discussions/posts/post-editor/PostEditor.jsx
+++ b/src/discussions/posts/post-editor/PostEditor.jsx
@@ -27,7 +27,8 @@ import {
selectAnonymousPostingConfig,
selectDivisionSettings,
selectModerationSettings,
- selectUserIsPrivileged,
+ selectUserHasModerationPrivileges,
+ selectUserIsGroupTa,
} from '../../data/selectors';
import { selectCoursewareTopics, selectNonCoursewareIds, selectNonCoursewareTopics } from '../../topics/data/selectors';
import {
@@ -96,13 +97,14 @@ function PostEditor({
const coursewareTopics = useSelector(selectCoursewareTopics);
const cohorts = useSelector(selectCourseCohorts);
const post = useSelector(selectThread(postId));
- const userIsPrivileged = useSelector(selectUserIsPrivileged);
+ const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
+ const userIsGroupTa = useSelector(selectUserIsGroupTa);
const settings = useSelector(selectDivisionSettings);
const { allowAnonymous, allowAnonymousToPeers } = useSelector(selectAnonymousPostingConfig);
const { reasonCodesEnabled, editReasons } = useSelector(selectModerationSettings);
const canDisplayEditReason = (reasonCodesEnabled && editExisting
- && userIsPrivileged && post.author !== authenticatedUser.username
+ && (userHasModerationPrivileges || userIsGroupTa) && post?.author !== authenticatedUser.username
);
const editReasonCodeValidation = canDisplayEditReason && {
@@ -112,13 +114,14 @@ function PostEditor({
const canSelectCohort = (tId) => {
// If the user isn't privileged, they can't edit the cohort.
// If the topic is being edited the cohort can't be changed.
- if (!userIsPrivileged || editExisting) {
+ if (!userHasModerationPrivileges) {
return false;
}
if (nonCoursewareIds.includes(tId)) {
return settings.dividedCourseWideDiscussions.includes(tId);
}
- return settings.alwaysDivideInlineDiscussions || settings.dividedInlineDiscussions.includes(tId);
+ const isCohorting = settings.alwaysDivideInlineDiscussions || settings.dividedInlineDiscussions.includes(tId);
+ return isCohorting;
};
const hideEditor = () => {
if (editExisting) {
@@ -166,7 +169,7 @@ function PostEditor({
};
useEffect(() => {
- if (userIsPrivileged && isEmpty(cohorts)) {
+ if (userHasModerationPrivileges && isEmpty(cohorts)) {
dispatch(fetchCourseCohorts(courseId));
}
if (editExisting) {
diff --git a/src/discussions/posts/post-editor/PostEditor.test.jsx b/src/discussions/posts/post-editor/PostEditor.test.jsx
index bc997171..43e04363 100644
--- a/src/discussions/posts/post-editor/PostEditor.test.jsx
+++ b/src/discussions/posts/post-editor/PostEditor.test.jsx
@@ -151,8 +151,7 @@ describe('PostEditor', () => {
config: {
provider: 'legacy',
userRoles: ['Student', 'Moderator'],
- userIsPrivileged: true,
- moderationSettings: {},
+ hasModerationPrivileges: true,
settings: {
dividedInlineDiscussions: dividedcw,
dividedCourseWideDiscussions: dividedncw,
@@ -252,7 +251,7 @@ describe('PostEditor', () => {
});
});
test('test unprivileged user', async () => {
- await setupData({ userIsPrivileged: false });
+ await setupData({ hasModerationPrivileges: false });
await renderComponent();
['ncw-topic 1', 'ncw-topic 2', 'category-1-topic 1', 'category-2-topic 1'].forEach((topicName) => {
act(() => {
@@ -271,9 +270,9 @@ describe('PostEditor', () => {
.toBeInTheDocument();
});
});
- test('edit existing post should not show cohort selector', async () => {
+ test('edit existing post should not show cohort selector to unprivileged users', async () => {
const threadId = 'thread-1';
- await setupData();
+ await setupData({ hasModerationPrivileges: false });
axiosMock.onGet(`${threadsApiUrl}${threadId}/`)
.reply(200, Factory.build('thread'));
await executeThunk(fetchThread(threadId), store.dispatch, store.getState);
@@ -315,10 +314,13 @@ describe('PostEditor', () => {
describe('Edit codes', () => {
const threadId = 'thread-1';
beforeEach(async () => {
+ const dividedncw = ['ncw-topic-2'];
+ const dividedcw = ['category-1-topic-2', 'category-2-topic-1', 'category-2-topic-2'];
+
store = initializeStore({
config: {
provider: 'legacy',
- userIsPrivileged: true,
+ hasModerationPrivileges: true,
reasonCodesEnabled: true,
editReasons: [
{
@@ -330,6 +332,10 @@ describe('PostEditor', () => {
label: 'Reason 2',
},
],
+ settings: {
+ dividedInlineDiscussions: dividedcw,
+ dividedCourseWideDiscussions: dividedncw,
+ },
},
});
await executeThunk(fetchCourseTopics(courseId), store.dispatch, store.getState);
diff --git a/src/discussions/posts/post-filter-bar/PostFilterBar.jsx b/src/discussions/posts/post-filter-bar/PostFilterBar.jsx
index 3ce4e52a..797d9169 100644
--- a/src/discussions/posts/post-filter-bar/PostFilterBar.jsx
+++ b/src/discussions/posts/post-filter-bar/PostFilterBar.jsx
@@ -18,7 +18,7 @@ import {
} from '../../../data/constants';
import { selectCourseCohorts } from '../../cohorts/data/selectors';
import { fetchCourseCohorts } from '../../cohorts/data/thunks';
-import { selectUserIsPrivileged, selectUserIsStaff } from '../../data/selectors';
+import { selectUserHasModerationPrivileges, selectUserIsGroupTa } from '../../data/selectors';
import {
setCohortFilter, setPostsTypeFilter, setSortedBy, setStatusFilter,
} from '../data';
@@ -61,12 +61,12 @@ function PostFilterBar({
}) {
const dispatch = useDispatch();
const { courseId } = useParams();
- const userIsPrivileged = useSelector(selectUserIsPrivileged);
+ const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
+ const userIsGroupTa = useSelector(selectUserIsGroupTa);
const currentSorting = useSelector(selectThreadSorting());
const currentFilters = useSelector(selectThreadFilters());
const { status } = useSelector(state => state.cohorts);
const cohorts = useSelector(selectCourseCohorts);
- const userIsStaff = useSelector(selectUserIsStaff);
const [isOpen, setOpen] = useState(false);
@@ -106,10 +106,10 @@ function PostFilterBar({
};
useEffect(() => {
- if (userIsPrivileged && isEmpty(cohorts)) {
+ if (userHasModerationPrivileges && isEmpty(cohorts)) {
dispatch(fetchCourseCohorts(courseId));
}
- }, [courseId, userIsPrivileged]);
+ }, [courseId, userHasModerationPrivileges]);
return (
- {(userIsPrivileged || userIsStaff) && (
+ {(userHasModerationPrivileges || userIsGroupTa) && (
- {userIsPrivileged && (
+ {userHasModerationPrivileges && (
<>
{status === RequestStatus.IN_PROGRESS ? (
diff --git a/src/discussions/posts/post/PostFooter.jsx b/src/discussions/posts/post/PostFooter.jsx
index 0b9b2095..a855222b 100644
--- a/src/discussions/posts/post/PostFooter.jsx
+++ b/src/discussions/posts/post/PostFooter.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
import * as timeago from 'timeago.js';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
@@ -20,6 +20,7 @@ import {
StarOutline,
} from '../../../components/icons';
import timeLocale from '../../common/time-locale';
+import { selectUserHasModerationPrivileges } from '../../data/selectors';
import { updateExistingThread } from '../data/thunks';
import LikeButton from './LikeButton';
import messages from './messages';
@@ -31,6 +32,7 @@ function PostFooter({
preview,
}) {
const dispatch = useDispatch();
+ const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
timeago.register('time-locale', timeLocale);
return (
@@ -77,7 +79,7 @@ function PostFooter({
)}
- {post.groupId && (
+ {post.groupId && userHasModerationPrivileges && (
<>
{
roles: [],
},
});
- store = initializeStore();
+ store = initializeStore({
+ config: {
+ hasModerationPrivileges: true,
+ },
+ });
});
it("shows 'x new' badge for new comments", () => {
diff --git a/src/discussions/posts/post/PostLink.jsx b/src/discussions/posts/post/PostLink.jsx
index 3474c179..882907b5 100644
--- a/src/discussions/posts/post/PostLink.jsx
+++ b/src/discussions/posts/post/PostLink.jsx
@@ -2,6 +2,7 @@ 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 { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
@@ -11,6 +12,7 @@ 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';
@@ -40,9 +42,12 @@ 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 = (userHasModerationPrivileges || userIsGroupTa);
return (
<>
@@ -86,7 +91,7 @@ function PostLink({
)}
- {postReported && (
+ {postReported && canSeeReportedBadge && (
{
},
});
store = initializeStore();
+ axiosMock = new MockAdapter(getAuthenticatedHttpClient());
+ axiosMock.onGet(`${courseConfigApiUrl}${courseId}/`).reply(200, {
+ has_moderation_privileges: true,
+ });
+ axiosMock.onGet(`${courseConfigApiUrl}${courseId}/settings`).reply(200, {});
+ await executeThunk(fetchCourseConfig(courseId), store.dispatch, store.getState);
});
- it('has reported text only when abuseFlagged is true', () => {
+ it('has reported text only when abuseFlagged is true', async () => {
renderComponent(mockPost);
expect(screen.queryByTestId('reported-post')).toBeFalsy();
@@ -90,7 +96,9 @@ describe('Post username', () => {
axiosMock = new MockAdapter(getAuthenticatedHttpClient());
axiosMock.onGet(`${courseConfigApiUrl}${courseId}/`).reply(200, {
learners_tab_enabled: true,
+ has_moderation_privileges: true,
});
+ axiosMock.onGet(`${courseConfigApiUrl}${courseId}/settings`).reply(200, {});
await executeThunk(fetchCourseConfig(courseId), store.dispatch, store.getState);
});