Add Recent News and Events Entity relationships to TopTier and ServiceEntry

src/routes/(infoPages)/about/events/Event.svelte → src/lib/components/Event/Event.svelte

@@ -1,21 +1,36 @@
 <script lang="ts">
-  import type { PageServerData } from "./$types";
   import DateComponent from "$lib/components/Date";
   import Link from "$lib/components/Link";
   import {
     headingTagByLevel,
     type HeadingLevel,
   } from "$lib/components/ContentfulRichText/headings";
 
-  export let event: PageServerData["events"][number];
+  interface EventData {
+    __typename?: "EventEntry";
+    slug?: string | null;
+    shortTitle?: string | null;
+    eventDescription?: string | null;
+    eventDateAndTime?: Date | string | null;
+    eventSummary?: string | null;
+    sys: {
+      __typename?: "Sys";
+      id: string;
+    };
+  }
+
+  export let event: NonNullable<EventData>;
   export let headingLevel: HeadingLevel = 2;
   export let variation: "big" | "small" = "big";
-  $: date = event?.eventDateAndTime ? new Date(event?.eventDateAndTime) : undefined;
+
+  const dateString = event?.eventDateAndTime as string;
+
+  $: date = event?.eventDateAndTime ? new Date(dateString) : undefined;
 </script>
 
 <div class="event">
   {#if event?.eventDateAndTime}
-    <DateComponent dateString={event.eventDateAndTime} {variation} />
+    <DateComponent {dateString} {variation} />
   {/if}
   <div class="event-details">
     {#if event?.shortTitle}

src/lib/components/Event/index.ts

@@ -0,0 +1 @@
+export { default } from "./Event.svelte";

src/routes/(infoPages)/about/news/NewsEntrySnippet.svelte → src/lib/components/NewsEntry/NewsEntry.svelte

@@ -7,17 +7,28 @@
   } from "$lib/components/ContentfulRichText/headings";
   import { getDateStringFromUTCDate } from "$lib/util/dates";
 
-  import type { PageServerData } from "./$types";
-
+  type NewsEntry = {
+    __typename?: "News";
+    type?: string | null;
+    title?: string | null;
+    subhead?: string | null;
+    publicationDate?: Date | string | null;
+    slug?: string | null;
+    byline?: string | null;
+    sys: {
+      __typename?: "Sys";
+      id: string;
+    };
+  };
   type NewsSnippetVariation = "default" | "homepage-featured" | "homepage-listed";
 
-  export let entry: NonNullable<PageServerData["newsEntries"][number]>;
+  export let entry: NonNullable<NewsEntry>;
   export let headingLevel: HeadingLevel = 2;
   export let variation: NewsSnippetVariation = "default";
 
   $: ({ slug, title, subhead, byline, type, publicationDate } = entry);
 
-  $: dateString = getDateStringFromUTCDate(publicationDate);
+  $: dateString = getDateStringFromUTCDate(publicationDate as string);
 
   $: isArticle = type === "News article";
 </script>

src/lib/components/NewsEntry/index.ts

@@ -0,0 +1 @@
+export { default } from "./NewsEntry.svelte";

src/lib/fragments/entryProps.ts

@@ -4,7 +4,10 @@
 // break this up into separate fragments for those different situations.
 // It will both simplify queries and make what's requested more explicit.
 import gql from "graphql-tag";
+import assetProps from "$lib/fragments/assetProps";
+
 export default gql`
+  ${assetProps}
   fragment EntryProps on Entry {
     __typename
     sys {
@@ -54,5 +57,27 @@ export default gql`
         }
       }
     }
+
+    ... on EventEntry {
+      sys {
+        id
+      }
+      slug
+      shortTitle
+      eventDescription
+      eventDateAndTime
+    }
+
+    ... on News {
+      sys {
+        id
+      }
+      type
+      title
+      subhead
+      publicationDate
+      slug
+      byline
+    }
   }
 `;