Files
vibe-kanban/frontend
Louis Knight-Webb 8eeec4976f Changes to branches (vibe-kanban) (#68)
* Perfect! I've successfully completed all the requested changes:

## Summary of Changes Made:

1. **Removed Branch Status Panel**: Completely removed the branch status display panel that showed commit information, uncommitted changes, and merge status.

2. **Removed Branch Status Logic**: Eliminated all branch status fetching logic, state variables, and related useEffect hooks.

3. **Simplified Git Operations**: 
   - Removed branch status dependencies from merge/rebase buttons
   - Merge now executes directly without confirmation dialogs
   - Rebase button is always available for non-merged attempts
   - Removed merge confirmation and uncommitted changes warning dialogs

4. **Enhanced PR Functionality**: 
   - If a PR already exists (`selectedAttempt.pr_url`), the button shows "Open PR" and opens the existing PR
   - If no PR exists, it shows "Create PR" and opens the creation dialog
   - Updated button text to reflect the current state

5. **Cleaned Up Code**: 
   - Removed unused imports (`BranchStatus`, `FileText`, `useCallback`)
   - Removed unused state variables and functions
   - Added simple error display for git operations

The toolbar now provides a cleaner interface focused on the essential git operations while maintaining all the merge, rebase, and PR functionality as requested.

* prettier

* Perfect! Now the functionality works correctly:

## Fixed Implementation:

1. **Kept Branch Status Panel Hidden**: The branch status panel display is still removed - users don't see the detailed status information.

2. **Restored Smart Git Operations**: 
   - **Rebase button**: Only appears when `branchStatus.is_behind === true` and `!branchStatus.merged`
   - **Merge button**: Only appears when `!branchStatus.merged` and not behind (can't merge if behind)  
   - **PR button**: Always shows when not merged, but disabled when behind (need to rebase first)

3. **Enhanced PR Logic**: 
   - Shows "Open PR" and opens existing PR if `selectedAttempt.pr_url` exists
   - Shows "Create PR" for new PRs
   - Disabled when branch is behind (need to rebase first)

4. **Branch Status Fetching**: Restored the background fetching logic to determine button states, but the status panel remains hidden from users.

The interface now shows only the relevant buttons based on the actual git state - no more confusing unnecessary buttons!

* prettier
2025-07-04 00:42:31 +01:00
..
2025-06-17 21:41:57 -04:00
2025-06-25 09:36:07 +01:00
2025-06-25 09:36:07 +01:00
2025-06-14 15:14:08 -04:00
2025-06-17 20:36:25 -04:00
2025-06-25 09:36:34 +01:00
2025-06-27 13:32:32 +01:00
2025-06-14 15:14:08 -04:00
2025-06-14 16:26:48 -04:00
2025-06-14 15:14:08 -04:00
2025-07-02 18:24:26 +01:00