From cc1c2abfa9201df4540ff241c33d9bfe4fd92b8f Mon Sep 17 00:00:00 2001 From: tree Date: Mon, 13 Mar 2023 17:42:38 +0100 Subject: [PATCH] Fix --- src/lib/components/CalendarList.svelte | 3 +++ src/routes/[entry]/[type]/[slug]/+page.svelte | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lib/components/CalendarList.svelte b/src/lib/components/CalendarList.svelte index f0efc351..9ebffe9d 100644 --- a/src/lib/components/CalendarList.svelte +++ b/src/lib/components/CalendarList.svelte @@ -14,6 +14,9 @@ const sg = segments[i] if (sg.remote) { const event = bundle.events.find(e => e.id === sg.remote) + if (!event || !event.segments) { + continue + } const remoteSegments = event.segments.map(rs => Object.assign(rs, { event, remote: true diff --git a/src/routes/[entry]/[type]/[slug]/+page.svelte b/src/routes/[entry]/[type]/[slug]/+page.svelte index 13d8dda3..34f61263 100644 --- a/src/routes/[entry]/[type]/[slug]/+page.svelte +++ b/src/routes/[entry]/[type]/[slug]/+page.svelte @@ -38,14 +38,16 @@ } function enrichItem (it) { - if (!it) return null - console.log(it) + if (!it || !it.segments) return it // segments let segments = it.segments for (let i = 0; i < segments.length; i++) { const sg = segments[i] if (sg.remote) { const event = data.bundle.events.find(e => e.id === sg.remote) + if (!event || !event.segments) { + continue + } const remoteSegments = event.segments.map(rs => Object.assign(rs, { event, remote: true @@ -71,7 +73,7 @@ .join(', ') } - $: itemDescription = `${formatItemDate(item, { full: true })} @ ${item.venues ? venuesMap(item.venues) : item.venueName }. ${item.tags ? item.tags.join(', ') : ''}` + $: itemDescription = col === 'event' ? `${formatItemDate(item, { full: true })} @ ${item.venues ? venuesMap(item.venues) : item.venueName }. ${item.tags ? item.tags.join(', ') : ''}` : null