From e34f08ecb5764e8016a8bdf313fa457318133257 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@redhat.com>
Date: Thu, 26 Sep 2024 10:15:47 +0200
Subject: [PATCH] Fix irritating Enter key behaviour in container creation
 dialog

Pressing "Enter" in the dialog on any active form element (such as the
search input or the checkboxes) previously bubbled up to the Form, which
then activated the first popover help. This is unexpected and very
irritating especially when using the search input.

Just ignore the Enter key to fix that, similar to what the image search
modal already does.

See https://github.com/cockpit-project/cockpit-podman/pull/1821#issuecomment-2374302608
---
 src/ImageRunModal.jsx  | 2 +-
 test/check-application | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/ImageRunModal.jsx b/src/ImageRunModal.jsx
index e6806de3e..94d835176 100644
--- a/src/ImageRunModal.jsx
+++ b/src/ImageRunModal.jsx
@@ -744,7 +744,7 @@ export class ImageRunModal extends React.Component {
         );
 
         const defaultBody = (
-            <Form>
+            <Form onKeyDown={e => e.key === 'Enter' && e.preventDefault()}>
                 {this.state.dialogError && <ErrorNotification errorMessage={this.state.dialogError} errorDetail={this.state.dialogErrorDetail} />}
                 <FormGroup id="image-name-group" fieldId='run-image-dialog-name' label={_("Name")} className="ct-m-horizontal">
                     <TextInput id='run-image-dialog-name'
diff --git a/test/check-application b/test/check-application
index f6bdeacc9..a0635e9b8 100755
--- a/test/check-application
+++ b/test/check-application
@@ -1738,9 +1738,16 @@ class TestApplication(testlib.MachineCase):
 
         # Local registry
         b.click('button.pf-v5-c-toggle-group__button:contains("localhost:5000")')
-        b.set_input_text("#create-image-image-select-typeahead", "my-busybox")
+        b.set_input_text("#create-image-image-select-typeahead", "my-busybox", blur=False)
         b.wait_text("button.pf-v5-c-select__menu-item:not(.pf-m-disabled)", "localhost:5000/my-busybox")
 
+        # pressing Enter does not disturb the dialog or open popup help
+        b.wait_val("#create-image-image-select-typeahead", "my-busybox")
+        b.key("Enter")
+        time.sleep(0.3)
+        self.assertFalse(b.is_present(".pf-v5-c-popover"))
+        b.wait_val("#create-image-image-select-typeahead", "my-busybox")
+
         # Select image
         b.click('button.pf-v5-c-select__menu-item:contains("localhost:5000/my-busybox")')