altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

fix: agenda meeting updated datetime (#4783)

Browse source 
* fix: agenda meeting updated datetime

* test: correct updated datetime format
This commit is contained in:
Nicolas Giard 2022-11-23 13:43:26 -05:00 committed by GitHub
parent ba9f44093f
commit ae51096c65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/agenda/Agenda.vue
View file

@ -317,7 +317,14 @@ const meetingDate = computed(() => {
} }
}) })
const meetingUpdated = 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(() => { const colorLegendShown = computed(() => {
return agendaStore.colorPickerVisible || (agendaStore.colorLegendShown && Object.keys(agendaStore.colorAssignments).length > 0) return agendaStore.colorPickerVisible || (agendaStore.colorLegendShown && Object.keys(agendaStore.colorAssignments).length > 0)

1
client/agenda/FloorPlan.vue
View file

@ -5,7 +5,6 @@
span #[strong IETF {{agendaStore.meeting.number}}] Floor Plan span #[strong IETF {{agendaStore.meeting.number}}] Floor Plan
.meeting-h1-badges.d-none.d-sm-flex .meeting-h1-badges.d-none.d-sm-flex
span.meeting-warning(v-if='agendaStore.meeting.warningNote') {{agendaStore.meeting.warningNote}} span.meeting-warning(v-if='agendaStore.meeting.warningNote') {{agendaStore.meeting.warningNote}}
span.meeting-beta BETA
h4 h4
span {{agendaStore.meeting.city}}, {{ meetingDate }} span {{agendaStore.meeting.city}}, {{ meetingDate }}

14
playwright/tests/meeting/agenda.spec.js
View file

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