Skip to content

Conversation

@alexcarpenter
Copy link
Member

@alexcarpenter alexcarpenter commented Oct 29, 2025

Description

Reverts OrgPreview removal from #7086

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Restored organization preview display within the organization switcher component when managing organizations.

@changeset-bot
Copy link

changeset-bot bot commented Oct 29, 2025

🦋 Changeset detected

Latest commit: 54b626e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
Name Type
@clerk/clerk-js Patch
@clerk/chrome-extension Patch
@clerk/clerk-expo Patch

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

@vercel
Copy link

vercel bot commented Oct 29, 2025

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Preview Comments Updated (UTC)
clerk-js-sandbox Ready Ready Preview Comment Oct 29, 2025 4:52pm

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Oct 29, 2025

Walkthrough

This pull request adds an OrganizationPreview rendering component to the OrganizationSwitcherTrigger, conditionally displaying organization information when an organization is present. A changeset entry documents this patch release for @clerk/clerk-js.

Changes

Cohort / File(s) Summary
Changeset documentation
\.changeset/old-adults-deny.md
Adds patch release entry for @clerk/clerk-js noting the restoration of OrgPreview within OrgSwitcher
Organization switcher trigger component
packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
Introduces conditional OrganizationPreview rendering when an organization exists, receiving props for elementId, gap, size, organization, and maxWidth; PersonalWorkspacePreview remains for non-organization state

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

  • Verify the OrganizationPreview component receives correct props and behaves as expected in both organization and personal workspace states
  • Confirm the conditional logic properly branches between organization and non-organization scenarios

Poem

🐰 The OrgPreview hops back to the switcher's light,
Nestled in conditions, rendered just right,
When organizations bloom, the preview will show,
Personal workspaces below, a harmonious flow! 🌿

Pre-merge checks and finishing touches

❌ Failed checks (1 warning)
Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. You can run @coderabbitai generate docstrings to improve docstring coverage.
✅ Passed checks (2 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title Check ✅ Passed The title "fix(clerk-js): Add missing OrgPreview in OrgSwitcher" directly and clearly describes the main change in this PR. The raw summary confirms that the PR introduces a new OrganizationPreview rendering inside OrganizationSwitcherTrigger when an organization is present, which is exactly what the title conveys. The title is concise, uses proper conventional commit formatting with the "fix" prefix to indicate a bug fix in the clerk-js package, and is specific enough that a reviewer scanning the history would immediately understand the primary change. There is no vague language, file lists, or noise that would detract from clarity.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch alexcarpenter/fix-missing-org-preview

Comment @coderabbitai help to get the list of available commands and usage tips.

@alexcarpenter alexcarpenter enabled auto-merge (squash) October 29, 2025 16:53
@pkg-pr-new
Copy link

pkg-pr-new bot commented Oct 29, 2025

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7091

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7091

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7091

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7091

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7091

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7091

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@7091

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@7091

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7091

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7091

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7091

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7091

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7091

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7091

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@7091

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7091

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@7091

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7091

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7091

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7091

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@7091

@clerk/types

npm i https://pkg.pr.new/@clerk/types@7091

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7091

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7091

commit: 54b626e

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
.changeset/old-adults-deny.md (1)

1-5: Changeset format is valid, but the description could be more detailed for clarity.

The YAML frontmatter is correctly structured (lines 1–3), and the patch version bump is appropriate. However, the description at line 5 is very brief and doesn't provide enough context for end users or changelog readers about what was changed and why.

Consider expanding the description to include:

  • What OrgPreview component does and why it's important.
  • What the previous behavior was (if applicable).
  • The specific impact on users.

Example enhancement:

- Bring back OrgPreview within the OrgSwitcher component
+ Restore OrganizationPreview component rendering in OrgSwitcher to display organization details when available, improving user visibility of the selected organization.

Note: The actual implementation file (OrganizationSwitcherTrigger.tsx) mentioned in the PR summary and AI summary was not provided for review. To complete a thorough review of this PR, please provide the modified implementation file(s) so I can verify:

  • Correct import and usage of OrganizationPreview.
  • Proper conditional rendering logic.
  • Correct prop passing and TypeScript types.
  • Integration with existing PersonalWorkspacePreview rendering.
📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 8625042 and 54b626e.

📒 Files selected for processing (2)
  • .changeset/old-adults-deny.md (1 hunks)
  • packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx (2 hunks)
🧰 Additional context used
📓 Path-based instructions (10)
.changeset/**

📄 CodeRabbit inference engine (.cursor/rules/monorepo.mdc)

Automated releases must use Changesets.

Files:

  • .changeset/old-adults-deny.md
packages/clerk-js/src/ui/**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/clerk-js-ui.mdc)

packages/clerk-js/src/ui/**/*.{ts,tsx}: Element descriptors should always be camelCase
Use element descriptors in UI components to enable consistent theming and styling via appearance.elements
Element descriptors should generate unique, stable CSS classes for theming
Element descriptors should handle state classes (e.g., cl-loading, cl-active, cl-error, cl-open) automatically based on component state
Do not render hard-coded values; all user-facing strings must be localized using provided localization methods
Use the useLocalizations hook and localizationKeys utility for all text and error messages
Use the styled system (sx prop, theme tokens, responsive values) for custom component styling
Use useCardState for card-level state, useFormState for form-level state, and useLoadingStatus for loading states
Always use handleError utility for API errors and use translateError for localized error messages
Use useFormControl for form field state, implement proper validation, and handle loading and error states in forms
Use localization keys for all form labels and placeholders
Use element descriptors for consistent styling and follow the theme token system
Use the Card and FormContainer patterns for consistent UI structure

Files:

  • packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
**/*.{js,jsx,ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

**/*.{js,jsx,ts,tsx}: All code must pass ESLint checks with the project's configuration
Follow established naming conventions (PascalCase for components, camelCase for variables)
Maintain comprehensive JSDoc comments for public APIs
Use dynamic imports for optional features
All public APIs must be documented with JSDoc
Provide meaningful error messages to developers
Include error recovery suggestions where applicable
Log errors appropriately for debugging
Lazy load components and features when possible
Implement proper caching strategies
Use efficient data structures and algorithms
Profile and optimize critical paths
Validate all inputs and sanitize outputs
Implement proper logging with different levels

Files:

  • packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
**/*.{js,jsx,ts,tsx,json,css,scss,md,yaml,yml}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

Use Prettier for consistent code formatting

Files:

  • packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
packages/**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

TypeScript is required for all packages

Files:

  • packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
packages/**/*.{ts,tsx,d.ts}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

Packages should export TypeScript types alongside runtime code

Files:

  • packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

Use proper TypeScript error types

**/*.{ts,tsx}: Always define explicit return types for functions, especially public APIs
Use proper type annotations for variables and parameters where inference isn't clear
Avoid any type - prefer unknown when type is uncertain, then narrow with type guards
Use interface for object shapes that might be extended
Use type for unions, primitives, and computed types
Prefer readonly properties for immutable data structures
Use private for internal implementation details
Use protected for inheritance hierarchies
Use public explicitly for clarity in public APIs
Prefer readonly for properties that shouldn't change after construction
Prefer composition and interfaces over deep inheritance chains
Use mixins for shared behavior across unrelated classes
Implement dependency injection for loose coupling
Let TypeScript infer when types are obvious
Use const assertions for literal types: as const
Use satisfies operator for type checking without widening
Use mapped types for transforming object types
Use conditional types for type-level logic
Leverage template literal types for string manipulation
Use ES6 imports/exports consistently
Use default exports sparingly, prefer named exports
Use type-only imports: import type { ... } from ...
No any types without justification
Proper error handling with typed errors
Consistent use of readonly for immutable data
Proper generic constraints
No unused type parameters
Proper use of utility types instead of manual type construction
Type-only imports where possible
Proper tree-shaking friendly exports
No circular dependencies
Efficient type computations (avoid deep recursion)

Files:

  • packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
**/*.{jsx,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

**/*.{jsx,tsx}: Use error boundaries in React components
Minimize re-renders in React components

**/*.{jsx,tsx}: Always use functional components with hooks instead of class components
Follow PascalCase naming for components: UserProfile, NavigationMenu
Keep components focused on a single responsibility - split large components
Limit component size to 150-200 lines; extract logic into custom hooks
Use composition over inheritance - prefer smaller, composable components
Export components as named exports for better tree-shaking
One component per file with matching filename and component name
Use useState for simple state management
Use useReducer for complex state logic
Implement proper state initialization
Use proper state updates with callbacks
Implement proper state cleanup
Use Context API for theme/authentication
Implement proper state selectors
Use proper state normalization
Implement proper state persistence
Use React.memo for expensive components
Implement proper useCallback for handlers
Use proper useMemo for expensive computations
Implement proper virtualization for lists
Use proper code splitting with React.lazy
Implement proper cleanup in useEffect
Use proper refs for DOM access
Implement proper event listener cleanup
Use proper abort controllers for fetch
Implement proper subscription cleanup
Use proper HTML elements
Implement proper ARIA attributes
Use proper heading hierarchy
Implement proper form labels
Use proper button types
Implement proper focus management
Use proper keyboard shortcuts
Implement proper tab order
Use proper skip links
Implement proper focus traps
Implement proper error boundaries
Use proper error logging
Implement proper error recovery
Use proper error messages
Implement proper error fallbacks
Use proper form validation
Implement proper error states
Use proper error messages
Implement proper form submission
Use proper form reset
Use proper component naming
Implement proper file naming
Use proper prop naming
Implement proper...

Files:

  • packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
**/*.{js,ts,tsx,jsx}

📄 CodeRabbit inference engine (.cursor/rules/monorepo.mdc)

Support multiple Clerk environment variables (CLERK_, NEXT_PUBLIC_CLERK_, etc.) for configuration.

Files:

  • packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
**/*.tsx

📄 CodeRabbit inference engine (.cursor/rules/react.mdc)

**/*.tsx: Use proper type definitions for props and state
Leverage TypeScript's type inference where possible
Use proper event types for handlers
Implement proper generic types for reusable components
Use proper type guards for conditional rendering

Files:

  • packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
🧬 Code graph analysis (1)
packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx (1)
packages/clerk-js/src/ui/elements/OrganizationPreview.tsx (1)
  • OrganizationPreview (22-106)
⏰ 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). (28)
  • GitHub Check: Integration Tests (quickstart, chrome, 16)
  • GitHub Check: Integration Tests (quickstart, chrome, 15)
  • GitHub Check: Integration Tests (machine, chrome)
  • GitHub Check: Integration Tests (nextjs, chrome, 15)
  • GitHub Check: Integration Tests (nextjs, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 14)
  • GitHub Check: Integration Tests (vue, chrome)
  • GitHub Check: Integration Tests (billing, chrome)
  • GitHub Check: Integration Tests (elements, chrome)
  • GitHub Check: Integration Tests (react-router, chrome)
  • GitHub Check: Integration Tests (handshake, chrome)
  • GitHub Check: Integration Tests (custom, chrome)
  • GitHub Check: Integration Tests (nuxt, chrome)
  • GitHub Check: Integration Tests (astro, chrome)
  • GitHub Check: Integration Tests (tanstack-react-start, chrome)
  • GitHub Check: Integration Tests (expo-web, chrome)
  • GitHub Check: Integration Tests (handshake:staging, chrome)
  • GitHub Check: Integration Tests (ap-flows, chrome)
  • GitHub Check: Integration Tests (sessions, chrome)
  • GitHub Check: Integration Tests (localhost, chrome)
  • GitHub Check: Integration Tests (sessions:staging, chrome)
  • GitHub Check: Integration Tests (express, chrome)
  • GitHub Check: Integration Tests (generic, chrome)
  • GitHub Check: Static analysis
  • GitHub Check: Publish with pkg-pr-new
  • GitHub Check: Unit Tests (22, **)
  • GitHub Check: Unit Tests (18, --filter=@clerk/astro --filter=@clerk/backend --filter=@clerk/express --filter=@c...
  • GitHub Check: semgrep-cloud-platform/scan
🔇 Additional comments (2)
packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx (2)

4-4: LGTM! Import follows established patterns.

The OrganizationPreview import is correctly structured and consistent with the existing PersonalWorkspacePreview import pattern.


55-63: LGTM! Correctly implements the missing OrganizationPreview.

The OrganizationPreview rendering is properly implemented with:

  • Consistent props pattern matching PersonalWorkspacePreview (size='xs', gap=3)
  • Appropriate maxWidth for text truncation in the trigger
  • Correct element descriptor usage via elementId prop

Note: The user prop is intentionally not passed, which is appropriate for a compact trigger at size='xs' where displaying the role label would be unnecessary.

@brkalow brkalow disabled auto-merge October 29, 2025 17:00
@brkalow brkalow merged commit 3410bc6 into main Oct 29, 2025
45 checks passed
@brkalow brkalow deleted the alexcarpenter/fix-missing-org-preview branch October 29, 2025 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants