Archive labels UI #26502
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1491,11 +1491,15 @@ issues.label_title = Name | |
| issues.label_description = Description | ||
| issues.label_color = Color | ||
| issues.label_exclusive = Exclusive | ||
| issues.active_labels = Active Labels | ||
| issues.archived_labels = Archived Labels | ||
| issues.label_archive = Archive Label | ||
| issues.label_archive_tooltip= Archived labels are excluded from the label search when applying labels to an issue. Existing labels on issues remain unaffected, allowing you to retire obsolete labels without losing information. | ||
| issues.label_exclusive_desc = Name the label <code>scope/item</code> to make it mutually exclusive with other <code>scope/</code> labels. | ||
| issues.label_exclusive_warning = Any conflicting scoped labels will be removed when editing the labels of an issue or pull request. | ||
| issues.label_count = %d labels | ||
| issues.active_label_count = %d active labels | ||
| issues.archived_label_count = %d archived | ||
| issues.label_open_issues = %d open issues/pull requests | ||
| issues.label_edit = Edit | ||
| issues.label_delete = Delete | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,12 +61,32 @@ func RetrieveLabels(ctx *context.Context) { | |
| ctx.ServerError("RetrieveLabels.GetLabels", err) | ||
| return | ||
| } | ||
| // total number of labels | ||
| ctx.Data["NumLabels"] = len(labels) | ||
|
|
||
| var archivedLabels []*issues_model.Label | ||
| var nonArchivedLabels []*issues_model.Label | ||
| for _, l := range labels { | ||
| l.CalOpenIssues() | ||
| if l.IsArchived() { | ||
| archivedLabels = append(archivedLabels, l) | ||
| } else { | ||
| nonArchivedLabels = append(nonArchivedLabels, l) | ||
| } | ||
| } | ||
| // archivedLabels | ||
| ctx.Data["NumArchivedLabels"] = len(archivedLabels) | ||
|
|
||
| // non archived label a.k.a. active labels | ||
| ctx.Data["NumNonArchivedLabels"] = len(nonArchivedLabels) | ||
|
|
||
| includeArchivedLabel := ctx.FormOptionalBool("archived_label") | ||
| if includeArchivedLabel.IsTrue() { | ||
| ctx.Data["IsPageArchivedLabels"] = true | ||
| ctx.Data["Labels"] = archivedLabels | ||
| } else { | ||
| ctx.Data["Labels"] = nonArchivedLabels | ||
| } | ||
|
|
||
| if ctx.Repo.Owner.IsOrganization() { | ||
| orgLabels, err := issues_model.GetLabelsByOrgID(ctx, ctx.Repo.Owner.ID, ctx.FormString("sort"), db.ListOptions{}) | ||
|
|
@@ -95,7 +115,6 @@ func RetrieveLabels(ctx *context.Context) { | |
| ctx.Data["OrganizationLink"] = ctx.Org.OrgLink | ||
| } | ||
| } | ||
| ctx.Data["SortType"] = ctx.FormString("sort") | ||
| } | ||
|
|
||
|
|
||
|
There was a problem hiding this comment. Hmm… I've thought about what the best design for it is. <h4 class="ui top attached header gt-df">
<span class="gt-f1">18 labels</span>
<label class="gt-f1"><input type="checkbox" class="show-archived-labels-checkbox"> Show archived labels</label>
<div class="gt-f1">…
</h4>) document.querySelector('.show-archived-labels-checkbox').addEventListener('input',
e => for(const archivedLabel of document.querySelectorAll('.archived-label'))
toggleElem(archivedLabel, e.target.checked)
)
);We should highlight the archived labels, i.e. by using a different background for them. There was a problem hiding this comment. That way, we don't need a separate page, hide unnecessary information by default, add no technical debt but still allow configuring anything the user wants to configure. There was a problem hiding this comment. Correct, this UI is good and easy to use. here is the implementation https://github.com/go-gitea/gitea/pull/26511/files |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,5 +1,28 @@ | ||||||||||||||||||
| <h4 class="ui top attached header"> | ||||||||||||||||||
| {{if eq .NumLabels 0}} | ||||||||||||||||||
| {{.locale.Tr "repo.issues.label_count" .NumLabels}} | ||||||||||||||||||
| {{else}} | ||||||||||||||||||
| <span> | ||||||||||||||||||
| <a class="text light" href="{{.Link}}">{{.locale.Tr "repo.issues.active_label_count" .NumNonArchivedLabels}}</a> | ||||||||||||||||||
| </span> | ||||||||||||||||||
| {{if gt .NumArchivedLabels 0}} | ||||||||||||||||||
| <span class="gt-ml-2"> | ||||||||||||||||||
| <a class="text light" href="{{.Link}}?archived_label=true">{{.locale.Tr "repo.issues.archived_label_count" .NumArchivedLabels}}</a> | ||||||||||||||||||
| </span> | ||||||||||||||||||
| <i class="gt-dif gt-ml-1 gt-mt-3" data-tooltip-content={{.locale.Tr "repo.issues.label_archive_tooltip"}}> | ||||||||||||||||||
| {{svg "octicon-info" 12}} | ||||||||||||||||||
| </i> | ||||||||||||||||||
| {{end}} | ||||||||||||||||||
| {{end}} | ||||||||||||||||||
|
|
||||||||||||||||||
| <div class="gt-dif gt-jc label-category"> | ||||||||||||||||||
| {{if not .IsPageArchivedLabels}} | ||||||||||||||||||
| {{.locale.Tr "repo.issues.active_labels"}} | ||||||||||||||||||
| {{else}} | ||||||||||||||||||
| {{.locale.Tr "repo.issues.archived_labels"}} | ||||||||||||||||||
| {{end}} | ||||||||||||||||||
| </div> | ||||||||||||||||||
|
|
||||||||||||||||||
| <div class="ui right"> | ||||||||||||||||||
| <div class="ui right floated secondary filter menu"> | ||||||||||||||||||
| <!-- Sort --> | ||||||||||||||||||
|
|
@@ -9,10 +32,11 @@ | |||||||||||||||||
| {{svg "octicon-triangle-down" 14 "dropdown icon"}} | ||||||||||||||||||
| </span> | ||||||||||||||||||
| <div class="menu"> | ||||||||||||||||||
|
|
||||||||||||||||||
| <a class="{{if or (eq .SortType "alphabetically") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=alphabetically&state={{$.State}}&archived_label={{if .IsPageArchivedLabels}}true{{end}}">{{.locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a> | ||||||||||||||||||
| <a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$.Link}}?sort=reversealphabetically&state={{$.State}}&archived_label={{if .IsPageArchivedLabels}}true{{end}}">{{.locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a> | ||||||||||||||||||
| <a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}&archived_label={{if .IsPageArchivedLabels}}true{{end}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a> | ||||||||||||||||||
| <a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?sort=mostissues&state={{$.State}}&archived_label={{if .IsPageArchivedLabels}}true{{end}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a> | ||||||||||||||||||
|
Comment on lines
+36
to
+39
There was a problem hiding this comment.
Suggested change
|
||||||||||||||||||
| </div> | ||||||||||||||||||
| </div> | ||||||||||||||||||
| </div> | ||||||||||||||||||
|
|
||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,3 +42,8 @@ | |
| .issue-label-list .item.org-label { | ||
| opacity: 0.7; | ||
| } | ||
|
|
||
| .label-category { | ||
| width: 55%; | ||
| margin-left: auto; | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, you're absolutely right.
I missed that edge case.