From 0918a3ba6a1de43ac76e84b4bf6c9c2007397edf Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Thu, 22 May 2025 14:13:10 +0100
Subject: [PATCH] appview: pulls: revert pullHeader fragment to original state

the stacking working introduced some unnecessary changes here
---
 .../repo/pulls/fragments/pullHeader.html      | 153 +++++++-----------
 1 file changed, 57 insertions(+), 96 deletions(-)

diff --git a/appview/pages/templates/repo/pulls/fragments/pullHeader.html b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
index a9f439a9..4e1b90ec 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullHeader.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
@@ -1,108 +1,69 @@
 {{ define "repo/pulls/fragments/pullHeader" }}
-  <header class="flex items-center gap-2 pb-2">
-      {{ block "pullState" .Pull }} {{ end }}
-      <h1 class="text-2xl dark:text-white">
-          {{ .Pull.Title }}
-          <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span>
-      </h1>
-  </header>
+<header class="pb-4">
+    <h1 class="text-2xl dark:text-white">
+        {{ .Pull.Title }}
+        <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span>
+    </h1>
+</header>
 
-  <section class="">
-    <div class="flex items-center gap-2">
-      <span class="text-gray-500 dark:text-gray-400 text-sm">
-        opened by
-        {{ $owner := index $.DidHandleMap .Pull.OwnerDid }}
-        <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a>
-        <span class="select-none before:content-['\00B7']"></span>
-        <time>{{ .Pull.Created | timeFmt }}</time>
-        <span class="select-none before:content-['\00B7']"></span>
-        <span>
-          targeting
-          <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">
-            <a href="/{{ .RepoInfo.FullName }}/tree/{{ .Pull.TargetBranch }}" class="no-underline hover:underline">{{ .Pull.TargetBranch }}</a>
-          </span>
-        </span>
-        {{ if not .Pull.IsPatchBased }}
-          from
-          <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">
-            {{ if .Pull.IsForkBased }}
-              {{ if .Pull.PullSource.Repo }}
-              <a href="/{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}</a>:
-              {{- else -}}
-              <span class="italic">[deleted fork]</span>
-              {{- end -}}
-            {{- end -}}
-            {{- .Pull.PullSource.Branch -}}
-          </span>
-        {{ end }}
-      </span>
-    </div>
-
-    {{ if .Pull.Body }}
-      <article id="body" class="mt-2 prose dark:prose-invert">
-          {{ .Pull.Body | markdown }}
-      </article>
-    {{ end }}
-  </section>
-
-{{ end }}
-
-{{ define "singlePullHeader" }}
-{{ end }}
+{{ $bgColor := "bg-gray-800 dark:bg-gray-700" }}
+{{ $icon := "ban" }}
 
-{{ define "stackedPullHeader" }}
-  <div class="border border-gray-200 dark:border-gray-700 rounded-sm">
-    {{ block "stackedPullHeaderAbove" . }} {{ end }}
-    <div class="p-2">
-      {{ block "singlePullHeader"       . }} {{ end }}
-    </div>
-    {{ block "stackedPullHeaderBelow" . }} {{ end }}
-  </div>
+{{ if .Pull.State.IsOpen }}
+    {{ $bgColor = "bg-green-600 dark:bg-green-700" }}
+    {{ $icon = "git-pull-request" }}
+{{ else if .Pull.State.IsMerged }}
+    {{ $bgColor = "bg-purple-600 dark:bg-purple-700" }}
+    {{ $icon = "git-merge" }}
 {{ end }}
 
-{{ define "stackedPullHeaderAbove" }}
-  {{ if .Pull.IsStacked }}
-    {{ $above := .Stack.StrictlyAbove .Pull }}
-    <div class="flex flex-col">
-      {{ range $pull := $above }}
-        <div class="border-b border-gray-200 dark:border-gray-700 p-2">
-          {{ block "summarizedHeader" (list $pull $) }} {{ end }}
+<section class="mt-2">
+    <div class="flex items-center gap-2">
+        <div
+            id="state"
+            class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}"
+        >
+            {{ i $icon "w-4 h-4 mr-1.5 text-white" }}
+            <span class="text-white">{{ .Pull.State.String }}</span>
         </div>
-      {{ end }}
-    </div>
-  {{ end }}
-{{ end }}
+        <span class="text-gray-500 dark:text-gray-400 text-sm">
+            opened by
+            {{ $owner := index $.DidHandleMap .Pull.OwnerDid }}
+            <a href="/{{ $owner }}" class="no-underline hover:underline"
+                >{{ $owner }}</a
+            >
+            <span class="select-none before:content-['\00B7']"></span>
+            <time>{{ .Pull.Created | timeFmt }}</time>
 
-{{ define "stackedPullHeaderBelow" }}
-  {{ if .Pull.IsStacked }}
-    {{ $below := .Stack.StrictlyBelow .Pull }}
-    <div class="flex flex-col">
-      {{ range $pull := $below }}
-        <div class="border-t border-gray-200 dark:border-gray-700 p-2">
-          {{ block "summarizedHeader" (list $pull $) }} {{ end }}
-        </div>
-      {{ end }}
+            <span class="select-none before:content-['\00B7']"></span>
+            <span>
+              targeting
+              <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">
+                <a href="/{{ .RepoInfo.FullName }}/tree/{{ .Pull.TargetBranch }}" class="no-underline hover:underline">{{ .Pull.TargetBranch }}</a>
+              </span>
+            </span>
+            {{ if not .Pull.IsPatchBased }}
+              from
+              <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">
+                {{ if .Pull.IsForkBased }}
+                  {{ if .Pull.PullSource.Repo }}
+                  <a href="/{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}</a>:
+                  {{- else -}}
+                  <span class="italic">[deleted fork]</span>
+                  {{- end -}}
+                {{- end -}}
+                {{- .Pull.PullSource.Branch -}}
+              </span>
+            {{ end }}
+        </span>
     </div>
-  {{ end }}
-{{ end }}
 
-{{ define "pullState" }}
-  {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }}
-  {{ $icon := "ban" }}
+    {{ if .Pull.Body }}
+        <article id="body" class="mt-8 prose dark:prose-invert">
+            {{ .Pull.Body | markdown }}
+        </article>
+    {{ end }}
+</section>
 
-  {{ if .State.IsOpen }}
-    {{ $bgColor = "bg-green-600 dark:bg-green-700" }}
-    {{ $icon = "git-pull-request" }}
-  {{ else if .State.IsMerged }}
-    {{ $bgColor = "bg-purple-600 dark:bg-purple-700" }}
-    {{ $icon = "git-merge" }}
-  {{ else if .State.IsDeleted }}
-    {{ $bgColor = "bg-red-600 dark:bg-red-700" }}
-    {{ $icon = "git-pull-request-closed" }}
-  {{ end }}
 
-  <div id="state" class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}" >
-    {{ i $icon "w-4 h-4 mr-1.5 text-white" }}
-    <span class="text-white ">{{ .State.String }}</span>
-  </div>
 {{ end }}
-- 
2.51.2