Skip to content

Commit 03e161b

Browse files
committed
chore: merge branch 'main' into feat/rfc
2 parents e3ba021 + 5006ea5 commit 03e161b

42 files changed

Lines changed: 550 additions & 285 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/tests.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,19 @@ jobs:
4545
echo "Running tests..."
4646
if [[ "x${{ github.event.inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then
4747
echo "Lower coverage failures will be ignored."
48-
./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test --ignore-lower-coverage
48+
HOME=/root ./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test --ignore-lower-coverage
4949
else
50-
./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test
50+
HOME=/root ./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test
5151
fi
5252
coverage xml
5353
54+
- name: Upload geckodriver.log
55+
uses: actions/upload-artifact@v3
56+
if: ${{ failure() }}
57+
with:
58+
name: geckodriverlog
59+
path: geckodriver.log
60+
5461
- name: Upload Coverage Results to Codecov
5562
uses: codecov/codecov-action@v3.1.4
5663
with:
@@ -161,4 +168,4 @@ jobs:
161168
with:
162169
name: playwright-legacy-results-${{ matrix.project }}
163170
path: playwright/test-results/
164-
if-no-files-found: ignore
171+
if-no-files-found: ignore

client/agenda/AgendaMobileBar.vue

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
<template lang="pug">
22
.agenda-mobile-bar(v-if='siteStore.viewport < 990')
3+
n-dropdown(
4+
:options='jumpToDayOptions'
5+
size='huge'
6+
:show-arrow='true'
7+
trigger='click'
8+
@select='jumpToDay'
9+
)
10+
button
11+
i.bi.bi-arrow-down-circle
312
button(@click='agendaStore.$patch({ filterShown: true })')
4-
i.bi.bi-filter-square-fill.me-2
5-
span Filters
13+
i.bi.bi-funnel
614
n-badge.ms-2(:value='agendaStore.selectedCatSubs.length', processing)
715
button(@click='agendaStore.$patch({ calendarShown: true })')
8-
i.bi.bi-calendar3.me-2
9-
span Cal
16+
i.bi.bi-calendar3
1017
n-dropdown(
1118
:options='downloadIcsOptions'
1219
size='huge'
@@ -15,14 +22,13 @@
1522
@select='downloadIcs'
1623
)
1724
button
18-
i.bi.bi-calendar-check.me-2
19-
span .ics
25+
i.bi.bi-download
2026
button(@click='agendaStore.$patch({ settingsShown: !agendaStore.settingsShown })')
2127
i.bi.bi-gear
2228
</template>
2329

2430
<script setup>
25-
import { h } from 'vue'
31+
import { computed, h } from 'vue'
2632
2733
import {
2834
NBadge,
@@ -43,13 +49,34 @@ const message = useMessage()
4349
const agendaStore = useAgendaStore()
4450
const siteStore = useSiteStore()
4551
52+
// Meeting Days
53+
54+
const jumpToDayOptions = computed(() => {
55+
const days = []
56+
if (agendaStore.isMeetingLive) {
57+
days.push({
58+
label: 'Jump to Now',
59+
key: 'now',
60+
icon: () => h('i', { class: 'bi bi-arrow-down-right-square text-red' })
61+
})
62+
}
63+
for (const day of agendaStore.meetingDays) {
64+
days.push({
65+
label: `Jump to ${day.label}`,
66+
key: day.slug,
67+
icon: () => h('i', { class: 'bi bi-arrow-down-right-square' })
68+
})
69+
}
70+
return days
71+
})
72+
4673
// Download Ics Options
4774
4875
const downloadIcsOptions = [
4976
{
5077
label: 'Subscribe... (webcal)',
5178
key: 'subscribe',
52-
icon: () => h('i', { class: 'bi bi-calendar-week text-blue' })
79+
icon: () => h('i', { class: 'bi bi-calendar-week' })
5380
},
5481
{
5582
label: 'Download... (.ics)',
@@ -60,6 +87,20 @@ const downloadIcsOptions = [
6087
6188
// METHODS
6289
90+
function jumpToDay (dayId) {
91+
if (dayId === 'now') {
92+
const lastEventId = agendaStore.findCurrentEventId()
93+
94+
if (lastEventId) {
95+
document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
96+
} else {
97+
message.warning('There is no event happening right now.')
98+
}
99+
} else {
100+
document.getElementById(`agenda-day-${dayId}`)?.scrollIntoView(true)
101+
}
102+
}
103+
63104
function downloadIcs (key) {
64105
message.loading('Generating calendar file... Download will begin shortly.')
65106
let icsUrl = ''
@@ -102,6 +143,8 @@ function downloadIcs (key) {
102143
color: #FFF;
103144
padding: 0 15px;
104145
transition: all .4s ease;
146+
text-align: center;
147+
flex: 1 1;
105148
106149
& + button {
107150
margin-left: 1px;

client/agenda/AgendaScheduleList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ const meetingEvents = computed(() => {
362362
if (item.links.calendar) {
363363
links.push({
364364
id: `lnk-${item.id}-calendar`,
365-
label: isMobile.value ? `Calendar (.ics) entry for this session` : `Calendar (.ics) entry for ${item.acronym} session on ${item.adjustedStart.toFormat('fff')}`,
365+
label: 'Calendar (.ics) entry for this session',
366366
icon: 'calendar-check',
367367
href: item.links.calendar,
368368
color: 'pink'

client/embedded.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
import { createApp } from 'vue'
2+
import { createPinia } from 'pinia'
3+
import piniaPersist from 'pinia-plugin-persist'
24
import Embedded from './Embedded.vue'
35

6+
// Initialize store (Pinia)
7+
8+
const pinia = createPinia()
9+
pinia.use(piniaPersist)
10+
411
// Mount App
512

613
const mountEls = document.querySelectorAll('div.vue-embed')
@@ -9,5 +16,6 @@ for (const mnt of mountEls) {
916
componentName: mnt.dataset.component,
1017
componentId: mnt.dataset.componentId
1118
})
19+
app.use(pinia)
1220
app.mount(mnt)
1321
}

dev/coverage-action/package-lock.json

Lines changed: 48 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/coverage-action/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"chart.js": "3.5.1",
1212
"chartjs-node-canvas": "4.1.6",
1313
"lodash": "4.17.21",
14-
"luxon": "3.4.3"
14+
"luxon": "3.4.4"
1515
},
1616
"devDependencies": {
17-
"eslint": "8.52.0",
17+
"eslint": "8.53.0",
1818
"eslint-config-standard": "17.1.0",
1919
"eslint-plugin-import": "2.29.0",
2020
"eslint-plugin-node": "11.1.0",

0 commit comments

Comments
 (0)