fix: FineTuning & Fixe Bugs

Author: malikalahfaoui

templates/next/components/foo/Show.tsx

@@ -8,9 +8,10 @@ import Head from 'next/head'
 
 interface Props {
   {{{lc}}}: {{{ucf}}};
+  text: String
 }
 
-export const Show: FunctionComponent<Props> = ({ {{{lc}}} }) => {
+export const Show: FunctionComponent<Props> = ({ {{{lc}}}, text }) => {
   const [error, setError] = useState(null);
   const router = useRouter();
 

templates/next/pages/foos/[id]/edit.tsx

@@ -4,6 +4,7 @@ import { {{{ucf}}} } from "../../../types/{{{ucf}}}";
 import { fetch } from "../../../utils/dataAccess";
 import Head from "next/head";
 import DefaultErrorPage from "next/error";
+import { getPathsFromHydraResponse } from "../../../utils/helpers";
 
 interface Props {
   {{{lc}}}: {{{ucf}}};
@@ -27,48 +28,25 @@ const Page: NextComponentType<NextPageContext, Props, Props> = ({ {{{lc}}} }) =>
 };
 
 export const getStaticProps: GetStaticProps = async ({ params }) => {
+  const response = await fetch(`/{{{name}}}/${params.id}`);
+
   return {
     props: {
-      {{{lc}}}: await fetch(`/{{{name}}}/${params.id}`),
+      {{{lc}}}: response.data,
     },
     revalidate: 1,
   };
 }
 
-export const getStaticPaths: GetStaticPaths = async () => {
-  try {
-    const response = await fetch("/{{{name}}}");
-  } catch (e) {
-    console.error(e);
-
-    return {
-      paths: [],
-      fallback: true,
-    };
-  }
-
-  const view = response.data['{{{hydraPrefix}}}view'];
-  const paths = response.data["{{{hydraPrefix}}}member"].map(({{{lc}}}) => `${ {{~lc}}['@id'] }/edit`);
 
-  if (view) {
-    try {
-      const {
-        '{{{hydraPrefix}}}last': last
-      } = view;
-      for (let page = 2; page <= parseInt(last.replace(/^\/{{{name}}}\?page=(\d+)/, '$1')); page++) {
-        paths.concat(
-          await fetch(`/{{{name}}}?page=${page}`).data["{{{hydraPrefix}}}member"].map(({{{lc}}}) => `${ {{~lc}}['@id'] }/edit`)
-        );
-      }
-    } catch (e) {
-      console.error(e);
-    }
+export const getStaticPaths: GetStaticPaths = async() => {
+  const response = await fetch("/{{{name}}}");
+  const paths= await getPathsFromHydraResponse(response,true);
+  return {
+      paths,
+      fallback:true
   }
 
-  return {
-    paths,
-    fallback: true,
-  };
 }
 
 export default Page;

templates/next/pages/foos/[id]/index.tsx

@@ -5,6 +5,7 @@ import { fetch } from "../../../utils/dataAccess";
 import Head from "next/head";
 import DefaultErrorPage from "next/error";
 import { useMercure } from "../../../utils/mercure";
+import { getPathsFromHydraResponse } from "../../../utils/helpers";
 
 interface Props {
   {{{lc}}}: {{{ucf}}};
@@ -25,7 +26,7 @@ const Page: NextComponentType<NextPageContext, Props, Props> = (props) => {
           <title>{`Show {{{ucf}}} ${ {{~lc}}['@id'] }`}</title>
         </Head>
       </div>
-      <Show {{{lc}}}={ {{{lc}}} } text={ props.text } />
+      <Show {{{lc}}}={ {{{lc}}} } text={ data.text } />
     </div>
   );
 };
@@ -42,41 +43,12 @@ export const getStaticProps: GetStaticProps = async ({ params }) => {
     revalidate: 1,
   };
 }
-
-export const getStaticPaths: GetStaticPaths = async () => {
-  try {
-    const response = await fetch("/{{{name}}}");
-  } catch (e) {
-    console.error(e);
-
-    return {
-      paths: [],
-      fallback: true,
-    };
-  }
-
-  const view = response.data['{{{hydraPrefix}}}view'];
-  const paths = response.data["{{{hydraPrefix}}}member"].map(({{{lc}}}) => `${ {{~lc}}['@id'] }`);
-
-  if (view) {
-    try {
-      const {
-        '{{{hydraPrefix}}}last': last
-      } = view;
-      for (let page = 2; page <= parseInt(last.replace(/^\/{{{name}}}\?page=(\d+)/, '$1')); page++) {
-        paths.concat(
-          await fetch(`/{{{name}}}?page=${page}`).data["{{{hydraPrefix}}}member"].map(({{{lc}}}) => `${ {{~lc}}['@id'] }`)
-      );
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
+export const getStaticPaths: GetStaticPaths = async() => {
+  const response = await fetch("/{{{name}}}");
+  const paths= await getPathsFromHydraResponse(response,false);
   return {
     paths,
-    fallback: true,
-  };
+    fallback:true
+}
 }
-
 export default Page;

templates/next/utils/dataAccess.ts

@@ -36,12 +36,13 @@ export const fetch = async (id: string, init: RequestInit = {}) => {
   const resp = await isomorphicFetch(ENTRYPOINT + id, init);
   if (resp.status === 204) return;
 
-  const json = await resp.json();
+  const text = await resp.text();
+  const json = JSON.parse(text);
   if (resp.ok) {
     return {
       hubURL: extractHubURL(resp)?.toString(), // URL cannot be serialized as JSON, must be sent as string
       data: normalize(json),
-      text: await resp.text(),
+      text,
     };
   }
 

templates/next/utils/helpers.ts

@@ -0,0 +1,25 @@
+import { fetch } from "./dataAccess";
+
+export const getPathsFromHydraResponse = async (response,isEdit: boolean) => {
+try {
+    const concatPath=isEdit?"/edit":"";
+    const view = response.data['{{{hydraPrefix}}}view'];
+    const paths = response.data["{{{hydraPrefix}}}member"].map(({{{lc}}}) => `${ {{~lc}}['@id'] }${concatPath}`);
+
+    if (view) {
+        const {
+          '{{{hydraPrefix}}}last': last
+        } = view;
+        for (let page = 2; page <= parseInt(last.replace(/^\/{{{name}}}\?page=(\d+)/, '$1')); page++) {
+          paths.concat(
+            await fetch(`/{{{name}}}?page=${page}`).data["{{{hydraPrefix}}}member"].map(({{{lc}}}) => `${ {{~lc}}['@id'] }${concatPath}`)
+        );
+        }    
+    }
+    return paths
+  } catch (e) {
+    console.error(e);
+
+    return  []
+  }
+}