Skip to content

fix: use groupAcronym to determine hackathon icon in agenda #8540

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

Merged
rjsparks merged 2 commits into from
Feb 14, 2025
Merged

fix: use groupAcronym to determine hackathon icon in agenda #8540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f39c3c7
fix: use groupAcronym to determine hackathon icon in agenda
NGPixel Feb 14, 2025
81a76c5
test: fix agenda tests related to hackathon
NGPixel Feb 14, 2025
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: 2 additions & 2 deletions client/agenda/AgendaScheduleList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ const meetingEvents = computed(() => {
})
}
// -> Point to Wiki for Hackathon sessions, HedgeDocs otherwise
if (item.name.toLowerCase().includes('hackathon')) {
if (item.groupAcronym === 'hackathon') {
links.push({
id: `lnk-${item.id}-wiki`,
label: 'Wiki',
Expand Down Expand Up @@ -461,7 +461,7 @@ const meetingEvents = computed(() => {
case 'other':
if (item.name.toLowerCase().indexOf('office hours') >= 0) {
icon = 'bi-building'
} else if (item.name.toLowerCase().indexOf('hackathon') >= 0) {
} else if (item.groupAcronym === 'hackathon') {
icon = 'bi-command bi-pink'
}
break
Expand Down
2 changes: 1 addition & 1 deletion playwright/helpers/meeting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ module.exports = {
name: 'Hackathon Kickoff',
startDateTime: day1.set({ hour: 10, minute: 30 }),
duration: '30m',
...findAreaGroup('hackathon-kickoff', categories[2]),
...findAreaGroup('hackathon', categories[2]),
showAgenda: true,
hasAgenda: true,
hasRecordings: true,
Expand Down
6 changes: 3 additions & 3 deletions playwright/tests/meeting/agenda.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ test.describe('past - desktop', () => {
// Name column
// -----------
// Event icon
if (['break', 'plenary'].includes(event.type) || (event.type === 'other' && ['office hours', 'hackathon'].some(s => event.name.toLowerCase().indexOf(s) >= 0))) {
if (['break', 'plenary'].includes(event.type) || (event.type === 'other' && event.name.toLowerCase().indexOf('office hours') >= 0)) {
await expect(row.locator('.agenda-table-cell-name > i.bi')).toBeVisible()
}
// Name link
Expand Down Expand Up @@ -286,7 +286,7 @@ test.describe('past - desktop', () => {
// No meeting materials yet warning badge
await expect(eventButtons.locator('.no-meeting-materials')).toBeVisible()
}
if (event.name.toLowerCase().includes('hackathon')) {
if (event.groupAcronym === 'hackathon') {
// Hackathon Wiki button
const hackathonWikiLink = `https://wiki.ietf.org/meeting/${meetingData.meeting.number}/hackathon`
await expect(eventButtons.locator(`#btn-lnk-${event.id}-wiki`)).toHaveAttribute('href', hackathonWikiLink)
Expand Down Expand Up @@ -1169,7 +1169,7 @@ test.describe('future - desktop', () => {
// No meeting materials yet warning badge
await expect(eventButtons.locator('.no-meeting-materials')).toBeVisible()
}
if (event.name.toLowerCase().includes('hackathon')) {
if (event.groupAcronym === 'hackathon') {
// Hackathon Wiki button
const hackathonWikiLink = `https://wiki.ietf.org/meeting/${meetingData.meeting.number}/hackathon`
await expect(eventButtons.locator(`#btn-lnk-${event.id}-wiki`)).toHaveAttribute('href', hackathonWikiLink)
Expand Down