From b376287cc939e13cb436973a987957ffa2eecdcb Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Fri, 12 Jun 2026 15:33:22 +0300
Subject: [PATCH] appview/pages: cleverer htmx-ing in new issue comment
 fragments

- errors are printed to the right of the button
- any existing error messages are dismissed before a new request is
  fired

Signed-off-by: oppiliappan <me@oppi.li>
---
 .../repo/issues/fragments/newComment.html          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/appview/pages/templates/repo/issues/fragments/newComment.html b/appview/pages/templates/repo/issues/fragments/newComment.html
index 65f806a8..9dff87f3 100644
--- a/appview/pages/templates/repo/issues/fragments/newComment.html
+++ b/appview/pages/templates/repo/issues/fragments/newComment.html
@@ -2,13 +2,15 @@
   {{ if .LoggedInUser }}
   <form
     hx-post="/comment"
+    hx-swap="none"
     hx-trigger="submit, click from:#close-button, keydown[commentButtonEnabled() && (ctrlKey || metaKey) && key=='Enter'] from:#comment-textarea"
     hx-disabled-elt="find button[type='submit']"
+    hx-on::before-request="document.getElementById('comment-error').innerHTML = ''"
     hx-on::after-request="if(event.detail.successful) this.reset()"
-    class="group/form"
+    class="group/form "
   >
     <input name="subject-uri" type="hidden" value="{{ .Issue.AtUri }}">
-    <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full">
+    <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full border border-gray-200 dark:border-gray-700">
       <div class="text-sm pb-2 text-gray-500 dark:text-gray-400">
         {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }}
       </div>
@@ -21,11 +23,9 @@
         rows="5"
         required
       ></textarea>
-      <div id="comment-error" class="error"></div>
-      <div id="issue-action" class="error"></div>
     </div>
 
-    <div class="flex gap-2 mt-2">
+    <div class="flex gap-2 mt-2 items-center">
         <button
             id="comment-button"
             type="submit"
@@ -59,6 +59,7 @@
             hx-target="#issue-action"
             hx-swap="none"
             hx-indicator="#close-button"
+            hx-on::before-request="document.getElementById('issue-action').innerHTML = ''"
         >
         </div>
         {{ else if and (or $isIssueAuthor $isRepoCollaborator $isRepoOwner) (not .Issue.Open) }}
@@ -74,6 +75,9 @@
         </button>
         {{ end }}
 
+        <div id="comment-error" class="error"></div>
+        <div id="issue-action" class="error"></div>
+
         <script>
         function commentButtonEnabled() {
             const commentButton = document.getElementById('comment-button');
-- 
2.51.2