Fix hardcoded "behind main" label to use configured baseBranch#77
Merged
Conversation
Thread baseBranch parameter from RepoModel through renderCard, worktreeCard, compactWorktreeCard, mainBehindWithSync, syncButton, and mainBehindIndicator so the UI displays the actual configured base branch name instead of always showing 'main'.
Tests now assert on ' behind ' pattern instead of 'behind main', matching the new dynamic baseBranch label.
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
1 participant
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.
Problem
The worktree card UI hardcodes "main" in the "X behind main" label and the sync button tooltip. While the behind count is correctly calculated against the configured
baseBranch, the label always says "main" — even when the repo's base branch is something else (e.g.develop).Fix
Thread
baseBranch: stringfromRepoModel.BaseBranchthrough the card rendering pipeline insrc/Client/App.fs:mainBehindIndicator— displays"{count} behind {baseBranch}"instead of hardcoded"main"syncButton— tooltip shows"Sync with {baseBranch} (S)"instead of"Sync with main (S)"mainBehindWithSync— passesbaseBranchto the two functions abovecompactWorktreeCard/worktreeCard— accept and forwardbaseBranchrenderCard— acceptsbaseBranchand passes it to both card variantsrepoSectioncall site — passesrepo.BaseBranchintorenderCardNo new types or server changes needed —
RepoModelalready carriesBaseBranchfrom the server's.treemon.jsonconfig (defaulting to"main").Tests
dotnet build src/Client/Client.fsproj— passesdotnet build src/Server/Server.fsproj— passes