Skip to content

fix: Attachments not collapsing when using incoming webhook #31318

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
kodiakhq merged 14 commits into from
Jan 3, 2024
Merged

fix: Attachments not collapsing when using incoming webhook #31318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9e77334
Fixed collapse bug
rezerov Dec 25, 2023
74c5a0d
.
rezerov Dec 25, 2023
91a452e
..
rezerov Dec 25, 2023
78e5017
.
rezerov Dec 27, 2023
1c7d174
Revert "."
rezerov Dec 27, 2023
9083711
.
rezerov Dec 27, 2023
0e90ff4
...
rezerov Dec 27, 2023
4ba512d
Create attachment-collapse.md
hugocostadev Dec 27, 2023
e51a623
removed collapsed prop
rezerov Dec 27, 2023
e2326c0
Merge branch 'collapsefix' of https://github.com/hardikbhatia777/Rock…
rezerov Dec 27, 2023
52c9982
Merge branch 'develop' into collapsefix
hugocostadev Dec 27, 2023
e74f4ba
Merge branch 'develop' into collapsefix
rezerov Dec 29, 2023
6dbb843
Merge branch 'develop' into collapsefix
casalsgh Jan 3, 2024
d000969
Merge branch 'develop' into collapsefix
casalsgh Jan 3, 2024
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
5 changes: 5 additions & 0 deletions .changeset/attachment-collapse.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed Attachments not respecting collapse property when using incoming webhook
5 changes: 2 additions & 3 deletions apps/meteor/client/components/message/content/Attachments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ import AttachmentsItem from './attachments/AttachmentsItem';

type AttachmentsProps = {
attachments: MessageAttachmentBase[];
collapsed?: boolean;
id?: string | undefined;
};

const Attachments = ({ attachments, collapsed, id }: AttachmentsProps): ReactElement => {
const Attachments = ({ attachments, id }: AttachmentsProps): ReactElement => {
return (
<>
{attachments?.map((attachment, index) => (
<AttachmentsItem key={index} id={id} attachment={{ ...attachment, collapsed }} />
<AttachmentsItem key={index} id={id} attachment={{ ...attachment }} />
))}
</>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const QuoteAttachment = ({ attachment }: QuoteAttachmentProps): ReactElem
{attachment.md ? <MessageContentBody md={attachment.md} /> : attachment.text.substring(attachment.text.indexOf('\n') + 1)}
{attachment.attachments && (
<AttachmentInner>
<Attachments attachments={attachment.attachments} collapsed={attachment.collapsed} />
<Attachments attachments={attachment.attachments} />
</AttachmentInner>
)}
</AttachmentDetails>
Expand Down