Skip to content

fix(desktop): show branch subtitle for main workspace list item when branch name differs - #1201

Merged
saddlepaddle merged 1 commit into
ParadevAI:mainfrom
ascrazy:codex/branch-subtitle
Feb 4, 2026
Merged

saddlepaddle merged 1 commit into
ParadevAI:mainfrom
ascrazy:codex/branch-subtitle

Conversation

@ascrazy

@ascrazy ascrazy commented Feb 4, 2026 •

Copy link
Copy Markdown
Contributor

Description

Show the branch subtitle for the main (branch) workspace menu item only when the workspace name differs from the branch, so we avoid duplicate labels while still exposing the current branch when a custom name is used.

Related Issues

Type of Change

  • Bug fix
  • [-] New feature
  • [-] Documentation
  • [-] Refactor
  • [-] Other (please describe):

Testing

Screenshots (if applicable)

Before After
Screenshot 2026-02-04 at 21 28 40 Screenshot 2026-02-04 at 21 25 19

Additional Notes

Summary by CodeRabbit

Release Notes

  • Bug Fixes
    • Improved branch name display logic in workspace sidebar to more accurately show branch information in tooltips when branch names differ from branch labels.

@coderabbitai

coderabbitai Bot commented Feb 4, 2026 •

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

The WorkspaceListItem component's branch subtitle display logic is enhanced to account for cases where a branch name exists and differs from the branch label, in addition to non-branch workspaces. The collapsed branch tooltip is updated to conditionally display the branch name when appropriate.

Changes

Cohort / File(s) Summary
Branch Subtitle and Tooltip Display
apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
Updated showBranchSubtitle condition to evaluate when branch name is present and differs from branch label. Added conditional rendering in collapsed tooltip to display branch name alongside existing branch information.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

Poem

🐰 Branch names dancing in the light,
Showing truly when they're right!
Tooltips bloom with names so clear,
The subtle touch we all hold dear. ✨

🚥 Pre-merge checks | ✅ 2 | ❌ 1
❌ 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%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and specifically describes the main change: showing branch subtitle for the main workspace list item when the branch name differs from the workspace name.
Description check ✅ Passed The description covers the key required sections: clear description of changes, type of change marked as bug fix, and before/after screenshots demonstrating the fix.

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

✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

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.

❤️ Share

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

@ascrazy

ascrazy commented Feb 4, 2026

Copy link
Copy Markdown
Contributor Author

This addresses a big onboarding pain for folks adopting Superset on an existing repo.

The problem In my case I added the repo when the main copy was on a feature branch, so the main workspace is now forever stuck named after that branch. Even though I have long ago moved it to main branch

Is it intentional that the main workspace item can’t be renamed?

Possible direction: I think the best long‑term fix is to allow renaming the main workspace (like worktrees).

Also, having visibility into the actual branch (what this PR suggests) is valuable — I’m not sure though if it's a good idea to show it conditionally, and only have this condition for main worktree item. It feels like it it adds a lot of small inconsistencies.

@saddlepaddle

Copy link
Copy Markdown
Collaborator

This addresses a big onboarding pain for folks adopting Superset on an existing repo.

The problem In my case I added the repo when the main copy was on a feature branch, so the main workspace is now forever stuck named after that branch. Even though I have long ago moved it to main branch

Is it intentional that the main workspace item can’t be renamed?

Possible direction: I think the best long‑term fix is to allow renaming the main workspace (like worktrees).

Also, having visibility into the actual branch (what this PR suggests) is valuable — I’m not sure though if it's a good idea to show it conditionally, and only have this condition for main worktree item. It feels like it it adds a lot of small inconsistencies.

Honestly I feel like it's in a weird spot in general, I kinda like the Conductor approach of hiding the concept of the "main branch" entirely and just treating everything as a worktree. I think your approach is reasonable as a short-term fix though!

@saddlepaddle
saddlepaddle merged commit 9e305b4 into ParadevAI:main Feb 4, 2026
4 of 5 checks passed
@ascrazy

ascrazy commented Feb 4, 2026

Copy link
Copy Markdown
Contributor Author

hiding the concept of the "main branch" entirely

Please no! :)

I like Superset specifically for the fact it feels lower level in such things, gives me more control, etc...

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.

2 participants