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

Jump to bottom

Suggestion to TC128 #27748

Closed
wants to merge 5 commits into from
Closed

Suggestion to TC128 #27748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55a5991
[FIX]Reply on thread button showing unintendedly
Educg550 Jan 10, 2023
f77c4a0
Fix on message context flagging
Educg550 Jan 10, 2023
9ce6a7e
Requested changes made
Educg550 Jan 12, 2023
84ee601
Fixed lint issue
Educg550 Jan 12, 2023
f9ccd6f
fix: suggestions
hugocostadev Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/meteor/client/components/message/toolbox/Toolbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { IMessage, IUser, IRoom } from '@rocket.chat/core-typings';
import { isThreadMessage, isRoomFederated } from '@rocket.chat/core-typings';
import type { IUser, IRoom, IMessage } from '@rocket.chat/core-typings';
import { isThreadMessage, isRoomFederated, isThreadFirstMessage } from '@rocket.chat/core-typings';
import { MessageToolbox, MessageToolboxItem } from '@rocket.chat/fuselage';
import { useUser, useUserSubscription, useSettings, useTranslation } from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
Expand All @@ -21,7 +21,7 @@ const getMessageContext = (message: IMessage, room: IRoom): MessageActionContext
if (isRoomFederated(room)) {
return 'federated';
}
if (isThreadMessage(message)) {
if (isThreadFirstMessage(message) || isThreadMessage(message)) {
return 'threads';
}
return 'message';
Expand Down
5 changes: 5 additions & 0 deletions apps/meteor/client/components/message/variants/ThreadMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { ISubscription, IThreadMessage, IThreadMainMessage } from '@rocket.chat/core-typings';
import { isThreadMainMessage } from '@rocket.chat/core-typings';
import { Message, MessageLeftContainer, MessageContainer } from '@rocket.chat/fuselage';
import { useToggle } from '@rocket.chat/fuselage-hooks';
import { useUserId } from '@rocket.chat/ui-contexts';
Expand Down Expand Up @@ -53,6 +54,10 @@ const ThreadMessage = ({ message, sequential, unread }: ThreadMessageProps): Rea

const normalizedMessage = useMemo(() => normalizeMessage(message), [message, normalizeMessage]);

if (isThreadMainMessage(message)) {
message.renderedOnThread = true;
}

return (
<Message
id={message._id}
Expand Down
3 changes: 3 additions & 0 deletions packages/core-typings/src/IMessage/IMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,14 @@ export interface IThreadMainMessage extends IMessage {
tcount: number;
tlm: Date;
replies: IUser['_id'][];
renderedOnThread?: boolean;
}
export interface IThreadMessage extends IMessage {
tmid: string;
}

export const isThreadFirstMessage = (message: IMessage): message is IThreadMessage => 'renderedOnThread' in message;

export const isThreadMainMessage = (message: IMessage): message is IThreadMainMessage => 'tcount' in message && 'tlm' in message;

export const isThreadMessage = (message: IMessage): message is IThreadMessage => !!message.tmid;
Expand Down