Skip to content

Commit 185c4d5

Browse files
fix: Show links for more session types on the agenda (ietf-tools#5038)
* fix: Show links for more session types on the agenda * test: Update test to expect buttons on additional sessions * test: Update the past meeting test case also
1 parent e7c2063 commit 185c4d5

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

client/agenda/AgendaScheduleList.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,9 @@ const meetingEvents = computed(() => {
270270
271271
// -> Populate event links
272272
const links = []
273-
if (item.flags.showAgenda || ['regular', 'plenary'].includes(item.type)) {
273+
const typesWithLinks = ['regular', 'plenary', 'other']
274+
const purposesWithoutLinks = ['admin', 'closed_meeting', 'officehours', 'social']
275+
if (item.flags.showAgenda || (typesWithLinks.includes(item.type) && !purposesWithoutLinks.includes(item.purpose))) {
274276
if (item.flags.agenda) {
275277
links.push({
276278
id: `lnk-${item.id}-tar`,

ietf/meeting/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1708,6 +1708,7 @@ def agenda_extract_schedule (item):
17081708
"startDateTime": item.timeslot.time.isoformat(),
17091709
"status": item.session.current_status,
17101710
"type": item.session.type.slug,
1711+
"purpose": item.session.purpose.slug,
17111712
"isBoF": item.session.group_at_the_time().state_id == "bof",
17121713
"filterKeywords": item.filter_keywords,
17131714
"groupAcronym": item.session.group_at_the_time().acronym,

playwright/tests/meeting/agenda.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ test.describe('past - desktop', () => {
268268
}
269269
// Scheduled
270270
case 'sched': {
271-
if (event.flags.showAgenda || ['regular', 'plenary'].includes(event.type)) {
271+
if (event.flags.showAgenda || (['regular', 'plenary', 'other'].includes(event.type) && !['admin', 'closed_meeting', 'officehours', 'social'].includes(event.purpose))) {
272272
const eventButtons = row.locator('.agenda-table-cell-links > .agenda-table-cell-links-buttons')
273273
if (event.flags.agenda) {
274274
// Show meeting materials button
@@ -1145,7 +1145,7 @@ test.describe('future - desktop', () => {
11451145
// -----------------------
11461146
if (event.status === 'sched') {
11471147
const eventButtons = row.locator('.agenda-table-cell-links > .agenda-table-cell-links-buttons')
1148-
if (event.flags.showAgenda || ['regular', 'plenary'].includes(event.type)) {
1148+
if (event.flags.showAgenda || (['regular', 'plenary', 'other'].includes(event.type) && !['admin', 'closed_meeting', 'officehours', 'social'].includes(event.purpose))) {
11491149
if (event.flags.agenda) {
11501150
// Show meeting materials button
11511151
await expect(eventButtons.locator('i.bi.bi-collection')).toBeVisible()

0 commit comments

Comments
 (0)