Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Web UI Merge Dialog Enter Should Submit #8781

Merged
merged 1 commit into from
Mar 10, 2025
Merged

Conversation

nopcoder
Copy link
Contributor

New code was tested manually by performing a Merge operation between branches.

Closes #8780

Compare two branches, enabling the "Merge" button. Upon merging, a dialog popup appears requesting a commit message and related information. **Currently**, pressing enter after entering the merge commit message triggers the "Cancel" operation instead of the default "Merge" action.
@nopcoder nopcoder requested a review from a team March 10, 2025 06:48
@nopcoder nopcoder self-assigned this Mar 10, 2025
@nopcoder nopcoder added bug Something isn't working area/UI Improvements or additions to UI include-changelog PR description should be included in next release changelog labels Mar 10, 2025
Copy link

E2E Test Results - Quickstart

11 passed

Copy link

E2E Test Results - DynamoDB Local - Local Block Adapter

14 passed

Copy link
Contributor

@itaigilo itaigilo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, requesting changes for the Issue here (and not the PR):

Merge sounds like something to be considered carefully by the users.
I think that the friction added by having to click and not simply press Enter is better in this case.

What is the origin of this requirement? Is it something coming from users?
Maybe it's worth removing the Cancel-on-Enter behavior instead?

@nopcoder
Copy link
Contributor Author

nopcoder commented Mar 10, 2025

It came from frustration while working with UI and getting different experience from command and merge using the keyboard.

  • Commit dialog -> Enter will commit the changes
  • Merge dialog -> Enter will close the dialog and abort the change

The above aligned to commit, but if you think we should change both and require key combo to apply the change - I'm very open.

@nopcoder nopcoder closed this Mar 10, 2025
@nopcoder nopcoder requested a review from itaigilo March 10, 2025 13:35
@nopcoder nopcoder reopened this Mar 10, 2025
@nopcoder
Copy link
Contributor Author

@itaigilo also not that usually in the UX the green button is the default, but I agree that in some dialogs, usually multi-line text, the enter will not trigger the button.

@itaigilo
Copy link
Contributor

The above aligned to commit, but if you think we should change both and require key combo to apply the change - I'm very open.

@nopcoder my thoughts on this:

  1. Merge and Commit are different actions, hence it well might be that we'll want that one will have more friction (i.e mouse-clicking) than the other.
  2. In this case, I prefer that it's better to align both to do nothing when clicking Enter - but I also believe this should be a product decision.

@nopcoder
Copy link
Contributor Author

@itaigilo as merge and commit both modify the branch by adding a commit (both we can revert) I will go with align the Enter for both commit and merge operations.

@nopcoder nopcoder merged commit 0845265 into master Mar 10, 2025
85 of 86 checks passed
@nopcoder nopcoder deleted the fix/ui-merge-enter branch March 10, 2025 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/UI Improvements or additions to UI bug Something isn't working include-changelog PR description should be included in next release changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WebUI: Merge Dialog Enter Key Behavior
2 participants