refactor (desktop): avatar organization consolidation and move to top bar by AviPeltz · Pull Request #758 · superset-sh/superset

AviPeltz · 2026-01-14T21:38:08Z

Description

Related Issues

Type of Change

Testing

Screenshots (if applicable)

Additional Notes

Summary by CodeRabbit

New Features
- Added keyboard shortcuts reference and direct support contact options (Discord, X, Email Founders) to the organization dropdown menu.
Refactor
- Consolidated the support menu into the organization dropdown, providing unified access to help and contact features.
- Rebranded "Team" terminology to "Organization" throughout the application for consistency.
- Updated related labels and empty state messages to reflect organizational language.

_{✏️ Tip: You can customize this high-level summary in your review settings.}

coderabbitai · 2026-01-14T21:38:19Z

📝 Walkthrough

Walkthrough

The PR consolidates UI terminology from "Team" to "Organization" throughout the settings section, and refactors the top navigation bar by removing the separate SupportMenu component and integrating its functionality (keyboard shortcuts, report issues, contact options, organization switching) into an enhanced OrganizationDropdown component. Backend naming conventions are updated to reflect "Org" instead of "Workspace" in newly created organizations.

Changes

Cohort / File(s)	Summary
Settings Terminology Updates `apps/desktop/src/renderer/routes/_authenticated/settings/components/SettingsSidebar/components/GeneralSettings/GeneralSettings.tsx`, `apps/desktop/src/renderer/routes/_authenticated/settings/team/components/MemberActions/MemberActions.tsx`, `apps/desktop/src/renderer/routes/_authenticated/settings/team/page.tsx`	Text labels changed from "Team" to "Organization"; dialog title updated for member removal; empty state message simplified.
TopBar Navigation Consolidation `apps/desktop/src/renderer/screens/main/components/TopBar/OrganizationDropdown.tsx`	Removed `isCollapsed` prop (now no props). Enhanced with keyboard shortcut handlers, Contact Us submenu (Discord, X, Email), Report Issue option, and organization switching. Avatar display with organization/user name fallback. Styling and trigger button refined.
SupportMenu Removal `apps/desktop/src/renderer/screens/main/components/TopBar/SupportMenu.tsx`	Entire component deleted; functionality merged into OrganizationDropdown.
TopBar Index `apps/desktop/src/renderer/screens/main/components/TopBar/index.tsx`	SupportMenu import and usage replaced with OrganizationDropdown.
Sidebar Header Cleanup `apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx`	OrganizationDropdown component and import removed from both collapsed and expanded header layouts.
Auth and Database Naming `packages/auth/src/server.ts`, `packages/db/drizzle/0006_add_better_auth_tables.sql`	New organization naming convention: "[user]'s Org" (from "[user]'s Workspace") and slug suffix "-org" (from "-workspace").

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~40 minutes

Possibly related PRs

refactor (desktop): get rid of slash branch project top bar redundant #604 — Modifies the same TopBar index file, likely coordinating top-navigation component changes.
refactor (desktop): New workspace button #596 — Changes to WorkspaceSidebarHeader component structure and content.
Consolidate top bar item into avatar dropdown #506 — Consolidates top-bar dropdown actions by removing the separate Help/Support menu and merging functionality into an organization dropdown component.

Poem

🐰 A rabbit hops through dropdowns wide,
Where Team becomes Org with pride,
Support and settings take one seat,
As navigation grows so neat,
With Discord links and Discord cheer,
The organization menu's here! 🎉

🚥 Pre-merge checks | ✅ 1 | ❌ 2

❌ Failed checks (2 warnings)

Check name	Status	Explanation	Resolution
Description check	⚠️ Warning	The PR description is incomplete; it contains only the template structure with minimal information filled in. The Description, Related Issues, Testing, Screenshots, and Additional Notes sections are empty or use placeholder text.	Fill in the Description section with details about the consolidation and top bar move, link any related issues, describe testing steps, and add relevant context or screenshots.
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (1 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title accurately reflects the main changes: consolidating organization/avatar functionality and moving it to the top bar, as evidenced by the OrganizationDropdown changes and its relocation from the sidebar to TopBar.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

📝 Generate docstrings

🧹 Recent nitpick comments

apps/desktop/src/renderer/routes/_authenticated/settings/team/components/MemberActions/MemberActions.tsx (1)
62-70: Consider adding console error logging for debugging.

The error is appropriately shown to users via toast, but adding a console log with context would help with debugging in production.
Suggested improvement
 		} catch (error) {
+			console.error("[MemberActions/handleRemove] Failed:", error);
 			toast.error(
 				error instanceof Error
 					? error.message
 					: `Failed to ${isCurrentUser ? "leave" : "remove member from"} organization`,
 			);
 		} finally {
apps/desktop/src/renderer/screens/main/components/TopBar/OrganizationDropdown.tsx (3)
54-63: Add error handling to async event handlers.

Both switchOrganization and handleSignOut are async functions used as event handlers but lack error handling. Unhandled promise rejections in event handlers won't surface properly and could leave the UI in an inconsistent state.
Suggested improvement
 const switchOrganization = async (newOrgId: string) => {
+  try {
     await authClient.organization.setActive({
       organizationId: newOrgId,
     });
+  } catch (error) {
+    console.error("[OrganizationDropdown/switchOrganization] Failed to switch organization:", error);
+  }
 };

 const handleSignOut = async () => {
+  try {
     await authClient.signOut();
     signOutMutation.mutate();
+  } catch (error) {
+    console.error("[OrganizationDropdown/handleSignOut] Sign out failed:", error);
+  }
 };
69-71: Simplify mailto link handling.

window.open with "_blank" is unconventional for mailto: URLs since they trigger the email client rather than opening a browser tab. This can cause inconsistent behavior across browsers.
Suggested fix
 const handleContactUs = () => {
-  window.open(COMPANY.MAIL_TO, "_blank");
+  window.location.href = COMPANY.MAIL_TO;
 };
161-191: Use onSelect instead of onClick for consistency and accessibility.

Several DropdownMenuItem components use onClick (lines 162, 166, 179, 183, 186) while others use onSelect (lines 111, 117, 140, 196). For Radix-based dropdown menus, onSelect is the canonical event handler that properly integrates with keyboard navigation and automatically closes the menu.
Suggested fix
 {/* Support section */}
-<DropdownMenuItem onClick={handleReportIssue}>
+<DropdownMenuItem onSelect={handleReportIssue}>
   <HiOutlineBugAnt className="h-4 w-4" />
   Report Issue
 </DropdownMenuItem>
-<DropdownMenuItem onClick={handleKeyboardShortcuts}>
+<DropdownMenuItem onSelect={handleKeyboardShortcuts}>
   <LuKeyboard className="h-4 w-4" />
   Keyboard Shortcuts
   {showShortcut && (
     <DropdownMenuShortcut>{shortcutsHotkey}</DropdownMenuShortcut>
   )}
 </DropdownMenuItem>
 <DropdownMenuSub>
   <DropdownMenuSubTrigger>
     <LuLifeBuoy className="h-4 w-4" />
     Contact Us
   </DropdownMenuSubTrigger>
   <DropdownMenuSubContent sideOffset={8} className="w-56">
-    <DropdownMenuItem onClick={handleJoinDiscord}>
+    <DropdownMenuItem onSelect={handleJoinDiscord}>
       <FaDiscord className="h-4 w-4" />
       Discord
     </DropdownMenuItem>
-    <DropdownMenuItem onClick={handleTwitter}>
-      <FaXTwitter className="h-4 w-4" />X
+    <DropdownMenuItem onSelect={handleTwitter}>
+      <FaXTwitter className="h-4 w-4" />
+      <span>X</span>
     </DropdownMenuItem>
-    <DropdownMenuItem onClick={handleContactUs}>
+    <DropdownMenuItem onSelect={handleContactUs}>
       <HiOutlineEnvelope className="h-4 w-4" />
       Email Founders
     </DropdownMenuItem>
   </DropdownMenuSubContent>
 </DropdownMenuSub>

📜 Recent review details

Configuration used: defaults

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between c5f0b67 and 766abc6.

⛔ Files ignored due to path filters (1)

bun.lock is excluded by !**/*.lock

📒 Files selected for processing (9)

apps/desktop/src/renderer/routes/_authenticated/settings/components/SettingsSidebar/components/GeneralSettings/GeneralSettings.tsx
apps/desktop/src/renderer/routes/_authenticated/settings/team/components/MemberActions/MemberActions.tsx
apps/desktop/src/renderer/routes/_authenticated/settings/team/page.tsx
apps/desktop/src/renderer/screens/main/components/TopBar/OrganizationDropdown.tsx
apps/desktop/src/renderer/screens/main/components/TopBar/SupportMenu.tsx
apps/desktop/src/renderer/screens/main/components/TopBar/index.tsx
apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
packages/auth/src/server.ts
packages/db/drizzle/0006_add_better_auth_tables.sql

💤 Files with no reviewable changes (2)

apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
apps/desktop/src/renderer/screens/main/components/TopBar/SupportMenu.tsx

🧰 Additional context used

📓 Path-based instructions (6)

apps/desktop/**/*.{ts,tsx}

📄 CodeRabbit inference engine (apps/desktop/AGENTS.md)

apps/desktop/**/*.{ts,tsx}: For Electron interprocess communication, ALWAYS use tRPC as defined in src/lib/trpc
Use alias as defined in tsconfig.json when possible
Prefer zustand for state management if it makes sense. Do not use effect unless absolutely necessary.
For tRPC subscriptions with trpc-electron, ALWAYS use the observable pattern from @trpc/server/observable instead of async generators, as the library explicitly checks isObservable(result) and throws an error otherwise

Files:

apps/desktop/src/renderer/routes/_authenticated/settings/components/SettingsSidebar/components/GeneralSettings/GeneralSettings.tsx
apps/desktop/src/renderer/routes/_authenticated/settings/team/page.tsx
apps/desktop/src/renderer/screens/main/components/TopBar/OrganizationDropdown.tsx
apps/desktop/src/renderer/screens/main/components/TopBar/index.tsx
apps/desktop/src/renderer/routes/_authenticated/settings/team/components/MemberActions/MemberActions.tsx

**/*.{ts,tsx}