From f5f258b259de8d44259053a2f976bbe084f7a41e Mon Sep 17 00:00:00 2001
From: Anirudh Oppiliappan <x@icyphox.sh>
Date: Wed, 30 Apr 2025 20:11:19 +0300
Subject: [PATCH] appview: pages: show tags against commits

---
 appview/pages/pages.go                  |  1 +
 appview/pages/templates/repo/index.html | 11 +++--
 appview/pages/templates/repo/log.html   | 57 ++++++++++++++++++-------
 appview/state/repo.go                   | 26 +++++++++++
 4 files changed, 73 insertions(+), 22 deletions(-)

diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 4ac662c..2bf3cee 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -499,6 +499,7 @@ func (p *Pages) RepoIndexPage(w io.Writer, params RepoIndexParams) error {
 type RepoLogParams struct {
 	LoggedInUser *auth.User
 	RepoInfo     RepoInfo
+	TagMap       map[string][]string
 	types.RepoLogResponse
 	Active             string
 	EmailToDidOrHandle map[string]string
diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html
index 7c0e75b..68c94d8 100644
--- a/appview/pages/templates/repo/index.html
+++ b/appview/pages/templates/repo/index.html
@@ -151,8 +151,8 @@
 <div id="commit-log" class="md:col-span-1 px-2 pb-4">
   <div class="flex justify-between items-center">
     <a href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}" class="flex text-black dark:text-white items-center gap-4 pb-2 no-underline hover:no-underline group">
-      <div class="flex gap-2 items-center">
-        {{ i "git-commit-horizontal" "w-4 h-4" }} commits
+      <div class="flex gap-2 items-center font-bold">
+        {{ i "logs" "w-4 h-4" }} commits
       </div>
       <span class="hidden group-hover:flex gap-2 items-center text-sm text-gray-500 dark:text-gray-400 ">
         view {{ .TotalCommits }} commits {{ i "chevron-right" "w-4 h-4" }}
@@ -248,9 +248,8 @@
   {{ if gt (len .BranchesTrunc) 0 }}
     <div id="branches" class="md:col-span-1 px-2 py-4 border-t border-gray-200 dark:border-gray-700">
       <a href="/{{ .RepoInfo.FullName }}/branches" class="flex text-black dark:text-white items-center gap-4 pb-2 no-underline hover:no-underline group">
-        <div class="flex gap-2 items-center">
-          <!-- git-branch icon is seemingly bigger than others at 4x4 -->
-          {{ i "git-branch" "w-3 h-3" }} branches
+        <div class="flex gap-2 items-center font-bold">
+          {{ i "git-branch" "w-4 h-4" }} branches
         </div>
         <span class="hidden group-hover:flex gap-2 items-center text-sm text-gray-500 dark:text-gray-400 ">
           view {{ len .Branches }} branches {{ i "chevron-right" "w-4 h-4" }}
@@ -283,7 +282,7 @@
     <div id="tags" class="md:col-span-1 px-2 py-4 border-t border-gray-200 dark:border-gray-700">
       <div class="flex justify-between items-center">
         <a href="/{{ .RepoInfo.FullName }}/tags" class="flex text-black dark:text-white items-center gap-4 pb-2 no-underline hover:no-underline group">
-          <div class="flex gap-2 items-center">
+          <div class="flex gap-2 items-center font-bold">
             {{ i "tags" "w-4 h-4" }} tags
           </div>
           <span class="hidden group-hover:flex gap-2 items-center text-sm text-gray-500 dark:text-gray-400 ">
diff --git a/appview/pages/templates/repo/log.html b/appview/pages/templates/repo/log.html
index a80beef..7705fea 100644
--- a/appview/pages/templates/repo/log.html
+++ b/appview/pages/templates/repo/log.html
@@ -43,16 +43,30 @@
                     </td>
                     <td class=" py-3 align-top">
                       <div>
-                          <a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}" class="dark:text-white no-underline hover:underline">{{ index $messageParts 0 }}</a>
-                          {{ if gt (len $messageParts) 1 }} 
-                          <button class="ml-2 py-1/2 px-1 bg-gray-200 hover:bg-gray-400 dark:bg-gray-700 dark:hover:bg-gray-600 rounded" hx-on:click="this.nextElementSibling.classList.toggle('hidden')">{{ i "ellipsis" "w-3 h-3" }}</button>
+                          <div class="flex items-center justify-start">
+                              <a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}" class="dark:text-white no-underline hover:underline">{{ index $messageParts 0 }}</a>
+                              {{ if gt (len $messageParts) 1 }} 
+                              <button class="ml-2 py-1/2 px-1 bg-gray-200 hover:bg-gray-400 dark:bg-gray-700 dark:hover:bg-gray-600 rounded" hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')">{{ i "ellipsis" "w-3 h-3" }}</button>
+                              {{ end }}
+
+                              
+                              {{ if index $.TagMap $commit.Hash.String }}
+                                {{ range $tag := index $.TagMap $commit.Hash.String }}
+                                  <span class="ml-2 text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 inline-flex items-center">
+                                    {{ $tag }}
+                                  </span>
+                                {{ end }}
+                              {{ end }}
+                  
+                          </div>
+                          
+                          {{ if gt (len $messageParts) 1 }}
                           <p class="hidden mt-1 text-sm text-gray-600 dark:text-gray-400">{{ nl2br (index $messageParts 1) }}</p>
                           {{ end }}
-                      </div>
                     </td>
                     <td class=" py-3 align-top text-gray-500 dark:text-gray-400">{{ timeFmt $commit.Author.When }}</td>
                 </tr>
-            {{ end }}
+                {{ end }}
         </tbody>
     </table>
 
@@ -66,17 +80,28 @@
                         <div>
                             <div class="flex items-center justify-between">
                                 <div class="flex-1">
-                                    <a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}" 
-                                       class="inline no-underline hover:underline dark:text-white">
-                                       {{ index $messageParts 0 }}
-                                    </a>
-                                    {{ if gt (len $messageParts) 1 }}
-                                        <button 
-                                            class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600"
-                                            hx-on:click="this.nextElementSibling.classList.toggle('hidden')">
-                                            {{ i "ellipsis" "w-3 h-3" }}
-                                        </button>
-                                    {{ end }}
+                                    <div class="flex items-center">
+                                        <a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}" 
+                                           class="inline no-underline hover:underline dark:text-white">
+                                           {{ index $messageParts 0 }}
+                                        </a>
+                                        {{ if gt (len $messageParts) 1 }}
+                                            <button 
+                                                class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600 ml-2"
+                                                hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')">
+                                                {{ i "ellipsis" "w-3 h-3" }}
+                                            </button>
+                                        {{ end }}
+
+                                        {{ if index $.TagMap $commit.Hash.String }}
+                                            {{ range $tag := index $.TagMap $commit.Hash.String }}
+                                                <span class="ml-2 text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 inline-flex items-center">
+                                                {{ $tag }}
+                                                </span>
+                                            {{ end }}
+                                        {{ end }}
+                                    </div>
+
                                     {{ if gt (len $messageParts) 1 }}
                                         <p class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300">
                                             {{ nl2br (index $messageParts 1) }}
diff --git a/appview/state/repo.go b/appview/state/repo.go
index 1bf88c6..4442ad5 100644
--- a/appview/state/repo.go
+++ b/appview/state/repo.go
@@ -167,9 +167,35 @@ func (s *State) RepoLog(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	resp, err = us.Tags(f.OwnerDid(), f.RepoName)
+	if err != nil {
+		log.Println("failed to reach knotserver", err)
+		return
+	}
+
+	body, err = io.ReadAll(resp.Body)
+	if err != nil {
+		log.Printf("error reading response body: %v", err)
+		return
+	}
+
+	var result types.RepoTagsResponse
+	err = json.Unmarshal(body, &result)
+	if err != nil {
+		log.Printf("Error unmarshalling response body: %v", err)
+		return
+	}
+
+	tagMap := make(map[string][]string)
+	for _, tag := range result.Tags {
+		hash := tag.Hash
+		tagMap[hash] = append(tagMap[hash], tag.Name)
+	}
+
 	user := s.auth.GetUser(r)
 	s.pages.RepoLog(w, pages.RepoLogParams{
 		LoggedInUser:       user,
+		TagMap:             tagMap,
 		RepoInfo:           f.RepoInfo(s, user),
 		RepoLogResponse:    repolog,
 		EmailToDidOrHandle: EmailToDidOrHandle(s, uniqueEmails(repolog.Commits)),
-- 
2.51.2