From cbceaca16e7ba0728f1a73892e9fa096f2632fcb Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Thu, 18 Jun 2026 13:31:37 +0100
Subject: [PATCH] appview/pages: htmxify keys handlers

Signed-off-by: oppiliappan <me@oppi.li>
---
 appview/pages/templates/layouts/profilebase.html  |  2 +-
 .../user/settings/fragments/keyListing.html       | 15 +++++++--------
 appview/pages/templates/user/settings/keys.html   | 12 +++++-------
 appview/settings/settings.go                      | 14 ++++++++++++--
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/appview/pages/templates/layouts/profilebase.html b/appview/pages/templates/layouts/profilebase.html
index 7a838c12..c55a9631 100644
--- a/appview/pages/templates/layouts/profilebase.html
+++ b/appview/pages/templates/layouts/profilebase.html
@@ -30,7 +30,7 @@
 {{ end }}
 
 {{ define "content" }}
-  {{ if not .Card.HasProfile }}
+  {{ if not .Card.IsTangledUser }}
   <section class="bg-white dark:bg-gray-800 px-2 py-6 md:p-6 rounded w-full dark:text-white shadow-sm">
     <div class="flex items-center gap-6 p-4">
       <img class="w-28 h-28 shrink-0 object-cover rounded-full" src="{{ profileAvatarUrl .Card.Profile "" }}" />
diff --git a/appview/pages/templates/user/settings/fragments/keyListing.html b/appview/pages/templates/user/settings/fragments/keyListing.html
index 3f12fc67..2d3488dc 100644
--- a/appview/pages/templates/user/settings/fragments/keyListing.html
+++ b/appview/pages/templates/user/settings/fragments/keyListing.html
@@ -1,27 +1,26 @@
 {{ define "user/settings/fragments/keyListing" }}
-  {{ $root := index . 0 }}
-  {{ $key := index . 1 }}
-  <div id="key-{{$key.Name}}" class="flex items-center justify-between p-2">
+  <div id="key-{{.Name}}" class="flex items-center justify-between p-2">
     <div class="hover:no-underline flex flex-col gap-1 text min-w-0 max-w-[80%]">
     <div class="flex items-center gap-2">
       <span>{{ i "key" "w-4" "h-4" }}</span>
       <span class="font-bold">
-        {{ $key.Name }}
+        {{ .Name }}
       </span>
     </div>
       <span class="font-mono text-sm text-gray-500 dark:text-gray-400">
-        {{ sshFingerprint $key.Key }}
+        {{ sshFingerprint .Key }}
       </span>
       <div class="flex flex-wrap text-sm items-center gap-1 text-gray-500 dark:text-gray-400">
-        <span>added {{ template "repo/fragments/time" $key.Created }}</span>
+        <span>added {{ template "repo/fragments/time" .Created }}</span>
       </div>
     </div>
     <button
       class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"
       title="Delete key"
-      hx-delete="/settings/keys?name={{urlquery $key.Name}}&rkey={{urlquery $key.Rkey}}"
+      hx-delete="/settings/keys?name={{urlquery .Name}}&rkey={{urlquery .Rkey}}"
       hx-swap="none"
-      hx-confirm="Are you sure you want to delete the key {{ $key.Name }}?"
+      hx-on:keydeleted="this.closest('[id^=key-]').remove()"
+      hx-confirm="Are you sure you want to delete the key {{ .Name }}?"
     >
       {{ i "trash-2" "w-5 h-5" }}
       <span class="hidden md:inline">Delete</span>
diff --git a/appview/pages/templates/user/settings/keys.html b/appview/pages/templates/user/settings/keys.html
index efc54400..231a9229 100644
--- a/appview/pages/templates/user/settings/keys.html
+++ b/appview/pages/templates/user/settings/keys.html
@@ -29,13 +29,9 @@
       {{ template "addKeyButton" . }}
     </div>
   </div>
-  <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 w-full">
+  <div id="keys-list" class="flex flex-col rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 w-full [&:not(:has(*))]:hidden">
     {{ range .PubKeys }}
-      {{ template "user/settings/fragments/keyListing" (list $ .) }}
-    {{ else }}
-      <div class="flex items-center justify-center p-2 text-gray-500">
-        No keys added yet
-      </div>
+      {{ template "user/settings/fragments/keyListing" . }}
     {{ end }}
   </div>
 {{ end }}
@@ -60,7 +56,9 @@
 <form
   hx-put="/settings/keys"
   hx-indicator="#spinner"
-  hx-swap="none"
+  hx-target="#keys-list"
+  hx-swap="beforeend"
+  hx-on:keyadded="this.reset(); this.closest('[popover]').hidePopover()"
   class="flex flex-col gap-2"
 >
   <label for="key-name" class="text-lg font-medium p-0">
diff --git a/appview/settings/settings.go b/appview/settings/settings.go
index 176e387d..50a679e8 100644
--- a/appview/settings/settings.go
+++ b/appview/settings/settings.go
@@ -275,6 +275,9 @@ func (s *Settings) profileSettings(w http.ResponseWriter, r *http.Request) {
 		IsDeactivated:       isDeactivated,
 		HandleOpen:          r.URL.Query().Get("handle") == "1",
 	})
+	if err != nil {
+		s.Logger.Error("failed to render settings page", "err", err)
+	}
 }
 
 func (s *Settings) notificationsSettings(w http.ResponseWriter, r *http.Request) {
@@ -680,7 +683,13 @@ func (s *Settings) keys(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		s.Pages.HxLocation(w, "/settings/keys")
+		// return just the new key row so the client appends it in place. the
+		// keyadded trigger lets the form reset/close only on success (errors go
+		// through Notice, which also returns 200).
+		w.Header().Set("HX-Trigger", "keyadded")
+		if err := s.Pages.KeyFragment(w, pubKey); err != nil {
+			s.Logger.Error("failed to render key fragment", "err", err)
+		}
 		return
 
 	case http.MethodDelete:
@@ -728,7 +737,8 @@ func (s *Settings) keys(w http.ResponseWriter, r *http.Request) {
 		}
 		s.Logger.Info("deleted key successfully", "name", name)
 
-		s.Pages.HxLocation(w, "/settings/keys")
+		w.Header().Set("HX-Trigger", "keydeleted")
+		w.WriteHeader(http.StatusOK)
 		return
 	}
 }
-- 
2.51.2