Skip to content

Revamp MergeStatusCard with collapsible sections and merge actions#44

Merged
stylessh merged 4 commits intomainfrom
stylessh/merge-status-revamp
Apr 9, 2026
Merged

Revamp MergeStatusCard with collapsible sections and merge actions#44
stylessh merged 4 commits intomainfrom
stylessh/merge-status-revamp

Conversation

@stylessh
Copy link
Copy Markdown
Owner

@stylessh stylessh commented Apr 9, 2026

Summary

  • Rebuilt the PR merge status card with GitHub-style collapsible sections for reviews (with dismiss/re-request actions) and checks (with individual check runs, app avatars, and scrollable list)
  • Added merge action footer with strategy dropdown (merge, squash, rebase) and update branch split button with merge commit/rebase options
  • Introduced MutationResult return type for all mutation server functions with structured error messages (403 → "Insufficient permissions", 404, 409, 422) and console error logging
  • Added a persistent bottom bar warning system that surfaces permission issues with a "Configure access" CTA linking to the GitHub App installation page (via GITHUB_APP_SLUG env var)
  • Mounted Sonner <Toaster> in root layout and re-exported toast from UI package for error-only toast notifications

Test plan

  • Verify collapsible reviews and checks sections open by default and toggle correctly
  • Test merge button with different strategies on a mergeable PR
  • Test update branch button on an out-of-date PR
  • Trigger a 403 error and verify the bottom bar warning appears with CTA
  • Verify error toasts show descriptive messages for failed mutations

…permission warnings

Rebuild the PR merge status card with GitHub-style collapsible sections for
reviews and checks, individual check run display with app avatars, merge
strategy dropdown, update branch split button, and a bottom bar warning
system for insufficient GitHub App permissions.
@cloudflare-workers-and-pages
Copy link
Copy Markdown

cloudflare-workers-and-pages Bot commented Apr 9, 2026

Deploying with  Cloudflare Workers  Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status Name Latest Commit Preview URL Updated (UTC)
✅ Deployment successful!
View logs
diffkit e367e44 Commit Preview URL

Branch Preview URL
Apr 09 2026, 07:08 PM

stylessh added 3 commits April 9, 2026 11:55
…feedback

- Detect admin permissions via repos.get API for reliable bypass check
- Show bypass branch protections checkbox when merge is blocked and user is admin
- Add merged commit entry to activity timeline with purple merge icon
- Map mergeCommitSha and mergedBy fields from GitHub API
- Keep buttons in loading state until query revalidation completes
- Only show update branch button when branch is actually behind
- Show output title next to check run name for completed checks
- Show "Started Xs ago" for pending checks
- Add overflow-hidden to status card container for clean corners
@stylessh stylessh merged commit bc122cf into main Apr 9, 2026
4 checks passed
stylessh added a commit that referenced this pull request Apr 18, 2026
* Revamp MergeStatusCard with collapsible sections, merge actions, and permission warnings

Rebuild the PR merge status card with GitHub-style collapsible sections for
reviews and checks, individual check run display with app avatars, merge
strategy dropdown, update branch split button, and a bottom bar warning
system for insufficient GitHub App permissions.

* Add admin bypass toggle, merged timeline entry, and improve mutation feedback

- Detect admin permissions via repos.get API for reliable bypass check
- Show bypass branch protections checkbox when merge is blocked and user is admin
- Add merged commit entry to activity timeline with purple merge icon
- Map mergeCommitSha and mergedBy fields from GitHub API
- Keep buttons in loading state until query revalidation completes
- Only show update branch button when branch is actually behind

* Add check run output titles, started times, and overflow fix

- Show output title next to check run name for completed checks
- Show "Started Xs ago" for pending checks
- Add overflow-hidden to status card container for clean corners
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.

1 participant