From eec45b43db3b30c1d197e0d3cd03de00fd84e744 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 13 Jul 2023 22:00:38 +0200 Subject: [PATCH] move issue filters to shared template (#25729) Issue filters are being used on repo list page and on milestone issues page, and the code is mostly duplicated. This PR does the following changes: - move issue filters into a shared template - allow filtering milestone issues by project, so no need to hide this filter on milestone issues page - remove some dead code (e. g. issue actions in milestone issues template) - fix label filter dropdown width --------- Co-authored-by: 6543 <6543@obermui.de> --- routers/web/repo/milestone.go | 3 +- templates/repo/issue/filters.tmpl | 194 ++++++++++++++++++++ templates/repo/issue/list.tmpl | 197 +-------------------- templates/repo/issue/milestone_issues.tmpl | 149 +--------------- web_src/css/repo.css | 1 + web_src/css/repo/issue-list.css | 6 +- 6 files changed, 203 insertions(+), 347 deletions(-) create mode 100644 templates/repo/issue/filters.tmpl diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go index 38ef693967..a6f7f56af7 100644 --- a/routers/web/repo/milestone.go +++ b/routers/web/repo/milestone.go @@ -264,6 +264,7 @@ func DeleteMilestone(ctx *context.Context) { // MilestoneIssuesAndPulls lists all the issues and pull requests of the milestone func MilestoneIssuesAndPulls(ctx *context.Context) { milestoneID := ctx.ParamsInt64(":id") + projectID := ctx.FormInt64("project") milestone, err := issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, milestoneID) if err != nil { if issues_model.IsErrMilestoneNotExist(err) { @@ -289,7 +290,7 @@ func MilestoneIssuesAndPulls(ctx *context.Context) { ctx.Data["Title"] = milestone.Name ctx.Data["Milestone"] = milestone - issues(ctx, milestoneID, 0, util.OptionalBoolNone) + issues(ctx, milestoneID, projectID, util.OptionalBoolNone) ret, _ := issue.GetTemplatesFromDefaultBranch(ctx.Repo.Repository, ctx.Repo.GitRepo) ctx.Data["NewIssueChooseTemplate"] = len(ret) > 0 diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl new file mode 100644 index 0000000000..edc483d752 --- /dev/null +++ b/templates/repo/issue/filters.tmpl @@ -0,0 +1,194 @@ +
+
+ {{if and ($.CanWriteIssuesOrPulls) (gt (len .Issues) 0)}} + + {{end}} + {{template "repo/issue/openclose" .}} +
+
+
+ +
+ + {{.locale.Tr "repo.issues.filter_label"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+
+ {{svg "octicon-search" 16}} + +
+ {{.locale.Tr "repo.issues.filter_label_exclude" | Safe}} +
+ {{.locale.Tr "repo.issues.filter_label_select_no_label"}} + {{.locale.Tr "repo.issues.filter_label_no_select"}} + {{$previousExclusiveScope := "_no_scope"}} + {{range .Labels}} + {{$exclusiveScope := .ExclusiveScope}} + {{if and (ne $previousExclusiveScope $exclusiveScope)}} +
+ {{end}} + {{$previousExclusiveScope = $exclusiveScope}} + {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} + {{end}} +
+
+ + {{if not .Milestone}} + +
+ + {{.locale.Tr "repo.issues.filter_milestone"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+
+ {{svg "octicon-search" 16}} + +
+
+ {{.locale.Tr "repo.issues.filter_milestone_all"}} + {{.locale.Tr "repo.issues.filter_milestone_none"}} + {{if .OpenMilestones}} +
+
{{.locale.Tr "repo.issues.filter_milestone_open"}}
+ {{range .OpenMilestones}} + + {{svg "octicon-milestone" 16 "mr-2"}} + {{.Name}} + + {{end}} + {{end}} + {{if .ClosedMilestones}} +
+
{{.locale.Tr "repo.issues.filter_milestone_closed"}}
+ {{range .ClosedMilestones}} + + {{svg "octicon-milestone" 16 "mr-2"}} + {{.Name}} + + {{end}} + {{end}} +
+
+ {{end}} + + +
+ + {{.locale.Tr "repo.issues.filter_project"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+
+ {{svg "octicon-search" 16}} + +
+ {{.locale.Tr "repo.issues.filter_project_all"}} + {{.locale.Tr "repo.issues.filter_project_none"}} + {{if .OpenProjects}} +
+
+ {{.locale.Tr "repo.issues.new.open_projects"}} +
+ {{range .OpenProjects}} + + {{svg .IconName 18 "gt-mr-3 gt-shrink-0"}}{{.Title}} + + {{end}} + {{end}} + {{if .ClosedProjects}} +
+
+ {{.locale.Tr "repo.issues.new.closed_projects"}} +
+ {{range .ClosedProjects}} + + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} + + {{end}} + {{end}} +
+
+ + +
+ + {{.locale.Tr "repo.issues.filter_poster"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+
+ {{svg "octicon-search" 16}} + +
+ {{.locale.Tr "repo.issues.filter_poster_no_select"}} +
+
+ + +
+ + {{.locale.Tr "repo.issues.filter_assignee"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+
+ {{svg "octicon-search" 16}} + +
+ {{.locale.Tr "repo.issues.filter_assginee_no_assignee"}} + {{.locale.Tr "repo.issues.filter_assginee_no_select"}} +
+ {{range .Assignees}} + + {{avatar $.Context . 20}}{{template "repo/search_name" .}} + + {{end}} +
+
+ + {{if .IsSigned}} + +
+ + {{.locale.Tr "repo.issues.filter_type"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+ {{.locale.Tr "repo.issues.filter_type.all_issues"}} + {{.locale.Tr "repo.issues.filter_type.assigned_to_you"}} + {{.locale.Tr "repo.issues.filter_type.created_by_you"}} + {{if .PageIsPullList}} + {{.locale.Tr "repo.issues.filter_type.review_requested"}} + {{.locale.Tr "repo.issues.filter_type.reviewed_by_you"}} + {{end}} + {{.locale.Tr "repo.issues.filter_type.mentioning_you"}} +
+
+ {{end}} + + +
+ + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+ {{.locale.Tr "repo.issues.filter_sort.latest"}} + {{.locale.Tr "repo.issues.filter_sort.oldest"}} + {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{.locale.Tr "repo.issues.filter_sort.mostcomment"}} + {{.locale.Tr "repo.issues.filter_sort.leastcomment"}} + {{.locale.Tr "repo.issues.filter_sort.nearduedate"}} + {{.locale.Tr "repo.issues.filter_sort.farduedate"}} +
+
+
+
+
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index c7d73c6667..8eb85a3298 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -81,197 +81,8 @@ {{end}} {{end}} -
-
- {{if and ($.CanWriteIssuesOrPulls) (gt (len .Issues) 0)}} - - {{end}} - {{template "repo/issue/openclose" .}} -
-
-
- -
- - {{.locale.Tr "repo.issues.filter_label"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
-
- {{svg "octicon-search" 16}} - -
- {{.locale.Tr "repo.issues.filter_label_exclude" | Safe}} -
- {{.locale.Tr "repo.issues.filter_label_select_no_label"}} - {{.locale.Tr "repo.issues.filter_label_no_select"}} - {{$previousExclusiveScope := "_no_scope"}} - {{range .Labels}} - {{$exclusiveScope := .ExclusiveScope}} - {{if and (ne $previousExclusiveScope $exclusiveScope)}} -
- {{end}} - {{$previousExclusiveScope = $exclusiveScope}} - {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} - {{end}} -
-
- -
- - {{.locale.Tr "repo.issues.filter_milestone"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
-
- {{svg "octicon-search" 16}} - -
-
- {{.locale.Tr "repo.issues.filter_milestone_all"}} - {{.locale.Tr "repo.issues.filter_milestone_none"}} - {{if .OpenMilestones}} -
-
{{.locale.Tr "repo.issues.filter_milestone_open"}}
- {{range .OpenMilestones}} - - {{svg "octicon-milestone" 16 "mr-2"}} - {{.Name}} - - {{end}} - {{end}} - {{if .ClosedMilestones}} -
-
{{.locale.Tr "repo.issues.filter_milestone_closed"}}
- {{range .ClosedMilestones}} - - {{svg "octicon-milestone" 16 "mr-2"}} - {{.Name}} - - {{end}} - {{end}} -
-
- - -
- - {{.locale.Tr "repo.issues.filter_project"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
-
- {{svg "octicon-search" 16}} - -
- {{.locale.Tr "repo.issues.filter_project_all"}} - {{.locale.Tr "repo.issues.filter_project_none"}} - {{if .OpenProjects}} -
-
- {{.locale.Tr "repo.issues.new.open_projects"}} -
- {{range .OpenProjects}} - - {{svg .IconName 18 "gt-mr-3 gt-shrink-0"}}{{.Title}} - - {{end}} - {{end}} - {{if .ClosedProjects}} -
-
- {{.locale.Tr "repo.issues.new.closed_projects"}} -
- {{range .ClosedProjects}} - - {{svg .IconName 18 "gt-mr-3"}}{{.Title}} - - {{end}} - {{end}} -
-
- - -
- - {{.locale.Tr "repo.issues.filter_poster"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
-
- {{svg "octicon-search" 16}} - -
- {{.locale.Tr "repo.issues.filter_poster_no_select"}} -
-
- - -
- - {{.locale.Tr "repo.issues.filter_assignee"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
-
- {{svg "octicon-search" 16}} - -
- {{.locale.Tr "repo.issues.filter_assginee_no_assignee"}} - {{.locale.Tr "repo.issues.filter_assginee_no_select"}} - {{range .Assignees}} - - {{avatar $.Context . 20}}{{template "repo/search_name" .}} - - {{end}} -
-
- - {{if .IsSigned}} - -
- - {{.locale.Tr "repo.issues.filter_type"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{.locale.Tr "repo.issues.filter_type.all_issues"}} - {{.locale.Tr "repo.issues.filter_type.assigned_to_you"}} - {{.locale.Tr "repo.issues.filter_type.created_by_you"}} - {{if .PageIsPullList}} - {{.locale.Tr "repo.issues.filter_type.review_requested"}} - {{.locale.Tr "repo.issues.filter_type.reviewed_by_you"}} - {{end}} - {{.locale.Tr "repo.issues.filter_type.mentioning_you"}} -
-
- {{end}} - - -
- - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{.locale.Tr "repo.issues.filter_sort.latest"}} - {{.locale.Tr "repo.issues.filter_sort.oldest"}} - {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{.locale.Tr "repo.issues.filter_sort.mostcomment"}} - {{.locale.Tr "repo.issues.filter_sort.leastcomment"}} - {{.locale.Tr "repo.issues.filter_sort.nearduedate"}} - {{.locale.Tr "repo.issues.filter_sort.farduedate"}} -
-
-
-
-
+ {{template "repo/issue/filters" .}}
@@ -282,12 +93,12 @@ {{if not .Repository.IsArchived}} {{if .IsShowClosed}} - + {{else}} - + {{end}} {{if $.IsRepoAdmin}} - diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 5913f59fe8..dab6ef3de6 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -50,155 +50,8 @@
-
-
- {{template "repo/issue/openclose" .}} -
-
-
- -
- - {{.locale.Tr "repo.issues.filter_label"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
-
- {{svg "octicon-search" 16}} - -
- {{.locale.Tr "repo.issues.filter_label_exclude" | Safe}} - {{.locale.Tr "repo.issues.filter_label_no_select"}} - {{range .Labels}} - {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if SliceUtils.Contains $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}} {{RenderLabel $.Context .}} - {{end}} -
-
+ {{template "repo/issue/filters" .}} - -
- - {{.locale.Tr "repo.issues.filter_poster"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
-
- {{svg "octicon-search" 16}} - -
- {{.locale.Tr "repo.issues.filter_poster_no_select"}} -
-
- - -
- - {{.locale.Tr "repo.issues.filter_assignee"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
-
- {{svg "octicon-search" 16}} - -
- {{.locale.Tr "repo.issues.filter_assginee_no_select"}} - {{range .Assignees}} - - {{avatar $.Context . 20}}{{template "repo/search_name" .}} - - {{end}} -
-
- - {{if .IsSigned}} - -
- - {{.locale.Tr "repo.issues.filter_type"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{.locale.Tr "repo.issues.filter_type.all_issues"}} - {{.locale.Tr "repo.issues.filter_type.assigned_to_you"}} - {{.locale.Tr "repo.issues.filter_type.created_by_you"}} - {{.locale.Tr "repo.issues.filter_type.review_requested"}} - {{.locale.Tr "repo.issues.filter_type.reviewed_by_you"}} - {{.locale.Tr "repo.issues.filter_type.mentioning_you"}} -
-
- {{end}} - - -
- - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{.locale.Tr "repo.issues.filter_sort.latest"}} - {{.locale.Tr "repo.issues.filter_sort.oldest"}} - {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{.locale.Tr "repo.issues.filter_sort.mostcomment"}} - {{.locale.Tr "repo.issues.filter_sort.leastcomment"}} -
-
-
-
-
- -
-
- {{template "repo/issue/openclose" .}} -
-
-
- - {{if .IsShowClosed}} - - {{else}} - - {{end}} - -
- - {{.locale.Tr "repo.issues.action_label"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{range .Labels}} -
- {{if SliceUtils.Contains $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}} {{RenderLabel $.Context .}} -
- {{end}} -
-
- - -
- - {{.locale.Tr "repo.issues.action_assignee"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
-
- {{.locale.Tr "repo.issues.action_assignee_no_select"}} -
- {{range .Assignees}} -
- {{avatar $.Context . 20}} - {{.GetDisplayName}} -
- {{end}} -
-
-
-
-
{{template "shared/issuelist" dict "." . "listType" "milestone"}}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index da5cd06b3e..ff539228f5 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -169,6 +169,7 @@ /* the label-filter is the first dropdown, it shouldn't be shown leftward, otherwise it may go out the viewport (left side) */ .repository .filter.menu .ui.dropdown.label-filter .menu { + min-width: max-content; right: unset; left: 0; } diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 8602bb9a97..7769a16f5f 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -1,6 +1,6 @@ .issue-list-toolbar { display: flex; - flex-wrap: wrap; + flex-wrap: wrap-reverse; justify-content: space-between; align-items: flex-start; gap: 1rem; @@ -14,13 +14,9 @@ .issue-list-toolbar-right .filter.menu { flex-direction: row; flex-wrap: wrap; - gap: 8px; } @media (max-width: 767.98px) { - .issue-list-toolbar { - flex-direction: column-reverse; - } .issue-list-toolbar-right .dropdown .menu { left: auto !important; right: auto !important;