mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

[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 013b89eb13)
This commit is contained in:
Gusted 2024-07-14 05:38:45 +02:00 committed by GitHub
parent 118b8eb9c1
commit b2d3ae4dc0
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
templates/repo/issue/labels/labels_sidebar.tmpl
View File

@ -1,11 +1,13 @@
<div class="ui labels list"> <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="no-select item {{if .root.HasSelectedLabel}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_label"}}</span>
<span class="labels-list"> {{if .root.HasSelectedLabel}}
{{range .root.Labels}} <span class="labels-list">
{{template "repo/issue/labels/label" dict "root" $.root "label" .}} {{range .root.Labels}}
{{end}} {{template "repo/issue/labels/label" dict "root" $.root "label" .}}
{{range .root.OrgLabels}} {{end}}
{{template "repo/issue/labels/label" dict "root" $.root "label" .}} {{range .root.OrgLabels}}
{{end}} {{template "repo/issue/labels/label" dict "root" $.root "label" .}}
</span> {{end}}
</span>
{{end}}
</div> </div>

29
tests/integration/issue_test.go
View File

@ -939,3 +939,32 @@ func TestIssueUnsubscription(t *testing.T) {
session.MakeRequest(t, req, http.StatusOK) 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)
})
}