From 21a3b2a609ef946ee0648cca367e47accc16844e Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Wed, 27 Aug 2025 12:28:48 +0100 Subject: [PATCH] appview/pages: refactor fragments to be one-per-file Change-Id: mvmrzuxwmzvskvnywwmorrnwzvwokzun this is a limitation of how fragments are loaded at the moment. multiple definitions per file are unsupported. Signed-off-by: oppiliappan --- .../pages/templates/repo/fragments/duration.html | 4 ++++ .../templates/repo/fragments/shortTime.html | 4 ++++ .../templates/repo/fragments/shortTimeAgo.html | 4 ++++ appview/pages/templates/repo/fragments/time.html | 16 ---------------- .../templates/repo/fragments/timeWrapper.html | 5 +++++ .../repo/pulls/fragments/pullStack.html | 2 +- .../pulls/fragments/summarizedPullHeader.html | 2 +- appview/pages/templates/repo/pulls/pulls.html | 2 +- 8 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 appview/pages/templates/repo/fragments/duration.html create mode 100644 appview/pages/templates/repo/fragments/shortTime.html create mode 100644 appview/pages/templates/repo/fragments/shortTimeAgo.html create mode 100644 appview/pages/templates/repo/fragments/timeWrapper.html diff --git a/appview/pages/templates/repo/fragments/duration.html b/appview/pages/templates/repo/fragments/duration.html new file mode 100644 index 00000000..4df3e252 --- /dev/null +++ b/appview/pages/templates/repo/fragments/duration.html @@ -0,0 +1,4 @@ +{{ define "repo/fragments/duration" }} + +{{ end }} + diff --git a/appview/pages/templates/repo/fragments/shortTime.html b/appview/pages/templates/repo/fragments/shortTime.html new file mode 100644 index 00000000..aa9d3e30 --- /dev/null +++ b/appview/pages/templates/repo/fragments/shortTime.html @@ -0,0 +1,4 @@ +{{ define "repo/fragments/shortTime" }} +{{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | shortRelTimeFmt)) }} +{{ end }} + diff --git a/appview/pages/templates/repo/fragments/shortTimeAgo.html b/appview/pages/templates/repo/fragments/shortTimeAgo.html new file mode 100644 index 00000000..080941a7 --- /dev/null +++ b/appview/pages/templates/repo/fragments/shortTimeAgo.html @@ -0,0 +1,4 @@ +{{ define "repo/fragments/shortTimeAgo" }} +{{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (print (. | shortRelTimeFmt) " ago")) }} +{{ end }} + diff --git a/appview/pages/templates/repo/fragments/time.html b/appview/pages/templates/repo/fragments/time.html index 1e2521a3..46937612 100644 --- a/appview/pages/templates/repo/fragments/time.html +++ b/appview/pages/templates/repo/fragments/time.html @@ -1,19 +1,3 @@ -{{ define "repo/fragments/timeWrapper" }} - -{{ end }} - {{ define "repo/fragments/time" }} {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | relTimeFmt)) }} {{ end }} - -{{ define "repo/fragments/shortTime" }} -{{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | shortRelTimeFmt)) }} -{{ end }} - -{{ define "repo/fragments/shortTimeAgo" }} -{{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (print (. | shortRelTimeFmt) " ago")) }} -{{ end }} - -{{ define "repo/fragments/duration" }} - -{{ end }} \ No newline at end of file diff --git a/appview/pages/templates/repo/fragments/timeWrapper.html b/appview/pages/templates/repo/fragments/timeWrapper.html new file mode 100644 index 00000000..dd8e4bd5 --- /dev/null +++ b/appview/pages/templates/repo/fragments/timeWrapper.html @@ -0,0 +1,5 @@ +{{ define "repo/fragments/timeWrapper" }} + +{{ end }} + + diff --git a/appview/pages/templates/repo/pulls/fragments/pullStack.html b/appview/pages/templates/repo/pulls/fragments/pullStack.html index 1c856236..d38b07eb 100644 --- a/appview/pages/templates/repo/pulls/fragments/pullStack.html +++ b/appview/pages/templates/repo/pulls/fragments/pullStack.html @@ -52,7 +52,7 @@ {{ end }}
- {{ template "repo/pulls/fragments/summarizedHeader" (list $pull $pipeline) }} + {{ template "repo/pulls/fragments/summarizedPullHeader" (list $pull $pipeline) }}
diff --git a/appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html b/appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html index 06558a47..f8f521b0 100644 --- a/appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html +++ b/appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html @@ -1,4 +1,4 @@ -{{ define "repo/pulls/fragments/summarizedHeader" }} +{{ define "repo/pulls/fragments/summarizedPullHeader" }} {{ $pull := index . 0 }} {{ $pipeline := index . 1 }} {{ with $pull }} diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html index fb179cac..69445a24 100644 --- a/appview/pages/templates/repo/pulls/pulls.html +++ b/appview/pages/templates/repo/pulls/pulls.html @@ -144,7 +144,7 @@
- {{ template "repo/pulls/fragments/summarizedHeader" (list $pull $pipeline) }} + {{ template "repo/pulls/fragments/summarizedPullHeader" (list $pull $pipeline) }}
-- 2.43.0