Fix issue #5179: [frontend]: Push to Github button should only push branch, but not creating a PR #5181

openhands-agent · 2024-11-21T18:45:26Z

This pull request fixes #5179.

The PR has successfully resolved the original issue by implementing the requested split functionality for GitHub interactions. Specifically:

The original single "Push to GitHub" button that automatically created PRs has been separated into two distinct buttons:
- A "Push to GitHub" button that only pushes changes to the remote branch
- A "Push & Create PR" button that handles both pushing and PR creation
The implementation includes proper test coverage to verify:
- The presence of both buttons when GitHub credentials are available
- Correct button labeling
- Proper message handling when each button is clicked
The changes maintain backward compatibility while adding the requested granular control over GitHub operations.

This solution directly addresses the original problem by preventing unintended PR creation while still maintaining the ability to create PRs when desired. The clear separation of concerns through distinct buttons provides a better user experience aligned with the requested solution.

A reviewer can verify that:

Both buttons are properly implemented and visible
Each button triggers the correct corresponding action
The test suite covers the new functionality
The implementation doesn't break existing features

Automatic fix generated by OpenHands 🙌

~~It looks something like this:~~

Before click push to PR:

Once Push to PR is clicked

To run this PR locally, use the following command:

docker run -it --rm   -p 3000:3000   -v /var/run/docker.sock:/var/run/docker.sock   --add-host host.docker.internal:host-gateway   -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:4df8b6f-nikolaik   --name openhands-app-4df8b6f   docker.all-hands.dev/all-hands-ai/openhands:4df8b6f

…ranch, but not creating a PR

xingyaoww

@openhands-agent you should do npm run lint:fix to fix frontend linting.

github-actions · 2024-11-21T18:48:42Z

OpenHands started fixing the pr! You can monitor the progress here.

github-actions · 2024-11-21T18:49:25Z

OpenHands started fixing the pr! You can monitor the progress here.

…ld only push branch, but not creating a PR

openhands-agent · 2024-11-21T18:52:39Z

New OpenHands update

github-actions · 2024-11-21T18:52:40Z

The workflow to fix this issue encountered an error. Please check the workflow logs for more information.

github-actions · 2024-11-21T18:55:06Z

The workflow to fix this issue encountered an error. Please check the workflow logs for more information.

neubig

Could we get a screenshot of the resulting design? I'm a little bit worried about the design becoming noisy.

xingyaoww · 2024-11-22T20:28:33Z

@neubig edited the PR description to include a screenshot

neubig · 2024-11-22T20:33:41Z

Thanks! @rbren , wdyt about this design?

For me personally I think it might be nice if we could put the buttons side-by-side to save screen space?

xingyaoww · 2024-11-22T20:39:48Z

@openhands-agent Can you put these two button side to side?

github-actions · 2024-11-22T20:40:04Z

OpenHands started fixing the pr! You can monitor the progress here.

…ld only push branch, but not creating a PR

openhands-agent · 2024-11-22T20:45:40Z

New OpenHands update

github-actions · 2024-11-22T20:45:41Z

The workflow to fix this issue encountered an error. Please check the workflow logs for more information.

xingyaoww · 2024-11-22T21:17:07Z

@openhands-agent please display the "Push to Github" and "Push & Create PR" button side-by-side

github-actions · 2024-11-22T21:17:29Z

OpenHands started fixing the pr! You can monitor the progress here.

github-actions · 2024-11-23T20:28:23Z

OpenHands started fixing the pr! You can monitor the progress here.

…ld only push branch, but not creating a PR

openhands-agent · 2024-11-23T20:32:24Z

New OpenHands update

github-actions · 2024-11-23T20:32:25Z

The workflow to fix this issue encountered an error. Please check the workflow logs for more information.

…s-fix-issue-5179

neubig

LGTM now!

rbren · 2024-11-25T14:05:59Z

frontend/src/components/chat-interface.tsx

+                    suggestion={{
+                      label: "Push to GitHub",
+                      value:
+                        "Please push the changes to a remote branch on GitHub, but do NOT create a pull request.",


Can we update the microagent instructions to send the user a compare link?

e.g.

If the user asks you to push your changes, but not create a PR, send them a message with a link to compare the files on the remote branch against the main branch.

rbren · 2024-11-25T14:25:43Z

frontend/__tests__/components/chat/chat-interface.test.tsx

+    ];
+    renderChatInterface(messages);
+
+    const pushButton = screen.getByRole("button", { name: "Push to GitHub" });


Let's name this Push to Branch

rbren · 2024-11-25T14:27:18Z

frontend/__tests__/components/chat/chat-interface.test.tsx

+    renderChatInterface(messages);
+
+    const pushButton = screen.getByRole("button", { name: "Push to GitHub" });
+    const prButton = screen.getByRole("button", { name: "Push & Create PR" });


I think once the Push & Create PR button has been clicked once, we should only show one button after that. The agent (and user) will get v confused if you push and create PR, and then click "push to branch", since the PR is already opened.

Once you click "Push & Create PR" we should just have one button that says "Push changes to PR"

done the most recent commit

xingyaoww · 2024-11-25T15:03:00Z

@openhands-agent Can you review the comments above and work on it?

github-actions · 2024-11-25T15:03:22Z

OpenHands started fixing the pr! You can monitor the progress here.

enyst · 2024-11-25T15:07:08Z

@xingyaoww Hah, sorry, I have the assumption that it will read all comments too, but it doesn't automatically receive them: #5236

…ld only push branch, but not creating a PR

openhands-agent · 2024-11-25T15:09:03Z

New OpenHands update

github-actions · 2024-11-25T15:09:04Z

The workflow to fix this issue encountered an error. Please check the workflow logs for more information.

… creation * Rename 'Push to GitHub' button to 'Push to Branch' * Add state to track PR creation * Show only 'Push changes to PR' button after PR is created * Update tests to reflect new behavior

xingyaoww · 2024-11-25T15:39:57Z

Before click push to PR:

Once Push to PR is clicked

Fix issue #5179: [frontend]: Push to Github button should only push b…

157883f

…ranch, but not creating a PR

github-actions bot mentioned this pull request Nov 21, 2024

[frontend]: Push to Github button should only push branch, but not creating a PR #5179

Closed

xingyaoww reviewed Nov 21, 2024

View reviewed changes

xingyaoww added the fix-me Attempt to fix this issue with OpenHands label Nov 21, 2024

Fix pr #5181: Fix issue #5179: [frontend]: Push to Github button shou…

f456410

…ld only push branch, but not creating a PR

xingyaoww mentioned this pull request Nov 21, 2024

[Bug]: Github Resolver cannot push to the SAME PR #5183

Open

1 task

neubig reviewed Nov 21, 2024

View reviewed changes

xingyaoww and others added 2 commits November 22, 2024 15:21

specify do not create PR

59fc3af

Merge branch 'main' into openhands-fix-issue-5179

bf6e2e0

Fix pr #5181: Fix issue #5179: [frontend]: Push to Github button shou…

b347226

…ld only push branch, but not creating a PR

xingyaoww mentioned this pull request Nov 22, 2024

[Bug]: Github Resolver comment "workflow error" when the workflow is successful #5216

Open

1 task

Merge branch 'main' into openhands-fix-issue-5179

125ca38

xingyaoww added fix-me Attempt to fix this issue with OpenHands and removed fix-me Attempt to fix this issue with OpenHands labels Nov 23, 2024

Fix pr #5181: Fix issue #5179: [frontend]: Push to Github button shou…

ede8a17

…ld only push branch, but not creating a PR

xingyaoww and others added 3 commits November 24, 2024 23:58

Merge commit '5460a666faa83762eaf127d20fde9fefe1e46940' into openhand…

096f6b9

…s-fix-issue-5179

Merge branch 'main' into openhands-fix-issue-5179

6d250a5

fix resolver test

7733d0f

neubig approved these changes Nov 25, 2024

View reviewed changes

rbren reviewed Nov 25, 2024

View reviewed changes

Fix pr #5181: Fix issue #5179: [frontend]: Push to Github button shou…

c3978b4

…ld only push branch, but not creating a PR

openhands-agent and others added 4 commits November 25, 2024 15:20

Fix issue #5179: Rename GitHub button and show single button after PR…

4a28111

… creation * Rename 'Push to GitHub' button to 'Push to Branch' * Add state to track PR creation * Show only 'Push changes to PR' button after PR is created * Update tests to reflect new behavior

Fix Git cache

c612826

center buttons

dbb5ddf

Fix Git cache

4df8b6f

xingyaoww marked this pull request as ready for review November 25, 2024 15:40

rbren approved these changes Nov 25, 2024

View reviewed changes

xingyaoww enabled auto-merge (squash) November 25, 2024 15:51

xingyaoww merged commit d267c06 into main Nov 25, 2024
17 checks passed

xingyaoww deleted the openhands-fix-issue-5179 branch November 25, 2024 15:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix issue #5179: [frontend]: Push to Github button should only push branch, but not creating a PR #5181

Fix issue #5179: [frontend]: Push to Github button should only push branch, but not creating a PR #5181

openhands-agent commented Nov 21, 2024 •

edited by github-actions bot

Loading

xingyaoww left a comment

github-actions bot commented Nov 21, 2024

github-actions bot commented Nov 21, 2024

openhands-agent commented Nov 21, 2024

github-actions bot commented Nov 21, 2024

github-actions bot commented Nov 21, 2024

neubig left a comment

xingyaoww commented Nov 22, 2024

neubig commented Nov 22, 2024

xingyaoww commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

openhands-agent commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

xingyaoww commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

github-actions bot commented Nov 23, 2024

openhands-agent commented Nov 23, 2024

github-actions bot commented Nov 23, 2024

neubig left a comment

rbren Nov 25, 2024

rbren Nov 25, 2024

xingyaoww Nov 25, 2024

rbren Nov 25, 2024

xingyaoww Nov 25, 2024

xingyaoww commented Nov 25, 2024

github-actions bot commented Nov 25, 2024

enyst commented Nov 25, 2024

openhands-agent commented Nov 25, 2024

github-actions bot commented Nov 25, 2024

xingyaoww commented Nov 25, 2024

Fix issue #5179: [frontend]: Push to Github button should only push branch, but not creating a PR #5181

Fix issue #5179: [frontend]: Push to Github button should only push branch, but not creating a PR #5181

Conversation

openhands-agent commented Nov 21, 2024 • edited by github-actions bot Loading

xingyaoww left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 21, 2024

github-actions bot commented Nov 21, 2024

openhands-agent commented Nov 21, 2024

github-actions bot commented Nov 21, 2024

github-actions bot commented Nov 21, 2024

neubig left a comment

Choose a reason for hiding this comment

xingyaoww commented Nov 22, 2024

neubig commented Nov 22, 2024

xingyaoww commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

openhands-agent commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

xingyaoww commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

github-actions bot commented Nov 23, 2024

openhands-agent commented Nov 23, 2024

github-actions bot commented Nov 23, 2024

neubig left a comment

Choose a reason for hiding this comment

rbren Nov 25, 2024

Choose a reason for hiding this comment

rbren Nov 25, 2024

Choose a reason for hiding this comment

xingyaoww Nov 25, 2024

Choose a reason for hiding this comment

rbren Nov 25, 2024

Choose a reason for hiding this comment

xingyaoww Nov 25, 2024

Choose a reason for hiding this comment

xingyaoww commented Nov 25, 2024

github-actions bot commented Nov 25, 2024

enyst commented Nov 25, 2024

openhands-agent commented Nov 25, 2024

github-actions bot commented Nov 25, 2024

xingyaoww commented Nov 25, 2024

openhands-agent commented Nov 21, 2024 •

edited by github-actions bot

Loading