Corrections lors du fetch

incubateur-ademe · Jan 22, 2024 · 6993dfd · 6993dfd
1 parent 2435048
commit 6993dfd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/site/app/programme/[uid]/page.tsx b/packages/site/app/programme/[uid]/page.tsx
@@ -1,3 +1,4 @@
+import {notFound} from 'next/navigation';
 import {getServiceStrapiData} from './utils';
 import {InfoData, ListeData, ParagrapheData} from './types';
 import ParagrapheService from './ParagrapheService';
@@ -11,7 +12,7 @@ type ServiceProgrammeProps = {
 const ServiceProgramme = async ({params: {uid}}: ServiceProgrammeProps) => {
   const data = await getServiceStrapiData(uid);
 
-  if (!data || data.contenu.length === 0) return null;
+  if (!data || data.contenu.length === 0) return notFound();
 
   return (
     <>
@@ -24,7 +25,7 @@ const ServiceProgramme = async ({params: {uid}}: ServiceProgrammeProps) => {
           case 'info':
             return <InfoService {...(c as InfoData)} />;
           default:
-            return null;
+            return notFound();
         }
       })}
     </>

diff --git a/packages/site/app/programme/[uid]/utils.ts b/packages/site/app/programme/[uid]/utils.ts
@@ -20,7 +20,7 @@ export const getServiceStrapiData = async (uid: string) => {
     ['populate[5]', 'contenu.boutons'],
   ]);
 
-  if (data) {
+  if (data && data.length > 0 && data[0].attributes.contenu) {
     const serviceData = data[0].attributes;
 
     return {
@@ -67,5 +67,5 @@ export const getServiceStrapiData = async (uid: string) => {
         },
       ),
     };
-  } else return data;
+  } else return null;
 };