Summary

After a merge fails, the Merge button remains disabled until the user navigates away from the PR and returns. This prevents immediate retry after fixing the underlying issue (e.g., updating credentials).

Steps to Reproduce

1. Create a pull request in Sztab
2. Attempt to merge with invalid credentials or other error condition
3. Observe merge failure with error message
4. Fix the underlying issue (e.g., update PAT in database)
5. Attempt to click "Merge" button again

Expected Behavior

• After a failed merge, the user should be able to retry the merge immediately
• The Merge button should be enabled and clickable after error is displayed

Actual Behavior

• The Merge button remains disabled after a failed merge attempt
• User must navigate away from the PR detail page and return to re-enable the button
• Error state persists in the UI component

Workaround

Navigate away from the PR (e.g., go to PR list) and return to the PR detail page. The Merge button will be enabled again.

Root Cause

React mutation state (merge.isPending or error state) is not properly reset after a failed merge attempt, leaving the button in a disabled state.

Proposed Fix

In src/pages/pr/PrDetailPage.tsx, add merge.reset() in the onError handler to clear the mutation state:

onError: (error: unknown): void => {
    if (error instanceof Error) {
        setMergeError(error.message);
    } else {
        setMergeError("Merge failed");
    }
    merge.reset();  // Clear mutation state to allow retry
}

Severity

Low - Minor UX annoyance with simple workaround

Priority

P3 - Fix in next minor release (1.9.4 or later)

Environment

• Version: 1.9.3
• Component: Frontend (React UI)
• File: src/pages/pr/PrDetailPage.tsx

Related Issues

• Successfully validated credential refresh feature works correctly (credentials can be updated in DB without restart)