Skip to content

Commit 514311a

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Make issue meta dropdown support Enter, confirm before reloading (go-gitea#23014) Fix SyncOnCommit always return false in API of push_mirrors (go-gitea#23088) Fix commit name in Apply Patch page (go-gitea#23086) Add wrapper to author to avoid long name ui problem (go-gitea#23030) Avoid Hugo from adding quote to actions url (go-gitea#23097) Remove all package data after tests (go-gitea#22984) Change style to improve whitespaces trimming inside inline markdown code (go-gitea#23093) Nest metadata in refactoring docs (go-gitea#23087) # Conflicts: # templates/repo/issue/view_content/context_menu.tmpl
2 parents 57153f6 + 0bc8bb3 commit 514311a

29 files changed

+139
-44
lines changed

‎docs/content/doc/advanced/config-cheat-sheet.en-us.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,7 @@ PROXY_HOSTS = *.gh.loli.garden
13361336
## Actions (`actions`)
13371337

13381338
- `ENABLED`: **false**: Enable/Disable actions capabilities
1339-
- `DEFAULT_ACTIONS_URL`: **https://gitea.com**: Default address to get action plugins, e.g. the default value means downloading from "https://gitea.com/actions/checkout" for "uses: actions/checkout@v3"
1339+
- `DEFAULT_ACTIONS_URL`: **https://gitea.com**: Default address to get action plugins, e.g. the default value means downloading from "<https://gitea.com/actions/checkout>" for "uses: actions/checkout@v3"
13401340

13411341
`DEFAULT_ACTIONS_URL` indicates where should we find the relative path action plugin. i.e. when use an action in a workflow file like
13421342

‎docs/content/doc/developers/guidelines-refactoring.en-us.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ weight: 20
66
toc: false
77
draft: false
88
menu:
9-
sidebar:
10-
parent: "developers"
11-
name: "Guidelines for Refactoring"
12-
weight: 20
13-
identifier: "guidelines-refactoring"
9+
sidebar:
10+
parent: "developers"
11+
name: "Guidelines for Refactoring"
12+
weight: 20
13+
identifier: "guidelines-refactoring"
1414
---
1515

1616
# Guidelines for Refactoring

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ require (
117117
mvdan.cc/xurls/v2 v2.4.0
118118
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
119119
xorm.io/builder v0.3.12
120-
xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830
120+
xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e
121121
)
122122

123123
require (

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -2075,5 +2075,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:
20752075
xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
20762076
xorm.io/builder v0.3.12 h1:ASZYX7fQmy+o8UJdhlLHSW57JDOkM8DNhcAF5d0LiJM=
20772077
xorm.io/builder v0.3.12/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
2078-
xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830 h1:ohaHCvT7ocSDkTEa2/2z0BXfINYlHm/Z7IzN7MeXQlM=
2079-
xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=
2078+
xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e h1:d5PY6mwuQK5/7T6VKfFswaKMzLmGTHkJ/ZS7+cUIAjk=
2079+
xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=

‎models/db/context.go

+12-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func DecrByIDs(ctx context.Context, ids []int64, decrCol string, bean interface{
209209
return err
210210
}
211211

212-
// DeleteBeans deletes all given beans, beans should contain delete conditions.
212+
// DeleteBeans deletes all given beans, beans must contain delete conditions.
213213
func DeleteBeans(ctx context.Context, beans ...interface{}) (err error) {
214214
e := GetEngine(ctx)
215215
for i := range beans {
@@ -220,6 +220,17 @@ func DeleteBeans(ctx context.Context, beans ...interface{}) (err error) {
220220
return nil
221221
}
222222

223+
// TruncateBeans deletes all given beans, beans may contain delete conditions.
224+
func TruncateBeans(ctx context.Context, beans ...interface{}) (err error) {
225+
e := GetEngine(ctx)
226+
for i := range beans {
227+
if _, err = e.Truncate(beans[i]); err != nil {
228+
return err
229+
}
230+
}
231+
return nil
232+
}
233+
223234
// CountByBean counts the number of database records according non-empty fields of the bean as conditions.
224235
func CountByBean(ctx context.Context, bean interface{}) (int64, error) {
225236
return GetEngine(ctx).Count(bean)

‎models/db/engine.go

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ type Engine interface {
3838
Count(...interface{}) (int64, error)
3939
Decr(column string, arg ...interface{}) *xorm.Session
4040
Delete(...interface{}) (int64, error)
41+
Truncate(...interface{}) (int64, error)
4142
Exec(...interface{}) (sql.Result, error)
4243
Find(interface{}, ...interface{}) error
4344
Get(beans ...interface{}) (bool, error)

‎routers/web/repo/patch.go

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ const (
2525
func NewDiffPatch(ctx *context.Context) {
2626
canCommit := renderCommitRights(ctx)
2727

28+
ctx.Data["PageIsPatch"] = true
29+
2830
ctx.Data["TreePath"] = ""
2931

3032
ctx.Data["commit_summary"] = ""
@@ -51,6 +53,7 @@ func NewDiffPatchPost(ctx *context.Context) {
5153
if form.CommitChoice == frmCommitChoiceNewBranch {
5254
branchName = form.NewBranchName
5355
}
56+
ctx.Data["PageIsPatch"] = true
5457
ctx.Data["TreePath"] = ""
5558
ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL()
5659
ctx.Data["FileContent"] = form.Content

‎services/convert/mirror.go

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ func ToPushMirror(pm *repo_model.PushMirror) (*api.PushMirror, error) {
2424
LastUpdateUnix: pm.LastUpdateUnix.FormatLong(),
2525
LastError: pm.LastError,
2626
Interval: pm.Interval.String(),
27+
SyncOnCommit: pm.SyncOnCommit,
2728
}, nil
2829
}
2930

‎templates/repo/editor/commit_form.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{{.locale.Tr "repo.editor.commit_changes"}}
1010
{{- end}}</h3>
1111
<div class="field">
12-
<input name="commit_summary" placeholder="{{if .PageIsDelete}}{{.locale.Tr "repo.editor.delete" .TreePath}}{{else if .PageIsUpload}}{{.locale.Tr "repo.editor.upload_files_to_dir" .TreePath}}{{else if .IsNewFile}}{{.locale.Tr "repo.editor.add_tmpl"}}{{else}}{{.locale.Tr "repo.editor.update" .TreePath}}{{end}}" value="{{.commit_summary}}" autofocus>
12+
<input name="commit_summary" placeholder="{{if .PageIsDelete}}{{.locale.Tr "repo.editor.delete" .TreePath}}{{else if .PageIsUpload}}{{.locale.Tr "repo.editor.upload_files_to_dir" .TreePath}}{{else if .IsNewFile}}{{.locale.Tr "repo.editor.add_tmpl"}}{{else if .PageIsPatch}}{{.locale.Tr "repo.editor.patch"}}{{else}}{{.locale.Tr "repo.editor.update" .TreePath}}{{end}}" value="{{.commit_summary}}" autofocus>
1313
</div>
1414
<div class="field">
1515
<textarea name="commit_message" placeholder="{{.locale.Tr "repo.editor.commit_message_desc"}}" rows="5">{{.commit_message}}</textarea>

‎templates/repo/issue/view_content/add_reaction.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="header">{{.ctx.locale.Tr "repo.pick_reaction"}}</div>
88
<div class="divider"></div>
99
{{range $value := AllowedReactions}}
10-
<div class="item reaction tooltip" data-content="{{$value}}">{{ReactionToEmoji $value}}</div>
10+
<a class="item reaction tooltip" data-content="{{$value}}">{{ReactionToEmoji $value}}</a>
1111
{{end}}
1212
</div>
1313
</div>

‎templates/repo/issue/view_content/context_menu.tmpl

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
{{else}}
1111
{{$referenceUrl = Printf "%s/files#%s" .ctx.Issue.Link .item.HashTag}}
1212
{{end}}
13-
<div class="item context" data-clipboard-text-type="url" data-clipboard-text="{{AppSubUrl}}{{$referenceUrl}}">{{.ctx.locale.Tr "repo.issues.context.copy_link"}}</div>
14-
<div class="item context quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.HashTag}}-raw">{{.ctx.locale.Tr "repo.issues.context.quote_reply"}}</div>
13+
<a class="item context" data-clipboard-text-type="url" data-clipboard-text="{{AppSubUrl}}{{$referenceUrl}}">{{.ctx.locale.Tr "repo.issues.context.copy_link"}}</a>
14+
<a class="item context quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.HashTag}}-raw">{{.ctx.locale.Tr "repo.issues.context.quote_reply"}}</a>
1515
{{if not .ctx.UnitIssuesGlobalDisabled}}
16-
<div class="item context reference-issue" data-target="{{.item.HashTag}}-raw" data-modal="#reference-issue-modal" data-poster="{{.item.Poster.GetDisplayName}}" data-poster-username="{{.item.Poster.Name}}" data-reference="{{$referenceUrl}}">{{.ctx.locale.Tr "repo.issues.context.reference_issue"}}</div>
16+
<a class="item context reference-issue" data-target="{{.item.HashTag}}-raw" data-modal="#reference-issue-modal" data-poster="{{.item.Poster.GetDisplayName}}" data-poster-username="{{.item.Poster.Name}}" data-reference="{{$referenceUrl}}">{{.ctx.locale.Tr "repo.issues.context.reference_issue"}}</a>
1717
{{end}}
1818
{{if or .ctx.Permission.IsAdmin .IsCommentPoster .ctx.HasIssuesOrPullsWritePermission}}
1919
<div class="divider"></div>
20-
<div class="item context edit-content">{{.ctx.locale.Tr "repo.issues.context.edit"}}</div>
20+
<a class="item context edit-content">{{.ctx.locale.Tr "repo.issues.context.edit"}}</a>
2121
{{if .delete}}
22-
<!-- Hide issue comment delete button -->
23-
<div class="item context delete-comment" style="display: none" data-comment-id={{.item.HashTag}} data-url="{{.ctx.RepoLink}}/comments/{{.item.ID}}/delete" data-locale="{{.ctx.locale.Tr "repo.issues.delete_comment_confirm"}}">{{.ctx.locale.Tr "repo.issues.context.delete"}}</div>
22+
<!-- Hide issue comment delete button -->
23+
<a class="item context delete-comment" style="display: none" data-comment-id={{.item.HashTag}} data-url="{{.ctx.RepoLink}}/comments/{{.item.ID}}/delete" data-locale="{{.ctx.locale.Tr "repo.issues.delete_comment_confirm"}}">{{.ctx.locale.Tr "repo.issues.context.delete"}}</a>
2424
{{end}}
2525
{{end}}
2626
</div>

‎templates/repo/issue/view_content/sidebar.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_labels"}}">
122122
</div>
123123
{{end}}
124-
<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_labels"}}</div>
124+
<a class="no-select item" href="#">{{.locale.Tr "repo.issues.new.clear_labels"}}</a>
125125
{{if or .Labels .OrgLabels}}
126126
{{$previousExclusiveScope := "_no_scope"}}
127127
{{range .Labels}}

‎templates/repo/view_list.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
{{if .LatestCommitUser}}
99
{{avatar $.Context .LatestCommitUser 24}}
1010
{{if .LatestCommitUser.FullName}}
11-
<a class="muted" href="{{.LatestCommitUser.HomeLink}}"><strong>{{.LatestCommitUser.FullName}}</strong></a>
11+
<a class="muted author-wrapper" title="{{.LatestCommitUser.FullName}}" href="{{.LatestCommitUser.HomeLink}}"><strong>{{.LatestCommitUser.FullName}}</strong></a>
1212
{{else}}
13-
<a class="muted" href="{{.LatestCommitUser.HomeLink}}"><strong>{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}</strong></a>
13+
<a class="muted author-wrapper" title="{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}" href="{{.LatestCommitUser.HomeLink}}"><strong>{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}</strong></a>
1414
{{end}}
1515
{{else}}
1616
{{if .LatestCommit.Author}}
1717
{{avatarByEmail $.Context .LatestCommit.Author.Email .LatestCommit.Author.Name 24}}
18-
<strong>{{.LatestCommit.Author.Name}}</strong>
18+
<span class="author-wrapper" title="{{.LatestCommit.Author.Name}}"><strong>{{.LatestCommit.Author.Name}}</strong></span>
1919
{{end}}
2020
{{end}}
2121
<a rel="nofollow" class="ui sha label {{if .LatestCommit.Signature}} isSigned {{if .LatestCommitVerification.Verified}} isVerified{{if eq .LatestCommitVerification.TrustStatus "trusted"}}{{else if eq .LatestCommitVerification.TrustStatus "untrusted"}}Untrusted{{else}}Unmatched{{end}}{{else if .LatestCommitVerification.Warning}} isWarning{{end}}{{end}}" href="{{.RepoLink}}/commit/{{PathEscape .LatestCommit.ID.String}}">

‎tests/integration/api_packages_composer_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
func TestPackageComposer(t *testing.T) {
2727
defer tests.PrepareTestEnv(t)()
28+
2829
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2930

3031
vendorName := "gitea"

‎tests/integration/api_packages_conan_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha
205205

206206
func TestPackageConan(t *testing.T) {
207207
defer tests.PrepareTestEnv(t)()
208+
208209
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
209210

210211
name := "ConanPackage"

‎tests/integration/api_packages_container_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ func TestPackageContainer(t *testing.T) {
640640

641641
checkCatalog := func(owner string) func(t *testing.T) {
642642
return func(t *testing.T) {
643-
defer tests.PrepareTestEnv(t)()
643+
defer tests.PrintCurrentTest(t)()
644644

645645
req := NewRequest(t, "GET", fmt.Sprintf("%sv2/_catalog", setting.AppURL))
646646
addTokenAuthHeader(req, userToken)

‎tests/integration/api_packages_generic_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
func TestPackageGeneric(t *testing.T) {
2323
defer tests.PrepareTestEnv(t)()
24+
2425
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2526

2627
packageName := "te-st_pac.kage"

‎tests/integration/api_packages_helm_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
func TestPackageHelm(t *testing.T) {
2828
defer tests.PrepareTestEnv(t)()
29+
2930
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
3031

3132
packageName := "test-chart"

‎tests/integration/api_packages_maven_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
func TestPackageMaven(t *testing.T) {
2424
defer tests.PrepareTestEnv(t)()
25+
2526
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2627

2728
groupID := "com.gitea"

‎tests/integration/api_packages_npm_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
func TestPackageNpm(t *testing.T) {
2626
defer tests.PrepareTestEnv(t)()
27+
2728
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2829

2930
token := fmt.Sprintf("Bearer %s", getTokenForLoggedInUser(t, loginUser(t, user.Name)))

‎tests/integration/api_packages_pub_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727

2828
func TestPackagePub(t *testing.T) {
2929
defer tests.PrepareTestEnv(t)()
30+
3031
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
3132

3233
token := "Bearer " + getUserToken(t, user.Name)

‎tests/integration/api_packages_pypi_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
func TestPackagePyPI(t *testing.T) {
2727
defer tests.PrepareTestEnv(t)()
28+
2829
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2930

3031
packageName := "test-package"

‎tests/integration/api_packages_rubygems_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323

2424
func TestPackageRubyGems(t *testing.T) {
2525
defer tests.PrepareTestEnv(t)()
26+
2627
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2728

2829
packageName := "gitea"

‎tests/integration/api_packages_test.go

+22-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
user_model "code.gitea.io/gitea/models/user"
2020
"code.gitea.io/gitea/modules/setting"
2121
api "code.gitea.io/gitea/modules/structs"
22+
"code.gitea.io/gitea/modules/util"
2223
packages_service "code.gitea.io/gitea/services/packages"
2324
packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup"
2425
"code.gitea.io/gitea/tests"
@@ -235,16 +236,35 @@ func TestPackageQuota(t *testing.T) {
235236
func TestPackageCleanup(t *testing.T) {
236237
defer tests.PrepareTestEnv(t)()
237238

239+
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
240+
238241
duration, _ := time.ParseDuration("-1h")
239242

240243
t.Run("Common", func(t *testing.T) {
241244
defer tests.PrintCurrentTest(t)()
242245

246+
// Upload and delete a generic package and upload a container blob
247+
data, _ := util.CryptoRandomBytes(5)
248+
url := fmt.Sprintf("/api/packages/%s/generic/cleanup-test/1.1.1/file.bin", user.Name)
249+
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(data))
250+
AddBasicAuthHeader(req, user.Name)
251+
MakeRequest(t, req, http.StatusCreated)
252+
253+
req = NewRequest(t, "DELETE", url)
254+
AddBasicAuthHeader(req, user.Name)
255+
MakeRequest(t, req, http.StatusNoContent)
256+
257+
data, _ = util.CryptoRandomBytes(5)
258+
url = fmt.Sprintf("/v2/%s/cleanup-test/blobs/uploads?digest=sha256:%x", user.Name, sha256.Sum256(data))
259+
req = NewRequestWithBody(t, "POST", url, bytes.NewReader(data))
260+
AddBasicAuthHeader(req, user.Name)
261+
MakeRequest(t, req, http.StatusCreated)
262+
243263
pbs, err := packages_model.FindExpiredUnreferencedBlobs(db.DefaultContext, duration)
244264
assert.NoError(t, err)
245265
assert.NotEmpty(t, pbs)
246266

247-
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, 2, packages_model.TypeContainer, "test", container_model.UploadVersion)
267+
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, "cleanup-test", container_model.UploadVersion)
248268
assert.NoError(t, err)
249269

250270
err = packages_cleanup_service.Cleanup(db.DefaultContext, duration)
@@ -254,15 +274,13 @@ func TestPackageCleanup(t *testing.T) {
254274
assert.NoError(t, err)
255275
assert.Empty(t, pbs)
256276

257-
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, 2, packages_model.TypeContainer, "test", container_model.UploadVersion)
277+
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, "cleanup-test", container_model.UploadVersion)
258278
assert.ErrorIs(t, err, packages_model.ErrPackageNotExist)
259279
})
260280

261281
t.Run("CleanupRules", func(t *testing.T) {
262282
defer tests.PrintCurrentTest(t)()
263283

264-
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
265-
266284
type version struct {
267285
Version string
268286
ShouldExist bool

‎tests/test_utils.go

+14
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import (
1313
"runtime"
1414
"testing"
1515

16+
"code.gitea.io/gitea/models/db"
17+
packages_model "code.gitea.io/gitea/models/packages"
1618
"code.gitea.io/gitea/models/unittest"
1719
"code.gitea.io/gitea/modules/base"
1820
"code.gitea.io/gitea/modules/git"
@@ -204,6 +206,18 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() {
204206
return err
205207
}))
206208

209+
// clear all package data
210+
assert.NoError(t, db.TruncateBeans(db.DefaultContext,
211+
&packages_model.Package{},
212+
&packages_model.PackageVersion{},
213+
&packages_model.PackageFile{},
214+
&packages_model.PackageBlob{},
215+
&packages_model.PackageProperty{},
216+
&packages_model.PackageBlobUpload{},
217+
&packages_model.PackageCleanupRule{},
218+
))
219+
assert.NoError(t, storage.Clean(storage.Packages))
220+
207221
return deferFn
208222
}
209223

‎web_src/js/features/aria.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ function attachOneDropdownAria($dropdown) {
8181
$dropdown.on('keydown', (e) => {
8282
// here it must use keydown event before dropdown's keyup handler, otherwise there is no Enter event in our keyup handler
8383
if (e.key === 'Enter') {
84-
const $item = $dropdown.dropdown('get item', $dropdown.dropdown('get value'));
84+
let $item = $dropdown.dropdown('get item', $dropdown.dropdown('get value'));
85+
if (!$item) $item = $menu.find('> .item.selected'); // when dropdown filters items by input, there is no "value", so query the "selected" item
8586
// if the selected item is clickable, then trigger the click event. in the future there could be a special CSS class for it.
8687
if ($item && $item.is('a')) $item[0].click();
8788
}

0 commit comments

Comments
 (0)