From e93aa94d188abfb395646061030a206e477f98fc Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Tue, 4 Feb 2025 10:15:26 -0500
Subject: [PATCH 1/3] Disallow enter key to submit form on selecting
 Autocomplete item (CFM-150)

---
 .../components/autocomplete/cm-autocomplete-people.js     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js b/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
index 00787222..75a84db6 100644
--- a/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
+++ b/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
@@ -243,6 +243,11 @@ export default {
         }
       }
       this.listLastPos = itemPosition
+    },
+    onEnter(ev) {
+      if(this.options.type == 'field') {
+        return false;
+      }
     }
   },
   mounted() {
@@ -310,7 +315,8 @@ export default {
           @show="calculateDisabled"
           @keyup.arrow-down="onListNavigate"
           @keyup.arrow-up="onListNavigate"
-          @item-select="setPerson">
+          @item-select="setPerson"
+          @keydown.enter.stop.prevent="onEnter">
           <template #option="slotProps">
             <div class="cm-ac-item">
               <div class="cm-ac-item-primary">

From ec100071ba86cb2f84e0d4f94eabe260f4ebafe2 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Tue, 4 Feb 2025 10:47:32 -0500
Subject: [PATCH 2/3] Disallow enter key for all but stand-alone people pickers
 on select (CFM-150)

---
 .../comanage/components/autocomplete/cm-autocomplete-people.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js b/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
index 75a84db6..04e9b4a7 100644
--- a/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
+++ b/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
@@ -245,7 +245,7 @@ export default {
       this.listLastPos = itemPosition
     },
     onEnter(ev) {
-      if(this.options.type == 'field') {
+      if(this.options.type != 'stand-alone') {
         return false;
       }
     }

From 6f09abdacd985bb45f09df2b67d519f1faf08dc7 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Tue, 4 Feb 2025 11:03:22 -0500
Subject: [PATCH 3/3] Allow enter key when people-picker field is empty
 (CFM-150)

---
 .../components/autocomplete/cm-autocomplete-people.js    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js b/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
index 04e9b4a7..c0c73ecc 100644
--- a/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
+++ b/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
@@ -245,7 +245,12 @@ export default {
       this.listLastPos = itemPosition
     },
     onEnter(ev) {
-      if(this.options.type != 'stand-alone') {
+      if(this.options.type != 'stand-alone'
+        && this.person != '') {
+        // Allow the Enter key to submit the form only if we're in 
+        // stand-alone mode or the field is empty. 
+        ev.preventDefault();
+        ev.stopPropagation();
         return false;
       }
     }
@@ -316,7 +321,7 @@ export default {
           @keyup.arrow-down="onListNavigate"
           @keyup.arrow-up="onListNavigate"
           @item-select="setPerson"
-          @keydown.enter.stop.prevent="onEnter">
+          @keydown.enter="onEnter">
           <template #option="slotProps">
             <div class="cm-ac-item">
               <div class="cm-ac-item-primary">