Skip to content

Commit 876ee8c

Browse files
KN4CK3RKN4CK3R
authored
Allow package version sorting (#21453)
1 parent 63ebb53 commit 876ee8c

File tree

6 files changed

+58
-17
lines changed

6 files changed

+58
-17
lines changed

Diff for: ‎models/packages/container/search.go

+17-2
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ type ImageTagsSearchOptions struct {
165165
PackageID int64
166166
Query string
167167
IsTagged bool
168+
Sort packages.VersionSort
168169
db.Paginator
169170
}
170171

@@ -195,12 +196,26 @@ func (opts *ImageTagsSearchOptions) toConds() builder.Cond {
195196
return cond
196197
}
197198

199+
func (opts *ImageTagsSearchOptions) configureOrderBy(e db.Engine) {
200+
switch opts.Sort {
201+
case packages.SortVersionDesc:
202+
e.Desc("package_version.version")
203+
case packages.SortVersionAsc:
204+
e.Asc("package_version.version")
205+
case packages.SortCreatedAsc:
206+
e.Asc("package_version.created_unix")
207+
default:
208+
e.Desc("package_version.created_unix")
209+
}
210+
}
211+
198212
// SearchImageTags gets a sorted list of the tags of an image
199213
func SearchImageTags(ctx context.Context, opts *ImageTagsSearchOptions) ([]*packages.PackageVersion, int64, error) {
200214
sess := db.GetEngine(ctx).
201215
Join("INNER", "package", "package.id = package_version.package_id").
202-
Where(opts.toConds()).
203-
Desc("package_version.created_unix")
216+
Where(opts.toConds())
217+
218+
opts.configureOrderBy(sess)
204219

205220
if opts.Paginator != nil {
206221
sess = db.SetSessionPagination(sess, opts)

Diff for: ‎models/packages/package_version.go

+17-6
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,17 @@ type SearchValue struct {
163163
ExactMatch bool
164164
}
165165

166+
type VersionSort = string
167+
168+
const (
169+
SortNameAsc VersionSort = "name_asc"
170+
SortNameDesc VersionSort = "name_desc"
171+
SortVersionAsc VersionSort = "version_asc"
172+
SortVersionDesc VersionSort = "version_desc"
173+
SortCreatedAsc VersionSort = "created_asc"
174+
SortCreatedDesc VersionSort = "created_desc"
175+
)
176+
166177
// PackageSearchOptions are options for SearchXXX methods
167178
// Besides IsInternal are all fields optional and are not used if they have their default value (nil, "", 0)
168179
type PackageSearchOptions struct {
@@ -176,7 +187,7 @@ type PackageSearchOptions struct {
176187
IsInternal util.OptionalBool
177188
HasFileWithName string // only results are found which are associated with a file with the specific name
178189
HasFiles util.OptionalBool // only results are found which have associated files
179-
Sort string
190+
Sort VersionSort
180191
db.Paginator
181192
}
182193

@@ -254,15 +265,15 @@ func (opts *PackageSearchOptions) toConds() builder.Cond {
254265

255266
func (opts *PackageSearchOptions) configureOrderBy(e db.Engine) {
256267
switch opts.Sort {
257-
case "alphabetically":
268+
case SortNameAsc:
258269
e.Asc("package.name")
259-
case "reversealphabetically":
270+
case SortNameDesc:
260271
e.Desc("package.name")
261-
case "highestversion":
272+
case SortVersionDesc:
262273
e.Desc("package_version.version")
263-
case "lowestversion":
274+
case SortVersionAsc:
264275
e.Asc("package_version.version")
265-
case "oldest":
276+
case SortCreatedAsc:
266277
e.Asc("package_version.created_unix")
267278
default:
268279
e.Desc("package_version.created_unix")

Diff for: ‎options/locale/locale_en-US.ini

+4
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ never = Never
106106

107107
rss_feed = RSS Feed
108108

109+
[filter]
110+
string.asc = A - Z
111+
string.desc = Z - A
112+
109113
[error]
110114
occurred = An error occurred
111115
report_message = If you are sure this is a Gitea bug, please search for issues on <a href="https://github.com/go-gitea/gitea/issues" target="_blank">GitHub</a> or open a new issue if necessary.

Diff for: ‎routers/web/user/package.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ func ListPackageVersions(ctx *context.Context) {
233233
}
234234

235235
query := ctx.FormTrim("q")
236+
sort := ctx.FormTrim("sort")
236237

237238
ctx.Data["Title"] = ctx.Tr("packages.title")
238239
ctx.Data["IsPackagesPage"] = true
@@ -243,9 +244,11 @@ func ListPackageVersions(ctx *context.Context) {
243244
Owner: ctx.Package.Owner,
244245
}
245246
ctx.Data["Query"] = query
247+
ctx.Data["Sort"] = sort
246248

247249
pagerParams := map[string]string{
248-
"q": query,
250+
"q": query,
251+
"sort": sort,
249252
}
250253

251254
var (
@@ -264,6 +267,7 @@ func ListPackageVersions(ctx *context.Context) {
264267
PackageID: p.ID,
265268
Query: query,
266269
IsTagged: tagged == "" || tagged == "tagged",
270+
Sort: sort,
267271
})
268272
if err != nil {
269273
ctx.ServerError("SearchImageTags", err)
@@ -278,6 +282,7 @@ func ListPackageVersions(ctx *context.Context) {
278282
Value: query,
279283
},
280284
IsInternal: util.OptionalBoolFalse,
285+
Sort: sort,
281286
})
282287
if err != nil {
283288
ctx.ServerError("SearchVersions", err)

Diff for: ‎templates/admin/packages/list.tmpl

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@
3737
<th>ID</th>
3838
<th>{{.locale.Tr "admin.packages.owner"}}</th>
3939
<th>{{.locale.Tr "admin.packages.type"}}</th>
40-
<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically">
40+
<th data-sortt-asc="name_asc" data-sortt-desc="name_desc">
4141
{{.locale.Tr "admin.packages.name"}}
42-
{{SortArrow "alphabetically" "reversealphabetically" .SortType false}}
42+
{{SortArrow "name_asc" "name_desc" .SortType false}}
4343
</th>
44-
<th data-sortt-asc="highestversion" data-sortt-desc="lowestversion">
44+
<th data-sortt-asc="version_desc" data-sortt-desc="version_asc">
4545
{{.locale.Tr "admin.packages.version"}}
46-
{{SortArrow "highestversion" "lowestversion" .SortType false}}
46+
{{SortArrow "version_desc" "version_asc" .SortType false}}
4747
</th>
4848
<th>{{.locale.Tr "admin.packages.creator"}}</th>
4949
<th>{{.locale.Tr "admin.packages.repository"}}</th>
5050
<th>{{.locale.Tr "admin.packages.size"}}</th>
51-
<th data-sortt-asc="oldest" data-sortt-desc="newest">
51+
<th data-sortt-asc="created_asc" data-sortt-desc="created_desc">
5252
{{.locale.Tr "admin.packages.published"}}
53-
{{SortArrow "oldest" "newest" .SortType true}}
53+
{{SortArrow "created_asc" "created_desc" .SortType true}}
5454
</th>
5555
<th>{{.locale.Tr "admin.notices.op"}}</th>
5656
</tr>

Diff for: ‎templates/package/shared/versionlist.tmpl

+8-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@
33
<form class="ui form ignore-dirty">
44
<div class="ui fluid action input">
55
<input name="q" value="{{.Query}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
6+
<select class="ui dropdown" name="sort">
7+
<option value="version_asc"{{if eq .Sort "version_asc"}} selected="selected"{{end}}>{{.locale.Tr "filter.string.asc"}}</option>
8+
<option value="version_desc"{{if eq .Sort "version_desc"}} selected="selected"{{end}}>{{.locale.Tr "filter.string.desc"}}</option>
9+
<option value="created_asc"{{if eq .Sort "created_asc"}} selected="selected"{{end}}>{{.locale.Tr "repo.issues.filter_sort.oldest"}}</option>
10+
<option value="created_desc"{{if or (eq .Sort "") (eq .Sort "created_desc")}} selected="selected"{{end}}>{{.locale.Tr "repo.issues.filter_sort.latest"}}</option>
11+
</select>
612
{{if eq .PackageDescriptor.Package.Type "container"}}
713
<select class="ui dropdown" name="tagged">
814
{{$isTagged := or (eq .Tagged "") (eq .Tagged "tagged")}}
9-
<option value="tagged" {{if $isTagged}}selected="selected"{{end}}>{{.locale.Tr "packages.filter.container.tagged"}}</option>
10-
<option value="untagged" {{if not $isTagged}}selected="selected"{{end}}>{{.locale.Tr "packages.filter.container.untagged"}}</option>
15+
<option value="tagged"{{if $isTagged}} selected="selected"{{end}}>{{.locale.Tr "packages.filter.container.tagged"}}</option>
16+
<option value="untagged"{{if not $isTagged}} selected="selected"{{end}}>{{.locale.Tr "packages.filter.container.untagged"}}</option>
1117
</select>
1218
{{end}}
1319
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>

0 commit comments

Comments
 (0)