Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Show links for more session types on the agenda #5038

Merged
merged 4 commits into from
Jan 27, 2023
Merged

fix: Show links for more session types on the agenda #5038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4db596
fix: Show links for more session types on the agenda
jennifer-richards Jan 26, 2023
7ab7170
test: Update test to expect buttons on additional sessions
jennifer-richards Jan 26, 2023
7592d42
Merge branch 'main' into jennifer/tix4745
jennifer-richards Jan 26, 2023
d599de2
test: Update the past meeting test case also
jennifer-richards Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/agenda/AgendaScheduleList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,9 @@ const meetingEvents = computed(() => {

// -> Populate event links
const links = []
if (item.flags.showAgenda || ['regular', 'plenary'].includes(item.type)) {
const typesWithLinks = ['regular', 'plenary', 'other']
const purposesWithoutLinks = ['admin', 'closed_meeting', 'officehours', 'social']
if (item.flags.showAgenda || (typesWithLinks.includes(item.type) && !purposesWithoutLinks.includes(item.purpose))) {
if (item.flags.agenda) {
links.push({
id: `lnk-${item.id}-tar`,
Expand Down
1 change: 1 addition & 0 deletions ietf/meeting/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,7 @@ def agenda_extract_schedule (item):
"startDateTime": item.timeslot.time.isoformat(),
"status": item.session.current_status,
"type": item.session.type.slug,
"purpose": item.session.purpose.slug,
"isBoF": item.session.group_at_the_time().state_id == "bof",
"filterKeywords": item.filter_keywords,
"groupAcronym": item.session.group_at_the_time().acronym,
Expand Down
4 changes: 2 additions & 2 deletions playwright/tests/meeting/agenda.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ test.describe('past - desktop', () => {
}
// Scheduled
case 'sched': {
if (event.flags.showAgenda || ['regular', 'plenary'].includes(event.type)) {
if (event.flags.showAgenda || (['regular', 'plenary', 'other'].includes(event.type) && !['admin', 'closed_meeting', 'officehours', 'social'].includes(event.purpose))) {
const eventButtons = row.locator('.agenda-table-cell-links > .agenda-table-cell-links-buttons')
if (event.flags.agenda) {
// Show meeting materials button
Expand Down Expand Up @@ -1145,7 +1145,7 @@ test.describe('future - desktop', () => {
// -----------------------
if (event.status === 'sched') {
const eventButtons = row.locator('.agenda-table-cell-links > .agenda-table-cell-links-buttons')
if (event.flags.showAgenda || ['regular', 'plenary'].includes(event.type)) {
if (event.flags.showAgenda || (['regular', 'plenary', 'other'].includes(event.type) && !['admin', 'closed_meeting', 'officehours', 'social'].includes(event.purpose))) {
if (event.flags.agenda) {
// Show meeting materials button
await expect(eventButtons.locator('i.bi.bi-collection')).toBeVisible()
Expand Down