web: centralize prop fetching for live + preview, fix preview banner breakage

web/src/app/lokaler/[slug]/page.tsx

@@ -3,10 +3,9 @@ import { notFound } from "next/navigation";
 import { getClient } from "@/app/client";
 import {
   VenuePageView,
-  venueBySlugQuery,
+  loadVenuePageProps,
 } from "@/components/venues/VenuePageView";
 import { graphql } from "@/gql";
-import { VenueFragment } from "@/gql/graphql";
 import { getSeoMetadata } from "@/lib/seo";
 
 type Params = Promise<{ slug: string }>;
@@ -16,20 +15,9 @@ export async function generateMetadata(
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
   const { slug } = await params;
-  const { data, error } = await getClient().query(venueBySlugQuery, {
-    slug,
-  });
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.venue) {
-    return null;
-  }
-
-  const venue = data.venue as VenueFragment;
-  const metadata = await getSeoMetadata(venue, parent);
-  return metadata;
+  const props = await loadVenuePageProps({ slug });
+  if (!props) return null;
+  return getSeoMetadata(props.venue, parent);
 }
 
 export async function generateStaticParams() {
@@ -59,18 +47,7 @@ export async function generateStaticParams() {
 
 export default async function Page({ params }: { params: Params }) {
   const { slug } = await params;
-  const { data, error } = await getClient().query(venueBySlugQuery, {
-    slug,
-  });
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.venue) {
-    return notFound();
-  }
-
-  const venue = data.venue as VenueFragment;
-
-  return <VenuePageView venue={venue} />;
+  const props = await loadVenuePageProps({ slug });
+  if (!props) return notFound();
+  return <VenuePageView {...props} />;
 }

web/src/app/lokaler/page.tsx

@@ -1,42 +1,19 @@
 import { Metadata, ResolvingMetadata } from "next";
-import { VenueFragment, VenueIndexFragment } from "@/gql/graphql";
-import { getClient } from "@/app/client";
 import {
   VenueIndexView,
-  venueIndexQuery,
+  loadVenueIndexProps,
 } from "@/components/venues/VenueIndexView";
 import { getSeoMetadata } from "@/lib/seo";
 
 export async function generateMetadata(
-  { params }: { params: Promise<{}> },
+  _: unknown,
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
-  const { data, error } = await getClient().query(venueIndexQuery, {});
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.index) {
-    return null;
-  }
-
-  const index = (data?.index ?? []) as VenueIndexFragment;
-  const metadata = await getSeoMetadata(index, parent);
-  return metadata;
+  const { index } = await loadVenueIndexProps();
+  return getSeoMetadata(index, parent);
 }
 
 export default async function Page() {
-  const { data, error } = await getClient().query(venueIndexQuery, {});
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.index || !data?.venues) {
-    throw new Error("Failed to render /lokaler");
-  }
-
-  const index = data.index as VenueIndexFragment;
-  const venues = (data?.venues ?? []) as VenueFragment[];
-
-  return <VenueIndexView index={index} venues={venues} />;
+  const props = await loadVenueIndexProps();
+  return <VenueIndexView {...props} />;
 }