Skip to content

Commit 50e2cf3

Browse files
run formatter and linter
1 parent aa5719e commit 50e2cf3

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

services/context/repo.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ import (
1616
"strconv"
1717
"strings"
1818

19-
group_model "code.gitea.io/gitea/models/group"
20-
2119
asymkey_model "code.gitea.io/gitea/models/asymkey"
2220
"code.gitea.io/gitea/models/db"
2321
git_model "code.gitea.io/gitea/models/git"
22+
group_model "code.gitea.io/gitea/models/group"
2423
issues_model "code.gitea.io/gitea/models/issues"
2524
access_model "code.gitea.io/gitea/models/perm/access"
2625
repo_model "code.gitea.io/gitea/models/repo"

tests/integration/org_test.go

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,33 @@ func TestOrgRepos(t *testing.T) {
2828

2929
var (
3030
users = []string{"user1", "user2"}
31-
cases = map[string][]string{
32-
"alphabetically": {"repo21", "repo3", "repo5"},
33-
"reversealphabetically": {"repo5", "repo3", "repo21"},
31+
cases = map[string]map[string][]string{
32+
"129": {
33+
"alphabetically": {"repo21", "repo3"},
34+
"reversealphabetically": {"repo3", "repo21"},
35+
},
36+
"139": {
37+
"alphabetically": {"repo5"},
38+
"reversealphabetically": {"repo5"},
39+
},
3440
}
3541
)
3642

3743
for _, user := range users {
3844
t.Run(user, func(t *testing.T) {
3945
session := loginUser(t, user)
40-
for sortBy, repos := range cases {
41-
req := NewRequest(t, "GET", "/org3?sort="+sortBy)
42-
resp := session.MakeRequest(t, req, http.StatusOK)
43-
44-
htmlDoc := NewHTMLParser(t, resp.Body)
45-
46-
sel := htmlDoc.doc.Find("a.name")
47-
assert.Len(t, repos, len(sel.Nodes))
48-
for i := range repos {
49-
assert.Equal(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
46+
for group, groupCases := range cases {
47+
for sortBy, repos := range groupCases {
48+
req := NewRequest(t, "GET", "/org3/groups/"+group+"?sort="+sortBy)
49+
resp := session.MakeRequest(t, req, http.StatusOK)
50+
51+
htmlDoc := NewHTMLParser(t, resp.Body)
52+
53+
sel := htmlDoc.doc.Find("a.name")
54+
assert.Len(t, repos, len(sel.Nodes))
55+
for i := range repos {
56+
assert.Equal(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
57+
}
5058
}
5159
}
5260
})

web_src/js/components/DashboardRepoGroup.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ const options: SortableOptions = {
103103
get() {
104104
return combined.value.map((a) => getId(a)).filter((a, i, arr) => arr.indexOf(a) === i);
105105
},
106-
// eslint-disable-next-line @typescript-eslint/no-misused-promises
107106
async set(sortable) {
108107
const arr = sortable.toArray();
109108
const groups = Array.from(new Set(arr.filter((a) => a.startsWith('group')).map((a) => parseInt(a.split('-')[1]))));
@@ -180,7 +179,7 @@ const options: SortableOptions = {
180179
:class="{ 'expandable-menu': curGroup === 0, 'repo-owner-name-list': curGroup === 0, 'expandable-ul': true }"
181180
v-model:list="combined"
182181
:data-is-group="true"
183-
:item-key="(it) => getId(it)"
182+
:item-key="(it: any) => getId(it)"
184183
:key="dynKey"
185184
>
186185
<template #item="{ element, index }">

0 commit comments

Comments
 (0)