From 3ef86ac85733aae703abbd3ec6e0d2af2eaac6ab Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Mon, 10 Nov 2025 07:58:04 +0000 Subject: [PATCH] appview/pages: use tabselectors to toggle issue/pull states Change-Id: nwtnqorztmlrnumywmxxpupkttntyxup Signed-off-by: oppiliappan --- .../templates/fragments/tabSelector.html | 16 +++-- .../templates/repo/fragments/diffOpts.html | 22 ++++++- .../pages/templates/repo/issues/issues.html | 53 +++++++++------ appview/pages/templates/repo/pulls/pulls.html | 65 +++++++++++-------- 4 files changed, 101 insertions(+), 55 deletions(-) diff --git a/appview/pages/templates/fragments/tabSelector.html b/appview/pages/templates/fragments/tabSelector.html index 0567447c..3b3698ee 100644 --- a/appview/pages/templates/fragments/tabSelector.html +++ b/appview/pages/templates/fragments/tabSelector.html @@ -6,10 +6,18 @@ {{ $activeTab := "bg-white dark:bg-gray-700 shadow-sm" }} {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800 shadow-inner" }} {{ range $index, $value := $all }} - {{ $isActive := eq $value $active }} - - {{ $value }} + {{ $isActive := eq $value.Key $active }} + + {{ if $value.Icon }} + {{ i $value.Icon "size-4" }} + {{ end }} + + {{ with $value.Meta }} + {{ . }} + {{ end }} + + {{ $value.Value }} {{ end }} diff --git a/appview/pages/templates/repo/fragments/diffOpts.html b/appview/pages/templates/repo/fragments/diffOpts.html index a6484bb6..23bad8db 100644 --- a/appview/pages/templates/repo/fragments/diffOpts.html +++ b/appview/pages/templates/repo/fragments/diffOpts.html @@ -5,8 +5,26 @@ {{ if .Split }} {{ $active = "split" }} {{ end }} - {{ $values := list "unified" "split" }} - {{ template "fragments/tabSelector" (dict "Name" "diff" "Values" $values "Active" $active) }} + + {{ $unified := + (dict + "Key" "unified" + "Value" "unified" + "Icon" "square-split-vertical" + "Meta" "") }} + {{ $split := + (dict + "Key" "split" + "Value" "split" + "Icon" "square-split-horizontal" + "Meta" "") }} + {{ $values := list $unified $split }} + + {{ template "fragments/tabSelector" + (dict + "Name" "diff" + "Values" $values + "Active" $active) }} {{ end }} diff --git a/appview/pages/templates/repo/issues/issues.html b/appview/pages/templates/repo/issues/issues.html index 13cf6713..e22d74f9 100644 --- a/appview/pages/templates/repo/issues/issues.html +++ b/appview/pages/templates/repo/issues/issues.html @@ -8,6 +8,26 @@ {{ end }} {{ define "repoContent" }} + {{ $active := "closed" }} + {{ if .FilteringByOpen }} + {{ $active = "open" }} + {{ end }} + + {{ $open := + (dict + "Key" "open" + "Value" "open" + "Icon" "circle-dot" + "Meta" (string .RepoInfo.Stats.IssueCount.Open)) }} + {{ $closed := + (dict + "Key" "closed" + "Value" "closed" + "Icon" "ban" + "Meta" (string .RepoInfo.Stats.IssueCount.Closed)) }} + {{ $values := list $open $closed }} + +
-
- - {{ i "circle-dot" "w-4 h-4" }} - {{ .RepoInfo.Stats.IssueCount.Open }} open - - - {{ i "ban" "w-4 h-4" }} - {{ .RepoInfo.Stats.IssueCount.Closed }} closed - +
+ {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }}
-
+
+
{{ end }} {{ define "repoAfter" }} diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html index 854bf571..b12f92ee 100644 --- a/appview/pages/templates/repo/pulls/pulls.html +++ b/appview/pages/templates/repo/pulls/pulls.html @@ -8,7 +8,33 @@ {{ end }} {{ define "repoContent" }} -
+ {{ $active := "closed" }} + {{ if .FilteringBy.IsOpen }} + {{ $active = "open" }} + {{ else if .FilteringBy.IsMerged }} + {{ $active = "merged" }} + {{ end }} + {{ $open := + (dict + "Key" "open" + "Value" "open" + "Icon" "git-pull-request" + "Meta" (string .RepoInfo.Stats.PullCount.Open)) }} + {{ $merged := + (dict + "Key" "merged" + "Value" "merged" + "Icon" "git-merge" + "Meta" (string .RepoInfo.Stats.PullCount.Merged)) }} + {{ $closed := + (dict + "Key" "closed" + "Value" "closed" + "Icon" "ban" + "Meta" (string .RepoInfo.Stats.IssueCount.Closed)) }} + {{ $values := list $open $merged $closed }} +