refactor(meta): use renamed pageMeta

Co-Authored-By: Khallad Sharafeldin <32259466+khallad2@users.noreply.github.com>

app/routes/$.tsx

@@ -6,8 +6,8 @@ import { strapiPageFromRequest } from "~/services/cms/index.server";
 
 export const loader = async ({ request }: LoaderFunctionArgs) => {
   try {
-    const { content, meta } = await strapiPageFromRequest({ request });
-    return json({ content, meta });
+    const { content, pageMeta } = await strapiPageFromRequest({ request });
+    return json({ content, meta: pageMeta });
   } catch (error) {
     if ((error as Error).name === "StrapiPageNotFound") {
       throw new Response(null, { status: 404 });

app/routes/beratungshilfe.zustaendiges-gericht.ergebnis.$.tsx

@@ -31,12 +31,12 @@ export const loader = async ({ params }: LoaderFunctionArgs) => {
   }
 
   const slug = "/beratungshilfe/zustaendiges-gericht/ergebnis";
-  const [common, { content, meta }] = await Promise.all([
+  const [common, { content, pageMeta }] = await Promise.all([
     fetchTranslations("amtsgericht"),
     fetchPage(slug),
   ]);
 
-  return json({ court, content, meta, common });
+  return json({ court, content, meta: pageMeta, common });
 };
 
 export const Component = () => {

app/routes/beratungshilfe.zustaendiges-gericht.suche.tsx

@@ -29,23 +29,22 @@ const validatorServer = withZod(serverSchema);
 export async function loader({ request }: LoaderFunctionArgs) {
   const sessionManager = getSessionManager("/beratungshilfe/vorabcheck");
 
-  const [common, { pre_form, form, meta, nextButtonLabel }] = await Promise.all(
-    [
+  const [common, { pre_form, form, pageMeta, nextButtonLabel }] =
+    await Promise.all([
       fetchTranslations("amtsgericht"),
       fetchFlowPage(
         "vorab-check-pages",
         "/beratungshilfe/zustaendiges-gericht" as FlowId,
         "/suche",
       ),
-    ],
-  );
+    ]);
   const { url: backURL, session } = getReturnToURL({
     request,
     session: await sessionManager.getSession(request.headers.get("Cookie")),
   });
   const headers = { "Set-Cookie": await sessionManager.commitSession(session) };
   return json(
-    { common, pre_form, form, meta, backURL, nextButtonLabel },
+    { common, pre_form, form, meta: pageMeta, backURL, nextButtonLabel },
     { headers },
   );
 }

app/routes/cookie-einstellungen.tsx

@@ -13,9 +13,9 @@ import {
 import { strapiPageFromRequest } from "~/services/cms/index.server";
 
 export async function loader({ request }: LoaderFunctionArgs) {
-  const { content, meta } = await strapiPageFromRequest({ request });
+  const { content, pageMeta } = await strapiPageFromRequest({ request });
   const trackingConsent = await trackingCookieValue({ request });
-  return { meta, content, trackingConsent, acceptCookiesFieldName };
+  return { meta: pageMeta, content, trackingConsent, acceptCookiesFieldName };
 }
 
 export async function action({ request }: ActionFunctionArgs) {

app/routes/feedback.erfolgreich.tsx

@@ -9,8 +9,8 @@ import { strapiPageFromRequest } from "~/services/cms/index.server";
 export const loader = async ({ request }: LoaderFunctionArgs) => {
   const { searchParams } = new URL(request.url);
   const url = searchParams.get("url") ?? "";
-  const { content, meta } = await strapiPageFromRequest({ request });
-  return json({ content, meta, url });
+  const { content, pageMeta } = await strapiPageFromRequest({ request });
+  return json({ content, meta: pageMeta, url });
 };
 
 export default function Index() {

app/routes/geld-einklagen.vorabcheck.partnergericht.ergebnis.$.tsx

@@ -60,12 +60,22 @@ export const loader = async ({
       }
     });
 
-  const [common, { heading, freeZone, hintText, meta }] = await Promise.all([
-    fetchTranslations("amtsgericht"),
-    fetchFlowPage("result-pages", flowId, stepId),
-  ]);
+  const [common, { heading, freeZone, hintText, pageMeta }] = await Promise.all(
+    [
+      fetchTranslations("amtsgericht"),
+      fetchFlowPage("result-pages", flowId, stepId),
+    ],
+  );
 
-  return json({ courts, freeZone, heading, hintText, pageType, meta, common });
+  return json({
+    courts,
+    freeZone,
+    heading,
+    hintText,
+    pageType,
+    meta: pageMeta,
+    common,
+  });
 };
 
 const iconCSS = "inline-block mr-8 !h-[36px] !w-[36px]";

app/routes/kitchensink._index.tsx

@@ -7,8 +7,8 @@ import { throw404OnProduction } from "~/services/errorPages/throw404";
 
 export const loader = async ({ request }: LoaderFunctionArgs) => {
   throw404OnProduction();
-  const { content, meta } = await strapiPageFromRequest({ request });
-  return json({ content, meta });
+  const { content, pageMeta } = await strapiPageFromRequest({ request });
+  return json({ content, meta: pageMeta });
 };
 
 export default function Kitchensink() {

app/routes/opensource.tsx

@@ -7,9 +7,9 @@ import { dependencies } from "~/services/openSourceLicenses/dependencies.server"
 import LicenseList from "~/services/openSourceLicenses/LicenseList";
 
 export const loader = async ({ request }: LoaderFunctionArgs) => {
-  const { content, meta } = await strapiPageFromRequest({ request });
+  const { content, pageMeta } = await strapiPageFromRequest({ request });
   return json({
-    meta,
+    meta: pageMeta,
     content,
     dependencies,
   });

app/routes/persoenliche-daten-loeschen.tsx

@@ -19,9 +19,14 @@ export async function loader({ request }: LoaderFunctionArgs) {
     origin,
   });
 
-  const { content, meta } = await strapiPageFromRequest({ request });
+  const { content, pageMeta } = await strapiPageFromRequest({ request });
   const translations = await fetchTranslations("delete-data");
-  return { meta, content, translations, backButton: sanitizedReferrer };
+  return {
+    meta: pageMeta,
+    content,
+    translations,
+    backButton: sanitizedReferrer,
+  };
 }
 
 export default function PersoenlicheDatenLoeschen() {

app/routes/shared/formular.server.ts

@@ -138,7 +138,7 @@ export const loader = async ({
     return strapiFormElement;
   });
 
-  const meta = stepMeta(formPageContent.meta, parentMeta);
+  const meta = stepMeta(formPageContent.pageMeta, parentMeta);
 
   // Retrieve user data for current step
   const fieldNames = formPageContent.form.map((entry) => entry.name);

app/routes/shared/result.server.ts

@@ -69,7 +69,7 @@ export const loader = async ({ request, context }: LoaderFunctionArgs) => {
       flowId,
       common: defaultStrings,
       cmsData,
-      meta: { ...cmsContent.meta, breadcrumb: parentMeta?.breadcrumb },
+      meta: { ...cmsContent.pageMeta, breadcrumb: parentMeta?.breadcrumb },
       backButton,
     },
     { headers },

app/routes/shared/vorabcheck.server.ts

@@ -78,7 +78,7 @@ export const loader = async ({
     return strapiFormElement;
   });
 
-  const meta = stepMeta(vorabcheckPage.meta, parentMeta);
+  const meta = stepMeta(vorabcheckPage.pageMeta, parentMeta);
 
   // filter user data for current step
   const fieldNames = formElements.map((entry) => entry.name);

app/services/cms/__test__/getStrapiEntryFromFile.test.ts

@@ -14,7 +14,7 @@ describe("services/cms", () => {
     const impressum = {
       slug: impressumPath,
       locale: StrapiLocaleSchema.Values.de,
-      meta: {
+      pageMeta: {
         title: "Impressum",
         description: "description",
         ogTitle: null,
@@ -38,7 +38,7 @@ describe("services/cms", () => {
           nextButtonLabel: null,
           backButtonLabel: null,
           stepId: "/stepId",
-          meta: {
+          pageMeta: {
             title: "",
             description: null,
             ogTitle: null,

app/services/cms/index.server.ts

@@ -21,7 +21,7 @@ import type { Translations } from "../translations/getTranslationByKey";
 export async function fetchMeta(
   opts: Omit<GetStrapiEntryOpts, "apiId" | "filter"> & { filterValue: string },
 ) {
-  const populate = "meta";
+  const populate = "pageMeta";
   const filters = [{ value: opts.filterValue, field: "slug" }];
   const apiId = "pages";
   const pageEntry = await getStrapiEntry({
@@ -32,7 +32,7 @@ export async function fetchMeta(
     deep: false,
   });
   const parsedEntry = HasStrapiMetaSchema.safeParse(pageEntry[0]);
-  return parsedEntry.success ? parsedEntry.data.meta : null;
+  return parsedEntry.success ? parsedEntry.data.pageMeta : null;
 }
 
 export async function fetchSingleEntry<T extends SingleEntryId>(

app/services/cms/models/HasStrapiMeta.ts

@@ -1,4 +1,4 @@
 import { z } from "zod";
 import { StrapiMetaSchema } from "./StrapiMeta";
 
-export const HasStrapiMetaSchema = z.object({ meta: StrapiMetaSchema });
+export const HasStrapiMetaSchema = z.object({ pageMeta: StrapiMetaSchema });

tests/factories/cmsModels/strapiFlowPage.ts

@@ -17,7 +17,7 @@ export function getStrapiFlowPage(
     pre_form: [],
     post_form: [],
     locale: params.locale ?? "de",
-    meta: {
+    pageMeta: {
       title: faker.lorem.word(),
       breadcrumb: faker.lorem.word(),
       description: null,