Skip to content

Regression: run clientMessageRecieved hooks on thread main message #27962

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
ggazzo merged 6 commits into from
Mar 2, 2023
Merged

Regression: run clientMessageRecieved hooks on thread main message #27962

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e632235
use main thread message from collections
yash-rajpal Feb 7, 2023
625958d
fix types
yash-rajpal Feb 8, 2023
87c55c8
Merge branch 'develop' into e2e-thread-main-message
yash-rajpal Feb 23, 2023
d1fdede
fix conflicts
yash-rajpal Feb 28, 2023
a9fd43c
Merge branch 'develop' into e2e-thread-main-message
yash-rajpal Mar 1, 2023
2e49604
use main messasge from useQuery
yash-rajpal Mar 1, 2023
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
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const ThreadMessageList = ({ mainMessage, jumpTo, onJumpTo }: ThreadMessageListP
</li>
) : (
<MessageListProvider>
{[mainMessage, ...messages].map((message, index, { [index - 1]: previous }) => {
{messages.map((message, index, { [index - 1]: previous }) => {
const sequential = isMessageSequential(message, previous, messageGroupingPeriod);
const newDay = isMessageNewDay(message, previous);
const firstUnread = isMessageFirstUnread(subscription, message, previous);
Expand Down
16 changes: 8 additions & 8 deletions apps/meteor/client/views/room/contextualBar/Threads/hooks/useLegacyThreadMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
import type { IThreadMainMessage } from '@rocket.chat/core-typings';
import { isThreadMessage } from '@rocket.chat/core-typings';
import type { IThreadMessage, IThreadMainMessage } from '@rocket.chat/core-typings';
import { useMethod } from '@rocket.chat/ui-contexts';
import { useEffect, useState, useCallback } from 'react';

import { Messages } from '../../../../../../app/models/client';
import { upsertMessageBulk } from '../../../../../../app/ui-utils/client/lib/RoomHistoryManager';
import { useReactiveValue } from '../../../../../hooks/useReactiveValue';

export const useLegacyThreadMessages = (tmid: IThreadMainMessage['_id']) => {
export const useLegacyThreadMessages = (
tmid: IThreadMainMessage['_id'],
): {
messages: Array<IThreadMessage | IThreadMainMessage>;
loading: boolean;
} => {
const messages = useReactiveValue(
useCallback(() => {
return Messages.find(
{
$or: [{ tmid }, { _id: tmid }],
_hidden: { $ne: true },
tmid,
_id: { $ne: tmid },
},
{
fields: {
Expand All @@ -25,9 +27,7 @@ export const useLegacyThreadMessages = (tmid: IThreadMainMessage['_id']) => {
},
sort: { ts: 1 },
},
)
.fetch()
.filter(isThreadMessage);
).fetch() as Array<IThreadMessage | IThreadMainMessage>;
}, [tmid]),
);

Expand Down