fix: dinamic calculation for pageModel based on url

aleph-im · May 30, 2024 · fe1172d · fe1172d
1 parent ee3c0bc
commit fe1172d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/src/hooks/useFetchBuilderContent.tsx b/src/hooks/useFetchBuilderContent.tsx
@@ -1,23 +1,22 @@
 import { fetchBuilderData } from "@/utils/fetchBuilderData";
 import { BuilderContent } from "@builder.io/sdk";
 import { useRouter } from "next/router";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 
 interface FetchBuilderContentArgs {
-  pageModel: string;
   preloadedPage: BuilderContent | null;
   fetchContentFrom?: string;
 }
 
 interface FetchBuilderContentResponse {
+  pageModel: "page" | "blog-article";
   content: BuilderContent | null;
   isUpToDate: boolean;
   isNotFound: boolean;
   loading: boolean;
 }
 
 export function useFetchBuilderContent({
-  pageModel,
   preloadedPage,
   fetchContentFrom,
 }: FetchBuilderContentArgs): FetchBuilderContentResponse {
@@ -27,6 +26,15 @@ export function useFetchBuilderContent({
   const [loading, setLoading] = useState(true);
   const router = useRouter();
 
+  const pageModel = useMemo(() => {
+    const [urlPath, _hash] =
+      (fetchContentFrom || router.asPath).split("#") || "/";
+
+    if (urlPath.indexOf("/blog/articles/") !== -1) return "blog-article";
+
+    return "page";
+  }, [fetchContentFrom, router.asPath]);
+
   const fetchBuilderContent = useCallback(async () => {
     const [urlPath, _hash] =
       (fetchContentFrom || router.asPath).split("#") || "/";
@@ -71,5 +79,5 @@ export function useFetchBuilderContent({
     fetchBuilderContent();
   }, [fetchBuilderContent]);
 
-  return { content, isUpToDate, isNotFound, loading };
+  return { pageModel, content, isUpToDate, isNotFound, loading };
 }
diff --git a/src/pages/[[...page]].tsx b/src/pages/[[...page]].tsx
@@ -15,7 +15,6 @@ export const getStaticProps: GetStaticProps = (async ({ params }) => {
     .toPromise();
 
   const pageProps: DynamicPageProps = {
-    pageModel: PAGE_MODEL,
     page: page || null,
   };
 

diff --git a/src/pages/_dynamicPage.tsx b/src/pages/_dynamicPage.tsx
@@ -11,24 +11,22 @@ import MainContentContainer from "@/components/MainContentContainer";
 import { useFetchBuilderContent } from "@/hooks/useFetchBuilderContent";
 
 export type DynamicPageProps = {
-  pageModel?: string;
   page: BuilderContent | null;
   fetchContentFrom?: string;
 };
 
 export default function DynamicPage({
-  pageModel = "page",
   page,
   fetchContentFrom,
 }: DynamicPageProps) {
   const router = useRouter();
   const isPreviewing = useIsPreviewing();
 
-  const { content, isUpToDate, isNotFound, loading } = useFetchBuilderContent({
-    pageModel,
-    preloadedPage: page,
-    fetchContentFrom,
-  });
+  const { pageModel, content, isUpToDate, isNotFound, loading } =
+    useFetchBuilderContent({
+      preloadedPage: page,
+      fetchContentFrom,
+    });
 
   useEffect(() => {
     async function scrollToElement() {

diff --git a/src/pages/blog/articles/[blogArticle].tsx b/src/pages/blog/articles/[blogArticle].tsx
@@ -15,7 +15,6 @@ export const getStaticProps: GetStaticProps = (async ({ params }) => {
     .toPromise();
 
   const pageProps: DynamicPageProps = {
-    pageModel: PAGE_MODEL,
     page: page || null,
   };
 

diff --git a/src/pages/blog/categories/[category].tsx b/src/pages/blog/categories/[category].tsx
@@ -18,7 +18,6 @@ export const getStaticProps: GetStaticProps = (async () => {
     .toPromise();
 
   const pageProps: DynamicPageProps = {
-    pageModel: PAGE_MODEL,
     page: page || null,
     fetchContentFrom: FETCH_CONTENT_FROM,
   };

diff --git a/src/pages/blog/tags/[tag].tsx b/src/pages/blog/tags/[tag].tsx
@@ -18,7 +18,6 @@ export const getStaticProps: GetStaticProps = (async () => {
     .toPromise();
 
   const pageProps: DynamicPageProps = {
-    pageModel: PAGE_MODEL,
     page: page || null,
     fetchContentFrom: FETCH_CONTENT_FROM,
   };