BLENDER: Support both exclusive and non-exclusive scope for labels

Author: brechtvl

models/issues/label.go

@@ -184,18 +184,23 @@ func (l *Label) BelongsToRepo() bool {
 	return l.RepoID > 0
 }
 
-// ExclusiveScope returns scope substring of label name, or empty string if none exists
-func (l *Label) ExclusiveScope() string {
-	if !l.Exclusive {
-		return ""
-	}
+// Return scope substring of label name, or empty string if none exists
+func (l *Label) Scope() string {
 	lastIndex := strings.LastIndex(l.Name, "/")
 	if lastIndex == -1 || lastIndex == 0 || lastIndex == len(l.Name)-1 {
 		return ""
 	}
 	return l.Name[:lastIndex]
 }
 
+// ExclusiveScope returns scope substring of label name, or empty string if none exists
+func (l *Label) ExclusiveScope() string {
+	if !l.Exclusive {
+		return ""
+	}
+	return l.Scope()
+}
+
 // NewLabel creates a new label
 func NewLabel(ctx context.Context, l *Label) error {
 	color, err := label.NormalizeColor(l.Color)

modules/templates/util_render.go

@@ -127,7 +127,7 @@ func (ut *RenderUtils) RenderLabel(label *issues_model.Label) template.HTML {
 	locale := ut.ctx.Value(translation.ContextKey).(translation.Locale)
 	var extraCSSClasses string
 	textColor := util.ContrastColor(label.Color)
-	labelScope := label.ExclusiveScope()
+	labelScope := label.Scope()
 	descriptionText := emoji.ReplaceAliases(label.Description)
 
 	if label.IsArchived() {

templates/repo/issue/filter_actions.tmpl

@@ -22,15 +22,15 @@
 				<div class="item issue-action" data-action="clear" data-url="{{$.RepoLink}}/issues/labels">
 					{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}
 				</div>
-				{{$previousExclusiveScope := "_no_scope"}}
+				{{$previousScope := "_no_scope"}}
 				{{range .Labels}}
-					{{$exclusiveScope := .ExclusiveScope}}
-					{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
+					{{$scope := .Scope}}
+					{{if and (ne $previousScope "_no_scope") (ne $previousScope $scope)}}
 						<div class="divider"></div>
 					{{end}}
-					{{$previousExclusiveScope = $exclusiveScope}}
+					{{$previousScope = $scope}}
 					<div class="item issue-action tw-flex tw-justify-between" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels">
-						{{if SliceUtils.Contains $.SelLabelIDs .ID}}{{svg (Iif $exclusiveScope "octicon-dot-fill" "octicon-check")}}{{end}} {{ctx.RenderUtils.RenderLabel .}}
+						{{if SliceUtils.Contains $.SelLabelIDs .ID}}{{svg (Iif .ExclusiveScope "octicon-dot-fill" "octicon-check")}}{{end}} {{ctx.RenderUtils.RenderLabel .}}
 						{{template "repo/issue/labels/label_archived" .}}
 					</div>
 				{{end}}

templates/repo/issue/filter_item_label.tmpl

@@ -26,19 +26,19 @@
 		{{/* The logic here is not the same as the label selector in the issue sidebar.
 		The one in the issue sidebar renders "repo labels | divider | org labels".
 		Maybe the logic should be updated to be consistent.*/}}
-		{{$previousExclusiveScope := "_no_scope"}}
+		{{$previousScope := "_no_scope"}}
 		{{range .Labels}}
-			{{$exclusiveScope := .ExclusiveScope}}
-			{{if and (ne $previousExclusiveScope $exclusiveScope)}}
+			{{$scope := .Scope}}
+			{{if and (ne $previousScope $scope)}}
 				<div class="divider" data-scope="{{.ExclusiveScope}}"></div>
 			{{end}}
-			{{$previousExclusiveScope = $exclusiveScope}}
+			{{$previousScope = $scope}}
 			<a class="item label-filter-query-item" data-label-id="{{.ID}}" data-scope="{{.ExclusiveScope}}" {{if .IsArchived}}data-is-archived{{end}}
 				href="{{QueryBuild $queryLink "labels" .QueryString}}">
 				{{if .IsExcluded}}
 					{{svg "octicon-circle-slash"}}
 				{{else if .IsSelected}}
-					{{Iif $exclusiveScope (svg "octicon-dot-fill") (svg "octicon-check")}}
+					{{Iif .ExclusiveScope (svg "octicon-dot-fill") (svg "octicon-check")}}
 				{{end}}
 				{{ctx.RenderUtils.RenderLabel .}}
 				<p class="tw-ml-auto">{{template "repo/issue/labels/label_archived" .}}</p>

templates/repo/issue/sidebar/label_list.tmpl

@@ -19,23 +19,25 @@
 				<div class="scrolling menu">
 					<a class="item clear-selection" data-text="" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
 					<div class="divider"></div>
-					{{$previousExclusiveScope := "_no_scope"}}
+					{{$previousScope := "_no_scope"}}
 					{{range $data.RepoLabels}}
+						{{$scope := .Scope}}
 						{{$exclusiveScope := .ExclusiveScope}}
-						{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
+						{{if and (ne $previousScope "_no_scope") (ne $previousScope $scope)}}
 							<div class="divider" data-scope="{{.ExclusiveScope}}"></div>
 						{{end}}
-						{{$previousExclusiveScope = $exclusiveScope}}
+						{{$previousScope = $scope}}
 						{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
 					{{end}}
 					{{if and $data.RepoLabels $data.OrgLabels}}<div class="divider"></div>{{end}}
-					{{$previousExclusiveScope = "_no_scope"}}
+					{{$previousScope = "_no_scope"}}
 					{{range $data.OrgLabels}}
+						{{$scope := .Scope}}
 						{{$exclusiveScope := .ExclusiveScope}}
-						{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
+						{{if and (ne $previousScope "_no_scope") (ne $previousScope $scope)}}
 							<div class="divider" data-scope="{{.ExclusiveScope}}"></div>
 						{{end}}
-						{{$previousExclusiveScope = $exclusiveScope}}
+						{{$previousScope = $scope}}
 						{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
 					{{end}}
 				</div>