Skip to content

Commit ef9fc69

Browse files
authored
Merge pull request #2589 from mroderick/feature/eligible-tooltip
feat(admin): add eligible members explanation to admin pages
2 parents e5a279e + c2b2554 commit ef9fc69

5 files changed

Lines changed: 52 additions & 2 deletions

File tree

app/views/admin/chapters/show.html.haml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,22 @@
2626

2727
.card.border-info.my-4.my-md-0.my-lg-4.ms-md-4.ms-lg-0
2828
.card-body
29-
%ul.nav.flex-column.ms-0.mb-0
29+
%ul.nav.flex-column.ms-0.mb-2
3030
- @groups.each do |group|
3131
%li.nav-item
3232
= link_to [ :admin, group ], class: 'nav-link' do
3333
#{group.name} (#{group.eligible_members.count} eligible, #{group.members.count} total)
3434
%li.nav-item
3535
= link_to admin_chapter_members_path(@chapter, type: group.name.downcase), class: 'nav-link' do
3636
View #{group.name} emails
37+
%ul.nav.flex-column.ms-0.mb-0
3738
%li.nav-item
3839
= link_to 'View all sponsors', admin_sponsors_path, class: 'nav-link'
3940
%li.nav-item
4041
= link_to 'View all workshops', admin_chapter_workshops_path(@chapter), class: 'nav-link'
42+
.alert.alert-info.mt-2.mb-0
43+
%strong= t('admin.groups.eligible_title')
44+
= simple_format(t('admin.groups.eligible_help'))
4145

4246
- if @how_you_found_us.data_present?
4347
.card.border-info.my-4.my-md-0.my-lg-4.ms-md-4.ms-lg-0

app/views/admin/groups/show.html.haml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@
1111

1212
.row
1313
.col
14-
%h3.mb-3 Members (#{@eligible_count} eligible, #{@total_count} total)
14+
%h3.mb-3
15+
Members
16+
%small (#{@eligible_count} eligible, #{@total_count} total)
17+
.alert.alert-info.mt-2
18+
%strong= t('admin.groups.eligible_title')
19+
= simple_format(t('admin.groups.eligible_help'))
1520

1621
.row.mb-4
1722
.col-12.col-md-6

config/locales/admin.en.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
en:
22
admin:
3+
groups:
4+
eligible_title: "What is \"eligible\"?"
5+
eligible_help: |
6+
Eligible members are those who:
7+
1. Have accepted the codebar Terms & Conditions
8+
2. Are not banned from the platform
9+
10+
Members who haven't accepted T&C or are banned do not receive invitations and cannot RSVP to workshops.
11+
312
shared:
413
workshops: Workshops
514
events: Events

spec/features/admin/chapters_spec.rb

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,19 @@
144144
expect(page).not_to have_content('How members found this chapter')
145145
end
146146
end
147+
148+
context 'eligible members tooltip' do
149+
let(:chapter) { Fabricate(:chapter_with_groups) }
150+
151+
before do
152+
login_as_admin(member)
153+
end
154+
155+
scenario 'shows explanation for eligible members' do
156+
visit admin_chapter_path(chapter)
157+
158+
expect(page).to have_content('What is "eligible"?')
159+
expect(page).to have_content(/Are not banned/i)
160+
end
161+
end
147162
end

spec/features/admin/groups_spec.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,21 @@
1717
expect(page).to have_content('Group Students for chapter Brighton has been successfully created')
1818
end
1919
end
20+
21+
context '#show page' do
22+
let(:member) { Fabricate(:member) }
23+
let(:chapter) { Fabricate(:chapter, name: 'Brighton') }
24+
let(:group) { Fabricate(:group, chapter: chapter, name: 'Students') }
25+
26+
before do
27+
login_as_admin(member)
28+
end
29+
30+
scenario 'shows explanation for eligible members' do
31+
visit admin_group_path(group)
32+
33+
expect(page).to have_content('What is "eligible"?')
34+
expect(page).to have_content(/Are not banned/i)
35+
end
36+
end
2037
end

0 commit comments

Comments
 (0)