fix: Do not register videoconf user for embedded layout#40982
fix: Do not register videoconf user for embedded layout#40982gabriellsh wants to merge 4 commits into
Conversation
|
Looks like this PR is not ready to merge, because of the following issues:
Please fix the issues and try again If you have any trouble, please check the PR guidelines |
🦋 Changeset detectedLatest commit: 2821c72 The changes in this PR will be included in the next version bump. This PR includes changesets to release 3 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
📜 Recent review details⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (5)
Walkthrough
ChangesVideoConf embedded layout and userId guard
Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Warning Review ran into problems🔥 ProblemsErrors were encountered while retrieving linked issues. Errors (1)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #40982 +/- ##
===========================================
+ Coverage 70.14% 70.15% +0.01%
===========================================
Files 3358 3358
Lines 129569 129572 +3
Branches 22457 22456 -1
===========================================
+ Hits 90883 90899 +16
+ Misses 35380 35360 -20
- Partials 3306 3313 +7
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
23cf9b8 to
06e4987
Compare
cardoso
left a comment
There was a problem hiding this comment.
Confirmed the fix:
- User A opens with regular layout
- User B opens channel without User A with embedded layout
- User A calls User B
Before this fix: crash
After this fix: no crash
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@apps/meteor/client/lib/VideoConfManager.ts`:
- Around line 304-306: The guard condition in the updateUser method (checking if
userId === this.userId) returns early and prevents disconnect/reconnect logic
from executing when the connection state changes but userId remains the same.
Modify the guard to only return early when userId AND the connection/login state
are all unchanged; specifically, the early return should account for isConnected
and isLoggingIn changes in addition to userId identity, allowing the disconnect
logic (around lines 310-312) and reconnect logic (around lines 319-321) to
execute properly when connection or login state changes while userId stays the
same.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 6cb52afc-029d-4ee4-86c0-8c048136d062
📒 Files selected for processing (2)
apps/meteor/client/lib/VideoConfManager.tsapps/meteor/client/views/root/hooks/loggedIn/useUpdateVideoConfUser.ts
📜 Review details
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (4)
- GitHub Check: 📦 Build Packages
- GitHub Check: CodeQL-Build
- GitHub Check: CodeQL-Build
- GitHub Check: Hacktron Security Check
🧰 Additional context used
📓 Path-based instructions (1)
**/*.{ts,tsx,js}
📄 CodeRabbit inference engine (.cursor/rules/playwright.mdc)
**/*.{ts,tsx,js}: Write concise, technical TypeScript/JavaScript with accurate typing in Playwright tests
Avoid code comments in the implementation
Files:
apps/meteor/client/lib/VideoConfManager.tsapps/meteor/client/views/root/hooks/loggedIn/useUpdateVideoConfUser.ts
🧠 Learnings (5)
📚 Learning: 2026-02-10T16:32:42.586Z
Learnt from: tassoevan
Repo: RocketChat/Rocket.Chat PR: 38528
File: apps/meteor/client/startup/roles.ts:14-14
Timestamp: 2026-02-10T16:32:42.586Z
Learning: In Rocket.Chat's Meteor client code, DDP streams use EJSON and Date fields arrive as Date objects; do not manually construct new Date() in stream handlers (for example, in sdk.stream()). Only REST API responses return plain JSON where dates are strings, so implement explicit conversion there if needed. Apply this guidance to all TypeScript files under apps/meteor/client to ensure consistent date handling in DDP streams and REST responses.
Applied to files:
apps/meteor/client/lib/VideoConfManager.tsapps/meteor/client/views/root/hooks/loggedIn/useUpdateVideoConfUser.ts
📚 Learning: 2026-05-11T20:30:35.265Z
Learnt from: tassoevan
Repo: RocketChat/Rocket.Chat PR: 40480
File: apps/meteor/client/meteor/startup/accounts.ts:59-61
Timestamp: 2026-05-11T20:30:35.265Z
Learning: In Rocket.Chat’s Meteor client code, when calling `dispatchToastMessage` with `{ type: 'error' }`, pass the raw caught error object as `message` without manual normalization. `dispatchToastMessage` is designed to accept `message: unknown` for error toasts, so avoid converting errors to strings (e.g., `String(error)`) or extracting `error.message` before passing them.
Applied to files:
apps/meteor/client/lib/VideoConfManager.tsapps/meteor/client/views/root/hooks/loggedIn/useUpdateVideoConfUser.ts
📚 Learning: 2026-02-26T19:25:44.063Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 38778
File: packages/ui-voip/src/providers/useMediaSession.ts:192-192
Timestamp: 2026-02-26T19:25:44.063Z
Learning: In the Rocket.Chat repository, do not reference Biome lint rules in code review feedback. Biome is not used even if biome.json exists; only reference Biome rules if there is explicit, project-wide usage documented. For TypeScript files, review lint implications without Biome guidance unless the project enables Biome rules.
Applied to files:
apps/meteor/client/lib/VideoConfManager.tsapps/meteor/client/views/root/hooks/loggedIn/useUpdateVideoConfUser.ts
📚 Learning: 2026-02-26T19:25:44.063Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 38778
File: packages/ui-voip/src/providers/useMediaSession.ts:192-192
Timestamp: 2026-02-26T19:25:44.063Z
Learning: In this repository (RocketChat/Rocket.Chat), Biome lint rules are not used even if a biome.json exists. When reviewing TypeScript files (e.g., packages/ui-voip/src/providers/useMediaSession.ts), ensure lint suggestions do not reference Biome-specific rules. Rely on general ESLint/TypeScript lint rules and project conventions instead.
Applied to files:
apps/meteor/client/lib/VideoConfManager.tsapps/meteor/client/views/root/hooks/loggedIn/useUpdateVideoConfUser.ts
📚 Learning: 2026-05-06T12:21:44.083Z
Learnt from: juliajforesti
Repo: RocketChat/Rocket.Chat PR: 40256
File: apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx:121-149
Timestamp: 2026-05-06T12:21:44.083Z
Learning: Field wrappers in rocket.chat/fuselage-forms (Field, FieldLabel, FieldRow, FieldError, FieldHint) auto-create htmlFor/id associations, aria-describedby, and role="alert" for errors. Do not manually set htmlFor, id, aria-describedby, or role attributes when using these wrappers. This automatic wiring does not apply to plain rocket.chat/fuselage components, which require explicit ID wiring per the accessibility docs. In code reviews, prefer using fuselage-forms wrappers for form fields and verify there is no unnecessary manual ID/aria wiring in files that use these wrappers. If a component uses plain fuselage components, ensure proper id wiring as per docs.
Applied to files:
apps/meteor/client/lib/VideoConfManager.tsapps/meteor/client/views/root/hooks/loggedIn/useUpdateVideoConfUser.ts
🔇 Additional comments (3)
apps/meteor/client/views/root/hooks/loggedIn/useUpdateVideoConfUser.ts (3)
13-14: LGTM!
15-15: LGTM!
10-10: No action required —useEmbeddedLayout()returns a stable boolean primitive.The
isEmbeddedproperty inLayoutContextValueis typed as a boolean (not an object wrapper), and the context value is properly memoized inLayoutProvider.tsx. Boolean primitives are always stable references, so includingembeddedLayoutin the dependency array does not cause excessive re-runs.> Likely an incorrect or invalid review comment.
There was a problem hiding this comment.
1 issue found and verified against the latest diff
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
Fixes an issue with embedded layout where users were able to receive VideoConf calls, causing the application to crash
Proposed changes (including videos or screenshots)
Embedded layout is supposed to be a controlable window that locks the user in that page, unless an external navigation (through window.postMessage) is triggered. Videoconf is not part of the supported features for embedded layout, and was incorrectly registering users that should not receive calls (those in embedded layout)
Issue(s)
Steps to test or reproduce
Further comments
SUP-1056
Summary by CodeRabbit