Skip to content

feat: added soft delete functionality #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alam-2U merged 1 commit into from
Jan 16, 2026
Merged

feat: added soft delete functionality #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/assets/undelete.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 44 additions & 1 deletion src/components/FilterBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,16 @@ const FilterBar = ({
label: intl.formatMessage(messages.filterUnresponded),
value: PostsStatusFilter.UNRESPONDED,
},
{
id: 'status-active',
label: intl.formatMessage(messages.filterActive),
value: PostsStatusFilter.ACTIVE,
},
{
id: 'status-deleted',
label: intl.formatMessage(messages.filterDeleted),
value: PostsStatusFilter.DELETED,
},
{
id: 'sort-activity',
label: intl.formatMessage(messages.lastActivityAt),
Expand Down Expand Up @@ -124,7 +134,7 @@ const FilterBar = ({
<Collapsible.Body className="collapsible-body px-4 pb-3 pt-0">
<Form>
<div className="d-flex flex-row py-2 justify-content-between">
{filters.map((value) => (
{filters.filter(f => !f.hasSeparator).map((value) => (
<Form.RadioSet
key={value.name}
name={value.name}
Expand All @@ -150,6 +160,38 @@ const FilterBar = ({
</Form.RadioSet>
))}
</div>
{filters.some(f => f.hasSeparator) && (
<>
<div className="border-bottom my-2" />
<div className="d-flex flex-row py-2 justify-content-between">
{filters.filter(f => f.hasSeparator).map((value) => (
<Form.RadioSet
key={value.name}
name={value.name}
className="d-flex flex-column list-group list-group-flush"
value={selectedFilters[value.name]}
onChange={handleFilterToggle}
>
{value.filters.map(filterName => {
const element = allFilters.find(obj => obj.id === filterName);
if (element) {
return (
<ActionItem
key={element.id}
id={element.id}
label={element.label}
value={element.value}
selected={selectedFilters[value.name]}
/>
);
}
return false;
})}
</Form.RadioSet>
))}
</div>
</>
)}
{showCohortsFilter && (
<>
<div className="border-bottom my-2" />
Expand Down Expand Up @@ -199,6 +241,7 @@ FilterBar.propTypes = {
selectedFilters: PropTypes.shape({
postType: ThreadType,
status: PostsStatusFilter,
contentStatus: PostsStatusFilter,
orderBy: ThreadOrdering,
cohort: PropTypes.string,
}).isRequired,
Expand Down
6 changes: 6 additions & 0 deletions src/data/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export const ContentActions = {
COPY_LINK: 'copy_link',
REPORT: 'abuse_flagged',
DELETE: 'delete',
RESTORE: 'restore',
FOLLOWING: 'following',
CHANGE_GROUP: 'group_id',
MARK_READ: 'read',
Expand All @@ -60,6 +61,8 @@ export const ContentActions = {
VOTE: 'voted',
DELETE_COURSE_POSTS: 'delete-course-posts',
DELETE_ORG_POSTS: 'delete-org-posts',
RESTORE_COURSE_POSTS: 'restore-course-posts',
RESTORE_ORG_POSTS: 'restore-org-posts',
};

/**
Expand Down Expand Up @@ -109,6 +112,8 @@ export const PostsStatusFilter = {
REPORTED: 'statusReported',
UNANSWERED: 'statusUnanswered',
UNRESPONDED: 'statusUnresponded',
ACTIVE: 'statusActive',
DELETED: 'statusDeleted',
};

/**
Expand All @@ -132,6 +137,7 @@ export const LearnersOrdering = {
BY_FLAG: 'flagged',
BY_LAST_ACTIVITY: 'activity',
BY_RECENCY: 'recency',
BY_DELETED: 'deleted',
};

/**
Expand Down
5 changes: 4 additions & 1 deletion src/discussions/common/ActionsDropdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,13 @@ const ActionsDropdown = ({
size="inline"
onClick={() => {
close();
handleActions(action.action);
if (!action.disabled) {
handleActions(action.action);
}
}}
className="d-flex justify-content-start actions-dropdown-item"
data-testId={action.id}
disabled={action.disabled}
>
<Icon
src={action.icon}
Expand Down
16 changes: 12 additions & 4 deletions src/discussions/common/HoverCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const HoverCard = ({
voted,
following,
endorseIcons,
isDeleted,
}) => {
const intl = useIntl();
const { enableInContextSidebar } = useContext(DiscussionContext);
Expand All @@ -50,9 +51,9 @@ const HoverCard = ({
'px-2.5 py-2 border-0 font-style text-gray-700',
{ 'w-100': enableInContextSidebar },
)}
onClick={() => handleResponseCommentButton()}
disabled={isClosed}
style={{ lineHeight: '20px' }}
onClick={handleResponseCommentButton}
disabled={isClosed || isDeleted}
style={{ lineHeight: '20px', ...(isDeleted ? { opacity: 0.3, cursor: 'not-allowed' } : {}) }}
>
{addResponseCommentButtonMessage}
</Button>
Expand All @@ -78,6 +79,8 @@ const HoverCard = ({
className={['endorse', 'unendorse'].includes(endorseIcons.id) ? 'text-dark-500' : 'text-success-500'}
size="sm"
alt="Endorse"
disabled={isDeleted}
style={isDeleted ? { opacity: 0.3, cursor: 'not-allowed' } : {}}
/>
</OverlayTrigger>
</div>
Expand All @@ -95,8 +98,9 @@ const HoverCard = ({
iconAs={Icon}
size="sm"
alt="Like"
disabled={!userHasLikePermission}
disabled={!userHasLikePermission || isDeleted}
iconClassNames="like-icon-dimensions"
style={isDeleted ? { opacity: 0.3, cursor: 'not-allowed' } : {}}
onClick={(e) => {
e.preventDefault();
onLike();
Expand All @@ -119,6 +123,8 @@ const HoverCard = ({
size="sm"
alt="Follow"
iconClassNames="follow-icon-dimensions"
disabled={isDeleted}
style={isDeleted ? { opacity: 0.3, cursor: 'not-allowed' } : {}}
onClick={(e) => {
e.preventDefault();
onFollow();
Expand Down Expand Up @@ -165,12 +171,14 @@ HoverCard.propTypes = {
)),
onFollow: PropTypes.func,
following: PropTypes.bool,
isDeleted: PropTypes.bool,
};

HoverCard.defaultProps = {
onFollow: () => null,
endorseIcons: null,
following: undefined,
isDeleted: false,
};

export default React.memo(HoverCard);
5 changes: 5 additions & 0 deletions src/discussions/data/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ export const ContentTypes = {
POST: 'POST',
COMMENT: 'COMMENT',
};

export const THREAD_FILTER_TYPES = {
ACTIVE: 'active',
DELETED: 'deleted',
};
Comment on lines +13 to +17
Copy link

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The THREAD_FILTER_TYPES constant is defined but never used in the codebase. The code uses PostsStatusFilter.ACTIVE and PostsStatusFilter.DELETED instead. Consider removing this unused constant or updating the code to use it consistently.

Suggested change
export const THREAD_FILTER_TYPES = {
ACTIVE: 'active',
DELETED: 'deleted',
};

Copilot uses AI. Check for mistakes.
2 changes: 1 addition & 1 deletion src/discussions/data/selectors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function selectAreThreadsFiltered(state) {
}

return !(
filters.status === PostsStatusFilter.ALL
(filters.status === PostsStatusFilter.ALL || filters.status === PostsStatusFilter.ACTIVE)
&& filters.postType === ThreadType.ALL
);
}
Expand Down
114 changes: 76 additions & 38 deletions src/discussions/learners/LearnerActionsDropdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import React, {
useCallback, useRef, useState,
useCallback, useEffect, useRef, useState,
} from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';

import {
Button, Dropdown, Icon, IconButton, ModalPopup, useToggle,
} from '@openedx/paragon';
import { MoreHoriz } from '@openedx/paragon/icons';
import { ChevronRight, MoreHoriz } from '@openedx/paragon/icons';

import { useIntl } from '@edx/frontend-platform/i18n';

import { useLearnerActions } from './utils';
import { useLearnerActionsMenu } from './utils';

const LearnerActionsDropdown = ({
actionHandlers,
Expand All @@ -21,14 +22,16 @@ const LearnerActionsDropdown = ({
const intl = useIntl();
const [isOpen, open, close] = useToggle(false);
const [target, setTarget] = useState(null);
const actions = useLearnerActions(userHasBulkDeletePrivileges);
const [activeSubmenu, setActiveSubmenu] = useState(null);
const menuItems = useLearnerActionsMenu(intl, userHasBulkDeletePrivileges);

const handleActions = useCallback((action) => {
const actionFunction = actionHandlers[action];
if (actionFunction) {
actionFunction();
close();
}
}, [actionHandlers]);
}, [actionHandlers, close]);

const onClickButton = useCallback((event) => {
event.preventDefault();
Expand All @@ -39,8 +42,15 @@ const LearnerActionsDropdown = ({
const onCloseModal = useCallback(() => {
close();
setTarget(null);
setActiveSubmenu(null);
}, [close]);

// Cleanup portal on unmount to prevent memory leaks and orphaned DOM nodes
useEffect(() => () => {
setTarget(null);
setActiveSubmenu(null);
}, []);

return (
<>
<IconButton
Expand All @@ -53,41 +63,69 @@ const LearnerActionsDropdown = ({
iconClassNames={dropDownIconSize ? 'dropdown-icon-dimensions' : ''}
/>
<div className="actions-dropdown">
<ModalPopup
onClose={onCloseModal}
positionRef={target}
isOpen={isOpen}
placement="bottom-start"
>
<div
className="bg-white shadow d-flex flex-column mt-1"
data-testid="learner-actions-dropdown-modal-popup"
{isOpen && ReactDOM.createPortal(
<ModalPopup
onClose={onCloseModal}
positionRef={target}
isOpen={isOpen}
placement="bottom-start"
style={{ zIndex: 9998 }}
>
{actions.map(action => (
<React.Fragment key={action.id}>
<Dropdown.Item
as={Button}
variant="tertiary"
size="inline"
onClick={() => {
close();
handleActions(action.action);
}}
className="d-flex justify-content-start actions-dropdown-item"
data-testId={action.id}
<div
className="bg-white shadow d-flex flex-column mt-1"
data-testid="learner-actions-dropdown-modal-popup"
style={{ position: 'relative', zIndex: 9998 }}
>
{menuItems.map(item => (
<div
key={item.id}
className="position-relative"
onMouseEnter={() => setActiveSubmenu(item.id)}
onMouseLeave={() => setActiveSubmenu(null)}
style={{ zIndex: 2 }}
>
<Icon
src={action.icon}
className="icon-size-24"
/>
<span className="font-weight-normal ml-2">
{action.label.defaultMessage}
</span>
</Dropdown.Item>
</React.Fragment>
))}
</div>
</ModalPopup>
<Dropdown.Item
as={Button}
variant="tertiary"
size="inline"
className="d-flex justify-content-between align-items-center actions-dropdown-item"
data-testid={item.id}
>
<div className="d-flex align-items-center">
<span className="font-weight-normal">
{item.label}
</span>
</div>
<Icon
src={ChevronRight}
className="icon-size-16"
/>
</Dropdown.Item>
{activeSubmenu === item.id && (
<div className="bg-white learner-submenu-container">
{item.submenu.map(subItem => (
<Dropdown.Item
key={subItem.id}
as={Button}
variant="tertiary"
size="inline"
onClick={() => handleActions(subItem.action)}
className="d-flex justify-content-start actions-dropdown-item"
data-testid={subItem.id}
>
<span className="font-weight-normal">
{subItem.label}
</span>
</Dropdown.Item>
))}
</div>
)}
</div>
))}
</div>
</ModalPopup>,
document.body,
)}
</div>
</>
);
Expand Down
Loading
Loading