Skip to content

Commit ae51096

Browse files
authored
fix: agenda meeting updated datetime (ietf-tools#4783)
* fix: agenda meeting updated datetime * test: correct updated datetime format
1 parent ba9f440 commit ae51096

3 files changed

Lines changed: 15 additions & 9 deletions

File tree

client/agenda/Agenda.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,14 @@ const meetingDate = computed(() => {
317317
}
318318
})
319319
const meetingUpdated = computed(() => {
320-
return agendaStore.meeting.updated ? DateTime.fromISO(agendaStore.meeting.updated).setZone(agendaStore.timezone).toFormat(`DD 'at' tt ZZZZ`) : false
320+
if (!agendaStore.meeting.updated) { return false }
321+
322+
const updatedDatetime = DateTime.fromISO(agendaStore.meeting.updated).setZone(agendaStore.timezone)
323+
if (!updatedDatetime.isValid || updatedDatetime < DateTime.fromISO('1980-01-01')) {
324+
return false
325+
}
326+
327+
return updatedDatetime.toFormat(`DD 'at' T ZZZZ`)
321328
})
322329
const colorLegendShown = computed(() => {
323330
return agendaStore.colorPickerVisible || (agendaStore.colorLegendShown && Object.keys(agendaStore.colorAssignments).length > 0)

client/agenda/FloorPlan.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
span #[strong IETF {{agendaStore.meeting.number}}] Floor Plan
66
.meeting-h1-badges.d-none.d-sm-flex
77
span.meeting-warning(v-if='agendaStore.meeting.warningNote') {{agendaStore.meeting.warningNote}}
8-
span.meeting-beta BETA
98
h4
109
span {{agendaStore.meeting.city}}, {{ meetingDate }}
1110

playwright/tests/meeting/agenda.spec.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ test.describe('past - desktop', () => {
6868
const updatedDateTime = DateTime.fromISO(meetingData.meeting.updated)
6969
.setZone(meetingData.meeting.timezone)
7070
.setLocale(BROWSER_LOCALE)
71-
.toFormat('DD \'at\' tt ZZZZ')
71+
.toFormat('DD \'at\' T ZZZZ')
7272
await expect(page.locator('.agenda h6').first(), 'should have meeting last updated datetime').toContainText(updatedDateTime)
7373

7474
// NAV
@@ -136,7 +136,7 @@ test.describe('past - desktop', () => {
136136
const localDateTime = DateTime.fromISO(meetingData.meeting.updated)
137137
.setZone(BROWSER_TIMEZONE)
138138
.setLocale(BROWSER_LOCALE)
139-
.toFormat('DD \'at\' tt ZZZZ')
139+
.toFormat('DD \'at\' T ZZZZ')
140140
await expect(page.locator('.agenda h6').first()).toContainText(localDateTime)
141141
// Switch to UTC
142142
await tzUtcBtnLocator.click()
@@ -145,7 +145,7 @@ test.describe('past - desktop', () => {
145145
const utcDateTime = DateTime.fromISO(meetingData.meeting.updated)
146146
.setZone('utc')
147147
.setLocale(BROWSER_LOCALE)
148-
.toFormat('DD \'at\' tt ZZZZ')
148+
.toFormat('DD \'at\' T ZZZZ')
149149
await expect(page.locator('.agenda h6').first()).toContainText(utcDateTime)
150150
await expect(page.locator('.agenda .agenda-timezone-ddn')).toContainText('UTC')
151151
// Switch back to meeting timezone
@@ -694,7 +694,7 @@ test.describe('past - desktop', () => {
694694
const localDateTime = DateTime.fromISO(meetingData.meeting.updated)
695695
.setZone(BROWSER_TIMEZONE)
696696
.setLocale(BROWSER_LOCALE)
697-
.toFormat('DD \'at\' tt ZZZZ')
697+
.toFormat('DD \'at\' T ZZZZ')
698698
await expect(page.locator('.agenda h6').first()).toContainText(localDateTime)
699699
// Switch to UTC
700700
await tzButtonsLocator.last().click()
@@ -703,7 +703,7 @@ test.describe('past - desktop', () => {
703703
const utcDateTime = DateTime.fromISO(meetingData.meeting.updated)
704704
.setZone('utc')
705705
.setLocale(BROWSER_LOCALE)
706-
.toFormat('DD \'at\' tt ZZZZ')
706+
.toFormat('DD \'at\' T ZZZZ')
707707
await expect(page.locator('.agenda h6').first()).toContainText(utcDateTime)
708708
// Switch back to meeting timezone
709709
await tzButtonsLocator.first().click()
@@ -837,7 +837,7 @@ test.describe('past - desktop', () => {
837837
const localDateTime = DateTime.fromISO(meetingData.meeting.updated)
838838
.setZone(BROWSER_TIMEZONE)
839839
.setLocale(BROWSER_LOCALE)
840-
.toFormat('DD \'at\' tt ZZZZ')
840+
.toFormat('DD \'at\' T ZZZZ')
841841
await expect(page.locator('.agenda h6').first()).toContainText(localDateTime)
842842
// Switch to UTC
843843
await tzUtcBtnLocator.click()
@@ -846,7 +846,7 @@ test.describe('past - desktop', () => {
846846
const utcDateTime = DateTime.fromISO(meetingData.meeting.updated)
847847
.setZone('utc')
848848
.setLocale(BROWSER_LOCALE)
849-
.toFormat('DD \'at\' tt ZZZZ')
849+
.toFormat('DD \'at\' T ZZZZ')
850850
await expect(page.locator('.agenda h6').first()).toContainText(utcDateTime)
851851
// Switch back to meeting timezone
852852
await tzMeetingBtnLocator.click()

0 commit comments

Comments
 (0)