Skip to content

fix: agenda meeting updated datetime #4783

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 3 commits into from
Nov 23, 2022
Merged

fix: agenda meeting updated datetime #4783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a591b9d
fix: agenda meeting updated datetime
NGPixel Nov 22, 2022
8c45297
Merge branch 'main' into agenda-1970-updated
NGPixel Nov 22, 2022
d695d50
test: correct updated datetime format
NGPixel Nov 22, 2022
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
9 changes: 8 additions & 1 deletion client/agenda/Agenda.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,14 @@ const meetingDate = computed(() => {
}
})
const meetingUpdated = computed(() => {
return agendaStore.meeting.updated ? DateTime.fromISO(agendaStore.meeting.updated).setZone(agendaStore.timezone).toFormat(`DD 'at' tt ZZZZ`) : false
if (!agendaStore.meeting.updated) { return false }

const updatedDatetime = DateTime.fromISO(agendaStore.meeting.updated).setZone(agendaStore.timezone)
if (!updatedDatetime.isValid || updatedDatetime < DateTime.fromISO('1980-01-01')) {
return false
}

return updatedDatetime.toFormat(`DD 'at' T ZZZZ`)
})
const colorLegendShown = computed(() => {
return agendaStore.colorPickerVisible || (agendaStore.colorLegendShown && Object.keys(agendaStore.colorAssignments).length > 0)
Expand Down
1 change: 0 additions & 1 deletion client/agenda/FloorPlan.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
span #[strong IETF {{agendaStore.meeting.number}}] Floor Plan
.meeting-h1-badges.d-none.d-sm-flex
span.meeting-warning(v-if='agendaStore.meeting.warningNote') {{agendaStore.meeting.warningNote}}
span.meeting-beta BETA
h4
span {{agendaStore.meeting.city}}, {{ meetingDate }}

Expand Down
14 changes: 7 additions & 7 deletions playwright/tests/meeting/agenda.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ test.describe('past - desktop', () => {
const updatedDateTime = DateTime.fromISO(meetingData.meeting.updated)
.setZone(meetingData.meeting.timezone)
.setLocale(BROWSER_LOCALE)
.toFormat('DD \'at\' tt ZZZZ')
.toFormat('DD \'at\' T ZZZZ')
await expect(page.locator('.agenda h6').first(), 'should have meeting last updated datetime').toContainText(updatedDateTime)

// NAV
Expand Down Expand Up @@ -136,7 +136,7 @@ test.describe('past - desktop', () => {
const localDateTime = DateTime.fromISO(meetingData.meeting.updated)
.setZone(BROWSER_TIMEZONE)
.setLocale(BROWSER_LOCALE)
.toFormat('DD \'at\' tt ZZZZ')
.toFormat('DD \'at\' T ZZZZ')
await expect(page.locator('.agenda h6').first()).toContainText(localDateTime)
// Switch to UTC
await tzUtcBtnLocator.click()
Expand All @@ -145,7 +145,7 @@ test.describe('past - desktop', () => {
const utcDateTime = DateTime.fromISO(meetingData.meeting.updated)
.setZone('utc')
.setLocale(BROWSER_LOCALE)
.toFormat('DD \'at\' tt ZZZZ')
.toFormat('DD \'at\' T ZZZZ')
await expect(page.locator('.agenda h6').first()).toContainText(utcDateTime)
await expect(page.locator('.agenda .agenda-timezone-ddn')).toContainText('UTC')
// Switch back to meeting timezone
Expand Down Expand Up @@ -694,7 +694,7 @@ test.describe('past - desktop', () => {
const localDateTime = DateTime.fromISO(meetingData.meeting.updated)
.setZone(BROWSER_TIMEZONE)
.setLocale(BROWSER_LOCALE)
.toFormat('DD \'at\' tt ZZZZ')
.toFormat('DD \'at\' T ZZZZ')
await expect(page.locator('.agenda h6').first()).toContainText(localDateTime)
// Switch to UTC
await tzButtonsLocator.last().click()
Expand All @@ -703,7 +703,7 @@ test.describe('past - desktop', () => {
const utcDateTime = DateTime.fromISO(meetingData.meeting.updated)
.setZone('utc')
.setLocale(BROWSER_LOCALE)
.toFormat('DD \'at\' tt ZZZZ')
.toFormat('DD \'at\' T ZZZZ')
await expect(page.locator('.agenda h6').first()).toContainText(utcDateTime)
// Switch back to meeting timezone
await tzButtonsLocator.first().click()
Expand Down Expand Up @@ -837,7 +837,7 @@ test.describe('past - desktop', () => {
const localDateTime = DateTime.fromISO(meetingData.meeting.updated)
.setZone(BROWSER_TIMEZONE)
.setLocale(BROWSER_LOCALE)
.toFormat('DD \'at\' tt ZZZZ')
.toFormat('DD \'at\' T ZZZZ')
await expect(page.locator('.agenda h6').first()).toContainText(localDateTime)
// Switch to UTC
await tzUtcBtnLocator.click()
Expand All @@ -846,7 +846,7 @@ test.describe('past - desktop', () => {
const utcDateTime = DateTime.fromISO(meetingData.meeting.updated)
.setZone('utc')
.setLocale(BROWSER_LOCALE)
.toFormat('DD \'at\' tt ZZZZ')
.toFormat('DD \'at\' T ZZZZ')
await expect(page.locator('.agenda h6').first()).toContainText(utcDateTime)
// Switch back to meeting timezone
await tzMeetingBtnLocator.click()
Expand Down