Skip to content

feat(dashboard): move org switcher from sidebar to header#403

Merged
zbigniewsobiecki merged 10 commits intodevfrom
feature/move-org-switcher-to-header
Feb 18, 2026
Merged

feat(dashboard): move org switcher from sidebar to header#403
zbigniewsobiecki merged 10 commits intodevfrom
feature/move-org-switcher-to-header

Conversation

@aaight
Copy link
Copy Markdown
Collaborator

@aaight aaight commented Feb 18, 2026

Summary

  • Moved the OrgSwitcher component from the sidebar into the header bar, replacing the static org-name Badge with an interactive <Select> dropdown for admin users with multiple orgs
  • For single-org admins, shows the org name as plain text (preserving previous context visibility)
  • Cleaned up sidebar.tsx by removing the OrgSwitcher function, its usage, and all now-unused imports (Select, SelectContent, SelectItem, SelectTrigger, SelectValue, Building2, useOrgContext)

Test plan

  • Log in as admin with multiple orgs → org switcher dropdown appears in top nav header (left side)
  • Switch org via dropdown → all data refreshes correctly (same behavior as before)
  • Log in as admin with single org → org name shown as text in header, no dropdown
  • Log in as non-admin → no org switcher or org name in header
  • Verify sidebar no longer shows the org switcher section (nav flows directly after CASCADE branding)
  • npm run lint and npm run typecheck pass ✅

Card: https://trello.com/c/FtarOIgX/34-lets-move-the-admins-organization-switcher-to-top-nav-replacing-word-admin-we-have-there

🤖 Generated with Claude Code

@nhopeatall
Copy link
Copy Markdown
Collaborator

🔍 Reviewing PR...

Copy link
Copy Markdown
Collaborator

@nhopeatall nhopeatall left a comment

Choose a reason for hiding this comment

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

LGTM — clean relocation of the org switcher from sidebar to header. The conditional logic correctly handles all three user states (multi-org admin → dropdown, single-org admin → plain text, non-admin → nothing). Sidebar cleanup removes all now-unused imports. No issues found.

@zbigniewsobiecki zbigniewsobiecki merged commit d6ad270 into dev Feb 18, 2026
4 checks passed
@zbigniewsobiecki zbigniewsobiecki deleted the feature/move-org-switcher-to-header branch March 16, 2026 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants