fix: resolved linter issues

fix: discussions navigation tab is not sticking to top

src/components/TinyMCEEditor.jsx

@@ -32,6 +32,7 @@ import 'tinymce/plugins/lists';
 import 'tinymce/plugins/emoticons';
 import 'tinymce/plugins/emoticons/js/emojis';
 import 'tinymce/plugins/charmap';
+import 'tinymce/plugins/paste';
 /* eslint import/no-webpack-loader-syntax: off */
 // eslint-disable-next-line import/no-unresolved
 import edxBrandCss from '!!raw-loader!sass-loader!../index.scss';
@@ -100,12 +101,13 @@ export default function TinyMCEEditor(props) {
           skin: false,
           menubar: false,
           branding: false,
+          paste_data_images: false,
           contextmenu: false,
           browser_spellcheck: true,
           a11y_advanced_options: true,
           autosave_interval: '1s',
           autosave_restore_when_empty: false,
-          plugins: 'autoresize autosave codesample link lists image imagetools code emoticons charmap',
+          plugins: 'autoresize autosave codesample link lists image imagetools code emoticons charmap paste',
           toolbar: 'undo redo'
                       + ' | formatselect | bold italic underline'
                       + ' | link blockquote openedx_code image'

src/discussions/comments/CommentsView.jsx

@@ -18,6 +18,7 @@ import {
 import { useDispatchWithState } from '../../data/hooks';
 import { DiscussionContext } from '../common/context';
 import { useIsOnDesktop } from '../data/hooks';
+import { EmptyPage } from '../empty-posts';
 import { Post } from '../posts';
 import { selectThread } from '../posts/data/selectors';
 import { fetchThread, markThreadAsRead } from '../posts/data/thunks';
@@ -133,9 +134,9 @@ DiscussionCommentsView.propTypes = {
 };
 
 function CommentsView({ intl }) {
+  const [isLoading, submitDispatch] = useDispatchWithState();
   const { postId } = useParams();
   const thread = usePost(postId);
-  const dispatch = useDispatch();
   const history = useHistory();
   const location = useLocation();
   const isOnDesktop = useIsOnDesktop();
@@ -143,8 +144,16 @@ function CommentsView({ intl }) {
     courseId, learnerUsername, category, topicId, page, inContext,
   } = useContext(DiscussionContext);
 
+  useEffect(() => {
+    if (!thread) { submitDispatch(fetchThread(postId, courseId, true)); }
+  }, [postId]);
+
   if (!thread) {
-    dispatch(fetchThread(postId, true));
+    if (!isLoading) {
+      return (
+        <EmptyPage title={intl.formatMessage(messages.noThreadFound)} />
+      );
+    }
     return (
       <Spinner animation="border" variant="primary" data-testid="loading-indicator" />
     );

src/discussions/comments/CommentsView.test.jsx

@@ -102,7 +102,7 @@ function renderComponent(postId) {
 }
 
 describe('CommentsView', () => {
-  beforeEach(async () => {
+  beforeEach(() => {
     initializeMockApp({
       authenticatedUser: {
         userId: 3,
@@ -147,7 +147,7 @@ describe('CommentsView', () => {
         )];
       });
 
-    await executeThunk(fetchThreads(courseId), store.dispatch, store.getState);
+    executeThunk(fetchThreads(courseId), store.dispatch, store.getState);
     mockAxiosReturnPagedComments();
     mockAxiosReturnPagedCommentsResponses();
   });
@@ -381,6 +381,7 @@ describe('CommentsView', () => {
       });
       expect(testLocation.pathname).toBe(`/${courseId}/posts/${discussionPostId}/edit`);
     });
+
     it('should allow pinning the post', async () => {
       renderComponent(discussionPostId);
       await act(async () => {
@@ -394,6 +395,7 @@ describe('CommentsView', () => {
       });
       assertLastUpdateData({ pinned: false });
     });
+
     it('should allow reporting the post', async () => {
       renderComponent(discussionPostId);
       await act(async () => {
@@ -405,6 +407,11 @@ describe('CommentsView', () => {
       await act(async () => {
         fireEvent.click(screen.getByRole('button', { name: /report/i }));
       });
+      expect(screen.queryByRole('dialog', { name: /Report \w+/i, exact: false })).toBeInTheDocument();
+      await act(async () => {
+        fireEvent.click(screen.queryByRole('button', { name: /Confirm/i }));
+      });
+      expect(screen.queryByRole('dialog', { name: /Report \w+/i, exact: false })).not.toBeInTheDocument();
       assertLastUpdateData({ abuse_flagged: true });
     });
 
@@ -423,12 +430,8 @@ describe('CommentsView', () => {
       expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ voted: true });
     });
 
-    it.each([
-      ['endorsing comments', 'Endorse', { endorsed: true }],
-      ['reporting comments', 'Report', { abuse_flagged: true }],
-    ])('handles %s', async (label, buttonLabel, patchData) => {
+    it('handles endorsing comments', async () => {
       renderComponent(discussionPostId);
-
       // Wait for the content to load
       await screen.findByText('comment number 7', { exact: false });
 
@@ -438,20 +441,45 @@ describe('CommentsView', () => {
       await act(async () => {
         fireEvent.click(actionButtons[1]);
       });
+
       await act(async () => {
-        fireEvent.click(screen.getByRole('button', { name: buttonLabel }));
+        fireEvent.click(screen.getByRole('button', { name: /Endorse/i }));
       });
       expect(axiosMock.history.patch).toHaveLength(2);
-      expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject(patchData);
+      expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ endorsed: true });
+    });
+
+    it('handles reporting comments', async () => {
+      renderComponent(discussionPostId);
+      // Wait for the content to load
+      await screen.findByText('comment number 7', { exact: false });
+
+      // There should be three buttons, one for the post, the second for the
+      // comment and the third for a response to that comment
+      const actionButtons = screen.queryAllByRole('button', { name: /actions menu/i });
+      await act(async () => {
+        fireEvent.click(actionButtons[1]);
+      });
+
+      await act(async () => {
+        fireEvent.click(screen.getByRole('button', { name: /Report/i }));
+      });
+      expect(screen.queryByRole('dialog', { name: /Report \w+/i, exact: false })).toBeInTheDocument();
+      await act(async () => {
+        fireEvent.click(screen.queryByRole('button', { name: /Confirm/i }));
+      });
+      expect(screen.queryByRole('dialog', { name: /Report \w+/i, exact: false })).not.toBeInTheDocument();
+      expect(axiosMock.history.patch).toHaveLength(2);
+      expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ abuse_flagged: true });
     });
   });
 
   describe('for discussion thread', () => {
     const findLoadMoreCommentsButton = () => screen.findByTestId('load-more-comments');
 
-    it('shown spinner when post isn\'t loaded', async () => {
+    it('shown post not found when post id does not belong to course', async () => {
       renderComponent('unloaded-id');
-      expect(await screen.findByTestId('loading-indicator'))
+      expect(await screen.findByText('Thread not found', { exact: true }))
         .toBeInTheDocument();
     });
 
@@ -624,12 +652,8 @@ describe('CommentsView', () => {
       expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ voted: true });
     });
 
-    it.each([
-      ['endorsing comments', 'Endorse', { endorsed: true }],
-      ['reporting comments', 'Report', { abuse_flagged: true }],
-    ])('handles %s', async (label, buttonLabel, patchData) => {
+    it('handles endorsing comments', async () => {
       renderComponent(discussionPostId);
-
       // Wait for the content to load
       await screen.findByText('comment number 7', { exact: false });
 
@@ -639,11 +663,36 @@ describe('CommentsView', () => {
       await act(async () => {
         fireEvent.click(actionButtons[1]);
       });
+
       await act(async () => {
-        fireEvent.click(screen.getByRole('button', { name: buttonLabel }));
+        fireEvent.click(screen.getByRole('button', { name: /Endorse/i }));
       });
       expect(axiosMock.history.patch).toHaveLength(2);
-      expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject(patchData);
+      expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ endorsed: true });
+    });
+
+    it('handles reporting comments', async () => {
+      renderComponent(discussionPostId);
+      // Wait for the content to load
+      await screen.findByText('comment number 7', { exact: false });
+
+      // There should be three buttons, one for the post, the second for the
+      // comment and the third for a response to that comment
+      const actionButtons = screen.queryAllByRole('button', { name: /actions menu/i });
+      await act(async () => {
+        fireEvent.click(actionButtons[1]);
+      });
+
+      await act(async () => {
+        fireEvent.click(screen.getByRole('button', { name: /Report/i }));
+      });
+      expect(screen.queryByRole('dialog', { name: /Report \w+/i, exact: false })).toBeInTheDocument();
+      await act(async () => {
+        fireEvent.click(screen.queryByRole('button', { name: /Confirm/i }));
+      });
+      expect(screen.queryByRole('dialog', { name: /Report \w+/i, exact: false })).not.toBeInTheDocument();
+      expect(axiosMock.history.patch).toHaveLength(2);
+      expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ abuse_flagged: true });
     });
   });
 

src/discussions/comments/comment/Comment.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 
 import classNames from 'classnames';
@@ -9,10 +9,10 @@ import { Button, useToggle } from '@edx/paragon';
 
 import HTMLLoader from '../../../components/HTMLLoader';
 import { ContentActions } from '../../../data/constants';
-import { AlertBanner, DeleteConfirmation, EndorsedAlertBanner } from '../../common';
-import { selectBlackoutDate } from '../../data/selectors';
+import { AlertBanner, Confirmation, EndorsedAlertBanner } from '../../common';
+import { DiscussionContext } from '../../common/context';
+import { useUserCanAddThreadInBlackoutDate } from '../../data/hooks';
 import { fetchThread } from '../../posts/data/thunks';
-import { inBlackoutDateRange } from '../../utils';
 import CommentIcons from '../comment-icons/CommentIcons';
 import { selectCommentCurrentPage, selectCommentHasMorePages, selectCommentResponses } from '../data/selectors';
 import { editComment, fetchCommentResponses, removeComment } from '../data/thunks';
@@ -35,11 +35,14 @@ function Comment({
   const inlineReplies = useSelector(selectCommentResponses(comment.id));
   const [isEditing, setEditing] = useState(false);
   const [isDeleting, showDeleteConfirmation, hideDeleteConfirmation] = useToggle(false);
+  const [isReporting, showReportConfirmation, hideReportConfirmation] = useToggle(false);
   const [isReplying, setReplying] = useState(false);
   const hasMorePages = useSelector(selectCommentHasMorePages(comment.id));
   const currentPage = useSelector(selectCommentCurrentPage(comment.id));
-  const blackoutDateRange = useSelector(selectBlackoutDate);
-
+  const userCanAddThreadInBlackoutDate = useUserCanAddThreadInBlackoutDate();
+  const {
+    courseId,
+  } = useContext(DiscussionContext);
   useEffect(() => {
     // If the comment has a parent comment, it won't have any children, so don't fetch them.
     if (hasChildren && !currentPage && showFullThread) {
@@ -47,14 +50,32 @@ function Comment({
     }
   }, [comment.id]);
 
+  const handleAbusedFlag = () => {
+    if (comment.abuseFlagged) {
+      dispatch(editComment(comment.id, { flagged: !comment.abuseFlagged }));
+    } else {
+      showReportConfirmation();
+    }
+  };
+
+  const handleDeleteConfirmation = () => {
+    dispatch(removeComment(comment.id));
+    hideDeleteConfirmation();
+  };
+
+  const handleReportConfirmation = () => {
+    dispatch(editComment(comment.id, { flagged: !comment.abuseFlagged }));
+    hideReportConfirmation();
+  };
+
   const actionHandlers = {
     [ContentActions.EDIT_CONTENT]: () => setEditing(true),
     [ContentActions.ENDORSE]: async () => {
       await dispatch(editComment(comment.id, { endorsed: !comment.endorsed }, ContentActions.ENDORSE));
-      await dispatch(fetchThread(comment.threadId));
+      await dispatch(fetchThread(comment.threadId, courseId));
     },
     [ContentActions.DELETE]: showDeleteConfirmation,
-    [ContentActions.REPORT]: () => dispatch(editComment(comment.id, { flagged: !comment.abuseFlagged })),
+    [ContentActions.REPORT]: () => handleAbusedFlag(),
   };
 
   const handleLoadMoreComments = () => (
@@ -64,16 +85,25 @@ function Comment({
   return (
     <div className={classNames({ 'py-2 my-3': showFullThread })}>
       <div className="d-flex flex-column card" data-testid={`comment-${comment.id}`} role="listitem">
-        <DeleteConfirmation
+        <Confirmation
           isOpen={isDeleting}
           title={intl.formatMessage(messages.deleteResponseTitle)}
           description={intl.formatMessage(messages.deleteResponseDescription)}
           onClose={hideDeleteConfirmation}
-          onDelete={() => {
-            dispatch(removeComment(comment.id));
-            hideDeleteConfirmation();
-          }}
+          comfirmAction={handleDeleteConfirmation}
+          closeButtonVaraint="tertiary"
+          confirmButtonText={intl.formatMessage(messages.deleteConfirmationDelete)}
         />
+        {!comment.abuseFlagged && (
+          <Confirmation
+            isOpen={isReporting}
+            title={intl.formatMessage(messages.reportResponseTitle)}
+            description={intl.formatMessage(messages.reportResponseDescription)}
+            onClose={hideReportConfirmation}
+            comfirmAction={handleReportConfirmation}
+            confirmButtonVariant="danger"
+          />
+        )}
         <EndorsedAlertBanner postType={postType} content={comment} />
         <div className="d-flex flex-column p-4.5">
           <AlertBanner content={comment} />
@@ -127,18 +157,18 @@ function Comment({
               />
             ) : (
               <>
-                {(!isClosedPost && !inBlackoutDateRange(blackoutDateRange))
+                {!isClosedPost && userCanAddThreadInBlackoutDate
                   && (
-                    <Button
-                      className="d-flex flex-grow mt-3 py-2 font-size-14"
-                      variant="outline-primary"
-                      style={{
-                        lineHeight: '20px',
-                      }}
-                      onClick={() => setReplying(true)}
-                    >
-                      {intl.formatMessage(messages.addComment)}
-                    </Button>
+                  <Button
+                    className="d-flex flex-grow mt-3 py-2 font-size-14"
+                    variant="outline-primary"
+                    style={{
+                      lineHeight: '20px',
+                    }}
+                    onClick={() => setReplying(true)}
+                  >
+                    {intl.formatMessage(messages.addComment)}
+                  </Button>
                   )}
               </>
 

src/discussions/comments/comment/Reply.jsx

@@ -10,7 +10,7 @@ import { Avatar, useToggle } from '@edx/paragon';
 import HTMLLoader from '../../../components/HTMLLoader';
 import { AvatarOutlineAndLabelColors, ContentActions } from '../../../data/constants';
 import {
-  ActionsDropdown, AlertBanner, AuthorLabel, DeleteConfirmation,
+  ActionsDropdown, AlertBanner, AuthorLabel, Confirmation,
 } from '../../common';
 import timeLocale from '../../common/time-locale';
 import { useAlertBannerVisible } from '../../data/hooks';
@@ -29,6 +29,26 @@ function Reply({
   const dispatch = useDispatch();
   const [isEditing, setEditing] = useState(false);
   const [isDeleting, showDeleteConfirmation, hideDeleteConfirmation] = useToggle(false);
+  const [isReporting, showReportConfirmation, hideReportConfirmation] = useToggle(false);
+
+  const handleAbusedFlag = () => {
+    if (reply.abuseFlagged) {
+      dispatch(editComment(reply.id, { flagged: !reply.abuseFlagged }));
+    } else {
+      showReportConfirmation();
+    }
+  };
+
+  const handleDeleteConfirmation = () => {
+    dispatch(removeComment(reply.id));
+    hideDeleteConfirmation();
+  };
+
+  const handleReportConfirmation = () => {
+    dispatch(editComment(reply.id, { flagged: !reply.abuseFlagged }));
+    hideReportConfirmation();
+  };
+
   const actionHandlers = {
     [ContentActions.EDIT_CONTENT]: () => setEditing(true),
     [ContentActions.ENDORSE]: () => dispatch(editComment(
@@ -37,7 +57,7 @@ function Reply({
       ContentActions.ENDORSE,
     )),
     [ContentActions.DELETE]: showDeleteConfirmation,
-    [ContentActions.REPORT]: () => dispatch(editComment(reply.id, { flagged: !reply.abuseFlagged })),
+    [ContentActions.REPORT]: () => handleAbusedFlag(),
   };
   const authorAvatars = useSelector(selectAuthorAvatars(reply.author));
   const colorClass = AvatarOutlineAndLabelColors[reply.authorLabel];
@@ -45,17 +65,25 @@ function Reply({
 
   return (
     <div className="d-flex flex-column mt-4.5" data-testid={`reply-${reply.id}`} role="listitem">
-      <DeleteConfirmation
+      <Confirmation
         isOpen={isDeleting}
         title={intl.formatMessage(messages.deleteCommentTitle)}
         description={intl.formatMessage(messages.deleteCommentDescription)}
         onClose={hideDeleteConfirmation}
-        onDelete={() => {
-          dispatch(removeComment(reply.id));
-          hideDeleteConfirmation();
-        }}
+        comfirmAction={handleDeleteConfirmation}
+        closeButtonVaraint="tertiary"
+        confirmButtonText={intl.formatMessage(messages.deleteConfirmationDelete)}
       />
-
+      {!reply.abuseFlagged && (
+        <Confirmation
+          isOpen={isReporting}
+          title={intl.formatMessage(messages.reportCommentTitle)}
+          description={intl.formatMessage(messages.reportCommentDescription)}
+          onClose={hideReportConfirmation}
+          comfirmAction={handleReportConfirmation}
+          confirmButtonVariant="danger"
+        />
+      )}
       {hasAnyAlert && (
         <div className="d-flex">
           <div className="d-flex invisible">

src/discussions/comments/comment/ResponseEditor.jsx

@@ -2,14 +2,12 @@ import React, { useContext, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 
 import classNames from 'classnames';
-import { useSelector } from 'react-redux';
 
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Button } from '@edx/paragon';
 
 import { DiscussionContext } from '../../common/context';
-import { selectBlackoutDate } from '../../data/selectors';
-import { inBlackoutDateRange } from '../../utils';
+import { useUserCanAddThreadInBlackoutDate } from '../../data/hooks';
 import messages from '../messages';
 import CommentEditor from './CommentEditor';
 
@@ -20,13 +18,12 @@ function ResponseEditor({
 }) {
   const { inContext } = useContext(DiscussionContext);
   const [addingResponse, setAddingResponse] = useState(false);
+  const userCanAddThreadInBlackoutDate = useUserCanAddThreadInBlackoutDate();
 
   useEffect(() => {
     setAddingResponse(false);
   }, [postId]);
 
-  const blackoutDateRange = useSelector(selectBlackoutDate);
-
   return addingResponse
     ? (
       <div className={classNames({ 'bg-white p-4 mb-4 rounded': addWrappingDiv })}>
@@ -37,7 +34,7 @@ function ResponseEditor({
         />
       </div>
     )
-    : !inBlackoutDateRange(blackoutDateRange) && (
+    : userCanAddThreadInBlackoutDate && (
       <div className={classNames({ 'mb-4': addWrappingDiv }, 'actions d-flex')}>
         <Button
           variant="primary"

src/discussions/comments/messages.js

@@ -148,6 +148,31 @@ const messages = defineMessages({
     defaultMessage: 'Are you sure you want to permanently delete this comment?',
     description: 'Text displayed in confirmation dialog when deleting a comment',
   },
+  deleteConfirmationDelete: {
+    id: 'discussions.delete.confirmation.button.delete',
+    defaultMessage: 'Delete',
+    description: 'Delete button shown on delete confirmation dialog',
+  },
+  reportResponseTitle: {
+    id: 'discussions.editor.response.response.title',
+    defaultMessage: 'Report inappropriate content?',
+    description: 'Title of confirmation dialog shown when reporting a response',
+  },
+  reportResponseDescription: {
+    id: 'discussions.editor.response.description',
+    defaultMessage: 'The discussion moderation team will review this content and take appropriate action.',
+    description: 'Text displayed in confirmation dialog when deleting a response',
+  },
+  reportCommentTitle: {
+    id: 'discussions.editor.report.comment.title',
+    defaultMessage: 'Report inappropriate content?',
+    description: 'Title of confirmation dialog shown when reporting a comment',
+  },
+  reportCommentDescription: {
+    id: 'discussions.editor.report.comment.description',
+    defaultMessage: 'The discussion moderation team will review this content and take appropriate action.',
+    description: 'Text displayed in confirmation dialog when deleting a response',
+  },
   editReasonCode: {
     id: 'discussions.editor.comments.editReasonCode',
     defaultMessage: 'Reason for editing',
@@ -182,6 +207,11 @@ const messages = defineMessages({
     defaultMessage: '{time} ago',
     description: 'Time text for endorse banner',
   },
+  noThreadFound: {
+    id: 'discussion.thread.notFound',
+    defaultMessage: 'Thread not found',
+    description: 'message to show on screen if the request thread is not found in course',
+  },
 });
 
 export default messages;

src/discussions/common/ActionsDropdown.jsx

@@ -52,37 +52,39 @@ function ActionsDropdown({
         size="sm"
         ref={setTarget}
       />
-      <ModalPopup
-        onClose={close}
-        positionRef={target}
-        isOpen={isOpen}
-        placement={inContext ? 'left' : 'auto-start'}
-      >
-        <div
-          className="bg-white p-1 shadow d-flex flex-column"
-          data-testid="actions-dropdown-modal-popup"
+      <div className="actions-dropdown">
+        <ModalPopup
+          onClose={close}
+          positionRef={target}
+          isOpen={isOpen}
+          placement={inContext ? 'left' : 'auto-start'}
         >
-          {actions.map(action => (
-            <React.Fragment key={action.id}>
-              {action.action === ContentActions.DELETE
+          <div
+            className="bg-white p-1 shadow d-flex flex-column"
+            data-testid="actions-dropdown-modal-popup"
+          >
+            {actions.map(action => (
+              <React.Fragment key={action.id}>
+                {(action.action === ContentActions.DELETE)
               && <Dropdown.Divider />}
 
-              <Dropdown.Item
-                as={Button}
-                variant="tertiary"
-                size="inline"
-                onClick={() => {
-                  close();
-                  handleActions(action.action);
-                }}
-                className="d-flex justify-content-start py-1.5 mr-4"
-              >
-                <Icon src={action.icon} className="mr-1" /> {intl.formatMessage(action.label)}
-              </Dropdown.Item>
-            </React.Fragment>
-          ))}
-        </div>
-      </ModalPopup>
+                <Dropdown.Item
+                  as={Button}
+                  variant="tertiary"
+                  size="inline"
+                  onClick={() => {
+                    close();
+                    handleActions(action.action);
+                  }}
+                  className="d-flex justify-content-start py-1.5 mr-4"
+                >
+                  <Icon src={action.icon} className="mr-1" /> {intl.formatMessage(action.label)}
+                </Dropdown.Item>
+              </React.Fragment>
+            ))}
+          </div>
+        </ModalPopup>
+      </div>
     </>
   );
 }

src/discussions/common/AlertBanner.jsx

@@ -6,7 +6,7 @@ import { useSelector } from 'react-redux';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Alert } from '@edx/paragon';
-import { Error } from '@edx/paragon/icons';
+import { Report } from '@edx/paragon/icons';
 
 import { commentShape } from '../comments/comment/proptypes';
 import messages from '../comments/messages';
@@ -28,7 +28,7 @@ function AlertBanner({
   return (
     <>
       {canSeeReportedBanner && (
-        <Alert icon={Error} variant="danger" className="px-3 mb-2 py-10px shadow-none flex-fill">
+        <Alert icon={Report} variant="danger" className="px-3 mb-2 py-10px shadow-none flex-fill">
           {intl.formatMessage(messages.abuseFlaggedMessage)}
         </Alert>
       )}

src/discussions/common/Confirmation.jsx

@@ -6,13 +6,16 @@ import { ActionRow, Button, ModalDialog } from '@edx/paragon';
 
 import messages from '../messages';
 
-function DeleteConfirmation({
+function Confirmation({
   intl,
   isOpen,
   title,
   description,
   onClose,
-  onDelete,
+  comfirmAction,
+  closeButtonVaraint,
+  confirmButtonVariant,
+  confirmButtonText,
 }) {
   return (
     <ModalDialog title={title} isOpen={isOpen} hasCloseButton={false} onClose={onClose} zIndex={5000}>
@@ -26,11 +29,11 @@ function DeleteConfirmation({
       </ModalDialog.Body>
       <ModalDialog.Footer>
         <ActionRow>
-          <ModalDialog.CloseButton variant="tertiary">
-            {intl.formatMessage(messages.deleteConfirmationCancel)}
+          <ModalDialog.CloseButton variant={closeButtonVaraint}>
+            {intl.formatMessage(messages.confirmationCancel)}
           </ModalDialog.CloseButton>
-          <Button variant="primary" onClick={onDelete}>
-            {intl.formatMessage(messages.deleteConfirmationDelete)}
+          <Button variant={confirmButtonVariant} onClick={comfirmAction}>
+            { confirmButtonText || intl.formatMessage(messages.confirmationConfirm)}
           </Button>
         </ActionRow>
       </ModalDialog.Footer>
@@ -38,13 +41,22 @@ function DeleteConfirmation({
   );
 }
 
-DeleteConfirmation.propTypes = {
+Confirmation.propTypes = {
   intl: intlShape.isRequired,
   isOpen: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,
-  onDelete: PropTypes.func.isRequired,
+  comfirmAction: PropTypes.func.isRequired,
   title: PropTypes.string.isRequired,
   description: PropTypes.string.isRequired,
+  closeButtonVaraint: PropTypes.string,
+  confirmButtonVariant: PropTypes.string,
+  confirmButtonText: PropTypes.string,
 };
 
-export default injectIntl(DeleteConfirmation);
+Confirmation.defaultProps = {
+  closeButtonVaraint: 'default',
+  confirmButtonVariant: 'primary',
+  confirmButtonText: '',
+};
+
+export default injectIntl(Confirmation);

src/discussions/common/index.js

@@ -1,5 +1,5 @@
 export { default as ActionsDropdown } from './ActionsDropdown';
 export { default as AlertBanner } from './AlertBanner';
 export { default as AuthorLabel } from './AuthorLabel';
-export { default as DeleteConfirmation } from './DeleteConfirmation';
+export { default as Confirmation } from './Confirmation';
 export { default as EndorsedAlertBanner } from './EndorsedAlertBanner';

src/discussions/data/hooks.js

@@ -10,20 +10,26 @@ import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { AppContext } from '@edx/frontend-platform/react';
 import { breakpoints, useWindowSize } from '@edx/paragon';
 
-import { Routes } from '../../data/constants';
+import { RequestStatus, Routes } from '../../data/constants';
 import { selectTopicsUnderCategory } from '../../data/selectors';
 import { fetchCourseBlocks } from '../../data/thunks';
 import { DiscussionContext } from '../common/context';
 import { clearRedirect } from '../posts/data';
-import { selectTopics } from '../topics/data/selectors';
+import { threadsLoadingStatus } from '../posts/data/selectors';
+import { selectTopics, topicsLoadingStatus } from '../topics/data/selectors';
 import { fetchCourseTopics } from '../topics/data/thunks';
-import { discussionsPath } from '../utils';
+import { discussionsPath, inBlackoutDateRange } from '../utils';
 import {
-  selectAreThreadsFiltered, selectLearnersTabEnabled,
+  selectAreThreadsFiltered,
+  selectBlackoutDate,
+  selectIsCourseAdmin,
+  selectIsCourseStaff,
+  selectLearnersTabEnabled,
   selectModerationSettings,
   selectPostThreadCount,
   selectUserHasModerationPrivileges,
   selectUserIsGroupTa,
+  selectUserIsStaff,
 } from './selectors';
 import { fetchCourseConfig } from './thunks';
 
@@ -43,14 +49,27 @@ export function useTotalTopicThreadCount() {
 export const useSidebarVisible = () => {
   const isFiltered = useSelector(selectAreThreadsFiltered);
   const totalThreads = useSelector(selectPostThreadCount);
-  const isViewingTopics = useRouteMatch(Routes.TOPICS.PATH);
+  const threadsCallStatus = useSelector(threadsLoadingStatus);
+  const isViewingSpecificTopic = useRouteMatch(Routes.TOPICS.TOPIC);
+  const isViewingTopics = useRouteMatch(Routes.TOPICS.ALL);
   const isViewingLearners = useRouteMatch(Routes.LEARNERS.PATH);
+  const topicsLoading = useSelector(topicsLoadingStatus);
+
+  if (
+    isViewingSpecificTopic
+    && isViewingSpecificTopic.isExact
+    && totalThreads > 0
+    && topicsLoading === RequestStatus.SUCCESSFUL
+    && threadsCallStatus === RequestStatus.SUCCESSFUL
+  ) {
+    return false;
+  }
 
   if (isFiltered) {
     return true;
   }
 
-  if (isViewingTopics || isViewingLearners) {
+  if ((isViewingTopics && isViewingTopics.isExact) || isViewingLearners) {
     return true;
   }
 
@@ -97,7 +116,7 @@ export function useRedirectToThread(courseId, inContext) {
 
 export function useIsOnDesktop() {
   const windowSize = useWindowSize();
-  return windowSize.width >= breakpoints.large.minWidth;
+  return windowSize.width >= breakpoints.medium.minWidth;
 }
 
 export function useIsOnXLDesktop() {
@@ -174,3 +193,16 @@ export const useCurrentDiscussionTopic = () => {
   }
   return null;
 };
+
+export const useUserCanAddThreadInBlackoutDate = () => {
+  const blackoutDateRange = useSelector(selectBlackoutDate);
+  const isUserAdmin = useSelector(selectUserIsStaff);
+  const userHasModerationPrivilages = useSelector(selectUserHasModerationPrivileges);
+  const isUserGroupTA = useSelector(selectUserIsGroupTa);
+  const isCourseAdmin = useSelector(selectIsCourseAdmin);
+  const isCourseStaff = useSelector(selectIsCourseStaff);
+  const isInBlackoutDateRange = inBlackoutDateRange(blackoutDateRange);
+
+  return (!(isInBlackoutDateRange)
+          || (isUserAdmin || userHasModerationPrivilages || isUserGroupTA || isCourseAdmin || isCourseStaff));
+};

src/discussions/data/hooks.test.jsx

@@ -1,15 +1,32 @@
 import { render } from '@testing-library/react';
+import MockAdapter from 'axios-mock-adapter';
 import { IntlProvider } from 'react-intl';
+import { Factory } from 'rosie';
 
 import { initializeMockApp } from '@edx/frontend-platform';
+import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import { AppProvider } from '@edx/frontend-platform/react';
 
 import { initializeStore } from '../../store';
+import { executeThunk } from '../../test-utils';
 import { DiscussionContext } from '../common/context';
-import { useCurrentDiscussionTopic } from './hooks';
+import { courseConfigApiUrl } from './api';
+import { useCurrentDiscussionTopic, useUserCanAddThreadInBlackoutDate } from './hooks';
+import { fetchCourseConfig } from './thunks';
 
+const courseId = 'course-v1:edX+TestX+Test_Course';
 let store;
-initializeMockApp();
+let axiosMock;
+
+const generateApiResponse = (blackouts = [], isCourseAdmin = false) => ({
+  blackouts,
+  hasModerationPrivileges: false,
+  isGroupTa: false,
+  isCourseAdmin,
+  isCourseStaff: false,
+  isUserAdmin: false,
+});
+
 describe('Hooks', () => {
   describe('useCurrentDiscussionTopic', () => {
     function ComponentWithHook() {
@@ -39,6 +56,7 @@ describe('Hooks', () => {
     }
 
     beforeEach(() => {
+      initializeMockApp();
       store = initializeStore({
         blocks: {
           blocks: {
@@ -82,4 +100,75 @@ describe('Hooks', () => {
       expect(queryByText('null')).toBeInTheDocument();
     });
   });
+
+  describe('useUserCanAddThreadInBlackoutDate', () => {
+    function ComponentWithHook() {
+      const userCanAddThreadInBlackoutDate = useUserCanAddThreadInBlackoutDate();
+      return (
+        <div>
+          {String(userCanAddThreadInBlackoutDate)}
+        </div>
+      );
+    }
+
+    function renderComponent() {
+      return render(
+        <IntlProvider locale="en">
+          <AppProvider store={store}>
+            <ComponentWithHook />
+          </AppProvider>
+        </IntlProvider>,
+      );
+    }
+    describe('User can add Thread in blackoutdates ', () => {
+      beforeEach(() => {
+        initializeMockApp({
+          authenticatedUser: {
+            userId: 3,
+            username: 'abc123',
+            administrator: true,
+            roles: [],
+          },
+        });
+        axiosMock = new MockAdapter(getAuthenticatedHttpClient());
+        Factory.resetAll();
+        store = initializeStore();
+      });
+
+      test('when blackoutdates are not active and Role is Learner return true', async () => {
+        axiosMock.onGet(`${courseConfigApiUrl}${courseId}/`)
+          .reply(200, generateApiResponse([], false));
+        await executeThunk(fetchCourseConfig(courseId), store.dispatch, store.getState);
+        const { queryByText } = renderComponent();
+        expect(queryByText('true')).toBeInTheDocument();
+      });
+
+      test('when blackoutdates are not active and Role is not Learner return true', async () => {
+        axiosMock.onGet(`${courseConfigApiUrl}${courseId}/`)
+          .reply(200, generateApiResponse([], true));
+        await executeThunk(fetchCourseConfig(courseId), store.dispatch, store.getState);
+        const { queryByText } = renderComponent();
+        expect(queryByText('true')).toBeInTheDocument();
+      });
+
+      test('when blackoutdates are active and Role is Learner return false', async () => {
+        axiosMock.onGet(`${courseConfigApiUrl}${courseId}/`)
+          .reply(200, generateApiResponse([{
+            start: '2022-11-25T00:00:00Z',
+            end: '2050-11-25T23:59:00Z',
+          }], false));
+        await executeThunk(fetchCourseConfig(courseId), store.dispatch, store.getState);
+        const { queryByText } = renderComponent();
+        expect(queryByText('false')).toBeInTheDocument();
+      });
+
+      test('when blackoutdates are active and Role is not Learner return true', async () => {
+        axiosMock.onGet(`${courseConfigApiUrl}${courseId}/`)
+          .reply(200, generateApiResponse([
+            { start: '2022-11-25T00:00:00Z', end: '2050-11-25T23:59:00Z' }], true));
+        const { queryByText } = renderComponent();
+        expect(queryByText('true')).toBeInTheDocument();
+      });
+    });
+  });
 });

src/discussions/data/selectors.js

@@ -24,6 +24,10 @@ export const selectBlackoutDate = state => state.config.blackouts;
 
 export const selectGroupAtSubsection = state => state.config.groupAtSubsection;
 
+export const selectIsCourseAdmin = state => state.config.isCourseAdmin;
+
+export const selectIsCourseStaff = state => state.config.isCourseStaff;
+
 export const selectModerationSettings = state => ({
   postCloseReasons: state.config.postCloseReasons,
   editReasons: state.config.editReasons,

src/discussions/data/slices.js

@@ -14,6 +14,8 @@ const configSlice = createSlice({
     groupAtSubsection: false,
     hasModerationPrivileges: false,
     isGroupTa: false,
+    isCourseAdmin: false,
+    isCourseStaff: false,
     isUserAdmin: false,
     learnersTabEnabled: false,
     settings: {

src/discussions/learners/learner-post-filter-bar/LearnerPostFilterBar.jsx

@@ -4,6 +4,8 @@ import { isEmpty } from 'lodash';
 import { useDispatch, useSelector } from 'react-redux';
 import { useParams } from 'react-router-dom';
 
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+
 import FilterBar from '../../../components/FilterBar';
 import { selectCourseCohorts } from '../../cohorts/data/selectors';
 import { fetchCourseCohorts } from '../../cohorts/data/thunks';
@@ -39,12 +41,20 @@ function LearnerPostFilterBar() {
 
   const handleFilterChange = (event) => {
     const { name, value } = event.currentTarget;
+    const filterContentEventProperties = {
+      statusFilter: postFilter.status,
+      threadTypeFilter: postFilter.postType,
+      sortFilter: postFilter.orderBy,
+      cohortFilter: postFilter.cohort,
+      triggeredBy: name,
+    };
     if (name === 'postType') {
       if (postFilter.postType !== value) {
         dispatch(setPostFilter({
           ...postFilter,
           postType: value,
         }));
+        filterContentEventProperties.threadTypeFilter = value;
       }
     } else if (name === 'status') {
       if (postFilter.status !== value) {
@@ -52,6 +62,7 @@ function LearnerPostFilterBar() {
           ...postFilter,
           status: value,
         }));
+        filterContentEventProperties.statusFilter = value;
       }
     } else if (name === 'orderBy') {
       if (postFilter.orderBy !== value) {
@@ -59,6 +70,7 @@ function LearnerPostFilterBar() {
           ...postFilter,
           orderBy: value,
         }));
+        filterContentEventProperties.sortFilter = value;
       }
     } else if (name === 'cohort') {
       if (postFilter.cohort !== value) {
@@ -66,8 +78,10 @@ function LearnerPostFilterBar() {
           ...postFilter,
           cohort: value,
         }));
+        filterContentEventProperties.cohortFilter = value;
       }
     }
+    sendTrackEvent('edx.forum.filter.content', filterContentEventProperties);
   };
 
   useEffect(() => {

src/discussions/learners/learner/LearnerFilterBar.jsx

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { useDispatch, useSelector } from 'react-redux';
 
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Collapsible, Form, Icon } from '@edx/paragon';
 import { Check, Tune } from '@edx/paragon/icons';
@@ -58,6 +59,12 @@ function LearnerFilterBar({
 
     if (name === 'sort') {
       dispatch(setSortedBy(value));
+      sendTrackEvent(
+        'edx.forum.sort.user',
+        {
+          sort: value,
+        },
+      );
     }
   };
 

src/discussions/messages.js

@@ -31,6 +31,11 @@ const messages = defineMessages({
     defaultMessage: 'Delete',
     description: 'Action to delete a post or comment',
   },
+  confirmationConfirm: {
+    id: 'discussions.confirmation.button.confirm',
+    defaultMessage: 'Confirm',
+    description: 'Confirm button shown on confirmation dialog',
+  },
   closeAction: {
     id: 'discussions.actions.close',
     defaultMessage: 'Close',
@@ -71,16 +76,11 @@ const messages = defineMessages({
     defaultMessage: 'Unmark as answered',
     description: 'Action to unmark a comment as answering a post',
   },
-  deleteConfirmationCancel: {
-    id: 'discussions.delete.confirmation.button.cancel',
+  confirmationCancel: {
+    id: 'discussions.modal.confirmation.button.cancel',
     defaultMessage: 'Cancel',
     description: 'Cancel button shown on delete confirmation dialog',
   },
-  deleteConfirmationDelete: {
-    id: 'discussions.delete.confirmation.button.delete',
-    defaultMessage: 'Delete',
-    description: 'Delete button shown on delete confirmation dialog',
-  },
   emptyAllTopics: {
     id: 'discussions.empty.allTopics',
     defaultMessage:

src/discussions/posts/PostsList.jsx

@@ -22,7 +22,9 @@ import { fetchThreads } from './data/thunks';
 import NoResults from './NoResults';
 import { PostLink } from './post';
 
-function PostsList({ posts, topics, intl }) {
+function PostsList({
+  posts, topics, intl, isTopicTab,
+}) {
   const dispatch = useDispatch();
   const {
     courseId,
@@ -38,7 +40,7 @@ function PostsList({ posts, topics, intl }) {
   const userIsStaff = useSelector(selectUserIsStaff);
   const configStatus = useSelector(selectconfigLoadingStatus);
 
-  const loadThreads = (topicIds, pageNum = undefined) => {
+  const loadThreads = (topicIds, pageNum = undefined, isFilterChanged = false) => {
     const params = {
       orderBy,
       filters,
@@ -46,6 +48,7 @@ function PostsList({ posts, topics, intl }) {
       author: showOwnPosts ? authenticatedUser.username : null,
       countFlagged: (userHasModerationPrivileges || userIsStaff) || undefined,
       topicIds,
+      isFilterChanged,
     };
 
     if (showOwnPosts) {
@@ -59,7 +62,11 @@ function PostsList({ posts, topics, intl }) {
     if (topics !== undefined && configStatus === RequestStatus.SUCCESSFUL) {
       loadThreads(topics);
     }
-  }, [courseId, orderBy, filters, page, JSON.stringify(topics), configStatus]);
+  }, [courseId, filters, orderBy, page, JSON.stringify(topics), configStatus]);
+
+  useEffect(() => {
+    if (isTopicTab) { loadThreads(topics, 1, true); }
+  }, [filters]);
 
   const checkIsSelected = (id) => window.location.pathname.includes(id);
   const pinnedPosts = useMemo(() => filterPosts(posts, 'pinned'), [posts]);
@@ -103,12 +110,14 @@ PostsList.propTypes = {
     id: PropTypes.string.isRequired,
   })),
   topics: PropTypes.arrayOf(PropTypes.string),
+  isTopicTab: PropTypes.bool,
   intl: intlShape.isRequired,
 };
 
 PostsList.defaultProps = {
   posts: [],
   topics: undefined,
+  isTopicTab: false,
 };
 
 export default injectIntl(PostsList);

src/discussions/posts/PostsView.jsx

@@ -21,7 +21,7 @@ function AllPostsList() {
 
 function TopicPostsList({ topicId }) {
   const posts = useSelector(selectTopicThreads([topicId]));
-  return <PostsList posts={posts} topics={[topicId]} />;
+  return <PostsList posts={posts} topics={[topicId]} isTopicTab />;
 }
 
 TopicPostsList.propTypes = {

src/discussions/posts/PostsView.test.jsx

@@ -112,7 +112,6 @@ describe('PostsView', () => {
       config: { hasModerationPrivileges: true },
       ...data,
     };
-    // console.log(storeData);
     store = initializeStore(storeData);
     store.dispatch(fetchConfigSuccess({}));
   }

src/discussions/posts/data/api.js

@@ -71,8 +71,8 @@ export async function getThreads(
  * @param {string} threadId
  * @returns {Promise<{}>}
  */
-export async function getThread(threadId) {
-  const params = { requested_fields: 'profile_image' };
+export async function getThread(threadId, courseId) {
+  const params = { requested_fields: 'profile_image', course_id: courseId };
   const url = `${threadsApiUrl}${threadId}/`;
   const { data } = await getAuthenticatedHttpClient().get(url, { params });
   return data;

src/discussions/posts/data/slices.js

@@ -79,7 +79,13 @@ const threadsSlice = createSlice({
       }
       state.status = RequestStatus.SUCCESSFUL;
       state.threadsById = { ...state.threadsById, ...payload.threadsById };
-      state.threadsInTopic = mergeThreadsInTopics(state.threadsInTopic, payload.threadsInTopic);
+      // filter
+      if (payload.isFilterChanged) {
+        state.threadsInTopic = { ...payload.threadsInTopic };
+      } else {
+        state.threadsInTopic = mergeThreadsInTopics(state.threadsInTopic, payload.threadsInTopic);
+      }
+
       state.avatars = { ...state.avatars, ...payload.avatars };
       state.nextPage = (payload.page < payload.pagination.numPages) ? payload.page + 1 : null;
       state.totalPages = payload.pagination.numPages;

src/discussions/posts/data/thunks.js

@@ -102,6 +102,7 @@ export function fetchThreads(courseId, {
   author = null,
   filters = {},
   page = 1,
+  isFilterChanged,
   countFlagged,
 } = {}) {
   const options = {
@@ -141,7 +142,7 @@ export function fetchThreads(courseId, {
       const data = await getThreads(courseId, options);
       const normalisedData = normaliseThreads(camelCaseObject(data), topicIds);
       dispatch(fetchThreadsSuccess({
-        ...normalisedData, page, author, textSearchRewrite: data.text_search_rewrite,
+        ...normalisedData, page, author, textSearchRewrite: data.text_search_rewrite, isFilterChanged,
       }));
     } catch (error) {
       if (getHttpErrorStatus(error) === 403) {
@@ -154,18 +155,18 @@ export function fetchThreads(courseId, {
   };
 }
 
-export function fetchThread(threadId, isDirectLinkPost = false) {
+export function fetchThread(threadId, courseId, isDirectLinkPost = false) {
   return async (dispatch) => {
     try {
       dispatch(fetchThreadRequest({ threadId }));
-      const data = await getThread(threadId);
+      const data = await getThread(threadId, courseId);
       if (isDirectLinkPost) {
         dispatch(fetchThreadByDirectLinkSuccess({ ...normaliseThreads(camelCaseObject(data)), page: 1 }));
       } else {
         dispatch(fetchThreadSuccess(normaliseThreads(camelCaseObject(data))));
       }
     } catch (error) {
-      if (getHttpErrorStatus(error) === 403) {
+      if (getHttpErrorStatus(error) === 403 || getHttpErrorStatus(error) === 404) {
         dispatch(fetchThreadDenied());
       } else {
         dispatch(fetchThreadFailed());

src/discussions/posts/post-actions-bar/PostActionsBar.jsx

@@ -12,8 +12,9 @@ import { Close } from '@edx/paragon/icons';
 
 import Search from '../../../components/Search';
 import { RequestStatus } from '../../../data/constants';
-import { selectBlackoutDate, selectconfigLoadingStatus } from '../../data/selectors';
-import { inBlackoutDateRange, postMessageToParent } from '../../utils';
+import { useUserCanAddThreadInBlackoutDate } from '../../data/hooks';
+import { selectconfigLoadingStatus } from '../../data/selectors';
+import { postMessageToParent } from '../../utils';
 import { showPostEditor } from '../data';
 import messages from './messages';
 
@@ -25,7 +26,7 @@ function PostActionsBar({
 }) {
   const dispatch = useDispatch();
   const loadingStatus = useSelector(selectconfigLoadingStatus);
-  const blackoutDateRange = useSelector(selectBlackoutDate);
+  const userCanAddThreadInBlackoutDate = useUserCanAddThreadInBlackoutDate();
 
   const handleCloseInContext = () => {
     postMessageToParent('learning.events.sidebar.close');
@@ -39,7 +40,8 @@ function PostActionsBar({
           {intl.formatMessage(messages.title)}
         </h4>
       )}
-      {(!inBlackoutDateRange(blackoutDateRange) && loadingStatus === RequestStatus.SUCCESSFUL) && (
+      {loadingStatus === RequestStatus.SUCCESSFUL && userCanAddThreadInBlackoutDate
+      && (
         <>
           {!inContext && <div className="border-right border-light-400 mx-3" />}
           <Button

src/discussions/posts/post-editor/PostEditor.jsx

@@ -33,6 +33,7 @@ import {
   selectUserIsGroupTa,
   selectUserIsStaff,
 } from '../../data/selectors';
+import { EmptyPage } from '../../empty-posts';
 import { selectCoursewareTopics, selectNonCoursewareIds, selectNonCoursewareTopics } from '../../topics/data/selectors';
 import {
   discussionsPath, formikCompatibleHandler, isFormikFieldInvalid, useCommentsPagePath,
@@ -193,16 +194,25 @@ function PostEditor({
       dispatch(fetchCourseCohorts(courseId));
     }
     if (editExisting) {
-      dispatch(fetchThread(postId));
+      dispatchSubmit(fetchThread(postId, courseId));
     }
   }, [courseId, editExisting]);
 
   if (editExisting && !post) {
-    return (
-      <div className="m-4 card p-4 align-items-center">
-        <Spinner animation="border" variant="primary" />
-      </div>
-    );
+    if (submitting) {
+      return (
+        <div className="m-4 card p-4 align-items-center">
+          <Spinner animation="border" variant="primary" />
+        </div>
+      );
+    }
+    if (!submitting) {
+      return (
+        <EmptyPage
+          title={intl.formatMessage(messages.noThreadFound)}
+        />
+      );
+    }
   }
 
   const validationSchema = Yup.object().shape({

src/discussions/posts/post-editor/messages.js

@@ -131,6 +131,11 @@ const messages = defineMessages({
     defaultMessage: 'Unnamed subcategory',
     description: 'display string for topics with missing names',
   },
+  noThreadFound: {
+    id: 'discussion.thread.notFound',
+    defaultMessage: 'Thread not found',
+    description: 'message to show on screen if the request thread is not found in course',
+  },
 });
 
 export default messages;

src/discussions/posts/post-filter-bar/PostFilterBar.jsx

@@ -8,6 +8,7 @@ import { capitalize, isEmpty, toString } from 'lodash';
 import { useDispatch, useSelector } from 'react-redux';
 import { useParams } from 'react-router-dom';
 
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
   Collapsible, Form, Icon, Spinner,
@@ -84,6 +85,13 @@ function PostFilterBar({
       name,
       value,
     } = event.currentTarget;
+    const filterContentEventProperties = {
+      statusFilter: currentStatus,
+      threadTypeFilter: currentType,
+      sortFilter: currentSorting,
+      cohortFilter: selectedCohort,
+      triggeredBy: name,
+    };
     if (name === 'type') {
       dispatch(setPostsTypeFilter(value));
       if (
@@ -92,6 +100,7 @@ function PostFilterBar({
         // You can't filter discussions by unanswered
         dispatch(setStatusFilter(PostsStatusFilter.ALL));
       }
+      filterContentEventProperties.threadTypeFilter = value;
     }
     if (name === 'status') {
       dispatch(setStatusFilter(value));
@@ -103,13 +112,17 @@ function PostFilterBar({
         // You can't filter questions by not responded so switch type to discussion
         dispatch(setPostsTypeFilter(ThreadType.DISCUSSION));
       }
+      filterContentEventProperties.statusFilter = value;
     }
     if (name === 'sort') {
       dispatch(setSortedBy(value));
+      filterContentEventProperties.sortFilter = value;
     }
     if (name === 'cohort') {
       dispatch(setCohortFilter(value));
+      filterContentEventProperties.cohortFilter = value;
     }
+    sendTrackEvent('edx.forum.filter.content', filterContentEventProperties);
   };
 
   useEffect(() => {

src/discussions/posts/post/Post.jsx

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 
+import classNames from 'classnames';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory, useLocation } from 'react-router-dom';
 
@@ -10,7 +11,8 @@ import { Hyperlink, useToggle } from '@edx/paragon';
 import HTMLLoader from '../../../components/HTMLLoader';
 import { ContentActions } from '../../../data/constants';
 import { selectorForUnitSubsection, selectTopicContext } from '../../../data/selectors';
-import { AlertBanner, DeleteConfirmation } from '../../common';
+import { AlertBanner, Confirmation } from '../../common';
+import { DiscussionContext } from '../../common/context';
 import { selectModerationSettings } from '../../data/selectors';
 import { selectTopic } from '../../topics/data/selectors';
 import { removeThread, updateExistingThread } from '../data/thunks';
@@ -34,7 +36,29 @@ function Post({
   const topicContext = useSelector(selectTopicContext(post.topicId));
   const { reasonCodesEnabled } = useSelector(selectModerationSettings);
   const [isDeleting, showDeleteConfirmation, hideDeleteConfirmation] = useToggle(false);
+  const [isReporting, showReportConfirmation, hideReportConfirmation] = useToggle(false);
   const [isClosing, showClosePostModal, hideClosePostModal] = useToggle(false);
+
+  const handleAbusedFlag = () => {
+    if (post.abuseFlagged) {
+      dispatch(updateExistingThread(post.id, { flagged: !post.abuseFlagged }));
+    } else {
+      showReportConfirmation();
+    }
+  };
+
+  const handleDeleteConfirmation = () => {
+    dispatch(removeThread(post.id));
+    history.push('.');
+    hideDeleteConfirmation();
+  };
+
+  const handleReportConfirmation = () => {
+    dispatch(updateExistingThread(post.id, { flagged: !post.abuseFlagged }));
+    hideReportConfirmation();
+  };
+
+  const { inContext } = useContext(DiscussionContext);
   const actionHandlers = {
     [ContentActions.EDIT_CONTENT]: () => history.push({
       ...location,
@@ -52,7 +76,7 @@ function Post({
     },
     [ContentActions.COPY_LINK]: () => { navigator.clipboard.writeText(`${window.location.origin}/${courseId}/posts/${post.id}`); },
     [ContentActions.PIN]: () => dispatch(updateExistingThread(post.id, { pinned: !post.pinned })),
-    [ContentActions.REPORT]: () => dispatch(updateExistingThread(post.id, { flagged: !post.abuseFlagged })),
+    [ContentActions.REPORT]: () => handleAbusedFlag(),
   };
 
   const getTopicCategoryName = topicData => (
@@ -61,30 +85,50 @@ function Post({
 
   return (
     <div className="d-flex flex-column w-100 mw-100" data-testid={`post-${post.id}`}>
-      <DeleteConfirmation
+      <Confirmation
         isOpen={isDeleting}
         title={intl.formatMessage(messages.deletePostTitle)}
         description={intl.formatMessage(messages.deletePostDescription)}
         onClose={hideDeleteConfirmation}
-        onDelete={() => {
-          dispatch(removeThread(post.id));
-          history.push('.');
-          hideDeleteConfirmation();
-        }}
+        comfirmAction={handleDeleteConfirmation}
+        closeButtonVaraint="tertiary"
+        confirmButtonText={intl.formatMessage(messages.deleteConfirmationDelete)}
       />
+      {!post.abuseFlagged && (
+        <Confirmation
+          isOpen={isReporting}
+          title={intl.formatMessage(messages.reportPostTitle)}
+          description={intl.formatMessage(messages.reportPostDescription)}
+          onClose={hideReportConfirmation}
+          comfirmAction={handleReportConfirmation}
+          confirmButtonVariant="danger"
+        />
+      )}
       <AlertBanner content={post} />
       <PostHeader post={post} actionHandlers={actionHandlers} />
       <div className="d-flex mt-4 mb-2 text-break font-style-normal text-primary-500">
         <HTMLLoader htmlNode={post.renderedBody} id="post" />
       </div>
       {topicContext && topic && (
-        <div className="border px-3 rounded mb-4 border-light-400 align-self-start py-2.5">
+        <div className={classNames('border px-3 rounded mb-4 border-light-400 align-self-start py-2.5',
+          { 'w-100': inContext })}
+        >
           <span className="text-gray-500">{intl.formatMessage(messages.relatedTo)}{' '}</span>
           <Hyperlink
             destination={topicContext.unitLink}
             target="_top"
           >
-            {`${getTopicCategoryName(topic)} / ${topic.name}`}
+            {inContext
+              ? (
+                <>
+                  <span className="w-auto">{topicContext.chapterName}</span>
+                  <span className="mx-1">/</span>
+                  <span className="w-auto">{topicContext.verticalName}</span>
+                  <span className="mx-1">/</span>
+                  <span className="w-auto">{topicContext.unitName}</span>
+                </>
+              )
+              : `${getTopicCategoryName(topic)} / ${topic.name}`}
           </Hyperlink>
         </div>
       )}

src/discussions/posts/post/messages.js

@@ -71,6 +71,21 @@ const messages = defineMessages({
     id: 'discussions.editor.delete.post.description',
     defaultMessage: 'Are you sure you want to permanently delete this post?',
   },
+  deleteConfirmationDelete: {
+    id: 'discussions.post.delete.confirmation.button.delete',
+    defaultMessage: 'Delete',
+    description: 'Delete button shown on delete confirmation dialog',
+  },
+  reportPostTitle: {
+    id: 'discussions.editor.report.post.title',
+    defaultMessage: 'Report inappropriate content?',
+    description: 'Title of confirmation dialog shown when reporting a post',
+  },
+  reportPostDescription: {
+    id: 'discussions.editor.report.post.description',
+    defaultMessage: 'The discussion moderation team will review this content and take appropriate action.',
+    description: 'Text displayed in confirmation dialog when deleting a post',
+  },
   closePostModalTitle: {
     id: 'discussions.post.closePostModal.title',
     defaultMessage: 'Close post',

src/i18n/messages/ar.json

@@ -28,6 +28,11 @@
   "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
   "discussions.editor.delete.comment.title": "Delete comment",
   "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
+  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.editor.comments.editReasonCode": "Reason for editing",
   "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
   "discussions.comment.comments.editedBy": "Edited by",
@@ -35,6 +40,7 @@
   "discussions.post.closedBy": "Post closed by",
   "discussion.comment.repliesHeading": "{count} replies for the response added",
   "discussion.comment.time": "{time} ago",
+  "discussion.thread.notFound": "Thread not found",
   "discussions.learner.reported": "{reported} reported",
   "discussions.learner.previouslyReported": "{previouslyReported} previously reported",
   "discussions.learner.lastLogin": "Last active {lastActiveTime}",
@@ -50,6 +56,7 @@
   "discussions.actions.button.alt": "Actions menu",
   "discussions.actions.copylink": "Copy link",
   "discussions.actions.unpin": "Unpin",
+  "discussions.confirmation.button.confirm": "Confirm",
   "discussions.actions.close": "Close",
   "discussions.actions.reopen": "Reopen",
   "discussions.actions.report": "Report",
@@ -58,8 +65,7 @@
   "discussions.actions.unendorse": "Unendorse",
   "discussions.actions.markAnswered": "Mark as answered",
   "discussions.actions.unMarkAnswered": "Unmark as answered",
-  "discussions.delete.confirmation.button.cancel": "Cancel",
-  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.modal.confirmation.button.cancel": "Cancel",
   "discussions.empty.allTopics": "All discussion activity for these topics will show up here.",
   "discussions.empty.allPosts": "All discussion activity for your course will show up here.",
   "discussions.empty.myPosts": "Posts you've interacted with will show up here.",
@@ -158,6 +164,9 @@
   "discussions.post.relatedTo": "Related to",
   "discussions.editor.delete.post.title": "Delete post",
   "discussions.editor.delete.post.description": "Are you sure you want to permanently delete this post?",
+  "discussions.post.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.report.post.title": "Report inappropriate content?",
+  "discussions.editor.report.post.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.post.closePostModal.title": "Close post",
   "discussions.post.closePostModal.text": "Enter a reason for closing this post. This will only be displayed to other moderators.",
   "discussions.post.closePostModal.reasonCodeInput": "Reason",

src/i18n/messages/de_DE.json

@@ -28,6 +28,11 @@
   "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
   "discussions.editor.delete.comment.title": "Delete comment",
   "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
+  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.editor.comments.editReasonCode": "Reason for editing",
   "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
   "discussions.comment.comments.editedBy": "Edited by",
@@ -35,6 +40,7 @@
   "discussions.post.closedBy": "Post closed by",
   "discussion.comment.repliesHeading": "{count} replies for the response added",
   "discussion.comment.time": "{time} ago",
+  "discussion.thread.notFound": "Thread not found",
   "discussions.learner.reported": "{reported} reported",
   "discussions.learner.previouslyReported": "{previouslyReported} previously reported",
   "discussions.learner.lastLogin": "Last active {lastActiveTime}",
@@ -50,6 +56,7 @@
   "discussions.actions.button.alt": "Actions menu",
   "discussions.actions.copylink": "Copy link",
   "discussions.actions.unpin": "Unpin",
+  "discussions.confirmation.button.confirm": "Confirm",
   "discussions.actions.close": "Close",
   "discussions.actions.reopen": "Reopen",
   "discussions.actions.report": "Report",
@@ -58,8 +65,7 @@
   "discussions.actions.unendorse": "Unendorse",
   "discussions.actions.markAnswered": "Mark as answered",
   "discussions.actions.unMarkAnswered": "Unmark as answered",
-  "discussions.delete.confirmation.button.cancel": "Cancel",
-  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.modal.confirmation.button.cancel": "Cancel",
   "discussions.empty.allTopics": "All discussion activity for these topics will show up here.",
   "discussions.empty.allPosts": "All discussion activity for your course will show up here.",
   "discussions.empty.myPosts": "Posts you've interacted with will show up here.",
@@ -158,6 +164,9 @@
   "discussions.post.relatedTo": "Related to",
   "discussions.editor.delete.post.title": "Delete post",
   "discussions.editor.delete.post.description": "Are you sure you want to permanently delete this post?",
+  "discussions.post.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.report.post.title": "Report inappropriate content?",
+  "discussions.editor.report.post.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.post.closePostModal.title": "Close post",
   "discussions.post.closePostModal.text": "Enter a reason for closing this post. This will only be displayed to other moderators.",
   "discussions.post.closePostModal.reasonCodeInput": "Reason",

src/i18n/messages/es_419.json

@@ -28,6 +28,11 @@
   "discussions.editor.delete.response.description": "¿Está seguro de que desea eliminar esta respuesta de forma permanente?",
   "discussions.editor.delete.comment.title": "Eliminar comentario",
   "discussions.editor.delete.comment.description": "¿Estás seguro de que quieres eliminar este comentario de forma permanente?",
+  "discussions.delete.confirmation.button.delete": "Borrar",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.editor.comments.editReasonCode": "Razón de la edición",
   "discussions.editor.posts.editReasonCode.error": "Seleccione el motivo de la edición",
   "discussions.comment.comments.editedBy": "Editado por",
@@ -35,6 +40,7 @@
   "discussions.post.closedBy": "Publicación cerrada por",
   "discussion.comment.repliesHeading": "{count} respuestas para la respuesta añadida",
   "discussion.comment.time": "hace {time}",
+  "discussion.thread.notFound": "Thread not found",
   "discussions.learner.reported": "{reported} informado",
   "discussions.learner.previouslyReported": "{previouslyReported} informado anteriormente",
   "discussions.learner.lastLogin": "Último activo {lastActiveTime}",
@@ -50,6 +56,7 @@
   "discussions.actions.button.alt": "Menú de acciones",
   "discussions.actions.copylink": "Copiar link",
   "discussions.actions.unpin": "Desmarcar",
+  "discussions.confirmation.button.confirm": "Confirm",
   "discussions.actions.close": "Cerrar",
   "discussions.actions.reopen": "Reabrir",
   "discussions.actions.report": "Informar",
@@ -58,8 +65,7 @@
   "discussions.actions.unendorse": "Invalidar",
   "discussions.actions.markAnswered": "Mark as answered",
   "discussions.actions.unMarkAnswered": "Desmarcar como respondida",
-  "discussions.delete.confirmation.button.cancel": "Cancelar",
-  "discussions.delete.confirmation.button.delete": "Borrar",
+  "discussions.modal.confirmation.button.cancel": "Cancel",
   "discussions.empty.allTopics": "Toda la actividad de debate de estos temas se mostrará aquí.",
   "discussions.empty.allPosts": "Toda la actividad de debate de su curso se mostrará aquí.",
   "discussions.empty.myPosts": "Las publicaciones con las que has interactuado se mostrarán aquí.",
@@ -158,6 +164,9 @@
   "discussions.post.relatedTo": "Related to",
   "discussions.editor.delete.post.title": "Eliminar mensaje",
   "discussions.editor.delete.post.description": "¿Seguro que quieres eliminar esta publicación de forma permanente?",
+  "discussions.post.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.report.post.title": "Report inappropriate content?",
+  "discussions.editor.report.post.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.post.closePostModal.title": "Cerrar publicación",
   "discussions.post.closePostModal.text": "Escribe un motivo para cerrar esta publicación. Esto solo se mostrará a otros moderadores.",
   "discussions.post.closePostModal.reasonCodeInput": "Motivo",

src/i18n/messages/fr.json

@@ -28,6 +28,11 @@
   "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
   "discussions.editor.delete.comment.title": "Delete comment",
   "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
+  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.editor.comments.editReasonCode": "Reason for editing",
   "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
   "discussions.comment.comments.editedBy": "Édité par",
@@ -35,6 +40,7 @@
   "discussions.post.closedBy": "Message fermé par",
   "discussion.comment.repliesHeading": "{count} réponses pour la réponse ajoutée",
   "discussion.comment.time": "il y a {time}",
+  "discussion.thread.notFound": "Thread not found",
   "discussions.learner.reported": "{reported} signalé",
   "discussions.learner.previouslyReported": "{previouslyReported} previously reported",
   "discussions.learner.lastLogin": "Last active {lastActiveTime}",
@@ -50,6 +56,7 @@
   "discussions.actions.button.alt": "Actions menu",
   "discussions.actions.copylink": "Copy link",
   "discussions.actions.unpin": "Unpin",
+  "discussions.confirmation.button.confirm": "Confirm",
   "discussions.actions.close": "Close",
   "discussions.actions.reopen": "Reopen",
   "discussions.actions.report": "Report",
@@ -58,8 +65,7 @@
   "discussions.actions.unendorse": "Unendorse",
   "discussions.actions.markAnswered": "Mark as answered",
   "discussions.actions.unMarkAnswered": "Unmark as answered",
-  "discussions.delete.confirmation.button.cancel": "Cancel",
-  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.modal.confirmation.button.cancel": "Cancel",
   "discussions.empty.allTopics": "All discussion activity for these topics will show up here.",
   "discussions.empty.allPosts": "All discussion activity for your course will show up here.",
   "discussions.empty.myPosts": "Posts you've interacted with will show up here.",
@@ -158,6 +164,9 @@
   "discussions.post.relatedTo": "Related to",
   "discussions.editor.delete.post.title": "Delete post",
   "discussions.editor.delete.post.description": "Are you sure you want to permanently delete this post?",
+  "discussions.post.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.report.post.title": "Report inappropriate content?",
+  "discussions.editor.report.post.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.post.closePostModal.title": "Close post",
   "discussions.post.closePostModal.text": "Enter a reason for closing this post. This will only be displayed to other moderators.",
   "discussions.post.closePostModal.reasonCodeInput": "Reason",

src/i18n/messages/fr_CA.json

@@ -28,6 +28,11 @@
   "discussions.editor.delete.response.description": "Êtes-vous sûr de vouloir supprimer définitivement cette réponse ?",
   "discussions.editor.delete.comment.title": "Supprimer le commentaire",
   "discussions.editor.delete.comment.description": "Êtes-vous sûr de vouloir supprimer définitivement ce commentaire ?",
+  "discussions.delete.confirmation.button.delete": "Supprimer",
+  "discussions.editor.response.response.title": "Signaler un contenu inapproprié ?",
+  "discussions.editor.response.description": "L'équipe de modération de la discussion examinera ce contenu et prendra les mesures appropriées.",
+  "discussions.editor.report.comment.title": "Signaler un contenu inapproprié ?",
+  "discussions.editor.report.comment.description": "L'équipe de modération de la discussion examinera ce contenu et prendra les mesures appropriées.",
   "discussions.editor.comments.editReasonCode": "Raison de la modification",
   "discussions.editor.posts.editReasonCode.error": "Sélectionnez la raison de la modification",
   "discussions.comment.comments.editedBy": "Édité par",
@@ -35,6 +40,7 @@
   "discussions.post.closedBy": "Message fermé par",
   "discussion.comment.repliesHeading": "{count} réponses pour la réponse ajoutée",
   "discussion.comment.time": "il y a {time}",
+  "discussion.thread.notFound": "Sujet introuvable",
   "discussions.learner.reported": "{reported} signalé",
   "discussions.learner.previouslyReported": "{previouslyReported} signalé précédemment",
   "discussions.learner.lastLogin": "Dernier actif {lastActiveTime}",
@@ -44,22 +50,22 @@
   "discussions.learner.mostActivity": "La plupart des activités",
   "discussions.learner.reportedActivity": "Activité signalée",
   "discussions.learner.recentActivity": "Activité récente",
-  "discussions.learner.sortFilterStatus": "All learners sorted by {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
+  "discussions.learner.sortFilterStatus": "Tous les apprenants triés pas {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
   "discussion.learner.allActivity": "Toutes les activités",
   "discussion.learner.posts": "Posts",
   "discussions.actions.button.alt": "Menu Actions",
   "discussions.actions.copylink": "Copier le lien",
   "discussions.actions.unpin": "Détacher",
+  "discussions.confirmation.button.confirm": "Confirmer",
   "discussions.actions.close": "Fermer",
   "discussions.actions.reopen": "Rouvrir",
   "discussions.actions.report": "Signaler",
   "discussions.actions.unreport": "Ne pas signaler",
   "discussions.actions.endorse": "Approuver",
   "discussions.actions.unendorse": "Ne plus approuver",
-  "discussions.actions.markAnswered": "Mark as answered",
+  "discussions.actions.markAnswered": "Marquer comme répondu",
   "discussions.actions.unMarkAnswered": "Décocher comme répondu",
-  "discussions.delete.confirmation.button.cancel": "Annuler",
-  "discussions.delete.confirmation.button.delete": "Supprimer",
+  "discussions.modal.confirmation.button.cancel": "Annuler",
   "discussions.empty.allTopics": "Toutes les activités de discussion pour ces sujets apparaîtront ici.",
   "discussions.empty.allPosts": "Toutes les activités de discussion pour votre cours s'afficheront ici.",
   "discussions.empty.myPosts": "Les publications avec lesquelles vous avez interagi s'afficheront ici.",
@@ -158,6 +164,9 @@
   "discussions.post.relatedTo": "Relative à",
   "discussions.editor.delete.post.title": "Supprimer le message",
   "discussions.editor.delete.post.description": "Êtes-vous sûr de vouloir supprimer définitivement ce message ?",
+  "discussions.post.delete.confirmation.button.delete": "Supprimer",
+  "discussions.editor.report.post.title": "Signaler un contenu inapproprié ?",
+  "discussions.editor.report.post.description": "L'équipe de modération de la discussion examinera ce contenu et prendra les mesures appropriées.",
   "discussions.post.closePostModal.title": "Fermer le message",
   "discussions.post.closePostModal.text": "Entrez une raison pour fermer ce message. Cela ne sera affiché qu'aux autres modérateurs.",
   "discussions.post.closePostModal.reasonCodeInput": "Raison",

src/i18n/messages/fr_FR.json

@@ -28,6 +28,11 @@
   "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
   "discussions.editor.delete.comment.title": "Delete comment",
   "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
+  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.editor.comments.editReasonCode": "Reason for editing",
   "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
   "discussions.comment.comments.editedBy": "Edited by",
@@ -35,6 +40,7 @@
   "discussions.post.closedBy": "Post closed by",
   "discussion.comment.repliesHeading": "{count} replies for the response added",
   "discussion.comment.time": "{time} ago",
+  "discussion.thread.notFound": "Thread not found",
   "discussions.learner.reported": "{reported} reported",
   "discussions.learner.previouslyReported": "{previouslyReported} previously reported",
   "discussions.learner.lastLogin": "Last active {lastActiveTime}",
@@ -50,6 +56,7 @@
   "discussions.actions.button.alt": "Actions menu",
   "discussions.actions.copylink": "Copy link",
   "discussions.actions.unpin": "Unpin",
+  "discussions.confirmation.button.confirm": "Confirm",
   "discussions.actions.close": "Close",
   "discussions.actions.reopen": "Reopen",
   "discussions.actions.report": "Report",
@@ -58,8 +65,7 @@
   "discussions.actions.unendorse": "Unendorse",
   "discussions.actions.markAnswered": "Mark as answered",
   "discussions.actions.unMarkAnswered": "Unmark as answered",
-  "discussions.delete.confirmation.button.cancel": "Cancel",
-  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.modal.confirmation.button.cancel": "Cancel",
   "discussions.empty.allTopics": "All discussion activity for these topics will show up here.",
   "discussions.empty.allPosts": "All discussion activity for your course will show up here.",
   "discussions.empty.myPosts": "Posts you've interacted with will show up here.",
@@ -158,6 +164,9 @@
   "discussions.post.relatedTo": "Related to",
   "discussions.editor.delete.post.title": "Delete post",
   "discussions.editor.delete.post.description": "Are you sure you want to permanently delete this post?",
+  "discussions.post.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.report.post.title": "Report inappropriate content?",
+  "discussions.editor.report.post.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.post.closePostModal.title": "Close post",
   "discussions.post.closePostModal.text": "Enter a reason for closing this post. This will only be displayed to other moderators.",
   "discussions.post.closePostModal.reasonCodeInput": "Reason",

src/i18n/messages/it_IT.json

@@ -28,6 +28,11 @@
   "discussions.editor.delete.response.description": "Sei sicuro di voler eliminare definitivamente questa risposta?",
   "discussions.editor.delete.comment.title": "Elimina commento",
   "discussions.editor.delete.comment.description": "Sei sicuro di voler eliminare definitivamente questo commento?",
+  "discussions.delete.confirmation.button.delete": "Cancella",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.editor.comments.editReasonCode": "Motivo della modifica",
   "discussions.editor.posts.editReasonCode.error": "Seleziona il motivo per la modifica",
   "discussions.comment.comments.editedBy": "A cura di",
@@ -35,6 +40,7 @@
   "discussions.post.closedBy": "Post chiuso da",
   "discussion.comment.repliesHeading": "{count} risposte per la risposta aggiunta",
   "discussion.comment.time": "{time} fa",
+  "discussion.thread.notFound": "Thread not found",
   "discussions.learner.reported": "{reported} segnalato",
   "discussions.learner.previouslyReported": "{previouslyReported} segnalato in precedenza",
   "discussions.learner.lastLogin": "Ultimo attivo {lastActiveTime}",
@@ -50,6 +56,7 @@
   "discussions.actions.button.alt": "Menù Azioni",
   "discussions.actions.copylink": "Copia link",
   "discussions.actions.unpin": "Sblocca ",
+  "discussions.confirmation.button.confirm": "Confirm",
   "discussions.actions.close": "Chiudi",
   "discussions.actions.reopen": "Riaprire",
   "discussions.actions.report": "Segnala",
@@ -58,8 +65,7 @@
   "discussions.actions.unendorse": "Annulla promozione ",
   "discussions.actions.markAnswered": "Mark as answered",
   "discussions.actions.unMarkAnswered": "Deseleziona come risposta",
-  "discussions.delete.confirmation.button.cancel": "Annulla",
-  "discussions.delete.confirmation.button.delete": "Cancella",
+  "discussions.modal.confirmation.button.cancel": "Cancel",
   "discussions.empty.allTopics": "Tutte le attività di discussione per questi argomenti verranno visualizzate qui.",
   "discussions.empty.allPosts": "Tutte le attività di discussione per il tuo corso verranno visualizzate qui.",
   "discussions.empty.myPosts": "I post con cui hai interagito verranno visualizzati qui.",
@@ -158,6 +164,9 @@
   "discussions.post.relatedTo": "Related to",
   "discussions.editor.delete.post.title": "Elimina messaggio",
   "discussions.editor.delete.post.description": "Sei sicuro di voler eliminare definitivamente questo post?",
+  "discussions.post.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.report.post.title": "Report inappropriate content?",
+  "discussions.editor.report.post.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.post.closePostModal.title": "Chiudi messaggio",
   "discussions.post.closePostModal.text": "Inserisci un motivo per chiudere questo post. Questo verrà mostrato solo agli altri moderatori.",
   "discussions.post.closePostModal.reasonCodeInput": "Motivo ",

src/i18n/messages/pl.json

@@ -28,6 +28,11 @@
   "discussions.editor.delete.response.description": "Czy na pewno chcesz trwale usunąć tę odpowiedź?",
   "discussions.editor.delete.comment.title": "Usuń komentarz",
   "discussions.editor.delete.comment.description": "Czy na pewno chcesz trwale usunąć ten komentarz?",
+  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.editor.comments.editReasonCode": "Reason for editing",
   "discussions.editor.posts.editReasonCode.error": "Wybierz powód edycji",
   "discussions.comment.comments.editedBy": "Edytowany przez",
@@ -35,6 +40,7 @@
   "discussions.post.closedBy": "Post zamknięty przez",
   "discussion.comment.repliesHeading": "{count} replies for the response added",
   "discussion.comment.time": "{time} ago",
+  "discussion.thread.notFound": "Thread not found",
   "discussions.learner.reported": "{reported}  zgłoszone",
   "discussions.learner.previouslyReported": "{previouslyReported} previously reported",
   "discussions.learner.lastLogin": "Ostatnia aktywność {lastActiveTime}",
@@ -50,6 +56,7 @@
   "discussions.actions.button.alt": "Menu czynności",
   "discussions.actions.copylink": "Copy link",
   "discussions.actions.unpin": "Unpin",
+  "discussions.confirmation.button.confirm": "Confirm",
   "discussions.actions.close": "Close",
   "discussions.actions.reopen": "Otwórz ponownie",
   "discussions.actions.report": "Report",
@@ -58,8 +65,7 @@
   "discussions.actions.unendorse": "Unendorse",
   "discussions.actions.markAnswered": "Mark as answered",
   "discussions.actions.unMarkAnswered": "Nie oznaczaj jako odpowiedziane",
-  "discussions.delete.confirmation.button.cancel": "Cancel",
-  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.modal.confirmation.button.cancel": "Cancel",
   "discussions.empty.allTopics": "Wszystkie dyskusje dotyczące tych tematów pojawią się tutaj.",
   "discussions.empty.allPosts": "All discussion activity for your course will show up here.",
   "discussions.empty.myPosts": "Posts you've interacted with will show up here.",
@@ -158,6 +164,9 @@
   "discussions.post.relatedTo": "Related to",
   "discussions.editor.delete.post.title": "Usuń post",
   "discussions.editor.delete.post.description": "Czy na pewno chcesz trwale usunąć ten wpis?",
+  "discussions.post.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.report.post.title": "Report inappropriate content?",
+  "discussions.editor.report.post.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.post.closePostModal.title": "Close post",
   "discussions.post.closePostModal.text": "Enter a reason for closing this post. This will only be displayed to other moderators.",
   "discussions.post.closePostModal.reasonCodeInput": "Reason",

src/i18n/messages/tr_TR.json

@@ -4,18 +4,18 @@
   "discussions.comments.comment.addResponse": "Bir cevap ekle",
   "discussions.comments.comment.addComment": "Bir yorum ekle",
   "discussions.comments.comment.abuseFlaggedMessage": "Personelin incelemesi için bildirilen içerik",
-  "discussions.actions.back.alt": "Back to list",
+  "discussions.actions.back.alt": "Listeye dön",
   "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {No responses}\n      one {Showing # response}\n      other {Showing # responses}\n    }",
   "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
   "discussions.comments.comment.loadMoreComments": "Daha fazla yorum yükle",
   "discussions.comments.comment.loadMoreResponses": "Daha fazla yanıt yükle",
   "discussions.comments.comment.visibility": "This post is visible to {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
   "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
-  "discussions.comments.comment.commentTime": "Posted {relativeTime}",
+  "discussions.comments.comment.commentTime": "{relativeTime} önce gönderildi",
   "discussions.comments.comment.answer": "Cevap",
   "discussions.comments.comment.answeredlabel": "Marked as answered by",
-  "discussions.comments.comment.endorsed": "Endorsed",
-  "discussions.comments.comment.endorsedlabel": "Endorsed by",
+  "discussions.comments.comment.endorsed": "Doğrulandı",
+  "discussions.comments.comment.endorsedlabel": "Doğrulayan",
   "discussions.actions.label": "Eylemler menüsü",
   "discussions.actions.edit": "Düzenle",
   "discussions.actions.pin": "İşaretle",
@@ -28,13 +28,19 @@
   "discussions.editor.delete.response.description": "Bu yanıtı kalıcı olarak silmek istediğinizden emin misiniz?",
   "discussions.editor.delete.comment.title": "Yorumu sil",
   "discussions.editor.delete.comment.description": "Bu yorumu kalıcı olarak silmek istediğinizden emin misiniz?",
+  "discussions.delete.confirmation.button.delete": "Sil",
+  "discussions.editor.response.response.title": "Uygunsuz içerik mi raporlayacaksınız?",
+  "discussions.editor.response.description": "Tartışma yöneticileri bu içeriği inceleyecek ve uygun işlemi yapacaktır.",
+  "discussions.editor.report.comment.title": "Uygunsuz içerik mi raporlayacaksınız?",
+  "discussions.editor.report.comment.description": "Tartışma yöneticileri bu içeriği inceleyecek ve uygun işlemi yapacaktır.",
   "discussions.editor.comments.editReasonCode": "Düzenleme nedeni",
   "discussions.editor.posts.editReasonCode.error": "Düzenleme nedenini seçin",
   "discussions.comment.comments.editedBy": "Düzenleyen",
   "discussions.comment.comments.reason": "Gerekçe",
-  "discussions.post.closedBy": "Post closed by",
-  "discussion.comment.repliesHeading": "{count} replies for the response added",
-  "discussion.comment.time": "{time} ago",
+  "discussions.post.closedBy": "Gönderiyi kapatan ",
+  "discussion.comment.repliesHeading": "Eklenen yanıt için {count} yanıt",
+  "discussion.comment.time": "{time} önce",
+  "discussion.thread.notFound": "Tartışma zinciri bulunamadı",
   "discussions.learner.reported": "{reported} rapor edildi",
   "discussions.learner.previouslyReported": "{previouslyReported} daha önce rapor edildi",
   "discussions.learner.lastLogin": "Son etkinlik {lastActiveTime}",
@@ -43,23 +49,23 @@
   "discussions.learner.activityForLearner": "{username} için etkinlik",
   "discussions.learner.mostActivity": "En çok etkinlik",
   "discussions.learner.reportedActivity": "Rapor edilen etkinlik",
-  "discussions.learner.recentActivity": "Recent activity",
+  "discussions.learner.recentActivity": "Son etkinlik",
   "discussions.learner.sortFilterStatus": "All learners sorted by {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
-  "discussion.learner.allActivity": "All activity",
+  "discussion.learner.allActivity": "Tüm etkinlikler",
   "discussion.learner.posts": "Gönderiler",
   "discussions.actions.button.alt": "Eylemler menüsü",
-  "discussions.actions.copylink": "Copy link",
+  "discussions.actions.copylink": "Bağlantıyı kopyala",
   "discussions.actions.unpin": "İşareti kaldır",
+  "discussions.confirmation.button.confirm": "Onayla",
   "discussions.actions.close": "Kapat",
   "discussions.actions.reopen": "Yeniden aç",
   "discussions.actions.report": "Raporla",
   "discussions.actions.unreport": "Bildirme",
   "discussions.actions.endorse": "Destekle",
   "discussions.actions.unendorse": "Destekleme",
-  "discussions.actions.markAnswered": "Mark as answered",
+  "discussions.actions.markAnswered": "Cevaplandı olarak işaretle",
   "discussions.actions.unMarkAnswered": "Cevaplandı olarak işaretini kaldır",
-  "discussions.delete.confirmation.button.cancel": "İptal",
-  "discussions.delete.confirmation.button.delete": "Sil",
+  "discussions.modal.confirmation.button.cancel": "İptal",
   "discussions.empty.allTopics": "Bu konularla ilgili tüm tartışma etkinlikleri burada gösterilecektir.",
   "discussions.empty.allPosts": "Dersiniz için tüm tartışma etkinlikleri burada gösterilecektir.",
   "discussions.empty.myPosts": "Etkileşimde bulunduğunuz gönderiler burada gösterilecektir.",
@@ -68,22 +74,22 @@
   "discussions.empty.noPostSelected": "Gönderi seçilmedi",
   "discussions.empty.noTopicSelected": "Konu seçilmedi",
   "discussions.sidebar.noResultsFound": "Sonuç bulunamadı",
-  "discussions.sidebar.differentKeywords": "Try searching different keywords",
+  "discussions.sidebar.differentKeywords": "Farklı anahtar kelimelerle aramayı dene",
   "discussions.sidebar.removeKeywords": "Farklı anahtar kelimeler aramayı veya bazı filtreleri kaldırmayı deneyin",
-  "discussions.sidebar.removeKeywordsOnly": "Try searching different keywords",
+  "discussions.sidebar.removeKeywordsOnly": "Farklı anahtar kelimelerle aramayı dene",
   "discussions.sidebar.removeFilters": "Bazı filtreleri kaldırmayı deneyin",
   "discussions.empty.iconAlt": "Boş",
   "discussions.authors.label.staff": "Personel",
   "discussions.authors.label.ta": "TA",
   "discussions.learner.loadMostPosts": "Daha fazla ileti yükle",
   "discussions.post.anonymous.author": "anonim",
-  "discussion.banner.welcomeMessage": "🎉 Welcome to the new and improved discussions experience!",
+  "discussion.banner.welcomeMessage": "🎉 Yeni ve geliştirilmiş tartışma deneyimine hoş geldiniz!",
   "discussion.banner.learnMore": "Daha fazlasını öğren",
-  "discussion.banner.shareFeedback": "Share feedback",
+  "discussion.banner.shareFeedback": "Geri bildirim paylaş",
   "discussion.blackoutBanner.information": "Blackout dates are currently active. Posting in discussions is unavailable at this time.",
   "discussions.editor.image.warning.message": "Images having width or height greater than 999px will not be visible when the post, response or comment is viewed using in-line course discussions",
-  "discussions.editor.image.warning.title": "Warning!",
-  "discussions.editor.image.warning.dismiss": "Ok",
+  "discussions.editor.image.warning.title": "Uyarı!",
+  "discussions.editor.image.warning.dismiss": "Tamam",
   "discussions.navigation.breadcrumbMenu.allTopics": "Konular",
   "discussions.navigation.breadcrumbMenu.showAll": "Tümünü göster",
   "discussions.navigation.navigationBar.allPosts": "Tüm iletiler",
@@ -96,7 +102,7 @@
   "discussions.actionBar.searchInfo": "\"{text}\" için {count} sonuç gösteriliyor",
   "discussions.actionBar.searchRewriteInfo": "No results found for \"{searchString}\". Showing {count} results for \"{textSearchRewrite}\".",
   "discussions.actionBar.searchInfoSearching": "Aranıyor...",
-  "discussions.actionBar.clearSearch": "Clear results",
+  "discussions.actionBar.clearSearch": "Sonuçları temizle",
   "discussion.posts.actionBar.add": "Bir ileti ekle",
   "discussion.posts.actionBar.close": "Kapat",
   "discussions.post.editor.type": "Gönderi türü",
@@ -109,13 +115,13 @@
   "discussions.post.editor.discussionType": "Forum",
   "discussions.post.editor.discussionDescription": "Fikirleri paylaşın ve sohbetler başlatın",
   "discussions.post.editor.topicArea": "Başlık alanı",
-  "discussions.post.editor.topicAreaDescription": "Add your post to a relevant topic to help others find it.",
+  "discussions.post.editor.topicAreaDescription": "Başkalarının bulmasına yardımcı olmak için gönderinizi ilgili bir konuya ekleyin.",
   "discussions.post.editor.cohortVisibility": "Kohort görünürlüğü",
   "discussions.post.editor.cohortVisibilityAllLearners": "Tüm öğrenciler",
-  "discussions.post.editor.title": "Post title",
+  "discussions.post.editor.title": "İleti başlığı",
   "discussions.post.editor.titleDescription": "Katılıma teşvik etmek için, açık ve tanıtıcı bir başlık ekleyin.",
-  "discussions.post.editor.title.error": "Post title cannot be empty.",
-  "discussions.post.editor.content.error": "Post content cannot be empty.",
+  "discussions.post.editor.title.error": "Gönderi başlığı boş olamaz.",
+  "discussions.post.editor.content.error": "Gönderi içeriği boş olamaz.",
   "discussions.post.editor.questionText": "Sorunuz veya fikriniz (gerekli)",
   "discussions.post.editor.preview": "Önizleme",
   "discussions.post.editor.followPost": "Bu iletiyi takip edin",
@@ -123,8 +129,8 @@
   "discussions.post.editor.anonymousToPeersPost": "Akranlarına anonim olarak gönder",
   "discussions.editor.posts.editReasonCode": "Düzenleme nedeni",
   "discussions.editor.posts.showPreview.button": "Önizlemeyi Göster",
-  "discussions.topic.noName.label": "Unnamed category",
-  "discussions.subtopic.noName.label": "Unnamed subcategory",
+  "discussions.topic.noName.label": "İsimsiz kategori",
+  "discussions.subtopic.noName.label": "İsimsiz alt kategori",
   "discussions.posts.filter.showALl": "Tümünü göster",
   "discussions.posts.filter.discussions": "Forumlar",
   "discussions.posts.filter.questions": "Sorular",
@@ -134,7 +140,7 @@
   "discussions.posts.status.filter.following": "Takip ediliyor",
   "discussions.posts.status.filter.reported": "Rapor edildi",
   "discussions.posts.status.filter.unanswered": "Cevaplanmamış",
-  "discussions.posts.status.filter.unresponded": "Not responded",
+  "discussions.posts.status.filter.unresponded": "Yanıtlanmamış",
   "discussions.posts.filter.myPosts": "Gönderilerim",
   "discussions.posts.filter.myDiscussions": "Tartışmalarım",
   "discussions.posts.filter.myQuestions": "Sorularım",
@@ -145,19 +151,22 @@
   "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } sorted by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most likes}\n      other {{sort}}\n    }",
   "discussions.post.author.anonymous": "anonim",
   "discussions.post.lastResponse": "Son yanıt {time}",
-  "discussions.post.postedOn": "Posted {time} by {author} {authorLabel}",
+  "discussions.post.postedOn": "{author} {authorLabel} tarafından {time} önce gönderildi",
   "discussions.post.contentReported": "Rapor edildi",
   "discussions.post.following": "Takip ediliyor",
   "discussions.post.follow": "Takip et",
   "discussions.post.answered": "Yanıtlandı",
   "discussions.post.unFollow": "Takibi bırak",
   "discussions.post.like": "Beğen",
-  "discussions.post.removeLike": "Unlike",
+  "discussions.post.removeLike": "Beğenmeme",
   "discussions.post.viewActivity": "Etkinliği görüntüle",
   "discussions.post.closed": "Yanıtlar ve yorumlar için gönderi kapatıldı",
-  "discussions.post.relatedTo": "Related to",
+  "discussions.post.relatedTo": "Bunun ile ilgili",
   "discussions.editor.delete.post.title": "Gönderiyi sil",
   "discussions.editor.delete.post.description": "Bu gönderiyi kalıcı olarak silmek istediğinizden emin misiniz?",
+  "discussions.post.delete.confirmation.button.delete": "Sil",
+  "discussions.editor.report.post.title": "Uygunsuz içerik mi raporlayacaksınız?",
+  "discussions.editor.report.post.description": "Tartışma yöneticileri bu içeriği inceleyecek ve uygun işlemi yapacaktır.",
   "discussions.post.closePostModal.title": "Gönderiyi kapat",
   "discussions.post.closePostModal.text": "Bu gönderiyi kapatmak için bir neden girin. Bu sadece diğer moderatörlere gösterilecektir.",
   "discussions.post.closePostModal.reasonCodeInput": "Gerekçe",
@@ -169,14 +178,14 @@
   "discussions.post.postWithoutPreview": "Önizleme yok",
   "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
   "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} reported",
-  "discussions.topics.previouslyReported": "{previouslyReported} previously reported",
+  "discussions.topics.reported": "{reported} rapor edildi",
+  "discussions.topics.previouslyReported": "{previouslyReported} ileti rapor edildi",
   "discussions.topics.sort.message": "{sortBy} ölçütüne göre sıralandı",
   "discussions.topics.sort.lastActivity": "Son etkinlik",
   "discussions.topics.sort.commentCount": "En çok etkinlik",
   "discussions.topics.sort.courseStructure": "Ders Yapısı",
-  "discussions.topics.find.label": "Search topics",
+  "discussions.topics.find.label": "Konuları ara",
   "discussions.topics.archived.label": "Arşivlenmiş",
-  "discussions.topics.unnamed.label": "Unnamed category",
-  "discussions.subtopics.unnamed.label": "Unnamed subcategory"
+  "discussions.topics.unnamed.label": "İsimsiz kategori",
+  "discussions.subtopics.unnamed.label": "İsimsiz alt kategori"
 }

src/i18n/messages/zh_CN.json

@@ -28,6 +28,11 @@
   "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
   "discussions.editor.delete.comment.title": "Delete comment",
   "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
+  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.editor.comments.editReasonCode": "Reason for editing",
   "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
   "discussions.comment.comments.editedBy": "Edited by",
@@ -35,6 +40,7 @@
   "discussions.post.closedBy": "Post closed by",
   "discussion.comment.repliesHeading": "{count} replies for the response added",
   "discussion.comment.time": "{time} ago",
+  "discussion.thread.notFound": "Thread not found",
   "discussions.learner.reported": "{reported} reported",
   "discussions.learner.previouslyReported": "{previouslyReported} previously reported",
   "discussions.learner.lastLogin": "Last active {lastActiveTime}",
@@ -50,6 +56,7 @@
   "discussions.actions.button.alt": "Actions menu",
   "discussions.actions.copylink": "Copy link",
   "discussions.actions.unpin": "Unpin",
+  "discussions.confirmation.button.confirm": "Confirm",
   "discussions.actions.close": "Close",
   "discussions.actions.reopen": "Reopen",
   "discussions.actions.report": "Report",
@@ -58,8 +65,7 @@
   "discussions.actions.unendorse": "Unendorse",
   "discussions.actions.markAnswered": "Mark as answered",
   "discussions.actions.unMarkAnswered": "Unmark as answered",
-  "discussions.delete.confirmation.button.cancel": "Cancel",
-  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.modal.confirmation.button.cancel": "Cancel",
   "discussions.empty.allTopics": "All discussion activity for these topics will show up here.",
   "discussions.empty.allPosts": "All discussion activity for your course will show up here.",
   "discussions.empty.myPosts": "Posts you've interacted with will show up here.",
@@ -158,6 +164,9 @@
   "discussions.post.relatedTo": "Related to",
   "discussions.editor.delete.post.title": "Delete post",
   "discussions.editor.delete.post.description": "Are you sure you want to permanently delete this post?",
+  "discussions.post.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.report.post.title": "Report inappropriate content?",
+  "discussions.editor.report.post.description": "The discussion moderation team will review this content and take appropriate action.",
   "discussions.post.closePostModal.title": "Close post",
   "discussions.post.closePostModal.text": "Enter a reason for closing this post. This will only be displayed to other moderators.",
   "discussions.post.closePostModal.reasonCodeInput": "Reason",

src/index.scss

@@ -118,7 +118,7 @@ $fa-font-path: "~font-awesome/fonts";
 
 header {
   .user-dropdown {
-    z-index: 2005;
+    z-index: 1;
   }
   .logo {
     margin-right: 1rem;
@@ -227,7 +227,7 @@ header {
 
 .header-action-bar {
   background-color: #fff;
-  z-index: 2002;
+  z-index: 1;
   box-shadow: 0px 2px 4px rgb(0 0 0 / 15%), 0px 2px 8px rgb(0 0 0 / 15%);
   position: sticky;
   top: 0;
@@ -237,16 +237,24 @@ header {
   z-index: 1;
 }
 
+.actions-dropdown {
+  z-index: 0;
+}
+
 .discussion-topic-group:last-of-type .divider{
   display: none;
 }
 
 .zindex-5000 {
- z-index: 5000;
+  z-index: 5000;
 }
 
 #paragon-portal-root .pgn__modal-layer {
-  z-index: 1500 !important;
+  z-index: 5000 !important;
+}
+
+#iconbutton-tooltip-top {
+  z-index: 0;
 }
 
 @media only screen and (max-width: 767px) {