wip: Ajoute la desérialisation des actus sur les pages

DNUM-SocialGouv · Dec 17, 2024 · cd33da1 · cd33da1
1 parent 26d6002
commit cd33da1
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 12 deletions.
diff --git a/src/pages/actualites/index.page.test.tsx b/src/pages/actualites/index.page.test.tsx
@@ -9,7 +9,7 @@ import { mockUseRouter } from '~/client/components/useRouter.mock';
 import { mockScrollIntoView, mockSmallScreen } from '~/client/components/window.mock';
 import { DependenciesProvider } from '~/client/context/dependenciesContainer.context';
 import { aManualAnalyticsService } from '~/client/services/analytics/analytics.service.fixture';
-import ActualitesPage, { getStaticProps } from '~/pages/actualites/index.page';
+import { ActualitesPage, getStaticProps } from '~/pages/actualites/index.page';
 import { anActualite, anActualiteList } from '~/server/actualites/domain/actualite.fixture';
 import { createFailure, createSuccess } from '~/server/errors/either';
 import { ErreurMetier } from '~/server/errors/erreurMetier.types';

diff --git a/src/pages/actualites/index.page.tsx b/src/pages/actualites/index.page.tsx
@@ -10,16 +10,38 @@ import useAnalytics from '~/client/hooks/useAnalytics';
 import { Actualite } from '~/server/actualites/domain/actualite';
 import { isFailure } from '~/server/errors/either';
 import { dependencies } from '~/server/start';
+import { ISODateTime } from '~/shared/ISODateTime';
 
 import analytics from './index.analytics';
 import styles from './index.module.scss';
 
+type SerializedActualite = Omit<Actualite, 'dateMiseAJour'> & {
+	dateMiseAJour?: ISODateTime
+}
+interface SerializedActualitesPageProps {
+	cartesActualites: Array<SerializedActualite>
+}
 interface ActualitesPageProps {
 	cartesActualites: Array<Actualite>
 }
 
 const MAX_VISIBLE_ACTUALITES = 3;
-export default function ActualitesPage({ cartesActualites }: ActualitesPageProps) {
+
+function deserialize(actualites: Array<SerializedActualite>): Array<Actualite> {
+	return actualites.map((actualite) => ({
+		...actualite,
+		dateMiseAJour: actualite.dateMiseAJour ? new Date(actualite.dateMiseAJour) : undefined,
+	}));
+}
+function serialize(cartesActualitesResponse: Array<Actualite>): Array<SerializedActualite> {
+	return JSON.parse(JSON.stringify(cartesActualitesResponse));
+}
+
+export default function Deserialize(props: SerializedActualitesPageProps) {
+	const deserializedActus = deserialize(props.cartesActualites);
+	return <ActualitesPage cartesActualites={deserializedActus} />;
+}
+export function ActualitesPage({ cartesActualites }: ActualitesPageProps) {
 	useAnalytics(analytics);
 
 	const articleCardList = useMemo(() => {
@@ -54,7 +76,7 @@ export default function ActualitesPage({ cartesActualites }: ActualitesPageProps
 	);
 }
 
-export async function getStaticProps(): Promise<GetStaticPropsResult<ActualitesPageProps>> {
+export async function getStaticProps(): Promise<GetStaticPropsResult<SerializedActualitesPageProps>> {
 	const isEspaceJeuneVisible = process.env.NEXT_PUBLIC_OLD_ESPACE_JEUNE_FEATURE === '0';
 	if (!isEspaceJeuneVisible) {
 		return { notFound: true };
@@ -68,7 +90,7 @@ export async function getStaticProps(): Promise<GetStaticPropsResult<ActualitesP
 
 	return {
 		props: {
-			cartesActualites: JSON.parse(JSON.stringify(cartesActualitesResponse.result)),
+			cartesActualites: serialize(cartesActualitesResponse.result),
 		},
 		revalidate: dependencies.cmsDependencies.duréeDeValiditéEnSecondes(),
 	};

diff --git a/src/pages/espace-jeune/index.page.test.tsx b/src/pages/espace-jeune/index.page.test.tsx
@@ -10,7 +10,7 @@ import { mockUseRouter } from '~/client/components/useRouter.mock';
 import { mockScrollIntoView, mockSmallScreen } from '~/client/components/window.mock';
 import { DependenciesProvider } from '~/client/context/dependenciesContainer.context';
 import { aManualAnalyticsService } from '~/client/services/analytics/analytics.service.fixture';
-import EspaceJeunePage, { getStaticProps } from '~/pages/espace-jeune/index.page';
+import { EspaceJeunePage, getStaticProps } from '~/pages/espace-jeune/index.page';
 import { anActualite, anActualiteList } from '~/server/actualites/domain/actualite.fixture';
 import { aServiceJeune, aServiceJeuneList } from '~/server/services-jeunes/domain/servicesJeunes.fixture';
 

diff --git a/src/pages/espace-jeune/index.page.tsx b/src/pages/espace-jeune/index.page.tsx
@@ -10,21 +10,45 @@ import { LightHero, LightHeroPrimaryText, LightHeroSecondaryText } from '~/clien
 import SeeMoreItemList from '~/client/components/ui/SeeMore/SeeMoreItemList';
 import useAnalytics from '~/client/hooks/useAnalytics';
 import analytics from '~/pages/espace-jeune/index.analytics';
+import { Accueil } from '~/pages/index.page';
 import { Actualite } from '~/server/actualites/domain/actualite';
 import { isFailure } from '~/server/errors/either';
 import { ServiceJeune } from '~/server/services-jeunes/domain/servicesJeunes';
 import { dependencies } from '~/server/start';
+import { ISODateTime } from '~/shared/ISODateTime';
 
 import styles from './index.module.scss';
 
-interface EspaceJeunePageProps {
-	cartesActualites: Actualite[]
+type EspaceJeunePageProps = {
+	cartesActualites: Array<Actualite>
 	serviceJeuneList: Array<ServiceJeune>
 }
+type SerializedActualite = Omit<Actualite, 'dateMiseAJour'> & {
+	dateMiseAJour?: ISODateTime
+}
+type SerializedEspaceJeunePageProps = {
+	cartesActualites: Array<SerializedActualite>
+	serviceJeuneList: Array<ServiceJeune>
+}
+
 
 const MAX_VISIBLE_ACTUALITES_LENGTH = 3;
+function deserialize(actualites: Array<SerializedActualite>): Array<Actualite> {
+	return actualites.map((actualite) => ({
+		...actualite,
+		dateMiseAJour: actualite.dateMiseAJour ? new Date(actualite.dateMiseAJour) : undefined,
+	}));
+}
+function serialize(cartesActualitesResponse: unknown): Record<string, unknown> {
+	return JSON.parse(JSON.stringify(cartesActualitesResponse));
+}
+
+export default function Deserialize(props: SerializedEspaceJeunePageProps) {
+	const deserializedActus = deserialize(props.cartesActualites);
+	return <Accueil	actualites={deserializedActus} />;
+}
 
-export default function EspaceJeunePage({ cartesActualites, serviceJeuneList }: EspaceJeunePageProps) {
+export function EspaceJeunePage({ cartesActualites, serviceJeuneList }: EspaceJeunePageProps) {
 	useAnalytics(analytics);
 
 	const articleCardList: React.ReactNode[] = useMemo(() => {
@@ -87,8 +111,8 @@ export async function getStaticProps(): Promise<GetStaticPropsResult<EspaceJeune
 
 	return {
 		props: {
-			cartesActualites: JSON.parse(JSON.stringify(cartesActualitesResponse.result)),
-			serviceJeuneList: JSON.parse(JSON.stringify(serviceJeuneList.result)),
+			cartesActualites: serialize(cartesActualitesResponse.result),
+			serviceJeuneList: serialize(serviceJeuneList.result),
 		},
 		revalidate: dependencies.cmsDependencies.duréeDeValiditéEnSecondes(),
 	};

diff --git a/src/pages/index.page.tsx b/src/pages/index.page.tsx
@@ -27,7 +27,7 @@ interface CardContent {
 }
 
 type SerializedActualite = Omit<Actualite, 'dateMiseAJour'> & {
-	dateMiseAJour: ISODateTime
+	dateMiseAJour?: ISODateTime
 }
 interface SerializedAccueilPageProps {
 	actualites: Array<SerializedActualite>
@@ -38,7 +38,7 @@ interface AccueilPageProps {
 function deserialize(actualites: Array<SerializedActualite>): Array<Actualite> {
 	return actualites.map((actualite) => ({
 		...actualite,
-		dateMiseAJour: new Date(actualite.dateMiseAJour),
+		dateMiseAJour: actualite.dateMiseAJour ? new Date(actualite.dateMiseAJour) : undefined,
 	}));
 }
 function serialize(cartesActualitesResponse: Array<Actualite>): Array<SerializedActualite> {