Conversation
|
|
|
View your CI Pipeline Execution ↗ for commit 49780ee
☁️ Nx Cloud last updated this comment at |
|
View your CI Pipeline Execution ↗ for commit 9521ed7
☁️ Nx Cloud last updated this comment at |
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Contributor
|
I see you added the "on stage" label, I'll get this merged to the stage branch! |
stage-branch-merger bot
added a commit
that referenced
this pull request
Apr 7, 2026
…r-managers-gmail-account' (PR #8958) into stage
stage-branch-merger bot
added a commit
that referenced
this pull request
Apr 7, 2026
…r-managers-gmail-account' (PR #8958) into stage
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
💤 Files with no reviewable changes (1)
WalkthroughFilters Google Sheets integrations in the sync dialog to only show integrations whose Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Suggested reviewers
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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 |
Contributor
|
Merge conflict attempting to merge this into stage. Please fix manually. |
jianwei1
force-pushed
the
jianweichong/nes-1492-google-sync-dropdown-shows-another-managers-gmail-account
branch
from
65c0e93 to
b48397c
Compare
Contributor
|
Merge conflict attempting to merge this into stage. Please fix manually. |
mikeallisonJS
approved these changes
Apr 7, 2026
This comment has been minimized.
This comment has been minimized.
…hows-another-managers-gmail-account
stage-branch-merger bot
added a commit
that referenced
this pull request
Apr 7, 2026
…r-managers-gmail-account' (PR #8958) into stage
![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: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@apps/journeys-admin/src/components/JourneyVisitorsList/FilterDrawer/GoogleSheetsSyncDialog/GoogleSheetsSyncDialog.spec.tsx`:
- Around line 260-371: The tests render GoogleSheetsSyncDialog directly which
skips the required test providers and MSW/Apollo stack; update each test that
calls render(<GoogleSheetsSyncDialog ... />) to wrap the component with the
prescribed provider chain (SnackbarProvider →
ApolloLoadingProvider/MockedProvider → ThemeProvider) and ensure MSW
test/mswServer.ts is initialized via the test setup (keep using setupApolloMocks
and mockUseIntegrationQuery/mockUseAuth for data but render through the
ApolloLoadingProvider helper); this will mirror runtime wiring and fix divergent
behavior in the tests.
In `@docs/plans/2026-04-07-001-fix-google-sync-dropdown-userid-mismatch-plan.md`:
- Around line 14-15: The plan text is stale: update the document to reflect that
the implemented fix no longer filters integrations by integration.user?.id
(which compared Prisma UUID to Firebase UID and always failed); change
references that say the branch filters by integration.user?.id and remove or
rewrite the note at lines 119-122 about a pending filter fix so the doc
correctly describes the current behavior and the actual fix (matching by the
correct user identifier used in the UI, e.g., the Firebase UID or the normalized
id field used by the integrations lookup); specifically search for and replace
mentions of integration.user?.id, currentUserId comparison, and the “filter fix
pending” wording so the plan accurately documents the implemented change and its
rationale.
🪄 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: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 8b38e23c-c0c4-4cbd-9c7c-0d70fdb98f2c
⛔ Files ignored due to path filters (1)
apps/journeys-admin/__generated__/GetIntegration.tsis excluded by!**/__generated__/**
📒 Files selected for processing (5)
apps/journeys-admin/src/components/JourneyVisitorsList/FilterDrawer/GoogleSheetsSyncDialog/GoogleSheetsSyncDialog.spec.tsxapps/journeys-admin/src/components/JourneyVisitorsList/FilterDrawer/GoogleSheetsSyncDialog/GoogleSheetsSyncDialog.tsxapps/journeys-admin/src/libs/useIntegrationQuery/useIntegrationQuery.tsdocs/plans/2026-04-07-001-fix-google-sync-dropdown-userid-mismatch-plan.mdlibs/locales/en/apps-journeys-admin.json
💤 Files with no reviewable changes (1)
- libs/locales/en/apps-journeys-admin.json
✅ Files skipped from review due to trivial changes (1)
- apps/journeys-admin/src/libs/useIntegrationQuery/useIntegrationQuery.ts
…hows-another-managers-gmail-account
This comment has been minimized.
This comment has been minimized.
…hows-another-managers-gmail-account
Contributor
|
Merge conflict attempting to merge this into stage. Please fix manually. |
Contributor
Author
Review feedback addressed (ee4fc7a)Challenged:
Skipped (optional/nit):
|
…hows-another-managers-gmail-account
Contributor
|
Merge conflict attempting to merge this into stage. Please fix manually. |
This comment has been minimized.
This comment has been minimized.
…hows-another-managers-gmail-account
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
4 participants
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
Bug (NES-1492): In multi-manager teams, the Google Sheets sync dropdown showed ALL team integrations — including those created by other managers.
Previous fix (#8938, reverted as #8957): Filtered by
integration.user?.id === currentUserId, but this comparison always failed becauseintegration.user.idresolves to a Prisma UUID (via federation throughapi-users), whileuseAuth().user.idis the Firebase UID. Result: dropdown showed zero integrations.This fix: Uses the
userIdscalar field exposed in #8967 to filter integrations byintegration.userId === currentUserId— both are Firebase UIDs, so the comparison works correctly.Changes
userIdto theGetIntegrationquery (keptuser { id }— used byGoogleIntegrationDetailsfor ownership checks)GoogleSheetsSyncDialogto compareintegration.userIdinstead ofintegration.user?.idDependencies
userIdonIntegrationGooglebackend)Test plan
🤖 Generated with Claude Code
Summary by CodeRabbit