From e47dda68c5d34763e98983a6af56ab1c4711c697 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 26 Jun 2024 15:05:54 -0400
Subject: [PATCH 1/6] Updated templates

---
 .../partials/form_entry/bootstrap3/entry_button.html          | 2 +-
 .../cloudcare/partials/form_entry/bootstrap3/entry_file.html  | 2 +-
 .../cloudcare/partials/form_entry/bootstrap3/entry_geo.html   | 4 ++--
 .../partials/form_entry/bootstrap3/entry_signature.html       | 2 +-
 .../partials/form_entry/bootstrap5/entry_button.html          | 2 +-
 .../cloudcare/partials/form_entry/bootstrap5/entry_file.html  | 2 +-
 .../cloudcare/partials/form_entry/bootstrap5/entry_geo.html   | 4 ++--
 .../partials/form_entry/bootstrap5/entry_signature.html       | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_button.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_button.html
index 7cd1c232c186..ebe8a5c85050 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_button.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_button.html
@@ -1,5 +1,5 @@
 <script type="text/html" id="button-entry-ko-template">
-  <button class="btn btn-default" data-bind="click: onClick, attr: {id: entryId}">
+  <button type="button" class="btn btn-default" data-bind="click: onClick, attr: {id: entryId}">
     <span data-bind="renderMarkdown: buttonLabel()"></span>
   </button>
 </script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_file.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_file.html
index 443a711bb6c8..d9e5e26c8288 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_file.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_file.html
@@ -13,7 +13,7 @@
         "/>
     </div>
     <div class="col-xs-4">
-      <button class="btn btn-default btn-xs pull-right" data-bind="
+      <button type="button" class="btn btn-default btn-xs pull-right" data-bind="
         click: onClear,
         text: $root.getTranslation('upload.clear.title', '{% trans_html_attr 'Clear' %}'),
       ">
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_geo.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_geo.html
index 5e04196a05ee..16db8ad3098b 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_geo.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_geo.html
@@ -7,7 +7,7 @@
       <td class="lat coordinate" data-bind="text: formatLat()"></td>
       <td class="lon coordinate" data-bind="text: formatLon()"></td>
       <td align="right" valign="bottom">
-        <button class="btn btn-default btn-xs clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
+        <button type="button" class="btn btn-default btn-xs clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
       </td>
     </tr>
     </tbody>
@@ -26,7 +26,7 @@
           <div class="input-group">
             <input class="query form-control" type="text" />
             <span class="input-group-btn">
-              <button class="btn btn-default search">{% trans "Search" %}</button>
+              <button type="button" class="btn btn-default search">{% trans "Search" %}</button>
             </span>
           </div>
         </div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_signature.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_signature.html
index 0525e8ff265f..37c80f368b36 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_signature.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_signature.html
@@ -11,7 +11,7 @@
       style="border: 1px solid #ccc; border-radius: 4px;"/>
     </canvas>
   </div>
-  <button class="btn btn-default btn-xs pull-right" data-bind="click: onClear">
+  <button type="button" class="btn btn-default btn-xs pull-right" data-bind="click: onClear">
     {% trans "Clear" %}
   </button>
   <input type="file" class="hidden" data-bind="
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_button.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_button.html
index 906deedc9979..88586b3ab1cd 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_button.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_button.html
@@ -1,5 +1,5 @@
 <script type="text/html" id="button-entry-ko-template">
-  <button class="btn btn-outline-primary" data-bind="click: onClick, attr: {id: entryId}">
+  <button type="button" class="btn btn-outline-primary" data-bind="click: onClick, attr: {id: entryId}">
     <span data-bind="renderMarkdown: buttonLabel()"></span>
   </button>
 </script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_file.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_file.html
index 38a9461dc52f..432dd222ea16 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_file.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_file.html
@@ -14,7 +14,7 @@
         "/>
     </div>
     <div class="col-sm-4">
-      <button class="btn btn-outline-primary btn-sm float-end" data-bind="
+      <button type="button" class="btn btn-outline-primary btn-sm float-end" data-bind="
         click: onClear,
         text: $root.getTranslation('upload.clear.title', '{% trans_html_attr 'Clear' %}'),
       ">
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_geo.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_geo.html
index efe6fdc790c1..aa6edc2c9243 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_geo.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_geo.html
@@ -7,7 +7,7 @@
       <td class="lat coordinate" data-bind="text: formatLat()"></td>
       <td class="lon coordinate" data-bind="text: formatLon()"></td>
       <td align="right" valign="bottom">
-        <button class="btn btn-outline-primary btn-sm clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
+        <button type="button" class="btn btn-outline-primary btn-sm clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
       </td>
     </tr>
     </tbody>
@@ -27,7 +27,7 @@
                  type="text"
                  data-bind="css: { 'is-invalid': $parent.hasError() }"
           />
-          <button class="btn btn-outline-primary search">{% trans "Search" %}</button>
+          <button type="button" class="btn btn-outline-primary search">{% trans "Search" %}</button>
         </div>
       </div>
     </form>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_signature.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_signature.html
index 7d6d239c9e55..0b8d17caf87a 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_signature.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_signature.html
@@ -12,7 +12,7 @@
       class="border rounded" />
     </canvas>
   </div>
-  <button class="btn btn-outline-primary btn-sm float-end" data-bind="click: onClear">
+  <button type="button" class="btn btn-outline-primary btn-sm float-end" data-bind="click: onClear">
     {% trans "Clear" %}
   </button>
   <input type="file" class="d-none" data-bind="

From 45386e9b68aaedf8dffcac1d5c07410bfa77c03f Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 26 Jun 2024 15:06:09 -0400
Subject: [PATCH 2/6] Updated B5 diffs

---
 .../partials/form_entry/entry_button.html.diff.txt        | 4 ++--
 .../partials/form_entry/entry_file.html.diff.txt          | 4 ++--
 .../cloudcare/partials/form_entry/entry_geo.html.diff.txt | 8 ++++----
 .../partials/form_entry/entry_signature.html.diff.txt     | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_button.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_button.html.diff.txt
index 9b9feeb3d99f..2b581254add5 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_button.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_button.html.diff.txt
@@ -2,8 +2,8 @@
 +++ 
 @@ -1,5 +1,5 @@
  <script type="text/html" id="button-entry-ko-template">
--  <button class="btn btn-default" data-bind="click: onClick, attr: {id: entryId}">
-+  <button class="btn btn-outline-primary" data-bind="click: onClick, attr: {id: entryId}">
+-  <button type="button" class="btn btn-default" data-bind="click: onClick, attr: {id: entryId}">
++  <button type="button" class="btn btn-outline-primary" data-bind="click: onClick, attr: {id: entryId}">
      <span data-bind="renderMarkdown: buttonLabel()"></span>
    </button>
  </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_file.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_file.html.diff.txt
index d2111190b14a..3c0e84157086 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_file.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_file.html.diff.txt
@@ -17,9 +17,9 @@
          "/>
      </div>
 -    <div class="col-xs-4">
--      <button class="btn btn-default btn-xs pull-right" data-bind="
+-      <button type="button" class="btn btn-default btn-xs pull-right" data-bind="
 +    <div class="col-sm-4">
-+      <button class="btn btn-outline-primary btn-sm float-end" data-bind="
++      <button type="button" class="btn btn-outline-primary btn-sm float-end" data-bind="
          click: onClear,
          text: $root.getTranslation('upload.clear.title', '{% trans_html_attr 'Clear' %}'),
        ">
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_geo.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_geo.html.diff.txt
index 9384cf8f91f5..7bf014085546 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_geo.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_geo.html.diff.txt
@@ -4,8 +4,8 @@
        <td class="lat coordinate" data-bind="text: formatLat()"></td>
        <td class="lon coordinate" data-bind="text: formatLon()"></td>
        <td align="right" valign="bottom">
--        <button class="btn btn-default btn-xs clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
-+        <button class="btn btn-outline-primary btn-sm clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
+-        <button type="button" class="btn btn-default btn-xs clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
++        <button type="button" class="btn btn-outline-primary btn-sm clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
        </td>
      </tr>
      </tbody>
@@ -18,7 +18,7 @@
 -          <div class="input-group">
 -            <input class="query form-control" type="text" />
 -            <span class="input-group-btn">
--              <button class="btn btn-default search">{% trans "Search" %}</button>
+-              <button type="button" class="btn btn-default search">{% trans "Search" %}</button>
 -            </span>
 -          </div>
 +      <div class="mt-1" data-bind="css: control_width">
@@ -27,7 +27,7 @@
 +                 type="text"
 +                 data-bind="css: { 'is-invalid': $parent.hasError() }"
 +          />
-+          <button class="btn btn-outline-primary search">{% trans "Search" %}</button>
++          <button type="button" class="btn btn-outline-primary search">{% trans "Search" %}</button>
          </div>
        </div>
      </form>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_signature.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_signature.html.diff.txt
index f620e401f34f..81698d63cc8d 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_signature.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_signature.html.diff.txt
@@ -14,8 +14,8 @@
 +      class="border rounded" />
      </canvas>
    </div>
--  <button class="btn btn-default btn-xs pull-right" data-bind="click: onClear">
-+  <button class="btn btn-outline-primary btn-sm float-end" data-bind="click: onClear">
+-  <button type="button" class="btn btn-default btn-xs pull-right" data-bind="click: onClear">
++  <button type="button" class="btn btn-outline-primary btn-sm float-end" data-bind="click: onClear">
      {% trans "Clear" %}
    </button>
 -  <input type="file" class="hidden" data-bind="

From 3b9cc2bdd5ac3501874f8478f128695feb542b7f Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 25 Jun 2024 14:57:29 -0500
Subject: [PATCH 3/6] QA-6732: Add type button

* Add `type="button"` to add and delete group buttons
* Without it they default to `type="submit"` since they are
  inside a form
---
 .../form_entry/bootstrap3/sub_group.html         | 14 ++++++++++----
 .../form_entry/bootstrap5/sub_group.html         | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/sub_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/sub_group.html
index 0b20a0621aa8..1f3d059e3e7e 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/sub_group.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/sub_group.html
@@ -4,7 +4,7 @@
 <script type="text/html" id="sub-group-fullform-ko-template">
   <!-- ko if: isDummy -->
   <div style="margin-bottom: 10px; margin-right: 10px">
-      <button class="btn btn-default add" href="#"
+      <button type="button" class="btn btn-default add" href="#"
               data-bind="click: newRepeat, text: addChoice"
               id="repeat-add-new">
               <i class="fa fa-plus"></i>
@@ -48,7 +48,10 @@
                 data-bind="
                   html: ko.utils.unwrapObservable($data.caption_markdown) || caption(),
                 "></span>
-          <button class="btn btn-danger del pull-right" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
+          <button type="button"
+                  class="btn btn-danger del pull-right"
+                  href="#"
+                  aria-label="{% trans_html_attr 'Delete Repeat' %}"
                   data-bind="
                       visible: showDelete,
                       enabled: hasNoPendingAnswer(),
@@ -65,8 +68,11 @@
           </div>
           <span class="webapp-markdown-output caption" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
           <i class="fa fa-warning text-danger pull-right" data-bind="visible: hasError() && !showChildren()"></i>
-           <button class="btn btn-danger del pull-right" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
-                  data-bind="
+           <button type="button"
+                   class="btn btn-danger del pull-right"
+                   href="#"
+                   aria-label="{% trans_html_attr 'Delete Repeat' %}"
+                   data-bind="
                       visible: showDelete,
                       enabled: hasNoPendingAnswer(),
                       click: deleteRepeat
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/sub_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/sub_group.html
index 5f5731248c1b..7fb9387ea314 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/sub_group.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/sub_group.html
@@ -4,7 +4,7 @@
 <script type="text/html" id="sub-group-fullform-ko-template">
   <!-- ko if: isDummy -->
   <div class="mb-1 mr-1">
-      <button class="btn btn-outline-primary add" href="#"
+      <button type="button" class="btn btn-outline-primary add" href="#"
               data-bind="click: newRepeat, text: addChoice"
               id="repeat-add-new">
               <i class="fa fa-plus"></i>
@@ -48,7 +48,10 @@
                 data-bind="
                   html: ko.utils.unwrapObservable($data.caption_markdown) || caption(),
                 "></span>
-          <button class="btn btn-outline-danger del float-end" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
+          <button type="button"
+                  class="btn btn-outline-danger del float-end"
+                  href="#"
+                  aria-label="{% trans_html_attr 'Delete Repeat' %}"
                   data-bind="
                       visible: showDelete,
                       enabled: hasNoPendingAnswer(),
@@ -65,12 +68,15 @@
           </div>
           <span class="webapp-markdown-output caption" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
           <i class="fa fa-warning text-danger float-end" data-bind="visible: hasError() && !showChildren()"></i>
-           <button class="btn btn-outline-danger del float-end" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
-                  data-bind="
+           <button type="button"
+                   class="btn btn-outline-danger del float-end"
+                   href="#"
+                   aria-label="{% trans_html_attr 'Delete Repeat' %}"
+                   data-bind="
                       visible: showDelete,
                       enabled: hasNoPendingAnswer(),
                       click: deleteRepeat
-                  "><i class="fa fa-remove"></i></button>
+                   "><i class="fa fa-remove"></i></button>
         </div>
       </div>
       <span class="ix"></span>

From 57eaf4b1729a8a343a37fac4c3accab2d0f08475 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 25 Jun 2024 20:12:27 +0000
Subject: [PATCH 4/6] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../form_entry/sub_group.html.diff.txt        | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/sub_group.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/sub_group.html.diff.txt
index d5187c69da9d..388aff2816e4 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/sub_group.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/sub_group.html.diff.txt
@@ -5,9 +5,9 @@
  <script type="text/html" id="sub-group-fullform-ko-template">
    <!-- ko if: isDummy -->
 -  <div style="margin-bottom: 10px; margin-right: 10px">
--      <button class="btn btn-default add" href="#"
+-      <button type="button" class="btn btn-default add" href="#"
 +  <div class="mb-1 mr-1">
-+      <button class="btn btn-outline-primary add" href="#"
++      <button type="button" class="btn btn-outline-primary add" href="#"
                data-bind="click: newRepeat, text: addChoice"
                id="repeat-add-new">
                <i class="fa fa-plus"></i>
@@ -28,27 +28,36 @@
             clickable: collapsible
          },
          attr: collapsible ? {
-@@ -48,7 +48,7 @@
-                 data-bind="
+@@ -49,7 +49,7 @@
                    html: ko.utils.unwrapObservable($data.caption_markdown) || caption(),
                  "></span>
--          <button class="btn btn-danger del pull-right" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
-+          <button class="btn btn-outline-danger del float-end" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
+           <button type="button"
+-                  class="btn btn-danger del pull-right"
++                  class="btn btn-outline-danger del float-end"
+                   href="#"
+                   aria-label="{% trans_html_attr 'Delete Repeat' %}"
                    data-bind="
-                       visible: showDelete,
-                       enabled: hasNoPendingAnswer(),
-@@ -64,8 +64,8 @@
+@@ -67,16 +67,16 @@
              "></i>
            </div>
            <span class="webapp-markdown-output caption" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
 -          <i class="fa fa-warning text-danger pull-right" data-bind="visible: hasError() && !showChildren()"></i>
--           <button class="btn btn-danger del pull-right" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
 +          <i class="fa fa-warning text-danger float-end" data-bind="visible: hasError() && !showChildren()"></i>
-+           <button class="btn btn-outline-danger del float-end" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
-                   data-bind="
+            <button type="button"
+-                   class="btn btn-danger del pull-right"
++                   class="btn btn-outline-danger del float-end"
+                    href="#"
+                    aria-label="{% trans_html_attr 'Delete Repeat' %}"
+                    data-bind="
                        visible: showDelete,
                        enabled: hasNoPendingAnswer(),
-@@ -86,7 +86,7 @@
+                       click: deleteRepeat
+-                  "><i class="fa fa-remove"></i></button>
++                   "><i class="fa fa-remove"></i></button>
+         </div>
+       </div>
+       <span class="ix"></span>
+@@ -92,7 +92,7 @@
                  afterRender: focusNewRepeat,
                },
                css: {

From 45aa915399a6ff4bb4a702179de798049c6a1e1d Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Wed, 26 Jun 2024 10:49:36 -0500
Subject: [PATCH 5/6] Clear button inside for should have type=button

* Without it, the button will capture the enter key instead of the
  submit button
---
 .../cloudcare/partials/form_entry/bootstrap3/entry_select.html  | 2 +-
 .../cloudcare/partials/form_entry/bootstrap5/entry_select.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_select.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_select.html
index 55a4e3cde6dc..6ce0a440111e 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_select.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_select.html
@@ -22,7 +22,7 @@
           </div>
         </div>
       </div>
-      <button class="btn btn-default btn-xs pull-right" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
+      <button type="button" class="btn btn-default btn-xs pull-right" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
         {% trans "Clear" %}
       </button>
     </div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_select.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_select.html
index a85cd6a87e78..501949a69226 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_select.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_select.html
@@ -22,7 +22,7 @@
           ></label>
         </div>
       </div>
-      <button class="btn btn-outline-primary btn-sm float-end" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
+      <button type="button" class="btn btn-outline-primary btn-sm float-end" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
         {% trans "Clear" %}
       </button>
     </div>

From 26edc3fae14360189afe173306413c29a9128ca3 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Wed, 26 Jun 2024 16:19:49 +0000
Subject: [PATCH 6/6] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../cloudcare/partials/form_entry/entry_select.html.diff.txt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_select.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_select.html.diff.txt
index 7a6ed62e4aa7..be2784281b92 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_select.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_select.html.diff.txt
@@ -36,8 +36,8 @@
 +          ></label>
          </div>
        </div>
--      <button class="btn btn-default btn-xs pull-right" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
-+      <button class="btn btn-outline-primary btn-sm float-end" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
+-      <button type="button" class="btn btn-default btn-xs pull-right" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
++      <button type="button" class="btn btn-outline-primary btn-sm float-end" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
          {% trans "Clear" %}
        </button>
      </div>