From 6f9479560718c27a019c123459673566d5242541 Mon Sep 17 00:00:00 2001 From: Gauthier Fiorentino Date: Tue, 17 Dec 2024 16:30:52 +0100 Subject: [PATCH] =?UTF-8?q?refactor:=20Utilise=20le=20lien=20pour=20d?= =?UTF-8?q?=C3=A9finir=20le=20type=20de=20redirection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/features/Actualites/ActualiteCard.tsx | 7 +++---- src/pages/espace-jeune/index.page.tsx | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/client/components/features/Actualites/ActualiteCard.tsx b/src/client/components/features/Actualites/ActualiteCard.tsx index 7acd87d469..a109d59d8a 100644 --- a/src/client/components/features/Actualites/ActualiteCard.tsx +++ b/src/client/components/features/Actualites/ActualiteCard.tsx @@ -4,6 +4,7 @@ import React from 'react'; import { Card } from '~/client/components/ui/Card/Card'; import Date from '~/client/components/ui/Date'; import { Link } from '~/client/components/ui/Link/Link'; +import { useIsInternalLink } from '~/client/hooks/useIsInternalLink'; import { Actualite } from '~/server/actualites/domain/actualite'; import { getExtraitContenu } from '~/server/cms/infra/repositories/strapi.utils'; @@ -17,9 +18,7 @@ type ActualiteCardProps = Omit, 'layout }; export default function ActualiteCard({ actualite, headingLevel = 'h2', className, ...rest }: ActualiteCardProps) { - // FIXME (GAFI 14-11-2024): Passer plutôt par actualite.lien, actualite.article n'est pas utilisé dans le composant - // ou bien utiliser actualite.article.slug dans le composant - const isExternalLink = actualite.article == null; + const isInternalLink = useIsInternalLink(actualite.link); const extrait = getExtraitContenu(actualite.contenu); @@ -38,7 +37,7 @@ export default function ActualiteCard({ actualite, headingLevel = 'h2', classNam {actualite.titre}

{extrait}

- {isExternalLink ? 'En savoir plus' : 'Lire l\'article'} + {isInternalLink ? 'Lire l\'article' : 'En savoir plus'} diff --git a/src/pages/espace-jeune/index.page.tsx b/src/pages/espace-jeune/index.page.tsx index 777adbf36f..9bd58a9d5f 100644 --- a/src/pages/espace-jeune/index.page.tsx +++ b/src/pages/espace-jeune/index.page.tsx @@ -39,7 +39,7 @@ function deserialize(actualites: Array): Array { dateMiseAJour: actualite.dateMiseAJour ? new Date(actualite.dateMiseAJour) : undefined, })); } -function serialize(cartesActualitesResponse: unknown): Record { +function serialize(cartesActualitesResponse: InitialType): SerializedType { return JSON.parse(JSON.stringify(cartesActualitesResponse)); } @@ -96,7 +96,7 @@ export function EspaceJeunePage({ cartesActualites, serviceJeuneList }: EspaceJe ); } -export async function getStaticProps(): Promise> { +export async function getStaticProps(): Promise> { const isEspaceJeuneVisible = process.env.NEXT_PUBLIC_OLD_ESPACE_JEUNE_FEATURE === '1'; if (!isEspaceJeuneVisible) { return { notFound: true };