- {{ customPill }}
-
+ :text="customPill"
+ />
- {{ customPill }}
-
+ :text="customPill"
+ />
import { defineComponent } from 'vue'
import type { ElasticSearchPage } from '../../interfaces'
+
// @ts-ignore
import dayjs from 'dayjs'
import SearchResultCard from './../SearchResultCard/SearchResultCard.vue'
@@ -131,6 +135,8 @@ export default defineComponent({
const pageType = page._source[handle + '__label']
if (handle === 'events_eventpage') {
date = 'Event date: ' + parseDate(page._source[handle + '__start_datetime'])
+ } else if (handle === 'edu_events_edueventpage') {
+ date = null
} else if (handle === 'missions_mission') {
date = page._source.display_date_filter
? 'Launch date: ' + page._source.display_date_filter
@@ -155,13 +161,37 @@ export default defineComponent({
page.topic = topic
// properties for event's page
page.location =
- handle === 'events_eventpage' ? page._source[handle + '__location'] : null
+ handle === 'events_eventpage' || handle === 'edu_events_edueventpage'
+ ? page._source[handle + '__location'] | page._source[handle + '__location_name']
+ : null
page.startDate =
- handle === 'events_eventpage' ? page._source[handle + '__start_datetime'] : null
+ handle === 'events_eventpage' || handle === 'edu_events_edueventpage'
+ ? page._source[handle + '__start_datetime']
+ : null
page.endDate =
- handle === 'events_eventpage' ? page._source[handle + '__end_datetime'] : null
+ handle === 'events_eventpage' || handle === 'edu_events_edueventpage'
+ ? page._source[handle + '__end_datetime']
+ : null
page.startTime =
- handle === 'events_eventpage' ? page._source[handle + '__start_time_string'] : null
+ handle === 'events_eventpage' || handle === 'edu_events_edueventpage'
+ ? page._source[handle + '__start_time_string']
+ : null
+ page.endTime =
+ handle === 'events_eventpage' || handle === 'edu_events_edueventpage'
+ ? page._source[handle + '__end_time_string']
+ : null
+ page.eventType =
+ handle === 'edu_events_edueventpage'
+ ? page._source.edu_events_edueventpage__event_type_label_filter
+ : undefined
+ page.customDate =
+ handle === 'edu_events_edueventpage'
+ ? page._source.edu_events_edueventpage__custom_date
+ : undefined
+ page.ongoing =
+ handle === 'edu_events_edueventpage'
+ ? page._source.edu_events_edueventpage__ongoing
+ : undefined
// properties that are different for profiles page
page.summary =
handle === 'profiles_profilepage'
diff --git a/packages/vue/src/constants.ts b/packages/vue/src/constants.ts
index c8dc3905..8b7e3a56 100644
--- a/packages/vue/src/constants.ts
+++ b/packages/vue/src/constants.ts
@@ -2,6 +2,7 @@ import type { DictionaryInterface, PillDictionaryInterface } from './interfaces'
export const eduMetadataDictionary: PillDictionaryInterface = {
EDUEventPage: {
+ label: 'Event',
variant: 'primary',
icons: 'primary',
type: 'event'
@@ -73,9 +74,9 @@ export const searchContentTypeToPageType: DictionaryInterface = {
news_news: 'News',
events_eventpage: 'EventPage',
missions_mission: 'Mission',
- eduevents_edueventpage: 'EDUEventPage',
- eduresources_educollectionsdetailpage: 'EDUCollectionsDetailPage',
- eduresources_eduexplainerarticlepage: 'EDUExplainerArticlePage',
- eduresources_edulessonpage: 'EDULessonPage',
- eduresources_eduteachablemomentpage: 'EDUTeachableMomentPage'
+ edu_events_edueventpage: 'EDUEventPage',
+ edu_resources_educollectionsdetailpage: 'EDUCollectionsDetailPage',
+ edu_resources_eduexplainerarticlepage: 'EDUExplainerArticlePage',
+ edu_resources_edulessonpage: 'EDULessonPage',
+ edu_resources_eduteachablemomentpage: 'EDUTeachableMomentPage'
}
diff --git a/packages/vue/src/interfaces.ts b/packages/vue/src/interfaces.ts
index 8a6df494..921699c7 100644
--- a/packages/vue/src/interfaces.ts
+++ b/packages/vue/src/interfaces.ts
@@ -79,16 +79,19 @@ export interface ElasticSearchPage {
content_type: string
url: string
type: string
- topic: string
- image: string | any
- date: string
- startDate: string
- endDate: string
- startTime: string
- endTime: string
- location: string
+ topic?: string
+ image?: string | any
+ date?: string
+ startDate?: string
+ endDate?: string
+ customDate?: string
+ startTime?: string
+ endTime?: string
+ location?: string
title: string
- summary: string
+ summary?: string
+ eventType?: string
+ ongoing?: boolean
}
export interface FormOption {
diff --git a/packages/vue/src/templates/edu/PageEduEventDetail/PageEduEventDetail.vue b/packages/vue/src/templates/edu/PageEduEventDetail/PageEduEventDetail.vue
index a2123400..a57e6f75 100644
--- a/packages/vue/src/templates/edu/PageEduEventDetail/PageEduEventDetail.vue
+++ b/packages/vue/src/templates/edu/PageEduEventDetail/PageEduEventDetail.vue
@@ -36,9 +36,8 @@
- {{ data.eventType }}
-
+ :text="data.eventType"
+ />