Skip to content

fix: Rooms not working in embedded layout #35204

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 3 commits into from
Feb 18, 2025
Merged

fix: Rooms not working in embedded layout #35204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9e7c19
fix queryData used as subscription record
gabriellsh Feb 13, 2025
8b6a7c9
create changeset
gabriellsh Feb 13, 2025
f36bc5c
Merge branch 'develop' into fix/embeddedLayoutSub
kodiakhq[bot] Feb 18, 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
5 changes: 5 additions & 0 deletions .changeset/six-deers-dress.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fixes an issue with embedded layout rooms displaying as if the user is not part of the room
8 changes: 4 additions & 4 deletions apps/meteor/client/views/room/RoomOpenerEmbedded.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const RoomOpenerEmbedded = ({ type, reference }: RoomOpenerProps): ReactElement
const subscribeToNotifyUser = useStream('notify-user');

const rid = data?.rid;
const { data: subscription, refetch } = useQuery({
const { data: subscriptionData, refetch } = useQuery({
queryKey: ['subscriptions', rid] as const,
queryFn: () => {
if (!rid) {
Expand All @@ -55,13 +55,13 @@ const RoomOpenerEmbedded = ({ type, reference }: RoomOpenerProps): ReactElement
});

useEffect(() => {
if (!subscription) {
if (!subscriptionData?.subscription) {
return;
}

CachedChatSubscription.upsertSubscription(subscription as unknown as ISubscription);
CachedChatSubscription.upsertSubscription(subscriptionData.subscription as unknown as ISubscription);
LegacyRoomManager.computation.invalidate();
}, [subscription]);
}, [subscriptionData]);

useEffect(() => {
if (!uid) {
Expand Down
Loading