Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
f5d4d74
ci: merge main to release
rjsparks Oct 26, 2023
5eb2f56
chore(deps): update all Yarn dependencies (#6613)
depfu[bot] Nov 13, 2023
c36f63b
feat: Revamp AD dashboard (#6534)
larseggert Nov 15, 2023
53e2323
fix: Sort milestones for groups not using dates (#6642)
jennifer-richards Nov 15, 2023
522443a
fix: pin django_vite to <3 in requirements.txt
NGPixel Nov 15, 2023
569c713
Merge pull request #6647 from ietf-tools/release
rjsparks Nov 16, 2023
aee3c6c
ci: merge main to release
rjsparks Nov 16, 2023
925e220
ci: change test coverage fudge factor (#6649)
rjsparks Nov 16, 2023
5cea620
ci: bring release's merge commit back into main
rjsparks Nov 16, 2023
0cdefa0
ci: merge main to release
rjsparks Nov 16, 2023
1f47d0a
ci: bring release merge commit back into to main
rjsparks Nov 17, 2023
c1627ed
fix: restore attendee dbtemplate for old meetings pending data correc…
rjsparks Nov 17, 2023
4159366
ci: merge main to release
rjsparks Nov 17, 2023
c965b44
chore(deps): update all npm dependencies for dev/del-old-packages
depfu[bot] Nov 20, 2023
4500642
chore(deps): update all npm dependencies for playwright
depfu[bot] Nov 20, 2023
efcbe01
chore(deps): update all npm dependencies for dev/deploy-to-container
depfu[bot] Nov 20, 2023
2836347
chore(deps): update all npm dependencies for dev/diff
depfu[bot] Nov 20, 2023
1f997b2
chore(deps): update all npm dependencies for dev/coverage-action
depfu[bot] Nov 20, 2023
c955582
Merge pull request #6670 from ietf-tools/depfu/batch_all/devcoverage-…
rjsparks Nov 21, 2023
6eda9b5
Merge pull request #6669 from ietf-tools/depfu/batch_all/devdiff/npm/…
rjsparks Nov 21, 2023
d633213
Merge pull request #6668 from ietf-tools/depfu/batch_all/devdeploy-to…
rjsparks Nov 21, 2023
d183121
Merge pull request #6667 from ietf-tools/depfu/batch_all/playwright/n…
rjsparks Nov 21, 2023
e7ee304
Merge pull request #6666 from ietf-tools/depfu/batch_all/devdel-old-p…
rjsparks Nov 21, 2023
377db9d
ci: update dev.ietf.org settings_local.py
NGPixel Nov 21, 2023
3d44825
ci: Switch to using geckodriver (#6541)
larseggert Nov 21, 2023
b09f6ef
feat: add jump to now/day on mobile agenda (#6654)
NGPixel Nov 22, 2023
62775bc
chore: Squelch celery deprecation warning (#6662)
jennifer-richards Nov 22, 2023
8bd5d94
fix: chatlog component missing pinia + agenda switch to text dark mod…
NGPixel Nov 22, 2023
9dec409
feat: iab workshops (#6684)
rjsparks Nov 27, 2023
f442d6c
fix: Remove extra spaces in bibtex (#6688)
kesara Nov 27, 2023
0fa51e9
ci: Update deploy-to-container/cli.js
NGPixel Nov 28, 2023
d1909fd
fix: Combine Group and GroupHistory when counting (#6701)
jennifer-richards Nov 28, 2023
9a6595b
ci: merge release to main to capture last release's merge commit
rjsparks Nov 29, 2023
bb2e780
ci: merge main to release
rjsparks Nov 29, 2023
ddebdf0
test: Add delay to upcoming mtg filter tests (#6707)
jennifer-richards Nov 29, 2023
63210c1
ci: merge release to main to capture earlier merge commit
rjsparks Nov 29, 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
13 changes: 10 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,19 @@ jobs:
echo "Running tests..."
if [[ "x${{ github.event.inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then
echo "Lower coverage failures will be ignored."
./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test --ignore-lower-coverage
HOME=/root ./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test --ignore-lower-coverage
else
./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test
HOME=/root ./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test
fi
coverage xml

- name: Upload geckodriver.log
uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: geckodriverlog
path: geckodriver.log

- name: Upload Coverage Results to Codecov
uses: codecov/codecov-action@v3.1.4
with:
Expand Down Expand Up @@ -161,4 +168,4 @@ jobs:
with:
name: playwright-legacy-results-${{ matrix.project }}
path: playwright/test-results/
if-no-files-found: ignore
if-no-files-found: ignore
816 changes: 414 additions & 402 deletions .pnp.cjs

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/vue-npm-3.3.4-174fadbea4-58b6c62a66.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
59 changes: 51 additions & 8 deletions client/agenda/AgendaMobileBar.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
<template lang="pug">
.agenda-mobile-bar(v-if='siteStore.viewport < 990')
n-dropdown(
:options='jumpToDayOptions'
size='huge'
:show-arrow='true'
trigger='click'
@select='jumpToDay'
)
button
i.bi.bi-arrow-down-circle
button(@click='agendaStore.$patch({ filterShown: true })')
i.bi.bi-filter-square-fill.me-2
span Filters
i.bi.bi-funnel
n-badge.ms-2(:value='agendaStore.selectedCatSubs.length', processing)
button(@click='agendaStore.$patch({ calendarShown: true })')
i.bi.bi-calendar3.me-2
span Cal
i.bi.bi-calendar3
n-dropdown(
:options='downloadIcsOptions'
size='huge'
Expand All @@ -15,14 +22,13 @@
@select='downloadIcs'
)
button
i.bi.bi-calendar-check.me-2
span .ics
i.bi.bi-download
button(@click='agendaStore.$patch({ settingsShown: !agendaStore.settingsShown })')
i.bi.bi-gear
</template>

<script setup>
import { h } from 'vue'
import { computed, h } from 'vue'

import {
NBadge,
Expand All @@ -43,13 +49,34 @@ const message = useMessage()
const agendaStore = useAgendaStore()
const siteStore = useSiteStore()

// Meeting Days

const jumpToDayOptions = computed(() => {
const days = []
if (agendaStore.isMeetingLive) {
days.push({
label: 'Jump to Now',
key: 'now',
icon: () => h('i', { class: 'bi bi-arrow-down-right-square text-red' })
})
}
for (const day of agendaStore.meetingDays) {
days.push({
label: `Jump to ${day.label}`,
key: day.slug,
icon: () => h('i', { class: 'bi bi-arrow-down-right-square' })
})
}
return days
})

// Download Ics Options

const downloadIcsOptions = [
{
label: 'Subscribe... (webcal)',
key: 'subscribe',
icon: () => h('i', { class: 'bi bi-calendar-week text-blue' })
icon: () => h('i', { class: 'bi bi-calendar-week' })
},
{
label: 'Download... (.ics)',
Expand All @@ -60,6 +87,20 @@ const downloadIcsOptions = [

// METHODS

function jumpToDay (dayId) {
if (dayId === 'now') {
const lastEventId = agendaStore.findCurrentEventId()

if (lastEventId) {
document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
} else {
message.warning('There is no event happening right now.')
}
} else {
document.getElementById(`agenda-day-${dayId}`)?.scrollIntoView(true)
}
}

function downloadIcs (key) {
message.loading('Generating calendar file... Download will begin shortly.')
let icsUrl = ''
Expand Down Expand Up @@ -102,6 +143,8 @@ function downloadIcs (key) {
color: #FFF;
padding: 0 15px;
transition: all .4s ease;
text-align: center;
flex: 1 1;

& + button {
margin-left: 1px;
Expand Down
2 changes: 1 addition & 1 deletion client/agenda/AgendaScheduleList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ const meetingEvents = computed(() => {
if (item.links.calendar) {
links.push({
id: `lnk-${item.id}-calendar`,
label: isMobile.value ? `Calendar (.ics) entry for this session` : `Calendar (.ics) entry for ${item.acronym} session on ${item.adjustedStart.toFormat('fff')}`,
label: 'Calendar (.ics) entry for this session',
icon: 'calendar-check',
href: item.links.calendar,
color: 'pink'
Expand Down
8 changes: 8 additions & 0 deletions client/embedded.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import { createApp } from 'vue'
import { createPinia } from 'pinia'
import piniaPersist from 'pinia-plugin-persist'
import Embedded from './Embedded.vue'

// Initialize store (Pinia)

const pinia = createPinia()
pinia.use(piniaPersist)

// Mount App

const mountEls = document.querySelectorAll('div.vue-embed')
Expand All @@ -9,5 +16,6 @@ for (const mnt of mountEls) {
componentName: mnt.dataset.component,
componentId: mnt.dataset.componentId
})
app.use(pinia)
app.mount(mnt)
}
96 changes: 48 additions & 48 deletions dev/coverage-action/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dev/coverage-action/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"chart.js": "3.5.1",
"chartjs-node-canvas": "4.1.6",
"lodash": "4.17.21",
"luxon": "3.4.3"
"luxon": "3.4.4"
},
"devDependencies": {
"eslint": "8.52.0",
"eslint": "8.53.0",
"eslint-config-standard": "17.1.0",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-node": "11.1.0",
Expand Down
Loading