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

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

@@ -3,10 +3,9 @@ import { notFound } from "next/navigation";
 import { getClient } from "@/app/client";
 import {
   NewsPageView,
-  newsBySlugQuery,
+  loadNewsPageProps,
 } from "@/components/news/NewsPageView";
 import { graphql } from "@/gql";
-import { NewsFragment } from "@/gql/graphql";
 import { getSeoMetadata } from "@/lib/seo";
 
 export async function generateStaticParams() {
@@ -41,33 +40,14 @@ export async function generateMetadata(
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
   const { slug } = await params;
-  const { data, error } = await getClient().query(newsBySlugQuery, {
-    slug,
-  });
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.news) {
-    return null;
-  }
-  const news = data.news as NewsFragment;
-  const metadata = await getSeoMetadata(news, parent);
-  return metadata;
+  const props = await loadNewsPageProps({ slug });
+  if (!props) return null;
+  return getSeoMetadata(props.news, parent);
 }
 
 export default async function Page({ params }: { params: Params }) {
   const { slug } = await params;
-  const { data, error } = await getClient().query(newsBySlugQuery, {
-    slug,
-  });
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.news) {
-    return notFound();
-  }
-
-  const news = data?.news as NewsFragment;
-  return <NewsPageView news={news} />;
+  const props = await loadNewsPageProps({ slug });
+  if (!props) return notFound();
+  return <NewsPageView {...props} />;
 }

web/src/app/aktuelt/page.tsx

@@ -1,33 +1,19 @@
-import { getClient } from "@/app/client";
-import { NewsIndexView } from "@/components/news/NewsIndexView";
 import { Metadata, ResolvingMetadata } from "next";
-import { newsQuery, NewsFragment, NewsIndexFragment } from "@/lib/news";
+import {
+  NewsIndexView,
+  loadNewsIndexProps,
+} from "@/components/news/NewsIndexView";
 import { getSeoMetadata } from "@/lib/seo";
 
 export async function generateMetadata(
-  { params }: { params: Promise<{}> },
+  _: unknown,
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
-  const { data, error } = await getClient().query(newsQuery, {});
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.index) {
-    return null;
-  }
-
-  const index = data.index as NewsIndexFragment;
-  const metadata = await getSeoMetadata(index, parent);
-  return metadata;
+  const { index } = await loadNewsIndexProps();
+  return getSeoMetadata(index, parent);
 }
 
 export default async function Page() {
-  const { data, error } = await getClient().query(newsQuery, {});
-  if (error) {
-    throw new Error(error.message);
-  }
-  const news = (data?.news ?? []) as NewsFragment[];
-  const index = data?.index as NewsIndexFragment;
-
-  return <NewsIndexView index={index} news={news} />;
+  const props = await loadNewsIndexProps();
+  return <NewsIndexView {...props} />;
 }