feat: added soft delete functionality

Author: Alam-2U

src/discussions/components/FilterBar.test.jsx

@@ -11,9 +11,9 @@ import { Provider } from 'react-redux';
 
 import { IntlProvider } from '@edx/frontend-platform/i18n';
 
-import { threadsReducer } from '../../data/slices';
-import messages from '../../messages';
-import FilterBar from '../FilterBar';
+import messages from '../messages';
+import { threadsReducer } from '../posts/data/slices';
+import FilterBar from './FilterBar';
 
 // Mock the soft delete service
 jest.mock('../../data/services/softDeleteService', () => ({
@@ -144,7 +144,9 @@ describe('FilterBar Component', () => {
 
     test('shows loading state during bulk delete', async () => {
       const selectedThreadIds = ['thread1'];
-      mockOnBulkAction.mockImplementation(() => new Promise(resolve => setTimeout(resolve, 100)));
+      mockOnBulkAction.mockImplementation(() => new Promise((resolve) => {
+        setTimeout(resolve, 100);
+      }));
 
       renderFilterBar({
         selectedThreadIds,
@@ -189,7 +191,9 @@ describe('FilterBar Component', () => {
 
     test('shows loading state during bulk restore', async () => {
       const selectedThreadIds = ['thread1'];
-      mockOnBulkAction.mockImplementation(() => new Promise(resolve => setTimeout(resolve, 100)));
+      mockOnBulkAction.mockImplementation(() => new Promise((resolve) => {
+        setTimeout(resolve, 100);
+      }));
 
       renderFilterBar({
         selectedThreadIds,

src/discussions/data/services/softDeleteService.js

@@ -10,29 +10,20 @@ const getDiscussionApiBaseUrl = () => `${getConfig().LMS_BASE_URL}/api/discussio
 /**
  * Soft delete a single thread by calling the DELETE endpoint
  * @param {string} threadId - The ID of the thread to soft delete
- * @param {string} userId - The ID of the user performing the action
- * @param {string} courseId - The course ID
  * @returns {Promise} API response
  */
-export async function softDeleteThread(threadId, userId, courseId) {
+export async function softDeleteThread(threadId) {
   const url = `${getDiscussionApiBaseUrl()}/threads/${threadId}/`;
-  console.log('[Service] softDeleteThread - About to DELETE:', url);
-  console.log('[Service] LMS_BASE_URL:', getConfig().LMS_BASE_URL);
-
   return getAuthenticatedHttpClient().delete(url);
 }
 
 /**
  * Restore a soft deleted thread
  * @param {string} threadId - The ID of the thread to restore
- * @param {string} courseId - The course ID
  * @returns {Promise} API response
  */
-export async function restoreThread(threadId, courseId) {
+export async function restoreThread(threadId) {
   const url = `${getDiscussionApiBaseUrl()}/threads/${threadId}/restore/`;
-  console.log('[Service] restoreThread - About to POST:', url);
-  console.log('[Service] LMS_BASE_URL:', getConfig().LMS_BASE_URL);
-
   return getAuthenticatedHttpClient().post(url, {});
 }
 
@@ -41,20 +32,12 @@ export async function restoreThread(threadId, courseId) {
  * NOTE: Currently implemented as sequential deletes.
  * TODO: Implement true bulk endpoint for better performance
  * @param {string[]} threadIds - Array of thread IDs to soft delete
- * @param {string} userId - The ID of the user performing the action
- * @param {string} courseId - The course ID
  * @returns {Promise} API response
  */
-export async function bulkSoftDeleteThreads(threadIds, userId, courseId) {
-  console.log('[Service] bulkSoftDeleteThreads called', { threadIds, userId, courseId });
-  console.log('[Service] Processing', threadIds.length, 'threads');
+export async function bulkSoftDeleteThreads(threadIds) {
   const results = await Promise.allSettled(
-    threadIds.map(threadId => softDeleteThread(threadId, userId, courseId)),
+    threadIds.map(threadId => softDeleteThread(threadId)),
   );
-  console.log('[Service] bulkSoftDeleteThreads completed', {
-    successful: results.filter(r => r.status === 'fulfilled').length,
-    failed: results.filter(r => r.status === 'rejected').length,
-  });
 
   return {
     successful: results.filter(r => r.status === 'fulfilled').length,
@@ -68,19 +51,12 @@ export async function bulkSoftDeleteThreads(threadIds, userId, courseId) {
  * NOTE: Currently implemented as sequential restores.
  * TODO: Implement true bulk endpoint for better performance
  * @param {string[]} threadIds - Array of thread IDs to restore
- * @param {string} courseId - The course ID
  * @returns {Promise} API response
  */
-export async function bulkRestoreThreads(threadIds, courseId) {
-  console.log('[Service] bulkRestoreThreads called', { threadIds, courseId });
-  console.log('[Service] Processing', threadIds.length, 'threads');
+export async function bulkRestoreThreads(threadIds) {
   const results = await Promise.allSettled(
-    threadIds.map(threadId => restoreThread(threadId, courseId)),
+    threadIds.map(threadId => restoreThread(threadId)),
   );
-  console.log('[Service] bulkRestoreThreads completed', {
-    successful: results.filter(r => r.status === 'fulfilled').length,
-    failed: results.filter(r => r.status === 'rejected').length,
-  });
 
   return {
     successful: results.filter(r => r.status === 'fulfilled').length,
@@ -117,17 +93,13 @@ export async function getDeletedThreads(courseId, options = {}) {
 /**
  * Search threads with optional deleted filter
  * @param {Object} searchParams - Search parameters including courseId
- * @param {boolean} includeDeleted - Whether to include deleted threads in search
  * @returns {Promise} API response
  */
-export async function searchThreadsWithDeletedFilter(searchParams, includeDeleted = false) {
+export async function searchThreadsWithDeletedFilter(searchParams) {
   const url = `${getDiscussionApiBaseUrl()}/threads/`;
 
   const params = {
     ...searchParams,
-    // If includeDeleted is false, we'll get only non-deleted threads (default behavior)
-    // If true, we need to handle this differently - perhaps by fetching both and merging
-    // For now, we use the standard thread list endpoint
   };
 
   return getAuthenticatedHttpClient().get(url, { params });
@@ -136,28 +108,19 @@ export async function searchThreadsWithDeletedFilter(searchParams, includeDelete
 /**
  * Soft delete a single comment by calling the DELETE endpoint
  * @param {string} commentId - The ID of the comment to soft delete
- * @param {string} userId - The ID of the user performing the action
- * @param {string} courseId - The course ID
  * @returns {Promise} API response
  */
-export async function softDeleteComment(commentId, userId, courseId) {
+export async function softDeleteComment(commentId) {
   const url = `${getDiscussionApiBaseUrl()}/comments/${commentId}/`;
-  console.log('[Service] softDeleteComment - About to DELETE:', url);
-  console.log('[Service] LMS_BASE_URL:', getConfig().LMS_BASE_URL);
-
   return getAuthenticatedHttpClient().delete(url);
 }
 
 /**
  * Restore a soft deleted comment
  * @param {string} commentId - The ID of the comment to restore
- * @param {string} courseId - The course ID
  * @returns {Promise} API response
  */
-export async function restoreComment(commentId, courseId) {
+export async function restoreComment(commentId) {
   const url = `${getDiscussionApiBaseUrl()}/comments/${commentId}/restore/`;
-  console.log('[Service] restoreComment - About to POST:', url);
-  console.log('[Service] LMS_BASE_URL:', getConfig().LMS_BASE_URL);
-
   return getAuthenticatedHttpClient().post(url, {});
 }

src/discussions/post-comments/comments/comment/Comment.jsx

@@ -3,12 +3,11 @@ import React, {
 } from 'react';
 import PropTypes from 'prop-types';
 
-import { Alert, Button, useToggle } from '@openedx/paragon';
+import { Button, useToggle } from '@openedx/paragon';
 import { DeleteOutline } from '@openedx/paragon/icons';
 import classNames from 'classnames';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { logError } from '@edx/frontend-platform/logging';
 
@@ -110,19 +109,13 @@ const Comment = ({
   }, [abuseFlagged, id, showReportConfirmation]);
 
   const handleDeleteConfirmation = useCallback(async () => {
-    console.log('[Comment] handleDeleteConfirmation called', { commentId: id, courseId, threadId });
     try {
-      const authenticatedUser = getAuthenticatedUser();
-      console.log('[Comment] Authenticated user:', authenticatedUser);
       const { performSoftDeleteComment } = await import('../../data/thunks');
-      console.log('[Comment] About to dispatch performSoftDeleteComment');
-      const result = await dispatch(performSoftDeleteComment(id, authenticatedUser.userId || authenticatedUser.id, courseId));
-      console.log('[Comment] performSoftDeleteComment result:', result);
+      const result = await dispatch(performSoftDeleteComment(id));
       if (result.success) {
         await dispatch(fetchThread(threadId, courseId));
       }
     } catch (error) {
-      console.error('[Comment] Error in handleDeleteConfirmation:', error);
       logError(error);
     }
     hideDeleteConfirmation();
@@ -146,18 +139,14 @@ const Comment = ({
   }, [showRestoreConfirmation]);
 
   const handleRestoreConfirmation = useCallback(async () => {
-    console.log('[Comment] handleRestoreConfirmation called', { commentId: id, courseId, threadId });
     try {
       const { performRestoreComment } = await import('../../data/thunks');
-      console.log('[Comment] About to dispatch performRestoreComment');
-      const result = await dispatch(performRestoreComment(id, courseId));
-      console.log('[Comment] performRestoreComment result:', result);
+      const result = await dispatch(performRestoreComment(id));
       if (result.success) {
         // Refresh the thread to reflect the change
         await dispatch(fetchThread(threadId, courseId));
       }
     } catch (error) {
-      console.error('[Comment] Error in handleRestoreConfirmation:', error);
       logError(error);
     }
     hideRestoreConfirmation();
@@ -207,17 +196,25 @@ const Comment = ({
       >
         <Confirmation
           isOpen={isDeleting}
-          title={intl.formatMessage(isNested ? messages.deleteCommentTitle : messages.deleteResponseTitle)}
-          description={intl.formatMessage(isNested ? messages.deleteCommentDescription : messages.deleteResponseDescription)}
+          title={intl.formatMessage(
+            isNested ? messages.deleteCommentTitle : messages.deleteResponseTitle,
+          )}
+          description={intl.formatMessage(
+            isNested ? messages.deleteCommentDescription : messages.deleteResponseDescription,
+          )}
           onClose={hideDeleteConfirmation}
           confirmAction={handleDeleteConfirmation}
           closeButtonVariant="tertiary"
           confirmButtonText={intl.formatMessage(messages.deleteConfirmationDelete)}
         />
         <Confirmation
           isOpen={isRestoring}
-          title={intl.formatMessage(isNested ? messages.undeleteCommentTitle : messages.undeleteResponseTitle)}
-          description={intl.formatMessage(isNested ? messages.undeleteCommentDescription : messages.undeleteResponseDescription)}
+          title={intl.formatMessage(
+            isNested ? messages.undeleteCommentTitle : messages.undeleteResponseTitle,
+          )}
+          description={intl.formatMessage(
+            isNested ? messages.undeleteCommentDescription : messages.undeleteResponseDescription,
+          )}
           onClose={hideRestoreConfirmation}
           confirmAction={handleRestoreConfirmation}
           closeButtonVariant="tertiary"

src/discussions/post-comments/comments/comment/Reply.jsx

@@ -7,7 +7,6 @@ import { Avatar, Badge, useToggle } from '@openedx/paragon';
 import { useDispatch, useSelector } from 'react-redux';
 import * as timeago from 'timeago.js';
 
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { logError } from '@edx/frontend-platform/logging';
 
@@ -20,8 +19,8 @@ import DiscussionContext from '../../../common/context';
 import timeLocale from '../../../common/time-locale';
 import { ContentTypes } from '../../../data/constants';
 import { useAlertBannerVisible } from '../../../data/hooks';
-import { fetchThread } from '../../../data/thunks';
 import { selectAuthorAvatar, selectThread } from '../../../posts/data/selectors';
+import { fetchThread } from '../../../posts/data/thunks';
 import { selectCommentOrResponseById } from '../../data/selectors';
 import { editComment } from '../../data/thunks';
 import messages from '../../messages';
@@ -54,9 +53,8 @@ const Reply = ({ responseId }) => {
 
   const handleDeleteConfirmation = useCallback(async () => {
     try {
-      const authenticatedUser = getAuthenticatedUser();
       const { performSoftDeleteComment } = await import('../../data/thunks');
-      const result = await dispatch(performSoftDeleteComment(id, authenticatedUser.userId || authenticatedUser.id, courseId));
+      const result = await dispatch(performSoftDeleteComment(id));
       if (result.success) {
         await dispatch(fetchThread(threadId, courseId));
       }
@@ -98,7 +96,7 @@ const Reply = ({ responseId }) => {
   const handleRestoreConfirmation = useCallback(async () => {
     try {
       const { performRestoreComment } = await import('../../data/thunks');
-      const result = await dispatch(performRestoreComment(id, courseId));
+      const result = await dispatch(performRestoreComment(id));
       if (result.success) {
         await dispatch(fetchThread(threadId, courseId));
       }

src/discussions/post-comments/data/thunks.js

@@ -186,34 +186,26 @@ export function removeComment(commentId, threadId) {
   };
 }
 
-export function performSoftDeleteComment(commentId, userId, courseId) {
+export function performSoftDeleteComment(commentId) {
   return async () => {
-    console.log('[Thunk] performSoftDeleteComment called', { commentId, userId, courseId });
     try {
       const { softDeleteComment } = await import('../../data/services/softDeleteService');
-      console.log('[Thunk] About to call softDeleteComment service');
-      await softDeleteComment(commentId, userId, courseId);
-      console.log('[Thunk] softDeleteComment service completed successfully');
+      await softDeleteComment(commentId);
       return { success: true };
     } catch (error) {
-      console.error('[Thunk] Error in performSoftDeleteComment:', error);
       logError(error);
       return { success: false, error: error.message };
     }
   };
 }
 
-export function performRestoreComment(commentId, courseId) {
+export function performRestoreComment(commentId) {
   return async () => {
-    console.log('[Thunk] performRestoreComment called', { commentId, courseId });
     try {
       const { restoreComment } = await import('../../data/services/softDeleteService');
-      console.log('[Thunk] About to call restoreComment service');
-      await restoreComment(commentId, courseId);
-      console.log('[Thunk] restoreComment service completed successfully');
+      await restoreComment(commentId);
       return { success: true };
     } catch (error) {
-      console.error('[Thunk] Error in performRestoreComment:', error);
       logError(error);
       return { success: false, error: error.message };
     }

src/discussions/posts/data/thunks.js

@@ -7,7 +7,6 @@ import {
 import { setContentCreationRateLimited } from '../../data/slices';
 import { getHttpErrorStatus } from '../../utils';
 import {
-  deleteThread,
   getThread,
   getThreads,
   postThread,
@@ -308,13 +307,13 @@ export function updateExistingThread(threadId, {
   };
 }
 
-export function removeThread(threadId, courseId, userId) {
+export function removeThread(threadId) {
   return async (dispatch) => {
     try {
       dispatch(deleteThreadRequest({ threadId }));
       // Use soft delete instead of hard delete
       const { softDeleteThread } = await import('../../data/services/softDeleteService');
-      await softDeleteThread(threadId, userId, courseId);
+      await softDeleteThread(threadId);
       dispatch(deleteThreadSuccess({ threadId }));
     } catch (error) {
       if (getHttpErrorStatus(error) === 403) {