Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ const ActivityFeedV2 = ({
}, [currentUserId, feedItems]);

const filteredItems = React.useMemo(() => {
return transformedItems.filter(item => {
const filtered = transformedItems.filter(item => {
if ((item.type === 'comment' || item.type === 'annotation') && item.isResolved && !showResolved) {
return false;
}
Expand All @@ -240,6 +240,11 @@ const ActivityFeedV2 = ({
}
return true;
});
const filtersDroppedItems = filtered.length < transformedItems.length;
if (!filtersDroppedItems && filtered.every(item => item.type === 'version')) {
Comment thread
jackiejou marked this conversation as resolved.
return [];
}
return filtered;
}, [currentUserId, showOnlyMentionsMe, showResolved, transformedItems]);

React.useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,39 @@ describe('elements/content-sidebar/activity-feed-v2/ActivityFeedV2', () => {
expect(screen.getByTestId('task-task-1')).toBeVisible();
});

test('should render version feed items', () => {
test('should render version feed items alongside other items', () => {
render(
<ActivityFeedV2
currentUser={mockCurrentUser}
feedItems={[mockComment, mockVersion] as ActivityFeedV2Props['feedItems']}
/>,
);

expect(screen.getByTestId('version-version-1')).toBeVisible();
});

test('should suppress version-only feeds so the empty state can render', () => {
render(
<ActivityFeedV2
currentUser={mockCurrentUser}
feedItems={[mockVersion] as ActivityFeedV2Props['feedItems']}
/>,
);

expect(screen.queryByTestId('version-version-1')).not.toBeInTheDocument();
expect(screen.getByTestId('activity-feed-list').children).toHaveLength(0);
});

test('should keep version rows when filters dropped other items', () => {
const resolvedComment = { ...mockComment, id: 'resolved-1', status: 'resolved' };
render(
<ActivityFeedV2
currentUser={mockCurrentUser}
feedItems={[resolvedComment, mockVersion] as ActivityFeedV2Props['feedItems']}
/>,
);

expect(screen.queryByTestId('threaded-annotation-resolved-1')).not.toBeInTheDocument();
expect(screen.getByTestId('version-version-1')).toBeVisible();
});

Expand Down
Loading