altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 4 Packages Projects Releases Wiki Activity

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

Browse source 
* 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
This commit is contained in:
Jennifer Richards 2023-01-27 13:55:05 -04:00 committed by GitHub
parent e7c2063992
commit 185c4d556c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/agenda/AgendaScheduleList.vue
View file

@ -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`,

1
ietf/meeting/views.py
View file

@ -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,

4
playwright/tests/meeting/agenda.spec.js
View file

@ -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
@ -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()