Skip to content

Commit

Permalink
fixup! fix: Adds a fix to remove "Add a post" button when discussion …
Browse files Browse the repository at this point in the history
…is restricted
  • Loading branch information
farhaanbukhsh committed Oct 24, 2024
1 parent 6b5b1b1 commit 78fbe14
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
5 changes: 1 addition & 4 deletions src/discussions/data/hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,9 @@ export const useCurrentDiscussionTopic = () => {

export const useUserPostingEnabled = () => {
const isPostingEnabled = useSelector(selectIsPostingEnabled);
const isUserAdmin = useSelector(selectUserIsStaff);
const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
const isUserGroupTA = useSelector(selectUserIsGroupTa);
const isCourseAdmin = useSelector(selectIsCourseAdmin);
const isCourseStaff = useSelector(selectIsCourseStaff);
const isPrivileged = isUserAdmin || userHasModerationPrivileges || isUserGroupTA || isCourseAdmin || isCourseStaff;
const isPrivileged = userHasModerationPrivileges || isUserGroupTA

Check failure on line 225 in src/discussions/data/hooks.js

View workflow job for this annotation

GitHub Actions / tests (18)

Missing semicolon

Check failure on line 225 in src/discussions/data/hooks.js

View workflow job for this annotation

GitHub Actions / tests (20)

Missing semicolon

return (isPostingEnabled || isPrivileged);
};
Expand Down
5 changes: 2 additions & 3 deletions src/discussions/posts/post-actions-bar/PostActionsBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Search from '../../../components/Search';
import { RequestStatus } from '../../../data/constants';
import DiscussionContext from '../../common/context';
import { useUserPostingEnabled } from '../../data/hooks';
import { selectConfigLoadingStatus, selectEnableInContext, selectIsPostingEnabled } from '../../data/selectors';
import { selectConfigLoadingStatus, selectEnableInContext } from '../../data/selectors';
import { TopicSearchBar as IncontextSearch } from '../../in-context-topics/topic-search';
import { postMessageToParent } from '../../utils';
import { showPostEditor } from '../data';
Expand All @@ -26,7 +26,6 @@ const PostActionsBar = () => {
const dispatch = useDispatch();
const loadingStatus = useSelector(selectConfigLoadingStatus);
const enableInContext = useSelector(selectEnableInContext);
const isPostingEnabled = useSelector(selectIsPostingEnabled);
const isUserPrivilegedInPostingRestriction = useUserPostingEnabled();
const { enableInContextSidebar, page } = useContext(DiscussionContext);

Expand All @@ -50,7 +49,7 @@ const PostActionsBar = () => {
{intl.formatMessage(messages.title)}
</h4>
)}
{loadingStatus === RequestStatus.SUCCESSFUL && isUserPrivilegedInPostingRestriction && isPostingEnabled && (
{loadingStatus === RequestStatus.SUCCESSFUL && isUserPrivilegedInPostingRestriction && (
<>
{!enableInContextSidebar && <div className="border-right border-light-400 mx-3" />}
<Button
Expand Down

0 comments on commit 78fbe14

Please sign in to comment.