From b2d3ae4dc0d5ab07b3a5e83a98aca468b74f5a36 Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Sun, 14 Jul 2024 05:38:45 +0200
Subject: [PATCH] [UI] Remove unnecessary vertical space in empty labels list

- Don't show the labels-list element, if no labels are selected.
- The labels-list was taking up vertical space, even if no labels were
selected which caused an inconsistency in how the sidebar looked.
- Adds integration test

(cherry picked from commit 013b89eb13f4a87e521381072853d253137c1da5)
---
 .../repo/issue/labels/labels_sidebar.tmpl     | 18 +++++++-----
 tests/integration/issue_test.go               | 29 +++++++++++++++++++
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/templates/repo/issue/labels/labels_sidebar.tmpl b/templates/repo/issue/labels/labels_sidebar.tmpl
index be30baba92..d39c2133a7 100644
--- a/templates/repo/issue/labels/labels_sidebar.tmpl
+++ b/templates/repo/issue/labels/labels_sidebar.tmpl
@@ -1,11 +1,13 @@
 <div class="ui labels list">
 	<span class="no-select item {{if .root.HasSelectedLabel}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_label"}}</span>
-	<span class="labels-list">
-		{{range .root.Labels}}
-			{{template "repo/issue/labels/label" dict "root" $.root "label" .}}
-		{{end}}
-		{{range .root.OrgLabels}}
-			{{template "repo/issue/labels/label" dict "root" $.root "label" .}}
-		{{end}}
-	</span>
+	{{if .root.HasSelectedLabel}}
+		<span class="labels-list">
+			{{range .root.Labels}}
+				{{template "repo/issue/labels/label" dict "root" $.root "label" .}}
+			{{end}}
+			{{range .root.OrgLabels}}
+				{{template "repo/issue/labels/label" dict "root" $.root "label" .}}
+			{{end}}
+		</span>
+	{{end}}
 </div>
diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go
index 3f61dafbf0..6a0a9c2934 100644
--- a/tests/integration/issue_test.go
+++ b/tests/integration/issue_test.go
@@ -939,3 +939,32 @@ func TestIssueUnsubscription(t *testing.T) {
 		session.MakeRequest(t, req, http.StatusOK)
 	})
 }
+
+func TestIssueLabelList(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+	labelListSelector := ".labels.list .labels-list"
+	hiddenClass := "tw-hidden"
+
+	t.Run("Show label list", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+		resp := MakeRequest(t, req, http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+
+		htmlDoc.AssertElement(t, labelListSelector, true)
+		htmlDoc.AssertElement(t, ".labels.list .no-select.item."+hiddenClass, true)
+	})
+
+	t.Run("Show no label list", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		session := loginUser(t, "user2")
+
+		req := NewRequest(t, "GET", "/user2/repo2/issues/1")
+		resp := session.MakeRequest(t, req, http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+
+		htmlDoc.AssertElement(t, labelListSelector, false)
+		htmlDoc.AssertElement(t, ".labels.list .no-select.item:not([class*='"+hiddenClass+"'])", true)
+	})
+}