Skip to content

Commit 474a88a

Browse files
Sort groups by name in dropdown (#211)
* Sort groups by name in dropdown * Adjust tests * Edit fixture * Fix group ids
1 parent fb911f4 commit 474a88a

File tree

3 files changed

+60
-58
lines changed

3 files changed

+60
-58
lines changed

cypress/e2e/accounts_spec.cy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,11 +648,11 @@ describe('Account Management', () => {
648648
.click()
649649

650650
cy.get('pep-pharos-modal:visible pep-pharos-button')
651-
.contains('ithaka', { matchCase: false })
651+
.contains('ilium', { matchCase: false })
652652
.click()
653653

654654
cy.get('pep-pharos-modal:visible pep-pharos-dropdown-menu-item')
655-
.contains('ilium', { matchCase: false })
655+
.contains('ithaka', { matchCase: false })
656656
.click()
657657

658658
cy.get('pep-pharos-modal:visible .feature-selection pep-pharos-checkbox')
Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
{
2-
"name": "Test User",
3-
"contact": "user.name@ithaka.org",
4-
"id": 3,
5-
"type": "users",
6-
"groups": [
7-
{
8-
"id": 1,
9-
"name": "Ithaka",
10-
"features": {
11-
"view_snippet": true,
12-
"view_abstract": true,
13-
"view_book_description": true,
14-
"print_pdf": true,
15-
"download_pdf": true,
16-
"remove_users": true,
17-
"add_or_edit_users": true,
18-
"get_users": true,
19-
"approve_requests": true,
20-
"deny_requests": true,
21-
"bulk_approve": true,
22-
"undo_bulk_approve": true,
23-
"get_facilities": true,
24-
"edit_facilities": true,
25-
"test_feature": true
26-
}
27-
},
28-
{
29-
"id": 2,
30-
"name": "Ilium",
31-
"features": {
32-
"view_snippet": true,
33-
"remove_users": true,
34-
"add_or_edit_users": true,
35-
"get_users": true,
36-
"view_abstract": true,
37-
"view_book_description": true,
38-
"print_pdf": true,
39-
"download_pdf": true,
40-
"approve_requests": true,
41-
"deny_requests": true,
42-
"bulk_approve": true,
43-
"undo_bulk_approve": true,
44-
"get_facilities": true,
45-
"edit_facilities": true,
46-
"test_feature": true
47-
}
48-
}
49-
]
50-
}
2+
"name": "Test User",
3+
"contact": "user.name@ithaka.org",
4+
"id": 3,
5+
"type": "users",
6+
"groups": [
7+
{
8+
"id": 2,
9+
"name": "Ilium",
10+
"features": {
11+
"view_snippet": true,
12+
"view_abstract": true,
13+
"view_book_description": true,
14+
"print_pdf": true,
15+
"download_pdf": true,
16+
"remove_users": true,
17+
"add_or_edit_users": true,
18+
"get_users": true,
19+
"approve_requests": true,
20+
"deny_requests": true,
21+
"bulk_approve": true,
22+
"undo_bulk_approve": true,
23+
"get_facilities": true,
24+
"edit_facilities": true,
25+
"test_feature": true
26+
}
27+
},
28+
{
29+
"id": 1,
30+
"name": "Ithaka",
31+
"features": {
32+
"view_snippet": true,
33+
"remove_users": true,
34+
"add_or_edit_users": true,
35+
"get_users": true,
36+
"view_abstract": true,
37+
"view_book_description": true,
38+
"print_pdf": true,
39+
"download_pdf": true,
40+
"approve_requests": true,
41+
"deny_requests": true,
42+
"bulk_approve": true,
43+
"undo_bulk_approve": true,
44+
"get_facilities": true,
45+
"edit_facilities": true,
46+
"test_feature": true
47+
}
48+
}
49+
]
50+
}

src/components/account/EntityManager.vue

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ if (!selectedGroups.value[featureName.value]) {
6464
}
6565
6666
const selectorGroupOptions = ref(
67-
featureDetails.value[featureName.value]?.groups.reduce((arr, id: number) => {
68-
const group = groupMap.value.get(id)
69-
if (group) {
70-
arr.push(group)
71-
}
72-
return arr
73-
}, [] as Group[]) || [],
67+
featureDetails.value[featureName.value]?.groups
68+
.reduce((arr, id: number) => {
69+
const group = groupMap.value.get(id)
70+
if (group) {
71+
arr.push(group)
72+
}
73+
return arr
74+
}, [] as Group[])
75+
.sort((a, b) => a.name.localeCompare(b.name)) || [],
7476
)
7577
7678
if (props.action === 'edit') {

0 commit comments

Comments
 (0)