#74 introduced buyTicketsUrl allowing to show a button routing to event registration page

fcamblor · fcamblor · commit 7eba358557dc · 2025-02-22T17:35:31.000+01:00
diff --git a/cloud/functions/src/crawlers/bdxio/crawler.ts b/cloud/functions/src/crawlers/bdxio/crawler.ts
@@ -283,6 +283,7 @@ export const BDXIO_CRAWLER: CrawlerKind<typeof BDXIO_PARSER> = {
             infos: descriptor.infos,
             features: descriptor.features,
             supportedTalkLanguages: descriptor.supportedTalkLanguages,
+            buyTicketsUrl: descriptor.buyTicketsUrl || null,
             formattings: descriptor.formattings || {
               talkFormatTitle: 'with-duration',
               parseMarkdownOn: [],
@@ -360,7 +361,8 @@ export const BDXIO_CRAWLER: CrawlerKind<typeof BDXIO_PARSER> = {
                 location: descriptor.location,
                 logoUrl: descriptor.logoUrl,
                 timezone: descriptor.timezone,
-                peopleDescription: descriptor.peopleDescription as any,
+                peopleDescription: descriptor.peopleDescription,
+                buyTicketsUrl: descriptor.buyTicketsUrl || null,
                 backgroundUrl: descriptor.backgroundUrl
             },
             conferenceDescriptor: confDescriptor,
diff --git a/cloud/functions/src/crawlers/camping-des-speakers/crawler.ts b/cloud/functions/src/crawlers/camping-des-speakers/crawler.ts
@@ -151,6 +151,7 @@ export const CAMPING_DES_SPEAKERS_CRAWLER: CrawlerKind<typeof CAMPING_DES_SPEAKE
             logoUrl: descriptor.logoUrl,
             timezone: descriptor.timezone,
             peopleDescription: descriptor.peopleDescription || "",
+            buyTicketsUrl: descriptor.buyTicketsUrl || null,
             backgroundUrl: descriptor.backgroundUrl,
             theming: descriptor.theming as ConferenceDescriptor['theming'],
             rooms: descriptor.rooms,
@@ -261,7 +262,8 @@ export const CAMPING_DES_SPEAKERS_CRAWLER: CrawlerKind<typeof CAMPING_DES_SPEAKE
                 location: descriptor.location,
                 logoUrl: descriptor.logoUrl,
                 timezone: descriptor.timezone,
-                peopleDescription: descriptor.peopleDescription as any,
+                peopleDescription: descriptor.peopleDescription,
+                buyTicketsUrl: descriptor.buyTicketsUrl || null,
                 backgroundUrl: descriptor.backgroundUrl
             },
             conferenceDescriptor: confDescriptor,
diff --git a/cloud/functions/src/crawlers/codeurs-en-seine/crawler.ts b/cloud/functions/src/crawlers/codeurs-en-seine/crawler.ts
@@ -271,6 +271,7 @@ export const CODEURS_EN_SEINE_CRAWLER: CrawlerKind<typeof CODEURS_EN_SEINE_PARSE
             logoUrl: descriptor.logoUrl,
             timezone: descriptor.timezone,
             peopleDescription: descriptor.peopleDescription || "",
+            buyTicketsUrl: descriptor.buyTicketsUrl || null,
             backgroundUrl: descriptor.backgroundUrl,
             theming: descriptor.theming,
             rooms: descriptor.rooms,
@@ -298,6 +299,7 @@ export const CODEURS_EN_SEINE_CRAWLER: CrawlerKind<typeof CODEURS_EN_SEINE_PARSE
                 logoUrl: confDescriptor.logoUrl,
                 timezone: confDescriptor.timezone,
                 peopleDescription: confDescriptor.peopleDescription,
+                buyTicketsUrl: confDescriptor.buyTicketsUrl || null,
                 backgroundUrl: confDescriptor.backgroundUrl
             },
             conferenceDescriptor: confDescriptor,
diff --git a/cloud/functions/src/crawlers/crawler-parsers.ts b/cloud/functions/src/crawlers/crawler-parsers.ts
@@ -92,6 +92,7 @@ export const LISTABLE_EVENT_PARSER = z.object({
     backgroundUrl: z.string(),
     logoUrl: z.string(),
     theming: EVENT_THEME_PARSER,
+    buyTicketsUrl: z.string().nullish().optional(),
 })
 
 export const INFOS_PARSER = z.object({
diff --git a/cloud/functions/src/crawlers/devoxx-scala/crawler.ts b/cloud/functions/src/crawlers/devoxx-scala/crawler.ts
@@ -273,6 +273,7 @@ export const DEVOXX_SCALA_CRAWLER: CrawlerKind<typeof DEVOXX_SCALA_DESCRIPTOR_PA
             title: descriptor.title,
             description: conferenceResourceUrl.resource.label,
             peopleDescription: descriptor.peopleDescription,
+            buyTicketsUrl: descriptor.buyTicketsUrl || null,
             timezone: descriptor.timezone,
             days: descriptor.days,
             logoUrl: descriptor.logoUrl,
diff --git a/cloud/functions/src/crawlers/devoxx/crawler.ts b/cloud/functions/src/crawlers/devoxx/crawler.ts
@@ -278,6 +278,7 @@ Please, unless event id is made configurable at cfp.dev level, you should rather
             title: cfpEvent.name,
             description: cfpEvent.description,
             peopleDescription: descriptor.peopleDescription,
+            buyTicketsUrl: descriptor.buyTicketsUrl || null,
             timezone: cfpEvent.timezone,
             days: days,
             logoUrl: descriptor.logoUrl,
diff --git a/cloud/functions/src/crawlers/full-event.builder.ts b/cloud/functions/src/crawlers/full-event.builder.ts
@@ -337,9 +337,20 @@ export class FullEventBuilder {
   }
 
   public usingInfosAndDescriptor(listableEventInfo: FullEvent['listableEventInfo'], descriptor: Omit<FullEvent['conferenceDescriptor'], "rooms"|"talkTracks"|"talkFormats"|"supportedTalkLanguages"|keyof FullEvent['listableEventInfo']>): this {
-    this.listableEventInfo = listableEventInfo;
+    this.listableEventInfo = {
+      ...listableEventInfo,
+      // converting undefined unsupported firestore values to null
+      description: listableEventInfo.description || null,
+      peopleDescription: listableEventInfo.peopleDescription || null,
+      buyTicketsUrl: listableEventInfo.buyTicketsUrl || null,
+      location: {
+        ...listableEventInfo.location,
+        address: listableEventInfo.location.address || null,
+        coords: listableEventInfo.location.coords || null,
+      },
+    };
     this.descriptor = {
-      ...pick(listableEventInfo, ['id', 'title', 'days', 'timezone', 'keywords', 'location', 'backgroundUrl', 'logoUrl', 'theming']),
+      ...pick(this.listableEventInfo, ['id', 'title', 'days', 'timezone', 'keywords', 'location', 'backgroundUrl', 'logoUrl', 'theming', 'buyTicketsUrl']),
       ...pick(descriptor, ['headingTitle', 'headingBackground', 'features', 'formattings', 'infos']),
       rooms: [...this.roomsById.values()],
       talkTracks: [...this.tracksById.values()],
diff --git a/cloud/functions/src/crawlers/jugsummercamp/crawler.ts b/cloud/functions/src/crawlers/jugsummercamp/crawler.ts
@@ -142,6 +142,7 @@ export const JUG_SUMMERCAMP_CRAWLER: CrawlerKind<typeof JUG_SUMMERCAMP_PARSER> =
             logoUrl: descriptor.logoUrl,
             timezone: descriptor.timezone,
             peopleDescription: descriptor.peopleDescription || "",
+            buyTicketsUrl: descriptor.buyTicketsUrl || null,
             backgroundUrl: descriptor.backgroundUrl,
             theming: descriptor.theming as ConferenceDescriptor['theming'],
             rooms: descriptor.rooms,
@@ -253,7 +254,8 @@ export const JUG_SUMMERCAMP_CRAWLER: CrawlerKind<typeof JUG_SUMMERCAMP_PARSER> =
                 location: descriptor.location,
                 logoUrl: descriptor.logoUrl,
                 timezone: descriptor.timezone,
-                peopleDescription: descriptor.peopleDescription as any,
+                peopleDescription: descriptor.peopleDescription,
+                buyTicketsUrl: descriptor.buyTicketsUrl || null,
                 backgroundUrl: descriptor.backgroundUrl
             },
             conferenceDescriptor: confDescriptor,
diff --git a/cloud/functions/src/crawlers/la-product-conf/crawler.ts b/cloud/functions/src/crawlers/la-product-conf/crawler.ts
@@ -255,6 +255,7 @@ export const LA_PRODUCT_CONF_CRAWLER: CrawlerKind<typeof LA_PRODUCT_CONF_DESCRIP
             logoUrl: descriptor.logoUrl,
             timezone: descriptor.timezone,
             peopleDescription: descriptor.peopleDescription || "",
+            buyTicketsUrl: descriptor.buyTicketsUrl || null,
             backgroundUrl: descriptor.backgroundUrl,
             theming: descriptor.theming as ConferenceDescriptor['theming'],
             rooms: descriptor.rooms,
@@ -281,7 +282,8 @@ export const LA_PRODUCT_CONF_CRAWLER: CrawlerKind<typeof LA_PRODUCT_CONF_DESCRIP
                 location: descriptor.location,
                 logoUrl: descriptor.logoUrl,
                 timezone: descriptor.timezone,
-                peopleDescription: descriptor.peopleDescription as any,
+                peopleDescription: descriptor.peopleDescription,
+                buyTicketsUrl: descriptor.buyTicketsUrl || null,
                 backgroundUrl: descriptor.backgroundUrl
             },
             conferenceDescriptor: confDescriptor,
diff --git a/cloud/functions/src/crawlers/openplanner/crawler.ts b/cloud/functions/src/crawlers/openplanner/crawler.ts
@@ -293,6 +293,7 @@ export const OPENPLANNER_CRAWLER: CrawlerKind<typeof OPENPLANNER_DESCRIPTOR_PARS
           title: descriptor.title || openPlannerSchedule.title,
           description: descriptor.description,
           peopleDescription: descriptor.peopleDescription || '',
+          buyTicketsUrl: descriptor.buyTicketsUrl || null,
           timezone,
           logoUrl: descriptor.logoUrl || openPlannerSchedule.logoUrl,
           backgroundUrl: descriptor.backgroundUrl || openPlannerSchedule.backgroundUrl,
@@ -322,6 +323,7 @@ export const OPENPLANNER_CRAWLER: CrawlerKind<typeof OPENPLANNER_DESCRIPTOR_PARS
           title: descriptor.title || openPlannerSchedule.title,
           description: descriptor.description,
           peopleDescription: descriptor.peopleDescription || '',
+          buyTicketsUrl: descriptor.buyTicketsUrl || null,
           timezone,
           days: openPlannerSchedule.days,
           logoUrl: descriptor.logoUrl || openPlannerSchedule.logoUrl,
diff --git a/cloud/functions/src/crawlers/single-file/crawler.ts b/cloud/functions/src/crawlers/single-file/crawler.ts
@@ -61,6 +61,7 @@ export const SINGLE_FILE_CRAWLER: CrawlerKind<typeof SINGLE_FILE_DESCRIPTOR_PARS
       backgroundUrl: descriptor.backgroundUrl,
       logoUrl: descriptor.logoUrl,
       theming: descriptor.theming,
+      buyTicketsUrl: descriptor.buyTicketsUrl || null,
     }
 
     descriptor.rooms.forEach(room => {
diff --git a/cloud/functions/src/crawlers/web2day/crawler.ts b/cloud/functions/src/crawlers/web2day/crawler.ts
@@ -190,6 +190,7 @@ export const WEB2DAY_CRAWLER: CrawlerKind<typeof WEB2DAY_PARSER> = {
             logoUrl: descriptor.logoUrl,
             timezone: descriptor.timezone,
             peopleDescription: descriptor.peopleDescription || "",
+            buyTicketsUrl: descriptor.buyTicketsUrl || null,
             backgroundUrl: descriptor.backgroundUrl,
             theming: descriptor.theming as ConferenceDescriptor['theming'],
             rooms: descriptor.rooms,
@@ -300,7 +301,8 @@ export const WEB2DAY_CRAWLER: CrawlerKind<typeof WEB2DAY_PARSER> = {
                 location: descriptor.location,
                 logoUrl: descriptor.logoUrl,
                 timezone: descriptor.timezone,
-                peopleDescription: descriptor.peopleDescription as any,
+                peopleDescription: descriptor.peopleDescription,
+                buyTicketsUrl: descriptor.buyTicketsUrl || null,
                 backgroundUrl: descriptor.backgroundUrl
             },
             conferenceDescriptor: confDescriptor,
diff --git a/mobile/src/views/event/SpeakersDirectoryPage.vue b/mobile/src/views/event/SpeakersDirectoryPage.vue
@@ -36,7 +36,8 @@
         </template>
       </speaker-card>
       <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-        <ion-fab-button class="btnGoToTicketing" :aria-label="LL.Go_To_Ticketing()">
+        <ion-fab-button class="btnGoToTicketing" :aria-label="LL.Go_To_Ticketing()" v-if="confDescriptor.buyTicketsUrl"
+                        :href="confDescriptor.buyTicketsUrl" target="_blank">
           <ion-icon :icon="ticket" aria-hidden="true"></ion-icon>
         </ion-fab-button>
       </ion-fab>
diff --git a/shared/event-list.firestore.d.ts b/shared/event-list.firestore.d.ts
@@ -32,14 +32,15 @@ export type ListableEvent = {
     location: {
         country: string,
         city: string,
-        address?: string|undefined,
-        coords?: { latitude: number, longitude: number }|undefined,
+        address?: string|undefined|null,
+        coords?: { latitude: number, longitude: number }|undefined|null,
     },
     peopleDescription?: string|undefined|null,
     backgroundUrl: string,
     logoUrl: string,
     websiteUrl: string,
-    theming: EventTheme
+    buyTicketsUrl?: string|null|undefined,
+    theming: EventTheme,
 } & ListableEventVisibility;
 
 export type EventLastUpdates = {
