From 4f551aff7b9d7cac22b55a01dc34cdc1a4b7804e Mon Sep 17 00:00:00 2001
From: stuzer05 <stuzer05@stuzer.link>
Date: Sun, 8 Dec 2024 13:42:31 +0200
Subject: [PATCH 1/5] Fix labels display

---
 templates/repo/issue/sidebar/label_list.tmpl | 24 +++++++-------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/templates/repo/issue/sidebar/label_list.tmpl b/templates/repo/issue/sidebar/label_list.tmpl
index fb8f1a667e75c..8fd0ff5ddc603 100644
--- a/templates/repo/issue/sidebar/label_list.tmpl
+++ b/templates/repo/issue/sidebar/label_list.tmpl
@@ -19,23 +19,15 @@
 				<a class="item clear-selection" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
 				<div class="scrolling menu">
 					{{$previousExclusiveScope := "_no_scope"}}
-					{{range $data.RepoLabels}}
-						{{$exclusiveScope := .ExclusiveScope}}
-						{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
-							<div class="divider"></div>
+					{{range $data.AllLabels}}
+						{{if or (not .IsArchived) (.IsChecked)}}
+							{{$exclusiveScope := .ExclusiveScope}}
+							{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
+								<div class="divider"></div>
+							{{end}}
+							{{$previousExclusiveScope = $exclusiveScope}}
+							{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
 						{{end}}
-						{{$previousExclusiveScope = $exclusiveScope}}
-						{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
-					{{end}}
-					{{if and $data.RepoLabels $data.OrgLabels}}<div class="divider"></div>{{end}}
-					{{$previousExclusiveScope = "_no_scope"}}
-					{{range $data.OrgLabels}}
-						{{$exclusiveScope := .ExclusiveScope}}
-						{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
-							<div class="divider"></div>
-						{{end}}
-						{{$previousExclusiveScope = $exclusiveScope}}
-						{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
 					{{end}}
 				</div>
 			{{end}}

From 51ce44f330beb0edf7169634264367b2029078de Mon Sep 17 00:00:00 2001
From: stuzer05 <stuzer05@stuzer.link>
Date: Sun, 8 Dec 2024 13:59:36 +0200
Subject: [PATCH 2/5] Fix labels display

---
 routers/web/repo/issue_page_meta.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routers/web/repo/issue_page_meta.go b/routers/web/repo/issue_page_meta.go
index 7eda6e3c73634..f584b860a3f3c 100644
--- a/routers/web/repo/issue_page_meta.go
+++ b/routers/web/repo/issue_page_meta.go
@@ -441,4 +441,8 @@ func (d *IssuePageMetaData) retrieveLabelsData(ctx *context.Context) {
 	}
 	labelsData.AllLabels = append(labelsData.AllLabels, labelsData.RepoLabels...)
 	labelsData.AllLabels = append(labelsData.AllLabels, labelsData.OrgLabels...)
+
+	sort.Slice(labelsData.AllLabels, func(i, j int) bool {
+		return labelsData.AllLabels[i].Name > labelsData.AllLabels[j].Name
+	})
 }

From e20ab8842a744adbe9666e47c3032dd85b044c21 Mon Sep 17 00:00:00 2001
From: stuzer05 <stuzer05@stuzer.link>
Date: Sun, 8 Dec 2024 14:00:36 +0200
Subject: [PATCH 3/5] Fix labels display

---
 routers/web/repo/issue_page_meta.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/web/repo/issue_page_meta.go b/routers/web/repo/issue_page_meta.go
index f584b860a3f3c..ddeaecf6e099a 100644
--- a/routers/web/repo/issue_page_meta.go
+++ b/routers/web/repo/issue_page_meta.go
@@ -443,6 +443,6 @@ func (d *IssuePageMetaData) retrieveLabelsData(ctx *context.Context) {
 	labelsData.AllLabels = append(labelsData.AllLabels, labelsData.OrgLabels...)
 
 	sort.Slice(labelsData.AllLabels, func(i, j int) bool {
-		return labelsData.AllLabels[i].Name > labelsData.AllLabels[j].Name
+		return labelsData.AllLabels[i].Name < labelsData.AllLabels[j].Name
 	})
 }

From 68bf3b9230304ecb042989bdcd3ee2c95b5399c7 Mon Sep 17 00:00:00 2001
From: stuzer05 <stuzer05@stuzer.link>
Date: Sun, 8 Dec 2024 15:19:53 +0200
Subject: [PATCH 4/5] Fix labels display

---
 web_src/css/modules/divider.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web_src/css/modules/divider.css b/web_src/css/modules/divider.css
index acc8408f37600..5d1fc6238829f 100644
--- a/web_src/css/modules/divider.css
+++ b/web_src/css/modules/divider.css
@@ -41,3 +41,7 @@ h4.divider {
   border-top: 1px solid var(--color-secondary);
   margin: 4px 0;
 }
+
+.ui.dropdown .menu .item.filtered + .divider {
+  display: none;
+}

From cf9120e1e77824bba9c5be53a4a3b5155d03df56 Mon Sep 17 00:00:00 2001
From: stuzer05 <stuzer05@stuzer.link>
Date: Sun, 8 Dec 2024 15:21:02 +0200
Subject: [PATCH 5/5] Fix labels display

---
 web_src/css/modules/divider.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/css/modules/divider.css b/web_src/css/modules/divider.css
index 5d1fc6238829f..c70e1d4fc8103 100644
--- a/web_src/css/modules/divider.css
+++ b/web_src/css/modules/divider.css
@@ -42,6 +42,6 @@ h4.divider {
   margin: 4px 0;
 }
 
-.ui.dropdown .menu .item.filtered + .divider {
+.ui.dropdown .menu > .item.filtered + .divider {
   display: none;
 }