fix(web): org switching now updates sidebar and improve dropdown UX#970
Merged
Conversation
- Fix myOrganization tRPC procedure to filter by activeOrganizationId from session instead of returning first membership found - Update Header dropdown trigger to show org name + avatar (matching desktop app UX) with chevron icon - Simplify dropdown to show org switcher submenu and log out button
Contributor
📝 WalkthroughWalkthroughModified the Header component to use organization-based data for avatar display and added an organization switcher dropdown. Updated the user organization query to filter memberships by both the current user and their active organization from the session. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
Poem
🚥 Pre-merge checks | ✅ 1 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (1 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches
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 |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Fix all issues with AI agents
In `@packages/trpc/src/router/user/user.ts`:
- Around line 14-22: The code reads ctx.session.session.activeOrganizationId
without guarding for missing session payload; change to use optional chaining
when extracting activeOrganizationId (e.g., const activeOrganizationId =
ctx.session?.session?.activeOrganizationId) and ensure the conditional passed to
db.query.members.findFirst still only includes the organization filter when
activeOrganizationId is defined so members.userId and members.organizationId
checks remain safe; update the logic around db.query.members.findFirst (and any
use in myOrganization) to handle undefined activeOrganizationId gracefully.
Comment on lines
+14
to
+22
| const activeOrganizationId = ctx.session.session.activeOrganizationId; | ||
|
|
||
| const membership = await db.query.members.findFirst({ | ||
| where: eq(members.userId, ctx.session.user.id), | ||
| where: activeOrganizationId | ||
| ? and( | ||
| eq(members.userId, ctx.session.user.id), | ||
| eq(members.organizationId, activeOrganizationId), | ||
| ) | ||
| : eq(members.userId, ctx.session.user.id), |
Contributor
There was a problem hiding this comment.
Guard against missing session payload before reading activeOrganizationId.
Line 14 assumes ctx.session.session is always defined; if it’s absent (e.g., session variants or partial payloads), this will throw and break myOrganization. The client-side usage already treats it as optional. Consider optional chaining to keep behavior aligned and fail-safe.
✅ Suggested fix
- const activeOrganizationId = ctx.session.session.activeOrganizationId;
+ const activeOrganizationId = ctx.session.session?.activeOrganizationId;📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| const activeOrganizationId = ctx.session.session.activeOrganizationId; | |
| const membership = await db.query.members.findFirst({ | |
| where: eq(members.userId, ctx.session.user.id), | |
| where: activeOrganizationId | |
| ? and( | |
| eq(members.userId, ctx.session.user.id), | |
| eq(members.organizationId, activeOrganizationId), | |
| ) | |
| : eq(members.userId, ctx.session.user.id), | |
| const activeOrganizationId = ctx.session.session?.activeOrganizationId; | |
| const membership = await db.query.members.findFirst({ | |
| where: activeOrganizationId | |
| ? and( | |
| eq(members.userId, ctx.session.user.id), | |
| eq(members.organizationId, activeOrganizationId), | |
| ) | |
| : eq(members.userId, ctx.session.user.id), |
🤖 Prompt for AI Agents
In `@packages/trpc/src/router/user/user.ts` around lines 14 - 22, The code reads
ctx.session.session.activeOrganizationId without guarding for missing session
payload; change to use optional chaining when extracting activeOrganizationId
(e.g., const activeOrganizationId = ctx.session?.session?.activeOrganizationId)
and ensure the conditional passed to db.query.members.findFirst still only
includes the organization filter when activeOrganizationId is defined so
members.userId and members.organizationId checks remain safe; update the logic
around db.query.members.findFirst (and any use in myOrganization) to handle
undefined activeOrganizationId gracefully.
Contributor
🧹 Preview Cleanup CompleteThe following preview resources have been cleaned up:
Thank you for your contribution! 🎉 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
myOrganizationtRPC procedure to filter byactiveOrganizationIdfrom session instead of returning first membership found - this was causing the sidebar to not update when switching orgsTest plan
Summary by CodeRabbit
Release Notes
✏️ Tip: You can customize this high-level summary in your review settings.