Skip to content

Commit

Permalink
refactor: Utilise le lien pour définir le type de redirection
Browse files Browse the repository at this point in the history
  • Loading branch information
Mintoo200 committed Dec 17, 2024
1 parent cd33da1 commit 6f94795
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions src/client/components/features/Actualites/ActualiteCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -17,9 +18,7 @@ type ActualiteCardProps = Omit<React.ComponentPropsWithRef<typeof Card>, '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);

Expand All @@ -38,7 +37,7 @@ export default function ActualiteCard({ actualite, headingLevel = 'h2', classNam
<Card.Title className={styles.title} titleAs={headingLevel}>{actualite.titre}</Card.Title>
<p>{extrait}</p>
<Link appearance={'asQuaternaryButton'} href={actualite.link}>
{isExternalLink ? 'En savoir plus' : 'Lire l\'article'}
{isInternalLink ? 'Lire l\'article' : 'En savoir plus'}
<Link.Icon />
</Link>
</Card.Content>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/espace-jeune/index.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function deserialize(actualites: Array<SerializedActualite>): Array<Actualite> {
dateMiseAJour: actualite.dateMiseAJour ? new Date(actualite.dateMiseAJour) : undefined,
}));
}
function serialize(cartesActualitesResponse: unknown): Record<string, unknown> {
function serialize<SerializedType, InitialType>(cartesActualitesResponse: InitialType): SerializedType {
return JSON.parse(JSON.stringify(cartesActualitesResponse));
}

Expand Down Expand Up @@ -96,7 +96,7 @@ export function EspaceJeunePage({ cartesActualites, serviceJeuneList }: EspaceJe
);
}

export async function getStaticProps(): Promise<GetStaticPropsResult<EspaceJeunePageProps>> {
export async function getStaticProps(): Promise<GetStaticPropsResult<SerializedEspaceJeunePageProps>> {
const isEspaceJeuneVisible = process.env.NEXT_PUBLIC_OLD_ESPACE_JEUNE_FEATURE === '1';
if (!isEspaceJeuneVisible) {
return { notFound: true };
Expand Down

0 comments on commit 6f94795

Please sign in to comment.