Skip to content
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

fix: mark channel read for all incoming unread messages #2622

Merged
merged 3 commits into from
Jan 28, 2025
Merged

fix: mark channel read for all incoming unread messages #2622

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1b6e9d
fix: mark channel read for all incoming unread messages
MartinCupela Jan 27, 2025
e654e89
test: remove tests that do not update the channel read state
MartinCupela Jan 27, 2025
1f8d786
fix: determine last read message from the latest message list
MartinCupela Jan 28, 2025
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
1 change: 0 additions & 1 deletion src/components/MessageList/MessageList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ const MessageListWithContext = <
useMarkRead({
isMessageListScrolledToBottom,
messageListIsThread: threadList,
unreadCount: channelUnreadUiState?.unread_messages ?? 0,
wasMarkedUnread: !!channelUnreadUiState?.first_unread_message_id,
});

Expand Down
1 change: 0 additions & 1 deletion src/components/MessageList/VirtualizedMessageList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,6 @@ const VirtualizedMessageListWithContext = <
useMarkRead({
isMessageListScrolledToBottom,
messageListIsThread: !!threadList,
unreadCount: channelUnreadUiState?.unread_messages ?? 0,
wasMarkedUnread: !!channelUnreadUiState?.first_unread_message_id,
});

Expand Down
88 changes: 0 additions & 88 deletions src/components/MessageList/__tests__/MessageList.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,94 +370,6 @@ describe('MessageList', () => {
afterEach(jest.clearAllMocks);
afterAll(jest.restoreAllMocks);

it('should keep displaying the unread messages separator when an unread channel is marked read on mount', async () => {
const user = generateUser();
const last_read_message_id = 'X';
const lastReadMessage = generateMessage({ id: last_read_message_id });
const messages = [lastReadMessage, generateMessage(), generateMessage()];
const {
channels: [channel],
client: chatClient,
} = await initClientWithChannels({
channelsData: [
{
messages,
read: [
{
last_read: lastReadMessage.created_at.toISOString(),
last_read_message_id,
unread_messages: 2,
user,
},
],
},
],
customUser: user,
});

const markReadMock = jest
.spyOn(channel, 'markRead')
.mockReturnValueOnce(markReadApi(channel));

await act(() => {
renderComponent({
channelProps: { channel },
chatClient,
msgListProps: { messages },
});
});

expect(markReadMock).toHaveBeenCalledTimes(1);
expect(screen.queryByText(separatorText)).toBeInTheDocument();
});

it('should display unread messages separator before the first message', async () => {
const user = generateUser();
const messages = [generateMessage(), generateMessage()];
const {
channels: [channel],
client: chatClient,
} = await initClientWithChannels({
channelsData: [
{
messages,
read: [
{
last_read: new Date(1).toISOString(),
unread_messages: messages.length,
user,
},
],
},
],
customUser: user,
});

const markReadMock = jest.spyOn(channel, 'markRead').mockReturnValue(markReadApi(channel));
const Message = () => <div className='message-ui' />;
let container;

await act(() => {
const result = renderComponent({
channelProps: { channel, Message },
chatClient,
msgListProps: { messages },
});
container = result.container;
});
const listItems = container.querySelectorAll('.str-chat__ul > *');
expect(listItems).toHaveLength(4);
expect(listItems[1].firstChild).toMatchInlineSnapshot(`
<div
class="str-chat__unread-messages-separator"
data-testid="unread-messages-separator"
>
Unread messages
</div>
`);
markReadMock.mockRestore();
});

it('should display unread messages separator when a channel is marked unread and remove it when marked read by markRead()', async () => {
jest.useFakeTimers();
const markReadBtnTestId = 'test-mark-read';
Expand Down
Loading
Loading